取消登录校验限制

src/api/http.js

@@ -29,7 +29,7 @@ const checkResCode=(code,msg)=>{
         // 清除token，重新登录
         localStorage.removeItem('yben_token')
         localStorage.removeItem('user_info')
-        router.replace('/login')
+        //router.replace('/login')
       },1000)
       break;
     case 4013:

src/components/AvatarPopover.vue

@@ -1,10 +1,11 @@
 <script setup>
-import {bindPhone,loginOut,passwordChange} from '@/utils/common.js'
+import {bindPhone,loginOut,passwordChange,signUp} from '@/utils/common.js'
 
 const props=defineProps({
   userInfo:{}
 })
 
+const yb_token = localStorage.getItem('yben_token')
 </script>
 
 <template>
@@ -15,10 +16,10 @@ const props=defineProps({
     <template #reference>
         <div class="user-info-hover">
             <img src="@/assets/icons/avatar.svg" />
-            <span>{{userInfo.Name}}</span>
+            <span>{{userInfo.Name||''}}</span>
         </div>
     </template>
-    <div class="user-info-message">
+    <div class="user-info-message" v-if="yb_token">
         <div class="user-info-item">User Name：<span><span>{{userInfo.Name}}</span></span></div>
         <div class="user-info-item">Email Address：<span>{{userInfo.Email}}</span></div>
         <div class="user-info-item">Mobile Phone No：
@@ -37,6 +38,13 @@ const props=defineProps({
             <el-button plain @click="passwordChange" size="large" style="min-width: 100px;padding: 12px;">Update password</el-button>
         </div>
     </div>
+    <div class="user-info-message" v-else>
+        <div class="user-info-item">Please log in/sign up first</div>
+        <div style="margin-top: 30px;display: flex;align-items: center;justify-content: space-between;">
+            <el-button type="primary" @click="loginOut" size="large" style="min-width: 100px;background-color:#1856A7 ;">Log In</el-button>
+            <el-button plain @click="signUp" size="large" style="min-width: 100px;padding: 12px;">Sign Up</el-button>
+        </div>
+    </div>
   </el-popover>
 </template>
   

src/router/index.js

@@ -98,12 +98,13 @@ const shouldRedireact=['/report/index','/report/detail','/roadshow/detail']
 router.beforeEach((to, from, next) => {
   // console.log(to.path);
   // 做登录的权限判断
-  if(!localStorage.getItem('yben_token') && !whitelist.includes(to.path)){
+  //英文研报1.1 取消登录判断
+  /* if(!localStorage.getItem('yben_token') && !whitelist.includes(to.path)){
     if(shouldRedireact.includes(to.path)) sessionStorage.setItem('login_redirect',to.fullPath)
 
     next({path:'/login',replace:true})
     return 
-  }
+  } */
   if(to.query.ShareEmail){
     sessionStorage.setItem('shareId',to.query.ShareEmail)
   }

src/utils/common.js

@@ -43,7 +43,14 @@ export const goYBPCCN=()=>{
 // 去用户信息页面 - 移动端
 export const userInfoGo=()=>{
   let {href} = router.resolve("/my");
-  window.open(href,'_blank');
+  const yb_token = localStorage.getItem('yben_token')
+  if(yb_token){
+    window.open(href,'_blank');
+  }else{
+    //未注册直接走退出登录
+    loginOut()
+  }
+  
 }
 // 去绑定手机页面
 export const bindPhone=()=>{
@@ -60,4 +67,11 @@ export const loginOut=()=>{
 export const passwordChange=()=>{
   let {href} = router.resolve({path:"/passwordChange"});
   window.open(href,'_blank');
+}
+
+//去注册页(PC)
+export const signUp=()=>{
+    localStorage.removeItem('yben_token')
+    localStorage.removeItem('user_info')
+    isMobile()?router.push('/login'):router.push('/register')
 }