From 6378d83c6f40a3be5efb0bbe1e021eeb577509bb Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 3 Dec 2021 16:46:14 +0800
Subject: [PATCH 1/2] BUG 25208

---
 src/apps/AppAskForm/formDetail.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppAskForm/formDetail.vue b/src/apps/AppAskForm/formDetail.vue
index 3cdafa8d..a8a68717 100644
--- a/src/apps/AppAskForm/formDetail.vue
+++ b/src/apps/AppAskForm/formDetail.vue
@@ -126,6 +126,9 @@ export default {
     }
   },
   methods: {
+    emitShow(){
+      document.title = this.form.title || "调查问卷"
+    },
     getForm() {
       let {id} = this.$route.query
       this.$http.post("/app/appquestionnairetemplate/queryDetailById", null, {
@@ -223,9 +226,6 @@ export default {
   },
   created() {
     this.isResult ? this.getResult() : this.getForm()
-  },
-  mounted() {
-    document.title = this.form.title || "调查问卷"
   }
 }
 </script>

From 8efedfba8ed5a77b9545068e88317afda6aee280 Mon Sep 17 00:00:00 2001
From: wanglei <1336977847@qq.com>
Date: Fri, 3 Dec 2021 16:52:23 +0800
Subject: [PATCH 2/2] 25226

---
 src/apps/AppNotification/AppNotification.vue | 75 ++++++++++----------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/apps/AppNotification/AppNotification.vue b/src/apps/AppNotification/AppNotification.vue
index 99c6d603..1e32da04 100644
--- a/src/apps/AppNotification/AppNotification.vue
+++ b/src/apps/AppNotification/AppNotification.vue
@@ -6,7 +6,7 @@
       </AiTopFixed>
       <div class="body" v-if="dataList.length">
         <div class="card" v-for="(item,idx) in dataList" :key="idx" @click="handeClick(item)">
-          <template>
+          <template v-if="!item.imgUrl">
             <label>
               <span class="status" v-if="index==0 && item.readStatus==0">未读</span>
               <span class="status read" v-if="index==0 && item.readStatus!=0">已读</span>
@@ -21,25 +21,26 @@
             <text>{{ item.releaseTime }}</text>
           </span>
           </template>
-<!--          <template v-else>-->
-<!--            <div class="has-pic">-->
-<!--              <div class="left">-->
-<!--                <label>-->
-<!--                  <b v-if="index==0 && item.readStatus==0"></b>-->
-<!--                  <div class="tag" v-if="index==1" :style="color(item.status)">-->
-<!--                    {{ $dict.getLabel("announcementStatus", item.status) }}-->
-<!--                  </div>-->
-<!--                  {{ item.title }}-->
-<!--                </label>-->
-<!--                <u-gap height="16"></u-gap>-->
-<!--                <span class="info">-->
-<!--                <text>{{ item.releaseUserName }}</text>-->
-<!--                <text>{{ item.releaseTime }}</text>-->
-<!--              </span>-->
-<!--              </div>-->
-<!--              <img :src="item.imgUrl" alt="">-->
-<!--            </div>-->
-<!--          </template>-->
+          <template v-else>
+            <div class="has-pic">
+              <div class="left">
+                <label>
+                  <span class="status" v-if="index==0 && item.readStatus==0">未读</span>
+                  <span class="status read" v-if="index==0 && item.readStatus!=0">已读</span>
+                  <div class="tag" v-if="index==1" :style="color(item.status)">
+                    {{ $dict.getLabel("announcementStatus", item.status) }}
+                  </div>
+                  {{ item.title }}
+                </label>
+                <u-gap height="16"></u-gap>
+                <span class="info">
+                <text>{{ item.releaseUserName }}</text>
+                <text>{{ item.releaseTime }}</text>
+              </span>
+              </div>
+              <img :src="item.imgUrl" alt="">
+            </div>
+          </template>
         </div>
       </div>
 
@@ -296,23 +297,6 @@ export default {
         line-height: 44px;
       }
 
-      .status {
-        display: inline-block;
-        width: 88px;
-        height: 36px;
-        font-size: 26px;
-        color: #FF8822;
-        background:rgba(255,136,34,.1);
-        line-height: 36px;
-        text-align: center;
-        margin-right: 4px;
-      }
-
-      .read{
-        background: rgba(102,102,102,.1);
-        color: #666666;
-      }
-
       .tag {
         width: 96px;
         height: 44px;
@@ -361,6 +345,23 @@ export default {
         }
       }
     }
+
+    .status {
+      display: inline-block;
+      width: 88px;
+      height: 36px;
+      font-size: 26px;
+      color: #FF8822;
+      background:rgba(255,136,34,.1);
+      line-height: 36px;
+      text-align: center;
+      margin-right: 4px;
+    }
+
+    .read{
+      background: rgba(102,102,102,.1);
+      color: #666666;
+    }
   }
 
   .popup-wrap {