Commit 8147d45e authored by 杨梦雪's avatar 杨梦雪

个人信息-自我介绍

parent 97e0c5f6
...@@ -85,6 +85,16 @@ ...@@ -85,6 +85,16 @@
} }
} }
.el-textarea__inner {
&:hover {
border-color: var(--color);
}
&:focus {
border-color: var(--color);
}
}
// 圆 // 圆
.el-radio-group { .el-radio-group {
.el-radio { .el-radio {
......
...@@ -561,7 +561,7 @@ ...@@ -561,7 +561,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 既往病史或过敏史 --> <!-- 既往病史或过敏史 -->
<el-col :span="12" v-show="configJson.pastMedicalHistory == 1"> <el-col :span="12" v-show="configJson.pastMedicalHistory == 1&&isOffline==true">
<el-form-item <el-form-item
label="既往病史或过敏史" label="既往病史或过敏史"
prop="past_medical_history" prop="past_medical_history"
...@@ -582,7 +582,7 @@ ...@@ -582,7 +582,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 备注或其它 --> <!-- 备注或其它 -->
<el-col :span="12" v-show="configJson.noteOther == 1"> <el-col :span="12" v-show="configJson.noteOther == 1&&isOffline==true">
<el-form-item <el-form-item
label="备注或其它" label="备注或其它"
prop="clothes_size" prop="clothes_size"
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 衣服尺码--> <!-- 衣服尺码-->
<el-col :span="12" v-show="configJson.clothesSize == 1"> <el-col :span="12" v-show="configJson.clothesSize == 1&&isOffline==true">
<el-form-item <el-form-item
label="衣服尺码" label="衣服尺码"
prop="clothes_size" prop="clothes_size"
...@@ -653,10 +653,10 @@ ...@@ -653,10 +653,10 @@
每个邀请码仅能绑定一个用户 每个邀请码仅能绑定一个用户
</div> </div>
</el-col> </el-col>
<!-- 自我介绍--> <!-- 自我介绍 -->
<el-col :span="12" v-show="configJson.introduceMyself == 1"> <el-col :span="12" v-show="configJson.introduceMyself == 1">
<el-form-item <el-form-item
prop="introduceMyself" prop="introduce"
label="自我介绍" label="自我介绍"
style="height: 73px" style="height: 73px"
:rules=" :rules="
...@@ -667,11 +667,12 @@ ...@@ -667,11 +667,12 @@
> >
<el-input <el-input
ref="code" ref="code"
v-model="referForm.introduceMyself" v-model="referForm.introduce"
placeholder="自我介绍" placeholder="自我介绍"
type="textarea" type="textarea"
maxlength="200" maxlength="200"
size="small" size="small"
@change="changeIntroduce"
show-word-limit/> show-word-limit/>
</el-form-item> </el-form-item>
<div class="tipsMsg"> <div class="tipsMsg">
...@@ -1036,7 +1037,7 @@ ...@@ -1036,7 +1037,7 @@
clothes_size: null, clothes_size: null,
emergency: null, emergency: null,
emergency_phone: null, emergency_phone: null,
introduceMyself: null, introduce: null,
school_province: null, school_province: null,
school_city: null, school_city: null,
school: null, school: null,
...@@ -1179,7 +1180,7 @@ ...@@ -1179,7 +1180,7 @@
trigger: "change", trigger: "change",
}, },
], ],
introduceMyself: [ introduce: [
{ {
required: true, required: true,
message: "自我介绍不能为空!", message: "自我介绍不能为空!",
...@@ -1400,7 +1401,6 @@ ...@@ -1400,7 +1401,6 @@
// this.getProAndCity(); // this.getProAndCity();
this.getTenYear(); this.getTenYear();
this.getAccount(); // 页面信息个人获取 this.getAccount(); // 页面信息个人获取
// console.log(this.$store.state.configJson)
this.configJson = this.$store.state.configJson; this.configJson = this.$store.state.configJson;
if (this.configJson.jiguanCity == 1 || this.configJson.school == 1) { if (this.configJson.jiguanCity == 1 || this.configJson.school == 1) {
this.getProAndCity(); this.getProAndCity();
...@@ -1409,22 +1409,12 @@ ...@@ -1409,22 +1409,12 @@
//若线下形式(既往病史或过敏史,备注或其它,衣服尺码)为必填项,否则为选填。 //若线下形式(既往病史或过敏史,备注或其它,衣服尺码)为必填项,否则为选填。
let multiform = JSON.parse(window.localStorage.getItem("multiform" + code)); let multiform = JSON.parse(window.localStorage.getItem("multiform" + code));
let multiform_id = window.localStorage.getItem("multiform_id" + code); let multiform_id = window.localStorage.getItem("multiform_id" + code);
console.log(typeof multiform)
multiform.forEach((i) => { multiform.forEach((i) => {
if (i.id == multiform_id) { if (i.id == multiform_id) {
let reg = /[\u7ebf][\u4e0b]/ let reg = /[\u7ebf][\u4e0b]/
this.isOffline = reg.test(i.multiform_name) this.isOffline = reg.test(i.multiform_name)
} }
}) })
// console.log(this.isOffline)
console.log(this.$store.state.signUpInfo)
let introduce = this.$store.state.signUpInfo.introduce
console.log(introduce)
if (introduce != null) {
this.referForm.introduceMyself = introduce
}
console.log(this.referForm.introduceMyself)
}, },
watch: { watch: {
referForm(val) { referForm(val) {
...@@ -1492,11 +1482,15 @@ ...@@ -1492,11 +1482,15 @@
this.elect_subject_situation = '-'; this.elect_subject_situation = '-';
this.referForm.chooseSubject = []; this.referForm.chooseSubject = [];
} }
// console.log(this.referForm)
if (this.invitation_code != null) { if (this.invitation_code != null) {
this.referForm.code = this.invitation_code; this.referForm.code = this.invitation_code;
this.isCode = true; this.isCode = true;
} }
//自我介绍
let introduce = this.$store.state.signUpInfo.introduce
if (introduce != null) {
this.referForm.introduce = introduce
}
}, },
}, },
mounted() { mounted() {
...@@ -1536,7 +1530,7 @@ ...@@ -1536,7 +1530,7 @@
clothes_size: null, clothes_size: null,
emergency: null, emergency: null,
emergency_phone: null, emergency_phone: null,
introduceMyself: null, introduce: null,
school_province: null, school_province: null,
school_city: null, school_city: null,
school: null, school: null,
...@@ -1616,6 +1610,10 @@ ...@@ -1616,6 +1610,10 @@
this.elect_subject_situation = val.join("#"); this.elect_subject_situation = val.join("#");
this.$forceUpdate(); this.$forceUpdate();
}, },
//自我介绍
changeIntroduce(val) {
this.referForm.introduce = val
},
// 获取省份城市 // 获取省份城市
getProAndCity() { getProAndCity() {
getProAndCity({}).then((res) => { getProAndCity({}).then((res) => {
...@@ -1945,14 +1943,6 @@ ...@@ -1945,14 +1943,6 @@
break; // 因为我们只需要检测一项,所以就可以跳出循环了 break; // 因为我们只需要检测一项,所以就可以跳出循环了
} }
}, },
confimCode(code) {
setInviteCode({code: code}).then((res) => {
// console.log(res, "code");
if (res.data.code !== 200) {
return this.$message.error(res.data.message);
}
});
},
confirm() { confirm() {
this.$refs["referRef"].validate((valid, object) => { this.$refs["referRef"].validate((valid, object) => {
if (!valid) { if (!valid) {
...@@ -2038,7 +2028,7 @@ ...@@ -2038,7 +2028,7 @@
} }
//自我介绍 //自我介绍
if (this.configJson.introduceMyself == 1) { if (this.configJson.introduceMyself == 1) {
obj.introduce = _this.referForm.introduceMyself; obj.introduce = _this.referForm.introduce;
} }
if (this.configJson.school == 1) { if (this.configJson.school == 1) {
obj.school_province = _this.referForm.school_province; obj.school_province = _this.referForm.school_province;
......
...@@ -382,7 +382,6 @@ ...@@ -382,7 +382,6 @@
JSON.stringify(fileList) JSON.stringify(fileList)
); //上传的图片 ); //上传的图片
} }
// 银行截图 // 银行截图
const bank_Path = res.data.bank_info; const bank_Path = res.data.bank_info;
if (bank_Path != null) { if (bank_Path != null) {
...@@ -411,7 +410,7 @@ ...@@ -411,7 +410,7 @@
} }
//多活動形式 //多活動形式
window.localStorage.setItem("multiform_id" + code, res.data.multiform_id); window.localStorage.setItem("multiform_id" + code, res.data.multiform_id);
//填写个人信息-自我介绍 //vuex-个人信息
store.state.signUpInfo = res.data store.state.signUpInfo = res.data
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment