@fonixtree/magic-design 0.1.78 → 1.0.2-0.1

package/es/composite-comp/bol/components/Video/mobile/Layout2/index.less

@@ -2,39 +2,48 @@
   display: flex;
   flex-direction: column;
   position: relative;
-  padding-bottom: 0.72rem;
-}
-.video-layout2-wrap .slider-wrap {
-  width: 100%;
-  overflow: hidden;
-}
-.video-layout2-wrap .slider-wrap .slider-list-wrap {
-  display: flex;
-  transform: translateX(-100%);
-  transition: all 0.3s linear;
-  position: relative;
-}
-.video-layout2-wrap .slider-wrap .slider-list-wrap.noAnimation {
-  animation: none;
-}
-.video-layout2-wrap .slider-wrap .video-item-wrap {
-  height: 4.24rem;
-  position: relative;
-  width: 100%;
-  flex-shrink: 0;
-}
-.video-layout2-wrap .slider-wrap .video-item-wrap:last-child {
-  margin-bottom: 0;
-}
-.video-layout2-wrap .slider-wrap .video-item-wrap .play-btn {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1;
-  cursor: pointer;
-}
-.video-layout2-wrap .slider-wrap .video-item-wrap .play-btn img {
-  width: 100%;
-  height: 100%;
-}
+  padding-bottom: 36px;
+
+  .slider-wrap {
+    width: 100%;
+    overflow: hidden;
+
+    .slider-list-wrap {
+      display: flex;
+      transform: translateX(-100%);
+      transition: all .3s linear;
+      position: relative;
+
+      &.noAnimation {
+        animation: none;
+      }
+    }
+
+    .video-item-wrap {
+      height: 212px;
+      position: relative;
+      width: 100%;
+      flex-shrink: 0;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      .play-btn {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        // width: 60px;
+        // height: 60px;
+        z-index: 1;
+        cursor: pointer;
+
+        img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+  }
+}

package/es/composite-comp/bol/components/Video/mobile/Layout3/index.less

@@ -1,46 +1,57 @@
 .video-layout3-wrap {
   display: flex;
   flex-direction: column;
-}
-.video-layout3-wrap .video-tag-container {
-  padding-top: 0.4rem;
-  padding-bottom: 0.76rem;
-}
-.video-layout3-wrap .video-layout3-item-con {
-  display: flex;
-  flex-direction: column;
-  margin-bottom: 0.2rem;
-}
-.video-layout3-wrap .video-layout3-item-con:last-child {
-  margin-bottom: 0;
-}
-.video-layout3-wrap .video-item-wrap {
-  height: 4.24rem;
-  position: relative;
-}
-.video-layout3-wrap .video-item-wrap:last-child {
-  margin-bottom: 0;
-}
-.video-layout3-wrap .video-item-wrap .play-btn {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1;
-  cursor: pointer;
-}
-.video-layout3-wrap .video-item-wrap .play-btn img {
-  width: 100%;
-  height: 100%;
-}
-.video-layout3-wrap .video-item-wrap .play-btn.bottomLeft {
-  left: 0.24rem;
-  bottom: 0.2rem;
-  transform: unset;
-  top: unset;
-}
-.video-layout3-wrap .video-item-wrap .video-share-btn {
-  position: absolute;
-  right: 0.24rem;
-  bottom: 0.24rem;
-}
+  .video-tag-container {
+    padding-top: 20px;
+    padding-bottom: 38px;
+  }
+
+  .video-layout3-item-con {
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 10px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .video-item-wrap {
+    height: 212px;
+    position: relative;
+
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    .play-btn {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      // width: 60px;
+      // height: 60px;
+      z-index: 1;
+      cursor: pointer;
+
+      img {
+        width: 100%;
+        height: 100%;
+      }
+
+      &.bottomLeft {
+        left: 12px;
+        bottom: 10px;
+        transform: unset;
+        top: unset;
+      }
+    }
+
+    .video-share-btn {
+      position: absolute;
+      right: 12px;
+      bottom: 12px;
+    }
+  }
+}

package/es/composite-comp/bol/components/Video/mobile/index.less

@@ -1,3 +1,4 @@
 .m-video-mobile {
-  position: relative;
-}
+	position: relative;
+
+}

package/es/composite-comp/bol/components/Wallet/mobile/index.less

@@ -1,27 +1,40 @@
-.m-Wallet-mobile .headline {
-  margin-bottom: 0.14rem;
-}
-.m-Wallet-mobile .content {
-  display: flex;
-  flex-wrap: wrap;
-}
-.m-Wallet-mobile .content.column_3 .item-wrap .title {
-  top: 13%;
-}
-.m-Wallet-mobile .content.column_3 .item-wrap .amount {
-  bottom: 13%;
-}
-.m-Wallet-mobile .content .item-wrap {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  border-radius: 0.2rem;
-}
-.m-Wallet-mobile .content .item-wrap .image {
-  border-radius: 0.2rem;
-  overflow: hidden;
-}
-.m-Wallet-mobile .content .item-wrap .text-content {
-  position: absolute;
-}
+.m-Wallet-mobile {
+
+  .headline {
+    margin-bottom: 7px;
+  }
+
+  .content {
+    display: flex;
+    flex-wrap: wrap;
+
+    &.column_3 {
+      .item-wrap {
+        .title {
+          top: 13%;
+        }
+
+        .amount {
+          bottom: 13%;
+        }
+      }
+    }
+
+    .item-wrap {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      position: relative;
+      border-radius: 10px;
+
+      .image {
+        border-radius: 10px;
+        overflow: hidden;
+      }
+
+      .text-content {
+        position: absolute;
+      }
+    }
+  }
+}

package/es/composite-comp/bol/second-config-panels/ImageTextSecondConfig/index.js

@@ -7,7 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _lodash = require("lodash");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
+var _pick = _interopRequireDefault(require("lodash/pick"));
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
@@ -252,15 +254,15 @@ function (_super) {
 
       if (panelProps.hover.open) {
         var tempObj = {};
-        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.button, ['buttonBorder', 'buttonIcon', 'buttonText', 'spacing', 'content', 'open', 'text']));
+        tempObj = (0, _cloneDeep["default"])((0, _pick["default"])(panelProps.button, ['buttonBorder', 'buttonIcon', 'buttonText', 'spacing', 'content', 'open', 'text']));
         panelProps.hover.button = __assign(__assign({}, panelProps.hover.button), tempObj);
-        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.secondButton, ['buttonBorder', 'buttonIcon', 'buttonText', 'spacing', 'content', 'open', 'text']));
+        tempObj = (0, _cloneDeep["default"])((0, _pick["default"])(panelProps.secondButton, ['buttonBorder', 'buttonIcon', 'buttonText', 'spacing', 'content', 'open', 'text']));
         panelProps.hover.secondButton = __assign(__assign({}, panelProps.hover.secondButton), tempObj);
-        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.image, ['content', 'open']));
+        tempObj = (0, _cloneDeep["default"])((0, _pick["default"])(panelProps.image, ['content', 'open']));
         panelProps.hover.image = __assign(__assign({}, panelProps.hover.image), tempObj);
-        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.text, ['content', 'open', 'spacing', 'specialContent', 'text', 'underline', 'vertical']));
+        tempObj = (0, _cloneDeep["default"])((0, _pick["default"])(panelProps.text, ['content', 'open', 'spacing', 'specialContent', 'text', 'underline', 'vertical']));
         panelProps.hover.text = __assign(__assign({}, panelProps.hover.text), tempObj);
-        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.title, ['content', 'open', 'spacing', 'specialContent', 'text', 'underline', 'vertical']));
+        tempObj = (0, _cloneDeep["default"])((0, _pick["default"])(panelProps.title, ['content', 'open', 'spacing', 'specialContent', 'text', 'underline', 'vertical']));
         panelProps.hover.title = __assign(__assign({}, panelProps.hover.title), tempObj);
         panelProps.hover.background = __assign(__assign({}, panelProps.hover.background), panelProps.background); // console.log(buttonTemp.buttonBorder == panelProps.button.buttonBorder);
       }

package/es/composite-comp/common/components/ProductItem/index.js

@@ -202,13 +202,11 @@ function (_super) {
         text: _price
       }),
       readonly: true
-    }), panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "price-sold-wrap"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
+    }), oldPrice && panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "old-price-wrap"
     }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
       className: "discount"
-    }, "-", discount, "%"), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+    }, "-", discount, "%"), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "old-price",
       data: __assign(__assign({}, panelProps.salesPrice), {
         text: oldPrice
@@ -217,9 +215,7 @@ function (_super) {
       style: {
         color: panelProps.salesPrice.content.color
       }
-    })), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "sold-count"
-    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")), showProgress && panelProps.salesProgressVisible.open && /*#__PURE__*/_react["default"].createElement("div", {
+    })), showProgress && panelProps.salesProgressVisible.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "text"
@@ -230,7 +226,9 @@ function (_super) {
       style: {
         width: salePercent + "%"
       }
-    })))));
+    }))), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "sold-count"
+    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")));
   };
 
   ProductItem.defaultProps = {

package/es/composite-comp/common/components/ProductItem/index.less

@@ -7,7 +7,13 @@
   cursor: pointer;
   position: relative;
 
-
+  .sold-count {
+    color: #7b7b7b;
+    font-size: 12px;
+    position: absolute;
+    right: 8px;
+    bottom: 8px;
+  }
 
   .img-wrap {
     position: relative;
@@ -53,40 +59,28 @@
       text-overflow: ellipsis;
     }
 
-    .price-sold-wrap {
+    .old-price-wrap {
       display: flex;
       margin-top: 0px;
-      align-items: center;
+      align-items: baseline;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
-      flex-wrap: wrap;
-      line-height: 15px;
-      .old-price-wrap {
-        display: flex;
-        line-height: 13px;
-        .discount {
-          margin-right: 3px;
-          font-family: 'Montserrat';
-          font-style: normal;
-          font-weight: 700;
-          font-size: 8px;
-          line-height: 15px;
-          color: #fff;
-          padding: 0 4px;
-          background-color: #CE1126;
-        }
-        .old-price {
-          text-decoration: line-through;
-          width: fit-content;
-        }
+
+      .discount {
+        margin-right: 3px;
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 700;
+        font-size: 8px;
+        line-height: 15px;
+        color: #fff;
+        padding: 0 4px;
+        background-color: #CE1126;
       }
 
-      .sold-count {
-        color: #7b7b7b;
-        font-size: 12px;
-        text-align: right ;
-        flex-grow: 1;
+      .old-price {
+        text-decoration: line-through;
       }
     }
 

package/es/composite-comp/dito/components/FlashDeal/mobile/index.less

@@ -1,86 +1,100 @@
 .m-flash-deal-mobile {
   display: flex;
   flex-direction: column;
-  padding: 0.32rem 0.32rem 0.56rem 0.32rem;
-}
-.m-flash-deal-mobile .flash-deal-title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.m-flash-deal-mobile .flash-deal-title .left {
-  display: flex;
-  align-items: center;
-}
-.m-flash-deal-mobile .flash-deal-title .left .icon {
-  height: 0.36rem;
-  margin-right: 0.2rem;
-}
-.m-flash-deal-mobile .flash-deal-title .left .title {
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: 600;
-  font-size: 0.28rem;
-  line-height: 0.36rem;
-  color: #2C2C2C;
-  margin-right: 0.2rem;
-}
-.m-flash-deal-mobile .flash-deal-title .left .sub-title {
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: 600;
-  font-size: 0.2rem;
-  line-height: 0.36rem;
-  color: #2C2C2C;
-  margin-right: 0.12rem;
-  align-self: end;
-}
-.m-flash-deal-mobile .flash-deal-title .right {
-  display: flex;
-  align-items: center;
-}
-.m-flash-deal-mobile .flash-deal-title .right .text {
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: 600;
-  font-size: 0.24rem;
-  line-height: 0.3rem;
-  color: #0038A8;
-  margin-right: 0.1rem;
-}
-.m-flash-deal-mobile .flash-deal-title .right .btn {
-  white-space: nowrap;
-}
-.m-flash-deal-mobile .flash-deal-list {
-  margin-top: 0.32rem;
-  overflow-x: auto;
-  overflow-y: hidden;
-  white-space: nowrap;
-  display: flex;
-  align-items: flex-start;
-  justify-content: flex-start;
-  position: relative;
-}
-.m-flash-deal-mobile .flash-deal-list .loading-wrap {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0.6rem;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  margin: auto;
-}
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap {
-  width: 2.84rem;
-  margin-right: 0.16rem;
-}
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap .product-img {
-  height: 2.8rem;
-  width: 2.8rem;
-}
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap .product-name {
-  height: 0.72rem;
-}
+  padding: 16px 16px 28px 16px;
+
+  .flash-deal-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .left {
+      display: flex;
+      align-items: center;
+
+      .icon {
+        height: 18px;
+        margin-right: 10px;
+      }
+
+      .title {
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 600;
+        font-size: 14px;
+        line-height: 18px;
+        color: #2C2C2C;
+        margin-right: 10px;
+      }
+
+      .sub-title {
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 600;
+        font-size: 10px;
+        line-height: 18px;
+        color: #2C2C2C;
+        margin-right: 6px;
+        align-self: end;
+      }
+    }
+
+    .right {
+      display: flex;
+      align-items: center;
+
+      .text {
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 600;
+        font-size: 12px;
+        line-height: 15px;
+        color: #0038A8;
+        margin-right: 5px;
+      }
+
+      .btn {
+        white-space: nowrap;
+      }
+    }
+  }
+
+  .flash-deal-list {
+    margin-top: 16px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    white-space: nowrap;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    position: relative;
+
+    .loading-wrap {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 30px;
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      margin: auto;
+    }
+
+    // 秒杀特有样式
+    .m-product-item-wrap {
+      width: 142px;
+      margin-right: 8px;
+
+      .product-img {
+        height: 140px;
+        width: 140px;
+      }
+
+      .product-name {
+        height: 36px;
+      }
+    }
+  }
+}

package/es/composite-comp/dito/components/MobileNavigation/mobile/index.less

@@ -1,21 +1,38 @@
-.mobile-navigation-mobile .group-wrap {
-  padding: 0 0.4rem;
-  display: flex;
+.mobile-navigation-mobile {
+  // display: flex;
+  // flex-direction: column;
+  // padding-top: 18px;
+  .group-wrap {
+    padding: 0 20px;
+    display: flex;
+    .one-card {
+      // display: flex;
+
+      .card-image-wrap {
+        margin-bottom: 4px;
+        width: 100%;
+      }
+    }
+  } 
+
 }
-.mobile-navigation-mobile .group-wrap .one-card .card-image-wrap {
-  margin-bottom: 0.08rem;
-  width: 100%;
+
+.newline {
+  .group-wrap {
+    flex-wrap: wrap;
+  }
 }
-.newline .group-wrap {
-  flex-wrap: wrap;
-}
-.tile .group-wrap {
-  overflow-x: auto;
-  flex-wrap: nowrap;
-  scroll-snap-type: x;
-  padding: 0 0.3rem;
-}
-.tile .group-wrap .one-card {
-  flex-shrink: 0;
-  scroll-snap-align: end;
+
+.tile {
+  .group-wrap {
+    // overflow-x: scroll;
+    overflow-x: auto;
+    flex-wrap: nowrap;
+    scroll-snap-type: x;
+    padding: 0 15px;
+    .one-card {
+      flex-shrink: 0;
+      scroll-snap-align: end;
+    }
+  }
 }