Skip to content

C
campSite
Commit 6ddceae6 authored by 杨梦雪's avatar 杨梦雪
Browse files
Options

api

parent bdea4b12
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 101 deletions
src/request/base/home.js 0 → 100644
View file @ 6ddceae6
import {request} from './network'
// 热门活动
export function hot(data) {
return request({
method: 'get',
url: '/activityCenter/hot',
params: data
})
}
src/request/base/myInfo.js 0 → 100644
View file @ 6ddceae6
import {request} from './network'
//我的营地列表
export function activity(data) {
return request({
method: 'get',
url: '/web/download/stu/activity',
params: data
})
}
src/views/base/home/Home.vue
View file @ 6ddceae6
......@@ -14,11 +14,11 @@
热门活动
</div>
<div class="active-list">
<div class="active-list-item" v-for="(item, index) in activeList" :key="index"
:style="{
<div :key="index" :style="{
'-webkit-animation-delay': (index+1)*0.1+'s',
'imation-delay': (index+1)*0.1+'s',
}">
}" class="active-list-item"
v-for="(item, index) in activeList">
<div class="inner">
<div class="active-list-item-bg">
<el-image :src="item.activityCover" fit="cover"></el-image>
......@@ -26,29 +26,31 @@
<div class="active-list-item-cont">
<div class="active-list-item-cont-header">
<div class="label" v-if="item.activityLabel">
<span v-for="(item2, index2) in item.activityLabel.split(',')"
:key="index2">{{item2}}</span>
<span :key="index2"
v-for="(item2, index2) in item.activityLabel.split(',')">{{item2}}</span>
</div>
<div class="title">{{item.name}}</div>
</div>
<div class="active-list-item-cont-txt1">
<div class="sign-box" v-if="item.schoolName">
<div class="sign"
v-for="(item2, index2) in item.schoolName.split(',')"
:key="index2">{{item2}}
<div :key="index2"
class="sign"
v-for="(item2, index2) in item.schoolName.split(',')">{{item2}}
</div>
</div>
<div class="sign-box" v-if="item.subjectName">
<div class="sign"
v-for="(item2, index2) in item.subjectName.split(',')"
:key="index2">{{item2}}
<div :key="index2"
class="sign"
v-for="(item2, index2) in item.subjectName.split(',')">{{item2}}
</div>
</div>
</div>
<div class="active-list-item-cont-txt2">{{formatYMD(item.activityStartTime)}} （共{{item.activityTime}}天）</div>
<div class="active-list-item-cont-txt2">{{formatYMD(item.activityStartTime)}}
（共{{item.activityTime}}天）
</div>
<div class="active-list-item-cont-txt3">报名截止时间：{{formatYMDChina(item.bmEndTime)}}</div>
<div class="active-list-item-cont-bottom" @click="$router.push('/active/'+item.id)">
<div @click="$router.push('/active/'+item.id)" class="active-list-item-cont-bottom">
<div>查看详情</div>
<i class="el-icon-right"></i>
</div>
......@@ -91,20 +93,18 @@
<div class="item_text">
{{item.think}}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import img from "../../../assets/img/recruit.png";
import banner1 from "../../../assets/img/Banner/banner1.jpg";
import banner2 from "../../../assets/img/Banner/banner2.jpg";
import {hot} from "r/base/home";
export default {
name: "Home",
......@@ -116,81 +116,7 @@
}, {
url: banner2
}],
activeList: [
{
id: 21,
activityCover: img,
activityLabel: '线上',
name: '2023年寒假历史营地',
schoolName: '南开大学',
subjectName: '历史学',
activityStartTime: '2023-09-01',
activityEndTime: '20230903',
activityTime: '3',
bmEndTime: '2023-08-31',
},
{
id: 2,
activityCover: img,
activityLabel: '线上',
name: '2023年寒假历史营地2',
schoolName: '南开大学',
subjectName: '历史学',
activityStartTime: '2023-09-01',
activityEndTime: '20230903',
activityTime: '3',
bmEndTime: '2023-08-31',
},
{
id: 3,
activityCover: img,
activityLabel: '线上',
name: '2023年寒假历史营地3',
schoolName: '南开大学',
subjectName: '历史学',
activityStartTime: '2023-09-01',
activityEndTime: '20230903',
activityTime: '3',
bmEndTime: '2023-08-31',
},
{
id: 1,
activityCover: img,
activityLabel: '线上',
name: '2023年寒假历史营地',
schoolName: '南开大学',
subjectName: '历史学',
activityStartTime: '2023-09-01',
activityEndTime: '20230903',
activityTime: '3',
bmEndTime: '2023-08-31',
},
{
id: 2,
activityCover: img,
activityLabel: '线上',
name: '2023年寒假历史营地2',
schoolName: '南开大学',
subjectName: '历史学',
activityStartTime: '2023-09-01',
activityEndTime: '20230903',
activityTime: '3',
bmEndTime: '2023-08-31',
},
{
id: 3,
activityCover: img,
activityLabel: '线上',
name: '2023年寒假历史营地3',
schoolName: '南开大学',
subjectName: '历史学',
activityStartTime: '2023-09-01',
activityEndTime: '20230903',
activityTime: '3',
bmEndTime: '2023-08-31',
}
],
activeList: [],
reflectionsList: [{
name: '同学',
think: '我想小鸟肯定是害怕了，小鸟失去了自由，一定高兴不起来了，只有外面的天空才是小鸟的家，小鸟被细绳牵着失去自由实在是太可怜了，我决心把小鸟放走我轻轻的走过去，把小鸟腿上的细绳解开了。我把小鸟放在窗台上，我站在远处看着它，只见小鸟趴在窗台上还是一动也不动，嘴巴张着。妈妈说小鸟可能吓坏了，我有点后悔。后来过了好一会儿，小鸟才回过神来，它眨了眨眼睛，慢慢飞了起来。我看我觉的小鸟是我们人类的朋友，我们不能伤害小鸟，只有让小鸟在天空中自由的飞翔，它才会感到快乐',
......@@ -233,7 +159,20 @@
this.bannerHeight = 600 / 1550 * this.screenWidth
}
},
created() {
this.getHot();
},
methods: {
getHot() {
hot().then((res) => {
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
this.$message.success(res.data.message);
this.activeList = res.data.data;
})
},
}
}
</script>
......@@ -328,7 +267,8 @@
left: 8%;
padding: 0 25px 0 0;
background-color: #ffffff;
.item_float_content{
.item_float_content {
display: flex;
transform: translateY(-50%);
}
......
src/views/base/login/Login.vue
View file @ 6ddceae6
......@@ -2,24 +2,24 @@
<div class="container">
<div class="title_Login">
<div v-if="changeLogin == 1">
<div @click="toCodeLogin" class="title">
<div :class="changeLogin == 2 ? 'change_login' : ''">验证码登录</div>
<div @click="toCodeLogin" class="title title_top">
<div :class="changeLogin == 2 ? 'change_login normal' : 'normal'">验证码登录</div>
</div>
<div @click="toLogin" class="title">
<div :class="changeLogin == 1 ? 'change_login' : ''">
<div @click="toLogin" class="title ">
<div :class="changeLogin == 1 ? 'change_login ' : '' ">
账号密码登录
</div>
</div>
</div>
<div v-else-if="changeLogin == 2">
<div @click="toLogin" class="title">
<div :class="changeLogin == 1 ? 'change_login' : ''">
<div @click="toLogin" class="title title_top">
<div :class="changeLogin == 1 ? 'change_login normal' : 'normal'">
账号密码登录
</div>
</div>
<div @click="toCodeLogin" class="title">
<div :class="changeLogin == 2 ? 'change_login' : ''">验证码登录</div>
<div @click="toCodeLogin" class="title ">
<div :class="changeLogin == 2 ? 'change_login ' : ' '">验证码登录</div>
</div>
</div>
</div>
......@@ -307,11 +307,24 @@
.title {
font-size: 12px !important;
}
.title_top {
display: flex;
justify-content: end;
}
.normal {
width: 100px;
cursor: pointer
}
.change_login {
margin-top: 5px !important;
font-size: 18px !important;
}
}
......
src/views/base/myInfo/index.vue
View file @ 6ddceae6
......@@ -41,6 +41,7 @@
import Footer from "@/components/Footer.vue";
import svg1 from '@/assets/img/signUp/icon.svg';
import signUpList from '../myInfo/signUp.vue';
import {activity} from "r/base/myInfo";
export default {
name: "myInfoIndex",
......@@ -71,6 +72,8 @@
watch: {},
created() {
// this.ToSignUp(this.campindex_type)
this.getCampList();
},
mounted() {
window.addEventListener("scroll", this.handleScrollX, true);
......@@ -81,6 +84,18 @@
window.removeEventListener("resize", this.onResize, true);
},
methods: {
getCampList() {
activity({
phone:window.localStorage.getItem('index-phone-all'),
type:1
}).then((res) => {
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
this.$message.success(res.data.message);
this.activeList = res.data.data;
})
},
ToSignUp(index) {
console.log(index, 'index')
this.campindex_type = index;
......
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