1

2025-06-17 16:28:28 +08:00 · 2025-06-17 16:28:28 +08:00 · 9569d59fb9
commit 9569d59fb9
parent 9dcfaf201d
6 changed files with 323 additions and 22 deletions
--- a/qingdao_h5/src/App.vue
+++ b/qingdao_h5/src/App.vue
@ -20,9 +20,9 @@
      <van-tabbar-item replace to="/home" icon="wap-home-o"
        >首页</van-tabbar-item
      >
-      <!-- <van-tabbar-item replace to="/red-black-list" icon="medal-o"
+      <van-tabbar-item replace to="/red-black-list" icon="medal-o"
        >红黑榜</van-tabbar-item
-      > -->
+      >
      <van-tabbar-item replace to="/personal-center" icon="manager-o"
        >个人中心</van-tabbar-item
      >
--- a/qingdao_h5/src/config/index.js
+++ b/qingdao_h5/src/config/index.js
@ -14,13 +14,13 @@
 export default {
    dev: {
        //baseUrl: "http://88.22.24.208:8081",
-        baseUrl: "https://qdrest.duolunxc.com/qdjx",
+        baseUrl: "https://qdjspx.qdjtcx.cn/qdjp-rest",
        h5Url: "http://88.22.10.102:8099",
        appId: "wxc52cee03ac4a9bc9",
    },
    prod: {
-        baseUrl: "https://qdrest.duolunxc.com/qdjx",
-        h5Url: "https://qdrest.duolunxc.com/qdjx_h5",
+        baseUrl: "https://qdjspx.qdjtcx.cn/qdjp-rest",
+        h5Url: "https://qdjspx.qdjtcx.cn/qdjp-rest/qdjp_h5",
        appId: "wxc52cee03ac4a9bc9",
    },
 }
--- a/qingdao_h5/src/router/index.ts
+++ b/qingdao_h5/src/router/index.ts
@ -108,6 +108,15 @@ const router = createRouter({
        title: "个人中心",
      },
    },
+    {
+      //学车指南
+      path: "/learnTips",
+      name: "learnTips",
+      component: () => import("../views/learningTips/learnTips.vue"),
+      meta: {
+        title: "学车指南",
+      },
+    },
    {
      //去评价
      path: "/evaluate",
--- a/qingdao_h5/src/views/home/Home.vue
+++ b/qingdao_h5/src/views/home/Home.vue
@ -99,10 +99,10 @@
            <div>
              <!-- <span class="publicity-subjcect">C1</span> -->
              <span class="publicity-course">{{
-                state.classType.vehicleKindName
+                state.classType?state.classType.vehicleKindName:''
              }}</span>
            </div>
-            <span class="publicity-price">￥{{ state.classType.price }}</span>
+            <span class="publicity-price">￥{{ state.classType?state.classType.price:'' }}</span>
          </div>
        </div>
      </div>
@ -261,7 +261,6 @@ export default {
      } else {
        state.coachList = [];
      }
-
      state.getSchoolList = await getAllSchoolList({
        params: {
          distructId: "",
@ -284,9 +283,11 @@ export default {

      state.classType =
        state.classTypeList.length > 0 ? state.classTypeList[0] : {};
-      state.schoolType = await getSchoolDetailById({
-        schoolId: state.classType.schoolId,
-      });
+        if(state.classType) {
+          state.schoolType = await getSchoolDetailById({
+            schoolId: state.classType.schoolId,
+          });
+        }

      state.loading = false;
    }
@ -303,10 +304,12 @@ export default {

      state.classType =
        state.classTypeList[classTypeIndex % state.getSchoolList.length];
-      state.schoolType = await getSchoolDetailById({
-        schoolId: state.classType.schoolId,
-        noCover: true,
-      });
+        if(state.classType) {
+          state.schoolType = await getSchoolDetailById({
+            schoolId: state.classType.schoolId,
+            noCover: true,
+          });
+        }

      let schoolStart = 4 * showSchoolIndex;

--- a/qingdao_h5/src/views/learningTips/learnTips.vue
+++ b/qingdao_h5/src/views/learningTips/learnTips.vue
@ -0,0 +1,254 @@
+<!--
+ * @Author: liucun-0626 1511974295@qq.com
+ * @Date: 2024-05-15 09:21:10
+ * @LastEditors: liucun-0626 1511974295@qq.com
+ * @LastEditTime: 2024-05-24 14:55:16
+ * @FilePath: \maanshan_h5\src\views\learningTips\index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div>
+    <van-tabs v-model:active="activeName" title-active-color="#e83743">
+      <van-tab
+        :title="item"
+        v-for="(item, index) in tabList"
+        :key="index"
+      ></van-tab>
+    </van-tabs>
+
+    <div class="titleBox">
+      <span>{{ showTitle }}</span
+      ><span>{{ tabList[activeName] }}</span>
+    </div>
+    <div v-html="showHtml" class="textBox" v-show="activeName != '4'"></div>
+    <div class="textBox" v-show="activeName == '4'">
+      <van-tabs v-model:active="activeName1" v-if="refreshTab">
+        <van-tab title="科目二" />
+        <van-tab title="科目三" />
+      </van-tabs>
+      <div v-html="showHtml1" class="textBox"></div>
+    </div>
+    <div class="bottomBtn">
+      <div class="btn preBtn" @click="changePage(0)">{{ preTitleName }}</div>
+      <div class="btn nextBtn" @click="changePage(1)">{{ nextTitleName }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      refreshTab: false,
+      activeName: 0,
+      activeName1: 0,
+      preTitleName: "返回",
+      nextTitleName: "下一步:体检面签",
+      tabList: [
+        "选择驾校",
+        "体检面签",
+        "报名缴费",
+        "理论学习",
+        "实操培训",
+        "安全文明",
+        "结业领证",
+      ],
+      showTitle: "第一步",
+      showHtml: "",
+      showHtml1: ""
+    };
+  },
+  watch: {
+    activeName1(newV, oldV) {
+      this.showHtml1 =
+        newV == "0"
+          ? '<div style="font-size: 16px;">科目二是场地驾驶技能考试科目的简称，科目二考试满分为100分，考试大型客车、牵引车、城市公交、中型客车、大型货车准驾车型的，成绩达到90分的为合格，其他准驾车型的成绩达到80分的为合格。</div>'
+          : '<div style="font-size: 16px;">科目三是道路驾驶技能和安全文明驾驶常识考试科目的简称。</div><div style="font-size: 16px; margin-top: 10px;">学员需要在驾校完成相应的道路驾驶技能培训，并且学时达标后才能参加考试。科目三道路驾驶技能和安全文明驾驶常识考试满分分别为100分，成绩分别达到90分的为合格。</div>';
+    },
+    activeName(newV, oldV) {
+      this.refreshTab = false;
+      this.preTitleName =
+        this.activeName == 0
+          ? "返回"
+          : `上一步:${this.tabList[this.activeName - 1]}`;
+      this.nextTitleName =
+        this.activeName == 6
+          ? "结束阅读"
+          : `下一步:${this.tabList[this.activeName + 1]}`;
+      this.showTitle =
+        this.activeName == 0
+          ? "第一步"
+          : this.activeName == 1
+          ? "第二步"
+          : this.activeName == 2
+          ? "第三步"
+          : this.activeName == 3
+          ? "第四步"
+          : this.activeName == 4
+          ? "第五步"
+          : this.activeName == 5
+          ? "第六步"
+          : "第七步";
+      this.getShowHtml();
+      if (newV == 4) {
+        setTimeout(() => {
+          this.refreshTab = true;
+        }, 10);
+      }
+    },
+  },
+  created() {
+    this.showHtml =
+      '<div style="font-size: 16px;">选择驾校时，应优先考虑培训资格、教学规模等因素<div>';
+    localStorage.setItem("ifReadTips", 1);
+    this.showHtml1 =
+      '<div style="font-size: 16px;">科目二是场地驾驶技能考试科目的简称，科目二考试满分为100分，考试大型客车、牵引车、城市公交、中型客车、大型货车准驾车型的，成绩达到90分的为合格，其他准驾车型的成绩达到80分的为合格。</div>';
+  },
+
+  methods: {
+    changePage(flag) {
+      if (flag == 0) {
+        if (this.activeName == 3 || this.activeName == 5) {
+          this.refreshTab = false;
+          setTimeout(() => {
+            this.refreshTab = true;
+          }, 10);
+        }
+        if (this.activeName == 0) {
+          //退出学车指南
+          this.$router.push({
+            path: "/onlineRegist",
+            query: {
+              busiStatus: window.userInfo.busiStatus,
+              agree: true,
+              schoolId: this.$route.query.schoolId,
+              packageId: this.$route.query.packageId,
+              signUpForOthers: this.$route.query.signUpForOthers,
+              coachId: this.$route.query.coachId,
+              vehicleId: this.$route.query.vehicleId,
+              learnSubjectType: this.$route.query.learnSubjectType,
+            },
+          });
+        } else {
+          this.activeName--;
+          this.preTitleName =
+            this.activeName == 0
+              ? "返回"
+              : `上一步:${this.tabList[this.activeName - 1]}`;
+          this.nextTitleName = `下一步:${this.tabList[this.activeName + 1]}`;
+        }
+      } else {
+        if (this.activeName == 3 || this.activeName == 5) {
+          this.refreshTab = false;
+          setTimeout(() => {
+            this.refreshTab = true;
+          }, 10);
+        }
+        if (this.activeName == 6) {
+          //完成学车指南退出
+          this.$router.push({
+            path: "/onlineRegist",
+            query: {
+              busiStatus: window.userInfo.busiStatus,
+              agree: true,
+              schoolId: this.$route.query.schoolId,
+              packageId: this.$route.query.packageId,
+              signUpForOthers: this.$route.query.signUpForOthers,
+              coachId: this.$route.query.coachId,
+              vehicleId: this.$route.query.vehicleId,
+              learnSubjectType: this.$route.query.learnSubjectType,
+            },
+          });
+        } else {
+          this.activeName++;
+          this.preTitleName = `上一步:${this.tabList[this.activeName - 1]}`;
+          this.nextTitleName =
+            this.activeName == 6
+              ? "结束阅读"
+              : `下一步:${this.tabList[this.activeName + 1]}`;
+        }
+      }
+      this.showTitle =
+        this.activeName == 0
+          ? "第一步"
+          : this.activeName == 1
+          ? "第二步"
+          : this.activeName == 2
+          ? "第三步"
+          : this.activeName == 3
+          ? "第四步"
+          : this.activeName == 4
+          ? "第五步"
+          : this.activeName == 5
+          ? "第六步"
+          : "第七步";
+      this.getShowHtml();
+    },
+    getShowHtml() {
+      if (this.activeName == 0) {
+        this.showHtml =
+          '<div style="font-size: 16px;">选择驾校时，应优先考虑培训资格、教学规模等因素。</div>';
+      } else if (this.activeName == 1) {
+        this.showHtml =
+          '<div style="font-size: 16px;">申领驾驶证需要进行体检和面签两个环节。在体检和面签过程中，应遵循相关法律法规，确保材料真实、有效，同时确保体检和面签的顺利进行。</div><div style="font-size: 16px; color: #ff8c8c; margin-top: 10px;">注:体检和面签可以在您报名的驾校一起完成，记得携带身份证。</div>';
+      } else if (this.activeName == 2) {
+        this.showHtml = `<div style="font-size: 16px;">报名缴费是申领驾驶证非常重要的一环，你可以在<青学驾>移动端上实现报名缴费！</div>`;
+      } else if (this.activeName == 3) {
+        this.showHtml = `<div style="font-size: 16px;">科目一，又称科目一理论考试、驾驶员理论考试，是机动车驾驶证考核的一部分。</div><div style="font-size: 16px;  margin-top: 10px;">科目一的远程教育学生需在驾校签约的计时服务商提供的远程教育平台进行学时打卡。</div><div style="font-size: 18px;  margin-top: 10px;">科目一考试满分为10分，成绩达到90分的为合格。</div>`;
+      } else if (this.activeName == 4) {
+        this.showHtml =
+          '<div style="font-size: 16px;">科目二是场地驾驶技能考试科目的简称，科目二考试满分为100分，考试大型客车、牵引车、城市公交、中型客车、大型货车准驾车型的，成绩达到90分的为合格，其他准驾车型的成绩达到80分的为合格。</div>';
+      } else if (this.activeName == 5) {
+        this.showHtml =
+          '<div style="font-size: 16px;">科目四是安全文明驾驶常识考试的简称。</div><div style="font-size: 16px;  margin-top: 10px;">学员完成科目一、科目二、科目三道路驾驶技能考试合格后，申请人可以当日参加科目四考试。</div>';
+      } else if (this.activeName == 6) {
+        this.showHtml =
+          '<div style="font-size: 16px;">申请人考试合格后，应当接受不少于半小时的交通安全文明驾驶常识和交通事故案例警示教育，并参加领证宣誓仪式。</div>';
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.textBox {
+  padding: 20px;
+  overflow: auto;
+  height: 77vh;
+}
+.bottomBtn {
+  position: fixed;
+  bottom: 20px;
+  display: flex;
+  font-size: 14px;
+  justify-content: center;
+  width: 100%;
+}
+.btn {
+  width: 40vw;
+  height: 36px;
+  text-align: center;
+  line-height: 36px;
+  color: #fff;
+  border: none;
+}
+.preBtn {
+  background-color: #5ba1e2;
+}
+.nextBtn {
+  background-color: #e83743;
+}
+.titleBox {
+  font-size: 16px;
+  font-weight: bold;
+  width: 100%;
+  text-align: center;
+  margin-top: 10px;
+  span {
+    margin: 0px 4px;
+  }
+}
+:deep(.van-tab--active) {
+  font-size: 16px !important;
+}
+</style>
--- a/qingdao_h5/src/views/online/index.vue
+++ b/qingdao_h5/src/views/online/index.vue
@ -17,7 +17,6 @@
                </div>
            </template> -->
    </container>
-    
    <van-dialog v-model:show="showDialog" title="报名预警" @confirm="dialogConfirm" :confirm-button-text="confirmText" :message="message" :allow-html="true" :confirm-button-disabled="confirmDisabled">
    </van-dialog>
  </div>
@ -65,14 +64,23 @@ export default {
      confirmDisabled: true,
      confirmText: '我已知晓',
      confirmTextTimer: null,
-      hideBtn: false
+      hideBtn: false,
+      ifShowTips: false
    };
  },
  unmounted() {
    clearTimeout(this.timer)
  },
  created() {
-
+    if (localStorage.getItem("ifReadTips") == null) {
+      localStorage.setItem("ifReadTips", 0);
+    }
+    if (localStorage.getItem("ifReadTips") == 1) {
+      this.ifShowTips = false;
+    } else {
+      this.ifShowTips = true;
+    }
+    
    this.userInfo = JSON.parse(JSON.stringify(window.userInfo));
    this.userInfo.signUpForOthers = Request('signUpForOthers');

@ -189,7 +197,7 @@ export default {
        clearTimeout(this.timer)
      }
    },
-    
+
    getSchoolPunishment() {
      querySchoolPunishment({
        schoolId: this.userInfo.schoolId
@ -222,8 +230,35 @@ export default {
          break;
        case 1:
          // if (this.agree) {
+          if (this.ifShowTips) {
+            this.$dialog
+              .confirm({
+                title: "提示",
+                message: "在您准备学车之前，建议您阅读或了解学车指南。这将有助于您更好的了解学车的流程和注意事项！",
+                confirmButtonText: "不用了，谢谢",
+                cancelButtonText: "去看看",
+              })
+              .then((res) => {
+                this.currentStep++;
+              })
+              .catch((fail) => {
+                //跳转学车指南页面
+                this.$router.push({
+                  path: "/learnTips",
+                  query: {
+                    schoolId: this.$route.query.schoolId,
+                    packageId: this.$route.query.packageId,
+                    signUpForOthers: this.$route.query.signUpForOthers,
+                    coachId: this.$route.query.coachId,
+                    vehicleId: this.$route.query.vehicleId,
+                    learnSubjectType: this.$route.query.learnSubjectType,
+                  },
+                });
+              });
+          } else {
+            this.currentStep++;
+          }
          this.buttonTip = "下一步";
-          this.currentStep++;
          // } else {
          //     this.toastTip("请认真阅读报名须知!");
          // }
@ -409,7 +444,7 @@ export default {
        this.$toast('该驾校未配置银行!');
        return
      }
-      
+
      let type = 1
      if (this.userInfo.schoolUseBankName.indexOf("平安") != -1) {
        type = 1;
@ -420,7 +455,7 @@ export default {

      this.$router.push({
        path: "payType",
-        query: { type: type, bankTypeId: this.userInfo.bankTypeId}
+        query: { type: type, bankTypeId: this.userInfo.bankTypeId }
      });
    },
  },