Merge branch 'master' of http://39.96.92.240:10000/r/~fyy/unattended-app

yangan

2024-10-17 725325a5bdfac73de8e8cbec2ba71a4923883529

 api/publicInterface.js

@@ -3,10 +3,12 @@


import { BaseUrl as wrBaseUrl } from '@/api/request.js'
const BaseUrl = 'http://192.168.31.14:9999'
// const BaseUrl = 'https://mx.jzeg.cn:9095'
// 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
@@ -58,12 +60,28 @@
   idCard,
   carNo,
   carImg,
   drivingImg
   drivingImg,
   vehicleColour,
   bodyofcarJpg,
   roadTransportImg,
   tradeQualificationImg,
   isCoalCar,
   countryNumberCar,
   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,
@@ -75,7 +93,18 @@
            idCard,
            carNo,
            carImg,
            drivingImg
            drivingImg,
            vehicleColour,
            bodyofcarJpg,
            roadTransportImg,
            tradeQualificationImg,
            isCoalCar,
            countryNumberCar,
            inventoryImg,
            truckLength,
            truckWidth,
            truckHeight,
            maximumPayload
         },
         header: {
            'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
@@ -109,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,