jufubao-mall 2.0.31-beta104 → 2.0.31-beta106

package/package.json

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

package/src/components/JfbMallNavigation/JfbMallNavigation.vue

@@ -186,13 +186,8 @@
       },
       topNavItemStyleComp(){
         let itemWidth = this.navTopImgSize;
-        let border = this.getBorderCompatibleOldStyle(this.navTopItemBorder, {});
         return {
           width: itemWidth + 'rpx',
-          borderRadius: this.navTopItemRadius + 'rpx',
-          border,
-          boxShadow: this.navTopItemShadow,
-          backgroundColor: this.navTopItemBGColor,
         }
       },
       topNavItemImgStyleComp(){
@@ -200,7 +195,11 @@
         let imgW = itemWidth - this.navTopItemPadding * 2;
         return {
           width: imgW + 'rpx',
-          height: imgW + 'rpx'
+          height: imgW + 'rpx',
+          borderRadius: this.navTopItemRadius + 'rpx',
+          border: this.getBorderCompatibleOldStyle(this.navTopItemBorder, {}),
+          boxShadow: this.navTopItemShadow,
+          backgroundColor: this.navTopItemBGColor,
         }
       },
       topNavItemNameStyleComp(){
@@ -424,16 +423,41 @@
         if(item.business_code) extParams.xnamespace = item.business_code;
         this.handleLink(item.redirect_type, item.redirect_data, extParams);
       },
+      isCurSite(app){
+        let deploy_dir = this.projectAttr.deploy_dir;
+        let host = this.projectAttr.host;
+        if(app.dir === deploy_dir && app.host === host){
+          return true;
+        }
+        return false;
+      },
       handleLink(redirect_type, redirect_data, otherParams = {}){
         var item = {redirect_type};
         if(redirect_type === 'INN'){
           try{
             let rData = JSON.parse(redirect_data);
-            let value = rData.all.app.value;
+            let app = rData.all.app;
             let app_code = rData.all.app.aopen_app_code;
             let app_type= rData.all.app.appType;
             let rParams = rData.params || {};
 
+            //是否当前站点
+            item.app_type = app_type;
+            let value = "";
+            // #ifdef MP-WEIXIN
+            value = rData.all.app.value;
+            if(this.isCurSite(app)){
+              item.app_type = "";
+            }
+            // #endif
+            // #ifdef H5
+            if(this.isCurSite(app)){
+              value = rData.all.app.value;
+            }else{
+              value = `@site_domain@/${app.dir}/` + rData.all.app.value;
+            }
+            // #endif
+
             for(let key in rParams){
               if(Array.isArray(rParams[key])){
                 let cur = rParams[key];
@@ -459,7 +483,7 @@
               page: value,
               app_code: app_code
             }
-            item.app_type = app_type;
+            
             let redirect_params = this.$xdUniHelper.jsonToParams({...otherParams, ...rParams});
             item.redirect_params = redirect_params ? `${redirect_params}&${customParams}` : customParams;
             item.redirect_data = JSON.stringify(redirectData);
@@ -543,7 +567,7 @@
         this.cateIndex = index;
         this.loadCateIndex = index;
         let curCate = this.categoryList[index];
-        
+        this.prodScrollIntoView = null;
         //是否最后一个分类
         if(this.cateIndex === this.categoryList.length - 1){
           await this.loadPreCateProduct(index);

package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue

@@ -524,7 +524,13 @@
           data: data
         })
           .then(res => {
-            this.searchFilterList = res.items || [];
+            this.searchFilterList = (res.items || []).map(item => {
+              item.options = item.options.map(it=>{
+                it.value = it.value + '';
+                return it;
+              });
+              return item;
+            });
             this.$xdHideLoading();
           })
           .catch(err => {

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

@@ -284,8 +284,6 @@ export default (data, gValue, gColor, oldData) => {
         type: 'notice', //normal,notice,privacy
         isNew: true,
       },
-      notice: '商品详情里头部显示的固定内容',
-      inline: false,
       handleCustom({ action, data }) {
         if (data && data.params) {
           //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接

package/src/components/JfbMallResourceShopList/JfbMallResourceShopList.vue

@@ -499,6 +499,10 @@
           this.$set(this.searchFilterParams, 'brand', options['brand_ids'].split(','));
           delete options['brand_ids'];
         }
+        if(options['brand_id']){
+          this.brand_id = options['brand_id'];
+          delete options['brand_id'];
+        }
         if(options['shop_category_ids']) {
           this.$set(this.searchFilterParams, 'shop', options['shop_category_ids'].split(','));
           delete options['shop_category_ids'];