Merge branch 'dev/v1.0.53_yf' of jianyu/web into feature/v1.0.53

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

@@ -41,7 +41,8 @@ const {
   setEmployEvent,
   vipDialogConf,
   closeVipDialog,
-  doChangeTab
+  doChangeTab,
+  goWorkSpace
 } = SearchEntModel
 const {
   show: showVipDialog,
@@ -101,7 +102,7 @@ function toBuySvip () {
       <search-header-card
         v-model="inputKeywordsState.input"
         :tabs="searchTabs"
-        :showWorkspaceButton="!isInApp"
+        :showWorkspaceButton="isLogin && !isInApp"
         placeholder="输入企业名称"
         @change-tab="doChangeTab"
         @search="doSearch"
@@ -112,6 +113,7 @@ function toBuySvip () {
         @clearSearch="onClearSearchHistory"
         @clearBrowse="onClearBrowseHistory"
         @selectEnt="onSelectEnt"
+        @goWorkSpace="goWorkSpace"
       >
         <div class="toggle-filter m-l-16px font-size-14px" @click="showFilter = !showFilter">
           <span>筛选</span>

apps/bigmember_pc/src/views/search/ent/model/base.js

@@ -86,9 +86,10 @@ export default function () {
 
   // 页面tab切换Model
   const { searchTabs, doChangeTab } = useSearchTabsModel({ defaultTab: 3, isInApp: isInApp.value })
+  const  { searchvalue: searchValue } = useRoute().query
 
   const inputKeywordsState = ref({
-    input: ''
+    input: searchValue || ''
   })
 
   const {
@@ -440,6 +441,7 @@ export default function () {
     setEmployEvent,
     vipDialogConf,
     closeVipDialog,
-    doChangeTab
+    doChangeTab,
+    goWorkSpace
   }
 }

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

@@ -90,7 +90,7 @@ function onSelectEnt(data) {
       <search-header-card
         v-model="inputKeywordsState.input"
         :tabs="searchTabs"
-        :showWorkspaceButton="!isInApp"
+        :showWorkspaceButton="isLogin && !isInApp"
         @change-tab="doChangeTab"
         placeholder="输入采购单位名称"
         @search="doSearch"

apps/bigmember_pc/src/views/search/purchase/model/base.js

@@ -52,9 +52,10 @@ export default function () {
 
   // 页面tab切换Model
   const { searchTabs, doChangeTab } = useSearchTabsModel({ defaultTab: 4, isInApp: isInApp.value })
+  const  { searchvalue: searchValue } = useRoute().query
 
   const inputKeywordsState = ref({
-    input: ''
+    input: searchValue || ''
   })
 
   // 监控信息（已使用次数、剩余次数、点击的当前项）

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

@@ -13,6 +13,7 @@ import { useSearchSupplyModel, SearchSupplyModel } from './model/index'
 useSearchSupplyModel()
 
 const {
+  isLogin,
   isInApp,
   doChangeTab,
   showFilter,
@@ -53,7 +54,8 @@ function goWorkSpaceCustom() {
   }
   // 保存数据，进入工作台
   sessionStorage.setItem('supply-search-filter-storage', JSON.stringify(supplyData))
-  window.location.replace(import.meta.env.VITE_APP_WORK_DESKTOP_URL + '/search/supply')
+  const goHref_ = location.origin + '/swordfish/page_big_pc/search/supply'
+  window.location.replace(`/page_workDesktop/work-bench/page?link=${encodeURIComponent(goHref_)}`)
 }
 </script>
 
@@ -63,7 +65,7 @@ function goWorkSpaceCustom() {
       <search-header-card
         v-model="inputKeywordsState.input"
         :tabs="searchTabs"
-        :showWorkspaceButton="!isInApp"
+        :showWorkspaceButton="isLogin && !isInApp"
         @change-tab="doChangeTab"
         placeholder="输入您想要查询的供应信息，多个关键词用空格隔开"
         @search="doSearch"
@@ -164,6 +166,17 @@ function goWorkSpaceCustom() {
     }
 
     ::v-deep {
+      .search-header{
+        position: relative;
+        &::after{
+          position: absolute;
+          content: '';
+          left: 32px;
+          right: 20px;
+          bottom: 0;
+          border-bottom: 1px solid #ececec;
+        }
+      }
       .el-badge__content {
         padding: 0 6px;
         right: 26px;

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

@@ -4,11 +4,17 @@ import { useSearchFilterModel } from './modules/filter'
 import { showFilter, loginFlag, goToPublish } from './modules/search-header'
 import { replaceKeyword, dateFromNow, InContainer } from '@/utils'
 import { useSearchTabsModel } from '@/views/search/ent/model/modules/tabs'
+import { useStore } from '@/store'
+import { useRoute } from 'vue-router/composables'
 
 export default function () {
   // 本地调试，可改为工作台内isInApp = ref(true)，  isInWeb = ref(false)
   const isInApp = ref(InContainer.inApp)
   const isInWeb = ref(InContainer.inWeb)
+  // 是否登录
+  const isLogin = computed(() => {
+    return useStore().getters['user/loginFlag']
+  })
   // 解构基础业务
   const APIModel = useQuickSearchModel({
     type: 'search-supply'
@@ -16,9 +22,10 @@ export default function () {
 
   // 页面tab切换Model
   const { searchTabs, doChangeTab } = useSearchTabsModel({ defaultTab: 5, isInApp: isInApp.value })
+  const  { keywords } = useRoute().query
 
   const inputKeywordsState = ref({
-    input: ''
+    input: keywords || ''
   })
 
   const {
@@ -177,6 +184,7 @@ export default function () {
     doChangePageNum,
     doChangePageSize,
     isInApp,
+    isLogin,
     doChangeTab
   }
 }