diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 582561b..ee5be77 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -10,6 +10,10 @@
{
"launchtype" : "local"
},
+ "mp-weixin" :
+ {
+ "launchtype" : "local"
+ },
"type" : "uniCloud"
}
]
diff --git a/components/columnChart/columnChart.vue b/components/columnChart/columnChart.vue
new file mode 100644
index 0000000..bdd9cbc
--- /dev/null
+++ b/components/columnChart/columnChart.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/columnChart/gaugeChart.vue b/components/columnChart/gaugeChart.vue
new file mode 100644
index 0000000..fae2508
--- /dev/null
+++ b/components/columnChart/gaugeChart.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config/api.js b/config/api.js
index c10e699..94d8df2 100644
--- a/config/api.js
+++ b/config/api.js
@@ -48,6 +48,8 @@ export const logOut = (data={}) => http.post('member/auth/logout', data, {custom
export const findQuestionList = (data) => http.post('questionWrong/findQuestionList', data,)
// 我的学习--天数、错题、收藏、考试记录、合格率
export const mystudy = (carType) => http.get(`mystudy/mystudy-${carType}`, )
+ // 模拟考试或者仿真考试统计
+ export const examStatistics = (data) => http.get(`mystudy/${data.examType}-examStatistics-${data.stepType}-${data.carType}`, )
// 模拟考试科目1或者4考试首页
@@ -63,8 +65,11 @@ export const logOut = (data={}) => http.post('member/auth/logout', data, {custom
// 模拟考试次数、通过率
export const idexExam = (data) => http.get(`idex/exam-${data.stepType}-${data.carType}`, )
// 获取行政区划下拉树列表
- export const treeSelect = (carType) => http.get(`/idex/treeSelect`, )
-
+ export const treeSelect = (carType) => http.get(`idex/treeSelect`, )
+ // 会员等级
+ export const memberGradelist = (carType) => http.get(`vip/memberGradelist-${carType}`, )
+ // 会员VIP之声
+ export const memberVoicePage = (data) => http.post(`vip/memberVoicePage`, data,)
diff --git a/config/request.js b/config/request.js
index 75fb3dd..190f371 100644
--- a/config/request.js
+++ b/config/request.js
@@ -6,6 +6,9 @@ let { H5_API, WX_API,httpPrefix } = setObj
// import md5 from 'js-md5'
let secretKey = '22d90e09d1374f0f9e4accd07d333e55'
+import { loginApi, } from '@/config/api.js'
+
+let num = 0
// 此vm参数为页面的实例,可以通过它引用vuex中的变量
@@ -51,7 +54,26 @@ let secretKey = '22d90e09d1374f0f9e4accd07d333e55'
if(data.code==401) {
console.log('报401的接口')
console.log(response.config.url)
- return uni.$u.toast('登录异常请退出重进')
+ // return false
+ if(num) return uni.$u.toast('登录异常,请回题库重进')
+ num ++
+ let loginInfo = uni.getStorageSync('loginInfo')
+ const res = await loginApi({
+ "type": loginInfo.type,
+ "username": loginInfo.phone,
+ })
+ res.data.phone = loginInfo.phone
+ res.data.type = loginInfo.type
+ uni.setStorageSync('loginInfo', res.data);
+ // num = 0
+ let obj = response.config
+ let method = obj.method.toLowerCase()
+ if(method=='get') {
+ return uni.$u.http[method](obj.url, {params: obj.params})
+ }else{
+ return uni.$u.http[method](obj.url, obj.data )
+ }
+
}
// 自定义参数
diff --git a/config/site.config.js b/config/site.config.js
index 3ad1b72..0f46f2c 100644
--- a/config/site.config.js
+++ b/config/site.config.js
@@ -1,11 +1,13 @@
const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM || 'h5';
// localIp = false
let obj = {
+ // H5_API: VUE_APP_PLATFORM === 'h5' ? 'http://question.ywxcw.cn' : '',//h5
H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理
- WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://www.lyjppt.com/',//非代理地址 不要忘记加/
+ WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://question.ywxcw.cn/',//非代理地址 不要忘记加/
website: 'http://192.168.1.37',
httpPrefix: 'api/',
- mapKey: 'IDZBZ-L5GCZ-EQXXA-ZR5K4-JTSXH-IQBLO',
+ // httpPrefix: 'questionapi/',
+ mapKey: 'P3EBZ-N2G3W-2X4RO-3YFCD-UBAV6-VCBYG',
// 支付测试地址
// preUrl: 'https://u8wbs.zyebank.cn/cem_ysb_u6/index.html',
// const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html'
@@ -16,4 +18,4 @@ let obj = {
export default obj
// http://123.6.232.1:8099/测试地址
// http://192.168.1.43:8318/本地地址
-//http://www.lyjppt.com/正式地址
+//http://question.ywxcw.cn/questionapi/正式地址
diff --git a/index.html b/index.html
index c3ff205..b40c8cb 100644
--- a/index.html
+++ b/index.html
@@ -16,5 +16,16 @@
+
+
+
+