zhengkaixin hace 2 años
padre
commit
797015628c
Se han modificado 37 ficheros con 147 adiciones y 5 borrados
  1. 5 0
      App.vue
  2. BIN
      assets/font/SourceHanSerifSC-Bold.otf
  3. BIN
      assets/font/SourceHanSerifSC-ExtraLight.otf
  4. BIN
      assets/font/SourceHanSerifSC-Heavy.otf
  5. BIN
      assets/font/SourceHanSerifSC-Light.otf
  6. BIN
      assets/font/SourceHanSerifSC-Medium.otf
  7. BIN
      assets/font/SourceHanSerifSC-Regular.otf
  8. BIN
      assets/font/SourceHanSerifSC-SemiBold.otf
  9. 57 0
      assets/font/font.css
  10. 1 0
      main.js
  11. 2 1
      pages/homePage/homePage.vue
  12. 2 0
      pages/login/login.vue
  13. 2 0
      pages/mine/data.vue
  14. 2 0
      pages/mine/issue.vue
  15. 4 0
      pages/mine/mine.vue
  16. 2 0
      pages/mine/myComment.vue
  17. 2 0
      pages/mine/myLike.vue
  18. 2 0
      pages/mine/myWinningRecord.vue
  19. 3 0
      pages/mine/personalPage.vue
  20. 4 1
      pages/mine/points/points.vue
  21. 4 0
      pages/mine/points/pointsExchange/orderDetails.vue
  22. 6 0
      pages/mine/points/pointsExchange/pointsExchange.vue
  23. 9 0
      pages/mine/points/pointsExchange/prizeDetails.vue
  24. 5 0
      pages/mine/points/rankingList.vue
  25. 2 1
      pages/mine/result.vue
  26. 2 0
      pages/news/articleDetails.vue
  27. 1 0
      pages/news/news.vue
  28. 1 0
      pages/search/searchResult.vue
  29. 4 0
      pages/staffHome/activityCenter/activityCenter.vue
  30. 4 0
      pages/staffHome/activityCenter/activityDetail.vue
  31. 1 0
      pages/staffHome/activityReward/activityReward.vue
  32. 1 0
      pages/staffHome/activityReward/rewardDetail.vue
  33. 4 0
      pages/staffHome/commend.vue
  34. 2 1
      pages/staffHome/filesonic.vue
  35. 2 0
      pages/staffHome/staffHome.vue
  36. 8 1
      pages/staffHome/teamHonor/badgeDetails.vue
  37. 3 0
      pages/staffHome/teamHonor/teamHonor.vue

+ 5 - 0
App.vue

@@ -33,6 +33,7 @@
 	color: rgba(182, 189, 195, 1);
 	font-size: 12px;
 	font-weight: bold;
+	font-family: 'Regular';
 }
 	.uni-icon-success-no-circle:before {
 	    content: "" !important ;
@@ -51,6 +52,10 @@
 		text-align: center;
 		border-radius: 1px;
 	}
+	/deep/.u-navbar-content-title{
+		font-family: 'Medium';
+		
+	}
 	@media screen and (min-width: 320px) {
 	   /deep/.u-tabbar__content {
 			height: 45px!important;

BIN
assets/font/SourceHanSerifSC-Bold.otf


BIN
assets/font/SourceHanSerifSC-ExtraLight.otf


BIN
assets/font/SourceHanSerifSC-Heavy.otf


BIN
assets/font/SourceHanSerifSC-Light.otf


BIN
assets/font/SourceHanSerifSC-Medium.otf


BIN
assets/font/SourceHanSerifSC-Regular.otf


BIN
assets/font/SourceHanSerifSC-SemiBold.otf


+ 57 - 0
assets/font/font.css

@@ -0,0 +1,57 @@
+@font-face {  
+
+    font-family: 'Bold';
+
+    src: url('SourceHanSerifSC-Bold.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+
+  @font-face {  
+
+    font-family: 'Medium';
+
+    src: url('SourceHanSerifSC-Medium.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+
+@font-face {  
+
+    font-family: 'SemiBold';
+
+    src: url('SourceHanSerifSC-SemiBold.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+@font-face {  
+
+    font-family: 'Regular';
+
+    src: url('SourceHanSerifSC-Regular.otf');
+
+    font-weight: normal;  
+
+    font-style: normal;  
+
+  }
+  @font-face {
+  
+      font-family: 'Light';
+  
+      src: url('SourceHanSerifSC-Light.otf');
+  
+      font-weight: normal;  
+  
+      font-style: normal;  
+  
+    }

+ 1 - 0
main.js

@@ -2,6 +2,7 @@ import App from './App'
 import Vue from 'vue'
 import getOpenId from './apis/utils/init.js'
 import getALIOpenId from './apis/utils/initALI.js'
+import '@/assets/font/font.css'
 
 var IS_WEIXIN = /MicroMessenger/.test(window.navigator.userAgent)
 var IS_ALI = /AlipayClient/.test(window.navigator.userAgent)

+ 2 - 1
pages/homePage/homePage.vue

@@ -247,6 +247,7 @@
 <style scoped lang="scss">
 	page {
 		padding-bottom: 50px;
+		font-family: 'Regular';
 	}
 
 	.sticky {
@@ -347,7 +348,7 @@
 			display: flex;
 			align-items: center;
 			margin-bottom: 40rpx;
-
+font-family: 'SemiBold';
 			img {
 				width: 40rpx;
 				height: 40rpx;

+ 2 - 0
pages/login/login.vue

@@ -90,6 +90,7 @@
 			text-align: center;
 			font-weight: bold;
 			margin-top: 8rpx;
+			font-family: 'SemiBold';
 		}
 
 	}
@@ -148,6 +149,7 @@
 			.verification-code {
 				color: #1F4A99;
 				line-height: 80rpx;
+				font-family: 'Regular';
 			}
 		}
 

+ 2 - 0
pages/mine/data.vue

@@ -189,6 +189,7 @@
 <style lang="scss" scoped>
 	page{
 		background-color: #fff;
+		font-family: 'Regular';
 	}
 	/deep/.u-slot-content {
 		display: block;
@@ -239,6 +240,7 @@
 			height: 88rpx;
 		     text-align: right;
 			 color: #888888;
+			 font-family: Microsoft Yahei;
 		}
 	}
 </style>

+ 2 - 0
pages/mine/issue.vue

@@ -237,6 +237,7 @@
 	}
 	page{
 		background-color: #fff;
+		font-family: 'Regular';
 	}
 	/deep/.u-slot-content {
 		display: block;
@@ -275,6 +276,7 @@ uni-textarea{
 	width: 100%;
 	text-indent: 28rpx;
 	padding-top:28rpx;
+	font-family: Microsoft Yahei;
 }
 .upload{
 	padding: 32rpx;

+ 4 - 0
pages/mine/mine.vue

@@ -280,6 +280,9 @@
 </script>
 
 <style lang="scss" scoped>
+	page{
+		font-family: 'Regular';
+	}
 	// 个人信息
 	.person-infos {
 		background: linear-gradient(45.45deg, rgba(6, 50, 130, 1) -0.45%, rgba(0, 88, 209, 1) 23.41%, rgba(0, 53, 153, 1) 52.12%, rgba(0, 66, 178, 1) 77.4%, rgba(0, 20, 130, 1) 100.65%);
@@ -305,6 +308,7 @@
 				.name {
 					line-height: 28px;
 					font-size: 20px;
+					font-family: 'Medium';
 				}
 
 				.department-position {

+ 2 - 0
pages/mine/myComment.vue

@@ -113,12 +113,14 @@
 					font-size: 32rpx;
 					line-height: 46rpx;
 					font-weight: bold;
+					font-family: 'Medium';
 				}
 				.else{
 					display: flex;
 					justify-content: space-between;
 					color: rgba(119, 119, 119, 1);
 					font-size: 24rpx;
+					font-family: 'Regular';
 				}
 			}
 			.picture{

+ 2 - 0
pages/mine/myLike.vue

@@ -113,12 +113,14 @@
 					font-size: 32rpx;
 					line-height: 46rpx;
 					font-weight: bold;
+					font-family: 'Medium';
 				}
 				.else{
 					display: flex;
 					justify-content: space-between;
 					color: rgba(119, 119, 119, 1);
 					font-size: 24rpx;
+					font-family: 'Regular';
 				}
 			}
 			.picture{

+ 2 - 0
pages/mine/myWinningRecord.vue

@@ -87,6 +87,7 @@
 				color: rgba(51, 51, 51, 1);
 				font-size: 16px;
 				font-weight: bold;
+				font-family: 'Medium';
 				.highlight{
 					color:#018BB9;
 				}
@@ -97,6 +98,7 @@
 				font-size: 12px;
 				justify-content: space-between;
 				margin-top: 24rpx;
+				font-family: 'Regular';
 			}
 		}
 	}

+ 3 - 0
pages/mine/personalPage.vue

@@ -166,6 +166,7 @@
 	page{
 		background-color: #fff;
 		padding-bottom: 50px;
+		font-family: 'Regular';
 	}
 	.header{
 		padding: 0 0 48rpx 0;
@@ -227,6 +228,7 @@
 				.name {
 					line-height: 28px;
 					font-size: 20px;
+					font-family: 'Medium';
 				}
 			
 				.department-position {
@@ -303,6 +305,7 @@
 					font-size: 18px;
 					font-weight:bold;
 					line-height: 25px;
+					font-family: 'Medium';
 				}
 				.year-month{
 					color: rgba(51, 51, 51, 1);

+ 4 - 1
pages/mine/points/points.vue

@@ -147,10 +147,12 @@
 			align-items: baseline;
 			.number{
 				font-size: 36px;
+				font-family: 'Medium';
 			}
 			.unit{
 				font-size: 16px;
 				margin-left: 16rpx;
+				font-family: 'Regular';
 			}
 		}
 		.rank{
@@ -169,6 +171,7 @@
 			.text{
 				margin-left: 8rpx;
 				margin-right: 4rpx;
+				font-family: 'Regular';
 			}
 		}
 	}
@@ -197,7 +200,7 @@
 				text-indent:32rpx;
 			}
 			.each{
-				
+				font-family: 'Regular';
 				display: flex;
 				justify-content: space-between;
 				align-items: center;

+ 4 - 0
pages/mine/points/pointsExchange/orderDetails.vue

@@ -78,6 +78,9 @@
 </script>
 
 <style lang="scss" scoped>
+	page{
+		font-family: 'Regular';
+	}
 	// 奖品
 	.prize{
 		margin: 24rpx 32rpx;
@@ -137,6 +140,7 @@
 		line-height: 70rpx;
 		.value{
 			font-weight: bold;
+			font-family: 'Medium';
 		}
 	}
 }

+ 6 - 0
pages/mine/points/pointsExchange/pointsExchange.vue

@@ -198,8 +198,10 @@
 				font-size: 36px;
 				margin-left: 24rpx;
 				font-weight: bold;
+				font-family: 'Medium';
 			}
 			.button{
+				font-family: 'Regular';
 				width: 144rpx;
 				height: 56rpx;
 				line-height: 56rpx;
@@ -213,6 +215,7 @@
 	
 	// 提示
 	.hint{
+		font-family: 'Regular';
 		  border-radius: 8px;
 		  background-color: #018BB9;
 		  color: #fff;
@@ -262,6 +265,7 @@
 			}
 		}
 		.name{
+			font-family: 'Medium';
 			margin-top: 24rpx;
 			color: #101010;
 			font-weight: bold;
@@ -276,9 +280,11 @@
 			.points{
 				color: rgba(255, 61, 0, 1);
 				font-size: 32rpx;
+				font-family: 'SemiBold';
 			}
 			.remain{
 				color: rgba(148, 148, 148, 1);
+				font-family: 'Regular';
 			}
 		}
 	}

+ 9 - 0
pages/mine/points/pointsExchange/prizeDetails.vue

@@ -100,6 +100,9 @@
 </script>
 
 <style lang="scss" scoped>
+	page{
+		font-family: 'Regular';
+	}
 	// 奖品图片
 	.prize-img{
 		width: 100%;
@@ -114,14 +117,17 @@
  .prize-infos{
 	 padding: 32rpx;
 	 background-color: #fff;
+	 
 	 .name{
 		 color: rgba(51, 51, 51, 1);
 		 font-size: 40rpx;
 		 font-weight: bold;
+		 font-family: 'SemiBold';
 	 }
 	 .explain{
 		 color: rgba(119, 119, 119, 1);
         margin-top: 8rpx;
+		
 	 }
 	 .points{
 		 margin-top: 40rpx;
@@ -147,6 +153,7 @@
 		color: rgba(51, 51, 51, 1);
 		font-size: 18px;
 		margin-bottom: 48rpx;
+		font-family: 'Medium';
 	}
 	.item{
 		display: flex;
@@ -180,6 +187,7 @@
 	justify-content: space-between;
 	.points{
 		.need{
+			font-family: 'Medium';
 			color: rgba(255, 61, 0, 1);
 			font-size: 16px;
 			.unit{
@@ -194,6 +202,7 @@
 		}
 	}
 	.button{
+		font-family: 'Medium';
 		width:280rpx;
 		
 		height: 80rpx;

+ 5 - 0
pages/mine/points/rankingList.vue

@@ -172,6 +172,7 @@
 		linear-gradient(180deg, rgba(255,150,0,1) 0%,rgba(255,61,0,1) 100%) ;
 		background-repeat: no-repeat,no-repeat;
 		background-position: 85% 50%,105% 40%;
+		font-family: 'SemiBold';
 	}
 	.self{
 		background-color: #fff;
@@ -204,11 +205,13 @@
 			 color: rgba(51, 51, 51, 1);
 			 font-size: 16px;
 			 margin-left: 24rpx;
+			 font-family: 'Medium';
 		 }
 		 .points{
 			 color: rgba(31, 74, 153, 1);
 			 font-size: 16px;
             margin-left: auto;
+			font-family: 'Regular';
 		 }
 	}
    .else{
@@ -246,11 +249,13 @@
 	   			 color: rgba(51, 51, 51, 1);
 	   			 font-size: 16px;
 	   			 margin-left: 24rpx;
+				 font-family: 'Medium';
 	   }
 	   .points{
 	   			 color: rgba(31, 74, 153, 1);
 	   			 font-size: 16px;
 	           margin-left: auto;
+			   font-family: 'Regular';
 			   
 	   }
 	   .points1{

+ 2 - 1
pages/mine/result.vue

@@ -40,10 +40,11 @@
 		color: rgba(16, 16, 16, 1);
 		font-size: 20px;
 		text-align: center;
+		font-family: 'Regular';
 	}
 	.hint{
 		color: rgba(119, 119, 119, 1);
-		
+		font-family: 'Regular';
 		text-align: center;
 		margin-top: 8rpx;
 	}

+ 2 - 0
pages/news/articleDetails.vue

@@ -260,6 +260,7 @@
 	
 	page{
 		padding-bottom:100px;
+		font-family: 'Regular';
 	}
 	// 新闻内容
 	.content{
@@ -270,6 +271,7 @@
 			font-size: 20px;
 			text-align: justify;
 		     font-weight: 550;
+			 font-family: 'SemiBold';
 		}
 		.infos{
 			display: flex;

+ 1 - 0
pages/news/news.vue

@@ -109,6 +109,7 @@
 <style lang="scss" scoped>
 	page{
 		background-color: #ffffff;
+		font-family: 'Regular';
 	}
 	/deep/.u-slot-content {
 		display: block;

+ 1 - 0
pages/search/searchResult.vue

@@ -207,6 +207,7 @@
 <style lang="scss" scoped>
 	page{
 		background-color: #fff;
+		font-family: 'Regular';
 	}
 	// 搜索框
 	.search{

+ 4 - 0
pages/staffHome/activityCenter/activityCenter.vue

@@ -142,6 +142,7 @@
 			.title{
 				color: rgba(51, 51, 51, 1);
 				font-size: 18px;
+				font-family: 'Medium';
 			}
 			.pictures {
 				display: flex;
@@ -158,6 +159,7 @@
 				color: rgba(119, 119, 119, 1);
 				line-height: 20px;
 				margin-top: 16rpx;
+				font-family: 'Regular';
 			}
 			
 		}
@@ -176,6 +178,7 @@
 				border: 1px solid rgba(31, 74, 153, 1);
 				line-height: 18px;
 				padding: 0 17rpx;
+				font-family: 'Medium';
 				
 			}
 			.tag2{
@@ -184,6 +187,7 @@
 			}
 			.click{
 				color: rgba(119, 119, 119, 1);
+				font-family: 'Regular';
 			}
 		}
 		

+ 4 - 0
pages/staffHome/activityCenter/activityDetail.vue

@@ -69,6 +69,7 @@
 		// 活动介绍
 		.introduction{
 			margin-top: 24rpx;
+			font-family: 'Regular';
 			.title{
 				color: rgba(16, 16, 16, 1);
 				font-size: 18px;
@@ -83,6 +84,7 @@
 		
 	// 活动时间
 	.date{
+		font-family: 'Regular';
 		margin-top: 32rpx;
 		.title{
 			color: rgba(16, 16, 16, 1);
@@ -111,6 +113,7 @@
 			color: rgba(16, 16, 16, 1);
 			font-size: 18px;
 			line-height: 26px;
+			font-family: 'Regular';
 		}
 		.integral-group{
 			margin-top: 24rpx;
@@ -144,6 +147,7 @@
 	   bottom: 0;
 	   left: 0;
 	   right: 0;
+	   font-family: Arial;
 	   uni-button{
 		   border-radius: 8px;
 		   background-color: rgba(31, 74, 153, 1);

+ 1 - 0
pages/staffHome/activityReward/activityReward.vue

@@ -128,6 +128,7 @@
 		   }
 	}
 	.main{
+		font-family: 'Medium';
 		padding: 24rpx 32rpx 0 32rpx;
 		.reward-detail{
 			background-color: #fff;

+ 1 - 0
pages/staffHome/activityReward/rewardDetail.vue

@@ -70,6 +70,7 @@
 		font-size: 20px;
 		text-align: center;
 		padding: 44rpx 0;
+		font-family: 'Medium';
 	}
 	
  .reward-group{

+ 4 - 0
pages/staffHome/commend.vue

@@ -81,6 +81,7 @@
 </script>
 
 <style lang="scss" scoped>
+	
 	.tabs{
 		background-color: rgba(255, 255, 255, 1);
 		/deep/.u-tabs{
@@ -101,6 +102,7 @@
 				color: rgba(51, 51, 51, 1);
 				font-size: 16px;
 				line-height: 23px;
+				font-family: 'Medium';
 			}
 			.commendation{
 				color: rgba(119, 119, 119, 1);
@@ -108,6 +110,7 @@
 				line-height: 17px;
 				margin-top: 4rpx;
 				width: 480rpx;
+				font-family: 'Regular';
 			}
 			.integral{
 				margin-top: 48rpx;
@@ -128,6 +131,7 @@
 				.text{
 					font-size: 12px;
 					color: rgba(119, 119, 119, 1);
+					font-family: 'Regular';
 				}
 				
 			}

+ 2 - 1
pages/staffHome/filesonic.vue

@@ -195,7 +195,7 @@
 			padding-bottom: 32rpx;
 			border-bottom: 1px solid rgba(232, 232, 232, 1);
 			margin-top: 48rpx;
-
+font-family: 'Regular';
 			.infos {
 				display: flex;
 				justify-content: space-between;
@@ -217,6 +217,7 @@
 						color: rgba(51, 51, 51, 1);
 						font-size: 16px;
 						margin-left: 24rpx;
+						font-family: 'Medium';
 					}
 				}
 			}

+ 2 - 0
pages/staffHome/staffHome.vue

@@ -96,9 +96,11 @@
 		font-size: 40rpx;
 		text-align: center;
 		padding: 44rpx 0;
+		font-family: 'Medium';
 	}
 
 	.grid {
+		font-family: 'Regular';
 		.icon {
 			width: 96rpx;
 			height: 96rpx;

+ 8 - 1
pages/staffHome/teamHonor/badgeDetails.vue

@@ -141,12 +141,15 @@
 </script>
 
 <style lang="scss" scoped>
+	page{
+		font-family: 'Regular';
+	}
 	// 荣誉名称
 	.honor-name {
 		background-color: #fff;
 		padding: 32rpx 0;
 		text-align: center;
-
+    
 		.icon {
 			img {
 				max-width: 536rpx;
@@ -178,6 +181,7 @@
            color: rgba(51, 51, 51, 1);
             font-size: 18px;
 			line-height: 18px;
+			font-family: 'Regular';
 			.rec {
 				width: 4px;
 				height: 16px;
@@ -200,6 +204,7 @@
 					color: rgba(51, 51, 51, 1);
 					font-size: 16px;
 					line-height: 23px;
+					font-family: 'Medium';
 				}
 
 				.commendation {
@@ -207,6 +212,7 @@
 					font-size: 12px;
 					line-height: 17px;
 					margin-top: 4rpx;
+					
 				}
 
 				.integral {
@@ -214,6 +220,7 @@
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
+					
 					.flex{
 						display: flex;
 						border-radius: 50px;

+ 3 - 0
pages/staffHome/teamHonor/teamHonor.vue

@@ -185,6 +185,7 @@
 				color: rgba(51, 51, 51, 1);
 				font-size: 16px;
 				line-height: 23px;
+				font-family: 'Medium';
 			}
 			.commendation{
 				color: rgba(119, 119, 119, 1);
@@ -194,6 +195,7 @@
 				width: 430rpx;
 			}
 			.integral{
+				font-family: 'Regular';
 				margin-top: 14rpx;
 				display: flex;
 				align-items: center;
@@ -228,6 +230,7 @@
 		.name{
 			text-align: center;
 			color: rgba(51, 51, 51, 1);
+			font-family: 'Regular';
 		
 		}
 	}