@fonixtree/magic-design 2.0.100 → 2.0.102

package/es/common/PopUpModal/index.js

@@ -15,8 +15,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 require("./index.less");
 
-var _Button = _interopRequireDefault(require("../Button"));
-
 var _coreUtil = require("../../utils/coreUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -51,149 +49,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
-var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
-  var _ = {
-    label: 0,
-    sent: function sent() {
-      if (t[0] & 1) throw t[1];
-      return t[1];
-    },
-    trys: [],
-    ops: []
-  },
-      f,
-      y,
-      t,
-      g;
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-    return this;
-  }), g;
-
-  function verb(n) {
-    return function (v) {
-      return step([n, v]);
-    };
-  }
-
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-
-    while (_) {
-      try {
-        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-        if (y = 0, t) op = [op[0] & 2, t.value];
-
-        switch (op[0]) {
-          case 0:
-          case 1:
-            t = op;
-            break;
-
-          case 4:
-            _.label++;
-            return {
-              value: op[1],
-              done: false
-            };
-
-          case 5:
-            _.label++;
-            y = op[1];
-            op = [0];
-            continue;
-
-          case 7:
-            op = _.ops.pop();
-
-            _.trys.pop();
-
-            continue;
-
-          default:
-            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-              _ = 0;
-              continue;
-            }
-
-            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-              _.label = op[1];
-              break;
-            }
-
-            if (op[0] === 6 && _.label < t[1]) {
-              _.label = t[1];
-              t = op;
-              break;
-            }
-
-            if (t && _.label < t[2]) {
-              _.label = t[2];
-
-              _.ops.push(op);
-
-              break;
-            }
-
-            if (t[2]) _.ops.pop();
-
-            _.trys.pop();
-
-            continue;
-        }
-
-        op = body.call(thisArg, _);
-      } catch (e) {
-        op = [6, e];
-        y = 0;
-      } finally {
-        f = t = 0;
-      }
-    }
-
-    if (op[0] & 5) throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
-
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -207,8 +62,6 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var debug = require('debug')('worker:pop-up-modal');
-
 var AComponent =
 /** @class */
 function (_super) {
@@ -218,55 +71,6 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
-
-    _this.onConfirm = function () {
-      return __awaiter(_this, void 0, void 0, function () {
-        var _a, onConfirm, onClose, error_1;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
-            case 0:
-              _b.trys.push([0, 2,, 3]);
-
-              _a = this.props, onConfirm = _a.onConfirm, onClose = _a.onClose;
-              return [4
-              /*yield*/
-              , onConfirm()];
-
-            case 1:
-              _b.sent();
-
-              onClose();
-              return [3
-              /*break*/
-              , 3];
-
-            case 2:
-              error_1 = _b.sent();
-              debug(error_1);
-              return [3
-              /*break*/
-              , 3];
-
-            case 3:
-              return [2
-              /*return*/
-              ];
-          }
-        });
-      });
-    };
-
-    _this.onCancel = function () {
-      try {
-        var onClose = _this.props.onClose;
-        onCancel();
-        onClose();
-      } catch (error) {
-        debug(error);
-      }
-    };
-
     return _this;
   }
 
@@ -274,19 +78,10 @@ function (_super) {
     var _a = this.props,
         title = _a.title,
         titleStyle = _a.titleStyle,
-        message = _a.message,
-        confirmText = _a.confirmText,
-        cancelText = _a.cancelText,
+        children = _a.children,
         onClose = _a.onClose,
         visible = _a.visible,
-        maskClosable = _a.maskClosable,
-        rest = __rest(_a, ["title", "titleStyle", "message", "confirmText", "cancelText", "onClose", "visible", "maskClosable"]);
-
-    var messageBox = message;
-
-    if (message instanceof Function) {
-      messageBox = message();
-    }
+        rest = __rest(_a, ["title", "titleStyle", "children", "onClose", "visible"]);
 
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, visible && /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('popUpModal', rest.className),
@@ -295,20 +90,19 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "modal-shadow",
-      onClick: maskClosable && onClose
+      onClick: onClose
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "modal-content"
-    }, title && /*#__PURE__*/_react["default"].createElement("div", {
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "topLineWrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "topLine"
+    })), title && /*#__PURE__*/_react["default"].createElement("div", {
       className: "modal-title",
       style: titleStyle
     }, title), /*#__PURE__*/_react["default"].createElement("div", {
       className: "modal-btn-wrap"
-    }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-      onClick: this.onConfirm,
-      style: {
-        flex: 'none'
-      }
-    }, confirmText)))));
+    }, children))));
   };
 
   return AComponent;

package/es/common/PopUpModal/index.less

@@ -32,6 +32,7 @@
     right: 0;
     width: 100%;
     padding: 20px;
+    padding-top: 0;
     display: flex;
     flex-direction: column;
     background-color: #fff;
@@ -41,6 +42,19 @@
     max-height: 60%;
     border-radius: 10px 10px 0 0;
 
+    .topLineWrap {
+      text-align: center;
+      margin-bottom: 15px;
+
+      .topLine {
+        display: inline-block;
+        width: 42px;
+        height: 4px;
+        background: #e9e9e9;
+        border-radius: 2px;
+      }
+    }
+
     .modal-title {
       color: #000;
       font-size: 16px;

package/es/common/ProductFilterModal/components/FilterSearchModal/index.js

@@ -162,10 +162,6 @@ function (_super) {
     }) : list;
 
     return /*#__PURE__*/_react["default"].createElement(_PopUpModal["default"], {
-      bodyStyle: {
-        height: '80vh'
-      },
-      destroyOnClose: true,
       visible: visible
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "classificationDetailModal"
@@ -179,7 +175,7 @@ function (_super) {
         _this.onClear();
       },
       size: 20,
-      type: "icon-arrow-left"
+      type: "icon-outlined-left"
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "headerTitle"
     }, title)), /*#__PURE__*/_react["default"].createElement("div", {
@@ -221,6 +217,7 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("p", null, "Sorry, we couldn't find \"", searchValue, "\"")))), _list.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "bottomWrap"
     }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      className: "btn-confirm",
       onClick: this.onOkClick
     }, (0, _locale.i18n)('OK')))));
   };

package/es/common/ProductFilterModal/components/FilterSearchModal/index.less

@@ -1,9 +1,6 @@
 .classificationDetailModal {
-  height: 100vh;
+  height: calc(80vh - 40px);
   width: 100%;
-  position: absolute;
-  z-index: 5;
-  padding: 16px;
   background-color: #fff;
   box-sizing: border-box;
 
@@ -56,7 +53,7 @@
 
   .contentWrap {
     background: #ffffff;
-    height: calc(100vh - 210px);
+    height: 300px;
     margin-top: 16px;
     overflow-y: scroll;
     overflow-x: hidden;
@@ -76,7 +73,7 @@
         font-size: 14px;
         text-align: center;
         color: #333333;
-        margin: 25% auto;
+        margin: 0 auto;
       }
 
       :global {
@@ -124,6 +121,24 @@
     background: #fff;
     height: 78px;
     padding: 12px;
+
+    .btn-confirm {
+      display: flex;
+      flex: 1 1;
+      height: 54px;
+      align-items: center;
+      justify-content: center;
+      color: #fff;
+      border: 1px solid #FF8650;
+      background-color: #FF8650;
+      border-radius: 8px;
+      font-weight: 600;
+      font-size: 14px;
+
+      &:hover {
+        background-color: #FF8650;
+      }
+    }
   }
 
 }

package/es/common/ProductFilterModal/index.js

@@ -230,10 +230,6 @@ function ProductFilterModal(props) {
   };
 
   return /*#__PURE__*/_react["default"].createElement(_PopUpModal["default"], {
-    bodyStyle: {
-      height: '80vh'
-    },
-    hideCloseBtn: true,
     onClose: onClose,
     visible: visible
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -329,13 +325,12 @@ function ProductFilterModal(props) {
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "bottomWrap"
   }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    className: "btn-reset",
     onClick: onReset,
     plain: true
   }, (0, _locale.i18n)('RESET')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-    onClick: onApply,
-    style: {
-      marginLeft: '20px'
-    }
+    className: "btn-confirm",
+    onClick: onApply
   }, (0, _locale.i18n)('APPLY'))), /*#__PURE__*/_react["default"].createElement(_FilterSearchModal["default"], {
     filterInfo: keyInfo[detailKey],
     onClose: function onClose() {

package/es/common/ProductFilterModal/index.less

@@ -3,7 +3,6 @@
   height: calc(80vh - 40px);
   overflow-y: scroll;
   overflow-x: hidden;
-  padding: 0 20px 78px 20px;
   box-sizing: border-box;
 
   .item {
@@ -53,7 +52,7 @@
       .btnMore {
         font-weight: 600;
         font-size: 14px;
-        color: var(--theme-color);
+        color: #FF8650;
         margin-top: 6px;
         margin-left: 10px;
       }
@@ -64,9 +63,49 @@
 .bottomWrap {
   position: fixed;
   bottom: 0;
+  left: 0;
+  right: 0;
   background: #fff;
   width: 100%;
   height: 78px;
   padding: 12px 24px;
   display: flex;
+  gap: 20px;
+  justify-content: space-between;
+
+  .btn-reset {
+    display: flex;
+    flex: 1 1;
+    height: 54px;
+    align-items: center;
+    justify-content: center;
+    color: #FF8650;
+    border: 1px solid #FF8650;
+    background-color: #fff;
+    border-radius: 8px;
+    font-weight: 600;
+    font-size: 14px;
+
+    &:hover {
+      background-color: #fff;
+    }
+  }
+
+  .btn-confirm {
+    display: flex;
+    flex: 1 1;
+    height: 54px;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+    border: 1px solid #FF8650;
+    background-color: #FF8650;
+    border-radius: 8px;
+    font-weight: 600;
+    font-size: 14px;
+
+    &:hover {
+      background-color: #FF8650;
+    }
+  }
 }

package/es/common/Tag/index.less

@@ -10,7 +10,7 @@
   margin-top: 8px;
 
   &.active {
-    color: var(--theme-color);
-    border-color: var(--theme-color);
+    color: #FF8650;
+    border-color: #FF8650;
   }
 }

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

@@ -7,10 +7,6 @@ exports.getDefaultJSON = void 0;
 
 var _uuid = require("uuid");
 
-var _headerImage = _interopRequireDefault(require("./mobile/img/headerImage.jpg"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var getDefaultJSON = function getDefaultJSON() {
   var contentId = (0, _uuid.v4)();
   return {
@@ -24,7 +20,7 @@ var getDefaultJSON = function getDefaultJSON() {
         content: {
           h5Name: '',
           pcName: '',
-          h5ImgSrc: _headerImage["default"],
+          h5ImgSrc: '',
           pcImgSrc: '',
           clickUrl: ''
         },

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

@@ -7,10 +7,6 @@ exports.getDefaultJSON = void 0;
 
 var _uuid = require("uuid");
 
-var _headerImage = _interopRequireDefault(require("./mobile/img/headerImage.jpg"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var getDefaultJSON = function getDefaultJSON() {
   var contentId = (0, _uuid.v4)();
   return {
@@ -24,7 +20,7 @@ var getDefaultJSON = function getDefaultJSON() {
         content: {
           h5Name: '',
           pcName: '',
-          h5ImgSrc: _headerImage["default"],
+          h5ImgSrc: '',
           pcImgSrc: '',
           clickUrl: ''
         },

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

@@ -225,21 +225,18 @@ function (_super) {
 
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var maxProdNum, res, list;
+        var res, list;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
-              maxProdNum = this.props.panelProps.content.maxProdNum;
               return [4
               /*yield*/
               , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
                 pageIndex: 1,
-                pageSize: maxProdNum,
-                sortType: '1',
-                intelligentType: '',
-                intelligentValue: '',
-                aggregation: false,
-                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
+                pageSize: 50,
+                qryStorePage: 'Y',
+                storeOfferCnt: 0,
+                campaignType: '2,14'
               }, 'POST')];
 
             case 1:

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

@@ -402,7 +402,7 @@ function (_super) {
     }), panelProps.title.headline.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "title",
       data: panelProps.title.headline
-    }), /*#__PURE__*/_react["default"].createElement(_MonpayCountDown["default"], {
+    }), panelProps.title.countdown.open && /*#__PURE__*/_react["default"].createElement(_MonpayCountDown["default"], {
       bgColor: panelProps.title.countdown.backgroundColor,
       effDate: effDate,
       expDate: expDate,

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

@@ -505,7 +505,7 @@ function (_super) {
     }), panelProps.title.headline.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "title",
       data: panelProps.title.headline
-    }), /*#__PURE__*/_react["default"].createElement(_MonpayCountDown["default"], {
+    }), panelProps.title.countdown.open && /*#__PURE__*/_react["default"].createElement(_MonpayCountDown["default"], {
       bgColor: panelProps.title.countdown.backgroundColor,
       effDate: effDate,
       expDate: expDate,

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

@@ -7,10 +7,6 @@ exports.recommendGroupSourceJSON = exports.getDefaultJSON = void 0;
 
 var _uuid = require("uuid");
 
-var _headerImage = _interopRequireDefault(require("./mobile/imgs/headerImage.jpg"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var recommendGroupSourceJSON = function recommendGroupSourceJSON(parentId, logo, text) {
   var groupId = (0, _uuid.v4)();
   var imageId = (0, _uuid.v4)();
@@ -169,8 +165,8 @@ var getDefaultJSON = function getDefaultJSON() {
         content: {
           h5Name: '',
           pcName: '',
-          h5ImgSrc: _headerImage["default"],
-          pcImgSrc: _headerImage["default"],
+          h5ImgSrc: '',
+          pcImgSrc: '',
           clickUrl: ''
         },
         hover: {

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

@@ -362,9 +362,9 @@ function (_super) {
       }, '#CE1126') : '#CE1126';
     };
 
-    _this.getProductList = function (index) {
+    _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, brandIds, catgIds, offerAttrValues, serviceIds, 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, res, _h, pageInfo, serviceIds, brandIds, catgIds, offerAttrValues, e_1, _cache;
 
         var _j, _k, _l;
 
@@ -468,7 +468,7 @@ function (_super) {
             case 7:
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', __assign({
                 pageIndex: 1,
                 pageSize: maxProdNum,
                 sortType: '1',
@@ -476,16 +476,16 @@ function (_super) {
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
                 storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
-              }, 'POST')];
+              }, filterParams), 'POST')];
 
             case 8:
-              _h = _m.sent(), pageInfo = _h.pageInfo, brandIds = _h.brandIds, catgIds = _h.catgIds, offerAttrValues = _h.offerAttrValues, serviceIds = _h.serviceIds;
+              _h = _m.sent(), pageInfo = _h.pageInfo, serviceIds = _h.serviceIds, brandIds = _h.brandIds, catgIds = _h.catgIds, offerAttrValues = _h.offerAttrValues;
               this.setState({
                 filterObj: {
+                  serviceIds: serviceIds,
                   brandIds: brandIds,
                   catgIds: catgIds,
-                  offerAttrValues: offerAttrValues,
-                  serviceIds: serviceIds
+                  offerAttrValues: offerAttrValues
                 }
               });
               newData = __spreadArrays(pageInfo.list);
@@ -592,8 +592,11 @@ function (_super) {
     _this.onSearchCondChange = function (cond) {
       _this.setState({
         searchParams: cond
-      }); // initProduct({ pageIndex: 1/, pageSize: 10, q: searchValue, ...linkParams, ...cond });
+      });
+
+      var tabIndex = _this.state.tabIndex;
 
+      _this.getProductList(tabIndex, cond);
     };
 
     return _this;

package/es/constants/index.js

@@ -183,7 +183,7 @@ var compInfoMap = {
     icon: 'icon-forms'
   },
   MONPAY_RECOMMEND: {
-    name: 'Monpay Recommend',
+    name: 'Recommend',
     icon: 'icon-forms'
   },
   INTEREST_PRODUCTS: {

package/es/locale/en/en.json

@@ -1,4 +1,11 @@
 {
+  "OK": "OK",
+  "BRANDS": "Brands",
+  "CATEGORY": "Category",
+  "SERVICE": "Service",
+  "RATINGS": "Ratings",
+  "STAR": "Star",
+  "APPLY": "Apply",
   "SORT_BY": "Sort by",
   "PROMOTION": "Promotion",
   "HIGHEST_RATED": "Highest rated",
@@ -158,7 +165,6 @@
   "ALL": "ALL",
   "HOT": "Hot",
   "GUESS_YOU_LIKE": "Guess you like",
-  "CATEGORY": "Category",
   "LABEL": "Label",
   "UNDERLINE_STYLE": "Underline Style",
   "UNDERLINE_COLOR": "Underline Color",
@@ -214,7 +220,6 @@
   "GROUP_BY": "Group By",
   "FLASH_SALE": "Flash Sale",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "The product quantity will be automatically updated with the items that meet the category conditions",
-  "OK": "OK",
   "CANCEL": "Cancel",
   "LINK_TYPE": "Link Type",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Looks like you do not have any images in your gallery. Choose images to feature on this page.",