1.25提交

App.vue

@@ -20,7 +20,7 @@
 	@import '@/static/customicons.css';
 	// 设置整个项目的背景色
 	page {
-		background-color: #F5F5F5;
+		background-color: #fafafa;
 	}
 
 	/* #endif */

components/area-chart/area-chart.vue

@@ -0,0 +1,95 @@
+<template>
+	<view class="chart-container">
+		<view class="chart-name">
+			<text class="chart-name-text">单科成绩走向图</text>
+		</view>
+		<view class="charts-box">
+			<qiun-data-charts type="area" :chartData="chartData" :loadingType="4" background="none" />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "area-chart",
+		data() {
+			return {
+				chartData: {
+					categories: [
+						"测验1",
+						"测验2",
+						"测验3",
+						"测验4",
+						"测验5",
+						"测验6"
+					],
+					series: [{
+							"name": "数学成绩",
+							"data": [
+								90,
+								95,
+								92,
+								100,
+								88,
+								85
+							]
+						},
+						{
+							"name": "班级平均",
+							"data": [
+								85,
+								88,
+								84,
+								92,
+								93,
+								89
+							]
+						},
+						{
+							"name": "年纪平均",
+							"data": [
+								88,
+								79,
+								77,
+								74,
+								85,
+								89
+							]
+						}
+					],
+				},
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+.chart-container {
+		margin: 10px;
+		padding: 5px 5px 5px 2px;
+		border-radius: 10px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		background-color: #FFFFFF;
+		box-shadow: 3px 3px 5px 1px rgba(0, 0, 0, 0.05);
+
+		.chart-name {
+			width: 100%;
+			text-align: left;
+			margin-left: 18px;
+			margin-top: 8px;
+
+			.chart-name-text {
+				font-size: 13px;
+			}
+		}
+
+		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
+		.charts-box {
+			width: 100%;
+			height: 190px;
+		}
+	}
+</style>

components/bar-chart/bar-chart.vue

@@ -0,0 +1,87 @@
+<template>
+	<view class="chart-container">
+		<view class="chart-name">
+			<text class="chart-name-text">成绩目标</text>
+		</view>
+		<view class="charts-box">
+			<qiun-data-charts type="bar" :chartData="chartData" :loadingType="4" background="none" />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "bar-chart",
+		data() {
+			return {
+				chartData: {
+					categories: [
+						"数学",
+						"语文",
+						"英语",
+						"体育",
+						"科学",
+						"思品"
+					],
+					series: [{
+							"name": "目标成绩",
+							"data": [
+								97,
+								90,
+								100,
+								95,
+								97,
+								91
+							]
+						},
+						{
+							"name": "近期成绩",
+							"data": [
+								91,
+								92,
+								94,
+								88,
+								82,
+								89
+							]
+						}
+					],
+				},
+			};
+		},
+		methods:{
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.chart-container {
+		margin: 10px;
+		padding: 5px 5px 5px 3px;
+		border-radius: 10px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		background-color: #FFFFFF;
+		box-shadow: 3px 3px 5px 1px rgba(0, 0, 0, 0.05);
+
+		.chart-name {
+			width: 100%;
+			text-align: left;
+			margin-left: 18px;
+			margin-top: 8px;
+
+			.chart-name-text {
+				font-size: 13px;
+			}
+		}
+
+		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
+		.charts-box {
+			width: 100%;
+			height: 280px;
+		}
+	}
+</style>

components/column-chart/column-chart.vue

@@ -0,0 +1,84 @@
+<template>
+	<view class="chart-container">
+		<view class="chart-name">
+			<text class="chart-name-text">近期成绩对比</text>
+		</view>
+		<view class="charts-box">
+			<qiun-data-charts type="column" :chartData="chartData" :loadingType="4" background="none" />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "column-chart",
+		data() {
+			return {
+				chartData: {
+					categories: [
+						"数学",
+						"语文",
+						"英语",
+						"体育",
+						"科学",
+						"思品"
+					],
+					series: [{
+							"name": "最近成绩",
+							"data": [
+								91,
+								92,
+								94,
+								88,
+								82,
+								89
+							]
+						},
+						{
+							"name": "上次成绩",
+							"data": [
+								88,
+								84,
+								97,
+								92,
+								89,
+								81
+							]
+						}
+					],
+				},
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.chart-container {
+		margin: 10px;
+		padding: 5px 5px 5px 2px;
+		border-radius: 10px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		background-color: #FFFFFF;
+		box-shadow: 3px 3px 5px 1px rgba(0, 0, 0, 0.05);
+	
+		.chart-name {
+			width: 100%;
+			text-align: left;
+			margin-left: 18px;
+			margin-top: 8px;
+	
+			.chart-name-text {
+				font-size: 13px;
+			}
+		}
+	
+		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
+		.charts-box {
+			width: 100%;
+			height: 190px;
+		}
+	}
+</style>

components/line-chart/line-chart.vue

@@ -0,0 +1,91 @@
+<template>
+	<view class="chart-container">
+		<view class="chart-name">
+			<text class="chart-name-text">总成绩走向图</text>
+		</view>
+		<view class="charts-box">
+			<qiun-data-charts type="line" :chartData="chartData" :loadingType="4"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "line-chart",
+		data() {
+			return {
+				chartData: {
+					categories: [
+						"测验1",
+						"测验2",
+						"测验3",
+						"测验4",
+						"测验5",
+					],
+					series: [{
+							"name": "孩子总分",
+							"data": [
+								400,
+								390,
+								380,
+								399,
+								366,
+							]
+						},
+						{
+							"name": "班级平均分",
+							"data": [
+								360,
+								377,
+								355,
+								322,
+								338,
+							]
+						},
+						{
+							"name": "年级平均分",
+							"data": [
+								333,
+								346,
+								364,
+								347,
+								355,
+							]
+						}
+					],
+				},
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.chart-container {
+		margin: 10px;
+		padding: 5px 5px 5px 2px;
+		border-radius: 10px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		background-color: #FFFFFF;
+		box-shadow: 3px 3px 5px 1px rgba(0, 0, 0, 0.05);
+
+		.chart-name {
+			width: 100%;
+			text-align: left;
+			margin-left: 18px;
+			margin-top: 8px;
+
+			.chart-name-text {
+				font-size: 13px;
+			}
+		}
+
+		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
+		.charts-box {
+			width: 100%;
+			height: 190px;
+		}
+	}
+</style>

components/mini-login/mini-login.vue

@@ -107,7 +107,7 @@
 	.content {
 		width: 100vw;
 		height: 100vh;
-		background-color: #ffffff;
+		background-color: #fafafa;
 		z-index: 999;
 	
 		.tips {
@@ -197,7 +197,7 @@
 				color: #FFFFFF;
 				background: linear-gradient(to right, #506AE7, #ade8f9);
 				text-shadow: 1px 1px 1px rgba(255,255,255, .1);
-				box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+				box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
 			}
 	
 			.other {

components/radar-chart/radar-chart.vue

@@ -0,0 +1,84 @@
+<template>
+	<view class="chart-container">
+		<view class="chart-name">
+			<text class="chart-name-text">单科能力</text>
+		</view>
+		<view class="charts-box">
+			<qiun-data-charts type="radar" :chartData="chartData" :loadingType="4" />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "radar-chart",
+		data() {
+			return {
+				chartData: {
+					categories: [
+						"数学",
+						"语文",
+						"英语",
+						"体育",
+						"科学",
+						"思品"
+					],
+					series: [{
+							"name": "孩子",
+							"data": [
+								91,
+								92,
+								94,
+								82,
+								82,
+								89
+							]
+						},
+						{
+							"name": "班平均",
+							"data": [
+								82,
+								83,
+								77,
+								83,
+								91,
+								81
+							]
+						}
+					],
+				},
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.chart-container {
+		width: 58%;
+		margin: 5px 10px;
+		border-radius: 10px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		background-color: #FFFFFF;
+		box-shadow: 3px 3px 5px 1px rgba(0, 0, 0, 0.05);
+
+		.chart-name {
+			width: 100%;
+			text-align: left;
+			margin-left: 18px;
+			margin-top: 8px;
+
+			.chart-name-text {
+				font-size: 13px;
+			}
+		}
+
+		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
+		.charts-box {
+			width: 100%;
+			height: 200px;
+		}
+	}
+</style>

information/children.js

@@ -0,0 +1,31 @@
+//导出学生信息存储模块
+export default{
+	//开启命名空间
+	namespaced: true,
+	
+	//模块数据
+	state: () => ({
+		
+		grade:'',
+		
+		childreninfo: JSON.parse(uni.getStorageSync('childreninfo') || '{}'),
+		
+	}),
+	//模块方法(修改数据)
+	mutations: {
+		//更新学生信息
+		updateParentInfo(state,childreninfo){
+			state.childreninfo = childreninfo
+			this.commit('m_children/saveParentInfoToStorage')
+		},
+		//持久化存储
+		saveParentInfoToStorage(state){
+			uni.setStorageSync('childreninfo',JSON.stringify(state.childreninfo))
+		},
+		
+	},
+	//模块属性(数据包装)
+	getters:{
+		
+	}
+}

information/store.js

@@ -3,6 +3,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 //1.导入应用模块
 import moduleparent from './parent.js'
+import modulechildren from './children.js'
 
 //2.将Vuex安装为Vue的插件
 Vue.use(Vuex)
@@ -12,6 +13,7 @@ const store = new Vuex.Store({
 	//挂载应用模块
 	modules:{
 		'm_parent': moduleparent,
+		'm_children': modulechildren
 	},
 })
 

manifest.json

@@ -49,10 +49,11 @@
     /* 快应用特有相关 */
     "mp-weixin" : {
         /* 小程序特有相关 */
-        "appid" : "wx29e2ea3bd1a73028",
+        "appid" : "wx5705da8747c77cfe",
         "setting" : {
             "urlCheck" : false,
-						"checkSiteMap": false
+            "checkSiteMap" : false,
+            "postcss" : true
         },
         "usingComponents" : true
     }

package-lock.json

@@ -1,8 +1,23 @@
 {
-  "name": "miniprogram",
+  "name": "miniprograms",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "miniprograms",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@escook/request-miniprogram": "^0.2.1"
+      }
+    },
+    "node_modules/@escook/request-miniprogram": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@escook/request-miniprogram/-/request-miniprogram-0.2.1.tgz",
+      "integrity": "sha512-ueWV5YsaEm/ycQZuEjMiA88GFMhfBQSjy9GrP9omy4xAQajkGTbYIlnhzsDfWzRPmRC1fKmAiKMrCVcgS+SHcQ=="
+    }
+  },
   "dependencies": {
     "@escook/request-miniprogram": {
       "version": "0.2.1",

package.json

@@ -1,9 +1,19 @@
 {
-    "id": "sin-signature",
-    "name": "签名组件-兼容H5、小程序、APP",
-    "version": "1.0.0",
-    "description": "用于uni-app的签名组件，支持H5、小程序、APP，可导出svg矢量图片。",
-    "keywords": [
-        "签名,签字,svg,canvas"
-    ]
+  "name": "miniprograms",
+  "version": "1.0.0",
+  "description": "",
+  "main": "main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "http://52.130.252.100:10000/TEAMMODEL/MiniPrograms.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@escook/request-miniprogram": "^0.2.1"
+  }
 }

pages.json

@@ -10,7 +10,8 @@
 	}, {
 		"path": "pages/grade/grade",
 		"style": {
-			"enablePullDownRefresh": false
+			"enablePullDownRefresh": false,
+			"navigationStyle":"custom"
 		}
 
 	}, {
@@ -30,11 +31,11 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "家长端",
-		"navigationBarBackgroundColor": "#F5F5F5",
-		"backgroundColor": "#F5F5F5"
+		"navigationBarBackgroundColor": "#fafafa",
+		"backgroundColor": "#fafafa"
 	},
 	"tabBar":{
-		"backgroundColor":"#F5F5F5",
+		"backgroundColor":"#fafafa",
 		"borderStyle":"white",
 		"color":"#707070",
 		"selectedColor":"#2c2c2c",

pages/grade/grade.vue

@@ -1,8 +1,19 @@
 <template>
-	<view>
-		<view class="charts-box">
-		    <qiun-data-charts type="area" :chartData="chartData" />
-		</view>
+	<view class="chart-list-container">
+		<!-- <view>
+			<view class="home-topinfo">
+				<image class="children-avatar" src="../../static/logo.png"></image>
+				<view class="children-name">
+					<text>XXX</text>
+				</view>
+				<uni-icons class="children-icons" type="right"></uni-icons>
+			</view>
+		</view> -->
+		<line-chart></line-chart>
+		<column-chart></column-chart>
+		<radar-chart></radar-chart>
+		<bar-chart></bar-chart>
+		<area-chart></area-chart>
 	</view>
 </template>
 
@@ -10,25 +21,20 @@
 	export default {
 		data() {
 			return {
-				chartData:{
-				  categories: ["2016", "2017", "2018", "2019", "2020", "2021"],
-				  series: [{
-				    name: "目标值",
-				    data: [35, 36, 31, 33, 13, 34]
-				  }, {
-				    name: "完成量",
-				    data: [18, 27, 21, 24, 6, 28]
-				  }]
-				}
+
 			}
 		},
 		mounted() {
+
+		},
+		methods: {
 			
 		}
 	}
 </script>
 
 <style lang="scss">
-
-
+	.chart-list-container{
+		
+	}
 </style>

pages/home/home.vue

@@ -38,7 +38,7 @@
 	
 	.home-topinfo{
 		height: 430rpx;
-		background: linear-gradient(#4169E1, #f5f5f5);
+		background: linear-gradient(#0052d4, #4364f7, #6fb1fc, #f5f5f5);
 		display: flex;
 		justify-content: flex-start;
 		align-items: center;

uni_modules/uni-card/components/uni-card/uni-card.vue

@@ -102,7 +102,7 @@
 			},
 			shadow: {
 				type: String,
-				default: '0 3px 5px 0 rgba(0, 0, 0, 0.03)'
+				default: '1px 3px 5px 1px rgba(0, 0, 0, 0.05);'
 			},
 			border: {
 				type: Boolean,