Merge branch 'Branch_1' of https://git.u8t.cn/tangxinyue/alipay-emulator into Branch_1

pages/other/score/center.vue

@@ -98,7 +98,7 @@ function back(){
         <view class="div_424"></view>
         <view class="flexcontainer_2"><text class="text_5"> 身份证号: </text><text class="text_6"> {{data.form.idNumber}} </text></view>
         <view class="div_425"></view>
-        <view class="flexcontainer_3"><text class="text_7"> 姓 名: </text><text class="text_8"> {{data.form.name}} </text></view>
+        <view class="flexcontainer_3"><view class="text_7"> 姓 <text>名:</text> </view><text class="text_8"> {{data.form.name}} </text></view>
         <view class="div_426"></view>
         <text class="text_9"> 科目成绩: </text>
         <view class="group_48319">
@@ -548,7 +548,7 @@ function back(){
       .flexcontainer_3 {
         position: relative;
         display: flex;
-        width: 288rpx;
+        // width: 288rpx;
         height: 32rpx;
         flex-direction: row;
         align-items: flex-start;
@@ -558,6 +558,7 @@ function back(){
 
         /* 姓 名: */
         .text_7 {
+					width: 210rpx;
           font-size: 32rpx;
           font-family: 'PingFang SC';
           font-weight: 400;
@@ -570,6 +571,8 @@ function back(){
           margin-bottom: -6rpx;
           position: relative;
           margin-left: 0;
+					display: flex;
+					justify-content: space-between;
         }
 
         /* 肖战 */

pages/other/score/guandong.vue

@@ -92,10 +92,11 @@
 		console.log(e)
 	}
 	function getTime(times,status){
+		let list=times.split('-')
 		if(status){
-			return times.substring(0,4)+'年'
+			return list[0]+'年'
 		}else{
-			return times.substring(0,7).replace('-','年')+'月'
+			return list[0]+'年'+list[1]+'月'
 		}
 	}
 </script>
@@ -109,17 +110,19 @@
 			</liu-drag-button>
 		</view>
 	<view class="container">
-		<view class="header" :style="{'padding-top':$systemInfo.statusBarHeight+'px'}">
+		<view class="headerBox" :style="{'padding-top':$systemInfo.statusBarHeight+'px'}">
-			<view class="left" @click="back()">
+			<view class="header" >
-				<image src="/static/image/other/score/guandong/leftIcon.png" mode=""></image>
+				<view class="left" @click="back()">
-			</view>
+					<image src="/static/image/other/score/guandong/leftIcon.png" mode=""></image>
-			<view class="center">
+				</view>
-				考试成绩结果
+				<view class="center">
-			</view>
+					考试成绩结果
-			<view class="right">
+				</view>
-				<image src="/static/image/other/score/guandong/rightIcon.png" mode=""></image>
+				<view class="right">
-			</view>
+					<image src="/static/image/other/score/guandong/rightIcon.png" mode=""></image>
+				</view>
 				
+			</view>
 		</view>
 		<view class="" :style="{height:$systemInfo.statusBarHeight*2+88+'rpx'}">
 			
@@ -468,13 +471,17 @@
 	}
 </style>
 <style lang="scss" scoped>
-	.header{
+	.headerBox{
 		z-index: 999;
 		position: fixed;
 		left: 0;
 		top: 0;
-		height: 88rpx;
 		width: 100%;
+	}
+	.header{
+		
+		width: 100%;
+		height: 88rpx;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;

pages/other/score/hebei.vue

@@ -76,7 +76,7 @@
 		return sum || '';
 	});
 
-	// 选择头像
+	// 选择二维码
 	const choose = () => {
 		uni.chooseImage({
 			count: 1,
@@ -97,7 +97,7 @@
 		});
 	};
 
-	// 清除头像
+	// 清除二维码
 	const clearAvatar = () => {
 		editDialog.data.avatar = '';
 	};
@@ -142,7 +142,7 @@
 						</view>
 						<view class="group_48369">
 							<view class="rectangle_23389">
-								<image v-if="data.form.avatar" :src="data.form.avatar" mode="aspectFill" />
+								<image  :src="data.form.avatar||'/static/image/other/score/qrcode.png'" mode="aspectFill" />
 							</view>
 						</view>
 					</view>
@@ -210,7 +210,7 @@
 				</view>
 				<view class="editDialog_body">
 					<view class="formItem avatar-item">
-						<text>头像</text>
+						<text>二维码</text>
 						<view class="avatar-wrap">
 							<image v-if="editDialog.data.avatar" :src="editDialog.data.avatar" class="avatar-img" @click="choose" />
 							<view v-else class="avatar-placeholder" @click="choose">
@@ -546,11 +546,9 @@
 						font-size: 22rpx;
 						font-family: 'PingFang SC';
 						font-weight: 400;
-						line-height: 30rpx;
 						color: #767676;
 						white-space: pre;
 						height: 30rpx;
-						margin-top: 6rpx;
 						width: max-content;
 						margin-left: auto;
 						margin-right: auto;
@@ -1280,7 +1278,6 @@
 				.group_48383 {
 					position: relative;
 					width: 100%;
-					height: 64rpx;
 					display: flex;
 					flex-direction: column;
 					align-items: center;
@@ -1362,6 +1359,8 @@
 
 		margin-top: 40rpx;
 		border: 1px solid #DBDBDB;
+		    padding-bottom: 1px;
+
 	}
 
 	.table2 {

pages/other/score/index.vue

@@ -96,6 +96,13 @@
 			prefix: '.uni.other.',
 			value:'高考查询'
 		})
+	// #ifdef APP-PLUS
+	util.setAndroidSystemBarColor('#ffffff')
+	// 保存定时器引用，以便在页面卸载时清理
+	setTimeout(() => {
+		plus.navigator.setStatusBarStyle("dark");
+	}, 500)
+	// #endif
 	})
 
 	function goPage(url,name) {