From 4ab4cd1d47021e01ef577f6d6ccc714cebd6e45c Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 30 Dec 2021 09:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=B2=A1=E6=9C=89=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E8=AF=A6=E6=83=85=E7=9A=84=E8=AE=AE=E9=A2=98=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/communityGovern/cpt/issue-info.vue  |  8 ++++----
 src/views/modules/visual/heart/index.vue               | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/cpt/issue-info.vue b/src/views/modules/visual/communityGovern/cpt/issue-info.vue
index 381a871cc..6ebd7d49e 100644
--- a/src/views/modules/visual/communityGovern/cpt/issue-info.vue
+++ b/src/views/modules/visual/communityGovern/cpt/issue-info.vue
@@ -23,7 +23,7 @@
               <span>{{ info.issueSuggestion }}</span>
             </div>
 
-            <div class="info-prop">
+            <div class="info-prop" v-if="info.topicInfo">
               <span class="info-title-2">话题内容：</span>
               <div>
                 <div>{{ info.topicInfo.topicContent }}</div>
@@ -43,7 +43,7 @@
               <span class="info-title-2">所属网格：</span>
               <span>{{ info.belongsGridName}}</span>
             </div>
-            <div class="info-prop">
+            <div class="info-prop" v-if="info.topicInfo">
               <span class="info-title-2">话题发表人：</span>
               <span>{{ info.topicInfo.publishedUser}}</span>
             </div>
@@ -51,11 +51,11 @@
               <span class="info-title-2">议题发起人：</span>
               <span>{{ info.issueInitiator}}</span>
             </div>
-            <div class="info-prop">
+            <div class="info-prop" v-if="info.topicInfo">
               <span class="info-title-2">话题来源：</span>
               <span>{{ info.topicInfo.groupName}}</span>
             </div>
-            <div class="info-prop">
+            <div class="info-prop" v-if="info.topicInfo">
               <span class="info-title-2">话题发表时间：</span>
               <span>{{ info.topicInfo.publishedTimeShow}}</span>
             </div>
diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
index d19a3ad10..26bd786de 100644
--- a/src/views/modules/visual/heart/index.vue
+++ b/src/views/modules/visual/heart/index.vue
@@ -80,6 +80,7 @@ import { requestPost } from "@/js/dai/request";
 import cptCard from "@/views/modules/visual/cpts/card";
 import cptTb from "@/views/modules/visual/cpts/tb";
 import nextTick from "dai-js/tools/nextTick";
+import dateFormat from "dai-js/tools/dateFormat";
 
 export default {
   name: "heart",
@@ -88,7 +89,14 @@ export default {
       agencyId: "",
       areaCode: "",
 
-      monthId: "",
+      monthId: dateFormat(
+        new Date(
+          new Date().getFullYear(),
+          new Date().getMonth() - 1,
+          new Date().getDate()
+        ),
+        "yyyyMM"
+      ),
 
       // 先进网格/支部
       tb1: {