修复了三力测试的bug

src/assets/json/echart.config.json

@@ -0,0 +1,98 @@
+{
+    "color": [
+        "#80FFA5",
+        "#00DDFF",
+        "#37A2FF",
+        "#FF0087",
+        "#FFBF00"
+    ],
+    "title": {
+      text: "Gradient Stacked Area Chart"
+    },
+    tooltip: {
+      trigger: "axis",
+      axisPointer: {
+        type: "cross",
+        label: {
+          backgroundColor: "#6a7985"
+            }
+        }
+    },
+    legend: {
+      data: [
+            "Line 1"
+        ]
+    },
+    toolbox: {
+      feature: {
+        saveAsImage: {}
+        }
+    },
+    grid: {
+      left: "3%",
+      right: "4%",
+      bottom: "3%",
+      containLabel: true
+    },
+    xAxis: [
+        {
+        type: "category",
+        boundaryGap: false,
+        data: [
+                "Mon",
+                "Tue",
+                "Wed",
+                "Thu",
+                "Fri",
+                "Sat",
+                "Sun"
+            ]
+        }
+    ],
+    yAxis: [
+        {
+        type: "value"
+        }
+    ],
+    series: [
+        {
+        name: "Line 1",
+        type: "line",
+        stack: "Total",
+        smooth: false,
+        lineStyle: {
+          width: 2
+            },
+        showSymbol: false,
+        areaStyle: {
+          opacity: 0.8,
+          color: new echarts.graphic.LinearGradient(1,
+                0,
+                1,
+                1,
+                [
+                    {
+              offset: 0,
+              color: "#E1F8F1"
+                    },
+                    {
+              offset: 1,
+              color: "#FEFEFE"
+                    }
+                ])
+            },
+        emphasis: {
+                "focus": "series"
+            },
+        data: [
+                140,
+                232,
+                101,
+                264,
+                90,
+                340,
+                250
+            ]
+        }
+    ]
+};

src/otherPages/beforeThreeExam/index.vue

@@ -41,11 +41,12 @@
         </view>
       </view>
       <view class="mid1-submit">
-        <navigator url="/otherPages/threeExam/index">
+        <navigator url="/otherPages/threeExam/index?showSubmit=1">
           <view class="mid1-submit-begin"> 开始考试</view>
         </navigator>
-
-        <view class="mid1-submit-continue">继续练习</view>
+        <navigator url="/otherPages/threeExam/index?showSubmit=0">
+          <view class="mid1-submit-continue">继续练习</view>
+        </navigator>
       </view>
     </view>
     <view class="mid2">
@@ -114,10 +115,9 @@ export default {
       display: flex;
 
       flex-direction: row;
-      margin-bottom: 38rpx;
-      padding: 0 30rpx;
-      padding-top: 40rpx;
-      padding-bottom: 30rpx;
+      
+      padding: 20rpx 30rpx;
+   
 
       .mid1-line1-title {
         width: 270rpx;

src/otherPages/careEveryDay/index.vue

@@ -1,19 +1,22 @@
 <template>
-    <view style="display: flex; position: relative">
-        <image   :show-menu-by-longpress="true" style="width: 100%;" mode="widthFix" src="https://ct.zzxcx.net/ctjk/mp-wx/careGzh/care3.png"></image>
-         <image
+  <view style="display: flex; position: relative">
+    <image
+      :show-menu-by-longpress="true"
+      style="width: 100%"
+      mode="widthFix"
+      src="https://ndata.zzxcx.net/ctjk/mp-wx/careGzh/care3.png"
+    ></image>
+    <image
       mode="widthFix"
       :show-menu-by-longpress="true"
       class="hand"
       src="https://ndata.zzxcx.net/ctjk/mp-wx/careGzh/hand.gif"
     ></image>
-    </view>
+  </view>
 </template>
 
 <script>
-    export default {
-        
-    }
+export default {};
 </script>
 
 <style lang="less" scoped>

src/otherPages/careGzh/index.vue

@@ -32,7 +32,7 @@ export default {
 }
 .hand {
   width: 154rpx;
-  top: 1325rpx;
+  top: 1125rpx;
   left: 525rpx;
   position: absolute;
 }

src/otherPages/teacherVideo/index.vue

@@ -15,7 +15,7 @@
         <image
           mode="widthFix"
           class="left"
-          src="https://ct.zzxcx.net/ctjk/mp-wx/teacherVideo/kemu3.png"
+          src="https://ndata.zzxcx.net/ctjk/mp-wx/teacherVideo/kemu3.png"
         ></image>
         <view class="right">
           <view>熟记考场</view>
@@ -31,7 +31,7 @@
           <image
             mode="widthFix"
             class="subject-bg"
-            :src="'https://ct.zzxcx.net/ctjk/mp-wx/teacherVideo/kemubg'+(index+1)+'.png'"
+            :src="'https://ndata.zzxcx.net/ctjk/mp-wx/teacherVideo/kemubg'+(index+1)+'.png'"
           ></image>
 
           <view class="text1"> 科目{{ item }} </view>

src/otherPages/threeExam/index.vue

@@ -246,21 +246,25 @@
         <view @click="nextPage" class="next"> 下一题</view>
       </view>
       <view class="submit">
-        <view
-          @click="
-            () => {
-              submitExamVisible = true;
-            }
-          "
-          class="submit-button"
-          ><text>交卷</text
-          ><countDown
-            @change="getThreeExamTime"
-            @end="submitExam"
-            background=""
-            :time="examTime"
-          ></countDown>
+        <view>
+          <view
+            v-if="query.showSubmit == '1'"
+            @click="
+              () => {
+                submitExamVisible = true;
+              }
+            "
+            class="submit-button"
+            ><text>交卷</text
+            ><countDown
+              @change="getThreeExamTime"
+              @end="submitExam"
+              background=""
+              :time="examTime"
+            ></countDown>
+          </view>
         </view>
+
         <view class="count">
           <view class="col">
             <icon type="success" size="26rpx" color="#33CDA4"></icon>
@@ -333,21 +337,21 @@
           <image
             mode="widthFix"
             style="width: 628rpx"
-            src="https://ct.zzxcx.net/ctjk/mp-wx/threeExam/bg_dialog.png"
+            src="https://ndata.zzxcx.net/ctjk/mp-wx/threeExam/bg_dialog.png"
           ></image>
           <image
             mode="widthFix"
             v-if="score < 90"
             class="tip2-cry"
             style="width: 187rpx"
-            src="https://ct.zzxcx.net/ctjk/mp-wx/threeExam/cry.png"
+            src="https://ndata.zzxcx.net/ctjk/mp-wx/threeExam/cry.png"
           ></image>
           <image
             mode="widthFix"
             v-if="score >= 90"
             class="tip2-cry"
             style="width: 187rpx"
-            src="https://ct.zzxcx.net/ctjk/mp-wx/threeExam/laugh.png"
+            src="https://ndata.zzxcx.net/ctjk/mp-wx/threeExam/laugh.png"
           ></image>
           <view class="tip2-text">
             <view>恭喜您</view>
@@ -393,10 +397,13 @@
 import api from "@/api";
 import utils from "@/utils";
 import countDown from "@/components/countDown/index";
+import Toast from "../../../dist/build/mp-weixin/wxcomponents/vant/toast/toast";
 export default {
   data() {
     return {
-      query: {},
+      query: {
+        showSubmit: true,
+      },
       anLength: 7,
       problemList: [
         {
@@ -482,22 +489,44 @@ export default {
   },
   onLoad(query) {
     this.query = query;
-    api.exam.studentThreeForceSelectTestQuestionInfoList().then((res) => {
-      if (Array.isArray(res.rows) && res.rows.length > 0) {
-        res.rows.forEach((element) => {
-          element.userAnswerIndex = -1;
-          element.isComplete = false;
-        });
-        this.problemList = res.rows;
-      }
-    });
+    if (this.query.showSubmit == "1") {
+      api.exam.studentThreeForceSelectTestQuestionInfoList().then((res) => {
+        if (Array.isArray(res.rows) && res.rows.length > 0) {
+          res.rows.forEach((element) => {
+            element.userAnswerIndex = -1;
+            element.isComplete = false;
+          });
+          this.problemList = res.rows;
+        } else {
+          Toast({
+            type: "fail",
+            message: "加载失败",
+          });
+        }
+      });
+    } else if (this.query.showSubmit == "0") {
+      api.exam.studentThreeForceList().then((res) => {
+        if (Array.isArray(res.rows) && res.rows.length > 0) {
+          res.rows.forEach((element) => {
+            element.userAnswerIndex = -1;
+            element.isComplete = false;
+          });
+          this.problemList = res.rows;
+        } else {
+          Toast({
+            type: "fail",
+            message: "加载失败",
+          });
+        }
+      });
+    }
   },
   methods: {
     goPath(url) {
-      console.log(url)
-    uni.navigateTo({
-      url
-    })
+      console.log(url);
+      uni.navigateTo({
+        url,
+      });
     },
     getThreeExamTime(a, b) {
       this.restTime = a;

src/otherPages/threeExamScore/index.vue

@@ -104,7 +104,7 @@ export default {
       ctx.lineCap = "round";
       ctx.lineWidth = 20;
       ctx.beginPath();
-      ctx.arc(x1, y1, r1, Math.PI, Math.PI * 1.2, false);
+      ctx.arc(x1, y1, r1, Math.PI, Math.PI * 1.1, false);
       ctx.stroke();
       console.log(ctx);
       // ctx.draw()
@@ -119,7 +119,7 @@ export default {
       console.log(scoreWidth);
       ctx.beginPath();
       ctx.fillStyle = "#FF4D53";
-      ctx.fillText("100", x1 + 10, y1);
+      ctx.fillText("10", x1 + 10, y1);
 
       ctx.textAlign = "right";
       ctx.font = "14px sans-serif";
@@ -141,7 +141,7 @@ export default {
 .top {
   width: 750rpx;
   height: 726rpx;
-  background-image: url("https://ct.zzxcx.net/ctjk/mp-wx/threeExamScore/topBg.png");
+  background-image: url("https://ndata.zzxcx.net/ctjk/mp-wx/threeExamScore/topBg.png");
   background-size: 100%;
   padding: 0 30rpx;
 

src/otherPages/videoSubjectList/index.vue

@@ -12,7 +12,7 @@
             <image
               class="list-item-play"
               alt=""
-              src="https://ct.zzxcx.net/ctjk/h5/videoList/play.png"
+              src="https://ndata.zzxcx.net/ctjk/h5/videoList/play.png"
             />
             <image
               mode="widthFix"
@@ -42,7 +42,7 @@ export default {
           id: 1,
           state: 1,
           updateTime: "2023-02-20 15:13:57",
-          videoCover: "https://ct.zzxcx.net/ctjk/h5/videoList/km1.png",
+          videoCover: "https://ndata.zzxcx.net/ctjk/h5/videoList/km1.png",
           videoName: "01小车科目一ABS题",
           videoSubject: 1,
           videoUrl:

src/pages.json

@@ -13,8 +13,9 @@
         // #endif
       }
     },
+
     {
-      "path": "pages/careGzh/index",
+      "path": "pages/teacherVideo/index",
       "style": {}
     },
    
@@ -242,10 +243,7 @@
             "navigationBarTitleText": "播放视频"
           }
         },
-        {
-          "path": "teacherVideo/index",
-          "style": {}
-        },
+
         {
           "path": "examRoadVideo/index",
           "styles": {
@@ -444,7 +442,7 @@
         "text": "驾考"
       },
       {
-        "pagePath": "pages/careGzh/index",
+        "pagePath": "pages/teacherVideo/index",
         "iconPath": "static/imgs/video.png",
         "selectedIconPath": "static/imgs/video-active.png",
         "text": "教学视频"
@@ -520,7 +518,7 @@
         "query": "liceCar=1&liceTruck=&liceBus=&liceMoto=&name=&gs=xc&cert=C1/C2/C3&vehicle=轿车&subject=1&title=精选考题&sort=3"
       },
       {
-        "path": "otherPages/teacherVideo/index",
+        "path": "pages/teacherVideo/index",
         "name": "教学视频",
         "query": "liceCar=1&liceTruck=&liceBus=&liceMoto=&name=&gs=xc&cert=C1/C2/C3&vehicle=轿车&subject=1&title=精选考题&sort=3"
       },

src/pages/careGzh/index.vue

@@ -1,39 +0,0 @@
-<template>
-    <div  style="display: flex;position: relative;">
-        <!-- <van-icon @click="back" class="leftback" name="arrow-left" /> -->
-        <image mode="widthFix" class="bg" :show-menu-by-longpress="true" src="https://ndata.zzxcx.net/ctjk/mp-wx/careGzh/care1.png"></image>
-        <image mode="widthFix" :show-menu-by-longpress="true" class="hand" src="https://ndata.zzxcx.net/ctjk/mp-wx/careGzh/hand.gif"></image>
-    </div>
-</template>
-
-<script>
-    export default {
-        methods: {
-            back() {
-                uni.navigateBack()
-                
-            }
-        },
-        
-    }
-</script>
-
-<style lang="less" scoped>
-.bg{
-    width: 750rpx;
-   
-}
-.hand{
-    width: 154rpx;
-    top: 1325rpx;
-    left: 525rpx;
-    position: absolute;
-}
-.leftback{
-    top: 20rpx;
-    position: absolute;
-    color: #fff;
-
-}
-
-</style>

src/pages/teacherVideo/index.vue

@@ -15,7 +15,7 @@
         <image
           mode="widthFix"
           class="left"
-          src="https://ct.zzxcx.net/ctjk/mp-wx/teacherVideo/kemu3.png"
+          src="https://ndata.zzxcx.net/ctjk/mp-wx/teacherVideo/kemu3.png"
         ></image>
         <view class="right">
           <view>熟记考场</view>
@@ -31,7 +31,7 @@
           <image
             mode="widthFix"
             class="subject-bg"
-            :src="'https://ct.zzxcx.net/ctjk/mp-wx/teacherVideo/kemubg'+(index+1)+'.png'"
+            :src="'https://ndata.zzxcx.net/ctjk/mp-wx/teacherVideo/kemubg'+(index+1)+'.png'"
           ></image>
 
           <view class="text1"> 科目{{ item }} </view>