feat: 合并冲突

apps/mobile/src/components/search/bidding/filterHistoryDialog.vue

@@ -8,14 +8,9 @@
     @cancel="onClose(false)"
     @close="onClose(false)"
     :before-close="beforeClose"
-<<<<<<< HEAD
     show-cancel-button
   >
-    <CellCard>
-=======
-    show-cancel-button>
     <CellCard scroll>
->>>>>>> main
       <template #header-left>
         <div class="card-left-header">
           <div class="card-item">

apps/mobile/src/components/search/bidding/filters.vue

@@ -740,11 +740,9 @@ export default {
           // 采购单位类型
           sameList.push(deepCompare(this.filters.buyerClass, buyerClass))
           // 联系方式
-<<<<<<< HEAD
           sameList.push(deepCompare(this.filters.winnerConcat, winnerConcat))
           sameList.push(deepCompare(this.filters.buyerConcat, buyerConcat))
           sameList.push(deepCompare(this.filters.notKey, notKey))
-=======
           sameList.push(
             deepCompare(this.filters.winnerConcat, winnerConcat)
           )
@@ -768,7 +766,6 @@ export default {
             deepCompare(this.filters.agencyList, agencyList)
           )
 
->>>>>>> main
           // 附件
           sameList.push(this.filters.fileExists === fileExists)
           needHighlight = sameList.includes(false)

apps/mobile/src/components/selector/keyword-input-group/index.vue

@@ -160,13 +160,8 @@ export default {
     }
   },
   methods: {
-<<<<<<< HEAD
     formatter(value) {
-      return value.replace(/\s{2,}/g, ' ')
-=======
-    formatter (value) {
       return value.replace(/,/g, ' ').replace(/\s{2,}/g, ' ')
->>>>>>> main
     },
     /**
      * 设置页面状态

apps/mobile/src/ui/cell-card/index.vue

@@ -13,14 +13,10 @@
     <div class="card-content-container" @click="onClickContent">
       <div
         class="card-content"
-<<<<<<< HEAD
-        :class="{ 'ellipsis inline': !expand && overflowEllipsis }"
-=======
         :class="{
           'ellipsis inline': !expand && overflowEllipsis,
           'need-scroll': scroll
         }"
->>>>>>> main
       >
         <slot name="default"></slot>
       </div>

apps/mobile/src/views/search/filter-history/bidding.vue

@@ -619,14 +619,10 @@ export default {
       if (val.winner) {
         localStorage.setItem('winner', val.winner)
       }
-<<<<<<< HEAD
-      localStorage.setItem('index', '-1')
-=======
       if (val.agency) {
         localStorage.setItem('agency', val.agency)
       }
-      localStorage.setItem('index','-1') 
->>>>>>> main
+      localStorage.setItem('index','-1')
       if (this.$envs.inWX) {
         window.location.replace(
           `${location.origin}/front/wx_dataExport/toSieve?from=filterList`

apps/mobile/src/views/search/result/bidding/index.vue

@@ -2103,13 +2103,7 @@ export default {
         done()
       }
     },
-<<<<<<< HEAD
-    formatFilterItems(item) {
-      console.log('flag!!!!!!!!!!!!!')
-=======
     formatFilterItems (item) {
-      console.log('flag!!!!!!!!!!!!!', item)
->>>>>>> main
       item.scope = item.selectType
       item.infotype = item.subtype
       const formatted = FilterHistoryAjaxModel2ViewModel.formatAll(item)