带广告的版本

src/App.vue

@@ -92,4 +92,9 @@ html {
 .uni-app-fontsize-paragraph{
   font-size: $uni-app-fontsize-paragraph;
 }
+.wxad{
+  padding-bottom: 20rpx;
+  padding-top: 20rpx;
+  border-top: 2rpx dashed #a8a8a8;
+}
 </style>

src/components/m-carVideo-tab/m-carVideo-tab.vue

@@ -0,0 +1,22 @@
+<template>
+    <view>
+        <scroll-view>
+            
+        </scroll-view>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+              
+            }
+        },
+        
+    }
+</script>
+
+<style lang="sass" scoped>
+
+</style>

src/components/m-classify-tip/m-classify-tip.vue

@@ -29,12 +29,14 @@ export default {
 .box {
   padding: 0 15rpx;
   width: 100%;
-  font-size: 28rpx;
+  font-size: 32rpx;
+  padding-bottom: 15rpx;
 
   .line1 {
     color: rgba(165, 0, 0, 0.61);
-    font-size: 28rpx;
-    line-height: 38rpx;
+    font-size: 40rpx;
+    line-height: 2;
+    font-weight: 600;
   }
 }
 </style>

src/otherPages/classifyArea/index.vue

@@ -28,6 +28,10 @@
     </van-cell>
     <div style="height: 40rpx; width: 750rpx"></div>
     <m-classify-tip :content="classifyTip"></m-classify-tip>
+    <view class="wxad">
+      <ad :ad-intervals="100" ad-type="video" unit-id="adunit-8eb44bbd7e3147d4"></ad>
+    </view>
+   
   </div>
 </template>
 

src/otherPages/classifyChoose/index.vue

@@ -1,63 +1,40 @@
 <template>
   <div class="cell-container">
-    <div
-      class="cell-box"
-      :class="{
-        'is-row': isRow,
-      }"
-    >
-      <van-cell
-        title-class="uni-app-fontsize-paragraph"
-        class="cell"
-        :title="
-          item.excellIssueName ||
-          item.placeIssueName ||
-          item.classIssueName ||
-          item.sequeIssueName
-        "
-        is-link
-        center
-        v-for="(item, index) in classDataLeft"
-        :key="index"
-        :border="false"
-        @click="
-          () => {
-            goExercise({
-              excellIssueName: item.excellIssueName,
-              sort: 2,
-              
-            });
-          }
-        "
-      >
+    <div class="cell-box" :class="{
+      'is-row': isRow,
+    }">
+      <van-cell title-class="uni-app-fontsize-paragraph" class="cell" :title="
+        item.excellIssueName ||
+        item.placeIssueName ||
+        item.classIssueName ||
+        item.sequeIssueName
+      " is-link center v-for="(item, index) in classDataLeft" :key="index" :border="false" @click="
+  () => {
+    goExercise({
+      excellIssueName: item.excellIssueName,
+      sort: 2,
+
+    });
+  }
+">
         <template #icon>
           <div class="icon-red">{{ index + 1 }}</div>
         </template>
       </van-cell>
 
-      <van-cell
-        title-class="uni-app-fontsize-paragraph"
-        class="cell"
-        :title="
-          item.excellIssueName ||
-          item.placeIssueName ||
-          item.classIssueName ||
-          item.sequeIssueName
-        "
-        is-link
-        center
-        v-for="(item, index) in classDataSpecial"
-        :key="index"
-        :border="false"
-        @click="
-          () => {
-            goExercise({
-              excellIssueName: item.excellIssueName,
-              sort: 2,
-            });
-          }
-        "
-      >
+      <van-cell title-class="uni-app-fontsize-paragraph" class="cell" :title="
+        item.excellIssueName ||
+        item.placeIssueName ||
+        item.classIssueName ||
+        item.sequeIssueName
+      " is-link center v-for="(item, index) in classDataSpecial" :key="index" :border="false" @click="
+  () => {
+    goExercise({
+      excellIssueName: item.excellIssueName,
+      sort: 2,
+    });
+  }
+">
         <template #icon>
           <div class="icon-red">{{ '新' }}</div>
         </template>
@@ -89,35 +66,30 @@
       </van-cell> -->
     </div>
     <div style="padding-right: 0rpx" class="cell-box">
-      <van-cell
-        class="cell"
-        :title="
-          item.placeIssueName ||
-          item.classIssueName ||
-          item.excellIssueName ||
-          item.sequeIssueName
-        "
-        @click="
-          () => {
-            goExercise({
-              excellIssueName: item.excellIssueName,
-            });
-          }
-        "
-        is-link
-        center
-        v-for="(item, index) in classDataRight"
-        :key="index"
-        :border="false"
-      >
+      <van-cell class="cell" :title="
+        item.placeIssueName ||
+        item.classIssueName ||
+        item.excellIssueName ||
+        item.sequeIssueName
+      " @click="
+  () => {
+    goExercise({
+      excellIssueName: item.excellIssueName,
+    });
+  }
+" is-link center v-for="(item, index) in classDataRight" :key="index" :border="false">
         <template #icon>
           <div class="icon-red">{{ index + 1 }}</div>
         </template>
       </van-cell>
-    
+
     </div>
     <div style="height: 40rpx; width: 750rpx"></div>
     <m-classify-tip :content="classifyTip"></m-classify-tip>
+    <view class="wxad">
+      <ad ad-type="video" :ad-intervals="100" unit-id="adunit-8eb44bbd7e3147d4"></ad>
+    </view>
+   
   </div>
 </template>
 
@@ -133,7 +105,7 @@ export default {
         "模拟考试能连续5次以上达到96分左右,即可参加考试",
         "如果模拟考试达不到要求,请把右边的选学题也学习一遍",
       ],
-      classDataSpecial:[],
+      classDataSpecial: [],
       classDataRight: [],
       classDataLeft: [],
       query: {
@@ -243,6 +215,7 @@ export default {
   width: 100%;
   box-sizing: border-box;
 }
+
 .cell-box {
   display: flex;
   align-content: flex-start;
@@ -257,6 +230,7 @@ export default {
     margin-bottom: 30rpx;
     box-shadow: 0px 0px 10rpx rgba(124, 129, 136, 0.2);
   }
+
   .icon-blue {
     width: 40rpx;
     height: 40rpx;
@@ -271,6 +245,7 @@ export default {
     color: #ffffff;
     margin-right: 10rpx;
   }
+
   .icon-red {
     width: 50rpx;
     height: 50rpx;
@@ -286,6 +261,7 @@ export default {
     margin-right: 10rpx;
   }
 }
+
 .is-row {
   flex-direction: row;
   width: 100%;

src/pages.json

@@ -13,6 +13,10 @@
         // #endif
       }
     },
+    {
+      "path": "pages/careGzh/index",
+      "styles": {}
+    },
     {
       "path": "pages/carVideo/videoList",
       "style": {
@@ -211,10 +215,7 @@
           "path": "marked/index",
           "styles": {}
         },
-        {
-          "path": "careGzh/index",
-          "styles": {}
-        },
+   
         {
           "path": "userInfoAuth/index",
           "style": {
@@ -378,14 +379,20 @@
       // },
       {
         "pagePath": "pages/carVideo/index",
-        "iconPath": "static/imgs/video.png",
-        "selectedIconPath": "static/imgs/video-avtive.png",
+        "iconPath": "static/imgs/car.png",
+        "selectedIconPath": "static/imgs/car-active.png",
         "text": "驾考"
       },
+      {
+        "pagePath": "pages/careGzh/index",
+        "iconPath": "static/imgs/video.png",
+        "selectedIconPath": "static/imgs/video-active.png",
+        "text": "视频"
+      },
       {
         "pagePath": "pages/user/index",
         "iconPath": "static/imgs/user.png",
-        "selectedIconPath": "static/imgs/user-avtive.png",
+        "selectedIconPath": "static/imgs/user-active.png",
         "text": "我的"
       }
     ]

src/pages/carVideo/components/tabCenter.vue

@@ -7,10 +7,8 @@
       :key="index"
     >
       <image class="center-img" :src="item.img"></image>
-      <text v-if="index == 0" class="center-text">{{
-        item.text + "\n500题"
-      }}</text>
-      <text v-if="index == 1" class="center-text">{{ item.text }}</text>
+   
+      <text  class="center-text">{{ item.text }}</text>
     </view>
   </view>
 </template>
@@ -86,17 +84,17 @@ export default {
   display: flex;
   flex-direction: column;
   width: 300rpx;
-  margin-top: 100rpx;
+  margin-top: 80rpx;
 
   .center-item {
     position: relative;
-    margin-bottom: 180rpx;
+    margin-bottom: 100rpx;
     color: #fff;
     text-align: center;
   }
   .center-img {
-    width: 250rpx;
-    height: 250rpx;
+    width: 300rpx;
+    height: 300rpx;
   }
   .center-text {
     position: absolute;

src/pages/carVideo/components/tabLeft.vue

@@ -86,7 +86,7 @@ export default {
 <style lang="scss" scoped>
 .left {
   width: 160rpx;
-  font-size: $uni-app-fontsize-paragraph;
+  font-size:30rpx;
   padding-top: 50rpx;
   .left-item {
     width: 100%;

src/pages/carVideo/components/tabRight.vue

@@ -81,7 +81,7 @@ export default {
 .right {
   width: 160rpx;
   padding-top: 50rpx;
-  font-size: $uni-app-fontsize-paragraph;
+  font-size: 30rpx;
   .right-item {
     white-space: nowrap;
     width: 100%;

src/pages/carVideo/index.vue

@@ -72,44 +72,21 @@
         <image class="" src="https://ct.zzxcx.net/ctjk/mp-wx/carVideo/triangle1@2x.png"></image>
       </view>
     </view>
-    <!-- #ifdef MP-WEIXIN -->
-    <view class="tab">
+    <!-- #ifdef MP-WEIXIN-->
+    <!-- (废弃) -->
+    <!-- <view class="tab">
       <van-tabs animated class="custom-tabs " :active="active" id="tabs" @change="changeSubject" :sticky="true">
         <van-tab class="uni-app-fontsize-paragraph" v-if="xcx_video_open" title="教学视频">
           <subjectVideoSelect></subjectVideoSelect>
         </van-tab>
-        <van-tab title-style="font-size:36rpx" tab-class="uni-app-fontsize-paragraph" title="科目一">
+        <van-tab title-style="font-size:36rpx;" title="科目一">
           <view class="tab-container">
             <tab-left :subject="1" :query="tabQuery" :leftList="leftList1"></tab-left>
             <tab-center :subject="1" :query="tabQuery" :centerList="centerList1"></tab-center>
             <tab-right :subject="1" :query="tabQuery" :rightList="rightList1"></tab-right>
           </view>
         </van-tab>
-        <!-- <van-tab title="科目二">
-          <view v-for="(item, index) in typeList" :key="index">
-            <branch-two
-              v-if="index == 1"
-              :carVideoList="item.children"
-            ></branch-two>
-          </view>
-        </van-tab> -->
-        <!-- <van-tab title="科目三">
-          <van-grid column-num="4">
-            <van-grid-item
-              @click="goLightMock"
-              icon="https://ct.zzxcx.net/ctjk/mp-wx/carVideo/lightmock.png"
-              text="灯光模拟"
-            >
-            </van-grid-item>
-          </van-grid>
-          <view v-for="(item, index) in typeList" :key="index">
-            <branch-two
-              v-if="index == 2"
-              :carVideoList="item.children"
-            ></branch-two>
-          </view>
-        </van-tab> -->
-        <van-tab title-style="font-size:36rpx" class="uni-app-fontsize-paragraph" title="科目四">
+        <van-tab title-style="font-size:36rpx;" title="科目四">
           <view class="tab-container">
             <tab-left :query="tabQuery" :subject="4" :leftList="leftList4"></tab-left>
             <tab-center :query="tabQuery" :subject="4" :centerList="centerList4"></tab-center>
@@ -117,70 +94,53 @@
           </view>
         </van-tab>
       </van-tabs>
-    </view>
-    <!-- #endif -->
-    <!-- #ifdef MP-TOUTIAO -->
-    <view class="tabTitle">
-      <view :style="{
-        left: active * 25 + '%',
-      }" class="rect">
-        <view class="rect-color"> </view>
+    </view> -->
+    <view class="subject">
+      <view class="subject-tab">
+        <view class="subject-slider" :class="{
+          'left0': active == 0,
+          'right0': active == 1
+        }"></view>
+        <view @click="() => {
+          active = 0
+        }" class="subject-tabs">
+          科目一
+        </view>
+        <view @click="() => {
+          active = 1
+        }" class="subject-tabs">
+          科目四
+        </view>
       </view>
-      <view @click="
-        () => {
-          active = index;
-          tabQuery.name = item;
-          tabQuery.subject = index + 1;
-        }
-      " v-for="(item, index) in subjectMap" :key="index" class="tabTitle-row">
-        {{ item }}
-      </view>.
 
     </view>
     <view class="tab">
-      <swiper scroll-x id="tabs" circular :current="active" :scroll-left="50" @change="
-        (e) => {
-          active = e.detail.current;
-        }
-      ">
-        <swiper-item id="tab1" style="display: inline-block; width: 100%">
+      <scroll-view @scrolltoupper="() => {
+        active = 0
+      }" @scrolltolower="() => {
+  active = 1
+}" scroll-with-animation :scroll-into-view="'tab-container' + (active)" enhanced
+        style="width: 100%;white-space: nowrap;" enable-flex :scroll-x="true">
+        <view id="tab-container0" style="display:inline-block;white-space:nowrap;">
           <view class="tab-container">
-            <tab-left :needVipList="[0, 1]" :subject="1" :query="tabQuery" :leftList="leftList1"></tab-left>
-            <tab-center :needVipList="[0, 1]" :subject="1" :query="tabQuery" :centerList="centerList1"></tab-center>
-            <tab-right :needVipList="[0, 1]" :subject="1" :query="tabQuery" :rightList="rightList1"></tab-right>
-          </view>
-        </swiper-item>
-
-        <swiper-item id="tab2" style="display: inline-block; width: 100%">
-          <view v-for="(item, index) in typeList" :key="index">
-            <branch-two v-if="index == 1" :carVideoList="item.children"></branch-two>
+            <tab-left :subject="1" :query="tabQuery" :leftList="leftList1"></tab-left>
+            <tab-center :subject="1" :query="tabQuery" :centerList="centerList1"></tab-center>
+            <tab-right :subject="1" :query="tabQuery" :rightList="rightList1"></tab-right>
           </view>
-        </swiper-item>
+        </view>
 
-        <swiper-item id="tab3" style="display: inline-block; width: 100%">
-          <!-- <van-grid column-num="4">
-            <van-grid-item
-              @click="goLightMock"
-              icon="https://ct.zzxcx.net/ctjk/mp-wx/carVideo/lightmock.png"
-              text="灯光模拟"
-            >
-            </van-grid-item>
-          </van-grid> -->
-          <view v-for="(item, index) in typeList" :key="index">
-            <branch-two v-if="index == 2" :carVideoList="item.children"></branch-two>
-          </view>
-        </swiper-item>
-        <swiper-item id="tab4" style="display: inline-block; width: 100%">
+        <view id="tab-container1" style="display:inline-block;white-space:nowrap;">
           <view class="tab-container">
-            <tab-left :needVipList="[0, 1]" :query="tabQuery" :subject="4" :leftList="leftList4"></tab-left>
-            <tab-center :needVipList="[0, 1]" :query="tabQuery" :subject="4" :centerList="centerList4"></tab-center>
-            <tab-right :needVipList="[0, 1]" :query="tabQuery" :subject="4" :rightList="rightList4"></tab-right>
+            <tab-left :query="tabQuery" :subject="4" :leftList="leftList4"></tab-left>
+            <tab-center :query="tabQuery" :subject="4" :centerList="centerList4"></tab-center>
+            <tab-right :query="tabQuery" :subject="4" :rightList="rightList4"></tab-right>
           </view>
-        </swiper-item>
-      </swiper>
+        </view>
+      </scroll-view>
     </view>
 
     <!-- #endif -->
+
     <view class="splitLine">
 
     </view>
@@ -290,57 +250,57 @@ export default {
     //科目一
     rightList1: [
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/LocalTopics%402x.png",
-        text: "地方专题\n ",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/localTopics@2x.png",
+        text: "地方专题",
         path: "/otherPages/classifyArea/index",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/WrongTopicCollection%402x.png",
-        text: "错题·收藏\n ",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/wrongTopicCollection@2x.png",
+        text: "错题·收藏",
         path: "/otherPages/collection/index",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/NotesBeforeExamination%402x.png",
-        text: "考前须知\n ",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/notesBeforeExamination@2x.png",
+        text: "考前须知",
         path: "/otherPages/marked/index?markdown=考前须知",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/LearnToSee@2x.png",
-        text: "学车必看\n ",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/learnToSee@2x.png",
+        text: "学车必看",
         path: "/otherPages/marked/index?markdown=学车必看",
       },
     ],
     centerList1: [
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/SelectedTestQuestions@2x.png",
-        text: "精选考题",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/selectedTestQuestions@2x.png",
+        text: "",
         path: "/otherPages/classifyChoose/index",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/SimulationTestTopics@2x.png",
-        text: "模拟考试\n仿真题目",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/simulationTestTopics@2x.png",
+        text: "",
         path: "/otherPages/beforeMockExam/index",
       },
     ],
     leftList1: [
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/SequentialPractice@2x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/sequentialPractice@2x.png",
         text: "顺序练习",
         path: "/otherPages/classifyOrder/index",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/ClassificationExercise@2x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/classificationExercise@2x.png",
         text: "分类练习",
         path: "/otherPages/classifyKind/index",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/RealExaminationRoomSimulation%402x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/realExaminationRoomSimulation@2x.png",
         text: "真实考场模拟",
         path: '/pages/extraHorWeb/index',
       },
 
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/SimulationResults@2x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/simulationResults@2x.png",
         text: "模拟成绩",
         path: "/otherPages/testScores/index",
       },
@@ -348,57 +308,57 @@ export default {
     //科目四
     rightList4: [
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/LocalTopics%402x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/localTopics%402x.png",
         text: "地方专题",
         path: "/otherPages/classifyArea/index",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/WrongTopicCollection%402x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/wrongTopicCollection%402x.png",
         text: "错题·收藏",
         path: "/otherPages/collection/index",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/NotesBeforeExamination%402x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/notesBeforeExamination%402x.png",
         text: "考前须知",
         path: "/otherPages/marked/index?markdown=学车必看",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/LearnToSee@2x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/learnToSee@2x.png",
         text: "学车必看",
         path: "/otherPages/marked/index?markdown=学车必看",
       },
     ],
     centerList4: [
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/SelectedTestQuestions@2x.png",
-        text: "精选考题",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/selectedTestQuestions@2x.png",
+        text: "",
         path: "/otherPages/classifyChoose/index",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/SimulationTestTopics@2x.png",
-        text: "模拟考试\n仿真题目",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/simulationTestTopics@2x.png",
+        text: "",
         path: "/otherPages/beforeMockExam/index",
       },
     ],
     leftList4: [
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/SequentialPractice@2x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/sequentialPractice@2x.png",
         text: "顺序练习",
         path: "/otherPages/classifyOrder/index",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/ClassificationExercise@2x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/classificationExercise@2x.png",
         text: "分类练习",
         path: "/otherPages/classifyKind/index",
       },
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/RealExaminationRoomSimulation%402x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/realExaminationRoomSimulation@2x.png",
         text: "真实考场模拟",
         path: '/pages/extraHorWeb/index',
       },
 
       {
-        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/SimulationResults@2x.png",
+        img: "https://ct.zzxcx.net/ctjk/mp-wx/carVideo/simulationResults@2x.png",
         text: "模拟成绩",
         path: "/otherPages/testScores/index",
       },
@@ -493,7 +453,7 @@ export default {
     api.system.systemConfigConfigKey('xcx_video_open').then(res => {
       this.xcx_video_open = Number(res.data)
       this.$nextTick(() => {
-        this.selectComponent("#tabs").resize() // 需要延迟
+        // 需要延迟
 
         api.user.getInfo().then(res => {
           uni.setStorageSync("userInfo", res.data);
@@ -516,107 +476,107 @@ export default {
 
       })
     })
-    
-      // api.user.getInfo().then(res => {
-      //   uni.setStorageSync("userInfo", res.data);
-      //   this.$store.commit('SET_USERINFO', res.data)
-      //   // if (!res.data.nickName) {
-      //   //   uni.showModal({
-      //   //     title: "新用户更新信息",
-      //   //     confirmText: "去更新",
-      //   //     success: function (res) {
-      //   //       if (res.confirm) {
-      //   //        uni.navigateTo({
-      //   //         url:"/otherPages/userInfoAuth/index"
-      //   //        })
-      //   //       } else if (res.cancel) {
-
-      //   //       }
-      //   //     }
-      //   //   })
-
-
-      //   // }
-      // })
-      // this.$nextTick(() => {
-      //   this.selectComponent("#tabs").resize();
-      // });
+
+    // api.user.getInfo().then(res => {
+    //   uni.setStorageSync("userInfo", res.data);
+    //   this.$store.commit('SET_USERINFO', res.data)
+    //   // if (!res.data.nickName) {
+    //   //   uni.showModal({
+    //   //     title: "新用户更新信息",
+    //   //     confirmText: "去更新",
+    //   //     success: function (res) {
+    //   //       if (res.confirm) {
+    //   //        uni.navigateTo({
+    //   //         url:"/otherPages/userInfoAuth/index"
+    //   //        })
+    //   //       } else if (res.cancel) {
+
+    //   //       }
+    //   //     }
+    //   //   })
+
+
+    //   // }
+    // })
+    // this.$nextTick(() => {
+    //   this.selectComponent("#tabs").resize();
+    // });
+  },
+  methods: {
+    clickCell(carVideoList) {
+      this.$utils.route.goPage(`/pages/carVideo/moreVideo?active=${this.active}`, null, {
+        carVideoList: carVideoList,
+        active: this.active
+      });
     },
-      methods: {
-      clickCell(carVideoList) {
-        this.$utils.route.goPage(`/pages/carVideo/moreVideo?active=${this.active}`, null, {
-          carVideoList: carVideoList,
-          active: this.active
-        });
-      },
-      goPath(url, extraQuery = {}, needVip = false) {
+    goPath(url, extraQuery = {}, needVip = false) {
 
-        uni.navigateTo({
-          url:
-            url + "?" + utils.mapToUrlQuery({ ...this.tabQuery, ...extraQuery }),
-        });
-      },
-      scrollTabs(e) {
-        console.log(e);
-      },
-      changeVehicle(item) {
-        this.tabQuery.vehicle = item.typeName;
-        this.tabQuery.cert = item.title;
-        switch (item.typeName) {
-          case "轿车":
-            this.tabQuery.liceCar = 1;
-            this.tabQuery.liceTruck = "";
-            this.tabQuery.liceBus = "";
-            this.tabQuery.liceMoto = "";
-            this.tabQuery.gs = "xc";
-            break;
-          case "货车":
-            this.tabQuery.liceCar = "";
-            this.tabQuery.liceTruck = 1;
-            this.tabQuery.liceBus = "";
-            this.tabQuery.liceMoto = "";
-            this.tabQuery.gs = "hc";
-            break;
-          case "客车":
-            this.tabQuery.liceCar = "";
-            this.tabQuery.liceTruck = "";
-            this.tabQuery.liceBus = 1;
-            this.tabQuery.liceMoto = "";
-            this.tabQuery.gs = "kc";
-            break;
-          case "摩托车":
-            this.tabQuery.liceCar = "";
-            this.tabQuery.liceTruck = "";
-            this.tabQuery.liceBus = "";
-            this.tabQuery.liceMoto = 1;
-            this.tabQuery.gs = "mtc";
-            break;
-          default:
-            break;
-        }
-      },
-      changeSubject(e) {
-        this.tabQuery.subject = e.detail.title == '科目一' ? 1 : 4;
-        this.tabQuery.name = e.detail.title;
-      },
-      goLightMock(e) {
-        uni.navigateTo({
-          url: "/pages/lightMock/index",
-        });
-      },
-      goAprilExam() {
-        uni.navigateTo({
-          url: "/pages/extraWeb/index?src=https://mn.zzxcx.net/#/aprilExam/test",
-        });
-      },
-      async search(e) {
-        let { data } = await this.$api.carVideo.getSearchList(e.detail);
-        console.log(data);
-        this.$utils.route.goPage("/pages/carVideo/more", null, {
-          carVideoList: data,
-        });
-      },
+      uni.navigateTo({
+        url:
+          url + "?" + utils.mapToUrlQuery({ ...this.tabQuery, ...extraQuery }),
+      });
+    },
+    scrollTabs(e) {
+      console.log(e);
+    },
+    changeVehicle(item) {
+      this.tabQuery.vehicle = item.typeName;
+      this.tabQuery.cert = item.title;
+      switch (item.typeName) {
+        case "轿车":
+          this.tabQuery.liceCar = 1;
+          this.tabQuery.liceTruck = "";
+          this.tabQuery.liceBus = "";
+          this.tabQuery.liceMoto = "";
+          this.tabQuery.gs = "xc";
+          break;
+        case "货车":
+          this.tabQuery.liceCar = "";
+          this.tabQuery.liceTruck = 1;
+          this.tabQuery.liceBus = "";
+          this.tabQuery.liceMoto = "";
+          this.tabQuery.gs = "hc";
+          break;
+        case "客车":
+          this.tabQuery.liceCar = "";
+          this.tabQuery.liceTruck = "";
+          this.tabQuery.liceBus = 1;
+          this.tabQuery.liceMoto = "";
+          this.tabQuery.gs = "kc";
+          break;
+        case "摩托车":
+          this.tabQuery.liceCar = "";
+          this.tabQuery.liceTruck = "";
+          this.tabQuery.liceBus = "";
+          this.tabQuery.liceMoto = 1;
+          this.tabQuery.gs = "mtc";
+          break;
+        default:
+          break;
+      }
+    },
+    changeSubject(e) {
+      this.tabQuery.subject = e.detail.title == '科目一' ? 1 : 4;
+      this.tabQuery.name = e.detail.title;
+    },
+    goLightMock(e) {
+      uni.navigateTo({
+        url: "/pages/lightMock/index",
+      });
     },
+    goAprilExam() {
+      uni.navigateTo({
+        url: "/pages/extraWeb/index?src=https://mn.zzxcx.net/#/aprilExam/test",
+      });
+    },
+    async search(e) {
+      let { data } = await this.$api.carVideo.getSearchList(e.detail);
+      console.log(data);
+      this.$utils.route.goPage("/pages/carVideo/more", null, {
+        carVideoList: data,
+      });
+    },
+  },
 };
 </script>
 
@@ -627,6 +587,45 @@ export default {
   background: #F2F3F5;
 }
 
+.subject {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin-top: 40rpx;
+
+  .subject-tab {
+    width: 546rpx;
+    height: 80rpx;
+    background: #E3EDFC;
+    border-radius: 46rpx;
+    position: relative;
+    display: flex;
+
+    .subject-tabs {
+      width: 50%;
+      height: 100%;
+      line-height: 80rpx;
+      color: #fff;
+      text-align: center;
+      font-size: 40rpx;
+      z-index: 11;
+    }
+
+    .subject-slider {
+      border-radius: 46rpx;
+      background: -webkit-linear-gradient(left, #26A1EE, #498EF5);
+      ;
+      width: 300rpx;
+      height: 100%;
+      position: absolute;
+
+      z-index: 10;
+    }
+
+  }
+
+}
+
 .two {
   width: 100%;
   padding: 40rpx 30rpx;
@@ -794,11 +793,12 @@ swiper-item {
   width: 100%;
   margin: 0 auto;
   display: inline-block;
-  padding: 0 30rpx;
   font-size: $uni-app-fontsize-paragraph;
+  white-space: nowrap;
+
 
   #tabs {
-    overflow-y: scroll;
+
     height: 800rpx;
   }
 
@@ -809,11 +809,13 @@ swiper-item {
   }
 
   .tab-container {
-    width: 690rpx;
+    width: 750rpx;
     display: flex;
     justify-content: space-between;
     align-content: flex-start;
     align-items: flex-start;
+    padding: 0 30rpx;
+
   }
 }
 
@@ -837,5 +839,13 @@ swiper-item {
     margin-bottom: 0;
   }
 }
+
+.left0 {
+  left: 0;
+}
+
+.right0 {
+  right: 0;
+}
 </style>
 

src/otherPages/careGzh/index.vue → src/pages/careGzh/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div  style="display: flex;position: relative;">
-        <van-icon class="leftback" name="arrow-left" />
+        <!-- <van-icon @click="back" class="leftback" name="arrow-left" /> -->
         <image mode="widthFix" class="bg" :show-menu-by-longpress="true" src="https://ct.zzxcx.net/ctjk/mp-wx/careGzh/care.png"></image>
         <image mode="widthFix" :show-menu-by-longpress="true" class="hand" src="https://ct.zzxcx.net/ctjk/mp-wx/careGzh/hand.gif"></image>
     </div>
@@ -8,6 +8,12 @@
 
 <script>
     export default {
+        methods: {
+            back() {
+                uni.navigateBack()
+                
+            }
+        },
         
     }
 </script>

src/pages/user/index.vue

@@ -61,7 +61,10 @@
 
       <!-- #endif -->
     </div>
-
+    <view class="wxad">
+      <ad ad-type="video" :ad-intervals="100" unit-id="adunit-8eb44bbd7e3147d4"></ad>
+    </view>
+   
     <!-- <view class="ad-box serviceBox">
 			<ad unit-id="adunit-d8c1548cc9663765"></ad>
 		</view> -->
@@ -146,7 +149,7 @@ export default {
 <style lang="scss" scoped>
 .user {
   background-color: #f2f3f5;
-
+ 
   /* height: 100vh; */
   .group {
     margin: 10px 0;