From c1b4cc167057aa6beaffa274f8f88d7a633af28f Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Thu, 14 Nov 2024 14:08:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=BB=91=E5=AE=9A=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84terminal=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84bug=20fix=20=E7=BB=91=E5=AE=9A=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=90=8Eloading=20=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=9A=E6=B6=88=E5=A4=B1=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mdd/front/service/impl/UserServiceImpl.java | 4 ++--
 uniapp/src/pages/user_set/user_set.vue                        | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
index 27bacfc3..38f1a7ee 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
@@ -375,11 +375,11 @@ public class UserServiceImpl implements IUserService {
             String uniId = wxOAuth2AccessToken.getUnionId();
             String openId  = wxOAuth2AccessToken.getOpenId();
             String unionId = uniId == null ? "0" : uniId;
-            Integer terminal = ClientEnum.OA.getCode();
+            Integer terminal = LikeFrontThreadLocal.getTerminal();
             String key = bindOaValidate.getKey();
 
             // 授权校验,未授权创建授权，已授权返回
-            bindWechatAuth(openId, unionId, ClientEnum.OA.getCode(), userId);
+            bindWechatAuth(openId, unionId, terminal, userId);
 
         } catch (WxErrorException e) {
             throw new OperateException(e.getError().getErrorCode() + ", " + e.getError().getErrorMsg());
diff --git a/uniapp/src/pages/user_set/user_set.vue b/uniapp/src/pages/user_set/user_set.vue
index b6253bd1..7e5dab32 100644
--- a/uniapp/src/pages/user_set/user_set.vue
+++ b/uniapp/src/pages/user_set/user_set.vue
@@ -226,7 +226,9 @@ onLoad(async (options) => {
             await oaAuthBind({code})
             await userStore.getUser()
         } catch (error) {
-        }
+        }
+		
+		uni.hideLoading()
         //用于清空code
         router.redirectTo('/pages/user_set/user_set')
     }