|
@@ -77,7 +77,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
<view class="confirm-text">
|
|
<view class="confirm-text">
|
|
|
<view class="text-title">充值金额由门店收取和管理</view>
|
|
<view class="text-title">充值金额由门店收取和管理</view>
|
|
|
- <view class="text-desc">保证余额安全是门店责任，与本小程序无关，小程序只是门店收款和登记工具</view>
|
|
|
|
|
|
|
+ <view class="text-desc">保证资金安全是门店责任，与小程序无关，本小程序只是门店收款和登记工具</view>
|
|
|
</view>
|
|
</view>
|
|
|
<view class="confirm-btn-wrap">
|
|
<view class="confirm-btn-wrap">
|
|
|
<button class="confirm-btn" @click="handleConfirmRecharge">知道了，继续充值</button>
|
|
<button class="confirm-btn" @click="handleConfirmRecharge">知道了，继续充值</button>
|
|
@@ -374,21 +374,9 @@ export default {
|
|
|
},
|
|
},
|
|
|
// 选择福利套餐
|
|
// 选择福利套餐
|
|
|
selectWelfare(info) {
|
|
selectWelfare(info) {
|
|
|
- // 防重复请求：5秒内禁止重复调用
|
|
|
|
|
- const currentTime = Date.now()
|
|
|
|
|
- const timeDiff = currentTime - this.lastSelectWelfareTime
|
|
|
|
|
-
|
|
|
|
|
- if (timeDiff < 5000 && this.lastSelectWelfareTime > 0) {
|
|
|
|
|
- const remainingTime = Math.ceil((5000 - timeDiff) / 1000)
|
|
|
|
|
- this.$msg(`请 ${remainingTime}秒 后再试`)
|
|
|
|
|
- return
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- // 更新最后调用时间
|
|
|
|
|
- this.lastSelectWelfareTime = currentTime
|
|
|
|
|
-
|
|
|
|
|
this.amount = info.recharge.toString()
|
|
this.amount = info.recharge.toString()
|
|
|
- this.wexinPayFn()
|
|
|
|
|
|
|
+ this.handleWelfareModal()
|
|
|
|
|
+ this.showPayConfirm()
|
|
|
},
|
|
},
|
|
|
// 关闭福利弹框
|
|
// 关闭福利弹框
|
|
|
closeWelfareModal() {
|
|
closeWelfareModal() {
|
|
@@ -430,7 +418,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
.shop-logo-wrap {
|
|
.shop-logo-wrap {
|
|
|
- padding-bottom: 20upx;
|
|
|
|
|
|
|
+ padding-left: 10upx;
|
|
|
@include disFlex(center, center);
|
|
@include disFlex(center, center);
|
|
|
.logo-img {
|
|
.logo-img {
|
|
|
width: 100%;
|
|
width: 100%;
|
|
@@ -438,8 +426,8 @@ export default {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
.logo {
|
|
.logo {
|
|
|
- width: 80upx;
|
|
|
|
|
- height: 80upx;
|
|
|
|
|
|
|
+ width: 60upx;
|
|
|
|
|
+ height: 60upx;
|
|
|
border-radius: 10upx;
|
|
border-radius: 10upx;
|
|
|
margin-left: 10upx;
|
|
margin-left: 10upx;
|
|
|
}
|
|
}
|
|
@@ -773,7 +761,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.tip-icon {
|
|
.tip-icon {
|
|
|
- font-size: 32upx;
|
|
|
|
|
|
|
+ font-size: 46upx;
|
|
|
margin-right: 12upx;
|
|
margin-right: 12upx;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
@@ -899,7 +887,7 @@ export default {
|
|
|
.welfare-gift {
|
|
.welfare-gift {
|
|
|
font-size: 30upx;
|
|
font-size: 30upx;
|
|
|
color: #ff6b6b;
|
|
color: #ff6b6b;
|
|
|
- font-weight: 580;
|
|
|
|
|
|
|
+ font-weight: 620;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
