소스 검색

其他页面更新

yin_yu820 2 년 전
부모
커밋
7f95bdc723

+ 8 - 1
src/views/activityMan/nonReligiousInformation/nonReligiousInformationInfo.vue

@@ -14,7 +14,8 @@
         <p>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;点:{{ info.placeSelectName }}</p>
         <p>详细地址:{{ info.placeDetailed }}</p>
         <p>事件概述:{{ info.eventOverview }}</p>
-        <p>事件内容:{{ info.eventContent }}</p>
+        <p>事件内容:</p>
+        <div v-html="info.eventContent" class="showhtml"> </div>
       </div>
       <van-button v-if="canAudit" type="primary" class="btn-sub" @click="update">审核</van-button>
     </div>
@@ -161,4 +162,10 @@
     text-align: center;
     margin-top: 80px;
   }
+  .showhtml{
+      margin: 5px;
+      padding: 10px;
+      border: 1px solid #ccc;
+      border-radius: 12px;
+    }
   </style>

+ 56 - 61
src/views/activityMan/religiousConference/religiousConferenceInfo.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-loading size="16px" v-if="isLoading">加载中...</van-loading>
+    <van-loading size="16px" v-if="isLoading" >加载中...</van-loading>
     <div class="main" v-if="!isLoading">
       <div class="banner">
         <h2>扎实提升“三力”</h2>
@@ -13,10 +13,7 @@
         <p>会议场所:{{ info.siteName.name }}</p>
         <p>参会人员:{{ info.participants.name }}</p>
         <p>会议议题:</p>
-          <wang-editor
-            ref="subjectContentEditor"
-            v-model="info.meetingTopics"
-          />
+          <div v-html="info.meetingTopics" class="showhtml"> </div>
       </div>
       <van-button v-if="canAudit" type="primary" class="btn-sub" @click="update">审核</van-button>
     </div>
@@ -24,13 +21,9 @@
     
     <script>
   import { ref } from "vue";
-  import religiousConferenceService from "@/api/religiousConference/religiousConferenceService";
-  import UserManage from "@/api/user/UserManage";
   import { useRoute } from "vue-router";
-  // 富文本编辑器
-  import WangEditor from "@/components/editor/WangEditor";
+  import religiousConferenceService from "@/api/religiousConference/religiousConferenceService";  
   export default {
-    components: { WangEditor },
     setup() {
       //window.xm.setNavigationBarTitle({ title: '负责人会议详情'})
       let isLoading = ref(true);
@@ -39,8 +32,6 @@
       const info = ref({     
         meetingTopics:"",  
       });
-      // 富文本
-      let subjectContentEditor = ref(null);
       let route = useRoute();
       new religiousConferenceService().queryById(route.query.id).then((data) => {
         info.value = data;
@@ -50,8 +41,6 @@
           canAudit.value = false;
         }      
         console.log(info.value.meetingTopics);
-        //这边报错??
-        //subjectContentEditor.value.init(info.value.meetingTopics);
         isLoading.value = false;
       });
       // 审核通过
@@ -72,57 +61,63 @@
         isLoading,
         canAudit,
         update,
-        subjectContentEditor,
       };
     },
   };
   </script>
     
-  <style lang="less">
-  .main {
-    background: #fff;
-    position: relative;
-    top: 40px;
-  }
-  .banner {
-    background-color: #36a7f3;
-    padding: 20px 50px 40px 50px;
-    color: #fff;
-    h2 {
-      &:nth-child(1) {
-        margin-top: 0px;
-        text-align: left;
-      }
-      &:nth-child(2) {
-        text-align: center;
-      }
-      &:nth-child(3) {
-        text-align: right;
+    <style lang="less">
+    .main {
+      background: #fff;
+      position: relative;
+      top: 40px;
+    }
+    .banner {
+      background-color: #36a7f3;
+      padding: 20px 50px 40px 50px;
+      color: #fff;
+      h2 {
+        &:nth-child(1) {
+          margin-top: 0px;
+          text-align: left;
+        }
+        &:nth-child(2) {
+          text-align: center;
+        }
+        &:nth-child(3) {
+          text-align: right;
+        }
       }
     }
-  }
-  .info {
-    position: relative;
-    width: 86vw;
-    margin: 10px auto;
-    padding: 10px;
-    background: #fff;
-    border-radius: 20px;
-    top: -50px;
-    font-size: 14px;
-  }
-  .btn-sub {
-    width: 90%;
-    border-radius: 20px;
-    margin-left: 5%;
-  }
-  .van-loading {
-    text-align: center;
-    margin-top: 80px;
-  }
-  #editor {
-  width: 100%;
-  height: 150px;
-  overflow: hidden;
-  }
-  </style>
+    .info {
+      position: relative;
+      width: 86vw;
+      // height: 120px;
+      margin: 10px auto;
+      padding: 10px;
+      background: #fff;
+      border-radius: 20px;
+      top: -50px;
+      font-size: 14px;
+    }
+    .btn-sub {
+      width: 90%;
+      border-radius: 20px;
+      margin-left: 5%;
+    }
+    .van-loading {
+      text-align: center;
+      margin-top: 80px;
+    }
+    #editor {
+      width: 100%;
+      height: 150px;
+      overflow: hidden;
+    }
+    .showhtml{
+      margin: 5px;
+      padding: 10px;
+      border: 1px solid #ccc;
+      border-radius: 12px;
+    }
+    </style>