jufubao-mall 2.0.31-beta103 → 2.0.31-beta104

package/package.json

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

package/src/components/JfbMallNavigation/JfbMallNavigation.vue

@@ -213,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(){
@@ -224,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(){
@@ -339,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);
@@ -439,12 +440,12 @@
                 let pStr = "";
                 for(let iKey in cur){
                   if(typeof cur[iKey] === 'string' || typeof cur[iKey] === 'number'){
-                    pStr += `${cur[iKey]},`;
+                    pStr += `,${cur[iKey]}`;
                   }else if(typeof cur[iKey] === 'object' && cur[iKey].value){
-                    pStr += `${cur[iKey].value},`;
+                    pStr += `,${cur[iKey].value}`;
                   }
                 }
-                rParams[key] = pStr;
+                rParams[key] = pStr.substring(1);
               }
               if(typeof rParams[key] === 'object'){
                 if(rParams[key].value){
@@ -542,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)
@@ -736,11 +738,11 @@
       },
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
-        this.categoryList = [];
-        this.cateIndex = 0;
-        this.loadCateIndex = 0;
-        this.pointerScroll = true;
-        this.onJfbLoad(options);
+        // this.categoryList = [];
+        // this.cateIndex = 0;
+        // this.loadCateIndex = 0;
+        // this.pointerScroll = true;
+        // this.onJfbLoad(options);
       },
       onJfbHide(options) {
         console.log('event.onJfbHide', options)
@@ -886,6 +888,7 @@
           align-items: center;
           padding: 12rpx;
           box-sizing: border-box;
+          overflow: hidden;
           image{
             width: 100%;
             height: 100%;

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,