Merge branch 'jlhg' of http://39.96.92.240:10000/r/~fyy/unattended-app into...

yangan

2024-05-30 29014207a8882df16d4372ef20e0d79e6e5df6d1

 api/publicInterface.js

@@ -1,11 +1,15 @@
// 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.3.109:9999"

import { BaseUrl as wrBaseUrl } from '@/api/request.js'
// 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'
// 登录
// function apiLogin({
//    code
@@ -57,14 +61,24 @@
   idCard,
   carNo,
   carImg,
   drivingImg
   drivingImg,
   vehicleColour,
   bodyofcarJpg,
   roadTransportImg,
   tradeQualificationImg,
   isCoalCar,
   countryNumberCar,
   inventoryImg
}) {
   uni.showLoading({
      title: "加载中..."
   })
   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,
@@ -76,21 +90,29 @@
            idCard,
            carNo,
            carImg,
            drivingImg
            drivingImg,
            vehicleColour,
            bodyofcarJpg,
            roadTransportImg,
            tradeQualificationImg,
            isCoalCar,
            countryNumberCar,
            inventoryImg
         },
         header: {
            "Authorization": 'Basic c29jaWFsOnNvY2lhbA==', //app:app
            'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
            'content-type': 'application/json',
            "CLIENT_TOC": "Y",
            "isToken": "false"
            'clientToc': 'Y',
            '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
@@ -110,8 +132,13 @@
}) {
   return new Promise((resolve, reject) => {
      uni.request({
         url: BaseUrl + "/admin/oauth2/token",
         method: "POST",
         // #ifdef H5
         url: '/admin/oauth2/token',
         // #endif
         // #ifndef H5
         url: BaseUrl + '/admin/oauth2/token',
         // #endif
         method: 'POST',
         data: {
            username,
            password,
@@ -119,18 +146,19 @@
            scope
         },
         header: {
            "Authorization": 'Basic c29jaWFsOnNvY2lhbA==', //app:app
            'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
            'content-type': 'application/x-www-form-urlencoded',
            "CLIENT_TOC": "Y",
            "isToken": "false"
            'clientToc': 'Y',
            '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: '服务器错误'
@@ -142,34 +170,31 @@


// 微信小程序一键登录
function apiLoginWx({
   code
}) {
   uni.showLoading({
      title: '加载中...'
   })
function apiLoginWx({ code }) {
   uni.showLoading({ title: '加载中...' })
   return new Promise((resolve, reject) => {
      uni.request({
         url: BaseUrl + '/admin/oauth2/token',
         method: "POST",
         method: 'POST',
         data: {
            grant_type:'mobile',
            mobile:`MINI@${code}`,
            grant_type: 'mobile',
            mobile: `MINI@${code}`,
            code
         },
         header: {
            "Authorization": 'Basic c29jaWFsOnNvY2lhbA==', //app:app
            'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
            'content-type': 'application/x-www-form-urlencoded',
            "CLIENT_TOC": "Y",
            "isToken": "false"
            'clientToc': 'Y',
            'CLIENT_TOC ': 'Y',
            'isToken': 'false'
         },
         success: (res) => {
            uni.hideLoading();
         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: '服务器错误'