@fonixtree/magic-design 2.0.106 → 2.0.108

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

@@ -153,6 +153,42 @@
       }
     }
 
+    .coupons-list {
+      display: flex;
+      flex-wrap: wrap;
+      margin-top: 8px;
+
+      .item {
+        width: 53px;
+        height: 20px;
+        color: #F47A46;
+        background: url('./imgs/coupon-orange.png') no-repeat center;
+        background-size: 100%;
+        margin-right: 6px;
+        margin-bottom: 4px;
+        line-height: 1;
+        text-align: center;
+        padding: 2px 0;
+
+        &.DISC {
+          color: #FF5757;
+          background: url('./imgs/coupon-red.png') no-repeat center;
+        }
+
+        .name {
+          font-size: 5px;
+          width: 40px;
+          margin-bottom: 1px;
+        }
+
+        .num {
+          font-size: 10px;
+          font-weight: 800;
+          width: 40px;
+        }
+      }
+    }
+
     .progress-wrap {
       margin-top: 10px;
 

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

@@ -377,7 +377,7 @@ function (_super) {
               , 6];
 
             case 3:
-              if (!(sourceType === 'recommend' || sourceType === 'cross')) return [3
+              if (!(sourceType === 'recommend')) return [3
               /*break*/
               , 5];
               return [4

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

@@ -44,6 +44,7 @@ var getDefaultJSON = function getDefaultJSON() {
         }
       },
       keyword: {
+        id: (0, _uuid.v4)(),
         open: true,
         type: 'InputField',
         placeholder: 'Tshirt Woman',

package/es/composite-comp/dito/config-panels/SearchBarConfig/SearchBarConfigContent/index.js

@@ -75,7 +75,7 @@ function (_super) {
   SearchBarConfigContent.prototype.render = function () {
     var _this = this;
 
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
 
     var panelProps = this.props.panelProps;
     var source = [{
@@ -126,7 +126,7 @@ function (_super) {
       metaOption: panelProps.box,
       toggleType: 'switch'
     }, {
-      key: (_e = panelProps.keyword) === null || _e === void 0 ? void 0 : _e.id,
+      key: 'search3',
       name: (0, _locale.i18n)('SEARCH_BAR_KEYWORD'),
       toggleType: 'switch',
       value: /*#__PURE__*/_react["default"].createElement("div", {
@@ -139,7 +139,7 @@ function (_super) {
       })),
       metaOption: panelProps.keyword
     }, {
-      key: panelProps.icon.id,
+      key: 'search4',
       name: (0, _locale.i18n)('ICON'),
       toggleType: 'triangle',
       value: /*#__PURE__*/_react["default"].createElement("div", {

package/es/composite-comp/dito/second-config-panels/RecommendSecondConfig/index.js

@@ -111,9 +111,7 @@ function (_super) {
         value: "select"
       }, (0, _locale.i18n)('SELECT_PRODUCT')), _this.hasSource('A') && /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "recommend"
-      }, (0, _locale.i18n)('AI_RECOMMENDATION')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "cross"
-      }, "Cross Selling"))), /*#__PURE__*/_react["default"].createElement("div", {
+      }, (0, _locale.i18n)('AI_RECOMMENDATION')))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "greyBg"
       }, panelProps.sourceType === 'select' && /*#__PURE__*/_react["default"].createElement(_common.ProductSource, {
         onChange: function onChange(ids, type) {
@@ -124,7 +122,7 @@ function (_super) {
         },
         prodType: panelProps.prodType,
         value: panelProps.prodIds
-      }), (panelProps.sourceType === 'recommend' || panelProps.sourceType === 'cross') && /*#__PURE__*/_react["default"].createElement(_AIRecommendation["default"], {
+      }), panelProps.sourceType === 'recommend' && /*#__PURE__*/_react["default"].createElement(_AIRecommendation["default"], {
         onChange: function onChange(val) {
           panelProps.intelligentType = val.intelligentType;
           panelProps.intelligentValue = val.intelligentValue;
@@ -135,7 +133,7 @@ function (_super) {
           intelligentType: panelProps.intelligentType,
           intelligentValue: panelProps.intelligentValue
         }
-      }), (panelProps.sourceType === 'recommend' || panelProps.sourceType === 'cross') && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      }), panelProps.sourceType === 'recommend' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('PRODUCT_QUANTITY')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
         onChange: function onChange(e) {

package/es/composite-comp/monpay/components/InterestProducts/mobile/index.js

@@ -314,7 +314,7 @@ function (_super) {
                 interestName: res.interest.interestName,
                 list: list
               });
-              this.getMacy();
+              if (list.length > 0) this.getMacy();
               (0, _storeUtil.setMagicStore)("interestProducts_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, list);
               return [2
               /*return*/
@@ -331,7 +331,10 @@ function (_super) {
     if (!(0, _coreUtil.isDesignMode)()) {
       this.getData();
     } else {
-      this.getMacy();
+      if (this.state.list.length > 0) this.getMacy();
+      this.setState({
+        interestName: 'Interest Name'
+      });
     }
   };
 
@@ -340,7 +343,7 @@ function (_super) {
     var _a = this.state,
         interestName = _a.interestName,
         list = _a.list;
-    return /*#__PURE__*/_react["default"].createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, list.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "monpay-interest-products-mobile"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "interest-products-title"
@@ -361,7 +364,7 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         }
       });
-    })));
+    }))));
   };
 
   InterestProductsMobile.defaultProps = {

package/es/composite-comp/monpay/components/MerchantSales/defaultJSON.js

@@ -47,7 +47,8 @@ var getDefaultJSON = function getDefaultJSON() {
           fontFamily: 'Open Sans',
           fontWeight: 400,
           fontSize: 14,
-          color: '#000'
+          color: '#000',
+          urlDisabled: true
         },
         underline: {
           open: false,

package/es/composite-comp/monpay/components/MerchantSales/mobile/ProductItem/index.js

@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _commonUtil = require("../../../../../../utils/commonUtil");
 
+var _components = require("../../../../../../meta-comp/components");
+
 var _common = require("../../../../../../common");
 
 require("./index.less");
@@ -45,6 +47,22 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -73,8 +91,9 @@ function (_super) {
   ProductItem.prototype.render = function () {
     var _a = this.props,
         data = _a.data,
+        panelProps = _a.panelProps,
         onItemClick = _a.onItemClick,
-        rest = __rest(_a, ["data", "onItemClick"]);
+        rest = __rest(_a, ["data", "panelProps", "onItemClick"]);
 
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('monpay-merchant-product-item-wrap'),
@@ -89,9 +108,12 @@ function (_super) {
       src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent)
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "sale-tag"
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "prodName"
-    }, data.offerName));
+    })), panelProps.merchantName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+      className: "prodName",
+      data: __assign(__assign({}, panelProps.merchantName), {
+        text: data.offerName
+      })
+    }));
   };
 
   ProductItem.defaultProps = {

package/es/composite-comp/monpay/components/MerchantSales/mobile/index.js

@@ -284,7 +284,8 @@ function (_super) {
         data: item,
         onItemClick: function onItemClick() {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
-        }
+        },
+        panelProps: panelProps.content
       });
     }))));
   };

package/es/composite-comp/monpay/components/MonpayFlashDeal/defaultJSON.js

@@ -115,6 +115,7 @@ var getDefaultJSON = function getDefaultJSON() {
         hover: null
       },
       sessionTime: {
+        id: (0, _uuid.v4)(),
         open: false
       }
     },
@@ -284,6 +285,7 @@ var getDefaultJSON = function getDefaultJSON() {
         color: '#FF8650'
       },
       stock: {
+        id: (0, _uuid.v4)(),
         open: true
       }
     },

package/es/composite-comp/monpay/components/MonpayRecommend/defaultJSON.js

@@ -305,7 +305,8 @@ var getDefaultJSON = function getDefaultJSON() {
           fontFamily: 'Open Sans',
           fontWeight: 400,
           fontSize: 10,
-          color: '#545454'
+          color: '#545454',
+          urlDisabled: true
         },
         underline: {
           open: false,
@@ -328,7 +329,8 @@ var getDefaultJSON = function getDefaultJSON() {
           fontFamily: 'Open Sans',
           fontWeight: 400,
           fontSize: 10,
-          color: '#545454'
+          color: '#545454',
+          urlDisabled: true
         },
         underline: {
           open: false,

package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js

@@ -238,9 +238,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -249,9 +247,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -260,9 +256,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -271,9 +265,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }];
 var LAYOUT_IMAGE_SIZE = {
   'layout1-2': {
@@ -364,14 +356,14 @@ function (_super) {
 
     _this.getProductList = function (index, filterParams) {
       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, _h, pageInfo, serviceIds, brandIds, catgIds, offerAttrValues, e_1, _cache;
+        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, _h, list, serviceIds, brandIds, catgIds, offerAttrValues, _j, pageInfo, serviceIds, brandIds, catgIds, offerAttrValues, _k, pageInfo, serviceIds, brandIds, catgIds, offerAttrValues, e_1, _cache;
 
-        var _j, _k, _l;
+        var _l, _m, _o;
 
         var _this = this;
 
-        return __generator(this, function (_m) {
-          switch (_m.label) {
+        return __generator(this, function (_p) {
+          switch (_p.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -383,7 +375,7 @@ function (_super) {
 
                 if (cache) {
                   if ("products" + index in cache) {
-                    this.setState((_j = {}, _j["products" + index] = cache["products" + index], _j), function () {
+                    this.setState((_l = {}, _l["products" + index] = cache["products" + index], _l), function () {
                       _this.resetLayout();
                     });
                     /** 如果数据未过期 */
@@ -397,14 +389,14 @@ function (_super) {
 
               _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.prodType, prodType = _d === void 0 ? '' : _d, _e = _a.intelligentType, intelligentType = _e === void 0 ? '' : _e, _f = _a.intelligentValue, intelligentValue = _f === void 0 ? [] : _f, _g = _a.maxProdNum, maxProdNum = _g === void 0 ? 10 : _g;
               newData = [];
-              _m.label = 1;
+              _p.label = 1;
 
             case 1:
-              _m.trys.push([1, 14,, 15]);
+              _p.trys.push([1, 18,, 19]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
-              , 12];
+              , 16];
               if (!(sourceType === 'select')) return [3
               /*break*/
               , 3];
@@ -426,16 +418,16 @@ function (_super) {
               , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', params, 'GET')];
 
             case 2:
-              res = _m.sent();
+              res = _p.sent();
               newData = __spreadArrays(res.list);
               return [3
               /*break*/
-              , 11];
+              , 15];
 
             case 3:
               if (!(sourceType === 'recommend')) return [3
               /*break*/
-              , 10];
+              , 14];
               if (!(intelligentType === 'Recently')) return [3
               /*break*/
               , 7];
@@ -444,28 +436,75 @@ function (_super) {
               , 5];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/viewlog/recent/list', {
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/viewlog/recent/list', __assign({
                 pageIndex: 1,
                 pageSize: maxProdNum
-              }, 'GET')];
+              }, filterParams), 'GET')];
 
             case 4:
-              res = _m.sent();
-              newData = __spreadArrays(res.list);
+              _h = _p.sent(), list = _h.list, serviceIds = _h.serviceIds, brandIds = _h.brandIds, catgIds = _h.catgIds, offerAttrValues = _h.offerAttrValues;
+              this.setState({
+                filterObj: {
+                  serviceIds: serviceIds,
+                  brandIds: brandIds,
+                  catgIds: catgIds,
+                  offerAttrValues: offerAttrValues
+                }
+              });
+              newData = __spreadArrays(list);
               return [3
               /*break*/
               , 6];
 
             case 5:
               newData = defaultData;
-              _m.label = 6;
+              _p.label = 6;
 
             case 6:
               return [3
               /*break*/
-              , 9];
+              , 13];
 
             case 7:
+              if (!(intelligentType === 'Coupon')) return [3
+              /*break*/
+              , 11];
+              if (!!(0, _coreUtil.isDesignMode)()) return [3
+              /*break*/
+              , 9];
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', __assign({
+                pageIndex: 1,
+                pageSize: maxProdNum,
+                qryUserCoupon: true
+              }, filterParams), 'POST')];
+
+            case 8:
+              _j = _p.sent(), pageInfo = _j.pageInfo, serviceIds = _j.serviceIds, brandIds = _j.brandIds, catgIds = _j.catgIds, offerAttrValues = _j.offerAttrValues;
+              this.setState({
+                filterObj: {
+                  serviceIds: serviceIds,
+                  brandIds: brandIds,
+                  catgIds: catgIds,
+                  offerAttrValues: offerAttrValues
+                }
+              });
+              newData = __spreadArrays(pageInfo.list);
+              return [3
+              /*break*/
+              , 10];
+
+            case 9:
+              newData = defaultData;
+              _p.label = 10;
+
+            case 10:
+              return [3
+              /*break*/
+              , 13];
+
+            case 11:
               return [4
               /*yield*/
               , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', __assign({
@@ -478,8 +517,8 @@ function (_super) {
                 storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
               }, filterParams), 'POST')];
 
-            case 8:
-              _h = _m.sent(), pageInfo = _h.pageInfo, serviceIds = _h.serviceIds, brandIds = _h.brandIds, catgIds = _h.catgIds, offerAttrValues = _h.offerAttrValues;
+            case 12:
+              _k = _p.sent(), pageInfo = _k.pageInfo, serviceIds = _k.serviceIds, brandIds = _k.brandIds, catgIds = _k.catgIds, offerAttrValues = _k.offerAttrValues;
               this.setState({
                 filterObj: {
                   serviceIds: serviceIds,
@@ -489,45 +528,45 @@ function (_super) {
                 }
               });
               newData = __spreadArrays(pageInfo.list);
-              _m.label = 9;
+              _p.label = 13;
 
-            case 9:
+            case 13:
               return [3
               /*break*/
-              , 11];
+              , 15];
 
-            case 10:
+            case 14:
               newData = [];
-              _m.label = 11;
+              _p.label = 15;
 
-            case 11:
+            case 15:
               return [3
               /*break*/
-              , 13];
+              , 17];
 
-            case 12:
+            case 16:
               newData = [];
-              _m.label = 13;
+              _p.label = 17;
 
-            case 13:
+            case 17:
               return [3
               /*break*/
-              , 15];
+              , 19];
 
-            case 14:
-              e_1 = _m.sent();
+            case 18:
+              e_1 = _p.sent();
               newData = [];
               return [3
               /*break*/
-              , 15];
+              , 19];
 
-            case 15:
+            case 19:
               if (!(0, _coreUtil.isDesignMode)()) {
                 _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_k = {}, _k["products" + index] = newData, _k.endTime = Date.now() + 3 * 60 * 1000, _k)));
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_m = {}, _m["products" + index] = newData, _m.endTime = Date.now() + 3 * 60 * 1000, _m)));
               }
 
-              this.setState((_l = {}, _l["products" + index] = newData, _l), function () {
+              this.setState((_o = {}, _o["products" + index] = newData, _o), function () {
                 _this.resetLayout();
               });
               return [2
@@ -676,16 +715,18 @@ function (_super) {
   RecommendMobile.prototype.render = function () {
     var _this = this;
 
+    var _a;
+
     var panelProps = this.props.panelProps;
-    var _a = this.state,
-        tabIndex = _a.tabIndex,
-        tabLeft = _a.tabLeft,
-        tabWidth = _a.tabWidth,
-        groupSource = _a.groupSource,
-        hideTabs = _a.hideTabs,
-        contentWidth = _a.contentWidth,
-        filterObj = _a.filterObj,
-        searchParams = _a.searchParams;
+    var _b = this.state,
+        tabIndex = _b.tabIndex,
+        tabLeft = _b.tabLeft,
+        tabWidth = _b.tabWidth,
+        groupSource = _b.groupSource,
+        hideTabs = _b.hideTabs,
+        contentWidth = _b.contentWidth,
+        filterObj = _b.filterObj,
+        searchParams = _b.searchParams;
     var products = this.state["products" + tabIndex] || [];
 
     var _products = products.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : products;
@@ -751,7 +792,7 @@ function (_super) {
         transform: "translateX(" + tabLeft + "px)",
         background: this.getTabBarActiveColor(panelProps)
       }
-    })), /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], {
+    })), ((_a = panelProps.content.filter) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], {
       filterObj: filterObj,
       onChange: this.onSearchCondChange,
       value: searchParams

package/es/composite-comp/monpay/components/MonpayRecommend/pc/index.js

@@ -242,9 +242,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -253,9 +251,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -264,9 +260,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -275,9 +269,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }];
 
 var RecommendMobile =

package/es/composite-comp/monpay/config-panels/BundleConfig/ConfigTitle/index.js

@@ -73,7 +73,7 @@ function (_super) {
       onRefresh: this.reRender,
       source: [{
         key: '1',
-        name: (0, _locale.i18n)('HEADLINE'),
+        name: (0, _locale.i18n)('HEADER_IMAGE'),
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.headerImage
         }),

package/es/composite-comp/monpay/config-panels/MerchantSalesConfig/ConfigContent/index.js

@@ -84,6 +84,7 @@ function (_super) {
     }, "Sales"))), /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
       divider: "bold",
       headerSize: "middle",
+      onRefresh: this.reRender,
       source: [{
         key: '1',
         name: 'Merchant Name',

package/es/composite-comp/monpay/config-panels/MerchantSalesConfig/ConfigTitle/index.js

@@ -73,7 +73,7 @@ function (_super) {
       onRefresh: this.reRender,
       source: [{
         key: '1',
-        name: (0, _locale.i18n)('HEADLINE'),
+        name: (0, _locale.i18n)('HEADER_IMAGE'),
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.headerImage
         }),