修复bug
This commit is contained in:
parent
ea1bbb1e9d
commit
027cc8bfbe
@ -2,18 +2,17 @@ let httpApiThree;
|
|||||||
let httpApi;
|
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://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://preview-worker-task.lihaink.cn' //预上线
|
||||||
// httpApiThree = 'https://worker-task.lihaink.cn' //正式
|
httpApiThree = 'https://worker-task.lihaink.cn' //正式
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
// httpApiThree = 'baseUrlTest' //生产
|
// httpApiThree = 'baseUrlTest' //生产
|
||||||
// #endif
|
// #endif
|
||||||
|
|
||||||
// if (process.env.NODE_ENV === "development") {
|
// if (process.env.NODE_ENV === "development") {
|
||||||
// httpApi = "http://192.168.0.222:8324"
|
// httpApi = "http://192.168.0.222:8324"
|
||||||
// // #ifdef MP-WEIXIN
|
// // #ifdef MP-WEIXIN
|
||||||
|
@ -99,6 +99,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<!-- 镇街公司 -->
|
<!-- 镇街公司 -->
|
||||||
<view v-if='company_type==16'>
|
<view v-if='company_type==16'>
|
||||||
|
|
||||||
<view class="info">
|
<view class="info">
|
||||||
<text>可监管车辆数量 {{datas.monitor_num}}</text>
|
<text>可监管车辆数量 {{datas.monitor_num}}</text>
|
||||||
<view @click="showPop=true" class="not_leased">
|
<view @click="showPop=true" class="not_leased">
|
||||||
@ -201,6 +202,13 @@
|
|||||||
<u--input placeholder="请输入内容" type="number" v-model="newCarNum"></u--input>
|
<u--input placeholder="请输入内容" type="number" v-model="newCarNum"></u--input>
|
||||||
</view>
|
</view>
|
||||||
</u-modal>
|
</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>
|
||||||
</view>
|
</view>
|
||||||
<mytn text='合同列表' v-if="datas.rent_num" @click="navgo('/subpkg/property/contractList')"></mytn>
|
<mytn text='合同列表' v-if="datas.rent_num" @click="navgo('/subpkg/property/contractList')"></mytn>
|
||||||
@ -231,6 +239,7 @@
|
|||||||
name: "vehicle",
|
name: "vehicle",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
aaa: 0,
|
||||||
showLoading: true,
|
showLoading: true,
|
||||||
company_type: "",
|
company_type: "",
|
||||||
// 1上传2审核3审核结束
|
// 1上传2审核3审核结束
|
||||||
@ -243,7 +252,8 @@
|
|||||||
dataList: [],
|
dataList: [],
|
||||||
newCarNum: "",
|
newCarNum: "",
|
||||||
newcarTit: "",
|
newcarTit: "",
|
||||||
flag: false
|
flag: false,
|
||||||
|
showpopp: false,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -309,6 +319,18 @@
|
|||||||
|
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
confirmFn() {
|
||||||
|
uni.reLaunch({
|
||||||
|
url: '/subpkg/property/index' // 替换为需要刷新的页面路径
|
||||||
|
});
|
||||||
|
},
|
||||||
|
test() {
|
||||||
|
this.aaa = 1;
|
||||||
|
this.showpopp = true;
|
||||||
|
// uni.reLaunch({
|
||||||
|
// url: '/subpkg/property/index' // 替换为需要刷新的页面路径
|
||||||
|
// });
|
||||||
|
},
|
||||||
// 申请车辆
|
// 申请车辆
|
||||||
applycarFn() {
|
applycarFn() {
|
||||||
upVehicleApi().then(res => {
|
upVehicleApi().then(res => {
|
||||||
@ -337,13 +359,14 @@
|
|||||||
},
|
},
|
||||||
confirm() {
|
confirm() {
|
||||||
if (!this.newCarNum) return
|
if (!this.newCarNum) return
|
||||||
|
this.showPop = false
|
||||||
leaseApi({
|
leaseApi({
|
||||||
num: Number(this.newCarNum)
|
num: Number(this.newCarNum)
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
this.newCarNum = ""
|
this.newCarNum = ""
|
||||||
Toast(res.msg)
|
// Toast(res.msg)
|
||||||
|
this.showpopp = true
|
||||||
})
|
})
|
||||||
this.showPop = false
|
|
||||||
},
|
},
|
||||||
|
|
||||||
navgo(url) {
|
navgo(url) {
|
||||||
|
@ -146,7 +146,10 @@
|
|||||||
// car_id: this.$route.query.id
|
// car_id: this.$route.query.id
|
||||||
car_id: options.id
|
car_id: options.id
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
|
|
||||||
this.datas = res.data
|
this.datas = res.data
|
||||||
|
this.markers[0].latitude = res.data.position?.lat
|
||||||
|
this.markers[0].longitude = res.data.position?.lon
|
||||||
|
|
||||||
})
|
})
|
||||||
this.minDateFn()
|
this.minDateFn()
|
||||||
@ -194,15 +197,7 @@
|
|||||||
this.showDate = false
|
this.showDate = false
|
||||||
},
|
},
|
||||||
showPloyline() {
|
showPloyline() {
|
||||||
let points = [{
|
let points = []
|
||||||
latitude: 28.916722,
|
|
||||||
longitude: 105.443274,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
latitude: 28.936762,
|
|
||||||
longitude: 105.443132,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
locusApi({
|
locusApi({
|
||||||
car_id: 7,
|
car_id: 7,
|
||||||
end_time: `${this.queryData} 23:59:59`,
|
end_time: `${this.queryData} 23:59:59`,
|
||||||
|
@ -21,8 +21,8 @@ function baseRequestTwo(url, method, data, {
|
|||||||
noAuth = false,
|
noAuth = false,
|
||||||
noVerify = false
|
noVerify = false
|
||||||
}) {
|
}) {
|
||||||
// let Url = "https://logistics.lihaink.cn",//正式环境
|
let Url = "https://logistics.lihaink.cn", //正式环境
|
||||||
let Url = "https://ceshi-logistics.lihaink.cn", //测试环境
|
// let Url = "https://ceshi-logistics.lihaink.cn", //测试环境
|
||||||
header = HEADER;
|
header = HEADER;
|
||||||
if (!noAuth) {
|
if (!noAuth) {
|
||||||
// 已经未登录了,禁止请求
|
// 已经未登录了,禁止请求
|
||||||
|
Loading…
x
Reference in New Issue
Block a user