jufubao-mall 2.0.20-beta6 → 2.0.20-beta7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.20-beta6",
+  "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

@@ -412,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  {
@@ -451,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;
@@ -476,6 +474,7 @@
         }
         return style
       },
+
       tabItemNameStyle(){
         if(this.layout === 'v2') return {
           fontSize: parseInt(this.titleStyle.fontSize) + 'rpx',
@@ -776,8 +775,10 @@
 
       switchTab(i){
         this.tabIndex = i;
+        this.brandList = null
         this.getList();
       },
+
       getList(){
         this.$xdShowLoading({});
         let params = {
@@ -788,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;
@@ -799,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});
             }
@@ -818,6 +822,7 @@
           })
         })
       },
+
       toBrand(brand){
         if(this.isPreview) return;
         let { params , brand_id} = brand;

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,
@@ -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/JfbMallProductList.vue

@@ -964,7 +964,7 @@
         this.isFirst = false;
         clearTimeout(this.timer);
         this.timer = setTimeout(() => {
-          jfbRootExec("getMallProductList", {
+          jfbRootExec("getNewMallProductList", {
             vm: this,
             data: this.$xdUniHelper.deleteParamEmptyKey(data)
           })
@@ -1109,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/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>
     <!--一级分类-->
@@ -200,7 +200,8 @@ export default {
     itemStyleComp(){
       return {
         width: this.getWidth(64,5) + 'px',
-        margin:'0 0 24rpx'
+        margin:'0 0 24rpx',
+        paddingBottom: '40rpx'
       }
     },
   },
@@ -402,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);
       }