no message

src/pages/setComments/commentRulesList.vue

@@ -6,8 +6,7 @@
 				<text class="commentRulesList-header-title">评论规则</text>
 			</view>
 		</navbar>
-<<<<<<< .merge_file_a12332
-        <view class="commentRulesList-content">
+        <!-- <view class="commentRulesList-content">
             <view class="commentRulesList-title flex">
                 <van-image class="img" width="35rpx" height="40rpx" fit="cover"
 				            src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653980136000_413.png" />
@@ -32,18 +31,7 @@
                 <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653902791000_806.png" mode="widthFix"></image>
                 <view>暂无评论规则数据</view>
             </view>
-        </view>
-        <view class="commentRulesList-footer-box">
-            <view class="commentRulesList-footer flex">
-                <view class="add flex">
-                  <text @click="addRules">添加自定义规则</text>
-                  <view class="Wire"></view>
-                </view>
-               <view class="save flex"><text @click="save">保存</text></view>  
-            </view>
-        </view>
-        <rulesPopup ref="getrulesPopup"></rulesPopup>
-=======
+        </view> -->
 		<view class="commentRulesList-content">
 			<view class="commentRulesList-title flex">
 				<van-image class="img" width="35rpx" height="40rpx" fit="cover" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653980136000_413.png" />
@@ -69,14 +57,13 @@
 		<view class="commentRulesList-footer-box">
 			<view class="commentRulesList-footer flex">
 				<view class="add flex">
-					<text>添加自定义规则</text>
+					<text @click="addRules">添加自定义规则</text>
 					<view class="Wire"></view>
 				</view>
-				<view class="save flex"><text>保存</text></view>
+				<view class="save flex"><text @click="saveRules">保存</text></view>
 			</view>
 		</view>
-		<rulesPopup></rulesPopup>
->>>>>>> .merge_file_a02420
+		<rulesPopup ref="getrulesPopup"></rulesPopup>
 	</view>
 </template>
 <script>
@@ -101,35 +88,27 @@
 			rulesPopup
 		},
 		setup() {
-<<<<<<< .merge_file_a12332
             let { refs } = getCurrentInstance();
-            let {
-=======
 			let {
->>>>>>> .merge_file_a02420
 				proxy
 			} = getCurrentInstance();
 			let data = reactive({
 				Msg: {
 					CourseId: '',
 				},
-<<<<<<< .merge_file_a12332
 				showPhone: false,
 				showLogin: true, //多次点击
                 HomeWorkId:'',
                 jobDetails: {},
                 dataList:[],
                 pageState:'more',
-=======
 				courseRule: {}, //课程规则
->>>>>>> .merge_file_a02420
 			});
 			let methods = {
 				back() {
 					uni.navigateBack({
 						delta: 1
 					})
-<<<<<<< .merge_file_a12332
                 },
                 saveRules(){//保存规则
 
@@ -159,12 +138,6 @@
                         }
                     });
                 },
-            }
-            onMounted (() => {
-                
-            })
-=======
-				},
 				editRules() { //编辑规则
 
 				},
@@ -194,7 +167,6 @@
 					})
 				}
 			}
->>>>>>> .merge_file_a02420
 			return {
 				...toRefs(data),
 				...methods
@@ -223,7 +195,6 @@
 		color: #cecece;
 		text-align: center;
 	}
-<<<<<<< .merge_file_a12332
     .save{
         margin-left: 24rpx;
     }
@@ -346,9 +317,6 @@
         text-align: center;
         padding-right: 40rpx;
     }
-    .navbarSticky {
-=======
-
 	.save {
 		margin-left: 24rpx;
 	}
@@ -493,7 +461,6 @@
 	}
 
 	.navbarSticky {
->>>>>>> .merge_file_a02420
 		display: sticky;
 		top: 0;
 		z-index: 9;