@fonixtree/magic-design 2.0.42 → 2.0.44

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.
@@ -211,7 +211,10 @@ function (_super) {
211
211
  onClick: function onClick() {
212
212
  /** PTO 定制GA */
213
213
  if (window.magicDesign.pushGA) {
214
- window.magicDesign.pushGA({}, 'select_promotion');
214
+ window.magicDesign.pushGA({}, 'select_promotion', {
215
+ event_label: (0, _ConfigPanel.getSecondConfigName)(data, item.id),
216
+ promotion_name: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
217
+ });
215
218
  }
216
219
  },
217
220
  onMouseEnter: _this.mouseEnterWrap,
@@ -7,10 +7,12 @@ exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _reactSlick = _interopRequireDefault(require("react-slick"));
11
-
12
10
  var _classnames = _interopRequireDefault(require("classnames"));
13
11
 
12
+ var _react2 = require("swiper/react");
13
+
14
+ var _modules = require("swiper/modules");
15
+
14
16
  var _components = require("../../../../../meta-comp/components");
15
17
 
16
18
  var _mobx = require("../../../../../mobx");
@@ -27,12 +29,14 @@ var _currencyUtil = require("../../../../../utils/currencyUtil");
27
29
 
28
30
  var _ConfigPanel = require("../../../../../core/Designer/ConfigPanel");
29
31
 
32
+ require("swiper/css");
33
+
34
+ require("swiper/css/effect-cards");
35
+
30
36
  require("./index.less");
31
37
 
32
38
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
33
39
 
34
- function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
35
-
36
40
  var __extends = void 0 && (void 0).__extends || function () {
37
41
  var _extendStatics = function extendStatics(d, b) {
38
42
  _extendStatics = Object.setPrototypeOf || {
@@ -243,7 +247,7 @@ function (_super) {
243
247
  sliderIndex: 0,
244
248
  userWalletData: {}
245
249
  };
246
- _this.sliderRef = null;
250
+ _this.swiperRef = null;
247
251
  _this.destroy = null;
248
252
 
249
253
  _this.getMyWalletData = function () {
@@ -306,12 +310,12 @@ function (_super) {
306
310
  // defaultShowWallet: 'Balance',
307
311
  // };
308
312
 
309
- if (data.customize.layout === 'layout2' && this.sliderRef) {
313
+ if (data.customize.layout === 'layout2' && this.swiperRef) {
310
314
  defaultShowIndex_1 = 0;
311
315
  data.groupSource.forEach(function (f, i) {
312
316
  if (f.sourceType === defaultShowWallet) defaultShowIndex_1 = i;
313
317
  });
314
- this.sliderRef.slickGoTo(defaultShowIndex_1);
318
+ this.swiperRef.slideTo(defaultShowIndex_1);
315
319
  }
316
320
 
317
321
  bnplObj = userCreditResps === null || userCreditResps === void 0 ? void 0 : userCreditResps.find(function (item) {
@@ -338,7 +342,7 @@ function (_super) {
338
342
  amount: userBalance === null ? '****' : (0, _currencyUtil.formatCurrencyWithSymbol)(userBalance),
339
343
  btnText: 'Social Commerce'
340
344
  }, _b[_constants.walletType.CENDUIT] = {
341
- amount: userBalance === null ? '****' : (0, _currencyUtil.formatCurrencyWithSymbol)(userPoint),
345
+ amount: userPoint === null ? '****' : (0, _currencyUtil.formatCurrencyWithSymbol)(userPoint),
342
346
  btnText: 'Cenduit Mall'
343
347
  }, _b)
344
348
  });
@@ -384,7 +388,7 @@ function (_super) {
384
388
  });
385
389
 
386
390
  if (nextIndex != -1 && nextIndex != _this.state.sliderIndex) {
387
- _this.sliderRef.slickGoTo(nextIndex);
391
+ _this.swiperRef.slideTo(nextIndex);
388
392
  }
389
393
  };
390
394
 
@@ -396,26 +400,30 @@ function (_super) {
396
400
 
397
401
  this.getMyWalletData();
398
402
  this.destroy = (0, _mobx.autorun)(function () {
399
- if (_this.props.data.customize.layout === 'layout2' && _this.sliderRef) {
403
+ var _a;
404
+
405
+ if (_this.props.data.customize.layout === 'layout2' && _this.swiperRef) {
400
406
  _this.sliderGoTo(_this.props.data.groupSource);
401
407
  /** 设计器模式下 如果选中特定group 自动播放关闭 */
402
408
 
403
409
 
404
410
  if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
405
- _this.sliderRef.slickPause();
411
+ (_a = _this.swiperRef.autoplay) === null || _a === void 0 ? void 0 : _a.stop();
406
412
  }
407
413
  }
408
414
  });
409
415
  };
410
416
 
411
417
  WalletMobile.prototype.componentWillReceiveProps = function (nextProps) {
412
- if (nextProps.data.customize.layout === 'layout2' && this.sliderRef) {
418
+ var _a, _b;
419
+
420
+ if (nextProps.data.customize.layout === 'layout2' && this.swiperRef) {
413
421
  this.sliderGoTo(nextProps.data.groupSource);
414
422
 
415
423
  if (nextProps.data.setting.autoplay.open) {
416
- this.sliderRef.slickPlay();
424
+ (_a = this.swiperRef.autoplay) === null || _a === void 0 ? void 0 : _a.start();
417
425
  } else {
418
- this.sliderRef.slickPause();
426
+ (_b = this.swiperRef.autoplay) === null || _b === void 0 ? void 0 : _b.stop();
419
427
  }
420
428
  }
421
429
  };
@@ -423,39 +431,24 @@ function (_super) {
423
431
  WalletMobile.prototype.render = function () {
424
432
  var _this = this;
425
433
 
434
+ var _a, _b, _c, _d, _e, _f, _g;
435
+
426
436
  var data = this.props.data;
427
437
  var sliderIndex = this.state.sliderIndex;
428
438
  var colNum = data.customize.rowNum;
429
- var autoplay = data.setting.autoplay.open;
430
439
  /** 设计器模式下 如果选中特定group 自动播放关闭 */
431
440
 
432
441
  if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
433
- autoplay = false;
442
+ (_a = this.swiperRef.autoplay) === null || _a === void 0 ? void 0 : _a.stop();
434
443
  }
435
444
 
436
- var settings = {
437
- className: 'slider-wrap',
438
- arrows: false,
439
- dots: false,
440
- autoplay: autoplay,
441
- autoplaySpeed: data.setting.autoplay.interval * 1000,
442
- speed: 500,
443
- draggable: window.magicDesign.mode === 'renderer',
444
- slidesToShow: 1,
445
- slidesToScroll: 1,
446
- beforeChange: function beforeChange(oldIndex, newIndex) {
447
- _this.setState({
448
- sliderIndex: newIndex
449
- });
450
- }
451
- };
452
445
  var navStyle = {
453
- fontSize: (0, _commonUtil.convertToRem)(data.setting.navigation.size),
454
- color: data.setting.navigation.color
446
+ fontSize: (0, _commonUtil.convertToRem)((_c = (_b = data.setting) === null || _b === void 0 ? void 0 : _b.navigation) === null || _c === void 0 ? void 0 : _c.size),
447
+ color: (_e = (_d = data.setting) === null || _d === void 0 ? void 0 : _d.navigation) === null || _e === void 0 ? void 0 : _e.color
455
448
  };
456
449
 
457
450
  var getItemContent = function getItemContent(item, preItem, nextItem) {
458
- var _a, _b, _c, _d, _e, _f, _g;
451
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
459
452
 
460
453
  var data = _this.props.data;
461
454
  var userWalletData = _this.state.userWalletData;
@@ -476,47 +469,47 @@ function (_super) {
476
469
  return /*#__PURE__*/_react["default"].createElement("div", {
477
470
  className: "text-content",
478
471
  style: _bgStyle
479
- }, item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
472
+ }, ((_a = item.title) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
480
473
  className: "title",
481
474
  data: item.title,
482
475
  GAData: __assign(__assign({}, GAData), {
483
476
  groupId: item.id,
484
477
  groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
485
478
  })
486
- }), item.amount.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
479
+ }), ((_b = item.amount) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
487
480
  className: "amount",
488
481
  data: __assign(__assign({}, item.amount), {
489
- text: (_a = userWalletData[item.sourceType]) === null || _a === void 0 ? void 0 : _a.amount
482
+ text: (_c = userWalletData[item.sourceType]) === null || _c === void 0 ? void 0 : _c.amount
490
483
  }),
491
484
  GAData: __assign(__assign({}, GAData), {
492
485
  groupId: item.id,
493
486
  groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
494
487
  }),
495
488
  readonly: true
496
- }), item.text.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
489
+ }), ((_d = item.text) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
497
490
  className: "text",
498
491
  data: __assign(__assign({}, item.text), {
499
- text: ((_b = userWalletData[item.sourceType]) === null || _b === void 0 ? void 0 : _b.text) || 'Make money and shop on Cendol!'
492
+ text: ((_e = userWalletData[item.sourceType]) === null || _e === void 0 ? void 0 : _e.text) || 'Make money and shop on Cendol!'
500
493
  }),
501
494
  GAData: __assign(__assign({}, GAData), {
502
495
  groupId: item.id,
503
496
  groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
504
497
  }),
505
498
  readonly: true
506
- }), item.button.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
499
+ }), ((_f = item.button) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
507
500
  className: "wallet-btn",
508
501
  data: __assign(__assign({}, item.button), {
509
- text: ((_c = userWalletData[item.sourceType]) === null || _c === void 0 ? void 0 : _c.btnText) || 'Lets Go!'
502
+ text: ((_g = userWalletData[item.sourceType]) === null || _g === void 0 ? void 0 : _g.btnText) || 'Lets Go!'
510
503
  }),
511
504
  GAData: __assign(__assign({}, GAData), {
512
505
  groupId: item.id,
513
506
  groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
514
507
  })
515
- }), data.customize.layout === 'layout2' && item.peek.open && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
508
+ }), data.customize.layout === 'layout2' && ((_h = item.peek) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
516
509
  className: "peek left"
517
510
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
518
511
  data: __assign(__assign({}, item.peek), {
519
- text: "" + (((_d = preItem === null || preItem === void 0 ? void 0 : preItem.title) === null || _d === void 0 ? void 0 : _d.text) || '')
512
+ text: "" + (((_j = preItem === null || preItem === void 0 ? void 0 : preItem.title) === null || _j === void 0 ? void 0 : _j.text) || '')
520
513
  }),
521
514
  GAData: __assign(__assign({}, GAData), {
522
515
  groupId: item.id,
@@ -525,7 +518,7 @@ function (_super) {
525
518
  readonly: true
526
519
  }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
527
520
  data: __assign(__assign({}, item.peek), {
528
- text: "" + (((_e = userWalletData[preItem === null || preItem === void 0 ? void 0 : preItem.sourceType]) === null || _e === void 0 ? void 0 : _e.amount) || '')
521
+ text: "" + (((_k = userWalletData[preItem === null || preItem === void 0 ? void 0 : preItem.sourceType]) === null || _k === void 0 ? void 0 : _k.amount) || '')
529
522
  }),
530
523
  GAData: __assign(__assign({}, GAData), {
531
524
  groupId: item.id,
@@ -536,7 +529,7 @@ function (_super) {
536
529
  className: "peek right"
537
530
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
538
531
  data: __assign(__assign({}, item.peek), {
539
- text: "" + (((_f = nextItem === null || nextItem === void 0 ? void 0 : nextItem.title) === null || _f === void 0 ? void 0 : _f.text) || '')
532
+ text: "" + (((_l = nextItem === null || nextItem === void 0 ? void 0 : nextItem.title) === null || _l === void 0 ? void 0 : _l.text) || '')
540
533
  }),
541
534
  GAData: __assign(__assign({}, GAData), {
542
535
  groupId: item.id,
@@ -545,7 +538,7 @@ function (_super) {
545
538
  readonly: true
546
539
  }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
547
540
  data: __assign(__assign({}, item.peek), {
548
- text: "" + (((_g = userWalletData[nextItem === null || nextItem === void 0 ? void 0 : nextItem.sourceType]) === null || _g === void 0 ? void 0 : _g.amount) || '')
541
+ text: "" + (((_m = userWalletData[nextItem === null || nextItem === void 0 ? void 0 : nextItem.sourceType]) === null || _m === void 0 ? void 0 : _m.amount) || '')
549
542
  }),
550
543
  GAData: __assign(__assign({}, GAData), {
551
544
  groupId: item.id,
@@ -565,42 +558,54 @@ function (_super) {
565
558
  style: (0, _commonUtil.pxToRem)({
566
559
  gap: MOBILE_IMG_SIZE[colNum].gap
567
560
  })
568
- }, data.groupSource.map(function (item, index) {
569
- var preItem = index === 0 ? {} : data.groupSource[index - 1];
570
- var nextItem = index === data.groupSource.length ? {} : data.groupSource[index + 1];
561
+ }, data.groupSource.map(function (item) {
571
562
  return /*#__PURE__*/_react["default"].createElement("div", {
572
563
  key: item.id,
573
564
  className: "item-wrap",
574
565
  style: (0, _commonUtil.pxToRem)({
575
566
  width: "calc((100% - " + (0, _commonUtil.convertToRem)(MOBILE_IMG_SIZE[colNum].gap * (colNum - 1)) + ") / " + colNum + ")"
576
567
  })
577
- }, getItemContent(item, preItem, nextItem));
568
+ }, getItemContent(item));
578
569
  })) : /*#__PURE__*/_react["default"].createElement("div", {
579
570
  className: "carousel-layout"
580
571
  }, data.setting.navigation.open && data.groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
581
572
  className: "carousel-icon-left",
582
573
  onClick: function onClick() {
583
- return _this.sliderRef.slickPrev();
574
+ return _this.swiperRef.slidePrev();
584
575
  },
585
576
  onMouseEnter: this.mouseEnterBtn,
586
577
  onMouseLeave: this.mouseLeaveBtn,
587
578
  style: navStyle,
588
579
  type: "icon-left"
589
- }), /*#__PURE__*/_react["default"].createElement(_reactSlick["default"], _extends({
590
- ref: function ref(slider) {
591
- return _this.sliderRef = slider;
592
- }
593
- }, settings), data.groupSource.map(function (item, index) {
594
- var preItem = index === 0 ? {} : data.groupSource[index - 1];
595
- var nextItem = index === data.groupSource.length ? {} : data.groupSource[index + 1];
596
- return /*#__PURE__*/_react["default"].createElement("div", {
580
+ }), /*#__PURE__*/_react["default"].createElement(_react2.Swiper, {
581
+ autoplay: {
582
+ delay: ((_g = (_f = data.setting) === null || _f === void 0 ? void 0 : _f.autoplay) === null || _g === void 0 ? void 0 : _g.interval) * 1000
583
+ },
584
+ effect: "cards",
585
+ loop: true,
586
+ modules: [_modules.EffectCards, _modules.Autoplay],
587
+ onSlideChange: function onSlideChange(swiper) {
588
+ return _this.setState({
589
+ sliderIndex: swiper.realIndex || 0
590
+ });
591
+ },
592
+ onSwiper: function onSwiper(swiper) {
593
+ return _this.swiperRef = swiper;
594
+ },
595
+ slidesPerView: 1
596
+ }, data.groupSource.map(function (item, index) {
597
+ var preItemFirst = data.groupSource.length > 1 ? data.groupSource[data.groupSource.length - 1] : null;
598
+ var preItemLast = data.groupSource.length > 1 ? data.groupSource[0] : null;
599
+ var preItem = index === 0 ? preItemFirst : data.groupSource[index - 1];
600
+ var nextItem = index === data.groupSource.length - 1 ? preItemLast : data.groupSource[index + 1];
601
+ return /*#__PURE__*/_react["default"].createElement(_react2.SwiperSlide, null, /*#__PURE__*/_react["default"].createElement("div", {
597
602
  key: item.id,
598
603
  className: "item-wrap"
599
- }, getItemContent(item, preItem, nextItem));
604
+ }, getItemContent(item, preItem, nextItem)));
600
605
  })), data.setting.navigation.open && data.groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
601
606
  className: "carousel-icon-right",
602
607
  onClick: function onClick() {
603
- return _this.sliderRef.slickNext();
608
+ return _this.swiperRef.slideNext();
604
609
  },
605
610
  onMouseEnter: this.mouseEnterBtn,
606
611
  onMouseLeave: this.mouseLeaveBtn,
@@ -615,7 +620,7 @@ function (_super) {
615
620
  active: i == sliderIndex
616
621
  }),
617
622
  onClick: function onClick() {
618
- return _this.sliderRef.slickGoTo(i);
623
+ return _this.swiperRef.slideTo(i);
619
624
  },
620
625
  style: (0, _commonUtil.pxToRem)({
621
626
  backgroundColor: i == sliderIndex ? data.setting.dots.hoverColor : data.setting.dots.color,
@@ -8,14 +8,14 @@
8
8
  justify-content: center;
9
9
  flex-wrap: wrap;
10
10
  border-radius: 0.2rem;
11
- padding: 0.4rem 0.8rem 1.8rem 0.8rem;
11
+ padding: 0.2rem 0.8rem 1.3rem 0.8rem;
12
12
  }
13
13
  .m-Wallet-mobile .item-wrap .text-content .wallet-btn {
14
- margin-top: 0.4rem;
14
+ margin-top: 0.2rem;
15
15
  }
16
16
  .m-Wallet-mobile .item-wrap .text-content .peek {
17
17
  position: absolute;
18
- bottom: 0.32rem;
18
+ bottom: 0.16rem;
19
19
  width: 1.2rem !important;
20
20
  white-space: nowrap;
21
21
  }
@@ -28,9 +28,10 @@
28
28
  .m-Wallet-mobile .column-layout {
29
29
  display: flex;
30
30
  flex-wrap: wrap;
31
+ justify-content: space-between;
31
32
  }
32
33
  .m-Wallet-mobile .column-layout .text-content {
33
- padding: 0.2rem 0 0.4rem 0;
34
+ padding: 0.2rem 0 0.2rem 0;
34
35
  }
35
36
  .m-Wallet-mobile .column-layout .text-content .wallet-btn {
36
37
  margin-top: 0.2rem;
@@ -44,6 +45,10 @@
44
45
  .m-Wallet-mobile .column-layout .text-content .peek.right {
45
46
  right: 0.32rem;
46
47
  }
48
+ .m-Wallet-mobile .carousel-layout {
49
+ position: relative;
50
+ min-height: 4.8rem;
51
+ }
47
52
  .m-Wallet-mobile .carousel-layout .slick-track {
48
53
  display: flex;
49
54
  justify-content: center;
@@ -65,14 +70,16 @@
65
70
  bottom: 0;
66
71
  margin: auto;
67
72
  cursor: pointer;
73
+ z-index: 10;
68
74
  }
69
75
  .m-Wallet-mobile .carousel-layout .swiper-ban {
70
76
  position: absolute;
71
77
  width: 100%;
72
- bottom: 0.8rem;
78
+ bottom: 0.6rem;
73
79
  display: flex;
74
80
  align-items: center;
75
81
  justify-content: center;
82
+ z-index: 10;
76
83
  }
77
84
  .m-Wallet-mobile .carousel-layout .swiper-ban .ban {
78
85
  font-size: 0.16rem;
@@ -211,7 +211,10 @@ function (_super) {
211
211
  onClick: function onClick() {
212
212
  /** PTO 定制GA */
213
213
  if (window.magicDesign.pushGA) {
214
- window.magicDesign.pushGA({}, 'select_promotion');
214
+ window.magicDesign.pushGA({}, 'select_promotion', {
215
+ event_label: (0, _ConfigPanel.getSecondConfigName)(data, item.id),
216
+ promotion_name: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
217
+ });
215
218
  }
216
219
  },
217
220
  onMouseEnter: _this.mouseEnterWrap,
@@ -7,10 +7,12 @@ exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _reactSlick = _interopRequireDefault(require("react-slick"));
11
-
12
10
  var _classnames = _interopRequireDefault(require("classnames"));
13
11
 
12
+ var _react2 = require("swiper/react");
13
+
14
+ var _modules = require("swiper/modules");
15
+
14
16
  var _components = require("../../../../../meta-comp/components");
15
17
 
16
18
  var _mobx = require("../../../../../mobx");
@@ -27,12 +29,14 @@ var _currencyUtil = require("../../../../../utils/currencyUtil");
27
29
 
28
30
  var _ConfigPanel = require("../../../../../core/Designer/ConfigPanel");
29
31
 
32
+ require("swiper/css");
33
+
34
+ require("swiper/css/effect-cards");
35
+
30
36
  require("./index.less");
31
37
 
32
38
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
33
39
 
34
- function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
35
-
36
40
  var __extends = void 0 && (void 0).__extends || function () {
37
41
  var _extendStatics = function extendStatics(d, b) {
38
42
  _extendStatics = Object.setPrototypeOf || {
@@ -243,7 +247,7 @@ function (_super) {
243
247
  sliderIndex: 0,
244
248
  userWalletData: {}
245
249
  };
246
- _this.sliderRef = null;
250
+ _this.swiperRef = null;
247
251
  _this.destroy = null;
248
252
 
249
253
  _this.getMyWalletData = function () {
@@ -306,12 +310,12 @@ function (_super) {
306
310
  // defaultShowWallet: 'Balance',
307
311
  // };
308
312
 
309
- if (data.customize.layout === 'layout2' && this.sliderRef) {
313
+ if (data.customize.layout === 'layout2' && this.swiperRef) {
310
314
  defaultShowIndex_1 = 0;
311
315
  data.groupSource.forEach(function (f, i) {
312
316
  if (f.sourceType === defaultShowWallet) defaultShowIndex_1 = i;
313
317
  });
314
- this.sliderRef.slickGoTo(defaultShowIndex_1);
318
+ this.swiperRef.slideTo(defaultShowIndex_1);
315
319
  }
316
320
 
317
321
  bnplObj = userCreditResps === null || userCreditResps === void 0 ? void 0 : userCreditResps.find(function (item) {
@@ -338,7 +342,7 @@ function (_super) {
338
342
  amount: userBalance === null ? '****' : (0, _currencyUtil.formatCurrencyWithSymbol)(userBalance),
339
343
  btnText: 'Social Commerce'
340
344
  }, _b[_constants.walletType.CENDUIT] = {
341
- amount: userBalance === null ? '****' : (0, _currencyUtil.formatCurrencyWithSymbol)(userPoint),
345
+ amount: userPoint === null ? '****' : (0, _currencyUtil.formatCurrencyWithSymbol)(userPoint),
342
346
  btnText: 'Cenduit Mall'
343
347
  }, _b)
344
348
  });
@@ -384,7 +388,7 @@ function (_super) {
384
388
  });
385
389
 
386
390
  if (nextIndex != -1 && nextIndex != _this.state.sliderIndex) {
387
- _this.sliderRef.slickGoTo(nextIndex);
391
+ _this.swiperRef.slideTo(nextIndex);
388
392
  }
389
393
  };
390
394
 
@@ -396,26 +400,30 @@ function (_super) {
396
400
 
397
401
  this.getMyWalletData();
398
402
  this.destroy = (0, _mobx.autorun)(function () {
399
- if (_this.props.data.customize.layout === 'layout2' && _this.sliderRef) {
403
+ var _a;
404
+
405
+ if (_this.props.data.customize.layout === 'layout2' && _this.swiperRef) {
400
406
  _this.sliderGoTo(_this.props.data.groupSource);
401
407
  /** 设计器模式下 如果选中特定group 自动播放关闭 */
402
408
 
403
409
 
404
410
  if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
405
- _this.sliderRef.slickPause();
411
+ (_a = _this.swiperRef.autoplay) === null || _a === void 0 ? void 0 : _a.stop();
406
412
  }
407
413
  }
408
414
  });
409
415
  };
410
416
 
411
417
  WalletMobile.prototype.componentWillReceiveProps = function (nextProps) {
412
- if (nextProps.data.customize.layout === 'layout2' && this.sliderRef) {
418
+ var _a, _b;
419
+
420
+ if (nextProps.data.customize.layout === 'layout2' && this.swiperRef) {
413
421
  this.sliderGoTo(nextProps.data.groupSource);
414
422
 
415
423
  if (nextProps.data.setting.autoplay.open) {
416
- this.sliderRef.slickPlay();
424
+ (_a = this.swiperRef.autoplay) === null || _a === void 0 ? void 0 : _a.start();
417
425
  } else {
418
- this.sliderRef.slickPause();
426
+ (_b = this.swiperRef.autoplay) === null || _b === void 0 ? void 0 : _b.stop();
419
427
  }
420
428
  }
421
429
  };
@@ -423,39 +431,24 @@ function (_super) {
423
431
  WalletMobile.prototype.render = function () {
424
432
  var _this = this;
425
433
 
434
+ var _a, _b, _c, _d, _e, _f, _g;
435
+
426
436
  var data = this.props.data;
427
437
  var sliderIndex = this.state.sliderIndex;
428
438
  var colNum = data.customize.rowNum;
429
- var autoplay = data.setting.autoplay.open;
430
439
  /** 设计器模式下 如果选中特定group 自动播放关闭 */
431
440
 
432
441
  if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
433
- autoplay = false;
442
+ (_a = this.swiperRef.autoplay) === null || _a === void 0 ? void 0 : _a.stop();
434
443
  }
435
444
 
436
- var settings = {
437
- className: 'slider-wrap',
438
- arrows: false,
439
- dots: false,
440
- autoplay: autoplay,
441
- autoplaySpeed: data.setting.autoplay.interval * 1000,
442
- speed: 500,
443
- draggable: window.magicDesign.mode === 'renderer',
444
- slidesToShow: 1,
445
- slidesToScroll: 1,
446
- beforeChange: function beforeChange(oldIndex, newIndex) {
447
- _this.setState({
448
- sliderIndex: newIndex
449
- });
450
- }
451
- };
452
445
  var navStyle = {
453
- fontSize: (0, _commonUtil.convertToRem)(data.setting.navigation.size),
454
- color: data.setting.navigation.color
446
+ fontSize: (0, _commonUtil.convertToRem)((_c = (_b = data.setting) === null || _b === void 0 ? void 0 : _b.navigation) === null || _c === void 0 ? void 0 : _c.size),
447
+ color: (_e = (_d = data.setting) === null || _d === void 0 ? void 0 : _d.navigation) === null || _e === void 0 ? void 0 : _e.color
455
448
  };
456
449
 
457
450
  var getItemContent = function getItemContent(item, preItem, nextItem) {
458
- var _a, _b, _c, _d, _e, _f, _g;
451
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
459
452
 
460
453
  var data = _this.props.data;
461
454
  var userWalletData = _this.state.userWalletData;
@@ -476,47 +469,47 @@ function (_super) {
476
469
  return /*#__PURE__*/_react["default"].createElement("div", {
477
470
  className: "text-content",
478
471
  style: _bgStyle
479
- }, item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
472
+ }, ((_a = item.title) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
480
473
  className: "title",
481
474
  data: item.title,
482
475
  GAData: __assign(__assign({}, GAData), {
483
476
  groupId: item.id,
484
477
  groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
485
478
  })
486
- }), item.amount.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
479
+ }), ((_b = item.amount) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
487
480
  className: "amount",
488
481
  data: __assign(__assign({}, item.amount), {
489
- text: (_a = userWalletData[item.sourceType]) === null || _a === void 0 ? void 0 : _a.amount
482
+ text: (_c = userWalletData[item.sourceType]) === null || _c === void 0 ? void 0 : _c.amount
490
483
  }),
491
484
  GAData: __assign(__assign({}, GAData), {
492
485
  groupId: item.id,
493
486
  groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
494
487
  }),
495
488
  readonly: true
496
- }), item.text.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
489
+ }), ((_d = item.text) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
497
490
  className: "text",
498
491
  data: __assign(__assign({}, item.text), {
499
- text: ((_b = userWalletData[item.sourceType]) === null || _b === void 0 ? void 0 : _b.text) || 'Make money and shop on Cendol!'
492
+ text: ((_e = userWalletData[item.sourceType]) === null || _e === void 0 ? void 0 : _e.text) || 'Make money and shop on Cendol!'
500
493
  }),
501
494
  GAData: __assign(__assign({}, GAData), {
502
495
  groupId: item.id,
503
496
  groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
504
497
  }),
505
498
  readonly: true
506
- }), item.button.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
499
+ }), ((_f = item.button) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
507
500
  className: "wallet-btn",
508
501
  data: __assign(__assign({}, item.button), {
509
- text: ((_c = userWalletData[item.sourceType]) === null || _c === void 0 ? void 0 : _c.btnText) || 'Lets Go!'
502
+ text: ((_g = userWalletData[item.sourceType]) === null || _g === void 0 ? void 0 : _g.btnText) || 'Lets Go!'
510
503
  }),
511
504
  GAData: __assign(__assign({}, GAData), {
512
505
  groupId: item.id,
513
506
  groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
514
507
  })
515
- }), data.customize.layout === 'layout2' && item.peek.open && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
508
+ }), data.customize.layout === 'layout2' && ((_h = item.peek) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
516
509
  className: "peek left"
517
510
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
518
511
  data: __assign(__assign({}, item.peek), {
519
- text: "" + (((_d = preItem === null || preItem === void 0 ? void 0 : preItem.title) === null || _d === void 0 ? void 0 : _d.text) || '')
512
+ text: "" + (((_j = preItem === null || preItem === void 0 ? void 0 : preItem.title) === null || _j === void 0 ? void 0 : _j.text) || '')
520
513
  }),
521
514
  GAData: __assign(__assign({}, GAData), {
522
515
  groupId: item.id,
@@ -525,7 +518,7 @@ function (_super) {
525
518
  readonly: true
526
519
  }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
527
520
  data: __assign(__assign({}, item.peek), {
528
- text: "" + (((_e = userWalletData[preItem === null || preItem === void 0 ? void 0 : preItem.sourceType]) === null || _e === void 0 ? void 0 : _e.amount) || '')
521
+ text: "" + (((_k = userWalletData[preItem === null || preItem === void 0 ? void 0 : preItem.sourceType]) === null || _k === void 0 ? void 0 : _k.amount) || '')
529
522
  }),
530
523
  GAData: __assign(__assign({}, GAData), {
531
524
  groupId: item.id,
@@ -536,7 +529,7 @@ function (_super) {
536
529
  className: "peek right"
537
530
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
538
531
  data: __assign(__assign({}, item.peek), {
539
- text: "" + (((_f = nextItem === null || nextItem === void 0 ? void 0 : nextItem.title) === null || _f === void 0 ? void 0 : _f.text) || '')
532
+ text: "" + (((_l = nextItem === null || nextItem === void 0 ? void 0 : nextItem.title) === null || _l === void 0 ? void 0 : _l.text) || '')
540
533
  }),
541
534
  GAData: __assign(__assign({}, GAData), {
542
535
  groupId: item.id,
@@ -545,7 +538,7 @@ function (_super) {
545
538
  readonly: true
546
539
  }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
547
540
  data: __assign(__assign({}, item.peek), {
548
- text: "" + (((_g = userWalletData[nextItem === null || nextItem === void 0 ? void 0 : nextItem.sourceType]) === null || _g === void 0 ? void 0 : _g.amount) || '')
541
+ text: "" + (((_m = userWalletData[nextItem === null || nextItem === void 0 ? void 0 : nextItem.sourceType]) === null || _m === void 0 ? void 0 : _m.amount) || '')
549
542
  }),
550
543
  GAData: __assign(__assign({}, GAData), {
551
544
  groupId: item.id,
@@ -565,42 +558,54 @@ function (_super) {
565
558
  style: (0, _commonUtil.pxToRem)({
566
559
  gap: MOBILE_IMG_SIZE[colNum].gap
567
560
  })
568
- }, data.groupSource.map(function (item, index) {
569
- var preItem = index === 0 ? {} : data.groupSource[index - 1];
570
- var nextItem = index === data.groupSource.length ? {} : data.groupSource[index + 1];
561
+ }, data.groupSource.map(function (item) {
571
562
  return /*#__PURE__*/_react["default"].createElement("div", {
572
563
  key: item.id,
573
564
  className: "item-wrap",
574
565
  style: (0, _commonUtil.pxToRem)({
575
566
  width: "calc((100% - " + (0, _commonUtil.convertToRem)(MOBILE_IMG_SIZE[colNum].gap * (colNum - 1)) + ") / " + colNum + ")"
576
567
  })
577
- }, getItemContent(item, preItem, nextItem));
568
+ }, getItemContent(item));
578
569
  })) : /*#__PURE__*/_react["default"].createElement("div", {
579
570
  className: "carousel-layout"
580
571
  }, data.setting.navigation.open && data.groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
581
572
  className: "carousel-icon-left",
582
573
  onClick: function onClick() {
583
- return _this.sliderRef.slickPrev();
574
+ return _this.swiperRef.slidePrev();
584
575
  },
585
576
  onMouseEnter: this.mouseEnterBtn,
586
577
  onMouseLeave: this.mouseLeaveBtn,
587
578
  style: navStyle,
588
579
  type: "icon-left"
589
- }), /*#__PURE__*/_react["default"].createElement(_reactSlick["default"], _extends({
590
- ref: function ref(slider) {
591
- return _this.sliderRef = slider;
592
- }
593
- }, settings), data.groupSource.map(function (item, index) {
594
- var preItem = index === 0 ? {} : data.groupSource[index - 1];
595
- var nextItem = index === data.groupSource.length ? {} : data.groupSource[index + 1];
596
- return /*#__PURE__*/_react["default"].createElement("div", {
580
+ }), /*#__PURE__*/_react["default"].createElement(_react2.Swiper, {
581
+ autoplay: {
582
+ delay: ((_g = (_f = data.setting) === null || _f === void 0 ? void 0 : _f.autoplay) === null || _g === void 0 ? void 0 : _g.interval) * 1000
583
+ },
584
+ effect: "cards",
585
+ loop: true,
586
+ modules: [_modules.EffectCards, _modules.Autoplay],
587
+ onSlideChange: function onSlideChange(swiper) {
588
+ return _this.setState({
589
+ sliderIndex: swiper.realIndex || 0
590
+ });
591
+ },
592
+ onSwiper: function onSwiper(swiper) {
593
+ return _this.swiperRef = swiper;
594
+ },
595
+ slidesPerView: 1
596
+ }, data.groupSource.map(function (item, index) {
597
+ var preItemFirst = data.groupSource.length > 1 ? data.groupSource[data.groupSource.length - 1] : null;
598
+ var preItemLast = data.groupSource.length > 1 ? data.groupSource[0] : null;
599
+ var preItem = index === 0 ? preItemFirst : data.groupSource[index - 1];
600
+ var nextItem = index === data.groupSource.length - 1 ? preItemLast : data.groupSource[index + 1];
601
+ return /*#__PURE__*/_react["default"].createElement(_react2.SwiperSlide, null, /*#__PURE__*/_react["default"].createElement("div", {
597
602
  key: item.id,
598
603
  className: "item-wrap"
599
- }, getItemContent(item, preItem, nextItem));
604
+ }, getItemContent(item, preItem, nextItem)));
600
605
  })), data.setting.navigation.open && data.groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
601
606
  className: "carousel-icon-right",
602
607
  onClick: function onClick() {
603
- return _this.sliderRef.slickNext();
608
+ return _this.swiperRef.slideNext();
604
609
  },
605
610
  onMouseEnter: this.mouseEnterBtn,
606
611
  onMouseLeave: this.mouseLeaveBtn,
@@ -615,7 +620,7 @@ function (_super) {
615
620
  active: i == sliderIndex
616
621
  }),
617
622
  onClick: function onClick() {
618
- return _this.sliderRef.slickGoTo(i);
623
+ return _this.swiperRef.slideTo(i);
619
624
  },
620
625
  style: (0, _commonUtil.pxToRem)({
621
626
  backgroundColor: i == sliderIndex ? data.setting.dots.hoverColor : data.setting.dots.color,
@@ -8,14 +8,14 @@
8
8
  justify-content: center;
9
9
  flex-wrap: wrap;
10
10
  border-radius: 0.2rem;
11
- padding: 0.4rem 0.8rem 1.8rem 0.8rem;
11
+ padding: 0.2rem 0.8rem 1.3rem 0.8rem;
12
12
  }
13
13
  .m-Wallet-mobile .item-wrap .text-content .wallet-btn {
14
- margin-top: 0.4rem;
14
+ margin-top: 0.2rem;
15
15
  }
16
16
  .m-Wallet-mobile .item-wrap .text-content .peek {
17
17
  position: absolute;
18
- bottom: 0.32rem;
18
+ bottom: 0.16rem;
19
19
  width: 1.2rem !important;
20
20
  white-space: nowrap;
21
21
  }
@@ -28,9 +28,10 @@
28
28
  .m-Wallet-mobile .column-layout {
29
29
  display: flex;
30
30
  flex-wrap: wrap;
31
+ justify-content: space-between;
31
32
  }
32
33
  .m-Wallet-mobile .column-layout .text-content {
33
- padding: 0.2rem 0 0.4rem 0;
34
+ padding: 0.2rem 0 0.2rem 0;
34
35
  }
35
36
  .m-Wallet-mobile .column-layout .text-content .wallet-btn {
36
37
  margin-top: 0.2rem;
@@ -44,6 +45,10 @@
44
45
  .m-Wallet-mobile .column-layout .text-content .peek.right {
45
46
  right: 0.32rem;
46
47
  }
48
+ .m-Wallet-mobile .carousel-layout {
49
+ position: relative;
50
+ min-height: 4.8rem;
51
+ }
47
52
  .m-Wallet-mobile .carousel-layout .slick-track {
48
53
  display: flex;
49
54
  justify-content: center;
@@ -65,14 +70,16 @@
65
70
  bottom: 0;
66
71
  margin: auto;
67
72
  cursor: pointer;
73
+ z-index: 10;
68
74
  }
69
75
  .m-Wallet-mobile .carousel-layout .swiper-ban {
70
76
  position: absolute;
71
77
  width: 100%;
72
- bottom: 0.8rem;
78
+ bottom: 0.6rem;
73
79
  display: flex;
74
80
  align-items: center;
75
81
  justify-content: center;
82
+ z-index: 10;
76
83
  }
77
84
  .m-Wallet-mobile .carousel-layout .swiper-ban .ban {
78
85
  font-size: 0.16rem;
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.42",
4
+ "version": "2.0.44",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",
@@ -41,7 +41,8 @@
41
41
  "replace": "^1.2.1",
42
42
  "shortid": "^2.2.16",
43
43
  "slick-carousel": "^1.8.1",
44
- "spark-md5": "^3.0.2"
44
+ "spark-md5": "^3.0.2",
45
+ "swiper": "^11.0.1"
45
46
  },
46
47
  "peerDependencies": {
47
48
  "react": ">=16.11.0",
Binary file
Binary file