3.11-3

components/analysis-box/analysis-box.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 
-		<view class="block" v-if="subscribe">
+		<view class="block">
 			<view class="item-container" @click="navRoseChart">
 				<view class="analysis-name">
 					<view class="t-icon t-icon-xtubiao-"></view>
@@ -26,14 +26,13 @@
 			</view>
 		</view>
 		
-		<view class="nosub-box" v-if="!subscribe">
+		<!-- <view class="nosub-box" v-if="!subscribe">
 			<view style="display: flex; align-items: center;margin: 30rpx 0 0 15rpx;">
-				<!-- <view class="t-icon t-icon-xtubiao-3" style="width: 50rpx;height: 50rpx;"></view> -->
 				<view class="nosub-text">综合分析模块</view>
 			</view>
 			<view class="nosub-content">孩子成绩综合全面分析</view>
 			<button class="nosub-btn" @click="getSubscribe">点击订阅</button>
-		</view>
+		</view> -->
 
 	</view>
 
@@ -56,11 +55,11 @@
 		methods: {
 			...mapMutations('m_parent',['updateSubscribe']),
 			//获取订阅
-			getSubscribe() {
-				this.updateSubscribe(true)
-				const orderInfo = {
-					order_price: 0.01,
-				}
+			// getSubscribe() {
+			// 	this.updateSubscribe(true)
+			// 	const orderInfo = {
+			// 		order_price: 0.01,
+			// 	}
 				//获取服务供应商
 				// uni.getProvider({
 				// 	service: 'payment',
@@ -76,7 +75,7 @@
 				// 	}
 				// })
 
-			},
+			// },
 			//导航玫瑰图页面
 			navRoseChart(e) {
 				console.log(e);
@@ -150,7 +149,7 @@
 			font-size: 35rpx;
 			font-weight: bold;
 			margin-left: 10rpx;
-			background-image: linear-gradient(to right, #ba7a63, #e8997d);
+			background-image: linear-gradient(to right, #ce866e, #e8997d);
 			background-clip: text;//裁剪成文字的前景色
 			color: transparent;//文字颜色变成透明
 		}
@@ -159,15 +158,17 @@
 			margin: 25rpx 65rpx 0 25rpx;
 			font-size: 45rpx;
 			font-weight: bold;
-			background-image: linear-gradient(to right, #ba7a63, #e8997d);
+			background-image: linear-gradient(to right, #ce866e, #e8997d);
 			background-clip: text;//裁剪成文字的前景色
 			color: transparent;//文字颜色变成透明
 		}
 		.nosub-btn{
 			margin-top: 30rpx;
 			line-height: 65rpx;
+			height: 65rpx;
+			width: 80%;
 			border-radius: 30rpx;
-			font-size: 35rpx;
+			font-size: 30rpx;
 			font-weight: bold;
 			background-image: linear-gradient(to right, #ba7a63, #ffa789);
 		}

components/todaydata-box/todaydata-box.vue

@@ -58,7 +58,7 @@
 			<view class="card-item" style="width: 710rpx;">
 				<view class="card-info">
 					<view class="t-icon t-icon-jiaoshidaka"></view>
-					<text class="info-text">孩子学习记录</text>
+					<text class="info-text">本周学习记录</text>
 				</view>
 				<view style="width: 100%; height: 500rpx; margin-top: -30rpx;">
 					<qiun-data-charts type="column" :chartData="todayData.studyColumn" :loadingType="4" :canvas2d='true'
@@ -69,7 +69,7 @@
 			<view class="card-item">
 				<view class="card-info">
 					<view class="t-icon t-icon-jiankangshangbao"></view>
-					<text class="info-text">运动记录</text>
+					<text class="info-text">本周运动</text>
 				</view>
 				<view style="width: 100%; height: 350rpx; margin-top: -10rpx;">
 					<qiun-data-charts type="pie" :chartData="todayData.exercisePie" :loadingType="4" :canvas2d='true'
@@ -80,7 +80,7 @@
 			<view class="card-item">
 				<view class="card-info">
 					<view class="t-icon t-icon-jiankangshangbao"></view>
-					<text class="info-text">睡眠记录</text>
+					<text class="info-text">本周睡眠</text>
 				</view>
 				<view style="width: 100%; height: 350rpx; margin-top: -10rpx;">
 					<qiun-data-charts type="ring" :chartData="todayData.sleepRing" :loadingType="4" :canvas2d='true'
@@ -107,9 +107,9 @@
 			return {
 				//模块名
 				list: [{
-					name: '今日数据'
+					name: '今日记录'
 				}, {
-					name: '历史数据'
+					name: '历史记录'
 				}],
 				//当前模块
 				current: 0,

gradepkg/radar-chart/radar-chart.vue

@@ -39,7 +39,7 @@
 		<view class="chart-container">
 			<view class="chart-name">
 				<view class="t-icon t-icon-xianxingsakesi"></view>
-				<text class="chart-name-text">大考对比</text>
+				<text class="chart-name-text">重要考试对比</text>
 			</view>
 			<!-- 图表 -->
 			<view class="charts-box">
@@ -50,7 +50,7 @@
 		<view class="chart-container">
 			<view class="chart-name">
 				<view class="t-icon t-icon-xianxingtouzi"></view>
-				<text class="chart-name-text">小考记录</text>
+				<text class="chart-name-text">普通测验记录</text>
 			</view>
 			<!-- 图表 -->
 			<view class="charts-box">
@@ -58,9 +58,6 @@
 			</view>
 		</view>
 
-		
-
-
 	</view>
 </template>
 

information/chart.js

@@ -532,7 +532,7 @@ export default {
 								98,
 								88,
 								95,
-								83
+								89
 							]
 						},
 						{
@@ -543,13 +543,13 @@ export default {
 								97,
 								91,
 								95,
-								82
+								85
 							]
 						},
 						{
 							"name": "期末考试",
 							"data": [
-								82,
+								80,
 								90,
 								95,
 								96,
@@ -616,7 +616,7 @@ export default {
 						},
 						{
 							"name": "超过班级中",
-							"data": 0.92,
+							"data": 0.90,
 							"color": "#ff5959"
 						}
 					],

pages/subscribe/subscribe.vue

@@ -8,7 +8,6 @@
 			<view class="card-item"></view>
 			<view class="card-item"></view>
 			<view class="card-item"></view>
-			<view class="card-item"></view>
 		</view>
 
 	</view>
@@ -75,7 +74,7 @@
 				box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
 				border-radius: 16rpx;
 				width: 100%;
-				height: 300rpx;
+				height: 250rpx;
 			}
 			}
 	}

subpkg/childrenInfo/childrenInfo.vue

@@ -19,11 +19,11 @@
 					<u-cell class="cell-box" size="large" title="班级" :label="childreninfo.class" :border="false"></u-cell>
 				</view>
 				<view class="i-item">
-					<view class="t-icon t-icon-empire-state-building-america-svgrepo-com"></view>
+					<view class="t-icon t-icon-galata-tower-istanbul-svgrepo-com"></view>
 					<u-cell class="cell-box" size="large" title="年龄" label="描述信息" :border="false"></u-cell>
 				</view>
 				<view class="i-item">
-					<view class="t-icon t-icon-atomium-belgium-svgrepo-com"></view>
+					<view class="t-icon t-icon-desert-nature-svgrepo-com"></view>
 					<u-cell class="cell-box" size="large" title="个人信息" label="描述信息" :border="false"></u-cell>
 				</view>
 			</u-cell-group>
@@ -127,16 +127,16 @@
 			display: flex;
 			flex-direction: column;
 			margin: 20rpx;
-			background-color: #ff8caf;
-			border-radius: 15rpx;
+			background-color: #FFFFFF;
+			border-radius: 16rpx;
 			width: 280rpx;
 			height: 280rpx;
-			box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.1);
+			box-shadow: 0 8rpx 16rpx rgba(153, 153, 153, 0.5);
 
 			.item-text {
 				font-size: 30rpx;
 				font-weight: bold;
-				color: #FFFFFF;
+				color: #353535;
 				margin: 30rpx 0 0 30rpx;
 			}
 

subpkg/guide/guide.vue

@@ -3,9 +3,9 @@
 		<!-- 标题 -->
 		<view class="tips">
 			<view class="title" v-show="!show">欢迎您的使用</view>
-			<view style="font-weight: bold;font-size: 45rpx;color: #4169E1;margin-left: 40rpx;margin-top: 10rpx;"
+			<view style="font-weight: bold;font-size: 36rpx;color: #b0b0b1;margin-left: 40rpx;margin-top: 20rpx;"
 				v-show="!show">醍摩豆家长助您孩子成长</view>
-			<view class="title-sim" 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"
@@ -45,15 +45,15 @@
 		},
 		computed: {
 			...mapState('m_parent', ['parentdetail', 'token']),
-			...mapState('m_children',['semesterList'])
+			...mapState('m_children', ['semesterList'])
 		},
 		onLoad() {
 			//判断用户信息
 			this.hasParentDetail()
 		},
 		methods: {
-			...mapMutations('m_children', ['updateChildrenInfo','updateChildrenSemester']),
-			...mapMutations('m_parent', ['updateParentInfo','updateParentDetail']),
+			...mapMutations('m_children', ['updateChildrenInfo', 'updateChildrenSemester']),
+			...mapMutations('m_parent', ['updateParentInfo', 'updateParentDetail']),
 
 			//选择孩子并跳转首页传入id查询显示孩子信息
 			chooseChildren(item) {
@@ -138,17 +138,9 @@
 				// color: transparent; //文字颜色变成透明
 			}
 
-			.title-sim {
-				padding-top: 200rpx;
-				padding-left: 40rpx;
-				margin-bottom: 50rpx;
-				font-weight: bold;
-				font-size: 45rpx;
-				color: #4169E1;
-			}
-
 			.detail-image {
-				margin-top: 50rpx;
+				margin-top: 80rpx;
+				margin-bottom: 20rpx;
 				width: 100%;
 				height: 500rpx;
 				background: $guide-back-base64;
@@ -156,10 +148,12 @@
 			}
 
 			.detail-button {
-				line-height: 100rpx;
+				line-height: 80rpx;
+				height: 80rpx;
+				width: 80%;
 				font-weight: bold;
-				font-size: 40rpx;
-				border-radius: 100rpx;
+				font-size: 36rpx;
+				border-radius: 80rpx;
 				position: relative;
 				margin: 100rpx auto; //relative相对定位居中
 				border: none;
@@ -176,18 +170,20 @@
 				justify-content: center;
 				align-items: center;
 				flex-wrap: wrap; //元素换行
+				margin-top: 60rpx;
 
 				.item {
-					margin: 10rpx 20rpx 20rpx 20rpx;
+					margin: 10rpx 20rpx 10rpx 20rpx;
 					padding: 20rpx;
 					display: flex;
 					flex-direction: column;
 					justify-content: center;
 					align-items: center;
-					background-color: #f1f3f5;
+					box-shadow: 0 8rpx 16rpx rgba(153, 153, 153, 0.5);
+					background-color: #FFFFFF;
 					border-radius: 20rpx;
 					width: 280rpx;
-					height: 320rpx;
+					height: 300rpx;
 					z-index: 99;
 
 					.item-text {

subpkg/parentInfo/parentInfo.vue

@@ -19,11 +19,11 @@
 					<u-cell class="cell-box" size="large" title="我的订阅" :label="parentdetail.phoneNumber" :border="false"></u-cell>
 				</view>
 				<view class="i-item">
-					<view class="t-icon t-icon-empire-state-building-america-svgrepo-com"></view>
+					<view class="t-icon t-icon-hassan-mosque-morocco-svgrepo-com"></view>
 					<u-cell class="cell-box" size="large" title="订阅信息" label="描述信息" :border="false"></u-cell>
 				</view>
 				<view class="i-item">
-					<view class="t-icon t-icon-atomium-belgium-svgrepo-com"></view>
+					<view class="t-icon t-icon-leaning-tower-of-pisa-europe-svgrepo-com"></view>
 					<u-cell class="cell-box" size="large" title="订阅时间" label="2022.2.15-2025.2.15" :border="false"></u-cell>
 				</view>
 			</u-cell-group>
@@ -127,18 +127,18 @@
 			flex-direction: column;
 			align-items: center;
 			margin: 20rpx;
-			background-color: #6190e8;
-			border-radius: 15rpx;
+			background-color: #FFFFFF;
+			border-radius: 16rpx;
 			width: 280rpx;
 			height: 280rpx;
-			box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.1);
-
+			box-shadow:0 15px 35px rgba(0,0,0,0.1);
+			
 			.item-text {
 				width: 100%;
 				justify-content: flex-start;
 				font-size: 35rpx;
 				font-weight: bold;
-				color: #FFFFFF;
+				color: #353535;
 				margin: 15rpx 0 0 30rpx;
 			}
 			.avatar-box{