@fonixtree/magic-design 2.0.102 → 2.0.103

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.
@@ -230,6 +230,7 @@ function ProductFilterModal(props) {
230
230
  };
231
231
 
232
232
  return /*#__PURE__*/_react["default"].createElement(_PopUpModal["default"], {
233
+ className: "productFilterModal",
233
234
  onClose: onClose,
234
235
  visible: visible
235
236
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -1,111 +1,113 @@
1
- .productFilterWrap {
2
- background: #ffffff;
3
- height: calc(80vh - 40px);
4
- overflow-y: scroll;
5
- overflow-x: hidden;
6
- box-sizing: border-box;
1
+ .productFilterModal {
2
+ .productFilterWrap {
3
+ background: #ffffff;
4
+ height: calc(80vh - 40px);
5
+ overflow-y: scroll;
6
+ overflow-x: hidden;
7
+ box-sizing: border-box;
7
8
 
8
- .item {
9
- margin-top: 20px;
9
+ .item {
10
+ margin-top: 20px;
10
11
 
11
- .inputWrap {
12
- margin-top: 10px;
13
- display: flex;
14
- align-items: center;
15
- justify-content: space-between;
12
+ .inputWrap {
13
+ margin-top: 10px;
14
+ display: flex;
15
+ align-items: center;
16
+ justify-content: space-between;
16
17
 
17
- .divider {
18
- padding: 0 10px;
19
- flex-shrink: 0;
20
- height: 2px;
21
- width: 11px;
22
- background-color: #000;
23
- }
18
+ .divider {
19
+ padding: 0 10px;
20
+ flex-shrink: 0;
21
+ height: 2px;
22
+ width: 11px;
23
+ background-color: #000;
24
+ }
24
25
 
25
- input {
26
- width: 45%;
27
- height: 48px;
28
- border: 1px solid #E4E4E4;
29
- box-shadow: none;
30
- padding: 12px;
31
- border-radius: 4px;
32
- outline: none;
26
+ input {
27
+ width: 45%;
28
+ height: 48px;
29
+ border: 1px solid #E4E4E4;
30
+ box-shadow: none;
31
+ padding: 12px;
32
+ border-radius: 4px;
33
+ outline: none;
34
+ }
33
35
  }
34
- }
35
36
 
36
- .title {
37
- line-height: 24px;
38
- font-size: 16px;
39
- font-weight: 600;
40
- color: #000;
41
- display: flex;
42
- align-items: center;
43
- justify-content: space-between;
44
- }
37
+ .title {
38
+ line-height: 24px;
39
+ font-size: 16px;
40
+ font-weight: 600;
41
+ color: #000;
42
+ display: flex;
43
+ align-items: center;
44
+ justify-content: space-between;
45
+ }
45
46
 
46
- .accordionContentWrap {
47
- display: flex;
48
- flex-wrap: wrap;
49
- align-items: center;
50
- padding-bottom: 1px;
47
+ .accordionContentWrap {
48
+ display: flex;
49
+ flex-wrap: wrap;
50
+ align-items: center;
51
+ padding-bottom: 1px;
51
52
 
52
- .btnMore {
53
- font-weight: 600;
54
- font-size: 14px;
55
- color: #FF8650;
56
- margin-top: 6px;
57
- margin-left: 10px;
53
+ .btnMore {
54
+ font-weight: 600;
55
+ font-size: 14px;
56
+ color: #FF8650;
57
+ margin-top: 6px;
58
+ margin-left: 10px;
59
+ }
58
60
  }
59
61
  }
60
62
  }
61
- }
62
-
63
- .bottomWrap {
64
- position: fixed;
65
- bottom: 0;
66
- left: 0;
67
- right: 0;
68
- background: #fff;
69
- width: 100%;
70
- height: 78px;
71
- padding: 12px 24px;
72
- display: flex;
73
- gap: 20px;
74
- justify-content: space-between;
75
63
 
76
- .btn-reset {
64
+ .bottomWrap {
65
+ position: fixed;
66
+ bottom: 0;
67
+ left: 0;
68
+ right: 0;
69
+ background: #fff;
70
+ width: 100%;
71
+ height: 78px;
72
+ padding: 12px 24px;
77
73
  display: flex;
78
- flex: 1 1;
79
- height: 54px;
80
- align-items: center;
81
- justify-content: center;
82
- color: #FF8650;
83
- border: 1px solid #FF8650;
84
- background-color: #fff;
85
- border-radius: 8px;
86
- font-weight: 600;
87
- font-size: 14px;
74
+ gap: 20px;
75
+ justify-content: space-between;
88
76
 
89
- &:hover {
77
+ .btn-reset {
78
+ display: flex;
79
+ flex: 1 1;
80
+ height: 54px;
81
+ align-items: center;
82
+ justify-content: center;
83
+ color: #FF8650;
84
+ border: 1px solid #FF8650;
90
85
  background-color: #fff;
91
- }
92
- }
86
+ border-radius: 8px;
87
+ font-weight: 600;
88
+ font-size: 14px;
93
89
 
94
- .btn-confirm {
95
- display: flex;
96
- flex: 1 1;
97
- height: 54px;
98
- align-items: center;
99
- justify-content: center;
100
- color: #fff;
101
- border: 1px solid #FF8650;
102
- background-color: #FF8650;
103
- border-radius: 8px;
104
- font-weight: 600;
105
- font-size: 14px;
90
+ &:hover {
91
+ background-color: #fff;
92
+ }
93
+ }
106
94
 
107
- &:hover {
95
+ .btn-confirm {
96
+ display: flex;
97
+ flex: 1 1;
98
+ height: 54px;
99
+ align-items: center;
100
+ justify-content: center;
101
+ color: #fff;
102
+ border: 1px solid #FF8650;
108
103
  background-color: #FF8650;
104
+ border-radius: 8px;
105
+ font-weight: 600;
106
+ font-size: 14px;
107
+
108
+ &:hover {
109
+ background-color: #FF8650;
110
+ }
109
111
  }
110
112
  }
111
113
  }
@@ -164,8 +164,6 @@ function (_super) {
164
164
  }, oldPrice && /*#__PURE__*/_react["default"].createElement("div", {
165
165
  className: "old-price"
166
166
  }, oldPrice)), /*#__PURE__*/_react["default"].createElement("div", {
167
- className: "shipping-price"
168
- }, oldPrice), /*#__PURE__*/_react["default"].createElement("div", {
169
167
  className: "rate-sold-wrap"
170
168
  }, /*#__PURE__*/_react["default"].createElement("div", {
171
169
  className: "evaluation-score"
@@ -179,7 +177,7 @@ function (_super) {
179
177
  className: "line"
180
178
  }), /*#__PURE__*/_react["default"].createElement("div", {
181
179
  className: "sold"
182
- }, "Sold $", soldNumber, "+"))));
180
+ }, "Sold ", soldNumber || 0, "+"))));
183
181
  };
184
182
 
185
183
  ProductItem.defaultProps = {
@@ -102,15 +102,10 @@
102
102
  font-size: 0.24rem;
103
103
  color: #FA7373;
104
104
  }
105
- .monpay-interest-product-item-wrap .content-wrap .shipping-price {
106
- font-weight: 400;
107
- font-size: 0.24rem;
108
- color: #545454;
109
- margin-top: 0.16rem;
110
- }
111
105
  .monpay-interest-product-item-wrap .content-wrap .rate-sold-wrap {
112
106
  display: flex;
113
107
  align-items: center;
108
+ margin-top: 0.1rem;
114
109
  }
115
110
  .monpay-interest-product-item-wrap .content-wrap .rate-sold-wrap .evaluation-score {
116
111
  display: inline-flex;
@@ -51,6 +51,22 @@ var __extends = void 0 && (void 0).__extends || function () {
51
51
  };
52
52
  }();
53
53
 
54
+ var __assign = void 0 && (void 0).__assign || function () {
55
+ __assign = Object.assign || function (t) {
56
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
57
+ s = arguments[i];
58
+
59
+ for (var p in s) {
60
+ if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
61
+ }
62
+ }
63
+
64
+ return t;
65
+ };
66
+
67
+ return __assign.apply(this, arguments);
68
+ };
69
+
54
70
  var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
55
71
  function adopt(value) {
56
72
  return value instanceof P ? value : new P(function (resolve) {
@@ -204,6 +220,7 @@ var defaultData = [{
204
220
  marketPrice: 19000000,
205
221
  discountPercent: 10,
206
222
  salePercent: 500,
223
+ salesCnt: 501,
207
224
  sppType: '2'
208
225
  }, {
209
226
  imgUrlContent: {
@@ -215,6 +232,7 @@ var defaultData = [{
215
232
  marketPrice: 19000000,
216
233
  discountPercent: 10,
217
234
  salePercent: 500,
235
+ salesCnt: 501,
218
236
  sppType: '2'
219
237
  }, {
220
238
  imgUrlContent: {
@@ -226,6 +244,7 @@ var defaultData = [{
226
244
  marketPrice: 19000000,
227
245
  discountPercent: 10,
228
246
  salePercent: 500,
247
+ salesCnt: 501,
229
248
  sppType: '2'
230
249
  }, {
231
250
  imgUrlContent: {
@@ -237,6 +256,7 @@ var defaultData = [{
237
256
  marketPrice: 19000000,
238
257
  discountPercent: 10,
239
258
  salePercent: 500,
259
+ salesCnt: 501,
240
260
  sppType: '2'
241
261
  }];
242
262
 
@@ -249,6 +269,7 @@ function (_super) {
249
269
  var _this = _super !== null && _super.apply(this, arguments) || this;
250
270
 
251
271
  _this.state = {
272
+ interestName: '',
252
273
  list: (0, _coreUtil.isDesignMode)() ? defaultData : (0, _commonUtil.ensure)(function () {
253
274
  return (0, _storeUtil.getMagicStore)("interestProducts_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
254
275
  }, [])
@@ -280,7 +301,7 @@ function (_super) {
280
301
  maxProdNum = this.props.panelProps.content.maxProdNum;
281
302
  return [4
282
303
  /*yield*/
283
- , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
304
+ , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers/interest', {
284
305
  pageIndex: 1,
285
306
  pageSize: maxProdNum,
286
307
  interested: true
@@ -290,6 +311,7 @@ function (_super) {
290
311
  res = _a.sent();
291
312
  list = res.pageInfo.list;
292
313
  this.setState({
314
+ interestName: res.interest.interestName,
293
315
  list: list
294
316
  });
295
317
  this.getMacy();
@@ -315,14 +337,18 @@ function (_super) {
315
337
 
316
338
  InterestProductsMobile.prototype.render = function () {
317
339
  var panelProps = this.props.panelProps;
318
- var list = this.state.list;
340
+ var _a = this.state,
341
+ interestName = _a.interestName,
342
+ list = _a.list;
319
343
  return /*#__PURE__*/_react["default"].createElement("div", {
320
344
  className: "monpay-interest-products-mobile"
321
345
  }, /*#__PURE__*/_react["default"].createElement("div", {
322
346
  className: "interest-products-title"
323
347
  }, panelProps.title.headline.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
324
348
  className: "text",
325
- data: panelProps.title.headline
349
+ data: __assign(__assign({}, panelProps.title.headline), {
350
+ text: interestName
351
+ })
326
352
  }), panelProps.title.seeAll.open && /*#__PURE__*/_react["default"].createElement("span", {
327
353
  className: "btn"
328
354
  }, "See All")), /*#__PURE__*/_react["default"].createElement("div", {
@@ -230,6 +230,7 @@ function ProductFilterModal(props) {
230
230
  };
231
231
 
232
232
  return /*#__PURE__*/_react["default"].createElement(_PopUpModal["default"], {
233
+ className: "productFilterModal",
233
234
  onClose: onClose,
234
235
  visible: visible
235
236
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -1,111 +1,113 @@
1
- .productFilterWrap {
2
- background: #ffffff;
3
- height: calc(80vh - 40px);
4
- overflow-y: scroll;
5
- overflow-x: hidden;
6
- box-sizing: border-box;
1
+ .productFilterModal {
2
+ .productFilterWrap {
3
+ background: #ffffff;
4
+ height: calc(80vh - 40px);
5
+ overflow-y: scroll;
6
+ overflow-x: hidden;
7
+ box-sizing: border-box;
7
8
 
8
- .item {
9
- margin-top: 20px;
9
+ .item {
10
+ margin-top: 20px;
10
11
 
11
- .inputWrap {
12
- margin-top: 10px;
13
- display: flex;
14
- align-items: center;
15
- justify-content: space-between;
12
+ .inputWrap {
13
+ margin-top: 10px;
14
+ display: flex;
15
+ align-items: center;
16
+ justify-content: space-between;
16
17
 
17
- .divider {
18
- padding: 0 10px;
19
- flex-shrink: 0;
20
- height: 2px;
21
- width: 11px;
22
- background-color: #000;
23
- }
18
+ .divider {
19
+ padding: 0 10px;
20
+ flex-shrink: 0;
21
+ height: 2px;
22
+ width: 11px;
23
+ background-color: #000;
24
+ }
24
25
 
25
- input {
26
- width: 45%;
27
- height: 48px;
28
- border: 1px solid #E4E4E4;
29
- box-shadow: none;
30
- padding: 12px;
31
- border-radius: 4px;
32
- outline: none;
26
+ input {
27
+ width: 45%;
28
+ height: 48px;
29
+ border: 1px solid #E4E4E4;
30
+ box-shadow: none;
31
+ padding: 12px;
32
+ border-radius: 4px;
33
+ outline: none;
34
+ }
33
35
  }
34
- }
35
36
 
36
- .title {
37
- line-height: 24px;
38
- font-size: 16px;
39
- font-weight: 600;
40
- color: #000;
41
- display: flex;
42
- align-items: center;
43
- justify-content: space-between;
44
- }
37
+ .title {
38
+ line-height: 24px;
39
+ font-size: 16px;
40
+ font-weight: 600;
41
+ color: #000;
42
+ display: flex;
43
+ align-items: center;
44
+ justify-content: space-between;
45
+ }
45
46
 
46
- .accordionContentWrap {
47
- display: flex;
48
- flex-wrap: wrap;
49
- align-items: center;
50
- padding-bottom: 1px;
47
+ .accordionContentWrap {
48
+ display: flex;
49
+ flex-wrap: wrap;
50
+ align-items: center;
51
+ padding-bottom: 1px;
51
52
 
52
- .btnMore {
53
- font-weight: 600;
54
- font-size: 14px;
55
- color: #FF8650;
56
- margin-top: 6px;
57
- margin-left: 10px;
53
+ .btnMore {
54
+ font-weight: 600;
55
+ font-size: 14px;
56
+ color: #FF8650;
57
+ margin-top: 6px;
58
+ margin-left: 10px;
59
+ }
58
60
  }
59
61
  }
60
62
  }
61
- }
62
-
63
- .bottomWrap {
64
- position: fixed;
65
- bottom: 0;
66
- left: 0;
67
- right: 0;
68
- background: #fff;
69
- width: 100%;
70
- height: 78px;
71
- padding: 12px 24px;
72
- display: flex;
73
- gap: 20px;
74
- justify-content: space-between;
75
63
 
76
- .btn-reset {
64
+ .bottomWrap {
65
+ position: fixed;
66
+ bottom: 0;
67
+ left: 0;
68
+ right: 0;
69
+ background: #fff;
70
+ width: 100%;
71
+ height: 78px;
72
+ padding: 12px 24px;
77
73
  display: flex;
78
- flex: 1 1;
79
- height: 54px;
80
- align-items: center;
81
- justify-content: center;
82
- color: #FF8650;
83
- border: 1px solid #FF8650;
84
- background-color: #fff;
85
- border-radius: 8px;
86
- font-weight: 600;
87
- font-size: 14px;
74
+ gap: 20px;
75
+ justify-content: space-between;
88
76
 
89
- &:hover {
77
+ .btn-reset {
78
+ display: flex;
79
+ flex: 1 1;
80
+ height: 54px;
81
+ align-items: center;
82
+ justify-content: center;
83
+ color: #FF8650;
84
+ border: 1px solid #FF8650;
90
85
  background-color: #fff;
91
- }
92
- }
86
+ border-radius: 8px;
87
+ font-weight: 600;
88
+ font-size: 14px;
93
89
 
94
- .btn-confirm {
95
- display: flex;
96
- flex: 1 1;
97
- height: 54px;
98
- align-items: center;
99
- justify-content: center;
100
- color: #fff;
101
- border: 1px solid #FF8650;
102
- background-color: #FF8650;
103
- border-radius: 8px;
104
- font-weight: 600;
105
- font-size: 14px;
90
+ &:hover {
91
+ background-color: #fff;
92
+ }
93
+ }
106
94
 
107
- &:hover {
95
+ .btn-confirm {
96
+ display: flex;
97
+ flex: 1 1;
98
+ height: 54px;
99
+ align-items: center;
100
+ justify-content: center;
101
+ color: #fff;
102
+ border: 1px solid #FF8650;
108
103
  background-color: #FF8650;
104
+ border-radius: 8px;
105
+ font-weight: 600;
106
+ font-size: 14px;
107
+
108
+ &:hover {
109
+ background-color: #FF8650;
110
+ }
109
111
  }
110
112
  }
111
113
  }
@@ -164,8 +164,6 @@ function (_super) {
164
164
  }, oldPrice && /*#__PURE__*/_react["default"].createElement("div", {
165
165
  className: "old-price"
166
166
  }, oldPrice)), /*#__PURE__*/_react["default"].createElement("div", {
167
- className: "shipping-price"
168
- }, oldPrice), /*#__PURE__*/_react["default"].createElement("div", {
169
167
  className: "rate-sold-wrap"
170
168
  }, /*#__PURE__*/_react["default"].createElement("div", {
171
169
  className: "evaluation-score"
@@ -179,7 +177,7 @@ function (_super) {
179
177
  className: "line"
180
178
  }), /*#__PURE__*/_react["default"].createElement("div", {
181
179
  className: "sold"
182
- }, "Sold $", soldNumber, "+"))));
180
+ }, "Sold ", soldNumber || 0, "+"))));
183
181
  };
184
182
 
185
183
  ProductItem.defaultProps = {
@@ -102,15 +102,10 @@
102
102
  font-size: 0.24rem;
103
103
  color: #FA7373;
104
104
  }
105
- .monpay-interest-product-item-wrap .content-wrap .shipping-price {
106
- font-weight: 400;
107
- font-size: 0.24rem;
108
- color: #545454;
109
- margin-top: 0.16rem;
110
- }
111
105
  .monpay-interest-product-item-wrap .content-wrap .rate-sold-wrap {
112
106
  display: flex;
113
107
  align-items: center;
108
+ margin-top: 0.1rem;
114
109
  }
115
110
  .monpay-interest-product-item-wrap .content-wrap .rate-sold-wrap .evaluation-score {
116
111
  display: inline-flex;
@@ -51,6 +51,22 @@ var __extends = void 0 && (void 0).__extends || function () {
51
51
  };
52
52
  }();
53
53
 
54
+ var __assign = void 0 && (void 0).__assign || function () {
55
+ __assign = Object.assign || function (t) {
56
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
57
+ s = arguments[i];
58
+
59
+ for (var p in s) {
60
+ if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
61
+ }
62
+ }
63
+
64
+ return t;
65
+ };
66
+
67
+ return __assign.apply(this, arguments);
68
+ };
69
+
54
70
  var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
55
71
  function adopt(value) {
56
72
  return value instanceof P ? value : new P(function (resolve) {
@@ -204,6 +220,7 @@ var defaultData = [{
204
220
  marketPrice: 19000000,
205
221
  discountPercent: 10,
206
222
  salePercent: 500,
223
+ salesCnt: 501,
207
224
  sppType: '2'
208
225
  }, {
209
226
  imgUrlContent: {
@@ -215,6 +232,7 @@ var defaultData = [{
215
232
  marketPrice: 19000000,
216
233
  discountPercent: 10,
217
234
  salePercent: 500,
235
+ salesCnt: 501,
218
236
  sppType: '2'
219
237
  }, {
220
238
  imgUrlContent: {
@@ -226,6 +244,7 @@ var defaultData = [{
226
244
  marketPrice: 19000000,
227
245
  discountPercent: 10,
228
246
  salePercent: 500,
247
+ salesCnt: 501,
229
248
  sppType: '2'
230
249
  }, {
231
250
  imgUrlContent: {
@@ -237,6 +256,7 @@ var defaultData = [{
237
256
  marketPrice: 19000000,
238
257
  discountPercent: 10,
239
258
  salePercent: 500,
259
+ salesCnt: 501,
240
260
  sppType: '2'
241
261
  }];
242
262
 
@@ -249,6 +269,7 @@ function (_super) {
249
269
  var _this = _super !== null && _super.apply(this, arguments) || this;
250
270
 
251
271
  _this.state = {
272
+ interestName: '',
252
273
  list: (0, _coreUtil.isDesignMode)() ? defaultData : (0, _commonUtil.ensure)(function () {
253
274
  return (0, _storeUtil.getMagicStore)("interestProducts_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
254
275
  }, [])
@@ -280,7 +301,7 @@ function (_super) {
280
301
  maxProdNum = this.props.panelProps.content.maxProdNum;
281
302
  return [4
282
303
  /*yield*/
283
- , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
304
+ , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers/interest', {
284
305
  pageIndex: 1,
285
306
  pageSize: maxProdNum,
286
307
  interested: true
@@ -290,6 +311,7 @@ function (_super) {
290
311
  res = _a.sent();
291
312
  list = res.pageInfo.list;
292
313
  this.setState({
314
+ interestName: res.interest.interestName,
293
315
  list: list
294
316
  });
295
317
  this.getMacy();
@@ -315,14 +337,18 @@ function (_super) {
315
337
 
316
338
  InterestProductsMobile.prototype.render = function () {
317
339
  var panelProps = this.props.panelProps;
318
- var list = this.state.list;
340
+ var _a = this.state,
341
+ interestName = _a.interestName,
342
+ list = _a.list;
319
343
  return /*#__PURE__*/_react["default"].createElement("div", {
320
344
  className: "monpay-interest-products-mobile"
321
345
  }, /*#__PURE__*/_react["default"].createElement("div", {
322
346
  className: "interest-products-title"
323
347
  }, panelProps.title.headline.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
324
348
  className: "text",
325
- data: panelProps.title.headline
349
+ data: __assign(__assign({}, panelProps.title.headline), {
350
+ text: interestName
351
+ })
326
352
  }), panelProps.title.seeAll.open && /*#__PURE__*/_react["default"].createElement("span", {
327
353
  className: "btn"
328
354
  }, "See All")), /*#__PURE__*/_react["default"].createElement("div", {
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.102",
4
+ "version": "2.0.103",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",