Merge branch 'Ztext1' of git.quantgroup.cn:ui/recruiting-management into Ztext1

src/page/login/update.vue

@@ -134,9 +134,9 @@ export default {
                 }
               updatePsd(params).then(res=>{
                   if(res.data.success==true){
-                    console.log(1234444)
                     this.ISIDMIN=res.data.body
                     localStorage.setItem('isADMIN',JSON.stringify(this.ISIDMIN))
+                    localStorage.setItem('token',res.data.body.token)
                     this.$router.replace({name:'allResume'})
                   }
                   if(res.data.body.code='101'){

src/page/upload/upload.vue

@@ -246,7 +246,7 @@ import ajax from '../../service/ajax'
                             type: file.type,
                             size: file.size,
                             title:null,
-                            status: "normal"
+                            status: "active"
                         }
                         this.dataList.push(temp)
                         this.fileName += files[key].name + ';'
@@ -262,7 +262,7 @@ import ajax from '../../service/ajax'
                    this.$Notice.error({
                     title: '提示',
                     desc:  '请您选择文件在上传',
-                    duration:'2'
+                    duration:2
                 });
                     return
                 }
@@ -270,7 +270,7 @@ import ajax from '../../service/ajax'
                    this.$Notice.error({
                       title: '提示',
                       desc:  '批量上传文件不能大于20份',
-                      duration:'2'
+                      duration:2
                     });
                     this.$refs.input.value = ''
                     this.fileName = ''
@@ -281,7 +281,7 @@ import ajax from '../../service/ajax'
                     this.$Notice.error({
                         title: '提示',
                         desc:  '单份文件不能大于2MB',
-                        duration:'2'
+                        duration:2
                     });
                     this.$refs.input.value = ''
                     this.fileName = ''
@@ -317,9 +317,21 @@ import ajax from '../../service/ajax'
                })
             },
             handleSuccess (res, files) {
-               let data = res.body
+              let data = res.body
               for(let key in data){
                   let code = data[key].code
+                  if (code == '900') {
+                    this.$Notice.error({render:(h) => {return h('div', {style: {
+                      paddingRight: '10px',
+                      fontSize: '14px',
+                      color: '#17233d'
+                    }}, '您的账号已在其他地方登录，如不是您个人操作，请及时修改密码')}})
+                    this.$router.replace({name: 'login'})
+                  }
+                  if (code == '902') {
+                    Notice.error({title:'cookie已失效，请重新登录'})
+                    this.$router.replace({name: 'login'})
+                  }
                   this.Code=data[key].code
                   this.Massage=data[key].message
                   this.dataList.map(item => {

src/service/ajax.js

@@ -63,8 +63,7 @@ export default function upload(option) {
     };
 
     xhr.open('post', action, true);
-
-    if (option.withCredentials && 'withCredentials' in xhr) {
+    if ('withCredentials' in xhr) {
         xhr.withCredentials = true;
     }
 
@@ -73,7 +72,7 @@ export default function upload(option) {
     if (headers['X-Requested-With'] !== null) {
       xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
     }
-
+   
     for (let item in headers) {
         if (headers.hasOwnProperty(item) && headers[item] !== null) {
             xhr.setRequestHeader(item, headers[item]);