From b239b1ad4a0cea0e874c0d25a13eef21d90a39e3 Mon Sep 17 00:00:00 2001
From: changjinpeng <185154740@qq.com>
Date: Wed, 16 Mar 2022 10:34:09 +0800
Subject: [PATCH] 28268

---
 src/mods/AppProgressNew/AppProgressNew.vue           | 4 +++-
 src/mods/AppProgressNew/detail.vue                   | 6 ++++--
 src/mods/AppServiceOnline/serviceList.vue            | 8 ++++++--
 src/mods/AppServiceOnlineNew/AppServiceOnlineNew.vue | 4 +++-
 src/mods/AppServiceOnlineNew/list.vue                | 4 +++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/mods/AppProgressNew/AppProgressNew.vue b/src/mods/AppProgressNew/AppProgressNew.vue
index b89a007..96e5924 100644
--- a/src/mods/AppProgressNew/AppProgressNew.vue
+++ b/src/mods/AppProgressNew/AppProgressNew.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="service">
-    <div class="service-list">
+    <div class="service-list" v-if="list.length">
       <div class="service-item" hover-class="bg-hover" @click="toDetail('./detail?id=' + item.id)" v-for="(item, index) in list" :key="index">
         <div class="service-item__wrapper">
           <h2>{{ item.processName }}</h2>
@@ -9,6 +9,8 @@
       </div>
     </div>
 
+    <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+
     <!-- <u-loadmore :status="loadingStatus" :margin-top="30" :margin-bottom="30" color="#999" font-size="26" /> -->
   </div>
 </template>
diff --git a/src/mods/AppProgressNew/detail.vue b/src/mods/AppProgressNew/detail.vue
index 0091afd..bb27096 100644
--- a/src/mods/AppProgressNew/detail.vue
+++ b/src/mods/AppProgressNew/detail.vue
@@ -42,11 +42,13 @@ export default {
 
 <style scoped lang="scss">
 .Page {
-  padding: 32px 32px 48px 32px;
+  padding: 0 32px 0 32px;
   background: #fff;
+  height: 100%;
   .processNames {
     font-size: 48px;
     font-weight: 600;
+    padding-top: 32px;
   }
   .types {
     padding-top: 16px;
@@ -54,7 +56,7 @@ export default {
     color: #999999;
   }
   .conts {
-    padding-top: 64px;
+    padding: 64px 0 48px 0;
     font-size: 36px;
     line-height: 64px;
   }
diff --git a/src/mods/AppServiceOnline/serviceList.vue b/src/mods/AppServiceOnline/serviceList.vue
index c0bb622..99a6759 100644
--- a/src/mods/AppServiceOnline/serviceList.vue
+++ b/src/mods/AppServiceOnline/serviceList.vue
@@ -5,12 +5,14 @@
       <span :class="[currIndex === 0 ? 'active' : '']" @click="changeTab(0)">网上办事</span>
     </div>
     <div class="service-list">
-      <div class="service-item" hover-class="bg-hover" @click="toDetail('./serviceNotice?id=' + item.id)" v-for="(item, index) in list" :key="index">
+      <div class="service-item" hover-class="bg-hover" @click="toDetail('./serviceNotice?id=' + item.id)" v-for="(item, index) in list" :key="index" v-if="list.length>0">
         <div class="service-item__wrapper">
           <h2>{{ item.processName }}</h2>
           <i class="iconfont">&#xe6ae;</i>
         </div>
       </div>
+
+       <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
     </div>
     <u-loadmore :status="loadingStatus" :margin-top="30" :margin-bottom="30" color="#999" font-size="26"/>
   </div>
@@ -52,7 +54,8 @@
         this.$instance.post(`/app/approval-process-def/list-xcx?processType=${this.currIndex === 0 ? 0 : 2}`, null, {
           params: {
             size: 10000,
-            classificationId: this.id
+            classificationId: this.id,
+            current: this.current
           },
           withoutToken: true
         }).then(res => {
@@ -115,6 +118,7 @@
     },
 
     onReachBottom() {
+      this.current = this.current + 1
       this.getList()
     }
   }
diff --git a/src/mods/AppServiceOnlineNew/AppServiceOnlineNew.vue b/src/mods/AppServiceOnlineNew/AppServiceOnlineNew.vue
index ed94dff..5843fcf 100644
--- a/src/mods/AppServiceOnlineNew/AppServiceOnlineNew.vue
+++ b/src/mods/AppServiceOnlineNew/AppServiceOnlineNew.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="servie">
-    <div class="serviceItem" v-for="(op, i) in list" :key="i" @click="toServiceList(op)" hover-class="bg-hover">
+    <div class="serviceItem" v-for="(op, i) in list" :key="i" @click="toServiceList(op)" hover-class="bg-hover" v-if="list.length">
       <img :src="op.icon" />
       <div class="fill flex1">
         <div>{{ op.name }}</div>
@@ -9,6 +9,8 @@
       </div>
       <i class="iconfont">&#xe697;</i>
     </div>
+
+    <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
   </div>
 </template>
 
diff --git a/src/mods/AppServiceOnlineNew/list.vue b/src/mods/AppServiceOnlineNew/list.vue
index 0973b55..a3cee3f 100644
--- a/src/mods/AppServiceOnlineNew/list.vue
+++ b/src/mods/AppServiceOnlineNew/list.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="service">
-    <div class="service-list">
+    <div class="service-list" v-if="list.length">
       <div class="service-item" hover-class="bg-hover" @click="toDetail('./notice?id=' + item.id)" v-for="(item, index) in list" :key="index">
         <div class="service-item__wrapper">
           <h2>{{ item.processName }}</h2>
@@ -9,6 +9,8 @@
       </div>
     </div>
 
+    <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+
     <!-- <u-loadmore :status="loadingStatus" :margin-top="30" :margin-bottom="30" color="#999" font-size="26" /> -->
   </div>
 </template>