Merge branch 'master' into dev-cym

src/router/index.ts

@@ -108,9 +108,6 @@ router.beforeEach(async (to, from, next) => {
     // 判断当前登录模式，分发处理逻辑
     const isNewLoginMode = sessionStorage.getItem('isNewLoginMode') === 'true';
     if (isNewLoginMode) {
-      if(wxid){
-        window.localStorage.setItem('weChat', JSON.stringify(wxid));
-      }
       await handleWxidLoginMode(to, next, wxid, WecomType);
     } else {
       await handleCodeLoginMode(to, next);
@@ -130,6 +127,9 @@ router.beforeEach(async (to, from, next) => {
 async function handleWxidLoginMode(to, next, wxid, WecomType) {
   try {
     window.localStorage.setItem('loginMode', 'wxidLogin');
+    if (wxid) {
+      window.localStorage.setItem('weChat', wxid);
+    }
     if (WecomType) {
       const agentFrom = getAgentFrom(WecomType);
       window.localStorage.setItem('agentFrom', agentFrom);
@@ -152,7 +152,6 @@ async function handleWxidLoginMode(to, next, wxid, WecomType) {
     doWxidLogin(formData)
       .then((res) => {
         if (res && res.StatusCode === 200 && res.Data && res.Data.token) {
-          // console.log("res=", res)
           const userInfoV1 = JSON.stringify(res.Data);
           window.localStorage.setItem('userInfoV1', userInfoV1);
           window.localStorage.setItem('AIToken', res.Data.token);
@@ -183,11 +182,7 @@ async function handleWxidLoginMode(to, next, wxid, WecomType) {
 function handleCodeLoginMode(to, next) {
   const org_loginMode = window.localStorage.getItem('loginMode');
   if (org_loginMode != 'codeLogin') {
-    let weChat = window.localStorage.getItem('weChat');
     window.localStorage.clear();
-    if(weChat){
-      window.localStorage.setItem('weChat',weChat);
-    }
   }
   window.localStorage.setItem('loginMode', 'codeLogin');
   //验证时间戳和token

src/styles/index.scss

@@ -177,4 +177,9 @@ html {
       }
     }
   }
+}
+.red-name-title{
+  color: #f00;
+  font-size: 16px;
+  // font-weight: bold;
 }

src/utils/requestAI.js

@@ -72,7 +72,6 @@ service.interceptors.response.use(async (res) => {
     } else if (code === 420) {
         // 双重判断：内存锁 + 本地缓存锁
         const isLock = authLock.isAuthorizing || window.localStorage.getItem('isWechatAuthorizing') === 'true';
-
         if (isLock) {
             return Promise.reject(new Error('正在授权，请勿重复操作'));
         }
@@ -87,9 +86,17 @@ service.interceptors.response.use(async (res) => {
 
             // 3. 微任务延迟跳转：给其他接口足够时间感知锁状态
             await Promise.resolve(); // 或 setTimeout(() => {}, 0)
-
-            // 4. 拼接授权链接并跳转（记录当前页面用于回跳）
-            getQyCode()
+            // 判断当前登录模式，分发处理逻辑
+            const isNewLoginMode = sessionStorage.getItem('isNewLoginMode') === 'true';
+            if (isNewLoginMode) {
+                window.localStorage.removeItem('AIToken');
+                window.localStorage.removeItem('guidInfo');
+                authLock.unlock();
+                window.location.reload();
+            } else {
+                // 4. 拼接授权链接并跳转（记录当前页面用于回跳）
+                getQyCode();
+            }
 
         } catch (err) {
             // 异常时解锁

src/utils/wecomLogin.ts

@@ -132,11 +132,7 @@ export const getGuid = () => {
     });
 }
 export const getQyCode = () => {
-    let weChat = window.localStorage.getItem('weChat');
     window.localStorage.clear();
-    if(weChat){
-      window.localStorage.setItem('weChat',weChat);
-    }
     let url, appid, agentid;
     // url = encodeURIComponent(process.env.VUE_APP_AUTHURL);
     url = encodeURIComponent(window.location.href);

src/views/AIDesign/design.vue

@@ -68,7 +68,7 @@
           </div>
           <div v-else class="placeholder">
             <img width="50" :src="require('@/assets/AIDesign/picture.png')" />
-            <p class="placeholder-text">请上传一张待设计外墙的房屋照片</p>
+            <p class="placeholder-text">请上传一张待设计<span class="red-name-title">【外墙】</span>的房屋照片</p>
             <p class="placeholder-text-tit">（避免模糊、光线不佳）</p>
           </div>
           <div class="image-buttons">

src/views/AIDesign/diagnose.vue

@@ -27,7 +27,7 @@
                                 @click="imgClick(selectedImage)" />
                         </div>
                         <div v-else class="placeholder">
-                            <p class="placeholder-text">请上传一张待诊断的{{ wallType == "outside" ? "外墙" : "内墙" }}房屋照片</p>
+                            <p class="placeholder-text">请上传一张待诊断的<span class="red-name-title">{{ wallType == "outside" ? "【外墙】" : "【内墙】" }}</span>房屋照片</p>
                             <p class="placeholder-text-tit">（避免模糊、光线不佳）</p>
                         </div>
                         <div class="image-buttons">

src/views/AIDesign/index.vue

@@ -117,7 +117,6 @@ export default class extends Vue {
   }
   // 点击事件处理
   handleDesignClick(type) {
-    console.log("=====点击事件处理====")
     if (type === 'outside') {
       // 外墙设计页
       this.$router.push("/AIDesign/design");

src/views/AIDesign/insideDesign.vue

@@ -24,7 +24,7 @@
           </div>
           <div v-else class="placeholder">
             <img width="50" :src="require('@/assets/AIDesign/picture.png')" />
-            <p class="placeholder-text">请上传一张待设计内墙的房屋照片</p>
+            <p class="placeholder-text">请上传一张待设计<span class="red-name-title">【内墙】</span>的房屋照片</p>
             <p class="placeholder-text-tit">（避免模糊、光线不佳）</p>
           </div>
           <div class="image-buttons">

src/views/login/index.vue

@@ -61,11 +61,7 @@ export default class extends Vue {
     that.wxUserId = that.$route.query.wxUserId as string;
   }
   onSubmit1() {
-    let weChat = window.localStorage.getItem('weChat');
     window.localStorage.clear();
-    if(weChat){
-      window.localStorage.setItem('weChat',weChat);
-    }
     window.localStorage.setItem('loginMode', 'codeLogin');
     initGuidInfo();
     doWecomLogin('QWert!@345', this.username)