Merge remote-tracking branch 'origin/feature/v1.0.29' into feature/v1.0.29

apps/mobile/src/composables/quick-monitor/component/QuickMonitor.vue

@@ -291,7 +291,7 @@ export default {
           this.doMonitor()
         }
       } else {
-        this.doCancelMonitor()
+        this.doMonitor()
       }
     },
     async successMonitorAndToPushSettingDialog() {
@@ -384,8 +384,10 @@ export default {
               if (this.beforeLeavePage) {
                 await this.beforeLeavePage()
               }
-              this.$leaveInfo.toLeaveInfoPage({
-                source: `${this.$env.platform}_${this.conf.limitSource}`
+              return openAppOrWxPage(LINKS.留资, {
+                query: {
+                  source: `${this.$env.platform}_${this.conf.limitSource}`
+                }
               })
             }
           }

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

@@ -5,7 +5,7 @@
       <div class="abstract-line" v-if="summaryMap.projectName?.value">
         <div class="abstract-line-label">项目名称</div>
         <div class="abstract-line-value">
-          <span class="abstract-line-value-text">
+          <span class="abstract-line-value-text ellipsis-2">
             {{ summaryMap.projectName?.value }}
           </span>
         </div>
@@ -32,6 +32,7 @@
         <div class="abstract-line-label">业主单位</div>
         <div class="abstract-line-value">
           <span
+            class="ellipsis-2"
             :class="{
               'highlight-text underline clickable': summaryMap.buyer?.link
             }"
@@ -62,7 +63,7 @@
       <div class="abstract-line" v-if="summaryMap.address?.value">
         <div class="abstract-line-label">建设地点</div>
         <div class="abstract-line-value">
-          <span class="abstract-line-value-text">
+          <span class="abstract-line-value-text ellipsis-2">
             {{ summaryMap.address?.value }}
           </span>
         </div>
@@ -70,7 +71,7 @@
       <div class="abstract-line" v-if="summaryMap.approveDept?.value">
         <div class="abstract-line-label">审批机关</div>
         <div class="abstract-line-value">
-          <span class="abstract-line-value-text">
+          <span class="abstract-line-value-text ellipsis-2">
             {{ summaryMap.approveDept?.value }}
           </span>
         </div>
@@ -112,7 +113,7 @@
       <div class="abstract-line" v-if="summaryMap.content?.value">
         <div class="abstract-line-label">建设内容</div>
         <div class="abstract-line-value">
-          <span class="abstract-line-value-text">
+          <span class="abstract-line-value-text ellipsis-2">
             {{ summaryMap.content?.value }}
           </span>
         </div>
@@ -124,6 +125,7 @@
         <div class="abstract-line-label">采购单位</div>
         <div class="abstract-line-value">
           <span
+            class="ellipsis-2"
             :class="{
               'highlight-text underline clickable': summaryMap.buyer?.link
             }"
@@ -137,7 +139,7 @@
         <div class="abstract-line-label">采购联系人 / 联系电话</div>
         <div class="abstract-line-value">
           <span
-            class="abstract-line-value-text"
+            class="abstract-line-value-text ellipsis-2"
             @click="doCallPhone(summaryMap.buyerContactInfo?.tel)"
             :class="{
               'highlight-text': summaryMap.buyerContactInfo?.isFreeView,
@@ -168,7 +170,7 @@
       <div class="abstract-line" v-if="summaryMap.agency?.value">
         <div class="abstract-line-label">招标代理机构</div>
         <div class="abstract-line-value">
-          <span class="abstract-line-value-text">
+          <span class="abstract-line-value-text ellipsis-2">
             {{ summaryMap.agency?.value }}
           </span>
         </div>
@@ -177,7 +179,7 @@
         <div class="abstract-line-label">代理联系人 / 联系电话</div>
         <div class="abstract-line-value">
           <span
-            class="abstract-line-value-text"
+            class="abstract-line-value-text ellipsis-2"
             @click="doCallPhone(summaryMap.agencyContactInfo?.tel)"
             :class="{
               'highlight-text': summaryMap.agencyContactInfo?.isFreeView,
@@ -230,6 +232,7 @@
           </div>
           <div class="abstract-line-value" @click="goToEntPortrait(winner)">
             <span
+              class="ellipsis-2"
               :class="{
                 'highlight-text': winner.id,
                 underline: winner.id,
@@ -244,7 +247,7 @@
           <div class="abstract-line-label">中标联系人 / 联系电话</div>
           <div class="abstract-line-value">
             <span
-              class="abstract-line-value-text"
+              class="abstract-line-value-text ellipsis-2"
               @click="doCallPhone(winner?.personTel?.tel)"
               :class="{
                 'highlight-text': winner?.personTel?.isFreeView,
@@ -308,9 +311,6 @@ export default {
     },
     beforeLeavePage: Function
   },
-  data() {
-    return {}
-  },
   computed: {
     ...mapState({
       summary: (state) => state.article.mainModel.summary

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

@@ -63,7 +63,7 @@ export default {
       if (Array.isArray(bList) && bList.length > 0) {
         const list = bList.map((b) => b.trim()).filter((b) => !!b)
         if (list.length > 1) {
-          return `${list.slice(0, 1).join(',')}等`
+          return `${list.slice(0, 1).join(',')} 等`
         } else {
           return list.join(',')
         }

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

@@ -48,12 +48,12 @@
           <ul class="table-box-row row-4 row-last">
             <li class="tab-box-column bd-r column-1">&nbsp;</li>
             <li class="tab-box-column bd-r column-2">
-              <span class="free-btn-reword" @click="leaveInfo">
+              <span class="free-btn-reword" @click="improveInformation">
                 完善个人信息
               </span>
             </li>
             <li class="tab-box-column bd-r column-3 gold-color">
-              <span class="free-btn-experience">免费体验</span>
+              <span class="free-btn-experience" @click="freeUse">免费体验</span>
               <span class="jump-customer-service" @click="concatKf">
                 咨询客服
               </span>
@@ -84,13 +84,19 @@ export default {
       }
       openAppOrWxPage(LINKS.大会员落地页面)
     },
-    async leaveInfo() {
+    improveInformation() {
+      this.leaveInfo(`jyarticle_see3_plus_${this.$env.platform}`)
+    },
+    freeUse() {
+      this.leaveInfo(`${this.$env.platform}_article_member_freeuse`)
+    },
+    async leaveInfo(source) {
       if (this.beforeLeavePage) {
         await this.beforeLeavePage()
       }
       openAppOrWxPage(LINKS.留资, {
         query: {
-          source: `jyarticle_see3_plus_${this.$env.platform}`
+          source
         }
       })
     },

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

@@ -171,8 +171,6 @@ import { LINKS } from '@/data'
 import { openAppOrWxPage } from '@/utils/'
 import setPageTdk from '@/utils/mixins/modules/set-tdk'
 
-console.log(checkAncestorClass)
-
 export default {
   name: 'ArticleContent',
   mixins: [mixinHeader, setPageTdk, appWxShareMixin],
@@ -489,6 +487,8 @@ export default {
     },
     beforeLeavePage() {
       this.saveStateToStorage()
+      // 返回true，广告位才能正常跳转
+      return true
     },
     clickRight() {
       this.doShare()

apps/mobile/src/views/article/ui/MaskCard.vue

@@ -121,6 +121,7 @@ export default {
   line-height: 20px;
   color: $gold_light;
   h5 {
+    font-size: inherit;
     font-weight: 400;
   }
 }

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

@@ -87,11 +87,7 @@ class ContentModel extends BaseModel {
     const projectName = baseInfo?.projectName
     const projectCode = baseInfo?.projectCode
 
-    content = content.replace(/[^\{\u4e00-\u9fa5]{1,90}{[^\}\u4e00-\u9fa5]+?}/g, '')
-    // 将多个连续的br替换成一个
-    content = content.replace(/(<br\s*\/?>)+/gi, '<br>')
-    content = content.replace(/^((<br\/?>)|(&nbsp;))+/g, '')
-    content = content.replace(/((<br\/?>)|(&nbsp;))+$/g, '')
+    content = content.replace(/[^\{\u4e00-\u9fa5]{1,90}{[^\}\u4e00-\u9fa5]+?}/g, '').trim()
 
     // 下划线高亮项目名称编号
     if(projectName && content.toLowerCase().indexOf(projectName.toLowerCase()) > -1){
@@ -132,10 +128,11 @@ class ContentModel extends BaseModel {
       content = replaceKeyword(content, key, '<span class="keyword highlight-text">$1</span>')
     })
 
-    // 高亮第三方服务
-    if (content) {
-      content = thirdPartyVerify.replaceKeysAndInsertMark(content)
-    }
+    // 将多个连续的br替换成一个
+    content = content.replace(/(<br\s*\/?>)+/gi, '<br>')
+    content = content.replace(/(<br>\s*)+/gi, '<br>')
+    content = content.replace(/^((<br\/?>)|(&nbsp;))+/g, '')
+    content = content.replace(/((<br\/?>)|(&nbsp;))+$/g, '')
 
     // freeView点击查看高亮
     // <span class="freeView">点击查看</span>     ==替换==>    <span class="freeView free-view highlight-text">点击查看</span>

data/data-models/modules/article/model/expand.js

@@ -114,8 +114,8 @@ class ContentExpandModel extends BaseModel {
       result.recommendWinners.list = this.preSortBiddingList(result.recommendWinners.list)
     }
     if (data?.customerRec) {
-      if (Array.isArray(data?.customerRec?.customer)) {
-        data.customerRec.customer = data.customerRec.customer.map((c) => {
+      if (Array.isArray(data?.customerRec?.list)) {
+        data.customerRec.list = data.customerRec.list.map((c) => {
           const arr = []
           if (c.area) {
             arr.push(c.area)

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

@@ -218,7 +218,7 @@ class SummaryModel extends BaseModel {
       new SummaryItem('bidAmount', '中标金额（元）', bidAmountFormat)
     )
 
-    result.list = list
+    result.list = list.filter((s) => !!s.value)
     result.originMap = summary
 
     result._s = summary