diff --git a/config/app.js b/config/app.js
index c9887f4..7b60c06 100644
--- a/config/app.js
+++ b/config/app.js
@@ -13,7 +13,6 @@ 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
@@ -31,27 +30,27 @@ httpApiThree = 'https://worker-task.lihaink.cn' //正式
// }
module.exports = {
- // 请求域名 格式： https://您的域名
- HTTP_REQUEST_URL: httpApi,
- HTTP_REQUEST_URL_THREE: httpApiThree,
+ // 请求域名 格式： https://您的域名
+ HTTP_REQUEST_URL: httpApi,
+ HTTP_REQUEST_URL_THREE: httpApiThree,
- // #ifdef H5
- //H5接口是浏览器地址
- // HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host,
- // HTTP_REQUEST_URL_THREE: httpApiThree || window.location.protocol + "//" + window.location.host,
- // #endif
- HEADER: {
- 'content-type': 'application/json',
- //#ifdef MP
- 'Form-type': 'routine',
- //#endif
- //#ifdef APP-PLUS
- 'Form-type': 'app',
- //#endif
- },
- // 回话密钥名称 请勿修改此配置
- // TOKENNAME: 'X-Token',
- TOKENNAME: 'token',
- // 缓存时间 0 永久
- EXPIRE: 0,
-};
+ // #ifdef H5
+ //H5接口是浏览器地址
+ // HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host,
+ // HTTP_REQUEST_URL_THREE: httpApiThree || window.location.protocol + "//" + window.location.host,
+ // #endif
+ HEADER: {
+ 'content-type': 'application/json',
+ //#ifdef MP
+ 'Form-type': 'routine',
+ //#endif
+ //#ifdef APP-PLUS
+ 'Form-type': 'app',
+ //#endif
+ },
+ // 回话密钥名称 请勿修改此配置
+ // TOKENNAME: 'X-Token',
+ TOKENNAME: 'token',
+ // 缓存时间 0 永久
+ EXPIRE: 0,
+};
\ No newline at end of file
diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue
index cffd870..de8050a 100644
--- a/subpkg/property/chosseCompany.vue
+++ b/subpkg/property/chosseCompany.vue
@@ -72,7 +72,6 @@
-
@@ -94,12 +93,14 @@
+
+
-
+
@@ -131,15 +132,12 @@
-
+
-
-
@@ -180,7 +178,6 @@
}
},
onLoad(options) {
- console.log(options)
getAgencyDetailApi({
id: options.id
}).then(res => {
@@ -192,8 +189,8 @@
if (this.dataList.status == 3) {
uni.navigateBack()
}
- console.log(this.dataList.cars_info)
- if (this.carList.length >= 0 || this.dataList.cars_info) {
+ if (this.carList.length > 0 || this.dataList.cars_info) {
+ console.log(this.dataList.cars_info)
this.flag1 = false
}
// console.log(this.dataList)
diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue
index b1783cc..eb2704c 100644
--- a/subpkg/property/index.vue
+++ b/subpkg/property/index.vue
@@ -99,6 +99,7 @@
+
可监管车辆数量 {{datas.monitor_num}}
@@ -201,6 +202,13 @@
+
+
+
+
+
+
@@ -231,6 +239,7 @@
name: "vehicle",
data() {
return {
+ aaa: 0,
showLoading: true,
company_type: "",
// 1上传2审核3审核结束
@@ -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) {
diff --git a/subpkg/property/vehicle_a.vue b/subpkg/property/vehicle_a.vue
index e68ed27..0f2bf48 100644
--- a/subpkg/property/vehicle_a.vue
+++ b/subpkg/property/vehicle_a.vue
@@ -48,7 +48,7 @@
到期时间:
- {{datas.rent_time}}
+ {{overDateFn(datas.rent_time) }}
@@ -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()
@@ -157,6 +160,12 @@
},
methods: {
+ // 计算到期时间
+ overDateFn(date) {
+ var specifiedDate = new Date(date);
+ specifiedDate.setMonth(specifiedDate.getMonth() + 2);
+ return specifiedDate.toISOString().split('T')[0]
+ },
showContractFn(url) {
console.log(url)
uni.navigateTo({
@@ -188,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`,
diff --git a/utils/logistics.js b/utils/logistics.js
index 54efb2d..f7d3b1a 100644
--- a/utils/logistics.js
+++ b/utils/logistics.js
@@ -21,7 +21,8 @@ function baseRequestTwo(url, method, data, {
noAuth = false,
noVerify = false
}) {
- let Url = "https://logistics.lihaink.cn",
+ let Url = "https://logistics.lihaink.cn", //正式环境
+ // let Url = "https://ceshi-logistics.lihaink.cn", //测试环境
header = HEADER;
if (!noAuth) {
// 已经未登录了,禁止请求