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') }