From 413da6aea7a6c4ddd039957b6e4f9ce1ba1a40a8 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Wed, 9 Oct 2024 15:41:20 +0800
Subject: [PATCH] =?UTF-8?q?task#15348,=E5=9F=B9=E8=AE=AD=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=92=8C=E6=96=87=E6=A1=A3=E6=9D=90=E6=96=99,=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/myMixins.js                   | 6 ++++--
 src/views/documentView/docmentList.vue  | 4 ++--
 src/views/documentView/trainDocment.vue | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/utils/myMixins.js b/src/utils/myMixins.js
index 3d5a7dc6..0aee548a 100644
--- a/src/utils/myMixins.js
+++ b/src/utils/myMixins.js
@@ -34,19 +34,21 @@ export const myMixins = {
         window.android.sendMessage("goBack");
       }
     },
-    goH5Detail(item){//h5传参到app文档资料，培训文档
+    goH5Detail(item,type){//h5传参到app文档资料，培训文档
       let data = {
         "action": "goTraining",
         "params": {
           "id": item.id,
+          "docType" : type=='培训文档' ? 1 : 2,
         }
       };
+
       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);
+        window.android.sendMessage("articleId=" + item.id+','+'docType='+(type=='培训文档' ? 1 : 2));
       }
     },
     h5GoBack(){
diff --git a/src/views/documentView/docmentList.vue b/src/views/documentView/docmentList.vue
index 641f23a8..97b16d83 100644
--- a/src/views/documentView/docmentList.vue
+++ b/src/views/documentView/docmentList.vue
@@ -30,10 +30,10 @@
   </div>
   <div class="contentWrap" v-show="!showEmpty">
     <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="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item,'文档资料')">
         <div class="info flexBetween common">
           <div class="title">{{ item.name }}</div>
-          <div class="time">{{ item.updateTime	 }}</div>
+          <div class="time">{{ item.pushTime		 }}</div>
         </div>
         <div class="imgWrap">
           <img :src="item.themePicture">
diff --git a/src/views/documentView/trainDocment.vue b/src/views/documentView/trainDocment.vue
index bd022484..2b58e1b0 100644
--- a/src/views/documentView/trainDocment.vue
+++ b/src/views/documentView/trainDocment.vue
@@ -29,10 +29,10 @@
   </div>
   <div class="contentWrap" v-show="!showEmpty">
     <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="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item,'培训文档')">
         <div class="info flexBetween common">
           <div class="title">{{ item.name }}<span v-if="item.mustRead===1" class="read">必读</span></div>
-          <div class="time">{{ item.updateTime	 }}</div>
+          <div class="time">{{ item.pushTime		 }}</div>
         </div>
         <div class="imgWrap">
           <img :src="item.themePicture">