Browse Source

Merge branch 'bug-fix'

hbchen 2 years ago
parent
commit
78cf918c56

+ 1 - 1
src/api/auth.js

@@ -15,7 +15,7 @@ export const emailCodeSend=params=>{
 /**
  * 短信验证码
  * @param params.Mobile  手机号
- * @param params.Area_num  区号
+ * @param params.AreaNum  区号
  */
 export const smsCodeSend=params=>{
     return get('/auth/smsCode',params)

+ 3 - 0
src/api/http.js

@@ -67,6 +67,7 @@ _axios.interceptors.response.use(
       setTimeout(()=>{
         // 清除token,重新登录
         localStorage.removeItem('yben_token')
+        localStorage.removeItem('user_info')
         router.replace('/login')
       },1000)
     }else if(data.code==4013){
@@ -93,6 +94,8 @@ _axios.interceptors.response.use(
       }).catch(()=>{})
     }else if(data.code==4012){
       // 权限到期
+      localStorage.removeItem('user_info')
+      localStorage.removeItem('yben_token')
       ElMessageBox.confirm("Your trial has ended Enjoyed your experience with us? Contact us at stephanie@hzinsights.com to extend your trial.","Prompt",
       {
         customClass:isPhone()?'mobile-message-confirm':'PC-message-confirm',

+ 1 - 0
src/views/report/Detail.vue

@@ -134,6 +134,7 @@ const bindPhone=()=>{
 }
 const loginOut=()=>{
     localStorage.removeItem('yben_token')
+    localStorage.removeItem('user_info')
     router.push('/login')
 }
 const passwordChange=()=>{

+ 1 - 0
src/views/report/Index.vue

@@ -176,6 +176,7 @@ const bindPhone=()=>{
 }
 const loginOut=()=>{
     localStorage.removeItem('yben_token')
+    localStorage.removeItem('user_info')
     router.push('/login')
 }
 const passwordChange=()=>{

+ 1 - 0
src/views/roadShow/Detail.vue

@@ -139,6 +139,7 @@ const bindPhone=()=>{
 }
 const loginOut=()=>{
     localStorage.removeItem('yben_token')
+    localStorage.removeItem('user_info')
     router.push('/login')
 }
 const passwordChange=()=>{

+ 2 - 2
src/views/verification/bindPhoneNo.vue

@@ -51,7 +51,7 @@ import { TEL_CODE_ARR } from '../../utils/constant';
     refTemp.validateField(['newPhoneNo']).then(res=>{
       let codeParams={
         Mobile:bindPhone.form.newPhoneNo,
-        Area_num:bindPhone.form.newPhoneNoPre || '86'
+        AreaNum:bindPhone.form.newPhoneNoPre || '86'
       }
       smsCodeSend(codeParams).then(res=>{
         if(res.code!=200) return 
@@ -61,8 +61,8 @@ import { TEL_CODE_ARR } from '../../utils/constant';
         codeTimer=setInterval(()=>{
           if(codeInfo.timeout==1){
             codeInfo.isRequesting=false
+            clearInterval(codeTimer)
             codeInfo.timeout=60
-            codeTimer=null
           }
           codeInfo.timeout--
         },1000)

+ 1 - 1
src/views/verification/login.vue

@@ -159,8 +159,8 @@ import { TEL_CODE_ARR } from '../../utils/constant';
         codeTimer=setInterval(()=>{
           if(codeInfo.timeout==1){
             codeInfo.isRequesting=false
+            clearInterval(codeTimer)
             codeInfo.timeout=60
-            codeTimer=null
           }
           codeInfo.timeout--
         },1000)

+ 1 - 0
src/views/verification/mobileMyPage.vue

@@ -12,6 +12,7 @@ const router = useRouter()
   }
   const loginOut=()=>{
       localStorage.removeItem('yben_token')
+      localStorage.removeItem('user_info')
       router.push('/login')
   }
   const passwordChange=()=>{

+ 1 - 0
src/views/verification/passwordChange.vue

@@ -68,6 +68,7 @@ import { passwordDigitValidator } from './utils/validators';
             })
             setTimeout(()=>{
               localStorage.removeItem('yben_token')
+              localStorage.removeItem('user_info')
               router.replace('/login')
             },1000)
           }

+ 4 - 3
src/views/verification/passwordMissing.vue

@@ -74,9 +74,9 @@ const changeLoginType=(type)=>{
     passwordConfirm:'',
     verificationCode:''
   }
+  clearInterval(codeTimer)
   codeInfo.timeout=60
   codeInfo.isRequesting=false
-  codeTimer=null
   let refTemp;
   if(isPhone()){
     refTemp=psdMissingMobileRef.value
@@ -105,7 +105,7 @@ const changeLoginType=(type)=>{
       }else{
         let params={
           Mobile:psdMissing.form.phone,
-          Area_num:psdMissing.form.phonePre ||'86'
+          AreaNum:psdMissing.form.phonePre ||'86'
         }
         resp=await smsCodeSend(params)
       }
@@ -115,8 +115,8 @@ const changeLoginType=(type)=>{
       codeTimer=setInterval(()=>{
         if(codeInfo.timeout==1){
           codeInfo.isRequesting=false
+          clearInterval(codeTimer)
           codeInfo.timeout=60
-          codeTimer=null
         }
         codeInfo.timeout--
       },1000)
@@ -158,6 +158,7 @@ const changeLoginType=(type)=>{
             })
             setTimeout(()=>{
               localStorage.removeItem('yben_token')
+              localStorage.removeItem('user_info')
               router.replace('/login')
             },1000)
           }

+ 1 - 1
src/views/verification/register.vue

@@ -65,8 +65,8 @@ import { passwordDigitValidator } from './utils/validators';
         codeTimer=setInterval(()=>{
           if(codeInfo.timeout==1){
             codeInfo.isRequesting=false
+            clearInterval(codeTimer)
             codeInfo.timeout=60
-            codeTimer=null
           }
           codeInfo.timeout--
         },1000)