登录

utils/api.js

@@ -1,14 +1,19 @@
 import request from './request.js'
 // 登录
 export const handLogin = (user, password) => request({
-	url:'api/aja/hand/handlogin',
-	// url:'api/pda/set/setPrint', // 测试接口
+	url:'mobile/auth/login',
 	data: {
-		user: user,
+		username: user,
 		password: password
 	}
 })
 
+// 测试状态码报错接口
+export const handRequest = () => request({
+	url:'getInfo/4',
+	data: {}
+})
+
 // 任务下发
 // 1.1查询所有区域信息
 export const handArea = (type) => request({

utils/request.js

@@ -16,6 +16,10 @@ const request = (params) => {
 	// 		data.token = '179509245-9c91827e0224bdc18d0b118b8be1b5af';
 	// 	}
 	// }
+	let token = ''
+	if (store.getters.saveToken !== '') {
+		token = store.getters.saveToken
+	}
 	let defaultOpot = {
 		// 'Content-Type': 'application/x-www-form-urlencoded',
 		'Terminal-Type': 'innerH5',
@@ -26,6 +30,7 @@ const request = (params) => {
 	if (method == 'POST') {
 		header = {
 			'Content-Type': 'application/json;charset=UTF-8',
+			'Authorization': token
 		}
 		// data = qs.stringify(data)
 	}
@@ -42,7 +47,19 @@ const request = (params) => {
 				dataType: 'json',
 			})
 			.then(res => { // 成功
-				if (res[1] && res[1].statusCode === 200) {
+				if (res.length === 1) {
+					uni.showModal({
+						content: 'request:fail',
+						showCancel: false
+					})
+					reject('request:fail')
+				} else if (res[1] && res[1].statusCode === 400) {
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
+					})
+					reject(res[1].data.message)
+				} else if (res[1] && res[1].statusCode === 200) {
 					let {
 						data: dataType
 					} = res[1]
@@ -83,11 +100,11 @@ const request = (params) => {
 					// 		break
 					// }
 				}else {
-					uni.showToast({
-						title: '网络错误',
-						icon: 'none'
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
 					})
-					reject(res[1].data.error)
+					reject(res[1].data.message)
 				}
 			})
 			.catch(err => { // 错误