From 1b4f1c9db703b1bfd0e3f8cc7f01153a7399088d Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 10 四月 2023 15:53:47 +0800
Subject: [PATCH] 修改称重控制，修复刷新失败
---
api/publicInterface.js | 194 +++++++++++++++++++++++++-----------------------
1 files changed, 100 insertions(+), 94 deletions(-)
diff --git a/api/publicInterface.js b/api/publicInterface.js
index 54e06bf..e850135 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -1,79 +1,51 @@
// 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.0.120: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({
- 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: '鏈嶅姟鍣ㄩ敊璇�'
- })
- }
- })
- })
-}
+
// 娉ㄥ唽
@@ -89,9 +61,7 @@
carImg,
drivingImg
}) {
- uni.showLoading({
- title: "鍔犺浇涓�..."
- })
+ uni.showLoading({ title: '鍔犺浇涓�...' })
return new Promise((resolve, reject) => {
uni.request({
url: wrBaseUrl + '/wrzs/wx/bindWx',
@@ -109,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
@@ -129,6 +99,7 @@
})
})
}
+
// 鑾峰彇token
function apiLoginPassword({
@@ -139,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,
@@ -148,18 +119,53 @@
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: '鏈嶅姟鍣ㄩ敊璇�'
+ })
+ }
+ })
+ })
+}
+
+
+// 寰俊灏忕▼搴忎竴閿櫥褰�
+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: '鏈嶅姟鍣ㄩ敊璇�'
@@ -178,8 +184,8 @@
export {
- apiLogin,
- apiLogin2,
+ apiLoginWx,
apiRegister,
- apiLoginPassword
+ apiLoginPassword,
+ BaseUrl
}
--
Gitblit v1.9.1