From 0becab45282781f281ad5aa04202b83039ab275e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 14 四月 2023 17:42:08 +0800
Subject: [PATCH] 增加发运统计页面,修改websocket,增加消息推送

---
 api/publicInterface.js |   82 +++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/api/publicInterface.js b/api/publicInterface.js
index 92997f9..e850135 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -1,10 +1,12 @@
 // import {resolve} from "../unpackage/dist/dev/mp-weixin/common/vendor";
 // import login from "../pages/login/login";
 
-// const BaseUrl = "http://192.168.3.159:9999/";
-import {BaseUrl as wrBaseUrl} from '@/api/request.js'
-// const BaseUrl = "http://192.168.0.120:9999"
-const BaseUrl = "http://192.168.3.130:9999"
+
+import { BaseUrl as wrBaseUrl } from '@/api/request.js'
+const BaseUrl = 'http://192.168.31.14:9999'
+// const BaseUrl = "http://hesuancj.cn:9999"
+// const BaseUrl = 'https://mx.jzeg.cn:9095'
+// const BaseUrl = 'http://192.168.31.18:9999'
 
 // 鐧诲綍
 // function apiLogin({
@@ -59,9 +61,7 @@
 	carImg,
 	drivingImg
 }) {
-	uni.showLoading({
-		title: "鍔犺浇涓�..."
-	})
+	uni.showLoading({ title: '鍔犺浇涓�...' })
 	return new Promise((resolve, reject) => {
 		uni.request({
 			url: wrBaseUrl + '/wrzs/wx/bindWx',
@@ -79,18 +79,18 @@
 				drivingImg
 			},
 			header: {
-				"Authorization": 'Basic c29jaWFsOnNvY2lhbA==', //app:app
+				'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
 				'content-type': 'application/json',
-				"CLIENT_TOC": "Y",
-				"isToken": "false"
+				'CLIENT_TOC': 'Y',
+				'isToken': 'false'
 			},
-			success: (res) => {
-				uni.hideLoading();
+			success: res => {
+				uni.hideLoading()
 				resolve(res)
 			},
-			fail: (err) => {
-				console.log('閿欒', err);
-				uni.hideLoading();
+			fail: err => {
+				console.log('閿欒', err)
+				uni.hideLoading()
 				uni.showModal({
 					title: '鏈嶅姟鍣ㄩ敊璇�',
 					icon: null
@@ -110,8 +110,8 @@
 }) {
 	return new Promise((resolve, reject) => {
 		uni.request({
-			url: BaseUrl + "/admin/oauth2/token",
-			method: "POST",
+			url: BaseUrl + '/admin/oauth2/token',
+			method: 'POST',
 			data: {
 				username,
 				password,
@@ -119,18 +119,18 @@
 				scope
 			},
 			header: {
-				"Authorization": 'Basic c29jaWFsOnNvY2lhbA==', //app:app
+				'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
 				'content-type': 'application/x-www-form-urlencoded',
-				"CLIENT_TOC": "Y",
-				"isToken": "false"
+				'CLIENT_TOC': 'Y',
+				'isToken': 'false'
 			},
-			success: (res) => {
-				uni.hideLoading();
-				resolve(res.data);
+			success: res => {
+				uni.hideLoading()
+				resolve(res.data)
 			},
-			fail: (err) => {
-				console.log('閿欒', err);
-				uni.hideLoading();
+			fail: err => {
+				console.log('閿欒', err)
+				uni.hideLoading()
 				uni.showToast({
 					icon: 'none',
 					title: '鏈嶅姟鍣ㄩ敊璇�'
@@ -142,34 +142,30 @@
 
 
 // 寰俊灏忕▼搴忎竴閿櫥褰�
-function apiLoginWx({
-	code
-}) {
-	uni.showLoading({
-		title: '鍔犺浇涓�...'
-	})
+function apiLoginWx({ code }) {
+	uni.showLoading({ title: '鍔犺浇涓�...' })
 	return new Promise((resolve, reject) => {
 		uni.request({
 			url: BaseUrl + '/admin/oauth2/token',
-			method: "POST",
+			method: 'POST',
 			data: {
-				grant_type:'mobile',
-				mobile:`MINI@${code}`,
+				grant_type: 'mobile',
+				mobile: `MINI@${code}`,
 				code
 			},
 			header: {
-				"Authorization": 'Basic c29jaWFsOnNvY2lhbA==', //app:app
+				'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
 				'content-type': 'application/x-www-form-urlencoded',
-				"CLIENT_TOC": "Y",
-				"isToken": "false"
+				'CLIENT_TOC': 'Y',
+				'isToken': 'false'
 			},
-			success: (res) => {
-				uni.hideLoading();
+			success: res => {
+				uni.hideLoading()
 				resolve(res.data)
 			},
-			fail: (err) => {
-				console.log('閿欒', err);
-				uni.hideLoading();
+			fail: err => {
+				console.log('閿欒', err)
+				uni.hideLoading()
 				uni.showToast({
 					icon: 'none',
 					title: '鏈嶅姟鍣ㄩ敊璇�'

--
Gitblit v1.9.1