Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/common/http.interceptor.js

@@ -55,6 +55,10 @@ const install = (Vue, vm) => {
 		config.header['x-requested-with'] = 'xmlhttprequest';
 		return config;
 	}
+	/**
+	 *后台返回的结构有 {header: ', data: {data: 数据 ,message:'', code: ''}', message:'', code: ''}或{header: ', data: 数据, message:'', code: ''}
+	 *code有statusCode、code
+	 */
 	function getCode(res){
 		const result = res.data || res
 		// let code
@@ -65,16 +69,26 @@ const install = (Vue, vm) => {
 		// }
 		return result.statusCode || result.code || res.statusCode || res.code
 	}
+	/**
+	 *后台返回的结构有 {header: ', data: {data: 数据 ,message:'', code: ''}', message:'', code: ''}或{header: ', data: 数据, message:'', code: ''}
+	 *message有errMsg、message
+	 */
 	function getMsg(res){
-		res = res.data || res
-		let msg = res.message || res.errMsg
+		const result = res.data || res
+		let msg = result.message || result.errMsg || res.message || res.errMsg 
 		if(res.code == 200 || res.status == true || msg) {
 			return msg
 		}
 		return msg || '请求错误'
 	}
+	/**
+	 *后台返回的结构有 {header: ', data: {data: 数据 ,message:'', code: ''}', message:'', code: ''}或{header: ', data: 数据, message:'', code: ''}
+	 *message有errMsg、message
+	 *code有statusCode、code
+	 */
 	// 响应拦截，判断状态码是否通过
 	Vue.prototype.$u.http.interceptor.response = (res) => {
+		console.log(res)
 		let result = res.data || res;
 		let msg = getMsg(res)
 		//返回__token__,设置
@@ -88,8 +102,7 @@ const install = (Vue, vm) => {
 				// return result;
 			case 200:
 				return {
-					// data:result.data == null  ? result : result.data, // result.data的值为0， false, ''的时候也要算有值
-					data:result.data,
+					data:result.data == null ? result : result.data, // result.data的值为0， false, ''的时候也要算有值
 					code:code,
 					message:msg
 				};
@@ -105,7 +118,7 @@ const install = (Vue, vm) => {
 				// return result;				
 			default:
 				return {
-					data:result,
+					data:result.data == null ? result : result.data,
 					code:code,
 					message:msg
 				};