页面修改

src/components/setComments/setComments.vue

@@ -118,151 +118,6 @@
 	};
 </script>
 <style scoped>
-<<<<<<< HEAD
-	.setComments-Evaluation view text:first-child {
-		border-right: 1px solid #E5E5E5;
-		padding: 0 16rpx 0 0;
-	}
-
-	.setComments-Evaluation view text:last-child {
-		margin-left: 16rpx;
-	}
-
-	.setComments-Evaluation view text {
-		display: inline-block;
-		letter-spacing: 1rpx;
-	}
-
-	.setComments-Evaluation view {
-		float: right;
-		margin-top: 25rpx;
-		margin-bottom: 27rpx;
-		font-size: 24rpx;
-		font-weight: 500;
-		color: #CE8086;
-	}
-
-	.setComments-Evaluation {
-		height: 85rpx;
-		border-top: 1rpx solid #E5E5E5;
-	}
-
-	.setComments-source {
-		font-size: 20rpx;
-		color: #C2BCBA;
-		font-weight: 500;
-		justify-content: space-between;
-		padding: 26rpx 0 25rpx 0;
-	}
-
-	.point {
-		width: 8rpx;
-		height: 8rpx;
-		background: #E64150;
-		border-radius: 50%;
-	}
-
-	.setComments-options-title,
-	.setComments-options-text {
-		font-size: 24rpx;
-		font-weight: 500;
-		color: #CE8086;
-		text-align: center;
-		font-weight: bold;
-	}
-
-	.setComments-options-text text {
-		padding: 5rpx 0;
-	}
-
-	.setComments-options-text {
-		flex-direction: column;
-		margin-top: 10rpx;
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 35rpx;
-		background: #FCEEEF;
-		padding: 20rpx 0 20rpx 0;
-		border-radius: 0 0 25rpx 25rpx;
-	}
-
-	.setComments-options-title text {
-		margin-right: 10rpx;
-		margin-left: 10rpx;
-	}
-
-	.setComments-options-title {
-		justify-content: center;
-		align-items: center;
-	}
-
-	.setComments-options {
-		flex-grow: 1;
-		border-radius: 25rpx;
-		background: #FCEEEF;
-		flex-direction: column;
-		padding: 14rpx 17rpx 15rpx 17rpx;
-		letter-spacing: 1rpx;
-		position: relative;
-	}
-
-	.setComments-title-right {
-		width: 190rpx;
-		flex-shrink: 0;
-	}
-
-	.setComments-title-left {
-		letter-spacing: 1rpx;
-		flex-grow: 1;
-		color: #282828;
-		font-size: 26rpx;
-		font-weight: bold;
-		margin-right: 20rpx;
-	}
-
-	.center-line {
-		position: absolute;
-		left: 0;
-		top: 30rpx;
-		width: 4rpx;
-		height: 23rpx;
-		background: #282828;
-	}
-
-	.setComments-content {
-		position: relative;
-		background: #FFFFFF;
-		padding: 21rpx 27rpx 0 22rpx;
-		box-shadow: 0px 6px 29px 0px rgba(76, 76, 76, 0.09);
-		border-radius: 30px;
-	}
-
-	.setComments-content-box {
-		padding: 0 50rpx;
-	}
-
-	.setComments-add van-icon {
-		font-size: 25rpx;
-		margin-right: 20rpx;
-	}
-
-	.setComments-add {
-		width: 190rpx;
-		margin: auto;
-		border-radius: 27rpx;
-		border: 1rpx solid #FB6087;
-		color: #FB6087;
-		font-size: 24rpx;
-		letter-spacing: 1rpx;
-		padding: 10rpx 0;
-		margin-bottom: 47rpx;
-		text-align: center;
-	}
-
-	.index-student-information {
-		min-height: 800rpx;
-=======
     .setComments-Evaluation view text:first-child{
         border-right: 1px solid #E5E5E5;
         padding: 0 16rpx 0 0;
@@ -385,10 +240,9 @@
     }
     .index-student-information{
         min-height: 800rpx;
->>>>>>> 5ef2f509125236dffc7e7eb3c1403abaca6832c1
 		background: #FFFFFF;
 		border-radius: 50rpx 50rpx 0 0;
 		padding: 71rpx 0 30rpx 0;
-		flex-direction: column;
-	}
+        flex-direction: column;
+    }
 </style>

src/pages/setComments/setComments.vue

@@ -6,7 +6,6 @@
 				<text class="setComments-index-header-title">设置评语</text>
 			</view>
 		</navbar>
-<<<<<<< HEAD
 		<view class="setComments-index-content">
 			<view class="setComments-index-setType flex">
 				<view class="setComments-setType-left flex">
@@ -29,32 +28,7 @@
 			</view>
 			<setComments :CourseCommentTimesList="courseTimeList" @refreshData="getCourseCommentTimes"></setComments>
 		</view>
-=======
-        <view class="setComments-index-content">
-            <view class="setComments-index-setType flex">
-                <view class="setComments-setType-left flex">
-                    <view>
-                        <van-image class="img" width="29rpx" height="29rpx" fit="cover"
-				            src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653977710000_475.png" />
-                    </view>
-                    <view class="setComments-setType-text flex">
-                        <text>自定义评价</text>
-                        <view>从自动评价规则进入修改</view>
-                    </view>
-                    
-                </view>
-                <view class="setComments-setType-right flex" @click="goRules">
-                    <view>
-                        <text>自动评价规则</text>
-                        <van-image class="img" width="14rpx" height="13rpx" fit="cover"
-                                src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653977684000_601.png" />
-                    </view>
-                    
-                </view>
-            </view>
-            <setComments></setComments>
-        </view>
->>>>>>> 5ef2f509125236dffc7e7eb3c1403abaca6832c1
+ 
 	</view>
 </template>
 <script>
@@ -115,7 +89,7 @@
 					uni.navigateBack({
 						delta: 1
 					})
-<<<<<<< HEAD
+
 				},
 				radioChange(e) {
 					console.log("打印国家名称", e.target.value)
@@ -127,17 +101,14 @@
 							data.courseTimeList = res.Data;
 						}
 					})
+				},
+				goRules() {
+					uni.navigateTo({
+						url: '/pages/setComments/commentRulesList'
+					})
 				}
-			}
-=======
-                },
-                goRules(){
-                    uni.navigateTo({
-                        url:'/pages/setComments/commentRulesList'
-                    })
-                }
-            }
->>>>>>> 5ef2f509125236dffc7e7eb3c1403abaca6832c1
+			};
+
 			return {
 				...toRefs(data),
 				...methods
@@ -151,7 +122,6 @@
 	};
 </script>
 <style scoped>
-<<<<<<< HEAD
 	.setComments-setType-right view text {
 		margin-right: 11rpx;
 	}
@@ -224,69 +194,6 @@
 	}
 
 	.navbarSticky {
-=======
-    .setComments-setType-right view text{
-        margin-right: 11rpx;
-    }
-    .setComments-setType-right view{
-        color: #D9868D;
-        background: #F5DEE0;
-        border-radius: 25rpx;
-        width: 200rpx;
-        height: 50rpx;
-        line-height: 50rpx;
-        text-align: center;
-        letter-spacing: 1rpx;
-    }
-    .setComments-setType-right{
-        flex-shrink: 0;
-        font-size: 24rpx;
-        font-weight: 500;
-        
-    }
-    .setComments-setType-text view{
-        font-size: 24rpx;
-        color: #AFAFAF;
-        font-weight: 400;
-        margin-top: 15rpx;
-    }
-    .setComments-setType-text text{
-        font-size: 30rpx;
-        font-weight: bold;
-        color: #282828;
-    }
-    .setComments-setType-text{
-        flex-direction: column;
-        margin-left: 26rpx;
-        letter-spacing: 1rpx;
-    }
-    .setComments-setType-left view:first-child{
-        flex-shrink: 0;
-    }
-    .setComments-setType-left{
-        flex-grow: 1;
-        margin-right: 32rpx;
-    }
-    .setComments-index-setType{
-        background: #FCEEEF;
-        box-shadow: 0rpx 6rpx 52rpx 0rpx rgba(230, 65, 80, 0.19);
-        border-radius: 50rpx;
-        margin: 55rpx 50rpx 50rpx 50rpx;
-        padding: 33rpx 50rpx;
-    }
-    .setComments-index-box{
-        background: #F6F6F6;
-    }
-    .setComments-index-header-title{
-        font-size: 32rpx;
-        font-weight: 500;
-        color: #282828;
-		flex:1;
-        text-align: center;
-        padding-right: 40rpx;
-    }
-    .navbarSticky {
->>>>>>> 5ef2f509125236dffc7e7eb3c1403abaca6832c1
 		display: sticky;
 		top: 0;
 		z-index: 9;