@fonixtree/magic-design 2.0.207 → 2.0.209

package/lib/composite-comp/common/components/ProductItem/index.less

@@ -1,7 +1,19 @@
 .m-product-item-advertise {
-  img {
+
+  img,
+  video,
+  .video-wrap {
     width: 100%;
     border-radius: 8px;
+    overflow: hidden;
+  }
+
+  .video-container {
+    background: unset;
+
+    .prism-player {
+      background-color: unset;
+    }
   }
 }
 
@@ -17,6 +29,7 @@
   .img-wrap {
     position: relative;
     overflow: hidden;
+    flex-shrink: 0;
 
     .product-img {
       width: 140px;
@@ -27,6 +40,7 @@
 
   .content-wrap {
     padding: 8px;
+    flex: 1;
 
     .promotions-wrap {
       display: flex;

package/lib/composite-comp/common/components/WatermarkLabel/index.less

@@ -0,0 +1,17 @@
+  .watermarkLabel {
+    position: absolute;
+    color: white;
+    pointer-events: none;
+    z-index: 1;
+    display: flex;
+    justify-content: center;
+    text-align: center;
+    align-items: center;
+    font-weight: 600;
+    background: rgba(0, 0, 0, 0.50);
+    bottom: 4px;
+    right: 4px;
+    font-size: 16px;
+    padding: 0px 9px;
+    border-radius: 7px;
+  }

package/lib/composite-comp/dito/components/Campaign/mobile/components/Bargain/index.js

@@ -304,7 +304,7 @@ function (_super) {
         key: item.id,
         data: item,
         onItemClick: function onItemClick() {
-          (0, _coreUtil.clickUrl)("proDetail - " + item.offerId + " -" + (item.sppProductId || '') + " ");
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
         }
       });
     }))));

package/lib/composite-comp/dito/components/Campaign/mobile/components/CountDown/index.js

@@ -130,7 +130,7 @@ function (_super) {
     return null;
   };
 
-  CountDown.prototype.componentDidUpdate = function () {
+  CountDown.prototype.componentDidMount = function () {
     var now = this.state.now;
 
     if (this.preTime != now) {

package/lib/composite-comp/dito/components/Campaign/mobile/components/FlashSale/index.js

@@ -256,7 +256,7 @@ function (_super) {
       isWill: false
     };
 
-    _this.getFlashData = function (pageSize, campaign) {
+    _this.getFlashData = function (pageSize, campaign, index, length) {
       return __awaiter(_this, void 0, void 0, function () {
         var res, pageId, _list;
 
@@ -278,7 +278,7 @@ function (_super) {
               _list = ((res === null || res === void 0 ? void 0 : res.list) || []).slice(0, 2);
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                if (_list.length === 0) this.props.onEmpty();
+                if (_list.length === 0 && index === length - 1) this.props.onEmpty();
                 (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, _list);
               }
 
@@ -299,10 +299,9 @@ function (_super) {
 
     _this.getNextFlashSale = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var data, _i, _a, _b, i, s, v, pageId;
-
-        return __generator(this, function (_c) {
-          switch (_c.label) {
+        var data, i, arr, pageId;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
               return [4
               /*yield*/
@@ -311,35 +310,34 @@ function (_super) {
               }, 'GET')];
 
             case 1:
-              data = _c.sent();
+              data = _a.sent();
               if (!(data.length > 0)) return [3
               /*break*/
               , 6];
-              _i = 0, _a = data.entries();
-              _c.label = 2;
+              i = 0;
+              _a.label = 2;
 
             case 2:
-              if (!(_i < _a.length)) return [3
+              if (!(i < data.length)) return [3
               /*break*/
               , 5];
-              _b = _a[_i], i = _b[0], s = _b[1];
               return [4
               /*yield*/
-              , this.getFlashData(2, s)];
+              , this.getFlashData(2, data[i], i, data.length)];
 
             case 3:
-              v = _c.sent();
+              arr = _a.sent();
 
-              if (v.length > 0) {
-                return [2
-                /*return*/
-                , true]; // 查询到秒杀场次，立即退出
+              if (arr.length > 0) {
+                return [3
+                /*break*/
+                , 5]; // 查询到秒杀场次，立即退出
               }
 
-              _c.label = 4;
+              _a.label = 4;
 
             case 4:
-              _i++;
+              i++;
               return [3
               /*break*/
               , 2];
@@ -361,7 +359,7 @@ function (_super) {
                 (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, []);
               }
 
-              _c.label = 7;
+              _a.label = 7;
 
             case 7:
               return [2
@@ -418,7 +416,7 @@ function (_super) {
           salePercent: isWill ? 0 : item.salePercent
         }),
         onItemClick: function onItemClick() {
-          (0, _coreUtil.clickUrl)("proDetail - " + item.offerId + " -" + (item.sppProductId || '') + " ");
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
         }
       });
     }))));

package/lib/composite-comp/dito/components/Campaign/mobile/components/GroupBuy/index.js

@@ -301,7 +301,7 @@ function (_super) {
         key: item.id,
         data: item,
         onItemClick: function onItemClick() {
-          (0, _coreUtil.clickUrl)("proDetail - " + item.offerId + " -" + (item.sppProductId || '') + " ");
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || ''));
         }
       });
     }))));

package/lib/composite-comp/dito/components/Campaign/mobile/components/ProductItem/index.js

@@ -85,7 +85,7 @@ function (_super) {
 
 
     var imgLabels = ((_a = data.labels) === null || _a === void 0 ? void 0 : _a.filter(function (f) {
-      return f.position !== '6' && f.position !== '7';
+      return f.position !== '6' && f.position !== '7' && f.position !== '8';
     })) || [];
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: "m-campaign-product-item",

package/lib/composite-comp/dito/components/Campaign/mobile/index.js

@@ -74,19 +74,19 @@ function (_super) {
     var flashSale = panelProps.groupSource[0];
     var groupBuy = panelProps.groupSource[1];
     var bargain = panelProps.groupSource[2];
-    var carouselHide = !flashSale.open && !groupBuy.open && !bargain.open;
+    var carouselHide = (!flashSale.open || flashSaleHide) && (!groupBuy.open || groupBuyHide) && (!bargain.open || bargainHide);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-campaign-mobile"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
+    }, panelProps.title.headline.open && (!carouselHide || panelProps.content.image.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "campaign-title"
-    }, panelProps.title.headline.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       data: panelProps.title.headline
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "campaign-content"
     }, !carouselHide && /*#__PURE__*/_react["default"].createElement("div", {
       className: "campaign-left"
     }, /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
-      autoplay: false,
+      autoplay: true,
       autoplaySpeed: 2000
     }, flashSale.open && !flashSaleHide && /*#__PURE__*/_react["default"].createElement(_FlashSale["default"], {
       onEmpty: function onEmpty() {

package/lib/composite-comp/dito/components/Campaign/mobile/index.less

@@ -20,6 +20,9 @@
 .m-campaign-mobile .campaign-content .campaign-left .slick-track > div > div {
   height: 100%;
 }
+.m-campaign-mobile .campaign-content .campaign-left .ant-carousel {
+  height: 100%;
+}
 .m-campaign-mobile .campaign-content .campaign-left .slick-dots {
   height: 0.06rem;
   display: flex !important;

package/lib/composite-comp/dito/components/FlashDeal/mobile/index.less

@@ -104,9 +104,6 @@
 .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap {
   flex: 1;
 }
-.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .product-name-wrap {
-  white-space: nowrap;
-}
 .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap {
   display: flex;
 }

package/lib/composite-comp/dito/components/FlashDeal/pc/ProductItem/index.js

@@ -93,12 +93,14 @@ function (_super) {
   }
 
   ProductItem.prototype.render = function () {
-    var _a = this.props,
-        data = _a.data,
-        panelProps = _a.panelProps,
-        onItemClick = _a.onItemClick,
-        unknownPrice = _a.unknownPrice,
-        rest = __rest(_a, ["data", "panelProps", "onItemClick", "unknownPrice"]);
+    var _a, _b;
+
+    var _c = this.props,
+        data = _c.data,
+        panelProps = _c.panelProps,
+        onItemClick = _c.onItemClick,
+        unknownPrice = _c.unknownPrice,
+        rest = __rest(_c, ["data", "panelProps", "onItemClick", "unknownPrice"]);
 
     var promotions = (0, _businessUtil.getPromotionList)(data);
     var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
@@ -129,6 +131,7 @@ function (_super) {
     var _price = integerPart + " " + (decimalPart ? '.' + decimalPart : '');
 
     var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
+    var salePercent = Number(data.salePercent) / 100 || 0;
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('m-pc-flash-product-item'),
       onClick: function onClick() {
@@ -170,7 +173,7 @@ function (_super) {
       style: {
         color: panelProps.salesPrice.content.color
       }
-    })), /*#__PURE__*/_react["default"].createElement("div", {
+    })), ((_a = panelProps.salesProgressVisible) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "rate-sold-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "rate-wrap"
@@ -180,9 +183,17 @@ function (_super) {
       type: "icon-star"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "rate-text"
-    }, (0, _currencyUtil.numberToFixed)(5.0, 1))), data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "sold-count"
-    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))));
+    }, (0, _currencyUtil.numberToFixed)(5.0, 1))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "progress-container"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "text"
+    }, salePercent, "% Sold"), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "progress",
+      style: {
+        width: salePercent + "%",
+        backgroundColor: (_b = panelProps.salesProgressVisible) === null || _b === void 0 ? void 0 : _b.color
+      }
+    })))));
   };
 
   ProductItem.defaultProps = {

package/lib/composite-comp/dito/components/FlashDeal/pc/ProductItem/index.less

@@ -11,6 +11,7 @@
     overflow: hidden;
     border-radius: 16px;
     border: 1px solid #E0E0E0;
+    flex-shrink: 0;
 
     .product-img {
       width: 270px;
@@ -21,6 +22,7 @@
 
   .content-wrap {
     padding: 8px;
+    flex: 1;
 
     .product-name-wrap {
       overflow: hidden;
@@ -54,6 +56,7 @@
       }
 
       .old-price {
+        width: auto !important;
         text-decoration: line-through;
         width: fit-content;
       }
@@ -61,7 +64,7 @@
     }
 
     .rate-sold-wrap {
-      margin-top: 4px;
+      // margin-top: 4px;
       display: flex;
       align-items: center;
 
@@ -75,26 +78,47 @@
           color: #666666;
           margin-left: 4px;
         }
-      }
-
-      .sold-count {
-        font-size: 16px;
-        font-weight: 500;
-        color: #666666;
-        margin-left: 10px;
-        display: flex;
-        align-items: center;
 
-        &:before {
+        &:after {
           content: '';
           display: block;
           width: 2px;
           height: 16px;
-          background-color: #666666;
-          margin-right: 10px;
+          background-color: #666;
+          margin: 0 8px;
+        }
+      }
+
+      .progress-container {
+        width: 100%;
+        height: 16px;
+        background-color: #F8B1B9;
+        border-radius: 8px;
+        position: relative;
+
+        .text {
+          font-family: Montserrat;
+          font-weight: 700;
+          font-size: 12px;
+          line-height: 16px;
+          letter-spacing: 0%;
+          color: #fff;
+          text-align: center;
+          position: absolute;
+          top: 0;
+          left: 0;
+          bottom: 0;
+          right: 0;
+          margin: auto;
+        }
+
+        .progress {
+          width: 10px;
+          border-radius: 8px;
+          height: 100%;
+          background: linear-gradient(289.79deg, #FCD117 -16.44%, #CE1126 58.47%, #0038A7 114.99%);
         }
       }
     }
   }
-
 }

package/lib/composite-comp/dito/components/FlashDeal/pc/index.js

@@ -497,12 +497,9 @@ function (_super) {
     }, ((_a = panelProps.title.image) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "icon",
       data: panelProps.title.image
-    }), !(0, _coreUtil.isPc)() && panelProps.title.headline.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      className: "title",
-      data: panelProps.title.headline
-    }), !(0, _coreUtil.isPc)() && isWill && /*#__PURE__*/_react["default"].createElement("span", {
+    }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "sub-title"
-    }, (0, _locale.i18n)('NEXT')), ((_b = panelProps.title.countDown) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_CountDown["default"], {
+    }, isWill ? (0, _locale.i18n)('STARTS_IN') : (0, _locale.i18n)('ENDS_IN')), ((_b = panelProps.title.countDown) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_CountDown["default"], {
       effDate: effDate,
       expDate: expDate,
       now: now,

package/lib/composite-comp/dito/components/FlashDeal/pc/index.less

@@ -28,13 +28,13 @@
       }
 
       .sub-title {
-        font-style: normal;
-        font-weight: 600;
-        font-size: 10px;
-        line-height: 18px;
+        font-family: Avenir Next;
+        font-weight: 700;
+        font-size: 20px;
+        line-height: 48px;
+        letter-spacing: 0%;
         color: #2C2C2C;
-        margin-right: 6px;
-        align-self: end;
+        margin-right: 8px;
       }
     }
 

package/lib/composite-comp/dito/components/MobileNavigation/defaultJSON.js

@@ -16,6 +16,10 @@ var MobileNavGroupSourceJSON = function MobileNavGroupSourceJSON() {
   var defaultFontFamily = _constants.projectFontFamily[(_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.projectCode] || 'Open Sans';
   return {
     id: groupId,
+    adult: {
+      id: (0, _uuid.v4)(),
+      open: false
+    },
     image: {
       parentId: groupId,
       id: (0, _uuid.v4)(),

package/lib/composite-comp/dito/components/MobileNavigation/mobile/index.js

@@ -93,15 +93,20 @@ function (_super) {
     //   wrapStyle.backgroundPosition = 'center';
     // }
 
+    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+
+    var _groupSource = data === null || data === void 0 ? void 0 : data.groupSource.filter(function (f) {
+      return userIsAdult || !f.adult.open;
+    });
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('mobile-navigation-mobile', data.customize.layout)
-    }, (data === null || data === void 0 ? void 0 : data.groupSource.length) > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    }, _groupSource.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "group-wrap"
-    }, data.groupSource.map(function (source, i) {
+    }, _groupSource.map(function (source, i) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: source.id,
-        className: "one-card" // className={data.groupSource.length > data.customize.rowNum ? 'one-card card-margin-bottom' : 'one-card'}
-        ,
+        className: "one-card",
         onClick: function onClick() {
           /** PTO 定制GA */
           if (window.magicDesign.pushGA) {

package/lib/composite-comp/dito/components/PersonalInformationSecond/defaultJSON.js

@@ -0,0 +1,168 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = exports.PersonalInfoGroupSourceJSON = exports.OrdersGroupSourceJSON = void 0;
+
+var _uuid = require("uuid");
+
+var PersonalInfoGroupSourceJSON = function PersonalInfoGroupSourceJSON(text) {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    title: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'TEXT',
+      specialContent: [],
+      text: text || 'Name',
+      content: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Montserrat',
+        fontWeight: 500,
+        fontSize: 10,
+        color: '#fff',
+        width: 0,
+        textAlign: 'center'
+      },
+      underline: {
+        open: false,
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
+    },
+    number: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'TEXT',
+      specialContent: [],
+      text: 0,
+      content: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Montserrat',
+        fontWeight: 600,
+        fontSize: 18,
+        color: '#fff',
+        width: 0,
+        textAlign: 'center'
+      },
+      underline: {
+        open: false,
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
+    },
+    sourceType: text
+  };
+};
+
+exports.PersonalInfoGroupSourceJSON = PersonalInfoGroupSourceJSON;
+
+var OrdersGroupSourceJSON = function OrdersGroupSourceJSON(text) {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    title: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'TEXT',
+      specialContent: [],
+      text: text || 'Name',
+      content: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Montserrat',
+        fontWeight: 600,
+        fontSize: 10,
+        color: '#3E3E3E',
+        width: 0,
+        textAlign: 'center'
+      },
+      underline: {
+        open: false,
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
+    },
+    image: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'IMAGE',
+      content: {
+        h5Name: 'name2',
+        pcName: 'name2',
+        h5ImgSrc: '',
+        pcImgSrc: '',
+        clickUrl: ''
+      },
+      hover: {
+        open: false,
+        backgroundType: 'enlarge',
+        magnification: 1.5,
+        pcImgHoverUrl: '',
+        h5ImgHoverUrl: ''
+      }
+    },
+    sourceType: text
+  };
+};
+
+exports.OrdersGroupSourceJSON = OrdersGroupSourceJSON;
+
+var getDefaultJSON = function getDefaultJSON() {
+  return {
+    id: (0, _uuid.v4)(),
+    type: 'PERSONAL_INFOMATION_SECOND',
+    login: {
+      open: true
+    },
+    decorationIcon: {
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'IMAGE',
+      content: {
+        h5Name: 'name2',
+        pcName: 'name2',
+        h5ImgSrc: '',
+        pcImgSrc: '',
+        clickUrl: ''
+      },
+      hover: {
+        open: false,
+        backgroundType: 'enlarge',
+        magnification: 1.5,
+        pcImgHoverUrl: '',
+        h5ImgHoverUrl: ''
+      }
+    },
+    groupSource: [],
+    groupSource2: [OrdersGroupSourceJSON('To Pay'), OrdersGroupSourceJSON('To Ship'), OrdersGroupSourceJSON('To Receive')],
+    spacing: {
+      pc: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        marginBottom: 0
+      },
+      mobile: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        marginBottom: 0
+      }
+    },
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;