|
@@ -73,9 +73,9 @@ export default {
|
|
|
},
|
|
|
close() {
|
|
|
this.show = false
|
|
|
- const arr_lbs_end_time = []
|
|
|
+ var arr_lbs_end_time = []
|
|
|
if (uni.getStorageSync('lbs_end_time')) {
|
|
|
- arr_lbs_end_time = JSON.parse(uni.getStorageSync('lbs_end_time'))
|
|
|
+ arr_lbs_end_time = uni.getStorageSync('lbs_end_time')
|
|
|
arr_lbs_end_time.push({
|
|
|
lbsId: this.$store.state?.lbsId,
|
|
|
time: new Date().getTime()
|
|
@@ -100,18 +100,36 @@ export default {
|
|
|
arr_lbs_end_time = uni.getStorageSync('lbs_end_time')
|
|
|
console.log(666)
|
|
|
console.log('arr_lbs_end_time::', uni.getStorageSync('lbs_end_time'))
|
|
|
- arr_lbs_end_time.forEach(element => {
|
|
|
- if (element.lbsId === this.$store.state?.lbsId) {
|
|
|
+ const arr_lbsId = arr_lbs_end_time.filter(element => {
|
|
|
+ return element.lbsId === this.$store.state?.lbsId
|
|
|
+ })
|
|
|
+ if (arr_lbsId.length > 0) {
|
|
|
console.log(777)
|
|
|
- if (element.time < nowTime00) {
|
|
|
+ if (arr_lbsId[0].time < nowTime00) {
|
|
|
this.show = true
|
|
|
console.log(333)
|
|
|
} else {
|
|
|
console.log(444)
|
|
|
this.show = false
|
|
|
}
|
|
|
- }
|
|
|
- });
|
|
|
+ } else {
|
|
|
+ this.show = true
|
|
|
+ }
|
|
|
+ console.log('arr_lbsId:::', arr_lbsId, this.$store.state?.lbsId)
|
|
|
+ // arr_lbs_end_time.forEach(element => {
|
|
|
+ // if (this.$store.state?.lbsId === element.lbsId) {
|
|
|
+ // console.log(777)
|
|
|
+ // if (element.time < nowTime00) {
|
|
|
+ // this.show = true
|
|
|
+ // console.log(333)
|
|
|
+ // } else {
|
|
|
+ // console.log(444)
|
|
|
+ // this.show = false
|
|
|
+ // }
|
|
|
+ // } else {
|
|
|
+
|
|
|
+ // }
|
|
|
+ // });
|
|
|
} else {
|
|
|
this.show = true
|
|
|
}
|
|
@@ -168,7 +186,7 @@ export default {
|
|
|
}
|
|
|
if (window.__wxjs_environment === 'miniprogram') {
|
|
|
wx.miniProgram.navigateTo({
|
|
|
- "url": "/pages/accumulatePoints/selfServicePoints?redirect=1" // 去 login 页面 1 去登录
|
|
|
+ "url": "/pages/accumulatePoints/selfServicePoints?redirect=1&backUrl=pages/package-parkingFee/parkingFeeWebView" // 去 login 页面 1 去登录
|
|
|
})
|
|
|
}
|
|
|
if (isAlipayClient) {
|
|
@@ -187,7 +205,7 @@ export default {
|
|
|
<style scoped>
|
|
|
.box {
|
|
|
position: absolute;
|
|
|
- z-index: 10000;
|
|
|
+ z-index: 1000;
|
|
|
width: calc(100vw - 84px);
|
|
|
padding: 8px 20px;
|
|
|
height: 80px;
|