Skip to content

C
campSite
Commit 1a51d059 authored by 杨梦雪's avatar 杨梦雪
Browse files
Options

增加邀请码

parent f43e9f33
Show whitespace changes
Inline Side-by-side
Showing with 401 additions and 356 deletions
src/components/index/SignUp/referInfo.vue
View file @ 1a51d059
......@@ -493,6 +493,25 @@
/>
</el-form-item>
</el-col>
<!-- 邀请码 -->
<el-col :span="12" v-show="doubt_code == 1">
<el-form-item
label="邀请码"
style="height: 73px"
>
<el-input
ref="code"
v-model="referForm.code"
placeholder="邀请码"
size="small"
:disabled="referForm.code==null?false:true"
clearable
/>
</el-form-item>
<div class="tipsMsg">
每个邀请码仅能绑定一个用户
</div>
</el-col>
</el-row>
<!-- 学校信息 -->
<div
......@@ -642,7 +661,7 @@
</div>
</div>
<!-- 学习成绩证明材料 -->
<div v-show="configJson.achievementPath == 1" >
<div v-show="configJson.achievementPath == 1">
<div class="cont_title">学习成绩证明材料</div>
<el-form-item
label="上传申请资料图片"
......@@ -724,7 +743,7 @@
<script>
/* eslint-disable */
import Cookie from "js-cookie";
import {setInviteCode} from "r/index/signUp";
import {
getAccount,
getAchievementOss,
......@@ -739,7 +758,7 @@
export default {
name: "referInfo",
props: {invitation_code: String},
data() {
const validateContent = (rule, value, callback) => {
if (!this.referForm.birthday) {
......@@ -781,8 +800,11 @@
school: null,
school_contacts: null,
school_phone: null,
code: null
},
doubt_code: window.localStorage.getItem(
"doubt_code" + this.$store.state.indexIdentity
),//是否填写邀请码
schoolName: {},
referInfoRules: {
name: [{required: true, message: "姓名不能为空！", trigger: "blur"}],
......@@ -881,10 +903,8 @@
},
{validator: validator.validatePhone, trigger: "blur"},
],
// backgroundPicture: [{ required: true, message: "请上传图片" }],
},
EducationArrs: ["初中", "高中", "大学", "硕士", "博士"],
countryList: area.country, //国籍
selectProvince: [], //省份
......@@ -895,7 +915,6 @@
jgProvinceCode: "", //省份id
jiguan_city: "", //城市id(和省份id拼接)
yearArrs: [], //生日涉及的近10年的年份
monthArrs: [
"01",
"02",
......@@ -974,7 +993,6 @@
dialogVisible: false,
fileList: [],
resultPicture: "",
dialogVisible: false,
disabled: false, //限制输入框
};
},
......@@ -999,6 +1017,7 @@
if (this.configJson.jiguanCity == 1 || this.configJson.school == 1) {
this.getProAndCity();
}
},
watch: {
referForm(val) {
......@@ -1057,6 +1076,9 @@
this.changeCity(this.referForm.school_city, true);
// console.log(this.referForm.school_city, 12322);
}
if (this.invitation_code != null) {
this.referForm.code = this.invitation_code
}
},
},
mounted() {
......@@ -1096,7 +1118,6 @@
console.log(yearArr, "yearArr");
this.yearArrs = yearArr;
},
//组装出生日期
getTime() {
this.referForm.birthday =
......@@ -1106,7 +1127,6 @@
// console.log(this.referForm.birthday);
},
// 国籍
//组装入学年份
getyear() {
this.referForm.start_school_date = this.start_year.toString();
......@@ -1125,7 +1145,6 @@
// console.log(this.selectProvince, this.CityName);
});
},
//选择籍贯省份change事件
changeProvince(type, val, status) {
// console.log(type, val);
......@@ -1146,7 +1165,6 @@
}
}
},
//返回当前省份下的城市列表
getCurrentCityLists(val) {
let currentCity = [];
......@@ -1185,7 +1203,6 @@
}
return currentCity;
},
// 籍贯城市change事件
getJiguan() {
this.referForm.jiguan_code =
......@@ -1217,7 +1234,6 @@
// });
// this.restaurants = data; //中学（模糊搜索）
},
// 返回当前城市下的学校列表
getCurrentSchoolLists(val) {
let currentSchool = [];
......@@ -1273,7 +1289,6 @@
}
return currentSchool;
},
// 图片上传成功前钩子
beforeAvatarUpload(file) {
// console.log(file, "beforeImage");
......@@ -1290,7 +1305,6 @@
}
return (isJPG || isPng || isJPEG) && isLt10M;
},
handlePictureCardPreview(file) {
console.log(file, "11111111");
this.resultPicture = file.url;
......@@ -1459,6 +1473,14 @@
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() {
// console.log(111);
// console.log(this.referForm.birthday);
......@@ -1486,7 +1508,6 @@
if (this.configJson.education == 1) {
obj.education = _this.referForm.education;
}
if (this.configJson.postAddress == 1) {
obj.address = _this.referForm.address;
}
......@@ -1534,6 +1555,10 @@
if (this.configJson.schoolPhone == 1) {
obj.school_phone = _this.referForm.school_phone;
}
//是否需要填写邀请码
if (this.doubt_code == 1 && this.code != '') {
obj.code = _this.referForm.code;
}
setAccount(obj).then((res) => {
// console.log(res, "setAccount");
if (res.data.code != 200) {
......@@ -1550,6 +1575,7 @@
// this.$router.push("/signUp/check?code=" + code);
this.referForm = res.data.data;
});
});
},
},
......
src/views/index/camp/SignUp.vue
View file @ 1a51d059
......@@ -12,7 +12,7 @@
this.status == 5
"
>
<el-button @click="lasStep()">上一步 </el-button>
<el-button @click="lasStep()">上一步</el-button>
</div>
<div>
<div v-if="$store.state.human == 1" class="signUp_titile">
......@@ -23,7 +23,7 @@
</div>
<div>
<Breadcrumb :statusNum="status"> </Breadcrumb>
<Breadcrumb :statusNum="status"></Breadcrumb>
</div>
</div>
<Confirm v-if="type == 'examInfo'" @getstatus="statuss"></Confirm>
......@@ -32,7 +32,10 @@
@getstatus="statuss"
:invitation_code="invitation_code"
></Invitation>
<ReferInfo v-else-if="type == 'referInfo'" @getstatus="statuss"></ReferInfo>
<ReferInfo v-else-if="type == 'referInfo'"
@getstatus="statuss"
:invitation_code="invitation_code"
></ReferInfo>
<Pass
v-else-if="type == 'check'"
@is_next="is_nextevent"
......@@ -148,18 +151,18 @@
</template>
<script>
/* eslint-disable */
import { HREF_URL } from "@/config/server";
import Breadcrumb from "c/breadcrumb";
import Confirm from "c/index/SignUp/confirm";
import Invitation from "c/index/SignUp/invitation";
import ReferInfo from "c/index/SignUp/referInfo";
import Pass from "c/index/SignUp/pass";
import Paying from "c/index/SignUp/paying";
import Success from "c/index/SignUp/success";
import { signUpInit, signBack } from "r/index/signUp";
export default {
/* eslint-disable */
import {HREF_URL} from "@/config/server";
import Breadcrumb from "c/breadcrumb";
import Confirm from "c/index/SignUp/confirm";
import Invitation from "c/index/SignUp/invitation";
import ReferInfo from "c/index/SignUp/referInfo";
import Pass from "c/index/SignUp/pass";
import Paying from "c/index/SignUp/paying";
import Success from "c/index/SignUp/success";
import {signUpInit, signBack} from "r/index/signUp";
export default {
name: "signUp",
components: {
Breadcrumb,
......@@ -230,8 +233,6 @@ export default {
},
},
methods: {
// 营地通知 详情内容
// toMsgDetail() {
// this.dialogVisibleList = false;
......@@ -296,6 +297,7 @@ export default {
} else if (this.status == 1) {
// 是否填写邀请码
if (this.doubt_code == 0) {
this.type = "referInfo";
this.status = 2;
} else {
......@@ -411,22 +413,26 @@ export default {
},
};
};
</script>
<style lang="scss" >
@import "a/scss/lastBtn";
.flex {
<style lang="scss">
@import "a/scss/lastBtn";
.flex {
display: flex;
}
.item {
}
.item {
margin-top: 10px;
margin-right: 40px;
}
.el-dialog__wrapper {
}
.el-dialog__wrapper {
transition-duration: 0.3s;
}
.btn {
}
.btn {
text-align: center;
// padding-bottom: 224px;
.el-button {
......@@ -443,8 +449,9 @@ export default {
padding: 0;
margin: 30px 0 0 0;
}
}
.signUp {
}
.signUp {
/*background: #ffffff;*/
/*width: 856px;*/
.signUp_titile {
......@@ -455,38 +462,46 @@ export default {
margin-bottom: 40px;
text-align: center;
}
.content {
padding: 50px 55px;
}
}
}
// 营地通知列表
.infoList {
// 营地通知列表
.infoList {
.el-dialog__header {
margin: 30px 20px 0 20px;
.el-dialog__title {
font-size: 24px;
}
}
.el-dialog__body {
padding: 0;
}
div {
// font-size: 16px;
line-height: 27px;
}
.msg {
background-color: #f2f2f2;
padding: 10px 15px;
.title {
width: 100%;
font-size: 17px;
font-weight: 600;
}
.time {
font-size: 15px;
color: #a9a9a9;
}
.msg_content {
font-size: 15px;
white-space: nowrap;
......@@ -495,27 +510,31 @@ export default {
overflow: hidden;
}
}
}
}
// 营地通知声明
.info {
// 营地通知声明
.info {
.el-dialog__header {
margin: 30px 20px 0 20px;
.el-dialog__title {
font-size: 24px;
}
}
.el-dialog__body {
padding: 0 25px 25px 30px;
}
div {
font-size: 17px;
line-height: 30px;
}
.time {
text-align: center;
font-size: 15px;
color: #a9a9a9;
}
}
}
</style>
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