Merge branch '电子门牌' into dev

# Conflicts:
#	src/views/Enjoyableservices/index.vue

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

@@ -42,16 +42,17 @@ import Android from '@/components/Android'
             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>
+<style lang="scss" scoped></style>

src/views/activity/index.vue

@@ -63,7 +63,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

@@ -66,7 +66,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

@@ -112,7 +112,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/houseQR/index.vue

@@ -45,7 +45,7 @@
         <div class="my_community flex flex-wrap">
           <div style="width: 25%" class="flex flex-y flex-center1 flex-center2" v-for="(item, index) in myCommunity"
             :key="index">
-            <img :src="item.imgSrc" class="img_33 m-top16" alt="" @click="handelCLickJump(index)" />
+            <img :src="item.imgSrc" class="img_33 m-top16" alt="" @click="handelCLickJump(item)" />
             <span class="font-size14 m-top10">{{ item.title }}</span>
           </div>
         </div>
@@ -85,27 +85,33 @@ export default {
         },
         {
           imgSrc: require('@/assets/images/houseQR/2.png'),
-          title: '我有诉求'
+          title: '我有诉求',
+          path:'/event'
         },
         {
           imgSrc: require('@/assets/images/houseQR/3.png'),
-          title: '社区讯息'
+          title: '社区讯息',
+          path:'/communityPublicity'
         },
         {
           imgSrc: require('@/assets/images/houseQR/4.png'),
-          title: '社区活动'
+          title: '社区活动',
+          path:'/activity'
         },
         {
           imgSrc: require('@/assets/images/houseQR/5.png'),
-          title: '居民议事'
+          title: '居民议事',
+          path:'/discussion'
         },
         {
           imgSrc: require('@/assets/images/houseQR/6.png'),
-          title: '满意度测评'
+          title: '满意度测评',
+          path:'/mySatisfaction'
         },
         {
           imgSrc: require('@/assets/images/houseQR/7.png'),
-          title: '可享服务'
+          title: '可享服务',
+          path:'/Enjoyableservices'
         },
         {
           imgSrc: require('@/assets/images/houseQR/8.png'),
@@ -146,15 +152,9 @@ export default {
         this.formData = res.data
       })
     },
-    handelCLickJump(index) {
-      if (index === 0) {
-        if (this.formData.qrCode) {
-          location.assign(this.formData.qrCode)
-        } else {
-          Notify({ type: 'primary', message: '未找到图片！' })
-        }
-      } else if (index === 1) {
-        this.$router.push({ path: '/event' })
+    handelCLickJump(item) {
+      if (item.path) {
+        this.$router.push({ path: item.path })
       } else {
         Notify({ type: 'primary', message: '功能持续开放中，敬请期待！' })
       }

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

@@ -56,7 +56,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

@@ -49,7 +49,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);