@fonixtree/magic-design 2.0.35 → 2.0.37

package/lib/composite-comp/common/config-panels/CustomizeConfig/index.less

@@ -4,15 +4,16 @@
     justify-content: space-between;
     align-items: center;
   }
+
   .selectWrap {
     position: relative;
     display: flex;
-    
+
     .iconNum {
       position: absolute;
       z-index: 9;
       left: 15px;
-      top: 10px;
+      top: 8px;
     }
 
     .cylon-select {

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

@@ -240,12 +240,12 @@ var LAYOUT_IMAGE_SIZE = {
     h: ''
   },
   layout4: {
-    w: 96,
-    h: 96
+    w: 152,
+    h: 152
   },
   layout5: {
-    w: 110,
-    h: 110
+    w: 152,
+    h: 152
   }
 };
 
@@ -616,20 +616,21 @@ function (_super) {
     })) : /*#__PURE__*/_react["default"].createElement("div", {
       key: "scrollContainer",
       className: (0, _classnames["default"])('scrollContainer', {
-        pl_100: layout === 'layout5'
+        pl_140: layout === 'layout5'
       })
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "scrollProductList"
     }, products.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "productCard"
+        className: "productCardRow"
       }, /*#__PURE__*/_react["default"].createElement(_AffiliateProductItem["default"], {
         key: "scroll_" + item.productId,
+        customFont: true,
         data: item,
         fixHeight: true,
-        imgHeight: imgHeight,
-        imgWidth: imgWidth // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
+        imgHeight: imgHeight // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
         ,
+        imgWidth: imgWidth,
         onItemClick: function onItemClick() {
           /** PTO 定制GA */
           if (window.magicDesign.pushGA) {

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

@@ -56,8 +56,8 @@
   overflow-x: auto;
   padding-bottom: 0.3rem;
 }
-.m-recommend-mobile .scrollContainer.pl_100 {
-  padding-left: 2rem;
+.m-recommend-mobile .scrollContainer.pl_140 {
+  padding-left: 2.8rem;
 }
 .m-recommend-mobile .scrollContainer .scrollProductList {
   display: flex;
@@ -67,6 +67,9 @@
 .m-recommend-mobile .scrollContainer .scrollProductList .productCard {
   margin-right: 0.24rem;
 }
+.m-recommend-mobile .scrollContainer .scrollProductList .productCardRow {
+  margin-right: 0.16rem;
+}
 .m-recommend-mobile .btnSeeAll {
   display: block;
   width: fit-content;

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

@@ -115,7 +115,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
           data: data.customize,
           isHideAlign: true,
-          layoutSource: (0, _coreUtil.isPc)() ? _layout.recommendLayoutPc : _layout.recommendLayoutMobile,
+          layoutSource: (0, _coreUtil.isPc)() ? _layout.affiliateLayoutPc : _layout.affiliateLayoutMobile,
           selectedLayoutFun: function selectedLayoutFun(v) {
             _this.getLayout(v);
           }

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.mobileNavigationLayout = exports.locationLayout = exports.imageTextLayoutPc = exports.imageTextLayoutMobile = exports.imageGalleryLayout = exports.dividerLayout = exports.carouselLayout = exports.WalletLayout = void 0;
+exports.videoPCLayout = exports.videoH5Layout = exports.searchLayout = exports.recommendLayoutPc = exports.recommendLayoutMobile = exports.pcNavigationLayout = exports.newsletterLayout = exports.mobileNavigationLayout = exports.locationLayout = exports.imageTextLayoutPc = exports.imageTextLayoutMobile = exports.imageGalleryLayout = exports.dividerLayout = exports.carouselLayout = exports.affiliateLayoutPc = exports.affiliateLayoutMobile = exports.WalletLayout = void 0;
 
 var _dividerLayout = _interopRequireDefault(require("../assets/images/layout-icon/dividerLayout.svg"));
 
@@ -15,6 +15,8 @@ var _imageGalleryLayout2 = _interopRequireDefault(require("../assets/images/layo
 
 var _walletLayout = _interopRequireDefault(require("../assets/images/layout-icon/walletLayout1.png"));
 
+var _walletLayout2 = _interopRequireDefault(require("../assets/images/layout-icon/walletLayout2.png"));
+
 var _layoutImagetextM = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-m1-1.png"));
 
 var _layoutImagetextM2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-m1-2.png"));
@@ -112,6 +114,10 @@ var WalletLayout = [{
   id: 'layout1',
   name: 'layout1',
   image: _walletLayout["default"]
+}, {
+  id: 'layout2',
+  name: 'layout2',
+  image: _walletLayout2["default"]
 }];
 exports.WalletLayout = WalletLayout;
 var carouselLayout = [{
@@ -214,6 +220,39 @@ var recommendLayoutPc = [{
   image: _layoutRecommend5["default"]
 }];
 exports.recommendLayoutPc = recommendLayoutPc;
+var affiliateLayoutMobile = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _layoutRecommend["default"]
+}, {
+  id: 'layout2',
+  name: 'layout2',
+  image: _layoutRecommend2["default"]
+}, // { id: 'layout3', name: 'layout3', image: recommendLayout3 },
+{
+  id: 'layout4',
+  name: 'layout4',
+  image: _layoutRecommend4["default"]
+}, {
+  id: 'layout5',
+  name: 'layout5',
+  image: _layoutRecommend5["default"]
+}];
+exports.affiliateLayoutMobile = affiliateLayoutMobile;
+var affiliateLayoutPc = [{
+  id: 'layout1',
+  name: 'layout1',
+  image: _layoutRecommend3["default"]
+}, {
+  id: 'layout2',
+  name: 'layout2',
+  image: _layoutRecommend4["default"]
+}, {
+  id: 'layout3',
+  name: 'layout3',
+  image: _layoutRecommend5["default"]
+}];
+exports.affiliateLayoutPc = affiliateLayoutPc;
 var videoPCLayout = [{
   id: 'layout1',
   name: 'layout1',

package/lib/core/Designer/ConfigPanel/index.js

@@ -81,7 +81,6 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
 
   switch (selectedNode.type) {
     case 'IMAGE_GALLERY':
-    case 'WALLET':
     case 'BANNER':
       groupName = ''; // if (!groupName) {
       //   groupName = isPc() ? panelProps.image?.content?.pcName : panelProps.image?.content?.h5Name;
@@ -109,6 +108,7 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
       break;
 
     case 'TEXT':
+    case 'WALLET':
       groupName = panelProps.title.text;
       break;
 

package/lib/locale/en/en.json

@@ -1,4 +1,5 @@
 {
+  "PEEK": "Peek",
   "ADDRESS": "Address",
   "LOCATION_LOGO": "Location Logo",
   "MESSAGE_ICON": "Message icon",

package/lib/locale/es/es.json

@@ -1,4 +1,5 @@
 {
+  "PEEK": "Peek",
   "ADDRESS": "Address",
   "LOCATION_LOGO": "Location Logo",
   "MESSAGE_ICON": "Message icon",

package/lib/locale/id/id.json

@@ -1,4 +1,5 @@
 {
+  "PEEK": "Peek",
   "ADDRESS": "Address",
   "LOCATION_LOGO": "Location Logo",
   "MESSAGE_ICON": "Message icon",

package/lib/utils/currencyUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.numberToFixed = exports.getPricePrefix = exports.getPrecision = exports.formatCurrencyWithSymbol = exports.formatCurrency = exports.formatBackendCurrency = exports.currencyToFont = exports.calcFloatCount = exports.addSeparators = void 0;
+exports.numberToFixed = exports.getPricePrefix = exports.getPrecision = exports.formatCurrencyWithSymbolNotSpace = exports.formatCurrencyWithSymbol = exports.formatCurrency = exports.formatBackendCurrency = exports.currencyToFont = exports.calcFloatCount = exports.addSeparators = void 0;
 
 var _divide = _interopRequireDefault(require("lodash/divide"));
 
@@ -105,6 +105,13 @@ var formatCurrencyWithSymbol = function formatCurrencyWithSymbol(num) {
   var ret = formatCurrency(num);
   return getPricePrefix() + " " + ret;
 };
+
+exports.formatCurrencyWithSymbol = formatCurrencyWithSymbol;
+
+var formatCurrencyWithSymbolNotSpace = function formatCurrencyWithSymbolNotSpace(num) {
+  var ret = formatCurrency(num);
+  return "" + getPricePrefix() + ret;
+};
 /**
  * TODO 未兼容科学计数法（小数点后7位）
  * 计算浮点位数
@@ -113,7 +120,7 @@ var formatCurrencyWithSymbol = function formatCurrencyWithSymbol(num) {
  */
 
 
-exports.formatCurrencyWithSymbol = formatCurrencyWithSymbol;
+exports.formatCurrencyWithSymbolNotSpace = formatCurrencyWithSymbolNotSpace;
 
 var calcFloatCount = function calcFloatCount(number) {
   var numbString = String(number);

package/package.json

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