Skip to content

C
campSite
Commit 2b1e6f45 authored by 杨梦雪's avatar 杨梦雪
Browse files
Options

bug

parent 4476a063
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 87 deletions
src/assets/scss/index.scss
View file @ 2b1e6f45
......@@ -6,7 +6,7 @@
--bk_pic: #4FACFE;
--logo: #4FACFE;
--all_color: #4FACFE;
--all_color: #4facfe;
}
body{
font-family: "PingFang SC";
......
src/config/server.js
View file @ 2b1e6f45
......@@ -17,12 +17,12 @@
// export const SERVER_WS_URL = "wss://apiy.thuers.com"; // websocket
// 测试
// export const SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket
export const SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; // 正式环境
export const DEVELOPMENT_SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; //开发环境
export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket
// 正式
export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
// export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
src/views/base/active/Active.vue
View file @ 2b1e6f45
......@@ -203,6 +203,7 @@
}
},
created() {
this.commonApi(39)
this.getLabelType();
this.getList();
},
......
src/views/base/active/ActiveInfo.vue
View file @ 2b1e6f45
<template>
<div class="com-container active-info-container" v-loading="loading">
<el-breadcrumb separator="/" class="active-breadcrumb">
<el-breadcrumb class="active-breadcrumb" separator="/">
<el-breadcrumb-item :to="{ path: '/active' }">活动中心</el-breadcrumb-item>
<el-breadcrumb-item>活动详情</el-breadcrumb-item>
</el-breadcrumb>
......@@ -9,32 +9,34 @@
<el-image :src="activeInfo.activityCover" fit="cover"/>
</div>
<div class="active-info-cont">
<div class="active-info-cont-header">
<template v-if="activeInfo.activityLabel">
<div class="label"
v-for="(item, index) in activeInfo.activityLabel.split(',')"
:key="index">{{item}}
<div :key="index"
class="label"
v-for="(item, index) in activeInfo.activityLabel.split(',')">
<span> {{item}}</span>
</div>
</template>
<div class="title">{{activeInfo.name}}</div>
</div>
<div class="active-info-cont-txt1">
<div class="sign-box" v-if="activeInfo.schoolName">
<div class="sign"
v-for="(item, index) in activeInfo.schoolName.split(',')"
:key="index">{{item}}
<div :key="index"
class="sign"
v-for="(item, index) in activeInfo.schoolName.split(',')">{{item}}
</div>
</div>
<div class="sign-box" v-if="activeInfo.subjectName">
<div class="sign"
v-for="(item, index) in activeInfo.subjectName.split(',')"
:key="index">{{item}}
<div :key="index"
class="sign"
v-for="(item, index) in activeInfo.subjectName.split(',')">{{item}}
</div>
</div>
<div class="sign-box" v-if="activeInfo.peopleName">
<div class="sign"
v-for="(item, index) in activeInfo.peopleName.split(',')"
:key="index">{{item}}
<div :key="index"
class="sign"
v-for="(item, index) in activeInfo.peopleName.split(',')">{{item}}
</div>
</div>
</div>
......@@ -46,7 +48,7 @@
<div>报名截止：{{formatYMDChina(activeInfo.bmEndTime)}}</div>
<div v-if="activeInfo.activityFee && activeInfo.activityFee!='0'">
活动费用：￥{{activeInfo.activityFee}}
<el-tooltip class="item" effect="dark" content="申请审核通过后，才可缴费参与活动具体活动费用以缴费时为准。" placement="top">
<el-tooltip class="item" content="申请审核通过后，才可缴费参与活动具体活动费用以缴费时为准。" effect="dark" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</div>
......@@ -55,10 +57,10 @@
(activeInfo.status==2 && activeInfo.source==2)||
(activeInfo.status==3 || activeInfo.status==4)||
(activeInfo.status==5)">
<el-button v-if="activeInfo.status==1" :disabled="true">报名未开放</el-button>
<el-button v-if="activeInfo.status==2 && activeInfo.source==2" @click="signUp">立即报名</el-button>
<el-button v-if="activeInfo.status==3 || activeInfo.status==4" :disabled="true">报名已截止</el-button>
<el-button v-if="activeInfo.status==5" :disabled="true">已结营</el-button>
<el-button :disabled="true" v-if="activeInfo.status==1">报名未开放</el-button>
<el-button @click="signUp" v-if="activeInfo.status==2 && activeInfo.source==2">立即报名</el-button>
<el-button :disabled="true" v-if="activeInfo.status==3 || activeInfo.status==4">报名已截止</el-button>
<el-button :disabled="true" v-if="activeInfo.status==5">已结营</el-button>
</div>
</div>
</div>
......@@ -68,40 +70,40 @@
(activeContent==2 && anchorList2.length>0)">
<div class="left-area-box">
<ul v-if="activeContent==1">
<li v-for="(item,index) in anchorList" :key="index">
<li :key="index" v-for="(item,index) in anchorList">
<a @click="anchorSkip(item.id)">{{item.name}}</a>
</li>
</ul>
<ul v-else-if="activeContent==2">
<li v-for="(item,index) in anchorList2" :key="index">
<li :key="index" v-for="(item,index) in anchorList2">
<a @click="anchorSkip(item.id)">{{item.name}}</a>
</li>
</ul>
</div>
</div>
<div class="center-area card-box" :style="{
<div :style="{
'min-height':minHeight+'px'
}">
}" class="center-area card-box">
<div class="center-area-title">
<div class="center-area-title-box">
<div class="center-area-title-box-item"
:class="activeContent==1?'is-active':''"
<div :class="activeContent==1?'is-active':''"
@click="changeActive(1)"
class="center-area-title-box-item"
>活动简章
</div>
<div class="center-area-title-box-item"
:class="activeContent==2?'is-active':''"
v-if="activeInfo.previousActivities"
<div :class="activeContent==2?'is-active':''"
@click="changeActive(2)"
class="center-area-title-box-item"
v-if="activeInfo.previousActivities"
>活动回顾
</div>
</div>
</div>
<div class="center-area-cont">
<div v-show="activeContent==1"
v-html="activeInfo.admissionsBrochure"></div>
<div v-show="activeContent==2"
v-html="activeInfo.previousActivities"></div>
<div v-html="activeInfo.admissionsBrochure"
v-show="activeContent==1"></div>
<div v-html="activeInfo.previousActivities"
v-show="activeContent==2"></div>
</div>
</div>
<div class="right-area" ref="RightArea">
......@@ -111,14 +113,14 @@
</div>
<div class="question-area-cont">
<div v-if="questionList.length>0">
<div class="ask-answer-item"
v-for="(item,index) in questionList"
:key="index">
<div :key="index"
class="ask-answer-item"
v-for="(item,index) in questionList">
<div class="ask bold">问：{{item.question}}</div>
<div class="answer">答：{{item.answer}}</div>
</div>
</div>
<el-empty v-else description="暂无问题"></el-empty>
<el-empty description="暂无问题" v-else></el-empty>
<div class="question-email bold">
如有其他问题需要咨询，请发送邮件至以下邮箱 service@campcenter.cn
......@@ -127,10 +129,10 @@
</div>
<div class="back-area" v-if="currActivity.length>0">
<div class="back-area-title">当期活动</div>
<div class="back-area-item card-box"
v-for="(item,index) in currActivity"
:key="index"
@click="toActiveInfo(item.id)">
<div :key="index"
@click="toActiveInfo(item.id)"
class="back-area-item card-box"
v-for="(item,index) in currActivity">
<div class="back-area-item-cover">
<el-image :src="item.activityCover" fit="cover"/>
</div>
......@@ -138,9 +140,9 @@
<div class="back-area-item-cont-txt">{{item.name}}</div>
<div class="back-area-item-cont-txt">
<div class="sign-box" v-if="item.activityLabel">
<div class="sign"
v-for="(item2, index2) in item.activityLabel.split(',')"
:key="index2">{{item2}}
<div :key="index2"
class="sign"
v-for="(item2, index2) in item.activityLabel.split(',')">{{item2}}
</div>
</div>
</div>
......@@ -152,10 +154,10 @@
</div>
<div class="back-area" v-if="oldActivity.length>0">
<div class="back-area-title">往期活动</div>
<div class="back-area-item card-box"
v-for="(item,index) in oldActivity"
:key="index"
@click="toActiveInfo(item.id)">
<div :key="index"
@click="toActiveInfo(item.id)"
class="back-area-item card-box"
v-for="(item,index) in oldActivity">
<div class="back-area-item-cover">
<el-image :src="item.activityCover" fit="cover"/>
</div>
......@@ -163,9 +165,9 @@
<div class="back-area-item-cont-txt">{{item.name}}</div>
<div class="back-area-item-cont-txt">
<div class="sign-box" v-if="item.activityLabel">
<div class="sign"
v-for="(item2, index2) in item.activityLabel.split(',')"
:key="index2">{{item2}}
<div :key="index2"
class="sign"
v-for="(item2, index2) in item.activityLabel.split(',')">{{item2}}
</div>
</div>
</div>
......@@ -215,6 +217,7 @@
}
},
created() {
this.commonApi(39)
let params = this.$route.params;
if (params.id) {
this.id = params.id;
......@@ -224,6 +227,7 @@
methods: {
// 立即报名按钮
signUp() {
this.commonApi(37)
let allToken = window.localStorage.getItem('index-token-all');
if (allToken) {
this.$store.commit('setIndexIdentity', this.activeInfo.identity)
......@@ -245,6 +249,7 @@
},
// 选择活动简章/回顾
changeActive(val) {
this.commonApi(39)
this.activeContent = val;
},
// 分离获取html中的锚点
......@@ -385,14 +390,14 @@
justify-content: space-around;
.active-info-cont-header {
display: flex;
flex-flow: row;
align-items: center;
margin-bottom: 10px;
/*display: flex;*/
/*flex-flow: row;*/
/*align-items: center;*/
/*margin-bottom: 10px;*/
.label {
span {
font-size: 14px;
padding: 0 14px;
padding: 6px 14px;
border-radius: 14px;
color: #ffffff;
background-color: var(--all_color);
......@@ -401,7 +406,7 @@
}
.title {
font-size: 22px;
font-size: 18px;
font-weight: 500;
line-height: 36px;
}
......@@ -456,28 +461,29 @@
}
}
.btn-area{
.btn-area {
margin-top: 10px;
.el-button {
width: 150px;
height: 40px;
color: #333333;
border-color: #333333;
background-color: #ffffff;
width: 150px;
height: 40px;
color: #333333;
border-color: #333333;
background-color: #ffffff;
&:hover {
color: var(--all_color);
border-color: var(--all_color);
&:hover {
color: var(--all_color);
border-color: var(--all_color);
}
}
&.is-disabled {
color: #333333;
border-color: #333333;
opacity: 0.5;
&.is-disabled {
color: #333333;
border-color: #333333;
opacity: 0.5;
}
}
}
}
}
}
......
src/views/base/home/Home.vue
View file @ 2b1e6f45
......@@ -128,32 +128,32 @@
activeList: [],
reflectionsList: [
{
name: '张宇翔',
name: '张同学',
think: '通过这几天的学习我深深地感受到了历史的魅力。从延伸千年的丝绸之路到骁勇善战的草原大漠，前往神秘享测的古埃及，置身考古现场研究墓穴壁画的构造。三天的学习使我受益匪浅，了解到很多之前闻所未闻的知识。',
tag: ['鄂尔多斯衡水实验中学', '2023南开历史营']
},
{
name: '黄圣凯',
name: '黄同学',
think: '对于这次的夏令营我的收获很大，这次的夏令营，教授和博士们的精彩演讲内容是课本中学不到的，很大的程度上对我的帮助很大，开拓了知识面。从这次的夏令营动中，我学会了从不同的角度去看待问题。',
tag: ['浙江省树人中学', '2023南开历史营']
},
{
name: '李奇霏',
name: '李同学',
think: '四天的学习生活让我获益匪浅，收获到了很多课本外的知识。经过本次学习我开拓了自己的眼界，激发了对历史学习的兴趣，也培养了与小组同学团结协作的能力。最后，感谢学科营的各位老师和同学，期待我们下一次相遇。',
tag: ['东北育才学校', '2023南开历史营']
},
{
name: '宁家禾',
name: '宁同学',
think: '这个活动让我结识了很多厉害的学长，让我接触到了一些很厉害的教授，感受到了美丽数学，更收获了友谊，最关键的是增强了自我生活的能力，和团结合作的能力。',
tag: ['北京市第五中学2', '2023南开数学营']
tag: ['北京市第五中学', '2023南开数学营']
},
{
name: '储恬宇',
name: '储同学',
think: '在这几天的学习里，我深切体会到了数学的如此魅力想向在此期间为我们提供帮助的教授们表达感谢感谢使我的前途更加明确，深刻的了解到了统计学和我们的生活息相关，对统计学产生了极大兴趣，感谢这次暑期营注动，在今后的高三学习里会更加努力，谢谢。',
tag: ['博野中学', '2023南开数学营']
},
{
name: '王科锦',
name: '王同学',
think: '在这几天的学习里，我对数学与统计学有了更深刻的认识，更充地认识到了二者在应用层面的价值，同时也拓宽了眼界，学到了课之外的知识。经过这三天的学习，我对自己的未来专业有了更加清的规划，也对未来的大学生活抱有更美好的憧憬。同时，我也想感谢各位教授与学长学姐的悉心教诲，感谢老师们的授业解惑。',
tag: ['济宁市第一中学', '2023南开数学营']
},
......@@ -171,6 +171,7 @@
}
},
created() {
this.commonApi(39)
this.getHot();
},
methods: {
......
src/views/base/login/Login.vue
View file @ 2b1e6f45
......@@ -196,7 +196,7 @@
this.loginForm.phone = phone;
this.intervalHandleNew(endTime);
}
this.commonApi(31)
this.commonApi(39)
},
methods: {
// 定时器倒计时
......@@ -273,6 +273,7 @@
this.$nextTick(() => {
this.$refs["loginFormRef"].clearValidate();
});
this.commonApi(39)
},
toCodeLogin() {
this.loginForm = {};
......@@ -280,6 +281,7 @@
this.$nextTick(() => {
this.$refs["loginFormRef"].clearValidate();
});
this.commonApi(39)
},
// 登录
submitForm() {
......
src/views/base/login/Register.vue
View file @ 2b1e6f45
......@@ -217,7 +217,7 @@
this.registerForm.phone = phone;
this.intervalHandleNew(endTime);
}
this.commonApi(30)
this.commonApi(39)
},
methods: {
// 去注册
......
src/views/base/login/Reset.vue
View file @ 2b1e6f45
......@@ -208,6 +208,7 @@
};
},
created() {
this.commonApi(39)
const endTime = window.localStorage.getItem("reset_code_time");
const phone = window.localStorage.getItem("reset_code_phone");
if (endTime > 0) {
......
src/views/base/myInfo/signUp.vue
View file @ 2b1e6f45
......@@ -46,10 +46,13 @@
}
},
created() {
this.commonApi(39)
},
methods: {
handleClick(tab, event) {
this.campStatus = tab.name;
this.commonApi(39)
},
}
......
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