diff --git a/src/components/noData.vue b/src/components/noData.vue
index 3829a7c..1bae13b 100644
--- a/src/components/noData.vue
+++ b/src/components/noData.vue
@@ -162,7 +162,7 @@
-
无数据
+ {{ msg }}
@@ -183,7 +183,7 @@ export default {
data() {
return {}
},
- props: [],
+ props: ['msg'],
// computed: mapState([
// 'itemNum', //第几题
diff --git a/src/main.js b/src/main.js
index 5e16759..59acb8d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -25,7 +25,7 @@ router.beforeEach((to,from,next)=>{
var apikey = to.query.apikey
var userId = to.query.userId
-
+ var userType = to.query.userType
if (apikey){
setStore('apikey',apikey)
@@ -37,6 +37,12 @@ router.beforeEach((to,from,next)=>{
console.log(userId)
}
+
+ if (userType){
+ setStore('userType',userType)
+ console.log(userType)
+ }
+
if (apikey){
@@ -44,6 +50,10 @@ router.beforeEach((to,from,next)=>{
if (userId){
delete to.query.userId
}
+ if (userType){
+ delete to.query.userType
+ }
+
next({
path:to.path,
query:{...to.query}
diff --git a/src/utils/mUtils.js b/src/utils/mUtils.js
index b4fc3e9..a84345b 100644
--- a/src/utils/mUtils.js
+++ b/src/utils/mUtils.js
@@ -1,3 +1,6 @@
+import Md5 from "crypto-js/md5";
+
+
/**
* 存储localStorage
*/
@@ -274,3 +277,61 @@ export const animate = (element, target, duration = 400, mode = 'ease-out', call
})
}, 20);
}
+
+
+
+
+export const processReuestData =(data)=>{
+
+ // 发请求前 业务处理
+
+
+
+ // 设置公共报文逻辑
+
+ let time = Date.parse(new Date());
+ let keys = ["apikey", "sign", "time"];
+
+ for (const keysKey in data) {
+ keys.push(keysKey);
+ }
+
+ data.isTest = 1;
+
+ //
+ let key1 = keys.sort();
+ let key2 = key1.join("&");
+ let key3 = key2 + "&" + time + "&" + "HuaTeng987!@#";
+ // console.log(key3)
+
+ // console.log(data)
+
+ let sign = Md5(key3).toString();
+
+ //
+ let apikey = getStore("apikey");
+
+ if (apikey !== null) {
+ data.apikey = apikey;
+ } else {
+ data.apikey = "HT_6d671a62c1d668161552616453";
+ }
+
+ console.log('apikey=='+data.apikey)
+
+ // userId
+ let userId = getStore("userId");
+
+ if (userId !== null) {
+ data.userId = userId;
+ }
+
+
+ // 参数
+ data.sign = sign;
+ data.time = time;
+
+
+ return data
+
+ }
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index f2cb208..3058ea9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -123,6 +123,11 @@ export default async (options = { method: "GET" }) => {
headers: myheaders,
});
+
+ // code ==! 200 报错
+ if(res.data.code !== 200){
+ return new Promise((resolve,reject)=>reject(res.data.msg));
+ }
return new Promise((resolve,reject)=>resolve(res.data.data))
} catch (error) {
diff --git a/src/views/Book.vue b/src/views/Book.vue
index 193d8c9..2e3ef43 100644
--- a/src/views/Book.vue
+++ b/src/views/Book.vue
@@ -35,6 +35,7 @@
@settingChange="settingChange"
:action = "action"
:headers = "headers"
+ :data = "extradata"
:isShowTeacherResource="true"
:continueReading="true"
:basisPath="basisPath"
@@ -43,7 +44,7 @@
/>
-
+
@@ -52,6 +53,7 @@