@fonixtree/magic-design 1.0.113 → 1.0.115

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/common/ColorPickerInput/index.less +2 -0
  2. package/es/composite-comp/common/components/ProductItem/index.js +25 -31
  3. package/es/composite-comp/common/components/ProductItem/index.less +1 -13
  4. package/es/composite-comp/dito/components/Bargain/defaultJSON.js +24 -0
  5. package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js +24 -0
  6. package/es/composite-comp/dito/components/GroupBuy/defaultJSON.js +24 -0
  7. package/es/composite-comp/dito/components/Recommend/defaultJSON.js +25 -1
  8. package/es/composite-comp/dito/components/Recommend/mobile/index.js +1 -1
  9. package/es/composite-comp/dito/components/Recommend/mobile/index.less +3 -0
  10. package/es/composite-comp/dito/components/SearchBanner/mobile/index.js +1 -1
  11. package/es/composite-comp/dito/config-panels/BargainConfig/FlashDealConfigContent/index.js +7 -0
  12. package/es/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js +7 -0
  13. package/es/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js +7 -0
  14. package/es/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigContent/index.js +9 -1
  15. package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js +2 -2
  16. package/es/locale/en/en.json +2 -0
  17. package/es/locale/es/es.json +2 -0
  18. package/es/locale/id/id.json +2 -0
  19. package/lib/common/ColorPickerInput/index.less +2 -0
  20. package/lib/composite-comp/common/components/ProductItem/index.js +25 -31
  21. package/lib/composite-comp/common/components/ProductItem/index.less +1 -13
  22. package/lib/composite-comp/dito/components/Bargain/defaultJSON.js +24 -0
  23. package/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js +24 -0
  24. package/lib/composite-comp/dito/components/GroupBuy/defaultJSON.js +24 -0
  25. package/lib/composite-comp/dito/components/Recommend/defaultJSON.js +25 -1
  26. package/lib/composite-comp/dito/components/Recommend/mobile/index.js +1 -1
  27. package/lib/composite-comp/dito/components/Recommend/mobile/index.less +3 -0
  28. package/lib/composite-comp/dito/components/SearchBanner/mobile/index.js +1 -1
  29. package/lib/composite-comp/dito/config-panels/BargainConfig/FlashDealConfigContent/index.js +7 -0
  30. package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js +7 -0
  31. package/lib/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js +7 -0
  32. package/lib/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigContent/index.js +9 -1
  33. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js +2 -2
  34. package/lib/locale/en/en.json +2 -0
  35. package/lib/locale/es/es.json +2 -0
  36. package/lib/locale/id/id.json +2 -0
  37. package/package.json +1 -1
package/es/common/ColorPickerInput/index.less CHANGED
@@ -1,4 +1,6 @@
1
1
  .m-color-picker-input {
2
+ position: relative;
3
+
2
4
  .input-color {
3
5
  height: 60px;
4
6
  background: #FFFFFF;
package/es/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -15,8 +15,6 @@ var _currencyUtil = require("../../../../utils/currencyUtil");
15
15
 
16
16
  var _common = require("../../../../common");
17
17
 
18
- var _locale = require("../../../../locale");
19
-
20
18
  var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
21
19
 
22
20
  var _components = require("../../../../meta-comp/components");
@@ -97,21 +95,21 @@ function (_super) {
97
95
  }
98
96
 
99
97
  ProductItem.prototype.render = function () {
100
- var _a, _b, _c, _d, _e, _f;
101
-
102
- var _g = this.props,
103
- data = _g.data,
104
- type = _g.type,
105
- panelProps = _g.panelProps,
106
- onItemClick = _g.onItemClick,
107
- showProName = _g.showProName,
108
- showProgress = _g.showProgress,
109
- fixHeight = _g.fixHeight,
110
- layout = _g.layout,
111
- imgHeight = _g.imgHeight,
112
- imgWidth = _g.imgWidth,
113
- unknownPrice = _g.unknownPrice,
114
- rest = __rest(_g, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
98
+ var _a, _b, _c, _d, _e, _f, _g;
99
+
100
+ var _h = this.props,
101
+ data = _h.data,
102
+ type = _h.type,
103
+ panelProps = _h.panelProps,
104
+ onItemClick = _h.onItemClick,
105
+ showProName = _h.showProName,
106
+ showProgress = _h.showProgress,
107
+ fixHeight = _h.fixHeight,
108
+ layout = _h.layout,
109
+ imgHeight = _h.imgHeight,
110
+ imgWidth = _h.imgWidth,
111
+ unknownPrice = _h.unknownPrice,
112
+ rest = __rest(_h, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
115
113
 
116
114
  var promotions = (0, _businessUtil.getPromotionList)(data);
117
115
  var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
@@ -162,7 +160,6 @@ function (_super) {
162
160
  var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
163
161
  return f.position === '7';
164
162
  })) || [];
165
- var soldNumber = data.salesCnt > 250 ? "" + (data.salesCnt - data.salesCnt % 250) : data.salesCnt || 0;
166
163
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
167
164
  className: (0, _classnames["default"])('m-product-item-wrap', {
168
165
  fixHeight: fixHeight,
@@ -232,9 +229,13 @@ function (_super) {
232
229
  className: "price-sold-wrap"
233
230
  }, /*#__PURE__*/_react["default"].createElement("div", {
234
231
  className: "old-price-wrap"
235
- }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
236
- className: type === 'groupBuy' || type === 'bargain' ? 'discount2' : 'discount'
237
- }, "-", discount, "%"), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
232
+ }, !!discount && ((_d = panelProps.discountLabel) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
233
+ className: "discount",
234
+ data: __assign(__assign({}, panelProps.discountLabel), {
235
+ text: "-" + discount + "%"
236
+ }),
237
+ readonly: true
238
+ }), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
238
239
  className: "old-price",
239
240
  data: __assign(__assign({}, panelProps.salesPrice), {
240
241
  text: oldPrice
@@ -243,16 +244,9 @@ function (_super) {
243
244
  style: {
244
245
  color: panelProps.salesPrice.content.color
245
246
  }
246
- })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && /*#__PURE__*/_react["default"].createElement("div", {
247
+ })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && ((_e = panelProps.sold) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
247
248
  className: "sold-count"
248
- }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
249
- className: "sold"
250
- }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
251
- data: __assign(__assign({}, panelProps.sold), {
252
- text: (0, _locale.i18n)('SOLD') + " " + soldNumber + "+"
253
- }),
254
- readonly: true
255
- })), showProgress && ((_e = panelProps.salesProgressVisible) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
249
+ }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), showProgress && ((_f = panelProps.salesProgressVisible) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
256
250
  className: "progress-wrap"
257
251
  }, /*#__PURE__*/_react["default"].createElement("span", {
258
252
  className: "text"
@@ -262,7 +256,7 @@ function (_super) {
262
256
  className: "progress",
263
257
  style: {
264
258
  width: salePercent + "%",
265
- backgroundColor: (_f = panelProps.salesProgressVisible) === null || _f === void 0 ? void 0 : _f.color
259
+ backgroundColor: (_g = panelProps.salesProgressVisible) === null || _g === void 0 ? void 0 : _g.color
266
260
  }
267
261
  })))));
268
262
  };
package/es/composite-comp/common/components/ProductItem/index.less CHANGED
@@ -83,25 +83,13 @@
83
83
  line-height: 13px;
84
84
 
85
85
  .discount {
86
- margin-right: 3px;
87
- font-family: 'Montserrat';
88
- font-style: normal;
89
- font-weight: 700;
90
- font-size: 8px;
91
- line-height: 15px;
92
- color: #fff;
93
- padding: 0 4px;
94
- background-color: #CE1126;
95
- }
96
-
97
- .discount2 {
98
86
  margin-right: 3px;
99
87
  font-family: 'Montserrat';
100
88
  font-style: normal;
101
89
  font-weight: 700;
102
90
  font-size: 12px;
103
91
  line-height: 15px;
104
- color: #2F3043;
92
+ color: #2C2C2C;
105
93
  }
106
94
 
107
95
  .old-price {
package/es/composite-comp/dito/components/Bargain/defaultJSON.js CHANGED
@@ -205,6 +205,30 @@ var getDefaultJSON = function getDefaultJSON() {
205
205
  lineHeight: 18
206
206
  }
207
207
  },
208
+ discountLabel: {
209
+ id: (0, _uuid.v4)(),
210
+ open: true,
211
+ type: 'TEXT',
212
+ specialContent: [],
213
+ text: '',
214
+ content: {
215
+ sizeType: 'Customize font styles',
216
+ fontFamily: 'Montserrat',
217
+ fontWeight: 700,
218
+ fontSize: 12,
219
+ color: '#2C2C2C',
220
+ urlDisabled: true
221
+ },
222
+ underline: {
223
+ open: false,
224
+ textDecorationColor: '',
225
+ textDecorationStyle: 'solid'
226
+ },
227
+ vertical: {
228
+ open: false,
229
+ lineHeight: 18
230
+ }
231
+ },
208
232
  salesProgressVisible: {
209
233
  open: true
210
234
  }
package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js CHANGED
@@ -209,6 +209,30 @@ var getDefaultJSON = function getDefaultJSON() {
209
209
  lineHeight: 18
210
210
  }
211
211
  },
212
+ discountLabel: {
213
+ id: (0, _uuid.v4)(),
214
+ open: true,
215
+ type: 'TEXT',
216
+ specialContent: [],
217
+ text: '',
218
+ content: {
219
+ sizeType: 'Customize font styles',
220
+ fontFamily: 'Montserrat',
221
+ fontWeight: 700,
222
+ fontSize: 12,
223
+ color: '#2C2C2C',
224
+ urlDisabled: true
225
+ },
226
+ underline: {
227
+ open: false,
228
+ textDecorationColor: '',
229
+ textDecorationStyle: 'solid'
230
+ },
231
+ vertical: {
232
+ open: false,
233
+ lineHeight: 18
234
+ }
235
+ },
212
236
  salesProgressVisible: {
213
237
  open: true
214
238
  }
package/es/composite-comp/dito/components/GroupBuy/defaultJSON.js CHANGED
@@ -191,6 +191,30 @@ var getDefaultJSON = function getDefaultJSON() {
191
191
  open: false,
192
192
  lineHeight: 18
193
193
  }
194
+ },
195
+ discountLabel: {
196
+ id: (0, _uuid.v4)(),
197
+ open: true,
198
+ type: 'TEXT',
199
+ specialContent: [],
200
+ text: '',
201
+ content: {
202
+ sizeType: 'Customize font styles',
203
+ fontFamily: 'Montserrat',
204
+ fontWeight: 700,
205
+ fontSize: 12,
206
+ color: '#2C2C2C',
207
+ urlDisabled: true
208
+ },
209
+ underline: {
210
+ open: false,
211
+ textDecorationColor: '',
212
+ textDecorationStyle: 'solid'
213
+ },
214
+ vertical: {
215
+ open: false,
216
+ lineHeight: 18
217
+ }
194
218
  }
195
219
  },
196
220
  spacing: {
package/es/composite-comp/dito/components/Recommend/defaultJSON.js CHANGED
@@ -272,7 +272,7 @@ var getDefaultJSON = function getDefaultJSON() {
272
272
  },
273
273
  sold: {
274
274
  id: (0, _uuid.v4)(),
275
- open: false,
275
+ open: true,
276
276
  type: 'TEXT',
277
277
  specialContent: [],
278
278
  text: '',
@@ -294,6 +294,30 @@ var getDefaultJSON = function getDefaultJSON() {
294
294
  lineHeight: 18
295
295
  }
296
296
  },
297
+ discountLabel: {
298
+ id: (0, _uuid.v4)(),
299
+ open: true,
300
+ type: 'TEXT',
301
+ specialContent: [],
302
+ text: '',
303
+ content: {
304
+ sizeType: 'Customize font styles',
305
+ fontFamily: 'Montserrat',
306
+ fontWeight: 700,
307
+ fontSize: 12,
308
+ color: '#2C2C2C',
309
+ urlDisabled: true
310
+ },
311
+ underline: {
312
+ open: false,
313
+ textDecorationColor: '',
314
+ textDecorationStyle: 'solid'
315
+ },
316
+ vertical: {
317
+ open: false,
318
+ lineHeight: 18
319
+ }
320
+ },
297
321
  salesProgressVisible: {
298
322
  open: true
299
323
  }
package/es/composite-comp/dito/components/Recommend/mobile/index.js CHANGED
@@ -635,7 +635,7 @@ function (_super) {
635
635
  tab.groupName.text = text;
636
636
  }
637
637
  }));
638
- }), groupSource.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
638
+ }), groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement("div", {
639
639
  className: "active-line",
640
640
  style: {
641
641
  width: tabWidth,
package/es/composite-comp/dito/components/Recommend/mobile/index.less CHANGED
@@ -86,3 +86,6 @@
86
86
  .m-recommend-mobile .scrollContainer .m-product-item-wrap {
87
87
  border: none;
88
88
  }
89
+ .m-recommend-mobile .scrollContainer .m-product-item-wrap .content-wrap {
90
+ padding: 0.16rem 0;
91
+ }
package/es/composite-comp/dito/components/SearchBanner/mobile/index.js CHANGED
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  require("./index.less");
11
11
 
12
- var _antd = require("antd4");
12
+ var _antd = require("antd");
13
13
 
14
14
  var _classnames = _interopRequireDefault(require("classnames"));
15
15
 
package/es/composite-comp/dito/config-panels/BargainConfig/FlashDealConfigContent/index.js CHANGED
@@ -120,6 +120,13 @@ function (_super) {
120
120
  data: panelProps.salesPrice
121
121
  }),
122
122
  metaOption: panelProps.salesPrice
123
+ }, {
124
+ key: '5',
125
+ name: (0, _locale.i18n)('PRICE_REDUCTION'),
126
+ value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
127
+ data: panelProps.discountLabel
128
+ }),
129
+ metaOption: panelProps.discountLabel
123
130
  }],
124
131
  type: "switch"
125
132
  }), /*#__PURE__*/_react["default"].createElement("div", {
package/es/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js CHANGED
@@ -120,6 +120,13 @@ function (_super) {
120
120
  data: panelProps.salesPrice
121
121
  }),
122
122
  metaOption: panelProps.salesPrice
123
+ }, {
124
+ key: '5',
125
+ name: (0, _locale.i18n)('PRICE_REDUCTION'),
126
+ value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
127
+ data: panelProps.discountLabel
128
+ }),
129
+ metaOption: panelProps.discountLabel
123
130
  }],
124
131
  type: "switch"
125
132
  }), /*#__PURE__*/_react["default"].createElement("div", {
package/es/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js CHANGED
@@ -120,6 +120,13 @@ function (_super) {
120
120
  data: panelProps.salesPrice
121
121
  }),
122
122
  metaOption: panelProps.salesPrice
123
+ }, {
124
+ key: '5',
125
+ name: (0, _locale.i18n)('PRICE_REDUCTION'),
126
+ value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
127
+ data: panelProps.discountLabel
128
+ }),
129
+ metaOption: panelProps.discountLabel
123
130
  }],
124
131
  type: "switch"
125
132
  }), /*#__PURE__*/_react["default"].createElement("div", {
package/es/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigContent/index.js CHANGED
@@ -106,6 +106,13 @@ function (_super) {
106
106
  data: panelProps.sold
107
107
  }),
108
108
  metaOption: panelProps.sold
109
+ }, {
110
+ key: '6',
111
+ name: (0, _locale.i18n)('PRICE_REDUCTION'),
112
+ value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
113
+ data: panelProps.discountLabel
114
+ }),
115
+ metaOption: panelProps.discountLabel
109
116
  }],
110
117
  type: "switch"
111
118
  }));
@@ -118,7 +125,8 @@ function (_super) {
118
125
  productName: {},
119
126
  activityPrice: {},
120
127
  salesPrice: {},
121
- sold: 0
128
+ sold: {},
129
+ discountLabel: {}
122
130
  }
123
131
  };
124
132
  return AComponent;
package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js CHANGED
@@ -9,7 +9,7 @@ exports["default"] = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _antd = require("antd4");
12
+ var _antd = require("antd");
13
13
 
14
14
  var _common = require("../../../../../common");
15
15
 
@@ -150,7 +150,7 @@ function (_super) {
150
150
  }
151
151
  }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
152
152
  layout: "horizontal",
153
- title: (0, _locale.i18n)('CART_ICON')
153
+ title: (0, _locale.i18n)('CHATBOT_ICON')
154
154
  }, /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
155
155
  checked: (0, _coreUtil.isPc)() ? panelProps.icon.cartIcon.pc : panelProps.icon.cartIcon.mobile,
156
156
  onChange: function onChange(e) {
package/es/locale/en/en.json CHANGED
@@ -1,4 +1,6 @@
1
1
  {
2
+ "PRICE_REDUCTION": "Price Reduction",
3
+ "CHATBOT_ICON": "Chatbot Icon",
2
4
  "PRODUCT_LABEL": "Product Label",
3
5
  "LABELS": "Labels",
4
6
  "TAB_BACKGROUND": "Tab Background",
package/es/locale/es/es.json CHANGED
@@ -1,4 +1,6 @@
1
1
  {
2
+ "PRICE_REDUCTION": "Price Reduction",
3
+ "CHATBOT_ICON": "Chatbot Icon",
2
4
  "PRODUCT_LABEL": "Product Label",
3
5
  "LABELS": "Labels",
4
6
  "TAB_BACKGROUND": "Tab Background",
package/es/locale/id/id.json CHANGED
@@ -1,4 +1,6 @@
1
1
  {
2
+ "PRICE_REDUCTION": "Price Reduction",
3
+ "CHATBOT_ICON": "Chatbot Icon",
2
4
  "PRODUCT_LABEL": "Product Label",
3
5
  "LABELS": "Labels",
4
6
  "TAB_BACKGROUND": "Tab Background",
package/lib/common/ColorPickerInput/index.less CHANGED
@@ -1,4 +1,6 @@
1
1
  .m-color-picker-input {
2
+ position: relative;
3
+
2
4
  .input-color {
3
5
  height: 60px;
4
6
  background: #FFFFFF;
package/lib/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -15,8 +15,6 @@ var _currencyUtil = require("../../../../utils/currencyUtil");
15
15
 
16
16
  var _common = require("../../../../common");
17
17
 
18
- var _locale = require("../../../../locale");
19
-
20
18
  var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
21
19
 
22
20
  var _components = require("../../../../meta-comp/components");
@@ -97,21 +95,21 @@ function (_super) {
97
95
  }
98
96
 
99
97
  ProductItem.prototype.render = function () {
100
- var _a, _b, _c, _d, _e, _f;
101
-
102
- var _g = this.props,
103
- data = _g.data,
104
- type = _g.type,
105
- panelProps = _g.panelProps,
106
- onItemClick = _g.onItemClick,
107
- showProName = _g.showProName,
108
- showProgress = _g.showProgress,
109
- fixHeight = _g.fixHeight,
110
- layout = _g.layout,
111
- imgHeight = _g.imgHeight,
112
- imgWidth = _g.imgWidth,
113
- unknownPrice = _g.unknownPrice,
114
- rest = __rest(_g, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
98
+ var _a, _b, _c, _d, _e, _f, _g;
99
+
100
+ var _h = this.props,
101
+ data = _h.data,
102
+ type = _h.type,
103
+ panelProps = _h.panelProps,
104
+ onItemClick = _h.onItemClick,
105
+ showProName = _h.showProName,
106
+ showProgress = _h.showProgress,
107
+ fixHeight = _h.fixHeight,
108
+ layout = _h.layout,
109
+ imgHeight = _h.imgHeight,
110
+ imgWidth = _h.imgWidth,
111
+ unknownPrice = _h.unknownPrice,
112
+ rest = __rest(_h, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
115
113
 
116
114
  var promotions = (0, _businessUtil.getPromotionList)(data);
117
115
  var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
@@ -162,7 +160,6 @@ function (_super) {
162
160
  var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
163
161
  return f.position === '7';
164
162
  })) || [];
165
- var soldNumber = data.salesCnt > 250 ? "" + (data.salesCnt - data.salesCnt % 250) : data.salesCnt || 0;
166
163
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
167
164
  className: (0, _classnames["default"])('m-product-item-wrap', {
168
165
  fixHeight: fixHeight,
@@ -232,9 +229,13 @@ function (_super) {
232
229
  className: "price-sold-wrap"
233
230
  }, /*#__PURE__*/_react["default"].createElement("div", {
234
231
  className: "old-price-wrap"
235
- }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
236
- className: type === 'groupBuy' || type === 'bargain' ? 'discount2' : 'discount'
237
- }, "-", discount, "%"), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
232
+ }, !!discount && ((_d = panelProps.discountLabel) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
233
+ className: "discount",
234
+ data: __assign(__assign({}, panelProps.discountLabel), {
235
+ text: "-" + discount + "%"
236
+ }),
237
+ readonly: true
238
+ }), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
238
239
  className: "old-price",
239
240
  data: __assign(__assign({}, panelProps.salesPrice), {
240
241
  text: oldPrice
@@ -243,16 +244,9 @@ function (_super) {
243
244
  style: {
244
245
  color: panelProps.salesPrice.content.color
245
246
  }
246
- })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && /*#__PURE__*/_react["default"].createElement("div", {
247
+ })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && ((_e = panelProps.sold) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
247
248
  className: "sold-count"
248
- }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
249
- className: "sold"
250
- }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
251
- data: __assign(__assign({}, panelProps.sold), {
252
- text: (0, _locale.i18n)('SOLD') + " " + soldNumber + "+"
253
- }),
254
- readonly: true
255
- })), showProgress && ((_e = panelProps.salesProgressVisible) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
249
+ }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), showProgress && ((_f = panelProps.salesProgressVisible) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
256
250
  className: "progress-wrap"
257
251
  }, /*#__PURE__*/_react["default"].createElement("span", {
258
252
  className: "text"
@@ -262,7 +256,7 @@ function (_super) {
262
256
  className: "progress",
263
257
  style: {
264
258
  width: salePercent + "%",
265
- backgroundColor: (_f = panelProps.salesProgressVisible) === null || _f === void 0 ? void 0 : _f.color
259
+ backgroundColor: (_g = panelProps.salesProgressVisible) === null || _g === void 0 ? void 0 : _g.color
266
260
  }
267
261
  })))));
268
262
  };
package/lib/composite-comp/common/components/ProductItem/index.less CHANGED
@@ -83,25 +83,13 @@
83
83
  line-height: 13px;
84
84
 
85
85
  .discount {
86
- margin-right: 3px;
87
- font-family: 'Montserrat';
88
- font-style: normal;
89
- font-weight: 700;
90
- font-size: 8px;
91
- line-height: 15px;
92
- color: #fff;
93
- padding: 0 4px;
94
- background-color: #CE1126;
95
- }
96
-
97
- .discount2 {
98
86
  margin-right: 3px;
99
87
  font-family: 'Montserrat';
100
88
  font-style: normal;
101
89
  font-weight: 700;
102
90
  font-size: 12px;
103
91
  line-height: 15px;
104
- color: #2F3043;
92
+ color: #2C2C2C;
105
93
  }
106
94
 
107
95
  .old-price {
package/lib/composite-comp/dito/components/Bargain/defaultJSON.js CHANGED
@@ -205,6 +205,30 @@ var getDefaultJSON = function getDefaultJSON() {
205
205
  lineHeight: 18
206
206
  }
207
207
  },
208
+ discountLabel: {
209
+ id: (0, _uuid.v4)(),
210
+ open: true,
211
+ type: 'TEXT',
212
+ specialContent: [],
213
+ text: '',
214
+ content: {
215
+ sizeType: 'Customize font styles',
216
+ fontFamily: 'Montserrat',
217
+ fontWeight: 700,
218
+ fontSize: 12,
219
+ color: '#2C2C2C',
220
+ urlDisabled: true
221
+ },
222
+ underline: {
223
+ open: false,
224
+ textDecorationColor: '',
225
+ textDecorationStyle: 'solid'
226
+ },
227
+ vertical: {
228
+ open: false,
229
+ lineHeight: 18
230
+ }
231
+ },
208
232
  salesProgressVisible: {
209
233
  open: true
210
234
  }
package/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js CHANGED
@@ -209,6 +209,30 @@ var getDefaultJSON = function getDefaultJSON() {
209
209
  lineHeight: 18
210
210
  }
211
211
  },
212
+ discountLabel: {
213
+ id: (0, _uuid.v4)(),
214
+ open: true,
215
+ type: 'TEXT',
216
+ specialContent: [],
217
+ text: '',
218
+ content: {
219
+ sizeType: 'Customize font styles',
220
+ fontFamily: 'Montserrat',
221
+ fontWeight: 700,
222
+ fontSize: 12,
223
+ color: '#2C2C2C',
224
+ urlDisabled: true
225
+ },
226
+ underline: {
227
+ open: false,
228
+ textDecorationColor: '',
229
+ textDecorationStyle: 'solid'
230
+ },
231
+ vertical: {
232
+ open: false,
233
+ lineHeight: 18
234
+ }
235
+ },
212
236
  salesProgressVisible: {
213
237
  open: true
214
238
  }
package/lib/composite-comp/dito/components/GroupBuy/defaultJSON.js CHANGED
@@ -191,6 +191,30 @@ var getDefaultJSON = function getDefaultJSON() {
191
191
  open: false,
192
192
  lineHeight: 18
193
193
  }
194
+ },
195
+ discountLabel: {
196
+ id: (0, _uuid.v4)(),
197
+ open: true,
198
+ type: 'TEXT',
199
+ specialContent: [],
200
+ text: '',
201
+ content: {
202
+ sizeType: 'Customize font styles',
203
+ fontFamily: 'Montserrat',
204
+ fontWeight: 700,
205
+ fontSize: 12,
206
+ color: '#2C2C2C',
207
+ urlDisabled: true
208
+ },
209
+ underline: {
210
+ open: false,
211
+ textDecorationColor: '',
212
+ textDecorationStyle: 'solid'
213
+ },
214
+ vertical: {
215
+ open: false,
216
+ lineHeight: 18
217
+ }
194
218
  }
195
219
  },
196
220
  spacing: {
package/lib/composite-comp/dito/components/Recommend/defaultJSON.js CHANGED
@@ -272,7 +272,7 @@ var getDefaultJSON = function getDefaultJSON() {
272
272
  },
273
273
  sold: {
274
274
  id: (0, _uuid.v4)(),
275
- open: false,
275
+ open: true,
276
276
  type: 'TEXT',
277
277
  specialContent: [],
278
278
  text: '',
@@ -294,6 +294,30 @@ var getDefaultJSON = function getDefaultJSON() {
294
294
  lineHeight: 18
295
295
  }
296
296
  },
297
+ discountLabel: {
298
+ id: (0, _uuid.v4)(),
299
+ open: true,
300
+ type: 'TEXT',
301
+ specialContent: [],
302
+ text: '',
303
+ content: {
304
+ sizeType: 'Customize font styles',
305
+ fontFamily: 'Montserrat',
306
+ fontWeight: 700,
307
+ fontSize: 12,
308
+ color: '#2C2C2C',
309
+ urlDisabled: true
310
+ },
311
+ underline: {
312
+ open: false,
313
+ textDecorationColor: '',
314
+ textDecorationStyle: 'solid'
315
+ },
316
+ vertical: {
317
+ open: false,
318
+ lineHeight: 18
319
+ }
320
+ },
297
321
  salesProgressVisible: {
298
322
  open: true
299
323
  }
package/lib/composite-comp/dito/components/Recommend/mobile/index.js CHANGED
@@ -635,7 +635,7 @@ function (_super) {
635
635
  tab.groupName.text = text;
636
636
  }
637
637
  }));
638
- }), groupSource.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
638
+ }), groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement("div", {
639
639
  className: "active-line",
640
640
  style: {
641
641
  width: tabWidth,
package/lib/composite-comp/dito/components/Recommend/mobile/index.less CHANGED
@@ -86,3 +86,6 @@
86
86
  .m-recommend-mobile .scrollContainer .m-product-item-wrap {
87
87
  border: none;
88
88
  }
89
+ .m-recommend-mobile .scrollContainer .m-product-item-wrap .content-wrap {
90
+ padding: 0.16rem 0;
91
+ }
package/lib/composite-comp/dito/components/SearchBanner/mobile/index.js CHANGED
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  require("./index.less");
11
11
 
12
- var _antd = require("antd4");
12
+ var _antd = require("antd");
13
13
 
14
14
  var _classnames = _interopRequireDefault(require("classnames"));
15
15
 
package/lib/composite-comp/dito/config-panels/BargainConfig/FlashDealConfigContent/index.js CHANGED
@@ -120,6 +120,13 @@ function (_super) {
120
120
  data: panelProps.salesPrice
121
121
  }),
122
122
  metaOption: panelProps.salesPrice
123
+ }, {
124
+ key: '5',
125
+ name: (0, _locale.i18n)('PRICE_REDUCTION'),
126
+ value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
127
+ data: panelProps.discountLabel
128
+ }),
129
+ metaOption: panelProps.discountLabel
123
130
  }],
124
131
  type: "switch"
125
132
  }), /*#__PURE__*/_react["default"].createElement("div", {
package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js CHANGED
@@ -120,6 +120,13 @@ function (_super) {
120
120
  data: panelProps.salesPrice
121
121
  }),
122
122
  metaOption: panelProps.salesPrice
123
+ }, {
124
+ key: '5',
125
+ name: (0, _locale.i18n)('PRICE_REDUCTION'),
126
+ value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
127
+ data: panelProps.discountLabel
128
+ }),
129
+ metaOption: panelProps.discountLabel
123
130
  }],
124
131
  type: "switch"
125
132
  }), /*#__PURE__*/_react["default"].createElement("div", {
package/lib/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js CHANGED
@@ -120,6 +120,13 @@ function (_super) {
120
120
  data: panelProps.salesPrice
121
121
  }),
122
122
  metaOption: panelProps.salesPrice
123
+ }, {
124
+ key: '5',
125
+ name: (0, _locale.i18n)('PRICE_REDUCTION'),
126
+ value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
127
+ data: panelProps.discountLabel
128
+ }),
129
+ metaOption: panelProps.discountLabel
123
130
  }],
124
131
  type: "switch"
125
132
  }), /*#__PURE__*/_react["default"].createElement("div", {
package/lib/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigContent/index.js CHANGED
@@ -106,6 +106,13 @@ function (_super) {
106
106
  data: panelProps.sold
107
107
  }),
108
108
  metaOption: panelProps.sold
109
+ }, {
110
+ key: '6',
111
+ name: (0, _locale.i18n)('PRICE_REDUCTION'),
112
+ value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
113
+ data: panelProps.discountLabel
114
+ }),
115
+ metaOption: panelProps.discountLabel
109
116
  }],
110
117
  type: "switch"
111
118
  }));
@@ -118,7 +125,8 @@ function (_super) {
118
125
  productName: {},
119
126
  activityPrice: {},
120
127
  salesPrice: {},
121
- sold: 0
128
+ sold: {},
129
+ discountLabel: {}
122
130
  }
123
131
  };
124
132
  return AComponent;
package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js CHANGED
@@ -9,7 +9,7 @@ exports["default"] = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _antd = require("antd4");
12
+ var _antd = require("antd");
13
13
 
14
14
  var _common = require("../../../../../common");
15
15
 
@@ -150,7 +150,7 @@ function (_super) {
150
150
  }
151
151
  }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
152
152
  layout: "horizontal",
153
- title: (0, _locale.i18n)('CART_ICON')
153
+ title: (0, _locale.i18n)('CHATBOT_ICON')
154
154
  }, /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
155
155
  checked: (0, _coreUtil.isPc)() ? panelProps.icon.cartIcon.pc : panelProps.icon.cartIcon.mobile,
156
156
  onChange: function onChange(e) {
package/lib/locale/en/en.json CHANGED
@@ -1,4 +1,6 @@
1
1
  {
2
+ "PRICE_REDUCTION": "Price Reduction",
3
+ "CHATBOT_ICON": "Chatbot Icon",
2
4
  "PRODUCT_LABEL": "Product Label",
3
5
  "LABELS": "Labels",
4
6
  "TAB_BACKGROUND": "Tab Background",
package/lib/locale/es/es.json CHANGED
@@ -1,4 +1,6 @@
1
1
  {
2
+ "PRICE_REDUCTION": "Price Reduction",
3
+ "CHATBOT_ICON": "Chatbot Icon",
2
4
  "PRODUCT_LABEL": "Product Label",
3
5
  "LABELS": "Labels",
4
6
  "TAB_BACKGROUND": "Tab Background",
package/lib/locale/id/id.json CHANGED
@@ -1,4 +1,6 @@
1
1
  {
2
+ "PRICE_REDUCTION": "Price Reduction",
3
+ "CHATBOT_ICON": "Chatbot Icon",
2
4
  "PRODUCT_LABEL": "Product Label",
3
5
  "LABELS": "Labels",
4
6
  "TAB_BACKGROUND": "Tab Background",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "1.0.113",
4
+ "version": "1.0.115",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",