@fonixtree/magic-design 2.0.153 → 2.0.158

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/es/composite-comp/common/components/MonpayProductItem/imgs/coupon-orange-big.png +0 -0
  2. package/es/composite-comp/common/components/MonpayProductItem/imgs/coupon-red-big.png +0 -0
  3. package/es/composite-comp/common/components/MonpayProductItem/index.js +15 -8
  4. package/es/composite-comp/common/components/MonpayProductItem/index.less +23 -2
  5. package/es/composite-comp/common/components/ProductItem/index.js +3 -1
  6. package/es/composite-comp/dito/components/FlashDeal/mobile/index.less +3 -3
  7. package/es/composite-comp/monpay/components/InterestProducts/mobile/ProductItem/index.js +4 -2
  8. package/es/composite-comp/monpay/components/InterestProducts/mobile/index.js +1 -1
  9. package/es/composite-comp/monpay/components/MonpayFlashDeal/mobile/index.js +3 -1
  10. package/es/composite-comp/monpay/components/MonpayFlashDeal/pc/index.js +3 -1
  11. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.js +3 -1
  12. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.less +3 -1
  13. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +16 -3
  14. package/es/constants/index.js +1 -0
  15. package/es/locale/en/en.json +3 -1
  16. package/es/locale/es/es.json +3 -1
  17. package/es/locale/index.js +3 -2
  18. package/es/locale/mn/mn.json +4 -2
  19. package/lib/composite-comp/common/components/MonpayProductItem/imgs/coupon-orange-big.png +0 -0
  20. package/lib/composite-comp/common/components/MonpayProductItem/imgs/coupon-red-big.png +0 -0
  21. package/lib/composite-comp/common/components/MonpayProductItem/index.js +15 -8
  22. package/lib/composite-comp/common/components/MonpayProductItem/index.less +23 -2
  23. package/lib/composite-comp/common/components/ProductItem/index.js +3 -1
  24. package/lib/composite-comp/dito/components/FlashDeal/mobile/index.less +3 -3
  25. package/lib/composite-comp/monpay/components/InterestProducts/mobile/ProductItem/index.js +4 -2
  26. package/lib/composite-comp/monpay/components/InterestProducts/mobile/index.js +1 -1
  27. package/lib/composite-comp/monpay/components/MonpayFlashDeal/mobile/index.js +3 -1
  28. package/lib/composite-comp/monpay/components/MonpayFlashDeal/pc/index.js +3 -1
  29. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.js +3 -1
  30. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.less +3 -1
  31. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +16 -3
  32. package/lib/constants/index.js +1 -0
  33. package/lib/locale/en/en.json +3 -1
  34. package/lib/locale/es/es.json +3 -1
  35. package/lib/locale/index.js +3 -2
  36. package/lib/locale/mn/mn.json +4 -2
  37. package/package.json +1 -1
package/es/composite-comp/common/components/MonpayProductItem/index.js CHANGED
@@ -90,14 +90,18 @@ var renderDiscount = function renderDiscount(data) {
90
90
  var text = '';
91
91
 
92
92
  if (AMT) {
93
- text = (0, _currencyUtil.formatCurrency)(data.discountAmount);
93
+ text = (0, _currencyUtil.formatCurrencyWithSymbol)(data.discountAmount);
94
94
  } else if (DISC) {
95
95
  var temp = (0, _currencyUtil.formatCurrency)(data.discountAmount, 2); // 折扣券处理：100 => 1%
96
96
 
97
97
  text = parseInt(temp, 10) + "%";
98
98
  }
99
99
 
100
- return text;
100
+ return {
101
+ text: text,
102
+ isBig: text.length > 6 && text.length <= 9,
103
+ isHide: text.length > 9
104
+ };
101
105
  };
102
106
 
103
107
  exports.renderDiscount = renderDiscount;
@@ -179,16 +183,16 @@ function (_super) {
179
183
  small: true
180
184
  }), (((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) || showDiscountTag) && data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
181
185
  className: "discount-tag"
182
- }, isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% off")), /*#__PURE__*/_react["default"].createElement("div", {
186
+ }, isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% " + (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
183
187
  className: "content-wrap"
184
- }, /*#__PURE__*/_react["default"].createElement("div", {
188
+ }, showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement("div", {
185
189
  className: "product-name-wrap"
186
190
  }, /*#__PURE__*/_react["default"].createElement("div", {
187
191
  className: "box"
188
192
  }, prodLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
189
193
  labels: prodLabels,
190
194
  small: true
191
- }), showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
195
+ }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
192
196
  data: __assign(__assign({}, panelProps.productName), {
193
197
  text: data.offerName
194
198
  }),
@@ -237,7 +241,7 @@ function (_super) {
237
241
  className: "sold"
238
242
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
239
243
  data: __assign(__assign({}, panelProps.sold), {
240
- text: "Sold " + soldNumber
244
+ text: (0, _locale.i18n)('SOLD') + " " + soldNumber
241
245
  }),
242
246
  readonly: true
243
247
  }))), intelligentType === 'Coupon' && data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
@@ -245,12 +249,15 @@ function (_super) {
245
249
  }, data.coupons.map(function (m) {
246
250
  return /*#__PURE__*/_react["default"].createElement("div", {
247
251
  key: m.couponId,
248
- className: (0, _classnames["default"])('item', m.discountMethod)
252
+ className: (0, _classnames["default"])('item', m.discountMethod, {
253
+ big: renderDiscount(m).isBig,
254
+ hide: renderDiscount(m).isHide
255
+ })
249
256
  }, /*#__PURE__*/_react["default"].createElement("div", {
250
257
  className: "name"
251
258
  }, (0, _locale.i18n)('DISCOUNT')), /*#__PURE__*/_react["default"].createElement("div", {
252
259
  className: "num"
253
- }, renderDiscount(m)));
260
+ }, renderDiscount(m).text));
254
261
  })), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
255
262
  className: "progress-wrap"
256
263
  }, ((_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 CHANGED
@@ -10,7 +10,7 @@
10
10
  .img-wrap {
11
11
  position: relative;
12
12
  border-radius: 8px;
13
- overflow: hidden;
13
+ // overflow: hidden;
14
14
 
15
15
  .product-img {
16
16
  width: 140px;
@@ -156,6 +156,8 @@
156
156
  display: flex;
157
157
  flex-wrap: wrap;
158
158
  margin-top: 8px;
159
+ max-height: 48px;
160
+ overflow: hidden;
159
161
 
160
162
  .item {
161
163
  display: block;
@@ -164,7 +166,7 @@
164
166
  color: #F47A46;
165
167
  background: url('./imgs/coupon-orange.png') no-repeat center;
166
168
  background-size: 100% !important;
167
- margin-right: 6px;
169
+ margin-right: 5px;
168
170
  margin-bottom: 4px;
169
171
  line-height: 1;
170
172
  text-align: center;
@@ -175,6 +177,24 @@
175
177
  background: url('./imgs/coupon-red.png') no-repeat center;
176
178
  }
177
179
 
180
+ &.DISC.big {
181
+ background: url('./imgs/coupon-red-big.png') no-repeat center;
182
+ }
183
+
184
+ &.big {
185
+ width: 75px;
186
+ background: url('./imgs/coupon-orange-big.png') no-repeat center;
187
+
188
+ .num,
189
+ .name {
190
+ width: 62px;
191
+ }
192
+ }
193
+
194
+ &.hide {
195
+ display: none;
196
+ }
197
+
178
198
  .name {
179
199
  font-size: 5px;
180
200
  width: 40px;
@@ -239,6 +259,7 @@
239
259
 
240
260
  .img-wrap {
241
261
  border-radius: 8px 0 0 8px;
262
+ margin-right: 8px;
242
263
 
243
264
  .product-img {
244
265
  width: 100px;
package/es/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var _classnames = _interopRequireDefault(require("classnames"));
11
11
 
12
+ var _locale = require("../../../../locale");
13
+
12
14
  var _commonUtil = require("../../../../utils/commonUtil");
13
15
 
14
16
  var _currencyUtil = require("../../../../utils/currencyUtil");
@@ -240,7 +242,7 @@ function (_super) {
240
242
  className: "progress-wrap"
241
243
  }, /*#__PURE__*/_react["default"].createElement("span", {
242
244
  className: "text"
243
- }, salePercent, "% Sold"), /*#__PURE__*/_react["default"].createElement("div", {
245
+ }, salePercent, "% ", (0, _locale.i18n)('SOLD')), /*#__PURE__*/_react["default"].createElement("div", {
244
246
  className: "progress-container"
245
247
  }, /*#__PURE__*/_react["default"].createElement("div", {
246
248
  className: "progress",
package/es/composite-comp/dito/components/FlashDeal/mobile/index.less CHANGED
@@ -76,12 +76,12 @@
76
76
  justify-content: flex-start;
77
77
  }
78
78
  .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap {
79
- width: 2.84rem;
79
+ width: 2.44rem;
80
80
  margin-right: 0.16rem;
81
81
  }
82
82
  .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap .product-img {
83
- height: 2.8rem;
84
- width: 2.8rem;
83
+ height: 2.4rem;
84
+ width: 2.4rem;
85
85
  }
86
86
  .m-flash-deal-mobile .flash-deal-list-horizontal {
87
87
  display: flex;
package/es/composite-comp/monpay/components/InterestProducts/mobile/ProductItem/index.js CHANGED
@@ -19,6 +19,8 @@ var _ImageLabel = _interopRequireDefault(require("../../../../../common/componen
19
19
 
20
20
  require("./index.less");
21
21
 
22
+ var _locale = require("../../../../../../locale");
23
+
22
24
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
23
25
 
24
26
  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) {
116
118
  small: true
117
119
  }), data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
118
120
  className: "discount-tag"
119
- }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
121
+ }, data.discountPercent, "% ", (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
120
122
  className: "content-wrap"
121
123
  }, /*#__PURE__*/_react["default"].createElement("div", {
122
124
  className: "product-name-wrap"
@@ -152,7 +154,7 @@ function (_super) {
152
154
  className: "line"
153
155
  }), /*#__PURE__*/_react["default"].createElement("div", {
154
156
  className: "sold"
155
- }, "Sold ", soldNumber))));
157
+ }, (0, _locale.i18n)('SOLD'), " ", soldNumber))));
156
158
  };
157
159
 
158
160
  ProductItem.defaultProps = {
package/es/composite-comp/monpay/components/InterestProducts/mobile/index.js CHANGED
@@ -311,7 +311,7 @@ function (_super) {
311
311
  interest: res.interest || {},
312
312
  list: list
313
313
  });
314
- if (list.length > 0) this.getMacy();
314
+ if (list.length > 0 && document.querySelector(".macyContainer_" + this.props.panelProps.id)) this.getMacy();
315
315
  return [2
316
316
  /*return*/
317
317
  ];
package/es/composite-comp/monpay/components/MonpayFlashDeal/mobile/index.js CHANGED
@@ -11,6 +11,8 @@ require("./index.less");
11
11
 
12
12
  var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
13
13
 
14
+ var _locale = require("../../../../../locale");
15
+
14
16
  var _MonpayProductItem = _interopRequireDefault(require("../../../../common/components/MonpayProductItem"));
15
17
 
16
18
  var _coreUtil = require("../../../../../utils/coreUtil");
@@ -426,7 +428,7 @@ function (_super) {
426
428
  className: "time"
427
429
  }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
428
430
  className: "status"
429
- }, item.cmpState === 'A' ? 'Coming Soon' : 'On Going'));
431
+ }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
430
432
  })), /*#__PURE__*/_react["default"].createElement("div", {
431
433
  className: "flash-deal-list"
432
434
  }, _list.map(function (item) {
package/es/composite-comp/monpay/components/MonpayFlashDeal/pc/index.js CHANGED
@@ -13,6 +13,8 @@ var _lodash = _interopRequireDefault(require("lodash.throttle"));
13
13
 
14
14
  var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
15
15
 
16
+ var _locale = require("../../../../../locale");
17
+
16
18
  var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
17
19
 
18
20
  var _coreUtil = require("../../../../../utils/coreUtil");
@@ -529,7 +531,7 @@ function (_super) {
529
531
  className: "time"
530
532
  }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
531
533
  className: "status"
532
- }, item.cmpState === 'A' ? 'Coming Soon' : 'On Going'));
534
+ }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
533
535
  })), /*#__PURE__*/_react["default"].createElement("div", {
534
536
  className: "flash-deal-content"
535
537
  }, /*#__PURE__*/_react["default"].createElement("div", {
package/es/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.js CHANGED
@@ -141,7 +141,9 @@ function SearchCondition(props) {
141
141
  color: "#848484",
142
142
  size: 16,
143
143
  type: "icon-list-sort"
144
- })), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('SORT_BY'), ":")), /*#__PURE__*/_react["default"].createElement("div", {
144
+ })), /*#__PURE__*/_react["default"].createElement("span", {
145
+ className: "sortBy"
146
+ }, (0, _locale.i18n)('SORT_BY'), ":")), /*#__PURE__*/_react["default"].createElement("div", {
145
147
  className: "rightWrap"
146
148
  }, (isBundle ? bundleSortList : sortList).map(function (srt) {
147
149
  return /*#__PURE__*/_react["default"].createElement("div", {
package/es/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.less CHANGED
@@ -10,7 +10,6 @@
10
10
  display: flex;
11
11
  align-items: center;
12
12
  justify-content: space-between;
13
- width: 2.8rem;
14
13
  flex-shrink: 0;
15
14
  padding-right: 0.16rem;
16
15
  }
@@ -40,6 +39,9 @@
40
39
  text-overflow: ellipsis;
41
40
  white-space: nowrap;
42
41
  }
42
+ .searchCondWrap .sortBy {
43
+ margin-left: 0.12rem;
44
+ }
43
45
  .searchCondWrap .sortItem + .sortItem {
44
46
  margin-left: 0.2rem;
45
47
  }
package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js CHANGED
@@ -236,9 +236,9 @@ var defaultData = [{
236
236
  imgUrlContent: {
237
237
  url: _card["default"]
238
238
  },
239
- offerName: 'Product Name',
239
+ offerName: 'Product Name Long Long Long Long Long',
240
240
  salesPrice: 10000,
241
- specialPrice: 8000,
241
+ specialPrice: null,
242
242
  marketPrice: 20000,
243
243
  salePercent: 500,
244
244
  discountPercent: 90,
@@ -249,7 +249,19 @@ var defaultData = [{
249
249
  }, {
250
250
  couponId: '2',
251
251
  discountMethod: 'AMT',
252
+ discountAmount: 100
253
+ }, {
254
+ couponId: '3',
255
+ discountMethod: 'AMT',
256
+ discountAmount: 1000
257
+ }, {
258
+ couponId: '4',
259
+ discountMethod: 'AMT',
252
260
  discountAmount: 10000
261
+ }, {
262
+ couponId: '5',
263
+ discountMethod: 'AMT',
264
+ discountAmount: 100000
253
265
  }]
254
266
  }, {
255
267
  imgUrlContent: {
@@ -264,7 +276,7 @@ var defaultData = [{
264
276
  imgUrlContent: {
265
277
  url: _card["default"]
266
278
  },
267
- offerName: 'Product Name',
279
+ offerName: 'Product Name Long Long Long Long Long',
268
280
  salesPrice: 18000000,
269
281
  specialPrice: 18000000,
270
282
  marketPrice: 19000000,
@@ -845,6 +857,7 @@ function (_super) {
845
857
  return /*#__PURE__*/_react["default"].createElement(_MonpayProductItem["default"], {
846
858
  key: "scroll_" + item.productId,
847
859
  data: item,
860
+ fixHeight: true,
848
861
  imgHeight: imgHeight,
849
862
  imgWidth: imgWidth,
850
863
  intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType,
package/es/constants/index.js CHANGED
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  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;
7
7
  var STORAGE_KEY = {
8
+ FISHX_LOCALE: 'fishx_locale',
8
9
  LOCALE: 'ZSMART_LOCALE',
9
10
  MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
10
11
  MAGIC_RENDER_PAGEDATA: 'MAGIC_RENDER_PAGEDATA',
package/es/locale/en/en.json CHANGED
@@ -1,4 +1,7 @@
1
1
  {
2
+ "OFF": "off",
3
+ "ON_GOING": "On Going",
4
+ "COMING_SOON": "Coming soon",
2
5
  "EXPDATE": "ExpDate",
3
6
  "EFFDATE": "EffDate",
4
7
  "MISSION_NAME": "Mission Name",
@@ -22,7 +25,6 @@
22
25
  "STORE": "Store",
23
26
  "PAGE_NAME": "Page Name",
24
27
  "CATEGORY": "Category",
25
- "COMING_SOON": "Coming soon",
26
28
  "CASHBACK": "Cashback",
27
29
  "CREDIT": "Credit",
28
30
  "BNPL": "BNPL",
package/es/locale/es/es.json CHANGED
@@ -1,4 +1,7 @@
1
1
  {
2
+ "OFF": "off",
3
+ "ON_GOING": "On Going",
4
+ "COMING_SOON": "Coming soon",
2
5
  "EXPDATE": "ExpDate",
3
6
  "EFFDATE": "EffDate",
4
7
  "MISSION_NAME": "Mission Name",
@@ -22,7 +25,6 @@
22
25
  "STORE": "Tienda",
23
26
  "PAGE_NAME": "Page Name",
24
27
  "CATEGORY": "Categoría",
25
- "COMING_SOON": "Coming soon",
26
28
  "CASHBACK": "Cashback",
27
29
  "CREDIT": "Credit",
28
30
  "BNPL": "BNPL",
package/es/locale/index.js CHANGED
@@ -20,7 +20,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
20
20
  var localeMap = {
21
21
  en: _en["default"],
22
22
  es: _es["default"],
23
- mn: _mn["default"]
23
+ mn: _mn["default"],
24
+ 'id-ID': _mn["default"]
24
25
  };
25
26
  /** 国际化 */
26
27
 
@@ -29,7 +30,7 @@ function i18n(key, args) {
29
30
  args = {};
30
31
  }
31
32
 
32
- var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
33
+ var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
33
34
  var localeObj = localeMap[locale || 'en'] || _en["default"];
34
35
  var tempString = localeObj[key];
35
36
 
package/es/locale/mn/mn.json CHANGED
@@ -1,4 +1,7 @@
1
1
  {
2
+ "OFF": "off",
3
+ "ON_GOING": "Явж байна",
4
+ "COMING_SOON": "Тун удахгүй",
2
5
  "EXPDATE": "ExpDate",
3
6
  "EFFDATE": "Хасах огноо",
4
7
  "MISSION_NAME": "Номлолын нэр",
@@ -22,7 +25,6 @@
22
25
  "STORE": "Дэлгүүр",
23
26
  "PAGE_NAME": "Хуудасны нэр",
24
27
  "CATEGORY": "Ангилал",
25
- "COMING_SOON": "Тун удахгүй",
26
28
  "CASHBACK": "Бэлэн мөнгө буцааж авах",
27
29
  "CREDIT": "Зээл",
28
30
  "BNPL": "BNPL",
@@ -154,7 +156,7 @@
154
156
  "SESSION_TIME": "Сеанс цаг",
155
157
  "COUNTDOWN": "Countdown",
156
158
  "FILTER": "Шүүлтүүр",
157
- "SOLD": "Борлуулсан",
159
+ "SOLD": "Sold",
158
160
  "EVALUATION_SCORE": "Үнэлгээний оноо",
159
161
  "SEARCH_BAR_KEYWORD": "Хайлтын мөрний түлхүүр үг",
160
162
  "BOX_BACKGROUND": "Хайрцагны дэвсгэр",
package/lib/composite-comp/common/components/MonpayProductItem/index.js CHANGED
@@ -90,14 +90,18 @@ var renderDiscount = function renderDiscount(data) {
90
90
  var text = '';
91
91
 
92
92
  if (AMT) {
93
- text = (0, _currencyUtil.formatCurrency)(data.discountAmount);
93
+ text = (0, _currencyUtil.formatCurrencyWithSymbol)(data.discountAmount);
94
94
  } else if (DISC) {
95
95
  var temp = (0, _currencyUtil.formatCurrency)(data.discountAmount, 2); // 折扣券处理：100 => 1%
96
96
 
97
97
  text = parseInt(temp, 10) + "%";
98
98
  }
99
99
 
100
- return text;
100
+ return {
101
+ text: text,
102
+ isBig: text.length > 6 && text.length <= 9,
103
+ isHide: text.length > 9
104
+ };
101
105
  };
102
106
 
103
107
  exports.renderDiscount = renderDiscount;
@@ -179,16 +183,16 @@ function (_super) {
179
183
  small: true
180
184
  }), (((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) || showDiscountTag) && data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
181
185
  className: "discount-tag"
182
- }, isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% off")), /*#__PURE__*/_react["default"].createElement("div", {
186
+ }, isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% " + (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
183
187
  className: "content-wrap"
184
- }, /*#__PURE__*/_react["default"].createElement("div", {
188
+ }, showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement("div", {
185
189
  className: "product-name-wrap"
186
190
  }, /*#__PURE__*/_react["default"].createElement("div", {
187
191
  className: "box"
188
192
  }, prodLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
189
193
  labels: prodLabels,
190
194
  small: true
191
- }), showProName && panelProps.productName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
195
+ }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
192
196
  data: __assign(__assign({}, panelProps.productName), {
193
197
  text: data.offerName
194
198
  }),
@@ -237,7 +241,7 @@ function (_super) {
237
241
  className: "sold"
238
242
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
239
243
  data: __assign(__assign({}, panelProps.sold), {
240
- text: "Sold " + soldNumber
244
+ text: (0, _locale.i18n)('SOLD') + " " + soldNumber
241
245
  }),
242
246
  readonly: true
243
247
  }))), intelligentType === 'Coupon' && data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
@@ -245,12 +249,15 @@ function (_super) {
245
249
  }, data.coupons.map(function (m) {
246
250
  return /*#__PURE__*/_react["default"].createElement("div", {
247
251
  key: m.couponId,
248
- className: (0, _classnames["default"])('item', m.discountMethod)
252
+ className: (0, _classnames["default"])('item', m.discountMethod, {
253
+ big: renderDiscount(m).isBig,
254
+ hide: renderDiscount(m).isHide
255
+ })
249
256
  }, /*#__PURE__*/_react["default"].createElement("div", {
250
257
  className: "name"
251
258
  }, (0, _locale.i18n)('DISCOUNT')), /*#__PURE__*/_react["default"].createElement("div", {
252
259
  className: "num"
253
- }, renderDiscount(m)));
260
+ }, renderDiscount(m).text));
254
261
  })), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
255
262
  className: "progress-wrap"
256
263
  }, ((_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 CHANGED
@@ -10,7 +10,7 @@
10
10
  .img-wrap {
11
11
  position: relative;
12
12
  border-radius: 8px;
13
- overflow: hidden;
13
+ // overflow: hidden;
14
14
 
15
15
  .product-img {
16
16
  width: 140px;
@@ -156,6 +156,8 @@
156
156
  display: flex;
157
157
  flex-wrap: wrap;
158
158
  margin-top: 8px;
159
+ max-height: 48px;
160
+ overflow: hidden;
159
161
 
160
162
  .item {
161
163
  display: block;
@@ -164,7 +166,7 @@
164
166
  color: #F47A46;
165
167
  background: url('./imgs/coupon-orange.png') no-repeat center;
166
168
  background-size: 100% !important;
167
- margin-right: 6px;
169
+ margin-right: 5px;
168
170
  margin-bottom: 4px;
169
171
  line-height: 1;
170
172
  text-align: center;
@@ -175,6 +177,24 @@
175
177
  background: url('./imgs/coupon-red.png') no-repeat center;
176
178
  }
177
179
 
180
+ &.DISC.big {
181
+ background: url('./imgs/coupon-red-big.png') no-repeat center;
182
+ }
183
+
184
+ &.big {
185
+ width: 75px;
186
+ background: url('./imgs/coupon-orange-big.png') no-repeat center;
187
+
188
+ .num,
189
+ .name {
190
+ width: 62px;
191
+ }
192
+ }
193
+
194
+ &.hide {
195
+ display: none;
196
+ }
197
+
178
198
  .name {
179
199
  font-size: 5px;
180
200
  width: 40px;
@@ -239,6 +259,7 @@
239
259
 
240
260
  .img-wrap {
241
261
  border-radius: 8px 0 0 8px;
262
+ margin-right: 8px;
242
263
 
243
264
  .product-img {
244
265
  width: 100px;
package/lib/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var _classnames = _interopRequireDefault(require("classnames"));
11
11
 
12
+ var _locale = require("../../../../locale");
13
+
12
14
  var _commonUtil = require("../../../../utils/commonUtil");
13
15
 
14
16
  var _currencyUtil = require("../../../../utils/currencyUtil");
@@ -240,7 +242,7 @@ function (_super) {
240
242
  className: "progress-wrap"
241
243
  }, /*#__PURE__*/_react["default"].createElement("span", {
242
244
  className: "text"
243
- }, salePercent, "% Sold"), /*#__PURE__*/_react["default"].createElement("div", {
245
+ }, salePercent, "% ", (0, _locale.i18n)('SOLD')), /*#__PURE__*/_react["default"].createElement("div", {
244
246
  className: "progress-container"
245
247
  }, /*#__PURE__*/_react["default"].createElement("div", {
246
248
  className: "progress",
package/lib/composite-comp/dito/components/FlashDeal/mobile/index.less CHANGED
@@ -76,12 +76,12 @@
76
76
  justify-content: flex-start;
77
77
  }
78
78
  .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap {
79
- width: 2.84rem;
79
+ width: 2.44rem;
80
80
  margin-right: 0.16rem;
81
81
  }
82
82
  .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap .product-img {
83
- height: 2.8rem;
84
- width: 2.8rem;
83
+ height: 2.4rem;
84
+ width: 2.4rem;
85
85
  }
86
86
  .m-flash-deal-mobile .flash-deal-list-horizontal {
87
87
  display: flex;
package/lib/composite-comp/monpay/components/InterestProducts/mobile/ProductItem/index.js CHANGED
@@ -19,6 +19,8 @@ var _ImageLabel = _interopRequireDefault(require("../../../../../common/componen
19
19
 
20
20
  require("./index.less");
21
21
 
22
+ var _locale = require("../../../../../../locale");
23
+
22
24
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
23
25
 
24
26
  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) {
116
118
  small: true
117
119
  }), data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
118
120
  className: "discount-tag"
119
- }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
121
+ }, data.discountPercent, "% ", (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
120
122
  className: "content-wrap"
121
123
  }, /*#__PURE__*/_react["default"].createElement("div", {
122
124
  className: "product-name-wrap"
@@ -152,7 +154,7 @@ function (_super) {
152
154
  className: "line"
153
155
  }), /*#__PURE__*/_react["default"].createElement("div", {
154
156
  className: "sold"
155
- }, "Sold ", soldNumber))));
157
+ }, (0, _locale.i18n)('SOLD'), " ", soldNumber))));
156
158
  };
157
159
 
158
160
  ProductItem.defaultProps = {
package/lib/composite-comp/monpay/components/InterestProducts/mobile/index.js CHANGED
@@ -311,7 +311,7 @@ function (_super) {
311
311
  interest: res.interest || {},
312
312
  list: list
313
313
  });
314
- if (list.length > 0) this.getMacy();
314
+ if (list.length > 0 && document.querySelector(".macyContainer_" + this.props.panelProps.id)) this.getMacy();
315
315
  return [2
316
316
  /*return*/
317
317
  ];
package/lib/composite-comp/monpay/components/MonpayFlashDeal/mobile/index.js CHANGED
@@ -11,6 +11,8 @@ require("./index.less");
11
11
 
12
12
  var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
13
13
 
14
+ var _locale = require("../../../../../locale");
15
+
14
16
  var _MonpayProductItem = _interopRequireDefault(require("../../../../common/components/MonpayProductItem"));
15
17
 
16
18
  var _coreUtil = require("../../../../../utils/coreUtil");
@@ -426,7 +428,7 @@ function (_super) {
426
428
  className: "time"
427
429
  }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
428
430
  className: "status"
429
- }, item.cmpState === 'A' ? 'Coming Soon' : 'On Going'));
431
+ }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
430
432
  })), /*#__PURE__*/_react["default"].createElement("div", {
431
433
  className: "flash-deal-list"
432
434
  }, _list.map(function (item) {
package/lib/composite-comp/monpay/components/MonpayFlashDeal/pc/index.js CHANGED
@@ -13,6 +13,8 @@ var _lodash = _interopRequireDefault(require("lodash.throttle"));
13
13
 
14
14
  var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
15
15
 
16
+ var _locale = require("../../../../../locale");
17
+
16
18
  var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
17
19
 
18
20
  var _coreUtil = require("../../../../../utils/coreUtil");
@@ -529,7 +531,7 @@ function (_super) {
529
531
  className: "time"
530
532
  }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
531
533
  className: "status"
532
- }, item.cmpState === 'A' ? 'Coming Soon' : 'On Going'));
534
+ }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
533
535
  })), /*#__PURE__*/_react["default"].createElement("div", {
534
536
  className: "flash-deal-content"
535
537
  }, /*#__PURE__*/_react["default"].createElement("div", {
package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.js CHANGED
@@ -141,7 +141,9 @@ function SearchCondition(props) {
141
141
  color: "#848484",
142
142
  size: 16,
143
143
  type: "icon-list-sort"
144
- })), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('SORT_BY'), ":")), /*#__PURE__*/_react["default"].createElement("div", {
144
+ })), /*#__PURE__*/_react["default"].createElement("span", {
145
+ className: "sortBy"
146
+ }, (0, _locale.i18n)('SORT_BY'), ":")), /*#__PURE__*/_react["default"].createElement("div", {
145
147
  className: "rightWrap"
146
148
  }, (isBundle ? bundleSortList : sortList).map(function (srt) {
147
149
  return /*#__PURE__*/_react["default"].createElement("div", {
package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/SearchCondition/index.less CHANGED
@@ -10,7 +10,6 @@
10
10
  display: flex;
11
11
  align-items: center;
12
12
  justify-content: space-between;
13
- width: 2.8rem;
14
13
  flex-shrink: 0;
15
14
  padding-right: 0.16rem;
16
15
  }
@@ -40,6 +39,9 @@
40
39
  text-overflow: ellipsis;
41
40
  white-space: nowrap;
42
41
  }
42
+ .searchCondWrap .sortBy {
43
+ margin-left: 0.12rem;
44
+ }
43
45
  .searchCondWrap .sortItem + .sortItem {
44
46
  margin-left: 0.2rem;
45
47
  }
package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js CHANGED
@@ -236,9 +236,9 @@ var defaultData = [{
236
236
  imgUrlContent: {
237
237
  url: _card["default"]
238
238
  },
239
- offerName: 'Product Name',
239
+ offerName: 'Product Name Long Long Long Long Long',
240
240
  salesPrice: 10000,
241
- specialPrice: 8000,
241
+ specialPrice: null,
242
242
  marketPrice: 20000,
243
243
  salePercent: 500,
244
244
  discountPercent: 90,
@@ -249,7 +249,19 @@ var defaultData = [{
249
249
  }, {
250
250
  couponId: '2',
251
251
  discountMethod: 'AMT',
252
+ discountAmount: 100
253
+ }, {
254
+ couponId: '3',
255
+ discountMethod: 'AMT',
256
+ discountAmount: 1000
257
+ }, {
258
+ couponId: '4',
259
+ discountMethod: 'AMT',
252
260
  discountAmount: 10000
261
+ }, {
262
+ couponId: '5',
263
+ discountMethod: 'AMT',
264
+ discountAmount: 100000
253
265
  }]
254
266
  }, {
255
267
  imgUrlContent: {
@@ -264,7 +276,7 @@ var defaultData = [{
264
276
  imgUrlContent: {
265
277
  url: _card["default"]
266
278
  },
267
- offerName: 'Product Name',
279
+ offerName: 'Product Name Long Long Long Long Long',
268
280
  salesPrice: 18000000,
269
281
  specialPrice: 18000000,
270
282
  marketPrice: 19000000,
@@ -845,6 +857,7 @@ function (_super) {
845
857
  return /*#__PURE__*/_react["default"].createElement(_MonpayProductItem["default"], {
846
858
  key: "scroll_" + item.productId,
847
859
  data: item,
860
+ fixHeight: true,
848
861
  imgHeight: imgHeight,
849
862
  imgWidth: imgWidth,
850
863
  intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType,
package/lib/constants/index.js CHANGED
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  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;
7
7
  var STORAGE_KEY = {
8
+ FISHX_LOCALE: 'fishx_locale',
8
9
  LOCALE: 'ZSMART_LOCALE',
9
10
  MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
10
11
  MAGIC_RENDER_PAGEDATA: 'MAGIC_RENDER_PAGEDATA',
package/lib/locale/en/en.json CHANGED
@@ -1,4 +1,7 @@
1
1
  {
2
+ "OFF": "off",
3
+ "ON_GOING": "On Going",
4
+ "COMING_SOON": "Coming soon",
2
5
  "EXPDATE": "ExpDate",
3
6
  "EFFDATE": "EffDate",
4
7
  "MISSION_NAME": "Mission Name",
@@ -22,7 +25,6 @@
22
25
  "STORE": "Store",
23
26
  "PAGE_NAME": "Page Name",
24
27
  "CATEGORY": "Category",
25
- "COMING_SOON": "Coming soon",
26
28
  "CASHBACK": "Cashback",
27
29
  "CREDIT": "Credit",
28
30
  "BNPL": "BNPL",
package/lib/locale/es/es.json CHANGED
@@ -1,4 +1,7 @@
1
1
  {
2
+ "OFF": "off",
3
+ "ON_GOING": "On Going",
4
+ "COMING_SOON": "Coming soon",
2
5
  "EXPDATE": "ExpDate",
3
6
  "EFFDATE": "EffDate",
4
7
  "MISSION_NAME": "Mission Name",
@@ -22,7 +25,6 @@
22
25
  "STORE": "Tienda",
23
26
  "PAGE_NAME": "Page Name",
24
27
  "CATEGORY": "Categoría",
25
- "COMING_SOON": "Coming soon",
26
28
  "CASHBACK": "Cashback",
27
29
  "CREDIT": "Credit",
28
30
  "BNPL": "BNPL",
package/lib/locale/index.js CHANGED
@@ -20,7 +20,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
20
20
  var localeMap = {
21
21
  en: _en["default"],
22
22
  es: _es["default"],
23
- mn: _mn["default"]
23
+ mn: _mn["default"],
24
+ 'id-ID': _mn["default"]
24
25
  };
25
26
  /** 国际化 */
26
27
 
@@ -29,7 +30,7 @@ function i18n(key, args) {
29
30
  args = {};
30
31
  }
31
32
 
32
- var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
33
+ var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
33
34
  var localeObj = localeMap[locale || 'en'] || _en["default"];
34
35
  var tempString = localeObj[key];
35
36
 
package/lib/locale/mn/mn.json CHANGED
@@ -1,4 +1,7 @@
1
1
  {
2
+ "OFF": "off",
3
+ "ON_GOING": "Явж байна",
4
+ "COMING_SOON": "Тун удахгүй",
2
5
  "EXPDATE": "ExpDate",
3
6
  "EFFDATE": "Хасах огноо",
4
7
  "MISSION_NAME": "Номлолын нэр",
@@ -22,7 +25,6 @@
22
25
  "STORE": "Дэлгүүр",
23
26
  "PAGE_NAME": "Хуудасны нэр",
24
27
  "CATEGORY": "Ангилал",
25
- "COMING_SOON": "Тун удахгүй",
26
28
  "CASHBACK": "Бэлэн мөнгө буцааж авах",
27
29
  "CREDIT": "Зээл",
28
30
  "BNPL": "BNPL",
@@ -154,7 +156,7 @@
154
156
  "SESSION_TIME": "Сеанс цаг",
155
157
  "COUNTDOWN": "Countdown",
156
158
  "FILTER": "Шүүлтүүр",
157
- "SOLD": "Борлуулсан",
159
+ "SOLD": "Sold",
158
160
  "EVALUATION_SCORE": "Үнэлгээний оноо",
159
161
  "SEARCH_BAR_KEYWORD": "Хайлтын мөрний түлхүүр үг",
160
162
  "BOX_BACKGROUND": "Хайрцагны дэвсгэр",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "2.0.153",
4
+ "version": "2.0.158",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",