|
|
|
@ -461,7 +461,7 @@ |
|
|
|
this.mylocation = uni.getStorageSync('mylocation') |
|
|
|
this.latitude = this.mylocation.latitude |
|
|
|
this.longitude = this.mylocation.longitude |
|
|
|
console.log(this.latitude, this.longitude) |
|
|
|
|
|
|
|
this.safeAreaBottom = getApp().globalData.safeAreaBottom + 66 |
|
|
|
this.top = getApp().globalData.top |
|
|
|
this.minheight = 40 |
|
|
|
@ -471,7 +471,7 @@ |
|
|
|
this.draptop = this.top |
|
|
|
}, |
|
|
|
onReady() { |
|
|
|
console.log('onReady') |
|
|
|
|
|
|
|
this.getdata() |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
@ -521,7 +521,7 @@ |
|
|
|
oid: this.info.id, |
|
|
|
code: code |
|
|
|
}, true).then(function(data) { |
|
|
|
console.log(data) |
|
|
|
|
|
|
|
that.getdata() |
|
|
|
setTimeout(() => { |
|
|
|
uni.navigateBack({ |
|
|
|
@ -565,13 +565,12 @@ |
|
|
|
key: 'finishthumb', |
|
|
|
success(res) { |
|
|
|
if (res.data.length > 0) { |
|
|
|
console.log('pppppppppppppppppppppppppp') |
|
|
|
console.log(res) |
|
|
|
|
|
|
|
that.sendRequest('Rider.Orders.Start', { |
|
|
|
oid: that.info.id, |
|
|
|
thumbs: JSON.stringify(res.data), |
|
|
|
}, true).then(function(data) { |
|
|
|
console.log(data) |
|
|
|
|
|
|
|
uni.setStorage({ |
|
|
|
key: 'finishthumb', |
|
|
|
data: '' |
|
|
|
@ -588,14 +587,14 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
connect() { |
|
|
|
console.log("111") |
|
|
|
|
|
|
|
var that = this |
|
|
|
var tonum = that.info.recip_phone; |
|
|
|
|
|
|
|
if (that.info.type < 3 && that.info.status == 3) { |
|
|
|
tonum = that.info.pick_phone |
|
|
|
} |
|
|
|
console.log(that.info) |
|
|
|
|
|
|
|
uni.makePhoneCall({ |
|
|
|
phoneNumber: tonum, |
|
|
|
success: (res) => { |
|
|
|
@ -603,7 +602,7 @@ |
|
|
|
}, |
|
|
|
// 失败回调 |
|
|
|
fail: (res) => { |
|
|
|
console.log('调用失败!', JSON.stringify(res)) |
|
|
|
|
|
|
|
} |
|
|
|
}) |
|
|
|
// uni.getStorage({ |
|
|
|
@ -631,7 +630,7 @@ |
|
|
|
makeline() { |
|
|
|
|
|
|
|
var that = this |
|
|
|
console.log(that.info) |
|
|
|
|
|
|
|
//订单类型 1帮送 2帮取 3帮买 4 帮排队 5帮办 |
|
|
|
let endlatitude; |
|
|
|
let endlongitude; |
|
|
|
@ -676,8 +675,7 @@ |
|
|
|
origin: that.longitude + ',' + that.latitude, |
|
|
|
destination: endlongitude + ',' + endlatitude, |
|
|
|
success: function(data) { |
|
|
|
console.log('路径规划完成') |
|
|
|
console.log('距离：' + data.paths[0].distance) |
|
|
|
|
|
|
|
that.scale = that.scalesize(data.paths[0].distance) |
|
|
|
|
|
|
|
var mydistance = 0 |
|
|
|
@ -700,8 +698,6 @@ |
|
|
|
|
|
|
|
that.info.allDistance = allDistance |
|
|
|
|
|
|
|
console.log('mydistance：' + that.info.myDistance) |
|
|
|
console.log('allDistance：' + that.info.allDistance) |
|
|
|
|
|
|
|
var points = []; |
|
|
|
if (data.paths && data.paths[0] && data.paths[0] |
|
|
|
@ -744,7 +740,7 @@ |
|
|
|
fail: () => {}, |
|
|
|
complete: () => {} |
|
|
|
}); |
|
|
|
console.log(data) |
|
|
|
|
|
|
|
} |
|
|
|
}) |
|
|
|
}, 0) |
|
|
|
@ -757,15 +753,15 @@ |
|
|
|
var farray = this.wgs84togcj02(lng, lat) |
|
|
|
lng = farray[0] |
|
|
|
lat = farray[1] |
|
|
|
console.log(farray) |
|
|
|
|
|
|
|
uni.openLocation({ |
|
|
|
latitude: parseFloat(lat), |
|
|
|
longitude: parseFloat(lng), |
|
|
|
success: function() { |
|
|
|
console.log('success'); |
|
|
|
|
|
|
|
}, |
|
|
|
fail(err) { |
|
|
|
console.log(err); |
|
|
|
|
|
|
|
} |
|
|
|
}); |
|
|
|
}, |
|
|
|
@ -991,7 +987,7 @@ |
|
|
|
// #ifdef APP-PLUS |
|
|
|
lag = system_info.appLanguage ? system_info.appLanguage : 'th-TH' |
|
|
|
// #endif |
|
|
|
console.log(lag) |
|
|
|
|
|
|
|
const cur_lang = lag.indexOf('zh') != -1 ? toolData.lang = 'zh' : toolData.lang = 'th' |
|
|
|
|
|
|
|
uni.request({ |
|
|
|
@ -1021,7 +1017,7 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
fail: function(err) { |
|
|
|
console.log(err) |
|
|
|
|
|
|
|
uni.hideLoading(); |
|
|
|
} |
|
|
|
}) |
|
|
|
|
