jufubao-mall 2.0.31-beta102 → 2.0.31-beta104

package/package.json

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

package/src/components/JfbMallNavigation/JfbMallNavigation.vue

@@ -51,11 +51,14 @@
           >
             <view class="product_scroll_inner" :style="rightNavStyleComp">
               <view v-if="!hasTop" style="height: 24rpx;"></view>
-              <view class="product_group" v-for="cate in categoryList" :key="cate.category_id"
+              <view class="product_group" v-for="(cate, index) in categoryList" :key="cate.category_id"
                 :id="getID(cate)"
                 :data-next="cate.nextHeight"
               >
-                <view v-if="cate.navigation && cate.navigation.ad_image_url" class="group_ad" @click="handleAdClick(cate)">
+                <view v-if="$configProject['isPreview'] && index===0" class="group_ad">
+                  <image mode="widthFix" src="https://sandbox-img.jufubao.cn/uploads/20251209/3a84bbc1f93fa3b41f62b2c04a83a2c4.png?x-oss-process=style/size3&ver=1766743768"></image>
+                </view>
+                <view v-else-if="cate.navigation && cate.navigation.ad_image_url" class="group_ad" @click="handleAdClick(cate)">
                   <image mode="widthFix" :src="getServiceUrl(cate.navigation.ad_image_url)"></image>
                 </view>
                 <view v-else class="group_title">{{cate.category_name}}</view>
@@ -78,7 +81,7 @@
         </view>
       </view>
       <view v-else>
-        <xd-no-data>暂无数据</xd-no-data>
+        <xd-no-data :scaleSize="2">暂无数据</xd-no-data>
       </view>
     </view>
   </view>
@@ -210,10 +213,7 @@
         let itemWidth = this.rightNavImgSize;
         return {
           width: itemWidth + 'rpx',
-          borderRadius: this.rightNavItemRadius + 'rpx',
-          border: this.getBorderCompatibleOldStyle(this.rightNavItemBorder, {}),
-          boxShadow: this.rightNavItemShadow,
-          backgroundColor: this.rightNavItemBGColor,
+          
         }
       },
       rightNavItemImgStyleComp(){
@@ -221,7 +221,11 @@
         let imgW = itemWidth - this.rightNavItemPadding * 2;
         return {
           width: imgW + 'rpx',
-          height: imgW + 'rpx'
+          height: imgW + 'rpx',
+          borderRadius: this.rightNavItemRadius + 'rpx',
+          backgroundColor: this.rightNavItemBGColor,
+          boxShadow: this.rightNavItemShadow,
+          border: this.getBorderCompatibleOldStyle(this.rightNavItemBorder, {}),
         }
       },
       rightNavItemNameStyleComp(){
@@ -309,7 +313,7 @@
         this.template_id = gCPVal(container, 'template_id', '');
         this.bodyPadding = gCPVal(container,'bodyPadding', [0], {sKey:'bodyPaddingStatus',fields:['bodyPadding'],isPMR: true});
         this.navTopMargin = gCPVal(container,'navTopMargin', [0], {sKey:'navTopMarginStatus',fields:['navTopMargin'],isPMR: true});
-        this.navTopPadding = gCPVal(container,'navTopPadding', [{top: 16,left: 24, bottom: 16, right: 24}], {sKey:'navTopPaddingStatus',isPMR: true});
+        this.navTopPadding = gCPVal(container,'navTopPadding', [{top: 16,left: 12, bottom: 16, right: 12}], {sKey:'navTopPaddingStatus',isPMR: true});
         this.navTopBg = gCPVal(container,'navTopBg', '#FFFFFF', {sKey:'navTopBgStatus'});
         this.navTopImgSize = gCPVal(container,'navTopImgSize', 120, {sKey:'navTopImgSizeStatus'});
         this.navTopItemPadding = gCPVal(container,'navTopItemPadding', 0, {sKey:'navTopItemPaddingStatus'});
@@ -336,7 +340,7 @@
         this.rightNavItemBGColor = gCPVal(container, 'rightNavItemBGColor', '#FFFFFF', {sKey:'rightNavItemBGColorStatus'});
         this.rightNavItemShadow = gCPVal(container, 'rightNavItemShadow', {color: '#eee',width: '0'}, {isShadow: true});
         this.rightNavItemBorder = gCPVal(container, 'rightNavItemBorder', {});
-        this.rightNavItemRadius = gCPVal(container,'rightNavItemRadius', 0, {sKey:'rightNavItemRadiusStatus'});
+        this.rightNavItemRadius = gCPVal(container,'rightNavItemRadius', 16, {sKey:'rightNavItemRadiusStatus'});
         this.rightNavItemFontColor = gCPVal(container,'rightNavItemFontColor', '#666666', {sKey:'rightNavItemFontStatus', fields: ['rightNavItemFontSize', 'rightNavItemFontColor']});
         this.rightNavItemFontSize = gCPVal(container,'rightNavItemFontSize', 24, {sKey:'rightNavItemFontStatus', fields: ['rightNavItemFontSize', 'rightNavItemFontColor']});
         console.log("this.rightNavItemFontSize", this.rightNavItemFontSize);
@@ -379,9 +383,12 @@
       handleToDetail(sub, parent){
         console.log('handleToDetail', sub, parent);
         let navObj = parent.navigation;
+        let extParams = {};
+        if(navObj.business_code) extParams.xnamespace = navObj.business_code;
         if(navObj.data_source === 'product_category'){
           //商品分类
-          this.handleLink(navObj.redirect_type, navObj.redirect_data, {category_id: sub.id});
+          extParams.category_id = sub.id;
+          this.handleLink(navObj.redirect_type, navObj.redirect_data, extParams);
         }else if(navObj.data_source === 'product_brand'){
           //品牌
           let redirect_type, redirect_data;
@@ -398,18 +405,24 @@
             redirect_type = navObj.offline_redirect_type;
             redirect_data = navObj.offline_redirect_data;
           }
-          this.handleLink(redirect_type, redirect_data, {brand_id: sub.id});
+          extParams.brand_id = sub.id;
+          if(navObj.data_json && navObj.data_json.brand_type) extParams.brand_type = navObj.data_json.brand_type;
+          this.handleLink(redirect_type, redirect_data, extParams);
         }else if(navObj.data_source === 'custom'){
           //自定义
-          this.handleLink(sub.redirect_type, sub.redirect_data);
+          this.handleLink(sub.redirect_type, sub.redirect_data, extParams);
         }
       },
       handleAdClick(parent){
         let navObj = parent.navigation;
-        this.handleLink(navObj.redirect_type, navObj.redirect_data);
+        let extParams = {};
+        if(navObj.business_code) extParams.xnamespace = navObj.business_code;
+        this.handleLink(navObj.ad_redirect_type, navObj.ad_redirect_data, extParams);
       },
       handleTopClick(item){
-        this.handleLink(item.redirect_type, item.redirect_data)
+        let extParams = {};
+        if(item.business_code) extParams.xnamespace = item.business_code;
+        this.handleLink(item.redirect_type, item.redirect_data, extParams);
       },
       handleLink(redirect_type, redirect_data, otherParams = {}){
         var item = {redirect_type};
@@ -420,6 +433,27 @@
             let app_code = rData.all.app.aopen_app_code;
             let app_type= rData.all.app.appType;
             let rParams = rData.params || {};
+
+            for(let key in rParams){
+              if(Array.isArray(rParams[key])){
+                let cur = rParams[key];
+                let pStr = "";
+                for(let iKey in cur){
+                  if(typeof cur[iKey] === 'string' || typeof cur[iKey] === 'number'){
+                    pStr += `,${cur[iKey]}`;
+                  }else if(typeof cur[iKey] === 'object' && cur[iKey].value){
+                    pStr += `,${cur[iKey].value}`;
+                  }
+                }
+                rParams[key] = pStr.substring(1);
+              }
+              if(typeof rParams[key] === 'object'){
+                if(rParams[key].value){
+                  rParams[key] = rParams[key].value;
+                }
+              }
+            }
+
             let customParams = rData.customParams || "";
             let redirectData = {
               page: value,
@@ -509,15 +543,16 @@
         this.cateIndex = index;
         this.loadCateIndex = index;
         let curCate = this.categoryList[index];
-        this.prodScrollIntoView = this.getID(curCate);
+        
         //是否最后一个分类
         if(this.cateIndex === this.categoryList.length - 1){
           await this.loadPreCateProduct(index);
         }
         //当前分类未加载过，则加载当前分类数据
         if(!curCate.loaded){
-          this.p_getSubCateList();
+          await this.p_getSubCateList();
         }
+        this.prodScrollIntoView = this.getID(curCate);
         setTimeout(()=>{
           this.pointerScroll = true;
         }, 500)
@@ -703,6 +738,11 @@
       },
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
+        // this.categoryList = [];
+        // this.cateIndex = 0;
+        // this.loadCateIndex = 0;
+        // this.pointerScroll = true;
+        // this.onJfbLoad(options);
       },
       onJfbHide(options) {
         console.log('event.onJfbHide', options)
@@ -729,19 +769,19 @@
       box-sizing: border-box;
       .nav_top{
         background-color: #FFFFFF;
-        padding: 16rpx 24rpx;
+        padding: 16rpx 12rpx;
         .cate_item{
-          margin: 8rpx 22rpx 8rpx 0;
-          &:nth-child(5n){
-            margin-right: 0;
-          }
+          margin: 8rpx 12rpx;
+          // &:nth-child(5n){
+          //   margin-right: 0;
+          // }
         }
       }
       .nav_main{
         display: flex;
         box-sizing: border-box;
         .left_nav{
-          width: 160rpx;
+          width: 152rpx;
           background-color: #F8F8F8;
           font-size: 24rpx;
           color: #333333;
@@ -793,10 +833,17 @@
             }
             .group_ad{
               width: 100%;
+              border-radius: 16rpx 16rpx 0 0;
+              overflow: hidden;
               image{
                 width: 100%;
                 display: block;
               }
+
+              & + .product_list{
+                border-top-left-radius: 0;
+                border-top-right-radius: 0;
+              }
             }
             .product_list{
               background: #FFFFFF;
@@ -812,12 +859,13 @@
               }
             }
             .cate_item{
-              margin: 20rpx 28rpx;
-              &:nth-child(3n){
-                margin-right: 0;
-              }
+              margin: 20rpx 26rpx;
+              // &:nth-child(3n){
+              //   margin-right: 0;
+              // }
               .cate_img{
                 box-shadow: 0 0 6rpx rgba(0, 0, 0, 0.08);
+                border-radius: 16rpx;
               }
               .cate_name{
                 margin-top: 10rpx;
@@ -840,6 +888,7 @@
           align-items: center;
           padding: 12rpx;
           box-sizing: border-box;
+          overflow: hidden;
           image{
             width: 100%;
             height: 100%;

package/src/components/JfbMallNavigation/cusAttr/advanced.js

@@ -2,15 +2,5 @@
 
 export default (data)=>{
     return [
-
-      {
-        label: '版本号:',
-        ele: 'el-input',
-        type: 'text',
-        groupKey: 'advanced',
-        valueKey: 'version',
-        value: 'v2.0',
-        hidden: true,
-      },
     ]
 }

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

@@ -95,5 +95,14 @@ export default function (data, gValue,gColor,oldData){
           });
       },
     },
+    {
+      label: '版本号:',
+      ele: 'el-input',
+      type: 'text',
+      groupKey: 'content',
+      valueKey: 'version',
+      value: 'v2.0',
+      hidden: true,
+    },
   ].filter(i=>i);
 }

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

@@ -854,7 +854,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       ele: 'xd-site-select-list',
       labelInline: true,
       valueKey: 'rightNavItemRadius',
-      value: dataVal({data, key:'rightNavItemRadius', dValue:'10', gValue}),
+      value: dataVal({data, key:'rightNavItemRadius', dValue:'16', gValue}),
       hidden: !statusShow({data, key: 'rightNavItemRadiusStatus', fields:['rightNavItemRadius'], gValue}),
       placeholder: '请选择图标是否设置圆角',
       multiple: false,