zc

pages_safetyEducationExamination/views/home/component/dataStatisticsReport.vue

@@ -4,7 +4,7 @@
     <!-- 弹窗容器 -->
     <view class="report-wrap" @tap.stop="stopProp">
       <!-- 关闭按钮 -->
-      <view class="close-btn" @tap="handleClose">✕</view>
+      <!-- <view class="close-btn" @tap="handleClose">✕</view> -->
       <scroll-view scroll-y class="report-scroll">
       <view class="report-wrap-big-box">
         <view class="report-wrap-min-box">
@@ -110,7 +110,8 @@
     },
     data() {
       return {
-        logUrl: 'https://labcontrol.nwafu.edu.cn/statics/2024/07/22/d1a9d129-ced7-49ac-b258-e5167d85232d.png',
+				logUrl: uni.getStorageSync('rectangleLogo'),
+				// logUrl: 'https://gzu.zjznai.com/statics/2026/06/17/00df3205-5321-4b46-aae3-0ffe4451ee51.png',
         newData: {
           userName: '',
           account: '',
@@ -205,8 +206,9 @@
           width: 578rpx;
           height: 88rpx;
           border-radius: 6rpx;
-          background-color: #1a6e3a;
-          margin: 40rpx 0 0 48rpx;
+          // background-color: #1a6e3a;
+          background-color: #77161B;
+          margin: 40rpx 0 0 24rpx;
           overflow: hidden;
 
           image {
@@ -231,7 +233,7 @@
           width: 578rpx;
           background-color: #faf6ec;
           border: 1rpx solid #e8dcc8;
-          margin: 9rpx 0 0 48rpx;
+          margin: 9rpx 0 0 24rpx;
           border-radius: 4rpx;
           padding: 10rpx 20rpx;
           box-sizing: border-box;
@@ -261,7 +263,7 @@
 
         // 学年学时列表
         .study-hours-max-big-box {
-          margin: 20rpx 48rpx 0 48rpx;
+          margin: 20rpx 24rpx 0 24rpx;
 
           .study-hours-title-box {
             display: flex;
@@ -339,7 +341,7 @@
 
         // 考试通过记录列表
         .study-hours-max-big-box-2 {
-          margin: 20rpx 48rpx 0 48rpx;
+          margin: 20rpx 24rpx 0 24rpx;
 
           .study-hours-title-box {
             display: flex;

pages_safetyEducationExamination/views/home/component/userInfoCard.vue

@@ -212,7 +212,8 @@
 						background: rgba(255, 215, 0, .2);
 						color: #ffe066;
 						font-size: 22rpx;
-						padding: 4rpx 16rpx;
+						line-height:40rpx;
+						padding: 0 16rpx;
 						border-radius: 40rpx;
 						border: 2rpx solid rgba(255, 215, 0, .35);
 						margin-right: 20rpx;
@@ -222,7 +223,8 @@
 						background: rgba(0, 210, 140, .18);
 						color: #7fffd4;
 						font-size: 22rpx;
-						padding: 4rpx 16rpx;
+						line-height:40rpx;
+						padding: 0 16rpx;
 						border-radius: 40rpx;
 						border: 2rpx solid rgba(0, 210, 140, .4);
 						margin-right: 20rpx;