@fonixtree/magic-design 1.0.78 → 1.0.80

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 (17) hide show
  1. package/es/assets/fonts/.DS_Store +0 -0
  2. package/es/composite-comp/common/components/ProductItem/index.js +5 -11
  3. package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js +1 -1
  4. package/es/composite-comp/dito/components/GroupBuy/defaultJSON.js +0 -4
  5. package/es/composite-comp/dito/components/GroupBuy/mobile/index.js +3 -3
  6. package/es/composite-comp/dito/components/Recommend/defaultJSON.js +1 -1
  7. package/es/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js +3 -3
  8. package/es/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js +6 -6
  9. package/lib/assets/fonts/.DS_Store +0 -0
  10. package/lib/composite-comp/common/components/ProductItem/index.js +5 -11
  11. package/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js +1 -1
  12. package/lib/composite-comp/dito/components/GroupBuy/defaultJSON.js +0 -4
  13. package/lib/composite-comp/dito/components/GroupBuy/mobile/index.js +3 -3
  14. package/lib/composite-comp/dito/components/Recommend/defaultJSON.js +1 -1
  15. package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js +3 -3
  16. package/lib/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js +6 -6
  17. package/package.json +1 -1
package/es/assets/fonts/.DS_Store ADDED
Binary file
package/es/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -140,9 +140,6 @@ function (_super) {
140
140
  var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
141
141
 
142
142
  var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
143
-
144
- var _oldPrice = type === 'groupBuy' && data.sppMarketPrice ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.sppMarketPrice) : oldPrice;
145
-
146
143
  var discount = Number(data.discountPercent) || 0;
147
144
  var salePercent = Number(data.salePercent) / 100 || 0;
148
145
  var imgStyle = {};
@@ -157,9 +154,6 @@ function (_super) {
157
154
  var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
158
155
  return f.position === '7';
159
156
  })) || [];
160
- var shareByNum = (0, _commonUtil.ensure)(function () {
161
- return data.campaigns.cmpShareBuys[0].shareByNum;
162
- }, 0);
163
157
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
164
158
  className: (0, _classnames["default"])('m-product-item-wrap', {
165
159
  fixHeight: fixHeight,
@@ -197,7 +191,7 @@ function (_super) {
197
191
  })), type === 'groupBuy' && panelProps.label.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
198
192
  className: "group-num",
199
193
  data: __assign(__assign({}, panelProps.label), {
200
- text: shareByNum
194
+ text: data.shareByNum
201
195
  }),
202
196
  readonly: true
203
197
  }), /*#__PURE__*/_react["default"].createElement("div", {
@@ -229,10 +223,10 @@ function (_super) {
229
223
  className: "old-price-wrap"
230
224
  }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
231
225
  className: "discount"
232
- }, "-", discount, "%"), _oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
226
+ }, "-", discount, "%"), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
233
227
  className: "old-price",
234
228
  data: __assign(__assign({}, panelProps.salesPrice), {
235
- text: _oldPrice
229
+ text: oldPrice
236
230
  }),
237
231
  readonly: true,
238
232
  style: {
@@ -240,7 +234,7 @@ function (_super) {
240
234
  }
241
235
  })), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
242
236
  className: "sold-count"
243
- }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")), showProgress && ((_d = panelProps.salesProgress) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
237
+ }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")), showProgress && ((_d = panelProps.salesProgressVisible) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
244
238
  className: "progress-wrap"
245
239
  }, /*#__PURE__*/_react["default"].createElement("span", {
246
240
  className: "text"
@@ -250,7 +244,7 @@ function (_super) {
250
244
  className: "progress",
251
245
  style: {
252
246
  width: salePercent + "%",
253
- backgroundColor: (_e = panelProps.salesProgress) === null || _e === void 0 ? void 0 : _e.color
247
+ backgroundColor: (_e = panelProps.salesProgressVisible) === null || _e === void 0 ? void 0 : _e.color
254
248
  }
255
249
  })))));
256
250
  };
package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js CHANGED
@@ -205,7 +205,7 @@ var getDefaultJSON = function getDefaultJSON() {
205
205
  lineHeight: 18
206
206
  }
207
207
  },
208
- salesProgress: {
208
+ salesProgressVisible: {
209
209
  open: true
210
210
  }
211
211
  },
package/es/composite-comp/dito/components/GroupBuy/defaultJSON.js CHANGED
@@ -191,10 +191,6 @@ var getDefaultJSON = function getDefaultJSON() {
191
191
  open: false,
192
192
  lineHeight: 18
193
193
  }
194
- },
195
- salesProgress: {
196
- open: true,
197
- color: '#CE1126'
198
194
  }
199
195
  },
200
196
  spacing: {
package/es/composite-comp/dito/components/GroupBuy/mobile/index.js CHANGED
@@ -251,10 +251,9 @@ function (_super) {
251
251
  case 0:
252
252
  return [4
253
253
  /*yield*/
254
- , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
255
- campaignType: '4',
254
+ , (0, _commonUtil.commonFetch)('/designer/v1/h5/sharebuy/offer/page', {
256
255
  sortType: this.sortType
257
- }, 'POST')];
256
+ }, 'GET')];
258
257
 
259
258
  case 1:
260
259
  res = _a.sent();
@@ -326,6 +325,7 @@ function (_super) {
326
325
  (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
327
326
  },
328
327
  panelProps: panelProps.content,
328
+ showProgress: false,
329
329
  type: "groupBuy"
330
330
  });
331
331
  }))));
package/es/composite-comp/dito/components/Recommend/defaultJSON.js CHANGED
@@ -270,7 +270,7 @@ var getDefaultJSON = function getDefaultJSON() {
270
270
  lineHeight: 18
271
271
  }
272
272
  },
273
- salesProgress: {
273
+ salesProgressVisible: {
274
274
  open: true
275
275
  }
276
276
  },
package/es/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js CHANGED
@@ -127,9 +127,9 @@ function (_super) {
127
127
  }, /*#__PURE__*/_react["default"].createElement("span", {
128
128
  className: "label"
129
129
  }, (0, _locale.i18n)('SALES_PROGRESS')), /*#__PURE__*/_react["default"].createElement(_antd.Switch, {
130
- checked: (_a = panelProps.salesProgress) === null || _a === void 0 ? void 0 : _a.open,
130
+ checked: (_a = panelProps.salesProgressVisible) === null || _a === void 0 ? void 0 : _a.open,
131
131
  onChange: function onChange(v) {
132
- panelProps.salesProgress = {
132
+ panelProps.salesProgressVisible = {
133
133
  open: v
134
134
  };
135
135
 
@@ -145,7 +145,7 @@ function (_super) {
145
145
  productName: {},
146
146
  activityPrice: {},
147
147
  salesPrice: {},
148
- salesProgress: {
148
+ salesProgressVisible: {
149
149
  open: false
150
150
  }
151
151
  }
package/es/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js CHANGED
@@ -129,24 +129,24 @@ function (_super) {
129
129
  }, /*#__PURE__*/_react["default"].createElement("span", {
130
130
  className: "label"
131
131
  }, (0, _locale.i18n)('SALES_PROGRESS')), /*#__PURE__*/_react["default"].createElement(_antd.Switch, {
132
- checked: (_a = panelProps.salesProgress) === null || _a === void 0 ? void 0 : _a.open,
132
+ checked: (_a = panelProps.salesProgressVisible) === null || _a === void 0 ? void 0 : _a.open,
133
133
  onChange: function onChange(v) {
134
- panelProps.salesProgress.open = v;
134
+ panelProps.salesProgressVisible.open = v;
135
135
 
136
136
  _this.reRender();
137
137
  }
138
- })), ((_b = panelProps.salesProgress) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
138
+ })), ((_b = panelProps.salesProgressVisible) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
139
139
  className: "content"
140
140
  }, /*#__PURE__*/_react["default"].createElement("p", {
141
141
  className: "name"
142
142
  }, (0, _locale.i18n)('PROGRESS_BAR_COLOR')), /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
143
143
  colorType: "rgba",
144
144
  onChange: function onChange(v) {
145
- panelProps.salesProgress.color = v;
145
+ panelProps.salesProgressVisible.color = v;
146
146
 
147
147
  _this.reRender();
148
148
  },
149
- value: (_c = panelProps.salesProgress) === null || _c === void 0 ? void 0 : _c.color
149
+ value: (_c = panelProps.salesProgressVisible) === null || _c === void 0 ? void 0 : _c.color
150
150
  }))));
151
151
  };
152
152
 
@@ -157,7 +157,7 @@ function (_super) {
157
157
  productName: {},
158
158
  activityPrice: {},
159
159
  salesPrice: {},
160
- salesProgress: {
160
+ salesProgressVisible: {
161
161
  open: false,
162
162
  color: '#000'
163
163
  }
package/lib/assets/fonts/.DS_Store ADDED
Binary file
package/lib/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -140,9 +140,6 @@ function (_super) {
140
140
  var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
141
141
 
142
142
  var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
143
-
144
- var _oldPrice = type === 'groupBuy' && data.sppMarketPrice ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.sppMarketPrice) : oldPrice;
145
-
146
143
  var discount = Number(data.discountPercent) || 0;
147
144
  var salePercent = Number(data.salePercent) / 100 || 0;
148
145
  var imgStyle = {};
@@ -157,9 +154,6 @@ function (_super) {
157
154
  var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
158
155
  return f.position === '7';
159
156
  })) || [];
160
- var shareByNum = (0, _commonUtil.ensure)(function () {
161
- return data.campaigns.cmpShareBuys[0].shareByNum;
162
- }, 0);
163
157
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
164
158
  className: (0, _classnames["default"])('m-product-item-wrap', {
165
159
  fixHeight: fixHeight,
@@ -197,7 +191,7 @@ function (_super) {
197
191
  })), type === 'groupBuy' && panelProps.label.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
198
192
  className: "group-num",
199
193
  data: __assign(__assign({}, panelProps.label), {
200
- text: shareByNum
194
+ text: data.shareByNum
201
195
  }),
202
196
  readonly: true
203
197
  }), /*#__PURE__*/_react["default"].createElement("div", {
@@ -229,10 +223,10 @@ function (_super) {
229
223
  className: "old-price-wrap"
230
224
  }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
231
225
  className: "discount"
232
- }, "-", discount, "%"), _oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
226
+ }, "-", discount, "%"), oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
233
227
  className: "old-price",
234
228
  data: __assign(__assign({}, panelProps.salesPrice), {
235
- text: _oldPrice
229
+ text: oldPrice
236
230
  }),
237
231
  readonly: true,
238
232
  style: {
@@ -240,7 +234,7 @@ function (_super) {
240
234
  }
241
235
  })), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
242
236
  className: "sold-count"
243
- }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")), showProgress && ((_d = panelProps.salesProgress) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
237
+ }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")), showProgress && ((_d = panelProps.salesProgressVisible) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
244
238
  className: "progress-wrap"
245
239
  }, /*#__PURE__*/_react["default"].createElement("span", {
246
240
  className: "text"
@@ -250,7 +244,7 @@ function (_super) {
250
244
  className: "progress",
251
245
  style: {
252
246
  width: salePercent + "%",
253
- backgroundColor: (_e = panelProps.salesProgress) === null || _e === void 0 ? void 0 : _e.color
247
+ backgroundColor: (_e = panelProps.salesProgressVisible) === null || _e === void 0 ? void 0 : _e.color
254
248
  }
255
249
  })))));
256
250
  };
package/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js CHANGED
@@ -205,7 +205,7 @@ var getDefaultJSON = function getDefaultJSON() {
205
205
  lineHeight: 18
206
206
  }
207
207
  },
208
- salesProgress: {
208
+ salesProgressVisible: {
209
209
  open: true
210
210
  }
211
211
  },
package/lib/composite-comp/dito/components/GroupBuy/defaultJSON.js CHANGED
@@ -191,10 +191,6 @@ var getDefaultJSON = function getDefaultJSON() {
191
191
  open: false,
192
192
  lineHeight: 18
193
193
  }
194
- },
195
- salesProgress: {
196
- open: true,
197
- color: '#CE1126'
198
194
  }
199
195
  },
200
196
  spacing: {
package/lib/composite-comp/dito/components/GroupBuy/mobile/index.js CHANGED
@@ -251,10 +251,9 @@ function (_super) {
251
251
  case 0:
252
252
  return [4
253
253
  /*yield*/
254
- , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
255
- campaignType: '4',
254
+ , (0, _commonUtil.commonFetch)('/designer/v1/h5/sharebuy/offer/page', {
256
255
  sortType: this.sortType
257
- }, 'POST')];
256
+ }, 'GET')];
258
257
 
259
258
  case 1:
260
259
  res = _a.sent();
@@ -326,6 +325,7 @@ function (_super) {
326
325
  (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
327
326
  },
328
327
  panelProps: panelProps.content,
328
+ showProgress: false,
329
329
  type: "groupBuy"
330
330
  });
331
331
  }))));
package/lib/composite-comp/dito/components/Recommend/defaultJSON.js CHANGED
@@ -270,7 +270,7 @@ var getDefaultJSON = function getDefaultJSON() {
270
270
  lineHeight: 18
271
271
  }
272
272
  },
273
- salesProgress: {
273
+ salesProgressVisible: {
274
274
  open: true
275
275
  }
276
276
  },
package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.js CHANGED
@@ -127,9 +127,9 @@ function (_super) {
127
127
  }, /*#__PURE__*/_react["default"].createElement("span", {
128
128
  className: "label"
129
129
  }, (0, _locale.i18n)('SALES_PROGRESS')), /*#__PURE__*/_react["default"].createElement(_antd.Switch, {
130
- checked: (_a = panelProps.salesProgress) === null || _a === void 0 ? void 0 : _a.open,
130
+ checked: (_a = panelProps.salesProgressVisible) === null || _a === void 0 ? void 0 : _a.open,
131
131
  onChange: function onChange(v) {
132
- panelProps.salesProgress = {
132
+ panelProps.salesProgressVisible = {
133
133
  open: v
134
134
  };
135
135
 
@@ -145,7 +145,7 @@ function (_super) {
145
145
  productName: {},
146
146
  activityPrice: {},
147
147
  salesPrice: {},
148
- salesProgress: {
148
+ salesProgressVisible: {
149
149
  open: false
150
150
  }
151
151
  }
package/lib/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js CHANGED
@@ -129,24 +129,24 @@ function (_super) {
129
129
  }, /*#__PURE__*/_react["default"].createElement("span", {
130
130
  className: "label"
131
131
  }, (0, _locale.i18n)('SALES_PROGRESS')), /*#__PURE__*/_react["default"].createElement(_antd.Switch, {
132
- checked: (_a = panelProps.salesProgress) === null || _a === void 0 ? void 0 : _a.open,
132
+ checked: (_a = panelProps.salesProgressVisible) === null || _a === void 0 ? void 0 : _a.open,
133
133
  onChange: function onChange(v) {
134
- panelProps.salesProgress.open = v;
134
+ panelProps.salesProgressVisible.open = v;
135
135
 
136
136
  _this.reRender();
137
137
  }
138
- })), ((_b = panelProps.salesProgress) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
138
+ })), ((_b = panelProps.salesProgressVisible) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
139
139
  className: "content"
140
140
  }, /*#__PURE__*/_react["default"].createElement("p", {
141
141
  className: "name"
142
142
  }, (0, _locale.i18n)('PROGRESS_BAR_COLOR')), /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
143
143
  colorType: "rgba",
144
144
  onChange: function onChange(v) {
145
- panelProps.salesProgress.color = v;
145
+ panelProps.salesProgressVisible.color = v;
146
146
 
147
147
  _this.reRender();
148
148
  },
149
- value: (_c = panelProps.salesProgress) === null || _c === void 0 ? void 0 : _c.color
149
+ value: (_c = panelProps.salesProgressVisible) === null || _c === void 0 ? void 0 : _c.color
150
150
  }))));
151
151
  };
152
152
 
@@ -157,7 +157,7 @@ function (_super) {
157
157
  productName: {},
158
158
  activityPrice: {},
159
159
  salesPrice: {},
160
- salesProgress: {
160
+ salesProgressVisible: {
161
161
  open: false,
162
162
  color: '#000'
163
163
  }
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.78",
4
+ "version": "1.0.80",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",