删除之前部分代码

src/views/Root/Msg/index.vue

@@ -77,14 +77,10 @@
               编辑
           </a>
           <a-divider v-show="record.notify_status === 1" type="vertical" />
-<<<<<<< HEAD
           <a v-if="record.notify_status==1" @click="onDelete(record)">
               删除
           </a> 
           <a v-else-if="record.notify_status==2" style="color: rgba(249, 250, 251, var(--tw-text-opacity));">
-=======
-          <a v-show="record.notify_status === 1" @click="onDelete(record)">
->>>>>>> origin/dev
               删除
           </a> 
         </span>

src/views/Root/News/index.vue

@@ -140,7 +140,6 @@ export default Vue.extend({
   },
   created() {
     this.getList()
-    this.search()
   },
   methods:{
     tableChange(e: any) {
@@ -155,7 +154,6 @@ export default Vue.extend({
         offset: (this.pagination.current - 1) * this.pagination.defaultPageSize
       }
       news.articleList(params).then(res => {
-        console.log(res,'this getlist')
         this.list = res.data.items
         this.pagination.total = res.data.total
         // if (this.searchPageReqParams.title) {
@@ -165,26 +163,15 @@ export default Vue.extend({
     },
     findTitle() {
       const searchParams = this.searchPageReqParams.article_type === 1 ? "searchByPolicy" : "searchByTitle"
-      console.log(searchParams,'this searchParams');
+      console.log(searchParams);
       
       news[searchParams]({title: this.searchPageReqParams.title}).then(res => {
         console.log(res,'this res')
         this.list = res.data.items
         this.pagination.total = res.data.total
-        console.log(this.list,'this.list');
         
       })
     },
-    search(){
-      this.getList
-      if(this.searchPageReqParams.article_type === 1){
-        this.list.filter(item=>{
-          console.log(item,'this item');
-          
-          // return item.title.includes(this.searchPageReqParams.title);
-        })
-      }
-    }, 
     query(){
       console.log(this.searchPageReqParams);
       this.getList()