feat: 未登录引导登录逻辑调整

apps/bigmember_pc/src/utils/common.js

@@ -18,9 +18,9 @@ Vue.prototype.$checkLogin = function () {
 // 1. type为true，登录后直接跳转工作桌面
 // 2. redirectUrl为'reload'，则登录后刷新当前页面。如果redirectUrl!=='reload'，则想该url做location.href跳转
 // 3. loginCallback登录成功的回调
-Vue.prototype.$showLoginDialog = function () {
+Vue.prototype.$showLoginDialog = function (type, redirectUrl, loginCallback) {
   try {
-    openLoginDig && openLoginDig(...arguments)
+    openLoginDig && openLoginDig(type, redirectUrl, loginCallback)
   } catch (error) {
     console.log(error)
     location.href = '/notin/page?close_goBack=1'

apps/bigmember_pc/src/views/search/sun/components/search-bid-header.vue

@@ -91,7 +91,7 @@ function onClearSearchHistory() {
       placeholder="请输入产品或业务名称关键词，例如：钢板"
       @change-tab="onChangeTab"
       @search="doSearch"
-      :show-wx-qr="!cooperateCode && !inBIPropertyIframe && !isBidField"
+      :show-wx-qr="false"
       :show-workspace-button="isLogin && !isInApp"
       :showTab="!inBIPropertyIframe"
       :historyEnabled="true"

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

@@ -473,7 +473,7 @@ export default function () {
    */
   function doListHeaderAction(item, $event) {
     if (!isLogin.value) {
-      return goLogin()
+      return goLogin(false, 'reload')
     }
 
     const { key } = item
@@ -559,9 +559,12 @@ export default function () {
     doQuery({}, 'pageNumChange', 1)
   }
   // 登录
-  $bus.$on('bidding:goLogin', goLogin)
-  function goLogin() {
-    that.$showLoginDialog(...arguments)
+  $bus.$on('bidding:goLogin', (e) => {
+    // console.log(e)
+    goLogin()
+  })
+  function goLogin(type, redirectUrl) {
+    that.$showLoginDialog(type, redirectUrl)
   }
 
   function createClickInfoItem(item) {
@@ -1365,7 +1368,7 @@ export default function () {
   /*******工作台跳转start***********/
   function guideGoWorkSpace () {
     if (!isLogin.value) {
-      goLogin()
+      goLogin(false, 'reload')
       return
     }
     goWorkSpace()

apps/mobile/src/views/article/components/ContentSummaryPurchaseList.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="content-summary-purchase-list" v-if="purchasingList.length > 0">
+  <section class="content-summary-purchase-list" v-if="purchasingList && purchasingList.length > 0">
     <div class="purchase-list-hd">采购清单</div>
     <div class="purchase-list-bd">
       <div class="purchase-list-card" v-for="(purchase, index) in purchasingList" :key="index">

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

@@ -548,7 +548,7 @@ export default {
         tabSwitchShow: true,
         adItem: {
           id: 0,
-          random: 4,
+          random: 3,
           show: true,
           ad: true
         }
@@ -617,7 +617,7 @@ export default {
       return target || {}
     },
     searchList() {
-      const listAdPosition = 3
+      const listAdPosition = 4
       const { list } = this.listState
       const { adItem } = this.pageState
       const { random, show } = adItem
@@ -959,7 +959,7 @@ export default {
       Object.assign(this.pageState.adItem, {
         id: getRandomString(8).toLowerCase(),
         show: hasClosedAd !== '1',
-        random: getRandomNumber(4, 4)
+        random: getRandomNumber(3, 3)
       })
     },
     onListAdClose(item) {

data/data-models/modules/article/transform/content.js

@@ -211,7 +211,7 @@ class CommonContentModel extends BaseModel {
           const r = list.find(item => item.id === baseInfo.id || item.id === result.id)
           // console.log(r)
           if (r && r.title) {
-            result.title = r.title + '等'
+            result.title = r.title
             return true
           }
         }