|
|
@ -49,7 +49,6 @@ Page({ |
|
|
|
effectiveFlag: 1 |
|
|
|
}) |
|
|
|
that.getPhraseList(); //常用语列表
|
|
|
|
that.getPosition(); |
|
|
|
that.clockAddressDetail(); |
|
|
|
that.getPosition() |
|
|
|
}, |
|
|
@ -246,7 +245,7 @@ Page({ |
|
|
|
var clockLongitudeMy = 0; |
|
|
|
var clockLatitudeMy = 0; |
|
|
|
|
|
|
|
console.log(this.data.locationLatitude + '::::::::::::::' + this.data.locationLongitude) |
|
|
|
// console.log(this.data.locationLatitude + '::::::::::::::' + this.data.locationLongitude)
|
|
|
|
if (this.data.locationLatitude > 0 && this.data.locationLongitude > 0) { |
|
|
|
clockLongitudeMy = this.data.locationLongitude; //经度
|
|
|
|
clockLatitudeMy = this.data.locationLatitude; //纬度
|
|
|
@ -262,7 +261,7 @@ Page({ |
|
|
|
s = s * 6378.137; // EARTH_RADIUS;
|
|
|
|
s = Math.round(s * 10000) / 10000; |
|
|
|
s = s.toFixed(4); |
|
|
|
console.log(s + "::::::::::::::::::" + this.data.signin.clockRadius) |
|
|
|
// console.log(s + "::::::::::::::::::" + this.data.signin.clockRadius)
|
|
|
|
if (s * 1000 > this.data.signin.clockRadius) { |
|
|
|
this.setData({ |
|
|
|
effectiveFlag: 0 |
|
|
|