@fonixtree/magic-design 1.0.4 → 1.0.6

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

@@ -1,100 +1,86 @@
 .m-flash-deal-mobile {
   display: flex;
   flex-direction: column;
-  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;
-      }
-    }
-  }
-}
+  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;
+}

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

@@ -1,38 +1,21 @@
-.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 {
+  padding: 0 0.4rem;
+  display: flex;
 }
-
-.newline {
-  .group-wrap {
-    flex-wrap: wrap;
-  }
+.mobile-navigation-mobile .group-wrap .one-card .card-image-wrap {
+  margin-bottom: 0.08rem;
+  width: 100%;
 }
-
-.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;
-    }
-  }
+.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;
 }

package/es/composite-comp/dito/components/Recommend/mobile/index.js

@@ -384,7 +384,8 @@ function (_super) {
                 sortType: '1',
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
-                aggregation: false
+                aggregation: false,
+                storeId: window.magicDesign.storeId || ''
               }, 'POST')];
 
             case 4:

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

@@ -1,89 +1,76 @@
 .m-recommend-mobile {
   display: flex;
   flex-direction: column;
-
-  .cylon-tabs-nav-operations {
-    display: none !important;
-  }
-
-  ::-webkit-scrollbar {
-    width: 0;
-    height: 0;
-    display: none;
-  }
-
-
-  .tab-select-wrap {
-    display: flex;
-    align-items: center;
-    height: 50px;
-    background: rgb(255 255 255);
-    overflow: auto;
-    position: relative;
-    margin-bottom: 15px;
-
-    .tabTitle {
-      display: flex;
-      align-items: center;
-      text-align: center;
-      padding: 0 16px;
-      width: fit-content;
-      height: 100%;
-      justify-content: center;
-      white-space: nowrap;
-      flex-direction: column;
-
-      img {
-        height: 20px;
-        width: 20px;
-        margin-bottom: 2px;
-      }
-    }
-
-    .active-line {
-      position: absolute;
-      bottom: 0;
-      width: 200px;
-      height: 3px;
-      background-color: #fff;
-      transition: .2s all linear;
-      border-radius: 1.5px;
-    }
-  }
-
-  .macyContainer {
-    display: flex;
-    margin: 0 16px;
-  }
-
-  .scrollContainer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    margin: 0 16px;
-    overflow-x: auto;
-    padding-bottom: 15px;
-
-    &.pl_100 {
-      padding-left: 100px;
-    }
-
-    .scrollProductList {
-      display: flex;
-      flex-direction: row;
-      align-items: flex-start;
-
-      .productCard {
-        margin-right: 12px;
-      }
-    }
-  }
-
-  .btnSeeAll {
-    display: block;
-    width: fit-content;
-    min-width: 80px;
-    margin: 0 auto;
-    flex: none;
-  }
-}
+}
+.m-recommend-mobile .cylon-tabs-nav-operations {
+  display: none !important;
+}
+.m-recommend-mobile ::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  display: none;
+}
+.m-recommend-mobile .tab-select-wrap {
+  display: flex;
+  align-items: center;
+  height: 1rem;
+  background: #ffffff;
+  overflow: auto;
+  position: relative;
+  margin-bottom: 0.3rem;
+}
+.m-recommend-mobile .tab-select-wrap .tabTitle {
+  display: flex;
+  align-items: center;
+  text-align: center;
+  padding: 0 0.32rem;
+  width: fit-content;
+  height: 100%;
+  justify-content: center;
+  white-space: nowrap;
+  flex-direction: column;
+}
+.m-recommend-mobile .tab-select-wrap .tabTitle img {
+  height: 0.4rem;
+  width: 0.4rem;
+  margin-bottom: 0.04rem;
+}
+.m-recommend-mobile .tab-select-wrap .active-line {
+  position: absolute;
+  bottom: 0;
+  width: 4rem;
+  height: 0.06rem;
+  background-color: #fff;
+  transition: 0.2s all linear;
+  border-radius: 0.03rem;
+}
+.m-recommend-mobile .macyContainer {
+  display: flex;
+  margin: 0 0.32rem;
+}
+.m-recommend-mobile .scrollContainer {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin: 0 0.32rem;
+  overflow-x: auto;
+  padding-bottom: 0.3rem;
+}
+.m-recommend-mobile .scrollContainer.pl_100 {
+  padding-left: 2rem;
+}
+.m-recommend-mobile .scrollContainer .scrollProductList {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+}
+.m-recommend-mobile .scrollContainer .scrollProductList .productCard {
+  margin-right: 0.24rem;
+}
+.m-recommend-mobile .btnSeeAll {
+  display: block;
+  width: fit-content;
+  min-width: 1.6rem;
+  margin: 0 auto;
+  flex: none;
+}

package/es/composite-comp/dito/components/Recommend/pc/index.js

@@ -379,7 +379,8 @@ function (_super) {
                 sortType: '1',
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
-                aggregation: false
+                aggregation: false,
+                storeId: window.magicDesign.storeId || ''
               }, 'POST')];
 
             case 4:

package/es/composite-comp/dito/components/SearchBar/defaultJSON.js

@@ -45,6 +45,14 @@ var getDefaultJSON = function getDefaultJSON() {
         color: {
           pc: '#D92929',
           mobile: '#232F46'
+        },
+        cartIcon: {
+          pc: true,
+          mobile: true
+        },
+        messageIcon: {
+          pc: false,
+          mobile: true
         }
       }
     },

package/es/composite-comp/dito/components/SearchBar/mobile/index.js

@@ -197,7 +197,48 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      messageNum: ''
+      messageNum: '',
+      cartNum: ''
+    };
+
+    _this.getCartNum = function () {
+      return __awaiter(_this, void 0, void 0, function () {
+        var num, cart;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              num = '';
+              if (!(localStorage.getItem('isLogin') === 'Y')) return [3
+              /*break*/
+              , 2];
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/carts/num', {}, 'GET')];
+
+            case 1:
+              cart = _a.sent();
+              num = cart.num;
+              return [3
+              /*break*/
+              , 3];
+
+            case 2:
+              num = (localStorage.getItem('TEMP_CART') || []).length;
+              _a.label = 3;
+
+            case 3:
+              if (num > 0) {
+                this.setState({
+                  cartNum: num
+                });
+              }
+
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
     };
 
     _this.getMessageNum = function () {
@@ -228,14 +269,19 @@ function (_super) {
   }
 
   SearchMobile.prototype.componentDidMount = function () {
+    // const { data } = this.props;
+    // console.log('---mobile ', data);
     this.getMessageNum();
+    this.getCartNum();
   };
 
   SearchMobile.prototype.render = function () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
 
     var data = this.props.data;
-    var messageNum = this.state.messageNum; // let styleWrap = {};
+    var _q = this.state,
+        messageNum = _q.messageNum,
+        cartNum = _q.cartNum; // let styleWrap = {};
     // if (data.content.background.bgType === 'color') {
     //   styleWrap = {
     //     backgroundColor: data.content.background.color,
@@ -269,10 +315,24 @@ function (_super) {
         display: 'flex'
       },
       type: "icon-search2"
-    })), data.content && ((_f = data.content.icon) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    })), data.content && ((_g = (_f = data.content.icon) === null || _f === void 0 ? void 0 : _f.cartIcon) === null || _g === void 0 ? void 0 : _g.mobile) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "message-wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      color: (_j = (_h = data.content.icon) === null || _h === void 0 ? void 0 : _h.color) === null || _j === void 0 ? void 0 : _j.mobile,
+      onClick: function onClick() {
+        return (0, _coreUtil.clickUrl)('/main/cart');
+      },
+      size: (0, _commonUtil.convertToRem)(24),
+      style: {
+        display: 'flex'
+      },
+      type: "icon-ShoppingCartSimple1"
+    }), !!cartNum && /*#__PURE__*/_react["default"].createElement("span", {
+      className: "num"
+    }, cartNum)), data.content && ((_l = (_k = data.content.icon) === null || _k === void 0 ? void 0 : _k.messageIcon) === null || _l === void 0 ? void 0 : _l.mobile) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: (_h = (_g = data.content.icon) === null || _g === void 0 ? void 0 : _g.color) === null || _h === void 0 ? void 0 : _h.mobile,
+      color: (_o = (_m = data.content.icon) === null || _m === void 0 ? void 0 : _m.color) === null || _o === void 0 ? void 0 : _o.mobile,
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },
@@ -280,10 +340,10 @@ function (_super) {
       style: {
         display: 'flex'
       },
-      type: "icon-ChatDots"
+      type: "icon-message"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, messageNum))), data.content && ((_j = data.content.logo) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    }, messageNum))), data.content && ((_p = data.content.logo) === null || _p === void 0 ? void 0 : _p.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "logo"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: data.content.logo,

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

@@ -1,58 +1,51 @@
 .m-search-bar {
-  height: 48px;
-  padding: 8px 0;
+  height: 0.96rem;
+  padding: 0.16rem 0;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
   justify-content: space-between;
   width: 100%;
-
-  .right {
-    display: flex;
-    flex: 1;
-    margin-left: 15px;
-    align-items: center;
-    justify-content: space-between;
-
-    .search-input-wrap {
-      flex: 1;
-      background: #fff;
-      border-radius: 4px;
-      border: 1px solid #D2D9E5;
-      padding: 4px 12px;
-      height: 32px;
-      text-align: right;
-      display: flex;
-      justify-content: flex-end;
-    }
-
-    .message-wrap {
-      position: relative;
-      margin-left: 10px;
-
-      .num {
-        position: absolute;
-        top: -6px;
-        right: -6px;
-        display: inline-block;
-        padding: 1px 2px;
-        min-width: 17px;
-        text-align: center;
-        background-color: #CE1126;
-        border: 1px solid #fff;
-        border-radius: 8px;
-        font-family: 'Montserrat';
-        font-style: normal;
-        font-weight: 600;
-        font-size: 8px;
-        color: #FFFFFF;
-      }
-    }
-  }
-
-  .logo {
-    img {
-      width: auto;
-    }
-  }
-}
+}
+.m-search-bar .right {
+  display: flex;
+  flex: 1;
+  margin-left: 0.3rem;
+  align-items: center;
+  justify-content: space-between;
+}
+.m-search-bar .right .search-input-wrap {
+  flex: 1;
+  background: #fff;
+  border-radius: 0.08rem;
+  border: 0.02rem solid #D2D9E5;
+  padding: 0.08rem 0.24rem;
+  height: 0.64rem;
+  text-align: right;
+  display: flex;
+  justify-content: flex-end;
+}
+.m-search-bar .right .message-wrap {
+  position: relative;
+  margin-left: 0.2rem;
+}
+.m-search-bar .right .message-wrap .num {
+  position: absolute;
+  top: -0.12rem;
+  right: -0.12rem;
+  display: inline-block;
+  padding: 0.02rem 0.04rem;
+  min-width: 0.34rem;
+  text-align: center;
+  background-color: #CE1126;
+  border: 0.02rem solid #fff;
+  border-radius: 0.16rem;
+  font-family: 'Montserrat';
+  font-style: normal;
+  font-weight: 600;
+  font-size: 0.16rem;
+  color: #FFFFFF;
+}
+.m-search-bar .logo img {
+  width: auto;
+}