今日页数据获取

components/todaydata-box/todaydata-box.vue

@@ -3,27 +3,26 @@
 	<view class="module-container">
 		<u-tabs :list="list" :current="current" @change="change"
 			:activeStyle="{color: '#5b7cff',fontWeight: 'bold',transform: 'scale(1.04)',}"
-			:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#5b7cff"
-			lineWidth="60"></u-tabs>
+			:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#5b7cff" lineWidth="60"></u-tabs>
 
 		<!-- 记录模块 -->
 		<view class="module-box" v-if="current == 0">
-			<view class="module-item">
+			<view class="module-item" @click="studyTimePicker = true">
 				<view class="module-item-box">
 					<text class="module-item-text">自主学习记录</text>
 					<view class="num-box">
-						<text class="module-item-num">5.5</text>
+						<text class="module-item-num">{{studyTime[6]}}</text>
 						<text class="unit">小时</text>
 					</view>
 					<view class="t-icon t-icon-bianjibi"></view>
 				</view>
 			</view>
 
-			<view class="module-item" style="background-color: #00cca3;">
+			<view class="module-item" style="background-color: #00cca3;" @click="restTimePicker = true">
 				<view class="module-item-box">
 					<text class="module-item-text">娱乐放松记录</text>
 					<view class="num-box">
-						<text class="module-item-num">5</text>
+						<text class="module-item-num">{{restTime}}</text>
 						<text class="unit">小时</text>
 					</view>
 					<view class="t-icon t-icon-leimucuyule"></view>
@@ -41,17 +40,24 @@
 				</view>
 			</view>
 
-			<view class="module-item" style="background-color: #f9c752;">
+			<view class="module-item" style="background-color: #f9c752;" @click="sleepTimePicker = true">
 				<view class="module-item-box">
 					<text class="module-item-text">睡眠记录</text>
 					<view class="num-box">
-						<text class="module-item-num">8</text>
+						<text class="module-item-num">{{sleepTime}}</text>
 						<text class="unit">小时</text>
 					</view>
 					<view class="t-icon t-icon-a-icon_wananyueliangshuimian"></view>
 				</view>
 			</view>
 		</view>
+		<!-- 时间选择器 -->
+		<u-picker :show="studyTimePicker" :columns="pickerHour" title="单位(小时)" ref="uPickerStudy" @confirm="hourStudy"
+			@cancel="studyCancel" :closeOnClickOverlay="true" @change="changeTime"></u-picker>
+		<u-picker :show="restTimePicker" :columns="pickerHour" title="单位(小时)" ref="uPickerRest" @confirm="hourRest"
+			@cancel="restCancel" :closeOnClickOverlay="true"></u-picker>
+		<u-picker :show="sleepTimePicker" :columns="pickerHour" title="单位(小时)" ref="uPickerSleep" @confirm="hourSleep"
+			@cancel="sleepCancel" :closeOnClickOverlay="true"></u-picker>
 
 		<!-- 记录表 -->
 		<view class="module-box" v-if="current == 1">
@@ -88,8 +94,6 @@
 				</view>
 			</view>
 		</view>
-
-
 	</view>
 
 </template>
@@ -105,6 +109,11 @@
 		},
 		data() {
 			return {
+				//选择器
+				studyTimePicker: false,
+				restTimePicker: false,
+				sleepTimePicker: false,
+
 				//模块名
 				list: [{
 					name: '今日记录'
@@ -113,23 +122,82 @@
 				}],
 				//当前模块
 				current: 0,
-				//动画
-				transition: true
 
+				pickerHour: [
+					['0.5', '1', '1.5', '2', '2.5', '3', '3.5', '4', '4.5', '5',
+						'5.5', '6', '6.5', '7', '7.5', '8', '8.5', '9', '9.5', '10'
+					],
+				],
+
+				//选择数据暂存
+				changeValue: 0,
+				//今日数据记录
+				studyTime: [2, 4, 3, 3.5, 5, 4, 0],
+				restTime: 0,
+				exerciseTime: 0,
+				sleepTime: 0,
 
 			};
 		},
 		methods: {
+			//更改模块
 			change(index) {
 				console.log(index)
 				this.current = index.index
-			}
+			},
+			changeTime(e) {
+				console.log('change事件', e)
+				if (e.value[0]) {
+					//将用户的选择的值抛出去
+					this.changeValue = e.value[0]
+				}else{
+					//默认值
+					this.changeValue = 1
+				}
+			},
+			//自主学习
+			hourStudy() {
+
+				let arr = this.studyTime
+				let num = parseFloat(this.changeValue)
+				arr.push(num)
+				if (arr.length > 7) {
+					arr.shift()
+				}
+				console.log(arr)
+				this.studyTime = arr
+				this.studyTimePicker = false
+			},
+			studyCancel() {
+				uni.$showMsg('取消选择')
+				this.studyTimePicker = false
+			},
+			//娱乐放松
+			hourRest(e) {
+				this.restTime = e.value[0]
+				this.restTimePicker = false
+			},
+			restCancel() {
+				uni.$showMsg('取消选择')
+				this.restTimePicker = false
+			},
+			//睡眠记录
+			hourSleep(e) {
+				this.sleepTime = e.value[0]
+				this.sleepTimePicker = false
+			},
+			sleepCancel() {
+				uni.$showMsg('取消选择')
+				this.sleepTimePicker = false
+			},
+
 		}
 	}
 </script>
 
 <style lang="scss">
 	@import '@/pages/common/mainpage.scss';
+
 	.module-container {
 		display: flex;
 		flex-direction: column;

components/top-box/top-box.vue

@@ -197,7 +197,4 @@
 		height: 40rpx;
 	}
 
-	.picker {
-		z-index: 99;
-	}
 </style>

information/chart.js

@@ -781,7 +781,6 @@ export default {
 				}]
 			},
 			
-			
 		},
 
 

pages.json

@@ -80,6 +80,14 @@
 					"disableScroll": true
 				}
 
+			}, {
+				"path": "childrenlist/childrenlist",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom",
+					"disableScroll": true
+				}
+
 			}
 		]
 	}, {
@@ -177,12 +185,12 @@
 		"backgroundColor": "#f5f5f5"
 	},
 	"tabBar": {
-		"backgroundColor": "#f5f5f5",
+		"backgroundColor": "#FFFFFF",
 		"borderStyle": "white",
 		"color": "#b0b0b1",
 		"selectedColor": "#303133",
 		"spacing": "5px",
-		"fontSize": "12px",
+		"fontSize": "14px",
 		"height": "55px",
 		"iconWidth": "24px",
 

pages/grade/grade.vue

@@ -10,7 +10,7 @@
 				<view class="mainchart-container">
 					<view class="mainchart-name">
 						<view class="t-icon t-icon-xtubiao-4"></view>
-						<text class="mainchart-text">学期成绩走势</text>
+						<text class="mainchart-text">成绩走势</text>
 					</view>
 
 					<view class="mainchart-box">
@@ -70,14 +70,13 @@
 			</view>
 
 			<!-- 成绩表单 -->
-			<view class="mini-chart-item" style="width: 100%; height: 500rpx;">
-				<view class="chart-container" style="height: 1000rpx">
+			<view class="mini-chart-item" style="width: 100%; height: 600rpx;">
+				<view class="chart-container" style="height: 100%">
 					<view class="chart-name">
 						<view class="t-icon t-icon-xtubiao-5"></view>
 						<text class="chart-name-text">成绩概览</text>
 					</view>
-					<z-table class="table" :tableData="gradeData.tableData" :columns="gradeData.columns"
-						stickSide="true">
+					<z-table class="table" :tableData="gradeData.tableData" :columns="gradeData.columns">
 					</z-table>
 				</view>
 			</view>
@@ -162,7 +161,7 @@
 			display: flex;
 			align-items: center;
 			flex-wrap: wrap;
-			margin: -50rpx 20rpx 0 20rpx;
+			margin: -50rpx 20rpx 10rpx 20rpx;
 			justify-content: space-between;
 
 			.mini-chart-item {
@@ -238,11 +237,11 @@
 	}
 
 	.table {
-		margin-bottom: 20rpx;
+		margin-bottom: 40rpx;
 		width: 93%;
+		height: 100%;
 	}
 
-	//图标
 	.t-icon {
 		width: 40rpx;
 		height: 40rpx;

pages/home/home.vue

@@ -132,6 +132,10 @@
 				classList: ['数学', '语文', '英语', '体育', '思品'],
 				//授课老师
 				teacherList: ['张老师', '李老师', '王老师', '陈老师', '黄老师'],
+				//问卷完成率
+				questionnaire: 56,
+				//投票完成率
+				vote: 100,
 
 				//评测进度条属性
 				evaluationOpts: {},
@@ -139,10 +143,7 @@
 				homeworkOpts: {},
 				//时间戳
 				timeStamp: '',
-				//问卷完成率
-				questionnaire: 56,
-				//投票完成率
-				vote: 100,
+				
 			}
 		},
 		onLoad() {

pages/my/my.vue

@@ -10,98 +10,97 @@
 				<u-tag :text="childreninfo.name + '家长'" shape="circle" plain plainFill></u-tag>
 			</view>
 		</view>
-		
-		
+
 		<!-- 功能组件 -->
 		<view class="userinfo-container">
-				<!-- 面板区域 -->
-				<view class="box-cart" >
-					<view class="box-cart-item left-box" @click="chooseChildren">
-						<view class="t-icon t-icon-a-boshimaojiaoyu" ></view>
-						<view class="card-text">
-							孩子管理
-							<view class="card-des">
-								查看您的孩子
-							</view>
+			<!-- 面板区域 -->
+			<view class="box-cart">
+				<view class="box-cart-item left-box" @click="chooseChildren">
+					<view class="t-icon t-icon-a-boshimaojiaoyu"></view>
+					<view class="card-text">
+						孩子管理
+						<view class="card-des">
+							查看您的孩子
 						</view>
 					</view>
-					<view class="box-cart-item right-box" @click="childrenInfo">
-						<view class="t-icon t-icon-a-jiangpaijiangzhang" ></view>
-						<view class="card-text">
-							孩子名片
-							<view class="card-des">
-								晒出TA的优秀表现
-							</view>
+				</view>
+				<view class="box-cart-item right-box" @click="childrenInfo">
+					<view class="t-icon t-icon-a-jiangpaijiangzhang"></view>
+					<view class="card-text">
+						孩子名片
+						<view class="card-des">
+							晒出TA的优秀表现
 						</view>
 					</view>
 				</view>
-				
-				<!-- 用户功能 -->
-				<view class="com-item">
-					<view class="com-box">
-						<view class="cell" @click="myInfo">
-							<view class="cell-left">
-								<view class="t-icon t-icon-zhanghu" ></view>
-								<view class="cell-text">个人信息</view>
-							</view>
-							<u-icon name="arrow-right" color="#bababa" size="16"></u-icon>
+			</view>
+
+			<!-- 用户功能 -->
+			<view class="com-item">
+				<view class="com-box">
+					<view class="cell" @click="myInfo">
+						<view class="cell-left">
+							<view class="t-icon t-icon-zhanghu"></view>
+							<view class="cell-text">个人信息</view>
+						</view>
+						<u-icon name="arrow-right" color="#bababa" size="16"></u-icon>
+					</view>
+					<view class="cell" @click="myMsg">
+						<view class="cell-left">
+							<view class="t-icon t-icon-a-liaotianpingluntaolunduihua"></view>
+							<view class="cell-text">我的消息</view>
 						</view>
-						<view class="cell" @click="myMsg">
-							<view class="cell-left">
-								<view class="t-icon t-icon-a-liaotianpingluntaolunduihua" ></view>
-								<view class="cell-text">我的消息</view>
-							</view>
-							<view class="cell-right">
-								<u-badge type="warning" shape="horn" :value="myData.msgList.length"></u-badge>
-								<u-icon name="arrow-right" color="#bababa" size="16"></u-icon>
-							</view>
+						<view class="cell-right">
+							<u-badge type="warning" shape="horn" :value="myData.msgList.length"></u-badge>
+							<u-icon name="arrow-right" color="#bababa" size="16"></u-icon>
 						</view>
-						<view class="cell" @click="logout">
-							<view class="cell-left">
-								<view class="t-icon t-icon-a-tuichulikai"></view>
-								<view class="cell-text">退出登录</view>
-							</view>
+					</view>
+					<view class="cell" @click="logout">
+						<view class="cell-left">
+							<view class="t-icon t-icon-a-tuichulikai"></view>
+							<view class="cell-text">退出登录</view>
 						</view>
 					</view>
 				</view>
-		
-				<!-- 用户服务 -->
-				<view class="com-item">
-					<view class="com-box">
-						<view class="cell">
-							<view class="cell-left">
-								<view class="t-icon t-icon-shoucang"></view>
-								<view class="cell-text">客服中心</view>
-							</view>
+			</view>
+
+			<!-- 用户服务 -->
+			<view class="com-item">
+				<view class="com-box">
+					<view class="cell">
+						<view class="cell-left">
+							<view class="t-icon t-icon-shoucang"></view>
+							<view class="cell-text">客服中心</view>
 						</view>
-						<view class="cell">
-							<view class="cell-left">
-								<view class="t-icon t-icon-a-appyingyongchengxukaifa"></view>
-								<view class="cell-text">帮助中心</view>
-							</view>
+					</view>
+					<view class="cell">
+						<view class="cell-left">
+							<view class="t-icon t-icon-a-appyingyongchengxukaifa"></view>
+							<view class="cell-text">帮助中心</view>
 						</view>
-						<view class="cell">
-							<view class="cell-left">
-								<view class="t-icon t-icon-shuji"></view>
-								<view class="cell-text">用户协议</view>
-							</view>
+					</view>
+					<view class="cell">
+						<view class="cell-left">
+							<view class="t-icon t-icon-shuji"></view>
+							<view class="cell-text">用户协议</view>
 						</view>
 					</view>
 				</view>
-				<!-- 日历组件 -->
-				<!-- <u-calendar class="calendar" :show="show" mode="single" @confirm="confirm"></u-calendar> -->
-				
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import { mapState,mapMutations } from 'vuex'
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
 
 	export default {
 		computed: {
-			...mapState('m_parent', ['token', 'parentdetail', 'parentinfo','myData']),
-			...mapState('m_children', ['childreninfo','semesterList'])
+			...mapState('m_parent', ['token', 'parentdetail', 'parentinfo', 'myData']),
+			...mapState('m_children', ['childreninfo', 'semesterList'])
 		},
 
 		data() {
@@ -111,52 +110,51 @@
 		},
 		onLoad() {},
 		methods: {
-			...mapMutations('m_parent',['updateParentDetail','updateParentInfo','updateToken']),
-			...mapMutations('m_children',['updateChildrenInfo','updateChildrenSemester']),
+			...mapMutations('m_parent', ['updateParentDetail', 'updateParentInfo', 'updateToken']),
+			...mapMutations('m_children', ['updateChildrenInfo', 'updateChildrenSemester']),
 			//退出登录事件
-			async logout(){
-				const [err,succ] = await uni.showModal({
+			async logout() {
+				const [err, succ] = await uni.showModal({
 					title: '提示',
 					content: '确认退出登录吗?'
 				}).catch(err => err)
-				if(succ && succ.confirm)
-				{
+				if (succ && succ.confirm) {
 					this.updateChildrenInfo()
 					this.updateChildrenSemester(this.semesterList[0][0])
 					this.updateParentDetail()
 					this.updateParentInfo()
 					this.updateToken()
-					
+
 					uni.reLaunch({
-						url:'/subpkg/login/login'
+						url: '/subpkg/login/login'
 					})
 				}
 			},
 			//切换孩子
-			chooseChildren(){
+			chooseChildren() {
 				// if(parentdetail.childrenList.length == 1)
 				// return uni.showMsg('您只有一个孩子，不能切换')
 				// if(uni.getStorageSync('parentdetail')){
 				// 	uni.setStorageSync('parentdetail',)
 				// }
 				uni.navigateTo({
-					url: '/subpkg/guide/guide'
+					url: '/subpkg/childrenlist/childrenlist'
 				})
 			},
 			//孩子名片
-			childrenInfo(){
+			childrenInfo() {
 				uni.navigateTo({
 					url: '/subpkg/childrenInfo/childrenInfo'
 				})
 			},
 			//我的消息
-			myMsg(){
+			myMsg() {
 				uni.navigateTo({
 					url: '/subpkg/mymsg/mymsg'
 				})
 			},
 			//我的信息
-			myInfo(){
+			myInfo() {
 				uni.navigateTo({
 					url: '/subpkg/parentInfo/parentInfo'
 				})
@@ -170,7 +168,8 @@
 	page,
 	.my-container {
 		height: 100%;
-		.bg1{
+
+		.bg1 {
 			position: fixed;
 			top: -400rpx;
 			right: -250rpx;
@@ -181,7 +180,8 @@
 			background-color: #6495ed;
 			z-index: -1;
 		}
-		.bg2{
+
+		.bg2 {
 			position: fixed;
 			top: -300rpx;
 			right: -320rpx;
@@ -221,13 +221,13 @@
 					font-weight: bold;
 					margin-left: 10rpx;
 				}
-				
-				.u-tag{
+
+				.u-tag {
 					margin-top: 10rpx !important;
 					height: 40rpx;
 					line-height: 36rpx;
-					
-					.u-tag__text{
+
+					.u-tag__text {
 						font-size: 24rpx !important;
 					}
 				}
@@ -239,114 +239,117 @@
 				}
 			}
 		}
-		.userinfo-container{
-				height: 100%;
-				
-				.box-cart{
-					height: 180rpx;
-					padding: 0 4%;
+
+		.userinfo-container {
+			height: 100%;
+
+			.box-cart {
+				height: 180rpx;
+				padding: 0 4%;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.box-cart-item {
+					width: 48%;
+					height: 100%;
+					padding-left: 20rpx;
+					border-radius: 20rpx;
+					background-color: #fff;
 					display: flex;
-					justify-content: space-between;
 					align-items: center;
-					
-					.box-cart-item{
-						width: 48%;
-						height: 100%;
-						padding-left: 20rpx;
-						border-radius: 20rpx;
-						background-color: #fff;
-						display: flex;
-						align-items: center;
-						box-sizing: border-box;
-						
-						.t-icon{
-							width: 60rpx !important;
-							height: 60rpx !important;
-							margin-right: 20rpx;
-						}
-						.card-text{
-							font-size: 32rpx;
-							font-weight: bolder;
-							margin: 20rpx 0;
-							color: #616161;
-							
-							.card-des{
-								margin-top: 10rpx;
-								font-weight: 400;
-								font-size: 24rpx;
-								color: #a6aaaf;
-							}
-						}
-					}
-					
-					.left-box{
-						background-image: linear-gradient(to top, #d7e4ff 0%, #d7e4ff 100%);
+					box-sizing: border-box;
+
+					.t-icon {
+						width: 60rpx !important;
+						height: 60rpx !important;
+						margin-right: 20rpx;
 					}
-					
-					.right-box{
-						background-image: linear-gradient(to top, #ffe1e7 0%, #ffe1e7 100%);
+
+					.card-text {
+						font-size: 32rpx;
+						font-weight: bolder;
+						margin: 20rpx 0;
+						color: #616161;
+
+						.card-des {
+							margin-top: 10rpx;
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #a6aaaf;
+						}
 					}
 				}
 
-				// 功能列表
-				.com-item {
-						width: 92%;
-						margin: 20rpx 4% 0 4%;
-				
-						.com-box {
-							overflow: hidden;
-							border-radius: 20rpx;
-						}
+				.left-box {
+					background-image: linear-gradient(to top, #d7e4ff 0%, #d7e4ff 100%);
+				}
+
+				.right-box {
+					background-image: linear-gradient(to top, #ffe1e7 0%, #ffe1e7 100%);
+				}
+			}
+
+			// 功能列表
+			.com-item {
+				width: 92%;
+				margin: 20rpx 4% 0 4%;
+
+				.com-box {
+					overflow: hidden;
+					border-radius: 20rpx;
+				}
+			}
+
+			.cell {
+				height: 100rpx;
+				padding-left: 20rpx;
+				padding-right: 20rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				background: #fff;
+				border-bottom: 1px solid #f8f8f8;
+
+				&:active {
+					background: #f2f2f2;
+				}
+
+				&:last-child {
+					border-bottom: none !important;
+				}
+
+				.cell-left {
+					display: flex;
+					align-items: center;
+					padding-left: 20rpx;
+
+					.t-icon {
+						width: 40rpx;
+						height: 40rpx;
 					}
-				
-					.cell {
-						height: 100rpx;
-						padding-left: 20rpx;
-						padding-right: 20rpx;
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						background: #fff;
-						border-bottom: 1px solid #f8f8f8;
-				
-						&:active {
-							background: #f2f2f2;
-						}
-				
-						&:last-child {
-							border-bottom: none !important;
-						}
-				
-						.cell-left {
-							display: flex;
-							align-items: center;
-							padding-left: 20rpx;
-				
-							.t-icon {
-								width: 40rpx;
-								height: 40rpx;
-							}
-				
-							.cell-text {
-								color: #666;
-								font-size: 28rpx;
-								margin-left: 20rpx;
-							}
-						}
-						
-						.cell-right{
-							display: flex;
-							align-items: center;
-							
-							.u-badge{
-								margin-right: 10rpx;
-							}
-						}
+
+					.cell-text {
+						color: #666;
+						font-size: 28rpx;
+						margin-left: 20rpx;
 					}
-					.calendar{
-						z-index: 999;
+				}
+
+				.cell-right {
+					display: flex;
+					align-items: center;
+
+					.u-badge {
+						margin-right: 10rpx;
 					}
+				}
 			}
 
+			.calendar {
+				z-index: 999;
+			}
+		}
+
 	}
 </style>

pages/subscribe/subscribe.vue

@@ -27,7 +27,7 @@
 				timeStamp: '',
 			}
 		},
-		methods:{
+		methods: {
 			//更新时间戳
 			getTimeStamp() {
 				var date = new Date(),
@@ -55,17 +55,19 @@
 		width: 100%;
 		height: 100%;
 		overflow-x: hidden; //隐藏多余的页面
-		
+
 		.home-topinfo {
 			background: linear-gradient(#ffd200, $page-background-color);
 		}
+
 		.card-box {
 			display: flex;
 			flex-direction: row;
 			flex-wrap: wrap;
 			margin: -50rpx 20rpx 0 20rpx;
 			justify-content: space-between;
-			.card-item{
+
+			.card-item {
 				margin: 10rpx 0;
 				display: flex;
 				flex-direction: column;
@@ -76,6 +78,6 @@
 				width: 100%;
 				height: 250rpx;
 			}
-			}
+		}
 	}
 </style>

subpkg/childrenlist/childrenlist.vue

@@ -0,0 +1,129 @@
+<template>
+	<view class="children-container">
+		<view class="tips">
+			<view class="title">选择您的孩子</view>
+		</view>
+
+		<!-- 孩子选择界面 -->
+		<view class="children-item">
+			<view class="com-box">
+				<view class="item" v-for="(item,index) in parentdetail.childrenList" :key="index"
+					@click="chooseChildren(item)">
+					<view class="item-text">{{item.name}}</view>
+					<view class="avatar-box">
+						<u-avatar size="120" class="item-avatar" :src="item.avatar" mode="aspectFill"></u-avatar>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 动画 -->
+		<view class="ocean"></view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
+	export default {
+		computed: {
+			...mapState('m_parent', ['parentdetail']),
+			...mapState('m_children', ['semesterList'])
+		},
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			...mapMutations('m_children', ['updateChildrenInfo', 'updateChildrenSemester']),
+
+			//选择孩子并跳转首页传入id查询显示孩子信息
+			chooseChildren(item) {
+				console.log(item.tmdid);
+				this.updateChildrenInfo(item)
+				//默认学期
+				this.updateChildrenSemester(this.semesterList[0][0])
+				uni.switchTab({
+					url: '/pages/home/home'
+				})
+			},
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/subpkg/common/ocean.scss';
+
+	.children-container {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		.tips {
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			z-index: 99;
+
+			.title {
+				padding-top: 200rpx;
+				padding-left: 40rpx;
+				line-height: 70rpx;
+				font-weight: bold;
+				font-size: 50rpx;
+				color: #4169E1;
+				// background-clip: text; //裁剪成文字的前景色
+				// color: transparent; //文字颜色变成透明
+			}
+		}
+		
+		.children-item {
+			.com-box {
+				display: flex;
+				flex-direction: row;
+				justify-content: center;
+				align-items: center;
+				flex-wrap: wrap; //元素换行
+				margin-top: 60rpx;
+		
+				.item {
+					margin: 10rpx 20rpx 10rpx 20rpx;
+					padding: 20rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					box-shadow: $box-shadow-stereo-white;
+					background-color: #FFFFFF;
+					border-radius: 20rpx;
+					width: 280rpx;
+					height: 300rpx;
+					z-index: 99;
+		
+					.item-text {
+						margin: -7rpx 0 20rpx 20rpx;
+						width: 100%;
+						line-height: 40rpx;
+						font-weight: bold;
+						font-size: 35rpx;
+						color: #696969;
+		
+					}
+		
+					.avatar-box {
+						.item-avatar {
+							width: 220rpx;
+							height: 220rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

subpkg/guide/guide.vue

@@ -2,28 +2,14 @@
 	<view class="children-container">
 		<!-- 标题 -->
 		<view class="tips">
-			<view class="title" v-show="!show">欢迎您的使用</view>
-			<view style="font-weight: bold;font-size: 36rpx;color: #b0b0b1;margin-left: 40rpx;margin-top: 20rpx;"
-				v-show="!show">醍摩豆家长助您孩子成长</view>
-			<view class="title" v-show="show">选择您的孩子</view>
-
-			<view class="detail-image" v-show="!show"></view>
-			<button class="detail-button" plain="true" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
-				v-show="!show">获取您的孩子信息</button>
+			<view class="title">欢迎您的使用</view>
+			<view style="font-weight: bold;font-size: 36rpx;color: #b0b0b1;margin-left: 40rpx;margin-top: 20rpx;">
+				醍摩豆家长助您孩子成长</view>
+			<view class="detail-image"></view>
+			<button class="detail-button" plain="true" open-type="getPhoneNumber"
+				@getphonenumber="getPhoneNumber">获取您的孩子信息</button>
 		</view>
 
-		<!-- 孩子选择界面 -->
-		<view class="children-item" v-show="show">
-			<view class="com-box">
-				<view class="item" v-for="(item,index) in parentdetail.childrenList" :key="index"
-					@click="chooseChildren(item)">
-					<view class="item-text">{{item.name}}</view>
-					<view class="avatar-box">
-						<u-avatar size="120" class="item-avatar" :src="item.avatar" mode="aspectFill"></u-avatar>
-					</view>
-				</view>
-			</view>
-		</view>
 		<!-- 动画 -->
 		<view class="ocean"></view>
 	</view>
@@ -38,41 +24,15 @@
 	import WXBizDataCrypt from "@/utils/WXBizDataCrypt.js";
 
 	export default {
+		computed: {
+			...mapState('m_parent', ['token'])
+		},
 		data() {
 			return {
-				show: false,
 			};
 		},
-		computed: {
-			...mapState('m_parent', ['parentdetail', 'token']),
-			...mapState('m_children', ['semesterList'])
-		},
-		onLoad() {
-			//判断用户信息
-			this.hasParentDetail()
-		},
 		methods: {
-			...mapMutations('m_children', ['updateChildrenInfo', 'updateChildrenSemester']),
-			...mapMutations('m_parent', ['updateParentInfo', 'updateParentDetail']),
-
-			//选择孩子并跳转首页传入id查询显示孩子信息
-			chooseChildren(item) {
-				console.log(item.tmdid);
-				this.updateChildrenInfo(item)
-				//默认学期
-				this.updateChildrenSemester(this.semesterList[0][0])
-				uni.switchTab({
-					url: '/pages/home/home'
-				})
-			},
-
-			//判断用户基本信息是否存在
-			hasParentDetail() {
-				if (uni.getStorageSync('parentdetail'))
-					this.show = true
-				else
-					this.show = false
-			},
+			...mapMutations('m_parent', ['updateParentDetail']),
 
 			//获取用户手机号
 			async getPhoneNumber(e) {
@@ -104,7 +64,9 @@
 								schoolname: '研发学校'
 							}, ]
 						})
-						this.show = true
+						uni.navigateTo({
+							url:'/subpkg/childrenlist/childrenlist'
+						})
 					}
 				}
 			},
@@ -164,48 +126,5 @@
 
 			}
 		}
-
-		.children-item {
-			.com-box {
-				display: flex;
-				flex-direction: row;
-				justify-content: center;
-				align-items: center;
-				flex-wrap: wrap; //元素换行
-				margin-top: 60rpx;
-
-				.item {
-					margin: 10rpx 20rpx 10rpx 20rpx;
-					padding: 20rpx;
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					align-items: center;
-					box-shadow: $box-shadow-stereo-white;
-					background-color: #FFFFFF;
-					border-radius: 20rpx;
-					width: 280rpx;
-					height: 300rpx;
-					z-index: 99;
-
-					.item-text {
-						margin: -7rpx 0 20rpx 20rpx;
-						width: 100%;
-						line-height: 40rpx;
-						font-weight: bold;
-						font-size: 35rpx;
-						color: #696969;
-
-					}
-
-					.avatar-box {
-						.item-avatar {
-							width: 220rpx;
-							height: 220rpx;
-						}
-					}
-				}
-			}
-		}
 	}
 </style>

subpkg/login/login.vue

@@ -101,6 +101,7 @@
 </script>
 
 <style lang="scss">
+	@import '@/subpkg/common/ocean.scss';
 	//登录页面
 	.content {
 		width: 100vw;
@@ -217,60 +218,7 @@
 		}
 	}
 
-
-
 	.ocean {
-		display: flex;
-		margin-top: -600rpx;
 		margin-left: -520rpx;
-		width: 1800rpx;
-		height: 1800rpx;
-		background-color: #4169E1;
-		border-radius: 50%;
-
-		&::before,
-		&::after {
-			content: "";
-			position: absolute;
-			margin-top: 870rpx;
-			width: 1600rpx;
-			height: 1600rpx;
-			top: 0;
-			left: 50%;
-			border-radius: 43%;
-			background-color: #FFFFFF;
-			transform: translate(-50%, -70%) rotate(0);
-			animation: rotate 6s linear infinite;
-			z-index: 2;
-		}
-
-		&::after {
-			border-radius: 46%;
-			background-color: #FFFFFF;
-			opacity: 0.7;
-			transform: translate(-50%, -70%) rotate(0);
-			animation: rotate 10s linear -5s infinite;
-			z-index: 3;
-		}
-
-		&::after {
-			border-radius: 40%;
-			background-color: #FFFFFF;
-			opacity: 0.5;
-			transform: translate(-50%, -70%) rotate(0);
-			animation: rotate 10s linear -5s infinite;
-			z-index: 3;
-		}
-
-	}
-
-	@keyframes rotate {
-		50% {
-			transform: translate(-50%, -73%) rotate(180deg);
-		}
-
-		100% {
-			transform: translate(-50%, -70%) rotate(360deg);
-		}
 	}
 </style>