#调整

1、调整首页

#修复
1、修复任务中的考试任务跳转问题

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" : {

src/pages/index/components/tab0.vue

@@ -20,7 +20,6 @@
     </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">
@@ -28,7 +27,6 @@
         </view>
         <view class="text">{{ item.name }}</view>
       </view>
-            </scroll-view>
     </view>
     <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>
     <view v-for="(item, index) in articleList" :key="index">
@@ -39,53 +37,69 @@
         </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">
+            <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>
+            <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 @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"/>
+                <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"/>
+                <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"/>
+                  <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"/>
+                  <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"/>
+              <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"/>
+                  <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"/>
+                  <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"/>
+                  <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"/>
+                  <uv-image :src="item.album[3].url" @click="handPreviewImage(item.album, 3)" radius="15" width="340rpx"
+                            height="340rpx"/>
                 </view>
               </view>
             </view>

src/pages/promote/progress.vue

@@ -264,14 +264,11 @@ const resultLink = ({
                     }) => {
   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}`
-    }
+  // 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})
 }