tanxue 3 недель назад
Родитель
Сommit
5065eb8ff4

+ 16 - 5
common/styles/global/components.scss

@@ -103,10 +103,10 @@ view{box-sizing: border-box;}
 .icon-title-navBar-box{
 	background-color: #fff;box-sizing: border-box;
 	.icon-title-box{display: flex;align-items: center;justify-content: center;padding:10rpx 10rpx 20rpx;position: relative;}
-	.nav-bar-title{font-size: 32rpx;height: 64rpx;line-height: 64rpx;color: #333;max-width: 70%;}
-	.nav-bar-box{width: 64rpx;height: 64rpx;line-height: 64rpx;position: absolute;left: 10rpx;top: 10rpx;
+	.nav-bar-title{font-size: 32rpx;height: 64rpx;line-height: 64rpx;color: #333;max-width: 65%;@include single-line-ellipsis();margin-right: 10%;}
+	.nav-bar-box{width: 100rpx;height: 64rpx;line-height: 64rpx;position: absolute;left: 10rpx;top: 10rpx;
 	display: flex;align-items: center;justify-content: center;}
-	.nav-bar-icon{width: 24rpx;height: 38rpx;@include ezy-no-repeat-cover();}
+	.nav-bar-icon{width: 24rpx;height: 38rpx;@include ezy-no-repeat-cover();margin-right: 36rpx;}
 	.bar-ml10{margin-left: 10rpx;}
 	.nav-bar-btn{font-size: 24rpx;position: absolute;right: 20rpx;
 			line-height: 50rpx;border-radius: 8rpx;padding: 0 10rpx;}
@@ -278,8 +278,11 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		padding: 24rpx 0!important;font-size: 30rpx;border-bottom: 1px solid #f5f5f5;
 		.uni-popup__info{color: #333!important;}
 	}
-	.ksxz-close-icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover;
-	position: absolute;top: -100rpx;right: 20rpx;}
+	.uni-dialog-content{padding: 32rpx;}
+	.ksxz-close-icon{
+		width: 100rpx;height: 80rpx;position: absolute;top: -124rpx;right: -36rpx;
+		icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover;display: block;margin: 24rpx auto;}
+	}
 	.uni-dialog-content{justify-content: flex-start!important;}
 	
 	.uni-dialog-button-text{color: #999!important;}
@@ -288,6 +291,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	.ksxz-content-box{
 		width: 100%;font-size: 28rpx;color: #333;max-height: 70vh;overflow: auto;
 		>view{margin-bottom: 12rpx;line-height: 1.6;}
+		.ksxz-user-img{border-radius: 50%;display: block;margin-bottom: 10rpx;}
 		.ksms-row{margin-bottom: 12rpx;}
 		.ksms-intro{color: #666;}
 		.ksxz-img-box{
@@ -296,6 +300,11 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		}
 	}
 	
+	.ksxz-sxt-tip{
+		color: #3fd2a1;font-size: 24rpx;text-align: justify;
+		border: 1rpx dashed #3fd2a1;padding: 4rpx 8rpx;margin-top: 20rpx;
+	}
+	
 }
 
 
@@ -424,4 +433,6 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	    margin: 62rpx auto 24rpx;
 	    font-size: 30rpx;
 	}
+	.sztqr-tip-content{width:680rpx;color: #3fd2a1;font-size: 28rpx;border-top: 1rpx dashed #3fd2a1;
+	padding: 24rpx 4rpx;line-height: 1.6;text-align: justify;margin: 84rpx auto 0;}
 }

+ 6 - 3
common/styles/global/pages.scss

@@ -45,7 +45,7 @@
 		.card-line-title:before{content: ' ';width: 6rpx;height: 28rpx;background-color:#fff;
 		margin-right: 12rpx;display: inline-block;vertical-align: middle;}
 		.card-more{
-			font-size: 24rpx;color: #fff;margin-left: auto;display: flex;align-items: center;
+			font-size: 24rpx;color: #fff;margin-left: auto;display: flex;align-items: center;padding: 20rpx 0 20rpx 32rpx;
 			.more-num{border: 1rpx solid;border-radius: 20rpx;box-sizing:border-box;font-size: 18rpx;padding: 2rpx 4rpx;
 			min-width: 26rpx;display: inline-flex;margin-left:6rpx;justify-content: center;line-height: 18rpx;
 			}
@@ -217,6 +217,7 @@
 			.bj-btn,.jx-btn,.save-btn{height: 60rpx;line-height: 58rpx;box-sizing: border-box;}
 			.bj-btn{margin-left: unset;}
 			.jx-btn,.save-btn{margin-right: unset;}
+			.shiti-num-box{padding: 24rpx 10rpx;}
 			.shiti-num-icon{
 				width: 27px;height: 24px;vertical-align: middle;
 				@include ezy-no-repeat-cover();
@@ -238,14 +239,15 @@
 		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{}
+	.score-dialog-btn,.score-dialog-return-btn{width: 360rpx;margin: 100rpx auto 24rpx;font-size: 30rpx;}
+	.score-dialog-return-btn{margin: 24rpx auto;}
 	.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;}
 	}
+	
 }
 	
 /*** 课程学习 ***/
@@ -336,6 +338,7 @@
 		width: 100%;height: 100rpx;background-color: #f0f0f0;
 		display: flex;align-items: center;justify-content: space-between;
 		padding: 0 24rpx;box-sizing: border-box;position: fixed;bottom: var(--window-bottom);
+		.score-num-box{padding: 20rpx 32rpx 20rpx 0;}
 		.score-num-icon{
 			width: 27px;height: 24px;vertical-align: middle;
 			@include ezy-no-repeat-cover();

+ 8 - 0
components/zhuapaiConfirm/submitScore.vue

@@ -22,6 +22,7 @@
 				<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>
+				<button type="default" class="phone-white-btn score-dialog-return-btn" @click="goIndex">退出</button>
 			</view>
 		</view>
 	</uni-popup>
@@ -62,6 +63,13 @@
 		emits('close');
 		popupRef.value.close()
 	}
+	
+	function goIndex(){
+		uni.navigateTo({
+		  url: `/pages/client/ShouYe/shouye`
+		})
+	}
+	
 
 	function handleCheckSj() {
 		emits('confirm', data);