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

add order

account
刘嘉炜 4 years ago
parent
ba61532a27
commit
5c930bed15
4 changed files with 154 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/components/order_list/club_rental/club_rental.vue
  2. 2
      src/pages/order_list/order_list.vue
  3. 3
      src/subpackage/order/js/api.js
  4. 200
      src/subpackage/order/pages/club_rental/detail/detail.vue

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

@ -11,12 +11,24 @@
<a-line :value="orderInfo.order_no || '-'"> <a-line :value="orderInfo.order_no || '-'">
<block slot="name">订单编号：</block> <block slot="name">订单编号：</block>
</a-line> </a-line>
<a-line :value="orderInfo.rent_duration || '-'">
<block slot="name">租借时长：</block>
</a-line>
<a-line :value="orderInfo.start_time || '-'">
<block slot="name">租借时间：</block>
</a-line>
<!-- order_type： deposit 押金订单 其他为租用 -->
<block v-if="orderInfo.order_type == 'deposit'">
<a-line :value="'押金'">
<block slot="name">类型：</block>
</a-line>
<a-line :value="orderInfo.pay_time || '-'">
<block slot="name">支付时间：</block>
</a-line>
</block>
<block v-else>
<a-line :value="orderInfo.rent_duration || '-'">
<block slot="name">租借时长：</block>
</a-line>
<a-line :value="orderInfo.start_time || '-'">
<block slot="name">租借时间：</block>
</a-line>
</block>
</view> </view>
<view class="vcc-total"> <view class="vcc-total">
<view class="vt-view"><text class="vv-text">合计支付：</text>￥{{ orderInfo.pay_amount || '0' }}</view> <view class="vt-view"><text class="vv-text">合计支付：</text>￥{{ orderInfo.pay_amount || '0' }}</view>

2
src/pages/order_list/order_list.vue
View File

@ -410,7 +410,7 @@
// 设备接口/不同模板 // 设备接口/不同模板
isNotDeviceTemp(){ isNotDeviceTemp(){
let { orderType } = this; let { orderType } = this;
return orderType == 7
return orderType == 7 || orderType == 16
}, },
// 请求列表订单参数 // 请求列表订单参数
getQueryForList(){ getQueryForList(){

3
src/subpackage/order/js/api.js
View File

@ -8,7 +8,7 @@ export const ORDER_API = {
userValueCardDeduct:`${ORIGIN}/admin/userValueCard/deduct`, // 用户储值卡-扣费_copy userValueCardDeduct:`${ORIGIN}/admin/userValueCard/deduct`, // 用户储值卡-扣费_copy
userValueCardRecharge:`${ORIGIN}/admin/userValueCard/recharge`, // 用户储值卡-充值_copy userValueCardRecharge:`${ORIGIN}/admin/userValueCard/recharge`, // 用户储值卡-充值_copy
momentOrderInfo:`${ORIGIN}/admin/perfect/moment/order/get`, // 后台-高光时刻订单详情_copy momentOrderInfo:`${ORIGIN}/admin/perfect/moment/order/get`, // 后台-高光时刻订单详情_copy
hardwareOrderInfo:`${ORIGIN}/admin/stadium/hardware/order/details`, // 硬件管理-订单详情_copy
hardwareOrderInfo:`${ORIGIN}/admin/assistant/hardware/order/get`, // 硬件管理-订单详情_copy
rentballRefundDeposit:`${ORIGIN}/admin/stadium/rentball/order/refundDeposit`, // 退押金-后台 rentballRefundDeposit:`${ORIGIN}/admin/stadium/rentball/order/refundDeposit`, // 退押金-后台
hardwareOrderGet:`${ORIGIN}/admin/assistant/hardware/order/get`, // 硬件订单详情 储物柜/售货柜/水阀/咖啡机/租售柜 hardwareOrderGet:`${ORIGIN}/admin/assistant/hardware/order/get`, // 硬件订单详情 储物柜/售货柜/水阀/咖啡机/租售柜
lockEndBill:`${ORIGIN}/admin/stadium/locker/endBill`, // 储物柜-结束计费 lockEndBill:`${ORIGIN}/admin/stadium/locker/endBill`, // 储物柜-结束计费
@ -21,6 +21,7 @@ export const ORDER_API = {
shop2OrderLogistics:`${ORIGIN}/admin/shop2/orderLogistics`, // 商城订单管理 - 发货_ shop2OrderLogistics:`${ORIGIN}/admin/shop2/orderLogistics`, // 商城订单管理 - 发货_
logisticsCompanyLs:`${ORIGIN}/shop2/logisticsCompany/List`, // 商城订单管理 - 快递公司列表 logisticsCompanyLs:`${ORIGIN}/shop2/logisticsCompany/List`, // 商城订单管理 - 快递公司列表
orderGoodsRefund:`${ORIGIN}/admin/shop2/orderGoodsRefund`, // 商城-商品退款_copy orderGoodsRefund:`${ORIGIN}/admin/shop2/orderGoodsRefund`, // 商城-商品退款_copy
rentballOrderEnd:`${ORIGIN}/admin/assistant/rentball/order/end`, // 租球机-结束计费
} }

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

@ -2,77 +2,110 @@
<view class="club-rental"> <view class="club-rental">
<view class="cr-header cr-box"> <view class="cr-header cr-box">
<view class="ch-stadium"> <view class="ch-stadium">
<image mode="aspectFit" :src="orderInfo.extension.stadium_logo"></image>
<view>{{ orderInfo.extension.stadium_name || '-' }}</view>
<image mode="aspectFit" :src="orderInfo.stadium_logo"></image>
<view>{{ orderInfo.stadium_name || '-' }}</view>
</view> </view>
<view class="ch-user"> <view class="ch-user">
<view class="cu-line"> <view class="cu-line">
<view><text>手机号码：</text>{{ orderInfo.mobile || '-' }}</view> <view><text>手机号码：</text>{{ orderInfo.mobile || '-' }}</view>
<view>退款完成</view>
<view>{{ orderInfo.extension.status_text || '-' }}</view>
</view> </view>
<view class="cu-line"> <view class="cu-line">
<view><text>用户昵称：</text>{{ orderInfo.extension.nickname || '-' }}</view> <view><text>用户昵称：</text>{{ orderInfo.extension.nickname || '-' }}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="cr-rent-info cr-box">
<view class="cr-tit">租用详情</view>
<a-line :value="orderInfo.hardware_name || '-'">
<block slot="name">设备名称：</block>
</a-line>
<a-line :value="'篮球'">
<block slot="name">租用设备：</block>
</a-line>
<a-line :value="orderInfo.cabinet_name || '-'">
<block slot="name">柜子编号：</block>
</a-line>
<a-line :value="orderInfo.deposit_order_no || '-'">
<block slot="name">订单编号：</block>
</a-line>
<a-line :value="orderInfo.start_time || '-'">
<block slot="name">租借时间：</block>
</a-line>
<a-line :value="orderInfo.end_time || '-'">
<block slot="name">归还时间：</block>
</a-line>
<a-line :value="orderInfo.end_time || '-'">
<block slot="name">租借时长：</block>
</a-line>
</view>
<view class="cr-box cr-expense-info">
<view class="cr-tit">费用详情</view>
<a-line :value="orderInfo.extension.locker_price_hint || '-'">
<block slot="name">收费标准： </block>
</a-line>
<a-line :value="'¥60'">
<block slot="name">产生费用：</block>
</a-line>
<view class="cei-line">
<view>积分抵扣</view>
<view>¥{{ orderInfo.deduction_amount || 0 }}</view>
</view>
<view class="cei-line">
<view>折扣金额</view>
<view>-¥{{ orderInfo.discount_amount || 0 }}</view>
<block v-if="orderInfo.order_type == 'deposit'">
<view class="cr-box cr-expense-info">
<view class="cr-tit">租用详情</view>
<a-line :value="orderInfo.cabinet.rent_ball_price.goods_name || '-'">
<block slot="name">租用设备：</block>
</a-line>
<a-line :value="orderInfo.deposit_order_no || '-'">
<block slot="name">订单编号：</block>
</a-line>
<a-line :value="'￥' + (orderInfo.extension.buy_price || 0)">
<block slot="name">押金金额：</block>
</a-line>
<view class="cei-line">
<view>积分抵扣</view>
<view>¥{{ orderInfo.deduction_amount || 0 }}</view>
</view>
<view class="cei-line">
<view>折扣金额</view>
<view>-¥{{ orderInfo.discount_amount || 0 }}</view>
</view>
<view class="cei-line">
<view>优惠券优惠</view>
<view>-¥{{ orderInfo.coupons_amount || 0 }}</view>
</view>
<view class="cei-total">
<text>合计支付：</text>￥{{ orderInfo.pay_amount || 0 }}
</view>
</view> </view>
<view class="cei-line">
<view>优惠券优惠</view>
<view>-¥{{ orderInfo.coupons_amount || 0 }}</view>
</block>
<block v-else>
<view class="cr-rent-info cr-box">
<view class="cr-tit">租用详情</view>
<a-line :value="orderInfo.hardware_name || '-'">
<block slot="name">设备名称：</block>
</a-line>
<a-line :value="orderInfo.cabinet.rent_ball_price.goods_name || '-'">
<block slot="name">租用设备：</block>
</a-line>
<a-line :value="orderInfo.cabinet.cabinet_name || '-'">
<block slot="name">柜子编号：</block>
</a-line>
<a-line :value="orderInfo.order_no || '-'">
<block slot="name">订单编号：</block>
</a-line>
<a-line :value="orderInfo.start_time || '-'">
<block slot="name">租借时间：</block>
</a-line>
<a-line :value="orderInfo.end_time || '-'">
<block slot="name">归还时间：</block>
</a-line>
<a-line :value="orderInfo.rent_duration || '-'">
<block slot="name">租借时长：</block>
</a-line>
</view> </view>
<view class="cei-total">
<text>合计支付：</text>￥{{ orderInfo.pay_amount || 0 }}
<view class="cr-box cr-expense-info">
<view class="cr-tit">费用详情</view>
<a-line :value="orderInfo.extension.cost_standard || '-'">
<block slot="name">收费标准： </block>
</a-line>
<a-line :value="orderInfo.amount ">
<block slot="name">产生费用：</block>
</a-line>
<a-line :value="orderInfo.pay_amount " v-if="orderInfo.order_type == 'buy'&&orderInfo.pay_status == 2">
<block slot="name">购买金额：</block>
</a-line>
<view class="cei-line">
<view>积分抵扣</view>
<view>¥{{ orderInfo.deduction_amount || 0 }}</view>
</view>
<view class="cei-line">
<view>折扣金额</view>
<view>¥{{ orderInfo.discount_amount || 0 }}</view>
</view>
<view class="cei-line">
<view>优惠券优惠</view>
<view>¥{{ orderInfo.coupons_amount || 0 }}</view>
</view>
<view class="cei-total">
<text>合计支付：</text>￥{{ orderInfo.pay_amount || 0 }}
</view>
</view> </view>
</view>
</block>
<view class="cr-box cr-pay-info"> <view class="cr-box cr-pay-info">
<view class="cr-tit">费用详情</view>
<view class="cr-tit">支付详情</view>
<view class="cpi-line"> <view class="cpi-line">
<view>订单编号</view> <view>订单编号</view>
<view>{{ orderInfo.order_no || '-' }}</view> <view>{{ orderInfo.order_no || '-' }}</view>
</view> </view>
<view class="cpi-line"> <view class="cpi-line">
<view>支付方式</view> <view>支付方式</view>
<view>{{ orderInfo.pay_type || '-' }}</view>
<view>{{ payTypeTxt(orderInfo.pay_type) }}</view>
</view> </view>
<view class="cpi-line"> <view class="cpi-line">
<view>支付时间</view> <view>支付时间</view>
@ -82,20 +115,25 @@
<view>交易流水号</view> <view>交易流水号</view>
<view>{{ orderInfo.trade_no || '-' }}</view> <view>{{ orderInfo.trade_no || '-' }}</view>
</view> </view>
<view class="cpi-line">
<view>退款单号</view>
<view>{{ orderInfo.refund_no || '-' }}</view>
</view>
<view class="cpi-line">
<view>退款时间</view>
<view>{{ orderInfo.refund_time || '-' }}</view>
</view>
<view class="cpi-line">
<view>退款金额</view>
<view>￥{{ orderInfo.refund_amount || 0 }}</view>
</view>
<block v-if="orderInfo.pay_status == 4">
<view class="cpi-line">
<view>退款单号</view>
<view>{{ orderInfo.refund_no || '-' }}</view>
</view>
<view class="cpi-line">
<view>退款时间</view>
<view>{{ orderInfo.refund_time || '-' }}</view>
</view>
<view class="cpi-line">
<view>退款金额</view>
<view>￥{{ orderInfo.refund_amount || 0 }}</view>
</view>
</block>
</view> </view>
<view class="cr-btn" @click="depositRefundBtn">退押金</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 != 'deposit'&&orderInfo.pay_status == 1 || true">结束计费</view>
</view> </view>
</template> </template>
@ -104,6 +142,8 @@ import { ORDER_API } from '../../../js/api';
import server from '../../../js/server'; import server from '../../../js/server';
import a_line from '../../../../../components/order_list/a_line/a_line.vue'; import a_line from '../../../../../components/order_list/a_line/a_line.vue';
import util from '../../../../../utils/util'; import util from '../../../../../utils/util';
// 租用中 1 已完成2 已退款4
// 押金类型只有2,4
export default { export default {
components: { components: {
'a-line': a_line, 'a-line': a_line,
@ -111,7 +151,8 @@ export default {
data(){ data(){
return { return {
orderInfo: { orderInfo: {
extension: {}
extension: {},
cabinet: {},
} }
} }
}, },
@ -119,14 +160,38 @@ export default {
this.getOrderInfo(options.order_no); this.getOrderInfo(options.order_no);
}, },
methods: { methods: {
overBillingBtn: util.debounce(function(){
util.showLoad();
let { orderInfo } = this;
server.post({
url: ORDER_API.rentballOrderEnd,
data: {
order_no: orderInfo.order_no
},
isDefaultGet: false,
})
.then(res => {
util.hideLoad();
if(res.data.code == 0){
util.showNone(res.data.message || '操作成功！');
setTimeout(_=>this.getOrderInfo(orderInfo.order_no), 1200);
}else{
util.showNone(res.data.message || '操作失败！');
}
})
.catch(util.hideLoad)
}),
payTypeTxt: util.order_pay_type_txt,
getOrderInfo(order_no = ''){ getOrderInfo(order_no = ''){
util.showLoad();
server.get({ server.get({
url: ORDER_API.hardwareOrderInfo, url: ORDER_API.hardwareOrderInfo,
data: { order_no }, data: { order_no },
failMsg: '加载失败！' failMsg: '加载失败！'
}) })
.then(res=>{ .then(res=>{
let _order = res.order || { extension: {} };
util.hideLoad();
let _order = res || { extension: {} };
this.orderInfo = _order; this.orderInfo = _order;
}) })
}, },
@ -143,6 +208,7 @@ export default {
.then(res => { .then(res => {
util.hideLoad(); util.hideLoad();
if(res.data.code == 0){ if(res.data.code == 0){
setTimeout(_=>this.getOrderInfo(orderInfo.order_no), 1200);
util.showNone(res.data.message || '操作成功！'); util.showNone(res.data.message || '操作成功！');
}else{ }else{
util.showNone(res.data.message || '操作失败！'); util.showNone(res.data.message || '操作失败！');
@ -199,7 +265,7 @@ export default {
} }
&+view{ &+view{
flex-shrink: 0; flex-shrink: 0;
color: #EA5061;
color: $themeColor;
} }
} }
} }

Write Preview
Loading…
Cancel
Save