@fonixtree/magic-design 2.0.131 → 2.0.134

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 (31) hide show
  1. package/es/assets/images/layout-icon/flash-deal-layout1.png +0 -0
  2. package/es/common/LinkModal/MissionDetail/index.js +318 -0
  3. package/es/common/LinkModal/index.js +7 -0
  4. package/es/composite-comp/common/components/ProductItem/index.js +4 -2
  5. package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js +4 -0
  6. package/es/composite-comp/dito/components/FlashDeal/mobile/index.js +17 -8
  7. package/es/composite-comp/dito/components/FlashDeal/mobile/index.less +40 -8
  8. package/es/composite-comp/dito/components/GroupBuy/mobile/index.less +3 -3
  9. package/es/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigTitle/index.js +20 -11
  10. package/es/composite-comp/dito/config-panels/FlashDealConfig/index.js +3 -7
  11. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +11 -11
  12. package/es/constants/layout.js +14 -2
  13. package/es/locale/en/en.json +2 -0
  14. package/es/locale/es/es.json +2 -0
  15. package/es/locale/mn/mn.json +2 -0
  16. package/lib/assets/images/layout-icon/flash-deal-layout1.png +0 -0
  17. package/lib/common/LinkModal/MissionDetail/index.js +318 -0
  18. package/lib/common/LinkModal/index.js +7 -0
  19. package/lib/composite-comp/common/components/ProductItem/index.js +4 -2
  20. package/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js +4 -0
  21. package/lib/composite-comp/dito/components/FlashDeal/mobile/index.js +17 -8
  22. package/lib/composite-comp/dito/components/FlashDeal/mobile/index.less +40 -8
  23. package/lib/composite-comp/dito/components/GroupBuy/mobile/index.less +3 -3
  24. package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigTitle/index.js +20 -11
  25. package/lib/composite-comp/dito/config-panels/FlashDealConfig/index.js +3 -7
  26. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +11 -11
  27. package/lib/constants/layout.js +14 -2
  28. package/lib/locale/en/en.json +2 -0
  29. package/lib/locale/es/es.json +2 -0
  30. package/lib/locale/mn/mn.json +2 -0
  31. package/package.json +1 -1
@@ -748,12 +748,12 @@ function (_super) {
748
748
  }, 140);
749
749
  if (_layout === 'layout1-2' && contentWidth) imgHeight = (contentWidth - 12) / 2;
750
750
  if (_layout === 'layout1-3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
751
- return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, groupSource.length === 1 && _products.length > 0 || groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement("div", {
751
+ return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (groupSource.length === 1 && _products.length > 0 || groupSource.length > 1) && /*#__PURE__*/_react["default"].createElement("div", {
752
752
  className: "monpay-recommend-mobile recommend_" + panelProps.id
753
753
  }, panelProps.title.headerImage.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
754
754
  className: "headerImg",
755
- isRect: true,
756
- data: panelProps.title.headerImage
755
+ data: panelProps.title.headerImage,
756
+ isRect: true
757
757
  }), !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
758
758
  className: "tab-select-wrap"
759
759
  }, groupSource.map(function (tab, index) {
@@ -806,6 +806,7 @@ function (_super) {
806
806
  data: item,
807
807
  imgHeight: imgHeight,
808
808
  imgWidth: imgWidth,
809
+ intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType,
809
810
  layout: layout === 'layout2' ? 'horizontal' : 'vertical',
810
811
  onItemClick: function onItemClick() {
811
812
  /** PTO 定制GA */
@@ -820,16 +821,15 @@ function (_super) {
820
821
  (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
821
822
  },
822
823
  panelProps: panelProps.content,
823
- showProgress: false,
824
- intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType
824
+ showProgress: false
825
825
  });
826
826
  })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
827
827
  className: "btnSeeAll",
828
828
  data: _seeAll
829
829
  }), _products.length === 0 && /*#__PURE__*/_react["default"].createElement("img", {
830
- src: _emptyImg["default"],
831
830
  alt: "",
832
- className: "emptyImg"
831
+ className: "emptyImg",
832
+ src: _emptyImg["default"]
833
833
  })) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
834
834
  key: "scrollContainer",
835
835
  className: (0, _classnames["default"])('scrollContainer', {
@@ -845,6 +845,7 @@ function (_super) {
845
845
  data: item,
846
846
  imgHeight: imgHeight,
847
847
  imgWidth: imgWidth,
848
+ intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType,
848
849
  onItemClick: function onItemClick() {
849
850
  /** PTO 定制GA */
850
851
  if (window.magicDesign.pushGA) {
@@ -854,16 +855,15 @@ function (_super) {
854
855
  (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
855
856
  },
856
857
  panelProps: panelProps.content,
857
- showProgress: false,
858
- intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType
858
+ showProgress: false
859
859
  });
860
860
  })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
861
861
  className: "btnSeeAll",
862
862
  data: _seeAll
863
863
  })), _products.length === 0 && /*#__PURE__*/_react["default"].createElement("img", {
864
- src: _emptyImg["default"],
865
864
  alt: "",
866
- className: "emptyImg"
865
+ className: "emptyImg",
866
+ src: _emptyImg["default"]
867
867
  }))));
868
868
  };
869
869
 
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.videoPCLayout = exports.videoH5Layout = exports.searchLayout = exports.recommendLayoutPc = exports.recommendLayoutMobile = exports.pcNavigationLayout = exports.newsletterLayout = exports.monpaySignBoardLayout = exports.monpayRecommendLayoutMobile = exports.mobileNavigationLayout = exports.locationLayout = exports.imageTextLayoutPc = exports.imageTextLayoutMobile = exports.imageGalleryLayout = exports.dividerLayout = exports.carouselLayout = exports.bannerSlideLayout = exports.affiliateLayoutPc = exports.affiliateLayoutMobile = exports.WalletNuriLayout = exports.WalletLayout = void 0;
6
+ exports.videoPCLayout = exports.videoH5Layout = exports.searchLayout = exports.recommendLayoutPc = exports.recommendLayoutMobile = exports.pcNavigationLayout = exports.newsletterLayout = exports.monpaySignBoardLayout = exports.monpayRecommendLayoutMobile = exports.mobileNavigationLayout = exports.locationLayout = exports.imageTextLayoutPc = exports.imageTextLayoutMobile = exports.imageGalleryLayout = exports.flashDealLayout = exports.dividerLayout = exports.carouselLayout = exports.bannerSlideLayout = exports.affiliateLayoutPc = exports.affiliateLayoutMobile = exports.WalletNuriLayout = exports.WalletLayout = void 0;
7
7
 
8
8
  var _dividerLayout = _interopRequireDefault(require("../assets/images/layout-icon/dividerLayout.svg"));
9
9
 
@@ -95,6 +95,8 @@ var _bannerSlideLayout = _interopRequireDefault(require("../assets/images/layout
95
95
 
96
96
  var _bannerSlideLayout2 = _interopRequireDefault(require("../assets/images/layout-icon/banner-slide-layout2.png"));
97
97
 
98
+ var _flashDealLayout = _interopRequireDefault(require("../assets/images/layout-icon/flash-deal-layout1.png"));
99
+
98
100
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
99
101
 
100
102
  // import p3 from '../assets/images/layout-icon/layout-imagetext-p3.png';
@@ -359,4 +361,14 @@ var monpaySignBoardLayout = [{
359
361
  name: 'layout1',
360
362
  image: _monpaySignBoardLayout["default"]
361
363
  }];
362
- exports.monpaySignBoardLayout = monpaySignBoardLayout;
364
+ exports.monpaySignBoardLayout = monpaySignBoardLayout;
365
+ var flashDealLayout = [{
366
+ id: 'layout1',
367
+ name: 'layout1',
368
+ image: _flashDealLayout["default"]
369
+ }, {
370
+ id: 'layout2',
371
+ name: 'layout2',
372
+ image: _layoutImagetextM4["default"]
373
+ }];
374
+ exports.flashDealLayout = flashDealLayout;
@@ -1,4 +1,6 @@
1
1
  {
2
+ "MISSION_NAME": "Mission Name",
3
+ "COUNT_DOWN": "Count Down",
2
4
  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
3
5
  "INTER": "Inter",
4
6
  "STORE_SERVICES": "Store services",
@@ -1,4 +1,6 @@
1
1
  {
2
+ "MISSION_NAME": "Mission Name",
3
+ "COUNT_DOWN": "Count Down",
2
4
  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
3
5
  "INTER": "Inter",
4
6
  "STORE_SERVICES": "Store services",
@@ -1,4 +1,6 @@
1
1
  {
2
+ "MISSION_NAME": "Mission Name",
3
+ "COUNT_DOWN": "Count Down",
2
4
  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
3
5
  "INTER": "Inter",
4
6
  "STORE_SERVICES": "Store services",
@@ -0,0 +1,318 @@
1
+ "use strict";
2
+
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports["default"] = MissionDetail;
9
+
10
+ var _react = _interopRequireWildcard(require("react"));
11
+
12
+ var _antd = require("antd4");
13
+
14
+ var _locale = require("../../../locale");
15
+
16
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
17
+
18
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
19
+
20
+ var __assign = void 0 && (void 0).__assign || function () {
21
+ __assign = Object.assign || function (t) {
22
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
23
+ s = arguments[i];
24
+
25
+ for (var p in s) {
26
+ if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
27
+ }
28
+ }
29
+
30
+ return t;
31
+ };
32
+
33
+ return __assign.apply(this, arguments);
34
+ };
35
+
36
+ var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
37
+ function adopt(value) {
38
+ return value instanceof P ? value : new P(function (resolve) {
39
+ resolve(value);
40
+ });
41
+ }
42
+
43
+ return new (P || (P = Promise))(function (resolve, reject) {
44
+ function fulfilled(value) {
45
+ try {
46
+ step(generator.next(value));
47
+ } catch (e) {
48
+ reject(e);
49
+ }
50
+ }
51
+
52
+ function rejected(value) {
53
+ try {
54
+ step(generator["throw"](value));
55
+ } catch (e) {
56
+ reject(e);
57
+ }
58
+ }
59
+
60
+ function step(result) {
61
+ result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
62
+ }
63
+
64
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
65
+ });
66
+ };
67
+
68
+ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
69
+ var _ = {
70
+ label: 0,
71
+ sent: function sent() {
72
+ if (t[0] & 1) throw t[1];
73
+ return t[1];
74
+ },
75
+ trys: [],
76
+ ops: []
77
+ },
78
+ f,
79
+ y,
80
+ t,
81
+ g;
82
+ return g = {
83
+ next: verb(0),
84
+ "throw": verb(1),
85
+ "return": verb(2)
86
+ }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
87
+ return this;
88
+ }), g;
89
+
90
+ function verb(n) {
91
+ return function (v) {
92
+ return step([n, v]);
93
+ };
94
+ }
95
+
96
+ function step(op) {
97
+ if (f) throw new TypeError("Generator is already executing.");
98
+
99
+ while (_) {
100
+ try {
101
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
102
+ if (y = 0, t) op = [op[0] & 2, t.value];
103
+
104
+ switch (op[0]) {
105
+ case 0:
106
+ case 1:
107
+ t = op;
108
+ break;
109
+
110
+ case 4:
111
+ _.label++;
112
+ return {
113
+ value: op[1],
114
+ done: false
115
+ };
116
+
117
+ case 5:
118
+ _.label++;
119
+ y = op[1];
120
+ op = [0];
121
+ continue;
122
+
123
+ case 7:
124
+ op = _.ops.pop();
125
+
126
+ _.trys.pop();
127
+
128
+ continue;
129
+
130
+ default:
131
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
132
+ _ = 0;
133
+ continue;
134
+ }
135
+
136
+ if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
137
+ _.label = op[1];
138
+ break;
139
+ }
140
+
141
+ if (op[0] === 6 && _.label < t[1]) {
142
+ _.label = t[1];
143
+ t = op;
144
+ break;
145
+ }
146
+
147
+ if (t && _.label < t[2]) {
148
+ _.label = t[2];
149
+
150
+ _.ops.push(op);
151
+
152
+ break;
153
+ }
154
+
155
+ if (t[2]) _.ops.pop();
156
+
157
+ _.trys.pop();
158
+
159
+ continue;
160
+ }
161
+
162
+ op = body.call(thisArg, _);
163
+ } catch (e) {
164
+ op = [6, e];
165
+ y = 0;
166
+ } finally {
167
+ f = t = 0;
168
+ }
169
+ }
170
+
171
+ if (op[0] & 5) throw op[1];
172
+ return {
173
+ value: op[0] ? op[1] : void 0,
174
+ done: true
175
+ };
176
+ }
177
+ };
178
+
179
+ var paginationParams = {
180
+ pageSize: 20,
181
+ pageIndex: 1
182
+ };
183
+
184
+ function MissionDetail(props) {
185
+ var _this = this;
186
+
187
+ var _onChange = props.onChange,
188
+ _fetch = props._fetch;
189
+
190
+ var _a = (0, _react.useState)([]),
191
+ list = _a[0],
192
+ setList = _a[1];
193
+
194
+ var _b = (0, _react.useState)(false),
195
+ loading = _b[0],
196
+ setLoading = _b[1];
197
+
198
+ var _c = (0, _react.useState)(''),
199
+ taskName = _c[0],
200
+ setTaskName = _c[1];
201
+
202
+ var queryData = function queryData(params) {
203
+ return __awaiter(_this, void 0, void 0, function () {
204
+ var res;
205
+ return __generator(this, function (_a) {
206
+ switch (_a.label) {
207
+ case 0:
208
+ setLoading(true);
209
+ return [4
210
+ /*yield*/
211
+ , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distributor/task/unfinished/trans", __assign({}, params), 'GET')];
212
+
213
+ case 1:
214
+ res = _a.sent();
215
+ paginationParams.total = res.total;
216
+ setList(res.list);
217
+ setLoading(false);
218
+ return [2
219
+ /*return*/
220
+ ];
221
+ }
222
+ });
223
+ });
224
+ };
225
+
226
+ (0, _react.useEffect)(function () {
227
+ queryData(paginationParams);
228
+ }, []);
229
+ var columns = [{
230
+ title: 'Mission Name',
231
+ dataIndex: 'taskName'
232
+ }, {
233
+ title: 'EffDate',
234
+ dataIndex: 'effDate'
235
+ }, {
236
+ title: 'ExpDate',
237
+ dataIndex: 'expDate'
238
+ }];
239
+ var rowSelection = {
240
+ onChange: function onChange(selectedRowKeys, selectedRow) {
241
+ _onChange({
242
+ value: selectedRow[0].sfTaskId,
243
+ name: selectedRow[0].taskName
244
+ });
245
+ },
246
+ type: 'radio'
247
+ };
248
+
249
+ var reset = function reset() {
250
+ setTaskName('');
251
+ queryData(__assign({
252
+ taskName: ''
253
+ }, paginationParams));
254
+ };
255
+
256
+ return /*#__PURE__*/_react["default"].createElement("div", {
257
+ style: {
258
+ height: 550
259
+ }
260
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
261
+ labelCol: {
262
+ span: 6
263
+ },
264
+ layout: "horizontal"
265
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
266
+ gutter: 24
267
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
268
+ span: 16
269
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
270
+ label: (0, _locale.i18n)('MISSION_NAME')
271
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
272
+ onChange: function onChange(e) {
273
+ return setTaskName(e.target.value);
274
+ },
275
+ size: "small",
276
+ value: taskName
277
+ }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
278
+ span: 6
279
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
280
+ onClick: function onClick() {
281
+ setLoading(true);
282
+ paginationParams.pageIndex = 1;
283
+ queryData(__assign({
284
+ taskName: taskName
285
+ }, paginationParams));
286
+ },
287
+ size: "small",
288
+ style: {
289
+ marginRight: 10
290
+ },
291
+ type: "primary"
292
+ }, (0, _locale.i18n)('QUERY')), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
293
+ onClick: function onClick() {
294
+ reset();
295
+ },
296
+ size: "small"
297
+ }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
298
+ bordered: false,
299
+ columns: columns,
300
+ dataSource: list,
301
+ defaultExpandAllRows: true,
302
+ loading: loading,
303
+ pagination: __assign(__assign({}, paginationParams), {
304
+ onChange: function onChange(page) {
305
+ paginationParams.pageIndex = page;
306
+ queryData(__assign(__assign({}, paginationParams), {
307
+ taskName: taskName
308
+ }));
309
+ },
310
+ showSizeChanger: false
311
+ }),
312
+ rowKey: "sfTaskId",
313
+ rowSelection: rowSelection,
314
+ scroll: {
315
+ y: 400
316
+ }
317
+ }));
318
+ }
@@ -49,6 +49,8 @@ var _InterestedProducts = _interopRequireDefault(require("./InterestedProducts")
49
49
 
50
50
  var _MerchantStory = _interopRequireDefault(require("./MerchantStory"));
51
51
 
52
+ var _MissionDetail = _interopRequireDefault(require("./MissionDetail"));
53
+
52
54
  var _locale = require("../../locale");
53
55
 
54
56
  var _commonUtil = require("../../utils/commonUtil");
@@ -424,6 +426,11 @@ var LinkModal = function LinkModal(props) {
424
426
  onChange: function onChange(value) {
425
427
  return setLinkUrl(value);
426
428
  }
429
+ }), item.linkTypeCode === 'AffiliateMissionDetail' && /*#__PURE__*/_react["default"].createElement(_MissionDetail["default"], {
430
+ _fetch: _fetch,
431
+ onChange: function onChange(value) {
432
+ return setLinkUrl(value);
433
+ }
427
434
  }));
428
435
  })), /*#__PURE__*/_react["default"].createElement("div", {
429
436
  className: "footer"
@@ -206,7 +206,9 @@ function (_super) {
206
206
  text: data.offerName
207
207
  }),
208
208
  readonly: true
209
- }))), panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
209
+ }))), (panelProps.activityPrice.open || panelProps.salesPrice.open) && /*#__PURE__*/_react["default"].createElement("div", {
210
+ className: "price-info-wrap"
211
+ }, panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
210
212
  className: "price-wrap"
211
213
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
212
214
  className: "price",
@@ -234,7 +236,7 @@ function (_super) {
234
236
  }
235
237
  })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
236
238
  className: "sold-count"
237
- }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")), showProgress && ((_d = panelProps.salesProgress) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
239
+ }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), showProgress && ((_d = panelProps.salesProgress) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
238
240
  className: "progress-wrap"
239
241
  }, /*#__PURE__*/_react["default"].createElement("span", {
240
242
  className: "text"
@@ -85,6 +85,10 @@ var getDefaultJSON = function getDefaultJSON() {
85
85
  layout: 'right'
86
86
  },
87
87
  hover: null
88
+ },
89
+ countDown: {
90
+ id: (0, _uuid.v4)(),
91
+ open: true
88
92
  }
89
93
  },
90
94
  content: {
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  require("./index.less");
11
11
 
12
+ var _classnames = _interopRequireDefault(require("classnames"));
13
+
12
14
  var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
13
15
 
14
16
  var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
@@ -375,13 +377,16 @@ function (_super) {
375
377
  };
376
378
 
377
379
  FlashDealMobile.prototype.render = function () {
380
+ var _a;
381
+
378
382
  var panelProps = this.props.panelProps;
379
- var _a = this.state,
380
- list = _a.list,
381
- effDate = _a.effDate,
382
- expDate = _a.expDate,
383
- now = _a.now,
384
- isWill = _a.isWill;
383
+ console.log('flash deal panelProps: ', panelProps);
384
+ var _b = this.state,
385
+ list = _b.list,
386
+ effDate = _b.effDate,
387
+ expDate = _b.expDate,
388
+ now = _b.now,
389
+ isWill = _b.isWill;
385
390
 
386
391
  var _list = list.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
387
392
 
@@ -400,7 +405,7 @@ function (_super) {
400
405
  data: panelProps.title.headline
401
406
  }), isWill && /*#__PURE__*/_react["default"].createElement("span", {
402
407
  className: "sub-title"
403
- }, (0, _locale.i18n)('NEXT')), /*#__PURE__*/_react["default"].createElement(_CountDown["default"], {
408
+ }, (0, _locale.i18n)('NEXT')), ((_a = panelProps.title) === null || _a === void 0 ? void 0 : _a.countDown.open) && /*#__PURE__*/_react["default"].createElement(_CountDown["default"], {
404
409
  effDate: effDate,
405
410
  expDate: expDate,
406
411
  now: now,
@@ -414,7 +419,10 @@ function (_super) {
414
419
  className: "btn",
415
420
  data: panelProps.title.button
416
421
  }))), /*#__PURE__*/_react["default"].createElement("div", {
417
- className: "flash-deal-list"
422
+ className: (0, _classnames["default"])('flash-deal-list', {
423
+ 'flash-deal-list-vertical': panelProps.customize.layout === 'layout1',
424
+ 'flash-deal-list-horizontal': panelProps.customize.layout === 'layout2'
425
+ })
418
426
  }, _list.map(function (item) {
419
427
  return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
420
428
  key: item.id,
@@ -422,6 +430,7 @@ function (_super) {
422
430
  salePercent: isWill ? 0 : item.salePercent
423
431
  }) // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId ?? ''}`)}
424
432
  ,
433
+ layout: panelProps.customize.layout === 'layout2' ? 'horizontal' : 'vertical',
425
434
  onItemClick: function onItemClick() {
426
435
  if (window.magicDesign.pushGA) {
427
436
  window.magicDesign.pushGA({}, 'select_promotion', {
@@ -53,12 +53,6 @@
53
53
  }
54
54
  .m-flash-deal-mobile .flash-deal-list {
55
55
  margin-top: 0.32rem;
56
- overflow-x: auto;
57
- overflow-y: hidden;
58
- white-space: nowrap;
59
- display: flex;
60
- align-items: flex-start;
61
- justify-content: flex-start;
62
56
  position: relative;
63
57
  }
64
58
  .m-flash-deal-mobile .flash-deal-list .loading-wrap {
@@ -73,11 +67,49 @@
73
67
  right: 0;
74
68
  margin: auto;
75
69
  }
76
- .m-flash-deal-mobile .flash-deal-list .m-product-item-wrap {
70
+ .m-flash-deal-mobile .flash-deal-list-vertical {
71
+ overflow-x: auto;
72
+ overflow-y: hidden;
73
+ white-space: nowrap;
74
+ display: flex;
75
+ align-items: flex-start;
76
+ justify-content: flex-start;
77
+ }
78
+ .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap {
77
79
  width: 2.84rem;
78
80
  margin-right: 0.16rem;
79
81
  }
80
- .m-flash-deal-mobile .flash-deal-list .m-product-item-wrap .product-img {
82
+ .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap .product-img {
81
83
  height: 2.8rem;
82
84
  width: 2.8rem;
83
85
  }
86
+ .m-flash-deal-mobile .flash-deal-list-horizontal {
87
+ display: flex;
88
+ flex-direction: column;
89
+ gap: 0.16rem;
90
+ }
91
+ .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap {
92
+ width: 100%;
93
+ }
94
+ .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap {
95
+ flex: 1;
96
+ }
97
+ .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .product-name-wrap {
98
+ white-space: nowrap;
99
+ }
100
+ .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap {
101
+ display: flex;
102
+ }
103
+ .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap .price-wrap {
104
+ margin-bottom: 0;
105
+ }
106
+ .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap .price-sold-wrap {
107
+ margin-left: 0.04rem;
108
+ }
109
+ .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap .price-sold-wrap .discount {
110
+ display: none;
111
+ }
112
+ .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .progress-wrap {
113
+ padding-right: 0.52rem;
114
+ margin-top: 0;
115
+ }
@@ -74,13 +74,13 @@
74
74
  margin: auto;
75
75
  }
76
76
  .m-group-buy-mobile .group-buy-list .m-product-item-wrap {
77
- width: 2.8rem;
77
+ width: 3.44rem;
78
78
  margin-right: 0.24rem;
79
79
  border-radius: 0;
80
80
  }
81
81
  .m-group-buy-mobile .group-buy-list .m-product-item-wrap .product-img {
82
- height: 2.76rem;
83
- width: 2.76rem;
82
+ height: 3.4rem;
83
+ width: 3.4rem;
84
84
  }
85
85
  .m-group-buy-mobile .group-buy-list .m-product-item-wrap .content-wrap {
86
86
  padding: 0.24rem;