@fonixtree/magic-design 0.1.77 → 1.0.2-0.1

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"));
 
@@ -81,13 +83,123 @@ function (_super) {
 
     _this.state = {};
 
+    _this.getImageRecommendSize = function (customize) {
+      var _a, _b, _c;
+
+      var obj = null;
+
+      if ((0, _coreUtil.isPc)()) {
+        if (((_a = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _a === void 0 ? void 0 : _a.pcLayout) == 'normal' || ((_b = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _b === void 0 ? void 0 : _b.pcLayout) == 'center') {
+          switch (customize === null || customize === void 0 ? void 0 : customize.pcRowNum) {
+            case 5:
+              obj = {
+                width: 119,
+                height: 90
+              };
+              break;
+
+            case 4:
+              obj = {
+                width: 150,
+                height: 112
+              };
+              break;
+
+            case 3:
+              obj = {
+                width: 205,
+                height: 154
+              };
+              break;
+
+            case 2:
+              obj = {
+                width: 314,
+                height: 236
+              };
+              break;
+
+            case 1:
+              obj = {
+                width: 640,
+                height: 480
+              };
+              break;
+          }
+        } else {
+          obj = {
+            width: 65,
+            height: 65
+          };
+        }
+      } else {
+        switch ((_c = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _c === void 0 ? void 0 : _c.h5Layout) {
+          case 'normal2':
+            obj = {
+              width: 190,
+              height: 142
+            };
+            break;
+
+          case 'normal3':
+            {
+              switch (customize === null || customize === void 0 ? void 0 : customize.rowNum) {
+                case 4:
+                  obj = {
+                    width: 61,
+                    height: 61
+                  };
+                  break;
+
+                case 3:
+                  obj = {
+                    width: 91,
+                    height: 91
+                  };
+                  break;
+
+                case 2:
+                  obj = {
+                    width: 150,
+                    height: 150
+                  };
+                  break;
+
+                case 1:
+                  obj = {
+                    width: 327,
+                    height: 327
+                  };
+                  break;
+              }
+
+              break;
+            }
+
+          default:
+            obj = {
+              width: 38,
+              height: 38
+            };
+            break;
+        }
+      }
+
+      return obj;
+    };
+
     _this.getContentPanel = function (data, needHover) {
+      var parentNode = _this.props.parentNode;
+
+      var size = _this.getImageRecommendSize(parentNode.customize);
+
       var source = [{
         key: 'imageTextSecondContent1',
         name: (0, _locale.i18n)('IMAGE'),
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: data.image,
-          needHover: needHover
+          needHover: needHover,
+          recommendImgSize: size
         }),
         metaOption: data.image
       }, {
@@ -142,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);
       }
@@ -182,7 +294,8 @@ function (_super) {
   };
 
   ImageTextSecondConfig.defaultProps = {
-    panelProps: {}
+    panelProps: {},
+    parentNode: {}
   };
   return ImageTextSecondConfig;
 }(_react["default"].Component);

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

@@ -75,8 +75,58 @@ function (_super) {
       _this.setState({});
     };
 
+    _this.getImageRecommendSize = function (customize) {
+      var _a;
+
+      var obj = null;
+
+      if ((0, _coreUtil.isPc)()) {
+        switch ((_a = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _a === void 0 ? void 0 : _a.pcLayout) {
+          case 'layout1':
+            obj = {
+              width: 1280,
+              height: 600
+            };
+            break;
+
+          case 'layout2':
+            obj = {
+              width: 640,
+              height: 600
+            };
+            break;
+
+          case 'layout3':
+            obj = {
+              width: 410,
+              height: 300
+            };
+            break;
+
+          default:
+            obj = {
+              width: 440,
+              height: 272
+            };
+            break;
+        }
+      } else {
+        obj = {
+          width: 343,
+          height: 212
+        };
+      }
+
+      return obj;
+    };
+
     _this.getContentPanel = function () {
-      var panelProps = _this.props.panelProps;
+      var _a = _this.props,
+          panelProps = _a.panelProps,
+          parentNode = _a.parentNode;
+
+      var size = _this.getImageRecommendSize(parentNode.customize);
+
       var source = [{
         key: '1',
         name: 'Overlay',
@@ -84,7 +134,8 @@ function (_super) {
           data: panelProps.overilay,
           needClickArea: false,
           needHover: false,
-          needURL: false
+          needURL: false,
+          recommendImgSize: size
         }),
         metaOption: panelProps.overilay
       }, {

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

@@ -133,7 +133,7 @@ function (_super) {
     }
 
     var pricePrefix = (0, _commonUtil.ensure)(function () {
-      return window.ecommerce.prefix;
+      return window.systemParams.prefix;
     }, 'Rp');
 
     var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
@@ -226,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

@@ -5,6 +5,15 @@
   border: 1px solid #D2D9E5;
   width: 142px;
   cursor: pointer;
+  position: relative;
+
+  .sold-count {
+    color: #7b7b7b;
+    font-size: 12px;
+    position: absolute;
+    right: 8px;
+    bottom: 8px;
+  }
 
   .img-wrap {
     position: relative;

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

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

@@ -98,7 +98,7 @@ var recommendGroupSourceJSON = function recommendGroupSourceJSON(parentId, logo,
       },
       hover: null
     },
-    sourceType: 'recommend',
+    sourceType: 'select',
     prodIds: '',
     intelligentType: 'Hot',
     intelligentValue: [],

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:
@@ -634,7 +635,14 @@ function (_super) {
         layout: layout === 'layout2' ? 'horizontal' : 'vertical' // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
         ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA(item, 'select_item', {
+              event_action: 'Select Item'
+            });
+          }
+
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false
@@ -660,7 +668,12 @@ function (_super) {
         imgWidth: imgWidth // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
         ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA({}, 'select_item', item);
+          }
+
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false