@fonixtree/magic-design 2.0.134 → 2.0.136

package/lib/common/LinkModal/index.js

@@ -11,6 +11,8 @@ var _antd = require("antd4");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _CouponTable = _interopRequireDefault(require("./CouponTable"));
 
 var _FilteredProductModal = _interopRequireDefault(require("./FilteredProductModal"));
@@ -323,116 +325,124 @@ var LinkModal = function LinkModal(props) {
     visible: visible,
     width: "1000px",
     wrapClassName: "magicLinkModal"
-  }, modalConfig), /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
-    activeKey: selected,
-    onChange: onTabsChange
+  }, modalConfig), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "wrap"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "types-list"
   }, linkTypes.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_antd.Tabs.TabPane, {
+    return /*#__PURE__*/_react["default"].createElement("span", {
       key: item.linkTypeCode,
-      tab: item.linkTypeName
-    }, item.linkTypeCode === 'StoreCategory' && /*#__PURE__*/_react["default"].createElement(_StoreCatgTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'CustomizedPage' && /*#__PURE__*/_react["default"].createElement(_CustomTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(url) {
-        return setLinkUrl(url);
-      }
-    }), item.linkTypeCode === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
-      _fetch: _fetch,
-      onDataChange: function onDataChange(url, t) {
-        setLinkUrl(url);
-        setTotal(t);
-      }
-    }), item.linkTypeCode === 'FunctionPage' && /*#__PURE__*/_react["default"].createElement(_FunctionTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'Coupons' && /*#__PURE__*/_react["default"].createElement(_CouponTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'BundleCampaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'Video' && /*#__PURE__*/_react["default"].createElement(_SelectVideoModal["default"], {
-      _fetch: _fetch,
-      setUrl: function setUrl(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'ShareURL' && /*#__PURE__*/_react["default"].createElement(_ShareUrl["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'MiniApp' && /*#__PURE__*/_react["default"].createElement(_MiniAppTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'Store' && /*#__PURE__*/_react["default"].createElement(_StoreTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'AffiliateProduct' && /*#__PURE__*/_react["default"].createElement(_AffiliateProductTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'AffiliateStore' && /*#__PURE__*/_react["default"].createElement(_AffiliateStore["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'MiniApi' && /*#__PURE__*/_react["default"].createElement(_MiniAppApi["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'AffiliatePlatform' && /*#__PURE__*/_react["default"].createElement(_AffiliatePlatform["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'InterestedMerchants' && /*#__PURE__*/_react["default"].createElement(_InterestedMerchants["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'InterestedProducts' && /*#__PURE__*/_react["default"].createElement(_InterestedProducts["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'MerchantStory' && /*#__PURE__*/_react["default"].createElement(_MerchantStory["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'AffiliateMissionDetail' && /*#__PURE__*/_react["default"].createElement(_MissionDetail["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
+      className: (0, _classnames["default"])('tag', {
+        active: selected === item.linkTypeCode
+      }),
+      onClick: function onClick() {
+        return onTabsChange(item.linkTypeCode);
       }
-    }));
+    }, item.linkTypeName);
   })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "form-content"
+  }, selected === 'StoreCategory' && /*#__PURE__*/_react["default"].createElement(_StoreCatgTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      setLinkUrl(value);
+    }
+  }), selected === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'CustomizedPage' && /*#__PURE__*/_react["default"].createElement(_CustomTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(url) {
+      return setLinkUrl(url);
+    }
+  }), selected === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
+    _fetch: _fetch,
+    onDataChange: function onDataChange(url, t) {
+      setLinkUrl(url);
+      setTotal(t);
+    }
+  }), selected === 'FunctionPage' && /*#__PURE__*/_react["default"].createElement(_FunctionTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'Coupons' && /*#__PURE__*/_react["default"].createElement(_CouponTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'BundleCampaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'Video' && /*#__PURE__*/_react["default"].createElement(_SelectVideoModal["default"], {
+    _fetch: _fetch,
+    setUrl: function setUrl(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'ShareURL' && /*#__PURE__*/_react["default"].createElement(_ShareUrl["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'MiniApp' && /*#__PURE__*/_react["default"].createElement(_MiniAppTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'Store' && /*#__PURE__*/_react["default"].createElement(_StoreTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'AffiliateProduct' && /*#__PURE__*/_react["default"].createElement(_AffiliateProductTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'AffiliateStore' && /*#__PURE__*/_react["default"].createElement(_AffiliateStore["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'MiniApi' && /*#__PURE__*/_react["default"].createElement(_MiniAppApi["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'AffiliatePlatform' && /*#__PURE__*/_react["default"].createElement(_AffiliatePlatform["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'InterestedMerchants' && /*#__PURE__*/_react["default"].createElement(_InterestedMerchants["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'InterestedProducts' && /*#__PURE__*/_react["default"].createElement(_InterestedProducts["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'MerchantStory' && /*#__PURE__*/_react["default"].createElement(_MerchantStory["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'AffiliateMissionDetail' && /*#__PURE__*/_react["default"].createElement(_MissionDetail["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"
   }, selected === 'FilteredProduct' ? /*#__PURE__*/_react["default"].createElement("div", {
     className: "total"

package/lib/common/LinkModal/index.less

@@ -4,9 +4,10 @@
   left: unset !important;
 
   .cylon-modal .cylon-modal-content .cylon-modal-body {
-      padding-bottom: 60px !important;
-      padding-top: 0 !important;
+    padding-bottom: 60px !important;
+    padding-top: 0 !important;
   }
+
   .urlModalWrap {
     font-family: 'Open Sans';
     font-style: normal;
@@ -69,10 +70,40 @@
       }
     }
   }
+
   .shareUrlWrap {
     height: 500px;
   }
 
+  .types-list {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 12px;
+    margin-top: 20px;
+    margin-bottom: 20px;
+
+    .tag {
+      display: inline-block;
+      width: 145px;
+      height: 36px;
+      background-color: #F5F6F7;
+      border-radius: 4px;
+      line-height: 36px;
+      text-align: center;
+      color: #232F46;
+      font-weight: 400;
+      font-size: 14px;
+      border: 1px solid #F5F6F7;
+      cursor: pointer;
+
+      &.active {
+        border: 1px solid #2F54EB;
+        color: #2F54EB;
+      }
+    }
+  }
+
   .footer {
     padding: 10px 0;
     display: flex;
@@ -91,11 +122,13 @@
       border: none;
       margin-right: 12px;
     }
+
     .btn-confirm {
       background: #2F54EB;
       border: none;
       border-radius: 6px;
     }
+
     .total {
       font-size: 13px;
       color: #2d3040;

package/lib/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/lib/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/lib/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/lib/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/lib/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/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/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.134",
+  "version": "2.0.136",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",