From 725325a5bdfac73de8e8cbec2ba71a4923883529 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 17 十月 2024 16:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://39.96.92.240:10000/r/~fyy/unattended-app
---
api/publicInterface.js | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/api/publicInterface.js b/api/publicInterface.js
index 558c616..e28669a 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -4,8 +4,8 @@
import { BaseUrl as wrBaseUrl } from '@/api/request.js'
// const BaseUrl = 'http://192.168.0.110:9999'
-// const BaseUrl = 'http://192.168.0.22:9999'
-const BaseUrl = 'https://mx.jzeg.cn:9096'
+const BaseUrl = 'http://192.168.0.22:9999'
+// const BaseUrl = 'https://mr1.res.jzeg.cn:9096'
// const BaseUrl = 'http://192.168.31.17:9999'
// const BaseUrl = 'http://192.168.0.100:9999'
// const BaseUrl = 'http://192.168.0.108:9999'
@@ -67,12 +67,21 @@
tradeQualificationImg,
isCoalCar,
countryNumberCar,
- inventoryImg
+ inventoryImg,
+ truckLength,
+ truckWidth,
+ truckHeight,
+ maximumPayload
}) {
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,
@@ -91,7 +100,11 @@
tradeQualificationImg,
isCoalCar,
countryNumberCar,
- inventoryImg
+ inventoryImg,
+ truckLength,
+ truckWidth,
+ truckHeight,
+ maximumPayload
},
header: {
'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
@@ -125,7 +138,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,
--
Gitblit v1.9.1