bug fixes

src/pages/login/login.vue

@@ -160,9 +160,11 @@ export default {
             this.wechatLogin()
             return
           }
-          if (Cookies.get('wechat_login_error')) {
+          const error = Cookies.get('wechat_login_error')
+          if (error) {
+            this.$toast(error)
             Cookies.remove('wechat_login_error', { domain: '.ezijing.com' })
-            wx.miniProgram.navigateBack()
+            // wx.miniProgram.navigateBack()
           }
         }
       }

src/pages/my/index.vue

 <template>
   <div>
     <div class="info-box">
-      <img v-if="info.avatar" :src="info.avatar" alt="">
-      <img v-else src="../../assets/images/tx.png" alt="">
+      <img v-if="info.avatar" :src="info.avatar" />
+      <img v-else src="../../assets/images/tx.png" />
       <div class="name" v-if="info.nickname">{{ info.nickname }}</div>
       <div class="name" v-else @click="goLogin">点击登录</div>
     </div>
     <ul>
       <li v-for="(item, index) in navList" :key="index" @click="go(item.url)">
         <div class="title">{{ item.title }}</div>
-        <van-icon name="arrow" class="icon"/>
+        <van-icon name="arrow" class="icon" />
       </li>
     </ul>
-    <div class="login-out" @click="logout">
-      退出登录
-      <!-- <van-button type="default" >退出登录</van-button> -->
-    </div>
+    <div class="login-out" @click="logout">退出登录</div>
   </div>
 </template>
 
@@ -58,7 +55,6 @@ export default {
   methods: {
     logout() {
       logout().then(response => {
-        console.log(response, '======')
         this.$toast('退出成功')
       })
     },
@@ -74,17 +70,11 @@ export default {
     goLogin() {
       if (this.isWeapp) {
         // 小程序
-        wx.miniProgram.navigateTo({
-          url: `/pages/login/index?redirect_uri=${encodeURIComponent(
-            `/exam/result?type=${this.$route.query.type}&is_create=0&papersUrl=${this.$route.query.papersUrl}`
-          )}`
-        })
+        wx.miniProgram.navigateTo({ url: '/pages/login/index' })
       } else {
         this.$router.push({
           path: '/login',
-          query: {
-            redirect_uri: '/my'
-          }
+          query: { redirect_uri: window.location.href }
         })
       }
     }
@@ -97,51 +87,51 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .info-box{
+.info-box {
   display: flex;
   align-items: center;
   height: 2rem;
-    img{
+  img {
     width: 1.2rem;
     height: 1.2rem;
-      margin:0 .2rem 0 .4rem;
+    margin: 0 0.2rem 0 0.4rem;
   }
-    .name{
-      font-size: .34rem;
+  .name {
+    font-size: 0.34rem;
     color: #222;
   }
-  }
-  ul{
-    padding: 0 .4rem;
-    li{
+}
+ul {
+  padding: 0 0.4rem;
+  li {
     height: 1.1rem;
-      border-bottom: .01rem solid rgba(238,238,238,1);
+    border-bottom: 0.01rem solid rgba(238, 238, 238, 1);
     display: flex;
     align-items: center;
-      .title{
-        font-size: .3rem;
+    .title {
+      font-size: 0.3rem;
       color: #222;
     }
-      .icon{
+    .icon {
       margin-left: auto;
     }
   }
-    li:last-child{
+  li:last-child {
     border: none;
   }
-  }
-  .login-out{
+}
+.login-out {
   position: absolute;
   bottom: 2rem;
   left: 50%;
   -webkit-transform: translateX(-50%);
-    width:6.7rem;
-    height:.7rem;
-    background:rgba(247,247,247,1);
-    border-radius:.12rem;
+  width: 6.7rem;
+  height: 0.7rem;
+  background: rgba(247, 247, 247, 1);
+  border-radius: 0.12rem;
   text-align: center;
-    line-height: .7rem;
-    font-size: .3rem;
+  line-height: 0.7rem;
+  font-size: 0.3rem;
   color: #ccc;
-  }
+}
 </style>