bug修改

utils/getData2.js

@@ -185,6 +185,7 @@ export const taskConfirm = (code1, code2) => request({
 // 查询未完成指令
 export const pdaInsts = (keyword, scode, ncode) => request({
 	url:'api/pda/insts',
+	acsurl: true,
 	data: {
 		keyword: keyword,
 		start_devicecode: scode,
@@ -195,6 +196,7 @@ export const pdaInsts = (keyword, scode, ncode) => request({
 // 指令操作
 export const pdaInst = (type, uuid) => request({
 	url:'api/pda/inst',
+	acsurl: true,
 	data: {
 		type: type,
 		inst_uuid: uuid

utils/mork2.js

@@ -1,3 +1,12 @@
+export const handLogin = (user, password) => {
+	let res = {
+		user: {
+			user: {username: 'admin'},
+		},
+		token: 'abcd'
+	}
+	return res
+}
 export const getVehicleType = () => {
 	let res = [
     {
@@ -63,6 +72,13 @@ export const queryVehicleGroup = () => {
 return res
 }
 
+export const groupLink = (arr) => {
+	let res = {
+    "message": "tempor elit adipisicing cillum nisi"
+	}
+	return res
+}
+
 export const pdaPrintf = (code) => {
 	let res = {
 	  "vehicle_code": "91",

utils/request.js

@@ -5,17 +5,7 @@ const request = (params) => {
 	let url = params.url;
 	let method = params.method || 'POST';
 	let data = params.data || {};
-	// data.token = "default-access_token"
-	// if (!params.token) {
-	// 	let token = uni.getStorageSync('token');
-	// 	if (!token) {
-	// 		uni.navigateTo({
-	// 			url: '/pages/login/login'
-	// 		});
-	// 	} else {
-	// 		data.token = '179509245-9c91827e0224bdc18d0b118b8be1b5af';
-	// 	}
-	// }
+	let acsurl = params.acsurl
 	let token = ''
 	if (store.getters.saveToken !== '') {
 		token = store.getters.saveToken
@@ -34,7 +24,10 @@ const request = (params) => {
 		}
 		// data = qs.stringify(data)
 	}
-	const requestUrl = `${store.getters.baseUrl}/` + url;
+	let requestUrl  = `${store.getters.baseUrl}/` + url;
+	if (acsurl) {
+		requestUrl = `${store.getters.acsUrl}/` + url;
+	}
 	uni.showLoading({
 		title: '加载中...'
 	});