diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6520776..6d79bc2 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import { login, logout, getInfo, refreshToken, getPhoneCode, isLogin,isAdmin } from '@/api/login'
+import { login, logout, getInfo, refreshToken, getPhoneCode, isLogin,isAdmin} from '@/api/login'
import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
// 更严格的手机号和邮箱正则表达式
@@ -6,7 +6,7 @@ const phonePattern = /^(\+86)?1[3-9]\d{9}$/ // 支持前缀 +86
const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
// 构建 payload 函数
-const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, verificationCode }) => {
+const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, verificationCode,phoneUuid }) => {
let loginType = ''
if (loginMethod === 'mobile') {
loginType = phonePattern.test(mobile.trim()) ? 'PHONE_OTP' : emailPattern.test(mobile.trim()) ? 'EMAIL_OTP' : 'PHONE_OTP'
@@ -15,7 +15,8 @@ const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, ver
verificationCode,
uuid,
code,
- loginType
+ loginType,
+ phoneUuid
}
} else {
loginType = phonePattern.test(username.trim()) ? 'PHONE_PASSWORD' : emailPattern.test(username.trim()) ? 'EMAIL_PASSWORD' : 'USERNAME_PASSWORD'
@@ -25,7 +26,8 @@ const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, ver
verificationCode,
uuid,
code,
- loginType
+ loginType,
+ phoneUuid
}
}
}
@@ -95,10 +97,11 @@ const user = {
// 获取手机验证码
GetPhoneCode({ commit }, userInfo) {
const payload = {
- mobile: userInfo.mobile.trim(),
+ username: userInfo.mobile.trim(),
uuid: userInfo.uuid,
code: userInfo.code,
- mobileCodeType: userInfo.mobileCodeType
+ phoneUuid: userInfo.phoneUuid,
+ verificationCodeType: userInfo.mobileCodeType
}
return getPhoneCode(payload)
.then(res => res)
diff --git a/src/views/base/crew/components/table-crew.vue b/src/views/base/crew/components/table-crew.vue
index 5bbb323..ea2a7ed 100644
--- a/src/views/base/crew/components/table-crew.vue
+++ b/src/views/base/crew/components/table-crew.vue
@@ -26,8 +26,8 @@
移出班组
@@ -44,7 +44,7 @@
{{ data.relName }}
班组长
diff --git a/src/views/base/crew/components/table-member.vue b/src/views/base/crew/components/table-member.vue
index d3163c6..16a91ad 100644
--- a/src/views/base/crew/components/table-member.vue
+++ b/src/views/base/crew/components/table-member.vue
@@ -20,7 +20,7 @@
{
- this.$emit('closeHat', true)
+ this.$emit('closeMember', true)
}
"
>取消 {
+ this.projRange.forEach(item => {
if (e === item.value) {
this.projectParams.proName = item.label;
}
diff --git a/src/views/base/person/components/form-person.vue b/src/views/base/person/components/form-person.vue
index f38e4bd..7db16f4 100644
--- a/src/views/base/person/components/form-person.vue
+++ b/src/views/base/person/components/form-person.vue
@@ -98,6 +98,7 @@ export default {
},
mounted() {
+ console.log(this.editParams, 'edit')
if (this.editParams) {
Object.assign(this.projectParams, this.editParams)
// 查询未脱敏数据
diff --git a/src/views/base/proj/components/form-project.vue b/src/views/base/proj/components/form-project.vue
index 59a90aa..b58bdda 100644
--- a/src/views/base/proj/components/form-project.vue
+++ b/src/views/base/proj/components/form-project.vue
@@ -53,7 +53,6 @@
v-model="projectParams.relId"
clearable
filterable
- allow-create
placeholder="请选择"
>
{