@fonixtree/magic-design 2.0.125 → 2.0.127

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 (69) hide show
  1. package/es/assets/fonts/Inter-Bold.ttf +0 -0
  2. package/es/assets/fonts/Inter-Regular.ttf +0 -0
  3. package/es/assets/fonts/Inter-SemiBold.ttf +0 -0
  4. package/es/assets/less/font.less +22 -1
  5. package/es/composite-comp/bol/components/WalletNuri/mobile/index.js +8 -4
  6. package/es/composite-comp/common/components/MonpayProductItem/index.js +9 -35
  7. package/es/composite-comp/common/components/MonpayProductItem/index.less +16 -12
  8. package/es/composite-comp/common/components/ProductItem/index.js +2 -2
  9. package/es/composite-comp/common/config-panels/InputField/index.js +4 -6
  10. package/es/composite-comp/dito/components/MenuNavigation/MenuNavMetaImage/index.less +3 -1
  11. package/es/composite-comp/dito/components/MobileNavigation/mobile/index.js +1 -1
  12. package/es/composite-comp/dito/components/SearchBar/defaultJSON.js +5 -0
  13. package/es/composite-comp/dito/components/SearchBar/mobile/index.js +38 -25
  14. package/es/composite-comp/dito/components/SearchBar/mobile/index.less +4 -1
  15. package/es/composite-comp/dito/components/SearchBar/pc/index.js +27 -14
  16. package/es/composite-comp/dito/config-panels/PcNavigationConfig/TextOnlyFontConfig/index.js +3 -1
  17. package/es/composite-comp/dito/config-panels/SearchBarConfig/SearchBarConfigContent/index.js +21 -1
  18. package/es/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less +1 -1
  19. package/es/composite-comp/monpay/components/InterestProducts/mobile/index.js +2 -2
  20. package/es/composite-comp/monpay/components/MonpayFlashDeal/defaultJSON.js +6 -6
  21. package/es/composite-comp/monpay/components/MonpayFlashDeal/mobile/index.less +1 -3
  22. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +22 -24
  23. package/es/composite-comp/monpay/components/MonpaySignBoard/mobile/index.js +2 -7
  24. package/es/composite-comp/monpay/components/MonpaySignBoard/mobile/index.less +1 -1
  25. package/es/constants/index.js +1 -1
  26. package/es/core/Renderer/index.js +2 -1
  27. package/es/locale/en/en.json +2 -0
  28. package/es/locale/es/es.json +2 -0
  29. package/es/locale/id/id.json +2 -0
  30. package/es/locale/index.js +2 -1
  31. package/es/meta-comp/config-panels/ButtonConfig/index.js +3 -1
  32. package/es/meta-comp/config-panels/TextConfig/index.js +7 -2
  33. package/es/meta-comp/config-panels/TextConfig/index.less +2 -0
  34. package/es/utils/currencyUtil.js +9 -1
  35. package/lib/assets/fonts/Inter-Bold.ttf +0 -0
  36. package/lib/assets/fonts/Inter-Regular.ttf +0 -0
  37. package/lib/assets/fonts/Inter-SemiBold.ttf +0 -0
  38. package/lib/assets/less/font.less +22 -1
  39. package/lib/composite-comp/bol/components/WalletNuri/mobile/index.js +8 -4
  40. package/lib/composite-comp/common/components/MonpayProductItem/index.js +9 -35
  41. package/lib/composite-comp/common/components/MonpayProductItem/index.less +16 -12
  42. package/lib/composite-comp/common/components/ProductItem/index.js +2 -2
  43. package/lib/composite-comp/common/config-panels/InputField/index.js +4 -6
  44. package/lib/composite-comp/dito/components/MenuNavigation/MenuNavMetaImage/index.less +3 -1
  45. package/lib/composite-comp/dito/components/MobileNavigation/mobile/index.js +1 -1
  46. package/lib/composite-comp/dito/components/SearchBar/defaultJSON.js +5 -0
  47. package/lib/composite-comp/dito/components/SearchBar/mobile/index.js +38 -25
  48. package/lib/composite-comp/dito/components/SearchBar/mobile/index.less +4 -1
  49. package/lib/composite-comp/dito/components/SearchBar/pc/index.js +27 -14
  50. package/lib/composite-comp/dito/config-panels/PcNavigationConfig/TextOnlyFontConfig/index.js +3 -1
  51. package/lib/composite-comp/dito/config-panels/SearchBarConfig/SearchBarConfigContent/index.js +21 -1
  52. package/lib/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less +1 -1
  53. package/lib/composite-comp/monpay/components/InterestProducts/mobile/index.js +2 -2
  54. package/lib/composite-comp/monpay/components/MonpayFlashDeal/defaultJSON.js +6 -6
  55. package/lib/composite-comp/monpay/components/MonpayFlashDeal/mobile/index.less +1 -3
  56. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +22 -24
  57. package/lib/composite-comp/monpay/components/MonpaySignBoard/mobile/index.js +2 -7
  58. package/lib/composite-comp/monpay/components/MonpaySignBoard/mobile/index.less +1 -1
  59. package/lib/constants/index.js +1 -1
  60. package/lib/core/Renderer/index.js +2 -1
  61. package/lib/locale/en/en.json +2 -0
  62. package/lib/locale/es/es.json +2 -0
  63. package/lib/locale/id/id.json +2 -0
  64. package/lib/locale/index.js +2 -1
  65. package/lib/meta-comp/config-panels/ButtonConfig/index.js +3 -1
  66. package/lib/meta-comp/config-panels/TextConfig/index.js +7 -2
  67. package/lib/meta-comp/config-panels/TextConfig/index.less +2 -0
  68. package/lib/utils/currencyUtil.js +9 -1
  69. package/package.json +1 -1
@@ -278,8 +278,8 @@ function (_super) {
278
278
  waitForImages: false,
279
279
  useOwnImageLoader: false,
280
280
  margin: {
281
- x: 12,
282
- y: 12
281
+ x: 16,
282
+ y: 16
283
283
  },
284
284
  columns: 2
285
285
  });
@@ -75,7 +75,7 @@ var getDefaultJSON = function getDefaultJSON() {
75
75
  id: (0, _uuid.v4)(),
76
76
  open: true,
77
77
  type: 'BUTTON',
78
- text: 'Shop More',
78
+ text: 'See All',
79
79
  content: {
80
80
  url: '',
81
81
  backgroundColor: ''
@@ -83,10 +83,10 @@ var getDefaultJSON = function getDefaultJSON() {
83
83
  buttonText: {
84
84
  sizeType: 'Customize font styles',
85
85
  fontFamily: 'Open Sans',
86
- fontWeight: 600,
87
- fontSize: 12,
86
+ fontWeight: 400,
87
+ fontSize: 14,
88
88
  fontStyle: 'normal',
89
- color: '#0038A8',
89
+ color: '#FF8650',
90
90
  padding: '0'
91
91
  },
92
92
  buttonBorder: {
@@ -109,7 +109,7 @@ var getDefaultJSON = function getDefaultJSON() {
109
109
  }
110
110
  },
111
111
  buttonIcon: {
112
- iconUrl: '/get/resource/platform/conf/20220719/picture/icon-arrow-right-s1549371733179686912.png',
112
+ iconUrl: '',
113
113
  layout: 'right'
114
114
  },
115
115
  hover: null
@@ -300,7 +300,7 @@ var getDefaultJSON = function getDefaultJSON() {
300
300
  mobile: {
301
301
  paddingTop: 0,
302
302
  paddingBottom: 0,
303
- paddingLeft: 0,
303
+ paddingLeft: 20,
304
304
  paddingRight: 0,
305
305
  marginBottom: window.magicDesign.compSpacing
306
306
  }
@@ -1,6 +1,3 @@
1
- .monpay-flash-deal-mobile {
2
- padding: 0.32rem;
3
- }
4
1
  .monpay-flash-deal-mobile .flash-deal-title {
5
2
  display: flex;
6
3
  justify-content: space-between;
@@ -36,6 +33,7 @@
36
33
  .monpay-flash-deal-mobile .flash-deal-title .right {
37
34
  display: flex;
38
35
  align-items: center;
36
+ margin-right: 0.4rem;
39
37
  }
40
38
  .monpay-flash-deal-mobile .flash-deal-title .right .text {
41
39
  font-family: 'Montserrat';
@@ -235,25 +235,27 @@ var defaultData = [{
235
235
  url: _card["default"]
236
236
  },
237
237
  offerName: 'Product Name',
238
- salesPrice: 18000000,
239
- specialPrice: 18000000,
240
- marketPrice: 19000000,
238
+ salesPrice: 10000,
239
+ specialPrice: 8000,
240
+ marketPrice: 20000,
241
241
  salePercent: 500,
242
242
  coupons: [{
243
243
  couponId: '1',
244
- discountMethod: 'DISC'
244
+ discountMethod: 'DISC',
245
+ discountAmount: 30
245
246
  }, {
246
247
  couponId: '2',
247
- discountMethod: 'AMT'
248
+ discountMethod: 'AMT',
249
+ discountAmount: 10000
248
250
  }]
249
251
  }, {
250
252
  imgUrlContent: {
251
253
  url: _card["default"]
252
254
  },
253
255
  offerName: 'Product Name',
254
- salesPrice: 18000000,
255
- specialPrice: 18000000,
256
- marketPrice: 19000000,
256
+ salesPrice: 10000,
257
+ specialPrice: null,
258
+ marketPrice: 20000,
257
259
  salePercent: 500
258
260
  }, {
259
261
  imgUrlContent: {
@@ -263,6 +265,7 @@ var defaultData = [{
263
265
  salesPrice: 18000000,
264
266
  specialPrice: 18000000,
265
267
  marketPrice: 19000000,
268
+ discountPercent: 10,
266
269
  salePercent: 500
267
270
  }, {
268
271
  imgUrlContent: {
@@ -607,8 +610,8 @@ function (_super) {
607
610
  waitForImages: false,
608
611
  useOwnImageLoader: false,
609
612
  margin: {
610
- x: 12,
611
- y: 12
613
+ x: 16,
614
+ y: 16
612
615
  },
613
616
  columns: columns
614
617
  });
@@ -645,18 +648,7 @@ function (_super) {
645
648
  return _this;
646
649
  }
647
650
 
648
- RecommendMobile.prototype.componentDidMount = function () {// const { panelProps } = this.props;
649
- // const source = [];
650
- // panelProps.groupSource.map(m => {
651
- // const show = m.image.open || m.groupName.open;
652
- // if (show) source.push(m);
653
- // });
654
- // this.setState({ groupSource: source }, () => {
655
- // this.initTab(0);
656
- // this.getProductList(0);
657
- // });
658
- // this.listenWidth();
659
- };
651
+ RecommendMobile.prototype.componentDidMount = function () {};
660
652
 
661
653
  RecommendMobile.prototype.componentWillReceiveProps = function (nextProps) {
662
654
  var _this = this;
@@ -805,6 +797,8 @@ function (_super) {
805
797
  key: "macyContainer",
806
798
  className: "macyContainer macyContainer_" + panelProps.id
807
799
  }, _products.map(function (item) {
800
+ var _a;
801
+
808
802
  return /*#__PURE__*/_react["default"].createElement(_MonpayProductItem["default"], {
809
803
  key: item.productId,
810
804
  data: item,
@@ -824,7 +818,8 @@ function (_super) {
824
818
  (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
825
819
  },
826
820
  panelProps: panelProps.content,
827
- showProgress: false
821
+ showProgress: false,
822
+ intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType
828
823
  });
829
824
  })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
830
825
  className: "btnSeeAll",
@@ -837,6 +832,8 @@ function (_super) {
837
832
  }, /*#__PURE__*/_react["default"].createElement("div", {
838
833
  className: "scrollProductList"
839
834
  }, _products.map(function (item) {
835
+ var _a;
836
+
840
837
  return /*#__PURE__*/_react["default"].createElement(_MonpayProductItem["default"], {
841
838
  key: "scroll_" + item.productId,
842
839
  data: item,
@@ -851,7 +848,8 @@ function (_super) {
851
848
  (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
852
849
  },
853
850
  panelProps: panelProps.content,
854
- showProgress: false
851
+ showProgress: false,
852
+ intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType
855
853
  });
856
854
  })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
857
855
  className: "btnSeeAll",
@@ -351,7 +351,7 @@ function (_super) {
351
351
  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
352
352
  onClick: _commonUtil.navigateBack,
353
353
  color: "#000",
354
- size: (0, _commonUtil.convertToRem)(20),
354
+ size: (0, _commonUtil.convertToRem)(16),
355
355
  type: "icon-outlined-left"
356
356
  }), ((_b = (_a = data.content) === null || _a === void 0 ? void 0 : _a.box) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
357
357
  className: "input-wrap",
@@ -374,12 +374,7 @@ function (_super) {
374
374
  size: (0, _commonUtil.convertToRem)(20),
375
375
  fontWeight: 600,
376
376
  type: "icon-search2"
377
- }))), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
378
- color: "#000",
379
- size: (0, _commonUtil.convertToRem)(20),
380
- type: "icon-share-points",
381
- onClick: this.onShare
382
- })), /*#__PURE__*/_react["default"].createElement("div", {
377
+ })))), /*#__PURE__*/_react["default"].createElement("div", {
383
378
  className: "store-info-wrap"
384
379
  }, /*#__PURE__*/_react["default"].createElement("img", {
385
380
  className: "store-logo",
@@ -1,7 +1,6 @@
1
1
  .m-sign-board-wrap .header-wrap {
2
2
  display: flex;
3
3
  align-items: center;
4
- justify-content: space-between;
5
4
  background-color: #fff;
6
5
  padding: 0.16rem 0.4rem;
7
6
  height: 1.14rem;
@@ -14,6 +13,7 @@
14
13
  display: flex;
15
14
  justify-content: space-between;
16
15
  align-items: center;
16
+ margin-left: 0.4rem;
17
17
  }
18
18
  .m-sign-board-wrap .header-wrap .input-wrap input {
19
19
  width: 3.7rem;
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = 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.baseUrlMap = exports.STORE_KEY = exports.STORAGE_KEY = exports.ORDER_TYPE = exports.CREDIT_STATE = void 0;
7
7
  var STORAGE_KEY = {
8
- LOCALE: 'magicLocale',
8
+ LOCALE: 'ZSMART_LOCALE',
9
9
  MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
10
10
  MAGIC_RENDER_PAGEDATA: 'MAGIC_RENDER_PAGEDATA',
11
11
  FONIXTREE_AI_IMG_HIS: 'fonixtree_ai_img_his'
@@ -157,7 +157,8 @@ var Renderer = function Renderer(props) {
157
157
  }
158
158
 
159
159
  return {
160
- overflow: 'auto'
160
+ overflowY: 'auto',
161
+ overflowX: 'hidden'
161
162
  };
162
163
  };
163
164
 
@@ -1,4 +1,6 @@
1
1
  {
2
+ "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
3
+ "INTER": "Inter",
2
4
  "STORE_SERVICES": "Store services",
3
5
  "SHIP_ON_TIME": "Ship on time",
4
6
  "COMMODITY_QUALITY": "Commodity Quality",
@@ -1,4 +1,6 @@
1
1
  {
2
+ "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
3
+ "INTER": "Inter",
2
4
  "STORE_SERVICES": "Store services",
3
5
  "SHIP_ON_TIME": "Ship on time",
4
6
  "COMMODITY_QUALITY": "Commodity Quality",
@@ -1,4 +1,6 @@
1
1
  {
2
+ "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
3
+ "INTER": "Inter",
2
4
  "STORE_SERVICES": "Store services",
3
5
  "SHIP_ON_TIME": "Ship on time",
4
6
  "COMMODITY_QUALITY": "Commodity Quality",
@@ -27,7 +27,8 @@ function i18n(key, args) {
27
27
  args = {};
28
28
  }
29
29
 
30
- var tempString = localeMap[_mobx.store.locale || 'en'][key];
30
+ var locale = localeMap[_mobx.store.locale || 'en'] || _en["default"];
31
+ var tempString = locale[key];
31
32
 
32
33
  if (tempString) {
33
34
  var str_1 = tempString;
@@ -195,7 +195,9 @@ function (_super) {
195
195
  value: "Montserrat"
196
196
  }, (0, _locale.i18n)('MONTSERRAT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
197
197
  value: "Open Sans"
198
- }, (0, _locale.i18n)('OPEN_SANS')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
198
+ }, (0, _locale.i18n)('OPEN_SANS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
199
+ value: "Inter"
200
+ }, (0, _locale.i18n)('INTER')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
199
201
  title: (0, _locale.i18n)('FONT_WEIGHT')
200
202
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
201
203
  onChange: function onChange(v) {
@@ -232,7 +232,9 @@ function (_super) {
232
232
  value: "Montserrat"
233
233
  }, (0, _locale.i18n)('MONTSERRAT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
234
234
  value: "Open Sans"
235
- }, (0, _locale.i18n)('OPEN_SANS')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
235
+ }, (0, _locale.i18n)('OPEN_SANS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
236
+ value: "Inter"
237
+ }, (0, _locale.i18n)('INTER')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
236
238
  title: (0, _locale.i18n)('FONT_WEIGHT')
237
239
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
238
240
  onChange: function onChange(v) {
@@ -360,7 +362,10 @@ function (_super) {
360
362
 
361
363
  return /*#__PURE__*/_react["default"].createElement("div", {
362
364
  ref: this.containerRef,
363
- className: "m-text-config"
365
+ className: "m-text-config",
366
+ style: {
367
+ paddingTop: 0
368
+ }
364
369
  }, /*#__PURE__*/_react["default"].createElement(_common.Collapse // divider="dashed"
365
370
  // headerSize="small"
366
371
  , {
@@ -2,7 +2,9 @@
2
2
  display: flex;
3
3
  flex-direction: column;
4
4
  padding: 0 12px;
5
+ padding-top: 12px;
5
6
  background-color: #F5F6F7;
7
+ border-radius: 6px;
6
8
 
7
9
  .edit-text-btn {
8
10
  margin: 8px auto;
@@ -102,9 +102,17 @@ var formatCurrency = function formatCurrency(num) {
102
102
  exports.formatCurrency = formatCurrency;
103
103
 
104
104
  var formatCurrencyWithSymbol = function formatCurrencyWithSymbol(num) {
105
+ var _a;
106
+
105
107
  var ret = formatCurrency(num);
108
+
109
+ if ((_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.isUnitBehind) {
110
+ return ret + " " + getPricePrefix();
111
+ }
112
+
106
113
  return getPricePrefix() + " " + ret;
107
- };
114
+ }; // Nuri项目使用
115
+
108
116
 
109
117
  exports.formatCurrencyWithSymbol = formatCurrencyWithSymbol;
110
118
 
Binary file
@@ -47,6 +47,28 @@
47
47
  font-style: normal;
48
48
  }
49
49
 
50
+ @font-face {
51
+ font-family: 'Inter';
52
+ src: url(../fonts/Inter-Bold.ttf);
53
+ font-weight: 700;
54
+ font-style: normal;
55
+ }
56
+
57
+ @font-face {
58
+ font-family: 'Inter';
59
+ src: url(../fonts/Inter-SemiBold.ttf);
60
+ font-weight: 600;
61
+ font-style: normal;
62
+ }
63
+
64
+ @font-face {
65
+ font-family: 'Inter';
66
+ src: url('../fonts/Inter-Regular.ttf');
67
+ font-weight: 400;
68
+ font-style: normal;
69
+ }
70
+
71
+
50
72
  @font-face {
51
73
  font-family: 'Trueno';
52
74
  src: url('../fonts/Trueno-Light.otf');
@@ -66,5 +88,4 @@
66
88
  src: url(../fonts/TruenoBd.otf);
67
89
  font-weight: 600;
68
90
  font-style: normal;
69
- font-display: swap;
70
91
  }
@@ -231,7 +231,7 @@ function (_super) {
231
231
  case 0:
232
232
  return [4
233
233
  /*yield*/
234
- , (0, _commonUtil.commonFetch)('/designer/v1//h5/nuri/distribute/commission')];
234
+ , (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/commission')];
235
235
 
236
236
  case 1:
237
237
  infoObj = _a.sent();
@@ -268,8 +268,12 @@ function (_super) {
268
268
  };
269
269
 
270
270
  _this.clickJump = function (title) {
271
- if (title !== 'Voucher') {
272
- (0, _coreUtil.clickUrl)('/main/my-commission');
271
+ if (title === 'Saldo') {
272
+ (0, _coreUtil.clickUrl)('/social-commerce/my-earnings');
273
+ } else if (title === 'Koin') {
274
+ (0, _coreUtil.clickUrl)('/my-points');
275
+ } else if (title === 'Voucher') {
276
+ (0, _coreUtil.clickUrl)('/my-coupon');
273
277
  }
274
278
  };
275
279
 
@@ -291,7 +295,7 @@ function (_super) {
291
295
  }
292
296
 
293
297
  WalletNuriMobile.prototype.componentDidMount = function () {
294
- if (localStorage.getItem('isLogin') === 'Y') {
298
+ if (localStorage.getItem('isLogin') === 'Y' && !(0, _coreUtil.isDesignMode)()) {
295
299
  this.getInfo();
296
300
  }
297
301
  };
@@ -92,7 +92,7 @@ var renderDiscount = function renderDiscount(data) {
92
92
  var text = '';
93
93
 
94
94
  if (AMT) {
95
- text = (0, _currencyUtil.formatCurrencyWithSymbol)(data.discountAmount);
95
+ text = (0, _currencyUtil.formatCurrency)(data.discountAmount);
96
96
  } else if (DISC) {
97
97
  var temp = (0, _currencyUtil.formatCurrency)(data.discountAmount, 2); // 折扣券处理:100 => 1%
98
98
 
@@ -125,43 +125,19 @@ function (_super) {
125
125
  onItemClick = _m.onItemClick,
126
126
  showProName = _m.showProName,
127
127
  showProgress = _m.showProgress,
128
+ intelligentType = _m.intelligentType,
128
129
  fixHeight = _m.fixHeight,
129
130
  layout = _m.layout,
130
131
  imgHeight = _m.imgHeight,
131
132
  imgWidth = _m.imgWidth,
132
133
  unknownPrice = _m.unknownPrice,
133
- rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
134
+ rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
134
135
 
135
136
  var promotions = (0, _businessUtil.getPromotionList)(data);
136
- var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
137
- /** 当是拼团时 显示价格 */
137
+ var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
138
+ price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.specialPrice) : (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
139
+ var oldPrice = data.specialPrice !== null && data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null; // const discount = Number(data.discountPercent) || 0;
138
140
 
139
- if (data.sppType && promotions.length) {
140
- price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
141
- }
142
-
143
- var integerPart = price;
144
- var decimalPart = null;
145
-
146
- if (unknownPrice) {
147
- if (price.length > 5) {
148
- integerPart = price.slice(0, -5).replace(/\d/g, '? ') + price.slice(-5);
149
- } else {
150
- integerPart = price.replace(/\d/, '? ');
151
- }
152
- } else if (Array.isArray(price)) {
153
- integerPart = price[0];
154
- decimalPart = price[1];
155
- }
156
-
157
- var pricePrefix = (0, _commonUtil.ensure)(function () {
158
- return window.systemParams.prefix;
159
- }, 'Rp');
160
-
161
- var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
162
-
163
- var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
164
- var discount = Number(data.discountPercent) || 0;
165
141
  var salePercent = Number(data.salePercent) / 100 || 0;
166
142
  var imgStyle = {};
167
143
  if (imgWidth) imgStyle.width = imgWidth;
@@ -229,7 +205,7 @@ function (_super) {
229
205
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
230
206
  className: "price",
231
207
  data: __assign(__assign({}, panelProps.activityPrice), {
232
- text: _price
208
+ text: price
233
209
  }),
234
210
  readonly: true
235
211
  }), priceLabels.length > 0 && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
@@ -239,9 +215,7 @@ function (_super) {
239
215
  className: "price-sold-wrap"
240
216
  }, /*#__PURE__*/_react["default"].createElement("div", {
241
217
  className: "old-price-wrap"
242
- }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
243
- className: "discount"
244
- }, "-", discount, "%"), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
218
+ }, oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
245
219
  className: "old-price",
246
220
  data: __assign(__assign({}, panelProps.salesPrice), {
247
221
  text: oldPrice
@@ -273,7 +247,7 @@ function (_super) {
273
247
  text: "Sold " + soldNumber
274
248
  }),
275
249
  readonly: true
276
- }))), data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
250
+ }))), intelligentType === 'Coupon' && data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
277
251
  className: "coupons-list"
278
252
  }, data.coupons.map(function (m) {
279
253
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -2,14 +2,15 @@
2
2
  display: flex;
3
3
  flex-direction: column;
4
4
  background: #FFFFFF;
5
- border: 1px solid #D2D9E5;
6
5
  width: 142px;
7
6
  cursor: pointer;
8
7
  position: relative;
9
- margin-right: 12px;
8
+ margin-right: 16px;
10
9
 
11
10
  .img-wrap {
12
11
  position: relative;
12
+ border-radius: 8px;
13
+ overflow: hidden;
13
14
 
14
15
  .product-img {
15
16
  width: 140px;
@@ -31,7 +32,6 @@
31
32
  }
32
33
 
33
34
  .content-wrap {
34
- padding: 12px;
35
35
 
36
36
  .promotions-wrap {
37
37
  display: flex;
@@ -64,14 +64,13 @@
64
64
  line-height: 18px;
65
65
  max-height: 40px;
66
66
  white-space: wrap;
67
+ margin-top: 8px;
67
68
  }
68
69
 
69
70
  .price-wrap {
70
71
  display: flex;
71
72
  align-items: center;
72
73
  flex-wrap: wrap;
73
- margin-top: 6px;
74
- margin-bottom: 4px;
75
74
 
76
75
  .price {
77
76
  width: auto !important;
@@ -84,7 +83,6 @@
84
83
 
85
84
  .price-sold-wrap {
86
85
  display: flex;
87
- margin-top: 0;
88
86
  align-items: center;
89
87
  white-space: nowrap;
90
88
  overflow: hidden;
@@ -106,12 +104,12 @@
106
104
  color: #fff;
107
105
  padding: 0 4px;
108
106
  background-color: #CE1126;
107
+ margin-right: 4px;
109
108
  }
110
109
 
111
110
  .old-price {
112
111
  text-decoration: line-through;
113
112
  width: fit-content;
114
- margin-left: 4px;
115
113
  }
116
114
  }
117
115
 
@@ -191,7 +189,7 @@
191
189
  }
192
190
 
193
191
  .progress-wrap {
194
- margin-top: 10px;
192
+ margin-top: 8px;
195
193
 
196
194
  .text {
197
195
  font-family: 'Montserrat';
@@ -232,11 +230,17 @@
232
230
 
233
231
  &.horizontal {
234
232
  flex-direction: row;
233
+ border: 1px solid #D2D9E5;
234
+ border-radius: 8px;
235
235
 
236
- .product-img {
237
- width: 100px;
238
- height: 100%;
239
- min-height: 100px;
236
+ .img-wrap {
237
+ border-radius: 8px 0 0 8px;
238
+
239
+ .product-img {
240
+ width: 100px;
241
+ height: 100%;
242
+ min-height: 100px;
243
+ }
240
244
  }
241
245
 
242
246
  .content-wrap {
@@ -135,9 +135,9 @@ function (_super) {
135
135
 
136
136
  var pricePrefix = (0, _commonUtil.ensure)(function () {
137
137
  return window.systemParams.prefix;
138
- }, 'Rp');
138
+ }, 'Rp'); // 蒙古项目货币符号在后面
139
139
 
140
- var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
140
+ var _price = integerPart + " " + (decimalPart ? '.' + decimalPart : '') + " " + pricePrefix;
141
141
 
142
142
  var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
143
143
  var discount = Number(data.discountPercent) || 0;
@@ -92,11 +92,7 @@ function (_super) {
92
92
  inputLabel = _a.inputLabel;
93
93
  var textData = data.content;
94
94
  return /*#__PURE__*/_react["default"].createElement("div", {
95
- className: "m-text-config",
96
- style: {
97
- paddingTop: 12,
98
- borderRadius: 6
99
- }
95
+ className: "m-text-config"
100
96
  }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
101
97
  title: inputLabel || (0, _locale.i18n)('PLACEHOLDER')
102
98
  }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
@@ -143,7 +139,9 @@ function (_super) {
143
139
  value: "Montserrat"
144
140
  }, (0, _locale.i18n)('MONTSERRAT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
145
141
  value: "Open Sans"
146
- }, (0, _locale.i18n)('OPEN_SANS')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
142
+ }, (0, _locale.i18n)('OPEN_SANS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
143
+ value: "Inter"
144
+ }, (0, _locale.i18n)('INTER')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
147
145
  title: (0, _locale.i18n)('FONT_WEIGHT')
148
146
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
149
147
  onChange: function onChange(v) {
@@ -4,10 +4,12 @@
4
4
  height: 100%;
5
5
  display: flex;
6
6
  justify-content: center;
7
+ max-height: 65px;
8
+
7
9
  // overflow: hidden;
8
10
  &>img {
9
11
  width: 100%;
10
- height: 100%;
12
+ // height: 100%;
11
13
  // object-fit: contain;
12
14
  transition: all .2s linear;
13
15
  vertical-align: initial;
@@ -118,7 +118,7 @@ function (_super) {
118
118
  className: "card-image",
119
119
  data: source.image,
120
120
  limitWidthHeight: true,
121
- maxHeight: 82,
121
+ maxHeight: 120,
122
122
  scale: 0.5
123
123
  })), source.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
124
124
  className: "card-text",