Merge remote-tracking branch 'origin/dev' into dev

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

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>
@@ -386,6 +386,9 @@
               color: #333333;
               display: inline-block;
               line-height: 44px;
+              text-overflow: ellipsis;
+              overflow-x: hidden;
+              white-space: nowrap;
             }
           }
 

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>