@fonixtree/magic-design 1.0.79 → 1.0.81

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 (11) 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/common/components/ProductItem/index.less +10 -0
  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/lib/assets/fonts/.DS_Store +0 -0
  7. package/lib/composite-comp/common/components/ProductItem/index.js +5 -11
  8. package/lib/composite-comp/common/components/ProductItem/index.less +10 -0
  9. package/lib/composite-comp/dito/components/GroupBuy/defaultJSON.js +0 -4
  10. package/lib/composite-comp/dito/components/GroupBuy/mobile/index.js +3 -3
  11. 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", {
@@ -228,17 +222,17 @@ function (_super) {
228
222
  }, /*#__PURE__*/_react["default"].createElement("div", {
229
223
  className: "old-price-wrap"
230
224
  }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
231
- className: "discount"
232
- }, "-", discount, "%"), _oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
225
+ className: type === 'groupBuy' ? 'discount2' : 'discount'
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: {
239
233
  color: panelProps.salesPrice.content.color
240
234
  }
241
- })), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
235
+ })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
242
236
  className: "sold-count"
243
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"
package/es/composite-comp/common/components/ProductItem/index.less CHANGED
@@ -94,6 +94,16 @@
94
94
  background-color: #CE1126;
95
95
  }
96
96
 
97
+ .discount2 {
98
+ margin-right: 3px;
99
+ font-family: 'Montserrat';
100
+ font-style: normal;
101
+ font-weight: 700;
102
+ font-size: 12px;
103
+ line-height: 15px;
104
+ color: #2F3043;
105
+ }
106
+
97
107
  .old-price {
98
108
  text-decoration: line-through;
99
109
  width: fit-content;
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
- salesProgressVisible: {
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/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", {
@@ -228,17 +222,17 @@ function (_super) {
228
222
  }, /*#__PURE__*/_react["default"].createElement("div", {
229
223
  className: "old-price-wrap"
230
224
  }, !!discount && /*#__PURE__*/_react["default"].createElement("span", {
231
- className: "discount"
232
- }, "-", discount, "%"), _oldPrice && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
225
+ className: type === 'groupBuy' ? 'discount2' : 'discount'
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: {
239
233
  color: panelProps.salesPrice.content.color
240
234
  }
241
- })), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
235
+ })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
242
236
  className: "sold-count"
243
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"
package/lib/composite-comp/common/components/ProductItem/index.less CHANGED
@@ -94,6 +94,16 @@
94
94
  background-color: #CE1126;
95
95
  }
96
96
 
97
+ .discount2 {
98
+ margin-right: 3px;
99
+ font-family: 'Montserrat';
100
+ font-style: normal;
101
+ font-weight: 700;
102
+ font-size: 12px;
103
+ line-height: 15px;
104
+ color: #2F3043;
105
+ }
106
+
97
107
  .old-price {
98
108
  text-decoration: line-through;
99
109
  width: fit-content;
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
- salesProgressVisible: {
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/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "1.0.79",
4
+ "version": "1.0.81",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",