@fonixtree/magic-design 2.0.153 → 2.0.158

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

@@ -90,14 +90,18 @@ var renderDiscount = function renderDiscount(data) {
   var text = '';
 
   if (AMT) {
-    text = (0, _currencyUtil.formatCurrency)(data.discountAmount);
+    text = (0, _currencyUtil.formatCurrencyWithSymbol)(data.discountAmount);
   } else if (DISC) {
     var temp = (0, _currencyUtil.formatCurrency)(data.discountAmount, 2); // 折扣券处理：100 => 1%
 
     text = parseInt(temp, 10) + "%";
   }
 
-  return text;
+  return {
+    text: text,
+    isBig: text.length > 6 && text.length <= 9,
+    isHide: text.length > 9
+  };
 };
 
 exports.renderDiscount = renderDiscount;
@@ -179,16 +183,16 @@ function (_super) {
       small: true
     }), (((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) || showDiscountTag) && data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
       className: "discount-tag"
-    }, isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% off")), /*#__PURE__*/_react["default"].createElement("div", {
+    }, isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% " + (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
+    }, showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "product-name-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "box"
     }, prodLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
       labels: prodLabels,
       small: true
-    }), showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+    }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       data: __assign(__assign({}, panelProps.productName), {
         text: data.offerName
       }),
@@ -237,7 +241,7 @@ function (_super) {
       className: "sold"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       data: __assign(__assign({}, panelProps.sold), {
-        text: "Sold " + soldNumber
+        text: (0, _locale.i18n)('SOLD') + " " + soldNumber
       }),
       readonly: true
     }))), intelligentType === 'Coupon' && data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
@@ -245,12 +249,15 @@ function (_super) {
     }, data.coupons.map(function (m) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: m.couponId,
-        className: (0, _classnames["default"])('item', m.discountMethod)
+        className: (0, _classnames["default"])('item', m.discountMethod, {
+          big: renderDiscount(m).isBig,
+          hide: renderDiscount(m).isHide
+        })
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "name"
       }, (0, _locale.i18n)('DISCOUNT')), /*#__PURE__*/_react["default"].createElement("div", {
         className: "num"
-      }, renderDiscount(m)));
+      }, renderDiscount(m).text));
     })), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"
     }, ((_j = panelProps.salesProgress) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -10,7 +10,7 @@
   .img-wrap {
     position: relative;
     border-radius: 8px;
-    overflow: hidden;
+    // overflow: hidden;
 
     .product-img {
       width: 140px;
@@ -156,6 +156,8 @@
       display: flex;
       flex-wrap: wrap;
       margin-top: 8px;
+      max-height: 48px;
+      overflow: hidden;
 
       .item {
         display: block;
@@ -164,7 +166,7 @@
         color: #F47A46;
         background: url('./imgs/coupon-orange.png') no-repeat center;
         background-size: 100% !important;
-        margin-right: 6px;
+        margin-right: 5px;
         margin-bottom: 4px;
         line-height: 1;
         text-align: center;
@@ -175,6 +177,24 @@
           background: url('./imgs/coupon-red.png') no-repeat center;
         }
 
+        &.DISC.big {
+          background: url('./imgs/coupon-red-big.png') no-repeat center;
+        }
+
+        &.big {
+          width: 75px;
+          background: url('./imgs/coupon-orange-big.png') no-repeat center;
+
+          .num,
+          .name {
+            width: 62px;
+          }
+        }
+
+        &.hide {
+          display: none;
+        }
+
         .name {
           font-size: 5px;
           width: 40px;
@@ -239,6 +259,7 @@
 
     .img-wrap {
       border-radius: 8px 0 0 8px;
+      margin-right: 8px;
 
       .product-img {
         width: 100px;

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

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _locale = require("../../../../locale");
+
 var _commonUtil = require("../../../../utils/commonUtil");
 
 var _currencyUtil = require("../../../../utils/currencyUtil");
@@ -240,7 +242,7 @@ function (_super) {
       className: "progress-wrap"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "text"
-    }, salePercent, "% Sold"), /*#__PURE__*/_react["default"].createElement("div", {
+    }, salePercent, "% ", (0, _locale.i18n)('SOLD')), /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-container"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress",

package/es/composite-comp/dito/components/FlashDeal/mobile/index.less

@@ -76,12 +76,12 @@
   justify-content: flex-start;
 }
 .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap {
-  width: 2.84rem;
+  width: 2.44rem;
   margin-right: 0.16rem;
 }
 .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap .product-img {
-  height: 2.8rem;
-  width: 2.8rem;
+  height: 2.4rem;
+  width: 2.4rem;
 }
 .m-flash-deal-mobile .flash-deal-list-horizontal {
   display: flex;

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

@@ -19,6 +19,8 @@ var _ImageLabel = _interopRequireDefault(require("../../../../../common/componen
 
 require("./index.less");
 
+var _locale = require("../../../../../../locale");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -116,7 +118,7 @@ function (_super) {
       small: true
     }), data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
       className: "discount-tag"
-    }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
+    }, data.discountPercent, "% ", (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "product-name-wrap"
@@ -152,7 +154,7 @@ function (_super) {
       className: "line"
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "sold"
-    }, "Sold ", soldNumber))));
+    }, (0, _locale.i18n)('SOLD'), " ", soldNumber))));
   };
 
   ProductItem.defaultProps = {

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

@@ -311,7 +311,7 @@ function (_super) {
                 interest: res.interest || {},
                 list: list
               });
-              if (list.length > 0) this.getMacy();
+              if (list.length > 0 && document.querySelector(".macyContainer_" + this.props.panelProps.id)) this.getMacy();
               return [2
               /*return*/
               ];

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

@@ -11,6 +11,8 @@ require("./index.less");
 
 var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
+var _locale = require("../../../../../locale");
+
 var _MonpayProductItem = _interopRequireDefault(require("../../../../common/components/MonpayProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -426,7 +428,7 @@ function (_super) {
         className: "time"
       }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
         className: "status"
-      }, item.cmpState === 'A' ? 'Coming Soon' : 'On Going'));
+      }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "flash-deal-list"
     }, _list.map(function (item) {

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

@@ -13,6 +13,8 @@ var _lodash = _interopRequireDefault(require("lodash.throttle"));
 
 var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
+var _locale = require("../../../../../locale");
+
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -529,7 +531,7 @@ function (_super) {
         className: "time"
       }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
         className: "status"
-      }, item.cmpState === 'A' ? 'Coming Soon' : 'On Going'));
+      }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "flash-deal-content"
     }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -141,7 +141,9 @@ function SearchCondition(props) {
     color: "#848484",
     size: 16,
     type: "icon-list-sort"
-  })), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('SORT_BY'), ":")), /*#__PURE__*/_react["default"].createElement("div", {
+  })), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "sortBy"
+  }, (0, _locale.i18n)('SORT_BY'), ":")), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rightWrap"
   }, (isBundle ? bundleSortList : sortList).map(function (srt) {
     return /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -10,7 +10,6 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  width: 2.8rem;
   flex-shrink: 0;
   padding-right: 0.16rem;
 }
@@ -40,6 +39,9 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.searchCondWrap .sortBy {
+  margin-left: 0.12rem;
+}
 .searchCondWrap .sortItem + .sortItem {
   margin-left: 0.2rem;
 }

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

@@ -236,9 +236,9 @@ var defaultData = [{
   imgUrlContent: {
     url: _card["default"]
   },
-  offerName: 'Product Name',
+  offerName: 'Product Name Long Long Long Long Long',
   salesPrice: 10000,
-  specialPrice: 8000,
+  specialPrice: null,
   marketPrice: 20000,
   salePercent: 500,
   discountPercent: 90,
@@ -249,7 +249,19 @@ var defaultData = [{
   }, {
     couponId: '2',
     discountMethod: 'AMT',
+    discountAmount: 100
+  }, {
+    couponId: '3',
+    discountMethod: 'AMT',
+    discountAmount: 1000
+  }, {
+    couponId: '4',
+    discountMethod: 'AMT',
     discountAmount: 10000
+  }, {
+    couponId: '5',
+    discountMethod: 'AMT',
+    discountAmount: 100000
   }]
 }, {
   imgUrlContent: {
@@ -264,7 +276,7 @@ var defaultData = [{
   imgUrlContent: {
     url: _card["default"]
   },
-  offerName: 'Product Name',
+  offerName: 'Product Name Long Long Long Long Long',
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
@@ -845,6 +857,7 @@ function (_super) {
       return /*#__PURE__*/_react["default"].createElement(_MonpayProductItem["default"], {
         key: "scroll_" + item.productId,
         data: item,
+        fixHeight: true,
         imgHeight: imgHeight,
         imgWidth: imgWidth,
         intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType,

package/es/constants/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.projectCodes = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.campaignTypes = exports.baseUrlMap = exports.STORE_KEY = exports.STORAGE_KEY = exports.ORDER_TYPE = exports.CREDIT_STATE = void 0;
 var STORAGE_KEY = {
+  FISHX_LOCALE: 'fishx_locale',
   LOCALE: 'ZSMART_LOCALE',
   MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
   MAGIC_RENDER_PAGEDATA: 'MAGIC_RENDER_PAGEDATA',

package/es/locale/en/en.json

@@ -1,4 +1,7 @@
 {
+  "OFF": "off",
+  "ON_GOING": "On Going",
+  "COMING_SOON": "Coming soon",
   "EXPDATE": "ExpDate",
   "EFFDATE": "EffDate",
   "MISSION_NAME": "Mission Name",
@@ -22,7 +25,6 @@
   "STORE": "Store",
   "PAGE_NAME": "Page Name",
   "CATEGORY": "Category",
-  "COMING_SOON": "Coming soon",
   "CASHBACK": "Cashback",
   "CREDIT": "Credit",
   "BNPL": "BNPL",

package/es/locale/es/es.json

@@ -1,4 +1,7 @@
 {
+  "OFF": "off",
+  "ON_GOING": "On Going",
+  "COMING_SOON": "Coming soon",
   "EXPDATE": "ExpDate",
   "EFFDATE": "EffDate",
   "MISSION_NAME": "Mission Name",
@@ -22,7 +25,6 @@
   "STORE": "Tienda",
   "PAGE_NAME": "Page Name",
   "CATEGORY": "Categoría",
-  "COMING_SOON": "Coming soon",
   "CASHBACK": "Cashback",
   "CREDIT": "Credit",
   "BNPL": "BNPL",

package/es/locale/index.js

@@ -20,7 +20,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 var localeMap = {
   en: _en["default"],
   es: _es["default"],
-  mn: _mn["default"]
+  mn: _mn["default"],
+  'id-ID': _mn["default"]
 };
 /** 国际化 */
 
@@ -29,7 +30,7 @@ function i18n(key, args) {
     args = {};
   }
 
-  var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
+  var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
   var localeObj = localeMap[locale || 'en'] || _en["default"];
   var tempString = localeObj[key];
 

package/es/locale/mn/mn.json

@@ -1,4 +1,7 @@
 {
+  "OFF": "off",
+  "ON_GOING": "Явж байна",
+  "COMING_SOON": "Тун удахгүй",
   "EXPDATE": "ExpDate",
   "EFFDATE": "Хасах огноо",
   "MISSION_NAME": "Номлолын нэр",
@@ -22,7 +25,6 @@
   "STORE": "Дэлгүүр",
   "PAGE_NAME": "Хуудасны нэр",
   "CATEGORY": "Ангилал",
-  "COMING_SOON": "Тун удахгүй",
   "CASHBACK": "Бэлэн мөнгө буцааж авах",
   "CREDIT": "Зээл",
   "BNPL": "BNPL",
@@ -154,7 +156,7 @@
   "SESSION_TIME": "Сеанс цаг",
   "COUNTDOWN": "Countdown",
   "FILTER": "Шүүлтүүр",
-  "SOLD": "Борлуулсан",
+  "SOLD": "Sold",
   "EVALUATION_SCORE": "Үнэлгээний оноо",
   "SEARCH_BAR_KEYWORD": "Хайлтын мөрний түлхүүр үг",
   "BOX_BACKGROUND": "Хайрцагны дэвсгэр",

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

@@ -90,14 +90,18 @@ var renderDiscount = function renderDiscount(data) {
   var text = '';
 
   if (AMT) {
-    text = (0, _currencyUtil.formatCurrency)(data.discountAmount);
+    text = (0, _currencyUtil.formatCurrencyWithSymbol)(data.discountAmount);
   } else if (DISC) {
     var temp = (0, _currencyUtil.formatCurrency)(data.discountAmount, 2); // 折扣券处理：100 => 1%
 
     text = parseInt(temp, 10) + "%";
   }
 
-  return text;
+  return {
+    text: text,
+    isBig: text.length > 6 && text.length <= 9,
+    isHide: text.length > 9
+  };
 };
 
 exports.renderDiscount = renderDiscount;
@@ -179,16 +183,16 @@ function (_super) {
       small: true
     }), (((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) || showDiscountTag) && data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
       className: "discount-tag"
-    }, isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% off")), /*#__PURE__*/_react["default"].createElement("div", {
+    }, isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% " + (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
+    }, showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "product-name-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "box"
     }, prodLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
       labels: prodLabels,
       small: true
-    }), showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+    }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       data: __assign(__assign({}, panelProps.productName), {
         text: data.offerName
       }),
@@ -237,7 +241,7 @@ function (_super) {
       className: "sold"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       data: __assign(__assign({}, panelProps.sold), {
-        text: "Sold " + soldNumber
+        text: (0, _locale.i18n)('SOLD') + " " + soldNumber
       }),
       readonly: true
     }))), intelligentType === 'Coupon' && data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
@@ -245,12 +249,15 @@ function (_super) {
     }, data.coupons.map(function (m) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: m.couponId,
-        className: (0, _classnames["default"])('item', m.discountMethod)
+        className: (0, _classnames["default"])('item', m.discountMethod, {
+          big: renderDiscount(m).isBig,
+          hide: renderDiscount(m).isHide
+        })
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "name"
       }, (0, _locale.i18n)('DISCOUNT')), /*#__PURE__*/_react["default"].createElement("div", {
         className: "num"
-      }, renderDiscount(m)));
+      }, renderDiscount(m).text));
     })), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"
     }, ((_j = panelProps.salesProgress) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -10,7 +10,7 @@
   .img-wrap {
     position: relative;
     border-radius: 8px;
-    overflow: hidden;
+    // overflow: hidden;
 
     .product-img {
       width: 140px;
@@ -156,6 +156,8 @@
       display: flex;
       flex-wrap: wrap;
       margin-top: 8px;
+      max-height: 48px;
+      overflow: hidden;
 
       .item {
         display: block;
@@ -164,7 +166,7 @@
         color: #F47A46;
         background: url('./imgs/coupon-orange.png') no-repeat center;
         background-size: 100% !important;
-        margin-right: 6px;
+        margin-right: 5px;
         margin-bottom: 4px;
         line-height: 1;
         text-align: center;
@@ -175,6 +177,24 @@
           background: url('./imgs/coupon-red.png') no-repeat center;
         }
 
+        &.DISC.big {
+          background: url('./imgs/coupon-red-big.png') no-repeat center;
+        }
+
+        &.big {
+          width: 75px;
+          background: url('./imgs/coupon-orange-big.png') no-repeat center;
+
+          .num,
+          .name {
+            width: 62px;
+          }
+        }
+
+        &.hide {
+          display: none;
+        }
+
         .name {
           font-size: 5px;
           width: 40px;
@@ -239,6 +259,7 @@
 
     .img-wrap {
       border-radius: 8px 0 0 8px;
+      margin-right: 8px;
 
       .product-img {
         width: 100px;

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

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _locale = require("../../../../locale");
+
 var _commonUtil = require("../../../../utils/commonUtil");
 
 var _currencyUtil = require("../../../../utils/currencyUtil");
@@ -240,7 +242,7 @@ function (_super) {
       className: "progress-wrap"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "text"
-    }, salePercent, "% Sold"), /*#__PURE__*/_react["default"].createElement("div", {
+    }, salePercent, "% ", (0, _locale.i18n)('SOLD')), /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-container"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress",

package/lib/composite-comp/dito/components/FlashDeal/mobile/index.less

@@ -76,12 +76,12 @@
   justify-content: flex-start;
 }
 .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap {
-  width: 2.84rem;
+  width: 2.44rem;
   margin-right: 0.16rem;
 }
 .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap .product-img {
-  height: 2.8rem;
-  width: 2.8rem;
+  height: 2.4rem;
+  width: 2.4rem;
 }
 .m-flash-deal-mobile .flash-deal-list-horizontal {
   display: flex;

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

@@ -19,6 +19,8 @@ var _ImageLabel = _interopRequireDefault(require("../../../../../common/componen
 
 require("./index.less");
 
+var _locale = require("../../../../../../locale");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -116,7 +118,7 @@ function (_super) {
       small: true
     }), data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
       className: "discount-tag"
-    }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
+    }, data.discountPercent, "% ", (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "product-name-wrap"
@@ -152,7 +154,7 @@ function (_super) {
       className: "line"
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "sold"
-    }, "Sold ", soldNumber))));
+    }, (0, _locale.i18n)('SOLD'), " ", soldNumber))));
   };
 
   ProductItem.defaultProps = {

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

@@ -311,7 +311,7 @@ function (_super) {
                 interest: res.interest || {},
                 list: list
               });
-              if (list.length > 0) this.getMacy();
+              if (list.length > 0 && document.querySelector(".macyContainer_" + this.props.panelProps.id)) this.getMacy();
               return [2
               /*return*/
               ];

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

@@ -11,6 +11,8 @@ require("./index.less");
 
 var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
+var _locale = require("../../../../../locale");
+
 var _MonpayProductItem = _interopRequireDefault(require("../../../../common/components/MonpayProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -426,7 +428,7 @@ function (_super) {
         className: "time"
       }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
         className: "status"
-      }, item.cmpState === 'A' ? 'Coming Soon' : 'On Going'));
+      }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "flash-deal-list"
     }, _list.map(function (item) {

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

@@ -13,6 +13,8 @@ var _lodash = _interopRequireDefault(require("lodash.throttle"));
 
 var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
+var _locale = require("../../../../../locale");
+
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -529,7 +531,7 @@ function (_super) {
         className: "time"
       }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
         className: "status"
-      }, item.cmpState === 'A' ? 'Coming Soon' : 'On Going'));
+      }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "flash-deal-content"
     }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -141,7 +141,9 @@ function SearchCondition(props) {
     color: "#848484",
     size: 16,
     type: "icon-list-sort"
-  })), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('SORT_BY'), ":")), /*#__PURE__*/_react["default"].createElement("div", {
+  })), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "sortBy"
+  }, (0, _locale.i18n)('SORT_BY'), ":")), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rightWrap"
   }, (isBundle ? bundleSortList : sortList).map(function (srt) {
     return /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -10,7 +10,6 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  width: 2.8rem;
   flex-shrink: 0;
   padding-right: 0.16rem;
 }
@@ -40,6 +39,9 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.searchCondWrap .sortBy {
+  margin-left: 0.12rem;
+}
 .searchCondWrap .sortItem + .sortItem {
   margin-left: 0.2rem;
 }

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

@@ -236,9 +236,9 @@ var defaultData = [{
   imgUrlContent: {
     url: _card["default"]
   },
-  offerName: 'Product Name',
+  offerName: 'Product Name Long Long Long Long Long',
   salesPrice: 10000,
-  specialPrice: 8000,
+  specialPrice: null,
   marketPrice: 20000,
   salePercent: 500,
   discountPercent: 90,
@@ -249,7 +249,19 @@ var defaultData = [{
   }, {
     couponId: '2',
     discountMethod: 'AMT',
+    discountAmount: 100
+  }, {
+    couponId: '3',
+    discountMethod: 'AMT',
+    discountAmount: 1000
+  }, {
+    couponId: '4',
+    discountMethod: 'AMT',
     discountAmount: 10000
+  }, {
+    couponId: '5',
+    discountMethod: 'AMT',
+    discountAmount: 100000
   }]
 }, {
   imgUrlContent: {
@@ -264,7 +276,7 @@ var defaultData = [{
   imgUrlContent: {
     url: _card["default"]
   },
-  offerName: 'Product Name',
+  offerName: 'Product Name Long Long Long Long Long',
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
@@ -845,6 +857,7 @@ function (_super) {
       return /*#__PURE__*/_react["default"].createElement(_MonpayProductItem["default"], {
         key: "scroll_" + item.productId,
         data: item,
+        fixHeight: true,
         imgHeight: imgHeight,
         imgWidth: imgWidth,
         intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType,

package/lib/constants/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.projectCodes = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.campaignTypes = exports.baseUrlMap = exports.STORE_KEY = exports.STORAGE_KEY = exports.ORDER_TYPE = exports.CREDIT_STATE = void 0;
 var STORAGE_KEY = {
+  FISHX_LOCALE: 'fishx_locale',
   LOCALE: 'ZSMART_LOCALE',
   MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
   MAGIC_RENDER_PAGEDATA: 'MAGIC_RENDER_PAGEDATA',

package/lib/locale/en/en.json

@@ -1,4 +1,7 @@
 {
+  "OFF": "off",
+  "ON_GOING": "On Going",
+  "COMING_SOON": "Coming soon",
   "EXPDATE": "ExpDate",
   "EFFDATE": "EffDate",
   "MISSION_NAME": "Mission Name",
@@ -22,7 +25,6 @@
   "STORE": "Store",
   "PAGE_NAME": "Page Name",
   "CATEGORY": "Category",
-  "COMING_SOON": "Coming soon",
   "CASHBACK": "Cashback",
   "CREDIT": "Credit",
   "BNPL": "BNPL",

package/lib/locale/es/es.json

@@ -1,4 +1,7 @@
 {
+  "OFF": "off",
+  "ON_GOING": "On Going",
+  "COMING_SOON": "Coming soon",
   "EXPDATE": "ExpDate",
   "EFFDATE": "EffDate",
   "MISSION_NAME": "Mission Name",
@@ -22,7 +25,6 @@
   "STORE": "Tienda",
   "PAGE_NAME": "Page Name",
   "CATEGORY": "Categoría",
-  "COMING_SOON": "Coming soon",
   "CASHBACK": "Cashback",
   "CREDIT": "Credit",
   "BNPL": "BNPL",

package/lib/locale/index.js

@@ -20,7 +20,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 var localeMap = {
   en: _en["default"],
   es: _es["default"],
-  mn: _mn["default"]
+  mn: _mn["default"],
+  'id-ID': _mn["default"]
 };
 /** 国际化 */
 
@@ -29,7 +30,7 @@ function i18n(key, args) {
     args = {};
   }
 
-  var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
+  var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
   var localeObj = localeMap[locale || 'en'] || _en["default"];
   var tempString = localeObj[key];
 

package/lib/locale/mn/mn.json

@@ -1,4 +1,7 @@
 {
+  "OFF": "off",
+  "ON_GOING": "Явж байна",
+  "COMING_SOON": "Тун удахгүй",
   "EXPDATE": "ExpDate",
   "EFFDATE": "Хасах огноо",
   "MISSION_NAME": "Номлолын нэр",
@@ -22,7 +25,6 @@
   "STORE": "Дэлгүүр",
   "PAGE_NAME": "Хуудасны нэр",
   "CATEGORY": "Ангилал",
-  "COMING_SOON": "Тун удахгүй",
   "CASHBACK": "Бэлэн мөнгө буцааж авах",
   "CREDIT": "Зээл",
   "BNPL": "BNPL",
@@ -154,7 +156,7 @@
   "SESSION_TIME": "Сеанс цаг",
   "COUNTDOWN": "Countdown",
   "FILTER": "Шүүлтүүр",
-  "SOLD": "Борлуулсан",
+  "SOLD": "Sold",
   "EVALUATION_SCORE": "Үнэлгээний оноо",
   "SEARCH_BAR_KEYWORD": "Хайлтын мөрний түлхүүр үг",
   "BOX_BACKGROUND": "Хайрцагны дэвсгэр",

package/package.json

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