jufubao-mall 2.0.90-beta21 → 2.0.90-beta22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.90-beta21",
+  "version": "2.0.90-beta22",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallMarketNew/JfbMallMarketNew.vue

@@ -1,7 +1,7 @@
 <template>
   <view
     class="jfb-mall-market-new"
-    v-if="hasProductData || isEditx"
+    v-if="hasProductData"
     @click="handleEditxSelect"
     :class="{ editx : isEditx && active }"
   >
@@ -61,7 +61,7 @@
             show-scrollbar="false"
             style="display:flex"
           >
-            <view class="jfb-mall-market-new__body-scroll-content" :style="[{ '--columns': v1_productColumns }, v1ScrollContentWidth]">
+            <view class="jfb-mall-market-new__body-scroll-content" :style="[{ '--columns': Number(v1_productColumns) || 2 }, v1ScrollContentWidth]">
               <!-- 商品项 -->
               <view 
                 v-for="(item, index) in prodList.slice(0, displayProductCount)" 
@@ -284,7 +284,7 @@
             <!-- 左侧商品 -->
             <view :class="['jfb-mall-market-new__body-products-product-container', v2_left_productLayout === 'upDown' ? 'jfb-mall-market-new__body-products-product-container--horizontal' : 'jfb-mall-market-new__body-products-product-container--vertical']">
               <view 
-                v-for="(item, index) in prodList.slice(0, v2_productNumber === '1' ? 1 : 2)" 
+                v-for="(item, index) in prodList.filter(i => i.region === 'v2_left').slice(0, v2_productNumber === '1' ? 1 : 2)"
                 :key="'left-' + index" 
                 :class="['jfb-mall-market-new__body-product', {
                   'jfb-mall-market-new__body-product--v2-horizontal': v2_left_productLayout === 'leftRight',
@@ -325,7 +325,7 @@
                   </button>
                 </view>
               </view>
-              <view style="flex:1" v-if="prodList.slice(0, v2_productNumber === '1' ? 1 : 2).length===1"></view>
+              <view style="flex:1" v-if="prodList.filter(i => i.region === 'v2_left').slice(0, v2_productNumber === '1' ? 1 : 2).length===1"></view>
             </view>
           </view>
           
@@ -382,7 +382,7 @@
             <!-- 右侧商品 -->
             <view :class="['jfb-mall-market-new__body-products-product-container', v2_right_productLayout === 'upDown' ? 'jfb-mall-market-new__body-products-product-container--horizontal' : 'jfb-mall-market-new__body-products-product-container--vertical']">
               <view 
-                v-for="(item, index) in prodList.slice(v2_productNumber === '1' ? 1 : 2, v2_productNumber === '1' ? 2 : 4)" 
+                v-for="(item, index) in prodList.filter(i => i.region === 'v2_right').slice(0, v2_productNumber === '1' ? 1 : 2)"
                 :key="'right-' + index" 
                 :class="['jfb-mall-market-new__body-product', {
                   'jfb-mall-market-new__body-product--v2-horizontal': v2_right_productLayout === 'leftRight',
@@ -423,7 +423,7 @@
                   </button>
                 </view>
               </view>
-              <view style="flex:1" v-if="prodList.slice(v2_productNumber === '1' ? 1 : 2, v2_productNumber === '1' ? 2 : 4).length===1"></view>
+              <view style="flex:1" v-if="prodList.filter(i => i.region === 'v2_right').slice(0, v2_productNumber === '1' ? 1 : 2).length===1"></view>
             </view>
           </view>
         </view>
@@ -471,8 +471,8 @@
               ></Title>
             </template>
             <view 
-              v-for="(item, index) in prodList.slice(0, 1)" 
-              :key="'left-' + index" 
+              v-for="(item, index) in prodList.filter(i => i.region === 'v3_left').slice(0, 1)"
+              :key="'left-' + index"
               :class="['jfb-mall-market-new__body-product', 'jfb-mall-market-new__body-product--v3-vertical','align-center']"
               :style="[{
                 padding: productPadding ? (typeof productPadding === 'object' ? `${productPadding.top}rpx ${productPadding.right}rpx ${productPadding.bottom}rpx ${productPadding.left}rpx` : `${productPadding}rpx`) : '20rpx',
@@ -500,7 +500,7 @@
                 </template>
               </button>
             </view>
-            <view style="flex:1" v-if="prodList.slice(0, 1).length===1"></view>
+            <view style="flex:1" v-if="prodList.filter(i => i.region === 'v3_left').slice(0, 1).length===1"></view>
           </view>
           
           <!-- 中间商品区域 -->
@@ -536,8 +536,8 @@
             </template>
             <!-- 中间商品 -->
             <view 
-              v-for="(item, index) in prodList.slice(1, 2)" 
-              :key="'center-' + index" 
+              v-for="(item, index) in prodList.filter(i => i.region === 'v3_center').slice(0, 1)"
+              :key="'center-' + index"
               :class="['jfb-mall-market-new__body-product', 'jfb-mall-market-new__body-product--v3-vertical','align-center']"
               :style="[{
                 padding: productPadding ? (typeof productPadding === 'object' ? `${productPadding.top}rpx ${productPadding.right}rpx ${productPadding.bottom}rpx ${productPadding.left}rpx` : `${productPadding}rpx`) : '20rpx',
@@ -565,7 +565,7 @@
                 </template>
               </button>
             </view>
-            <view style="flex:1" v-if="prodList.slice(1, 2).length===1"></view>
+            <view style="flex:1" v-if="prodList.filter(i => i.region === 'v3_center').slice(0, 1).length===1"></view>
           </view>
           
           <!-- 右侧商品区域 -->
@@ -601,8 +601,8 @@
             </template>
             <!-- 右侧商品 -->
             <view 
-              v-for="(item, index) in prodList.slice(2, 3)" 
-              :key="'right-' + index" 
+              v-for="(item, index) in prodList.filter(i => i.region === 'v3_right').slice(0, 1)"
+              :key="'right-' + index"
               :class="['jfb-mall-market-new__body-product', 'jfb-mall-market-new__body-product--v3-vertical','align-center']"
               :style="[{
                 padding: productPadding ? (typeof productPadding === 'object' ? `${productPadding.top}rpx ${productPadding.right}rpx ${productPadding.bottom}rpx ${productPadding.left}rpx` : `${productPadding}rpx`) : '20rpx',
@@ -630,7 +630,7 @@
                 </template>
               </button>
             </view>
-            <view style="flex:1" v-if="prodList.slice(2, 3).length===1"></view>
+            <view style="flex:1" v-if="prodList.filter(i => i.region === 'v3_right').slice(0, 1).length===1"></view>
           </view>
         </view>
       </template>
@@ -1744,6 +1744,7 @@
         page_token:'1',
         loadingList:false,
         prodList: [],
+        isPreview: false,
         timer: null,  
         isAlgin: 'C',
         styleLayout:'v1',
@@ -1779,6 +1780,7 @@
         v1_category_ids:[],
         v1_marketType:[],
         v1_isPlatformTags:[],
+        v1_productLink:'',
         //商品展示内容
         showProductName:'Y',
         showBrand:'N',
@@ -1808,7 +1810,7 @@
         v2_left_category_ids:[],
         v2_left_marketType:[],
         v2_left_isPlatformTags:[],
-        // v2_left_productLink:'',
+        v2_left_productLink:'',
         // 右侧区域配置
         v2_right_is_title:'Y',
         v2_right_titleName:'排行榜单',
@@ -1822,7 +1824,7 @@
         v2_right_category_ids:[],
         v2_right_marketType:[],
         v2_right_isPlatformTags:[],
-        // v2_right_productLink:'',
+        v2_right_productLink:'',
         // 布局4属性
         v4_rowGapStatus: 'D',
         v4_rowGap: 16,
@@ -1839,7 +1841,7 @@
         v4_header_category_ids:[],
         v4_header_marketType:[],
         v4_header_isPlatformTags:[],
-        // v4_header_productLink:'',
+        v4_header_productLink:'',
         // 左下区域配置
         v4_left_is_title:'Y',
         v4_left_titleName:'新品推荐',
@@ -1852,7 +1854,7 @@
         v4_left_category_ids:[],
         v4_left_marketType:[],
         v4_left_isPlatformTags:[],
-        // v4_left_productLink:'',
+        v4_left_productLink:'',
         // 右下区域配置
         v4_right_is_title:'Y',
         v4_right_titleName:'品牌特惠',
@@ -1865,7 +1867,7 @@
         v4_right_category_ids:[],
         v4_right_marketType:[],
         v4_right_isPlatformTags:[],
-        // v4_right_productLink:'',
+        v4_right_productLink:'',
         // 区域选择属性
         areaSelect:[],
         area:'left',
@@ -2019,7 +2021,7 @@
         v3_left_category_ids: [],
         v3_left_marketType: [],
         v3_left_isPlatformTags: [],
-        // v3_left_productLink: '',
+        v3_left_productLink: '',
         // 中间区域内容配置
         v3_center_is_title: 'Y',
         v3_center_titleName: '大牌推荐',
@@ -2032,7 +2034,7 @@
         v3_center_category_ids: [],
         v3_center_marketType: [],
         v3_center_isPlatformTags: [],
-        // v3_center_productLink: '',
+        v3_center_productLink: '',
         // 右侧区域内容配置
         v3_right_is_title: 'Y',
         v3_right_titleName: '今日爆款',
@@ -2045,7 +2047,7 @@
         v3_right_category_ids: [],
         v3_right_marketType: [],
         v3_right_isPlatformTags: [],
-        // v3_right_productLink: '',
+        v3_right_productLink: '',
 
         // 布局4属性
         v4_rowGapStatus: 'D',
@@ -2465,7 +2467,7 @@
       // 商品链接
       productLink() {
         switch(this.styleLayout) {
-          /* case 'v1':
+          case 'v1':
             return this.v1_productLink;
           case 'v2':
             // 布局2根据当前选中的区域返回对应的商品链接
@@ -2500,7 +2502,7 @@
                 return this.v4_right_productLink;
               default:
                 return '';
-            } */
+            }
           case 'v5':
             // 布局5根据当前选中的区域返回对应的商品链接
             switch(this.v5_area) {
@@ -2523,7 +2525,7 @@
       },
       // 计算容器样式
       containerStyle() {
-        const paddingDefault = this.styleLayout === 'v1' ? 32 : this.styleLayout === 'v2' ? 0 : 16;
+        const paddingDefault = this.styleLayout === 'v1' ? 32 : this.styleLayout === 'v2' ? 0 : this.styleLayout === 'v5' ? 0 : 16;
         return {
           'margin': this.getMarginAndPadding(this.margin, 16),
           'padding': this.getMarginAndPadding(this.padding, paddingDefault),
@@ -2541,14 +2543,14 @@
       displayProductCount() {
         return this.v1_showEffect === 2 ? Number(this.v1_slideNumber) : Number(this.v1_productColumns);
       },
-      // 计算布局1滚动内容宽度
+      // 计算布局1滚动内容宽度（每个商品占 1/(columns+0.5)，使最后一个商品露出半个提示可滑动）
       v1ScrollContentWidth() {
-        const count = Number(this.v1_slideNumber) || 4;
         const columns = Number(this.v1_productColumns) || 2;
+        const count = Number(this.v1_slideNumber) || columns * 2;
         return {
-          width:(count / columns) * 100 + '%',
-          flex:1,
-          minWidth:0
+          width: (count / (columns + 0.5)) * 100 + '%',
+          flex: 1,
+          minWidth: 0
         }
       },
       // 计算布局1内容区样式
@@ -2610,6 +2612,7 @@
           'jfb-mall-market-new__body-product--image-left': this.v1_productImagePosition === 'left',
           'jfb-mall-market-new__body-product--image-right': this.v1_productImagePosition === 'right',
           'jfb-mall-market-new__body-product-v1':true,
+          'jfb-mall-market-new__body-product--v1-scroll': this.v1_showEffect === 2,
         };
       },
       // 计算商品项样式对象
@@ -2895,6 +2898,7 @@
     },
     created() {
       console.log('[price] created() calling init');
+      this.isPreview = this.$configProject.isPreview;
       this.init(this.container);
       this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
     },
@@ -3022,6 +3026,11 @@
       
         this.titleBg = gCPVal(container, 'titleBg', { url: '' }, { sKey: 'titleStyleStatus', fields: ['titleBg'] }).url;
         this.styleLayout = gCPVal(container, 'styleLayout', 'v1');
+        // v5 常规外边距默认 上0 下16 左16 右16，内边距默认 0
+        if (this.styleLayout === 'v5') {
+          this.margin = gCPVal(container, 'margin', [{ top: 0, left: 16, right: 16, bottom: 16 }], { sKey: 'marginStatus', fields: ['margin'], isPMR: true });
+          this.padding = gCPVal(container, 'padding', [{ top: 0, left: 0, right: 0, bottom: 0 }], { sKey: 'paddingStatus', fields: ['padding'], isPMR: true });
+        }
         // 各布局默认对齐：v1/v4 左对齐，v2/v5/v7 两边对齐，v3 居中
         const defaultAlignMap = { v1: 'L', v2: 'S', v3: 'C', v4: 'L', v5: 'S', v7: 'S' };
         const defaultAlign = defaultAlignMap[this.styleLayout] || 'C';
@@ -3038,7 +3047,10 @@
         this.v1_productColumns = gCPVal(container, 'v1_productColumns', '4');
         this.v1_productImagePosition = gCPVal(container, 'v1_productImagePosition', 'left');
         this.v1_showEffect = gCPVal(container, 'v1_showEffect', 1);
-        this.v1_slideNumber = gCPVal(container, 'v1_slideNumber', '4');
+        // 滑块数量默认为商品列数的两倍；若已存值等于任一列数的默认两倍（4/6/8），则视为默认值跟随当前列数
+        const v1StoredSlideNumber = gCPVal(container, 'v1_slideNumber', '');
+        const v1IsDefaultSlide = v1StoredSlideNumber === '' || ['4', '6', '8'].includes(String(v1StoredSlideNumber));
+        this.v1_slideNumber = v1IsDefaultSlide ? String(Number(this.v1_productColumns) * 2) : v1StoredSlideNumber;
         // 布局2属性
         this.blockProductCount = gCPVal(container, 'blockProductCount', '2');
         this.v2_productNumber = gCPVal(container, 'v2_productNumber', '1');
@@ -3052,11 +3064,11 @@
         this.v2_left_isMore = gCPVal(container, 'v2_left_isMore', 'N');
         this.v2_left_moreName = gCPVal(container, 'v2_left_moreName', '更多');
         this.v2_left_morePath = gCPVal(container, 'v2_left_morePath', {value: ''}).value;
-        this.v2_left_xnamespace = gCPVal(container, 'v2_left_xnamespace', this.projectAttr.business_code);
+        this.v2_left_xnamespace = gCPVal(container, 'v2_left_xnamespace', this.projectAttr.business_code||this.v2_left_xnamespace);
         this.v2_left_category_ids = gCPVal(container, 'v2_left_category_ids', []);
         this.v2_left_marketType = gCPVal(container, 'v2_left_marketType', []);
         this.v2_left_isPlatformTags = gCPVal(container, 'v2_left_isPlatformTags', []);
-        // this.v2_left_productLink = gCPVal(container, 'v2_left_productLink', '');
+        this.v2_left_productLink = gCPVal(container, 'v2_left_productLink', '');
         // 右侧区域配置
         this.v2_right_is_title = gCPVal(container, 'v2_right_is_title', 'Y');
         this.v2_right_titleName = gCPVal(container, 'v2_right_titleName', '排行榜单');
@@ -3065,11 +3077,11 @@
         this.v2_right_isMore = gCPVal(container, 'v2_right_isMore', 'N');
         this.v2_right_moreName = gCPVal(container, 'v2_right_moreName', '更多');
         this.v2_right_morePath = gCPVal(container, 'v2_right_morePath', {value: ''}).value;
-        this.v2_right_xnamespace = gCPVal(container, 'v2_right_xnamespace', this.projectAttr.business_code);
+        this.v2_right_xnamespace = gCPVal(container, 'v2_right_xnamespace', this.projectAttr.business_code||this.v2_right_xnamespace);
         this.v2_right_category_ids = gCPVal(container, 'v2_right_category_ids', []);
         this.v2_right_marketType = gCPVal(container, 'v2_right_marketType', []);
         this.v2_right_isPlatformTags = gCPVal(container, 'v2_right_isPlatformTags', []);
-        // this.v2_right_productLink = gCPVal(container, 'v2_right_productLink', '');
+        this.v2_right_productLink = gCPVal(container, 'v2_right_productLink', '');
         // 布局4属性
         this.v4_rowGap = gCPVal(container, 'v4_rowGap', 16, {sKey:'v4_rowGapStatus', fields:['v4_rowGap']});
         this.v4_columnGap = gCPVal(container, 'v4_columnGap', 12, {sKey:'v4_columnGapStatus', fields:['v4_columnGap']});
@@ -3081,11 +3093,11 @@
         this.v4_header_isMore = gCPVal(container, 'v4_header_isMore', 'Y');
         this.v4_header_moreName = gCPVal(container, 'v4_header_moreName', '更多');
         this.v4_header_morePath = gCPVal(container, 'v4_header_morePath', {value: ''}).value;
-        this.v4_header_xnamespace = gCPVal(container, 'v4_header_xnamespace', this.projectAttr.business_code);
+        this.v4_header_xnamespace = gCPVal(container, 'v4_header_xnamespace', this.projectAttr.business_code||this.v4_header_xnamespace);
         this.v4_header_category_ids = gCPVal(container, 'v4_header_category_ids', []);
         this.v4_header_marketType = gCPVal(container, 'v4_header_marketType', []);
         this.v4_header_isPlatformTags = gCPVal(container, 'v4_header_isPlatformTags', []);
-        // this.v4_header_productLink = gCPVal(container, 'v4_header_productLink', '');
+        this.v4_header_productLink = gCPVal(container, 'v4_header_productLink', '');
         // 左下区域配置
         this.v4_left_is_title = gCPVal(container, 'v4_left_is_title', 'Y');
         this.v4_left_titleName = gCPVal(container, 'v4_left_titleName', '新品推荐');
@@ -3094,11 +3106,11 @@
         this.v4_left_isMore = gCPVal(container, 'v4_left_isMore', 'N');
         this.v4_left_moreName = gCPVal(container, 'v4_left_moreName', '更多');
         this.v4_left_morePath = gCPVal(container, 'v4_left_morePath', {value: ''}).value;
-        this.v4_left_xnamespace = gCPVal(container, 'v4_left_xnamespace', this.projectAttr.business_code);
+        this.v4_left_xnamespace = gCPVal(container, 'v4_left_xnamespace', this.projectAttr.business_code||this.v4_left_xnamespace);
         this.v4_left_category_ids = gCPVal(container, 'v4_left_category_ids', []);
         this.v4_left_marketType = gCPVal(container, 'v4_left_marketType', []);
         this.v4_left_isPlatformTags = gCPVal(container, 'v4_left_isPlatformTags', []);
-        // this.v4_left_productLink = gCPVal(container, 'v4_left_productLink', '');
+        this.v4_left_productLink = gCPVal(container, 'v4_left_productLink', '');
         // 右下区域配置
         this.v4_right_is_title = gCPVal(container, 'v4_right_is_title', 'Y');
         this.v4_right_titleName = gCPVal(container, 'v4_right_titleName', '品牌特惠');
@@ -3107,11 +3119,11 @@
         this.v4_right_isMore = gCPVal(container, 'v4_right_isMore', 'N');
         this.v4_right_moreName = gCPVal(container, 'v4_right_moreName', '更多');
         this.v4_right_morePath = gCPVal(container, 'v4_right_morePath', {value: ''}).value;
-        this.v4_right_xnamespace = gCPVal(container, 'v4_right_xnamespace', this.projectAttr.business_code);
+        this.v4_right_xnamespace = gCPVal(container, 'v4_right_xnamespace', this.projectAttr.business_code||this.v4_right_xnamespace);
         this.v4_right_category_ids = gCPVal(container, 'v4_right_category_ids', []);
         this.v4_right_marketType = gCPVal(container, 'v4_right_marketType', []);
         this.v4_right_isPlatformTags = gCPVal(container, 'v4_right_isPlatformTags', []);
-        // this.v4_right_productLink = gCPVal(container, 'v4_right_productLink', '');
+        this.v4_right_productLink = gCPVal(container, 'v4_right_productLink', '');
         // 区域选择属性
         this.areaSelect = gCPVal(container, 'areaSelect', []);
         this.area = gCPVal(container, 'area', 'left');
@@ -3131,11 +3143,12 @@
         this.v1_morePath = gCPVal(container, 'v1_morePath', {value: ''}).value;
         console.log(this.v1_morePath,'v1_morePath')
           //内容配置
-        this.v1_xnamespace = gCPVal(container, 'v1_xnamespace', this.projectAttr.business_code);
+        this.v1_xnamespace = gCPVal(container, 'v1_xnamespace', this.projectAttr.business_code||this.v1_xnamespace);
         this.v1_category_ids = gCPVal(container, 'v1_category_ids', []);
         console.log(this.v1_category_ids,'v1_category_ids')
         this.v1_marketType = gCPVal(container, 'v1_marketType', []);
         this.v1_isPlatformTags = gCPVal(container, 'v1_isPlatformTags', []);
+        this.v1_productLink = gCPVal(container, 'v1_productLink', '');
         //商品展示内容
         this.showProductName = gCPVal(container, 'showProductName', 'Y');
         this.showBrand = gCPVal(container, 'showBrand', this.styleLayout === 'v6' ? 'N' : 'N');
@@ -3258,7 +3271,7 @@
         this.left_titleMargin = gCPVal(container, 'left_titleMargin', [{ top: 0, left: 0, right: 0, bottom: 0 }], {sKey:'left_titleMarginStatus', fields:['left_titleMargin'], isPMR: true});
         
         // 左侧区域 - 标题背景
-        this.left_titleBgColor = gCPVal(container, 'left_titleBgColor', '#ffffff', {sKey:'left_titleBgStatus', fields:['left_titleBgColor']});
+        this.left_titleBgColor = gCPVal(container, 'left_titleBgColor', '', {sKey:'left_titleBgStatus', fields:['left_titleBgColor']});
         this.left_titleBgImage = gCPVal(container, 'left_titleBgImage', {}, {sKey:'left_titleBgStatus', fields:['left_titleBgImage']}).url;
         
         // 左侧区域 - 标题描边
@@ -3552,11 +3565,11 @@
         this.v3_left_isMore = gCPVal(container, 'v3_left_isMore', 'N');
         this.v3_left_morePath = gCPVal(container, 'v3_left_morePath', {value: ''}).value;
         this.v3_left_moreName = gCPVal(container, 'v3_left_moreName', '更多');
-        this.v3_left_xnamespace = gCPVal(container, 'v3_left_xnamespace', this.projectAttr.business_code);
+        this.v3_left_xnamespace = gCPVal(container, 'v3_left_xnamespace', this.projectAttr.business_code||this.v3_left_xnamespace);
         this.v3_left_category_ids = gCPVal(container, 'v3_left_category_ids', []);
         this.v3_left_marketType = gCPVal(container, 'v3_left_marketType', []);
         this.v3_left_isPlatformTags = gCPVal(container, 'v3_left_isPlatformTags', []);
-        // this.v3_left_productLink = gCPVal(container, 'v3_left_productLink', '');
+        this.v3_left_productLink = gCPVal(container, 'v3_left_productLink', '');
         
         // 中间区域内容配置
         this.v3_center_is_title = gCPVal(container, 'v3_center_is_title', 'Y');
@@ -3566,11 +3579,11 @@
         this.v3_center_isMore = gCPVal(container, 'v3_center_isMore', 'N');
         this.v3_center_morePath = gCPVal(container, 'v3_center_morePath', {value: ''}).value;
         this.v3_center_moreName = gCPVal(container, 'v3_center_moreName', '更多');
-        this.v3_center_xnamespace = gCPVal(container, 'v3_center_xnamespace', this.projectAttr.business_code);
+        this.v3_center_xnamespace = gCPVal(container, 'v3_center_xnamespace', this.projectAttr.business_code||this.v3_center_xnamespace);
         this.v3_center_category_ids = gCPVal(container, 'v3_center_category_ids', []);
         this.v3_center_marketType = gCPVal(container, 'v3_center_marketType', []);
         this.v3_center_isPlatformTags = gCPVal(container, 'v3_center_isPlatformTags', []);
-        // this.v3_center_productLink = gCPVal(container, 'v3_center_productLink', '');
+        this.v3_center_productLink = gCPVal(container, 'v3_center_productLink', '');
         
         // 右侧区域内容配置
         this.v3_right_is_title = gCPVal(container, 'v3_right_is_title', 'Y');
@@ -3580,11 +3593,11 @@
         this.v3_right_isMore = gCPVal(container, 'v3_right_isMore', 'N');
         this.v3_right_morePath = gCPVal(container, 'v3_right_morePath', {value: ''}).value;
         this.v3_right_moreName = gCPVal(container, 'v3_right_moreName', '更多');
-        this.v3_right_xnamespace = gCPVal(container, 'v3_right_xnamespace', this.projectAttr.business_code);
+        this.v3_right_xnamespace = gCPVal(container, 'v3_right_xnamespace', this.projectAttr.business_code||this.v3_right_xnamespace);
         this.v3_right_category_ids = gCPVal(container, 'v3_right_category_ids', []);
         this.v3_right_marketType = gCPVal(container, 'v3_right_marketType', []);
         this.v3_right_isPlatformTags = gCPVal(container, 'v3_right_isPlatformTags', []);
-        // this.v3_right_productLink = gCPVal(container, 'v3_right_productLink', '');
+        this.v3_right_productLink = gCPVal(container, 'v3_right_productLink', '');
         
         // 布局4属性
         if (this.styleLayout === 'v4') {
@@ -3603,7 +3616,7 @@
         this.v4_header_isMore = gCPVal(container, 'v4_header_isMore', 'Y');
         this.v4_header_moreName = gCPVal(container, 'v4_header_moreName', '更多');
         this.v4_header_morePath = gCPVal(container, 'v4_header_morePath', {value: ''}).value;
-        this.v4_header_xnamespace = gCPVal(container, 'v4_header_xnamespace', this.projectAttr.business_code);
+        this.v4_header_xnamespace = gCPVal(container, 'v4_header_xnamespace', this.projectAttr.business_code||this.v4_header_xnamespace);
         this.v4_header_category_ids = gCPVal(container, 'v4_header_category_ids', []);
         this.v4_header_marketType = gCPVal(container, 'v4_header_marketType', []);
         this.v4_header_isPlatformTags = gCPVal(container, 'v4_header_isPlatformTags', []);
@@ -3616,7 +3629,7 @@
         this.v4_left_isMore = gCPVal(container, 'v4_left_isMore', 'N');
         this.v4_left_moreName = gCPVal(container, 'v4_left_moreName', '更多');
         this.v4_left_morePath = gCPVal(container, 'v4_left_morePath', {value: ''}).value;
-        this.v4_left_xnamespace = gCPVal(container, 'v4_left_xnamespace', this.projectAttr.business_code);
+        this.v4_left_xnamespace = gCPVal(container, 'v4_left_xnamespace', this.projectAttr.business_code||this.v4_left_xnamespace);
         this.v4_left_category_ids = gCPVal(container, 'v4_left_category_ids', []);
         this.v4_left_marketType = gCPVal(container, 'v4_left_marketType', []);
         this.v4_left_isPlatformTags = gCPVal(container, 'v4_left_isPlatformTags', []);
@@ -3629,7 +3642,7 @@
         this.v4_right_isMore = gCPVal(container, 'v4_right_isMore', 'N');
         this.v4_right_moreName = gCPVal(container, 'v4_right_moreName', '更多');
         this.v4_right_morePath = gCPVal(container, 'v4_right_morePath', {value: ''}).value;
-        this.v4_right_xnamespace = gCPVal(container, 'v4_right_xnamespace', this.projectAttr.business_code);
+        this.v4_right_xnamespace = gCPVal(container, 'v4_right_xnamespace', this.projectAttr.business_code||this.v4_right_xnamespace);
         this.v4_right_category_ids = gCPVal(container, 'v4_right_category_ids', []);
         this.v4_right_marketType = gCPVal(container, 'v4_right_marketType', []);
         this.v4_right_isPlatformTags = gCPVal(container, 'v4_right_isPlatformTags', []);
@@ -3653,7 +3666,7 @@
           { fontSize: '24rpx', color: '#ffffff', fontWeight: 'normal', textAlign: 'left' }
         );
         this.v4_header_titleMargin = gCPVal(container, 'v4_header_titleMargin', [{ top: 0, left: 0, right: 0, bottom: 12 }], {sKey:'v4_header_titleMarginStatus', fields:['v4_header_titleMargin'], isPMR: true});
-        this.v4_header_titleBgColor = gCPVal(container, 'v4_header_titleBgColor', '#ffffff', {sKey:'v4_header_titleBgStatus', fields:['v4_header_titleBgColor', 'v4_header_titleBgImage']});
+        this.v4_header_titleBgColor = gCPVal(container, 'v4_header_titleBgColor', '', {sKey:'v4_header_titleBgStatus', fields:['v4_header_titleBgColor', 'v4_header_titleBgImage']});
         this.v4_header_titleBgImage = gCPVal(container, 'v4_header_titleBgImage', {}, {sKey:'v4_header_titleBgStatus', fields:['v4_header_titleBgColor', 'v4_header_titleBgImage']}).url;
         this.v4_header_titleBorder = gCPVal(container, 'v4_header_titleBorder', [{color: '#e5e5e5',width: 0,style: 'solid'}], {isBorder: true, bsOld:['is_border','is_border_w','is_border_c'], cusFields: ['v4_header_titleBorder']});
         this.v4_header_titleShadow = gCPVal(container, 'v4_header_titleShadow', [{width:20, color:'rgba(0,0,0,0)'},'none'], {isShadow:true, bsOld:['is_shadow','is_shadow_w','is_shadow_bg']});
@@ -3686,7 +3699,7 @@
           { fontSize: '24rpx', color: '#A4625D', fontWeight: 'normal', textAlign: 'left' }
         );
         this.v4_left_titleMargin = gCPVal(container, 'v4_left_titleMargin', [{ top: 0, left: 0, right: 0, bottom: 12 }], {sKey:'v4_left_titleMarginStatus', fields:['v4_left_titleMargin'], isPMR: true});
-        this.v4_left_titleBgColor = gCPVal(container, 'v4_left_titleBgColor', '#ffffff', {sKey:'v4_left_titleBgStatus', fields:['v4_left_titleBgColor', 'v4_left_titleBgImage']});
+        this.v4_left_titleBgColor = gCPVal(container, 'v4_left_titleBgColor', '', {sKey:'v4_left_titleBgStatus', fields:['v4_left_titleBgColor', 'v4_left_titleBgImage']});
         this.v4_left_titleBgImage = gCPVal(container, 'v4_left_titleBgImage', {}, {sKey:'v4_left_titleBgStatus', fields:['v4_left_titleBgColor', 'v4_left_titleBgImage']}).url;
         this.v4_left_titleBorder = gCPVal(container, 'v4_left_titleBorder', [{color: '#e5e5e5',width: 0,style: 'solid'}], {isBorder: true, bsOld:['is_border','is_border_w','is_border_c'], cusFields: ['v4_left_titleBorder']});
         this.v4_left_titleShadow = gCPVal(container, 'v4_left_titleShadow', [{width:20, color:'rgba(0,0,0,0)'},'none'], {isShadow:true, bsOld:['is_shadow','is_shadow_w','is_shadow_bg']});
@@ -3718,7 +3731,7 @@
           { fontSize: '24rpx', color: '#A4625D', fontWeight: 'normal', textAlign: 'left' }
         );
         this.v4_right_titleMargin = gCPVal(container, 'v4_right_titleMargin', [{ top: 0, left: 0, right: 0, bottom: 12 }], {sKey:'v4_right_titleMarginStatus', fields:['v4_right_titleMargin'], isPMR: true});
-        this.v4_right_titleBgColor = gCPVal(container, 'v4_right_titleBgColor', '#ffffff', {sKey:'v4_right_titleBgStatus', fields:['v4_right_titleBgColor', 'v4_right_titleBgImage']});
+        this.v4_right_titleBgColor = gCPVal(container, 'v4_right_titleBgColor', '', {sKey:'v4_right_titleBgStatus', fields:['v4_right_titleBgColor', 'v4_right_titleBgImage']});
         this.v4_right_titleBgImage = gCPVal(container, 'v4_right_titleBgImage', {}, {sKey:'v4_right_titleBgStatus', fields:['v4_right_titleBgColor', 'v4_right_titleBgImage']}).url;
         this.v4_right_titleBorder = gCPVal(container, 'v4_right_titleBorder', [{color: '#e5e5e5',width: 0,style: 'solid'}], {isBorder: true, bsOld:['is_border','is_border_w','is_border_c'], cusFields: ['v4_right_titleBorder']});
         this.v4_right_titleShadow = gCPVal(container, 'v4_right_titleShadow', [{width:20, color:'rgba(0,0,0,0)'},'none'], {isShadow:true, bsOld:['is_shadow','is_shadow_w','is_shadow_bg']});
@@ -3752,7 +3765,7 @@
         this.v5_left_isMore = gCPVal(container, 'v5_left_isMore', 'Y');
         this.v5_left_moreName = gCPVal(container, 'v5_left_moreName', '更多');
         this.v5_left_morePath = gCPVal(container, 'v5_left_morePath', {value: ''}).value;
-        this.v5_left_xnamespace = gCPVal(container, 'v5_left_xnamespace', this.projectAttr.business_code);
+        this.v5_left_xnamespace = gCPVal(container, 'v5_left_xnamespace', this.projectAttr.business_code||this.v5_left_xnamespace);
         this.v5_left_category_ids = gCPVal(container, 'v5_left_category_ids', []);
         this.v5_left_marketType = gCPVal(container, 'v5_left_marketType', []);
         this.v5_left_isPlatformTags = gCPVal(container, 'v5_left_isPlatformTags', []);
@@ -3765,7 +3778,7 @@
         this.v5_right_top_isMore = gCPVal(container, 'v5_right_top_isMore', 'N');
         this.v5_right_top_moreName = gCPVal(container, 'v5_right_top_moreName', '更多');
         this.v5_right_top_morePath = gCPVal(container, 'v5_right_top_morePath', {value: ''}).value;
-        this.v5_right_top_xnamespace = gCPVal(container, 'v5_right_top_xnamespace', this.projectAttr.business_code);
+        this.v5_right_top_xnamespace = gCPVal(container, 'v5_right_top_xnamespace', this.projectAttr.business_code||this.v5_right_top_xnamespace);
         this.v5_right_top_category_ids = gCPVal(container, 'v5_right_top_category_ids', []);
         this.v5_right_top_marketType = gCPVal(container, 'v5_right_top_marketType', []);
         this.v5_right_top_isPlatformTags = gCPVal(container, 'v5_right_top_isPlatformTags', []);
@@ -3781,7 +3794,7 @@
         this.v5_right_bottom_isMore = gCPVal(container, 'v5_right_bottom_isMore', 'N');
         this.v5_right_bottom_moreName = gCPVal(container, 'v5_right_bottom_moreName', '更多');
         this.v5_right_bottom_morePath = gCPVal(container, 'v5_right_bottom_morePath', {value: ''}).value;
-        this.v5_right_bottom_xnamespace = gCPVal(container, 'v5_right_bottom_xnamespace', this.projectAttr.business_code);
+        this.v5_right_bottom_xnamespace = gCPVal(container, 'v5_right_bottom_xnamespace', this.projectAttr.business_code||this.v5_right_bottom_xnamespace);
         this.v5_right_bottom_category_ids = gCPVal(container, 'v5_right_bottom_category_ids', []);
         this.v5_right_bottom_marketType = gCPVal(container, 'v5_right_bottom_marketType', []);
         this.v5_right_bottom_isPlatformTags = gCPVal(container, 'v5_right_bottom_isPlatformTags', []);
@@ -3798,20 +3811,20 @@
         // 右上区域样式
         this.v5_right_top_areaBgColor = gCPVal(container, 'v5_right_top_areaBgColor', '', {sKey:'v5_right_top_areaBgStatus', fields:['v5_right_top_areaBgColor', 'v5_right_top_areaBgImage']});
         this.v5_right_top_areaBgImage = gCPVal(container, 'v5_right_top_areaBgImage', {}, {sKey:'v5_right_top_areaBgStatus', fields:['v5_right_top_areaBgColor', 'v5_right_top_areaBgImage']}).url;
-        this.v5_right_top_contentPadding = gCPVal(container, 'v5_right_top_contentPadding', [{ top: 0, left: 0, right: 0, bottom: 0 }], {sKey:'v5_right_top_contentPaddingStatus', fields:['v5_right_top_contentPadding'], isPMR: true});
+        this.v5_right_top_contentPadding = gCPVal(container, 'v5_right_top_contentPadding', [{ top: 20, left: 20, right: 20, bottom: 20 }], {sKey:'v5_right_top_contentPaddingStatus', fields:['v5_right_top_contentPadding'], isPMR: true});
         this.v5_right_top_contentBgColor = gCPVal(container, 'v5_right_top_contentBgColor', '', {sKey:'v5_right_top_contentBgStatus', fields:['v5_right_top_contentBgColor', 'v5_right_top_contentBgImage']});
         this.v5_right_top_contentBgImage = gCPVal(container, 'v5_right_top_contentBgImage', {}, {sKey:'v5_right_top_contentBgStatus', fields:['v5_right_top_contentBgColor', 'v5_right_top_contentBgImage']}).url;
         this.v5_right_top_titleLayout = gCPVal(container, 'v5_right_top_titleLayout', 'leftRight');
         this.v5_right_top_titleTextStyle = this.getFontAndBgcStyle(
           gCPVal(container, 'v5_right_top_titleTextStyle', {}, {sKey:'v5_right_top_titleTextStatus', fields:['v5_right_top_titleTextStyle'], isMerge: true}),
-          { fontSize: '32rpx', color: '#333333', fontWeight: '500', textAlign: 'left' }
+          { fontSize: '36rpx', color: '#333333', fontWeight: '500', textAlign: 'left' }
         );
         this.v5_right_top_subtitleTextStyle = this.getFontAndBgcStyle(
           gCPVal(container, 'v5_right_top_subtitleTextStyle', {}, {sKey:'v5_right_top_subtitleTextStatus', fields:['v5_right_top_subtitleTextStyle'], isMerge: true}),
           { fontSize: '22rpx', color: '#999999', fontWeight: '400', textAlign: 'left' }
         );
         this.v5_right_top_titleMargin = gCPVal(container, 'v5_right_top_titleMargin', [{ top: 0, left: 0, right: 0, bottom: 20 }], {sKey:'v5_right_top_titleMarginStatus', fields:['v5_right_top_titleMargin'], isPMR: true});
-        this.v5_right_top_titleBgColor = gCPVal(container, 'v5_right_top_titleBgColor', '#ffffff', {sKey:'v5_right_top_titleBgStatus', fields:['v5_right_top_titleBgColor', 'v5_right_top_titleBgImage']});
+        this.v5_right_top_titleBgColor = gCPVal(container, 'v5_right_top_titleBgColor', '', {sKey:'v5_right_top_titleBgStatus', fields:['v5_right_top_titleBgColor', 'v5_right_top_titleBgImage']});
         this.v5_right_top_titleBgImage = gCPVal(container, 'v5_right_top_titleBgImage', {}, {sKey:'v5_right_top_titleBgStatus', fields:['v5_right_top_titleBgColor', 'v5_right_top_titleBgImage']}).url;
         this.v5_right_top_titleBorder = gCPVal(container, 'v5_right_top_titleBorder', [{color: '#e5e5e5',width: 0,style: 'solid'}], {isBorder: true, bsOld:['is_border','is_border_w','is_border_c'], cusFields: ['v5_right_top_titleBorder']});
         this.v5_right_top_titleShadow = gCPVal(container, 'v5_right_top_titleShadow', [{width:20, color:'rgba(0,0,0,0)'},'none'], {isShadow:true, bsOld:['is_shadow','is_shadow_w','is_shadow_bg']});
@@ -3828,20 +3841,20 @@
         // 右下区域样式
         this.v5_right_bottom_areaBgColor = gCPVal(container, 'v5_right_bottom_areaBgColor', '', {sKey:'v5_right_bottom_areaBgStatus', fields:['v5_right_bottom_areaBgColor', 'v5_right_bottom_areaBgImage']});
         this.v5_right_bottom_areaBgImage = gCPVal(container, 'v5_right_bottom_areaBgImage', {}, {sKey:'v5_right_bottom_areaBgStatus', fields:['v5_right_bottom_areaBgColor', 'v5_right_bottom_areaBgImage']}).url;
-        this.v5_right_bottom_contentPadding = gCPVal(container, 'v5_right_bottom_contentPadding', [{ top: 0, left: 0, right: 0, bottom: 0 }], {sKey:'v5_right_bottom_contentPaddingStatus', fields:['v5_right_bottom_contentPadding'], isPMR: true});
+        this.v5_right_bottom_contentPadding = gCPVal(container, 'v5_right_bottom_contentPadding', [{ top: 20, left: 20, right: 20, bottom: 20 }], {sKey:'v5_right_bottom_contentPaddingStatus', fields:['v5_right_bottom_contentPadding'], isPMR: true});
         this.v5_right_bottom_contentBgColor = gCPVal(container, 'v5_right_bottom_contentBgColor', '', {sKey:'v5_right_bottom_contentBgStatus', fields:['v5_right_bottom_contentBgColor', 'v5_right_bottom_contentBgImage']});
         this.v5_right_bottom_contentBgImage = gCPVal(container, 'v5_right_bottom_contentBgImage', {}, {sKey:'v5_right_bottom_contentBgStatus', fields:['v5_right_bottom_contentBgColor', 'v5_right_bottom_contentBgImage']}).url;
         this.v5_right_bottom_titleLayout = gCPVal(container, 'v5_right_bottom_titleLayout', 'leftRight');
         this.v5_right_bottom_titleTextStyle = this.getFontAndBgcStyle(
           gCPVal(container, 'v5_right_bottom_titleTextStyle', {}, {sKey:'v5_right_bottom_titleTextStatus', fields:['v5_right_bottom_titleTextStyle'], isMerge: true}),
-          { fontSize: '32rpx', color: '#333333', fontWeight: '500', textAlign: 'left' }
+          { fontSize: '36rpx', color: '#333333', fontWeight: '500', textAlign: 'left' }
         );
         this.v5_right_bottom_subtitleTextStyle = this.getFontAndBgcStyle(
           gCPVal(container, 'v5_right_bottom_subtitleTextStyle', {}, {sKey:'v5_right_bottom_subtitleTextStatus', fields:['v5_right_bottom_subtitleTextStyle'], isMerge: true}),
           { fontSize: '22rpx', color: '#999999', fontWeight: '400', textAlign: 'left' }
         );
         this.v5_right_bottom_titleMargin = gCPVal(container, 'v5_right_bottom_titleMargin', [{ top: 0, left: 0, right: 0, bottom: 20 }], {sKey:'v5_right_bottom_titleMarginStatus', fields:['v5_right_bottom_titleMargin'], isPMR: true});
-        this.v5_right_bottom_titleBgColor = gCPVal(container, 'v5_right_bottom_titleBgColor', '#ffffff', {sKey:'v5_right_bottom_titleBgStatus', fields:['v5_right_bottom_titleBgColor', 'v5_right_bottom_titleBgImage']});
+        this.v5_right_bottom_titleBgColor = gCPVal(container, 'v5_right_bottom_titleBgColor', '', {sKey:'v5_right_bottom_titleBgStatus', fields:['v5_right_bottom_titleBgColor', 'v5_right_bottom_titleBgImage']});
         this.v5_right_bottom_titleBgImage = gCPVal(container, 'v5_right_bottom_titleBgImage', {}, {sKey:'v5_right_bottom_titleBgStatus', fields:['v5_right_bottom_titleBgColor', 'v5_right_bottom_titleBgImage']}).url;
         this.v5_right_bottom_titleBorder = gCPVal(container, 'v5_right_bottom_titleBorder', [{color: '#e5e5e5',width: 0,style: 'solid'}], {isBorder: true, bsOld:['is_border','is_border_w','is_border_c'], cusFields: ['v5_right_bottom_titleBorder']});
         this.v5_right_bottom_titleShadow = gCPVal(container, 'v5_right_bottom_titleShadow', [{width:20, color:'rgba(0,0,0,0)'},'none'], {isShadow:true, bsOld:['is_shadow','is_shadow_w','is_shadow_bg']});
@@ -3865,7 +3878,7 @@
         // 右侧区域配置
         this.v6_right_showEffect = gCPVal(container, 'v6_right_showEffect', 1);
         this.v6_right_slideNumber = gCPVal(container, 'v6_right_slideNumber', 4);
-        this.v6_right_xnamespace = gCPVal(container, 'v6_right_xnamespace', this.projectAttr.business_code);
+        this.v6_right_xnamespace = gCPVal(container, 'v6_right_xnamespace', this.projectAttr.business_code||this.v6_right_xnamespace);
         this.v6_right_category_ids = gCPVal(container, 'v6_right_category_ids', []);
         this.v6_right_marketType = gCPVal(container, 'v6_right_marketType', []);
         this.v6_right_isPlatformTags = gCPVal(container, 'v6_right_isPlatformTags', []);
@@ -3897,7 +3910,7 @@
         this.v7_left_dotType = gCPVal(container, 'v7_left_dotType', 'dot');
         this.v7_left_imageScale = gCPVal(container, 'v7_left_imageScale', 'fill');
         console.log('[v7] init imageScale =', this.v7_left_imageScale);
-        this.v7_left_xnamespace = gCPVal(container, 'v7_left_xnamespace', this.projectAttr.business_code);
+        this.v7_left_xnamespace = gCPVal(container, 'v7_left_xnamespace', this.projectAttr.business_code||this.v7_left_xnamespace);
         
         // 右侧区域配置
         this.v7_right_is_title = gCPVal(container, 'v7_right_is_title', 'Y');
@@ -3907,7 +3920,7 @@
         this.v7_right_isMore = gCPVal(container, 'v7_right_isMore', 'N');
         this.v7_right_moreName = gCPVal(container, 'v7_right_moreName', '更多');
         this.v7_right_morePath = gCPVal(container, 'v7_right_morePath', {value: ''}).value;
-        this.v7_right_xnamespace = gCPVal(container, 'v7_right_xnamespace', this.projectAttr.business_code);
+        this.v7_right_xnamespace = gCPVal(container, 'v7_right_xnamespace', this.projectAttr.business_code||this.v7_right_xnamespace);
         this.v7_right_category_ids = gCPVal(container, 'v7_right_category_ids', []);
         this.v7_right_marketType = gCPVal(container, 'v7_right_marketType', []);
         this.v7_right_isPlatformTags = gCPVal(container, 'v7_right_isPlatformTags', []);
@@ -3939,7 +3952,7 @@
           { fontSize: '24rpx', color: '#999999', fontWeight: 'normal', textAlign: 'left' }
         );
         this.v7_right_titleMargin = gCPVal(container, 'v7_right_titleMargin', [{ top: 0, left: 0, right: 0, bottom: 12 }], {sKey:'v7_right_titleMarginStatus', fields:['v7_right_titleMargin'], isPMR: true});
-        this.v7_right_titleBgColor = gCPVal(container, 'v7_right_titleBgColor', '#ffffff', {sKey:'v7_right_titleBgStatus', fields:['v7_right_titleBgColor', 'v7_right_titleBgImage']});
+        this.v7_right_titleBgColor = gCPVal(container, 'v7_right_titleBgColor', '', {sKey:'v7_right_titleBgStatus', fields:['v7_right_titleBgColor', 'v7_right_titleBgImage']});
         this.v7_right_titleBgImage = gCPVal(container, 'v7_right_titleBgImage', {}, {sKey:'v7_right_titleBgStatus', fields:['v7_right_titleBgColor', 'v7_right_titleBgImage']}).url;
         this.v7_right_titleBorder = gCPVal(container, 'v7_right_titleBorder', [{color: '#e5e5e5',width: 0,style: 'solid'}], {isBorder: true, bsOld:['is_border','is_border_w','is_border_c'], cusFields: ['v7_right_titleBorder']});
         this.v7_right_titleShadow = gCPVal(container, 'v7_right_titleShadow', [{width:20, color:'rgba(0,0,0,0)'},'none'], {isShadow:true, bsOld:['is_shadow','is_shadow_w','is_shadow_bg']});
@@ -4146,6 +4159,13 @@
             xnamespace = this.v1_xnamespace;
         }
         
+        const isPreviewMode = this.$configProject['isPreview'];
+        // 预览模式下不判断业务线是否存在，直接请求接口返回mock数据
+        if (!isPreviewMode) {
+          // 过滤掉没有业务线值（xnamespace为空）的区域，传参只保留有业务线值的区域
+          blocks = blocks.filter(block => block.filters && block.filters.namespace);
+        }
+
         // 过滤掉 filters 中的空值参数（空字符串/空数组/null/undefined 不传递）
         blocks.forEach(block => {
           if (block.filters) {
@@ -4160,6 +4180,9 @@
           }
         });
 
+        // 非预览模式下，单区域布局没有业务线值、或多区域布局所有区域都没有业务线值时，不请求接口
+        if (!isPreviewMode && blocks.length === 0) return;
+
         this.fetchMarketMallProductList(blocks, xnamespace);
       },
       fetchMarketMallProductList(blocks, xnamespace) {

package/src/components/JfbMallMarketNew/JfbMallMarketNewLessSelf.less

@@ -123,6 +123,11 @@
           flex: 0 0 calc((100% / var(--columns, 2)) - (10rpx * (var(--columns, 2) - 1) / var(--columns, 2)));
           box-sizing: border-box;
           
+          // 布局1滑块模式：显示 columns 个完整商品 + 半个商品（提示可滑动）
+          &.jfb-mall-market-new__body-product--v1-scroll {
+            flex: 0 0 calc((100% - 10rpx * (var(--columns, 2) - 1)) / (var(--columns, 2) + 0.5));
+          }
+          
           // 布局5滑块模式下的商品图片固定尺寸
           &.jfb-mall-market-new__body-product--v5-scroll {
             flex: 0 0 calc(100% / 2);
@@ -134,7 +139,7 @@
             .jfb-mall-market-new__body-product-image {
               width: 100%;
               aspect-ratio: 1 / 1;
-              margin-bottom: 12rpx;
+              margin-bottom: 16rpx;
               flex-shrink: 0;
               overflow: hidden;
               
@@ -431,7 +436,7 @@
           min-width: 0;
           display: flex;
           flex-direction: column;
-          gap: 10rpx;
+          gap: 16rpx;
           
           &-top {
             flex: 1;
@@ -439,7 +444,7 @@
             
             &-products {
               display: flex;
-              gap: 10rpx;
+              gap: 20rpx;
               
               .jfb-mall-market-new__body-product {
                 flex: 1;
@@ -452,7 +457,7 @@
                 &-image {
                   width: 100%;
                   aspect-ratio: 1 / 1;
-                  margin-bottom: 12rpx;
+                  margin-bottom: 16rpx;
                   flex-shrink: 0;
                   overflow: hidden;
                   
@@ -514,7 +519,7 @@
             
             &-products {
               display: flex;
-              gap: 10rpx;
+              gap: 20rpx;
               
               .jfb-mall-market-new__body-product {
                 flex: 1;
@@ -527,7 +532,7 @@
                 &-image {
                   width: 100%;
                   aspect-ratio: 1 / 1;
-                  margin-bottom: 12rpx;
+                  margin-bottom: 16rpx;
                   flex-shrink: 0;
                   overflow: hidden;
                   
@@ -856,7 +861,7 @@
             // 右上商品列表样式
             &-products {
               display: flex;
-              gap: 10rpx;
+              gap: 20rpx;
               
               .jfb-mall-market-new__body-product {
                 flex: 1;
@@ -875,7 +880,7 @@
             // 右下商品列表样式
             &-products {
               display: flex;
-              gap: 10rpx;
+              gap: 20rpx;
               
               .jfb-mall-market-new__body-product {
                 flex: 1;
@@ -1340,18 +1345,22 @@
           width: 100%;
           font-size: 24rpx;
           color: #333;
+          margin-bottom: 12rpx;
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
+          text-align: left;
         }
         
         // 商品品牌样式
         &-brand {
+          width: 100%;
           font-size: 20rpx;
           color: #999;
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
+          text-align: left;
         }
         
         // 商品价格样式
@@ -1399,7 +1408,7 @@
       &-name {
         font-size: 24rpx;
         color: #333;
-        margin-bottom: 8rpx;
+        margin-bottom: 12rpx;
         text-align: left;
         white-space: nowrap;
         overflow: hidden;
@@ -1416,7 +1425,7 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        max-width: 100%;
+        width: 100%;
       }
       
       // 商品价格样式（上下布局）
@@ -1426,6 +1435,13 @@
         align-self: flex-start;
       }
       
+      // 划线价与金额间距 4px
+      &-price, &-info-price {
+        ::v-deep .line_one_delete {
+          margin-top: 8rpx;
+        }
+      }
+      
       // 立即购买按钮样式（上下布局）
       &-button {
         font-size: 24rpx;
@@ -1491,7 +1507,7 @@
         
         .jfb-mall-market-new__body-product-name,
         .jfb-mall-market-new__body-product-info-name {
-          margin-bottom: 8rpx;
+          margin-bottom: 12rpx;
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;

package/src/components/JfbMallMarketNew/cusAttr/content.js

@@ -99,19 +99,26 @@ export default (data, gValue, gColor, oldData) => {
         {"label": "滑块", "value": 2},
       ]
     },
-    data.styleLayout === 'v1' && data['v1_showEffect'] === 2 && {
-      labelInline: true,
-      label: '',
-      ele: 'el-input',
-      type: 'number',
-      valueKey: 'v1_slideNumber',
-      groupKey:'content',
-      value: data.v1_slideNumber || '4',
-      cusStyle: { paddingLeft: '100px' },
-      placeholder: '请输入数量',
-      className: 'input60',
-      unit:'个',
-    },
+    data.styleLayout === 'v1' && data['v1_showEffect'] === 2 && (() => {
+      // 滑块数量默认为列数的两倍；若已存值等于任一列数的默认两倍，则视为默认值跟随当前列数
+      const columns = Number(data.v1_productColumns) || 4;
+      const defaultSlideNumber = String(columns * 2);
+      const stored = data.v1_slideNumber;
+      const isDefaultValue = stored === undefined || stored === null || stored === '' || ['4', '6', '8'].includes(String(stored));
+      return {
+        labelInline: true,
+        label: '',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'v1_slideNumber',
+        groupKey:'content',
+        value: isDefaultValue ? defaultSlideNumber : stored,
+        cusStyle: { paddingLeft: '100px' },
+        placeholder: '请输入数量',
+        className: 'input60',
+        unit:'个',
+      };
+    })(),
     data.styleLayout === 'v2' && {
       label: "每块商数量",
       ele: "xd-radio",

package/src/components/JfbMallMarketNew/cusAttr/layouts/content-v1.js

@@ -198,7 +198,7 @@ export default (data, gValue, gColor, oldData) => {
     },
     // 商品分类
     data.v1_xnamespace && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: 'v1_category_ids',
       value: data['v1_category_ids'] || '',
@@ -231,7 +231,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       handleCustom({action, data}) {
         XdBus.getParentApi('getMarketOption')({
@@ -275,7 +275,7 @@ export default (data, gValue, gColor, oldData) => {
       }
     },
     // 商品链接
-    /* {
+    {
       label: '商品链接',
       ele: 'xd-select-pages-path',
       valueKey: 'v1_productLink',
@@ -289,7 +289,7 @@ export default (data, gValue, gColor, oldData) => {
       className: 'input80',
       inline: false,
       notice: '默认为高级里配置的链接，可自定义',
-    }, */
+    },
     {ele: 'group_end'},
   ].filter(i=>i)
 };

package/src/components/JfbMallMarketNew/cusAttr/layouts/content-v2.js

@@ -257,7 +257,7 @@ export default (data, gValue, gColor, oldData) => {
       hidden: currentArea !== 'left'
     },
     data.v2_left_xnamespace && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: 'v2_left_category_ids',
       value: data['v2_left_category_ids'] || '',
@@ -290,7 +290,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       handleCustom({action, data}) {
         XdBus.getParentApi('getMarketOption')({
@@ -334,7 +334,7 @@ export default (data, gValue, gColor, oldData) => {
       },
       hidden: currentArea !== 'left'
     },
-    /* {
+    {
       label: '商品链接',
       ele: 'xd-select-pages-path',
       valueKey: 'v2_left_productLink',
@@ -349,7 +349,7 @@ export default (data, gValue, gColor, oldData) => {
       inline: false,
       notice: '默认为高级里配置的链接，可自定义',
       hidden: currentArea !== 'left'
-    }, */
+    },
     {
       ele: 'group_end',
       hidden: currentArea !== 'left'
@@ -570,7 +570,7 @@ export default (data, gValue, gColor, oldData) => {
       hidden: currentArea !== 'right'
     },
     data.v2_right_xnamespace && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: 'v2_right_category_ids',
       value: data['v2_right_category_ids'] || '',
@@ -603,7 +603,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       handleCustom({action, data}) {
         XdBus.getParentApi('getMarketOption')({
@@ -647,7 +647,7 @@ export default (data, gValue, gColor, oldData) => {
       },
       hidden: currentArea !== 'right'
     },
-    /* {
+    {
       label: '商品链接',
       ele: 'xd-select-pages-path',
       valueKey: 'v2_right_productLink',
@@ -662,7 +662,7 @@ export default (data, gValue, gColor, oldData) => {
       inline: false,
       notice: '默认为高级里配置的链接，可自定义',
       hidden: currentArea !== 'right'
-    }, */
+    },
     {
       ele: 'group_end',
       hidden: currentArea !== 'right'

package/src/components/JfbMallMarketNew/cusAttr/layouts/content-v3.js

@@ -236,7 +236,7 @@ export default (data, gValue, gColor, oldData) => {
       hidden: currentArea !== areaPrefix.slice(0, -1)
     },
     data[`v3_${areaPrefix}xnamespace`] && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: `v3_${areaPrefix}category_ids`,
       value: data[`v3_${areaPrefix}category_ids`] || '',
@@ -269,7 +269,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       handleCustom({action, data}) {
         XdBus.getParentApi('getMarketOption')({
@@ -313,7 +313,7 @@ export default (data, gValue, gColor, oldData) => {
       },
       hidden: currentArea !== areaPrefix.slice(0, -1)
     },
-    /* {
+    {
       label: '商品链接',
       ele: 'xd-select-pages-path',
       valueKey: `v3_${areaPrefix}productLink`,
@@ -328,7 +328,7 @@ export default (data, gValue, gColor, oldData) => {
       inline: false,
       notice: '默认为高级里配置的链接，可自定义',
       hidden: currentArea !== areaPrefix.slice(0, -1)
-    }, */
+    },
     {
       ele: 'group_end',
       hidden: currentArea !== areaPrefix.slice(0, -1)

package/src/components/JfbMallMarketNew/cusAttr/layouts/content-v4.js

@@ -197,7 +197,7 @@ export default (data, gValue, gColor, oldData) => {
       hidden: currentArea !== 'header'
     },
     data.v4_header_xnamespace && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: 'v4_header_category_ids',
       value: data['v4_header_category_ids'] || '',
@@ -230,7 +230,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       handleCustom({action, data}) {
         XdBus.getParentApi('getMarketOption')({
@@ -274,7 +274,7 @@ export default (data, gValue, gColor, oldData) => {
       },
       hidden: currentArea !== 'header'
     },
-    /* {
+    {
       label: '商品链接',
       ele: 'xd-select-pages-path',
       valueKey: 'v4_header_productLink',
@@ -289,7 +289,7 @@ export default (data, gValue, gColor, oldData) => {
       inline: false,
       notice: '默认为高级里配置的链接，可自定义',
       hidden: currentArea !== 'header'
-    }, */
+    },
     {
       ele: 'group_end',
       hidden: currentArea !== 'header'
@@ -449,7 +449,7 @@ export default (data, gValue, gColor, oldData) => {
       hidden: currentArea !== 'left'
     },
     data.v4_left_xnamespace && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: 'v4_left_category_ids',
       value: data['v4_left_category_ids'] || '',
@@ -482,7 +482,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       handleCustom({action, data}) {
         XdBus.getParentApi('getMarketOption')({
@@ -526,7 +526,7 @@ export default (data, gValue, gColor, oldData) => {
       },
       hidden: currentArea !== 'left'
     },
-    /* {
+    {
       label: '商品链接',
       ele: 'xd-select-pages-path',
       valueKey: 'v4_left_productLink',
@@ -541,7 +541,7 @@ export default (data, gValue, gColor, oldData) => {
       inline: false,
       notice: '默认为高级里配置的链接，可自定义',
       hidden: currentArea !== 'left'
-    }, */
+    },
     {
       ele: 'group_end',
       hidden: currentArea !== 'left'
@@ -701,7 +701,7 @@ export default (data, gValue, gColor, oldData) => {
       hidden: currentArea !== 'right'
     },
     data.v4_right_xnamespace && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: 'v4_right_category_ids',
       value: data['v4_right_category_ids'] || '',
@@ -734,7 +734,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       handleCustom({action, data}) {
         XdBus.getParentApi('getMarketOption')({
@@ -778,7 +778,7 @@ export default (data, gValue, gColor, oldData) => {
       },
       hidden: currentArea !== 'right'
     },
-    /* {
+    {
       label: '商品链接',
       ele: 'xd-select-pages-path',
       valueKey: 'v4_right_productLink',
@@ -793,7 +793,7 @@ export default (data, gValue, gColor, oldData) => {
       inline: false,
       notice: '默认为高级里配置的链接，可自定义',
       hidden: currentArea !== 'right'
-    }, */
+    },
     {
       ele: 'group_end',
       hidden: currentArea !== 'right'

package/src/components/JfbMallMarketNew/cusAttr/layouts/content-v5.js

@@ -535,7 +535,7 @@ export default (data, gValue, gColor, oldData) => {
       }
     },
     data.v5_right_top_xnamespace && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: 'v5_right_top_category_ids',
       value: data['v5_right_top_category_ids'] || '',
@@ -568,7 +568,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       hidden: currentArea !== 'right-top',
       handleCustom({action, data}) {
@@ -795,7 +795,7 @@ export default (data, gValue, gColor, oldData) => {
       }
     },
     data.v5_right_bottom_xnamespace && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: 'v5_right_bottom_category_ids',
       value: data['v5_right_bottom_category_ids'] || '',
@@ -828,7 +828,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       hidden: currentArea !== 'right-bottom',
       handleCustom({action, data}) {

package/src/components/JfbMallMarketNew/cusAttr/layouts/content-v6.js

@@ -106,7 +106,7 @@ export default (data, gValue, gColor, oldData) => {
       }
     },
     currentArea === 'right-product' && data.v6_right_xnamespace && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: 'v6_right_category_ids',
       value: data['v6_right_category_ids'] || '',
@@ -138,7 +138,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       handleCustom({action, data}) {
         XdBus.getParentApi('getMarketOption')({

package/src/components/JfbMallMarketNew/cusAttr/layouts/content-v7.js

@@ -533,7 +533,7 @@ export default (data, gValue, gColor, oldData) => {
       }
     },
     data.v7_right_xnamespace && {
-      label: '商品分类:',
+      label: '商品分类',
       ele: 'xd-site-select-list',
       valueKey: 'v7_right_category_ids',
       value: data['v7_right_category_ids'] || '',
@@ -566,7 +566,7 @@ export default (data, gValue, gColor, oldData) => {
         multiple: true,
       },
       groupKey:'content',
-      className: 'input60',
+      className: 'input80',
       labelInline:true,
       hidden: currentArea !== 'right-product',
       handleCustom({action, data}) {

package/src/components/JfbMallMarketNew/cusAttr/layouts/style-v1.js

@@ -263,7 +263,7 @@ export default function (data, gValue, gColor, oldData) {
       ele: 'xd-color',
       valueKey: `${prefix}titleBgColor`,
       labelInline: true,
-      value: dataVal({data, key:`${prefix}titleBgColor`, dValue:'#ffffff', gValue}),
+      value: dataVal({data, key:`${prefix}titleBgColor`, dValue:'', gValue}),
       hidden: !statusShow({data, key: `${prefix}titleBgStatus`, fields:[`${prefix}titleBgColor`, `${prefix}titleBgImage`], gValue}),
       placeholder: '请选择背景颜色',
       className: 'input80',

package/src/components/JfbMallMarketNew/cusAttr/layouts/style-v2.js

@@ -350,7 +350,7 @@ export default function (data, gValue, gColor, oldData) {
       ele: 'xd-color',
       valueKey: `${areaPrefix}titleBgColor`,
       labelInline: true,
-      value: dataVal({data, key:`${areaPrefix}titleBgColor`, dValue:'#ffffff', gValue}),
+      value: dataVal({data, key:`${areaPrefix}titleBgColor`, dValue:'', gValue}),
       hidden: !statusShow({data, key: `${areaPrefix}titleBgStatus`, fields:[`${areaPrefix}titleBgColor`], gValue}) || currentArea !== areaPrefix.slice(0, -1),
       placeholder: '请选择背景色',
       className: 'input80',

package/src/components/JfbMallMarketNew/cusAttr/layouts/style-v4.js

@@ -431,7 +431,7 @@ export default (data, gValue, gColor, oldData) => {
       ele: 'xd-color',
       valueKey: `${areaPrefix}_titleBgColor`,
       labelInline: true,
-      value: dataVal({data, key: `${areaPrefix}_titleBgColor`, dValue: '#ffffff', gValue}),
+      value: dataVal({data, key: `${areaPrefix}_titleBgColor`, dValue: '', gValue}),
       hidden: !statusShow({data, key: `${areaPrefix}_titleBgStatus`, fields: [`${areaPrefix}_titleBgColor`, `${areaPrefix}_titleBgImage`], gValue}) || currentArea !== areaName,
       placeholder: '请选择背景颜色',
       className: 'input80',

package/src/components/JfbMallMarketNew/cusAttr/layouts/style-v5.js

@@ -83,7 +83,7 @@ export default (data, gValue, gColor, oldData) => {
       value: dataVal({
         data,
         key: `${areaPrefix}_contentPadding`,
-        dValue: { top: 0, left: 0, right: 0, bottom: 0 },
+        dValue: areaPrefix === 'v5_left' ? { top: 0, left: 0, right: 0, bottom: 0 } : { top: 20, left: 20, right: 20, bottom: 20 },
         gValue,
         isPM: true,
       }),
@@ -191,7 +191,7 @@ export default (data, gValue, gColor, oldData) => {
       ele: 'xd-text-and-bgc',
       groupKey:'style',
       valueKey: `${areaPrefix}_titleTextStyle`,
-      value: dataVal({data, key: `${areaPrefix}_titleTextStyle`, dValue: { fontSize: '32rpx', color: '#333333', fontWeight: 'normal', textAlign: 'left' }, gValue}),
+      value: dataVal({data, key: `${areaPrefix}_titleTextStyle`, dValue: { fontSize: '36rpx', color: '#333333', fontWeight: 'normal', textAlign: 'left' }, gValue}),
       hidden: !statusShow({data, key: `${areaPrefix}_titleTextStatus`, fields: [`${areaPrefix}_titleTextStyle`], gValue}) || currentArea !== areaName,
       setting: {
         fontSize: true,
@@ -199,7 +199,7 @@ export default (data, gValue, gColor, oldData) => {
         bgColor: false,
         selected: false,
         default: {
-          fontSize: '32rpx',
+          fontSize: '36rpx',
           color: '#333333',
           fontWeight: 'normal',
           textAlign: 'left'
@@ -343,7 +343,7 @@ export default (data, gValue, gColor, oldData) => {
       ele: 'xd-color',
       valueKey: `${areaPrefix}_titleBgColor`,
       labelInline: true,
-      value: dataVal({data, key: `${areaPrefix}_titleBgColor`, dValue: '#ffffff', gValue}),
+      value: dataVal({data, key: `${areaPrefix}_titleBgColor`, dValue: '', gValue}),
       hidden: !statusShow({data, key: `${areaPrefix}_titleBgStatus`, fields: [`${areaPrefix}_titleBgColor`, `${areaPrefix}_titleBgImage`], gValue}) || currentArea !== areaName,
       placeholder: '请选择背景颜色',
       className: 'input80',

package/src/components/JfbMallMarketNew/cusAttr/layouts/style-v7.js

@@ -333,7 +333,7 @@ export default (data, gValue, gColor, oldData) => {
       ele: 'xd-color',
       valueKey: `${areaPrefix}_titleBgColor`,
       labelInline: true,
-      value: dataVal({data, key: `${areaPrefix}_titleBgColor`, dValue: '#ffffff', gValue}),
+      value: dataVal({data, key: `${areaPrefix}_titleBgColor`, dValue: '', gValue}),
       hidden: !statusShow({data, key: `${areaPrefix}_titleBgStatus`, fields: [`${areaPrefix}_titleBgColor`, `${areaPrefix}_titleBgImage`], gValue}) || currentArea !== areaName,
       placeholder: '请选择背景颜色',
       className: 'input80',

package/src/components/JfbMallMarketNew/cusAttr/style.js

@@ -25,6 +25,10 @@ export default function (data, gValue, gColor, oldData) {
   // 获取当前布局类型
   const styleLayout = data.styleLayout;
   
+  // v5布局时，清空margin/padding旧值，确保使用正确的默认值
+  // 创建data副本，避免影响外部数据
+  const v5Data = styleLayout === 'v5' ? { ...data, margin: undefined, padding: undefined } : data;
+  
   // 公用样式属性
   const commonStyleAttrs = [
     {
@@ -54,7 +58,7 @@ export default function (data, gValue, gColor, oldData) {
       valueKey: 'margin',
       hidden:!statusShow({data, key: 'marginStatus', fields:['margin'], gValue}),
       value: dataVal({
-        data,
+        data: v5Data,
         key: 'margin',
         dValue: { top: 0, left: 16, right: 16, bottom: 16 },
         gValue,
@@ -86,9 +90,9 @@ export default function (data, gValue, gColor, oldData) {
       valueKey: 'padding',
       hidden:!statusShow({data, key: 'paddingStatus', fields:['padding'], gValue}),
       value: dataVal({
-        data,
+        data: v5Data,
         key:'padding',
-        dValue: { top: 32, left: 32, right: 32, bottom: 32 },
+        dValue: { top: styleLayout === 'v5' ? 0 : 32, left: styleLayout === 'v5' ? 0 : 32, right: styleLayout === 'v5' ? 0 : 32, bottom: styleLayout === 'v5' ? 0 : 32 },
         gValue,
         isPM: true,
       }),