Skip to content

C
campSite
Commit ca6fc8d1 authored by wuwangwolihui's avatar wuwangwolihui
Browse files
Options

修改-提示文字、西交大支付不传截图

parent 85dd5829
Show whitespace changes
Inline Side-by-side
Showing with 1085 additions and 951 deletions
src/components/breadcrumb.vue
View file @ ca6fc8d1
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
<div <div
class="referInfoTips" class="referInfoTips"
v-show="status == 0 || status == 1 || status == 2||status == 3 " v-show="status == 0 || status == 1 || status == 2 || status == 3"
@click="toShowSteps" @click="toShowSteps"
> >
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
...@@ -52,10 +52,10 @@ ...@@ -52,10 +52,10 @@
</template> </template>
<script> <script>
/* eslint-disable */ /* eslint-disable */
export default { export default {
name: "breadcrumb", name: "breadcrumb",
props: { statusNum: [String, Number] }, //进度参数 props: {statusNum: [String, Number]}, //进度参数
data() { data() {
return { return {
status: this.statusNum, status: this.statusNum,
...@@ -126,15 +126,16 @@ export default { ...@@ -126,15 +126,16 @@ export default {
this.isShowStepsTips = !this.isShowStepsTips; this.isShowStepsTips = !this.isShowStepsTips;
}, },
}, },
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.flex { .flex {
display: flex; display: flex;
} }
// 报名流程提示
.referInfoTips { // 报名流程提示
.referInfoTips {
// position: absolute; // position: absolute;
// right: 1%; // right: 1%;
// top: 45%; // top: 45%;
...@@ -145,9 +146,9 @@ export default { ...@@ -145,9 +146,9 @@ export default {
font-size: 26px; font-size: 26px;
cursor: pointer; cursor: pointer;
} }
} }
.vertical-steps { .vertical-steps {
position: absolute; position: absolute;
right: 2%; right: 2%;
top: 9.5%; top: 9.5%;
...@@ -157,6 +158,7 @@ export default { ...@@ -157,6 +158,7 @@ export default {
padding: 30px 20px 20px; padding: 30px 20px 20px;
border-radius: 8px; border-radius: 8px;
z-index: 99; z-index: 99;
.vertical-steps-title { .vertical-steps-title {
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
...@@ -170,9 +172,9 @@ export default { ...@@ -170,9 +172,9 @@ export default {
top: 2%; top: 2%;
cursor: pointer; cursor: pointer;
} }
} }
.step { .step {
display: flex; display: flex;
margin-bottom: 10px; margin-bottom: 10px;
position: relative; position: relative;
...@@ -193,8 +195,10 @@ export default { ...@@ -193,8 +195,10 @@ export default {
z-index: 2; z-index: 2;
border: 2px solid white; border: 2px solid white;
box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3), box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3),
/* 主阴影 */ inset 0 2px 4px rgba(255, 255, 255, 0.3), /* 主阴影 */
/* 内阴影 */ 0 0 0 4px rgba(24, 144, 255, 0.1); inset 0 2px 4px rgba(255, 255, 255, 0.3),
/* 内阴影 */
0 0 0 4px rgba(24, 144, 255, 0.1);
/* 外发光效果 */ /* 外发光效果 */
} }
...@@ -240,19 +244,20 @@ export default { ...@@ -240,19 +244,20 @@ export default {
border-left: 1.5px dotted var(--color); border-left: 1.5px dotted var(--color);
z-index: 1; z-index: 1;
} }
} }
.speed-bg-color { .speed-bg-color {
background-color: var(--color) !important; background-color: var(--color) !important;
} }
.speed-text-color { .speed-text-color {
color: var(--color) !important; color: var(--color) !important;
} }
.steps { .steps {
.step { .step {
align-items: center; align-items: center;
.cricle { .cricle {
width: 30px; width: 30px;
height: 30px; height: 30px;
...@@ -280,5 +285,5 @@ export default { ...@@ -280,5 +285,5 @@ export default {
margin: 0 15px 0 10px; margin: 0 15px 0 10px;
} }
} }
} }
</style> </style>
src/components/index/SignUp/pass.vue
View file @ ca6fc8d1
...@@ -5,13 +5,14 @@ ...@@ -5,13 +5,14 @@
<!-- <img src="@/assets/img/signUp/icon-shenhe.png" alt="" /> --> <!-- <img src="@/assets/img/signUp/icon-shenhe.png" alt="" /> -->
<i class="icon-icon"></i> <i class="icon-icon"></i>
</div> </div>
<!-- {{!this.examine_status == 1}} --> <!--<template v-if="this.examine_status == 0 || this.examine_status == 3">
<div v-if="this.examine_status == 0 || this.examine_status == 3"> <div>同学你好，你的报名资料已提交</div>
同学你好，你的报名资料已提交 <div>请等待工作人员审核，审核结果将于以短信形式发送到报名手机号，请注意查收。</div>
</div> </template>-->
<div v-if="this.examine_status == 0 || this.examine_status == 3"> <template v-if="this.examine_status == 0 || this.examine_status == 3">
请等待工作人员审核，审核结果将于以短信形式发送到报名手机号，请注意查收。 <div>同学好，你的报名资料已提交</div>
</div> <div>请等待工作人员审核，审核结果将以邮件形式发送到您的邮箱，请注意查收。</div>
</template>
<div v-if="this.examine_status == 1"> <div v-if="this.examine_status == 1">
同学你好，你的材料已经通过审核，请点击“下一步”完成报名 同学你好，你的材料已经通过审核，请点击“下一步”完成报名
</div> </div>
......
src/components/index/SignUp/paying.vue
View file @ ca6fc8d1
...@@ -261,15 +261,14 @@ ...@@ -261,15 +261,14 @@
</div> </div>
<el-dialog :visible.sync="dialogVisible"> <el-dialog :visible.sync="dialogVisible">
<img :src="resultPicture" alt="" width="100%" /> <img :src="resultPicture" alt="" width="100%"/>
</el-dialog> </el-dialog>
</div> </div>
</div> </div>
<div class="dialog-footer" slot="footer">
<span class="dialog-footer" slot="footer"> <el-button @click="bankDialogVisible = false">关 闭</el-button>
<el-button @click="bankDialogVisible = false">取 消</el-button> <!--<el-button @click="uploadConfirm" type="primary">确 定</el-button>-->
<el-button @click="uploadConfirm" type="primary">确 定</el-button> </div>
</span>
</el-dialog> </el-dialog>
<!-- 微信二维码截图支付 --> <!-- 微信二维码截图支付 -->
<el-dialog <el-dialog
...@@ -350,28 +349,54 @@ ...@@ -350,28 +349,54 @@
</div> </div>
<el-dialog :visible.sync="dialogVisible"> <el-dialog :visible.sync="dialogVisible">
<img :src="resultPicture" alt="" width="100%" /> <img :src="resultPicture" alt="" width="100%"/>
</el-dialog> </el-dialog>
</div> </div>
</div> </div>
<div class="dialog-footer" slot="footer">
<span class="dialog-footer" slot="footer"> <el-button @click="wxImgDialogVisible = false">关 闭</el-button>
<el-button @click="wxImgDialogVisible = false">取 消</el-button> <!--<el-button @click="uploadConfirm" type="primary">确 定</el-button>-->
<el-button @click="uploadConfirm" type="primary">确 定</el-button> </div>
</span> </el-dialog>
<!-- 微信二维码截图支付-西交大 -->
<el-dialog
:before-close="handleClose"
:visible.sync="wxImgDialogVisibleXJ"
title="微信二维码截图支付"
width="200"
@open="openBank"
>
<div class="bank_pay">
<img
style="width: 200px; margin: 10px 0"
:src="$store.state.tp_qr_code"
/>
<div v-if="$store.state.tp_qr_note != null">
<span>备注:</span>{{ $store.state.tp_qr_note }}
</div>
<el-checkbox
v-model="checkedXJ"
class="checkbox-btn"
>确认已完成支付
</el-checkbox>
</div>
<div class="dialog-footer" slot="footer">
<el-button @click="onCancel">取 消</el-button>
<el-button @click="onConfirm" type="primary">确 定</el-button>
</div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
/* eslint-disable */ /* eslint-disable */
import ConfirmSignUp from "c/index/SignUp/ConfirmSignUp"; import ConfirmSignUp from "c/index/SignUp/ConfirmSignUp";
import { delPayingPic, getAccount, signUpInit } from "r/index/signUp"; import {delPayingPic, getAccount, signUpInit} from "r/index/signUp";
import { getWxConfig } from "r/index/pay"; import {getWxConfig} from "r/index/pay";
import { achievementCallBack, cosSignature } from "r/index/cosUpload"; import {achievementCallBack, cosSignature} from "r/index/cosUpload";
import COS from "cos-js-sdk-v5"; import COS from "cos-js-sdk-v5";
export default { export default {
name: "Paying", name: "Paying",
components: { components: {
ConfirmSignUp, ConfirmSignUp,
...@@ -413,8 +438,9 @@ export default { ...@@ -413,8 +438,9 @@ export default {
disabled: false, //限制输入框 disabled: false, //限制输入框
hideUpload: false, hideUpload: false,
isBank_infoFile: false, isBank_infoFile: false,
//微信二维码支付 wxImgDialogVisible: false,//微信二维码支付
wxImgDialogVisible: false, wxImgDialogVisibleXJ: false,//微信二维码支付-西交大
checkedXJ: false,
}; };
}, },
created() { created() {
...@@ -448,7 +474,8 @@ export default { ...@@ -448,7 +474,8 @@ export default {
.then((_) => { .then((_) => {
done(); done();
}) })
.catch((_) => {}); .catch((_) => {
});
}, },
// 子组件触发，关闭确认报名弹框 // 子组件触发，关闭确认报名弹框
closeCFSUDialog(val, isSuccess) { closeCFSUDialog(val, isSuccess) {
...@@ -497,7 +524,7 @@ export default { ...@@ -497,7 +524,7 @@ export default {
this.commonApi(34); this.commonApi(34);
this.dialogPayingVisible = false; this.dialogPayingVisible = false;
if (this.has_amount == 0) { if (this.has_amount == 0) {
getWxConfig({ pay_type: 3 }).then((res) => { getWxConfig({pay_type: 3}).then((res) => {
console.log(res, "signUpInit"); console.log(res, "signUpInit");
if (res.data.code != 200) { if (res.data.code != 200) {
return this.$message.error(res.data.msg); return this.$message.error(res.data.msg);
...@@ -507,9 +534,14 @@ export default { ...@@ -507,9 +534,14 @@ export default {
}); });
} else { } else {
// transfer_account 判断微信支付宝或者银行卡支付 // transfer_account 判断微信支付宝或者银行卡支付
console.log(this.$store.state.tp_qr_pay, "this.$store.state.tp_qr_pay");
if (this.$store.state.tp_qr_pay == 1) { if (this.$store.state.tp_qr_pay == 1) {
//tp_qr_pay 微信二维码截图支付 //tp_qr_pay 微信二维码截图支付
const camArr = ['9ccaf182cc0b41b59775c91efd863d79', '38fed647ca494a688ce74e263ca60d2a', 'c306126c0f1d41ff947a4c456a2a8349'];
if (camArr.includes(this.$store.state.indexIdentity)) {
// 2025-10-17 西交大营地
this.wxImgDialogVisibleXJ = true;
return false;
}
this.wxImgDialogVisible = true; this.wxImgDialogVisible = true;
if (this.fileList.length >= 1) { if (this.fileList.length >= 1) {
this.hideUpload = true; this.hideUpload = true;
...@@ -549,7 +581,7 @@ export default { ...@@ -549,7 +581,7 @@ export default {
} }
} }
if (res.data.pay_amount == 0) { if (res.data.pay_amount == 0) {
getWxConfig({ pay_type: 3 }).then((res) => { getWxConfig({pay_type: 3}).then((res) => {
console.log(res, "signUpInit"); console.log(res, "signUpInit");
if (res.data.code != 200) { if (res.data.code != 200) {
return this.$message.error(res.data.msg); return this.$message.error(res.data.msg);
...@@ -594,7 +626,8 @@ export default { ...@@ -594,7 +626,8 @@ export default {
// this.personalInfo.create_time = parseTime(res.data.info.create_time); // this.personalInfo.create_time = parseTime(res.data.info.create_time);
}); });
}, },
openBank() {}, openBank() {
},
// 上传银行卡转账截图 // 上传银行卡转账截图
// 图片上传成功前钩子 // 图片上传成功前钩子
...@@ -636,36 +669,64 @@ export default { ...@@ -636,36 +669,64 @@ export default {
this.$refs["imgUrl"].clearFiles(); //上传成功之后清除历史记录 this.$refs["imgUrl"].clearFiles(); //上传成功之后清除历史记录
}, },
uploadPicture(params) { uploadPicture(params) {
// console.log("已经准备好上传图片", params);
this.file = params.file; this.file = params.file;
let raw = params.file; let raw = params.file;
console.log(raw);
let image = { let image = {
name: raw.name, name: raw.name,
size: raw.size, size: raw.size,
type: raw.type, type: raw.type,
}; };
// console.log(image)
// this.file_image = image;
this.getCosConfigs(image, params.file); this.getCosConfigs(image, params.file);
}, },
// 上传截图 // 取消-西交大
onCancel() {
this.wxImgDialogVisibleXJ = false;
this.checkedXJ = false;
},
// 确认-西交大
async onConfirm() {
if (!this.checkedXJ) {
this.$message.info("请勾选【确认已完成支付】");
return false;
}
let {data: res} = await getWxConfig({
pay_type: 4,
});
if (res.code != 200) {
if (res.msg == '请等待邮件通知，审核通过后登录报名网址。') {
this.wxImgDialogVisibleXJ = false;
this.checkedXJ = false;
this.$message.success(res.msg);
return false;
}
this.$message.info(res.msg);
return false;
}
this.wxImgDialogVisibleXJ = false;
this.checkedXJ = false;
this.$message.success("提交成功");
},
// 确认
uploadConfirm() { uploadConfirm() {
this.bankDialogVisible = false; this.bankDialogVisible = false;
this.wxImgDialogVisible = false; this.wxImgDialogVisible = false;
this.$message.success("提交成功"); this.$message.success("提交成功");
// this.getOssConfigs(this.file_image, this.file);
}, },
// 取消/关闭
uploadCancel() {
this.bankDialogVisible = false;
this.wxImgDialogVisible = false;
},
// 更新支付状态
async changeStatus() { async changeStatus() {
// console.log(SERVER_WS_URL); let {data: res} = await getWxConfig({
let { data: res } = await getWxConfig({
pay_type: 4, pay_type: 4,
}); });
}, },
// cos上传 // cos上传
async getCosConfigs(image, file) { async getCosConfigs(image, file) {
this.loading = true; this.loading = true;
await cosSignature({ image: image, index: "3" }) await cosSignature({image: image, index: "3"})
.then((res) => { .then((res) => {
let resData = res.data.data; let resData = res.data.data;
if (res.data.code === 200) { if (res.data.code === 200) {
...@@ -717,7 +778,7 @@ export default { ...@@ -717,7 +778,7 @@ export default {
}, },
// cos上传-告诉后端上传成功 // cos上传-告诉后端上传成功
async signUploadSuccess(path, resData) { async signUploadSuccess(path, resData) {
await achievementCallBack({ key: resData.key, index: 3 }) await achievementCallBack({key: resData.key, index: 3})
.then((res) => { .then((res) => {
if (res.data.code != 200) { if (res.data.code != 200) {
this.loading = false; this.loading = false;
...@@ -827,7 +888,7 @@ export default { ...@@ -827,7 +888,7 @@ export default {
); );
let savefile = str[1].split("?")[0]; let savefile = str[1].split("?")[0];
delPayingPic({ object: savefile }).then((res) => { delPayingPic({object: savefile}).then((res) => {
if (res.data.code != 200) { if (res.data.code != 200) {
return this.$message.error(res.data.msg); return this.$message.error(res.data.msg);
} }
...@@ -860,26 +921,26 @@ export default { ...@@ -860,26 +921,26 @@ export default {
}); });
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "a/scss/btn"; @import "a/scss/btn";
@import "a/scss/dialog"; @import "a/scss/dialog";
.btn { .btn {
padding-bottom: 0 !important; padding-bottom: 0 !important;
} }
.flex { .flex {
display: flex; display: flex;
} }
.margin1 { .margin1 {
margin-bottom: 1rem; margin-bottom: 1rem;
} }
::v-deep .hide { ::v-deep .hide {
.el-upload--picture-card { .el-upload--picture-card {
display: none; display: none;
} }
...@@ -887,9 +948,9 @@ export default { ...@@ -887,9 +948,9 @@ export default {
.el-upload-list__item div { .el-upload-list__item div {
height: 100%; height: 100%;
} }
} }
.paying { .paying {
padding: 0 56px 65px 56px; padding: 0 56px 65px 56px;
.redFont { .redFont {
...@@ -911,6 +972,7 @@ export default { ...@@ -911,6 +972,7 @@ export default {
width: 16px; width: 16px;
margin-right: 5px; margin-right: 5px;
} }
div { div {
color: #fff; color: #fff;
font-size: 12px; font-size: 12px;
...@@ -968,14 +1030,15 @@ export default { ...@@ -968,14 +1030,15 @@ export default {
color: red; color: red;
} }
} }
} }
.choose { .choose {
text-align: center; text-align: center;
.img_choose { .img_choose {
justify-content: space-around; justify-content: space-around;
margin: 0 0 50px 0; margin: 0 0 50px 0;
img { img {
width: 38%; width: 38%;
cursor: pointer; cursor: pointer;
...@@ -990,45 +1053,47 @@ export default { ...@@ -990,45 +1053,47 @@ export default {
.btn .el-button { .btn .el-button {
width: 120px !important; width: 120px !important;
} }
} }
// .pay_code {
// text-align: center;
// :nth-child(1) {
// font-size: 14px;
// font-weight: 500;
// color: #12141c;
// line-height: 14px;
// span {
// font-size: 13px !important;
// color: var(--color);
// }
// }
// :nth-child(2) {
// font-size: 14px;
// font-weight: 500;
// color: var(--color);
// line-height: 24px;
// }
// :nth-child(4) {
// font-size: 14px;
// font-weight: 500;
// color: #333333;
// line-height: 16px;
// span {
// font-size: 17px !important;
// color: var(--color);
// }
// }
// :nth-child(5) {
// font-size: 12px;
// font-weight: 500;
// color: #666666;
// line-height: 12px;
// }
// }
// .pay_code { .bank_pay {
// text-align: center; text-align: center;
// :nth-child(1) {
// font-size: 14px;
// font-weight: 500;
// color: #12141c;
// line-height: 14px;
// span {
// font-size: 13px !important;
// color: var(--color);
// }
// }
// :nth-child(2) {
// font-size: 14px;
// font-weight: 500;
// color: var(--color);
// line-height: 24px;
// }
// :nth-child(4) {
// font-size: 14px;
// font-weight: 500;
// color: #333333;
// line-height: 16px;
// span {
// font-size: 17px !important;
// color: var(--color);
// }
// }
// :nth-child(5) {
// font-size: 12px;
// font-weight: 500;
// color: #666666;
// line-height: 12px;
// }
// }
.bank_pay {
& div { & div {
margin: 8px 0; margin: 8px 0;
} }
...@@ -1036,5 +1101,29 @@ export default { ...@@ -1036,5 +1101,29 @@ export default {
& span { & span {
font-weight: 600; font-weight: 600;
} }
} }
::v-deep .checkbox-btn {
margin: 10px auto 0;
justify-content: center;
.el-checkbox__input {
&.is-focus {
.el-checkbox__inner {
border-color: var(--color);
}
}
&.is-checked {
.el-checkbox__inner {
background-color: var(--color);
border-color: var(--color);
}
& + .el-checkbox__label {
color: var(--color);
}
}
}
}
</style> </style>
src/components/index/SignUp/referInfo.vue
View file @ ca6fc8d1
...@@ -271,6 +271,7 @@ ...@@ -271,6 +271,7 @@
size="small" size="small"
v-model="referForm.email" v-model="referForm.email"
/> />
<div class="label-txt">(请填写常用邮箱，后续审核结果将通过邮件形式告知)</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 推荐人（非必填） --> <!-- 推荐人（非必填） -->
...@@ -749,16 +750,16 @@ ...@@ -749,16 +750,16 @@
<el-form-item <el-form-item
:rules=" :rules="
(configJson.clothesSize == 1 ? true : false) (configJson.clothesSize == 1 ? true : false)
? referInfoRules.clothesSize ? referInfoRules.clothes_size
: [{ required: false }] : [{ required: false }]
" "
label="衣服尺码" label="衣服尺码"
prop="clothes_size" prop="clothes_size"
style="height: 200px" style="margin-bottom: 50px"
> >
<el-radio-group ref="clothes_size" v-model="referForm.clothes_size"> <el-radio-group ref="clothes_size" v-model="referForm.clothes_size">
<div <div
v-for="item in clothesSize" v-for="item in clothesSizeList"
:key="item.id" :key="item.id"
style="margin-right: 10px" style="margin-right: 10px"
> >
...@@ -783,7 +784,7 @@ ...@@ -783,7 +784,7 @@
> >
<el-radio-group ref="clothes_size" v-model="referForm.clothes_size"> <el-radio-group ref="clothes_size" v-model="referForm.clothes_size">
<div <div
v-for="item in clothesSize" v-for="item in clothesSizeList"
:key="item.id" :key="item.id"
style="margin-right: 10px" style="margin-right: 10px"
> >
...@@ -1640,13 +1641,6 @@ ...@@ -1640,13 +1641,6 @@
// }, // },
{validator: validator.validateid_card, trigger: "blur"}, {validator: validator.validateid_card, trigger: "blur"},
], ],
clothesSize: [
{
required: true,
message: "衣服尺码不能为空！",
trigger: "change",
},
],
introduce: [ introduce: [
{ {
required: true, required: true,
...@@ -1682,6 +1676,13 @@ ...@@ -1682,6 +1676,13 @@
}, },
{validator: validator.validatePhone, trigger: "blur"}, {validator: validator.validatePhone, trigger: "blur"},
], ],
clothes_size: [
{
required: true,
message: "衣服尺码不能为空！",
trigger: "blur",
},
],
}, },
countryList: area.country, //国籍 countryList: area.country, //国籍
selectProvince: [], //省份 selectProvince: [], //省份
...@@ -1819,33 +1820,6 @@ ...@@ -1819,33 +1820,6 @@
name: "群众", name: "群众",
}, },
], ],
//衣服尺码
clothesSize: [
{
id: "S",
name: "S (155-160CM)",
},
{
id: "M",
name: "M (160-165CM)",
},
{
id: "L",
name: "L (165-170CM)",
},
{
id: "XL",
name: "XL (170-175CM)",
},
{
id: "XXL",
name: "XXL (175-180CM)",
},
{
id: "XXXL",
name: "XXXL (180-185CM)",
},
],
// 证件类型 // 证件类型
IDArrs: [ IDArrs: [
"大陆居民身份证", "大陆居民身份证",
...@@ -2004,7 +1978,11 @@ ...@@ -2004,7 +1978,11 @@
this.changeProvince(2, this.referForm.school_province, true); this.changeProvince(2, this.referForm.school_province, true);
this.changeCity(this.referForm.school_city, true); this.changeCity(this.referForm.school_city, true);
} }
if (val.clothes_size && this.clothesSizeList.some(item => item.id === val.clothes_size)) {
this.referForm.clothes_size = val.clothes_size;
} else {
this.referForm.clothes_size = "";
}
if ( if (
val.elect_subject_situation == "文科" || val.elect_subject_situation == "文科" ||
val.elect_subject_situation == "理科" val.elect_subject_situation == "理科"
...@@ -2037,7 +2015,61 @@ ...@@ -2037,7 +2015,61 @@
} }
}, },
}, },
mounted() { computed: {
clothesSizeList() {
let that = this;
let list = [];
let camArr = ['9ccaf182cc0b41b59775c91efd863d79', '38fed647ca494a688ce74e263ca60d2a', 'c306126c0f1d41ff947a4c456a2a8349'];
if (camArr.includes(that.$store.state.indexIdentity)) {
// 2025-10-17 西交大营地
list = [
{
id: "M",
name: "M码 (165CM及以下)",
},
{
id: "XL",
name: "XL码 (165-175CM)",
},
{
id: "XXL",
name: "XXL码 (175-185CM)",
},
{
id: "XXXXL",
name: "XXXXL码 (185CM及以上)",
},
]
} else {
list = [
{
id: "S",
name: "S (155-160CM)",
},
{
id: "M",
name: "M (160-165CM)",
},
{
id: "L",
name: "L (165-170CM)",
},
{
id: "XL",
name: "XL (170-175CM)",
},
{
id: "XXL",
name: "XXL (175-180CM)",
},
{
id: "XXXL",
name: "XXXL (180-185CM)",
},
]
}
return list;
}
}, },
methods: { methods: {
//上传附件 //上传附件
...@@ -2132,7 +2164,6 @@ ...@@ -2132,7 +2164,6 @@
}); });
}); });
}, },
// 判断证件类型-证件号是否需要校验 // 判断证件类型-证件号是否需要校验
// IDtypeRule(val) { // IDtypeRule(val) {
// if (val == "大陆居民身份证") { // if (val == "大陆居民身份证") {
...@@ -2750,148 +2781,148 @@ ...@@ -2750,148 +2781,148 @@
this.scrollView(object); this.scrollView(object);
return false; return false;
} }
let _this = this; let that = this;
let obj = {}; let obj = {};
if (_this.configJson.name == 1) { if (that.configJson.name == 1) {
obj.name = _this.referForm.name; obj.name = that.referForm.name;
} }
if (_this.configJson.gender == 1) { if (that.configJson.gender == 1) {
obj.gender = _this.referForm.gender; obj.gender = that.referForm.gender;
} }
if (_this.configJson.idCard == 1) { if (that.configJson.idCard == 1) {
obj.id_type = _this.referForm.id_type; obj.id_type = that.referForm.id_type;
} }
if (_this.configJson.idCard == 1) { if (that.configJson.idCard == 1) {
obj.id_card = _this.referForm.id_card; obj.id_card = that.referForm.id_card;
} }
if (_this.configJson.age == 1) { if (that.configJson.age == 1) {
obj.age = _this.referForm.age; obj.age = that.referForm.age;
} }
if (_this.configJson.education == 1) { if (that.configJson.education == 1) {
obj.education = _this.referForm.education; obj.education = that.referForm.education;
} }
if (_this.configJson.postAddress == 1) { if (that.configJson.postAddress == 1) {
obj.address = _this.referForm.address; obj.address = that.referForm.address;
} }
if (_this.configJson.country == 1) { if (that.configJson.country == 1) {
obj.country = _this.referForm.country; obj.country = that.referForm.country;
} }
if (_this.configJson.nation == 1) { if (that.configJson.nation == 1) {
obj.nation = _this.referForm.nation; obj.nation = that.referForm.nation;
} }
if (_this.configJson.startSchoolDate == 1) { if (that.configJson.startSchoolDate == 1) {
obj.start_school_date = _this.start_year; obj.start_school_date = that.start_year;
} }
if (_this.configJson.politicalStatus == 1) { if (that.configJson.politicalStatus == 1) {
obj.political_status = _this.referForm.political_status; obj.political_status = that.referForm.political_status;
} }
if (_this.configJson.phone == 1) { if (that.configJson.phone == 1) {
obj.phone = _this.referForm.phone; obj.phone = that.referForm.phone;
} }
if (_this.configJson.grade == 1) { if (that.configJson.grade == 1) {
obj.grade = _this.referForm.grade; obj.grade = that.referForm.grade;
} }
if (_this.configJson.unitandIdentity == 1) { if (that.configJson.unitandIdentity == 1) {
obj.unit_and_identity = _this.referForm.unit_and_identity; obj.unit_and_identity = that.referForm.unit_and_identity;
} }
if (_this.configJson.email == 1) { if (that.configJson.email == 1) {
obj.email = _this.referForm.email; obj.email = that.referForm.email;
} }
if (_this.configJson.jiguanCity == 1) { if (that.configJson.jiguanCity == 1) {
obj.jiguan_code = _this.referForm.jiguan_code; obj.jiguan_code = that.referForm.jiguan_code;
} }
if (_this.configJson.recommend == 1) { if (that.configJson.recommend == 1) {
obj.recommend = _this.referForm.recommend; obj.recommend = that.referForm.recommend;
} }
if (_this.configJson.start_school_date == 1) { if (that.configJson.start_school_date == 1) {
obj.start_school_date = _this.referForm.start_school_date; obj.start_school_date = that.referForm.start_school_date;
} }
if (_this.configJson.birthday == 1) { if (that.configJson.birthday == 1) {
obj.birthday = _this.referForm.birthday; obj.birthday = that.referForm.birthday;
} }
if (_this.configJson.electSubjectSituation == 1) { if (that.configJson.electSubjectSituation == 1) {
obj.elect_subject_situation = _this.elect_subject_situation; obj.elect_subject_situation = that.elect_subject_situation;
} }
if (_this.configJson.pastMedicalHistory == 1) { if (that.configJson.pastMedicalHistory == 1) {
obj.past_medical_history = _this.referForm.past_medical_history; obj.past_medical_history = that.referForm.past_medical_history;
} }
if (_this.configJson.noteOther == 1) { if (that.configJson.noteOther == 1) {
obj.note_other = _this.referForm.note_other; obj.note_other = that.referForm.note_other;
} }
if (_this.configJson.class == 1) { if (that.configJson.class == 1) {
obj.class = _this.referForm.class; obj.class = that.referForm.class;
} }
if (_this.configJson.emergency == 1) { if (that.configJson.emergency == 1) {
obj.emergency = _this.referForm.emergency; obj.emergency = that.referForm.emergency;
} }
if (_this.configJson.emergencyPhone == 1) { if (that.configJson.emergencyPhone == 1) {
obj.emergency_phone = _this.referForm.emergency_phone; obj.emergency_phone = that.referForm.emergency_phone;
} }
// 监护人信息 // 监护人信息
if (_this.configJson.guardianName == 1) { if (that.configJson.guardianName == 1) {
obj.guardian_name = _this.referForm.guardian_name; obj.guardian_name = that.referForm.guardian_name;
} }
if (_this.configJson.guardianPhone == 1) { if (that.configJson.guardianPhone == 1) {
obj.guardian_phone = _this.referForm.guardian_phone; obj.guardian_phone = that.referForm.guardian_phone;
} }
if (_this.configJson.guardianCard == 1) { if (that.configJson.guardianCard == 1) {
obj.guardian_card = _this.referForm.guardian_card; obj.guardian_card = that.referForm.guardian_card;
} }
//衣服尺码 //衣服尺码
if (_this.configJson.clothesSize == 1) { if (that.configJson.clothesSize == 1) {
obj.clothes_size = _this.referForm.clothes_size; obj.clothes_size = that.referForm.clothes_size;
} }
//自我介绍 //自我介绍
if (_this.configJson.introduceMyself == 1) { if (that.configJson.introduceMyself == 1) {
obj.introduce = _this.referForm.introduce; obj.introduce = that.referForm.introduce;
} }
if (_this.configJson.school == 1) { if (that.configJson.school == 1) {
obj.school_province = _this.referForm.school_province; obj.school_province = that.referForm.school_province;
obj.school_city = _this.referForm.school_city; obj.school_city = that.referForm.school_city;
obj.school = _this.referForm.school; obj.school = that.referForm.school;
} }
if (_this.configJson.schoolContacts == 1) { if (that.configJson.schoolContacts == 1) {
obj.school_contacts = _this.referForm.school_contacts; obj.school_contacts = that.referForm.school_contacts;
} }
if (_this.configJson.schoolPhone == 1) { if (that.configJson.schoolPhone == 1) {
obj.school_phone = _this.referForm.school_phone; obj.school_phone = that.referForm.school_phone;
} }
//是否需要填写邀请码 //是否需要填写邀请码
// if (_this.doubt_code == 1 && _this.code != '') { // if (that.doubt_code == 1 && that.code != '') {
if (_this.configJson.code == 1) { if (that.configJson.code == 1) {
obj.code = _this.referForm.code; obj.code = that.referForm.code;
} }
// 相关资料图片上传 // 相关资料图片上传
// if (_this.configJson.achievementPath == 1) { // if (that.configJson.achievementPath == 1) {
// console.log(_this.fileList4.length) // console.log(that.fileList4.length)
// if (_this.fileList4.length == 0) { // if (that.fileList4.length == 0) {
// return _this.$message.error('请上传成绩证明资料！') // return that.$message.error('请上传成绩证明资料！')
// } // }
// } // }
if (_this.configJson.transcripts == 1) { if (that.configJson.transcripts == 1) {
if (_this.fileList1.length == 0) { if (that.fileList1.length == 0) {
return _this.$message.error("请上传学生成绩单！"); return that.$message.error("请上传学生成绩单！");
} }
} }
// if (_this.configJson.achievementCertificate == 1) { // if (that.configJson.achievementCertificate == 1) {
// if (_this.fileList2.length == 0) { // if (that.fileList2.length == 0) {
// return _this.$message.error('请上传获奖证书！') // return that.$message.error('请上传获奖证书！')
// } // }
// } // }
if (_this.configJson.safetyNotices == 1) { if (that.configJson.safetyNotices == 1) {
if (_this.fileList3.length == 0) { if (that.fileList3.length == 0) {
return _this.$message.error("请上传安全告知书！"); return that.$message.error("请上传安全告知书！");
} }
} }
// console.log(this.referForm.annex_url) // console.log(this.referForm.annex_url)
// console.log(this.annexFileList.length) // console.log(this.annexFileList.length)
if ( if (
_this.$store.state.user_annex_key == 1 && that.$store.state.user_annex_key == 1 &&
_this.annexFileList.length == 0 that.annexFileList.length == 0
) { ) {
return this.$message.error("请上传附件"); return this.$message.error("请上传附件");
} }
...@@ -2904,26 +2935,26 @@ ...@@ -2904,26 +2935,26 @@
setAnnexUrl(obj1).then((res1) => { setAnnexUrl(obj1).then((res1) => {
console.log(res1); console.log(res1);
if (res1.data.code != 200) { if (res1.data.code != 200) {
return _this.$message.error(res1.data.msg); return that.$message.error(res1.data.msg);
} }
// console.log(obj); // console.log(obj);
setAccount(obj).then((res) => { setAccount(obj).then((res) => {
console.log(res); console.log(res);
if (res.data.code != 200) { if (res.data.code != 200) {
if (res.data.code == 400068) { if (res.data.code == 400068) {
_this.$parent.statuss(); that.$parent.statuss();
return _this.$message.error(res.data.msg); return that.$message.error(res.data.msg);
} }
return _this.$message.error(res.data.msg); return that.$message.error(res.data.msg);
} }
if (res.data.code == 4000346 || res.data.code == 4000347) { if (res.data.code == 4000346 || res.data.code == 4000347) {
_this.dialogVisible = true; that.dialogVisible = true;
_this.msg = res.data.msg; that.msg = res.data.msg;
return; return;
} }
_this.$emit("getstatus", res.data.status); that.$emit("getstatus", res.data.status);
_this.$message.success(res.data.msg); that.$message.success(res.data.msg);
// _this.referForm = res.data.data; // that.referForm = res.data.data;
}); });
}); });
}); });
...@@ -2935,4 +2966,12 @@ ...@@ -2935,4 +2966,12 @@
<style lang="scss" scoped> <style lang="scss" scoped>
@import "a/scss/btn"; @import "a/scss/btn";
@import "a/scss/SignUp/referInfo"; @import "a/scss/SignUp/referInfo";
.label-txt {
position: absolute;
top: -35px;
left: 60px;
font-size: 11px;
color: #12141c;
}
</style> </style>
src/config/server.js
View file @ ca6fc8d1
...@@ -9,6 +9,6 @@ export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-camps ...@@ -9,6 +9,6 @@ export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-camps
export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
// 测试 // 测试
// export const SERVER_URL = "http://192.168.8.204:8088/modules-campsite"; // 正式环境 // export const SERVER_URL = "http://192.168.1.107:8088/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "http://192.168.8.204:8088/modules-campsite"; //开发环境 // export const DEVELOPMENT_SERVER_URL = "http://192.168.1.107:8088/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://192.168.8.204:8088"; // websocket // export const SERVER_WS_URL = "wss://192.168.1.107:8088"; // websocket
src/views/base/active/ActiveInfo.vue
View file @ ca6fc8d1
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<div v-if="activeInfo.bmEndTime!=null">报名截止：{{formatYMDChina(activeInfo.bmEndTime)}}</div> <div v-if="activeInfo.bmEndTime!=null">报名截止：{{formatYMDChina(activeInfo.bmEndTime)}}</div>
<div v-if="activeInfo.activityFee && activeInfo.activityFee!='0'"> <div v-if="activeInfo.activityFee && activeInfo.activityFee!='0'">
活动费用：￥{{activeInfo.activityFee}} 活动费用：￥{{activeInfo.activityFee}}
<el-tooltip class="item" content="申请审核通过后，才可缴费参与活动具体活动费用以缴费时为准。" effect="dark" placement="top"> <el-tooltip class="item" content="申请审核通过后，才可缴费参与活动，具体活动费用以缴费时为准。" effect="dark" placement="top">
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</el-tooltip> </el-tooltip>
</div> </div>
......
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