|
@@ -245,23 +245,20 @@
|
|
selectedIconPath: 'static/images/common/dingdan@2x.png'
|
|
selectedIconPath: 'static/images/common/dingdan@2x.png'
|
|
})
|
|
})
|
|
var that = this
|
|
var that = this
|
|
-
|
|
|
|
|
|
+
|
|
//获取上一次点击起装卸地
|
|
//获取上一次点击起装卸地
|
|
if (uni.getStorageSync('fPlaceObj')) {
|
|
if (uni.getStorageSync('fPlaceObj')) {
|
|
that.startPlace = uni.getStorageSync('fPlaceObj');
|
|
that.startPlace = uni.getStorageSync('fPlaceObj');
|
|
} else {
|
|
} else {
|
|
- var photol=await permision.checkSystemEnableLocation()
|
|
|
|
- if (uni.getStorageSync('confirm_location')||photol) {
|
|
|
|
- this.getLngLat()
|
|
|
|
- }else{
|
|
|
|
- that.startPlace.selected = '北京'
|
|
|
|
- uni.setStorageSync('fPlaceObj', {
|
|
|
|
- fchoosearea: '全部',
|
|
|
|
- fchoosecity: '市辖区',
|
|
|
|
- fchooseprovince: '北京',
|
|
|
|
- selected: '北京'
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+ that.startPlace.selected = '北京'
|
|
|
|
+ uni.setStorageSync('fPlaceObj', {
|
|
|
|
+ fchoosearea: '全部',
|
|
|
|
+ fchoosecity: '市辖区',
|
|
|
|
+ fchooseprovince: '北京',
|
|
|
|
+ selected: '北京'
|
|
|
|
+ })
|
|
|
|
+
|
|
}
|
|
}
|
|
if (uni.getStorageSync('sPlaceObj')) {
|
|
if (uni.getStorageSync('sPlaceObj')) {
|
|
that.endPlace = uni.getStorageSync('sPlaceObj');
|
|
that.endPlace = uni.getStorageSync('sPlaceObj');
|
|
@@ -423,7 +420,7 @@
|
|
var intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
|
|
var intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
|
|
main.startActivity(intent); // 打开系统设置GPS服务页面
|
|
main.startActivity(intent); // 打开系统设置GPS服务页面
|
|
console.log()
|
|
console.log()
|
|
- }
|
|
|
|
|
|
+ }
|
|
// else {
|
|
// else {
|
|
// uni.setStorageSync('fPlaceObj', {
|
|
// uni.setStorageSync('fPlaceObj', {
|
|
// fchoosearea: '全部',
|
|
// fchoosearea: '全部',
|
|
@@ -968,7 +965,7 @@
|
|
// var photol = await permision.checkSystemEnableLocation()
|
|
// var photol = await permision.checkSystemEnableLocation()
|
|
// console.log("photol",photol)
|
|
// console.log("photol",photol)
|
|
// if (!photol) {
|
|
// if (!photol) {
|
|
- that.get_localtion_permission()
|
|
|
|
|
|
+ that.get_localtion_permission()
|
|
// }
|
|
// }
|
|
} else {
|
|
} else {
|
|
this.upCallback({
|
|
this.upCallback({
|