Commit d38470aac927552637268b2d9f9ddeae23879503
1 parent
49a45f56
地址解析为经纬度
Showing
3 changed files
with
9 additions
and
2 deletions
config/app.js
@@ -13,6 +13,7 @@ const IS_H5 = false | @@ -13,6 +13,7 @@ const IS_H5 = false | ||
13 | 13 | ||
14 | 14 | ||
15 | /** S API BaseURL **/ | 15 | /** S API BaseURL **/ |
16 | +// https://yuanlin.jichengshanshui.com.cn:8987 | ||
16 | const baseURLMap = { | 17 | const baseURLMap = { |
17 | // 开发环境 | 18 | // 开发环境 |
18 | development: 'https://test.jichengshanshui.com.cn:28303', | 19 | development: 'https://test.jichengshanshui.com.cn:28303', |
@@ -22,6 +23,8 @@ const baseURLMap = { | @@ -22,6 +23,8 @@ const baseURLMap = { | ||
22 | production: IS_H5 ? location.origin : 'https://test.jichengshanshui.com.cn:28303' | 23 | production: IS_H5 ? location.origin : 'https://test.jichengshanshui.com.cn:28303' |
23 | } | 24 | } |
24 | 25 | ||
26 | + | ||
27 | + | ||
25 | /** E API BaseURL **/ | 28 | /** E API BaseURL **/ |
26 | export const baseURL = SWITCH_DEVELOPMENT ? baseURLMap['development'] : baseURLMap['production'] | 29 | export const baseURL = SWITCH_DEVELOPMENT ? baseURLMap['development'] : baseURLMap['production'] |
27 | 30 | ||
@@ -30,4 +33,6 @@ export const version = '1.0.6' | @@ -30,4 +33,6 @@ export const version = '1.0.6' | ||
30 | // export const uploadURL = baseURL + '/ylapi/yuanl/common/upload' | 33 | // export const uploadURL = baseURL + '/ylapi/yuanl/common/upload' |
31 | export const uploadURL = baseURL + '/ylapi/yuanl/common/upload' | 34 | export const uploadURL = baseURL + '/ylapi/yuanl/common/upload' |
32 | // export const OSSURL = baseURL + '/yuanlin/' | 35 | // export const OSSURL = baseURL + '/yuanlin/' |
33 | -export const OSSURL = 'https://test.jichengshanshui.com.cn:28310/yuanlin/' | ||
34 | \ No newline at end of file | 36 | \ No newline at end of file |
37 | +export const OSSURL = 'https://test.jichengshanshui.com.cn:28310/yuanlin/' | ||
38 | + | ||
39 | +// https://yuanlin.jichengshanshui.com.cn:8987/yuanlin/ | ||
35 | \ No newline at end of file | 40 | \ No newline at end of file |
pages/work/daily/reporting.vue
@@ -191,6 +191,7 @@ export default { | @@ -191,6 +191,7 @@ export default { | ||
191 | "sysPhotoList": null | 191 | "sysPhotoList": null |
192 | } | 192 | } |
193 | console.log(this.formData) | 193 | console.log(this.formData) |
194 | + console.log(this.pickerList[1]) | ||
194 | this.formData.streetName = largeData.streetVo | 195 | this.formData.streetName = largeData.streetVo |
195 | this.formData.streetId = largeData.street | 196 | this.formData.streetId = largeData.street |
196 | this.getRoadList( this.formData.streetId) | 197 | this.getRoadList( this.formData.streetId) |
pages/work/daily/workOrder.vue
@@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
18 | <view class="fs-flex1 fs-ellipsis">所在街道:{{item.streetVo}}</view> | 18 | <view class="fs-flex1 fs-ellipsis">所在街道:{{item.streetVo}}</view> |
19 | </view> | 19 | </view> |
20 | <view class="fs-flex fs-mt20"> | 20 | <view class="fs-flex fs-mt20"> |
21 | - <view class="fs-flex1 fs-ellipsis">详细地址:{{item.address}}{{item.address}}{{item.address}}</view> | 21 | + <view class="fs-flex1 fs-ellipsis">详细地址:{{item.address}}</view> |
22 | </view> | 22 | </view> |
23 | <view class="fs-flex__between fs-mt20"> | 23 | <view class="fs-flex__between fs-mt20"> |
24 | <view class="fs-flex1 fs-ellipsis">截止日期:{{item.endTime}}</view> | 24 | <view class="fs-flex1 fs-ellipsis">截止日期:{{item.endTime}}</view> |
@@ -59,6 +59,7 @@ export default { | @@ -59,6 +59,7 @@ export default { | ||
59 | const params = { | 59 | const params = { |
60 | dispperson:useCounter.userInfo.userId, | 60 | dispperson:useCounter.userInfo.userId, |
61 | taskstate:'gdtype02', | 61 | taskstate:'gdtype02', |
62 | + reserve2:"1", | ||
62 | pageReq: {pageNum: pageNo, pageSize: pageSize}, | 63 | pageReq: {pageNum: pageNo, pageSize: pageSize}, |
63 | } | 64 | } |
64 | hotlinecaseList({data:params}).then(res => { | 65 | hotlinecaseList({data:params}).then(res => { |