From 29014207a8882df16d4372ef20e0d79e6e5df6d1 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 30 五月 2024 08:44:28 +0800
Subject: [PATCH] Merge branch 'jlhg' of http://39.96.92.240:10000/r/~fyy/unattended-app into jlhg
---
api/publicInterface.js | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/api/publicInterface.js b/api/publicInterface.js
index 369bb56..f86d2c2 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -3,9 +3,10 @@
import { BaseUrl as wrBaseUrl } from '@/api/request.js'
-// const BaseUrl = 'http://192.168.0.110:9999'
-// const BaseUrl = 'http://192.168.0.102:9999'
-const BaseUrl = 'https://mx.jzeg.cn:9096'
+// const BaseUrl = 'http://192.168.0.22:9999'
+const BaseUrl = 'http://192.168.0.17:9999'
+// const BaseUrl = 'http://192.168.0.12:9999'
+// const BaseUrl = 'https://mx.jzeg.cn:9195'
// const BaseUrl = 'http://192.168.31.17:9999'
// const BaseUrl = 'http://192.168.0.100:9999'
// const BaseUrl = 'http://192.168.0.108:9999'
@@ -72,7 +73,12 @@
uni.showLoading({ title: '鍔犺浇涓�...' })
return new Promise((resolve, reject) => {
uni.request({
- url: wrBaseUrl + '/wrzs/wx/bindWx',
+ // #ifdef H5
+ url: '/wrzs/wx/bindWx',
+ // #endif
+ // #ifndef H5
+ url: wrBaseUrl + '/wrzs/wx/bindWx',
+ // #endif
method: 'POST',
data: {
phone,
@@ -96,6 +102,7 @@
header: {
'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
'content-type': 'application/json',
+ 'clientToc': 'Y',
'CLIENT_TOC': 'Y',
'isToken': 'false'
},
@@ -125,7 +132,12 @@
}) {
return new Promise((resolve, reject) => {
uni.request({
+ // #ifdef H5
+ url: '/admin/oauth2/token',
+ // #endif
+ // #ifndef H5
url: BaseUrl + '/admin/oauth2/token',
+ // #endif
method: 'POST',
data: {
username,
@@ -136,6 +148,7 @@
header: {
'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
'content-type': 'application/x-www-form-urlencoded',
+ 'clientToc': 'Y',
'CLIENT_TOC': 'Y',
'isToken': 'false'
},
@@ -171,7 +184,8 @@
header: {
'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
'content-type': 'application/x-www-form-urlencoded',
- 'CLIENT_TOC': 'Y',
+ 'clientToc': 'Y',
+ 'CLIENT_TOC ': 'Y',
'isToken': 'false'
},
success: res => {
@@ -203,4 +217,4 @@
apiRegister,
apiLoginPassword,
BaseUrl
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1