Merge branch 'dev/1.0.36_zsy' of jianyu/web into feature/v1.0.36

apps/bigmember_pc/src/router/modules/search.js

@@ -3,7 +3,7 @@ export default [
   // 标讯搜索
   {
     path: '/search/bidding',
-    alias: ['/jylab/supsearch/index.html'],
+    alias: ['/jylab/supsearch/index.html', '/jylab/bi/index.html', '/jylab/medical/index.html'],
     name: 'bidding-search',
     component: () => import('@/views/search/bidding/index.vue')
   },

apps/bigmember_pc/src/utils/common.js

@@ -14,6 +14,15 @@ Vue.prototype.$checkLogin = function () {
   }
 }
 
+Vue.prototype.$showLoginDialog = function () {
+  try {
+    openLoginDig && openLoginDig(...arguments)
+  } catch (error) {
+    location.href = '/notin/page?close_goBack=1'
+    console.log(error)
+  }
+}
+
 Vue.prototype.contactCustomer = function (vm) {
   tryCallHooks({
     fn: () => {

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

@@ -86,7 +86,7 @@ const articleRef = ref({
 
 <template>
   <div class="search-bidding-page">
-    <div class="search-bidding-header-container b-rd-8px m-t-24px">
+    <div class="search-bidding-header-container b-rd-8px">
       <search-bid-header></search-bid-header>
     </div>
     <div class="search-bidding-filter-container b-rd-8px">
@@ -141,6 +141,9 @@ const articleRef = ref({
               @onJoinBid="onJoinBid"
               :config="articleRef"
             >
+              <template #bi-slot=" { item }">
+
+              </template>
               <template #right-handle-container>
                 <div
                   v-if="inBIPropertyIframe || inResourceBIIframe"
@@ -267,7 +270,7 @@ const articleRef = ref({
 
   .el-dialog__body {
     padding: 0 32px 0;
-    text-align: center;
+    text-align: center !important;
   }
 
   .el-dialog__footer {

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

@@ -378,7 +378,7 @@ export default function () {
   // 登录
   $bus.$on('bidding:goLogin', goLogin)
   function goLogin () {
-    that.$checkLogin()
+    that.$showLoginDialog()
   }
   // 跳转详情页
   function toDetail(item) {
@@ -429,7 +429,7 @@ export default function () {
   // 列表tag跳转处理
   function tagToDetail (item, label) {
     if(label === 'subtype') {
-      let val = item['stypeadd'] || item['toptype'] || 'ZBXYXX_HT'
+      let val = item['stypeadd'] || item['toptype']
       if(item.subtype === '中标') {
         val = 'ZHB'
       } else if(item.subtype === '招标') {
@@ -438,7 +438,7 @@ export default function () {
       window.open(`/list/stype/${val}.html`)
       return
     } else if(label === 'area'){
-      const val = item['areaadd'] || 'HN'
+      const val = item['areaadd']
       window.open(`/list/area/${val}.html`)
       return
     }
@@ -616,9 +616,9 @@ export default function () {
     // 组件筛选条件
     const originParams = packageFilter()
     sessionStorage.setItem('search:bidding:filter', JSON.stringify(originParams))
-    window.location.replace(location.origin + '/swordfish/page_big_pc/search/bidding?goback=true')
+    // window.location.replace('/page_workDesktop/work-bench/swordfish/page_big_pc/search/bidding?goback=true')
 
-    // window.location.replace(`/page_workDesktop/work-bench/page?link=${encodeURIComponent(goHref_ + 'goback=')}`)
+    window.location.replace(`/page_workDesktop/work-bench/page?link=${encodeURIComponent(goHref_ + 'goback=true')}`)
   }
   // 监听路由事件
   onMounted(() => {