diff --git a/constant/base.js b/constant/base.js index e69de29..49d47e8 100644 --- a/constant/base.js +++ b/constant/base.js @@ -0,0 +1,28 @@ +// 小程序特有相关: 同时更改manifest.json和 project.config.json文件中的appid; +// 所有用户端的配置 +export const CLIENT_CONFIGS = { + // 智念用户端 + zhinian: { + clientId: '2', + appId: 'wx5e79df5996572539' + }, + // 朵花用户端 + duohua: { + clientId: '2', + appId: 'wx23f86d809ae80259' + }, + // 天沐用户端 + tianmu: { + clientId: '4', + appId: 'wx0be424e1d22065a9' + } +}; + +// 获取当前用户端配置 +const getCurrentConfig = () => { + return CLIENT_CONFIGS.zhinian; +}; + +export const clientId = getCurrentConfig().clientId; +export const appId = getCurrentConfig().appId; + diff --git a/hooks/useGoLogin.js b/hooks/useGoLogin.js index 09a3928..31268d3 100644 --- a/hooks/useGoLogin.js +++ b/hooks/useGoLogin.js @@ -1,5 +1,7 @@ import { loginAuth, bindPhone } from "@/manager/LoginManager"; - +// 引入base.js中的clientId + import { clientId } from "@/constant/base"; + // 跳转登录 export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" }); @@ -12,9 +14,9 @@ export const onLogin = async (e) => { await loginAuth().then(async () => { const { code } = e.detail; console.info("onLogin code: ", code); - + // 绑定手机号 - const params = { wechatPhoneCode: code, clientId: "2" }; + const params = { wechatPhoneCode: code, clientId: clientId }; const res = await bindPhone(params); if (res.data) { resolve(); diff --git a/manager/LoginManager.js b/manager/LoginManager.js index 0750345..5e24477 100644 --- a/manager/LoginManager.js +++ b/manager/LoginManager.js @@ -5,6 +5,7 @@ import { } from "../request/api/LoginApi"; import { getWeChatAuthCode } from "./AuthManager"; import { useAppStore } from "@/store"; +import { clientId } from "@/constant/base"; const loginAuth = () => { return new Promise(async (resolve, reject) => { @@ -14,7 +15,7 @@ const loginAuth = () => { openIdCode: [openIdCode], grant_type: "wechat", scope: "server", - clientId: "2", + clientId: clientId, }); console.log("获取到的微信授权response:", response);