Merge remote-tracking branch 'origin/master'

马宇豪

2023-07-21 fc38d1c92f01a224e8373c4425481bb1d85e2bf3

 pages/index/index.vue

@@ -47,7 +47,7 @@
         uni.clearStorage();
      },
      onLoad() {
         this.connect()
         // this.connect()
      },
      methods: {
         Login(){
@@ -58,10 +58,10 @@
                  this.isLogining = false;
                   //登录成功后
                   //设置别名
                  jpushModule.setAlias({
                     'alias': this.phone,
                     'sequence': 1
                  })
                  // jpushModule.setAlias({
                  //    'alias': this.phone,
                  //    'sequence': 1
                  // })
                  uni.setStorageSync("tk", res.data.tk);
                  uni.setStorageSync("uid",res.data.uid);
                  uni.setStorageSync('user', res.data);
@@ -81,7 +81,7 @@
                  }else{
                     this.$store.commit('setRoleId', 'user_leader');
                     uni.switchTab({
                              url: '/pages/tabBar/examine/examine'
                              url: '/pages/tabBar/firstPage/firstPage'
                          });
                  }
               }