解决get请求

babel.config.js

@@ -1,12 +1,12 @@
 module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ],
-  plugins: [
-    ['import', {
-        libraryName: 'vant',
-        libraryDirectory: 'es',
-        style: true
-      }, 'vant']
+    presets: [
+        '@vue/cli-plugin-babel/preset'
+    ],
+    plugins: [
+        ['import', {
+            libraryName: 'vant',
+            libraryDirectory: 'es',
+            style: true
+        }, 'vant']
     ]
-}
+}

src/styles/style.css

@@ -7,6 +7,7 @@
 
 .van-nav-bar {
     background-color: #36a7f3!important;
+    z-index: 10000!important;
 }
 
 .van-nav-bar__title {

src/utils/httpRequest.js

@@ -2,10 +2,10 @@ import Vue from 'vue'
 import axios from 'axios'
 import BASE_URL from './config.js'
 
-const request=axios.create({
-	baseURL:BASE_URL,
-	//请求拦截器
-	//响应拦截器
+const request = axios.create({
+    baseURL: BASE_URL,
+    //请求拦截器
+    //响应拦截器
 });
 
-export default request;
+export default request;

src/utils/request.js

@@ -3,17 +3,18 @@ import sysConfig from '@/config' //引入配置文件
 import store from "../store/index"
 import qs from "qs"
 
-// console.log(process.env.NODE_ENV)
 
 axios.defaults.baseURL = sysConfig.baseUrl //设置请求时间
 axios.defaults.timeout = sysConfig.timeout //设置请求超时时间
 const ContentType = sysConfig.ContentType
 
-//axios.defaults.headers["Content-Type"] = "application/json";
 // axios.defaults.withCredentials = true
 axios.defaults.headers = { 'Content-Type': 'application/json; charset=utf-8' };
-
-// axios.defaults.headers["Content-Type"] = "application/x-www-form-urlencoded";
+axios.defaults.paramsSerializer = {
+    serialize: function(params) {
+        return qs.stringify(params, { allowDots: true })
+    }
+}
 
 
 /** 请求发送前拦截，用于配置求情内容，如headers参数等 */
@@ -31,29 +32,29 @@ function error1(res) {
     if (res.status == 408 || res.status == 401) { // 需要重新登录
         store.commit('setPcToken', "");
         console.log(res.data);
-        // window.xm.showToast({
-        //     message:res.data
-        // })
+        window.xm.showToast({
+            message: res.data
+        })
     } else if (res.status === 404) {
         console.log("404，路径找不到：" + res.data.path);
-        // window.xm.showToast({
-        //     message:"404，路径找不到："+res.data.path
-        // })
+        window.xm.showToast({
+            message: "404，路径找不到：" + res.data.path
+        })
     } else if (res.status === 503) {
         console.log("服务不可用");
-        // window.xm.showToast({
-        //     message:"服务不可用"
-        // })
+        window.xm.showToast({
+            message: "服务不可用"
+        })
     } else if (res.status === 504) {
         console.log("网络连接错误");
-        // window.xm.showToast({
-        //     message:"网络连接错误"
-        // })
+        window.xm.showToast({
+            message: "网络连接错误"
+        })
     } else {
         console.log(res.data);
-        // window.xm.showToast({
-        //     message:res.data
-        // })
+        window.xm.showToast({
+            message: res.data
+        })
     }
 }
 
@@ -114,16 +115,9 @@ var http = {
                 url: url,
                 method: 'post',
                 data: data,
-                // params: params,
                 params: qs.stringify(params),
                 config: config
             }).then((response) => {
-                //if(response.data && response.data.statusCode !== 200){
-                // 	error(response.data);
-                // 	reject(response.data)
-                // }
-                // resolve(response.data);
-
                 resolve(response);
             }).catch((error) => {
                 reject(error)

src/views/activityMan/differentbelievers/ReligiousPeopleReportList.vue

@@ -170,23 +170,21 @@ export default {
       loading.value = true;
       finished.value = false;
       // 异步更新数据
-      new placeActivityServer()
+      new ReligiousPeopleReportService()
         .list({
           current: index + 1,
           size: 10,
           assessment: 0,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           list.value.push(...records);
           // 加载状态结束
           loading.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index + 1 >= pages) {
             finished.value = true;
-          } else {
-            index++;
           }
+          index++;
         });
     };
     const loading1 = ref(false);
@@ -196,23 +194,21 @@ export default {
       loading1.value = true;
       finished1.value = false;
       // 异步更新数据
-      new placeActivityServer()
+      new ReligiousPeopleReportService()
         .list({
           current: index1 + 1,
           size: 10,
           assessment: 1,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           readList.value.push(...records);
           // 加载状态结束
           loading1.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index1 + 1 >= pages) {
             finished1.value = true;
-          } else {
-            index1++;
           }
+          index1++;
         });
     };
     // 搜索

src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -162,15 +162,9 @@
             <span
               v-show="placeActivity.subjectContent != ''"
               style="color: #36a7f3"
-              @click="showReport = true"
+              @click="open"
               >查看内容</span
             >
-            <van-popup v-model:show="showReport" 
-              ><wang-editor
-                ref="subjectContentEditor"
-                v-model="placeActivity.subjectContent"
-              />
-            </van-popup>
           </template>
         </van-field>
       </van-cell-group>
@@ -183,16 +177,24 @@
       >审核</van-button
     >
   </div>
+  <van-popup v-model:show="showReport"
+    ><wang-editor
+      ref="subjectContentEditor"
+      v-model="placeActivity.subjectContent"
+    />
+  </van-popup>
 </template>
   
   <script>
-import { ref, onMounted } from "vue";
+import "vant/es/toast/style";
+import { ref, onMounted, nextTick } from "vue";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
 import UserManage from "@/api/user/UserManage";
 import { useRoute } from "vue-router";
 import $base from "@/utils/config";
 // 富文本编辑器
 import WangEditor from "@/components/editor/WangEditor";
+import vant from "vant";
 export default {
   components: { WangEditor },
   setup() {
@@ -259,26 +261,30 @@ export default {
             });
           }
         });
-        if (subjectContentEditor.value != null) {
-          subjectContentEditor.value.init(placeActivity.value.subjectContent);
-        }
         isLoading.value = false;
       });
     });
     // 打开富文本
-    // const open = () => {
-    //   subjectContentEditor.value.init(placeActivity.value.subjectContent);
-    // };
-
+    const open = () => {
+      showReport.value = true;
+      nextTick(() => {
+        if (subjectContentEditor.value != null) {
+          subjectContentEditor.value.init(placeActivity.value.subjectContent);
+        }
+      });
+    };
     // 审核通过
     const update = () => {
       isLoading.value = true;
       placeActivity.value.assessment = 1;
-      new placeActivityServer().save(placeActivity.value).then((res) => {
-        console.log(res);
-        onClickLeft();
-        isLoading.value = false;
-      });
+      console.log("数据", showSuccessToast);
+      showSuccessToast("res");
+      // new placeActivityServer().save(placeActivity.value).then((res) => {
+
+      //   Toast.success(res);
+      //   // onClickLeft();
+      //   isLoading.value = false;
+      // });
     };
     return {
       onClickLeft,
@@ -288,16 +294,13 @@ export default {
       update,
       subjectContentEditor,
       showReport,
-      // open,
+      open,
     };
   },
 };
 </script>
   
 <style lang="less">
-.van-cell__value .van-field__right-icon .van-icon-location {
-  color: #36a7f3 !important;
-}
 .btn-sub {
   width: 90%;
   border-radius: 20px;
@@ -305,10 +308,6 @@ export default {
   margin-bottom: 40px;
   margin-top: -100px;
 }
-.van-loading {
-  text-align: center;
-  margin-top: 80px;
-}
 .van-popup--center {
   width: 98% !important;
 }

src/views/activityMan/placeactivity/placeActivityList.vue

@@ -151,7 +151,7 @@
 </template>
 
 <script>
-import { ref } from "vue";
+import { reactive, ref } from "vue";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
 import { useRouter } from "vue-router";
 export default {
@@ -185,17 +185,15 @@ export default {
           size: 10,
           assessment: 0,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           list.value.push(...records);
           // 加载状态结束
           loading.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index + 1 >= pages) {
             finished.value = true;
-          } else {
-            index++;
           }
+          index++;
         });
     };
     const loading1 = ref(false);
@@ -211,17 +209,15 @@ export default {
           size: 10,
           assessment: 1,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           readList.value.push(...records);
           // 加载状态结束
           loading1.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index1 + 1 >= pages) {
             finished1.value = true;
-          } else {
-            index1++;
           }
+          index1++;
         });
     };
     // 搜索

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -220,7 +220,7 @@
     </div>
     <div class="subbtn">
       <van-button type="primary" @click="submit">提交</van-button>
-      <van-button type="default" hairline>取消</van-button>
+      <van-button type="default" hairline @click="onClickLeft">暂存</van-button>
     </div>
   </div>
 </template>

src/views/activityMan/selfMeetingReport/selfMeetingInfo.vue

@@ -67,15 +67,9 @@
             <span
               v-show="inputForm.content != ''"
               style="color: #36a7f3"
-              @click="showReport = true"
+              @click="open"
               >查看内容</span
             >
-            <van-popup v-model:show="showReport"
-              ><wang-editor
-                ref="contentEditor"
-                v-model="inputForm.content"
-              />
-            </van-popup>
           </template>
         </van-field>
       </van-cell-group>
@@ -88,10 +82,13 @@
       >审核</van-button
     >
   </div>
+  <van-popup v-model:show="showReport"
+    ><wang-editor ref="contentEditor" v-model="inputForm.content" />
+  </van-popup>
 </template>
     
     <script>
-import { ref } from "vue";
+import { ref, nextTick } from "vue";
 import { useRoute } from "vue-router";
 import PrivatePartyPointService from "@/api/privateparty/PrivatePartyPointService";
 import UserManage from "@/api/user/UserManage";
@@ -139,9 +136,17 @@ export default {
           inputForm.value.relatedPersons.name += data.name + ",";
         });
       });
-      // contentEditor.value.init(inputForm.value.content);
       isLoading.value = false;
     });
+    // 打开富文本
+    const open = () => {
+      showReport.value = true;
+      nextTick(() => {
+        if (contentEditor.value != null) {
+          contentEditor.value.init(inputForm.value.content);
+        }
+      });
+    };
     // 审核通过
     const update = () => {
       isLoading.value = true;
@@ -158,7 +163,8 @@ export default {
       isLoading,
       update,
       contentEditor,
-      showReport
+      showReport,
+      open,
     };
   },
 };
@@ -171,5 +177,7 @@ export default {
   margin-left: 5%;
   margin-bottom: 40px;
 }
-
+.van-popup--center {
+  width: 98% !important;
+}
 </style>

src/views/activityMan/selfMeetingReport/selfMeetingList.vue

@@ -184,23 +184,21 @@ export default {
       loading.value = true;
       finished.value = false;
       // 异步更新数据
-      new placeActivityServer()
+      new PrivatePartyPointService()
         .list({
           current: index + 1,
           size: 10,
           assessment: 0,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           list.value.push(...records);
           // 加载状态结束
           loading.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index + 1 >= pages) {
             finished.value = true;
-          } else {
-            index++;
           }
+          index++;
         });
     };
     const loading1 = ref(false);
@@ -210,23 +208,21 @@ export default {
       loading1.value = true;
       finished1.value = false;
       // 异步更新数据
-      new placeActivityServer()
+      new PrivatePartyPointService()
         .list({
           current: index1 + 1,
           size: 10,
           assessment: 1,
         })
-        .then(({ records, total }) => {
+        .then(({ records, pages }) => {
           readList.value.push(...records);
           // 加载状态结束
           loading1.value = false;
-          let page = parseInt(total / 10);
           // 数据全部加载完成
-          if (index >= page || total < 10) {
+          if (index1 + 1 >= pages) {
             finished1.value = true;
-          } else {
-            index1++;
           }
+          index1++;
         });
     };
     // 搜索