Merge branch 'gzu_1st_main_20260908(教育考试)' into SCHOOL-XiBeiNongLin

api/request/config.js

@@ -16,14 +16,14 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
 	// base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
 	// base_url: 'https://lab.zjznai.com/labapp/',//43服务器线上
-	// base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
+	base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	// base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址
 	// base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址
 	// base_url: 'https://lab.zjznai.com/api/', //暨大化材
 	// base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
     //base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
-	base_url: 'https://labcontrol.nwafu.edu.cn/api', //西北农林
+	// base_url: 'https://labcontrol.nwafu.edu.cn/api', //西北农林
 	// base_url: 'http://172.16.0.65/api/', //西北农林
 	//base_url: 'https://lab.zjznai.com/labapp/', //43测试
 	// base_url: 'https://metersphere.zjznai.com/labSystem/', //中国海关

pages/views/information/information.vue

@@ -60,6 +60,7 @@
 			//详情页
 			goInfoPage(item) {
 				console.log('item',item)
+				item.isRead = true;
 				uni.navigateTo({
 					url: '/pages/views/information/informationInfo?item=' + encodeURIComponent(JSON.stringify(item))
 				});
@@ -199,9 +200,12 @@
 				}
 				.tips-box{
 					position: absolute;
-					top:0;
-					left:0;
+					top: 55px;
+					left: 50px;
 					background-color: #fa5151;
+					width: 15rpx;
+					height: 15rpx;
+					border-radius: 50%;
 				}
 			}
 

pages_safetyEducationExamination/views/approval/index.vue

@@ -90,7 +90,7 @@
 			}
 		},
 		onShow() {
-			this.loadPendingCount();
+			// this.loadPendingCount();
 			this.resetList();
 		},
 		methods: {

pages_safetyEducationExamination/views/home/component/labBinding.vue

@@ -1,7 +1,6 @@
 <!-- 实验室绑定申请 -->
 <template>
 	<view class="labBinding-component">
-		<!-- <view class="card mob-admin-only" @click="goToApproval" hover-class="card-hover" hover-stay-time="100"> -->
 		<view class="card mob-admin-only" @click="goToApproval">
 			<view class="card-content">
 				<view class="icon-box">🏛️</view>
@@ -81,7 +80,6 @@
 			display: flex;
 			align-items: center;
 			padding: 28rpx 32rpx;
-			cursor: pointer;
 		}
 
 		.icon-box {

pages_safetyEducationExamination/views/home/component/userInfoCard.vue

@@ -5,10 +5,8 @@
 			<img v-if="userInfo.avatar" class="avatar-img" :src="baseUrl+userInfo.avatar">
 			<img v-else class="avatar-img" :src="imagesUrl('commonality/icon_01.png')">
 			<view class="center-info-box">
-				<view class="name-box">
+				<view class="name-box-2">
 					<view>{{userInfo.userName}}</view>
-					<view>奖励分 {{userInfo.totalPoints}}</view>
-					<view>信用分 {{userInfo.scoreCredit}}</view>
 				</view>
 				<view class="account-box">
 					<view>{{userInfo.userType == 2?userInfo.educationName:(userInfo.userType == 1?'教职工':'系统用户')}}</view>
@@ -17,6 +15,10 @@
 					<view> · </view>
 					<view>{{userInfo.deptName}}</view>
 				</view>
+				<view class="name-box-1">
+					<view>奖励分 {{userInfo.totalPoints?userInfo.totalPoints:0}}</view>
+					<view>信用分 {{userInfo.scoreCredit?userInfo.scoreCredit:0}}</view>
+				</view>
 				<!-- <view class="dept-box">
 					<view>{{userInfo.deptName}}</view>
 				</view> -->
@@ -181,7 +183,7 @@
 	.safetyEducationExamination-workbench-userInfoCard {
 		.top-max-big-box {
 			z-index: 0;
-			height: 200rpx;
+			height: 240rpx;
 			background-color: #1959D5;
 			overflow: hidden;
 			display: flex;
@@ -191,24 +193,17 @@
 				border-radius: 50%;
 				width: 98rpx;
 				height: 98rpx;
-				margin: 32rpx 32rpx 0 32rpx;
+				margin: 48rpx 32rpx 0 32rpx;
 			}
 
 			.center-info-box {
 				flex: 1;
 				margin-top:22rpx;
-				.name-box {
+				.name-box-1 {
 					display: flex;
 					margin-top: 18rpx;
-
+					
 					view:nth-child(1) {
-						font-size: 34rpx;
-						font-weight: 700;
-						color: #fff;
-						margin-right: 20rpx;
-					}
-
-					view:nth-child(2) {
 						background: rgba(255, 215, 0, .2);
 						color: #ffe066;
 						font-size: 22rpx;
@@ -219,7 +214,7 @@
 						margin-right: 20rpx;
 					}
 
-					view:nth-child(3) {
+					view:nth-child(2) {
 						background: rgba(0, 210, 140, .18);
 						color: #7fffd4;
 						font-size: 22rpx;
@@ -230,6 +225,18 @@
 						margin-right: 20rpx;
 					}
 				}
+				.name-box-2 {
+					display: flex;
+					margin-top: 8rpx;
+
+					view:nth-child(1) {
+						font-size: 34rpx;
+						font-weight: 700;
+						color: #fff;
+						margin-right: 20rpx;
+					}
+
+				}
 
 				.account-box {
 					display: flex;
@@ -243,6 +250,9 @@
 					view:nth-child(2) {
 						margin: 0 10rpx;
 					}
+					view:nth-child(4) {
+						margin: 0 10rpx;
+					}
 				}
 
 				.dept-box {