update: 全局字体修改

.vs/teammodelwxapp/project-colors.json

@@ -0,0 +1,11 @@
+{
+  "Version": 1,
+  "ProjectMap": {
+    "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3": {
+      "ProjectGuid": "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3",
+      "DisplayName": "杂项文件",
+      "ColorIndex": -1
+    }
+  },
+  "NextColorIndex": 0
+}

App.vue

@@ -1,13 +1,6 @@
 <script>
 export default {
   onLaunch: function () {
-    // uni.loadFontFace({
-    //   family: 'minifont',
-    //   source: 'url("https://sungd.github.io/Pacifico.ttf")',
-    //   success() {
-    // 	  console.log('success')
-    //   }
-    // })
 		console.log('App onLaunch')
   },
   onShow: function () {
@@ -27,5 +20,5 @@ export default {
 /*iconfont */
 @import '@/static/iconfont/iconfont-weapp-icon.css';
 /*字体 */
-// @import url('~@/static/iconfont/iconfont-font.css');
+@import url('~@/static/iconfont/iconfont-font.css');
 </style>

common/global_scss/pages_style.scss

@@ -20,6 +20,12 @@ page{
 	font-weight: bold;
 	color: $subtitle;
 }
+.YS_title{
+	line-height: 35rpx;
+	font-size: 35rpx;
+	color: $title;
+	font-family: YSfont;
+}
 //标题头
 .front_tag {
 	margin-right: 20rpx;

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(-10deg);">
+				<view class="tag_text" style="color: #FFF;font-size: 24rpx;transform: skew(-10deg);font-family: YSfont;font-weight: 400;">
 					{{timeStamp}}更新
 				</view>
 
@@ -92,18 +92,15 @@
 			justify-content: space-around;
 
 			.content_name {
-				// font-family: minifont;
-				font-weight: bold;
-				font-size: 50rpx;
-				transform: skew(-10deg);
+				font-size: 55rpx;
+				font-family: YSfont;
 				color: #FFF;
 				z-index: 99;
 			}
 
 			.content_class {
-				// font-family: minifont;
-				font-size: 30rpx;
-				transform: skew(-10deg);
+				font-size: 40rpx;
+				font-family: YSfont;
 				color: #FFF;
 				z-index: 99;
 			}

components/top-semester/top-semester.vue

@@ -61,43 +61,31 @@
 		justify-content: space-around;
 
 		.content_title {
-			// font-family: minifont;
-			font-size: 50rpx;
-			font-weight: bold;
-			transform: skew(-10deg);
+			font-size: 70rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 		}
 
 		.content_subtitle {
-			// font-family: minifont;
-			font-size: 40rpx;
-			transform: skew(-10deg);
+			font-size: 50rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 		}
 	}
 
-	// .avatar {
-	// 	margin-left: auto;
-	// 	width: 102rpx;
-	// 	height: 102rpx;
-	// 	border-radius: 100%;
-	// 	border: 4rpx solid #FFFFFF;
-	// 	box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.2);
-	// 	z-index: 9;
-	// }
-
 	.tag {
 		margin-left: 20rpx;
 		border-radius: 6rpx;
 		border: 2px solid #FFF;
-		padding: 6rpx 12rpx;
+		padding: 4rpx 10rpx;
 		z-index: 9;
 
 		.tag_text {
-			font-size: 26rpx;
+			font-size: 30rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 9;
 		}

pages/tab_exam/tab_exam.vue

@@ -55,7 +55,7 @@
 				</view>
 				<view class="class_list">
 					<view class="class_item"
-						:style="{borderImage: item.examInfo.progress === 'finish'?none:'linear-gradient(to right, #ff8caf, #FFF) 1'}"
+						:style="{borderImage: none}"
 						v-for="(item,index) in examData" :key="index" @click="navExamData(index)"
 						v-if="examData.length != 0">
 						<view class="flex_row" style="margin: 0 20rpx;">

pages/tab_home/tab_home.vue

@@ -237,36 +237,35 @@
 						<view class="item_block">
 							<view class="subtitle">打卡记录</view>
 							<view class="flex_baseline">
-								<view class="title" style="transform: skew(-10deg);">{{dayTime.split('月')[0]}}</view>
-								<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">月</view>
-								<view class="title" style="margin-left: 10rpx;transform: skew(-10deg);">
+								<view class="YS_title">{{dayTime.split('月')[0]}}</view>
+								<view class="YS_title" style="font-size: 28rpx; margin-left: 6rpx;">月</view>
+								<view class="YS_title" style="margin-left: 4rpx;">
 									{{dayTime.split('月')[1]}}
 								</view>
-								<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">日</view>
+								<view class="YS_title" style="font-size: 28rpx; margin-left: 6rpx;">日</view>
 							</view>
 						</view>
 					</view>
 					<view class="flex_row" style="margin: auto 20rpx 20rpx 20rpx;justify-content: space-between;">
 						<view class="item_block" style="margin-left: -10rpx;">
 							<view class="subtitle">打卡时间</view>
-							<view class="title" v-if="clockTime === '无记录'" style="transform: skew(-10deg);">
+							<view class="YS_title" v-if="clockTime === '无记录'">
 								{{clockTime}}
 							</view>
 							<view class="flex_baseline" v-if="clockTime != '无记录'">
-								<view class="title" style="transform: skew(-10deg);">
+								<view class="YS_title">
 									{{clockTime.split(':')[0].replace('0','')}}
 								</view>
-								<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">点</view>
-								<view class="title" style="transform: skew(-10deg);margin-left: 10rpx;">
+								<view class="YS_title" style="font-size: 28rpx; margin-left: 6rpx;">点</view>
+								<view class="YS_title" style="margin-left: 6rpx;">
 									{{clockTime.split(':')[1]}}
 								</view>
-								<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">分</view>
+								<view class="YS_title" style="font-size: 28rpx; margin-left: 6rpx;">分</view>
 							</view>
-
 						</view>
 						<view class="icon_box" style="width: 110rpx;height: 110rpx;"
 							:style="{backgroundColor: clockState === '未打卡' ? '#ff5959':'#4169E1'}">
-							<view class="title" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">
+							<view class="YS_title" style="color: #FFF;font-size: 32rpx;">
 								{{clockState}}
 							</view>
 						</view>
@@ -287,23 +286,22 @@
 						<view class="flex_cloumn"
 							style="align-items: center; justify-content: space-around;height: 80rpx;">
 							<view class="subtitle" style="font-size: 24rpx;">当前课程</view>
-							<view class="title" style="font-size: 32rpx;" v-if="classCurrent!=-1">
+							<view class="YS_title" v-if="classCurrent!=-1">
 								{{classList[classCurrent - 1].name}}
 							</view>
-							<view class="title" style="font-size: 32rpx;" v-if="classCurrent===-1">无课程</view>
+							<view class="YS_title" v-if="classCurrent===-1">无课程</view>
 						</view>
 						<view v-if="classCurrent != -1">
 							<view class="icon_box" style="margin-right: 20rpx;"
 								:style="{backgroundColor: classList[classCurrent - 1].attendance ? '#23b46c':'#ff5959'}">
-								<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">
+								<view class="YS_title" style="color: #FFF;font-size: 32rpx;">
 									{{classList[classCurrent - 1].attendance ? '出勤':'缺勤'}}
 								</view>
 							</view>
 						</view>
 						<view v-if="classCurrent === -1">
 							<view class="icon_box" style="margin-right: 20rpx;background-color: #f9c752;">
-								<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">休息
-								</view>
+								<view class="YS_title" style="color: #FFF;font-size: 32rpx;">休息</view>
 							</view>
 						</view>
 					</view>
@@ -315,22 +313,18 @@
 						<view class="flex_cloumn"
 							style="align-items: center;justify-content: space-around;height: 80rpx;">
 							<view class="subtitle" style="font-size: 24rpx;">出勤课程</view>
-							<view class="title" style="font-size: 32rpx;" v-if="classList">{{finishClassNum}} 节
-							</view>
-							<view class="title" style="font-size: 32rpx;" v-if="!classList">0 节</view>
+							<view class="YS_title" v-if="classList">{{finishClassNum}}节课</view>
+							<view class="YS_title" v-if="!classList">0 节</view>
 						</view>
 						<view v-if="classList">
 							<view class="icon_box" style="margin-right: 20rpx;"
 								:style="{backgroundColor: classAttendanceQuality === '全勤' ? '#23b46c':'#ff5959'}">
-								<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">
-									{{classAttendanceQuality}}
-								</view>
+								<view class="YS_title" style="color: #FFF;font-size: 32rpx;">{{classAttendanceQuality}}</view>
 							</view>
 						</view>
 						<view v-if="!classList">
 							<view class="icon_box" style="margin-right: 20rpx;background-color: #f9c752;">
-								<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">休息
-								</view>
+								<view class="YS_title" style="color: #FFF;font-size: 32rpx;">休息</view>
 							</view>
 						</view>
 					</view>

pages/tab_mine/tab_mine.vue

@@ -8,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(-10deg);">{{parentInfo.nickName}}</view>
-					<view class="subtitle" style="font-size: 35rpx;transform: skew(-10deg);">{{childInfo.name}}家长</view>
+					<view class="YS_title" style="font-size: 55rpx;">{{parentInfo.nickName}}</view>
+					<view class="YS_title" style="font-size: 40rpx;color: #909399;">{{childInfo.name}}家长</view>
 				</view>
 			</view>
 			<!-- 卡片列表 -->
@@ -19,8 +19,8 @@
 						<view class="t-icon t-icon-a-boshimaojiaoyu"
 							style="width: 60rpx;height: 60rpx;margin-left: 25rpx;"></view>
 						<view class="flex_cloumn" style="margin: 30rpx 0 30rpx 25rpx;">
-							<view class="title" style="margin: 20rpx 0; font-weight: 500;transform: skew(-10deg);">孩子切换</view>
-							<view class="subtitle" style="font-size: 26rpx;margin: 10rpx 0;font-weight: 400;">管理并查看更多</view>
+							<view class="YS_title" style="margin: 20rpx 0;font-size: 40rpx;font-size: 300">孩子切换</view>
+							<view class="YS_title" style="font-size:30rpx;margin: 10rpx 0;color: #909399;">查看更多信息</view>
 						</view>
 					</view>
 				</view>
@@ -29,8 +29,8 @@
 						<view class="t-icon t-icon-a-jiangpaijiangzhang"
 							style="width: 60rpx;height: 60rpx;margin-left: 25rpx;"></view>
 						<view class="flex_cloumn" style="margin: 30rpx 0 30rpx 25rpx;">
-							<view class="title" style="margin: 20rpx 0; font-weight: 500;transform: skew(-10deg);">孩子名片</view>
-							<view class="subtitle" style="font-size: 26rpx;margin: 10rpx 0;font-weight: 400;">晒出TA优秀表现</view>
+							<view class="YS_title" style="margin: 20rpx 0;font-size: 40rpx;font-size: 300;">孩子名片</view>
+							<view class="YS_title" style="font-size:30rpx;margin: 10rpx 0;color: #909399;">晒出优秀表现</view>
 						</view>
 					</view>
 				</view>

pages/tab_swap/tab_swap.vue

@@ -52,7 +52,7 @@
 					</view>
 				</view>
 				<view class="class_list">
-					<view class="class_item" :style="{borderImage: item.survey.progress === 'finish' || item.vote.progress === 'finish'?none:'linear-gradient(to right, #FF6D31, #FFF) 1'}" v-for="(item,index) in swapData" :key="index" @click="navSwapData(index)" v-if="swapData.length != 0">
+					<view class="class_item" :style="{borderImage: none}" v-for="(item,index) in swapData" :key="index" @click="navSwapData(index)" v-if="swapData.length != 0">
 						<view class="flex_row" style="margin: 0 20rpx;">
 							<view class="t-icon t-icon-swapfont" style="width: 60rpx; height: 60rpx;"></view>
 							<view class="flex_cloumn">

pages/tab_work/tab_work.vue

@@ -53,7 +53,7 @@
 				</view>
 				<view class="class_list">
 					<view class="class_item"
-						:style="{borderImage: item.work.progress === 'finish'?none:'linear-gradient(to right, #f9c752, #FFF) 1'}"
+						:style="{borderImage: none}"
 						v-for="(item,index) in workData" :key="index" @click="navWorkData(index)"
 						v-if="workData.length != 0">
 						<view class="flex_row" style="margin: 0 20rpx;">

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(-10deg);">
+				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;">
 					{{workData.length}}</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">份作业</view>
 			</view>
@@ -177,16 +177,16 @@
 		justify-content: space-around;
 
 		.content_title {
-			font-size: 35rpx;
-			font-weight: bold;
-			transform: skew(-10deg);
+			font-size: 70rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 		}
-
+		
 		.content_subtitle {
-			font-size: 35rpx;
+			font-size: 50rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 		}

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

@@ -19,17 +19,14 @@
   justify-content: space-around;
 }
 .info_box .flex_cloumn .content_name {
-  font-weight: bold;
-  font-size: 50rpx;
-  -webkit-transform: skew(-10deg);
-          transform: skew(-10deg);
+  font-size: 55rpx;
+  font-family: YSfont;
   color: #FFF;
   z-index: 99;
 }
 .info_box .flex_cloumn .content_class {
-  font-size: 30rpx;
-  -webkit-transform: skew(-10deg);
-          transform: skew(-10deg);
+  font-size: 40rpx;
+  font-family: YSfont;
   color: #FFF;
   z-index: 99;
 }

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

@@ -3,18 +3,15 @@
   justify-content: space-around;
 }
 .flex_cloumn .content_title {
-  font-size: 50rpx;
-  font-weight: bold;
-  -webkit-transform: skew(-10deg);
-          transform: skew(-10deg);
+  font-size: 70rpx;
+  font-family: YSfont;
   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(-10deg);
-          transform: skew(-10deg);
+  font-size: 50rpx;
+  font-family: YSfont;
   color: #FFF;
   z-index: 2;
 }
@@ -22,11 +19,12 @@
   margin-left: 20rpx;
   border-radius: 6rpx;
   border: 2px solid #FFF;
-  padding: 6rpx 12rpx;
+  padding: 4rpx 10rpx;
   z-index: 9;
 }
 .tag .tag_text {
-  font-size: 26rpx;
+  font-size: 30rpx;
+  font-family: YSfont;
   color: #FFF;
   z-index: 9;
 }

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

@@ -60,16 +60,15 @@
   justify-content: space-around;
 }
 .flex_cloumn .content_title {
-  font-size: 35rpx;
-  font-weight: bold;
-  -webkit-transform: skew(-10deg);
-          transform: skew(-10deg);
+  font-size: 70rpx;
+  font-family: YSfont;
   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: 35rpx;
+  font-size: 50rpx;
+  font-family: YSfont;
   color: #FFF;
   z-index: 2;
 }