修复bug

This commit is contained in:
THK3121 2023-09-05 11:53:23 +08:00
parent ea1bbb1e9d
commit 027cc8bfbe
4 changed files with 36 additions and 19 deletions

View File

@ -2,18 +2,17 @@ let httpApiThree;
let httpApi;
// 正式使用的域名
httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
// httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
// httpApi = 'https://preview-worker-task.lihaink.cn' //预上线
// httpApi = 'https://worker-task.lihaink.cn' //正式
httpApi = 'https://worker-task.lihaink.cn' //正式
httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试
// httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试
// httpApiThree = 'https://preview-worker-task.lihaink.cn' //预上线
// httpApiThree = 'https://worker-task.lihaink.cn' //正式
httpApiThree = 'https://worker-task.lihaink.cn' //正式
// #ifdef H5
// httpApiThree = 'baseUrlTest' //生产
// #endif
// if (process.env.NODE_ENV === "development") {
// httpApi = "http://192.168.0.222:8324"
// // #ifdef MP-WEIXIN

View File

@ -99,6 +99,7 @@
</view>
<!-- 镇街公司 -->
<view v-if='company_type==16'>
<view class="info">
<text>可监管车辆数量 {{datas.monitor_num}}</text>
<view @click="showPop=true" class="not_leased">
@ -201,6 +202,13 @@
<u--input placeholder="请输入内容" type="number" v-model="newCarNum"></u--input>
</view>
</u-modal>
<u-modal :show="showpopp" title="提示" @confirm="confirmFn" @close="showpopp=false"
:closeOnClickOverlay="true">
<view class="slot-content">
<rich-text nodes="你的申请已提交"></rich-text>
</view>
</u-modal>
</view>
</view>
<mytn text='合同列表' v-if="datas.rent_num" @click="navgo('/subpkg/property/contractList')"></mytn>
@ -231,6 +239,7 @@
name: "vehicle",
data() {
return {
aaa: 0,
showLoading: true,
company_type: "",
// 123
@ -243,7 +252,8 @@
dataList: [],
newCarNum: "",
newcarTit: "",
flag: false
flag: false,
showpopp: false,
@ -309,6 +319,18 @@
methods: {
confirmFn() {
uni.reLaunch({
url: '/subpkg/property/index' //
});
},
test() {
this.aaa = 1;
this.showpopp = true;
// uni.reLaunch({
// url: '/subpkg/property/index' //
// });
},
//
applycarFn() {
upVehicleApi().then(res => {
@ -337,13 +359,14 @@
},
confirm() {
if (!this.newCarNum) return
this.showPop = false
leaseApi({
num: Number(this.newCarNum)
}).then(res => {
this.newCarNum = ""
Toast(res.msg)
// Toast(res.msg)
this.showpopp = true
})
this.showPop = false
},
navgo(url) {

View File

@ -146,7 +146,10 @@
// car_id: this.$route.query.id
car_id: options.id
}).then(res => {
this.datas = res.data
this.markers[0].latitude = res.data.position?.lat
this.markers[0].longitude = res.data.position?.lon
})
this.minDateFn()
@ -194,15 +197,7 @@
this.showDate = false
},
showPloyline() {
let points = [{
latitude: 28.916722,
longitude: 105.443274,
},
{
latitude: 28.936762,
longitude: 105.443132,
},
]
let points = []
locusApi({
car_id: 7,
end_time: `${this.queryData} 23:59:59`,

View File

@ -21,8 +21,8 @@ function baseRequestTwo(url, method, data, {
noAuth = false,
noVerify = false
}) {
// let Url = "https://logistics.lihaink.cn",//正式环境
let Url = "https://ceshi-logistics.lihaink.cn", //测试环境
let Url = "https://logistics.lihaink.cn", //正式环境
// let Url = "https://ceshi-logistics.lihaink.cn", //测试环境
header = HEADER;
if (!noAuth) {
// 已经未登录了,禁止请求