@fonixtree/magic-design 0.1.76 → 0.1.78

package/lib/composite-comp/bol/second-config-panels/ImageGallerySecondConfig/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
 
+var _coreUtil = require("../../../../utils/coreUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -46,18 +48,128 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
+
+    _this.getImageRecommendSize = function (customize) {
+      var _a, _b;
+
+      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: 1440,
+              height: 912
+            };
+            break;
+
+          case 'layout2':
+            {
+              switch (customize === null || customize === void 0 ? void 0 : customize.pcRowNum) {
+                case 6:
+                  obj = {
+                    width: 220,
+                    height: 166
+                  };
+                  break;
+
+                case 5:
+                  obj = {
+                    width: 268,
+                    height: 202
+                  };
+                  break;
+
+                case 4:
+                  obj = {
+                    width: 342,
+                    height: 256
+                  };
+                  break;
+
+                case 3:
+                  obj = {
+                    width: 464,
+                    height: 348
+                  };
+                  break;
+
+                case 2:
+                  obj = {
+                    width: 708,
+                    height: 531
+                  };
+                  break;
+              }
+
+              break;
+            }
+        }
+      } else {
+        switch ((_b = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _b === void 0 ? void 0 : _b.h5Layout) {
+          case 'layout1':
+            obj = {
+              width: 375,
+              height: 282
+            };
+            break;
+
+          case 'layout2':
+            {
+              switch (customize === null || customize === void 0 ? void 0 : customize.rowNum) {
+                case 5:
+                  obj = {
+                    width: 69,
+                    height: 50
+                  };
+                  break;
+
+                case 4:
+                  obj = {
+                    width: 85,
+                    height: 66
+                  };
+                  break;
+
+                case 3:
+                  obj = {
+                    width: 117,
+                    height: 87
+                  };
+                  break;
+
+                case 2:
+                  obj = {
+                    width: 182,
+                    height: 137
+                  };
+                  break;
+              }
+
+              break;
+            }
+        }
+      }
+
+      return obj;
+    };
+
     return _this;
   }
 
   ImageGallerySecondConfig.prototype.render = function () {
-    var panelProps = this.props.panelProps;
+    var _a = this.props,
+        panelProps = _a.panelProps,
+        parentNode = _a.parentNode;
+    var size = this.getImageRecommendSize(parentNode.customize);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "image_gallery_second_conf_wrap",
       style: {
         marginTop: '20px'
       }
     }, /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
-      data: panelProps.image
+      data: panelProps.image,
+      recommendImgSize: size
     }));
   };
 

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

@@ -81,13 +81,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
       }, {
@@ -182,7 +292,8 @@ function (_super) {
   };
 
   ImageTextSecondConfig.defaultProps = {
-    panelProps: {}
+    panelProps: {},
+    parentNode: {}
   };
   return ImageTextSecondConfig;
 }(_react["default"].Component);

package/lib/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/lib/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 : '');
@@ -202,11 +202,13 @@ function (_super) {
         text: _price
       }),
       readonly: true
-    }), oldPrice && panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }), panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "price-sold-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "old-price-wrap"
     }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
       className: "discount"
-    }, "-", discount, "%"), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+    }, "-", discount, "%"), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "old-price",
       data: __assign(__assign({}, panelProps.salesPrice), {
         text: oldPrice
@@ -215,7 +217,9 @@ function (_super) {
       style: {
         color: panelProps.salesPrice.content.color
       }
-    })), showProgress && panelProps.salesProgressVisible.open && /*#__PURE__*/_react["default"].createElement("div", {
+    })), !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", {
       className: "progress-wrap"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "text"

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

@@ -5,6 +5,9 @@
   border: 1px solid #D2D9E5;
   width: 142px;
   cursor: pointer;
+  position: relative;
+
+
 
   .img-wrap {
     position: relative;
@@ -50,28 +53,40 @@
       text-overflow: ellipsis;
     }
 
-    .old-price-wrap {
+    .price-sold-wrap {
       display: flex;
       margin-top: 0px;
-      align-items: baseline;
+      align-items: center;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
-
-      .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;
+      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;
+        }
       }
 
-      .old-price {
-        text-decoration: line-through;
+      .sold-count {
+        color: #7b7b7b;
+        font-size: 12px;
+        text-align: right ;
+        flex-grow: 1;
       }
     }
 

package/lib/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/lib/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

package/lib/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/lib/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/lib/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/lib/composite-comp/dito/components/SearchBar/pc/index.js

@@ -117,7 +117,7 @@ function (_super) {
         display: 'flex'
       },
       type: "icon-search2"
-    }))), data.content && data.content.icon.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), data.content && data.content.icon.cartIcon.pc && /*#__PURE__*/_react["default"].createElement("div", {
       className: "shopping-wrap",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/main/cart');
@@ -129,7 +129,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: data.content.icon.color.pc,
       size: 16,
-      type: "icon-ShoppingCartSimple"
+      type: "icon-ShoppingCartSimple1"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "shopping-txt"
     }, (0, _locale.i18n)('SHOPPING_CART')))), data.content && data.content.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {