Signed-off-by: liuboyan <632697560@qq.com>

1

pages/index/index.vue

@@ -1,61 +1,59 @@
 <template>
 	<view class="content">
-		<swiper :current="current" class="swiper-box">
-			<swiper-item class="swiper-item" style="padding: 0 15px 0px 15px;box-sizing: border-box;">
-				<view class="chart-box">
-					<canvas canvas-id="chartBox" id="chartBox" class="chart-canvas"></canvas>
-				</view>
-				<u-button type="warning" shape="circle" :ripple="true" :custom-style="customStyle" @click="goToTodayEnroll()">查看详情</u-button>
-				<view class="section-title" style="margin-top: 40px;">
-					<u-image width="20px" height="10px" :src="sectionIcon"></u-image>
-					<u-section title="场馆推荐" sub-title="查看更多" font-size="32" :show-line="false" @click="goToVenueList()"></u-section>
-				</view>
-				<u-card :show-head="false" :show-foot="false" :border="false" margin="0px">
-					<view class="class-show-box" slot="body">
-						<view v-for="(item, index) in videoList" :key="index" class="class-show-card" @click="goToVenueDetail(item)">
-							<u-image :src="item.url" mode="aspectFill" height="30vw" border-radius="10px"></u-image>
-							<view class="class-show-name">{{item.name}}</view>
-						</view>
-					</view>
-				</u-card>
-			</swiper-item>
-			<swiper-item class="swiper-item">
-				<view class="enroll-fix-box">
-					<view class="enroll-button" @click="goToAddForm('enrolledForm')">
-						<view class="enroll-img">
-							<u-image :src="enrolledIcon" mode="aspectFit" width="34px" height="34px"></u-image>
-						</view>
-						<view class="enroll-text">已报名</view>
-					</view>
-					<view class="enroll-button" @click="goToAddForm('intentionForm')">
-						<view class="enroll-img">
-							<u-image :src="intentionIcon" mode="aspectFit" width="34px" height="34px"></u-image>
-						</view>
-						<view class="enroll-text">有意向</view>
+		<view class="swiper-item" style="padding: 0 15px;" v-show="current == 0">
+			<view class="chart-box">
+				<canvas canvas-id="chartBox" id="chartBox" class="chart-canvas" force-use-old-canvas="true"></canvas>
+			</view>
+			<u-button type="warning" shape="circle" :ripple="true" :custom-style="customStyle" @click="goToTodayEnroll()">查看详情</u-button>
+			<view class="section-title" style="margin-top: 40px;">
+				<u-image width="20px" height="10px" :src="sectionIcon"></u-image>
+				<u-section title="场馆推荐" sub-title="查看更多" font-size="32" :show-line="false" @click="goToVenueList()"></u-section>
+			</view>
+			<u-card :show-head="false" :show-foot="false" :border="false" margin="0px">
+				<view class="class-show-box" slot="body">
+					<view v-for="(item, index) in videoList" :key="index" class="class-show-card" @click="goToVenueDetail(item)">
+						<u-image :src="item.url" mode="aspectFill" height="30vw" border-radius="10px"></u-image>
+						<view class="class-show-name">{{item.name}}</view>
 					</view>
 				</view>
-			</swiper-item>
-			<swiper-item class="swiper-item">
-				<view class="user-info">
-					<view class="user-data">
-						<view class="user-name">{{userData.nickName}}</view>
-						<view class="user-phone">{{userData.phone}}</view>
-					</view>
-					<view class="user-img">
-						<u-avatar :src="userData.headImage" size="160"></u-avatar>
+			</u-card>
+		</view>
+		<view class="swiper-item" v-show="current == 1">
+			<view class="enroll-fix-box">
+				<view class="enroll-button" @click="goToAddForm('enrolledForm')">
+					<view class="enroll-img">
+						<u-image :src="enrolledIcon" mode="aspectFit" width="34px" height="34px"></u-image>
 					</view>
+					<view class="enroll-text">已报名</view>
 				</view>
-				<view class="user-handle" v-for="(item, index) in handleList" :key="index" @click="goToHandle(item)">
-					<view class="handle-icon">
-						<u-image :src="item.icon" mode="aspectFit" width="28px" height="28px"></u-image>
-					</view>
-					<view class="handle-label">{{item.label}}</view>
-					<view class="handle-arrow">
-						<u-icon name="arrow-right" color="#cccccc" size="32"></u-icon>
+				<view class="enroll-button" @click="goToAddForm('intentionForm')">
+					<view class="enroll-img">
+						<u-image :src="intentionIcon" mode="aspectFit" width="34px" height="34px"></u-image>
 					</view>
+					<view class="enroll-text">有意向</view>
+				</view>
+			</view>
+		</view>
+		<view class="swiper-item" v-show="current == 2">
+			<view class="user-info">
+				<view class="user-data">
+					<view class="user-name">{{userData.nickName}}</view>
+					<view class="user-phone">{{userData.phone}}</view>
+				</view>
+				<view class="user-img">
+					<u-avatar :src="userData.headImage" size="160"></u-avatar>
+				</view>
+			</view>
+			<view class="user-handle" v-for="(item, index) in handleList" :key="index" @click="goToHandle(item)">
+				<view class="handle-icon">
+					<u-image :src="item.icon" mode="aspectFit" width="28px" height="28px"></u-image>
 				</view>
-			</swiper-item>
-		</swiper>
+				<view class="handle-label">{{item.label}}</view>
+				<view class="handle-arrow">
+					<u-icon name="arrow-right" color="#cccccc" size="32"></u-icon>
+				</view>
+			</view>
+		</view>
 		<u-top-tips ref="uTips"></u-top-tips>
 		<u-tabbar v-model="current" :list="tabbarList" :mid-button="true" :active-color="mainColor" inactive-color="#cccccc"
 		 icon-size="60"></u-tabbar>
@@ -270,13 +268,6 @@
 	}
 </script>
 
-<style>
-	page {
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-	}
-</style>
 <style lang="scss" scoped>
 	@import "@/static/css/themes.scss";
 
@@ -284,14 +275,10 @@
 		width: 100%;
 		float: left;
 
-		.swiper-box {
+		.swiper-item {
+			width: 100%;
 			height: calc(100vh - 50px);
-
-			.swiper-item {
-				height: 100%;
-				overflow-y: auto;
-				position: relative;
-			}
+			position: relative;
 		}
 
 		.chart-box {
@@ -299,6 +286,7 @@
 			height: 240px;
 			float: left;
 			padding: 20px 0;
+			display: flex;
 
 			.chart-canvas {
 				width: 100% !important;

pagesMain/messageList.vue

@@ -42,21 +42,19 @@
 					name: '全部',
 					isOver: false,
 					pageIndex: 1,
+					type: 2,
 					tableList: [],
 				}, {
-					name: '请假',
+					name: '办卡',
 					isOver: false,
 					pageIndex: 1,
+					type: 0,
 					tableList: [],
 				}, {
 					name: '续费',
 					isOver: false,
 					pageIndex: 1,
-					tableList: [],
-				}, {
-					name: '签到',
-					isOver: false,
-					pageIndex: 1,
+					type: 1,
 					tableList: [],
 				}],
 				current: 0,
@@ -67,7 +65,6 @@
 			this.getTableList(0)
 			this.getTableList(1)
 			this.getTableList(2)
-			this.getTableList(3)
 		},
 		onReady() {},
 		methods: {
@@ -112,7 +109,7 @@
 			//  获取列表数据
 			getTableList(index, refresh) {
 				NET.request(API.getMessageList, {
-					type: index,
+					type: this.tabList[index].type,
 					page: this.tabList[index].pageIndex,
 					size: 10,
 				}, 'POST').then(res => {