[update] 修改bug87394

src/common/lang/en-us.js

@@ -227,6 +227,7 @@ module.exports = {
   unauthorized: 'Unauthorized, please log in again',
   tableDataDisabledClear: 'The table requires at least one piece of data',
   autoTakeout: 'Automatic takeout',
+  goHandle: 'To deal with',
   // 树右键
   treeRight: {
     addFolder: 'Create New Folder',

src/common/lang/zh-cn.js

@@ -244,6 +244,7 @@ module.exports = {
   unauthorized: '未授权，请重新登录',
   tableDataDisabledClear: '表格至少需要一条数据',
   autoTakeout: '自动带出',
+  goHandle: '去处理',
   // 标准字段
   standardField: {
     standardEnglishName: '标准英文名称',

src/components/tools/ShowAnnouncement.vue

@@ -8,9 +8,9 @@
     @cancel="handleCancel"
    >
     <template slot="footer">
-      <a-button key="back" @click="handleCancel">关闭</a-button>
+      <a-button key="back" @click="handleCancel">{{ $t('close') }}</a-button>
       <!-- url是当前页跳转，page新标签页跳转 -->
-      <a-button v-if="['url', 'page'].indexOf(record.openType) !== -1" type="primary" @click="toHandle">去处理</a-button>
+      <a-button v-if="['url', 'page'].indexOf(record.openType) !== -1" type="primary" @click="toHandle">{{ $t('goHandle') }}</a-button>
     </template>
     <a-card class="daily-article" :loading="loading">
       <a-card-meta

src/views/system/UserAnnouncementDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <internal-detail-page :title="$t('message.my.myMessage')" :loading="loading" :content-padding="0">
-    <div class="container">
+    <div class="detail-page-scroll-content container">
       <div class="msg-header">
         <div class="title">{{ model.titile }}</div>
         <div class="subTitle">
@@ -9,6 +9,12 @@
       </div>
       <div class="msg-content" v-html="model.msgContent"></div>
     </div>
+
+    <!--  操作按钮  -->
+    <div v-if="['url', 'page'].indexOf(this.model.openType) !== -1" class="detail-page-bottom-operate-box">
+      <!--  去处理  -->
+      <a-button type="primary" @click="goHandle">{{ $t('goHandle') }}</a-button>
+    </div>
   </internal-detail-page>
 </template>
 
@@ -43,12 +49,24 @@ export default {
       }).finally(() => {
         this.loading = false
       })
+    },
+    goHandle () {
+      if (this.model.openType === 'url') {
+        this.$router.push({ path: this.model.openPage })
+        // 如果是跳转其他页面请求详情（作用是为了标记已读）
+        // getMsgDetail({ id: this.model.id })
+      } else if (this.model.openType === 'page') {
+        this.$openPageNewSheet({ path: this.model.openPage })
+        // 如果是跳转其他页面请求详情（作用是为了标记已读）
+        // getMsgDetail({ id: record.id })
+      }
     }
   }
 }
 </script>
 
 <style lang="less" scoped>
+@import '~@assets/less/common.less';
 .container {
   margin: 0 90px;
 

src/views/system/UserAnnouncementList.vue

@@ -197,22 +197,12 @@ export default {
     },
     // 跳转详情
     handleGoDetail (record) {
-      if (record.openType === 'url') {
+      this.$router.push({
-        this.$router.push({ path: record.openPage })
+        path: '/isps/userAnnouncementDetail',
-        // 如果是跳转其他页面请求详情（作用是为了标记已读）
+        query: {
-        getMsgDetail({ id: record.id })
+          id: record.id
-      } else if (record.openType === 'page') {
+        }
-        this.$openPageNewSheet({ path: record.openPage })
+      })
-        // 如果是跳转其他页面请求详情（作用是为了标记已读）
-        getMsgDetail({ id: record.id })
-      } else {
-        this.$router.push({
-          path: '/isps/userAnnouncementDetail',
-          query: {
-            id: record.id
-          }
-        })
-      }
     },
     expandIcon (props) {
       if (props.expanded) {