feat(Login): 登录时携带公司代码

config_hnyz.js

@@ -1,9 +1,10 @@
 export default {
-	// baseUrl: 'https://api.ygtxfj.com/ynet',
-	// baseUrlPre:'https://api.ygtxfj.com',
-	// logoSrc: 'https://50006360.s21i.huaweicloudsite.cn/4/ABUIABAEGAAg-I3cuQYo6IXe9AQw9AM4Rg.png',
+	baseUrl: 'https://api.hnyunzhu.com:2443/ynet/',
+	baseUrlPre:'https://api.hnyunzhu.com:2443',
+	logoSrc: `https://api.hnyunzhu.com:2443/shares/document/yz/20250215/T_Company/412314635407140.png`,
 	companyName: '湖南韫珠',
-	// mapKey: 'KJBBZ-5JCLZ-3NLXD-742CK-Y26UZ-X7BJN',
+	companyCode: 'yz',
+	mapKey: 'CEBBZ-ASFKI-GZ2GU-UBGBO-MM6PZ-VTF3E',
 	timeout: 10000,
 	defaultAvatarPath:'/shares/document/miniApp/avatar/defaultAvatar.jpg',//默认服务器存储的头像路径
 }

config_ygtx.js

@@ -1,17 +1,10 @@
 export default {
-	// baseUrl: 'http://192.168.110.76:8081/oa',
-	// baseUrlPre: 'http://192.168.110.76:8081',
-	// baseUrl: 'http://192.168.110.82:8081/oa',
-	// baseUrlPre:'http://192.168.110.82:8081',
-	baseUrl: 'https://api.ygtxfj.com/ynet',
-	baseUrlPre:'https://api.ygtxfj.com',
+	baseUrl: 'https://api.ygtxfj.com:1443/ynet',
+	baseUrlPre:'https://api.ygtxfj.com:1443',
 	logoSrc: 'https://50006360.s21i.huaweicloudsite.cn/4/ABUIABAEGAAg-I3cuQYo6IXe9AQw9AM4Rg.png',
 	companyName:'宇光同行',
+	companyCode: 'yg',
 	mapKey: 'KJBBZ-5JCLZ-3NLXD-742CK-Y26UZ-X7BJN',
-	// signInTimeRange:['08:30:00', '09:30:00'], //正常签到时间范围
-	// signOutTimeRange:['17:30:00', '20:00:00'], //正常签退时间
-	// lateTimeRange:['09:00:00', '09:30:00'], //迟到时间范围
 	timeout: 10000,
-	// baseUrl: 'http://118.195.146.34:20076/ynet',
 	defaultAvatarPath:'/shares/document/miniApp/avatar/defaultAvatar.jpg',//默认服务器存储的头像路径
 }

store/user.js

@@ -19,6 +19,7 @@ import {
 	keepSession
 } from '@/api/login.js'
 import $modal from '@/plugins/modal.js'
+import config from '@/config.js'
 
 
 export const useUserStore = defineStore('user', () => {
@@ -43,16 +44,17 @@ export const useUserStore = defineStore('user', () => {
 			password
 		}
 		return new Promise((resolve, reject) => {
-			username = username.trim()
+			if (username.includes('@')) {
+				username = username.split('@')[0]
+			}
+			username = username.trim() + '@' +config.companyCode // 强制使用配置的公司代码
 			login(username, password)
 				.then(res => {
 					useId.value = res.returnParams.useId // 设置staffId
 					// user.value = res.returnParams
 					//保存账号密码
 					uni.setStorageSync('loginInfo', loginInfo)
-					if (username.includes('@')) {
-						username = username.split('@')[0]
-					}
+					username = username.split('@')[0] // 获取session时不需要公司代码
 					reLogin(username, password).then((res) => {
 						if ("ok" === res.data) {
 							setSession(res.cookies[0].split("=")[1].split(";")[0]);