feat：供应搜索联调

apps/bigmember_pc/src/views/search/components/search-schema-filter.vue

@@ -62,7 +62,7 @@ const getPrefix = {
           {{ item.label }}
         </slot>
       </div>
-      <div>
+      <div class="flex-1">
         <!-- @component 自定义组件  -->
         <!-- @input @change 兼容不同组件的输出  -->
         <Component

apps/bigmember_pc/src/views/search/layout/search-list.vue

@@ -47,6 +47,7 @@ const canShowPagination = computed(() => {
   if (props.listState.loading && props.listState.pageNum === 1) {
     return false
   }
+  if (!props.list.length) return false
   return props.listState.total > 0
 })
 </script>

apps/bigmember_pc/src/views/search/supply/constant/search-filters.js

@@ -1,5 +1,5 @@
 import SearchScopeSelector from '@/components/filter-items/SearchScopeSelector.vue'
-import AreaSelector from '@/components/selector/AreaSelector.vue'
+import RegionCollapseSelector from '@/components/filter-items/RegionCollapseSelector.vue'
 import TimeSelector from '@/components/selector/TimeSelector.vue'
 import TagSelector from '@/components/selector/TagSelector.vue'
 
@@ -35,17 +35,14 @@ const SearchSupplyBaseSchema = [
     }
   },
   {
-    key: 'selectArea',
+    key: 'regionMap',
     label: '选择区域：',
     defaultVal: [],
     _name: 'type',
     _type: 'component',
     expand: {
-      component: AreaSelector,
-      props: {
-        selectorType: 'line',
-        showKey: false
-      },
+      component: RegionCollapseSelector,
+      props: {},
       hooks: {}
     }
   },

apps/bigmember_pc/src/views/search/supply/index.vue

@@ -7,7 +7,6 @@ import {
   showFilter,
   loginFlag,
   goToPublish,
-  mixinVisited,
   filterState,
   searchTabs,
   inputKeywordsState,
@@ -20,24 +19,20 @@ import {
 import {
   SearchSupplyBaseSchema
 } from './constant/search-filters'
-import { onMounted, ref } from 'vue'
 
-const { refreshVisited, pathVisiting, createPathItem } = mixinVisited()
-onMounted(() => {
-  refreshVisited()
-})
 
 function goDetail(item) {
+  // 一切都好进供应搜索点击列表需要登录，其他不需要登录
+  if (!loginFlag) {
+    const cookieInfo = document.cookie.split('; ');
+    const isPass = cookieInfo.some(item => item.indexOf('channelCode') > -1)
+    if (isPass) {
+      window.location.href = '/notin/page'
+      return
+    }
+  }
   const { id } = item
-  item.visited = true
-  pathVisiting(
-    createPathItem(
-      '/demand/detail',
-      `id=${id}`
-    )
-  )
   const routerUrl = `/swordfish/page_web_pc/demand/detail/${id}?matchKey=${inputKeywordsState.value.input}`
-
   window.open(routerUrl)
 }
 </script>
@@ -92,6 +87,7 @@ function goDetail(item) {
           :tags='item.tags'
           :time="item.time"
           :visited="item.visited"
+          v-visited:demand="item.id"
           @onClick="goDetail(item)"
         >
         </supply-article-item>
@@ -109,10 +105,17 @@ function goDetail(item) {
     .toggle-filter{
       cursor: pointer;
       color: #686868;
+      .icon-zhankai{
+        display: inline-block;
+        margin-left: 2px;
+        transform: rotate(0deg);
+        transition: transform .3s;
+      }
       .rotate180 {
         transform: rotate(180deg);
       }
     }
+    
     ::v-deep{
       .el-badge__content {
         padding: 0 6px;
@@ -128,6 +131,9 @@ function goDetail(item) {
       .el-badge__content--danger{
         background-color: #fb483d;
       }
+      .selector-content{
+        margin-left: -5px;
+      }
     }
   }
   .search-header-container{

apps/bigmember_pc/src/views/search/supply/model/index.js

@@ -3,9 +3,7 @@ import useQuickSearchModel from '@jy/data-models/modules/quick-search/model'
 import { useSearchFilterModel } from './modules/filter'
 import { showFilter, loginFlag, goToPublish } from './modules/search-header'
 import { replaceKeyword, dateFromNow } from '@/utils'
-import { mixinVisited } from '@/utils/mixins/visited-setup.js'
 
-const { pathVisited, createPathItem } = mixinVisited()
 // 解构基础业务
 const APIModel = useQuickSearchModel({
   type: 'search-supply'
@@ -65,6 +63,11 @@ const formatList = computed(() => {
         value: item.province
       })
     }
+    if (item.city && item.city.replace('市', '') !== item.province) {
+      tags.push({
+        value: item.city.replace('市', '')
+      })
+    }
     return {
       id: item.id,
       title: replaceKeyword(item.title, inputKeywordsState.value.input, [
@@ -76,14 +79,21 @@ const formatList = computed(() => {
         '</span>'
       ]) : '',
       time: dateFromNow(item.publish_time * 1000),
-      tags: tags,
-      visited: false
+      tags: tags
     }
   })
 })
 
+// 页码总数只在第一页返回-记录保存
+const pageInfo = reactive({
+  total: 0
+})
 // search-list 组件所需参数
 const searchListProps = computed(() => {
+  if (listState.pageNum === 1) {
+    pageInfo.total = listState.total
+  }
+  listState.total = pageInfo.total
   return {
     showSelect: false,
     headerActions: [],
@@ -118,12 +128,13 @@ function getParams(params = {}) {
     {
       searchType: 'title',
       keywords: inputKeywordsState.value.input || '',
-      pageNum: listState.pageNum,
+      pageIndex: listState.pageNum,
       pageSize: listState.pageSize
     },
     getFormatAPIParams(),
     params
   )
+  console.log(result, 'result')
   return result
 }
 
@@ -131,7 +142,6 @@ export {
   showFilter,
   loginFlag,
   goToPublish,
-  mixinVisited,
   // 列表
   list,
   doQuery,

apps/bigmember_pc/src/views/search/supply/model/modules/filter.js

@@ -8,21 +8,49 @@ export function useSearchFilterModel() {
     status: 0,
     province: '',
     city: '',
-    time: ''
+    time: '',
+    regionMap: {}
   })
 
   function getFormatAPIParams() {
+    const { province, city } = getProvinceCity()
     const params = {
       searchType: filterState.value.searchType.toString(),
       status: filterState.value.status.toString(),
-      province: filterState.value.province,
-      city: filterState.value.city,
-      time: filterState.value.time
+      province: province.toString(),
+      city: city.toString(),
+      time: getFilterTime(filterState.value.time)
     }
 
     return params
   }
 
+  function getFilterTime(time) {
+    const { start, end } = time
+    if (start && end) {
+      return `${parseInt(start / 1000)}-${parseInt(end / 1000)}`
+    } else {
+      return ''
+    }
+  }
+
+  function getProvinceCity() {
+    const regionMap = filterState.value.regionMap
+    const province = []
+    const city = []
+    for (const key in regionMap) {
+      if (regionMap[key].length === 0) {
+        province.push(key)
+      } else {
+        city.push(...regionMap[key])
+      }
+    }
+    return {
+      province,
+      city
+    }
+  }
+
   return {
     filterState,
     getFormatAPIParams

packages/pc-ui/src/packages/article-item/supply-article-item.vue

@@ -1,9 +1,9 @@
 <template>
-  <div class="article-item-container supply-article-item" :class="{ 'visited': visited }">
+  <div class="article-item-container supply-article-item"  @click.stop="onClick">
     <div class="article-item-header">
       <slot name="prefix"></slot>
     </div>
-     <div class="article-item-content" :class="{ line: !detail, 'tags-bottom': tagsPosition === 'bottom' }" @click.stop.prevent="onClick">
+     <div class="article-item-content" :class="{ line: !detail, 'tags-bottom': tagsPosition === 'bottom' }">
       <div class="a-i-c-top visited-hd">
         <div class="ellipsis" v-html="calcTitle"></div>
         <div class="tags" v-if="tagsPosition === 'bottom'">
@@ -70,11 +70,6 @@ export default {
       type: Array,
       default: () => []
     },
-    // 已读
-    visited: {
-      type: Boolean,
-      default: false
-    },
     tagsPosition: {
       type: String,
       default: 'right'
@@ -116,7 +111,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 18px 36px;
+    padding: 18px 26px;
     width: 100%;
     cursor: pointer;