From d41219c77ea39a313d97948dab6197c694c41e1b Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 19 Feb 2025 00:39:14 +0800
Subject: [PATCH] =?UTF-8?q?#=E8=B0=83=E6=95=B4=201=E3=80=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#修复
1、修复任务中的考试任务跳转问题
---
 src/manifest.json                   |    4 +-
 src/pages/index/components/tab0.vue | 1402 ++++++++++++++-------------
 src/pages/promote/progress.vue      |  795 ++++++++-------
 3 files changed, 1106 insertions(+), 1095 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 346f029..e0cd833 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "appid" : "__UNI__06C03D0",
     //__UNI__06C03D0
     "description" : "",
-    "versionName" : "1.33.10",
-    "versionCode" : "247",
+    "versionName" : "1.33.11",
+    "versionCode" : "248",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/src/pages/index/components/tab0.vue b/src/pages/index/components/tab0.vue
index 77d4c80..5a46a4d 100644
--- a/src/pages/index/components/tab0.vue
+++ b/src/pages/index/components/tab0.vue
@@ -1,263 +1,277 @@
 <template>
-    <view>
-        <view class="layout-banner">
-            <uv-swiper :list="imgList" indicator indicatorMode="dot" height="300rpx" radius="30rpx"></uv-swiper>
+  <view>
+    <view class="layout-banner">
+      <uv-swiper :list="imgList" indicator indicatorMode="dot" height="300rpx" radius="30rpx"></uv-swiper>
+    </view>
+    <!-- 新闻资讯 -->
+    <view class="layout-news">
+      <view class="news-box">
+        <view class="name">新闻资讯</view>
+        <view class="news-content">
+          <swiper class="swiper-news" :autoplay="true" vertical="true">
+            <swiper-item v-for="(item, index) in newsList" :key="index">
+              <view class="news-item" @click="$jump(`/pages/article/info?id=${item.articleId}`)">
+                {{ item.title }}
+              </view>
+            </swiper-item>
+          </swiper>
+        </view>
+      </view>
+    </view>
+    <!-- 五分区 -->
+    <view class="layout-fifth">
+      <view class="fifth-item" v-for="(item,index) in fifthList" :key="index"
+            @click="handFifth(item.type)">
+        <view class="icon">
+          <uv-image :src="item.icon" width="60rpx" height="60rpx"></uv-image>
         </view>
-        <!-- 新闻资讯 -->
-        <view class="layout-news">
-            <view class="news-box">
-                <view class="name">新闻资讯</view>
-                <view class="news-content">
-                    <swiper class="swiper-news" :autoplay="true" vertical="true">
-                        <swiper-item v-for="(item, index) in newsList" :key="index">
-                            <view class="news-item" @click="$jump(`/pages/article/info?id=${item.articleId}`)">
-                                {{ item.title }}
-                            </view>
-                        </swiper-item>
-                    </swiper>
+        <view class="text">{{ item.name }}</view>
+      </view>
+    </view>
+    <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>
+    <view v-for="(item, index) in articleList" :key="index">
+      <view class="p-20 border-bottom">
+        <view class="flex justify-start items-center" @click="$jump(`/pages/article/info?id=${item.articleId}`)">
+          <uv-icon name="/static/image/hot.png" v-if="item.recommend === 1"/>
+          <view class="text-30 font-bold ml-10">{{ item.title }}</view>
+        </view>
+        <view class="mt-20 text-25 text-gray">
+          <view class="flex justify-start items-center">
+            <text @click="$jump(`/pages/article/list?id=${item.categoryId}&title=${item.categoryName}`)"
+                  class="text-blue">
+              #{{ item.categoryName }}#
+            </text>
+            <text @click="$jump(`/pages/article/info?id=${item.articleId}`)" class="ml-20">
+              {{ dayjs(item.publishTime ? item.publishTime : item.createTime).format('YYYY-MM-DD') }}
+            </text>
+            <text @click="$jump(`/pages/article/info?id=${item.articleId}`)" class="ml-20 text-gray">
+              {{ item.actualViews + item.virtualViews }} 浏览
+            </text>
+          </view>
+          <view @click="$jump(`/pages/article/info?id=${item.articleId}`)" class="mt-20 text-25 text-black line-2"
+                v-if="item.comments">{{ item.comments }}
+          </view>
+          <view class="mt-20">
+            <uv-image v-if="item.album && item.album.length === 1 && item.album[0]" :src="item.album[0].url" radius="15"
+                      width="710rpx" height="710rpx" @click="handPreviewImage(item.album, 0)"/>
+            <view v-else-if="item.album && item.album.length === 2"
+                  class="flex justify-center items-center">
+              <view class="mx-10">
+                <uv-image :src="item.album[0].url" @click="handPreviewImage(item.album, 0)" radius="15" width="340rpx"
+                          height="340rpx"/>
+              </view>
+              <view class="mx-10">
+                <uv-image :src="item.album[1].url" @click="handPreviewImage(item.album, 1)" radius="15" width="340rpx"
+                          height="340rpx"/>
+              </view>
+            </view>
+            <view class="flex flex-col justify-center items-center"
+                  v-else-if="item.album && item.album.length === 3">
+              <view class="flex justify-center items-center mb-20">
+                <view class="mx-10">
+                  <uv-image :src="item.album[0].url" @click="handPreviewImage(item.album, 0)" radius="15" width="340rpx"
+                            height="340rpx"/>
+                </view>
+                <view class="mx-10">
+                  <uv-image :src="item.album[1].url" @click="handPreviewImage(item.album, 1)" radius="15" width="340rpx"
+                            height="340rpx"/>
                 </view>
+              </view>
+              <uv-image :src="item.album[2].url" @click="handPreviewImage(item.album, 2)" radius="15" width="710rpx"
+                        height="340rpx"/>
             </view>
-        </view>
-        <!-- 五分区 -->
-        <view class="layout-fifth">
-            <scroll-view class="fifth-scroll" scroll-x="true">
-                <view class="fifth-item" v-for="(item,index) in fifthList" :key="index"
-                      @click="handFifth(item.type)">
-                    <view class="icon">
-                        <uv-image :src="item.icon" width="60rpx" height="60rpx"></uv-image>
-                    </view>
-                    <view class="text">{{ item.name }}</view>
+            <view class="flex flex-col justify-center items-center"
+                  v-else-if="item.album && item.album.length === 4">
+              <view class="flex justify-center items-center mb-20">
+                <view class="mx-10">
+                  <uv-image :src="item.album[0].url" @click="handPreviewImage(item.album, 0)" radius="15" width="340rpx"
+                            height="340rpx"/>
                 </view>
-            </scroll-view>
-        </view>
-        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>
-        <view v-for="(item, index) in articleList" :key="index">
-            <view class="p-20 border-bottom">
-                <view class="flex justify-start items-center" @click="$jump(`/pages/article/info?id=${item.articleId}`)">
-                    <uv-icon name="/static/image/hot.png" v-if="item.recommend === 1"/>
-                    <view class="text-30 font-bold ml-10">{{ item.title }}</view>
+                <view class="mx-10">
+                  <uv-image :src="item.album[1].url" @click="handPreviewImage(item.album, 1)" radius="15" width="340rpx"
+                            height="340rpx"/>
+                </view>
+              </view>
+              <view class="flex justify-center items-center">
+                <view class="mx-10">
+                  <uv-image :src="item.album[2].url" @click="handPreviewImage(item.album, 2)" radius="15" width="340rpx"
+                            height="340rpx"/>
                 </view>
-                <view class="mt-20 text-25 text-gray">
-                    <view class="flex justify-start items-center">
-                        <text @click="$jump(`/pages/article/list?id=${item.categoryId}&title=${item.categoryName}`)" class="text-blue">
-                            #{{ item.categoryName }}#
-                        </text>
-                        <text @click="$jump(`/pages/article/info?id=${item.articleId}`)" class="ml-20">{{ dayjs(item.publishTime ? item.publishTime : item.createTime).format('YYYY-MM-DD') }}</text>
-                        <text @click="$jump(`/pages/article/info?id=${item.articleId}`)" class="ml-20 text-gray">{{ item.actualViews + item.virtualViews }} 浏览</text>
-                    </view>
-                    <view @click="$jump(`/pages/article/info?id=${item.articleId}`)" class="mt-20 text-25 text-black line-2" v-if="item.comments">{{ item.comments }}</view>
-                    <view class="mt-20">
-                        <uv-image v-if="item.album && item.album.length === 1 && item.album[0]" :src="item.album[0].url" radius="15"
-                                  width="710rpx" height="710rpx" @click="handPreviewImage(item.album, 0)"/>
-                        <view v-else-if="item.album && item.album.length === 2"
-                              class="flex justify-center items-center">
-                            <view class="mx-10">
-                                <uv-image :src="item.album[0].url" @click="handPreviewImage(item.album, 0)" radius="15" width="340rpx" height="340rpx"/>
-                            </view>
-                            <view class="mx-10">
-                                <uv-image :src="item.album[1].url" @click="handPreviewImage(item.album, 1)" radius="15" width="340rpx" height="340rpx"/>
-                            </view>
-                        </view>
-                        <view class="flex flex-col justify-center items-center"
-                              v-else-if="item.album && item.album.length === 3">
-                            <view class="flex justify-center items-center mb-20">
-                                <view class="mx-10">
-                                    <uv-image :src="item.album[0].url" @click="handPreviewImage(item.album, 0)" radius="15" width="340rpx" height="340rpx"/>
-                                </view>
-                                <view class="mx-10">
-                                    <uv-image :src="item.album[1].url" @click="handPreviewImage(item.album, 1)" radius="15" width="340rpx" height="340rpx"/>
-                                </view>
-                            </view>
-                            <uv-image :src="item.album[2].url" @click="handPreviewImage(item.album, 2)" radius="15" width="710rpx" height="340rpx"/>
-                        </view>
-                        <view class="flex flex-col justify-center items-center"
-                              v-else-if="item.album && item.album.length === 4">
-                            <view class="flex justify-center items-center mb-20">
-                                <view class="mx-10">
-                                    <uv-image :src="item.album[0].url" @click="handPreviewImage(item.album, 0)" radius="15" width="340rpx" height="340rpx"/>
-                                </view>
-                                <view class="mx-10">
-                                    <uv-image :src="item.album[1].url" @click="handPreviewImage(item.album, 1)" radius="15" width="340rpx" height="340rpx"/>
-                                </view>
-                            </view>
-                            <view class="flex justify-center items-center">
-                                <view class="mx-10">
-                                    <uv-image :src="item.album[2].url" @click="handPreviewImage(item.album, 2)" radius="15" width="340rpx" height="340rpx"/>
-                                </view>
-                                <view class="mx-10">
-                                    <uv-image :src="item.album[3].url" @click="handPreviewImage(item.album, 3)" radius="15" width="340rpx" height="340rpx"/>
-                                </view>
-                            </view>
-                        </view>
-                    </view>
+                <view class="mx-10">
+                  <uv-image :src="item.album[3].url" @click="handPreviewImage(item.album, 3)" radius="15" width="340rpx"
+                            height="340rpx"/>
                 </view>
+              </view>
             </view>
+          </view>
         </view>
-        <!--        &lt;!&ndash; 竞赛 &ndash;&gt;-->
-        <!--        <view class="layout layout-race">-->
-        <!--            <view class="title-box" @click="$jump('/pages/match/match')">-->
-        <!--                <view class="title">竞赛进行时</view>-->
-        <!--                <view class="link">查看更多</view>-->
-        <!--            </view>-->
-        <!--            <view class="race-box">-->
-        <!--                <view class="race-item item-0" @click="toSingleMatch">-->
-        <!--                    <view class="icon">-->
-        <!--                        <uv-image src="/static/image/race-1.png" width="60rpx" height="60rpx"></uv-image>-->
-        <!--                    </view>-->
-        <!--                    <view class="text">个人竞技</view>-->
-        <!--                </view>-->
-        <!--                <view class="race-item item-1" @click="toMultiMatch">-->
-        <!--                    <view class="icon">-->
-        <!--                        <uv-image src="/static/image/race-2.png" width="60rpx" height="60rpx"></uv-image>-->
-        <!--                    </view>-->
-        <!--                    <view class="text">组队竞技</view>-->
-        <!--                </view>-->
-        <!--                <view class="race-item item-2" @click="$jump('/pages/match/pass?type=0')">-->
-        <!--                    <view class="icon">-->
-        <!--                        <uv-image src="/static/image/race-3.png" width="60rpx" height="60rpx"></uv-image>-->
-        <!--                    </view>-->
-        <!--                    <view class="text">答题闯关</view>-->
-        <!--                </view>-->
-        <!--            </view>-->
-        <!--        </view>-->
-        <!--        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>-->
-        <!--        &lt;!&ndash; 团队动态 &ndash;&gt;-->
-        <!--        <view class="layout layout-team">-->
-        <!--            <view class="title-box">-->
-        <!--                <view class="title">团队动态</view>-->
-        <!--                <view class="link">查看更多</view>-->
-        <!--            </view>-->
-        <!--            <view class="team-box" v-if="trainInfoList.length">-->
-        <!--                <view class="team-item">-->
-        <!--                    <view class="img">-->
-        <!--                        <uv-image :src="trainInfoList[0].trainInfo.cover" radius="20rpx" width="330rpx"-->
-        <!--                                  height="210rpx"></uv-image>-->
-        <!--                    </view>-->
-        <!--                    <view class="info">-->
-        <!--                        <view class="name">-->
-        <!--                            <uv-text :text="trainInfoList[0].trainInfo.title" lineHeight="36rpx" :lines="1"-->
-        <!--                                     bold></uv-text>-->
-        <!--                        </view>-->
-        <!--                        <view class="text">-->
-        <!--                            <uv-text :text="trainInfoList[0].trainInfo.intro" size="28rpx"-->
-        <!--                                     lineHeight="36rpx" :lines="3" color="#999"></uv-text>-->
-        <!--                        </view>-->
-        <!--                        <view class="man">-->
-        <!--                            &lt;!&ndash;                            <uv-avatar-group :urls="urls" size="40rpx" gap="0.4"></uv-avatar-group>&ndash;&gt;-->
-        <!--                            <text class="ren">{{ trainInfoList[0].trainInfo.peopleNum }}成员在学习</text>-->
-        <!--                        </view>-->
-        <!--                    </view>-->
-        <!--                </view>-->
-        <!--            </view>-->
-        <!--        </view>-->
-        <!--        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>-->
-        <!--        &lt;!&ndash; 培训进行时 &ndash;&gt;-->
-        <!--        <view class="layout">-->
-        <!--            <view class="title-box">-->
-        <!--                <view class="title">培训进行时</view>-->
-        <!--                <view class="link" @click="handFifth('promote')">查看更多</view>-->
-        <!--            </view>-->
-        <!--            <scroll-view class="tab-box" scroll-x="true">-->
-        <!--                <view :class="['tab-item',{active:tabIndex === index}]" v-for="(item,index) in tabList" :key="index"-->
-        <!--                      @click="handTab(index)">-->
-        <!--                    {{ item.name }}-->
-        <!--                </view>-->
-        <!--            </scroll-view>-->
-        <!--            <view class="train-box">-->
-        <!--                <swiper class="swiper-train" indicator-active-color="#00a4ee" :indicator-dots="true"-->
-        <!--                        :autoplay="true" next-margin="210rpx" circular="true">-->
-        <!--                    <swiper-item v-for="(item,index) in trainTaskList" :key="index"-->
-        <!--                                 @click="$jump(`/pages/promote/learn?courseId=${item.courseId}&trainId=${item.courseId}`)">-->
-        <!--                        <view class="train-item">-->
-        <!--                            <view class="img">-->
-        <!--                                <uv-image :src="item.cover" radius="20rpx"-->
-        <!--                                          width="470rpx" height="280rpx"></uv-image>-->
-        <!--                            </view>-->
-        <!--                            <view class="name">-->
-        <!--                                <uv-text :text="item.knowledgeStructure.title" size="28rpx" lineHeight="40rpx"-->
-        <!--                                         :lines="1" align="center"-->
-        <!--                                         bold color="#000"></uv-text>-->
-        <!--                            </view>-->
-        <!--                            <view class="text">-->
-        <!--                                <uv-text :text="item.knowledgeStructure.intro"-->
-        <!--                                         size="26rpx" lineHeight="32rpx" :lines="2" color="#b4b4b4"></uv-text>-->
-        <!--                            </view>-->
-        <!--                        </view>-->
-        <!--                    </swiper-item>-->
-        <!--                </swiper>-->
-        <!--            </view>-->
-        <!--        </view>-->
-        <!--        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>-->
-        <!--        &lt;!&ndash; 考试进行时 &ndash;&gt;-->
-        <!--        <view class="layout layout-exam">-->
-        <!--            <view class="title-box">-->
-        <!--                <view class="title">考试进行时</view>-->
-        <!--                <view class="link" @click="$jump(`/pages/promote/task?trainId=${trainInfoList[0].trainId}`)">查看更多-->
-        <!--                </view>-->
-        <!--            </view>-->
-        <!--            <view class="exam-box">-->
-        <!--                <view class="exam-item" v-for="(item,index) in examList" :key="index" @click="toExam(item)">-->
-        <!--                    <view class="info">-->
-        <!--                        <view class="name">-->
-        <!--                            <uv-text :text="item.paper.makeExamPlan.title" size="24rpx" lineHeight="40rpx" :lines="1"-->
-        <!--                                     bold></uv-text>-->
-        <!--                        </view>-->
-        <!--                        <view class="fen">总分 {{ item.paper.makeExamPlan.totalPoint }} 合格分 {{-->
-        <!--                                item.paper.makeExamPlan.passPoint-->
-        <!--                            }}-->
-        <!--                        </view>-->
-        <!--                    </view>-->
-        <!--                    &lt;!&ndash; <view class="round">未考</view> &ndash;&gt;-->
-        <!--                    <mprogress-->
-        <!--                        :progress="item.progress"-->
-        <!--                        :activeColor="item.color"-->
-        <!--                        :valueColor="item.color"-->
-        <!--                        :valueFontSize="12"-->
-        <!--                        :valueText="item.text"-->
-        <!--                        :width="50"-->
-        <!--                        :borderWidth="4"-->
-        <!--                    ></mprogress>-->
-        <!--                </view>-->
-        <!--            </view>-->
-        <!--        </view>-->
-        <!--        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>-->
-        <!--        &lt;!&ndash; 活动简介 &ndash;&gt;-->
-        <!--        <view class="layout">-->
-        <!--            <view class="title-box">-->
-        <!--                <view class="title">活动简介</view>-->
-        <!--                <view class="link">查看更多</view>-->
-        <!--            </view>-->
-        <!--            <view class="activity-box">-->
-        <!--                <view class="same-item" v-for="(item,index) in activityList" :key="index"-->
-        <!--                      @click="$jump(`/pages/activity/info?id=${item.id}`)">-->
-        <!--                    <view class="same-img">-->
-        <!--                        <view :class="['img', {pic: item.album.length === 1}]" v-for="(img,idx) in item.album"-->
-        <!--                              :key="idx">-->
-        <!--                            <uv-image :src="img" radius="20rpx" width="100%" height="100%"></uv-image>-->
-        <!--                        </view>-->
-        <!--                    </view>-->
-        <!--                    <view class="text">-->
-        <!--                        <uv-text :text="item.title" size="28rpx"-->
-        <!--                                 lineHeight="48rpx" :lines="2" bold color="#333"></uv-text>-->
-        <!--                    </view>-->
-        <!--                    <view class="between" @click="$jump(`/pages/activity/info?id=${item.id}`)">-->
-        <!--                        <view class="num">-->
-        <!--                            <text class="blue">{{ item.bookingNum }}</text>-->
-        <!--                            人已报名-->
-        <!--                            剩余-->
-        <!--                            <text class="red">{{ item.maxNum - item.bookingNum }}</text>-->
-        <!--                            人-->
-        <!--                        </view>-->
-        <!--                        <view class="msg">-->
-        <!--                            <uv-image src="/static/image/i-msg.png" width="40rpx" height="40rpx"></uv-image>-->
-        <!--                            <view class="shu">0</view>-->
-        <!--                        </view>-->
-        <!--                        <uv-image src="/static/image/i-nav.png" width="40rpx" height="40rpx"></uv-image>-->
-        <!--                    </view>-->
-        <!--                </view>-->
-        <!--            </view>-->
-        <!--        </view>-->
+      </view>
     </view>
+    <!--        &lt;!&ndash; 竞赛 &ndash;&gt;-->
+    <!--        <view class="layout layout-race">-->
+    <!--            <view class="title-box" @click="$jump('/pages/match/match')">-->
+    <!--                <view class="title">竞赛进行时</view>-->
+    <!--                <view class="link">查看更多</view>-->
+    <!--            </view>-->
+    <!--            <view class="race-box">-->
+    <!--                <view class="race-item item-0" @click="toSingleMatch">-->
+    <!--                    <view class="icon">-->
+    <!--                        <uv-image src="/static/image/race-1.png" width="60rpx" height="60rpx"></uv-image>-->
+    <!--                    </view>-->
+    <!--                    <view class="text">个人竞技</view>-->
+    <!--                </view>-->
+    <!--                <view class="race-item item-1" @click="toMultiMatch">-->
+    <!--                    <view class="icon">-->
+    <!--                        <uv-image src="/static/image/race-2.png" width="60rpx" height="60rpx"></uv-image>-->
+    <!--                    </view>-->
+    <!--                    <view class="text">组队竞技</view>-->
+    <!--                </view>-->
+    <!--                <view class="race-item item-2" @click="$jump('/pages/match/pass?type=0')">-->
+    <!--                    <view class="icon">-->
+    <!--                        <uv-image src="/static/image/race-3.png" width="60rpx" height="60rpx"></uv-image>-->
+    <!--                    </view>-->
+    <!--                    <view class="text">答题闯关</view>-->
+    <!--                </view>-->
+    <!--            </view>-->
+    <!--        </view>-->
+    <!--        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>-->
+    <!--        &lt;!&ndash; 团队动态 &ndash;&gt;-->
+    <!--        <view class="layout layout-team">-->
+    <!--            <view class="title-box">-->
+    <!--                <view class="title">团队动态</view>-->
+    <!--                <view class="link">查看更多</view>-->
+    <!--            </view>-->
+    <!--            <view class="team-box" v-if="trainInfoList.length">-->
+    <!--                <view class="team-item">-->
+    <!--                    <view class="img">-->
+    <!--                        <uv-image :src="trainInfoList[0].trainInfo.cover" radius="20rpx" width="330rpx"-->
+    <!--                                  height="210rpx"></uv-image>-->
+    <!--                    </view>-->
+    <!--                    <view class="info">-->
+    <!--                        <view class="name">-->
+    <!--                            <uv-text :text="trainInfoList[0].trainInfo.title" lineHeight="36rpx" :lines="1"-->
+    <!--                                     bold></uv-text>-->
+    <!--                        </view>-->
+    <!--                        <view class="text">-->
+    <!--                            <uv-text :text="trainInfoList[0].trainInfo.intro" size="28rpx"-->
+    <!--                                     lineHeight="36rpx" :lines="3" color="#999"></uv-text>-->
+    <!--                        </view>-->
+    <!--                        <view class="man">-->
+    <!--                            &lt;!&ndash;                            <uv-avatar-group :urls="urls" size="40rpx" gap="0.4"></uv-avatar-group>&ndash;&gt;-->
+    <!--                            <text class="ren">{{ trainInfoList[0].trainInfo.peopleNum }}成员在学习</text>-->
+    <!--                        </view>-->
+    <!--                    </view>-->
+    <!--                </view>-->
+    <!--            </view>-->
+    <!--        </view>-->
+    <!--        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>-->
+    <!--        &lt;!&ndash; 培训进行时 &ndash;&gt;-->
+    <!--        <view class="layout">-->
+    <!--            <view class="title-box">-->
+    <!--                <view class="title">培训进行时</view>-->
+    <!--                <view class="link" @click="handFifth('promote')">查看更多</view>-->
+    <!--            </view>-->
+    <!--            <scroll-view class="tab-box" scroll-x="true">-->
+    <!--                <view :class="['tab-item',{active:tabIndex === index}]" v-for="(item,index) in tabList" :key="index"-->
+    <!--                      @click="handTab(index)">-->
+    <!--                    {{ item.name }}-->
+    <!--                </view>-->
+    <!--            </scroll-view>-->
+    <!--            <view class="train-box">-->
+    <!--                <swiper class="swiper-train" indicator-active-color="#00a4ee" :indicator-dots="true"-->
+    <!--                        :autoplay="true" next-margin="210rpx" circular="true">-->
+    <!--                    <swiper-item v-for="(item,index) in trainTaskList" :key="index"-->
+    <!--                                 @click="$jump(`/pages/promote/learn?courseId=${item.courseId}&trainId=${item.courseId}`)">-->
+    <!--                        <view class="train-item">-->
+    <!--                            <view class="img">-->
+    <!--                                <uv-image :src="item.cover" radius="20rpx"-->
+    <!--                                          width="470rpx" height="280rpx"></uv-image>-->
+    <!--                            </view>-->
+    <!--                            <view class="name">-->
+    <!--                                <uv-text :text="item.knowledgeStructure.title" size="28rpx" lineHeight="40rpx"-->
+    <!--                                         :lines="1" align="center"-->
+    <!--                                         bold color="#000"></uv-text>-->
+    <!--                            </view>-->
+    <!--                            <view class="text">-->
+    <!--                                <uv-text :text="item.knowledgeStructure.intro"-->
+    <!--                                         size="26rpx" lineHeight="32rpx" :lines="2" color="#b4b4b4"></uv-text>-->
+    <!--                            </view>-->
+    <!--                        </view>-->
+    <!--                    </swiper-item>-->
+    <!--                </swiper>-->
+    <!--            </view>-->
+    <!--        </view>-->
+    <!--        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>-->
+    <!--        &lt;!&ndash; 考试进行时 &ndash;&gt;-->
+    <!--        <view class="layout layout-exam">-->
+    <!--            <view class="title-box">-->
+    <!--                <view class="title">考试进行时</view>-->
+    <!--                <view class="link" @click="$jump(`/pages/promote/task?trainId=${trainInfoList[0].trainId}`)">查看更多-->
+    <!--                </view>-->
+    <!--            </view>-->
+    <!--            <view class="exam-box">-->
+    <!--                <view class="exam-item" v-for="(item,index) in examList" :key="index" @click="toExam(item)">-->
+    <!--                    <view class="info">-->
+    <!--                        <view class="name">-->
+    <!--                            <uv-text :text="item.paper.makeExamPlan.title" size="24rpx" lineHeight="40rpx" :lines="1"-->
+    <!--                                     bold></uv-text>-->
+    <!--                        </view>-->
+    <!--                        <view class="fen">总分 {{ item.paper.makeExamPlan.totalPoint }} 合格分 {{-->
+    <!--                                item.paper.makeExamPlan.passPoint-->
+    <!--                            }}-->
+    <!--                        </view>-->
+    <!--                    </view>-->
+    <!--                    &lt;!&ndash; <view class="round">未考</view> &ndash;&gt;-->
+    <!--                    <mprogress-->
+    <!--                        :progress="item.progress"-->
+    <!--                        :activeColor="item.color"-->
+    <!--                        :valueColor="item.color"-->
+    <!--                        :valueFontSize="12"-->
+    <!--                        :valueText="item.text"-->
+    <!--                        :width="50"-->
+    <!--                        :borderWidth="4"-->
+    <!--                    ></mprogress>-->
+    <!--                </view>-->
+    <!--            </view>-->
+    <!--        </view>-->
+    <!--        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>-->
+    <!--        &lt;!&ndash; 活动简介 &ndash;&gt;-->
+    <!--        <view class="layout">-->
+    <!--            <view class="title-box">-->
+    <!--                <view class="title">活动简介</view>-->
+    <!--                <view class="link">查看更多</view>-->
+    <!--            </view>-->
+    <!--            <view class="activity-box">-->
+    <!--                <view class="same-item" v-for="(item,index) in activityList" :key="index"-->
+    <!--                      @click="$jump(`/pages/activity/info?id=${item.id}`)">-->
+    <!--                    <view class="same-img">-->
+    <!--                        <view :class="['img', {pic: item.album.length === 1}]" v-for="(img,idx) in item.album"-->
+    <!--                              :key="idx">-->
+    <!--                            <uv-image :src="img" radius="20rpx" width="100%" height="100%"></uv-image>-->
+    <!--                        </view>-->
+    <!--                    </view>-->
+    <!--                    <view class="text">-->
+    <!--                        <uv-text :text="item.title" size="28rpx"-->
+    <!--                                 lineHeight="48rpx" :lines="2" bold color="#333"></uv-text>-->
+    <!--                    </view>-->
+    <!--                    <view class="between" @click="$jump(`/pages/activity/info?id=${item.id}`)">-->
+    <!--                        <view class="num">-->
+    <!--                            <text class="blue">{{ item.bookingNum }}</text>-->
+    <!--                            人已报名-->
+    <!--                            剩余-->
+    <!--                            <text class="red">{{ item.maxNum - item.bookingNum }}</text>-->
+    <!--                            人-->
+    <!--                        </view>-->
+    <!--                        <view class="msg">-->
+    <!--                            <uv-image src="/static/image/i-msg.png" width="40rpx" height="40rpx"></uv-image>-->
+    <!--                            <view class="shu">0</view>-->
+    <!--                        </view>-->
+    <!--                        <uv-image src="/static/image/i-nav.png" width="40rpx" height="40rpx"></uv-image>-->
+    <!--                    </view>-->
+    <!--                </view>-->
+    <!--            </view>-->
+    <!--        </view>-->
+  </view>
 </template>
 
 <script setup>
@@ -269,89 +283,89 @@ import {toast} from "@/uni_modules/uv-ui-tools/libs/function";
 import {swiperListReq} from "@/api/common";
 
 const fifthList = ref([
-    // 报名中心、政策查询、排名查询、课程查询、积分查询、进度查询、满意度调研
-    {name: '报名中心', icon: '/static/image/nav-1.png', type: 'signUpCenter'},
-    {name: '竞赛中心', icon: '/static/image/match.png', type: 'match'},
-    {name: '合作单位', icon: '/static/image/coop.png', type: 'coop'},
-    {name: '政策查询', icon: '/static/image/nav-2.png', type: 'policy'},
-    {name: '排名查询', icon: '/static/image/nav-4.png', type: 'rank'},
-    {name: '课程查询', icon: '/static/image/nav-3.png', type: 'promote'},
-    {name: '积分查询', icon: '/static/image/nav-5.png', type: 'point'},
-    {name: '进度查询', icon: '/static/image/nav-7.png', type: 'process'},
-    {name: '满意度调研', icon: '/static/image/nav-8.png', type: 'survey'},
-    {name: '基地建设', icon: '/static/image/base.png', type: 'base'},
-    {name: '招聘需求', icon: '/static/image/hire.png', type: 'hireNeed'},
-    {name: '培训需求', icon: '/static/image/train.png', type: 'trainNeed'},
+  // 报名中心、政策查询、排名查询、课程查询、积分查询、进度查询、满意度调研
+  {name: '报名中心', icon: '/static/image/nav-1.png', type: 'signUpCenter'},
+  {name: '竞赛中心', icon: '/static/image/match.png', type: 'match'},
+  {name: '合作单位', icon: '/static/image/coop.png', type: 'coop'},
+  {name: '政策查询', icon: '/static/image/nav-2.png', type: 'policy'},
+  {name: '排名查询', icon: '/static/image/nav-4.png', type: 'rank'},
+  {name: '课程查询', icon: '/static/image/nav-3.png', type: 'promote'},
+  {name: '积分查询', icon: '/static/image/nav-5.png', type: 'point'},
+  {name: '进度查询', icon: '/static/image/nav-7.png', type: 'process'},
+  {name: '满意度调研', icon: '/static/image/nav-8.png', type: 'survey'},
+  {name: '基地建设', icon: '/static/image/base.png', type: 'base'},
+  {name: '招聘需求', icon: '/static/image/hire.png', type: 'hireNeed'},
+  {name: '培训需求', icon: '/static/image/train.png', type: 'trainNeed'},
 ])
 
 const handFifth = (type) => {
-    if (type === 'rank') {
-        uni.navigateTo({
-            url: '/pages/rank/rank'
-        })
-    } else if (type === 'signUpCenter') {
-        uni.navigateTo({
-            url: '/pages/index/signUpCenter'
-        })
-    } else if (type === 'match') {
-        uni.navigateTo({
-            url: '/pages/match/match'
-        })
-    } else if (type === 'promote') {
-        uni.switchTab({
-            url: '/pages/promote/promote'
-        })
-    } else if (type === 'process') {
-        uni.navigateTo({
-            url: '/pages/promote/progress'
-        })
-    } else if (type === 'point') {
-        uni.navigateTo({
-            url: '/pages/match/pointLog'
-        })
-    } else if (type === 'map') {
-        uni.navigateTo({
-            url: `/pages/promote/map?level=${trainTaskList.value[0].course.level}&seriesNoGroup=${trainTaskList.value[0].course.seriesNoGroup}`
-        })
-    } else if (type === 'survey') {
-        uni.navigateTo({
-            url: `/pages/promote/surveyList`
-        })
-    } else if (type === 'policy') {
-        uni.navigateTo({
-            url: `/pages/article/policy?id=283`
-        })
-    } else if (type === 'base') {
-        uni.navigateTo({
-            url: `/pages/index/base`
-        })
-    } else if (type === 'hireNeed') {
-        uni.navigateTo({
-            url: `/pages/user/hireNeed`
-        })
-    } else if (type === 'trainNeed') {
-        uni.navigateTo({
-            url: `/pages/user/trainNeed`
-        })
-    } else if (type === 'coop') {
-        uni.navigateTo({
-            url: `/pages/coop/index`
-        })
-    }
+  if (type === 'rank') {
+    uni.navigateTo({
+      url: '/pages/rank/rank'
+    })
+  } else if (type === 'signUpCenter') {
+    uni.navigateTo({
+      url: '/pages/index/signUpCenter'
+    })
+  } else if (type === 'match') {
+    uni.navigateTo({
+      url: '/pages/match/match'
+    })
+  } else if (type === 'promote') {
+    uni.switchTab({
+      url: '/pages/promote/promote'
+    })
+  } else if (type === 'process') {
+    uni.navigateTo({
+      url: '/pages/promote/progress'
+    })
+  } else if (type === 'point') {
+    uni.navigateTo({
+      url: '/pages/match/pointLog'
+    })
+  } else if (type === 'map') {
+    uni.navigateTo({
+      url: `/pages/promote/map?level=${trainTaskList.value[0].course.level}&seriesNoGroup=${trainTaskList.value[0].course.seriesNoGroup}`
+    })
+  } else if (type === 'survey') {
+    uni.navigateTo({
+      url: `/pages/promote/surveyList`
+    })
+  } else if (type === 'policy') {
+    uni.navigateTo({
+      url: `/pages/article/policy?id=283`
+    })
+  } else if (type === 'base') {
+    uni.navigateTo({
+      url: `/pages/index/base`
+    })
+  } else if (type === 'hireNeed') {
+    uni.navigateTo({
+      url: `/pages/user/hireNeed`
+    })
+  } else if (type === 'trainNeed') {
+    uni.navigateTo({
+      url: `/pages/user/trainNeed`
+    })
+  } else if (type === 'coop') {
+    uni.navigateTo({
+      url: `/pages/coop/index`
+    })
+  }
 }
 
 const tabIndex = ref(3)
 const tabList = [
-    {id: 1, name: '技能大师工作室'},
-    {id: 2, name: '企业级团队'},
-    {id: 3, name: '部门级团队'},
-    {id: 4, name: '班组级团队'},
+  {id: 1, name: '技能大师工作室'},
+  {id: 2, name: '企业级团队'},
+  {id: 3, name: '部门级团队'},
+  {id: 4, name: '班组级团队'},
 ]
 
 const newsList = ref([])
 const getNewsList = async () => {
-    const {data} = await listArticle({categoryId: 258, page: 1, limit: 10})
-    newsList.value = data
+  const {data} = await listArticle({categoryId: 258, page: 1, limit: 10})
+  newsList.value = data
 }
 
 // const trainInfoList = ref([])
@@ -410,77 +424,77 @@ const getNewsList = async () => {
 // }
 
 const toSingleMatch = async () => {
-    const {data} = await matchSingleRuleGetRuleReq()
-    if (data) {
-        let url = `/pages/exam/rand?title=个人竞技&num=${data.examNum}&diffStart=${data.diffStart}&diffEnd=${data.diffEnd}`
-        url += `&isMatch=true&matchType=0&matchId=${data.matchId}`
-        await uni.navigateTo({
-            url
-        })
-    } else {
-        toast('您还未参与任何竞赛')
-    }
+  const {data} = await matchSingleRuleGetRuleReq()
+  if (data) {
+    let url = `/pages/exam/rand?title=个人竞技&num=${data.examNum}&diffStart=${data.diffStart}&diffEnd=${data.diffEnd}`
+    url += `&isMatch=true&matchType=0&matchId=${data.matchId}`
+    await uni.navigateTo({
+      url
+    })
+  } else {
+    toast('您还未参与任何竞赛')
+  }
 }
 
 const toMultiMatch = async () => {
-    const {data} = await matchMultiRuleGetRuleReq()
-    if (data) {
-        let url = `/pages/exam/rand?title=团队竞技&num=${data.examNum}&diffStart=${data.diffStart}&diffEnd=${data.diffEnd}`
-        url += `&isMatch=true&matchType=1&matchId=${data.matchId}`
-        await uni.navigateTo({
-            url
-        })
-    } else {
-        toast('您还未参与任何竞赛')
-    }
+  const {data} = await matchMultiRuleGetRuleReq()
+  if (data) {
+    let url = `/pages/exam/rand?title=团队竞技&num=${data.examNum}&diffStart=${data.diffStart}&diffEnd=${data.diffEnd}`
+    url += `&isMatch=true&matchType=1&matchId=${data.matchId}`
+    await uni.navigateTo({
+      url
+    })
+  } else {
+    toast('您还未参与任何竞赛')
+  }
 }
 
 const toExam = ({id, examId, hasResult, paper, examDate, needFinishAdventure, hasFinishAdventure}) => {
-    let url
-    if (hasResult)
-        url = `/pages/promote/result?paperId=${examId}&examType=0&examId=${id}&title=${paper.title}`
-    else {
-        if (dayjs(examDate).isBefore(dayjs())) return toast('已过考试时间,无法继续参与考试')
-        if (needFinishAdventure === 1 && !hasFinishAdventure) return toast('请先完成游戏学')
-        url = `/pages/exam/exam?paperId=${examId}&title=${paper.title}&examType=0&examId=${id}`
-    }
-    uni.navigateTo({url})
+  let url
+  if (hasResult)
+    url = `/pages/promote/result?paperId=${examId}&examType=0&examId=${id}&title=${paper.title}`
+  else {
+    if (dayjs(examDate).isBefore(dayjs())) return toast('已过考试时间,无法继续参与考试')
+    if (needFinishAdventure === 1 && !hasFinishAdventure) return toast('请先完成游戏学')
+    url = `/pages/exam/exam?paperId=${examId}&title=${paper.title}&examType=0&examId=${id}`
+  }
+  uni.navigateTo({url})
 }
 
 const imgList = ref([])
 const getSwiperList = async () => {
-    const res = await swiperListReq({pageType: 'index'})
-    if (res) {
-        imgList.value = res.data.map(item => item.img)
-    }
+  const res = await swiperListReq({pageType: 'index'})
+  if (res) {
+    imgList.value = res.data.map(item => item.img)
+  }
 }
 
 const articleList = ref([])
 const getArticleList = async () => {
-    const res = await articlePageByTopReq({page: 1, limit: 50, parentCategoryId: 275})
-    if (res) {
-        articleList.value = res.data.map(item => {
-            if (item.album) item.album = JSON.parse(item.album)
-            return item
-        })
-    }
+  const res = await articlePageByTopReq({page: 1, limit: 50, parentCategoryId: 275})
+  if (res) {
+    articleList.value = res.data.map(item => {
+      if (item.album) item.album = JSON.parse(item.album)
+      return item
+    })
+  }
 }
 
 const handPreviewImage = (urls, index) => {
-    uni.previewImage({
-        current: index,
-        urls: urls.map(item => item.url)
-    })
+  uni.previewImage({
+    current: index,
+    urls: urls.map(item => item.url)
+  })
 }
 
 onMounted(async () => {
-    await getSwiperList()
-    await getNewsList()
-    await getArticleList()
-    // await getActivityList()
-    // if (checkLogin()) {
-    //     await getTrainInfoList()
-    // }
+  await getSwiperList()
+  await getNewsList()
+  await getArticleList()
+  // await getActivityList()
+  // if (checkLogin()) {
+  //     await getTrainInfoList()
+  // }
 })
 
 </script>
@@ -488,407 +502,407 @@ onMounted(async () => {
 <style lang="scss" scoped>
 
 .layout-banner {
-    padding: 10rpx 20rpx;
+  padding: 10rpx 20rpx;
 }
 
 .activity-box {
-    padding: 0 0 20rpx;
+  padding: 0 0 20rpx;
 }
 
 .layout-race {
-    padding: 20rpx 30rpx;
+  padding: 20rpx 30rpx;
 }
 
 .exam-box {
-    padding: 10rpx 0 20rpx;
-
-    .exam-item {
-        display: flex;
-        align-items: center;
-        margin-top: 24rpx;
-        padding: 24rpx 24rpx;
-        border-radius: 16rpx;
-        border: 1px solid #6c6c6c;
-        overflow: hidden;
-    }
+  padding: 10rpx 0 20rpx;
 
-    .info {
-        position: relative;
-        flex: 1;
-        min-height: 80rpx;
-        margin-right: 20rpx;
-
-        &::after {
-            position: absolute;
-            right: 0%;
-            top: 50%;
-            z-index: 9;
-            margin-top: -25rpx;
-            content: '';
-            width: 1px;
-            height: 50rpx;
-            background: #f3f3f3;
-        }
-
-        .fen {
-            margin-top: 8rpx;
-            font-size: 24rpx;
-            line-height: 32rpx;
-            color: #bababa;
-        }
-    }
+  .exam-item {
+    display: flex;
+    align-items: center;
+    margin-top: 24rpx;
+    padding: 24rpx 24rpx;
+    border-radius: 16rpx;
+    border: 1px solid #6c6c6c;
+    overflow: hidden;
+  }
+
+  .info {
+    position: relative;
+    flex: 1;
+    min-height: 80rpx;
+    margin-right: 20rpx;
+
+    &::after {
+      position: absolute;
+      right: 0%;
+      top: 50%;
+      z-index: 9;
+      margin-top: -25rpx;
+      content: '';
+      width: 1px;
+      height: 50rpx;
+      background: #f3f3f3;
+    }
+
+    .fen {
+      margin-top: 8rpx;
+      font-size: 24rpx;
+      line-height: 32rpx;
+      color: #bababa;
+    }
+  }
 }
 
 
 .race-box {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+  padding: 10rpx 0;
+
+  .race-item {
     display: flex;
-    justify-content: space-between;
+    justify-content: center;
     align-items: center;
-    flex-wrap: wrap;
+    margin: 10rpx 0;
+    width: 330rpx;
+    height: 110rpx;
+    border-radius: 32rpx;
+
+    .text {
+      margin-left: 30rpx;
+      font-size: 28rpx;
+      font-weight: 600;
+      color: #497568;
+    }
+  }
+
+  .item-0 {
+    background: url("/static/image/green-bg-0.png");
+    background-size: cover;
+  }
+
+  .item-1 {
+    background: url("/static/image/blue-bg-0.png");
+    background-size: cover;
+  }
+
+  .item-2 {
+    background: url("/static/image/blue-bg-1.png");
+    background-size: cover;
+  }
+
+  .race-item:last-child:nth-child(2n - 1) {
+    width: 100% !important;
+  }
+}
+
+.same-item {
+  margin-top: 30rpx;
+
+  .text {
     padding: 10rpx 0;
+  }
 
-    .race-item {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin: 10rpx 0;
-        width: 330rpx;
-        height: 110rpx;
-        border-radius: 32rpx;
-
-        .text {
-            margin-left: 30rpx;
-            font-size: 28rpx;
-            font-weight: 600;
-            color: #497568;
-        }
-    }
+  .between {
+    display: flex;
+    align-items: center;
+    padding: 20rpx 0 30rpx;
+    font-size: 26rpx;
+    line-height: 40rpx;
+    color: $dark-color;
+    border-bottom: 1px solid $border-color;
+  }
 
-    .item-0 {
-        background: url("/static/image/green-bg-0.png");
-        background-size: cover;
-    }
+  .blue {
+    color: $blue-color;
+  }
 
-    .item-1 {
-        background: url("/static/image/blue-bg-0.png");
-        background-size: cover;
-    }
+  .red {
+    color: $red-color;
+  }
 
-    .item-2 {
-        background: url("/static/image/blue-bg-1.png");
-        background-size: cover;
-    }
+  .grey {
+    color: $grey-color;
+  }
 
-    .race-item:last-child:nth-child(2n - 1) {
-        width: 100% !important;
-    }
-}
+  .num {
+    flex: 1;
+  }
 
-.same-item {
-    margin-top: 30rpx;
+  .msg {
+    display: flex;
+    align-items: center;
+    margin: 0 10rpx;
 
-    .text {
-        padding: 10rpx 0;
+    .shu {
+      margin: 0rpx 10rpx;
     }
 
-    .between {
-        display: flex;
-        align-items: center;
-        padding: 20rpx 0 30rpx;
-        font-size: 26rpx;
-        line-height: 40rpx;
-        color: $dark-color;
-        border-bottom: 1px solid $border-color;
+    .shued {
+      color: $green-color;
     }
+  }
 
-    .blue {
-        color: $blue-color;
-    }
+  .same-top {
+    display: flex;
+    align-items: center;
+    padding-bottom: 20rpx;
 
-    .red {
-        color: $red-color;
+    .name {
+      flex: 1;
+      padding: 0 30rpx;
+      font-size: 24rpx;
+      line-height: 40rpx;
+      color: $minor-color;
     }
 
-    .grey {
-        color: $grey-color;
+    .zhu {
+      display: inline-block;
+      padding: 0 20rpx;
+      font-size: 24rpx;
+      line-height: 44rpx;
+      color: $minor-color;
+      border: 1px solid $minor-color;
+      border-radius: 22rpx;
     }
 
-    .num {
-        flex: 1;
+    .zhued {
+      color: $grey-color;
+      border-color: $grey-color;
     }
+  }
 
-    .msg {
-        display: flex;
-        align-items: center;
-        margin: 0 10rpx;
-
-        .shu {
-            margin: 0rpx 10rpx;
-        }
-
-        .shued {
-            color: $green-color;
-        }
-    }
+  .same-img {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
 
-    .same-top {
-        display: flex;
-        align-items: center;
-        padding-bottom: 20rpx;
-
-        .name {
-            flex: 1;
-            padding: 0 30rpx;
-            font-size: 24rpx;
-            line-height: 40rpx;
-            color: $minor-color;
-        }
-
-        .zhu {
-            display: inline-block;
-            padding: 0 20rpx;
-            font-size: 24rpx;
-            line-height: 44rpx;
-            color: $minor-color;
-            border: 1px solid $minor-color;
-            border-radius: 22rpx;
-        }
-
-        .zhued {
-            color: $grey-color;
-            border-color: $grey-color;
-        }
+    .img {
+      margin: 10rpx 0;
+      width: 334rpx;
+      height: 240rpx;
     }
 
-    .same-img {
-        display: flex;
-        justify-content: space-between;
-        flex-wrap: wrap;
-
-        .img {
-            margin: 10rpx 0;
-            width: 334rpx;
-            height: 240rpx;
-        }
-
-        .pic {
-            width: 100%;
-            height: 400rpx !important;
-        }
+    .pic {
+      width: 100%;
+      height: 400rpx !important;
     }
+  }
 
-    .img:last-child:nth-child(2n - 1) {
-        width: 100% !important;
-    }
+  .img:last-child:nth-child(2n - 1) {
+    width: 100% !important;
+  }
 }
 
 .same-item:nth-child(1) {
-    margin-top: 10rpx;
+  margin-top: 10rpx;
 }
 
 
 .layout-news {
-    padding: 10rpx 20rpx;
-
-    .news-box {
-        display: flex;
-        height: 40rpx;
-        padding: 14rpx 24rpx;
-        background: #ffebd1;
-        border-radius: 34rpx;
-    }
+  padding: 10rpx 20rpx;
 
-    .name {
-        display: inline-block;
-        padding: 0 10rpx;
-        font-size: 24rpx;
-        line-height: 40rpx;
-        color: #fff;
-        background: #efa100;
-        border-radius: 6rpx;
-    }
-
-    .news-content {
-        margin-left: 30rpx;
-        flex: 1;
-    }
+  .news-box {
+    display: flex;
+    height: 40rpx;
+    padding: 14rpx 24rpx;
+    background: #ffebd1;
+    border-radius: 34rpx;
+  }
+
+  .name {
+    display: inline-block;
+    padding: 0 10rpx;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    color: #fff;
+    background: #efa100;
+    border-radius: 6rpx;
+  }
+
+  .news-content {
+    margin-left: 30rpx;
+    flex: 1;
+  }
 }
 
 .train-box {
-    padding: 20rpx 0 30rpx;
+  padding: 20rpx 0 30rpx;
 }
 
 .layout-fifth {
-    padding: 10rpx 20rpx;
-    background: #fff;
+  padding: 10rpx 20rpx;
+  background: #fff;
 
-    .fifth-scroll {
-        white-space: nowrap;
-        width: 100%;
-    }
+  .fifth-scroll {
+    white-space: nowrap;
+    width: 100%;
+  }
+
+  .fifth-item {
+    display: inline-block;
+    width: 20%;
+    height: auto;
+    padding: 10rpx 0;
+    overflow: hidden;
 
-    .fifth-item {
-        display: inline-block;
-        width: 20%;
-        height: auto;
-        padding: 10rpx 0;
-        overflow: hidden;
-
-        .icon {
-            display: flex;
-            justify-content: center;
-        }
-
-        .text {
-            margin-top: 10rpx;
-            font-size: 26rpx;
-            font-weight: 600;
-            line-height: 40rpx;
-            color: #333;
-            text-align: center;
-        }
+    .icon {
+      display: flex;
+      justify-content: center;
     }
+
+    .text {
+      margin-top: 10rpx;
+      font-size: 26rpx;
+      font-weight: 600;
+      line-height: 40rpx;
+      color: #333;
+      text-align: center;
+    }
+  }
 }
 
 .team-box {
-    padding: 15rpx 0;
+  padding: 15rpx 0;
 }
 
 .team-item {
-    display: flex;
-    margin: 15rpx 0;
-
-    .info {
-        margin-left: 30rpx;
-        flex: 1;
-
-        .name {
-            height: 36rpx;
-        }
-
-        .text {
-            margin-top: 10rpx;
-            height: 108rpx;
-        }
-
-        .man {
-            display: flex;
-            align-items: center;
-            margin-top: 6rpx;
-        }
-
-        .ren {
-            margin-left: 20rpx;
-            font-size: 24rpx;
-            line-height: 32rpx;
-            color: $grey-color;
-        }
-    }
-}
+  display: flex;
+  margin: 15rpx 0;
 
-.title-box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 10rpx 0;
+  .info {
+    margin-left: 30rpx;
+    flex: 1;
+
+    .name {
+      height: 36rpx;
+    }
 
-    .title {
-        font-size: 32rpx;
-        font-weight: 600;
-        line-height: 40rpx;
-        color: $black-color;
+    .text {
+      margin-top: 10rpx;
+      height: 108rpx;
     }
 
-    .link {
-        position: relative;
-        padding-right: 30rpx;
-        font-size: 24rpx;
-        line-height: 32rpx;
-        color: $grey-color;
-
-        &::after {
-            position: absolute;
-            right: 10rpx;
-            top: 50%;
-            z-index: 90;
-            display: block;
-            margin-top: -6rpx;
-            transform: rotate(45deg);
-            content: '';
-            width: 12rpx;
-            height: 12rpx;
-            border-top: 1px solid $grey-color;
-            border-right: 1px solid $grey-color;
-        }
+    .man {
+      display: flex;
+      align-items: center;
+      margin-top: 6rpx;
     }
 
-    .location {
-        position: relative;
-        padding-right: 20px;
-        font-size: 24rpx;
-        line-height: 32rpx;
-        color: $grey-color;
-
-        &::after {
-            position: absolute;
-            right: 0px;
-            top: 50%;
-            z-index: 90;
-            display: block;
-            margin-top: -6rpx;
-            content: '';
-            width: 0;
-            height: 0;
-            border-top: 6px solid $grey-color;
-            border-left: 6px solid transparent;
-            border-right: 6px solid transparent;
-        }
+    .ren {
+      margin-left: 20rpx;
+      font-size: 24rpx;
+      line-height: 32rpx;
+      color: $grey-color;
     }
+  }
+}
+
+.title-box {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10rpx 0;
+
+  .title {
+    font-size: 32rpx;
+    font-weight: 600;
+    line-height: 40rpx;
+    color: $black-color;
+  }
+
+  .link {
+    position: relative;
+    padding-right: 30rpx;
+    font-size: 24rpx;
+    line-height: 32rpx;
+    color: $grey-color;
+
+    &::after {
+      position: absolute;
+      right: 10rpx;
+      top: 50%;
+      z-index: 90;
+      display: block;
+      margin-top: -6rpx;
+      transform: rotate(45deg);
+      content: '';
+      width: 12rpx;
+      height: 12rpx;
+      border-top: 1px solid $grey-color;
+      border-right: 1px solid $grey-color;
+    }
+  }
+
+  .location {
+    position: relative;
+    padding-right: 20px;
+    font-size: 24rpx;
+    line-height: 32rpx;
+    color: $grey-color;
+
+    &::after {
+      position: absolute;
+      right: 0px;
+      top: 50%;
+      z-index: 90;
+      display: block;
+      margin-top: -6rpx;
+      content: '';
+      width: 0;
+      height: 0;
+      border-top: 6px solid $grey-color;
+      border-left: 6px solid transparent;
+      border-right: 6px solid transparent;
+    }
+  }
 }
 
 .layout {
-    padding: 10rpx 30rpx;
+  padding: 10rpx 30rpx;
 }
 
 
 .layout-share {
-    padding: 20rpx 30rpx;
+  padding: 20rpx 30rpx;
 }
 
 
 .tab-box {
-    white-space: nowrap;
-    padding: 10rpx 0rpx;
-
-    .tab-item {
-        position: relative;
-        z-index: 9;
-        display: inline-block;
-        margin-right: 20rpx;
-        padding: 10rpx 4rpx;
-        font-size: 24rpx;
-        line-height: 40rpx;
-        color: $dark-color;
-
-        &:last-child {
-            margin-right: 0;
-        }
-    }
-
-    .active {
-        font-weight: 600;
-        color: $black-color;
-
-        &::after {
-            position: absolute;
-            left: 0;
-            bottom: 10rpx;
-            z-index: -1;
-            content: '';
-            width: 100%;
-            height: 12rpx;
-            background: $blue-color;
-        }
-    }
+  white-space: nowrap;
+  padding: 10rpx 0rpx;
+
+  .tab-item {
+    position: relative;
+    z-index: 9;
+    display: inline-block;
+    margin-right: 20rpx;
+    padding: 10rpx 4rpx;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    color: $dark-color;
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+
+  .active {
+    font-weight: 600;
+    color: $black-color;
+
+    &::after {
+      position: absolute;
+      left: 0;
+      bottom: 10rpx;
+      z-index: -1;
+      content: '';
+      width: 100%;
+      height: 12rpx;
+      background: $blue-color;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/promote/progress.vue b/src/pages/promote/progress.vue
index 5fad391..f65934e 100644
--- a/src/pages/promote/progress.vue
+++ b/src/pages/promote/progress.vue
@@ -1,163 +1,163 @@
 <template>
-    <view class="min-height">
-        <scroll-view class="tab-box" scroll-x="true">
-            <view :class="['tab-item',{active:tabIndex === index}]" v-for="(item,index) in tabList" :key="index"
-                  @click="handTab(index)">
-                {{ item.name }}
+  <view class="min-height">
+    <scroll-view class="tab-box" scroll-x="true">
+      <view :class="['tab-item',{active:tabIndex === index}]" v-for="(item,index) in tabList" :key="index"
+            @click="handTab(index)">
+        {{ item.name }}
+      </view>
+    </scroll-view>
+    <view class="layout layout-train">
+      <view class="title-box">
+        <view class="title">培训任务</view>
+        <view class="link"></view>
+      </view>
+      <view class="train-box">
+        <view v-for="(item,index) in trainList" :key="index" class="mb-25"
+              @click="$jump(`/pages/promote/learn?courseId=${item.courseId}&trainId=${item.id}`)">
+          <view class="train-item" v-if="item.cover">
+            <view class="img">
+              <uv-image :src="item.cover" radius="20rpx" width="700rpx"
+                        height="280rpx"></uv-image>
             </view>
-        </scroll-view>
-        <view class="layout layout-train">
-            <view class="title-box">
-                <view class="title">培训任务</view>
-                <view class="link"></view>
+            <view class="name">
+              <uv-text :text="item.title" size="28rpx" lineHeight="40rpx" :lines="1"
+                       align="center" bold
+                       color="#000"></uv-text>
+              <uv-text v-if="item.endDate" :text="`结束日期:${item.endDate}`" size="24rpx"
+                       lineHeight="40rpx" :lines="1"
+                       align="center"
+                       color="#AAA"></uv-text>
+              <uv-text :text="`已学:${(item.learnSec / 3600).toFixed(2)}个学时`" size="24rpx"
+                       lineHeight="40rpx" :lines="1"
+                       align="center"
+                       color="#AAA"></uv-text>
             </view>
-            <view class="train-box">
-                <view v-for="(item,index) in trainList" :key="index" class="mb-25"
-                      @click="$jump(`/pages/promote/learn?courseId=${item.courseId}&trainId=${item.id}`)">
-                    <view class="train-item" v-if="item.cover">
-                        <view class="img">
-                            <uv-image :src="item.cover" radius="20rpx" width="700rpx"
-                                      height="280rpx"></uv-image>
-                        </view>
-                        <view class="name">
-                            <uv-text :text="item.title" size="28rpx" lineHeight="40rpx" :lines="1"
-                                     align="center" bold
-                                     color="#000"></uv-text>
-                            <uv-text v-if="item.endDate" :text="`结束日期:${item.endDate}`" size="24rpx"
-                                     lineHeight="40rpx" :lines="1"
-                                     align="center"
-                                     color="#AAA"></uv-text>
-                            <uv-text :text="`已学:${(item.learnSec / 3600).toFixed(2)}个学时`" size="24rpx"
-                                     lineHeight="40rpx" :lines="1"
-                                     align="center"
-                                     color="#AAA"></uv-text>
-                        </view>
-                        <view class="text">
-                            <uv-line-progress :percentage="item.progress" activeColor="#00d61d"></uv-line-progress>
-                        </view>
-                    </view>
-                </view>
+            <view class="text">
+              <uv-line-progress :percentage="item.progress" activeColor="#00d61d"></uv-line-progress>
             </view>
+          </view>
         </view>
-        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>
-        <view class="layout layout-plan">
-            <view class="title-box" @click="taskLink">
-                <view class="title">考试任务</view>
-                <view class="link"></view>
+      </view>
+    </view>
+    <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>
+    <view class="layout layout-plan">
+      <view class="title-box" @click="taskLink">
+        <view class="title">考试任务</view>
+        <view class="link"></view>
+      </view>
+      <view class="exam-box">
+        <view class="exam-item" v-for="(item,index) in examList"
+              :key="index"
+              @click="resultLink(item)">
+          <view class="info info-1">
+            <view class="name">
+              <uv-text :text="item.paper.title" size="24rpx" lineHeight="40rpx" :lines="1" bold></uv-text>
+            </view>
+            <view class="fen">考试类型: {{ ['线上', '线下'][item.type] }}</view>
+            <template v-if="item.type === 1 && item.trainExamPeopleInRoom">
+              <view v-if="item.trainExamPeopleInRoom.roomConfig" class="fen">考场:
+                {{ item.trainExamPeopleInRoom.roomConfig.position }}
+              </view>
+              <view v-if="item.trainExamPeopleInRoom.examSession" class="fen">考试时间:
+                {{ item.trainExamPeopleInRoom.examSession.startTime }} ~
+                {{ item.trainExamPeopleInRoom.examSession.endTime }}
+              </view>
+            </template>
+            <view class="fen" v-if="item.type === 0">考试截止日期: {{ item.examDate }}</view>
+            <view class="fen" v-if="item.workTypeLists && item.workTypeLists.length > 0">考试科目:
+              {{
+                item.workTypeLists[0].course.title
+              }}({{
+                ['初级', '中级', '高级', '技师', '高级技师'][item.workTypeLists[0].course.level]
+              }})
             </view>
-            <view class="exam-box">
-                <view class="exam-item" v-for="(item,index) in examList"
-                      :key="index"
-                      @click="resultLink(item)">
-                    <view class="info info-1">
-                        <view class="name">
-                            <uv-text :text="item.paper.title" size="24rpx" lineHeight="40rpx" :lines="1" bold></uv-text>
-                        </view>
-                        <view class="fen">考试类型: {{ ['线上', '线下'][item.type] }}</view>
-                        <template v-if="item.type === 1 && item.trainExamPeopleInRoom">
-                            <view v-if="item.trainExamPeopleInRoom.roomConfig" class="fen">考场:
-                                {{ item.trainExamPeopleInRoom.roomConfig.position }}
-                            </view>
-                            <view v-if="item.trainExamPeopleInRoom.examSession" class="fen">考试时间:
-                                {{ item.trainExamPeopleInRoom.examSession.startTime }} ~
-                                {{ item.trainExamPeopleInRoom.examSession.endTime }}
-                            </view>
-                        </template>
-                        <view class="fen" v-if="item.type === 0">考试截止日期: {{ item.examDate }}</view>
-                        <view class="fen" v-if="item.workTypeLists && item.workTypeLists.length > 0">考试科目:
-                            {{
-                                item.workTypeLists[0].course.title
-                            }}({{
-                                ['初级', '中级', '高级', '技师', '高级技师'][item.workTypeLists[0].course.level]
-                            }})
-                        </view>
-                        <view class="fen" v-if="!item.trainExamPeopleInfo">总分 {{ item.paper.totalPoint }} 合格分
-                            {{ item.paper.passPoint }}
-                        </view>
-                        <view class="fen" v-else>
-                            <template v-if="item.text === '已完成' && item.trainExamPeopleInfo.realScore">
-                                <view v-if="item.type === 0">
-                                    <text>考试得分 {{ item.trainExamPeopleInfo.score }}</text>
-                                    <text class="ml-15" v-if="item.trainExamPeopleInfo.inWhiteList === 0">平时分
-                                        {{ item.trainExamPeopleInfo.normalScore }}
-                                    </text>
-                                    <text class="ml-15">总分
-                                        {{ item.trainExamPeopleInfo.normalScore + item.trainExamPeopleInfo.score }}
-                                    </text>
-                                    <text class="ml-15">实际得分
-                                        {{ item.trainExamPeopleInfo.realScore }}
-                                    </text>
-                                </view>
-                                <view v-else>
-                                    <text>考试得分 {{ item.trainExamPeopleInfo.score }}</text>
-                                    <text class="ml-15">实操得分 {{ item.trainExamPeopleInfo.operateScore }}</text>
-                                    <text class="ml-15">总分
-                                        {{ item.trainExamPeopleInfo.realScore }}
-                                    </text>
-                                </view>
-                                <view class="mt-15"
-                                      :class="[item.trainExamPeopleInfo.totalScore >= 60 ? 'text-green' : 'text-red']"
-                                      v-if="item.showResult">{{
-                                        item.trainExamPeopleInfo.totalScore >= 60 ? '合格' : '不合格'
-                                    }}
-                                </view>
-                            </template>
-                        </view>
-                        <view class="fen"
-                              v-if="item.trainExamPeopleInfo && item.trainExamPeopleInfo.highLevelStatus > 0">
-                            <text>专家评审结果:</text>
-                            <text class="ml-15"
-                                  :class="[item.trainExamPeopleInfo.highLevelStatus === 1 ? 'text-green' : 'text-red']">
-                                {{ ['待审核', '已通过', '未通过'][item.trainExamPeopleInfo.highLevelStatus] }}
-                            </text>
-                        </view>
-                    </view>
-                    <mprogress
-                        :progress="item.progress"
-                        :activeColor="item.color"
-                        :valueColor="item.color"
-                        :valueFontSize="12"
-                        :valueText="item.text"
-                        :width="50"
-                        :borderWidth="4"
-                    ></mprogress>
+            <view class="fen" v-if="!item.trainExamPeopleInfo">总分 {{ item.paper.totalPoint }} 合格分
+              {{ item.paper.passPoint }}
+            </view>
+            <view class="fen" v-else>
+              <template v-if="item.text === '已完成' && item.trainExamPeopleInfo.realScore">
+                <view v-if="item.type === 0">
+                  <text>考试得分 {{ item.trainExamPeopleInfo.score }}</text>
+                  <text class="ml-15" v-if="item.trainExamPeopleInfo.inWhiteList === 0">平时分
+                    {{ item.trainExamPeopleInfo.normalScore }}
+                  </text>
+                  <text class="ml-15">总分
+                    {{ item.trainExamPeopleInfo.normalScore + item.trainExamPeopleInfo.score }}
+                  </text>
+                  <text class="ml-15">实际得分
+                    {{ item.trainExamPeopleInfo.realScore }}
+                  </text>
+                </view>
+                <view v-else>
+                  <text>考试得分 {{ item.trainExamPeopleInfo.score }}</text>
+                  <text class="ml-15">实操得分 {{ item.trainExamPeopleInfo.operateScore }}</text>
+                  <text class="ml-15">总分
+                    {{ item.trainExamPeopleInfo.realScore }}
+                  </text>
+                </view>
+                <view class="mt-15"
+                      :class="[item.trainExamPeopleInfo.totalScore >= 60 ? 'text-green' : 'text-red']"
+                      v-if="item.showResult">{{
+                    item.trainExamPeopleInfo.totalScore >= 60 ? '合格' : '不合格'
+                  }}
                 </view>
+              </template>
             </view>
+            <view class="fen"
+                  v-if="item.trainExamPeopleInfo && item.trainExamPeopleInfo.highLevelStatus > 0">
+              <text>专家评审结果:</text>
+              <text class="ml-15"
+                    :class="[item.trainExamPeopleInfo.highLevelStatus === 1 ? 'text-green' : 'text-red']">
+                {{ ['待审核', '已通过', '未通过'][item.trainExamPeopleInfo.highLevelStatus] }}
+              </text>
+            </view>
+          </view>
+          <mprogress
+            :progress="item.progress"
+            :activeColor="item.color"
+            :valueColor="item.color"
+            :valueFontSize="12"
+            :valueText="item.text"
+            :width="50"
+            :borderWidth="4"
+          ></mprogress>
         </view>
-        <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>
-        <!-- 竞赛任务 -->
-        <view class="layout layout-plan">
-            <view class="title-box" @click="$jump('/pages/match/match')">
-                <view class="title">竞赛任务</view>
-                <view class="link"></view>
+      </view>
+    </view>
+    <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>
+    <!-- 竞赛任务 -->
+    <view class="layout layout-plan">
+      <view class="title-box" @click="$jump('/pages/match/match')">
+        <view class="title">竞赛任务</view>
+        <view class="link"></view>
+      </view>
+      <view class="exam-box">
+        <view class="exam-item" v-for="(item,index) in matchList" :key="index">
+          <view class="info info-1">
+            <view class="name">
+              <uv-text :text="item.title" size="24rpx" lineHeight="40rpx" :lines="1" bold></uv-text>
             </view>
-            <view class="exam-box">
-                <view class="exam-item" v-for="(item,index) in matchList" :key="index">
-                    <view class="info info-1">
-                        <view class="name">
-                            <uv-text :text="item.title" size="24rpx" lineHeight="40rpx" :lines="1" bold></uv-text>
-                        </view>
-                        <view class="between">
-                            <view class="ren">{{ item.peopleNum }}人</view>
-                            <view class="progress">
-                                <uv-line-progress :percentage="item.progress"
-                                                  :activeColor="item.color"></uv-line-progress>
-                            </view>
-                        </view>
-                    </view>
-                    <mprogress
-                        :progress="item.progress"
-                        :activeColor="item.color"
-                        :valueColor="item.color"
-                        :valueFontSize="12"
-                        :valueText="item.text"
-                        :width="50"
-                        :borderWidth="4"
-                    ></mprogress>
-                </view>
+            <view class="between">
+              <view class="ren">{{ item.peopleNum }}人</view>
+              <view class="progress">
+                <uv-line-progress :percentage="item.progress"
+                                  :activeColor="item.color"></uv-line-progress>
+              </view>
             </view>
+          </view>
+          <mprogress
+            :progress="item.progress"
+            :activeColor="item.color"
+            :valueColor="item.color"
+            :valueFontSize="12"
+            :valueText="item.text"
+            :width="50"
+            :borderWidth="4"
+          ></mprogress>
         </view>
+      </view>
     </view>
+  </view>
 </template>
 
 <script setup>
@@ -172,115 +172,112 @@ import {matchListReq} from "@/api/match";
 
 const tabIndex = ref(3)
 const tabList = [
-    {id: 1, name: '技能大师工作室'},
-    {id: 2, name: '企业级团队'},
-    {id: 3, name: '部门级团队'},
-    {id: 4, name: '班组级团队'},
+  {id: 1, name: '技能大师工作室'},
+  {id: 2, name: '企业级团队'},
+  {id: 3, name: '部门级团队'},
+  {id: 4, name: '班组级团队'},
 ]
 
 const handTab = (index) => {
-    tabIndex.value = index
+  tabIndex.value = index
 }
 
 const trainInfoList = ref([])
 const getTrainInfoList = async () => {
-    const res = await trainInfoUserListReq()
-    trainInfoList.value = []
-    if (res) {
-        trainInfoList.value = res.data
-        if (trainInfoList.value.length > 0) {
-            await getExamList(trainInfoList.value[0].trainId)
-        }
+  const res = await trainInfoUserListReq()
+  trainInfoList.value = []
+  if (res) {
+    trainInfoList.value = res.data
+    if (trainInfoList.value.length > 0) {
+      await getExamList(trainInfoList.value[0].trainId)
     }
+  }
 }
 
 const examList = ref([])
 const getExamList = async () => {
-    const res = await trainExamListReq({})
-    examList.value = []
-    if (res) {
-        examList.value = res.data.filter(item => {
-            return (item.paper && item.trainExamPeopleInfo)
-        }).map(item => {
-            let progress = 0, text = '未完成', color = '#cacaca'
-            if (dayjs(item.examDate).isSame(dayjs())) {
-                progress = 50
-                color = '#57d801'
-                text = '进行中'
-            } else if ((item.type === 0 && item.hasResult) || (item.type === 1 && item.trainExamPeopleInfo && item.trainExamPeopleInfo.score > 0)) {
-                progress = 100
-                color = '#f29900'
-                text = '已完成'
-            }
-            item.progress = progress
-            item.color = color
-            item.text = text
-            // item.showResult = dayjs(item.examDate).isSameOrBefore(dayjs())
-            item.showResult = true
-            return item
-        })
-    }
+  const res = await trainExamListReq({})
+  examList.value = []
+  if (res) {
+    examList.value = res.data.filter(item => {
+      return (item.paper && item.trainExamPeopleInfo)
+    }).map(item => {
+      let progress = 0, text = '未完成', color = '#cacaca'
+      if (dayjs(item.examDate).isSame(dayjs())) {
+        progress = 50
+        color = '#57d801'
+        text = '进行中'
+      } else if ((item.type === 0 && item.hasResult) || (item.type === 1 && item.trainExamPeopleInfo && item.trainExamPeopleInfo.score > 0)) {
+        progress = 100
+        color = '#f29900'
+        text = '已完成'
+      }
+      item.progress = progress
+      item.color = color
+      item.text = text
+      // item.showResult = dayjs(item.examDate).isSameOrBefore(dayjs())
+      item.showResult = true
+      return item
+    })
+  }
 }
 
 const trainList = ref([])
 const getTrainList = async () => {
-    const {data} = await userTrainListReq({
-        withProgress: true,
-        page: 1,
-        limit: 9999,
-        groupType: tabList.value[tabIndex.value].id
-    })
-    trainList.value = data.list
+  const {data} = await userTrainListReq({
+    withProgress: true,
+    page: 1,
+    limit: 9999,
+    groupType: tabList.value[tabIndex.value].id
+  })
+  trainList.value = data.list
 }
 
 const taskLink = () => {
-    uni.navigateTo({
-        url: `/pages/promote/task?trainId=${this.trainInfoList[0].trainId}`
-    })
+  uni.navigateTo({
+    url: `/pages/promote/task?trainId=${this.trainInfoList[0].trainId}`
+  })
 }
 
 const matchList = ref([])
 const getMatchList = async () => {
-    const {data} = await matchListReq({deleted: 0})
-    matchList.value = data.map(item => {
-        item.process = 50
-        item.color = '#57d801'
-        item.text = '进行中'
-        return item
-    })
+  const {data} = await matchListReq({deleted: 0})
+  matchList.value = data.map(item => {
+    item.process = 50
+    item.color = '#57d801'
+    item.text = '进行中'
+    return item
+  })
 }
 
 const resultLink = ({
-                        id,
-                        type,
-                        examId,
-                        hasResult,
-                        paper,
-                        examDate,
-                        needFinishAdventure,
-                        hasFinishAdventure,
-                        needFinishNormal,
-                        hasFinishNormal
+                      id,
+                      type,
+                      examId,
+                      hasResult,
+                      paper,
+                      examDate,
+                      needFinishAdventure,
+                      hasFinishAdventure,
+                      needFinishNormal,
+                      hasFinishNormal
                     }) => {
-    if (type === 1) return
-    let url
-    if (hasResult)
-        url = `/pages/promote/result?paperId=${examId}&examType=0&examId=${id}&title=${paper.title}`
-    else {
-        if (dayjs(examDate).isBefore(dayjs())) return toast('已过考试时间,无法继续参与考试')
-        if (needFinishAdventure === 1 && !hasFinishAdventure) return toast('请先完成游戏学')
-        if (needFinishNormal === 1 && !hasFinishNormal) return toast('请先完成常规学')
-        url = `/pages/exam/exam?paperId=${examId}&title=${paper.title}&examType=0&examId=${id}`
-    }
-    uni.navigateTo({url})
+  if (type === 1) return
+  let url
+  if (needFinishAdventure === 1 && !hasFinishAdventure) return toast('请先完成游戏学')
+  if (needFinishNormal === 1 && !hasFinishNormal) return toast('请先完成常规学')
+  // url = `/pages/exam/exam?paperId=${examId}&title=${paper.title}&examType=0&examId=${id}`
+  url = `/pages/promote/exam?paperId=${examId}&title=${paper.title}&examType=0&examId=${id}`
+  // }
+  uni.navigateTo({url})
 }
 
 onLoad
 (() => {
-    getTrainInfoList()
-    getTrainList()
-    getExamList()
-    getMatchList()
+  getTrainInfoList()
+  getTrainList()
+  getExamList()
+  getMatchList()
 })
 
 </script>
@@ -288,218 +285,218 @@ onLoad
 <style scoped lang="scss">
 
 .title-box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 10rpx 0;
-
-    .title {
-        font-size: 32rpx;
-        font-weight: 600;
-        line-height: 40rpx;
-        color: $black-color;
-    }
-
-    .link {
-        position: relative;
-        padding-right: 30rpx;
-        font-size: 24rpx;
-        line-height: 32rpx;
-        color: $grey-color;
-
-        &::after {
-            position: absolute;
-            right: 10rpx;
-            top: 50%;
-            z-index: 90;
-            display: block;
-            margin-top: -6rpx;
-            transform: rotate(45deg);
-            content: '';
-            width: 12rpx;
-            height: 12rpx;
-            border-top: 1px solid $grey-color;
-            border-right: 1px solid $grey-color;
-        }
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10rpx 0;
+
+  .title {
+    font-size: 32rpx;
+    font-weight: 600;
+    line-height: 40rpx;
+    color: $black-color;
+  }
+
+  .link {
+    position: relative;
+    padding-right: 30rpx;
+    font-size: 24rpx;
+    line-height: 32rpx;
+    color: $grey-color;
+
+    &::after {
+      position: absolute;
+      right: 10rpx;
+      top: 50%;
+      z-index: 90;
+      display: block;
+      margin-top: -6rpx;
+      transform: rotate(45deg);
+      content: '';
+      width: 12rpx;
+      height: 12rpx;
+      border-top: 1px solid $grey-color;
+      border-right: 1px solid $grey-color;
     }
+  }
 }
 
 .tab-box {
-    white-space: nowrap;
-    padding: 10rpx 0rpx;
-
-    .tab-item {
-        position: relative;
-        z-index: 9;
-        display: inline-block;
-        margin-right: 20rpx;
-        padding: 10rpx 4rpx;
-        font-size: 24rpx;
-        line-height: 40rpx;
-        color: $dark-color;
-
-        &:last-child {
-            margin-right: 0;
-        }
+  white-space: nowrap;
+  padding: 10rpx 0rpx;
+
+  .tab-item {
+    position: relative;
+    z-index: 9;
+    display: inline-block;
+    margin-right: 20rpx;
+    padding: 10rpx 4rpx;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    color: $dark-color;
+
+    &:last-child {
+      margin-right: 0;
     }
-
-    .active {
-        font-weight: 600;
-        color: $black-color;
-
-        &::after {
-            position: absolute;
-            left: 0;
-            bottom: 10rpx;
-            z-index: -1;
-            content: '';
-            width: 100%;
-            height: 12rpx;
-            background: $blue-color;
-        }
+  }
+
+  .active {
+    font-weight: 600;
+    color: $black-color;
+
+    &::after {
+      position: absolute;
+      left: 0;
+      bottom: 10rpx;
+      z-index: -1;
+      content: '';
+      width: 100%;
+      height: 12rpx;
+      background: $blue-color;
     }
+  }
 }
 
 .layout {
-    padding: 20rpx 30rpx;
+  padding: 20rpx 30rpx;
 }
 
 .train-box {
-    padding: 20rpx 0 30rpx;
+  padding: 20rpx 0 30rpx;
 }
 
 .swiper-train {
-    width: 100%;
-    height: 460rpx;
+  width: 100%;
+  height: 460rpx;
 }
 
 .train-item {
-    width: 700rpx;
-    height: auto;
+  width: 700rpx;
+  height: auto;
 
-    .name {
-        padding: 20rpx 0;
-    }
+  .name {
+    padding: 20rpx 0;
+  }
 }
 
 .exam-box {
-    padding: 10rpx 0 20rpx;
-
-    .exam-item {
-        display: flex;
-        align-items: center;
-        margin-top: 24rpx;
-        padding: 24rpx 24rpx;
-        border-radius: 16rpx;
-        border: 1px solid #6c6c6c;
-        overflow: hidden;
-    }
+  padding: 10rpx 0 20rpx;
 
-    .info {
-        position: relative;
-        flex: 1;
-        margin-right: 20rpx;
-
-        .fen {
-            margin-top: 8rpx;
-            font-size: 24rpx;
-            line-height: 32rpx;
-            color: #bababa;
-        }
+  .exam-item {
+    display: flex;
+    align-items: center;
+    margin-top: 24rpx;
+    padding: 24rpx 24rpx;
+    border-radius: 16rpx;
+    border: 1px solid #6c6c6c;
+    overflow: hidden;
+  }
+
+  .info {
+    position: relative;
+    flex: 1;
+    margin-right: 20rpx;
+
+    .fen {
+      margin-top: 8rpx;
+      font-size: 24rpx;
+      line-height: 32rpx;
+      color: #bababa;
     }
-
-    .info-1 {
-        min-height: 80rpx;
-
-        &::after {
-            position: absolute;
-            right: 0%;
-            top: 50%;
-            z-index: 9;
-            margin-top: -25rpx;
-            content: '';
-            width: 1px;
-            height: 50rpx;
-            background: #f3f3f3;
-        }
+  }
+
+  .info-1 {
+    min-height: 80rpx;
+
+    &::after {
+      position: absolute;
+      right: 0%;
+      top: 50%;
+      z-index: 9;
+      margin-top: -25rpx;
+      content: '';
+      width: 1px;
+      height: 50rpx;
+      background: #f3f3f3;
     }
+  }
+
+  .look {
+    display: inline-block;
+    width: 110rpx;
+    height: 44rpx;
+    font-size: 24rpx;
+    line-height: 44rpx;
+    color: #fff;
+    text-align: center;
+    border-radius: 22rpx;
+    background: #00abf4;
+  }
+
+  .between {
+    display: flex;
+    align-items: center;
 
-    .look {
-        display: inline-block;
-        width: 110rpx;
-        height: 44rpx;
-        font-size: 24rpx;
-        line-height: 44rpx;
-        color: #fff;
-        text-align: center;
-        border-radius: 22rpx;
-        background: #00abf4;
+    .ren {
+      width: 100rpx;
+      font-size: 24rpx;
+      line-height: 40rpx;
+      color: $grey-color;
     }
 
-    .between {
-        display: flex;
-        align-items: center;
-
-        .ren {
-            width: 100rpx;
-            font-size: 24rpx;
-            line-height: 40rpx;
-            color: $grey-color;
-        }
-
-        .progress {
-            flex: 1;
-            margin-right: 20rpx;
-        }
+    .progress {
+      flex: 1;
+      margin-right: 20rpx;
     }
+  }
 }
 
 .shen-box {
-    padding: 20rpx 0;
+  padding: 20rpx 0;
 
-    .shen-item {
-        padding: 10rpx 0;
-        font-size: 30rpx;
-        line-height: 40rpx;
-        color: $dark-color;
-    }
+  .shen-item {
+    padding: 10rpx 0;
+    font-size: 30rpx;
+    line-height: 40rpx;
+    color: $dark-color;
+  }
 }
 
 .record-item {
+  display: flex;
+  align-items: center;
+  margin-top: 24rpx;
+  padding: 40rpx 30rpx;
+  border-radius: 16rpx;
+  border: 1px solid $grey-color;
+  overflow: hidden;
+
+  .text {
+    flex: 1;
+    margin-right: 20rpx;
+    font-size: 28rpx;
+    font-weight: 600;
+    line-height: 40rpx;
+    color: $black-color;
+  }
+
+  .time {
+    font-size: 28rpx;
+    line-height: 40rpx;
+    font-weight: 600;
+    color: $green-color;
+  }
+
+  .round {
     display: flex;
+    justify-content: center;
     align-items: center;
-    margin-top: 24rpx;
-    padding: 40rpx 30rpx;
-    border-radius: 16rpx;
+    width: 100rpx;
+    height: 100rpx;
     border: 1px solid $grey-color;
-    overflow: hidden;
-
-    .text {
-        flex: 1;
-        margin-right: 20rpx;
-        font-size: 28rpx;
-        font-weight: 600;
-        line-height: 40rpx;
-        color: $black-color;
-    }
-
-    .time {
-        font-size: 28rpx;
-        line-height: 40rpx;
-        font-weight: 600;
-        color: $green-color;
-    }
-
-    .round {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 100rpx;
-        height: 100rpx;
-        border: 1px solid $grey-color;
-        border-radius: 50%;
-        font-size: 24rpx;
-        color: $grey-color;
-    }
+    border-radius: 50%;
+    font-size: 24rpx;
+    color: $grey-color;
+  }
 }
 </style>
\ No newline at end of file