소스 검색

fix: 修复标讯详情页中标金额为0的情况下,没有取预算的问题

cuiyalong 10 달 전
부모
커밋
6fde4b7eba
1개의 변경된 파일14개의 추가작업 그리고 14개의 파일을 삭제
  1. 14 14
      data/data-models/modules/article/transform/content.js

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

@@ -1,11 +1,7 @@
-import BaseModel from '../../../core/base'
 import { dateFormatter, formatMoney, getQueryParam } from '@jy/util'
 import { dateFormatter, formatMoney, getQueryParam } from '@jy/util'
+import BaseModel from '../../../core/base'
 
 
 class CommonContentModel extends BaseModel {
 class CommonContentModel extends BaseModel {
-  constructor(config) {
-    super(config)
-  }
-
   createModel() {
   createModel() {
     const contentModel = {
     const contentModel = {
       id: '',
       id: '',
@@ -45,7 +41,7 @@ class CommonContentModel extends BaseModel {
     return contentModel
     return contentModel
   }
   }
 
 
-  formatModel(data, isInit = false) {
+  formatModel(data) {
     const result = this.createModel()
     const result = this.createModel()
     const { baseInfo, detailInfo } = data
     const { baseInfo, detailInfo } = data
     result.id = baseInfo.id ? decodeURIComponent(baseInfo.id) : ''
     result.id = baseInfo.id ? decodeURIComponent(baseInfo.id) : ''
@@ -86,6 +82,7 @@ class CommonContentModel extends BaseModel {
   isNiJianCheck(type) {
   isNiJianCheck(type) {
     return type === '拟建'
     return type === '拟建'
   }
   }
+
   isCaigouyixiangCheck(type) {
   isCaigouyixiangCheck(type) {
     return type === '采购意向'
     return type === '采购意向'
   }
   }
@@ -95,7 +92,7 @@ class CommonContentModel extends BaseModel {
     const defaultURL = 'javascript:void(0);'
     const defaultURL = 'javascript:void(0);'
 
 
     const area = [baseInfo?.area, baseInfo?.city, baseInfo?.district]
     const area = [baseInfo?.area, baseInfo?.city, baseInfo?.district]
-      .filter((v) => v)
+      .filter(v => v)
       .join('-')
       .join('-')
 
 
     const typeItem = {
     const typeItem = {
@@ -108,7 +105,7 @@ class CommonContentModel extends BaseModel {
     }
     }
 
 
     const amountItem = {
     const amountItem = {
-      label: formatMoney(baseInfo?.bidAmount ?? baseInfo?.budget ?? ''),
+      label: formatMoney(baseInfo?.bidAmount || baseInfo?.budget || ''),
       link: defaultURL
       link: defaultURL
     }
     }
 
 
@@ -127,7 +124,7 @@ class CommonContentModel extends BaseModel {
       },
       },
       // amount
       // amount
       amountItem
       amountItem
-    ].filter((v) => v.label)
+    ].filter(v => v.label)
 
 
     return tags.map((t) => {
     return tags.map((t) => {
       return {
       return {
@@ -146,18 +143,21 @@ class CommonContentModel extends BaseModel {
     let keysList = []
     let keysList = []
 
 
     // 移动端订阅预览等跳转过来传的词
     // 移动端订阅预览等跳转过来传的词
-    if (/^(subkey_)/.test(s_words)) {
-      keysList = s_words.replace(/^(subkey_)/, '').split('_')
+    const subKeyReg = /^subkey_/
+    if (subKeyReg.test(s_words)) {
+      keysList = s_words.replace(subKeyReg, '').split('_')
       let keyListArr = []
       let keyListArr = []
       keysList.forEach((v) => {
       keysList.forEach((v) => {
         const vArr = v.split('+')
         const vArr = v.split('+')
         keyListArr = keyListArr.concat(vArr)
         keyListArr = keyListArr.concat(vArr)
       })
       })
-    } else {
-      const reg = /[_\+\s+]/ // 匹配 _+空格
+    }
+    else {
+      const reg = /[_+\s]/ // 匹配 _+空格
       if (reg.test(s_words)) {
       if (reg.test(s_words)) {
         keysList = s_words.split(reg).filter(w => !!w)
         keysList = s_words.split(reg).filter(w => !!w)
-      } else {
+      }
+      else {
         keysList.push(s_words)
         keysList.push(s_words)
       }
       }
     }
     }