续费功能修复

This commit is contained in:
geng.tang@qq.com
2024-01-26 23:01:59 +08:00
parent 7d2668267a
commit 048aa2720b
2 changed files with 6 additions and 5 deletions

View File

@@ -102,7 +102,7 @@
<view class="xieyi"> <view class="xieyi">
<checkbox-group @change="onAgree" style="display: flex; align-items: center;"> <checkbox-group @change="onAgree" style="display: flex; align-items: center;">
<checkbox :checked="agree" />我已同意并阅读<div class="xieyi-text" @click="showXieyi(64)">租赁合同</div><div <checkbox :checked="agree" />我已阅读并同意<div class="xieyi-text" @click="showXieyi(64)">租赁合同</div><div
class="xieyi-text" @click="showXieyi(51)">隐私协议</div> class="xieyi-text" @click="showXieyi(51)">隐私协议</div>
</checkbox-group> </checkbox-group>
</view> </view>
@@ -258,6 +258,10 @@
}, },
async onBuy() { async onBuy() {
const app = this const app = this
if(!this.agree){
app.$error("请先同意租赁合同和隐私协议!")
return
}
const { const {
record, record,
dealerPhone dealerPhone
@@ -290,9 +294,6 @@
const expirationTime = dateFormat('YYYY-mm-dd HH:MM:SS', new Date(time)) const expirationTime = dateFormat('YYYY-mm-dd HH:MM:SS', new Date(time))
app.expirationTime = expirationTime app.expirationTime = expirationTime
addOrder({ addOrder({
orderNo: createOrderNo(), orderNo: createOrderNo(),
merchantCode: record.merchantCode, merchantCode: record.merchantCode,

View File

@@ -518,7 +518,7 @@
<view class="btn-item" @click="handleRentingOut(order)" <view class="btn-item" @click="handleRentingOut(order)"
v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus == 21 && !orderEnd">取消退租</view> v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus == 21 && !orderEnd">取消退租</view>
<view class="btn-item" @click="handleHireEquipment(item.orderId)" <view class="btn-item" @click="handleHireEquipment(order.orderId)"
v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 30 && order.receiptStatus != 21 && !orderEnd && order.orderId >= 28804">我要续费</view> v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 30 && order.receiptStatus != 21 && !orderEnd && order.orderId >= 28804">我要续费</view>
<block v-if="order.orderStatus == OrderStatusEnum.COMPLETED.value && order.isComment == 0"> <block v-if="order.orderStatus == OrderStatusEnum.COMPLETED.value && order.isComment == 0">