lrf преди 1 месец
родител
ревизия
7297d9541d
променени са 5 файла, в които са добавени 23 реда и са изтрити 7 реда
  1. 11 0
      README.md
  2. 6 6
      src/layout/index/mainData.vue
  3. 1 0
      src/main.js
  4. 4 1
      src/util/axios-wrapper.js
  5. 1 0
      src/views/login.vue

+ 11 - 0
README.md

@@ -9,3 +9,14 @@ http://localhost:8001/login?openid=ocPqjswkUejZHq2ANriNrFFC7A3I&type=4
 学生入学二维码地址(绑定用):
 学生入学二维码地址(绑定用):
 http://jytz.jilinjobs.cn/api/train/auth?redirect_uri=http://jytz.jilinjobs.cn/student/bind&type=2
 http://jytz.jilinjobs.cn/api/train/auth?redirect_uri=http://jytz.jilinjobs.cn/student/bind&type=2
 
 
+http://jytz.jilinjobs.cn/api/train/auth?
+redirect_uri: 微信验证后前往的地址:
+type: 0:登录; 1,2:二维码绑定; 9:消息
+
+登录:
+  学生:http://jytz.jilinjobs.cn/api/train/auth?type=0&utype=4
+  班主任:http://jytz.jilinjobs.cn/api/train/auth?type=0&utype=1
+  教师:http://jytz.jilinjobs.cn/api/train/auth?type=0&utype=3
+
+http://jytz.jilinjobs.cn/api/train/auth?redirect_uri=http://jytz.jilinjobs.cn/student&type=0
+http://jytz.jilinjobs.cn/student/login?openid=ocPqjswkUejZHq2ANriNrFFC7A3I&type=4

+ 6 - 6
src/layout/index/mainData.vue

@@ -67,15 +67,15 @@ export default {
       this.$router.push({ path: 'teacherscore/index', query: { teaid: item.teaid, lessonid: item._id } });
       this.$router.push({ path: 'teacherscore/index', query: { teaid: item.teaid, lessonid: item._id } });
     },
     },
     getLocaltion(data) {
     getLocaltion(data) {
-      if (data.subname.includes('训练')) return _.get(this.classInfo, 'kzjhlocation', '');
-      if (data.subname.includes('交流')) return _.get(this.classInfo, 'jslocation', '');
-      if (data.subid) {
+      if (data && data.subname && data.subname.includes('训练')) return _.get(this.classInfo, 'kzjhlocation', '');
+      if (data && data.subname && data.subname.includes('交流')) return _.get(this.classInfo, 'jslocation', '');
+      if (data && data.subname && data.subid) {
         return _.get(this.classInfo, 'jslocation', '');
         return _.get(this.classInfo, 'jslocation', '');
-      } else if (data.subname.includes('报到') || data.subname.includes('开班')) {
+      } else if (data && data.subname && (data.subname.includes('报到') || data.subname.includes('开班'))) {
         return _.get(this.classInfo, 'kbyslocation', '');
         return _.get(this.classInfo, 'kbyslocation', '');
-      } else if (data.subname.includes('交流')) {
+      } else if (data && data.subname && data.subname.includes('交流')) {
         return _.get(this.classInfo, 'kzjhlocation', '');
         return _.get(this.classInfo, 'kzjhlocation', '');
-      } else if (data.subname.includes('午餐+休息') || data.subname.includes('晚餐')) {
+      } else if (data && data.subname && (data.subname.includes('午餐+休息') || data.subname.includes('晚餐'))) {
         return _.get(this.classInfo, 'yclocation', '');
         return _.get(this.classInfo, 'yclocation', '');
       }
       }
     },
     },

+ 1 - 0
src/main.js

@@ -22,3 +22,4 @@ new Vue({
   render: h => h(App),
   render: h => h(App),
 }).$mount('#app');
 }).$mount('#app');
 InitStomp();
 InitStomp();
+localStorage.setItem('dType','mobile')

+ 4 - 1
src/util/axios-wrapper.js

@@ -74,7 +74,10 @@ export default class AxiosWrapper {
       const axios = Axios.create({
       const axios = Axios.create({
         baseURL: this.baseUrl,
         baseURL: this.baseUrl,
       });
       });
-      axios.defaults.headers.common.Authorization = util.token;
+      // axios.defaults.headers.common.Authorization = util.token;
+      const user = sessionStorage.getItem('user');
+      axios.defaults.headers.common.Authorization = encodeURI(user);;
+      axios.defaults.headers.common.dtype = localStorage.getItem('dType');
       let res = await axios.request({
       let res = await axios.request({
         method: isNullOrUndefined(data) ? 'get' : 'post',
         method: isNullOrUndefined(data) ? 'get' : 'post',
         url,
         url,

+ 1 - 0
src/views/login.vue

@@ -22,6 +22,7 @@ export default {
       duration: 0,
       duration: 0,
     });
     });
     let token = this.$route.query.token;
     let token = this.$route.query.token;
+    console.log(token)
     if (token) {
     if (token) {
       let user = jwt.decode(token);
       let user = jwt.decode(token);
       sessionStorage.setItem('user', JSON.stringify(user));
       sessionStorage.setItem('user', JSON.stringify(user));