@fonixtree/magic-design 2.0.114 → 2.0.116

package/es/common/LinkModal/InterestedMerchants/index.js

@@ -188,18 +188,18 @@ function InterestedMerchants(props) {
       _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
-      platformList = _a[0],
-      setPlatformList = _a[1];
+      list = _a[0],
+      setList = _a[1];
 
   var _b = (0, _react.useState)(false),
       loading = _b[0],
       setLoading = _b[1];
 
   var _c = (0, _react.useState)(''),
-      platformName = _c[0],
-      setPlatformName = _c[1];
+      interestName = _c[0],
+      setInterestName = _c[1];
 
-  var queryPlatform = function queryPlatform(params) {
+  var queryData = function queryData(params) {
     return __awaiter(_this, void 0, void 0, function () {
       var res;
       return __generator(this, function (_a) {
@@ -208,12 +208,12 @@ function InterestedMerchants(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distribution/platform/page", params, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/interest/page", params, 'GET')];
 
           case 1:
             res = _a.sent();
             paginationParams.total = res.total;
-            setPlatformList(res.list);
+            setList(res.list);
             setLoading(false);
             return [2
             /*return*/
@@ -224,11 +224,11 @@ function InterestedMerchants(props) {
   };
 
   (0, _react.useEffect)(function () {
-    queryPlatform(paginationParams);
+    queryData(paginationParams);
   }, []);
   var columns = [{
-    title: 'Platform Name',
-    dataIndex: 'platformName'
+    title: 'InterestName',
+    dataIndex: 'interestName'
   }, {
     title: 'Logo',
     dataIndex: 'logo',
@@ -246,17 +246,17 @@ function InterestedMerchants(props) {
   var rowSelection = {
     onChange: function onChange(selectedRowKeys, selectedRow) {
       _onChange({
-        value: selectedRow[0].distributionPlatformId,
-        name: selectedRow[0].platformName
+        value: selectedRow[0].interestId,
+        name: selectedRow[0].interestName
       });
     },
     type: 'radio'
   };
 
   var reset = function reset() {
-    setPlatformName('');
-    queryPlatform(__assign({
-      platformName: ''
+    setInterestName('');
+    queryData(__assign({
+      interestName: ''
     }, paginationParams));
   };
 
@@ -274,21 +274,21 @@ function InterestedMerchants(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 16
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "Platform Name"
+    label: "Interest Name"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
-      return setPlatformName(e.target.value);
+      return setInterestName(e.target.value);
     },
     size: "small",
-    value: platformName
+    value: interestName
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 6
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
       paginationParams.pageIndex = 1;
-      queryPlatform(__assign({
-        platformName: platformName
+      queryData(__assign({
+        interestName: interestName
       }, paginationParams));
     },
     size: "small",
@@ -304,19 +304,19 @@ function InterestedMerchants(props) {
   }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
     columns: columns,
-    dataSource: platformList,
+    dataSource: list,
     defaultExpandAllRows: true,
     loading: loading,
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         paginationParams.pageIndex = page;
-        queryPlatform(__assign(__assign({}, paginationParams), {
-          platformName: platformName
+        queryData(__assign(__assign({}, paginationParams), {
+          interestName: interestName
         }));
       },
       showSizeChanger: false
     }),
-    rowKey: "distributionPlatformId",
+    rowKey: "interestId",
     rowSelection: rowSelection,
     scroll: {
       y: 400

package/es/common/LinkModal/InterestedProducts/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = InterestedProducts;
+exports["default"] = InterestedMerchants;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -181,25 +181,25 @@ var paginationParams = {
   pageIndex: 1
 };
 
-function InterestedProducts(props) {
+function InterestedMerchants(props) {
   var _this = this;
 
   var _onChange = props.onChange,
       _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
-      platformList = _a[0],
-      setPlatformList = _a[1];
+      list = _a[0],
+      setList = _a[1];
 
   var _b = (0, _react.useState)(false),
       loading = _b[0],
       setLoading = _b[1];
 
   var _c = (0, _react.useState)(''),
-      platformName = _c[0],
-      setPlatformName = _c[1];
+      interestName = _c[0],
+      setInterestName = _c[1];
 
-  var queryPlatform = function queryPlatform(params) {
+  var queryData = function queryData(params) {
     return __awaiter(_this, void 0, void 0, function () {
       var res;
       return __generator(this, function (_a) {
@@ -208,12 +208,12 @@ function InterestedProducts(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distribution/platform/page", params, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/interest/page", params, 'GET')];
 
           case 1:
             res = _a.sent();
             paginationParams.total = res.total;
-            setPlatformList(res.list);
+            setList(res.list);
             setLoading(false);
             return [2
             /*return*/
@@ -224,11 +224,11 @@ function InterestedProducts(props) {
   };
 
   (0, _react.useEffect)(function () {
-    queryPlatform(paginationParams);
+    queryData(paginationParams);
   }, []);
   var columns = [{
-    title: 'Platform Name',
-    dataIndex: 'platformName'
+    title: 'InterestName',
+    dataIndex: 'interestName'
   }, {
     title: 'Logo',
     dataIndex: 'logo',
@@ -246,17 +246,17 @@ function InterestedProducts(props) {
   var rowSelection = {
     onChange: function onChange(selectedRowKeys, selectedRow) {
       _onChange({
-        value: selectedRow[0].distributionPlatformId,
-        name: selectedRow[0].platformName
+        value: selectedRow[0].interestId,
+        name: selectedRow[0].interestName
       });
     },
     type: 'radio'
   };
 
   var reset = function reset() {
-    setPlatformName('');
-    queryPlatform(__assign({
-      platformName: ''
+    setInterestName('');
+    queryData(__assign({
+      interestName: ''
     }, paginationParams));
   };
 
@@ -274,21 +274,21 @@ function InterestedProducts(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 16
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "Platform Name"
+    label: "Interest Name"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
-      return setPlatformName(e.target.value);
+      return setInterestName(e.target.value);
     },
     size: "small",
-    value: platformName
+    value: interestName
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 6
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
       paginationParams.pageIndex = 1;
-      queryPlatform(__assign({
-        platformName: platformName
+      queryData(__assign({
+        interestName: interestName
       }, paginationParams));
     },
     size: "small",
@@ -304,19 +304,19 @@ function InterestedProducts(props) {
   }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
     columns: columns,
-    dataSource: platformList,
+    dataSource: list,
     defaultExpandAllRows: true,
     loading: loading,
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         paginationParams.pageIndex = page;
-        queryPlatform(__assign(__assign({}, paginationParams), {
-          platformName: platformName
+        queryData(__assign(__assign({}, paginationParams), {
+          interestName: interestName
         }));
       },
       showSizeChanger: false
     }),
-    rowKey: "distributionPlatformId",
+    rowKey: "interestId",
     rowSelection: rowSelection,
     scroll: {
       y: 400

package/es/common/LinkModal/MerchantStory/index.js

@@ -229,7 +229,7 @@ function MerchantStory(props) {
     queryData(paginationParams);
   }, []);
   var columns = [{
-    title: 'store Name',
+    title: 'StoreName',
     dataIndex: 'storeName'
   }, {
     title: 'Logo',

package/es/common/PopUpModal/index.less

@@ -37,9 +37,9 @@
     flex-direction: column;
     background-color: #fff;
     box-shadow: 0px 4px 8px rgba(96, 97, 112, 0.16);
-    animation: bounceIn .5s linear;
+    animation: all .5s linear;
     margin-top: -80px;
-    max-height: 60%;
+    padding-bottom: 80px;
     border-radius: 10px 10px 0 0;
 
     .topLineWrap {

package/es/common/ProductFilterModal/index.less

@@ -1,7 +1,7 @@
 .productFilterModal {
   .productFilterWrap {
     background: #ffffff;
-    height: calc(80vh - 40px);
+    height: 60vh;
     overflow-y: scroll;
     overflow-x: hidden;
     box-sizing: border-box;

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

@@ -175,7 +175,7 @@ function (_super) {
     var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
       return f.position === '7';
     })) || [];
-    var soldNumber = data.salesCnt - data.salesCnt % 250;
+    var soldNumber = data.salesCnt > 250 ? data.salesCnt - data.salesCnt % 250 + "+" : data.salesCnt || 0;
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('monpay-product-item-wrap', {
         fixHeight: fixHeight,
@@ -270,7 +270,7 @@ function (_super) {
       className: "sold"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       data: __assign(__assign({}, panelProps.sold), {
-        text: "Sold " + (soldNumber || 0) + "+"
+        text: "Sold " + soldNumber
       }),
       readonly: true
     }))), data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -163,7 +163,7 @@
         height: 20px;
         color: #F47A46;
         background: url('./imgs/coupon-orange.png') no-repeat center;
-        background-size: 100%;
+        background-size: 100% !important;
         margin-right: 6px;
         margin-bottom: 4px;
         line-height: 1;

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

@@ -17,8 +17,6 @@ var _common = require("../../../../../../common");
 
 var _ImageLabel = _interopRequireDefault(require("../../../../../common/components/ImageLabel"));
 
-var _businessUtil = require("../../../../../../utils/businessUtil");
-
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -82,39 +80,10 @@ function (_super) {
     var _d = this.props,
         data = _d.data,
         onItemClick = _d.onItemClick,
-        unknownPrice = _d.unknownPrice,
-        rest = __rest(_d, ["data", "onItemClick", "unknownPrice"]);
-
-    var promotions = (0, _businessUtil.getPromotionList)(data);
-    var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
-    /** 当是拼团时 显示价格 */
-
-    if (data.sppType && promotions.length) {
-      price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
-    }
-
-    var integerPart = price;
-    var decimalPart = null;
-
-    if (unknownPrice) {
-      if (price.length > 5) {
-        integerPart = price.slice(0, -5).replace(/\d/g, '? ') + price.slice(-5);
-      } else {
-        integerPart = price.replace(/\d/, '? ');
-      }
-    } else if (Array.isArray(price)) {
-      integerPart = price[0];
-      decimalPart = price[1];
-    }
-
-    var pricePrefix = (0, _commonUtil.ensure)(function () {
-      return window.systemParams.prefix;
-    }, 'Rp');
-
-    var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
-
-    var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null; // const discount = Number(data.discountPercent) || 0;
+        rest = __rest(_d, ["data", "onItemClick"]);
 
+    var price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : null;
+    var oldPrice = data.salesPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice) : null;
     var imgLabels = ((_a = data.labels) === null || _a === void 0 ? void 0 : _a.filter(function (f) {
       return f.position !== '6' && f.position !== '7';
     })) || [];
@@ -124,7 +93,7 @@ function (_super) {
     var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
       return f.position === '7';
     })) || [];
-    var soldNumber = data.salesCnt - data.salesCnt % 250;
+    var soldNumber = data.salesCnt > 250 ? data.salesCnt - data.salesCnt % 250 + "+" : data.salesCnt || 0;
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('monpay-interest-product-item-wrap'),
       onClick: function onClick() {
@@ -139,7 +108,7 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
       labels: imgLabels,
       small: true
-    }), /*#__PURE__*/_react["default"].createElement("div", {
+    }), data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
       className: "discount-tag"
     }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
@@ -156,7 +125,7 @@ function (_super) {
       className: "price-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "price"
-    }, _price), priceLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
+    }, price, " "), priceLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
       labels: priceLabels,
       small: true
     })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -177,7 +146,7 @@ function (_super) {
       className: "line"
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "sold"
-    }, "Sold ", soldNumber || 0, "+"))));
+    }, "Sold ", soldNumber))));
   };
 
   ProductItem.defaultProps = {

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

@@ -215,7 +215,7 @@ var defaultData = [{
     url: _card["default"]
   },
   offerName: 'Product Name',
-  salesPrice: 18000000,
+  salesPrice: 20000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
   discountPercent: 10,
@@ -227,10 +227,10 @@ var defaultData = [{
     url: _card["default"]
   },
   offerName: 'Product Name',
-  salesPrice: 18000000,
+  salesPrice: 20000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
+  discountPercent: null,
   salePercent: 500,
   salesCnt: 501,
   sppType: '2'
@@ -239,7 +239,7 @@ var defaultData = [{
     url: _card["default"]
   },
   offerName: 'Product Name',
-  salesPrice: 18000000,
+  salesPrice: 20000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
   discountPercent: 10,
@@ -251,12 +251,12 @@ var defaultData = [{
     url: _card["default"]
   },
   offerName: 'Product Name',
-  salesPrice: 18000000,
+  salesPrice: 20000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
   discountPercent: 10,
   salePercent: 500,
-  salesCnt: 501,
+  salesCnt: 200,
   sppType: '2'
 }];
 
@@ -354,7 +354,7 @@ function (_super) {
       data: __assign(__assign({}, panelProps.title.headline), {
         text: interest.interestName
       })
-    }), panelProps.title.seeAll.open && /*#__PURE__*/_react["default"].createElement("span", {
+    }), panelProps.title.seeAll.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "btn",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)("/product/recommend/" + (interest.interestId || ''));

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
-    }), panelProps.title.countdown.open && /*#__PURE__*/_react["default"].createElement(_MonpayCountDown["default"], {
+    }), panelProps.title.countdown.open && panelProps.title.countdown.number.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

@@ -343,6 +343,7 @@ var getDefaultJSON = function getDefaultJSON() {
         }
       },
       filter: {
+        id: (0, _uuid.v4)(),
         open: false
       }
     },

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

@@ -104,7 +104,29 @@ function SearchCondition(props) {
     setVisible(false);
   };
 
-  (0, _react.useEffect)(function () {}, []);
+  var hideBottomBar = function hideBottomBar() {
+    var homeNavBar = document.querySelector('.menu_wrap');
+    if (homeNavBar) homeNavBar.style.visibility = 'hidden';
+    var toTop = document.querySelector('.toTopWrap');
+    if (toTop) toTop.style.visibility = 'hidden';
+  };
+
+  var showBottomBar = function showBottomBar() {
+    var homeNavBar = document.querySelector('.menu_wrap');
+    if (homeNavBar) homeNavBar.style.visibility = 'visible';
+    var toTop = document.querySelector('.toTopWrap');
+    if (toTop) toTop.style.visibility = 'visible';
+  };
+
+  (0, _react.useEffect)(function () {
+    if (visible) {
+      hideBottomBar();
+      console.log('hide');
+    } else {
+      showBottomBar();
+      console.log('show');
+    }
+  }, [visible]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "searchCondWrap",
     id: "sortCond"

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

@@ -238,7 +238,14 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  salePercent: 500
+  salePercent: 500,
+  coupons: [{
+    couponId: '1',
+    discountMethod: 'DISC'
+  }, {
+    couponId: '2',
+    discountMethod: 'AMT'
+  }]
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -281,12 +288,12 @@ var LAYOUT_IMAGE_SIZE = {
     h: 126
   },
   'layout3-2': {
-    w: 150,
-    h: 150
+    w: 130,
+    h: 130
   },
   'layout3-3': {
-    w: 96,
-    h: 96
+    w: 90,
+    h: 90
   },
   layout4: {
     w: 110,
@@ -379,10 +386,7 @@ function (_super) {
                       _this.resetLayout();
                     });
                     /** 如果数据未过期 */
-
-                    if (cache.endTime > Date.now()) return [2
-                    /*return*/
-                    ];
+                    // if (cache.endTime > Date.now()) return;
                   }
                 }
               }
@@ -832,9 +836,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "scrollProductList"
     }, _products.map(function (item) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "productCard"
-      }, /*#__PURE__*/_react["default"].createElement(_MonpayProductItem["default"], {
+      return /*#__PURE__*/_react["default"].createElement(_MonpayProductItem["default"], {
         key: "scroll_" + item.productId,
         data: item,
         imgHeight: imgHeight,
@@ -849,7 +851,7 @@ function (_super) {
         },
         panelProps: panelProps.content,
         showProgress: false
-      }));
+      });
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll

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

@@ -69,9 +69,6 @@
   flex-direction: row;
   align-items: flex-start;
 }
-.monpay-recommend-mobile .scrollContainer .scrollProductList .productCard {
-  margin-right: 0.24rem;
-}
 .monpay-recommend-mobile .btnSeeAll {
   display: block;
   width: fit-content;

package/es/constants/index.js

@@ -87,7 +87,10 @@ var urlTypeMap = {
   AFFILIATE_STORE: 'AffiliateStore',
   ANCHOR: 'Anchor',
   MINI_API: 'MiniApi',
-  AFFILIATE_PLATFORM: 'AffiliatePlatform'
+  AFFILIATE_PLATFORM: 'AffiliatePlatform',
+  INTERESTED_MERCHANTS: 'InterestedMerchants',
+  INTERESTED_PRODUCTS: 'InterestedProducts',
+  MERCHANT_STORY: 'MerchantStory'
 };
 exports.urlTypeMap = urlTypeMap;
 var respCodeMap = {

package/es/core/Designer/QuickMenuBar/index.js

@@ -129,10 +129,12 @@ function (_super) {
 
     _this.isShowSetTemplate = function () {
       return _constants.pageStateMap.DRAFT === _this.props.pageState;
-    };
+    }; // 拒绝审核 和 草稿状态展示保存按钮
+    // isShowSave = () => [pageStateMap.REJECTED, pageStateMap.DRAFT].includes(this.props.pageState)
+
 
     _this.isShowSave = function () {
-      return !(0, _coreUtil.isAutoAudit)() && [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState);
+      return true;
     };
 
     return _this;

package/es/decorator/compositeDecorator.js

@@ -121,7 +121,7 @@ function compositeDecorator(WrappedComponent) {
         var zIndex = '0';
         var position = 'relative';
 
-        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY' || nodeData.type === 'ORDERS') {
+        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY' || nodeData.type === 'ORDERS' || nodeData.type === 'MONPAY_RECOMMEND') {
           zIndex = '1';
         } // 解决pc导航hover上去，类目被下面组件遮罩的问题