Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/pages/message-management/directed-push/directed-push-list.vue

@@ -97,9 +97,7 @@
           </p>
           <div class="full_content">
             <div class="apaas_scroll">
-              <p class="item_content">
-                {{ templateDetail.contents }}
-              </p>
+              <p class="item_content" v-html="templateDetail.contents"></p>
             </div>
           </div>
         </div>

src/pages/message-management/message-alert/message-alert-list.vue

@@ -96,9 +96,7 @@
           </p>
           <div class="full_content">
             <div class="apaas_scroll">
-              <p class="item_content">
-                {{ templateDetail.contents }}
-              </p>
+              <p class="item_content" v-html="templateDetail.contents"></p>
             </div>
           </div>
         </div>
@@ -278,7 +276,7 @@ export default {
     },
     detailAction(item) {
       this.$http
-        .get(`//apaas/service/v3/push/alertmsg/view/${item.id}`)
+        .get(`/apaas/service/v3/push/alertmsg/view/${item.id}`)
         .then(({ data }) => {
           if (data.success == 1) {
             let detail = data.data || {};
@@ -327,4 +325,40 @@ export default {
 .list_container {
   height: 100%;
 }
+.detail_dialog {
+  display: flex;
+  flex-wrap: wrap;
+  text-align: left;
+}
+.detail_dialog .detail_item {
+  flex: 1 1 auto;
+  width: 50%;
+  margin-top: 20px;
+}
+.detail_dialog .detail_item.full_line {
+  width: 100%;
+}
+.detail_dialog .detail_item p {
+  padding: 0 15px;
+  font-size: 14px;
+  line-height: 22px;
+  color: #8890a7;
+}
+.detail_dialog .detail_item .item_content {
+  color: #000;
+  margin-top: 10px;
+}
+.detail_dialog .detail_item .full_content {
+  padding: 10px 0;
+  border-radius: 8px;
+  background-color: #f8f9fd;
+  margin-top: 5px;
+}
+.detail_dialog .detail_item .full_content > .apaas_scroll {
+  height: 176px;
+  overflow: auto;
+}
+.detail_dialog .detail_item .full_content .item_content {
+  margin: 0;
+}
 </style>