@fonixtree/magic-design 2.0.132 → 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 (29) hide show
  1. package/es/assets/images/layout-icon/flash-deal-layout1.png +0 -0
  2. package/es/common/LinkModal/MissionDetail/index.js +3 -3
  3. package/es/composite-comp/common/components/ProductItem/index.js +4 -2
  4. package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js +4 -0
  5. package/es/composite-comp/dito/components/FlashDeal/mobile/index.js +17 -8
  6. package/es/composite-comp/dito/components/FlashDeal/mobile/index.less +40 -8
  7. package/es/composite-comp/dito/components/GroupBuy/mobile/index.less +3 -3
  8. package/es/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigTitle/index.js +20 -11
  9. package/es/composite-comp/dito/config-panels/FlashDealConfig/index.js +3 -7
  10. package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +11 -11
  11. package/es/constants/layout.js +14 -2
  12. package/es/locale/en/en.json +1 -0
  13. package/es/locale/es/es.json +1 -0
  14. package/es/locale/mn/mn.json +1 -0
  15. package/lib/assets/images/layout-icon/flash-deal-layout1.png +0 -0
  16. package/lib/common/LinkModal/MissionDetail/index.js +3 -3
  17. package/lib/composite-comp/common/components/ProductItem/index.js +4 -2
  18. package/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js +4 -0
  19. package/lib/composite-comp/dito/components/FlashDeal/mobile/index.js +17 -8
  20. package/lib/composite-comp/dito/components/FlashDeal/mobile/index.less +40 -8
  21. package/lib/composite-comp/dito/components/GroupBuy/mobile/index.less +3 -3
  22. package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigTitle/index.js +20 -11
  23. package/lib/composite-comp/dito/config-panels/FlashDealConfig/index.js +3 -7
  24. package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js +11 -11
  25. package/lib/constants/layout.js +14 -2
  26. package/lib/locale/en/en.json +1 -0
  27. package/lib/locale/es/es.json +1 -0
  28. package/lib/locale/mn/mn.json +1 -0
  29. package/package.json +1 -1
package/es/common/LinkModal/MissionDetail/index.js CHANGED
@@ -227,13 +227,13 @@ function MissionDetail(props) {
227
227
  queryData(paginationParams);
228
228
  }, []);
229
229
  var columns = [{
230
- title: 'taskName',
230
+ title: 'Mission Name',
231
231
  dataIndex: 'taskName'
232
232
  }, {
233
- title: 'effDate',
233
+ title: 'EffDate',
234
234
  dataIndex: 'effDate'
235
235
  }, {
236
- title: 'expDate',
236
+ title: 'ExpDate',
237
237
  dataIndex: 'expDate'
238
238
  }];
239
239
  var rowSelection = {
package/es/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -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"
package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js CHANGED
@@ -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: {
package/es/composite-comp/dito/components/FlashDeal/mobile/index.js CHANGED
@@ -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', {
package/es/composite-comp/dito/components/FlashDeal/mobile/index.less CHANGED
@@ -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
+ }
package/es/composite-comp/dito/components/GroupBuy/mobile/index.less CHANGED
@@ -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;
package/es/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigTitle/index.js CHANGED
@@ -45,12 +45,12 @@ var __extends = void 0 && (void 0).__extends || function () {
45
45
  };
46
46
  }();
47
47
 
48
- var AComponent =
48
+ var FlashDealConfigTitle =
49
49
  /** @class */
50
50
  function (_super) {
51
- __extends(AComponent, _super);
51
+ __extends(FlashDealConfigTitle, _super);
52
52
 
53
- function AComponent() {
53
+ function FlashDealConfigTitle() {
54
54
  var _this = _super !== null && _super.apply(this, arguments) || this;
55
55
 
56
56
  _this.state = {};
@@ -64,7 +64,7 @@ function (_super) {
64
64
  return _this;
65
65
  }
66
66
 
67
- AComponent.prototype.render = function () {
67
+ FlashDealConfigTitle.prototype.render = function () {
68
68
  var _this = this;
69
69
 
70
70
  var panelProps = this.props.panelProps;
@@ -86,41 +86,50 @@ function (_super) {
86
86
  headerSize: "middle",
87
87
  onRefresh: this.reRender,
88
88
  source: [{
89
- key: '1',
89
+ key: 'iconConfig',
90
90
  name: (0, _locale.i18n)('ICON'),
91
91
  value: iconSetting,
92
92
  metaOption: panelProps.icon
93
93
  }, {
94
- key: '2',
94
+ key: 'headlineConfig',
95
95
  name: (0, _locale.i18n)('HEADLINE'),
96
96
  value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
97
97
  data: panelProps.headline
98
98
  }),
99
99
  metaOption: panelProps.headline
100
100
  }, {
101
- key: '3',
101
+ key: 'buttonCOnfig',
102
102
  name: (0, _locale.i18n)('BUTTON'),
103
103
  value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
104
104
  data: panelProps.button
105
105
  }),
106
106
  metaOption: panelProps.button
107
+ }, {
108
+ key: 'countDownConfig',
109
+ name: (0, _locale.i18n)('COUNT_DOWN'),
110
+ value: null,
111
+ metaOption: panelProps === null || panelProps === void 0 ? void 0 : panelProps.countDown,
112
+ toggleType: 'switch'
107
113
  }],
108
114
  type: "switch"
109
115
  }));
110
116
  };
111
117
 
112
- AComponent.defaultProps = {
118
+ FlashDealConfigTitle.defaultProps = {
113
119
  panelProps: {
114
120
  icon: {
115
121
  open: true,
116
122
  url: ''
117
123
  },
118
124
  headline: {},
119
- button: {}
125
+ button: {},
126
+ countDown: {
127
+ open: true
128
+ }
120
129
  }
121
130
  };
122
- return AComponent;
131
+ return FlashDealConfigTitle;
123
132
  }(_react["default"].Component);
124
133
 
125
- var _default = AComponent;
134
+ var _default = FlashDealConfigTitle;
126
135
  exports["default"] = _default;
package/es/composite-comp/dito/config-panels/FlashDealConfig/index.js CHANGED
@@ -11,8 +11,6 @@ var _FlashDealConfigTitle = _interopRequireDefault(require("./FlashDealConfigTit
11
11
 
12
12
  var _FlashDealConfigContent = _interopRequireDefault(require("./FlashDealConfigContent"));
13
13
 
14
- var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
15
-
16
14
  var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
17
15
 
18
16
  var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
@@ -23,6 +21,8 @@ var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
23
21
 
24
22
  var _locale = require("../../../../locale");
25
23
 
24
+ var _layout = require("../../../../constants/layout");
25
+
26
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
27
27
 
28
28
  function FlashDealConfig(props) {
@@ -55,11 +55,7 @@ function FlashDealConfig(props) {
55
55
  value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
56
56
  data: data.customize,
57
57
  isHideAlign: true,
58
- layoutSource: [{
59
- id: 'layout1',
60
- name: 'layout1',
61
- image: _layout["default"]
62
- }]
58
+ layoutSource: _layout.flashDealLayout
63
59
  })
64
60
  }, {
65
61
  key: '5',
package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js CHANGED
@@ -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
 
package/es/constants/layout.js CHANGED
@@ -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;
package/es/locale/en/en.json CHANGED
@@ -1,5 +1,6 @@
1
1
  {
2
2
  "MISSION_NAME": "Mission Name",
3
+ "COUNT_DOWN": "Count Down",
3
4
  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
4
5
  "INTER": "Inter",
5
6
  "STORE_SERVICES": "Store services",
package/es/locale/es/es.json CHANGED
@@ -1,5 +1,6 @@
1
1
  {
2
2
  "MISSION_NAME": "Mission Name",
3
+ "COUNT_DOWN": "Count Down",
3
4
  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
4
5
  "INTER": "Inter",
5
6
  "STORE_SERVICES": "Store services",
package/es/locale/mn/mn.json CHANGED
@@ -1,5 +1,6 @@
1
1
  {
2
2
  "MISSION_NAME": "Mission Name",
3
+ "COUNT_DOWN": "Count Down",
3
4
  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
4
5
  "INTER": "Inter",
5
6
  "STORE_SERVICES": "Store services",
package/lib/common/LinkModal/MissionDetail/index.js CHANGED
@@ -227,13 +227,13 @@ function MissionDetail(props) {
227
227
  queryData(paginationParams);
228
228
  }, []);
229
229
  var columns = [{
230
- title: 'taskName',
230
+ title: 'Mission Name',
231
231
  dataIndex: 'taskName'
232
232
  }, {
233
- title: 'effDate',
233
+ title: 'EffDate',
234
234
  dataIndex: 'effDate'
235
235
  }, {
236
- title: 'expDate',
236
+ title: 'ExpDate',
237
237
  dataIndex: 'expDate'
238
238
  }];
239
239
  var rowSelection = {
package/lib/composite-comp/common/components/ProductItem/index.js CHANGED
@@ -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"
package/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js CHANGED
@@ -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: {
package/lib/composite-comp/dito/components/FlashDeal/mobile/index.js CHANGED
@@ -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', {
package/lib/composite-comp/dito/components/FlashDeal/mobile/index.less CHANGED
@@ -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
+ }
package/lib/composite-comp/dito/components/GroupBuy/mobile/index.less CHANGED
@@ -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;
package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigTitle/index.js CHANGED
@@ -45,12 +45,12 @@ var __extends = void 0 && (void 0).__extends || function () {
45
45
  };
46
46
  }();
47
47
 
48
- var AComponent =
48
+ var FlashDealConfigTitle =
49
49
  /** @class */
50
50
  function (_super) {
51
- __extends(AComponent, _super);
51
+ __extends(FlashDealConfigTitle, _super);
52
52
 
53
- function AComponent() {
53
+ function FlashDealConfigTitle() {
54
54
  var _this = _super !== null && _super.apply(this, arguments) || this;
55
55
 
56
56
  _this.state = {};
@@ -64,7 +64,7 @@ function (_super) {
64
64
  return _this;
65
65
  }
66
66
 
67
- AComponent.prototype.render = function () {
67
+ FlashDealConfigTitle.prototype.render = function () {
68
68
  var _this = this;
69
69
 
70
70
  var panelProps = this.props.panelProps;
@@ -86,41 +86,50 @@ function (_super) {
86
86
  headerSize: "middle",
87
87
  onRefresh: this.reRender,
88
88
  source: [{
89
- key: '1',
89
+ key: 'iconConfig',
90
90
  name: (0, _locale.i18n)('ICON'),
91
91
  value: iconSetting,
92
92
  metaOption: panelProps.icon
93
93
  }, {
94
- key: '2',
94
+ key: 'headlineConfig',
95
95
  name: (0, _locale.i18n)('HEADLINE'),
96
96
  value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
97
97
  data: panelProps.headline
98
98
  }),
99
99
  metaOption: panelProps.headline
100
100
  }, {
101
- key: '3',
101
+ key: 'buttonCOnfig',
102
102
  name: (0, _locale.i18n)('BUTTON'),
103
103
  value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
104
104
  data: panelProps.button
105
105
  }),
106
106
  metaOption: panelProps.button
107
+ }, {
108
+ key: 'countDownConfig',
109
+ name: (0, _locale.i18n)('COUNT_DOWN'),
110
+ value: null,
111
+ metaOption: panelProps === null || panelProps === void 0 ? void 0 : panelProps.countDown,
112
+ toggleType: 'switch'
107
113
  }],
108
114
  type: "switch"
109
115
  }));
110
116
  };
111
117
 
112
- AComponent.defaultProps = {
118
+ FlashDealConfigTitle.defaultProps = {
113
119
  panelProps: {
114
120
  icon: {
115
121
  open: true,
116
122
  url: ''
117
123
  },
118
124
  headline: {},
119
- button: {}
125
+ button: {},
126
+ countDown: {
127
+ open: true
128
+ }
120
129
  }
121
130
  };
122
- return AComponent;
131
+ return FlashDealConfigTitle;
123
132
  }(_react["default"].Component);
124
133
 
125
- var _default = AComponent;
134
+ var _default = FlashDealConfigTitle;
126
135
  exports["default"] = _default;
package/lib/composite-comp/dito/config-panels/FlashDealConfig/index.js CHANGED
@@ -11,8 +11,6 @@ var _FlashDealConfigTitle = _interopRequireDefault(require("./FlashDealConfigTit
11
11
 
12
12
  var _FlashDealConfigContent = _interopRequireDefault(require("./FlashDealConfigContent"));
13
13
 
14
- var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
15
-
16
14
  var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
17
15
 
18
16
  var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
@@ -23,6 +21,8 @@ var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
23
21
 
24
22
  var _locale = require("../../../../locale");
25
23
 
24
+ var _layout = require("../../../../constants/layout");
25
+
26
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
27
27
 
28
28
  function FlashDealConfig(props) {
@@ -55,11 +55,7 @@ function FlashDealConfig(props) {
55
55
  value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
56
56
  data: data.customize,
57
57
  isHideAlign: true,
58
- layoutSource: [{
59
- id: 'layout1',
60
- name: 'layout1',
61
- image: _layout["default"]
62
- }]
58
+ layoutSource: _layout.flashDealLayout
63
59
  })
64
60
  }, {
65
61
  key: '5',
package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js CHANGED
@@ -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
 
package/lib/constants/layout.js CHANGED
@@ -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;
package/lib/locale/en/en.json CHANGED
@@ -1,5 +1,6 @@
1
1
  {
2
2
  "MISSION_NAME": "Mission Name",
3
+ "COUNT_DOWN": "Count Down",
3
4
  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
4
5
  "INTER": "Inter",
5
6
  "STORE_SERVICES": "Store services",
package/lib/locale/es/es.json CHANGED
@@ -1,5 +1,6 @@
1
1
  {
2
2
  "MISSION_NAME": "Mission Name",
3
+ "COUNT_DOWN": "Count Down",
3
4
  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
4
5
  "INTER": "Inter",
5
6
  "STORE_SERVICES": "Store services",
package/lib/locale/mn/mn.json CHANGED
@@ -1,5 +1,6 @@
1
1
  {
2
2
  "MISSION_NAME": "Mission Name",
3
+ "COUNT_DOWN": "Count Down",
3
4
  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
4
5
  "INTER": "Inter",
5
6
  "STORE_SERVICES": "Store services",
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.132",
4
+ "version": "2.0.134",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",