jufubao-mall 2.0.20-beta5 → 2.0.20-beta7

package/package.json

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

package/src/components/JfbMallBrandHome/JfbMallBrandHome.vue

@@ -805,7 +805,7 @@
         jfbRootExec("getBrandHomeInfo", {
           vm: this,
           data: {
-            ...this.options,
+            //...this.options,
             brand_id: this.brand_id,
             xnamespace: this.xnamespace
           }
@@ -910,20 +910,24 @@
             page_size = this.show_shop_num;
           }
         }
+        let data = this.$xdUniHelper.deleteParamEmptyKey({
+          consume_mode: "SELL",
+          ...this.options,
+          brand_id: this.brand_id,
+          city_code: this.stateCity.city_code,
+          latitude: this.stateLocation.latitude,
+          longitude: this.stateLocation.longitude,
+          page_size:  page_size,
+          page_token: this.shop_page_token,
+          region_limit_tpl_id: this.region_limit_tpl_id,
+          namespace: this.xnamespace,
+        });
+
+        if(data['brand_type']) delete data['brand_type'];
+
         jfbRootExec("getMallBrandHomeShopList", {
           vm: this,
-          data: this.$xdUniHelper.deleteParamEmptyKey({
-            consume_mode: "SELL",
-            ...this.options,
-            brand_id: this.brand_id,
-            city_code: this.stateCity.city_code,
-            latitude: this.stateLocation.latitude,
-            longitude: this.stateLocation.longitude,
-            page_size:  page_size,
-            page_token: this.shop_page_token,
-            region_limit_tpl_id: this.region_limit_tpl_id,
-            namespace: this.xnamespace,
-          })
+          data: data
         }).then(res => {
           this.loaded = true;
           let list = res.list.map(item=>{
@@ -1284,7 +1288,7 @@
         background:#fff;
         padding: 32rpx 40rpx 40rpx 40rpx;
         border-radius: 8rpx;
-        margin-bottom: 20rpx; 
+        margin-bottom: 20rpx;
       }
       &_brand_info {
         position: relative;
@@ -1374,7 +1378,7 @@
         }
       }
     }
-      
+
     }
   }
 </style>

package/src/components/JfbMallBrandWall/JfbMallBrandWall.vue

@@ -285,7 +285,6 @@
           outWdith += 172;
           if(this.titleBorderWidth) outWdith += this.titleBorderWidth * 2;
           if(this.titleBorderWidth === 0 && this.vStyle === 'v1') outWdith +=2
-          outWdith += this.getPMValue(this.tabPadding, 'RL', 0);
         }
         outWdith += this.getPMValue(this.listMargin, 'RL',0);
         outWdith += this.getPMValue(this.listPadding, 'RL',0);
@@ -392,7 +391,7 @@
       },
       tabListComp(){
         let temp = {};
-        if(this.layout === 'v1') {
+        if(['v1','v2'].includes(this.layout)) {
           temp['paddingLeft'] =  (this.tabPadding.left || 0) + 'rpx';
           temp['paddingRight'] =  (this.tabPadding.right || 0) + 'rpx';
           temp['paddingBottom'] =  (this.tabPadding.bottom || 0) + 'rpx';
@@ -413,24 +412,6 @@
           ...this.getTabHeight,
         };
       },
-      tabItemStyleComp(){
-        let style = {
-          color: this.titleStyle.color,
-          fontWeight: this.titleStyle.fontWeight,
-        };
-        if(this.layout === 'v2') {
-          style['fontSize'] = '24rpx';
-          style = {...style,...this.getTabItemHeight}
-          if(['v2'].includes(this.vStyle)) {
-            style['backgroundColor'] = this.titleStyle.bgColor;
-          }
-        }
-        if(this.layout === 'v1') {
-          style['fontSize'] = parseInt(this.titleStyle.actFontSize)  + 'rpx';
-          style = {...style,...this.getTabItemHeight}
-        }
-        return style
-      },
       getTabItemHeight(){
         if(this.layout === 'v1'){
           return  {
@@ -452,14 +433,30 @@
         }
 
       },
-
+      tabItemStyleComp(){
+        let style = {
+          color: this.titleStyle.color,
+          fontWeight: this.titleStyle.fontWeight,
+        };
+        if(this.layout === 'v2') {
+          style['fontSize'] = '24rpx';
+          style = {...style,...this.getTabItemHeight}
+          if(['v2'].includes(this.vStyle)) {
+            style['backgroundColor'] = this.titleStyle.bgColor;
+          }
+        }
+        if(this.layout === 'v1') {
+          style['fontSize'] = parseInt(this.titleStyle.actFontSize)  + 'rpx';
+          style = {...style,...this.getTabItemHeight}
+        }
+        return style
+      },
       tabActItemStyleComp(){
         let style = {
           color: this.titleStyle.actColor,
           fontWeight: this.titleStyle.actFontWeight,
         };
         if(this.layout === 'v2') {
-          style['fontSize'] = '24rpx';
           style = {...style,...this.getTabItemHeight}
           if(['v2'].includes(this.vStyle)) {
             if(this.titleStyle.actBgColor) style['backgroundColor'] = this.titleStyle.actBgColor;
@@ -477,14 +474,19 @@
         }
         return style
       },
+
       tabItemNameStyle(){
-        if(this.layout === 'v2') return {}
+        if(this.layout === 'v2') return {
+          fontSize: parseInt(this.titleStyle.fontSize) + 'rpx',
+          fontWeight: this.titleStyle.fontWeight,
+          color: this.titleStyle.color,
+        }
         return {
           borderRadius:['v1'].includes(this.hStyle)?'60rpx': 0,
           backgroundColor: ['v1'].includes(this.hStyle) ? this.titleStyle.bgColor:'',
           color: this.titleStyle.color,
           padding:'0 32rpx',
-          fontSize: this.titleStyle.fontSize + 'rpx',
+          fontSize: parseInt(this.titleStyle.fontSize) + 'rpx',
           fontWeight: this.titleStyle.fontWeight,
         }
       },
@@ -509,6 +511,8 @@
           return {
             backgroundColor: bgColor,
             color: color,
+            fontSize: parseInt(this.titleStyle.actFontSize) + 'rpx',
+            fontWeight: this.titleStyle.actFontWeight,
           }
         }
 
@@ -530,7 +534,7 @@
           backgroundImage: bgImage,
           padding: '0 32rpx',
           color: color,
-          fontSize: this.titleStyle.actFontSize + 'rpx',
+          fontSize:  parseInt(this.titleStyle.actFontSize) + 'rpx',
           fontWeight: this.titleStyle.actFontWeight,
         }
       },
@@ -702,16 +706,16 @@
           [{
             color: titleColor || '#333',
             bgColor: titleBgcColor || '#fff' ,
-            fontSize: '32',
+            fontSize: this.layout === 'v2' ?'24':'32',
             fontWeight: '400',
             actColor: titleActColor || '',
-            actFontWeight: '400',
-            actFontSize: '32',
+            actFontWeight: '500',
+            actFontSize: this.layout === 'v2' ?'24':'32',
             actBgColor:this.titleBgcActColor || '',
           }],
           {sKey:'titleStyleStatus',fields:['titleStyle'],isMerge: true},
         );
-        this.titleShadow = gCPVal(container, 'titleShadow', [this.gStyleValue.shadow,'none'], {isShadow:true, bsOld:['isTitleShadow','isTitleShadowBgcW','isTitleShadowBgc']});
+        this.titleShadow = gCPVal(container, 'titleShadow', [this.gStyleValue.shadow , 'none'], {isShadow:true, bsOld:['isTitleShadow','isTitleShadowBgcW','isTitleShadowBgc']});
         this.titleBorder = gCPVal(container, 'titleBorder', [{color: '#eee', width: '0', style: 'solid'},{color: '#eee', width: '0', style: 'solid'}], {isBorder:true, bsOld:['isTitleBorder','isTitleBorderW','isTitleBorderColor']});
         this.titleBorderWidth = gCPVal(container, 'titleBorder', [{color: '#eee', width: '0', style: 'solid'},{color: '#eee', width: '0', style: 'solid'}], {isBorder:true,isBsWidth: true, bsOld:['isTitleBorder','isTitleBorderW','isTitleBorderColor']});
 
@@ -771,8 +775,10 @@
 
       switchTab(i){
         this.tabIndex = i;
+        this.brandList = null
         this.getList();
       },
+
       getList(){
         this.$xdShowLoading({});
         let params = {
@@ -783,9 +789,9 @@
         if(this.isCityFilter === "Y") params['city_code'] = this.stateCity.city_code;
         else params['city_code'] = '';
         if(this.category_ids && this.category_ids.length > 0) params['category_ids'] = this.category_ids.join(",");
+
         jfbRootExec("getNewBrandWallList", {vm: this,data: params}).then(res => {
           this.$xdHideLoading();
-
           let brandList = res.items.map(item => {
             item['brand_icon'] = item.brand_icon ? getServiceUrl(item.brand_icon, "size2") : "";
             item['status'] = true;
@@ -794,7 +800,10 @@
 
           //补缺
           if(brandList.length >0) {
-            let differences = this.contentCell -  brandList.length % this.contentCell;
+            let differences = 0;
+            if( brandList.length % this.contentCell  > 0) {
+              differences = this.contentCell -  brandList.length % this.contentCell
+            }
             for(let i =0; i < differences; i++) {
               brandList.push({isEmpty: true});
             }
@@ -813,6 +822,7 @@
           })
         })
       },
+
       toBrand(brand){
         if(this.isPreview) return;
         let { params , brand_id} = brand;

package/src/components/JfbMallBrandWall/cusAttr/tab.js

@@ -4,7 +4,6 @@ import {dataVal, statusDataVal, statusShow, clone, cRaBorShadow,isDefStatus} fro
 
 export default (datas, gValue, gColor, oldData={})=>{
   let data = clone(datas);
-  debugger
   if(typeof data['tabPadding'] === 'string' && data['tabPadding'] ) {
     data['tabPadding'] = {
       top: Number(data['tabPadding']),
@@ -100,7 +99,7 @@ export default (datas, gValue, gColor, oldData={})=>{
           fontSize:'32',
           fontWeight: '400',
           actFontSize:'32',
-          actFontWeight: '400',
+          actFontWeight: '500',
           actColor: data['titleActColor'] || gValue.mainColor,
           actBgColor: data['titleBgcActColor'] || ''
         },

package/src/components/JfbMallHomeProductList/JfbMallHomeProductList.vue

@@ -140,7 +140,7 @@
         </view>
         <!--商品列表-->
         <xd-no-data :scale-size="2" type="product" v-if="prodList && prodList.length === 0"></xd-no-data>
-        <xd-more v-if="(isPreview || !hasNext) && prodList.length > 0" :color="footerColor" :background="footerColor"><text>我是有底线的</text></xd-more>
+        <xd-more v-if="(isPreview || !hasNext) && (prodList && prodList.length > 0)" :color="footerColor" :background="footerColor"><text>我是有底线的</text></xd-more>
         <xd-to-top :isPreview="isPreview" :mainColor="mainColor" ref="VT" :scrollTop="top"></xd-to-top>
       </view>
     </view>

package/src/components/JfbMallProductInfo/JfbMallProductInfo.vue

@@ -28,7 +28,7 @@
           height="750rpx"
           :indicatorDots="false"
           @animationfinish="animationfinish"
-        >            
+        >
          <!--#ifdef H5-->
           <template slot-scope="{ item,index }">
             <image v-show="item.status===true" @error="item.status=false" @click="handlePreview(index,item)" :src="item.src"></image>
@@ -148,7 +148,7 @@
               <xd-font-icon class="_ext" size="36" icon="iconsangedian-x" color="#999999"></xd-font-icon>
             </view>
             <view v-if="base_info.notice_text" class="content-item">
-              <xd-content-xss class="address_notice_content" :html="base_info.notice_text"></xd-content-xss>   
+              <xd-content-xss class="address_notice_content" :html="base_info.notice_text"></xd-content-xss>
               <xd-font-icon @click.stop="handleNotice" class="_ext" size="36" icon="iconwenhao" color="#999999"></xd-font-icon>
             </view>
           </view>
@@ -320,10 +320,10 @@
             :layoutInfo="layoutInfo"
             :fixedStyle="fixedStyle"
             :mainColor="mainColor"
-            :salePriceColor="salePriceColor" 
-            :salePriceFontSize="salePriceFontSize" 
-            :originalPriceFontSize="originalPriceFontSize" 
-            :originalPriceColor="originalPriceColor" 
+            :salePriceColor="salePriceColor"
+            :salePriceFontSize="salePriceFontSize"
+            :originalPriceFontSize="originalPriceFontSize"
+            :originalPriceColor="originalPriceColor"
             :isPlus="is_plus_site"
             @change="handleSkuChange"
             @onConfirm="handleConfirmSku"
@@ -583,7 +583,7 @@
         if(!this.buyButton.page_buttons) return null;
         return this.buyButton.page_buttons.find(item => item.code === 'view-delivery-scope');
       },
-      alert_bottom() {       
+      alert_bottom() {
         let style = this.fixedStyle({ paddingBottom: (this.btnHeight), zIndex: 110 })
         return style
       },
@@ -604,7 +604,7 @@
       },
       sectionBoxStyle() {
         console.log(this.sectionPadding,'this.getMarginAndPadding(this.sectionPadding,0)');
-        
+
         return {
           margin: this.getMarginAndPadding(this.sectionPadding,0),
           borderRadius: this.sectionRadius + 'rpx',
@@ -631,7 +631,7 @@
           padding: this.getMarginAndPadding(this.btnPadding, 0)
         };
         console.log(this.btnPadding,'this.btnPaddingst');
-        
+
         if(this.bottomBtnOrder === 'reverse'){
           style['flexDirection'] = 'row-reverse';
         }
@@ -678,7 +678,7 @@
       }
     },
     created() {
-      console.log(this.getTokenForKey('user_level'), 'user_leveluser_level');      
+      console.log(this.getTokenForKey('user_level'), 'user_leveluser_level');
       this.init(this.container);
       this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
       this.is_vip = this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP'?true:false
@@ -831,9 +831,13 @@
             ...data,
           }
         }).then(res => {
+
+          //res = {"base_info":{"product_id":66359621,"partner_id":161,"product_type":"good","category_id":142028,"product_name":"LUOLAI\/罗莱家纺月冉晓杏全棉可水洗夏被","sub_title":"","thumb":"\/uploads\/20250609\/b24185b5c38d3018cadf48c91d159e62.jpg","product_tags":[],"market_tags":[],"tags":[],"prices":{"sale_price":29000,"activity_price":0,"market_price":59900,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":29000,"n":"","t":"S"},{"p":59900,"n":"","t":"U"}]},"sale_num":4,"region_limit_tpl_id":"MxAZmuFFEX_wzGPmnoUYF","channel_code":"anVmdWJhb3w2NjM1OTYyMQ%3D%3D","notice_text":""},"images":[{"src":"\/uploads\/20250611\/90b6ec501ea7591fc006871c1fb78869.jpg"},{"src":"\/uploads\/20250609\/dec58372f4e7f1ef1ee8792820104e1f.jpg"},{"src":"\/uploads\/20250609\/27300fe6c336db75b18593823b5471cc.jpg"},{"src":"\/uploads\/20250609\/0ce25a57e372377223ec76d45409bfe4.jpg"},{"src":"\/uploads\/20250609\/9c3a9c7bd8d9361c23aee0d64c47409e.jpg"}],"videos":[],"parameters":[{"label":"品牌","value":"LUOLAI\/罗莱家纺","key":"brand"}],"delivery_methods":[{"label":"快递配送","value":"logistics"}],"brand_info":{"brand_id":40064,"brand_name":"LUOLAI\/罗莱家纺","brand_icon":"https:\/\/jfb-public-images.oss-cn-qingdao.aliyuncs.com\/admin-upload\/202105081449057244.jpg?x-oss-process=style\/common","brand_type":"MA","supplier_id":1358505},"skus":[{"product_sku":70199044,"standards":[{"attr_id":"","name":"月冉晓杏全棉可水洗夏被","value":"150*200cm\/950g","image":"\/\/img1-b.jufubao.cn\/uploads\/20250611\/a9c8fd6dc54918eb6687c65fea034e55.jpg?ver=1749625095120","desc":""}],"prices":{"sale_price":29000,"activity_price":0,"market_price":59900,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":29000,"n":"","t":"S"},{"p":59900,"n":"","t":"U"}]},"enabled":true},{"product_sku":70199045,"standards":[{"attr_id":"","name":"月冉晓杏全棉可水洗夏被","value":"200*230cm\/1450g","image":"\/\/img1-b.jufubao.cn\/uploads\/20250611\/0eca2b62949531ce2e22137ab7580a2c.jpg?ver=1749625100584","desc":""}],"prices":{"sale_price":36600,"activity_price":0,"market_price":69900,"wholesale_prices":[],"vip_price":0,"show_prices":[{"p":36600,"n":"","t":"S"},{"p":69900,"n":"","t":"U"}]},"enabled":true}],"sms_activity":{"status":"","activity_type":"","activity_tips":"","activity_price":0,"end_time":0,"start_time":0,"distance_start_time":0,"distance_end_time":0,"max_buy_num":0,"is_today":""},"similar_products":[],"request_id":"c4fa548ce8fa2185"}
+
+
           this.$xdHideLoading({});
           this.loadingInfo = false;
-          const { base_info, brand_info, delivery_methods, images, parameters, skus, similar_products, videos, sms_activity } = res; 
+          const { base_info, brand_info, delivery_methods, images, parameters, skus, similar_products, videos, sms_activity } = res;
           if(base_info.prices.market_price) {
             base_info.prices.market_price = this.$xdUniHelper.divisionFloatNumber(base_info.prices.market_price,100)
           }
@@ -996,23 +1000,23 @@
 
         // 根据布局类型设置价格
         if (this.goodsLayout === 'flash') {
-          const prices = this.smsStatus === 'ing' 
-            ? PRICE_CONFIG.FLASH.ING 
+          const prices = this.smsStatus === 'ing'
+            ? PRICE_CONFIG.FLASH.ING
             : PRICE_CONFIG.FLASH.WARM;
-          
+
           this.$set(this.base_info.prices, 'show_prices', prices);
-          
+
           // 处理时间格式
-          this.hours = this.smsStatus === 'ing' 
-            ? this.hours.split(':')[0] 
-            : this.hours.includes(':00') 
-              ? this.hours 
+          this.hours = this.smsStatus === 'ing'
+            ? this.hours.split(':')[0]
+            : this.hours.includes(':00')
+              ? this.hours
               : `${this.hours}:00`;
         } else {
-          const prices = this.showDiscount === 'Y' 
-            ? PRICE_CONFIG.NORMAL.WITH_DISCOUNT 
+          const prices = this.showDiscount === 'Y'
+            ? PRICE_CONFIG.NORMAL.WITH_DISCOUNT
             : PRICE_CONFIG.NORMAL.WITHOUT_DISCOUNT;
-          
+
           this.$set(this.base_info.prices, 'show_prices', prices);
         }
       },
@@ -1144,7 +1148,7 @@
               this.getElementHeight()
             });
           },50)
-         
+
         }).catch(err => {
           this.$xdHideLoading();
           this.$xdLog.catch(err);

package/src/components/JfbMallProductList/Api.js

@@ -12,7 +12,7 @@
  */
 module.exports = [
   {
-    mapFnName: 'getMallProductList',
+    mapFnName: 'getNewMallProductList',
     title: '获取商品列表',
     path: '/product/v1/:xnamespace/product/search',
     isRule: false,
@@ -33,14 +33,14 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getMallCategoryTree',
+    mapFnName: 'getNewMallCategoryTree',
     title: '分类 - 树列表',
-    path: '/product/v1/:xnamespace/category/index',
+    path: '/product/v1/:xnamespace/category/tree',
     isRule: false,
     params: {
       xnamespace: ['xnamespace', 'String', '必选'],
-      group_id: ['分组ID', 'Number', '必选'],
-      need_rec: ['是否需要推荐分类', 'Number', '必选'],
+      level: ['获取几层数据，默认：2', 'Number', '必选', 2],
+      root_category_id: ['父级分类，默认：0', 'Number', '必选', 0],
     },
     isConsole: true,
     disabled: true,
@@ -59,8 +59,8 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: "getSearchFilterList",
-    mapFn: "getSearchFilterList",
+    mapFnName: "getNewSearchFilterList",
+    mapFn: "getNewSearchFilterList",
     title: "获取商品搜索过滤列表",
     path: "/product/v1/:xnamespace/product/search-filters",
     isRule: false,

package/src/components/JfbMallProductList/ComFilterQuery.vue

@@ -1,5 +1,6 @@
 <template>
   <view class="jfb-filter" v-if="showQuery === 'Y'" :style="[cssStyle]">
+
     <view class="jfb-filter-placeholder" :style="[placeholderStyleComp]"></view>
     <view class="jfb-filter-menu" :style="[cusMenuStyle,menuStyleTopComp]">
       <template v-if="sortList.length > 0">
@@ -95,7 +96,7 @@
                   :class="{
                     active: isOtherActive(tab, item.value),
                     noMarginRigth: i%column === (column-1),
-                    noMarginTop: i/column <= 1
+                    noMarginTop: i/column < 1
                   }"
                   @click="setOhterChooseTag(tab, item)"
                 >{{item.label}}</view>
@@ -252,19 +253,19 @@ export default {
       return {
         zIndex: this.showQueryModal ? 1002 : 1,
         position:this.$configProject.isPreview?'absolute':'fixed',
-        top: this.$configProject.isPreview ? 0 : this.queryMaskComp.top
+        top: this.$configProject.isPreview ? 0 : (parseInt(this.queryMaskComp.top) - 2) + 'rpx',
       }
     },
     queryTopComp(){
       let {paddingTb} =  this.cusMenuStyle;
       let height = 48;//默认90高，填充0
       return {
-        top:  this.topHeight + this.layoutInfo.top + (height + paddingTb - 4)  + 'rpx'
+        top:  this.topHeight + this.layoutInfo.top + (height + paddingTb - 2)  + 'rpx'
       }
     },
     menuTextColorComp(){
       return {
-        color: this.cusMenuStyle.color || '#666'
+        color: this.cusMenuStyle.color || '#999'
       }
     },
 
@@ -331,7 +332,7 @@ export default {
       if(this.menuAct !== 'common') {
         params = {
           ...params,
-          borderColor: Color(font.color).alpha(0.01).toString(),
+          borderColor: Color(font.color).alpha(0.2).toString(),
           backgroundColor: Color(font.color).alpha(0.1).toString(),
         }
       }
@@ -776,7 +777,8 @@ export default {
       border-top: 1px solid var(--com-menu-border);
       display: flex;
       justify-content: space-around;
-      height: 48rpx;
+      height: 49rpx;
+
 
       &-item {
         display: flex;
@@ -893,7 +895,7 @@ export default {
 
             & > ._tag {
               text-align: center;
-              line-height: 66rpx;
+              line-height: 62rpx;
               border-radius: 4rpx;
               font-size: 24rpx;
               color: #666;
@@ -902,6 +904,9 @@ export default {
               white-space: nowrap;
               box-sizing: border-box;
               background-color: #f8f8f8;
+              border-width: 2rpx;
+              border-style: solid;
+              padding: 0 10rpx;
 
               &.noMarginRigth{
                 margin-right: 0!important;

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -24,7 +24,6 @@
         <view v-if="!loaded" class="skeleton-cate">
           <view class="cate_tab" v-if="showCategory === 'Y'">
             <view class="cate_tab_item" v-for="i in 5" :key="i"></view>
-
           </view>
           <view class="sub_cate" v-if="showCategory === 'Y'">
             <view class="sub_cate_item" v-for="i in 5" :key="i">
@@ -449,6 +448,12 @@
         if(this.initStatus && this.onLoadStatus) this.handleInit();
       },
 
+      filterModeData(){
+        if(this.$configProject.isPreview) {
+          this.$refs['filter-query'].hideSelectMenu();//隐藏菜单
+        }
+      },
+
     },
     created() {
       this.isPreview = this.$configProject.isPreview;
@@ -663,7 +668,7 @@
         let defFilterBgcColor = '#fff';
         if( category ==='v4') defFilterBgcColor = this.pageAttr.background;
         this.filterBgcColor = gCPVal(container, 'filterBgcColor', [defFilterBgcColor,'#fff'], {sKey: 'filterBgcColorStatus',fields:['filterBgcColor']});
-        this.filterColor = gCPVal(container, 'filterColor', ['#666'], {sKey: 'filterColorStatus',fields:['filterColor']});
+        this.filterColor = gCPVal(container, 'filterColor', ['#333'], {sKey: 'filterColorStatus',fields:['filterColor']});
         this.filterTopBorder = gCPVal(container, 'filterTopBorder', [{ color: '#f8f8f8', width: '2', style: 'solid'},{ color: '#f8f8f8', width: '0', style: 'solid'}], {isBorder:true});
         this.filterTopBorderWidth = gCPVal(container, 'filterTopBorder', [{ color: '#f8f8f8', width: '2', style: 'solid'},{ color: '#f8f8f8', width: '0', style: 'solid'}], {isBorder:true, isBsWidth: true});
 
@@ -809,22 +814,25 @@
 
         //二级导航文字颜色
         this.level2BgcColor = gCPVal(container, 'level2BgcColor', ['#fff','#f8f8f8'],{sKey:'level2BgcColorStatus', fields:['level2BgcColor']});
+
+        let color = gCPVal(container, 'level2Color', '') || '#333',
+          actColoor= this.mainColor , bgColor='',bgActColor='';
+        if(categoryLayout1ShowType === 'parentNew') {
+          actColoor = '#fff';
+          bgActColor = this.mainColor;
+        }
+
         const level2Name = gCPVal(container, 'level2Name', {
           fontSize: '24',
           actFontSize: '24',
-          color: gCPVal(container, 'level2Color', '') || '#333',
-          actColor: this.mainColor,
-          bgColor:'',
-          actBgColor:'',
+          color: color,
+          actColor:actColoor,
+          bgColor:bgColor,
+          actBgColor:bgActColor,
           fontWeight: 'normal',
           actFontWeight: 'normal',
-          borderStyle:'solid',
-          borderColor: 'rgba(0,0,0,0)',
-          borderWidth: 0,
-          borderActStyle:'solid',
-          borderActColor: 'rgba(0,0,0,0)',
-          borderActWidth:0,
         },{sKey:'level2NameStatus', fields:['level2Name','level2Color'],isMerge: true});
+        debugger
 
         const subTitleRadius = gCPVal(container, 'subTitleRadius', ['40rpx'],{sKey:'subTitleRadiusStatus', fields:['subTitleRadius']})||0;
         const subTitleIconShadow  = gCPVal(container, 'subTitleIconShadow', [this.gStyleValue.shadow,'none'], {isShadow:true});
@@ -956,7 +964,7 @@
         this.isFirst = false;
         clearTimeout(this.timer);
         this.timer = setTimeout(() => {
-          jfbRootExec("getMallProductList", {
+          jfbRootExec("getNewMallProductList", {
             vm: this,
             data: this.$xdUniHelper.deleteParamEmptyKey(data)
           })
@@ -1047,13 +1055,12 @@
       getCategoryList(){
         return new Promise((resolve)=>{
           if(this.showCategory==="Y") {
-            jfbRootExec("getMallCategoryTree", {
+            jfbRootExec("getNewMallCategoryTree", {
               vm: this,
               data: {
                 xnamespace: this.xnamespace,
-                parent_id: this.parentId,
+                root_category_id: Number(this.parentId),
                 level: 2,
-                need_rec: this.options.need_rec
               }
             })
               .then(res => {
@@ -1102,7 +1109,7 @@
       //过滤条件
       getSearchFilterList(){
         let data = this.getFilterListParams();
-        jfbRootExec("getSearchFilterList", {
+        jfbRootExec("getNewSearchFilterList", {
           vm: this,
           data: data
         }).then(res => {

package/src/components/JfbMallProductList/Mock.js

@@ -1,7 +1,7 @@
 "use strict";
 
 module.exports = {
-  getSearchFilterList: {
+  getNewSearchFilterList: {
     items: [
       {
         title: '配送方式',
@@ -93,7 +93,7 @@ module.exports = {
     ],
     request_id: "f1733f02aa8c9672"
   },
-  getMallProductList: {
+  getNewMallProductList: {
     total_size: 8,
     next_page_token: "1",
     list: [
@@ -443,7 +443,7 @@ module.exports = {
     ],
     request_id: "9512a165463ba45b"
   },
-  getMallCategoryTree: {
+  getNewMallCategoryTree: {
     items: [
       {
         category_name: "佳节礼品",
@@ -502,66 +502,5 @@ module.exports = {
       }
     ],
     request_id: "bf0aed811fd63214"
-  },
-  getMallCategoryChildren: {
-    items: [
-      {
-        category_name: "佳节礼品",
-        category_id: 10001,
-        category_icon:
-          "http://static.e56buy.com/XdnPLVzrdDzhdZJGZvy5Mt2QLhgtYZwV",
-        children: []
-      },
-      {
-        category_name: "粮油副食",
-        category_id: 10002,
-        category_icon:
-          "http://sandbox-img.jufubao.cn/uploads/20230406/2bcd668a78c0171f83ca68a9dfc2f8f5.jpeg",
-        children: []
-      },
-      {
-        category_name: "休闲食品",
-        category_id: 10003,
-        category_icon:
-          "http://sandbox-img.jufubao.cn/uploads/20230403/dadf68c84461a3a3f1caa30fe4debc2f.jpg",
-        children: []
-      },
-      {
-        category_name: "乳品饮料",
-        category_id: 10004,
-        category_icon:
-          "http://sandbox-img.jufubao.cn/uploads/20230324/008363a661eec227e2e1dd91ea6095e0.png",
-        children: []
-      },
-      {
-        category_name: "家纺用品",
-        category_id: 10005,
-        category_icon:
-          "http://sandbox-img.jufubao.cn/uploads/20230525/b432700f35328c44fc8b8c9f36a113f0.png",
-        children: []
-      },
-      {
-        category_name: "家用电器",
-        category_id: 10006,
-        category_icon:
-          "http://sandbox-img.jufubao.cn/uploads/20230525/a849865fcb85f7756285a2a96a90811b.jpg",
-        children: []
-      },
-      {
-        category_name: "日货用品",
-        category_id: 10007,
-        category_icon:
-          "http://sandbox-img.jufubao.cn/uploads/20230525/f56df5f334b392daaa539e74df269dbe.jpg",
-        children: []
-      },
-      {
-        category_name: "生鲜冷链",
-        category_id: 10008,
-        category_icon:
-          "http://static.e56buy.com/XdHO6sAVMAb8WzwPvtwoo1iuCxh8uWXp",
-        children: []
-      }
-    ],
-    request_id: "bf0aed811fd63214"
   }
 };

package/src/components/JfbMallProductList/XdCateV1.vue

@@ -57,6 +57,7 @@
                   <image :src="sub.category_icon" style="width:100%;height:100%"/>
                 </view>
               </view>
+              <view style="margin-top: 8rpx; height: 36rpx"></view>
               <view
                 class="sub_name"
                 :style="[sub.category_id === (['child','parentNew'].includes(showType)? uiPid:uiCateId )?level2ActNameComp:level2NameComp]"
@@ -332,13 +333,14 @@ export default {
 
   methods: {
     init(navList, pid){
+      debugger
       if(navList.length === 0) return;
 
       //预览模式生效
       if(this.isPreview) {
         navList = navList.filter(item=>{
           //显示父级显示全部分类
-          if(['all', 'parent','parentNew'].includes(this.showType)) return true
+          if(['all', 'parent','parentNew','child'].includes(this.showType)) return true
           //只显示子级去掉全部分类
           else return item.category_id !== -1
         });
@@ -353,6 +355,14 @@ export default {
         this.subCategory = navList[this.tabIndex].children;
       }
 
+      //图片样式作为一级显示时候(预览模式)
+      if(['child','parentNew'].includes(this.showType)) {
+        if(this.pid === '') {
+          this.uiPid = -1;
+          this.initPid = -1;
+        }
+      }
+
       this.transformNavList = navList;
       this.refreshNav = Date.now()
 
@@ -504,12 +514,17 @@ export default {
       align-content: center;
       flex-flow: nowrap;
 
+
       .sub_cate {
         display: inline-block;
         margin: 16rpx var(--sub-icon-right-sp) 16rpx 0;
         padding: 0 16rpx;
         text-align: center;
 
+        & > view {
+          position: relative;
+        }
+
         &:last-child {
           margin-right: 32rpx;
         }
@@ -541,6 +556,7 @@ export default {
           margin-top: 8rpx;
           overflow: hidden;
           white-space: wrap;
+          box-sizing: border-box;
           word-break: break-all;
           line-height: 36rpx;
           height: 36rpx;

package/src/components/JfbMallProductList/XdCateV2.vue

@@ -67,7 +67,7 @@
         <view :style="[subTitleIcon]" class="sub_icon">
           <image :src="item.category_icon" />
         </view>
-        <view :style="[(uiPid === item.category_id?level2ActNameComp:level2NameComp)]">{{item.category_name||item.name}}</view>
+        <view class="sub_name" :style="[(uiPid === item.category_id?level2ActNameComp:level2NameComp)]">{{item.category_name||item.name}}</view>
       </view>
     </view>
     <!--一级分类-->
@@ -160,14 +160,19 @@ export default {
     },
     cateBarStyleRLComp(){
       return {
-        backgroundColor: Color( this.styleConfig.backgroundColor).lighten(.2).hex().toString()
+        backgroundColor: Color( this.styleConfig.backgroundColor).lighten(.2).hex().toString(),
       }
     },
     cateBarStyleComp(){
+      let orderColor = '';
+      let {backgroundColor} = this.styleConfig;
+      if(Color(backgroundColor).isDark()) orderColor = Color(backgroundColor).lighten(0.8).toString();
+      else if(Color(backgroundColor).isLight()) orderColor = Color(backgroundColor).darken(0.05).toString();
+
       return {
         top: this.$configProject.isPreview?0:(this.layoutInfo.top) + 'rpx',
         backgroundColor: this.styleConfig.backgroundColor,
-        '--border-color': Color( this.styleConfig.backgroundColor).lighten(.5).hex().toString(),
+        '--border-color': orderColor,
         position: this.$configProject.isPreview?'absolute':'fixed',
       };
     },
@@ -195,7 +200,8 @@ export default {
     itemStyleComp(){
       return {
         width: this.getWidth(64,5) + 'px',
-        margin:'0 0 24rpx'
+        margin:'0 0 24rpx',
+        paddingBottom: '40rpx'
       }
     },
   },
@@ -362,7 +368,7 @@ export default {
       display: flex;
       justify-content: center;
       align-items: center;
-      border-left: 2rpx solid #f8f8f8;;
+      border-left: 4rpx solid var(--border-color);
       background: #FFFFFF;
       z-index: 1;
       flex-shrink: 0;
@@ -397,6 +403,19 @@ export default {
       align-items: center;
       font-size: 24rpx;
       color: #333333;
+      position: relative;
+
+      & > .sub_name {
+        left: 0!important;
+        right: 0!important;
+        text-align: center;
+        width: 100%!important;
+        overflow: hidden;
+        word-break: break-all;
+        white-space: wrap;
+        height: 36rpx;
+        line-height: 36rpx;
+      }
       &.active{
         color: var(--main-color);
       }

package/src/components/JfbMallProductList/cateMixins.js

@@ -25,9 +25,20 @@ export default {
         borderWidth:level2Name.borderWidth + 'rpx',
         borderColor:level2Name.borderColor,
         padding: padding,
-        borderRadius: radius
+        borderRadius: radius,
+        ...this.parentNewComp,
       }
     },
+
+    parentNewComp(){
+      return {
+        position: 'absolute',
+        bottom: '0',
+        left: '-16rpx',
+        width: `calc(100% + 32rpx)`
+      }
+    },
+
     level2ActNameComp(){
       if(this.$xdUniHelper.isEmpty(this.tabStyle)) return {}
       if(this.$xdUniHelper.isEmpty(this.tabStyle['level2Name'])) return {}
@@ -48,7 +59,8 @@ export default {
         borderWidth:level2Name.borderActWidth + 'rpx',
         borderColor:level2Name.borderActColor,
         padding: padding,
-        borderRadius: radius
+        borderRadius: radius,
+        ...this.parentNewComp,
       }
     },
 

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

@@ -6,7 +6,8 @@ import {
   customVal,
   cusDisabled ,
   getCustomAttr,
-  isArray
+  isArray,
+  isObject
 } from "@/utils/AttrTools";
 import PosterAttr from "@/utils/Attr/PosterAttr";
 import ProductAttr from "@/utils/Attr/ProductAttr";
@@ -172,7 +173,23 @@ export default (data, gValue,gColor,oldData)=>{
       inline:false,
       notice:'建议尺寸：128*128像素',
       rules: [
-        {required: true, message: '请上传全部图标', trigger: ['blur', 'change']},
+        {
+          validator: (rule, value, callback) => {
+            if(!value) callback('请上传全部图片图片');
+            else {
+              if(!isObject(value)){
+                callback('请上传全部图片图片');
+              }
+              else {
+                if(!value.url)callback('请上传全部图片图片');
+                else callback()
+              }
+            }
+          },
+          message: '请上传全部图片图片',
+          trigger: ['blur', 'change'],
+          required: true,
+        }
       ],
     },
     {
@@ -203,6 +220,20 @@ export default (data, gValue,gColor,oldData)=>{
       groupKey:'content',
       className: 'input100',
       hidden: categoryParentType === 'root',
+      rules: [
+        {
+          validator: (rule, value, callback) => {
+            if(categoryParentType === 'root')  callback();
+            else {
+              if(!value) callback('请输入父级分类ID');
+              else callback()
+            }
+          },
+          message: '请输入父级分类ID',
+          trigger: ['blur', 'change'],
+          required: true,
+        }
+      ],
     },
     {ele: 'group_end'},
     {

package/src/components/JfbMallProductList/cusAttr/filter.js

@@ -1,10 +1,13 @@
 'use strict';
 
 import {cRaBorShadow, dataVal, statusDataVal, statusShow} from "@/utils/AttrTools";
-const Color = require('color');
 
 export default (data, gValue, gColor, oldData)=>{
   let filterTopBorder = cRaBorShadow(data , 'filterTopBorder',{dValue:'D'}, gValue)
+  let filterBgcColor = '#fff';
+  if(gValue.isAdd && gValue.isFirst) {
+    if(data['category'] === 'v4') filterBgcColor = '#f8f8f8';
+  }
   return [
     {
       ele: 'title',
@@ -70,7 +73,7 @@ export default (data, gValue, gColor, oldData)=>{
       ele: 'xd-color',
       valueKey: 'filterBgcColor',
       groupKey:'style',
-      value: dataVal({data, key:'filterBgcColor', dValue:'#fff', gValue}),
+      value: dataVal({data, key:'filterBgcColor', dValue:filterBgcColor, gValue}),
       hidden: !statusShow({data, key: 'filterBgcColorStatus', fields:['filterBgcColor'], gValue}),
       classNmae: 'input80',
       setting: {
@@ -97,7 +100,7 @@ export default (data, gValue, gColor, oldData)=>{
       ele: 'xd-color',
       valueKey: 'filterColor',
       groupKey:'style',
-      value: dataVal({data, key:'filterColor', dValue:'#999', gValue}),
+      value: dataVal({data, key:'filterColor', dValue:'#333', gValue}),
       hidden: !statusShow({data, key: 'filterColorStatus', fields:['filterColor'], gValue}),
       classNmae: 'input80',
       setting: {

package/src/components/JfbMallProductList/cusAttr/icon.js

@@ -253,10 +253,10 @@ export default (data, gValue, gColor, oldData)=>{
       hidden: !statusShow({data, key: 'level2NameStatus', fields:['level2Name','level2Color'], gValue}) || disabled,
       setting: {
         fontSize: true,
-        weight:true,
+        weight:false,
         bgColor:true,
         selected:true,
-        isBorder:true,
+        isBorder:false,
         default: level2Name
       },
       handleCustom({action, data}) {

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

@@ -200,6 +200,7 @@ export default (data, gValue, gColor, oldData={})=>{
       hidden: !statusShow({data, key: 'titleRadiusStatus', fields:['titleRadius'], gValue}),
       placeholder: '请选择商品是否设置圆角',
       multiple: false,
+      isBackNotValue: true,
       className: 'input80',
       groupKey:'style',
       handleCustom({action, data}) {
@@ -409,7 +410,7 @@ export default (data, gValue, gColor, oldData={})=>{
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'contRadiusStatus',
-      value: statusDataVal({data, key:'contRadiusStatus',cValue:'N', fields:['contRadius'],gValue}),
+      value: statusDataVal({data,key:'contRadiusStatus',cValue:'N', fields:['contRadius'],gValue}),
       labelInline:true,
       list: [
         {label: '默认', value: 'D'},
@@ -428,6 +429,7 @@ export default (data, gValue, gColor, oldData={})=>{
       placeholder: '请选择商品是否设置圆角',
       multiple: false,
       className: 'input80',
+      isBackNotValue: true,
       groupKey:'style',
       handleCustom({action, data}) {
         XdBus.getParentApi('getOptionsSettingList')({
@@ -469,6 +471,7 @@ export default (data, gValue, gColor, oldData={})=>{
       placeholder: '请选择商品图圆角是否设置圆角',
       multiple: false,
       className: 'input80',
+      isBackNotValue: true,
       value: dataVal({data, key:'imageRadius', dValue:'10', gValue}),
       hidden: !statusShow({data, key: 'imageRadiusStatus', fields:['imageRadius'], gValue}),
       handleCustom({action, data}) {