fix: 提交

apps/bigmember_pc/src/components/article-item/ArticleItem.vue

@@ -315,13 +315,19 @@
         </p>
         <div
           class="l-d-item"
-          v-if="config.tagSignupEnd && (article.signEndTimeText || article.deliveryLoc)"
+          v-if="config.tagSignupEnd && article.signEndTimeText"
         >
           <p v-if="article.signEndTimeText">
             <i class="l-d-item-label">报名截止日期：</i>
             {{ article.signEndTimeText }}
           </p>
-          <p v-if="article.deliveryLoc">
+          
+        </div>
+        <div
+          class="l-d-item"
+          v-if="article.deliveryLoc"
+        >
+          <p>
             <i class="l-d-item-label">交付地点：</i>
             {{ article.deliveryLoc }}
           </p>

apps/bigmember_pc/src/views/article-content/components/ContentHeader.vue

@@ -103,8 +103,6 @@ const openTagLink = (event, url) => {
   */
 }
 
-console.log(ContentModel)
-
 const {
   findRenMai,
   showRenMaiButton,

apps/bigmember_pc/src/views/article-content/components/ContentSummary.vue

@@ -273,7 +273,7 @@ function doOpenItem(item, type = '') {
           prop="number"
         >
           <template slot-scope="scope">
-            {{ scope.row.number || '-' }}
+            {{ scope.row.numberUnit || '-' }}
           </template>
         </el-table-column>
       </el-table>
@@ -319,8 +319,12 @@ function doOpenItem(item, type = '') {
   }
 
   .summary-caigou-table {
+    color: #1d1d1d;
     ::v-deep {
       .el-table__header {
+        thead {
+          color: #686868;
+        }
         tr,th {
           background-color: #F9FAFB;
         }

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

@@ -71,7 +71,7 @@ function doChangeFilter() {
 
 <template>
   <div class="search-bid-filter">
-    <div class="guide-go-workspace" v-if="isInWeb">
+    <div class="guide-go-workspace" v-if="isInWeb && false">
       最近五年数据查询以及更多筛选条件请
       <span class="highlight-text">"</span>
       <span class="cursor-button highlight-text" @click="guideGoWorkSpace"
@@ -108,7 +108,7 @@ function doChangeFilter() {
           :vipConf="customMoreSchema.vipConf"
           v-model="filterState"
           vipMaskShow
-          :baseMaskShow="!isLogin"
+          :baseMaskShow="false"
           :vipModuleShow="isInApp && !inBIPropertyIframe"
           @clickVipMask="noPower"
           @clickBaseMask="toLogin"

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

@@ -3,6 +3,7 @@ import { getCurrentInstance, computed } from 'vue'
 import SearchHeaderCard from '@/views/search/components/search-header-card.vue'
 import KeywordTagsPc from '@/views/search/components/keyword-tags.vue'
 import CommonSingleChoice from '@/components/filter-items/CommonSingleChoice.vue'
+import TooltipHelpClass from './tooltip-help-class.vue'
 import { SearchBidModel } from '../model/index'
 import $bus from '@/utils/bus'
 
@@ -122,26 +123,7 @@ function onClearSearchHistory() {
             :beforeChange="checkPower"
           ></common-single-choice>
 
-          <el-tooltip
-            popper-class="tooltip-help-class"
-            effect="dark"
-            placement="bottom"
-            :offset="0"
-          >
-            <i
-              class="iconfont icon-help highlight-text cursor-pointer m-l-4px"
-            ></i>
-            <template slot="content">
-              <div class="tooltip-slot-content w-360px">
-                精准搜索: 搜索结果必须完全包含完整的关键词。如搜索"医疗设备"
-                ，搜索结果一定完整包含“医疗设备”才能被搜索到，而“医疗的设备”或“设备医疗”的项目不会被搜索到。
-                <br />
-                <br />
-                模糊搜索: 系统会先自动智能分词然后再进行搜索。如搜索"医疗设备"
-                ，系统会自动分成“医疗”“设备”然后进行搜索，只要项目中出现“医疗”和“设备”都会被搜索到，前提是两个词必须一同出现在一则公告内，不分先后顺序。
-              </div>
-            </template>
-          </el-tooltip>
+          <TooltipHelpClass />
         </div>
 
         <el-checkbox

apps/bigmember_pc/src/views/search/sun/components/tooltip-help-class.vue

@@ -0,0 +1,39 @@
+<template>
+  <div class="tooltip-help-class-container">
+    <el-tooltip
+      ref="elTooltip"
+      popper-class="tooltip-help-class"
+      effect="dark"
+      :append-to-body="false"
+      placement="bottom"
+      :offset="0"
+    >
+      <i
+        class="iconfont icon-help highlight-text cursor-pointer m-l-4px"
+      ></i>
+      <template slot="content">
+        <div class="tooltip-slot-content w-360px">
+          精准搜索: 搜索结果必须完全包含完整的关键词。如搜索"医疗设备"
+          ，搜索结果一定完整包含“医疗设备”才能被搜索到，而“医疗的设备”或“设备医疗”的项目不会被搜索到。
+          <br />
+          <br />
+          模糊搜索: 系统会先自动智能分词然后再进行搜索。如搜索"医疗设备"
+          ，系统会自动分成“医疗”“设备”然后进行搜索，只要项目中出现“医疗”和“设备”都会被搜索到，前提是两个词必须一同出现在一则公告内，不分先后顺序。
+        </div>
+      </template>
+    </el-tooltip>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ToolTipHelpClass',
+  mounted() {
+    this.$el.appendChild(this.$refs.elTooltip.popperVM.$el)
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -16,6 +16,7 @@ function noPower() {
 }
 
 function beforeChangeHandle($event, char, isLogin) {
+  return true
   if (isLogin) {
     return true
   }
@@ -154,7 +155,8 @@ function createSearchBidBaseSchema(conf = {}) {
       defaultVal: 'thisyear',
       _name: 'time',
       _type: 'component',
-      expand: vipUser ? publishTimeExpandVip : publishTimeExpandFree
+      // expand: vipUser ? publishTimeExpandVip : publishTimeExpandFree
+      expand: publishTimeExpandVip
     },
     {
       key: 'selectType',
@@ -163,7 +165,8 @@ function createSearchBidBaseSchema(conf = {}) {
       defaultVal: ['content', 'title'],
       _name: 'selectType',
       _type: 'component',
-      expand: vipUser ? searchScopeExpandVip : searchScopeExpandFree
+      // expand: vipUser ? searchScopeExpandVip : searchScopeExpandFree
+      expand: searchScopeExpandVip
     },
     {
       key: 'bmjzzt',
@@ -173,7 +176,8 @@ function createSearchBidBaseSchema(conf = {}) {
       _type: 'component',
       labelHeight: '25px',
       labelStyle: {
-        width: '100px',
+        width: '98px',
+        'white-space': 'nowrap'
       },
       expand: {
         component: TagSelector,
@@ -204,7 +208,8 @@ function createSearchBidBaseSchema(conf = {}) {
       _name: 'signUpEndTime',
       _type: 'component',
       labelStyle: {
-        width: '100px',
+        width: '98px',
+        'white-space': 'nowrap'
       },
       labelHeight: isVip || !isInApp ? '22px' : '32px',
       expand: {

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

@@ -458,6 +458,10 @@ export default function () {
    * @param item.key - 按钮标识
    */
   function doListHeaderAction(item, $event) {
+    if (!isLogin.value) {
+      return goLogin()
+    }
+
     const { key } = item
     switch (key) {
       case 'refined-list': {
@@ -507,9 +511,24 @@ export default function () {
     doToggleItemSelection(item.id)
   }
 
+  function scrollToTop(offset = 0) {
+    try {
+      const workContainer = document.querySelector('.micro-app--layout')
+      if (workContainer) {
+        const scrollWrapper = workContainer.parentElement
+        if (scrollWrapper) {
+          scrollWrapper.scrollTop = offset || 0
+        }
+      }
+    } catch (error) {
+      console.log(error)
+    }
+  }
+
   // 分页事件
   function doChangePageNum(page) {
     listState.pageNum = page
+    scrollToTop(0)
     doQuery({}, 'pageNumChange', page)
   }
   // 分页大小事件
@@ -559,6 +578,9 @@ export default function () {
 
   // 跳转详情页
   function toDetail(item) {
+    if (!isLogin.value) {
+      return goLogin()
+    }
     let aHref = ".html"
     if (inputKeywordsState.value.matchKeys && inputKeywordsState.value.matchKeys.length > 0){
       const kds = inputKeywordsState.value.matchKeys.join(' ')

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

@@ -6,11 +6,11 @@
         <div class="purchase-title">
           {{ index + 1 }} . {{ purchase.itemName || '-' }}
         </div>
-        <div class="purchase-line purchase-number highlight-text">数量：{{ purchase.number }}</div>
+        <div class="purchase-line purchase-number highlight-text">数量：{{ purchase.numberUnit || '-' }}</div>
         <div class="purchase-line purchase-info">
-          <div class="purchase-brand">品牌：{{ purchase.brandName }}</div>
+          <div class="purchase-brand">品牌：{{ purchase.brandName || '-' }}</div>
           <div class="p-divider">|</div>
-          <div class="purchase-brand">规格型号：{{ purchase.model }}</div>
+          <div class="purchase-brand">规格型号：{{ purchase.model || '-' }}</div>
         </div>
       </div>
     </div>
@@ -63,6 +63,7 @@ export default {
     .purchase-info {
       display: flex;
       align-items: center;
+      color: #5f5e64;
     }
     .p-divider {
       margin: 0 8px;

apps/mobile/src/views/article/content.vue

@@ -342,9 +342,6 @@ export default {
       if (this.IsCustomTopNet) {
         return false
       }
-      if (!this.canReadConf.showContentModule) {
-        return false
-      }
       return this.canReadConf.show
     },
     showTabActions() {

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

@@ -208,7 +208,7 @@ class CommonContentModel extends BaseModel {
         const list = JSON.parse(saved)
         if (Array.isArray(list)) {
           const r = list.find(item => item.id === baseInfo.id || item.id === result.id)
-          console.log(r)
+          // console.log(r)
           if (r && r.title) {
             result.title = r.title + '等'
           }

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

@@ -269,7 +269,13 @@ class SummaryModel extends BaseModel {
 
     // 项目清单
     result._s = summary
-    result.purchasingList = summary.purchasingList
+    result.purchasingList = summary.purchasingList.map(item => {
+      const numberUnit = item.number ? `${item.number}${item.unitName || ''}` : ''
+      return {
+        ...item,
+        numberUnit
+      }
+    })
     return result
   }