Merge branch 'dev/v1.0.63_yf' of jianyu/web into feature/v1.0.63

apps/bigmember_pc/src/components/zhima/mark-in-ent.vue

@@ -111,7 +111,7 @@ export default {
     getList() {
       const list = this.list.map((v) => {
         const topType = v.zhima_toptype
-        v.text = v.zhima_name
+        v.text = v.zhima_value
         v.desc = v.zhima_definition
         switch (topType) {
           case '社会价值':

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

@@ -66,7 +66,7 @@ function getRecommendEntInfo(list) {
           seoId: item.seoId,
           zhiMa:
             type === 'winner' && resItem.zhimaLabels
-              ? resItem.zhimaLabels.map((v) => v.zhima_name).join('，')
+              ? resItem.zhimaLabels.map((v) => v.zhima_value).join('，')
               : ''
         }
         recommendList.value = [].concat(resultList)

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

@@ -219,7 +219,7 @@ export default function () {
           }
         ],
         zhiMaLabels: v.zhima_labels
-          ? v.zhima_labels.map(item => item.zhima_name).join('，')
+          ? v.zhima_labels.map(item => item.zhima_value).join('，')
           : '',
         ...v
       }

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

@@ -83,7 +83,7 @@ export default {
       if (code === 0 && data) {
         data._type = type
         data.zhiMa = data.zhimaLabels
-          ? data.zhimaLabels.map((v) => v.zhima_name).join('，')
+          ? data.zhimaLabels.map((v) => v.zhima_value).join('，')
           : ''
         this.$set(this.req, id, data)
       }

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

@@ -275,7 +275,7 @@ export default {
           },
           address: v.company_address,
           zhiMa: v.zhima_labels
-            ? v.zhima_labels.map((v) => v.zhima_name).join('，')
+            ? v.zhima_labels.map((v) => v.zhima_value).join('，')
             : ''
         }
       })