@fonixtree/magic-design 2.0.134 → 2.0.136

package/es/composite-comp/common/components/MonpayProductItem/index.js

@@ -19,8 +19,6 @@ var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
 
 var _components = require("../../../../meta-comp/components");
 
-var _businessUtil = require("../../../../utils/businessUtil");
-
 var _locale = require("../../../../locale");
 
 require("./index.less");
@@ -130,10 +128,10 @@ function (_super) {
         layout = _m.layout,
         imgHeight = _m.imgHeight,
         imgWidth = _m.imgWidth,
-        unknownPrice = _m.unknownPrice,
-        rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
+        showDiscountTag = _m.showDiscountTag,
+        rest = __rest(_m, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "intelligentType", "fixHeight", "layout", "imgHeight", "imgWidth", "showDiscountTag"]); // const promotions = getPromotionList(data);
+
 
-    var promotions = (0, _businessUtil.getPromotionList)(data);
     var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
     var oldPrice = null;
 
@@ -178,22 +176,11 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
       labels: imgLabels,
       small: true
-    }), ((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    }), (((_d = panelProps.discount) === null || _d === void 0 ? void 0 : _d.open) || showDiscountTag) && data.discountPercent && /*#__PURE__*/_react["default"].createElement("div", {
       className: "discount-tag"
     }, data.discountPercent, "% off")), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
-    }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "promotions-wrap"
-    }, promotions.map(function (promot, index) {
-      return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
-        key: index,
-        className: "promotion-item",
-        data: __assign(__assign({}, panelProps.label), {
-          text: promot
-        }),
-        readonly: true
-      });
-    })), /*#__PURE__*/_react["default"].createElement("div", {
+    }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "product-name-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "box"

package/es/composite-comp/common/components/ProductItem/index.js

@@ -234,7 +234,7 @@ function (_super) {
       style: {
         color: panelProps.salesPrice.content.color
       }
-    })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && /*#__PURE__*/_react["default"].createElement("div", {
       className: "sold-count"
     }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), showProgress && ((_d = panelProps.salesProgress) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"

package/es/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less

@@ -28,7 +28,10 @@
   overflow: scroll;
 }
 .BundleItemWrap .prodList img {
+  height: 1.9rem;
   width: 1.9rem;
+  border-radius: 0.16rem;
+  object-fit: cover;
 }
 .BundleItemWrap .bottomWrap {
   border-top: 0.02rem solid #E4E4E4;

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

@@ -821,6 +821,7 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
+        showDiscountTag: true,
         showProgress: false
       });
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {

package/es/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
-
 var _TextConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/TextConfig"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -76,14 +74,8 @@ function (_super) {
         name: (0, _locale.i18n)('FILTER'),
         value: null,
         metaOption: panelProps.filter
-      }, {
-        key: '1',
-        name: (0, _locale.i18n)('LABEL'),
-        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
-          data: panelProps.label
-        }),
-        metaOption: panelProps.label
-      }, {
+      }, // { key: '1', name: i18n('LABEL'), value: <ButtonConfig data={panelProps.label} />, metaOption: panelProps.label },
+      {
         key: '2',
         name: (0, _locale.i18n)('PRODUCT_NAME'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {

package/es/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/es/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/lib/common/LinkModal/AffiliatePlatform/index.js

@@ -262,7 +262,7 @@ function AffiliatePlatform(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -319,7 +319,7 @@ function AffiliatePlatform(props) {
     rowKey: "distributionPlatformId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/lib/common/LinkModal/AffiliateProductTable/index.js

@@ -286,7 +286,7 @@ function AffiliateProductTable(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     form: form,

package/lib/common/LinkModal/AffiliateStore/index.js

@@ -268,7 +268,7 @@ function AffiliateStore(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -325,7 +325,7 @@ function AffiliateStore(props) {
     rowKey: "affiliateStoreId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/lib/common/LinkModal/BundleCampaign/index.js

@@ -404,7 +404,7 @@ var BundleCampaign = function BundleCampaign(props) {
     rowKey: "campaignId",
     rowSelection: rowSelection,
     scroll: {
-      y: 340
+      y: 300
     }
   }));
 };

package/lib/common/LinkModal/BundleCampaign/index.less

@@ -1,18 +1,21 @@
-.bundleCampaign{
+.bundleCampaign {
     // padding-top: 12px;
     // border-top: 1px solid #f0f0f0;
-    height: 550px;
+    height: 450px;
+
     .inputStyle {
         width: 280px;
         height: 32px;
         margin-left: 10px;
-      }
+    }
+
     .labelStyle {
         display: inline-block;
         width: 110px;
         text-align: right;
         line-height: 2;
     }
+
     .mb12 {
         margin-bottom: 12px;
     }

package/lib/common/LinkModal/CatgTable/index.js

@@ -223,7 +223,7 @@ function CatgTable(props) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
@@ -237,7 +237,7 @@ function CatgTable(props) {
     },
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/lib/common/LinkModal/CouponTable/index.js

@@ -294,7 +294,7 @@ function CouponTable(props) {
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     columns: columns,
@@ -308,7 +308,7 @@ function CouponTable(props) {
     }),
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/lib/common/LinkModal/CustomTable/index.js

@@ -221,7 +221,7 @@ function CustomTable(props) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
@@ -232,7 +232,7 @@ function CustomTable(props) {
     rowKey: "bdPageId",
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/lib/common/LinkModal/FilteredProductModal/index.js

@@ -674,7 +674,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
       }
     }),
     scroll: {
-      y: 400
+      y: 350
     }
   })))));
 };

package/lib/common/LinkModal/FilteredProductModal/index.less

@@ -1,5 +1,5 @@
 .mFilteredProductModal {
-  height: 550px;
+  height: 450px;
 
   .proModalWrap {
     .info {
@@ -86,7 +86,8 @@
 
       .leftCot {
         width: 280px;
-        // height: 400px;
+        height: 400px;
+        overflow-y: auto;
         box-sizing: border-box;
         border-right: 1px solid #e0e0e0;
         padding-right: 15px;

package/lib/common/LinkModal/FunctionTable/index.js

@@ -218,7 +218,7 @@ function FunctionTable(props) {
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     columns: columns,
@@ -228,7 +228,7 @@ function FunctionTable(props) {
     rowKey: "funcUrlLibId",
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/lib/common/LinkModal/InterestedMerchants/index.js

@@ -262,7 +262,7 @@ function InterestedMerchants(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -319,7 +319,7 @@ function InterestedMerchants(props) {
     rowKey: "interestId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/lib/common/LinkModal/InterestedProducts/index.js

@@ -262,7 +262,7 @@ function InterestedMerchants(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -319,7 +319,7 @@ function InterestedMerchants(props) {
     rowKey: "interestId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/lib/common/LinkModal/MerchantStory/index.js

@@ -264,7 +264,7 @@ function MerchantStory(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -321,7 +321,7 @@ function MerchantStory(props) {
     rowKey: "storeId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/lib/common/LinkModal/MiniAppApi/index.js

@@ -55,7 +55,7 @@ function MiniAppApi(_a) {
     rowKey: "title",
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 350
     }
   }));
 }

package/lib/common/LinkModal/MiniAppTable/index.js

@@ -233,7 +233,7 @@ function CustomTable(props) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
@@ -244,7 +244,7 @@ function CustomTable(props) {
     rowKey: "storeMiniProgramId",
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/lib/common/LinkModal/MissionDetail/index.js

@@ -255,7 +255,7 @@ function MissionDetail(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -312,7 +312,7 @@ function MissionDetail(props) {
     rowKey: "sfTaskId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/lib/common/LinkModal/ProductDetailPage/index.js

@@ -557,7 +557,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
     rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
-      y: 300
+      y: 250
     }
   }));
 };

package/lib/common/LinkModal/ProductDetailPage/index.less

@@ -1,5 +1,5 @@
 .productDetailPage {
-  height: 550px;
+  height: 450px;
 
   .btn-select-type {
     margin-bottom: 10px;

package/lib/common/LinkModal/SelectVideoModal/index.less

@@ -2,7 +2,8 @@
   display: flex;
   // padding: 20px 80px;
   // border-top: 1px solid #f0f0f0;
-  height: 550px;
+  height: 450px;
+
   .video-left-wrap {
     display: flex;
     flex-direction: column;

package/lib/common/LinkModal/ShareUrl/index.less

@@ -1,3 +1,3 @@
 .shareWrap {
-  height: 550px;
+  height: 450px;
 }

package/lib/common/LinkModal/StoreCatgTable/index.js

@@ -223,7 +223,7 @@ function StoreCatgTable(props) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
@@ -237,7 +237,7 @@ function StoreCatgTable(props) {
     },
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/lib/common/LinkModal/StoreTable/index.js

@@ -264,7 +264,7 @@ function StoreTable(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -321,7 +321,7 @@ function StoreTable(props) {
     rowKey: "storeId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }