|
|
@@ -149,24 +149,12 @@
|
|
|
type:"gcj02",
|
|
|
success : function (res) {
|
|
|
uni.hideLoading();
|
|
|
- console.log("定位返回信息:", res)
|
|
|
- // alert(res.longitude + "," + res.latitude )
|
|
|
- //#ifdef APP-PLUS
|
|
|
- ALog?.info({msg:res})
|
|
|
- //#endif
|
|
|
- // that.payeeinfo.longitude = res.longitude;
|
|
|
- // that.payeeinfo.latitude = res.latitude;
|
|
|
var dst = `${that.payeeinfo.latitude},${that.payeeinfo.longitude}`;
|
|
|
var src = res.latitude + ',' + res.longitude;
|
|
|
var locRet = location?.distance?.(src, dst);
|
|
|
that.positionInfo = true;
|
|
|
- // console.log('locRet',locRet);
|
|
|
- ALog?.info({msg:'计算距离:' + locRet.distance})
|
|
|
- ALog?.info({msg:'打开距离:' + that.payeeinfo.workDistance})
|
|
|
if(locRet.distance <= that.payeeinfo.workDistance){//在打卡范围内
|
|
|
that.outPosition = false;
|
|
|
- console.log('that.workType',that.workType);
|
|
|
- // debugger;
|
|
|
if(that.workType==1){
|
|
|
let workStartTime = new Date(that.payeeinfo.workStartTime.replace(/-/g,'/'));
|
|
|
if(that.currentTime<=workStartTime.getTime()){
|
|
|
@@ -259,9 +247,8 @@
|
|
|
});
|
|
|
},
|
|
|
customBack(){
|
|
|
- this.$u.route({
|
|
|
- // type:'switchTab',
|
|
|
- url: 'pages/index/index'
|
|
|
+ uni.navigateBack({
|
|
|
+ delta: 1
|
|
|
});
|
|
|
},
|
|
|
getPunchInfo(roadNo){
|
aleyds