@fonixtree/magic-design 2.0.178 → 2.0.182

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 (7) hide show
  1. package/es/composite-comp/common/components/MonpayProductItem/index.js +31 -22
  2. package/es/composite-comp/monpay/components/InterestProducts/mobile/ProductItem/index.js +9 -1
  3. package/es/constants/index.js +9 -2
  4. package/lib/composite-comp/common/components/MonpayProductItem/index.js +31 -22
  5. package/lib/composite-comp/monpay/components/InterestProducts/mobile/ProductItem/index.js +9 -1
  6. package/lib/constants/index.js +9 -2
  7. package/package.json +1 -1
package/es/composite-comp/common/components/MonpayProductItem/index.js CHANGED
@@ -21,6 +21,8 @@ var _locale = require("../../../../locale");
21
21
 
22
22
  require("./index.less");
23
23
 
24
+ var _constants = require("../../../../constants");
25
+
24
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
25
27
 
26
28
  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); }
@@ -113,25 +115,31 @@ function (_super) {
113
115
  var _this = _super !== null && _super.apply(this, arguments) || this;
114
116
 
115
117
  _this.state = {};
118
+
119
+ _this.isSpecialPrice = function () {
120
+ var data = _this.props.data;
121
+ return data.sppType === _constants.sppTypeMap.DISCOUNT || data.sppType === _constants.sppTypeMap.FLASH;
122
+ };
123
+
116
124
  return _this;
117
125
  }
118
126
 
119
127
  ProductItem.prototype.render = function () {
120
- var _a, _b, _c, _d, _e, _f, _g, _h;
121
-
122
- var _j = this.props,
123
- data = _j.data,
124
- panelProps = _j.panelProps,
125
- onItemClick = _j.onItemClick,
126
- showProName = _j.showProName,
127
- showProgress = _j.showProgress,
128
- intelligentType = _j.intelligentType,
129
- fixHeight = _j.fixHeight,
130
- layout = _j.layout,
131
- imgHeight = _j.imgHeight,
132
- imgWidth = _j.imgWidth,
133
- isWill = _j.isWill,
134
- rest = __rest(_j, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "isWill"]);
128
+ var _a, _b, _c, _d, _e, _f, _g;
129
+
130
+ var _h = this.props,
131
+ data = _h.data,
132
+ panelProps = _h.panelProps,
133
+ onItemClick = _h.onItemClick,
134
+ showProName = _h.showProName,
135
+ showProgress = _h.showProgress,
136
+ intelligentType = _h.intelligentType,
137
+ fixHeight = _h.fixHeight,
138
+ layout = _h.layout,
139
+ imgHeight = _h.imgHeight,
140
+ imgWidth = _h.imgWidth,
141
+ isWill = _h.isWill,
142
+ rest = __rest(_h, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "isWill"]);
135
143
 
136
144
  var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
137
145
  var oldPrice = null;
@@ -180,7 +188,8 @@ function (_super) {
180
188
  color: "#fff",
181
189
  size: 18,
182
190
  type: "icon-a-EssentionalUI"
183
- }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), ((_a = panelProps.label) === null || _a === void 0 ? void 0 : _a.open) && data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
191
+ }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), // panelProps.label?.open && data.discountPercent && !isGift && (
192
+ this.isSpecialPrice() && !isGift && data.discountPercent && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
184
193
  className: "discount-tag",
185
194
  data: __assign(__assign({}, panelProps.label), {
186
195
  text: isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% " + (0, _locale.i18n)('OFF')
@@ -219,7 +228,7 @@ function (_super) {
219
228
  }
220
229
  }))), /*#__PURE__*/_react["default"].createElement("div", {
221
230
  className: "rate-sold-wrap"
222
- }, ((_b = panelProps.evaluationScore) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
231
+ }, ((_a = panelProps.evaluationScore) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
223
232
  className: "evaluation-score"
224
233
  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
225
234
  color: "#FF8650",
@@ -231,9 +240,9 @@ function (_super) {
231
240
  text: (0, _currencyUtil.numberToFixed)(Number(data.evaluationAvg), 1)
232
241
  }),
233
242
  readonly: true
234
- })), ((_c = panelProps.evaluationScore) === null || _c === void 0 ? void 0 : _c.open) && ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
243
+ })), ((_b = panelProps.evaluationScore) === null || _b === void 0 ? void 0 : _b.open) && ((_c = panelProps.sold) === null || _c === void 0 ? void 0 : _c.open) && /*#__PURE__*/_react["default"].createElement("div", {
235
244
  className: "line"
236
- }), ((_e = panelProps.sold) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
245
+ }), ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
237
246
  className: "sold no-reversed"
238
247
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
239
248
  data: __assign(__assign({}, panelProps.sold), {
@@ -256,15 +265,15 @@ function (_super) {
256
265
  }, renderDiscount(m).text));
257
266
  })), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
258
267
  className: "progress-wrap"
259
- }, ((_f = panelProps.salesProgress) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
268
+ }, ((_e = panelProps.salesProgress) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
260
269
  className: "progress-container"
261
270
  }, /*#__PURE__*/_react["default"].createElement("div", {
262
271
  className: "progress",
263
272
  style: {
264
273
  width: salePercent + "%",
265
- backgroundColor: (_g = panelProps.salesProgress) === null || _g === void 0 ? void 0 : _g.color
274
+ backgroundColor: (_f = panelProps.salesProgress) === null || _f === void 0 ? void 0 : _f.color
266
275
  }
267
- })), ((_h = panelProps.stock) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement("div", {
276
+ })), ((_g = panelProps.stock) === null || _g === void 0 ? void 0 : _g.open) && /*#__PURE__*/_react["default"].createElement("div", {
268
277
  className: "text"
269
278
  }, data.saleNum || 0, "/", data.stockNum || 0, " ", (0, _locale.i18n)('STOCK')))));
270
279
  };
package/es/composite-comp/monpay/components/InterestProducts/mobile/ProductItem/index.js CHANGED
@@ -19,6 +19,8 @@ require("./index.less");
19
19
 
20
20
  var _locale = require("../../../../../../locale");
21
21
 
22
+ var _constants = require("../../../../../../constants");
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); }
@@ -71,6 +73,12 @@ function (_super) {
71
73
  var _this = _super !== null && _super.apply(this, arguments) || this;
72
74
 
73
75
  _this.state = {};
76
+
77
+ _this.isSpecialPrice = function () {
78
+ var data = _this.props.data;
79
+ return data.sppType === _constants.sppTypeMap.DISCOUNT || data.sppType === _constants.sppTypeMap.FLASH;
80
+ };
81
+
74
82
  return _this;
75
83
  }
76
84
 
@@ -116,7 +124,7 @@ function (_super) {
116
124
  color: "#fff",
117
125
  size: 18,
118
126
  type: "icon-a-EssentionalUI"
119
- }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement("div", {
127
+ }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), this.isSpecialPrice() && data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement("div", {
120
128
  className: "discount-tag"
121
129
  }, data.discountPercent, "% ", (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
122
130
  className: "content-wrap"
package/es/constants/index.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.projectFontFamily = exports.projectCodes = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.otherFontWeightList = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.fontWeightList = exports.fontFamilyList = 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;
6
+ exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.sppTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.projectFontFamily = exports.projectCodes = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.otherFontWeightList = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.fontWeightList = exports.fontFamilyList = 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
 
8
8
  var _locale = require("../locale");
9
9
 
@@ -461,4 +461,11 @@ var ORDER_TYPE = {
461
461
  VALUE: '商品详情购买'
462
462
  }
463
463
  };
464
- exports.ORDER_TYPE = ORDER_TYPE;
464
+ /** 蒙古商品活动促销类型 */
465
+
466
+ exports.ORDER_TYPE = ORDER_TYPE;
467
+ var sppTypeMap = {
468
+ FLASH: '2',
469
+ DISCOUNT: '14'
470
+ };
471
+ exports.sppTypeMap = sppTypeMap;
package/lib/composite-comp/common/components/MonpayProductItem/index.js CHANGED
@@ -21,6 +21,8 @@ var _locale = require("../../../../locale");
21
21
 
22
22
  require("./index.less");
23
23
 
24
+ var _constants = require("../../../../constants");
25
+
24
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
25
27
 
26
28
  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); }
@@ -113,25 +115,31 @@ function (_super) {
113
115
  var _this = _super !== null && _super.apply(this, arguments) || this;
114
116
 
115
117
  _this.state = {};
118
+
119
+ _this.isSpecialPrice = function () {
120
+ var data = _this.props.data;
121
+ return data.sppType === _constants.sppTypeMap.DISCOUNT || data.sppType === _constants.sppTypeMap.FLASH;
122
+ };
123
+
116
124
  return _this;
117
125
  }
118
126
 
119
127
  ProductItem.prototype.render = function () {
120
- var _a, _b, _c, _d, _e, _f, _g, _h;
121
-
122
- var _j = this.props,
123
- data = _j.data,
124
- panelProps = _j.panelProps,
125
- onItemClick = _j.onItemClick,
126
- showProName = _j.showProName,
127
- showProgress = _j.showProgress,
128
- intelligentType = _j.intelligentType,
129
- fixHeight = _j.fixHeight,
130
- layout = _j.layout,
131
- imgHeight = _j.imgHeight,
132
- imgWidth = _j.imgWidth,
133
- isWill = _j.isWill,
134
- rest = __rest(_j, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "isWill"]);
128
+ var _a, _b, _c, _d, _e, _f, _g;
129
+
130
+ var _h = this.props,
131
+ data = _h.data,
132
+ panelProps = _h.panelProps,
133
+ onItemClick = _h.onItemClick,
134
+ showProName = _h.showProName,
135
+ showProgress = _h.showProgress,
136
+ intelligentType = _h.intelligentType,
137
+ fixHeight = _h.fixHeight,
138
+ layout = _h.layout,
139
+ imgHeight = _h.imgHeight,
140
+ imgWidth = _h.imgWidth,
141
+ isWill = _h.isWill,
142
+ rest = __rest(_h, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "isWill"]);
135
143
 
136
144
  var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
137
145
  var oldPrice = null;
@@ -180,7 +188,8 @@ function (_super) {
180
188
  color: "#fff",
181
189
  size: 18,
182
190
  type: "icon-a-EssentionalUI"
183
- }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), ((_a = panelProps.label) === null || _a === void 0 ? void 0 : _a.open) && data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
191
+ }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), // panelProps.label?.open && data.discountPercent && !isGift && (
192
+ this.isSpecialPrice() && !isGift && data.discountPercent && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
184
193
  className: "discount-tag",
185
194
  data: __assign(__assign({}, panelProps.label), {
186
195
  text: isWill ? (0, _locale.i18n)('COMING_SOON') : data.discountPercent + "% " + (0, _locale.i18n)('OFF')
@@ -219,7 +228,7 @@ function (_super) {
219
228
  }
220
229
  }))), /*#__PURE__*/_react["default"].createElement("div", {
221
230
  className: "rate-sold-wrap"
222
- }, ((_b = panelProps.evaluationScore) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
231
+ }, ((_a = panelProps.evaluationScore) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
223
232
  className: "evaluation-score"
224
233
  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
225
234
  color: "#FF8650",
@@ -231,9 +240,9 @@ function (_super) {
231
240
  text: (0, _currencyUtil.numberToFixed)(Number(data.evaluationAvg), 1)
232
241
  }),
233
242
  readonly: true
234
- })), ((_c = panelProps.evaluationScore) === null || _c === void 0 ? void 0 : _c.open) && ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
243
+ })), ((_b = panelProps.evaluationScore) === null || _b === void 0 ? void 0 : _b.open) && ((_c = panelProps.sold) === null || _c === void 0 ? void 0 : _c.open) && /*#__PURE__*/_react["default"].createElement("div", {
235
244
  className: "line"
236
- }), ((_e = panelProps.sold) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
245
+ }), ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
237
246
  className: "sold no-reversed"
238
247
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
239
248
  data: __assign(__assign({}, panelProps.sold), {
@@ -256,15 +265,15 @@ function (_super) {
256
265
  }, renderDiscount(m).text));
257
266
  })), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
258
267
  className: "progress-wrap"
259
- }, ((_f = panelProps.salesProgress) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
268
+ }, ((_e = panelProps.salesProgress) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
260
269
  className: "progress-container"
261
270
  }, /*#__PURE__*/_react["default"].createElement("div", {
262
271
  className: "progress",
263
272
  style: {
264
273
  width: salePercent + "%",
265
- backgroundColor: (_g = panelProps.salesProgress) === null || _g === void 0 ? void 0 : _g.color
274
+ backgroundColor: (_f = panelProps.salesProgress) === null || _f === void 0 ? void 0 : _f.color
266
275
  }
267
- })), ((_h = panelProps.stock) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement("div", {
276
+ })), ((_g = panelProps.stock) === null || _g === void 0 ? void 0 : _g.open) && /*#__PURE__*/_react["default"].createElement("div", {
268
277
  className: "text"
269
278
  }, data.saleNum || 0, "/", data.stockNum || 0, " ", (0, _locale.i18n)('STOCK')))));
270
279
  };
package/lib/composite-comp/monpay/components/InterestProducts/mobile/ProductItem/index.js CHANGED
@@ -19,6 +19,8 @@ require("./index.less");
19
19
 
20
20
  var _locale = require("../../../../../../locale");
21
21
 
22
+ var _constants = require("../../../../../../constants");
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); }
@@ -71,6 +73,12 @@ function (_super) {
71
73
  var _this = _super !== null && _super.apply(this, arguments) || this;
72
74
 
73
75
  _this.state = {};
76
+
77
+ _this.isSpecialPrice = function () {
78
+ var data = _this.props.data;
79
+ return data.sppType === _constants.sppTypeMap.DISCOUNT || data.sppType === _constants.sppTypeMap.FLASH;
80
+ };
81
+
74
82
  return _this;
75
83
  }
76
84
 
@@ -116,7 +124,7 @@ function (_super) {
116
124
  color: "#fff",
117
125
  size: 18,
118
126
  type: "icon-a-EssentionalUI"
119
- }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement("div", {
127
+ }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), this.isSpecialPrice() && data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement("div", {
120
128
  className: "discount-tag"
121
129
  }, data.discountPercent, "% ", (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
122
130
  className: "content-wrap"
package/lib/constants/index.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.projectFontFamily = exports.projectCodes = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.otherFontWeightList = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.fontWeightList = exports.fontFamilyList = 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;
6
+ exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.sppTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.projectFontFamily = exports.projectCodes = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.otherFontWeightList = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.fontWeightList = exports.fontFamilyList = 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
 
8
8
  var _locale = require("../locale");
9
9
 
@@ -461,4 +461,11 @@ var ORDER_TYPE = {
461
461
  VALUE: '商品详情购买'
462
462
  }
463
463
  };
464
- exports.ORDER_TYPE = ORDER_TYPE;
464
+ /** 蒙古商品活动促销类型 */
465
+
466
+ exports.ORDER_TYPE = ORDER_TYPE;
467
+ var sppTypeMap = {
468
+ FLASH: '2',
469
+ DISCOUNT: '14'
470
+ };
471
+ exports.sppTypeMap = sppTypeMap;
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.178",
4
+ "version": "2.0.182",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",