APP
/
ox_zhiNengZhuShou
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

fix 租球订单

tags/v1.1.30
刘嘉炜 3 years ago
parent
d8b869ec66
commit
ab0658b8f9
3 changed files with 123 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/components/order_list/club_rental/club_rental.vue
  2. 150
      src/subpackage/order/pages/club_rental/detail/detail.vue
  3. 21
      src/subpackage/order/pages/stored_value_card/detail/detail.vue

4
src/components/order_list/club_rental/club_rental.vue
View File

@ -1,7 +1,7 @@
<template>
<!-- 租球机 -->
<view class="club-rental-container" @click="toInfo(0)">
<a-header :source="orderInfo.source || '-'" :status="orderInfo.extension.status_text || '-'">
<a-header :source="orderInfo.stadium_name || '-'" :status="orderInfo.extension.status_text || '-'">
<view slot="line" class="crc-line">
<image class="cl-img" mode="aspectFit" src="/static/images/icon/location.png"></image>
<view class="cl-view">{{ orderInfo.hardware_name || '-' }}</view>
@ -34,7 +34,7 @@
<view class="vcc-total" v-if="orderInfo.pay_status != 1">
<view class="vt-view"><text class="vv-text">合计支付：</text>￥{{ orderInfo.pay_amount || '0' }}</view>
</view>
<view class="vcc-end-btn" v-if="orderInfo.order_type == 'rent'&&orderInfo.pay_status == 0">
<view class="vcc-end-btn" v-if="orderInfo.order_type == 'rent'&&orderInfo.status_type == 5">
<view class="veb-item" @click.stop="toInfo(1)">结束计费</view>
</view>
</view>

150
src/subpackage/order/pages/club_rental/detail/detail.vue
View File

@ -27,14 +27,14 @@
</view>
<view class="cei-deposit-line">
<view class="cdl-left">
<text>押金订单号：</text>{{ orderInfo.deposit_order_no || '-' }}
<text>押金订单号：</text>{{ orderInfo.order_no || '-' }}
</view>
</view>
</view>
<!-- status_type 1/2/3 状态都显示 -->
<view class="cr-box cr-expense-info">
<view class="cr-tit">租用详情</view>
<view class="cei-deposit-line">
<view class="cdl-left">
<text>租用商品：</text>{{ orderInfo.cabinet.rent_ball_price.goods_name || '-' }}
@ -56,16 +56,48 @@
</view>
</view>
<view class="cei-deposit-line">
<view class="cdl-left">
<text>订单编号：</text>{{ extension.rent_order_no || '-' }}
</view>
<view class="cdl-right main-color" @click="toDepositOrder(extension.rent_order_no)">
查看租用订单
</view>
<view class="cdl-left">
<text>订单编号：</text>{{ extension.rent_order_no || '-' }}
</view>
<view class="cdl-right main-color" @click="toDepositOrder(extension.rent_order_no)">
查看租用订单
</view>
</view>
</view>
<!-- status_type 2/3 状态显示 -->
<view class="cr-box cr-expense-info" v-if="sType&&sType == 2 || sType&&sType == 3">
<view class="cr-tit">费用详情</view>
<view class="cei-deposit-line">
<view class="cdl-left">
<text>收费标准：</text>{{ extension.cost_standard || '-' }}
</view>
</view>
<view class="cei-deposit-line">
<view class="cdl-left green">
<text>产生费用：</text>￥{{ extension.rent_order.rent_fee || 0 }}
</view>
<view class="cdl-right" v-if="sType&&sType == 3">（产生费用已从押金扣取！）</view>
</view>
<view class="cei-deposit-line" v-if="sType&&sType == 2">
<view class="cdl-left orange">
<text>购买价格：</text>￥{{ orderInfo.pay_amount || 0 }}
</view>
<view class="cdl-right">（购买费用已从押金扣取！）</view>
</view>
<view class="cei-deposit-line">
<view class="cdl-left">
<text>回退押金：</text>￥{{ orderInfo.refund_amount || 0 }}
</view>
</view>
</view>
</block>
<!-- 租用/购买 -->
<block v-else>
<view class="cr-rent-info cr-box">
<view class="cr-tit">租用详情</view>
@ -78,13 +110,13 @@
<a-line :value="orderInfo.cabinet.cabinet_name || '-'">
<block slot="name">柜子编号：</block>
</a-line>
<a-line :value="orderInfo.order_no || '-'">
<!-- <a-line :value="orderInfo.order_no || '-'" v-if="sType&&sType!=5">
<block slot="name">订单编号：</block>
</a-line>
</a-line> -->
<a-line :value="orderInfo.start_time || '-'">
<block slot="name">租借时间：</block>
</a-line>
<a-line :value="orderInfo.end_time || '-'">
<a-line :value="orderInfo.end_time || '-'" v-if="sType&&sType!=5">
<block slot="name">归还时间：</block>
</a-line>
<a-line :value="orderInfo.rent_duration || '-'">
@ -102,12 +134,12 @@
<view class="cdl-left green">
<text>产生费用：</text>￥{{ orderInfo.amount || 0 }}
</view>
<view class="cdl-right" v-if="orderInfo.order_type != 'buy'&&orderInfo.pay_status !=1">
<view class="cdl-right" v-if="orderInfo.order_type != 'buy'&&sType&&sType!=5">
（产生费用已从押金扣取！）
</view>
</view>
<block v-if="orderInfo.pay_status !=1">
<block v-if="sType&&sType!=5&&sType!=4">
<view class="cei-deposit-line" v-if="orderInfo.order_type == 'buy'">
<view class="cdl-left orange">
<text>购买金额：</text>￥{{ orderInfo.buy_price || 0 }}
@ -146,7 +178,9 @@
</view>
</block>
</block>
<!-- 支付详情 -->
<view class="cr-box cr-pay-info">
<view class="cr-tit">支付详情</view>
<view class="cpi-line">
@ -163,14 +197,15 @@
<view>支付时间</view>
<view>{{ orderInfo.pay_time || '-' }}</view>
</view>
<!-- 只有押金订单才显示 -->
<view class="cpi-line" v-if="orderInfo.order_type == 'deposit'">
<view>交易流水号</view>
<view>{{ orderInfo.trade_no || '-' }}</view>
</view>
</block>
</view>
<view class="cr-box cr-pay-info" v-if="orderInfo.pay_status == 4&&orderInfo.order_type == 'deposit'">
<!-- 押金退款信息 （只有押金订单才显示） -->
<view class="cr-box cr-pay-info" v-if="orderInfo.status_type == 3&&orderInfo.order_type == 'deposit'">
<view class="cr-tit">退款信息</view>
<view class="cpi-line">
<view>退款金额</view>
@ -190,8 +225,9 @@
</view>
</view>
<view class="cr-btn" @click="depositRefundBtn" v-if="orderInfo.order_type == 'deposit'&&orderInfo.pay_status == 2">退押金</view>
<view class="cr-btn" @click="overBillingBtn" v-if="orderInfo.order_type == 'rent'&&orderInfo.pay_status == 0">结束计费</view>
<!-- 20220728 取消退押金操作 -->
<!-- <view class="cr-btn" @click="depositRefundBtn" v-if="orderInfo.order_type == 'deposit'&&orderInfo.pay_status == 2">退押金</view> -->
<view class="cr-btn" @click="overBillingBtn" v-if="orderInfo.order_type == 'rent'&&orderInfo.status_type == 5">结束计费</view>
<!-- <view class="cr-btn" @click="overBillingBtn">结束计费</view> -->
<end-billing
@ -205,6 +241,16 @@
</template>
<script>
/*
status_type
{ name: '押金-已完成', value: 1 },
{ name: '押金-已抵扣', value: 2 },
{ name: '押金-已退款', value: 3 },
{ name: '租用-待支付', value: 4 },
{ name: '租用-租用中', value: 5 },
{ name: '租用-已完成', value: 6 },
{ name: '租用-已退款', value: 7 }
*/
import { ORDER_API } from '../../../js/api';
import server from '../../../js/server';
import a_line from '../../../../../components/order_list/a_line/a_line.vue';
@ -219,6 +265,11 @@ export default {
'end-billing': end_billing
},
computed: {
sType(){
let { orderInfo } = this;
if(orderInfo.status_type)return orderInfo.status_type;
return ''
},
deposit_order(){
let { extension } = this;
if(extension.deposit_order)return extension.deposit_order || {};
@ -250,7 +301,7 @@ export default {
uni.setClipboardData({ data });
},
toDepositOrder(orderNo){
util.routeTo(`/subpackage/order/pages/club_rental/detail/detail?order_no=${orderNo}&is_end=0`, 'nT');
util.routeTo(`/subpackage/order/pages/club_rental/detail/detail?order_no=${orderNo}&is_end=0`, 'rT');
},
endBillingBtn: util.debounce(function(e){
this.isShowEndBilling = false;
@ -319,37 +370,38 @@ export default {
this.isShowEndBilling = isEndBilling;
})
},
depositRefundBtn: util.debounce(function(){
util.showModal({
title: '提示',
content: '是否确认退回押金',
success: mRes=>{
if(mRes.confirm)this.refundReq();
}
})
// 20220728 取消退押金操作
// depositRefundBtn: util.debounce(function(){
// util.showModal({
// title: '提示',
// content: '是否确认退回押金',
// success: mRes=>{
// if(mRes.confirm)this.refundReq();
// }
// })
}, 300, true),
refundReq(){
util.showLoad();
let { orderInfo } = this;
server.post({
url: ORDER_API.rentballRefundDeposit,
data: {
order_no: orderInfo.order_no
},
isDefaultGet: false,
})
.then(res => {
util.hideLoad();
if(res.data.code == 0){
setTimeout(_=>this.getOrderInfo(orderInfo.order_no), 1200);
util.showNone(res.data.message || '操作成功！');
}else{
util.showNone(res.data.message || '操作失败！');
}
})
.catch(util.hideLoad)
}
// }, 300, true),
// refundReq(){
// util.showLoad();
// let { orderInfo } = this;
// server.post({
// url: ORDER_API.rentballRefundDeposit,
// data: {
// order_no: orderInfo.order_no
// },
// isDefaultGet: false,
// })
// .then(res => {
// util.hideLoad();
// if(res.data.code == 0){
// setTimeout(_=>this.getOrderInfo(orderInfo.order_no), 1200);
// util.showNone(res.data.message || '操作成功！');
// }else{
// util.showNone(res.data.message || '操作失败！');
// }
// })
// .catch(util.hideLoad)
// }
},
}
</script>

21
src/subpackage/order/pages/stored_value_card/detail/detail.vue
View File

@ -29,7 +29,7 @@
<view class="sl-txt"><text>储值卡名称：</text>{{ cardInfo.card_name || '-' }}</view>
</view>
<view class="svc-line">
<view class="sl-txt"><text>储值卡卡号：</text>{{ cardInfo.card_no || '-' }}</view>
<view class="sl-txt"><text>储值卡卡号：</text>{{ orderInfo.value_card_no || '-' }}</view>
</view>
<view class="svc-line">
<view class="sl-txt"><text>储值卡类型：</text>{{ cardType(cardInfo.card_kind) }}</view>
@ -64,6 +64,25 @@
<view class="sl-txt"><text>微信交易号：</text>{{ orderInfo.trade_no || '-' }}</view>
</view>
</view>
<view class="svc-box" v-for="(e, i) in orderInfo.refunds" :key="i">
<view class="svc-line">
<view class="sl-txt" style="margin-bottom: 20rpx;"><text>退款信息{{i+1}}</text></view>
</view>
<view class="svc-line">
<view class="sl-txt"><text>退款金额：</text>{{ e.amount || 0 }}</view>
</view>
<view class="svc-line">
<view class="sl-txt"><text>退款单号：</text>{{ e.refund_no || '-' }}</view>
</view>
<view class="svc-line">
<view class="sl-txt"><text>退款时间：</text>{{ e.refund_time || '-' }}</view>
</view>
<view class="svc-line">
<view class="sl-txt"><text>退款原因：</text>{{ e.reason || '-' }}</view>
</view>
</view>
</view>
</template>

Write Preview
Loading…
Cancel
Save