From 09c2ac7911db8993b6b435cb5af23fcf69c0fbe2 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 24 三月 2023 14:40:50 +0800
Subject: [PATCH] 增加货代详情

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

diff --git a/api/publicInterface.js b/api/publicInterface.js
index 54e06bf..cb9197f 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -2,78 +2,50 @@
 // import login from "../pages/login/login";
 
 // const BaseUrl = "http://192.168.3.159:9999/";
-import {BaseUrl as wrBaseUrl} from '@/api/request.js'
+import {
+	BaseUrl as wrBaseUrl
+} from '@/api/request.js'
 // const BaseUrl = "http://192.168.0.120:9999"
-const BaseUrl = "http://192.168.0.120:9999"
+const BaseUrl = "http://192.168.3.109:9999"
 
 // 鐧诲綍
-function apiLogin({
-	code
-}) {
-	uni.showLoading({
-		title: '鐧诲綍涓�...',
-	})
-	return new Promise((resolve, reject) => {
-		uni.request({
-			url: BaseUrl + "/wrzs/wx/login",
-			method: "POST",
-			data: {
-				code
-			},
-			header: {
-				// "TENANT-ID": "5",
-				// "Authorization": "Basic cGlnOnBpZw==",
-				'Content-Type': 'application/x-www-form-urlencoded'
-			},
-			success: (res) => {
-				uni.hideLoading();
-				// console.log(res)
-				resolve(res.data);
-			},
-			fail: (err) => {
-				console.log('閿欒', err);
-				uni.hideLoading();
-				uni.showToast({
-					icon: 'none',
-					title: '鏈嶅姟鍣ㄩ敊璇�'
-				})
-			}
-		})
-	})
-}
+// function apiLogin({
+// 	code
+// }) {
+// 	uni.showLoading({
+// 		title: '鐧诲綍涓�...',
+// 	})
+// 	return new Promise((resolve, reject) => {
+// 		uni.request({
+// 			url: BaseUrl + "/wrzs/wx/login",
+// 			method: "POST",
+// 			data: {
+// 				code
+// 			},
+// 			header: {
+// 				// "TENANT-ID": "5",
+// 				// "Authorization": "Basic cGlnOnBpZw==",
+// 				'Content-Type': 'application/x-www-form-urlencoded'
+// 			},
+// 			success: (res) => {
+// 				uni.hideLoading();
+// 				// console.log(res)
+// 				resolve(res.data);
+// 			},
+// 			fail: (err) => {
+// 				console.log('閿欒', err);
+// 				uni.hideLoading();
+// 				uni.showToast({
+// 					icon: 'none',
+// 					title: '鏈嶅姟鍣ㄩ敊璇�'
+// 				})
+// 			}
+// 		})
+// 	})
+// }
 
 
-function apiLogin2({
-	code
-}) {
-	uni.showLoading({
-		title: '鍔犺浇涓�...'
-	})
-	return new Promise((resolve, reject) => {
-		uni.request({
-			url: BaseUrl + "/wrzs/wx/login2",
-			method: "POST",
-			data: {
-				code
-			},
-			header: {
-				'Content-Type': 'application/x-www-form-urlencoded'
-			},
-			success: (res) => {
-				uni.hideLoading();
-				resolve(res.data)
-			},
-			fail: (err) => {
-				console.log('閿欒', err);
-				uni.hideLoading();
-				uni.showToast({
-					icon: 'none',
-					title: '鏈嶅姟鍣ㄩ敊璇�'
-				})
-			}
-		})
-	})
-}
+
 
 
 // 娉ㄥ唽
@@ -130,6 +102,7 @@
 	})
 }
 
+
 // 鑾峰彇token
 function apiLoginPassword({
 	username,
@@ -170,6 +143,45 @@
 }
 
 
+// 寰俊灏忕▼搴忎竴閿櫥褰�
+function apiLoginWx({
+	code
+}) {
+	uni.showLoading({
+		title: '鍔犺浇涓�...'
+	})
+	return new Promise((resolve, reject) => {
+		uni.request({
+			url: BaseUrl + '/admin/oauth2/token',
+			method: "POST",
+			data: {
+				grant_type: 'mobile',
+				mobile: `MINI@${code}`,
+				code
+			},
+			header: {
+				"Authorization": 'Basic c29jaWFsOnNvY2lhbA==', //app:app
+				'content-type': 'application/x-www-form-urlencoded',
+				"CLIENT_TOC": "Y",
+				"isToken": "false"
+			},
+			success: (res) => {
+				uni.hideLoading();
+				resolve(res.data)
+			},
+			fail: (err) => {
+				console.log('閿欒', err);
+				uni.hideLoading();
+				uni.showToast({
+					icon: 'none',
+					title: '鏈嶅姟鍣ㄩ敊璇�'
+				})
+			}
+		})
+	})
+}
+
+
 
 // 鑾峰彇娴佺▼鏁版嵁
 // export const getProcessDataList = (params) => {
@@ -178,8 +190,8 @@
 
 
 export {
-	apiLogin,
-	apiLogin2,
+	apiLoginWx,
 	apiRegister,
-	apiLoginPassword
+	apiLoginPassword,
+	BaseUrl
 }

--
Gitblit v1.9.1