diff --git a/.env.development b/.env.development index a7a5b3c..fb995ad 100644 --- a/.env.development +++ b/.env.development @@ -2,6 +2,7 @@ VITE_APP_NAME=后台管理系统 VITE_SOCKET_URL=wss://server.gxwebsoft.com VITE_SERVER_URL=https://gxtyzx-server.websoft.top/api VITE_API_URL=https://gxtyzx-modules.websoft.top/api -VITE_THINK_URL=https://gxtyzx-api2.websoft.top/api +# 审批服务:部署在 8.134.55.105(经 nginx 80 端口反代) +VITE_THINK_URL=http://8.134.55.105/api #VITE_THINK_URL=http://127.0.0.1:9099/api diff --git a/.env.production b/.env.production index f89b06b..9f49a50 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,5 @@ VITE_APP_NAME=后台管理系统 VITE_SOCKET_URL=wss://server.gxwebsoft.com VITE_SERVER_URL=https://gxtyzx-server.websoft.top/api VITE_API_URL=https://gxtyzx-modules.websoft.top/api -VITE_THINK_URL=https://gxtyzx-api2.websoft.top/api +# 审批服务:本次部署的 gxtyzx-api(经 nginx 80 端口反代) +VITE_THINK_URL=http://8.134.55.105/api diff --git a/src/api/passport/login/index.ts b/src/api/passport/login/index.ts index 398a4a9..c98373a 100644 --- a/src/api/passport/login/index.ts +++ b/src/api/passport/login/index.ts @@ -39,6 +39,8 @@ export async function loginBySms(data: LoginParam): Promise console.log('UserId: ', user.userId); console.log('MerchantId: ', user.merchantId); uni.setStorageSync('TenantId', user.tenantId) + // 页面登录态统一读小写 phone(user.vue 等),不能只存大写 Phone + uni.setStorageSync('phone', user.phone) uni.setStorageSync('Phone', user.phone) uni.setStorageSync('UserId', user.userId) if (user.merchantId) { diff --git a/src/uni_modules/ws-login/components/ws-login/ws-login.vue b/src/uni_modules/ws-login/components/ws-login/ws-login.vue index 8fc905d..b6dbe0b 100644 --- a/src/uni_modules/ws-login/components/ws-login/ws-login.vue +++ b/src/uni_modules/ws-login/components/ws-login/ws-login.vue @@ -15,25 +15,37 @@ -