Skip to content

C
campSite
Commit 58a7d92f authored by 杨梦雪's avatar 杨梦雪
Browse files
Options

11

parent 83b05182
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 107 deletions
src/components/index/SignUp/referInfo.vue
View file @ 58a7d92f
......@@ -2,15 +2,12 @@
<div class="referInfo">
<!-- 测试 -->
<el-form
v-if="
$store.state.indexIdentity == '6c6884d1c83040ee8ca17736a8d67b93' ||
$store.state.indexIdentity == 'c432d9028b2840ebbbfd56947b38069b'
"
v-if="$store.state.human == 1"
ref="referRef"
:model="referForm"
label-position="top"
class="checkForm"
:rules="referInfoRules"
:rules="human_referRules"
>
<div class="cont_title">个人信息</div>
<el-row :gutter="20">
......@@ -48,7 +45,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="出生日期" prop="birthday">
<el-row :gutter="20">
<el-col :span="8">
......@@ -100,49 +97,8 @@
</el-col>
</el-row>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="籍贯" prop="jiguan_code">
<el-row :gutter="20">
<el-col :span="12">
<!-- @keyup.enter.native="selsectProvince" -->
<el-select
v-model="jgProvinceCode"
placeholder="省"
:popper-append-to-body="false"
@change="changeProvince(1, $event)"
>
<el-option
v-for="item in selectProvince"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-col>
<el-col :span="12">
<el-select
ref="jiguan_code"
v-model="jiguan_city"
placeholder="市"
:popper-append-to-body="false"
@change="getJiguan()"
>
<el-option
v-for="item in selectCityJiguan"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-col>
</el-row>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="国籍" prop="country">
<el-select
v-model="referForm.country"
......@@ -159,8 +115,8 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="民族" prop="nation">
<el-input
ref="nation"
......@@ -170,7 +126,7 @@
clearable
/>
</el-form-item>
</el-col>
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="入学年份" prop="start_school_date">
<el-row :gutter="20"> -->
......@@ -211,7 +167,7 @@
</el-row>
</el-form-item>
</el-col> -->
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="政治面貌" prop="political_status">
<el-select
ref="political_status"
......@@ -229,7 +185,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="手机号">
<el-input
......@@ -258,6 +214,65 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮寄地址" prop="jiguan_code">
<el-row :gutter="20">
<el-col :span="12">
<!-- @keyup.enter.native="selsectProvince" -->
<el-select
v-model="jgProvinceCode"
placeholder="省"
:popper-append-to-body="false"
@change="changeProvince(1, $event)"
>
<el-option
v-for="item in selectProvince"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-col>
<el-col :span="12">
<el-select
ref="jiguan_code"
v-model="jiguan_city"
placeholder="市"
:popper-append-to-body="false"
@change="getJiguan()"
>
<el-option
v-for="item in selectCityJiguan"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-col>
</el-row>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="详细地址" prop="address">
<el-input
v-model="referForm.address"
placeholder="填写详细地址"
size="small"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="推荐人">
<el-input
v-model="referForm.recommend"
placeholder="填写推荐人（选填）"
size="small"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="btn">
......@@ -704,6 +719,7 @@ export default {
id_card: null,
birthday: null,
jiguan_code: null,
address: null,
country: null,
nation: null,
start_school_date: null,
......@@ -711,6 +727,7 @@ export default {
phone: null,
unit_and_identity: null,
email: null,
recommend: null,
school_province: null,
school_city: null,
school: null,
......@@ -738,13 +755,7 @@ export default {
jiguan_code: [
{ required: true, validator: validateContents, trigger: "change" },
],
country: [
{
required: true,
message: "国籍不能为空！",
trigger: "change",
},
],
nation: [
{ required: true, message: "民族不能为空！", trigger: "change" },
],
......@@ -758,13 +769,6 @@ export default {
political_status: [
{ required: true, message: "政治面貌不能为空！", trigger: "blur" },
],
unit_and_identity: [
{
required: true,
message: "单位名称及身份不能为空！",
trigger: "blur",
},
],
email: [
{ required: true, message: "电子邮箱不能为空！", trigger: "blur" },
{ validator: validator.validateEmail, trigger: "blur" },
......@@ -799,6 +803,36 @@ export default {
],
// backgroundPicture: [{ required: true, message: "请上传图片" }],
},
// 人文学院Rules
human_referRules: {
name: [{ required: true, message: "姓名不能为空！", trigger: "blur" }],
gender: [
{ required: true, message: "性别不能为空！", trigger: "change" },
],
id_card: [
{ required: true, message: "身份证号不能为空！", trigger: "blur" },
{ validator: validator.validateid_card, trigger: "blur" },
],
jiguan_code: [
{ required: true, validator: validateContents, trigger: "change" },
],
address: [
{ required: true, message: "详细地址不能为空！", trigger: "blur" },
],
unit_and_identity: [
{
required: true,
message: "单位名称及身份不能为空！",
trigger: "blur",
},
],
email: [
{ required: true, message: "电子邮箱不能为空！", trigger: "blur" },
{ validator: validator.validateEmail, trigger: "blur" },
],
},
countryList: area.country, //国籍
selectProvince: [], //省份
CityName: {}, //根据省份筛选出所有城市的对象
......
src/components/index/SignUp/success.vue
View file @ 58a7d92f
<template>
<div class="sucess">
<div
v-if="$store.state.indexIdentity == 'c432d9028b2840ebbbfd56947b38069b'||$store.state.indexIdentity == '6c6884d1c83040ee8ca17736a8d67b93'"
class="p_content"
>
<div v-if="$store.state.human == 1" class="p_content">
<div class="top">
<div class="p_title">恭喜你！成功报名</div>
<div>
......
src/config/server.js
View file @ 58a7d92f
......@@ -12,11 +12,11 @@
// export const SERVER_WS_URL = 'wss://api1.testgate.cn' // websocket
// 正式
// export const SERVER_URL = "https://api.campcenter.cn/"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "https://api.campcenter.cn/"; //开发环境
// export const SERVER_WS_URL = "wss://api.campcenter.cn"; // websocket
export const SERVER_URL = "https://api.campcenter.cn/"; // 正式环境
export const DEVELOPMENT_SERVER_URL = "https://api.campcenter.cn/"; //开发环境
export const SERVER_WS_URL = "wss://api.campcenter.cn"; // websocket
// 测试
export const SERVER_URL = "https://ying-test.campcenter.cn"; // 正式环境
export const DEVELOPMENT_SERVER_URL = "https://ying-test.campcenter.cn/"; //开发环境
export const SERVER_WS_URL = "wss://ying-test.campcenter.cn"; // websocket
// export const SERVER_URL = "https://ying-test.campcenter.cn"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "https://ying-test.campcenter.cn/"; //开发环境
// export const SERVER_WS_URL = "wss://ying-test.campcenter.cn"; // websocket
src/main.js
View file @ 58a7d92f
......@@ -10,7 +10,7 @@ import '@/assets/scss/index.scss'
import {download, upload} from "r/index/network.js";
import 'default-passive-events'
Vue.config.productionTip = false
Vue.use(ElementUI)
......
src/router/index.js
View file @ 58a7d92f
......@@ -142,6 +142,10 @@ function checkCam(code, cb) {
window.localStorage.setItem("bank_idcard" + code, res.data.bank_idcard); //银行卡号
}
store.state.info = res.data;
if (code == '6c6884d1c83040ee8ca17736a8d67b93' || code == 'c432d9028b2840ebbbfd56947b38069b') {
store.state.human = 1;
}
cb && cb(true);
}).catch(() => {
cb && cb(false);
......@@ -149,7 +153,7 @@ function checkCam(code, cb) {
}
router.beforeEach((to, from, next) => {
console.log(to, 'to')
// console.log(to, 'to')
// console.log(from, 'from')
let
toLogin = "/login",
......@@ -180,7 +184,14 @@ router.beforeEach((to, from, next) => {
});
} else {
code = to.params.code ? to.params.code : to.query.code;
if (to.path == '/signUp/success') {
code = to.query.code;
} else {
code = to.params.code ? to.params.code : to.query.code;
}
// code = to.params.code ? to.params.code : to.query.code;
// console.log(code);
//return next();
let token = window.localStorage.getItem("index-token" + code);
......
src/store/index.js
View file @ 58a7d92f
......@@ -14,6 +14,7 @@ let state = {
data: [],
token: '',
indexIdentity:"",
human:0,
work_context:"",
enclosure_url:"",
......
src/views/index/camp/Certificate.vue
View file @ 58a7d92f
<template>
<div class="certificate">
<div class="title">
<div class="homework_titile">营地证书</div>
<div v-if="$store.state.human == 1" class="homework_titile">课程证书</div>
<div v-else class="homework_titile">营地证书</div>
</div>
<!-- <div class="content_empty"> -->
<!-- <div>
......@@ -13,11 +14,33 @@
<!-- </div> -->
<div class="content">
<div class="top">
<p class="p_title">
&emsp;&emsp; 恭喜你顺利完成所有营地课程，点击【填写/修改收货地址】以便确认收货地址，证书将以纸质形式邮寄。
</p>
<div>
<img src="@/assets/img/certificate.jpg" alt="" style="width: 25%" />
<p v-if="$store.state.human == 1" class="p_title">
&emsp;&emsp;
恭喜你顺利完成所有课程，点击【填写/修改收货地址】以便确认收货地址，证书将以纸质形式邮寄。
</p>
<p v-else class="p_title">
&emsp;&emsp;
恭喜你顺利完成所有营地课程，点击【填写/修改收货地址】以便确认收货地址，证书将以纸质形式邮寄。
</p>
</div>
<div>
<div v-if="$store.state.human == 1">
<img
src="@/assets/img/certificate_left.jpg"
alt=""
style="width: 25%"
/>
<img
src="@/assets/img/certificate_right.jpg"
alt=""
style="width: 25%"
/>
</div>
<div v-else>
<img src="@/assets/img/certificate.jpg" alt="" style="width: 25%" />
</div>
</div>
<div class="btn">
......@@ -93,7 +116,6 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="no_label" label=" " prop="county">
<!-- <el-select
ref="school"
......@@ -322,6 +344,7 @@ export default {
.btn {
padding-bottom: 0 !important;
padding-top: 20px !important;
.el-button {
width: 160px !important;
}
......@@ -374,6 +397,9 @@ export default {
color: #666666;
line-height: 18px;
}
img {
margin-right: 10px;
}
}
}
// 注意事项
......
src/views/index/camp/Homework.vue
View file @ 58a7d92f
<template>
<div class="homework">
<div class="title">
<div class="homework_titile">营地作业</div>
<div
v-if="$store.state.human == 1"
class="homework_titile"
>
作业
</div>
<div v-else class="homework_titile">营地作业</div>
</div>
<div class="content_empty" v-if="total <= 0">
<div>
......
src/views/index/camp/Index.vue
View file @ 58a7d92f
......@@ -8,11 +8,7 @@
<div class="index-container">
<div>
<div
v-if="
$store.state.indexIdentity ==
'6c6884d1c83040ee8ca17736a8d67b93' ||
$store.state.indexIdentity == 'c432d9028b2840ebbbfd56947b38069b'
"
v-if="$store.state.human == 1"
class="camp_left"
ref="leftBoxFu"
>
......
src/views/index/camp/SignUp.vue
View file @ 58a7d92f
......@@ -15,14 +15,7 @@
<el-button @click="lasStep()">上一步 </el-button>
</div>
<div>
<div
v-if="
$store.state.indexIdentity ==
'6c6884d1c83040ee8ca17736a8d67b93' ||
$store.state.indexIdentity == 'c432d9028b2840ebbbfd56947b38069b'
"
class="signUp_titile"
>
<div v-if="$store.state.human == 1" class="signUp_titile">
课程报名
</div>
<div v-else class="signUp_titile">营地报名</div>
......@@ -56,12 +49,9 @@
width="520px"
center
> -->
<el-dialog
v-if="
!$store.state.indexIdentity == '6c6884d1c83040ee8ca17736a8d67b93' ||
!$store.state.indexIdentity == 'c432d9028b2840ebbbfd56947b38069b'
"
v-if="!$store.state.human == 1"
style="font-size: 26px"
class="info"
title="营地声明"
......
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