diff --git a/src/App.vue b/src/App.vue index a9e2ed3..e4e35a8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,8 +2,8 @@
diff --git a/src/components/noData.vue b/src/components/noData.vue new file mode 100644 index 0000000..3829a7c --- /dev/null +++ b/src/components/noData.vue @@ -0,0 +1,209 @@ + + + + + diff --git a/src/main.js b/src/main.js index 73f720a..5e16759 100644 --- a/src/main.js +++ b/src/main.js @@ -20,18 +20,43 @@ Vue.config.productionTip = false Vue.use(XML) router.beforeEach((to,from,next)=>{ - var apikey = to.query.apikey + + var apikey = to.query.apikey + var userId = to.query.userId + + if (apikey){ setStore('apikey',apikey) console.log(apikey) } + + if (userId){ + setStore('userId',userId) + console.log(userId) + } + + if (apikey){ + + + delete to.query.apikey + if (userId){ + delete to.query.userId + } + next({ + path:to.path, + query:{...to.query} + }) + return + } + console.log(to) console.log(from) next() }) + new Vue({ router, store, diff --git a/src/service/getData.js b/src/service/getData.js index 94b4fa3..4fc2025 100644 --- a/src/service/getData.js +++ b/src/service/getData.js @@ -15,385 +15,220 @@ if (1) //线上黄精 } +// 书籍信息 +var bookinfo ={ + category : (params) =>{ + return request({ + url: `${prefix}/smile/local_view_catalog`, + method: 'GET', + data: params, + }) + }, + detail : (params) =>{ + return request({ + url: `${prefix}/smile/local_view_detail`, + method: 'GET', + data: params, + }) + }, + data : (params) =>{ + return request({ + url: `${prefix}/smile/local_view_data`, + method: 'GET', + data: params, + }) + }, +} + +// 笔记 + +var note = { + list : (params) =>{ + return request({ + url: `${prefix}/smile/listNote`, + method: 'GET', + data: params, + }) + }, + + + add : (params) =>{ + return request({ + url: `${prefix}/smile/addNote`, + method: 'POST', + data: params, + }) + }, + + edit : (params) =>{ + return request({ + url: `${prefix}/smile/editNote`, + method: 'POST', + data: params, + }) + }, + + delete : (params) =>{ + return request({ + url: `${prefix}/smile/deleteNote`, + method: 'POST', + data: params, + }) + }, + + +} + +// 书签 + +var bookmark = { + list : (params) =>{ + return request({ + url: `${prefix}/smile/bookmark/list`, + method: 'GET', + data: params, + }) + }, + + + add : (params) =>{ + return request({ + url: `${prefix}/smile/bookmark/store`, + method: 'POST', + data: params, + }) + }, + + edit : (params) =>{ + return request({ + url: `${prefix}/smile/bookmark/edit`, + method: 'POST', + data: params, + }) + }, + + delete : (params) =>{ + return request({ + url: `${prefix}/smile/bookmark/del`, + method: 'POST', + data: params, + }) + }, + + +} + + +// 高亮 + +var highlight = { + list : (params) =>{ + return request({ + url: `${prefix}/smile/highlightList`, + method: 'GET', + data: params, + }) + }, + + + add : (params) =>{ + return request({ + url: `${prefix}/smile/addHighlight`, + method: 'POST', + data: params, + }) + }, + + delete : (params) =>{ + return request({ + url: `${prefix}/smile/deleteHighlight`, + method: 'POST', + data: params, + }) + }, + + +} + +// 授课 +var resource ={ + list : (params) =>{ + return request({ + url: `${prefix}/smile/resourcesList`, + method: 'GET', + data: params, + }) + }, + + + add : (params) =>{ + return request({ + url: `${prefix}/smile/addResources`, + method: 'POST', + data: params, + }) + }, + + edit : (params) =>{ + return request({ + url: `${prefix}/smile/editResources`, + method: 'POST', + data: params, + }) + }, + + delete : (params) =>{ + return request({ + url: `${prefix}/smile/deleteResource`, + method: 'POST', + data: params, + }) + }, + + downloadFile: (params) =>{ + return request({ + url: `${prefix}/smile/downloadFile`, + method: 'POST', + data: params, + }) + } + +} + +// 存储用户的一些数据 +var userAction = { + //更新阅读进度 + updateReadLocation : (params) =>{ + return request({ + url: `${prefix}/smile/updateReadLocation`, + method: 'POST', + data: params, + }) + }, + //更新阅读进度 + getReadLocation : (params) =>{ + return request({ + url: `${prefix}/smile/getReadLocation`, + method: 'GET', + data: params, + }) + }, + +} + + + +export var bookApi ={ + bookinfo, + note, + bookmark, + highlight, + resource, + userAction +} + + // htzgks/get_qualification_list - -// 资格考试种类列表 小学，幼儿园 -export const getqualification_list = ( ) => { - - // var params ={tId,type}; - - - return request({ - url: `${prefix}/htzgks/get/qualification/listV2`, - method: 'POST', - data: {}, - }) -} -// return ajax("POST","/app_dev.php/api/htzgksmessage/get_zgksmessage_lists",data); - -// 消息列表 -export const getMessage= (tId='',type='1' ) => { - - var params ={tId,type}; - - - return request({ - url: `${prefix}/htzgksmessage/get_zgksmessage_lists`, - method: 'POST', - data: params, - }) -} - -// 获取资格考试列表 get_qualification_list - -export const get_qualification_list = () => { - - var params ={}; - - return request({ - url: `${prefix}/htzgks/get_qualification_list`, - method: 'POST', - data: params, - }) -} -// 获取分类 tId 资格考试id -export const get_category = (tId) => { - - var params ={tId}; - - return request({ - // url: `${prefix}/htzgks/get_category`, - url: `${prefix}/htzgks/get/categoryV2`, - - method: 'GET', - data: params, - }) -} - - -// 获取章节列表 catId 分类id - -export const get_zgkschapter_lists= (catId) => { - - var params ={catId}; - - return request({ - // url: `${prefix}/htzgkschapter/get_zgkschapter_lists`, - - url: `${prefix}/htzgkschapter/get/chapter/listsV2`, - - method: 'GET', - data: params, - }) - -} - - - -// 获取同步练习列表 - - -export const get_questions_list= (params)=>{ - - return request({ - // url: `${prefix}/htzgks/get_questions_list`, - url: `${prefix}/htzgks/get/questions/listV2`, - - - method: 'GET', - data: params, - }) - -} - - - -// 错题反馈 - - -export const feedback_wrong_ques= (params)=>{ - - - return request({ - url: `${prefix}/htzgks/feedback_wrong_ques_v2`, - method: 'POST', - data: params, - }) - -} - - -// 错题提交 - - -export const submit_wrong_questions= (params)=>{ - - // {"userId":1862,"catId":3,"tId":1,"chapterId":"","testpaperId":11,"quesData":[1,2,3,4,5,11,13,15]} - - var data = JSON.stringify(params); - - - params ={data} - - return request({ - // url: `${prefix}/htrealexercise/submit_wrong_questions`, - url: `${prefix}/htrealexercise/submit_wrong_questions_v2`, - method: 'POST', - data: params, - }) - -} - - -// 收藏 - - -export const set_collect= (userId ,quesId ,type,sub_ques)=>{ - - var params={ - userId, - quesId, - type, - sub_ques - }; - - return request({ - url: `${prefix}/htzgkscollect/set_collectV2`, - method: 'POST', - data: params, - }) - -} - - - - -// 获取试卷列表 catId 分类id - -export const get_testpaper_lists= (catId,page=1,pageSize=10) => { - - // var pageSize=2 - var params ={catId,page,pageSize}; - - return request({ - url: `${prefix}/htrealexercise/get_testpaper_lists`, - method: 'POST', - data: params, - }) - -} - - -// 获取试卷试题 - - -export const get_testpaper_questions= (params)=>{ - - - - - return request({ - url: `${prefix}/htrealexercise/get_testpaper_questions_v2`, - method: 'POST', - data: params, - }) - -} - - -// 我的收藏列表 -export const get_collect_category= (params)=>{ - return request({ - url: `${prefix}/htzgkscollect/get_collect_category`, - method: 'POST', - data: params, - }) -} -// 我的消息列表 -export const getMessage2= (type='2') => { - var params ={type}; - return request({ - url: `${prefix}/htzgksmessage/get_zgksmessage_lists`, - method: 'POST', - data: params, - }) -} -// 我的错题列表 -export const statistics_ques_log= (params)=>{ - return request({ - url: `${prefix}/htzgks/statistics_ques_logV2`, - method: 'POST', - data: params, - }) -} - - - -// 我的错题列表 -export const get_wrong_questions_list= (params)=>{ - - // var params={ - // userId, - // id, - // catId, - // tId, - // type - // } - - - return request({ - url: `${prefix}/htzgks/get_wrong_questions_listV2`, - method: 'POST', - data: params, - }) -} - - -// 移除我的错题 remove_wrong_ques -export const remove_wrong_ques= (params)=>{ - return request({ - url: `${prefix}/htzgks/remove_wrong_ques`, - method: 'POST', - data: params, - }) -} - - -// 我的收藏 试题列表 get_collect_questions - -export const get_collect_questions= (params)=>{ - return request({ - url: `${prefix}/htzgkscollect/get_collect_questionsV2`, - method: 'POST', - data: params, - }) -} - - - -/* -tId 资格id -catId 分类id -chapterId 章节id -answersNum 用户答题数量 -correctRate 正确率 -*/ -// 练习 用户提交答题 set_answer_progress_practice -export const set_answer_progress_practice= (userId, tId,catId ,chapterId ,answersNum ,correctRate )=>{ - - - - const type =1 - var params ={ - userId, - tId, - catId, - chapterId, - answersNum, - correctRate, - type - } - - - params.type =1 - - return request({ - url: `${prefix}/htzgks/set_answer_progress`, - method: 'POST', - data: params, - }) - } - - - - - /* -tId 资格id -catId 分类id -testpaperId 章节id -score 分数 -useTime 用时 - -type 2真题演练，3模拟 -*/ - // 真题模拟 用户提交答题 答题进度 set_answer_progress_exame -export const set_answer_progress_exame= (userId, tId,catId,testpaperId, score,useTime ,type =2)=>{ - - var params ={ - userId, - tId, - catId, - testpaperId, - score, - useTime, - type - } - - return request({ - url: `${prefix}/htzgks/set_answer_progress`, - method: 'POST', - data: params, - }) - } - - - /* - -*/ - // 同步练习章节答题进度 get_chapter_progress_info -export const get_chapter_progress_info= (userId,chapterId)=>{ - - - var params ={ - userId, - chapterId - } - - return request({ - url: `${prefix}/htzgks/get_chapter_progress_info`, - method: 'POST', - data: params, - }) - } - - - - //type 2真题演练，3模拟 - - // 真题模拟，考试答题进度 get_testpaper_progress -export const get_testpaper_progress= (userId,testpaperId,type=2)=>{ - - var params ={ - userId, - testpaperId, - type - } - - return request({ - url: `${prefix}/htzgks/get_testpaper_progress`, - method: 'POST', - data: params, - }) - } - - - - - - // 获取用户答题列表 get_answer_log -export const get_answer_log= (userId,tId)=>{ - - var params ={ - userId, - tId - } - - return request({ - url: `${prefix}/htzgks/get_answer_log`, - method: 'POST', - data: params, - }) - } diff --git a/src/store/index.js b/src/store/index.js index 332b916..9d5e550 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,10 +1,12 @@ import Vue from 'vue' import Vuex from 'vuex' +import { bookApi } from '../service/getData' Vue.use(Vuex) export default new Vuex.Store({ state: { + book:{}, }, mutations: { }, diff --git a/src/utils/request.js b/src/utils/request.js index 6a85d14..f2cb208 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -45,6 +45,7 @@ export default async (options = { method: "GET" }) => { } // 发请求前 业务处理 + var data = options.data; // 设置公共报文逻辑 @@ -58,7 +59,7 @@ export default async (options = { method: "GET" }) => { data.isTest = 1; - // debugger + // let key1 = keys.sort(); let key2 = key1.join("&"); let key3 = key2 + "&" + time + "&" + "HuaTeng987!@#"; @@ -68,7 +69,7 @@ export default async (options = { method: "GET" }) => { let sign = Md5(key3).toString(); - + // let apikey = getStore("apikey"); if (apikey !== null) { @@ -78,6 +79,15 @@ export default async (options = { method: "GET" }) => { } console.log('apikey=='+data.apikey) + + // userId + let userId = getStore("userId"); + + if (userId !== null) { + data.userId = userId; + } + + // 参数 data.sign = sign; data.time = time; @@ -100,8 +110,9 @@ export default async (options = { method: "GET" }) => { mydata = formData; } - // debugger + // try { + console.log(options.url) const res = await axios({ method: options.method, @@ -112,8 +123,9 @@ export default async (options = { method: "GET" }) => { headers: myheaders, }); - return res.data; + return new Promise((resolve,reject)=>resolve(res.data.data)) } catch (error) { + if (axios.isAxiosError(error)) { if (error.response) { // 请求已发出，服务器响应了状态码，但状态码不在 2xx 范围内 diff --git a/src/views/Book.vue b/src/views/Book.vue index 178ee7e..193d8c9 100644 --- a/src/views/Book.vue +++ b/src/views/Book.vue @@ -1,5 +1,6 @@