tanxue 2 månader sedan
förälder
incheckning
f53e613d0f
2 ändrade filer med 29 tillägg och 12 borttagningar
  1. 14 4
      common/styles/global/pages.scss
  2. 15 8
      components/zhuapaiConfirm/submitScore.vue

+ 14 - 4
common/styles/global/pages.scss

@@ -238,11 +238,21 @@
 /*** 得分页面***/
 .exam-score-dialog{
 	width: 100%;height: 100vh;line-height:1.6;background-color: #fff;
-	.score-content-box{box-sizing: border-box;padding:32rpx;
-	    border: 1rpx solid #3fd2a1;margin: 30rpx;border-radius: 10rpx;}
-	.score-content-name{color: #3fd2a1;font-size: 36rpx;margin-bottom:12rpx;}
-	.score-content-text{color: #666;font-size: 32rpx;margin-bottom:4rpx;}
+	.score-content-box{box-sizing: border-box;border-bottom: 1rpx solid #e5e5e5;margin: 30rpx;padding: 0 10rpx 20rpx;}
+	.content-score-box{display: flex;align-items: center;justify-content: space-between;}
+	.score-content-name{width:100%;color: #000;font-size: 30rpx;margin-bottom:12rpx;font-weight: 600;}
+	.score-content-text{
+		color: #666;font-size: 30rpx;margin-bottom:4rpx;
+		text{font-size: 64rpx;color:#ff6c6c;margin-right: 4rpx;}
+		}
 	.score-dialog-btn{width: 360rpx;margin: 100rpx auto 24rpx;font-size: 30rpx;}
+	.progress-circle-box{}
+	.progress-text-btn-box{
+		display: flex;flex-direction: column;align-items: center;
+		.cneter-box{font-size: 32rpx!important;color: #3fd2a1;}
+		.progress-text{margin-bottom: 16rpx;}
+		.container .rightcircle,.container .left .leftcircle{z-index: 2;border-color:#ecedef;}
+	}
 }
 	
 /*** 课程学习 ***/

+ 15 - 8
components/zhuapaiConfirm/submitScore.vue

@@ -9,16 +9,23 @@
 
 			<view class="score-content-box">
 				<view class="score-content-name">{{data.ksName}}</view>
-				<view class="score-content-text">{{labelName}}:{{data.ksScore}}</view>
-				<view class="score-content-text">及格分数:{{data.okScore}}</view>
-				<view class="score-content-text">正确数量:{{data.rightCount}}</view>
-				<view class="score-content-text">试题总数:{{data.shitiTotal}}</view>
-				<view class="score-content-text">用户得分:{{data.userScore}}</view>
+				<view class="content-score-box">
+					<view>
+						<view class="score-content-text">正确数量:{{data.rightCount}}</view>
+						<view class="score-content-text">试题总数:{{data.shitiTotal}}</view>
+						<view class="score-content-text">及格分数:{{data.okScore}}</view>
+						<view class="score-content-text">{{labelName}}:{{data.ksScore}}</view>
+					</view>
+					<view class="score-content-text"><text>{{data.userScore}}</text>分</view>
+				</view>
 			</view>
 
-			<c-progress-circle :progress='data.userAccuracy/100' color='#3ec3c1' size='200rpx'
-				boderWidth="200rpx"></c-progress-circle>
-			<button type="default" class="phone-green-btn score-dialog-btn" @click="handleCheckSj">查看成绩</button>
+			<view class="progress-text-btn-box">
+				<text class="progress-text">正确率</text>
+				<c-progress-circle :progress='data.userAccuracy/100' color='#3fd2a1' size='240rpx'
+					boderWidth="240rpx" class="progress-circle-box"></c-progress-circle>
+				<button type="default" class="phone-green-btn score-dialog-btn" @click="handleCheckSj">查看成绩</button>
+			</view>
 		</view>
 	</uni-popup>
 </template>