From fa7114c84df816d8ceab3bab9a912888a6055ceb Mon Sep 17 00:00:00 2001
From: wanglei <1336977847@qq.com>
Date: Wed, 8 Dec 2021 09:24:20 +0800
Subject: [PATCH 1/3] 25290

---
 src/apps/AppMeetingNotice/components/detail.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/apps/AppMeetingNotice/components/detail.vue b/src/apps/AppMeetingNotice/components/detail.vue
index fcf350fe..796fc855 100644
--- a/src/apps/AppMeetingNotice/components/detail.vue
+++ b/src/apps/AppMeetingNotice/components/detail.vue
@@ -386,6 +386,9 @@
               color: #333333;
               display: inline-block;
               line-height: 44px;
+              text-overflow: ellipsis;
+              overflow-x: hidden;
+              white-space: nowrap;
             }
           }
 

From 38a08ff55e42b54536dad0d510b34f2885418ecc Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 8 Dec 2021 09:36:30 +0800
Subject: [PATCH 2/3] 25269

---
 src/apps/AppAskForm/components/List.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppAskForm/components/List.vue b/src/apps/AppAskForm/components/List.vue
index 00dbc564..8d8a10d6 100644
--- a/src/apps/AppAskForm/components/List.vue
+++ b/src/apps/AppAskForm/components/List.vue
@@ -52,7 +52,7 @@
             </div>
             <h3>发布</h3>
           </div>
-          <div class="operate-item" @click="toStop" v-if="info.status === '1'">
+          <div class="operate-item" @click="isShowModal = true" v-if="info.status === '1'">
             <div>
               <image :src="`${$cdn}askform/stop.png`"/>
             </div>
@@ -80,6 +80,7 @@
         <div class="popup-btn" @click="isShow = false">关闭</div>
       </div>
     </u-popup>
+    <u-modal v-model="isShowModal" show-cancel-button	 content="确定停止该表单?" @confirm="toStop"></u-modal>
   </div>
 </template>
 
@@ -100,6 +101,7 @@ export default {
         templateType: 0,
         title: ''
       },
+      isShowModal: false,
       value: '',
       id: '',
       info: {},

From 0b259a52509b30b79fdc3c9273df339ac8cb4d3d Mon Sep 17 00:00:00 2001
From: wanglei <1336977847@qq.com>
Date: Wed, 8 Dec 2021 10:01:09 +0800
Subject: [PATCH 3/3] 25286

---
 src/apps/AppMeetingNotice/components/detail.vue | 2 +-
 src/apps/AppNotification/components/detail.vue  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppMeetingNotice/components/detail.vue b/src/apps/AppMeetingNotice/components/detail.vue
index 796fc855..75bb48bd 100644
--- a/src/apps/AppMeetingNotice/components/detail.vue
+++ b/src/apps/AppMeetingNotice/components/detail.vue
@@ -7,7 +7,7 @@
         <u-row v-if="detail.createUserId">
 <!--          <u-avatar :src="$cdn + 'common/xzh.png'" v-if="false"></u-avatar>-->
 <!--          <div class="u-avatar__img" v-else>{{ detail.userName && detail.userName.substr(-2) }}</div>-->
-          <AiOpenData type="userName" :openid="detail.createUserId"></AiOpenData>
+          <AiOpenData type="userName" style="font-size: 30px;color: #343D65;" :openid="detail.createUserId"></AiOpenData>
         </u-row>
         <u-gap height="32"></u-gap>
         <u-row>
diff --git a/src/apps/AppNotification/components/detail.vue b/src/apps/AppNotification/components/detail.vue
index c164f701..868a3a90 100644
--- a/src/apps/AppNotification/components/detail.vue
+++ b/src/apps/AppNotification/components/detail.vue
@@ -7,14 +7,14 @@
         <u-row>
           <span>发布人：</span>
           <template v-if="detailObj.createUserId">
-            <AiOpenData type="userName" :openid="detailObj.createUserId"></AiOpenData>
+            <AiOpenData type="userName" style="font-size: 30px;color: #343D65;" :openid="detailObj.createUserId"></AiOpenData>
           </template>
         </u-row>
         <u-gap height="8"></u-gap>
         <u-row>
           <span>发布部门：</span>
           <template v-if="detailObj.unitName">
-            <AiOpenData type="departmentName" :openid="detailObj.unitName"></AiOpenData>
+            <AiOpenData type="departmentName" style="font-size: 30px;color: #343D65;" :openid="detailObj.unitName"></AiOpenData>
           </template>
         </u-row>
         <u-gap height="8"></u-gap>