@fonixtree/magic-design 2.0.166 → 2.0.170

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.flashDealLayout = exports.dividerLayout = exports.carouselLayout = exports.bannerSlideLayout = exports.affiliateLayoutPc = exports.affiliateLayoutMobile = exports.WalletNuriLayout = exports.WalletLayout = void 0;
+exports.videoPCLayout = exports.videoH5Layout = exports.textLayout = exports.tagLayout = exports.searchLayout = exports.recommendLayoutPc = exports.recommendLayoutMobile = exports.pcNavigationLayout = exports.newsletterLayout = exports.monpaySignBoardLayout = exports.monpayRecommendLayoutMobile = exports.monpayFlashDealLayout = exports.mobileNavigationLayout = exports.merchantSalesLayout = exports.locationLayout = exports.interestLayout = exports.imageTextLayoutPc = exports.imageTextLayoutMobile = exports.imageGalleryLayout = exports.groupBuyLayout = exports.flashDealLayout = exports.dividerLayout = exports.defaultLayout = exports.carouselLayout = exports.buttonLayout = exports.bundleLayout = exports.bargainLayout = exports.bannerSlideLayout = exports.affiliateLayoutPc = exports.affiliateLayoutMobile = exports.WalletNuriLayout = exports.WalletLayout = void 0;
 
 var _dividerLayout = _interopRequireDefault(require("../assets/images/layout-icon/dividerLayout.svg"));
 
@@ -29,21 +29,21 @@ var _layoutImagetextM4 = _interopRequireDefault(require("../assets/images/layout
 
 var _layoutImagetextM5 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-m3.png"));
 
-var _carouselLayout = _interopRequireDefault(require("../assets/images/layout-icon/carouselLayout1.png"));
+var _layoutImagetextP = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p1.png"));
 
-var _carouselLayout2 = _interopRequireDefault(require("../assets/images/layout-icon/carouselLayout2.png"));
+var _layoutImagetextP2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p2.png"));
 
-var _carouselLayout3 = _interopRequireDefault(require("../assets/images/layout-icon/carouselLayout3.png"));
+var _layoutImagetextP3 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p3.png"));
 
-var _layoutImagetextP = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p1.png"));
+var _layoutImagetextP4 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p4.png"));
 
-var _layoutImagetextP2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p2.png"));
+var _layoutImagetextP5 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p5.png"));
 
-var _layoutImagetextP3 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p4.png"));
+var _carouselLayout = _interopRequireDefault(require("../assets/images/layout-icon/carouselLayout1.png"));
 
-var _imageTextLeft = _interopRequireDefault(require("../assets/images/layout-icon/imageTextLeft.svg"));
+var _carouselLayout2 = _interopRequireDefault(require("../assets/images/layout-icon/carouselLayout2.png"));
 
-var _imageTextRight = _interopRequireDefault(require("../assets/images/layout-icon/imageTextRight.svg"));
+var _carouselLayout3 = _interopRequireDefault(require("../assets/images/layout-icon/carouselLayout3.png"));
 
 var _newsletter = _interopRequireDefault(require("../assets/images/layout-icon/newsletter.svg"));
 
@@ -97,9 +97,46 @@ var _bannerSlideLayout2 = _interopRequireDefault(require("../assets/images/layou
 
 var _flashDealLayout = _interopRequireDefault(require("../assets/images/layout-icon/flash-deal-layout1.png"));
 
+var _buttonLayout = _interopRequireDefault(require("../assets/images/layout-icon/buttonLayout1.png"));
+
+var _buttonLayout2 = _interopRequireDefault(require("../assets/images/layout-icon/buttonLayout2.png"));
+
+var _tagLayout = _interopRequireDefault(require("../assets/images/layout-icon/tagLayout1.png"));
+
+var _textLayout = _interopRequireDefault(require("../assets/images/layout-icon/textLayout1.png"));
+
+var _bargainLayout = _interopRequireDefault(require("../assets/images/layout-icon/bargainLayout1.png"));
+
+var _groupBuyLayout = _interopRequireDefault(require("../assets/images/layout-icon/groupBuyLayout1.png"));
+
+var _bundleLayout = _interopRequireDefault(require("../assets/images/layout-icon/bundleLayout1.png"));
+
+var _interestLayout = _interopRequireDefault(require("../assets/images/layout-icon/interestLayout1.png"));
+
+var _merchantSalesLayout = _interopRequireDefault(require("../assets/images/layout-icon/merchantSalesLayout1.png"));
+
+var _left = _interopRequireDefault(require("../assets/images/layout-icon/left.png"));
+
+var _center = _interopRequireDefault(require("../assets/images/layout-icon/center.png"));
+
+var _right = _interopRequireDefault(require("../assets/images/layout-icon/right.png"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-// import p3 from '../assets/images/layout-icon/layout-imagetext-p3.png';
+var defaultLayout = [{
+  id: 'layout1',
+  name: 'left',
+  image: _left["default"]
+}, {
+  id: 'layout2',
+  name: 'center',
+  image: _center["default"]
+}, {
+  id: 'layout3',
+  name: 'right',
+  image: _right["default"]
+}];
+exports.defaultLayout = defaultLayout;
 var dividerLayout = [{
   id: 'layout1',
   name: 'layout1',
@@ -173,11 +210,11 @@ var imageTextLayoutPc = [{
 }, {
   id: 'layout4',
   name: 'leftImage',
-  image: _imageTextLeft["default"]
+  image: _layoutImagetextP4["default"]
 }, {
   id: 'layout5',
   name: 'rightImage',
-  image: _imageTextRight["default"]
+  image: _layoutImagetextP5["default"]
 }];
 exports.imageTextLayoutPc = imageTextLayoutPc;
 var imageTextLayoutMobile = [{
@@ -369,6 +406,64 @@ var flashDealLayout = [{
 }, {
   id: 'layout2',
   name: 'layout2',
-  image: _layoutImagetextM4["default"]
+  image: _layoutRecommendMobile2["default"]
+}];
+exports.flashDealLayout = flashDealLayout;
+var monpayFlashDealLayout = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _flashDealLayout["default"]
+}];
+exports.monpayFlashDealLayout = monpayFlashDealLayout;
+var buttonLayout = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _buttonLayout["default"]
+}, {
+  id: 'layout2',
+  name: 'layout2',
+  image: _buttonLayout2["default"]
+}];
+exports.buttonLayout = buttonLayout;
+var tagLayout = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _tagLayout["default"]
+}];
+exports.tagLayout = tagLayout;
+var textLayout = [{
+  id: 'layout1',
+  name: 'left',
+  image: _textLayout["default"]
+}];
+exports.textLayout = textLayout;
+var bargainLayout = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _bargainLayout["default"]
+}];
+exports.bargainLayout = bargainLayout;
+var groupBuyLayout = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _groupBuyLayout["default"]
+}];
+exports.groupBuyLayout = groupBuyLayout;
+var bundleLayout = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _bundleLayout["default"]
+}];
+exports.bundleLayout = bundleLayout;
+var interestLayout = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _interestLayout["default"]
+}];
+exports.interestLayout = interestLayout;
+var merchantSalesLayout = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _merchantSalesLayout["default"]
 }];
-exports.flashDealLayout = flashDealLayout;
+exports.merchantSalesLayout = merchantSalesLayout;

package/lib/utils/businessUtil.js

@@ -284,16 +284,43 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/social-commerce/my-cashback': 'CASHBACK',
         '/account/wallet': 'WEBVIEW',
         '/product/GroupBuy': 'GROUP',
-        '/search-page': 'SEARCH_PAGE'
+        '/search-page': 'SEARCH_PAGE',
+        '/commission': 'COMMISSION'
       };
-      params = {
-        action: 'jump',
-        params: {
-          type: map[link] || name,
-          link: link,
-          url: link
+      var typeTemp = map[link];
+
+      if (!typeTemp) {
+        if (type === _constants.urlTypeMap.FUNCTION_PAGE) {
+          params = {
+            action: 'jump',
+            params: {
+              type: 'WEBVIEW',
+              link: link,
+              url: link
+            }
+          };
+        } else if (!type) {
+          // 直接填的完整外链
+          params = {
+            action: 'jump',
+            params: {
+              type: 'NAVIGATE',
+              link: link,
+              url: link
+            }
+          };
         }
-      };
+      } else {
+        params = {
+          action: 'jump',
+          params: {
+            type: typeTemp || name,
+            link: link,
+            url: link
+          }
+        };
+      }
+
   }
 
   return {
@@ -423,7 +450,8 @@ var parseUrl = function parseUrl(url) {
         '/account/wallet': 'WEBVIEW',
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
-        '/main/my-commission': 'WALLET'
+        '/main/my-commission': 'WALLET',
+        '/commission': 'COMMISSION'
       };
       link = url;
       params = {

package/package.json

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

package/es/assets/images/layout-icon/banner-slide-layout1.svg

@@ -1,6 +0,0 @@
-<svg width="96" height="72" viewBox="0 0 96 72" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="94" height="70" rx="8" fill="#F5F6F7" stroke="#D2D9E5"/>
-<circle cx="48" cy="36" r="6" fill="#C1C9D7"/>
-<circle cx="28" cy="36" r="4" fill="#E6EAF0"/>
-<circle cx="68" cy="36" r="4" fill="#E6EAF0"/>
-</svg>

package/es/assets/images/layout-icon/imageTextLeft.svg

@@ -1,6 +0,0 @@
-<svg width="96" height="68" viewBox="0 0 96 68" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="94" height="66" rx="8" fill="#F5F6F7" stroke="#D2D9E5"/>
-<path d="M53.0322 29H84.0322" stroke="#D2D9E5" stroke-width="4" stroke-linecap="round"/>
-<path d="M53.0322 39H79.0322" stroke="#D2D9E5" stroke-width="4" stroke-linecap="round"/>
-<rect x="11.0322" y="11" width="36" height="46" rx="2" fill="#D2D9E5"/>
-</svg>

package/es/assets/images/layout-icon/imageTextRight.svg

@@ -1,6 +0,0 @@
-<svg width="96" height="68" viewBox="0 0 96 68" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="94" height="66" rx="8" fill="#F5F6F7" stroke="#D2D9E5"/>
-<path d="M11 29H42" stroke="#D2D9E5" stroke-width="4" stroke-linecap="round"/>
-<path d="M11 39H37" stroke="#D2D9E5" stroke-width="4" stroke-linecap="round"/>
-<rect x="48" y="11" width="36" height="46" rx="2" fill="#D2D9E5"/>
-</svg>

package/es/assets/images/layout-icon/layout-imagetext-m3-1.svg

@@ -1,18 +0,0 @@
-<svg width="96" height="68" viewBox="0 0 96 68" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="94" height="66" rx="8" fill="#F5F6F7" stroke="#D2D9E5"/>
-<rect x="6" y="13" width="24" height="42" rx="4" fill="white"/>
-<rect x="6" y="13" width="24" height="42" rx="4" stroke="#D2D9E5"/>
-<rect x="9" y="20" width="18" height="12" rx="2" fill="#D2D9E5"/>
-<path d="M11 39H23" stroke="#D2D9E5" stroke-width="4" stroke-linecap="round"/>
-<path d="M11 46H25" stroke="#D2D9E5" stroke-width="4" stroke-linecap="round"/>
-<rect x="36.0001" y="13" width="24" height="42" rx="4" fill="white"/>
-<rect x="36.0001" y="13" width="24" height="42" rx="4" stroke="#D2D9E5"/>
-<rect x="39.0001" y="20" width="18" height="12" rx="2" fill="#D2D9E5"/>
-<path d="M41.0001 39H53.0001" stroke="#D2D9E5" stroke-width="4" stroke-linecap="round"/>
-<path d="M41.0001 46H55.0001" stroke="#D2D9E5" stroke-width="4" stroke-linecap="round"/>
-<rect x="66.0001" y="13" width="24" height="42" rx="4" fill="white"/>
-<rect x="66.0001" y="13" width="24" height="42" rx="4" stroke="#D2D9E5"/>
-<rect x="69.0001" y="20" width="18" height="12" rx="2" fill="#D2D9E5"/>
-<path d="M71.0001 39H83.0001" stroke="#D2D9E5" stroke-width="4" stroke-linecap="round"/>
-<path d="M71.0001 46H85.0001" stroke="#D2D9E5" stroke-width="4" stroke-linecap="round"/>
-</svg>

package/es/assets/images/layout-icon/layout-imagetext-m3-2.svg

@@ -1,9 +0,0 @@
-<svg width="96" height="68" viewBox="0 0 96 68" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="94" height="66" rx="8" fill="#F5F6F7" stroke="#D2D9E5"/>
-<rect x="42" y="7" width="11" height="11" rx="2" fill="#C1C9D7"/>
-<path d="M42 23H54" stroke="#C1C9D7" stroke-width="4" stroke-linecap="round"/>
-<path d="M38 29H58" stroke="#C1C9D7" stroke-width="4" stroke-linecap="round"/>
-<rect x="42" y="36" width="11" height="11" rx="2" fill="#C1C9D7"/>
-<path d="M42 52H54" stroke="#C1C9D7" stroke-width="4" stroke-linecap="round"/>
-<path d="M38 58H58" stroke="#C1C9D7" stroke-width="4" stroke-linecap="round"/>
-</svg>