Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc

src/views/main.vue

@@ -144,7 +144,7 @@
       </svg>
       <!-- </div> -->
       <div v-if="!isLogin">
-        <router-link to="/list" style="display: inline-block; width: 100%">注册/登录</router-link>
+        <router-link to="/login" style="display: inline-block; width: 100%">注册/登录</router-link>
       </div>
       <div v-else>
         <router-link to="/list" style="display: inline-block; width: 100%">进入稻田</router-link>
@@ -367,7 +367,7 @@ export default {
         } else {
           this.routertitleindex = 7
         }
-        if (to.fullPath == '/login') {
+        if (to.fullPath == '/login' || !localStorage.getItem("LOGIN_DATA")) {
           this.loginPage = true
           this.isLogin = false
         } else {