update: 解决冲突

components/top-info/top-info.vue

@@ -11,7 +11,7 @@
 			</view>
 			<view class="user_data">
 
-				<view class="tag_text" style="color: #FFF;font-size: 22rpx;transform: skew(-15deg);">
+				<view class="tag_text" style="color: #FFF;font-size: 22rpx;transform: skew(-10deg);">
 					{{timeStamp}}更新
 				</view>
 
@@ -95,7 +95,7 @@
 				// font-family: minifont;
 				font-weight: bold;
 				font-size: 50rpx;
-				transform: skew(-15deg);
+				transform: skew(-10deg);
 				color: #FFF;
 				z-index: 99;
 			}
@@ -103,7 +103,7 @@
 			.content_class {
 				// font-family: minifont;
 				font-size: 30rpx;
-				transform: skew(-15deg);
+				transform: skew(-10deg);
 				color: #FFF;
 				z-index: 99;
 			}

components/top-semester/top-semester.vue

@@ -64,7 +64,7 @@
 			// font-family: minifont;
 			font-size: 50rpx;
 			font-weight: bold;
-			transform: skew(-15deg);
+			transform: skew(-10deg);
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
@@ -73,7 +73,7 @@
 		.content_subtitle {
 			// font-family: minifont;
 			font-size: 40rpx;
-			transform: skew(-15deg);
+			transform: skew(-10deg);
 			color: #FFF;
 			z-index: 2;
 		}

manifest.json

@@ -1,80 +1,81 @@
 {
-  "name": "teammodelwxapp",
-  "appid": "__UNI__74CA2D5",
-  "description": "",
-  "versionName": "1.0.0",
-  "versionCode": "100",
-  "transformPx": false,
-  /* 5+App特有相关 */
-  "app-plus": {
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
+    "name" : "teammodelwxapp",
+    "appid" : "__UNI__74CA2D5",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "optimization" : {
+            "subPackages" : true
+        },
+        "runmode" : "liberate",
+        // 开启分包优化后，必须配置资源释放模式
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {}
+        }
     },
-    "optimization": {
-      "subPackages": true
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx5705da8747c77cfe",
+        "setting" : {
+            "urlCheck" : true,
+            "es6" : true,
+            "postcss" : true,
+            "minified" : true
+        },
+        "usingComponents" : true,
+        "permission" : {}
     },
-    "runmode": "liberate",
-    // 开启分包优化后，必须配置资源释放模式
-    /* 模块配置 */
-    "modules": {},
-    /* 应用发布信息 */
-    "distribute": {
-      /* android打包配置 */
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ]
-      },
-      /* ios打包配置 */
-      "ios": {},
-      /* SDK配置 */
-      "sdkConfigs": {}
-    }
-  },
-  /* 快应用特有相关 */
-  "quickapp": {},
-  /* 小程序特有相关 */
-  "mp-weixin": {
-    "appid": "wx5705da8747c77cfe",
-    "setting": {
-      "urlCheck": false,
-      "es6": true,
-      "postcss": true,
-      "minified": true
+    "mp-alipay" : {
+        "usingComponents" : true
     },
-    "usingComponents": true
-  },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "uniStatistics": {
-    "enable": false
-  },
-  "vueVersion": "2"
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
 }

pages/tab_home/tab_home.vue

@@ -202,12 +202,19 @@
 					<view class="detail_image_none" :style="{backgroundImage:`url(${image})`}"></view>
 					<view class="class_list">
 						<view class="class_item" style="height: 120rpx;">
-							<view class="flex_row" style="justify-content: space-around;">
-								<view class="class_item_title">{{classList.length === 0 ? '假期充电' : '课间休息'}}</view>
+							<view class="flex_row" style="justify-content: space-between;">
+								<view class="class_item_title" v-if="!isAfterDayClass">
+									{{classList.length === 0 ? '假期充电' : '课间休息'}}
+								</view>
+								<view class="class_item_title" v-if="isAfterDayClass">课程完成</view>
 								<view class="tag" style="margin: 0;">
-									<view class="tag_text">{{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">
+									{{classList.length === 0 ? '合理规划' : '预习下节'}}
 								</view>
-								<view class="class_item_subtitle" style="font-weight: 400;font-size: 26rpx;">{{classList.length === 0 ? '合理规划' : '准备上课'}}</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;">课程列表
@@ -421,7 +428,7 @@
 				//当前课程索引
 				classCurrent: '',
 				//已上课程
-				finishClassNum: 0,
+				finishClassNum: '',
 				//课程缺省image
 				image: 'https://image.meiye.art/pic_1631411821366fqhkuMI110LbOlAIdv1SV',
 				//时间戳
@@ -430,13 +437,17 @@
 				dayTime: '',
 				//打卡状态
 				clockState: '',
+				//打卡时间
 				clockTime: '',
 				//出勤课程统计信息
 				classAttendanceQuality: '',
 				//打卡状态image
 				image1: 'https://ouch-cdn2.icons8.com/2farWQUdLe8J4mb4oQoEvJpl5OFXtM5P7AZi8nhuOxk/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvOTYz/L2VkZGEwNzAzLTAw/MWYtNGZiZS1hY2I3/LTVlNjRhZGYzNTAx/Mi5zdmc.png',
 				image2: 'https://ouch-cdn2.icons8.com/6CkTSZQdyBYaGiqmNJRhbqoYi8QDcLFn-04VEQyQaCo/rs:fit:962:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvNzMz/LzlhYmUzYjIyLTRl/ZGQtNDVkMi1iYWEw/LTVjYjk2NThmNDJi/OC5zdmc.png',
-				isHomeLoad: false
+				//当前页面加载是否完成
+				isHomeLoad: false,
+				//今日课程是否上完
+				isAfterDayClass: false
 			};
 		},
 		onLoad() {
@@ -496,44 +507,45 @@
 						return true
 					return false
 				}
-				//获取当前课程索引值(在课程中)
-				let i = 1
-				for (let item of this.classList) {
-					let timeArr = item.time.split("-")
-					let res = CompareDate(timeArr[0], timeArr[1])
-					if (res) {
-						break
-					}
-					i++
-				}
-				this.finishClassNum = i
-				//判断是否不在任意一个时间段内并存入已上课程
-				if (i > this.classList.length) {
-					let j = 1
+				//今日有课程
+				if (this.classList.length != 0) {
+					//当前课程索引
+					let classIndex = -100
+					//完成课程数目
+					let finishNum = -100
+					//判断是否在课程中，若是则赋值为当前课程索引
 					this.classList.forEach((item, index) => {
 						let timeArr = item.time.split("-")
-						let res = CompareDateStart(timeArr[0])
+						//在课堂中
+						let res = CompareDate(timeArr[0], timeArr[1])
 						if (res) {
-							j = index - 1
-							i = -1
+							classIndex = index + 1
+							finishNum = index + 1
+						}
+						//没在课堂中
+						let value = CompareDateStart(timeArr[0])
+						//课间时间
+						if (value) {
+							classIndex = -1
+							finishNum = index - 1
 						} else {
-							j = this.classList.length
-							i = -1
+							//放学时间(有课程但已上完状态)
+							this.isAfterDayClass = true
+							classIndex = -1
+							finishNum = this.classList.length
 						}
 					})
-					this.finishClassNum = j
-				}
-				//判断是否不在任意一个时间段内
-				// if (i > this.classList.length) {
-				// 	i = -1
-				// }
-				//判断有无课程
-				if (this.classList.length === 0) {
-					i = -1
+					//当前课程赋值
+					this.classCurrent = classIndex
+					//已上课程赋值
+					this.finishClassNum = finishNum
+					//无课程，放假时间
+				}else {
+					//当前课程赋值
+					this.classCurrent = -1
+					//已上课程赋值
+					this.finishClassNum = 0
 				}
-				//存入当前课程索引值
-				this.classCurrent = i
-				i = 0
 			},
 			//更新图表数据
 			getChartData() {

pages/tab_mine/tab_mine.vue

@@ -1,6 +1,5 @@
 <template>
 	<view>
-		<!-- 登录 -->
 		<view class="content">
 			<view class="bg1"></view>
 			<view class="bg2"></view>
@@ -9,8 +8,8 @@
 			<view class="info_box">
 				<image class="avatar" :src="parentInfo.avatarUrl"></image>
 				<view class="flex_cloumn">
-					<view class="title" style="font-size: 45rpx;transform: skew(-15deg);">{{parentInfo.nickName}}</view>
-					<view class="subtitle" style="font-size: 35rpx;transform: skew(-15deg);">{{childInfo.name}}家长</view>
+					<view class="title" style="font-size: 45rpx;transform: skew(-10deg);">{{parentInfo.nickName}}</view>
+					<view class="subtitle" style="font-size: 35rpx;transform: skew(-10deg);">{{childInfo.name}}家长</view>
 				</view>
 			</view>
 			<!-- 卡片列表 -->
@@ -176,6 +175,7 @@
 	.content {
 		height: 100%;
 		width: 100%;
+		overflow-x: hidden;
 
 		.bg1 {
 			position: fixed;

subpkg/datalist/classdetail.vue

@@ -15,7 +15,7 @@
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">孩子今日共</view>
-				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-15deg);">
+				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-10deg);">
 					{{classList.length}}
 				</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">节课程</view>
@@ -283,7 +283,7 @@
 		.content_title {
 			font-size: 35rpx;
 			font-weight: bold;
-			transform: skew(-15deg);
+			transform: skew(-10deg);
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;

subpkg/datalist/examdata.vue

@@ -51,13 +51,13 @@
 	.page_title {
 		font-size: 55rpx;
 		font-weight: bold;
-		transform: skew(-15deg);
+		transform: skew(-10deg);
 		color: #FFF;
 	}
 	.page_subtitle {
 		font-size: 34rpx;
 		font-weight: bold;
-		transform: skew(-15deg);
+		transform: skew(-10deg);
 		color: #FFF;
 	}
 

subpkg/datalist/examlist.vue

@@ -22,7 +22,7 @@
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">孩子今日共</view>
-				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-15deg);">
+				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-10deg);">
 					{{examData.length}}
 				</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">例评测</view>
@@ -162,7 +162,7 @@
 		.content_title {
 			font-size: 35rpx;
 			font-weight: bold;
-			transform: skew(-15deg);
+			transform: skew(-10deg);
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;

subpkg/datalist/swapdata.vue

@@ -49,13 +49,13 @@
 	.page_title {
 		font-size: 55rpx;
 		font-weight: bold;
-		transform: skew(-15deg);
+		transform: skew(-10deg);
 		color: #FFF;
 	}
 	.page_subtitle {
 		font-size: 34rpx;
 		font-weight: bold;
-		transform: skew(-15deg);
+		transform: skew(-10deg);
 		color: #FFF;
 	}
 

subpkg/datalist/swaplist.vue

@@ -16,7 +16,7 @@
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">当前共</view>
-					<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-15deg);">{{swapData.length}}</view>
+					<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-10deg);">{{swapData.length}}</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">场活动</view>
 			</view>
 		</view>
@@ -150,7 +150,7 @@
 		.content_title {
 			font-size: 35rpx;
 			font-weight: bold;
-			transform: skew(-15deg);
+			transform: skew(-10deg);
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;

subpkg/datalist/workdata.vue

@@ -48,13 +48,13 @@
 	.page_title {
 		font-size: 55rpx;
 		font-weight: bold;
-		transform: skew(-15deg);
+		transform: skew(-10deg);
 		color: #FFF;
 	}
 	.page_subtitle {
 		font-size: 34rpx;
 		font-weight: bold;
-		transform: skew(-15deg);
+		transform: skew(-10deg);
 		color: #FFF;
 	}
 

subpkg/datalist/worklist.vue

@@ -17,7 +17,7 @@
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">孩子今日共</view>
-				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-15deg);">
+				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-10deg);">
 					{{workData.length}}</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">份作业</view>
 			</view>
@@ -179,7 +179,7 @@
 		.content_title {
 			font-size: 35rpx;
 			font-weight: bold;
-			transform: skew(-15deg);
+			transform: skew(-10deg);
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;

subpkg/gradelist/gradelist_pages.scss

@@ -21,7 +21,7 @@
 		font-size: 50rpx;
 		font-weight: bold;
 		color: #FFF;
-		transform: skew(-15deg);
+		transform: skew(-10deg);
 		z-index: 5;
 	}
 	

subpkg/statslist/swapstats.vue

@@ -24,21 +24,21 @@
 				<view class="_item_subtext" style="margin-left: 30rpx;">{{item.text}}</view>
 
 				<view class="flex_baseline" style="margin-left: 30rpx;" v-if="item.numData === ''">
-					<text class="_item_text" style="transform: skew(-15deg);">记录</text>
+					<text class="_item_text" style="transform: skew(-10deg);">记录</text>
 					<text class="_item_subtext" style="margin-left: 10rpx;opacity:0.8;">今日时长</text>
 				</view>
 				<view class="flex_baseline" style="margin-left: 30rpx;"
 					v-if="item.numData.includes('小时') && item.numData != ''">
-					<text class="_item_text" style="transform: skew(-15deg);">{{item.numData.split('小时')[0]}}</text>
+					<text class="_item_text" style="transform: skew(-10deg);">{{item.numData.split('小时')[0]}}</text>
 					<text class="_item_subtext" style="margin-left: 10rpx;opacity:0.8;">小时</text>
 					<text class="_item_text"
-						style="margin-left: 10rpx;transform: skew(-15deg);">{{item.numData.split('小时')[1].replace('分','')}}</text>
+						style="margin-left: 10rpx;transform: skew(-10deg);">{{item.numData.split('小时')[1].replace('分','')}}</text>
 					<text class="_item_subtext" style="margin-left: 10rpx;opacity:0.8;">分钟</text>
 				</view>
 				<view class="flex_baseline" style="margin-left: 30rpx;"
 					v-if="item.numData.includes('小时') === false && item.numData != ''">
 					<text class="_item_text"
-						style="margin-left: 10rpx;transform: skew(-15deg);">{{item.numData.replace('分','')}}</text>
+						style="margin-left: 10rpx;transform: skew(-10deg);">{{item.numData.replace('分','')}}</text>
 					<text class="_item_subtext" style="margin-left: 10rpx;opacity:0.8;">分钟</text>
 				</view>
 				<view :class="item.icon"></view>
@@ -415,7 +415,7 @@
 		.content_title {
 			font-size: 35rpx;
 			font-weight: bold;
-			transform: skew(-15deg);
+			transform: skew(-10deg);
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;

subpkg/statslist/workstats.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">孩子今日共</view>
-				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-15deg);">{{workData.length}}</view>
+				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-10deg);">{{workData.length}}</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">份作业</view>
 			</view>
 		</view>
@@ -86,7 +86,7 @@
 		.content_title {
 			font-size: 35rpx;
 			font-weight: bold;
-			transform: skew(-15deg);
+			transform: skew(-10deg);
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;

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

@@ -72,5 +72,6 @@
       }
     ]
   },
+  "permission": {},
   "usingComponents": {}
 }

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

@@ -21,15 +21,15 @@
 .info_box .flex_cloumn .content_name {
   font-weight: bold;
   font-size: 50rpx;
-  -webkit-transform: skew(-15deg);
-          transform: skew(-15deg);
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
   color: #FFF;
   z-index: 99;
 }
 .info_box .flex_cloumn .content_class {
   font-size: 30rpx;
-  -webkit-transform: skew(-15deg);
-          transform: skew(-15deg);
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
   color: #FFF;
   z-index: 99;
 }

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

@@ -5,16 +5,16 @@
 .flex_cloumn .content_title {
   font-size: 50rpx;
   font-weight: bold;
-  -webkit-transform: skew(-15deg);
-          transform: skew(-15deg);
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
   color: #FFF;
   z-index: 2;
   text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 }
 .flex_cloumn .content_subtitle {
   font-size: 40rpx;
-  -webkit-transform: skew(-15deg);
-          transform: skew(-15deg);
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
   color: #FFF;
   z-index: 2;
 }

unpackage/dist/dev/mp-weixin/pages/tab_mine/tab_mine.wxss

@@ -1,6 +1,7 @@
 .content {
   height: 100%;
   width: 100%;
+  overflow-x: hidden;
 }
 .content .bg1 {
   position: fixed;

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": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "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": ""
+    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "packOptions": {
+        "ignore": [],
+        "include": []
     },
-    "disableUseStrict": false,
-    "useCompilerPlugins": false
-  },
-  "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "wx5705da8747c77cfe",
-  "projectname": "teammodelwxapp",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
+    "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
     },
-    "conversation": {
-      "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": []
+        }
     },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  }
 }

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

@@ -1,49 +1,50 @@
 {
-  "projectname": "teammodelwxapp",
-  "setting": {
-    "compileHotReLoad": true
-  },
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "",
-          "pathName": "subpkg/startup/options",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "subpkg/startup/login",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/init/init",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/tab_home/tab_home",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/tab_mine/tab_mine",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
+    "projectname": "teammodelwxapp",
+    "setting": {
+        "compileHotReLoad": true,
+        "urlCheck": false
+    },
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "condition": {
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "",
+                    "pathName": "subpkg/startup/options",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "subpkg/startup/login",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/init/init",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/tab_home/tab_home",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/tab_mine/tab_mine",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                }
+            ]
         }
-      ]
-    }
-  },
-  "libVersion": "2.21.4"
+    },
+    "libVersion": "2.24.6"
 }

unpackage/dist/dev/mp-weixin/subpkg/datalist/classdetail.wxss

@@ -110,8 +110,8 @@
 .flex_cloumn .content_title {
   font-size: 35rpx;
   font-weight: bold;
-  -webkit-transform: skew(-15deg);
-          transform: skew(-15deg);
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
   color: #FFF;
   z-index: 2;
   text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;

unpackage/dist/dev/mp-weixin/subpkg/datalist/examdata.wxss

@@ -4,15 +4,15 @@
 .page_title {
   font-size: 55rpx;
   font-weight: bold;
-  -webkit-transform: skew(-15deg);
-          transform: skew(-15deg);
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
   color: #FFF;
 }
 .page_subtitle {
   font-size: 34rpx;
   font-weight: bold;
-  -webkit-transform: skew(-15deg);
-          transform: skew(-15deg);
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
   color: #FFF;
 }
 .bg1 {

unpackage/dist/dev/mp-weixin/subpkg/datalist/examlist.wxss

@@ -50,8 +50,8 @@
 .flex_cloumn .content_title {
   font-size: 35rpx;
   font-weight: bold;
-  -webkit-transform: skew(-15deg);
-          transform: skew(-15deg);
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
   color: #FFF;
   z-index: 2;
   text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;

unpackage/dist/dev/mp-weixin/subpkg/datalist/swapdata.wxss

@@ -4,15 +4,15 @@
 .page_title {
   font-size: 55rpx;
   font-weight: bold;
-  -webkit-transform: skew(-15deg);
-          transform: skew(-15deg);
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
   color: #FFF;
 }
 .page_subtitle {
   font-size: 34rpx;
   font-weight: bold;
-  -webkit-transform: skew(-15deg);
-          transform: skew(-15deg);
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
   color: #FFF;
 }
 .bg1 {