Merge branch 'dev-shuju' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-shuju

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>

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: {