@fonixtree/magic-design 1.0.65 → 1.0.66

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/FlashDeal/pc/index.js

@@ -300,7 +300,7 @@ function (_super) {
     _this.scrollRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = {
       list: (0, _coreUtil.isDesignMode)() ? [] : (0, _commonUtil.ensure)(function () {
-        return (0, _storeUtil.getMagicStore)("flashSale_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
+        return (0, _storeUtil.getMagicStore)("flashSale_" + _this.props.panelProps.id);
       }, []),
       effDate: '',
       expDate: '',
@@ -312,7 +312,7 @@ function (_super) {
 
     _this.getFlashData = function (pageSize, campaign) {
       return __awaiter(_this, void 0, void 0, function () {
-        var res, pageId;
+        var res;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
@@ -327,7 +327,6 @@ function (_super) {
 
             case 1:
               res = _a.sent();
-              pageId = window.magicDesign.pageId || '';
 
               if (!res.list || res.list.length === 0) {
                 // 秒杀场次结束之后，清空列表数据，隐藏秒杀组件
@@ -336,7 +335,7 @@ function (_super) {
                 });
 
                 if (!(0, _coreUtil.isDesignMode)()) {
-                  (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, []);
+                  (0, _storeUtil.setMagicStore)("flashSale_" + this.props.panelProps.id, []);
                 }
 
                 return [2
@@ -345,7 +344,7 @@ function (_super) {
               }
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, res.list);
+                (0, _storeUtil.setMagicStore)("flashSale_" + this.props.panelProps.id, res.list);
               }
 
               this.setState({
@@ -365,7 +364,7 @@ function (_super) {
 
     _this.getNextFlashSale = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var data, pageId;
+        var data;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
@@ -385,10 +384,9 @@ function (_super) {
                 this.setState({
                   list: []
                 });
-                pageId = window.magicDesign.pageId || '';
 
                 if (!(0, _coreUtil.isDesignMode)()) {
-                  (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, []);
+                  (0, _storeUtil.setMagicStore)("flashSale_" + this.props.panelProps.id, []);
                 }
               }
 

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;
+    }
+  }
 }

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

@@ -262,7 +262,7 @@ function (_super) {
     _this.preContent = '';
     _this.preSpacing = '';
     _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
-      return (0, _storeUtil.getMagicStore)("recommend_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
+      return (0, _storeUtil.getMagicStore)("recommend_" + _this.props.panelProps.id);
     }, {});
     _this.state = __assign({
       contentWidth: 0,
@@ -308,7 +308,7 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, e_1, _cache;
+        var panelProps, groupSource, recommendId, cache, _a, _b, sourceType, _c, prodIds, _d, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, e_1, _cache;
 
         var _h, _j, _k;
 
@@ -320,10 +320,9 @@ function (_super) {
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
               recommendId = panelProps.id;
-              pageId = window.magicDesign.pageId || '';
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
+                cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
 
                 if (cache) {
                   if ("products" + index in cache) {
@@ -426,8 +425,8 @@ function (_super) {
 
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
-                _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_j = {}, _j["products" + index] = newData, _j.endTime = Date.now() + 3 * 60 * 1000, _j)));
+                _cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
+                (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_j = {}, _j["products" + index] = newData, _j.endTime = Date.now() + 3 * 60 * 1000, _j)));
               }
 
               this.setState((_k = {}, _k["products" + index] = newData, _k), function () {

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

@@ -1,76 +1,89 @@
 .m-recommend-mobile {
   display: flex;
   flex-direction: column;
-}
-.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;
-}
+
+  .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;
+  }
+}

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

@@ -245,7 +245,7 @@ function (_super) {
     _this.preContent = '';
     _this.preSpacing = '';
     _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
-      return (0, _storeUtil.getMagicStore)("recommend_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
+      return (0, _storeUtil.getMagicStore)("recommend_" + _this.props.panelProps.id);
     }, {});
     _this.scrollRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = __assign({
@@ -303,7 +303,7 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
+        var panelProps, groupSource, recommendId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
 
         var _g, _h, _j;
 
@@ -315,10 +315,9 @@ function (_super) {
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
               recommendId = panelProps.id;
-              pageId = window.magicDesign.pageId || '';
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
+                cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
 
                 if (cache) {
                   if ("products" + index in cache) {
@@ -418,8 +417,8 @@ function (_super) {
 
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
-                _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
+                _cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
+                (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
               }
 
               this.setState((_j = {}, _j["products" + index] = newData, _j), function () {

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

@@ -1,51 +1,58 @@
 .m-search-bar {
-  height: 0.96rem;
-  padding: 0.16rem 0;
+  height: 48px;
+  padding: 8px 0;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
   justify-content: space-between;
   width: 100%;
-}
-.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;
-}
+
+  .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;
+    }
+  }
+}