Bladeren bron

Merge branch 'dev/v4.8.70_tsz' of qmx/jy into feature/v4.8.70

汤世哲 1 jaar geleden
bovenliggende
commit
72b253b577
1 gewijzigde bestanden met toevoegingen van 5 en 2 verwijderingen
  1. 5 2
      src/web/templates/pc/dataExport_sieve.html

+ 5 - 2
src/web/templates/pc/dataExport_sieve.html

@@ -742,7 +742,7 @@
                     <p class="f-l-c-item" v-if="item.area || item.city">区域:<em class="i-value">${formatRegion(item.area,item.city)}</em></p>
                     <p class="f-l-c-item" v-if="item.industry">行业:<em class="i-value">${formatIndustry(item.industry)}</em></p>
                     <p class="f-l-c-item" v-if="item.buyerclass">采购单位类型:<em class="i-value">${formatBuyerClass(item.buyerclass)}</em></p>
-                    <p class="f-l-c-item" v-if="item.keyword">关键词:<em class="i-value">${formatKeyword(item.keyword)}</em></p>
+                    <p class="f-l-c-item" v-if="item.keywords">关键词:<em class="i-value">${formatKeyword(item.keywords)}</em></p>
                     <p class="f-l-c-item" v-if="item.selectType">关键词匹配方式:<em class="i-value">${formatScope(item.selectType, 'CN')}</em></p>
                     <p class="f-l-c-item">
                       <span v-if="item.minprice || item.maxprice">金额:<em class="i-value">${formatPriceScope(item.minprice, item.maxprice)}</em></span>
@@ -2012,7 +2012,10 @@
       formatKeyword: function(arr) {
         let keyword = ''
         if (arr) {
-          arr = JSON.parse(JSON.parse(arr))
+          arr= JSON.parse(arr)
+          if (typeof arr === 'string') {
+            arr = JSON.parse(arr)
+          }
           arr.forEach(function(v, i) {
             let key = ''
             let append = ''