完善富文本显示

src/views/activityMan/differentbelievers/ReligiousPeopleReportList.vue

@@ -172,7 +172,7 @@ export default {
           assessment: 0,
         })
         .then(({ records, pages }) => {
-          list.value.push(...records);
+          list.value = list.value.concat(records);
           // 加载状态结束
           loading.value = false;
           // 数据全部加载完成
@@ -196,7 +196,7 @@ export default {
           assessment: 1,
         })
         .then(({ records, pages }) => {
-          readList.value.push(...records);
+          readList.value = readList.value.concat(records);
           // 加载状态结束
           loading1.value = false;
           // 数据全部加载完成

src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -176,11 +176,12 @@
       >审核</van-button
     >
   </div>
-  <van-popup v-model:show="showReport"
-    ><wang-editor
+  <van-popup v-model:show="showReport">
+    <!-- <wang-editor
       ref="subjectContentEditor"
       v-model="placeActivity.subjectContent"
-    />
+    /> -->
+    <div v-html="placeActivity.subjectContent" class="showhtml"></div>
   </van-popup>
 </template>
   
@@ -331,5 +332,12 @@ export default {
 }
 .van-popup--center {
   width: 98% !important;
+  border-radius: 10px;
+  height: 70vh;
+  overflow: auto;
+}
+.showhtml {
+  width: 94%;
+  padding: 10px;
 }
 </style>

src/views/activityMan/placeactivity/placeActivityList.vue

@@ -43,8 +43,7 @@
                 <p v-show="item.activityTime != ''" style="color: #c4c4c4">
                   {{ item.activityTime }}
                 </p>
-                <p style="color: red" v-if="item.state == 1">已禁用</p>
-                <p style="color: green" v-if="item.state == 0">已启用</p>
+                <p style="color: red">未审核</p>
               </div>
               <van-cell>
                 <template #title>
@@ -58,26 +57,7 @@
                 </template>
               </van-cell>
             </div>
-            <!-- 启用/禁用 -->
-            <template #left>
-              <van-button
-                v-if="item.state == 1"
-                square
-                class="button"
-                type="success"
-                text="启用"
-                @click="upUseitem(item)"
-              />
-              <van-button
-                v-if="item.state == 0"
-                square
-                class="button"
-                type="warning"
-                text="禁用"
-                @click="upUseitem(item)"
-              />
-            </template>
-            <template #right v-if="item.state == 0">
+            <template #right>
               <van-button
                 square
                 type="danger"
@@ -109,8 +89,7 @@
                 <p v-show="item.activityTime != ''" style="color: #c4c4c4">
                   {{ item.activityTime }}
                 </p>
-                <p style="color: red" v-if="item.state == 1">已禁用</p>
-                <p style="color: green" v-if="item.state == 0">已启用</p>
+                <p style="color: gray">已审核</p>
               </div>
               <van-cell>
                 <template #title>
@@ -124,25 +103,6 @@
                 </template>
               </van-cell>
             </div>
-            <!-- 启用/禁用 -->
-            <template #left>
-              <van-button
-                v-if="item.state == 1"
-                square
-                class="button"
-                type="success"
-                text="启用"
-                @click="upUseitem(item)"
-              />
-              <van-button
-                v-if="item.state == 0"
-                square
-                class="button"
-                type="warning"
-                text="禁用"
-                @click="upUseitem(item)"
-              />
-            </template>
           </van-swipe-cell>
         </van-list>
       </van-tab>
@@ -221,7 +181,7 @@ export default {
           assessment: 0,
         })
         .then(({ records, pages }) => {
-          list.value.push(...records);
+          list.value = list.value.concat(records);
           // 加载状态结束
           loading.value = false;
           // 数据全部加载完成
@@ -245,7 +205,7 @@ export default {
           assessment: 1,
         })
         .then(({ records, pages }) => {
-          readList.value.push(...records);
+          readList.value = readList.value.concat(records);
           // 加载状态结束
           loading1.value = false;
           // 数据全部加载完成
@@ -278,34 +238,6 @@ export default {
       searchVal.value = "";
       searchShow.value = false;
     };
-    // 启用/禁用
-    const upUseitem = (item) => {
-      xm.showConfirm({
-        title: "提示",
-        message: "确定修改该项吗？",
-      }).then((result) => {
-        if (result == "ok") {
-          if (item.state == 0) {
-            item.state = 1;
-          } else {
-            item.state = 0;
-          }
-          new placeActivityServer().save(item).then((res) => {
-            if (res.status == 200 || res.statusText == "OK") {
-              xm.showToast({
-                message: "修改成功",
-              });
-            }
-            index = 0;
-            loading.value = true;
-            list.value = [];
-            readList.value = [];
-            onLoad();
-            onLoad1();
-          });
-        }
-      });
-    };
     // 删除
     const deleteItem = (val) => {
       xm.showConfirm({
@@ -367,7 +299,6 @@ export default {
       updateItem,
       goInfo,
       deleteItem,
-      upUseitem,
     };
   },
 };

src/views/activityMan/selfMeetingReport/selfMeetingInfo.vue

@@ -84,7 +84,9 @@
   </div>
   <!-- 富文本编辑器 -->
   <van-popup v-model:show="showReport"
-    ><wang-editor ref="contentEditor" v-model="inputForm.content" />
+    >
+    <!-- <wang-editor ref="contentEditor" v-model="inputForm.content" /> -->
+    <div v-html="inputForm.content" class="showhtml"></div>
   </van-popup>
 </template>
     
@@ -189,5 +191,12 @@ export default {
 }
 .van-popup--center {
   width: 98% !important;
+  border-radius: 10px;
+  height: 70vh;
+  overflow: auto;
+}
+.showhtml {
+  width: 94%;
+  padding: 10px;
 }
 </style>

src/views/activityMan/selfMeetingReport/selfMeetingList.vue

@@ -181,8 +181,6 @@ export default {
     let active = ref(0);
     // 未审核列表
     let list = ref([]);
-    // 已审核列表
-    let readList = ref([]);
     const loading = ref(false);
     const finished = ref(false);
     let index = 0;
@@ -197,7 +195,7 @@ export default {
           assessment: 0,
         })
         .then(({ records, pages }) => {
-          list.value.push(...records);
+          list.value = list.value.concat(records);
           // 加载状态结束
           loading.value = false;
           // 数据全部加载完成
@@ -207,6 +205,8 @@ export default {
           index++;
         });
     };
+    // 已审核列表
+    const readList = ref([]);
     const loading1 = ref(false);
     const finished1 = ref(false);
     let index1 = 0;
@@ -221,7 +221,7 @@ export default {
           assessment: 1,
         })
         .then(({ records, pages }) => {
-          readList.value.push(...records);
+          readList.value = readList.value.concat(records);
           // 加载状态结束
           loading1.value = false;
           // 数据全部加载完成