update: 二级页面修改

components/top-return/top-return.vue

@@ -58,12 +58,13 @@
 		padding: 0 0 0 20rpx;
 		display: flex;
 		align-items: center;
-		z-index: 99;
+		z-index: 999;
 
 		.back-text {
 			margin:0 0 5rpx 20rpx;
 			font-size: 40rpx;
 			font-weight: bold;
+			z-index: 999;
 		}
 	}
 </style>

pages.json

@@ -204,6 +204,27 @@
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom"
 				}
+			},
+			{
+				"path": "exam/exercisesinfo",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "home/recommendinfo",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "work/wrongbookinfo",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
 			}
 
 		]

pages/tab_exam/tab_exam.vue

@@ -96,7 +96,7 @@
 			<view class="flex_row" style="width: 70%;"></view>
 		</view>
 		<scroll-view class="scroll_view_bottom" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
-			<view class="_item" v-for="(item,index) in examPractice" :key="index">
+			<view class="_item" v-for="(item,index) in examPractice" :key="index" @click="navExercisesInfo(index)">
 				<view class="flex_cloumn" style="height: 320rpx;">
 					<view class="flex_row" style="margin: 10rpx;">
 						<view class="t-icon t-icon-yuwen" v-if="item.subject === '语文'"></view>
@@ -263,6 +263,11 @@
 				uni.navigateTo({
 					url: `/subpkg/datalist/examdata?index=${index}`
 				})
+			},
+			navExercisesInfo(index){
+				uni.navigateTo({
+					url: `/subpkg/exam/exercisesinfo?index=${index}`
+				})
 			}
 		}
 	}

pages/tab_home/tab_home.vue

@@ -208,13 +208,17 @@
 								</view>
 								<view class="class_item_title" v-if="isAfterDayClass">课程完成</view>
 								<view class="tag" style="margin: 0;">
-									<view class="tag_text" v-if="!isAfterDayClass">{{classList.length === 0 ? '无课' : '下课'}}</view>
+									<view class="tag_text" v-if="!isAfterDayClass">
+										{{classList.length === 0 ? '无课' : '下课'}}
+									</view>
 									<view class="tag_text" v-if="isAfterDayClass">放学</view>
 								</view>
-								<view class="class_item_subtitle" style="font-weight: 400;font-size: 26rpx;" v-if="!isAfterDayClass">
+								<view class="class_item_subtitle" style="font-weight: 400;font-size: 26rpx;"
+									v-if="!isAfterDayClass">
 									{{classList.length === 0 ? '合理规划' : '预习下节'}}
 								</view>
-								<view class="class_item_subtitle" style="font-weight: 400;font-size: 26rpx;" v-if="isAfterDayClass">巩固所学</view>
+								<view class="class_item_subtitle" style="font-weight: 400;font-size: 26rpx;"
+									v-if="isAfterDayClass">巩固所学</view>
 								<view class="flex_row" @click="navClassDetail">
 									<view class="t-icon t-icon-fenlei"></view>
 									<view class="class_item_title" style="color: #4169E1;margin-left: 10rpx;">课程列表
@@ -340,7 +344,7 @@
 				<view class="flex_row" style="width: 70%;"></view>
 			</view>
 			<scroll-view class="scroll_view_bottom" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
-				<view class="_item_box" v-for="(item,index) in classData" :key="index">
+				<view class="_item_box" v-for="(item,index) in classData" :key="index" @click="navRecommendInfo(index)">
 
 					<view class="column_item_box" v-for="(classItem,i) in item" :key="i">
 						<view style="display: flex; width: 100%;height: 100%;">
@@ -513,34 +517,49 @@
 					let classIndex = -100
 					//完成课程数目
 					let finishNum = -100
+					//是否在课堂中
+					let isInClass = false
 					//判断是否在课程中，若是则赋值为当前课程索引
-					this.classList.forEach((item, index) => {
+					this.classList.some((item, index) => {
 						let timeArr = item.time.split("-")
 						//在课堂中
 						let res = CompareDate(timeArr[0], timeArr[1])
 						if (res) {
 							classIndex = index + 1
 							finishNum = index + 1
-						}
-						//没在课堂中
-						let value = CompareDateStart(timeArr[0])
-						//课间时间
-						if (value) {
-							classIndex = -1
-							finishNum = index - 1
-						} else {
-							//放学时间(有课程但已上完状态)
-							this.isAfterDayClass = true
-							classIndex = -1
-							finishNum = this.classList.length
+							return isInClass = true
 						}
 					})
-					//当前课程赋值
-					this.classCurrent = classIndex
-					//已上课程赋值
-					this.finishClassNum = finishNum
+					if (isInClass) {
+						//当前课程赋值
+						this.classCurrent = classIndex
+						//已上课程赋值
+						this.finishClassNum = finishNum
+					} else {
+						//是否放学
+						this.classList.some((item, index) => {
+							let timeArr = item.time.split("-")
+							//没在课堂中
+							let value = CompareDateStart(timeArr[0])
+							//课间时间
+							if (value) {
+								classIndex = -1
+								finishNum = index - 1
+								return this.isAfterDayClass = false
+							} else {
+								//放学时间(有课程但已上完状态)
+								classIndex = -1
+								finishNum = this.classList.length
+								return this.isAfterDayClass = true
+							}
+						})
+						//当前课程赋值
+						this.classCurrent = classIndex
+						//已上课程赋值
+						this.finishClassNum = finishNum
+					}
 					//无课程，放假时间
-				}else {
+				} else {
 					//当前课程赋值
 					this.classCurrent = -1
 					//已上课程赋值
@@ -664,6 +683,11 @@
 				uni.navigateTo({
 					url: '/subpkg/statslist/clockstats'
 				})
+			},
+			navRecommendInfo(index){
+				uni.navigateTo({
+					url: `/subpkg/home/recommendinfo?index=${index}`
+				})
 			}
 
 		}

pages/tab_work/tab_work.vue

@@ -94,7 +94,7 @@
 			<view class="flex_row" style="width: 70%;"></view>
 		</view>
 		<scroll-view class="scroll_view_bottom" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
-			<view class="_item" v-for="(item,index) in mistakeData" :key="index">
+			<view class="_item" v-for="(item,index) in mistakeData" :key="index" @click="navWrongBookInfo(index)">
 				<view class="flex_cloumn_book" :style="{backgroundColor: item.color}">
 					<view class="book_shadow"></view>
 
@@ -203,6 +203,11 @@
 				uni.navigateTo({
 					url: `/subpkg/datalist/workdata?index=${index}`
 				})
+			},
+			navWrongBookInfo(index){
+				uni.navigateTo({
+					url: `/subpkg/work/wrongbookinfo?index=${index}`
+				})
 			}
 		}
 	}

subpkg/datalist/classdetail.vue

@@ -61,7 +61,7 @@
 							</view>
 							<view class="class_item_subtitle"
 								:style="{color: index == current && isactive == 0?'#4169E1':'#909399',fontSize: 24 + 'rpx'}">
-								{{index == current && isactive == 0?'进行中课程':item.timeFrame}}</view>
+								{{index == current && isactive == 0?'课程进行中':item.timeFrame}}</view>
 							<view class="class_item_title"
 								:style="{color: index == current && isactive == 0?'#4169E1':'#303133'}">{{item.time}}
 							</view>

subpkg/exam/exercisesinfo.vue

@@ -0,0 +1,49 @@
+<template>
+	<view class="page_view">
+		<view style="height: 200rpx;"></view>
+		<top-return text="评测练习"></top-return>
+		<!-- 天数选择 -->
+<!-- 		<scroll-view class="week_view" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
+			<view style="margin-top:20rpx;">
+				<view v-for="(item,index) in examPractice[index]" :key="index"
+					:class="isactive == index ? 'week_item_select' : 'week_item' " @click='chooseDay(index,item)'>
+					<view class="item_box">
+						<view class="_title">{{item.weekNum}}</view>
+						<view class="_day">{{item.dayNum}}</view>
+						<view class="tag_fill" v-if="isactive == index">
+							<view class="tag_text" v-if="isactive == index && currentClassList.length != 0">
+								{{currentClassList.length}} 节课
+							</view>
+							<view class="tag_text" v-if="isactive == index && currentClassList.length === 0">无课程</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view> -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex'
+	export default {
+		computed: {
+			...mapState('m_children', ['examPractice'])
+		},
+		data() {
+			return {
+				index: ''
+			}
+		},
+		onLoad(param) {
+			this.index = param.index
+		},
+		methods:{
+			
+		}
+	}
+</script>
+
+<style>
+</style>

subpkg/home/recommendinfo.vue

@@ -0,0 +1,11 @@
+<template>
+	<view class="page_view">
+		<top-return text="课程推荐"></top-return>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

subpkg/work/wrongbookinfo.vue

@@ -0,0 +1,11 @@
+<template>
+	<view class="page_view">
+		<top-return text="错题本"></top-return>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

unpackage/dist/dev/mp-weixin/app.json

@@ -32,7 +32,10 @@
         "datalist/swapdata",
         "datalist/examlist",
         "datalist/worklist",
-        "datalist/swaplist"
+        "datalist/swaplist",
+        "exam/exercisesinfo",
+        "home/recommendinfo",
+        "work/wrongbookinfo"
       ]
     }
   ],

unpackage/dist/dev/mp-weixin/components/top-return/top-return.wxss

@@ -3,11 +3,12 @@
   padding: 0 0 0 20rpx;
   display: flex;
   align-items: center;
-  z-index: 99;
+  z-index: 999;
 }
 .back .back-text {
   margin: 0 0 5rpx 20rpx;
   font-size: 40rpx;
   font-weight: bold;
+  z-index: 999;
 }
 

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,61 +1,61 @@
 {
-    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "packOptions": {
-        "ignore": [],
-        "include": []
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "coverView": true,
+    "lazyloadPlaceholderEnable": false,
+    "preloadBackgroundData": false,
+    "autoAudits": false,
+    "uglifyFileName": false,
+    "uploadWithSourceMap": true,
+    "enhance": true,
+    "useMultiFrameRuntime": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "useStaticServer": true,
+    "showES6CompileOption": false,
+    "checkInvalidKey": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
     },
-    "setting": {
-        "urlCheck": true,
-        "es6": true,
-        "postcss": true,
-        "minified": true,
-        "coverView": true,
-        "lazyloadPlaceholderEnable": false,
-        "preloadBackgroundData": false,
-        "autoAudits": false,
-        "uglifyFileName": false,
-        "uploadWithSourceMap": true,
-        "enhance": true,
-        "useMultiFrameRuntime": true,
-        "showShadowRootInWxmlPanel": true,
-        "packNpmManually": false,
-        "packNpmRelationList": [],
-        "minifyWXSS": true,
-        "useStaticServer": true,
-        "showES6CompileOption": false,
-        "checkInvalidKey": true,
-        "babelSetting": {
-            "ignore": [],
-            "disablePlugins": [],
-            "outputPath": ""
-        },
-        "disableUseStrict": false,
-        "useCompilerPlugins": false
+    "disableUseStrict": false,
+    "useCompilerPlugins": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "",
+  "appid": "wx5705da8747c77cfe",
+  "projectname": "teammodelwxapp",
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
     },
-    "compileType": "miniprogram",
-    "libVersion": "",
-    "appid": "wx5705da8747c77cfe",
-    "projectname": "teammodelwxapp",
-    "condition": {
-        "search": {
-            "current": -1,
-            "list": []
-        },
-        "conversation": {
-            "current": -1,
-            "list": []
-        },
-        "game": {
-            "current": -1,
-            "list": []
-        },
-        "miniprogram": {
-            "current": -1,
-            "list": []
-        }
+    "conversation": {
+      "current": -1,
+      "list": []
     },
-    "editorSetting": {
-        "tabIndent": "insertSpaces",
-        "tabSize": 4
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
     }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
 }