Merge branch 'dev' into ecollage

client/src/api/base_api.js

@@ -107,7 +107,7 @@ export default class API {
     const { data } = res
     /* 带 code 参数，新接口模型 */
     if (data.code !== undefined) {
-      if (data.code !== 0 && !/get-user-info$/gi.test(res.config.url)) {
+      if (data.code !== 0 && !/getinfo$/gi.test(res.config.url)) {
         data.msg && Message({ type: 'error', message: data.msg })
       }
     }
@@ -128,7 +128,7 @@ export default class API {
       const { status, data } = res.response
       /* 不带 code 参数，老接口模型 */
       if (data) {
-        if (status === 403 && !/check-access$/gi.test(res.config.url)) {
+        if (status === 403 && !/getinfo$/gi.test(res.config.url)) {
           this.setConfirm('提示', '确定', '登录状态已过期, 请重新登录。')
             .then(() => {
               this.goLoginIndex(_vIn)

client/src/api/other_api.js

@@ -29,7 +29,7 @@ export default class OtherAPI extends BaseAPI {
    * @param {[object]} obj
    */
   uploadFile = (obj = {}) =>
-    this.post('/api/usercenter/user/upload-image', obj, {
+    this.post('/api/lms/util/upload-file', obj, {
       headers: { 'Content-Type': 'multipart/form-data' }
     })
 

client/src/pages/other/updatePic.vue

@@ -57,7 +57,7 @@ export default {
         type: '',
         lastModifiedDate: '',
         size: '',
-        avatar: ''
+        file: ''
       },
       filesArr: []
     }
@@ -68,7 +68,7 @@ export default {
       this.file.type = file.raw.type
       this.file.lastModifiedDate = file.raw.lastModifiedDate
       this.file.size = file.raw.size
-      this.file.avatar = file.raw
+      this.file.file = file.raw
     },
     uploadFile() {
       if (!/\.(jpg|jpeg|gif|png|bmp)$/gi.test(this.file.name)) {
@@ -82,7 +82,7 @@ export default {
         spinner: '',
         background: 'rgba(255, 255, 255, 0.9)'
       })
-      action.Other.uploadFile({ image: this.file.avatar })
+      action.Other.uploadFile(this.file)
         .then(data => {
           this.imgUrl = data.url
           this.updateUser()