From a487d9b8944bd4072e8a8d9c39c7d855f5d8bbd5 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Mon, 28 Aug 2023 11:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=96=87=E6=A1=A3=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/documentView/trainDocment.vue       | 50 ++++++++++++-------
 .../workOrder/workOrderReconciliation.vue     |  5 +-
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/views/documentView/trainDocment.vue b/src/views/documentView/trainDocment.vue
index 6da541aa..d2655956 100644
--- a/src/views/documentView/trainDocment.vue
+++ b/src/views/documentView/trainDocment.vue
@@ -23,25 +23,28 @@
   </div>
 
   <div class="contentWrap" v-show="!showEmpty">
-        <div class="itemWrap" v-for="(item,index) in  pageList" :key="index">
-            <div class="info flexBetween common">
-              <div class="title">{{ item.pushUser }}</div>
-              <div class="time">{{ item.pushTime }}</div>
-            </div>
-           <div class="imgWrap">
-             <img :src="item.themePicture">
-             <div class="name">{{item.name}}</div>
-           </div>
-           <div class="num common">{{ item.synopsis }}</div>
-            <div class="doc flexBetween common">
-              <div class="left">{{ item.docType?.label }}</div>
-              <div class="right">
-                <span style="color: red;font-size: 14px;margin-right: 8px">{{ item.listShowButton==null ? '已处理' :  '未处理' }}</span>
-                <span style="opacity: .9;color: #ccc">阅读  {{item.readCount}}</span>
-              </div>
-            </div>
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index">
+        <div class="info flexBetween common">
+          <div class="title">{{ item.pushUser }}</div>
+          <div class="time">{{ item.pushTime }}</div>
         </div>
-  </div>
+        <div class="imgWrap">
+          <img :src="item.themePicture">
+          <div class="name">{{item.name}}</div>
+        </div>
+        <div class="num common">{{ item.synopsis }}</div>
+        <div class="doc flexBetween common">
+          <div class="left">{{ item.docType?.label }}</div>
+          <div class="right">
+            <span style="color: red;font-size: 14px;margin-right: 8px">{{ item.listShowButton==null ? '已处理' :  '未处理' }}</span>
+            <span style="opacity: .9;color: #ccc">阅读  {{item.readCount}}</span>
+          </div>
+        </div>
+      </div>
+
+    </van-pull-refresh>
+</div>
   <div class="empty" style="display: flex;justify-content: center;align-items: center;height:calc(100% - 46px);background-color: #FAFAFA" v-show="showEmpty">
     <img src="@/assets/empty.png"  style="width: 100%"/>
   </div>
@@ -63,7 +66,8 @@ export default {
       pageList:[],
       keyword:'',
       show:false,
-      showEmpty:false
+      showEmpty:false,
+      isLoading:false
     }
   },
   mounted() {
@@ -73,6 +77,13 @@ export default {
     // handleEnterKey() {
     //   this.getList()
     // },
+    onRefresh() {
+      this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
     async getList(){
       let res= await pageList({
         pageNum:this.pageNum,
@@ -119,6 +130,7 @@ export default {
   padding: 0 8px;
   width: 100%;
   box-sizing: border-box;
+  margin-top: 20px;
   .itemWrap{
     margin-bottom: 16px;
     @include wh(100%, 300px);
diff --git a/src/views/workOrder/workOrderReconciliation.vue b/src/views/workOrder/workOrderReconciliation.vue
index f98382f8..d39d168c 100644
--- a/src/views/workOrder/workOrderReconciliation.vue
+++ b/src/views/workOrder/workOrderReconciliation.vue
@@ -34,7 +34,7 @@
       </div>
     </div>
 
-    <van-pull-refresh v-model="isLoading" @refresh="onRefresh" style="height: 100%" v-show="!show">
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  v-show="!show">
      <div >
         <div  class="content_wrap" v-for="(item,index) in orderList" :key="index">
           <div class="codeTxt common">
@@ -242,16 +242,13 @@ export default {
   padding: 10px 0 15px 0;
   color: #737373;
   opacity: .7;
-
   div {
     padding-top: 8px;
   }
-
   .active {
     color: #3678FF;
     position: relative;
   }
-
   .active:after {
     content: '';
     display: block;