列表如果返回为空停止加载

src/store/modules/app.js

@@ -9,7 +9,7 @@ const state = {
 }
 const mutations = {
   SET_USER_INFO(state, userInfo) {
-    console.log(userInfo,'seeeeeeeeeeeeeeeee');
+    console.log(userInfo,'用户信息');
     state.userInfo = userInfo;
     state.agencyId = userInfo.agencyId;
     state.realNameFlag = userInfo.realName;

src/utils/request.js

@@ -9,7 +9,7 @@ import { Tips } from '@/utils/index'
 const service = axios.create({
   baseURL: baseApi,
   withCredentials: true, // send cookies when cross-domain requests
-  timeout: 50000 // 等待时间
+  timeout: 80000 // 等待时间
 })
 
 // request拦截器 request interceptor

src/views/Enjoyableservices/index.vue

@@ -1,54 +1,58 @@
 <template>
     <div>
-    <div class="container">
+        <div class="container">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="myCommonsService" class="card"
+            <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="myCommonsService" class="card"
-            :offset="50">
+                :offset="50">
-            <div class="card  m-bottom10" v-for="(item,index) in EnjoyableList" :key="index"  @click="$router.push({ path: `/detailServices`,query:{id:item.id} })"> 
+                <div class="card  m-bottom10" v-for="(item, index) in EnjoyableList" :key="index"
-            <div class="flex flex-x  flex-center2">
+                    @click="$router.push({ path: `/detailServices`, query: { id: item.id } })">
-                <van-tag v-if="item.status" color="#EBF1FE" text-color="#3974F6" size="large">{{ item.status? "进行中":"已结束" }}</van-tag> 
+                    <div class="flex flex-x  flex-center2">
-                <van-tag v-if="!item.status" color="#F5F5F5" text-color="#AAAAAA" size="large">{{ item.status? "进行中":"已结束" }}</van-tag>
+                        <van-tag v-if="item.status" color="#EBF1FE" text-color="#3974F6" size="large">{{ item.status ?
-                <div class="font-size13 C1 m-left12">{{ item.startDate }}</div>
+                            "进行中":"已结束" }}</van-tag>
-            </div>
+                        <van-tag v-if="!item.status" color="#F5F5F5" text-color="#AAAAAA" size="large">{{ item.status ?
-            <div class="m-top10">{{ item.title }}</div>
+                            "进行中":"已结束" }}</van-tag>
-            <div class="flex flex-x m-top10 ">
+                        <div class="font-size13 C1 m-left12">{{ item.startDate }}</div>
-                <div class="font-size15 AAA">享受服务条件：</div>
+                    </div>
-                <div class="font-size15 AAA">{{ item.resiSearchTagName }}</div>
+                    <div class="m-top10">{{ item.title }}</div>
-            </div>
+                    <div class="flex flex-x m-top10 ">
+                        <div class="font-size15 AAA">享受服务条件：</div>
+                        <div class="font-size15 AAA">{{ item.resiSearchTagName }}</div>
+                    </div>
+                </div>
+            </van-list>
         </div>
-        </van-list>
-       </div>
     </div>
 </template>
 <script>
 import { myCommonsService } from '@/api/user'
-    export default{
+export default {
-        data(){
+    data() {
-            return{
+        return {
-                EnjoyableList:[],
+            EnjoyableList: [],
-                finished: false,
+            finished: false,
             loading: true,
             showRegister: false,
-            pageSize:10,
+            pageSize: 10,
-            pageNo:1
+            pageNo: 1
-            }
+        }
-        },
+    },
-        created(){
+    created() {
-            this.myCommonsService()
+        this.myCommonsService()
-        },
+    },
-        methods:{
+    methods: {
-            async myCommonsService() {
+        async myCommonsService() {
             let res = await myCommonsService()
             if (res.code === 0) {
+                debugger
                 this.loading = false;
-                if (res.data.list.length < this.pageSize) {
+                if (!res.data || res.data.list.length < this.pageSize) {
                     this.finished = true;
                 }
-                this.EnjoyableList = this.EnjoyableList.concat(res.data.list);
+                if(res.data){
+                    this.EnjoyableList = this.EnjoyableList.concat(res.data.list);
+                }
             }
         },
-        }
     }
+}
 </script>
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-
-</style>

src/views/activity/index.vue

@@ -62,7 +62,7 @@ export default {
             console.log(res);
             if (res.code === 0) {
                 this.loading = false;
-                if (res.data.list.length < this.pageSize) {
+                if (!res.data || res.data.list.length < this.pageSize) {
                     this.finished = true;
                 }
                 this.activityList = this.activityList.concat(res.data.list);

src/views/appeal/index.vue

@@ -63,7 +63,7 @@ export default {
           let res = await collects(parm)
           if (res.code === 0) {
               this.loading = false;
-              if (res.data.list.length < this.pageSize) {
+              if (!res.data || res.data.list.length < this.pageSize) {
                   this.finished = true;
               }
               this.list = this.list.concat(res.data.list);

src/views/communityPublicity/index.vue

@@ -111,7 +111,7 @@ export default {
                         item.newContent = this.extractChineseCharactersAndPunctuation(item.content)
                     }
                 })
-                if (res.data.list.length < this.pageSize) {
+                if (!res.data || res.data.list.length < this.pageSize) {
                     this.finished = true;
                 }
                 this.PublicityList = this.PublicityList.concat(res.data.list);

src/views/message/index.vue

@@ -52,7 +52,7 @@ export default {
         // 加载状态结束
         this.loading = false
         // 数据全部加载完成
-        if (this.list.length >= this.total) {
+        if (!res.data || this.list.length >= this.total) {
           this.finished = true
         } else {
           this.pageNo++

src/views/messages/index.vue

@@ -84,7 +84,7 @@ export default {
             let res = await querystaffmessage(parm)
             this.loading = false
             if (res.code === 0) {
-                if (res.data.length < this.pageSize) {
+                if (!res.data || res.data.length < this.pageSize) {
                     this.finished = true;
                 }
                 this.MessageList = res.data

src/views/mine/myActivity/index.vue

@@ -54,7 +54,7 @@ export default {
             let res = await communityActivity(parm)
             if (res.code === 0) {
                 this.loading = false;
-                if (res.data.list.length < this.pageSize) {
+                if (!res.data || res.data.list.length < this.pageSize) {
                     this.finished = true;
                 }
                 this.list = this.list.concat(res.data.list);

src/views/mine/mySatisfaction/index.vue

@@ -47,7 +47,7 @@ export default {
             let res = await inspRecord(parm)
             if (res.code === 0) {
                 this.loading = false;
-                if (res.data.list.length < this.pageSize) {
+                if (!res.data || res.data.list.length < this.pageSize) {
                     this.finished = true;
                 }
                 this.list = this.list.concat(res.data.list);

src/views/search/index.vue

@@ -67,7 +67,7 @@ export default {
             let res = await keyWordSearch(parm)
             this.loading = false
             if (res.code === 0) {
-                if (res.data.list.length < this.pageSize) {
+                if ( !res.data || res.data.list.length < this.pageSize) {
                     this.finished = true;
                 }
                 this.tableList =this.tableList.concat(res.data.list);