From 9569d59fb91bceea9ec390f91876f1872fe9f7a4 Mon Sep 17 00:00:00 2001 From: lvyuankang <1344032923@qq.com> Date: Tue, 17 Jun 2025 16:28:28 +0800 Subject: [PATCH] 1 --- qingdao_h5/src/App.vue | 4 +- qingdao_h5/src/config/index.js | 6 +- qingdao_h5/src/router/index.ts | 9 + qingdao_h5/src/views/home/Home.vue | 23 +- .../src/views/learningTips/learnTips.vue | 254 ++++++++++++++++++ qingdao_h5/src/views/online/index.vue | 49 +++- 6 files changed, 323 insertions(+), 22 deletions(-) create mode 100644 qingdao_h5/src/views/learningTips/learnTips.vue diff --git a/qingdao_h5/src/App.vue b/qingdao_h5/src/App.vue index 07a50c1..822268d 100644 --- a/qingdao_h5/src/App.vue +++ b/qingdao_h5/src/App.vue @@ -20,9 +20,9 @@ 首页 - + > 个人中心 diff --git a/qingdao_h5/src/config/index.js b/qingdao_h5/src/config/index.js index c3d8e56..c16618d 100644 --- 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", }, } \ No newline at end of file diff --git a/qingdao_h5/src/router/index.ts b/qingdao_h5/src/router/index.ts index 136aaeb..fff4cff 100644 --- 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", diff --git a/qingdao_h5/src/views/home/Home.vue b/qingdao_h5/src/views/home/Home.vue index 9ad9e24..0d13670 100644 --- a/qingdao_h5/src/views/home/Home.vue +++ b/qingdao_h5/src/views/home/Home.vue @@ -99,10 +99,10 @@
{{ - state.classType.vehicleKindName + state.classType?state.classType.vehicleKindName:'' }}
- ￥{{ state.classType.price }} + ￥{{ state.classType?state.classType.price:'' }} @@ -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; diff --git a/qingdao_h5/src/views/learningTips/learnTips.vue b/qingdao_h5/src/views/learningTips/learnTips.vue new file mode 100644 index 0000000..ef24e1b --- /dev/null +++ b/qingdao_h5/src/views/learningTips/learnTips.vue @@ -0,0 +1,254 @@ + + + + + + diff --git a/qingdao_h5/src/views/online/index.vue b/qingdao_h5/src/views/online/index.vue index d5843de..9362f87 100644 --- a/qingdao_h5/src/views/online/index.vue +++ b/qingdao_h5/src/views/online/index.vue @@ -17,7 +17,6 @@ --> - @@ -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 } }); }, },