diff --git a/.env.development b/.env.development
index 5b6f2bd..7440985 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 金武联驾校
VITE_APP_ENV = 'development'
# 金武联驾校/开发环境
-VITE_APP_BASE_API = 'http://118.31.23.45:8888/'
+VITE_APP_BASE_API = 'https://jwl.ahduima.com/'
#
-VITE_WEB_BASE_URL = 'http://118.31.23.45:8888/'
+VITE_WEB_BASE_URL = 'https://jwl.ahduima.com'
diff --git a/.env.production b/.env.production
index 7f92d8e..a1f8f88 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 金武联驾校
VITE_APP_ENV = 'production'
# 金武联驾校/开发环境
-VITE_APP_BASE_API = 'https://i.equ-tech.com/zongheng-api/'
+VITE_APP_BASE_API = 'https://jwl.ahduima.com/'
#
-VITE_WEB_BASE_URL = 'https://i.equ-tech.com/zongheng'
+VITE_WEB_BASE_URL = 'https://jwl.ahduima.com'
diff --git a/src/jtools/api/question.js b/src/jtools/api/question.js
index e521426..e41c896 100644
--- a/src/jtools/api/question.js
+++ b/src/jtools/api/question.js
@@ -1,11 +1,11 @@
import request from '../request/index.js';
-
export function queryQuestion(data) {
return request({
url: 'driver-api/tdQuestion/queryQuestion',
method: 'POST',
data,
+ noToken: true
});
}
@@ -13,7 +13,7 @@ export function questionCategory(data) {
return request({
url: 'driver-api/tdQuestion/questionCategory',
method: 'POST',
- data,
+ data
});
}
@@ -21,7 +21,7 @@ export function getTestQuestion(data) {
return request({
url: 'driver-api/tdQuestion/getTestQuestion',
method: 'POST',
- data,
+ data
});
}
@@ -29,7 +29,7 @@ export function submitTest(data) {
return request({
url: 'driver-api/tdQuestionTest/testSubmit',
method: 'POST',
- data,
+ data
});
}
@@ -37,15 +37,15 @@ export function testTotal(data) {
return request({
url: 'driver-api/tdQuestionTest/testTotal',
method: 'POST',
- data,
+ data
});
}
//获取配置
-export function querySysConfigList(carTypeId,configKey) {
+export function querySysConfigList(carTypeId, configKey) {
return request({
- url: 'driver-api/tdSysConfigList/querySysConfigList?configKey='+configKey+'&carTypeId='+carTypeId,
- method: 'GET',
+ url: 'driver-api/tdSysConfigList/querySysConfigList?configKey=' + configKey + '&carTypeId=' + carTypeId,
+ method: 'GET'
});
}
@@ -53,7 +53,7 @@ export function querySysConfigList(carTypeId,configKey) {
export function queryProjectList(data) {
return request({
url: 'driver-api/tdTestProject/queryProjectList',
- method: 'POST',
- data,
+ method: 'POST',
+ data
});
}
diff --git a/src/jtools/api/vip.js b/src/jtools/api/vip.js
index 1df6e42..a792fcf 100644
--- a/src/jtools/api/vip.js
+++ b/src/jtools/api/vip.js
@@ -4,7 +4,7 @@ export function queryVip(data) {
return request({
url: 'driver-api/tdMember/queryUserMember',
method: 'POST',
- data,
+ data
});
}
@@ -13,5 +13,6 @@ export function getVipList(data) {
url: 'driver-api/tdMember/queryMember',
method: 'POST',
data,
+ noToken: true
});
-}
\ No newline at end of file
+}
diff --git a/src/jtools/store/question.js b/src/jtools/store/question.js
index ac374c7..c286ca8 100644
--- a/src/jtools/store/question.js
+++ b/src/jtools/store/question.js
@@ -21,8 +21,8 @@ const question = defineStore({
getOrderQuestion(val) {
queryQuestion({
carTypeId: this.currentCartype,
- subject: val,
- // questionIdList:[10982,10983,10985,10986]
+ // subject: val,
+ questionIdList:[10982,10983,10985,10986]
}).then(res => {
if (res.code == '0000') {
this.orderQuestion = res.data
diff --git a/src/pages/index/components/Subject1.vue b/src/pages/index/components/Subject1.vue
index d8241f0..56138ce 100644
--- a/src/pages/index/components/Subject1.vue
+++ b/src/pages/index/components/Subject1.vue
@@ -132,14 +132,26 @@
})
},
toVip(){
- uni.navigateTo({
- url:"/pages/index/videoVip"
- })
+ if(storage.get('token')){
+ uni.navigateTo({
+ url:"/pages/index/videoVip?subject="+this.subject
+ })
+ }else{
+ uni.navigateTo({
+ url:'/pages/login/login'
+ })
+ }
},
toClass(){
- uni.navigateTo({
- url:"/pages/questionBank/baseOperate"
- })
+ if(storage.get('token')){
+ uni.navigateTo({
+ url:"/pages/questionBank/baseOperate"
+ })
+ }else{
+ uni.navigateTo({
+ url:'/pages/login/login'
+ })
+ }
},
toAnswer(title,val) {
uni.navigateTo({
@@ -147,9 +159,15 @@
})
},
toExams(){
- uni.navigateTo({
- url:"/pages/questionBank/practiceExams?subject="+this.subject
- })
+ if(storage.get('token')){
+ uni.navigateTo({
+ url:"/pages/questionBank/practiceExams?subject="+this.subject
+ })
+ }else{
+ uni.navigateTo({
+ url:'/pages/login/login'
+ })
+ }
},
toExclusive(){
uni.navigateTo({
diff --git a/src/pages/index/components/Subject2.vue b/src/pages/index/components/Subject2.vue
index 3c4ccc4..63659d3 100644
--- a/src/pages/index/components/Subject2.vue
+++ b/src/pages/index/components/Subject2.vue
@@ -3,7 +3,7 @@
-
+
@@ -23,11 +23,19 @@
- 驾驶方法
-
-
- 基础操作讲解
- 操作方法精讲
+
+ 基础操作讲解
+
+ 全部
+
+
+
+
+
+
+ 上车、下车的方法
+ 上车、下车的方法
+
@@ -66,6 +74,7 @@ export default {
})
},
getVideoList(){
+ console.log(this.subject);
queryProjectList({
"carTypeId": storage.get('carType') || '1001',
"driveType": this.diverTypeList[this.diverTypeIndex].configItemCode,
@@ -133,4 +142,10 @@ export default {
background: linear-gradient(90deg, #11DF20 0%, #01B74F 100%);
color:#fff
}
+.pic{
+ width: 300rpx;
+ height: 169rpx;
+ background: #00B74F;
+ border-radius: 8rpx;
+ }
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 798d172..ebab377 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -8,7 +8,7 @@
-
+
@@ -54,6 +54,8 @@
this.getOrderQuestion('1')
}else if(this.tIndex==3){
this.getOrderQuestion('4')
+ }else{
+ this.$refs.subject2.getDiverType()
}
},
}
diff --git a/src/pages/index/paySuccess.vue b/src/pages/index/paySuccess.vue
index 359187b..45eb153 100644
--- a/src/pages/index/paySuccess.vue
+++ b/src/pages/index/paySuccess.vue
@@ -14,12 +14,16 @@