update:打卡block等等

components/interactive-box/interactive-box.vue

@@ -97,28 +97,32 @@
 				current: 0,
 				//记录卡片
 				moduleData: [{
-						text: '自主学习记录',
+						text: '学习时长',
 						color: 'background-color: #4169E1;',
 						icon: 't-icon t-icon-bianjibi',
 						numData: '记录一下',
+						numfont: ''
 					},
 					{
-						text: '娱乐放松记录',
+						text: '娱乐时长',
 						color: 'background-color: #ff5959;',
 						icon: 't-icon t-icon-leimucuyule',
 						numData: '记录一下',
+						numfont: ''
 					},
 					{
-						text: '运动锻炼记录',
+						text: '运动时长',
 						color: 'background-color: #ff8caf;',
 						icon: 't-icon t-icon-yundong',
 						numData: '记录一下',
+						numfont: ''
 					},
 					{
-						text: '每日睡眠记录',
+						text: '睡眠时长',
 						color: 'background-color: #f9c752;',
 						icon: 't-icon t-icon-a-icon_wananyueliangshuimian',
 						numData: '记录一下',
+						numfont: ''
 					}
 				],
 				//当前记录卡片
@@ -316,7 +320,7 @@
 				.t-icon {
 					width: 250rpx;
 					height: 250rpx;
-					margin: -250rpx 0 0 150rpx;
+					margin: -250rpx 0 0 160rpx;
 					z-index: 1;
 				}
 			}
@@ -336,7 +340,7 @@
 
 		.module-item-num {
 			color: #FFF;
-			font-size: 45rpx;
+			font-size: 48rpx;
 			font-weight: bold;
 		}
 	}

gradepkg/rank-chart/rank-chart.vue

@@ -31,7 +31,7 @@
 			</view>
 			<view class="charts-box">
 				<qiun-data-charts type="area" :chartData="gradeData.rankChart.semesterRank" :loadingType="4"
-					tooltipFormat='tooltipPercent' :canvas2d="true" canvasId="canvasId931234" />
+					tooltipFormat='subjectRankColum' :canvas2d="true" canvasId="canvasId931234" />
 			</view>
 		</view>
 		<!-- 单科排行走势 -->
@@ -47,7 +47,7 @@
 			</view>
 			<view class="charts-box">
 				<qiun-data-charts type="area" :chartData="gradeData.rankChart.semesterSubjectRank" :loadingType="4"
-					tooltipFormat='tooltipPercent' :canvas2d="true" canvasId="canvasId931870" />
+					tooltipFormat='subjectRankColum' :canvas2d="true" canvasId="canvasId931870" />
 			</view>
 		</view>
 		

gradepkg/single-chart/single-chart.vue

@@ -39,11 +39,11 @@
 		<view class="chart-container">
 			<view class="chart-name">
 				<view class="index" style="background-color: #a5c6ff;"></view>
-				<text class="chart-name-text">近期排行占比分析</text>
+				<text class="chart-name-text">近期单科排行</text>
 			</view>
-			<view class="charts-box" style="margin: 20rpx 0 -20rpx 0;">
-				<qiun-data-charts type="arcbar" :chartData="gradeData.recentTestChart.recentRank" :loadingType="4"
-					tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId312412" />
+			<view class="charts-box">
+				<qiun-data-charts type="column" :chartData="gradeData.recentTestChart.recentRankComparison" :loadingType="4"
+					tooltipFormat='subjectRankColum' :canvas2d="true" canvasId="canvasId1931238" />
 			</view>
 		</view>
 
@@ -67,13 +67,13 @@
 			return {
 				//分析模块数据
 				analysisData: [{
-					title: '本次超过年级中:',
+					title: '总成绩超过年级中:',
 					data: '',
-					color: '',
+					color: '#4169E1',
 				}, {
-					title: '本次超过班级中:',
+					title: '总成绩超过班级中:',
 					data: '',
-					color: '',
+					color: '#ff8caf',
 				}],
 
 
@@ -86,10 +86,6 @@
 					this.gradeData.recentTestChart.recentRank.series[0].data
 				this.analysisData[1].data =
 					this.gradeData.recentTestChart.recentRank.series[1].data
-				this.analysisData[0].color =
-					this.gradeData.recentTestChart.recentRank.series[0].color
-				this.analysisData[1].color =
-					this.gradeData.recentTestChart.recentRank.series[1].color
 			}
 		},
 		onLoad() {

manifest.json

@@ -15,9 +15,7 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {
-            "Share" : {}
-        },
+        "modules" : {},
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
@@ -46,7 +44,7 @@
             "sdkConfigs" : {
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx5705da8747c77cfe",
+                        "appid" : "",
                         "UniversalLinks" : ""
                     }
                 }
@@ -62,7 +60,9 @@
         "setting" : {
             "urlCheck" : false,
             "checkSiteMap" : false,
-            "postcss" : true
+            "postcss" : true,
+            "es6" : true,
+            "minified" : true
         },
         "usingComponents" : true,
         "optimization" : {

pages/home/home.vue

@@ -24,35 +24,39 @@
 			</view>
 
 			<!-- 今日打卡 -->
-			<view class="card-item" @click="navCalendar">
-				<view class="card-info" style="padding-bottom: 15rpx;">
+			<view class="card-item" style="overflow: hidden;" @click="navCalendar">
+				<!-- <view class="card-info" style="padding-bottom: 15rpx;">
 					<view class="t-icon t-icon-dakaqiandao"></view>
 					<text class="info-text">今日打卡</text>
-				</view>
-				<view class="state-box">
-					<view style="display: flex;align-items: center; width: 100%;">
-						<view class="index" :style="{backgroundColor: attendance==='已打卡'?'#4169E1':'#f9c752'}"></view>
-						<view class="text-content">打卡记录:</view>
-					</view>
-					<view class="flex">
-						<view :class="attendance==='已打卡'?'t-icon t-icon-weizhidaka-dakachenggong':'t-icon t-icon-weizhidaka-dakacuowu'" style="width:70rpx;height: 70rpx;"></view>
-						<view class="state" :style="{backgroundColor: attendance==='已打卡'?'#4169E1':(attendance === '未打卡'?'#f9c752':'#FFF')}">
-							<view class="state-text">{{attendance}}</view>
+				</view> -->
+				<view class="head-card" :style="{backgroundColor: attendance==='已打卡'?'#4169E1':'#f9c752'}">
+					<view class="flex-colum">
+						<view style="display: flex;align-items: center; width: 100%;margin-top: 10rpx;">
+							<view class="index" :style="{backgroundColor: '#FFF'}"></view>
+							<view class="text-content" style="color: #FFF;z-index: 2;">打卡记录</view>
 						</view>
-					</view>
-					
-					<view style="display: flex;align-items: center; width: 100%;">
-						<view class="index" :style="{backgroundColor: attendance==='已打卡'?'#4169E1':'#f9c752'}"></view>
-						<view class="text-content">打卡时间:</view>
-					</view>
-					<view class="flex">
-						<view :class="attendance==='已打卡'?'t-icon t-icon-weizhidaka-dakachenggong':'t-icon t-icon-weizhidaka-dakacuowu'" style="width:70rpx;height: 70rpx;"></view>
-						<view class="state" :style="{backgroundColor: attendance==='已打卡'?'#4169E1':(attendance === '未打卡'?'#f9c752':'#FFF')}">
-							<view class="state-text">{{attendanceTime}}</view>
+						<view class="flex">
+							<view class="state-text" style="z-index: 2;">{{attendance}}</view>
 						</view>
 					</view>
-					
+					<view :class="attendance==='已打卡'?'t-icon t-icon-gou1':'t-icon t-icon-cha'"
+						style="position: relative;top: -230rpx;left: 180rpx;width: 200rpx;height: 200rpx;z-index: 1;"></view>
 				</view>
+
+				<view style="display: flex;align-items: center; width: 100%;">
+					<view class="index" :style="{backgroundColor: attendance==='已打卡'?'#4169E1':'#f9c752'}" />
+					<view class="text-content">打卡时间</view>
+				</view>
+				<view class="flex" style="margin-left: 17rpx;">
+					<view :class="attendance==='已打卡'?'t-icon t-icon-weizhidaka-dakachenggong':'t-icon t-icon-weizhidaka-dakacuowu'"
+						style="width:70rpx;height: 70rpx;"></view>
+					<view class="state"
+						:style="{backgroundColor: attendance==='已打卡'?'#4169E1':(attendance === '未打卡'?'#f9c752':'#FFF')}">
+						<view class="state-text" style="font-size: 40rpx;">{{attendanceTime}}</view>
+					</view>
+				</view>
+
+
 			</view>
 
 
@@ -275,25 +279,32 @@
 <style lang="scss">
 	@import '@/pages/common/mainpage.scss';
 
-	.state-box {
+	.head-card {
+		height: 200rpx;
+		width: 100%;
+		border-radius: $card-border-radius;
+		background-color: $color-mixblue;
+	}
+
+	.flex-colum {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		height: 100%;
 		width: 100%;
+	}
 
-		.state {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			border-radius: 50rpx;
-			height: 70rpx;
-			width: 210rpx;
-		}
+	.state {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 50rpx;
+		height: 70rpx;
+		width: 210rpx;
 	}
 
 	.state-text {
-		font-size: 32rpx;
+		font-size: 48rpx;
 		font-weight: bold;
 		color: #FFF;
 	}
@@ -307,15 +318,17 @@
 
 	.flex {
 		width: 300rpx;
-		margin: 0 auto 0 20rpx;
+		margin: 10rpx auto 10rpx 15px;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.t-icon{
+
+	.t-icon {
 		background-repeat: no-repeat;
 	}
-	.index{
+
+	.index {
 		height: 30rpx;
 		width: 10rpx;
 		border-radius: 100rpx;

subpkg/common/detailpage.scss

@@ -12,12 +12,13 @@
 					height: 36rpx;
 					width: 10rpx;
 					border-radius: 100rpx;
+					margin-left: -5rpx;
 				}
 				.name {
 					font-size: 36rpx;
 					line-height: 36rpx;
 					font-weight: bold;
-					margin-left: 10rpx;
+					margin-left: 15rpx;
 					margin-bottom: 4rpx;
 				}
 			}
@@ -55,6 +56,15 @@
 					color: $color-title;
 					word-break: break-all;
 				}
+				.option-box{
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width:120rpx;
+					height: 50rpx;
+					border-radius: 10rpx;
+					padding: 5rpx;
+				}
 				.content-subtitle {
 					font-size: 25rpx;
 					font-weight: bold;

subpkg/detaillist/activitylist.vue

@@ -45,14 +45,40 @@
 							</view>
 						</view>
 					</view>
+					<!-- 内容 -->
 					<view class="content-detail-box">
-						<view class="title-box" :style="{backgroundColor: item.survey.progress === 'finish'||item.vote.progress === 'finish'? '#23b46c': '#f9c752' }" v-if="item.survey">
+						<!-- 问卷 -->
+						<view class="title-box"
+							:style="{backgroundColor: item.survey.progress === 'finish'? '#23b46c': '#f9c752' }"
+							v-if="item.survey">
 							<view class="content-subtitle">问卷详情</view>
 						</view>
-						<view class="title-box" :style="{backgroundColor: item.survey.progress === 'finish'||item.vote.progress === 'finish'? '#23b46c': '#f9c752' }" v-if="item.vote">
+						<view class="flex" style="justify-content: space-around;">
+							<view class="option-box"
+								:style="{backgroundColor: item.survey.progress === 'finish'? '#23b46c': '#f9c752' }"
+								v-for="(option,i) in item.survey.answers[0]" :key="i">
+								<view class="content-subtitle" style="font-size: 30rpx;">{{option}}</view>
+							</view>
+						</view>
+						
+						<!-- 投票 -->
+						<view class="title-box"
+							:style="{backgroundColor: item.vote.progress === 'finish'? '#23b46c': '#f9c752' }"
+							v-if="item.vote">
 							<view class="content-subtitle">{{item.vote.secret ? '匿名投票':'普通投票'}}</view>
 						</view>
-						<view class="content-detail"></view>
+						<view class="flex" style="justify-content: space-around;">
+							<view class="flex-colum" v-for="(option,j) in item.vote.options" :key="j">
+								<rich-text class="subtitle-info" style="margin-bottom: 15rpx;" :nodes="option.value">
+								</rich-text>
+								<view class="option-box"
+									:style="{backgroundColor: item.vote.progress === 'finish'? '#23b46c': '#f9c752' }">
+									<view class="content-subtitle" style="font-size: 30rpx;">{{option.code}}</view>
+								</view>
+							</view>
+						</view>
+
+
 					</view>
 				</view>
 
@@ -83,22 +109,6 @@
 			})
 		},
 		methods: {
-			openDocument() {
-				//下载并打开文档
-				uni.downloadFile({
-					url: 'https://cdn.zhoukaiwen.com/kevin.pdf',
-					success: function(res) {
-						let filePath = res.tempFilePath;
-						uni.openDocument({
-							filePath: filePath,
-							showMenu: true,
-							success: function(res) {
-								console.log('打开文档成功');
-							}
-						});
-					}
-				})
-			}
 
 
 		}
@@ -107,4 +117,9 @@
 
 <style lang="scss">
 	@import '@/subpkg/common/detailpage.scss';
+	.flex-colum{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 </style>

subpkg/detaillist/homeworklist.vue

@@ -20,12 +20,11 @@
 						style="margin-left: auto; width: 90rpx; height: 90rpx;"></view>
 					<view class="t-icon t-icon-jinhangzhong-copy1" v-if="item.work.progress === 'going'"
 						style="margin-left: auto; width: 90rpx; height: 90rpx;"></view>
-
 				</view>
 				<!-- 正文 -->
 				<view class="content-box">
 
-					<view style="display:flex;flex-direction: column;padding: 0 30rpx;">
+					<view class="flex-colum" style="padding: 0 30rpx;">
 						<rich-text class="subtitle-info" style="margin-bottom: 15rpx;" :nodes="item.work.description"></rich-text>
 						<view class="flex">
 							<view class="subtitle">布置老师:</view>
@@ -36,17 +35,23 @@
 						
 					</view>
 
-					<view class="content-detail-box">
-						<view class="title-box" :style="{backgroundColor: item.work.progress === 'finish'? '#23b46c': '#ff8caf' }">
+					<view class="content-detail-box" style="padding: 0 20rpx;">
+						<view class="title-box" :style="{backgroundColor: item.work.progress === 'finish'? '#23b46c': '#ff8caf',top: -15 +'rpx' }">
 							<view class="content-subtitle">作业附件</view>
 						</view>
-						<view class="attachment-box" @click="openDocument(item.work.attachments[0].url)">
-							<view class="t-icon t-icon-WORD"></view>
-							<view style="display: flex;flex-direction: column;margin-left: 20rpx;">
-								<view class="content-detail">文件名: {{item.work.attachments[0].name}}</view>
-								<view class="content-subtitle" style="color: #aaa;">文件大小: {{item.work.attachments[0].size/8/1024}}KB</view>
+						<view v-for="(attachment,i) in item.work.attachments" :key="i" style="margin-bottom: 20rpx;">
+							<view class="attachment-box" @click="openDocument(attachment.url)">
+								<view v-if="attachment.type == 'word'" class="t-icon t-icon-WORD"></view>
+								<view v-if="attachment.type == 'excel'" class="t-icon t-icon-ECEL"></view>
+								<view v-if="attachment.type == 'pdf'" class="t-icon t-icon-PDF"></view>
+								<view v-if="attachment.type == 'image'" class="t-icon t-icon-tupianziliao"></view>
+								<view class="flex-colum" style="margin-left: 20rpx;">
+									<view class="content-detail">文件名: {{attachment.name}}</view>
+									<view class="content-subtitle" style="color: #aaa;">文件大小: {{fixNum(attachment.size/8/1024)}}KB</view>
+								</view>
 							</view>
 						</view>
+						
 					</view>
 				</view>
 
@@ -78,6 +83,9 @@
 			})
 		},
 		methods: {
+			fixNum(num){
+				return num.toFixed(2)
+			},
 			openDocument(url) {
 				//下载并打开文档
 				uni.downloadFile({
@@ -108,4 +116,8 @@
 		background-color: #FFF;
 		border-radius: 10rpx;
 	}
+	.flex-colum{
+		display: flex;
+		flex-direction: column;
+	}
 </style>

uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@@ -98,30 +98,12 @@ const cfu = {
 	"option": {},
 	//下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
 	"formatter": {
-		"yAxisDemo1": function(val) {
-			return val + '元'
-		},
-		"yAxisDemo2": function(val) {
-			return val.toFixed(2)
-		},
-		"xAxisDemo1": function(val) {
-			return val + '年'
-		},
-		"xAxisDemo2": function(val) {
-			return formatDateTime(val, 'h:m')
-		},
-		"seriesDemo1": function(val) {
-			return val + '元'
-		},
 		"tooltipScore": function(item, category, index, opts) {
 			return category + ' ' + item.name + ': ' + item.data + ' 分 '
 		},
 		"tooltipScoreShort": function(item, category, index, opts) {
 			return item.name + '得分率: ' + item.data + ' % '
 		},
-		"tooltipPercent": function(item, category, index, opts) {
-			return category + ' ' + item.name + ': ' + item.data + ' % '
-		},
 		"HomeworkPercent": function(item, category, index, opts) {
 			let value = item.data >= 40? (item.data >= 70? '优秀' : '良好') : '较差'
 			return category + ' ' + item.name + '完成情况:' + value+ ' ' + item.data + ' % '
@@ -133,8 +115,11 @@ const cfu = {
 			return item.name + ': ' + item.data + ' 分钟 '
 		},
 		"sleepExerciseCom": function(item, category, index, opts) {
-			let value = item.data <= 20? (item.data >= 10? '科学分配' : '运动量少') : '运动过量'
-			return '运动占睡眠: ' + item.data + '% ' + value
+			let value = item.data <= 20? (item.data >= 10? '分配科学' : '运动量少') : '运动过量'
+			return '运动占睡眠: ' + item.data + ' % ' + value
+		},
+		"subjectRankColum": function(item, category, index, opts) {
+			return category + ' ' +item.name + ': ' + item.data + '% 的学生'
 		},
 	},
 	//这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。

utils/APIHandler.js

@@ -466,10 +466,10 @@ let homeworkData = [{
 		"attachments": [{
 			"name": "文件名称313", // 文件名
 			"url": "https://teammodeltest.blob.core.chinacloudapi.cn/hbcn/image/000222111.png", // 文件地址
-			"size": 43360, // 文件大小
+			"size": 73360, // 文件大小
 			"createTime": 1626864529474, // 文件创建时间
 			"extension": "PNG", // 文件扩展名    
-			"type": "image", // 文件类型
+			"type": "excel", // 文件类型
 			"blob": "/image/000222111.png", // 文件地址
 			"hash": null, // 文件hash值
 			"duration": 0 // 文件时长
@@ -511,14 +511,14 @@ let homeworkData = [{
 			"size": 43360, // 文件大小
 			"createTime": 1626864529474, // 文件创建时间
 			"extension": "PNG", // 文件扩展名    
-			"type": "image", // 文件类型
+			"type": "pdf", // 文件类型
 			"blob": "/image/000222111.png", // 文件地址
 			"hash": null, // 文件hash值
 			"duration": 0 // 文件时长
 		}, {
 			"name": "000222111.png", // 文件名
 			"url": "https://teammodeltest.blob.core.chinacloudapi.cn/hbcn/image/000222111.png", // 文件地址
-			"size": 43360, // 文件大小
+			"size": 23360, // 文件大小
 			"createTime": 1626864529474, // 文件创建时间
 			"extension": "PNG", // 文件扩展名    
 			"type": "image", // 文件类型
@@ -560,10 +560,10 @@ let homeworkData = [{
 		"attachments": [{
 			"name": "000222111.png", // 文件名
 			"url": "https://teammodeltest.blob.core.chinacloudapi.cn/hbcn/image/000222111.png", // 文件地址
-			"size": 43360, // 文件大小
+			"size": 143360, // 文件大小
 			"createTime": 1626864529474, // 文件创建时间
 			"extension": "PNG", // 文件扩展名    
-			"type": "image", // 文件类型
+			"type": "word", // 文件类型
 			"blob": "/image/000222111.png", // 文件地址
 			"hash": null, // 文件hash值
 			"duration": 0 // 文件时长
@@ -602,10 +602,10 @@ let homeworkData = [{
 		"attachments": [{
 			"name": "000222111.png", // 文件名
 			"url": "https://teammodeltest.blob.core.chinacloudapi.cn/hbcn/image/000222111.png", // 文件地址
-			"size": 43360, // 文件大小
+			"size": 48360, // 文件大小
 			"createTime": 1626864529474, // 文件创建时间
 			"extension": "PNG", // 文件扩展名    
-			"type": "image", // 文件类型
+			"type": "word", // 文件类型
 			"blob": "/image/000222111.png", // 文件地址
 			"hash": null, // 文件hash值
 			"duration": 0 // 文件时长
@@ -644,7 +644,7 @@ let homeworkData = [{
 		"attachments": [{
 			"name": "000222111.png", // 文件名
 			"url": "https://teammodeltest.blob.core.chinacloudapi.cn/hbcn/image/000222111.png", // 文件地址
-			"size": 43360, // 文件大小
+			"size": 53360, // 文件大小
 			"createTime": 1626864529474, // 文件创建时间
 			"extension": "PNG", // 文件扩展名    
 			"type": "image", // 文件类型
@@ -667,16 +667,16 @@ let activityData = [{
 		"school": null,
 		"name": "投票",
 		"creatorId": "张老师",
-		"description": "<p>富文本富文本富文本富文本富文本富文本富文</p>",
-		"progress": "finish",
+		"description": "<p>家长参与的投票活动</p>",
+		"progress": "going",
 		"options": [{
 				"code": "A",
-				"value": "<p>fer</p>",
+				"value": "<p>一方案富文本</p>",
 				"desc": null
 			},
 			{
 				"code": "B",
-				"value": "<p>gtyhgef</p>",
+				"value": "<p>二方案富文本</p>",
 				"desc": null
 			}
 		], // 投票选项
@@ -718,7 +718,7 @@ let activityData = [{
 		"owner": "teacher",
 		"school": null,
 		"name": "问卷",
-		"description": "<p>描述富文本述富文本述富文本述富文本</p>",
+		"description": "<p>家长问卷示例</p>",
 		"creatorId": "张老师",
 		"progress": "finish",
 		"scope": "private",
@@ -973,6 +973,11 @@ function initHome() {
 		month: 5,
 		year: 2022,
 		time: '08:06'
+	}, {
+		date: 7,
+		month: 5,
+		year: 2022,
+		time: '08:17'
 	}]
 	this.$store.commit('m_children/updateRecords', records)
 	let homeChartData = {
@@ -1173,16 +1178,42 @@ function initGrade(semester, tmdid) {
 			recentRank: {
 				series: [{
 						name: "超过年级中",
-						data: 0.8,
+						data: 0.53,
 						color: "#4169E1"
 					},
 					{
 						name: "超过班级中",
-						data: 0.90,
+						data: 0.72,
 						color: "#ff8caf"
 					}
 				],
 			},
+			recentRankComparison:{
+				categories: subjectList,
+				series: [{
+						name: "最近成绩超过",
+						data: [
+							71,
+							62,
+							74,
+							98,
+							58,
+							92
+						]
+					},
+					{
+						name: "上次成绩超过",
+						data: [
+							48,
+							64,
+							57,
+							52,
+							79,
+							93
+						]
+					}
+				],
+			}
 		},
 		//排名占比分析
 		rankChart: {