Merge branch 'dev' into test

src/views/modules/visual/communityGovern/cpt/issue-info.vue

@@ -23,7 +23,8 @@
               <span>{{ info.issueSuggestion }}</span>
             </div>
 
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题内容：</span>
               <div>
                 <div>{{ info.topicInfo.topicContent }}</div>
@@ -43,7 +44,8 @@
               <span class="info-title-2">所属网格：</span>
               <span>{{ info.belongsGridName}}</span>
             </div>
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题发表人：</span>
               <span>{{ info.topicInfo.publishedUser}}</span>
             </div>
@@ -51,11 +53,13 @@
               <span class="info-title-2">议题发起人：</span>
               <span>{{ info.issueInitiator}}</span>
             </div>
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题来源：</span>
               <span>{{ info.topicInfo.groupName}}</span>
             </div>
-            <div class="info-prop" v-if="info.topicInfo">
+            <div class="info-prop"
+                 v-if="info.topicInfo">
               <span class="info-title-2">话题发表时间：</span>
               <span>{{ info.topicInfo.publishedTimeShow}}</span>
             </div>
@@ -181,8 +185,10 @@ export default {
       if (code === 0) {
         this.info = data
 
-        this.info.topicInfo.publishedTimeShow = dateFormat(new Date(this.info.topicInfo.publishedTime * 1000), "yyyy-MM-dd")
+        if (this.info.topicInfo && this.info.topicInfo.publishedTime) {
+          this.info.topicInfo.publishedTimeShow = dateFormat(new Date(this.info.topicInfo.publishedTime * 1000), "yyyy-MM-dd")
 
+        }
       } else {
         this.$message.error(msg);
       }