@fonixtree/magic-design 2.0.135 → 2.0.136

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 (9) hide show
  1. package/es/composite-comp/common/components/MonpayProductItem/index.js +5 -18
  2. package/es/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less +3 -0
  3. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +1 -0
  4. package/es/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js +2 -10
  5. package/lib/composite-comp/common/components/MonpayProductItem/index.js +5 -18
  6. package/lib/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less +3 -0
  7. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +1 -0
  8. package/lib/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js +2 -10
  9. package/package.json +1 -1
package/es/composite-comp/common/components/MonpayProductItem/index.js CHANGED
@@ -19,8 +19,6 @@ var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
19
19
 
20
20
  var _components = require("../../../../meta-comp/components");
21
21
 
22
- var _businessUtil = require("../../../../utils/businessUtil");
23
-
24
22
  var _locale = require("../../../../locale");
25
23
 
26
24
  require("./index.less");
@@ -130,10 +128,10 @@ function (_super) {
130
128
  layout = _m.layout,
131
129
  imgHeight = _m.imgHeight,
132
130
  imgWidth = _m.imgWidth,
133
- unknownPrice = _m.unknownPrice,
134
- rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
131
+ showDiscountTag = _m.showDiscountTag,
132
+ rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "showDiscountTag"]); // const promotions = getPromotionList(data);
133
+
135
134
 
136
- var promotions = (0, _businessUtil.getPromotionList)(data);
137
135
  var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
138
136
  var oldPrice = null;
139
137
 
@@ -178,22 +176,11 @@ function (_super) {
178
176
  }), /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
179
177
  labels: imgLabels,
180
178
  small: true
181
- }), ((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
179
+ }), (((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) || showDiscountTag) && data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
182
180
  className: "discount-tag"
183
181
  }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
184
182
  className: "content-wrap"
185
- }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
186
- className: "promotions-wrap"
187
- }, promotions.map(function (promot, index) {
188
- return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
189
- key: index,
190
- className: "promotion-item",
191
- data: __assign(__assign({}, panelProps.label), {
192
- text: promot
193
- }),
194
- readonly: true
195
- });
196
- })), /*#__PURE__*/_react["default"].createElement("div", {
183
+ }, /*#__PURE__*/_react["default"].createElement("div", {
197
184
  className: "product-name-wrap"
198
185
  }, /*#__PURE__*/_react["default"].createElement("div", {
199
186
  className: "box"
package/es/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less CHANGED
@@ -28,7 +28,10 @@
28
28
  overflow: scroll;
29
29
  }
30
30
  .BundleItemWrap .prodList img {
31
+ height: 1.9rem;
31
32
  width: 1.9rem;
33
+ border-radius: 0.16rem;
34
+ object-fit: cover;
32
35
  }
33
36
  .BundleItemWrap .bottomWrap {
34
37
  border-top: 0.02rem solid #E4E4E4;
package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js CHANGED
@@ -821,6 +821,7 @@ function (_super) {
821
821
  (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
822
822
  },
823
823
  panelProps: panelProps.content,
824
+ showDiscountTag: true,
824
825
  showProgress: false
825
826
  });
826
827
  })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
package/es/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js CHANGED
@@ -7,8 +7,6 @@ exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
11
-
12
10
  var _TextConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/TextConfig"));
13
11
 
14
12
  var _coreUtil = require("../../../../../utils/coreUtil");
@@ -76,14 +74,8 @@ function (_super) {
76
74
  name: (0, _locale.i18n)('FILTER'),
77
75
  value: null,
78
76
  metaOption: panelProps.filter
79
- }, {
80
- key: '1',
81
- name: (0, _locale.i18n)('LABEL'),
82
- value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
83
- data: panelProps.label
84
- }),
85
- metaOption: panelProps.label
86
- }, {
77
+ }, // { key: '1', name: i18n('LABEL'), value: <ButtonConfig data={panelProps.label} />, metaOption: panelProps.label },
78
+ {
87
79
  key: '2',
88
80
  name: (0, _locale.i18n)('PRODUCT_NAME'),
89
81
  value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
package/lib/composite-comp/common/components/MonpayProductItem/index.js CHANGED
@@ -19,8 +19,6 @@ var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
19
19
 
20
20
  var _components = require("../../../../meta-comp/components");
21
21
 
22
- var _businessUtil = require("../../../../utils/businessUtil");
23
-
24
22
  var _locale = require("../../../../locale");
25
23
 
26
24
  require("./index.less");
@@ -130,10 +128,10 @@ function (_super) {
130
128
  layout = _m.layout,
131
129
  imgHeight = _m.imgHeight,
132
130
  imgWidth = _m.imgWidth,
133
- unknownPrice = _m.unknownPrice,
134
- rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
131
+ showDiscountTag = _m.showDiscountTag,
132
+ rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "showDiscountTag"]); // const promotions = getPromotionList(data);
133
+
135
134
 
136
- var promotions = (0, _businessUtil.getPromotionList)(data);
137
135
  var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
138
136
  var oldPrice = null;
139
137
 
@@ -178,22 +176,11 @@ function (_super) {
178
176
  }), /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
179
177
  labels: imgLabels,
180
178
  small: true
181
- }), ((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
179
+ }), (((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) || showDiscountTag) && data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
182
180
  className: "discount-tag"
183
181
  }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
184
182
  className: "content-wrap"
185
- }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
186
- className: "promotions-wrap"
187
- }, promotions.map(function (promot, index) {
188
- return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
189
- key: index,
190
- className: "promotion-item",
191
- data: __assign(__assign({}, panelProps.label), {
192
- text: promot
193
- }),
194
- readonly: true
195
- });
196
- })), /*#__PURE__*/_react["default"].createElement("div", {
183
+ }, /*#__PURE__*/_react["default"].createElement("div", {
197
184
  className: "product-name-wrap"
198
185
  }, /*#__PURE__*/_react["default"].createElement("div", {
199
186
  className: "box"
package/lib/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less CHANGED
@@ -28,7 +28,10 @@
28
28
  overflow: scroll;
29
29
  }
30
30
  .BundleItemWrap .prodList img {
31
+ height: 1.9rem;
31
32
  width: 1.9rem;
33
+ border-radius: 0.16rem;
34
+ object-fit: cover;
32
35
  }
33
36
  .BundleItemWrap .bottomWrap {
34
37
  border-top: 0.02rem solid #E4E4E4;
package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js CHANGED
@@ -821,6 +821,7 @@ function (_super) {
821
821
  (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
822
822
  },
823
823
  panelProps: panelProps.content,
824
+ showDiscountTag: true,
824
825
  showProgress: false
825
826
  });
826
827
  })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
package/lib/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js CHANGED
@@ -7,8 +7,6 @@ exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
11
-
12
10
  var _TextConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/TextConfig"));
13
11
 
14
12
  var _coreUtil = require("../../../../../utils/coreUtil");
@@ -76,14 +74,8 @@ function (_super) {
76
74
  name: (0, _locale.i18n)('FILTER'),
77
75
  value: null,
78
76
  metaOption: panelProps.filter
79
- }, {
80
- key: '1',
81
- name: (0, _locale.i18n)('LABEL'),
82
- value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
83
- data: panelProps.label
84
- }),
85
- metaOption: panelProps.label
86
- }, {
77
+ }, // { key: '1', name: i18n('LABEL'), value: <ButtonConfig data={panelProps.label} />, metaOption: panelProps.label },
78
+ {
87
79
  key: '2',
88
80
  name: (0, _locale.i18n)('PRODUCT_NAME'),
89
81
  value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
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.135",
4
+ "version": "2.0.136",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",