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 | 82 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/api/publicInterface.js b/api/publicInterface.js
index a661ccd..e28669a 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -3,12 +3,51 @@
import { BaseUrl as wrBaseUrl } from '@/api/request.js'
-// const BaseUrl = 'http://192.168.0.118:9999'
-const BaseUrl = 'http://192.168.31.15:9999'
-// const BaseUrl = 'https://mx.jzeg.cn:9096'
-// const BaseUrl = 'http://192.168.31.18:9999'
+// const BaseUrl = 'http://192.168.0.110:9999'
+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'
+// 鐧诲綍
+// 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 apiRegister({
@@ -24,15 +63,25 @@
drivingImg,
vehicleColour,
bodyofcarJpg,
- tradeQualificationImg,
roadTransportImg,
- isCoalCar
+ tradeQualificationImg,
+ isCoalCar,
+ countryNumberCar,
+ inventoryImg,
+ truckLength,
+ truckWidth,
+ truckHeight,
+ maximumPayload
}) {
- console.log(bodyofcarJpg);
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,
@@ -47,9 +96,15 @@
drivingImg,
vehicleColour,
bodyofcarJpg,
- tradeQualificationImg,
roadTransportImg,
- isCoalCar
+ tradeQualificationImg,
+ isCoalCar,
+ countryNumberCar,
+ inventoryImg,
+ truckLength,
+ truckWidth,
+ truckHeight,
+ maximumPayload
},
header: {
'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
@@ -83,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,
@@ -161,4 +221,4 @@
apiRegister,
apiLoginPassword,
BaseUrl
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1