This commit is contained in:
parent
ce56d02e9f
commit
dbfd20f2a0
|
@ -9,13 +9,13 @@
|
||||||
<view class="data_itm_box">
|
<view class="data_itm_box">
|
||||||
|
|
||||||
<u-form-item prop="userInfo.name" ref="item1" class="data_itm">
|
<u-form-item prop="userInfo.name" ref="item1" class="data_itm">
|
||||||
<text class="label_t">姓名</text>
|
<text class="label_t"><text style="color: #99241B;">*</text>姓名</text>
|
||||||
<u--input class="p32" placeholder="请填写姓名" inputAlign="right" clearable
|
<u--input class="p32" placeholder="请填写姓名" inputAlign="right" clearable
|
||||||
v-model="model1.userInfo.name" border="none"></u--input>
|
v-model="model1.userInfo.name" border="none"></u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
|
|
||||||
<u-form-item prop="userInfo.sex" ref="item1" @click="showSex=true" class="data_itm">
|
<u-form-item prop="userInfo.sex" ref="item1" @click="showSex=true" class="data_itm">
|
||||||
<text class="label_t">性别</text>
|
<text class="label_t"><text style="color: #99241B;">*</text>性别</text>
|
||||||
<u--input class="p32" placeholder="请填选择性别" v-model="model1.userInfo.sex" readonly
|
<u--input class="p32" placeholder="请填选择性别" v-model="model1.userInfo.sex" readonly
|
||||||
inputAlign="right" border="none">
|
inputAlign="right" border="none">
|
||||||
<u-icon slot="suffix" name="arrow-right"></u-icon>
|
<u-icon slot="suffix" name="arrow-right"></u-icon>
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
|
|
||||||
<u-form-item ref="item1" @click="showBirthday=true" class="data_itm">
|
<u-form-item ref="item1" @click="showBirthday=true" class="data_itm">
|
||||||
<text class="label_t">出生日期</text>
|
<text class="label_t"><text style="color: #99241B;">*</text>出生日期</text>
|
||||||
<u--input class="p32" placeholder="请填选择出生日期" v-model="model1.userInfo.birthday" readonly
|
<u--input class="p32" placeholder="请填选择出生日期" v-model="model1.userInfo.birthday" readonly
|
||||||
inputAlign="right" border="none">
|
inputAlign="right" border="none">
|
||||||
<u-icon slot="suffix" name="calendar"></u-icon>
|
<u-icon slot="suffix" name="calendar"></u-icon>
|
||||||
|
@ -33,7 +33,7 @@
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
|
|
||||||
<u-form-item prop="userInfo.idCOde" ref="item1" class="data_itm">
|
<u-form-item prop="userInfo.idCOde" ref="item1" class="data_itm">
|
||||||
<text class="label_t">身份证号</text>
|
<text class="label_t"><text style="color: #99241B;">*</text>身份证号</text>
|
||||||
<u--input class="p32" placeholder="请输入身份证号码" inputAlign="right" clearable
|
<u--input class="p32" placeholder="请输入身份证号码" inputAlign="right" clearable
|
||||||
v-model="model1.userInfo.idCOde" border="none"></u--input>
|
v-model="model1.userInfo.idCOde" border="none"></u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
|
@ -44,24 +44,22 @@
|
||||||
|
|
||||||
<!-- <u-form-item ref="item1" @click="zuShow=true" class="data_itm"> -->
|
<!-- <u-form-item ref="item1" @click="zuShow=true" class="data_itm"> -->
|
||||||
<u-form-item ref="item1" class="data_itm">
|
<u-form-item ref="item1" class="data_itm">
|
||||||
<text class="label_t">民族</text>
|
<text class="label_t"><text style="color: #99241B;">*</text>民族</text>
|
||||||
<u--input class="p32" placeholder="请输入民族" v-model="zuValue" inputAlign="right"
|
<u--input class="p32" placeholder="请输入民族" v-model="zuValue" inputAlign="right" border="none">
|
||||||
border="none">
|
|
||||||
<!-- <u-icon slot="suffix" name="arrow-right"></u-icon> -->
|
<!-- <u-icon slot="suffix" name="arrow-right"></u-icon> -->
|
||||||
</u--input>
|
</u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
|
|
||||||
<!-- <u-form-item ref="item1" @click="jigaunShow=true" class="data_itm"> -->
|
<!-- <u-form-item ref="item1" @click="jigaunShow=true" class="data_itm"> -->
|
||||||
<u-form-item ref="item1" class="data_itm">
|
<u-form-item ref="item1" class="data_itm">
|
||||||
<text class="label_t">籍贯</text>
|
<text class="label_t"><text style="color: #99241B;">*</text>籍贯</text>
|
||||||
<u--input class="p32" placeholder="请选择籍贯" v-model="jiguan" inputAlign="right"
|
<u--input class="p32" placeholder="请选择籍贯" v-model="jiguan" inputAlign="right" border="none">
|
||||||
border="none">
|
|
||||||
<!-- <u-icon slot="suffix" name="arrow-right"></u-icon> -->
|
<!-- <u-icon slot="suffix" name="arrow-right"></u-icon> -->
|
||||||
</u--input>
|
</u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
|
|
||||||
<u-form-item ref="item1" @click="zhengzhiShow=true" class="data_itm">
|
<u-form-item ref="item1" @click="zhengzhiShow=true" class="data_itm">
|
||||||
<text class="label_t">政治面貌</text>
|
<text class="label_t"><text style="color: #99241B;">*</text>政治面貌</text>
|
||||||
<u--input class="p32" placeholder="请选择政治面貌" v-model="zhengzhiValue" readonly inputAlign="right"
|
<u--input class="p32" placeholder="请选择政治面貌" v-model="zhengzhiValue" readonly inputAlign="right"
|
||||||
border="none">
|
border="none">
|
||||||
<u-icon slot="suffix" name="arrow-right"></u-icon>
|
<u-icon slot="suffix" name="arrow-right"></u-icon>
|
||||||
|
@ -78,7 +76,7 @@
|
||||||
v-model="model1.userInfo.phoneNum" border="none"></u--input>
|
v-model="model1.userInfo.phoneNum" border="none"></u--input>
|
||||||
</u-form-item> -->
|
</u-form-item> -->
|
||||||
<u-form-item prop="userInfo.pasw" ref="item1" class="data_itm">
|
<u-form-item prop="userInfo.pasw" ref="item1" class="data_itm">
|
||||||
<text class="label_t">密码</text>
|
<text class="label_t"><text style="color: #99241B;">*</text>密码</text>
|
||||||
<u--input class="p32" placeholder="请输入密码" inputAlign="right" clearable
|
<u--input class="p32" placeholder="请输入密码" inputAlign="right" clearable
|
||||||
v-model="model1.userInfo.pasw" border="none"></u--input>
|
v-model="model1.userInfo.pasw" border="none"></u--input>
|
||||||
</u-form-item>
|
</u-form-item>
|
||||||
|
@ -89,7 +87,7 @@
|
||||||
|
|
||||||
<view class="data_itm">
|
<view class="data_itm">
|
||||||
<view class="data_itm_key label_t">
|
<view class="data_itm_key label_t">
|
||||||
头像上传
|
<text style="color: #99241B;">*</text>头像上传
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<u-upload class="upload" accept="image" width="172rpx" height="172rpx" :fileList="fileList3"
|
<u-upload class="upload" accept="image" width="172rpx" height="172rpx" :fileList="fileList3"
|
||||||
|
@ -391,6 +389,7 @@
|
||||||
xieValue: '',
|
xieValue: '',
|
||||||
zuShow: false,
|
zuShow: false,
|
||||||
xieShow: false,
|
xieShow: false,
|
||||||
|
upLoadReady: true,
|
||||||
artResultList: '',
|
artResultList: '',
|
||||||
artlist: [''],
|
artlist: [''],
|
||||||
honorList: [''],
|
honorList: [''],
|
||||||
|
@ -452,7 +451,7 @@
|
||||||
rules: {
|
rules: {
|
||||||
'userInfo.pasw': [{
|
'userInfo.pasw': [{
|
||||||
required: true,
|
required: true,
|
||||||
message: '请填写密码',
|
message: '请设置登录密码',
|
||||||
trigger: ['blur', 'change']
|
trigger: ['blur', 'change']
|
||||||
}, {
|
}, {
|
||||||
min: 6,
|
min: 6,
|
||||||
|
@ -571,16 +570,10 @@
|
||||||
res.data.records.map((v, i) => {
|
res.data.records.map((v, i) => {
|
||||||
return this.xiehuiObj[v.name] = v.id
|
return this.xiehuiObj[v.name] = v.id
|
||||||
})
|
})
|
||||||
|
|
||||||
var xieList = res.data.records.map((v, i) => {
|
var xieList = res.data.records.map((v, i) => {
|
||||||
return v.name
|
return v.name
|
||||||
})
|
})
|
||||||
this.xiecolumns.push(xieList)
|
this.xiecolumns.push(xieList)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
console.log('this.xiehuiObj', this.xiehuiObj);
|
|
||||||
|
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
console.log("error", error);
|
console.log("error", error);
|
||||||
})
|
})
|
||||||
|
@ -714,7 +707,6 @@
|
||||||
}))
|
}))
|
||||||
fileListLen++
|
fileListLen++
|
||||||
}
|
}
|
||||||
console.log("fileList", this[`fileList${event.name}`]);
|
|
||||||
},
|
},
|
||||||
// 新增图片
|
// 新增图片
|
||||||
async afterRead1(event) {
|
async afterRead1(event) {
|
||||||
|
@ -743,10 +735,11 @@
|
||||||
}))
|
}))
|
||||||
fileListLen++
|
fileListLen++
|
||||||
}
|
}
|
||||||
console.log("fileList", this.fileList2[event.name]);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
uploadFilePromise(url) {
|
uploadFilePromise(url) {
|
||||||
|
this.upLoadReady = false
|
||||||
|
let that = this
|
||||||
let token = uni.getStorageSync('token');
|
let token = uni.getStorageSync('token');
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
let a = uni.uploadFile({
|
let a = uni.uploadFile({
|
||||||
|
@ -759,13 +752,14 @@
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
resolve(JSON.parse(res.data).data.path)
|
resolve(JSON.parse(res.data).data.path)
|
||||||
|
that.upLoadReady = true
|
||||||
}, 1000)
|
}, 1000)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
submit() {
|
submit() {
|
||||||
if (this.fileList3) {
|
if (this.fileList3.length > 0) {
|
||||||
var fl3 = this.fileList3[0].url
|
var fl3 = this.fileList3[0].url
|
||||||
} else {
|
} else {
|
||||||
var fl3 = ''
|
var fl3 = ''
|
||||||
|
@ -804,8 +798,6 @@
|
||||||
} else {
|
} else {
|
||||||
opsArr = []
|
opsArr = []
|
||||||
}
|
}
|
||||||
console.log("opsArr====", opsArr);
|
|
||||||
console.log("honorList", this.honorList);
|
|
||||||
|
|
||||||
var yishucj = null
|
var yishucj = null
|
||||||
if (this.artlist[0] == "") {
|
if (this.artlist[0] == "") {
|
||||||
|
@ -850,8 +842,10 @@
|
||||||
"fzr": that.DutyPeopleName,
|
"fzr": that.DutyPeopleName,
|
||||||
"wyrc": this.wyrc,
|
"wyrc": this.wyrc,
|
||||||
}
|
}
|
||||||
console.log("dataddddddddd", data);
|
if (!data.userName || !data.sex || !data.idCard || !data.images || !data.password || !data.politics) {
|
||||||
this.$refs.form1.validate().then(res => {
|
this.upLoadReady = false
|
||||||
|
}
|
||||||
|
if (this.upLoadReady) {
|
||||||
this.http.request('/auth/init', data, "POST").then(res => {
|
this.http.request('/auth/init', data, "POST").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
@ -868,10 +862,15 @@
|
||||||
icon: "none",
|
icon: "none",
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
}).catch(errors => {
|
} else {
|
||||||
uni.$u.toast('您的资料还未补充完整')
|
uni.$u.toast('您的资料还未补充完整')
|
||||||
return
|
}
|
||||||
})
|
// this.$refs.form1.validate().then(res => {
|
||||||
|
//
|
||||||
|
// }).catch(errors => {
|
||||||
|
// uni.$u.toast('您的资料还未补充完整')
|
||||||
|
// return
|
||||||
|
// })
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,6 +75,9 @@ export default {
|
||||||
} else if (response.data.code == 401) { //登录过期
|
} else if (response.data.code == 401) { //登录过期
|
||||||
reject(response)
|
reject(response)
|
||||||
} else if (response.data.code == 402) { //信息未完善
|
} else if (response.data.code == 402) { //信息未完善
|
||||||
|
if(response.data.data){
|
||||||
|
uni.setStorageSync('token', response.data.data.tokenValue)
|
||||||
|
}
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '信息未完善',
|
title: '信息未完善',
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
|
@ -84,7 +87,6 @@ export default {
|
||||||
url: '../SelectId/SelectId'
|
url: '../SelectId/SelectId'
|
||||||
})
|
})
|
||||||
}, 1200)
|
}, 1200)
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: response.data.msg,
|
title: response.data.msg,
|
||||||
|
|
Loading…
Reference in New Issue