|
|
@@ -46,6 +46,8 @@ class PunchClocks extends Component {
|
|
|
newArrder: {},
|
|
|
addressLatitude: '',
|
|
|
addressLongitude: '',
|
|
|
+ defaultLat: '28.2424',
|
|
|
+ defaultLng: '112.957',
|
|
|
distance: '',
|
|
|
dtails: {},
|
|
|
data: {
|
|
|
@@ -92,8 +94,8 @@ class PunchClocks extends Component {
|
|
|
console.log(list[i])
|
|
|
this.setState({
|
|
|
data: list[i],
|
|
|
- addressLatitude: parseFloat(list[i].latitude),
|
|
|
- addressLongitude: parseFloat(list[i].longitude),
|
|
|
+ addressLatitude: parseFloat(list[i].latitude || this.state.defaultLat),
|
|
|
+ addressLongitude: parseFloat(list[i].longitude || this.state.defaultLng),
|
|
|
isTips: false,
|
|
|
selectUid: "",
|
|
|
})
|
|
|
@@ -201,8 +203,8 @@ class PunchClocks extends Component {
|
|
|
this.setState({
|
|
|
dtails: v.data,
|
|
|
data,
|
|
|
- addressLatitude: parseFloat(data.latitude),
|
|
|
- addressLongitude: parseFloat(data.longitude),
|
|
|
+ addressLatitude: parseFloat(data.latitude || this.state.defaultLat),
|
|
|
+ addressLongitude: parseFloat(data.longitude || this.state.defaultLng),
|
|
|
}, () => {
|
|
|
Taro.showToast({ title: '切换成功' });
|
|
|
Taro.startLocationUpdate({
|
|
|
@@ -381,8 +383,8 @@ class PunchClocks extends Component {
|
|
|
this.setState({
|
|
|
dtails: v.data,
|
|
|
data,
|
|
|
- addressLatitude: data.latitude,
|
|
|
- addressLongitude: data.longitude,
|
|
|
+ addressLatitude: data.latitude || this.state.defaultLat,
|
|
|
+ addressLongitude: data.longitude || this.state.defaultLng,
|
|
|
}, () => {
|
|
|
fn();
|
|
|
})
|
|
|
@@ -465,7 +467,7 @@ class PunchClocks extends Component {
|
|
|
const newClockIn = !!data.prdcList && data.prdcList.length > 0 ? data.prdcList[0] : {};
|
|
|
if ([5, 6].indexOf(dtails.type) > -1) {
|
|
|
if (!dayjs().isAfter(dayjs(dtails.releaseEnds).add(1, 'day'))) {
|
|
|
- return [1, 2].includes(newClockIn.status) ? '#72cb78' : '#3f82e8'
|
|
|
+ return [1, 2].includes(newClockIn.status) ? '#3f82e8' : '#72cb78'
|
|
|
} else {
|
|
|
return '#828e83'
|
|
|
}
|