Skip to content

C
campSite
Commit 11de4eb7 authored by 杨梦雪's avatar 杨梦雪
Browse files
Options

1111

parent 7996c245
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 185 deletions
src/components/breadcrumb.vue
View file @ 11de4eb7
......@@ -86,7 +86,7 @@
</template>
<script>
/* eslint-disable */
/* eslint-disable */
export default {
name: "breadcrumb",
props: {statusNum: [String, Number]}, //进度参数
......
src/components/index/Header.vue
View file @ 11de4eb7
......@@ -63,6 +63,7 @@ export default {
font-weight: 500;
color: #666666;
line-height: 21px;
cursor: pointer;
}
:last-child {
font-weight: 500;
......
src/components/index/SignUp/Header.vue
View file @ 11de4eb7
......@@ -56,16 +56,39 @@ export default {
await logout({});
// if (res.code !== 200) return this.$message.error(res.message);
// 清除本地的 token
window.localStorage.clear();
// 清除本地缓存除了大学logo
// window.localStorage.clear();
window.localStorage.removeItem("doubt_code");
window.localStorage.removeItem("doubt_info");
window.localStorage.removeItem("doubt_check");
window.localStorage.removeItem("index-identity");
window.localStorage.removeItem("index-token");
window.localStorage.removeItem("phone");
window.localStorage.removeItem("camp_name");
window.localStorage.removeItem("system_color");
window.localStorage.removeItem("has_amount");
window.localStorage.removeItem("campsite_id");
window.localStorage.removeItem("order_no");
this.$store.state.token = "";
// 使用编程式导航跳转到登录页面
this.$router.replace({ name: "recruit" });
},
// 点击图片跳转到招生简章页面
toRecruit() {
// 清除本地的 token
window.localStorage.clear();
// 清除本地缓存除了大学logo
// window.localStorage.clear();
window.localStorage.removeItem("doubt_code");
window.localStorage.removeItem("doubt_info");
window.localStorage.removeItem("doubt_check");
window.localStorage.removeItem("index-identity");
window.localStorage.removeItem("index-token");
window.localStorage.removeItem("phone");
window.localStorage.removeItem("camp_name");
window.localStorage.removeItem("system_color");
window.localStorage.removeItem("has_amount");
window.localStorage.removeItem("campsite_id");
window.localStorage.removeItem("order_no");
this.$store.state.token = "";
this.$router.replace({ name: "recruit" });
},
......
src/components/index/SignUp/confirm.vue
View file @ 11de4eb7
......@@ -60,6 +60,7 @@ export default {
</script>
<style lang="scss" scoped>
@import "a/scss/btn";
.confirm {
padding: 0 56px 65px 56px;
.line {
......@@ -84,21 +85,6 @@ export default {
text-align: center;
margin-top: 42px;
}
.btn {
text-align: center;
}
.el-button {
width: 200px;
height: 50px;
background: var(--color);
border-radius: 4px;
opacity: 0.8;
line-height: 50px;
text-align: center;
color: #fff;
font-size: 16px;
padding: 0;
margin: 30px 0 0 0;
}
}
</style>
src/components/index/SignUp/invitation.vue
View file @ 11de4eb7
......@@ -211,9 +211,10 @@ export default {
return this.$message.error(res.data.message);
}
// this.status=res.data.status
this.$emit("getstatus", res.data.status.status);
this.$emit("getstatus", res.data.status);
// console.log( res.data.status)
this.$message.success(res.data.message);
this.$router.push("/signUp/referInfo");
// this.$router.push("/signUp/referInfo");
});
},
......@@ -222,6 +223,7 @@ export default {
</script>
<style lang="scss" scoped>
@import "a/scss/btn";
.flex {
display: flex;
}
......@@ -233,7 +235,7 @@ export default {
width: 110px;
height: 38px;
border-radius: 4px;
border: 2px solid #60194a;
border: 2px solid var(--color);
margin-right: 15px;
}
.code_titile {
......@@ -262,22 +264,6 @@ export default {
color: #d7373f;
line-height: 12px;
}
.btn {
text-align: center;
padding-bottom: 224px;
}
.el-button {
width: 200px;
height: 50px;
background: var(--color);
border-radius: 4px;
opacity: 0.8;
line-height: 50px;
text-align: center;
color: #fff;
font-size: 16px;
padding: 0;
margin: 30px 0 0 0;
}
}
</style>
src/components/index/SignUp/paying.vue
View file @ 11de4eb7
......@@ -110,6 +110,11 @@ export default {
</script>
<style lang="scss" scoped>
@import "a/scss/btn";
.btn {
padding-bottom: 0!important;
}
.flex {
display: flex;
}
......@@ -152,23 +157,7 @@ export default {
color: #999999;
line-height: 21px;
}
.btn {
text-align: center;
// padding-bottom: 224px;
}
.el-button {
width: 200px;
height: 50px;
background: #60194a;
border-radius: 4px;
opacity: 0.8;
line-height: 50px;
text-align: center;
color: #fff;
font-size: 16px;
padding: 0;
// margin: 30px 0 0 0;
}
}
.pay_code {
text-align: center;
......
src/components/index/SignUp/referInfo.vue
View file @ 11de4eb7
......@@ -41,7 +41,7 @@
<el-form-item label="出生日期" prop="birthday">
<el-row :gutter="20">
<el-col :span="8">
<el-select v-model="bdYear" clearable placeholder="年">
<el-select v-model="bdYear" placeholder="年">
<el-option
v-for="(item, index) in yearArrs"
:key="index"
......@@ -52,7 +52,7 @@
</el-select>
</el-col>
<el-col :span="8">
<el-select v-model="bdMonth" clearable placeholder="月">
<el-select v-model="bdMonth" placeholder="月">
<el-option
v-for="(item, index) in monthArrs"
:key="index"
......@@ -63,12 +63,7 @@
</el-select>
</el-col>
<el-col :span="8">
<el-select
v-model="bdDay"
clearable
placeholder="日"
@change="getTime()"
>
<el-select v-model="bdDay" placeholder="日" @change="getTime()">
<el-option
v-for="(item, index) in dayArrs"
:key="index"
......@@ -89,7 +84,6 @@
<el-select
v-model="jgProvinceCode"
placeholder="省"
clearable
@keyup.enter.native="selsectProvince"
@change="changeProvince(1, $event)"
>
......@@ -306,7 +300,7 @@
</el-upload>
</div>
<el-dialog :visible.sync="dialogVisible" >
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="resultPicture" alt="" />
</el-dialog>
</div>
......@@ -507,7 +501,7 @@ export default {
fileList: [],
resultPicture: "",
dialogVisible: false,
disabled: false,//限制输入框
disabled: false, //限制输入框
};
},
created() {
......@@ -631,7 +625,7 @@ export default {
}
}
this.selectSchoolList = selectSchool;
this.selectSchoolList = selectSchool;
this.referForm.school = "";
},
// 获取学校
......@@ -651,16 +645,15 @@ export default {
const isJPG = file.type === "image/jpg";
const isPng = file.type === "image/png";
const isJPEG = file.type === "image/jpeg";
const isLt10M = file.size / 1024 / 1024< 10;
// console.log(isLt10M)
if (!isJPG && !isPng && !isJPEG) {
this.$message.info("上传图片只能是 JPG,JPEG或png 格式!");
}
if (!isLt10M) {
this.$message.info("上传图片大小不能超过 10MB!");
}
return (isJPG || isPng || isJPEG) && isLt10M;
const isLt10M = file.size / 1024 / 1024 < 10;
// console.log(isLt10M)
if (!isJPG && !isPng && !isJPEG) {
this.$message.info("上传图片只能是 JPG,JPEG或png 格式!");
}
if (!isLt10M) {
this.$message.info("上传图片大小不能超过 10MB!");
}
return (isJPG || isPng || isJPEG) && isLt10M;
},
handlePictureCardPreview(file) {
......@@ -813,6 +806,7 @@ export default {
</script>
<style scoped lang="scss">
@import "a/scss/btn";
.referInfo {
padding: 0 50px 110px 50px;
.checkForm {
......@@ -934,7 +928,7 @@ export default {
//去除upload组件过渡效果 css
.el-upload-list__item {
transition: none !important;
div{
div {
height: 100%;
}
}
......@@ -962,23 +956,7 @@ export default {
text-align: center;
}
}
.btn {
text-align: center;
padding-bottom: 224px;
}
.el-button {
width: 200px;
height: 50px;
background: var(--color);
border-radius: 4px;
opacity: 0.8;
line-height: 50px;
text-align: center;
color: #fff;
font-size: 16px;
padding: 0;
margin: 30px 0 0 0;
}
}
}
}
......
src/components/index/SignUp/success.vue
View file @ 11de4eb7
......@@ -4,7 +4,7 @@
<div>
<div>恭喜你！成功报名2021南开大学历史学科暑假营</div>
<div>
<img src="@/assets/img/signUp/icon-shenhe.png" alt="" />
<img src="@/assets/img/signUp/offer@2x.png" alt="" />
</div>
<el-form-item class="btn">
......
src/router/index.js
View file @ 11de4eb7
......@@ -9,6 +9,12 @@ import indexCamp from './index/camp'
Vue.use(VueRouter)
const originalPush = VueRouter.prototype.push
VueRouter.prototype.push = function push(location) {
return originalPush.call(this, location).catch(err => err)
}
const routes = [{
path: '/',
name: 'recruit',
......@@ -43,10 +49,6 @@ const routes = [{
]
const originalPush = VueRouter.prototype.push
VueRouter.prototype.push = function push(location) {
return originalPush.call(this, location).catch(err => err)
}
const router = new VueRouter({
mode: 'history',
......
src/views/index/camp/Homework.vue
View file @ 11de4eb7
<template>
<div class="homework">
<div class="content">
<div class="title">
<div class="homework_titile">营地作业</div>
</div>
<div>
<img src="" alt="">
<p>同学你好，老师暂未发布作业</p>
<p>请于2020年XX年XX月 前往王章查看作业</p>
<div class="content">
<div>
<img src="@/assets/img/homework/homework.png" alt="" />
</div>
<p>同学你好，老师暂未发布作业</p>
<p>请于2021年XX年XX月XX日 前往网站查看作业</p>
</div>
</div>
</template>
<script>
/* eslint-disable */
export default {
name: "homework",
data() {
return {
};
},
created() {
},
watch: {
},
methods: {
return {};
},
created() {},
watch: {},
methods: {},
};
</script>
......@@ -43,15 +37,24 @@ export default {
.homework {
background: #ffffff;
width: 856px;
.homework_titile {
font-size: 24px;
font-weight: 500;
color: #1b1419;
line-height: 24px;
margin-bottom: 40px;
.title {
padding: 50px;
.homework_titile {
font-size: 24px;
font-weight: 500;
color: #1b1419;
line-height: 24px;
margin-bottom: 40px;
}
}
.content {
padding: 50px;
padding-bottom: 200px;
p,
div {
text-align: center;
}
}
}
</style>
......
src/views/index/camp/Index.vue
View file @ 11de4eb7
......@@ -5,15 +5,22 @@
<div class="cc flex">
<div class="camp_left">
<ul class="camp_left_box">
<li @click="ToSignUp" :class="type == 1 ? 'active' : ''">
<img src="@/assets/img/signUp/icon-bm.png" />营地报名
<li
v-for="(item, index) in tabs"
:key="index"
:class="{ active: campindex_type === index }"
@click="ToSignUp(index)"
>
<img :src="item.image" />
{{ item.desc }}
</li>
<li @click="ToHomework" :class="type == 2 ? 'active' : ''">
<!-- <img src="@/assets/img/signUp/icon-bm.png" />营地报名 -->
<!-- <li @click="ToHomework" :class="type == type_index ? 'active' : ''">
<img src="@/assets/img/signUp/icon-zs.png" />营地作业
</li>
<li @click="ToCertificate" :class="type == 3 ? 'active' : ''">
<li @click="ToCertificate" :class="type == type_index ? 'active' : ''">
<img src="@/assets/img/signUp/icon-zy.png" />营地证书
</li>
</li> -->
</ul>
</div>
......@@ -39,21 +46,48 @@ export default {
},
data() {
return {
type: 1,
tabs: [
{
id: "0",
desc: "营地报名",
image: require("@/assets/img/signUp/icon-bm.png"),
},
{
id: "1",
desc: "营地作业",
image: require("@/assets/img/signUp/icon-zs.png"),
},
{
id: "2",
desc: "营地证书",
image: require("@/assets/img/signUp/icon-zy.png"),
},
],
campindex_type: "",
};
},
methods: {
ToSignUp() {
this.$router.replace({ name: "index-signUp" });
this.type = 1;
},
ToHomework() {
this.$router.replace({ name: "index-homework" });
this.type = 2;
watch: {
type(val) {
// console.log(val, "index");
window.localStorage.setItem("campindex_type", val);
},
ToCertificate() {
this.$router.replace({ name: "index-certificate" });
this.type = 3;
},
created() {
window.localStorage.setItem("campindex_type", 0);
this.campindex_type = window.localStorage.getItem("campindex_type");
console.log(this.type, "type");
},
methods: {
ToSignUp(index) {
this.campindex_type = index;
if (this.campindex_type == 0) {
this.$router.replace({ name: "index-signUp" });
} else if (this.campindex_type == 1) {
this.$router.replace({ name: "index-homework" });
} else if (this.campindex_type == 2) {
this.$router.replace({ name: "index-certificate" });
}
},
},
};
......@@ -130,7 +164,7 @@ export default {
&.active,
&:hover {
cursor: pointer;
background-color: #F8F8F8;
background-color: #f8f8f8;
// border-right: 4px solid #3c0664;
}
}
......
src/views/index/camp/SignUp.vue
View file @ 11de4eb7
......@@ -6,8 +6,11 @@
<Breadcrumb :statusNum="status"> </Breadcrumb>
</div>
</div>
<Confirm v-if="type == 'examInfo'" :statusNum="status" @getstatus="statuss"></Confirm>
<Invitation v-else-if="type == 'invitation'" :statusNum="status" @getstatus="statuss"></Invitation>
<Confirm v-if="type == 'examInfo'" @getstatus="statuss"></Confirm>
<Invitation
v-else-if="type == 'invitation'"
@getstatus="statuss"
></Invitation>
<ReferInfo v-else-if="type == 'referInfo'" @getstatus="statuss"></ReferInfo>
<Pass v-else-if="type == 'check'" @getstatus="statuss"></Pass>
<Paying v-else-if="type == 'pay'" @getstatus="statuss"></Paying>
......@@ -44,16 +47,22 @@ export default {
doubt_code: window.localStorage.getItem("doubt_code"),
doubt_info: window.localStorage.getItem("doubt_info"),
doubt_check: window.localStorage.getItem("doubt_check"),
status_val: "",
};
},
created() {
this.type = this.$route.params.type;
// console.log(this.$route);
console.log(this.$route, "router");
// this.statuss();
this.signUpInit();
},
mounted() {
this.signUpInit();
},
watch: {
$route: {
handler(val) {
console.log(val, "routeval");
const that = this;
if (val.path.indexOf("signUp") != -1) {
that.type = val.params.type;
......@@ -62,23 +71,42 @@ export default {
deep: true,
},
status(val) {
console.log(111, val);
console.log(val, "status");
},
},
methods: {
// 点击下一步，触发父组件方法
statuss(val) {
console.log(val, "val");
this.signUpInit();
console.log(val, "statuss");
this.status_val = val;
// if (this.status_val == 1) {
// this.type = "invitation";
// this.status = 1;
// } else if (this.status_val == 2) {
// this.type = "referInfo";
// this.status = 3;
// } else if (this.status_val == 3) {
// this.type = "check";
// } else if (this.status_val == 4) {
// this.type = "pay";
// } else if (this.status_val == 5) {
// this.type = "success";
// }
this.signUpInit(this.status_val);
},
signUpInit() {
// console.log(111);
// status=4,跳到审核页面；status=3时，根据doubt_check做判断
signUpInit(status_val) {
// console.log(status_val, "11111");
signUpInit({}).then((res) => {
console.log(res, "signUpInit");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
this.status = res.data.status;
// 点击下一步传值给status,更新
if (status_val != null) {
this.status = status_val;
}
// doubt_code，doubt_info，doubt_check。0为不填写，1为填写
if (this.status == 0) {
this.type = "examInfo";
......@@ -89,7 +117,7 @@ export default {
this.status = 2;
} else {
this.type = "invitation";
// this.status = 1;
this.status = 1;
}
} else if (this.status == 2) {
// 是否填写个人资料
......
src/views/index/login/Register.vue
View file @ 11de4eb7
......@@ -227,13 +227,7 @@ export default {
return this.$message.error(res.data.message);
}
this.$message.success(res.data.message);
// token存储
window.localStorage.setItem("index-token", res.data.token);
window.localStorage.setItem("phone", this.registerForm.phone);
// 报名信息
window.localStorage.setItem("camp_name", res.data.cam.name);
//获取主题色
window.localStorage.setItem("system_color", res.data.cam.system_color);
window.localStorage.setItem(
"register_code_time",
res.data.data.now * 1000
......@@ -264,7 +258,7 @@ export default {
// token存储
window.localStorage.setItem("index-token", res.data.token);
window.localStorage.setItem("phone", this.loginForm.phone);
window.localStorage.setItem("phone", this.registerForm.phone);
// 报名信息
window.localStorage.setItem("camp_name", res.data.cam.name);
//获取主题色
......
src/views/index/login/Reset.vue
View file @ 11de4eb7
......@@ -202,12 +202,12 @@ export default {
console.log(timeLag);
if (!this.timer) {
this.count = timeLag;
this.show = false;
this.showCode = false;
this.timer = setInterval(() => {
if (this.count > 0 && this.count <= timeLag) {
this.count--;
} else {
this.show = true;
this.showCode = true;
clearInterval(this.timer);
this.timer = null;
}
......
src/views/index/recruit/Index.vue
View file @ 11de4eb7
......@@ -56,8 +56,8 @@ export default {
data() {
return {};
},
created(){
window.localStorage.setItem(
created() {
window.localStorage.setItem(
"index-identity",
"c59086fdb37848e7a10765812d1da349"
);
......@@ -67,7 +67,7 @@ export default {
toLogin() {
this.$router.replace({ name: "index-login" });
},
getCam() {
getCam() {
getCam({}).then((res) => {
console.log(res, "getCam");
let root = document.querySelector(":root");
......@@ -97,6 +97,7 @@ export default {
};
</script>
<style lang="scss" >
@import "a/scss/btn";
.flex {
display: flex;
}
......@@ -142,22 +143,6 @@ export default {
}
}
}
.btn {
text-align: center;
padding-bottom: 104px;
.el-button {
width: 200px;
height: 50px;
background:var(--color);
border-radius: 4px;
opacity: 0.8;
line-height: 50px;
text-align: center;
color: #fff;
font-size: 16px;
padding: 0;
margin: 30px 0 0 0;
}
}
}
</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