Merge branch 'dev/v1.0.70_yf' of jianyu/web into hotfix/v1.0.70

apps/bigmember_pc/src/views/portrayal/EntPortrayal.vue

@@ -52,7 +52,7 @@
           <WorkspaceButtonGroup></WorkspaceButtonGroup>
         </div>
       </div>
-      <div class="ent-header-actions" v-if="zhiMaLabels.length">
+      <div class="ent-header-actions" v-if="zhiMaLabels && zhiMaLabels.length">
         <ZhimaMarkInEnt :list="zhiMaLabels" />
       </div>
     </div>

apps/bigmember_pc/src/views/portrayal/EntSearchPortrayal.vue

@@ -58,7 +58,7 @@
           <WorkspaceButtonGroup></WorkspaceButtonGroup>
         </div>
       </div>
-      <div class="ent-header-actions" v-if="zhiMaLabels.length">
+      <div class="ent-header-actions" v-if="zhiMaLabels && zhiMaLabels.length">
         <ZhimaMarkInEnt :list="zhiMaLabels" />
       </div>
     </div>

apps/bigmember_pc/src/views/portrayal/components/EntForm.vue

@@ -51,7 +51,7 @@ export default {
         if (!data) {
           return
         }
-        this.$emit('zhima', data.zhimaLabels)
+        this.$emit('zhima', data.zhimaLabels || [])
         this.$emit('entname', data.entName)
         data.establish = dateFormatter(data.establish * 1000, 'yyyy-MM-dd')
         if (data.operStart !== -1) {

apps/bigmember_pc/src/views/portrayal/components/EntSubVipForm.vue

@@ -55,7 +55,7 @@ export default {
         if (!data) {
           return
         }
-        this.$emit('zhima', data.zhimaLabels)
+        this.$emit('zhima', data.zhimaLabels || [])
         this.$emit('entname', data.entName)
         data.establish =
           data.establish !== -1