diff --git a/config/app.js b/config/app.js
index 3c387d1..7fc5faa 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,9 +1,15 @@
let httpApiThree;
-let httpApi
-// httpApi = 'https://shop.lihaink.cn' //生产
-httpApi = 'https://worker-task.lihaink.cn' //生产
-httpApiThree = 'https://worker-task.lihaink.cn' //生产
-// httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
+let httpApi;
+
+// 正式使用的域名
+httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
+// httpApi = 'https://preview-worker-task.lihaink.cn' //预上线
+// httpApi = 'https://worker-task.lihaink.cn' //正式
+
+
+httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试
+// httpApiThree = 'https://preview-worker-task.lihaink.cn' //预上线
+// httpApiThree = 'https://worker-task.lihaink.cn' //正式
// #ifdef H5
// httpApiThree = 'baseUrlTest' //生产
// #endif
@@ -25,29 +31,27 @@ httpApiThree = 'https://worker-task.lihaink.cn' //生产
// }
module.exports = {
- // 请求域名 格式: https://您的域名
- // #ifdef MP || APP-PLUS || H5
- HTTP_REQUEST_URL: httpApi,
- HTTP_REQUEST_URL_THREE: httpApiThree,
- // #endif
+ // 请求域名 格式: 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/vehicle_a.vue b/subpkg/property/vehicle_a.vue
index e68ed27..dfd57d3 100644
--- a/subpkg/property/vehicle_a.vue
+++ b/subpkg/property/vehicle_a.vue
@@ -48,7 +48,7 @@
到期时间:
- {{datas.rent_time}}
+ {{overDateFn(datas.rent_time) }}
@@ -157,6 +157,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({
diff --git a/utils/logistics.js b/utils/logistics.js
index 54efb2d..89c7dcd 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) {
// 已经未登录了,禁止请求