From d4acc3788043f73ad678b48190bbaa58740c8523 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 14 Feb 2023 11:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/qujing/AppMine/AppMine.vue  | 18 +++++------
 src/project/qujing/AppMine/testList.vue | 41 +++++++++++++++++++------
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/project/qujing/AppMine/AppMine.vue b/src/project/qujing/AppMine/AppMine.vue
index 33f29d7..a2b5b57 100644
--- a/src/project/qujing/AppMine/AppMine.vue
+++ b/src/project/qujing/AppMine/AppMine.vue
@@ -74,12 +74,12 @@ export default {
             path: "./testList",
             type: 'token'
           },
-          {
-            icon: 'https://cdn.cunwuyun.cn/qujing/wdzs.png',
-            label: "我的证书",
-            path: "/mods/AppHometown/AppHometown",
-            type: 'token'
-          }
+          // {
+          //   icon: 'https://cdn.cunwuyun.cn/qujing/wdzs.png',
+          //   label: "我的证书",
+          //   path: "/mods/AppHometown/AppHometown",
+          //   type: 'token'
+          // }
         ],
       ]
     }
@@ -154,8 +154,7 @@ export default {
 
   .header-bg {
     width: 100%;
-    height: 424px;
-    position: relative;
+    height: 512px;
 
     .header-info {
       width: 100%;
@@ -163,7 +162,7 @@ export default {
       background: url("https://cdn.cunwuyun.cn/qujing/header-banner.png") no-repeat no-repeat;
       background-size: 100% 100%;
       box-sizing: border-box;
-      padding: 240px 0 0 48px;
+      padding: 240px 32px 0 48px;
 
       .wrap {
         width: 100%;
@@ -264,6 +263,7 @@ export default {
   .list-wrap {
     box-sizing: border-box;
     padding: 32px;
+    margin-top: -130px;
 
     .card {
       width: 100%;
diff --git a/src/project/qujing/AppMine/testList.vue b/src/project/qujing/AppMine/testList.vue
index 588d7cb..2c13a0e 100644
--- a/src/project/qujing/AppMine/testList.vue
+++ b/src/project/qujing/AppMine/testList.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="page">
     <div class="list">
-      <div class="item">
-        <div class="top">
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="top" @click="toTestResult(item.id)">
           <div class="flex-left">
-            <h3>曲靖规则基本考试</h3>
-            <p class="mar-b16">共<span>10</span>题,预计<span>10</span>分钟</p>
-            <p>264人通过/283人参与</p>
+            <h3>{{item.examinationName}}</h3>
+            <p class="mar-b16">共<span>{{item.allSubjectNumber}}</span>题,预计<span>10</span>分钟</p>
+            <p>{{item.passNumber}}人通过/{{item.examinationNumber}}人参与</p>
           </div>
           <div class="flex-right">
-            <img src="https://cdn.cunwuyun.cn/img/qrcode-sign-fail.png" alt="">
+            <img :src="statusImgList[item.assessmentType]" alt="" />
           </div>
         </div>
-        <div class="bottom">重新考试</div>
+        <div class="bottom" @click="toTestForm(item.id)">重新考试</div>
       </div>
     </div>
   </div>
@@ -25,7 +25,11 @@ export default {
   appName: "考试记录",
   data() {
     return {
-      
+      current: 1,
+      pages: 2,
+      list: [],
+      statusImgList: ['https://cdn.cunwuyun.cn/qujing/youxiu.png', 'https://cdn.cunwuyun.cn/qujing/lianghao.png',
+       'https://cdn.cunwuyun.cn/qujing/jige.png', 'https://cdn.cunwuyun.cn/qujing/bujige.png']
     }
   },
   computed: {
@@ -39,9 +43,28 @@ export default {
       frontColor: "#000000",
       backgroundColor: "#F4F6FA",
     })
+    this.getList()
   },
   methods: {
-    
+    getList() {
+      if(this.current > this.pages) return
+      this.$instance.post(`/app/appexaminationinfo/myExamination?size=20&current=${this.current}`).then(res => {
+        if (res.code == 0) {
+          this.pages = res.data.pages
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+    toTestForm(id) {
+      uni.navigateTo({url: `../AppLegalLearning/testForm?id=${id}`})
+    },
+    toTestResult(id) {
+      uni.navigateTo({url: `../AppLegalLearning/result?id=${id}`})
+    },
+  },
+  onReachBottom() {
+    this.current ++
+    this.getList()
   }
 }
 </script>