Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/index/index.js

@@ -232,6 +232,17 @@ Page({
 		}
 	},
 	onLoad() {
+		// 加载字体
+		wx.loadFontFace({
+			family: 'DOUYU',
+			source: 'url("https://hui.yrslm.com:8089/douyu.ttf")',
+			success: function (e) {
+				console.log(e, '动态加载字体成功')
+			},
+			fail: function (e) {
+				console.log(e, '动态加载字体失败')
+			},
+		})
 		this.barComponent3 = this.selectComponent('#streetlinechart3');
 		this.init_bar3();
 		console.log(app.globalData.navHeight)

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/index/index.wxml

@@ -282,7 +282,7 @@
 		<view
 			style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 			<!-- 标题 -->
-			<view style="  display: flex;justify-content: left;align-items: center;">
+			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
 					<image src="{{imgUrl}}index-communication.png" style="height: 50rpx;width: 56rpx"></image>
 				</view>
@@ -409,7 +409,7 @@
 		<view
 			style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 			<!-- 标题 -->
-			<view style="  display: flex;justify-content: left;align-items: center;">
+			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
 					<image src="{{imgUrl}}index-media.png" style="height: 50rpx;width: 56rpx"></image>
 				</view>
@@ -481,7 +481,7 @@
 		<view
 			style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 			<!-- 标题 -->
-			<view style="  display: flex;justify-content: left;align-items: center;">
+			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
 					<image src="{{imgUrl}}index-paper.png" style="height: 50rpx;width: 56rpx"></image>
 				</view>
@@ -535,7 +535,7 @@
 		<view
 			style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 			<!-- 标题 -->
-			<view style="  display: flex;justify-content: left;align-items: center;">
+			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
 					<image src="{{imgUrl}}index-map-title.png" style="height: 50rpx;width: 56rpx"></image>
 				</view>
@@ -579,7 +579,7 @@
 	<view style="width: 100%;position:relative;margin-top: 80rpx;">
 		<view style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;">
 			<!-- 标题 -->
-			<view style="  display: flex;justify-content: left;align-items: center;">
+			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
 					<image src="{{imgUrl}}index-video-title.png" style="height: 50rpx;width: 56rpx"></image>
 				</view>
@@ -623,7 +623,7 @@
 		<view
 			style="margin-left: 20rpx;border-radius: 10rpx;background-color: #ffffff;padding: 25rpx 30rpx;width: 651rpx;height: 100%;">
 			<!-- 标题 -->
-			<view style="  display: flex;justify-content: left;align-items: center;">
+			<view style="  display: flex;justify-content: left;align-items: center;height: 60rpx;">
 				<view style="display:flex;align-items:center;justify-content:center;">
 					<image src="{{imgUrl}}index-na-title.png" style="height: 50rpx;width: 56rpx"></image>
 				</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/index/index.wxss

@@ -87,14 +87,14 @@
 .people-font1 {
   height: 59rpx;
   /* font-size: 36rpx; */
-  font-size: 46rpx;
+  font-size: 40rpx;
   font-family: DOUYU;
   font-weight: normal;
   color: #333333;
   padding-right: 18rpx;
   display: flex;
   flex-direction: row;
-  align-items: center;
+  align-items: flex-end;
 }
 
 /* 每日更新字体 */
@@ -175,7 +175,8 @@
 }
 
 .tab-item.active{
-  font-size: 32rpx;
+  font-size: 27rpx;
+  font-family: DOUYU;
   border-bottom: 7rpx solid #508FF4;
 }
 
@@ -262,14 +263,16 @@
   display: flex;
   justify-content: left;
   align-items: center;
+  height: 60rpx
 }
 
 .data-center-title-font {
+  font-family: DOUYU;
   margin-left: 5rpx;
-  height: 50rpx;
-  font-size: 40rpx;
+  height: 100%;
+  font-size: 38rpx;
   display: flex;
-  align-items: center;
+  align-items: flex-end;
   justify-content: center;
 }