Merge branch 'master' into 1.4.0

src/configs/axios.ts

@@ -15,7 +15,8 @@ export enum ApiResult{
 	'TOKEN_INVALID' = 10000,
 	'TOKEN_ILLEGAL' = 10001,
 	'REMOTE_LOGIN' = 10010,
-	'STATIC_ACCESS' = 20005
+	'STATIC_ACCESS' = 20005,
+	'SCANNING_STATE' = 10008
 }
 
 export enum VipType{

src/store/user.ts

@@ -20,7 +20,7 @@ const st: StorageLike = {
 }
 
 export interface UserLoginResult {
-    status:'ERROR'|'CHOSEN'|'SUCCESS',
+    status:'ERROR'|'CHOSEN'|'SUCCESS'|'UNSWEPT',
     verify:boolean,
     data?:any[]
 }
@@ -131,9 +131,10 @@ export const useUserStore = defineStore('user', {
                         return { status:'CHOSEN', data:response.data.data } as UserLoginResult
                     }
                     
-                } else return { status:'ERROR'} as UserLoginResult
+                } else if(response.data.resultCode == ApiResult.SCANNING_STATE) return { status:'UNSWEPT'} as UserLoginResult
+                else return { status:'ERROR'} as UserLoginResult
             } catch (error) {}
-            return { status:'ERROR',verify:true } as UserLoginResult
+            return { status:'ERROR' } as UserLoginResult
         },
         async setUserPasswordLoginAsync(account:string,pwd:string,vtoken:string,tid:string='') {
             try {

src/views/Auth/components/wechatLogin.vue

@@ -82,6 +82,10 @@ const userLoginHandler = async ()=>{
             localStorage.setItem('sure_invite',JSON.stringify(inviteInfo.value))
         }
         location.href='/space';
+    }else if(result.status=='ERROR') {
+        stopTimerHandler()
+        qrCode.value = ''
+        ElMessage.error({message:'一维码已失效，请重新获取'})
     }
 }
 

src/views/Editor/PlayView.vue

@@ -24,7 +24,7 @@ const screenStore = useScreenStore()
 const sellHistoryTripTemplate = async () => {
     const id = parseInt(params.id.toString())
     const logId = parseInt(params.logId.toString())
-    const status = parseInt(params.logId.toString())
+    const status = parseInt(params.status.toString())
     const loadingObj = ElLoading.service({
       text:'正在渲染数据',
       lock:true