nlpower

utils/getData02.js

@@ -0,0 +1,54 @@
+import request from './request02.js'
+
+
+/**
+ * 指令管理
+ */
+// 1.1 查询未完成指令(生成任务号为-开头)
+export const handInsts = (key, scode, ncode) => request({
+	url:'api/hand/insts',
+	data: {
+		keyword: key,
+		start_devicecode: scode,
+		next_devicecode: ncode
+	}
+})
+// 1.2 指令操作
+export const handInst = (type, id) => request({
+	url:'api/hand/inst',
+	data: {
+		type: type,
+		inst_uuid: id
+	}
+})
+/**
+ * 任务管理
+ */
+// 1.1 1.1 查询无指令的任务（任务号为-开头）
+export const handTasks = (key, scode, ncode) => request({
+	url:'api/hand/tasks',
+	data: {
+		keyword: key,
+		start_devicecode: scode,
+		next_devicecode: ncode
+	}
+})
+// 1.2 任务操作
+export const handTaskoperation = (type, id) => request({
+	url:'api/hand/taskoperation',
+	data: {
+		type: type,
+		task_uuid: id
+	}
+})
+
+/**
+ * 托盘号补录--c
+ */
+export const handRecord = (st, mt) => request({
+	url:'api/hand/record',
+	data: {
+		sub_tray: st,
+		mother_tray: mt
+	}
+})

utils/getData1.js

@@ -0,0 +1,88 @@
+import request from './request.js'
+
+/**
+ * 公共接口
+ */
+// 查询区域
+export const regionSearch = () => request({
+	url:'api/pda/region',
+	data: {}
+})
+
+// 根据区域查询点位
+export const pointSearch = (rcode, pcode) => request({
+	url:'api/pda/point',
+	data: {
+        region_code: rcode,
+        point_code: pcode
+    }
+})
+
+// 查询各点位物料状态
+export const dwztSearch = (rcode) => request({
+	url:'api/pda/dwzt',
+	data: {
+        region_code: rcode
+    }
+})
+
+/**
+ * 原材料入库
+ */
+// 原材料入库
+export const yclrk = (spoint, stray, mtray, weight) => request({
+	url:'api/pda/yclrk',
+	data: {
+        start_point: spoint,
+        sub_tray: stray,
+        mother_tray: mtray,
+        weight: weight
+    }
+})
+
+/**
+ * 原材料出库
+ */
+// 原材料出库
+export const yclck = (spoint, mode, time, wcode) => request({
+	url:'api/pda/yclck',
+	data: {
+        start_point: spoint,
+        mode: mode,
+        time: time,
+        workorder_code: wcode
+    }
+})
+
+/**
+ * 搬运任务
+ */
+// 搬运任务
+export const taskCarry = (spoint, npoint) => request({
+	url:'api/pda/task',
+	data: {
+        start_point: spoint,
+        next_point: npoint,
+    }
+})
+
+/**
+ * 组盘解绑
+ */
+// 组盘解绑
+export const zpjb = (stray, mtray) => request({
+	url:'api/pda/zpjb',
+	data: {
+        sub_tray: stray,
+        mother_tray: mtray
+    }
+})
+
+/**
+ * 异常出库
+ */
+// 废包材位异常出库
+export const ycck = () => request({
+	url:'api/pda/ycck',
+	data: {}
+})

utils/getData2.js

@@ -0,0 +1,138 @@
+import request from './request.js'
+import request1 from './request1.js'
+
+// 版本更新测试
+export const pdaUpdate = () => request({
+	url:'api/pda/update'
+})
+// export const pdaUpdate = () => {
+// 	let res = {
+// 		versionName: '1.0.1',
+// 		url: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk'
+// 	}
+// 	return res
+// }
+
+// 登录
+export const handLogin = (user, password) => request({
+	url:'mobile/auth/login',
+	data: {
+		username: user,
+		password: password
+	}
+})
+
+/**
+ * 人工排产
+ */
+// 工单
+// export const manualSortingOrders = () => request({
+// 	url:'api/pda/manualSorting/orders',
+// 	data: {}
+// })
+export const manualSortingOrders = () => {
+	let res = [
+    {
+        "workorder_code": "231117001",
+        "material_code": "ZJB",
+        "material_name": "正极板",
+        "workorder_status": "1",
+        "operator": null,
+        "create_name": "管理员",
+        "plan_qty": "1111",
+        "real_qty": "0"
+    },
+    {
+        "workorder_code": "231128002",
+        "material_code": "FJB",
+        "material_name": "负极板",
+        "workorder_status": "3",
+        "operator": null,
+        "create_name": "管理员",
+        "plan_qty": "2222",
+        "real_qty": "0"
+    },
+    {
+        "workorder_code": "231128003",
+        "material_code": "BFJB",
+        "material_name": "边负极板",
+        "workorder_status": "4",
+        "operator": 'admin',
+        "create_name": "管理员",
+        "plan_qty": "1111",
+        "real_qty": "0"
+    },
+    {
+        "workorder_code": "231212003",
+        "material_code": "BFJB",
+        "material_name": "边负极板",
+        "workorder_status": "1",
+        "operator": null,
+        "create_name": "管理员",
+        "plan_qty": "8989767",
+        "real_qty": "0"
+    }
+]
+	return res
+}
+// 开工
+export const productionScheduling = (code, user) => request({
+	url:'api/pda/manualSorting/productionScheduling',
+	data: {
+		workorder_code: code,
+		username: user
+	}
+})
+// 完工
+export const productionComplete = (code, user) => request({
+	url:'api/pda/manualSorting/productionComplete',
+	data: {
+		workorder_code: code,
+		username: user
+	}
+})
+
+/**
+ * 涂板线
+ */
+// 数据
+// export const coatedWireIntoStorageTaskShow = () => request({
+// 	url:'api/pda/manualSorting/coatedWireIntoStorageTaskShow',
+// 	data: {}
+// })
+export const coatedWireIntoStorageTaskShow = () => {
+	let res = [{"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"1","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"2","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"3","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"4","remark":"普涂线01对接位01"}]
+	return res
+}
+// 入库
+export const coatedWireIntoStorageTask = (code, qty) => request({
+	url:'api/pda/manualSorting/coatedWireIntoStorageTask',
+	data: {
+		point_code: code,
+		qty: qty
+	}
+})
+
+/**
+ * 物料库存
+ */
+// 物料下拉框
+// export const materialList = () => request({
+// 	url:'api/pda/materialList',
+// 	data: {}
+// })
+export const materialList = () => {
+	let res = [{"value":"BFJB","text":"边负极板"},{"value":"FJB","text":"负极板"},{"value":"ZJB","text":"正极板"}]
+	return res
+}
+// 根据物料获取库存数据
+// export const getInventoryMaterialInfo = (code) => request({
+// 	url:'api/pda/getInventoryMaterialInfo',
+// 	data: {
+// 		material_code: code
+// 	}
+// })
+export const getInventoryMaterialInfo = (code) => {
+	let res = [{"material_code":"FJB","material_name":"负极板","point_code":"01-09-01","point_name":"01排09列01层","vehicle_code":"T202312060006","vehicle_type":"1"}]
+	return res
+}

utils/jsencrypt.js

@@ -0,0 +1,12 @@
+import JSEncrypt from './jsencrypt2.js'
+let publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n' +
+	  '2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ==';
+function RSAencrypt(pas){
+	//实例化jsEncrypt对象
+	let jse = new JSEncrypt();
+	//设置公钥
+	jse.setPublicKey(publicKey);
+	return jse.encrypt(pas);
+}
+
+export {RSAencrypt}

utils/permission.js

@@ -0,0 +1,245 @@
+/// null = 未请求，1 = 已允许，0 = 拒绝|受限, 2 = 系统未开启
+
+var isIOS
+
+function album() {
+    var result = 0;
+    var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
+    var authStatus = PHPhotoLibrary.authorizationStatus();
+    if (authStatus === 0) {
+        result = null;
+    } else if (authStatus == 3) {
+        result = 1;
+    } else {
+        result = 0;
+    }
+    plus.ios.deleteObject(PHPhotoLibrary);
+    return result;
+}
+
+function camera() {
+    var result = 0;
+    var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
+    var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
+    if (authStatus === 0) {
+        result = null;
+    } else if (authStatus == 3) {
+        result = 1;
+    } else {
+        result = 0;
+    }
+    plus.ios.deleteObject(AVCaptureDevice);
+    return result;
+}
+
+function location() {
+    var result = 0;
+    var cllocationManger = plus.ios.import("CLLocationManager");
+    var enable = cllocationManger.locationServicesEnabled();
+    var status = cllocationManger.authorizationStatus();
+    if (!enable) {
+        result = 2;
+    } else if (status === 0) {
+        result = null;
+    } else if (status === 3 || status === 4) {
+        result = 1;
+    } else {
+        result = 0;
+    }
+    plus.ios.deleteObject(cllocationManger);
+    return result;
+}
+
+function push() {
+    var result = 0;
+    var UIApplication = plus.ios.import("UIApplication");
+    var app = UIApplication.sharedApplication();
+    var enabledTypes = 0;
+    if (app.currentUserNotificationSettings) {
+        var settings = app.currentUserNotificationSettings();
+        enabledTypes = settings.plusGetAttribute("types");
+        if (enabledTypes == 0) {
+            result = 0;
+            console.log("推送权限没有开启");
+        } else {
+            result = 1;
+            console.log("已经开启推送功能!")
+        }
+        plus.ios.deleteObject(settings);
+    } else {
+        enabledTypes = app.enabledRemoteNotificationTypes();
+        if (enabledTypes == 0) {
+            result = 3;
+            console.log("推送权限没有开启!");
+        } else {
+            result = 4;
+            console.log("已经开启推送功能!")
+        }
+    }
+    plus.ios.deleteObject(app);
+    plus.ios.deleteObject(UIApplication);
+    return result;
+}
+
+function contact() {
+    var result = 0;
+    var CNContactStore = plus.ios.import("CNContactStore");
+    var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
+    if (cnAuthStatus === 0) {
+        result = null;
+    } else if (cnAuthStatus == 3) {
+        result = 1;
+    } else {
+        result = 0;
+    }
+    plus.ios.deleteObject(CNContactStore);
+    return result;
+}
+
+function record() {
+    var result = null;
+    var avaudiosession = plus.ios.import("AVAudioSession");
+    var avaudio = avaudiosession.sharedInstance();
+    var status = avaudio.recordPermission();
+    console.log("permissionStatus:" + status);
+    if (status === 1970168948) {
+        result = null;
+    } else if (status === 1735552628) {
+        result = 1;
+    } else {
+        result = 0;
+    }
+    plus.ios.deleteObject(avaudiosession);
+    return result;
+}
+
+function calendar() {
+    var result = null;
+    var EKEventStore = plus.ios.import("EKEventStore");
+    var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
+    if (ekAuthStatus == 3) {
+        result = 1;
+        console.log("日历权限已经开启");
+    } else {
+        console.log("日历权限没有开启");
+    }
+    plus.ios.deleteObject(EKEventStore);
+    return result;
+}
+
+function memo() {
+    var result = null;
+    var EKEventStore = plus.ios.import("EKEventStore");
+    var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
+    if (ekAuthStatus == 3) {
+        result = 1;
+        console.log("备忘录权限已经开启");
+    } else {
+        console.log("备忘录权限没有开启");
+    }
+    plus.ios.deleteObject(EKEventStore);
+    return result;
+}
+
+
+function requestIOS(permissionID) {
+    return new Promise((resolve, reject) => {
+        switch (permissionID) {
+            case "push":
+                resolve(push());
+                break;
+            case "location":
+                resolve(location());
+                break;
+            case "record":
+                resolve(record());
+                break;
+            case "camera":
+                resolve(camera());
+                break;
+            case "album":
+                resolve(album());
+                break;
+            case "contact":
+                resolve(contact());
+                break;
+            case "calendar":
+                resolve(calendar());
+                break;
+            case "memo":
+                resolve(memo());
+                break;
+            default:
+                resolve(0);
+                break;
+        }
+    });
+}
+
+function requestAndroid(permissionID) {
+    return new Promise((resolve, reject) => {
+        plus.android.requestPermissions(
+            [permissionID],
+            function(resultObj) {
+                var result = 0;
+                for (var i = 0; i < resultObj.granted.length; i++) {
+                    var grantedPermission = resultObj.granted[i];
+                    console.log('已获取的权限：' + grantedPermission);
+                    result = 1
+                }
+                for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+                    var deniedPresentPermission = resultObj.deniedPresent[i];
+                    console.log('拒绝本次申请的权限：' + deniedPresentPermission);
+                    result = 0
+                }
+                for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+                    var deniedAlwaysPermission = resultObj.deniedAlways[i];
+                    console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
+                    result = -1
+                }
+                resolve(result);
+            },
+            function(error) {
+                console.log('result error: ' + error.message)
+                resolve({
+                    code: error.code,
+                    message: error.message
+                });
+            }
+        );
+    });
+}
+
+function gotoAppPermissionSetting() {
+    if (permission.isIOS) {
+        var UIApplication = plus.ios.import("UIApplication");
+        var application2 = UIApplication.sharedApplication();
+        var NSURL2 = plus.ios.import("NSURL");
+        var setting2 = NSURL2.URLWithString("app-settings:");
+        application2.openURL(setting2);
+        plus.ios.deleteObject(setting2);
+        plus.ios.deleteObject(NSURL2);
+        plus.ios.deleteObject(application2);
+    } else {
+        var Intent = plus.android.importClass("android.content.Intent");
+        var Settings = plus.android.importClass("android.provider.Settings");
+        var Uri = plus.android.importClass("android.net.Uri");
+        var mainActivity = plus.android.runtimeMainActivity();
+        var intent = new Intent();
+        intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+        intent.setData(uri);
+        mainActivity.startActivity(intent);
+    }
+}
+
+const permission = {
+    get isIOS(){
+        return typeof isIOS === 'boolean' ? isIOS : (isIOS = uni.getSystemInfoSync().platform === 'ios')
+    },
+    requestIOS: requestIOS,
+    requestAndroid: requestAndroid,
+    gotoAppSetting: gotoAppPermissionSetting
+}
+
+export default permission

utils/request.js

@@ -0,0 +1,127 @@
+// import qs from 'qs' // 处理data
+import store from '@/vuex/store'
+const request = (params) => {
+	let _self = this;
+	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 token = ''
+	if (store.getters.saveToken !== '') {
+		token = store.getters.saveToken
+	}
+	let defaultOpot = {
+		// 'Content-Type': 'application/x-www-form-urlencoded',
+		'Terminal-Type': 'innerH5',
+		'Content-Type': 'application/json;charset=UTF-8',
+	}
+	let header = {}
+	method = method.toUpperCase()
+	if (method == 'POST') {
+		header = {
+			'Content-Type': 'application/json;charset=UTF-8',
+			'Authorization': token
+		}
+		// data = qs.stringify(data)
+	}
+	const requestUrl = `${store.getters.baseUrl}/` + url;
+	uni.showLoading({
+		title: '加载中...'
+	});
+	return new Promise((resolve, reject) => {
+		uni.request({
+				url: requestUrl,
+				method: method,
+				header: Object.assign({}, defaultOpot, header),
+				data: data,
+				dataType: 'json',
+			})
+			.then(res => { // 成功
+				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 === 401) {
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
+					})
+					store.dispatch('delUserInfo', '')
+					uni.redirectTo({
+						url: '/pages/login/login'
+					})
+				} else if (res[1] && res[1].statusCode === 200) {
+					let {
+						data: dataType
+					} = res[1]
+					resolve(dataType)
+					// switch (dataType.code * 1) { // 拦截返回参数
+					// 	case 0:
+					// 		resolve(dataType)
+					// 		break;
+					// 	case 1003:
+					// 		uni.showModal({
+					// 			title: '登录已过期',
+					// 			content: '很抱歉，登录已过期，请重新登录',
+					// 			confirmText: '重新登录',
+					// 			success: function(res) {
+					// 				if (res.confirm) {
+					// 					uni.navigateTo({
+					// 						// 切记这儿需要哈pages.json保持一致；不能有.vue后缀
+					// 						url: '/pages/login/login'
+					// 					});
+					// 				} else if (res.cancel) {
+					// 					console.log('用户点击取消');
+					// 				}
+					// 			}
+					// 		})
+					// 		break;
+					// 	case -1:
+					// 		uni.showModal({
+					// 			title: '请求数据失败',
+					// 			content: '获取数据失败！',
+					// 			confirmText: '确定',
+					// 			showCancel: false,
+					// 			success: function(res) {
+					// 				if (res.confirm) {} else if (res.cancel) {
+					// 					console.log('用户点击取消');
+					// 				}
+					// 			}
+					// 		})
+					// 		break
+					// }
+				}else {
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
+					})
+					reject(res[1].data.message)
+				}
+			})
+			.catch(err => { // 错误
+				reject(err)
+			})
+			.finally(() => {
+				uni.hideLoading();
+			})
+	})
+}
+export default request

utils/request02.js

@@ -0,0 +1,127 @@
+// import qs from 'qs' // 处理data
+import store from '@/vuex/store'
+const request = (params) => {
+	let _self = this;
+	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 token = ''
+	if (store.getters.saveToken !== '') {
+		token = store.getters.saveToken
+	}
+	let defaultOpot = {
+		// 'Content-Type': 'application/x-www-form-urlencoded',
+		'Terminal-Type': 'innerH5',
+		'Content-Type': 'application/json;charset=UTF-8',
+	}
+	let header = {}
+	method = method.toUpperCase()
+	if (method == 'POST') {
+		header = {
+			'Content-Type': 'application/json;charset=UTF-8',
+			'Authorization': token
+		}
+		// data = qs.stringify(data)
+	}
+	const requestUrl = `${store.getters.acsUrl}/` + url;
+	uni.showLoading({
+		title: '加载中...'
+	});
+	return new Promise((resolve, reject) => {
+		uni.request({
+				url: requestUrl,
+				method: method,
+				header: Object.assign({}, defaultOpot, header),
+				data: data,
+				dataType: 'json',
+			})
+			.then(res => { // 成功
+				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 === 401) {
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
+					})
+					store.dispatch('delUserInfo', '')
+					uni.redirectTo({
+						url: '/pages/login/login'
+					})
+				} else if (res[1] && res[1].statusCode === 200) {
+					let {
+						data: dataType
+					} = res[1]
+					resolve(dataType)
+					// switch (dataType.code * 1) { // 拦截返回参数
+					// 	case 0:
+					// 		resolve(dataType)
+					// 		break;
+					// 	case 1003:
+					// 		uni.showModal({
+					// 			title: '登录已过期',
+					// 			content: '很抱歉，登录已过期，请重新登录',
+					// 			confirmText: '重新登录',
+					// 			success: function(res) {
+					// 				if (res.confirm) {
+					// 					uni.navigateTo({
+					// 						// 切记这儿需要哈pages.json保持一致；不能有.vue后缀
+					// 						url: '/pages/login/login'
+					// 					});
+					// 				} else if (res.cancel) {
+					// 					console.log('用户点击取消');
+					// 				}
+					// 			}
+					// 		})
+					// 		break;
+					// 	case -1:
+					// 		uni.showModal({
+					// 			title: '请求数据失败',
+					// 			content: '获取数据失败！',
+					// 			confirmText: '确定',
+					// 			showCancel: false,
+					// 			success: function(res) {
+					// 				if (res.confirm) {} else if (res.cancel) {
+					// 					console.log('用户点击取消');
+					// 				}
+					// 			}
+					// 		})
+					// 		break
+					// }
+				}else {
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
+					})
+					reject(res[1].data.message)
+				}
+			})
+			.catch(err => { // 错误
+				reject(err)
+			})
+			.finally(() => {
+				uni.hideLoading();
+			})
+	})
+}
+export default request

utils/request1.js

@@ -0,0 +1,126 @@
+import store from '@/vuex/store'
+const request1 = (params) => {
+	let _self = this;
+	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 token = ''
+	if (store.getters.saveToken !== '') {
+		token = store.getters.saveToken
+	}
+	let defaultOpot = {
+		// 'Content-Type': 'application/x-www-form-urlencoded',
+		'Terminal-Type': 'innerH5',
+		'Content-Type': 'application/json;charset=UTF-8',
+	}
+	let header = {}
+	method = method.toUpperCase()
+	if (method == 'POST') {
+		header = {
+			'Content-Type': 'application/json;charset=UTF-8',
+			'Authorization': token
+		}
+		// data = qs.stringify(data)
+	}
+	const requestUrl = url;
+	uni.showLoading({
+		title: '加载中...'
+	});
+	return new Promise((resolve, reject) => {
+		uni.request({
+				url: requestUrl,
+				method: method,
+				header: Object.assign({}, defaultOpot, header),
+				data: data,
+				dataType: 'json',
+			})
+			.then(res => { // 成功
+				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 === 401) {
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
+					})
+					store.dispatch('delUserInfo', '')
+					uni.redirectTo({
+						url: '/pages/login/login'
+					})
+				} else if (res[1] && res[1].statusCode === 200) {
+					let {
+						data: dataType
+					} = res[1]
+					resolve(dataType)
+					// switch (dataType.code * 1) { // 拦截返回参数
+					// 	case 0:
+					// 		resolve(dataType)
+					// 		break;
+					// 	case 1003:
+					// 		uni.showModal({
+					// 			title: '登录已过期',
+					// 			content: '很抱歉，登录已过期，请重新登录',
+					// 			confirmText: '重新登录',
+					// 			success: function(res) {
+					// 				if (res.confirm) {
+					// 					uni.navigateTo({
+					// 						// 切记这儿需要哈pages.json保持一致；不能有.vue后缀
+					// 						url: '/pages/login/login'
+					// 					});
+					// 				} else if (res.cancel) {
+					// 					console.log('用户点击取消');
+					// 				}
+					// 			}
+					// 		})
+					// 		break;
+					// 	case -1:
+					// 		uni.showModal({
+					// 			title: '请求数据失败',
+					// 			content: '获取数据失败！',
+					// 			confirmText: '确定',
+					// 			showCancel: false,
+					// 			success: function(res) {
+					// 				if (res.confirm) {} else if (res.cancel) {
+					// 					console.log('用户点击取消');
+					// 				}
+					// 			}
+					// 		})
+					// 		break
+					// }
+				}else {
+					uni.showModal({
+						content: res[1].data.message,
+						showCancel: false
+					})
+					reject(res[1].data.message)
+				}
+			})
+			.catch(err => { // 错误
+				reject(err)
+			})
+			.finally(() => {
+				uni.hideLoading();
+			})
+	})
+}
+export default request1

utils/utils.js

@@ -0,0 +1,39 @@
+/**
+ * yy-mm-dd
+ */
+export const dateFtt = date => {
+    if (date == null) {
+      return ''
+    }
+    let year = date.getFullYear()
+    let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+    let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+    return `${year}-${month}-${day}`
+  }
+  
+  /**
+   * yy-mm-dd hh:mm:ss
+   */
+  export const dateTimeFtt = date => {
+    if (date == null) {
+      return ''
+    }
+    let year = date.getFullYear()
+    let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+    let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+    let hh = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+    let mm = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+    let ss = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+    return `${year}-${month}-${day} ${hh}:${mm}:${ss}`
+  }
+  
+  /**
+   * 将字符串形式的日期转换成日期对象
+   */
+  export const dateNew = date => {
+    if (date === undefined || date === 'undefined') {
+      return new Date()
+    }
+    return new Date(Date.parse(date))
+  }
+