diff --git a/config/app.js b/config/app.js
index 7fc5faa..7b60c06 100644
--- a/config/app.js
+++ b/config/app.js
@@ -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
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 dfd57d3..0f2bf48 100644
--- a/subpkg/property/vehicle_a.vue
+++ b/subpkg/property/vehicle_a.vue
@@ -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`,
diff --git a/utils/logistics.js b/utils/logistics.js
index 89c7dcd..f7d3b1a 100644
--- a/utils/logistics.js
+++ b/utils/logistics.js
@@ -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) {
// 已经未登录了,禁止请求