Merge remote-tracking branch 'origin/dev_cd' into dev_cd

pages/binding/index.vue

@@ -182,6 +182,8 @@ export default {
                 this.superiorParam = "0"
             }
             jumpUrl += "?index=" + this.superiorParam
+        }else{
+            jumpUrl += "?id=" + this.superiorParam
         }
       //跳转到绑定页面
       uni.reLaunch({ //信息更新成功后跳转到小程序首页
@@ -220,9 +222,11 @@ export default {
     if(e && e.url){
         this.superiorUrl = e.url
         if(e.index){
-            console.log(e.index)
            this.superiorParam = e.index 
         }
+        if(e.id){
+            this.superiorParam = e.id 
+        }
         
     }
      // #ifdef MP-WEIXIN

pages/main.vue

@@ -122,11 +122,11 @@ export default {
     },
     onLoad(option) {
         if(option && option.index){
-            console.log(option.index)
-            console.log("---------------------------")
-            
             this.$nextTick(() => {
                 let i = parseInt(option.index);
+                if(!i){
+                    i= 0;
+                }
                 this.tabChange(i)
                 this.$refs.myTab.current = i;
             });

pages/personal.vue

@@ -160,6 +160,13 @@ export default {
 
         },
         editInfo() {
+            let token = uni.getStorageSync('userToken');
+            if(!token){
+                uni.navigateTo({
+                    url: '/pages/binding/index?url=/pages/main&index=4'
+                })
+                return;
+            }
             uni.navigateTo({
                 url: '/pagesD/pages/personal/userInfo'
             });

pagesC/pages/shop/detail.vue

@@ -43,6 +43,13 @@ export default {
     },
     methods: {
         pay(){
+            let token = uni.getStorageSync('userToken');
+            if(!token){
+                uni.navigateTo({
+                    url: '/pages/binding/index?url=/pagesC/pages/shop/detail&id=' + this.id
+                })
+                return;
+            }
             uni.navigateTo({
                 url: '/pagesC/pages/shop/pay?id=' + this.id
             })