分支合并冲突

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>

apps/bigmember_pc/src/router/router-interceptors.js

@@ -41,13 +41,9 @@ const powerCheckWhiteList = [
   'unit_portrayal_id',
   'set-password',
   'portrayal_loading',
-<<<<<<< HEAD
-  'business_detail',
-  'article_detail'
-=======
+  'article_detail',
   'recommen-list',
   'business_detail'
->>>>>>> main
 ]
 
 const regListCheck = function (regList, path) {

apps/bigmember_pc/src/router/routers.js

@@ -246,20 +246,18 @@ export default [
     name: 'set-identity-info',
     component: () => import('@/views/accountInfo/SetIdentityInfo.vue')
   },
-<<<<<<< HEAD
   // 标讯详情页
   {
     path: '/article/:content/:id',
     alias: ['/article/:content/:id', '/nologin/:content/:id'],
     name: 'article_detail',
     component: () => import('@/views/article-content/pages/Article.vue')
-=======
+  },
   // 推荐标讯列表
   {
     path: '/recommen-list',
     name: 'recommen-list',
     component: () => import('@/views/recommen-list/recommenList.vue')
->>>>>>> main
   },
   // 商机情报-详情页
   {

apps/mobile/src/views/push/PushSetting.vue

@@ -1044,14 +1044,8 @@ export default {
     },
     PopupBox() {
       this.$dialog.confirm({
-<<<<<<< HEAD
-        title: '无消息提醒',
-        message:
-          '根据订阅条件，未匹配到新的招投标公告信息时，将为您发送提醒通知。',
-=======
         title: '推荐消息提醒',
         message: '根据您在平台的订阅词/搜索词/浏览标讯进行联想推荐，剑鱼标讯智能推荐为您推送新的标讯信息。',
->>>>>>> main
         className: 'j-confirm-dialog',
         messageAlign: 'left',
         showCancelButton: false,

apps/mobile/src/views/tabbar/Home.vue

@@ -369,11 +369,7 @@ export default {
       //   this.toLogin()
       // }
     },
-<<<<<<< HEAD
     toSearch() {
-=======
-    toSearch () { 
->>>>>>> main
       this.$router.push({
         name: 'search-middle-bidding',
         params: {

apps/mobile/src/views/tabbar/Subscribe.vue

@@ -1472,10 +1472,7 @@ export default {
           }
         })
       } catch (error) {
-<<<<<<< HEAD
-=======
         /* empty */
->>>>>>> main
       } finally {
         loading.clear()
       }
@@ -1653,11 +1650,7 @@ export default {
     resetListState() {
       Object.assign(this.listState, this.$options.data().listState)
     },
-<<<<<<< HEAD
-    async doSearch() {
-=======
     async doSearch(type) {
->>>>>>> main
       if (this.listTabActive === 'table') {
         this.listTabActive = 'list'
       }
@@ -1688,11 +1681,7 @@ export default {
       t.loading = false
       t.finished = true
     },
-<<<<<<< HEAD
     async getList() {
-=======
-    async getList(type) {
->>>>>>> main
       const t = this.listState
       const params = this.getSearchParams()
       this.searchState.listSearchCount += 1