Răsfoiți Sursa

fix:拟在建路由调整

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>
tangshizhe 1 an în urmă
părinte
comite
dcd8e55311

+ 1 - 1
apps/bigmember_pc/src/views/search/bidding/model/modules/tabs.js

@@ -48,7 +48,7 @@ export function useSearchTabsModel(conf) {
     {
       label: '拟在建项目查询',
       key: 6,
-      link: '/swordfish/page_web_pc/search/construction'
+      link: '/swordfish/page_big_pc/search/nzj'
     },
   ]
   let resTab = []

+ 1 - 1
apps/bigmember_pc/src/views/search/ent/model/modules/tabs.js

@@ -33,7 +33,7 @@ export function useSearchTabsModel(conf) {
     {
       label: '拟在建项目查询',
       key: 6,
-      link: '/swordfish/page_web_pc/search/construction'
+      link: '/swordfish/page_big_pc/search/nzj'
     }
   ]
 

+ 6 - 9
apps/bigmember_pc/src/views/search/nzj/index.vue

@@ -22,7 +22,8 @@ const {
   doChangePageSize,
   doChangeInput,
   doChangeFilter,
-  setSortState
+  setSortState,
+  doChangeTab
 } = SearchNzjModel
 
 const { pathVisiting, createPathItem } = mixinVisited()
@@ -45,10 +46,8 @@ const matchKeys = computed(() => {
 
 function goToDetail(item) {
   const { proposed_id } = item
-  console.log(item.visited, 'item.visited1')
   item.visited = true
   pathVisiting(createPathItem('/proposed/detail', `pid=${proposed_id}`))
-  console.log(item.visited, 'item.visited2')
   let keys = matchKeys.value.length ? matchKeys.value.join(',') : ''
   const routeUrl = `/swordfish/page_web_pc/proposed/detail?pid=${proposed_id}&matchKey=${keys}`
   window.open(routeUrl)
@@ -61,7 +60,10 @@ function goToDetail(item) {
       <search-header-card
         v-model="inputKeywordsState.input"
         :tabs="searchTabs"
-        placeholder="输入项目名称"
+        @change-tab="doChangeTab"
+        :placeholder="
+          filterParams.searchSort === 0 ? '输入项目名称' : '输入单位名称'
+        "
         @search="doSearch"
       >
         <div class="tab-switch-content" slot="tab-switch-content">
@@ -159,11 +161,6 @@ function goToDetail(item) {
     .search-nzj-filter {
       margin-top: 16px;
       background-color: #fff;
-      ::v-deep {
-        .flex-items-start {
-          border-bottom: 1px dashed rgba(0, 0, 0, 0.05);
-        }
-      }
       .filter-button {
         display: flex;
         align-items: center;

+ 10 - 7
apps/bigmember_pc/src/views/search/nzj/model/base.js

@@ -2,6 +2,8 @@ import { computed, reactive, ref } from 'vue'
 import useQuickSearchModel from '@jy/data-models/modules/quick-search/model'
 import { filterState } from './modules/filter'
 import { SearchNzjBaseSchema } from '../constant/search-filters'
+import { useSearchTabsModel } from '@/views/search/ent/model/modules/tabs'
+import { InContainer, openLinkInWorkspace } from '@/utils'
 
 export default function () {
   // 解构基础业务
@@ -9,13 +11,6 @@ export default function () {
     type: 'search-nzj'
   })
 
-  const searchTabs = [
-    {
-      label: '拟在建项目搜索',
-      key: 'nzj',
-      active: true
-    }
-  ]
 
   const inputKeywordsState = ref({
     input: ''
@@ -30,6 +25,13 @@ export default function () {
     searchResultCount
   } = APIModel
 
+  const isInApp = ref(InContainer.inApp)
+  // 页面tab切换Model
+  const { searchTabs, doChangeTab } = useSearchTabsModel({
+    defaultTab: 6,
+    isInApp: isInApp.value
+  })
+
   /**
    * 统一查询入口
    * - 拦截 doQuery 进行一些返回值处理
@@ -228,6 +230,7 @@ export default function () {
     searchTabs,
     inputKeywordsState,
     doSearch,
+    doChangeTab,
     doChangePageNum,
     doChangePageSize
   }

+ 1 - 1
apps/jy-pc/src/views/search/Issued.vue

@@ -330,7 +330,7 @@ export default {
           location.href = '/jylab/supsearch/index.html?tab=2&searchGroup=2'
           break
         case 5:
-          this.$router.push('/search/construction')
+          this.$router.push('/search/nzj')
           break
         default:
           break