From 1d5b7a535ba425cea11200521959ac3a84adbe71 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Tue, 29 Aug 2023 14:28:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=B5=84=E6=96=99=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/documentView/docmentList.vue  | 62 ++++++++++++++++++-------
 src/views/documentView/trainDocment.vue | 15 +++---
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/src/views/documentView/docmentList.vue b/src/views/documentView/docmentList.vue
index a61ddd68..1561b2c7 100644
--- a/src/views/documentView/docmentList.vue
+++ b/src/views/documentView/docmentList.vue
@@ -11,7 +11,7 @@
     >
       <template slot="title">
         <div v-show="!show">文档资料</div>
-        <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @keyup.enter="getList"/>
+        <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getList"/>
       </template>
       <template slot="right">
         <div class="rightWrap" @click="show = !show">
@@ -29,25 +29,27 @@
     </div>
   </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>
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh" style="min-height:85vh">
+      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item)">
+        <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>
       </div>
-    </div>
-  </div>
+    </van-pull-refresh>
+ </div>
   <div class="empty" style="display: flex;justify-content: center;align-items: center;height:calc(100% - 86px);background-color: #FAFAFA" v-show="showEmpty">
     <img src="@/assets/empty.png"  style="width: 100%"/>
   </div>
@@ -69,6 +71,7 @@ export default {
       pageSize:10,
       keyword:'',
       trainingType:1,
+      isLoading:false,
       show:false,
       showEmpty:false
     }
@@ -77,6 +80,28 @@ export default {
     this.getList()
   },
   methods:{
+    goH5Detail(item){
+      let data = {
+        "action": "goTraining",
+        "params": {
+          "id": item.id,
+        }
+      };
+      let u = navigator.userAgent;
+      let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+      if(isiOS){
+        window.webkit.messageHandlers.nativeObject.postMessage(data);
+      }else {
+        window.android.sendMessage("articleId=" + item.id);
+      }
+    },
+    onRefresh() {
+      this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
    async changeTab(index) {
     this.activeIndex = index
     this.pageNum = 1
@@ -161,6 +186,7 @@ export default {
   padding: 0 8px;
   width: 100%;
   box-sizing: border-box;
+
   .itemWrap{
     margin-top: 16px;
     @include wh(100%, 300px);
diff --git a/src/views/documentView/trainDocment.vue b/src/views/documentView/trainDocment.vue
index 4e90a302..e455c68c 100644
--- a/src/views/documentView/trainDocment.vue
+++ b/src/views/documentView/trainDocment.vue
@@ -23,7 +23,7 @@
   </div>
 
   <div class="contentWrap" v-show="!showEmpty">
-    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
       <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item)">
         <div class="info flexBetween common">
           <div class="title">{{ item.pushUser }}</div>
@@ -87,14 +87,11 @@ export default {
       };
       let u = navigator.userAgent;
       let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
-      // if (window.MyAppBridge) {
-        if(isiOS){
-          window.webkit.messageHandlers.nativeObject.postMessage(data);
-        }else {
-          window.android.sendMessage("articleId=" + item.id);
-        }
-      // }
-      // window.location.href = `http://crm1.sino-assist.com/res/training/training.html?id=${item.id}&source=supplierApp&supplierId=${this.supplierId}&userId=${this.userId}`;
+      if(isiOS){
+        window.webkit.messageHandlers.nativeObject.postMessage(data);
+      }else {
+        window.android.sendMessage("articleId=" + item.id);
+      }
     },
     onRefresh() {
       this.getList()