|
@@ -1138,11 +1138,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
var that = this;
|
|
var that = this;
|
|
|
this.disabled = true;
|
|
this.disabled = true;
|
|
|
- let loading2 = this.$toast.loading({
|
|
|
|
|
- duration: 0,
|
|
|
|
|
- message: '加载中...',
|
|
|
|
|
- forbidClick: true,
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ this.toastLoading(0, '加载中...', true);
|
|
|
getUserOrgStoreList({
|
|
getUserOrgStoreList({
|
|
|
lat: that.lat,
|
|
lat: that.lat,
|
|
|
lon: that.lon,
|
|
lon: that.lon,
|
|
@@ -1155,8 +1151,8 @@ export default {
|
|
|
genDate: this.genDate,
|
|
genDate: this.genDate,
|
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
|
this.disabled = false;
|
|
this.disabled = false;
|
|
|
|
|
+ this.toastLoading().clear();
|
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
|
- loading2.clear();
|
|
|
|
|
this.loading = false;
|
|
this.loading = false;
|
|
|
if (this.pageNum == '1') {
|
|
if (this.pageNum == '1') {
|
|
|
this.list = [];
|
|
this.list = [];
|
|
@@ -1574,9 +1570,6 @@ export default {
|
|
|
if (val.lat == '' || val.lat == null) {
|
|
if (val.lat == '' || val.lat == null) {
|
|
|
this.lat = location.lat;
|
|
this.lat = location.lat;
|
|
|
this.lon = location.lon;
|
|
this.lon = location.lon;
|
|
|
- } else {
|
|
|
|
|
- this.lat = val.lat;
|
|
|
|
|
- this.lon = val.lon;
|
|
|
|
|
}
|
|
}
|
|
|
// let PointSum = this.twoPointSum(this.lat, this.lon, location.lat, location.lon).toFixed(2);
|
|
// let PointSum = this.twoPointSum(this.lat, this.lon, location.lat, location.lon).toFixed(2);
|
|
|
let PointSumval = this.twoPointSum(
|
|
let PointSumval = this.twoPointSum(
|
|
@@ -1858,9 +1851,6 @@ export default {
|
|
|
if (val.lat == '' || val.lat == null) {
|
|
if (val.lat == '' || val.lat == null) {
|
|
|
that.lat = location.lat;
|
|
that.lat = location.lat;
|
|
|
that.lon = location.lon;
|
|
that.lon = location.lon;
|
|
|
- } else {
|
|
|
|
|
- that.lat = val.lat;
|
|
|
|
|
- that.lon = val.lon;
|
|
|
|
|
}
|
|
}
|
|
|
let PointSum = that
|
|
let PointSum = that
|
|
|
.twoPointSum(that.lat, that.lon, location.lat, location.lon)
|
|
.twoPointSum(that.lat, that.lon, location.lat, location.lon)
|
|
@@ -2108,9 +2098,6 @@ export default {
|
|
|
if (val.lat == '' || val.lat == null) {
|
|
if (val.lat == '' || val.lat == null) {
|
|
|
that.lat = location.lat;
|
|
that.lat = location.lat;
|
|
|
that.lon = location.lon;
|
|
that.lon = location.lon;
|
|
|
- } else {
|
|
|
|
|
- that.lat = val.lat;
|
|
|
|
|
- that.lon = val.lon;
|
|
|
|
|
}
|
|
}
|
|
|
let PointSum = that
|
|
let PointSum = that
|
|
|
.twoPointSum(that.lat, that.lon, location.lat, location.lon)
|
|
.twoPointSum(that.lat, that.lon, location.lat, location.lon)
|