|
|
@@ -56,6 +56,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
|
|
|
|
|
|
|
|
|
const [showDetailModal, setShowDetailModal] = useState(false)
|
|
|
+ const [showStageDetail, setShowStageDetail] = useState(false)
|
|
|
// const [locationDetail, setLocationDetail] = useState(null)
|
|
|
|
|
|
const [nightDate, setNightDate] = useState(new Date())
|
|
|
@@ -260,7 +261,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
|
|
|
}
|
|
|
|
|
|
function footer() {
|
|
|
- return <View className='day_night_card_footer'>
|
|
|
+ return <View className='day_night_card_footer' onClick={tapFooter}>
|
|
|
<Text style={{ color: '#9E9E9E', fontSize: rpxToPx(20) }}>{
|
|
|
// !isMember ? t('feature.track_time_duration.third_ring.member_desc') :
|
|
|
authInfo && (authInfo as any).lat ? t('feature.track_time_duration.third_ring.base_location_desc') :
|
|
|
@@ -275,7 +276,10 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
|
|
|
</View>
|
|
|
}
|
|
|
|
|
|
- function tapCard(e) {
|
|
|
+ function tapFooter(e) {
|
|
|
+ if (process.env.TARO_ENV == 'weapp') {
|
|
|
+ e.stopPropagation()
|
|
|
+ }
|
|
|
if (!user.isLogin) {
|
|
|
jumpPage('/pages/account/ChooseAuth', 'ChooseAuth', navigation)
|
|
|
return
|
|
|
@@ -305,6 +309,19 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
|
|
|
})
|
|
|
}
|
|
|
|
|
|
+ function tapCard(e) {
|
|
|
+ if (process.env.TARO_ENV == 'weapp') {
|
|
|
+ e.stopPropagation()
|
|
|
+ }
|
|
|
+ if (!user.isLogin) {
|
|
|
+ jumpPage('/pages/account/ChooseAuth', 'ChooseAuth', navigation)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (props.isNight && !nightStore.showNightRing || !props.isNight && !dayStore.showDayRing) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
function auth() {
|
|
|
Taro.chooseLocation({
|
|
|
success: function (res) {
|
|
|
@@ -320,7 +337,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
|
|
|
address: res.address,
|
|
|
date_start: strYesterday,
|
|
|
date_end: strTomorrow,
|
|
|
- coordinate_system_standard:'GCJ-02'
|
|
|
+ coordinate_system_standard: 'GCJ-02'
|
|
|
}).then(data => {
|
|
|
updateDate(data);
|
|
|
locationDetail = data;
|
|
|
@@ -676,22 +693,22 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
|
|
|
e.stopPropagation()
|
|
|
// setExpand(e.detail.value)
|
|
|
// if (props.isNight) {
|
|
|
- dispatch(showNight(e.detail.value))
|
|
|
+ dispatch(showNight(e.detail.value))
|
|
|
// }
|
|
|
// else {
|
|
|
- dispatch(showDay(e.detail.value))
|
|
|
+ dispatch(showDay(e.detail.value))
|
|
|
// }
|
|
|
|
|
|
|
|
|
Taro.setStorage({
|
|
|
- key: 'showNightRing',
|
|
|
+ key: 'showNightRing',
|
|
|
data: e.detail.value
|
|
|
})
|
|
|
Taro.setStorage({
|
|
|
- key: 'showDayRing',
|
|
|
+ key: 'showDayRing',
|
|
|
data: e.detail.value
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
|
|
|
if (user.isLogin) {
|
|
|
uploadPerm({ show_ring: e.detail.value })
|