@fonixtree/magic-design 2.0.132 → 2.0.135

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

@@ -53,12 +53,6 @@
 }
 .m-flash-deal-mobile .flash-deal-list {
   margin-top: 0.32rem;
-  overflow-x: auto;
-  overflow-y: hidden;
-  white-space: nowrap;
-  display: flex;
-  align-items: flex-start;
-  justify-content: flex-start;
   position: relative;
 }
 .m-flash-deal-mobile .flash-deal-list .loading-wrap {
@@ -73,11 +67,49 @@
   right: 0;
   margin: auto;
 }
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap {
+.m-flash-deal-mobile .flash-deal-list-vertical {
+  overflow-x: auto;
+  overflow-y: hidden;
+  white-space: nowrap;
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap {
   width: 2.84rem;
   margin-right: 0.16rem;
 }
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap .product-img {
+.m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap .product-img {
   height: 2.8rem;
   width: 2.8rem;
 }
+.m-flash-deal-mobile .flash-deal-list-horizontal {
+  display: flex;
+  flex-direction: column;
+  gap: 0.16rem;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap {
+  width: 100%;
+}
+.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;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap .price-wrap {
+  margin-bottom: 0;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap .price-sold-wrap {
+  margin-left: 0.04rem;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap .price-sold-wrap .discount {
+  display: none;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .progress-wrap {
+  padding-right: 0.52rem;
+  margin-top: 0;
+}

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

@@ -74,13 +74,13 @@
   margin: auto;
 }
 .m-group-buy-mobile .group-buy-list .m-product-item-wrap {
-  width: 2.8rem;
+  width: 3.44rem;
   margin-right: 0.24rem;
   border-radius: 0;
 }
 .m-group-buy-mobile .group-buy-list .m-product-item-wrap .product-img {
-  height: 2.76rem;
-  width: 2.76rem;
+  height: 3.4rem;
+  width: 3.4rem;
 }
 .m-group-buy-mobile .group-buy-list .m-product-item-wrap .content-wrap {
   padding: 0.24rem;

package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigTitle/index.js

@@ -45,12 +45,12 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var AComponent =
+var FlashDealConfigTitle =
 /** @class */
 function (_super) {
-  __extends(AComponent, _super);
+  __extends(FlashDealConfigTitle, _super);
 
-  function AComponent() {
+  function FlashDealConfigTitle() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
@@ -64,7 +64,7 @@ function (_super) {
     return _this;
   }
 
-  AComponent.prototype.render = function () {
+  FlashDealConfigTitle.prototype.render = function () {
     var _this = this;
 
     var panelProps = this.props.panelProps;
@@ -86,41 +86,50 @@ function (_super) {
       headerSize: "middle",
       onRefresh: this.reRender,
       source: [{
-        key: '1',
+        key: 'iconConfig',
         name: (0, _locale.i18n)('ICON'),
         value: iconSetting,
         metaOption: panelProps.icon
       }, {
-        key: '2',
+        key: 'headlineConfig',
         name: (0, _locale.i18n)('HEADLINE'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
           data: panelProps.headline
         }),
         metaOption: panelProps.headline
       }, {
-        key: '3',
+        key: 'buttonCOnfig',
         name: (0, _locale.i18n)('BUTTON'),
         value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
           data: panelProps.button
         }),
         metaOption: panelProps.button
+      }, {
+        key: 'countDownConfig',
+        name: (0, _locale.i18n)('COUNT_DOWN'),
+        value: null,
+        metaOption: panelProps === null || panelProps === void 0 ? void 0 : panelProps.countDown,
+        toggleType: 'switch'
       }],
       type: "switch"
     }));
   };
 
-  AComponent.defaultProps = {
+  FlashDealConfigTitle.defaultProps = {
     panelProps: {
       icon: {
         open: true,
         url: ''
       },
       headline: {},
-      button: {}
+      button: {},
+      countDown: {
+        open: true
+      }
     }
   };
-  return AComponent;
+  return FlashDealConfigTitle;
 }(_react["default"].Component);
 
-var _default = AComponent;
+var _default = FlashDealConfigTitle;
 exports["default"] = _default;

package/lib/composite-comp/dito/config-panels/FlashDealConfig/index.js

@@ -11,8 +11,6 @@ var _FlashDealConfigTitle = _interopRequireDefault(require("./FlashDealConfigTit
 
 var _FlashDealConfigContent = _interopRequireDefault(require("./FlashDealConfigContent"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
-
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
@@ -23,6 +21,8 @@ var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _locale = require("../../../../locale");
 
+var _layout = require("../../../../constants/layout");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function FlashDealConfig(props) {
@@ -55,11 +55,7 @@ function FlashDealConfig(props) {
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         isHideAlign: true,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'layout1',
-          image: _layout["default"]
-        }]
+        layoutSource: _layout.flashDealLayout
       })
     }, {
       key: '5',

package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js

@@ -748,12 +748,12 @@ function (_super) {
     }, 140);
     if (_layout === 'layout1-2' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (_layout === 'layout1-3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, groupSource.length === 1 && _products.length > 0 || groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (groupSource.length === 1 && _products.length > 0 || groupSource.length > 1) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "monpay-recommend-mobile recommend_" + panelProps.id
     }, panelProps.title.headerImage.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "headerImg",
-      isRect: true,
-      data: panelProps.title.headerImage
+      data: panelProps.title.headerImage,
+      isRect: true
     }), !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
       className: "tab-select-wrap"
     }, groupSource.map(function (tab, index) {
@@ -806,6 +806,7 @@ function (_super) {
         data: item,
         imgHeight: imgHeight,
         imgWidth: imgWidth,
+        intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType,
         layout: layout === 'layout2' ? 'horizontal' : 'vertical',
         onItemClick: function onItemClick() {
           /** PTO 定制GA */
@@ -820,16 +821,15 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
-        showProgress: false,
-        intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType
+        showProgress: false
       });
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
     }), _products.length === 0 && /*#__PURE__*/_react["default"].createElement("img", {
-      src: _emptyImg["default"],
       alt: "",
-      className: "emptyImg"
+      className: "emptyImg",
+      src: _emptyImg["default"]
     })) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
       key: "scrollContainer",
       className: (0, _classnames["default"])('scrollContainer', {
@@ -845,6 +845,7 @@ function (_super) {
         data: item,
         imgHeight: imgHeight,
         imgWidth: imgWidth,
+        intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType,
         onItemClick: function onItemClick() {
           /** PTO 定制GA */
           if (window.magicDesign.pushGA) {
@@ -854,16 +855,15 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
-        showProgress: false,
-        intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType
+        showProgress: false
       });
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
     })), _products.length === 0 && /*#__PURE__*/_react["default"].createElement("img", {
-      src: _emptyImg["default"],
       alt: "",
-      className: "emptyImg"
+      className: "emptyImg",
+      src: _emptyImg["default"]
     }))));
   };
 

package/lib/constants/index.js

@@ -90,7 +90,8 @@ var urlTypeMap = {
   AFFILIATE_PLATFORM: 'AffiliatePlatform',
   INTERESTED_MERCHANTS: 'InterestedMerchants',
   INTERESTED_PRODUCTS: 'InterestedProducts',
-  MERCHANT_STORY: 'MerchantStory'
+  MERCHANT_STORY: 'MerchantStory',
+  AFFILIATE_MISSION_DETAIL: 'AffiliateMissionDetail'
 };
 exports.urlTypeMap = urlTypeMap;
 var respCodeMap = {

package/lib/constants/layout.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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;
+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;
 
 var _dividerLayout = _interopRequireDefault(require("../assets/images/layout-icon/dividerLayout.svg"));
 
@@ -95,6 +95,8 @@ var _bannerSlideLayout = _interopRequireDefault(require("../assets/images/layout
 
 var _bannerSlideLayout2 = _interopRequireDefault(require("../assets/images/layout-icon/banner-slide-layout2.png"));
 
+var _flashDealLayout = _interopRequireDefault(require("../assets/images/layout-icon/flash-deal-layout1.png"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 // import p3 from '../assets/images/layout-icon/layout-imagetext-p3.png';
@@ -359,4 +361,14 @@ var monpaySignBoardLayout = [{
   name: 'layout1',
   image: _monpaySignBoardLayout["default"]
 }];
-exports.monpaySignBoardLayout = monpaySignBoardLayout;
+exports.monpaySignBoardLayout = monpaySignBoardLayout;
+var flashDealLayout = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _flashDealLayout["default"]
+}, {
+  id: 'layout2',
+  name: 'layout2',
+  image: _layoutImagetextM4["default"]
+}];
+exports.flashDealLayout = flashDealLayout;

package/lib/locale/en/en.json

@@ -1,5 +1,6 @@
 {
   "MISSION_NAME": "Mission Name",
+  "COUNT_DOWN": "Count Down",
   "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
   "INTER": "Inter",
   "STORE_SERVICES": "Store services",

package/lib/locale/es/es.json

@@ -1,5 +1,6 @@
 {
   "MISSION_NAME": "Mission Name",
+  "COUNT_DOWN": "Count Down",
   "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
   "INTER": "Inter",
   "STORE_SERVICES": "Store services",

package/lib/locale/mn/mn.json

@@ -1,5 +1,6 @@
 {
   "MISSION_NAME": "Mission Name",
+  "COUNT_DOWN": "Count Down",
   "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
   "INTER": "Inter",
   "STORE_SERVICES": "Store services",

package/lib/utils/businessUtil.js

@@ -75,7 +75,7 @@ var newParseUrl = function newParseUrl(urlObj) {
 
     case _constants.urlTypeMap.STORE_CATEGORY:
       // 商品列表
-      link = "/product/list/?storeCatgIds=" + value;
+      link = "/product/list/" + value;
       params = {
         action: 'jump',
         params: {
@@ -255,6 +255,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
 
+    case _constants.urlTypeMap.AFFILIATE_MISSION_DETAIL:
+      // affiliate mission detail
+      link = "/taskDetail/" + value;
+      params = {
+        action: 'jump',
+        params: {
+          type: 'AFFILIATE_MISSION_DETAIL',
+          url: value
+        }
+      };
+      break;
+
     default:
       var map = {
         '/main/cart': 'CART',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.132",
+  "version": "2.0.135",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",