From 75e014562fb94f24a562bab1e4fc0d78ddbb04cf Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Thu, 26 Sep 2024 17:42:15 +0800
Subject: [PATCH] =?UTF-8?q?task#15348,=E6=96=B0=E4=BA=BA=E5=9F=B9=E8=AE=AD?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4=EF=BC=8C=E5=BF=85=E8=AF=BB?=
 =?UTF-8?q?=E5=AD=97=E5=8F=B7=E5=87=8F=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/documentView/trainDocment.vue       |  1 +
 .../newcomerTraining/newTrainingList.vue      | 33 ++-----------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/views/documentView/trainDocment.vue b/src/views/documentView/trainDocment.vue
index 70a64a67..e170b56e 100644
--- a/src/views/documentView/trainDocment.vue
+++ b/src/views/documentView/trainDocment.vue
@@ -124,5 +124,6 @@ export default {
   border-radius: 5px;
   border: 1px solid red;
   color: red;
+  font-size: 8px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/newcomerTraining/newTrainingList.vue b/src/views/newcomerTraining/newTrainingList.vue
index 8f259df8..b2ebf9c3 100644
--- a/src/views/newcomerTraining/newTrainingList.vue
+++ b/src/views/newcomerTraining/newTrainingList.vue
@@ -11,8 +11,8 @@
       <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 class="title">{{ item.name }}</div>
+            <div class="time">{{ item.updateTime }}</div>
           </div>
           <div class="imgWrap"><img :src="item.themePicture"></div>
           <div class="num common">{{ item.synopsis }}</div>
@@ -38,7 +38,6 @@
             <div class="nextBtn" @click="showPoup = false">确定</div>
           </div>
         </div>
-
       </div>
     </div>
     <div  class="poupCommon" v-if="isFinished">
@@ -51,17 +50,14 @@
             <div class="nextBtn" @click="goApp">前往</div>
           </div>
         </div>
-
       </div>
     </div>
   </div>
 </template>
 
 <script>
-// import { Dialog  } from 'vant';
 import {myMixins} from "@/utils/myMixins"
 import {pageList} from  "@/api/mine"
-
 export default {
   name: "newTrainingList",
   computed: {
@@ -78,8 +74,6 @@ export default {
       isLoading:false,
       showPoup:true,//进入弹框
       isFinished:false,
-      // showPoup:false,//进入弹框
-      // isFinished:true,
     }
   },
   mounted() {
@@ -116,7 +110,6 @@ export default {
       if(aaa){
         this.showPoup=false
         this.isFinished=true
-        // await this.allProcessed()
       }
       if(res.data.length === 0){
         this.showEmpty  = true
@@ -139,28 +132,6 @@ export default {
         window.android.sendMessage("goBack");
       }
     },
-    /*allProcessed(){
-      Dialog.confirm({
-        title: '提示',
-        message: '恭喜您，您已经全部完成培训！现在您可以正常使用我们的app，请前往体验。',
-        confirmButtonText: '前往',
-        cancelButtonText: '稍后'
-      })
-          .then(() => {
-            let data = {"action":"goBack","params":""}
-            var u = navigator.userAgent;
-            var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
-            if(isiOS){
-              window.webkit.messageHandlers.nativeObject.postMessage(data);
-            }else {
-              window.android.sendMessage("goBack");
-            }
-          })
-          .catch(() => {
-            // on cancel
-          });
-      console.log("全部处理")
-    },*/
   }
 }
 </script>