Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

src/pages/home/index.vue

@@ -386,6 +386,9 @@ export default {
             link:linkVal,
           });
         }
+        if(res &&
+          res.id
+        ){
           app.fenxiaoModel.getDistributorHomepage(res).then(ele=>{
             if(ele.id) {
               this.getDistributorHomepageName = '我的小店';
@@ -393,6 +396,7 @@ export default {
               this.getDistributorHomepageName = '一键开店';
             }
           });
+        }
         if(
           res&&
           res.parentSpokesmanDistributionModel == '1'&& 

src/pages/wxArticle/index.vue

@@ -29,7 +29,7 @@ export default {
     };
   },
   async onLoad(options) {
-    console.log(options, '第三方页面');
+    console.log(options, "第三方页面");
     /**
      * scene=sso 第三方需要登录的页面
      * login=1   jwt需要登录（临时方案）
@@ -56,13 +56,15 @@ export default {
           this.getSsoBcakUrl(decodeURIComponent(options.link));
         }
       } else if (getUrlKey(decodeURIComponent(options.link), "login") != "1") {
-        this.link = decodeURIComponent(options.link);
+        this.setLink(decodeURIComponent(options.link));
       } else {
         if (wx.getStorageSync("sessionid")) {
-          this.link = forUrlAddKey(decodeURIComponent(options.link), {
+          this.setLink(
+            forUrlAddKey(decodeURIComponent(options.link), {
               token: wx.getStorageSync("sessionid"),
               jwt: 1,
-          });
+            })
+          );
         } else {
           let url = `/pages/login/main?scene=sso&back=${options.link}`;
           wx.navigateTo({
@@ -119,6 +121,9 @@ export default {
     };
   },
   methods: {
+    setLink(data) {
+      this.link = data;
+    },
     getSsoBcakUrl(link) {
       let op = {
         callbackUrl: link,
@@ -130,9 +135,8 @@ export default {
         wxAvatarUrl: this.$store.state.userInfo.avatarUrl,
       };
       login.getSsoBcakUrl(op).then((res) => {
-        console.log(res, this.link, 555444);
         if (res.data.code == "200") {
-          this.link = res.data.data;
+          this.setLink(res.data.data);
         } else {
           wx.showToast({ title: res.data.msg, icon: "none" });
         }

src/pages/wxPay/index.vue

@@ -158,9 +158,11 @@ export default {
                   }
                   // sso场景（跳转第三方url）
                   if (_this.scene == "sso") {
+                    setTimeout(() => {
                       wx.redirectTo({
                         url: `../wxArticle/main?from=sso&link=${_this.backUrl}`,
                       });
+                    }, 500);
                     return;
                   }
 

static/nativeComponents/GoodsList/index.js

@@ -351,9 +351,9 @@ const componentOptions = {
       let linkVal = "";
       if (goodsType != 1) {
         if (style == "list") {
-          linkVal = `/goodsSearch/goodsSearch?categoryName=${categoryName}&categoryId=${categoryId}`;
+          linkVal = `/goods/commodityMenu?categoryName=${categoryName}&categoryId=${categoryId}`;
         } else {
-          linkVal = `/goodsSearch/goodsSearch`;
+          linkVal = `/goods/commodityMenu`;
         }
       } else {
         linkVal = `/pointShop/productList?categoryName=${categoryName}&categoryId=${categoryId}`;

static/nativeComponents/GoodsList/index.wxml

@@ -86,7 +86,7 @@
       >
         <goods-item
           datas="{{datas}}"
-				 items="{{datas.componentData.goodsList[index]}}"
+          items="{{goodsList[index]}}"
           indexs="{{index}}"
         ></goods-item>
       </view>