@fonixtree/magic-design 2.0.101 → 2.0.103

package/lib/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/lib/common/ProductFilterModal/index.js

@@ -230,10 +230,7 @@ function ProductFilterModal(props) {
   };
 
   return /*#__PURE__*/_react["default"].createElement(_PopUpModal["default"], {
-    bodyStyle: {
-      height: '80vh'
-    },
-    hideCloseBtn: true,
+    className: "productFilterModal",
     onClose: onClose,
     visible: visible
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -329,13 +326,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/lib/common/ProductFilterModal/index.less

@@ -1,72 +1,113 @@
-.productFilterWrap {
-  background: #ffffff;
-  height: calc(80vh - 40px);
-  overflow-y: scroll;
-  overflow-x: hidden;
-  padding: 0 20px 78px 20px;
-  box-sizing: border-box;
+.productFilterModal {
+  .productFilterWrap {
+    background: #ffffff;
+    height: calc(80vh - 40px);
+    overflow-y: scroll;
+    overflow-x: hidden;
+    box-sizing: border-box;
 
-  .item {
-    margin-top: 20px;
+    .item {
+      margin-top: 20px;
 
-    .inputWrap {
-      margin-top: 10px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
+      .inputWrap {
+        margin-top: 10px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .divider {
+          padding: 0 10px;
+          flex-shrink: 0;
+          height: 2px;
+          width: 11px;
+          background-color: #000;
+        }
+
+        input {
+          width: 45%;
+          height: 48px;
+          border: 1px solid #E4E4E4;
+          box-shadow: none;
+          padding: 12px;
+          border-radius: 4px;
+          outline: none;
+        }
+      }
 
-      .divider {
-        padding: 0 10px;
-        flex-shrink: 0;
-        height: 2px;
-        width: 11px;
-        background-color: #000;
+      .title {
+        line-height: 24px;
+        font-size: 16px;
+        font-weight: 600;
+        color: #000;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
       }
 
-      input {
-        width: 45%;
-        height: 48px;
-        border: 1px solid #E4E4E4;
-        box-shadow: none;
-        padding: 12px;
-        border-radius: 4px;
-        outline: none;
+      .accordionContentWrap {
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+        padding-bottom: 1px;
+
+        .btnMore {
+          font-weight: 600;
+          font-size: 14px;
+          color: #FF8650;
+          margin-top: 6px;
+          margin-left: 10px;
+        }
       }
     }
+  }
 
-    .title {
-      line-height: 24px;
-      font-size: 16px;
-      font-weight: 600;
-      color: #000;
+  .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: space-between;
+      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;
+      }
     }
 
-    .accordionContentWrap {
+    .btn-confirm {
       display: flex;
-      flex-wrap: wrap;
+      flex: 1 1;
+      height: 54px;
       align-items: center;
-      padding-bottom: 1px;
+      justify-content: center;
+      color: #fff;
+      border: 1px solid #FF8650;
+      background-color: #FF8650;
+      border-radius: 8px;
+      font-weight: 600;
+      font-size: 14px;
 
-      .btnMore {
-        font-weight: 600;
-        font-size: 14px;
-        color: var(--theme-color);
-        margin-top: 6px;
-        margin-left: 10px;
+      &:hover {
+        background-color: #FF8650;
       }
     }
   }
-}
-
-.bottomWrap {
-  position: fixed;
-  bottom: 0;
-  background: #fff;
-  width: 100%;
-  height: 78px;
-  padding: 12px 24px;
-  display: flex;
 }

package/lib/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/lib/composite-comp/monpay/components/InterestProducts/mobile/ProductItem/index.js

@@ -164,8 +164,6 @@ function (_super) {
     }, oldPrice && /*#__PURE__*/_react["default"].createElement("div", {
       className: "old-price"
     }, oldPrice)), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "shipping-price"
-    }, oldPrice), /*#__PURE__*/_react["default"].createElement("div", {
       className: "rate-sold-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "evaluation-score"
@@ -179,7 +177,7 @@ function (_super) {
       className: "line"
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "sold"
-    }, "Sold $", soldNumber, "+"))));
+    }, "Sold ", soldNumber || 0, "+"))));
   };
 
   ProductItem.defaultProps = {

package/lib/composite-comp/monpay/components/InterestProducts/mobile/ProductItem/index.less

@@ -102,15 +102,10 @@
   font-size: 0.24rem;
   color: #FA7373;
 }
-.monpay-interest-product-item-wrap .content-wrap .shipping-price {
-  font-weight: 400;
-  font-size: 0.24rem;
-  color: #545454;
-  margin-top: 0.16rem;
-}
 .monpay-interest-product-item-wrap .content-wrap .rate-sold-wrap {
   display: flex;
   align-items: center;
+  margin-top: 0.1rem;
 }
 .monpay-interest-product-item-wrap .content-wrap .rate-sold-wrap .evaluation-score {
   display: inline-flex;

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

@@ -51,6 +51,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 __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -204,6 +220,7 @@ var defaultData = [{
   marketPrice: 19000000,
   discountPercent: 10,
   salePercent: 500,
+  salesCnt: 501,
   sppType: '2'
 }, {
   imgUrlContent: {
@@ -215,6 +232,7 @@ var defaultData = [{
   marketPrice: 19000000,
   discountPercent: 10,
   salePercent: 500,
+  salesCnt: 501,
   sppType: '2'
 }, {
   imgUrlContent: {
@@ -226,6 +244,7 @@ var defaultData = [{
   marketPrice: 19000000,
   discountPercent: 10,
   salePercent: 500,
+  salesCnt: 501,
   sppType: '2'
 }, {
   imgUrlContent: {
@@ -237,6 +256,7 @@ var defaultData = [{
   marketPrice: 19000000,
   discountPercent: 10,
   salePercent: 500,
+  salesCnt: 501,
   sppType: '2'
 }];
 
@@ -249,6 +269,7 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
+      interestName: '',
       list: (0, _coreUtil.isDesignMode)() ? defaultData : (0, _commonUtil.ensure)(function () {
         return (0, _storeUtil.getMagicStore)("interestProducts_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
       }, [])
@@ -280,7 +301,7 @@ function (_super) {
               maxProdNum = this.props.panelProps.content.maxProdNum;
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers/interest', {
                 pageIndex: 1,
                 pageSize: maxProdNum,
                 interested: true
@@ -290,6 +311,7 @@ function (_super) {
               res = _a.sent();
               list = res.pageInfo.list;
               this.setState({
+                interestName: res.interest.interestName,
                 list: list
               });
               this.getMacy();
@@ -315,14 +337,18 @@ function (_super) {
 
   InterestProductsMobile.prototype.render = function () {
     var panelProps = this.props.panelProps;
-    var list = this.state.list;
+    var _a = this.state,
+        interestName = _a.interestName,
+        list = _a.list;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "monpay-interest-products-mobile"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "interest-products-title"
     }, panelProps.title.headline.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "text",
-      data: panelProps.title.headline
+      data: __assign(__assign({}, panelProps.title.headline), {
+        text: interestName
+      })
     }), panelProps.title.seeAll.open && /*#__PURE__*/_react["default"].createElement("span", {
       className: "btn"
     }, "See All")), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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.",

package/lib/locale/es/es.json

@@ -1,4 +1,11 @@
 {
+  "OK": "OK",
+  "BRANDS": "Brands",
+  "CATEGORY": "Categoría",
+  "SERVICE": "Service",
+  "RATINGS": "Ratings",
+  "STAR": "Star",
+  "APPLY": "Apply",
   "SORT_BY": "Sort by",
   "PROMOTION": "Promotion",
   "HIGHEST_RATED": "Highest rated",
@@ -158,7 +165,6 @@
   "ALL": "TODO",
   "HOT": "Caliente",
   "GUESS_YOU_LIKE": "Supongo que te gusta",
-  "CATEGORY": "Categoría",
   "LABEL": "Etiqueta",
   "UNDERLINE_STYLE": "Estilo de subrayado",
   "UNDERLINE_COLOR": "Color de subrayado",
@@ -214,7 +220,6 @@
   "GROUP_BY": "Agrupar por",
   "FLASH_SALE": "Oferta relámpago",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "La cantidad del producto se actualizará automáticamente con los artículos que cumplan con las condiciones de la categoría",
-  "OK": "OK",
   "CANCEL": "Cancelar",
   "LINK_TYPE": "Tipo de enlace",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Parece que no tiene ninguna imagen en su galería. Elija imágenes para mostrar en esta página.",

package/lib/locale/id/id.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.",

package/lib/meta-comp/components/Button/editable.js

@@ -99,7 +99,7 @@ function (_super) {
     this.preData = JSON.stringify(data);
     this.preDevice = window.magicDesign.device;
     return /*#__PURE__*/_react["default"].createElement("span", {
-      className: "item",
+      className: "editable-item",
       contentEditable: (0, _coreUtil.isDesignMode)() && !readonly,
       onInput: function onInput(e) {
         var text = e.target.textContent;

package/lib/meta-comp/components/Button/editable.less

@@ -1,4 +1,4 @@
-.item {
+.editable-item {
   width: 100%;
   display: flex;
   align-items: center;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.101",
+  "version": "2.0.103",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",