From d81915d73a29e0595c1638c1344a141b28d19967 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 十二月 2023 14:40:37 +0800
Subject: [PATCH] Mr.Shi
---
bicycle/pages/index/index.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/bicycle/pages/index/index.vue b/bicycle/pages/index/index.vue
index 06a0229..f511ca6 100644
--- a/bicycle/pages/index/index.vue
+++ b/bicycle/pages/index/index.vue
@@ -8,7 +8,7 @@
<view class="index_nav_a" :style="{ height: statusbarHeight + 'px' }"></view>
<view :style="{ height: navHeight + 'px' }"></view>
<view class="index_nav_b" :style="{ height: navHeight + 'px', lineHeight: navHeight + 'px', top: statusbarHeight + 'px' }">
- <text>鍗拌薄婊ㄦ箹鑷杞�</text>
+ <text>鍗拌薄婊ㄦ箹瓒ｅ懗鑷杞�</text>
</view>
</view>
<view class="index_box">
@@ -36,7 +36,7 @@
<image class="imgfull" :src="info.leaseNoticeUrl" mode="widthFix"></image>
</view>
<view class="index_box_video" v-if="info.leaseVideoUrl">
- <video class="img100b" :show-play-btn="false" :src="info.leaseVideoUrl" enable-danmu danmu-btn controls></video>
+ <video class="img100b" :src="info.leaseVideoUrl" enable-danmu danmu-btn controls></video>
</view>
<view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 600rpx);" v-if="show5"></view>
<view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 660rpx);" v-if="show6"></view>
@@ -327,22 +327,27 @@
this.show3 = false
this.show6 = false
this.show7 = false
- uni.showToast({ title: '缁撶畻鎴愬姛锛�', icon: 'success', duration: 2000 });
- this.refresh()
+ uni.showToast({ title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒', icon: 'success', duration: 2000 });
+ // this.refresh()
}
}).finally(() => {
+ this.refresh()
+ this.show3 = false
this.isDisabled = true
})
}
},
minute() {
this.show3 = false
- console.log(this.info.rideStatus)
if (this.info.rideStatus != -1) {
this.show6 = true
}
},
settlement() {
+ if (this.info.depositStatus === 2) {
+ uni.showToast({ title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒', icon: 'none', duration: 2000 });
+ return
+ }
this.show6 = false
this.show3 = true
},
@@ -353,7 +358,8 @@
});
},
// 璺宠浆
- jump(item) {
+ async jump(item) {
+ await this.refresh()
if (item.id === 3) {
uni.navigateTo({
url: '/pages/pricingRules/pricingRules'
@@ -369,12 +375,17 @@
}
if (this.info.depositStatus === 1) {
this.show3 = true
+ } else if (this.info.depositStatus === 2) {
+ uni.showToast({ title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒', icon: 'none', duration: 2000 });
} else {
uni.showToast({ title: '鎮ㄦ殏鏃犳娂閲戯紝鏃犻渶缁撶畻锛�', icon: 'none', duration: 2000 });
}
} else if (item.id === 1) {
if (this.info.depositStatus === 1) {
uni.showToast({ title: '鎶奸噾宸插厖鍊�', icon: 'none', duration: 2000 });
+ return
+ } else if (this.info.depositStatus === 2) {
+ uni.showToast({ title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒', icon: 'none', duration: 2000 });
return
}
this.show1 = true
@@ -404,7 +415,7 @@
wx.requestPayment({
timeStamp: res.data.timeStamp,
nonceStr: res.data.nonceStr,
- package: res.data.packageValue,
+ package: res.data.packageVal,
signType: 'MD5',
paySign: res.data.paySign,
success (res) {
@@ -466,11 +477,15 @@
}
},
// 鎵爜绉熻溅
- carRental() {
+ async carRental() {
+ await this.refresh()
// 鍒ゆ柇鏈夋病鏈変氦鎶奸噾
if (this.info.depositStatus === 0) {
this.show1 = true
return;
+ } else if (this.info.depositStatus === 2) {
+ uni.showToast({ title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒', icon: 'none', duration: 2000 });
+ return;
}
var that = this;
if (!that.disable) {
--
Gitblit v1.9.3