diff --git a/src/components/reservation_order/reservation_order.vue b/src/components/reservation_order/reservation_order.vue index c2f354f..ae59b04 100644 --- a/src/components/reservation_order/reservation_order.vue +++ b/src/components/reservation_order/reservation_order.vue @@ -4,7 +4,7 @@ {{orderInfo.stadium_name || '-'}} {{zh_order_status(orderInfo.pay_status)}} + >{{zh_order_status(orderInfo)}} @@ -107,21 +107,6 @@ export default { return _obj[`${status}`] || '-' } }, - zh_order_status(){ - // 订单状态 -1已作废0未支付1已支付待使用2已使用3已失效4已退款 - return status =>{ - if(status == 8)return '使用中'; // 20210528 新增状态 - const _obj = { - '-1': '已作废', - '0': '未支付', - '1': '待使用', - '2': '已使用', - '3': '已失效', - '4': '已退款', - } - return _obj[`${status}`] || '-' - } - }, zh_type_name(){ // 预订项目 0场次 1人次 let { orderInfo } = this @@ -141,6 +126,21 @@ export default { }, }, methods:{ + zh_order_status(orderInfo = {}){ + // 订单状态 -1已作废0未支付1已支付待使用2已使用3已失效4已退款 + let _status = orderInfo.pay_status || ''; + if(_status == 3&&orderInfo.is_active_release)return '已失效*'; // 20220929 新增状态 '已失效*' + const _obj = { + '-1': '已作废', + '0': '未支付', + '1': '待使用', + '2': '已使用', + '3': '已失效', + '4': '已退款', + '8': '使用中', // 20210528 新增状态 + } + return _obj[`${_status}`] || '-' + }, detailChange(){ let { orderInfo } = this let _query = {} diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index 7f365da..aca5f50 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -109,6 +109,7 @@ + 释放场地 订单详情 @@ -161,6 +162,38 @@ export default { this.getOrderInfo(); }, methods: { + releaseBtn(){ + util.showModal({ + title: '是否确认释放场地', + content: '释放场地仅是释放场地给其他人预订，如需退款请登录后台操作', + showCancel: true, + success: mRes =>{ + if(mRes.confirm)this.releaseReq(); + } + }) + }, + releaseReq(){ + util.showLoad(); + let { orderInfo } = this; + servers.get({ + url: API.venue.releaseVenue, + data: { + id: 0, // 后端：0就可以了 + brand_id: orderInfo.stadium_order.brand_id || '', + order_no: orderInfo.order_no || '' + }, + isDefaultGet: false, + }) + .then(res=>{ + util.hideLoad(); + if(res.data.code == 0){ + util.showNone(res.data.message || '操作成功！'); + setTimeout(_=>this.$emit('refresh'), 1200); + }else{ + util.showNone(res.data.message || '操作失败！'); + } + }) + }, fixedCancelOccupy: util.debounce(function(){ let { orderInfo, queryInfo } = this; util.showLoad(); diff --git a/src/js/api.js b/src/js/api.js index 9b04f32..daecf1c 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -105,6 +105,10 @@ API['venue'] = { // 20210806 FixedOccupyCancel: `${ORIGIN}/admin/VenueNumberFixedOccupy/cancel`, // 固定场取消订场 + // 20220921 + releaseVenue: `${ORIGIN}/admin/stadium/order/releaseVenue`, // 【1000995】释放场地 + + } // 2.1 核销 diff --git a/src/js/server.js b/src/js/server.js index 9abf488..2c2579d 100644 --- a/src/js/server.js +++ b/src/js/server.js @@ -17,7 +17,7 @@ export class Server { url, data, method, // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT - header: {...header}, // 设置请求的 header // {'custom-header': 'application/json'} + header: {...header, Pcassistant: 2}, // 设置请求的 header // {'custom-header': 'application/json'} success: res=>{ if(islog)console.log('req success---->',{ link: url, diff --git a/src/pages.json b/src/pages.json index 6082199..fe088c7 100644 --- a/src/pages.json +++ b/src/pages.json @@ -278,6 +278,23 @@ ], "subpackages": [ { + "root": "subpackage/income", + "pages": [ + { + "path": "pages/search/search", + "style" : { + "navigationBarTitleText": "收款明细" + } + }, + { + "path": "pages/details_record/details_record", + "style" : { + "navigationBarTitleText": "收款明细" + } + } + ] + }, + { "root": "subpackage/device", "pages": [ { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 05f22e9..1dae59e 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -70,7 +70,6 @@ - + + \ No newline at end of file diff --git a/src/subpackage/income/js/api.js b/src/subpackage/income/js/api.js new file mode 100644 index 0000000..af17381 --- /dev/null +++ b/src/subpackage/income/js/api.js @@ -0,0 +1,9 @@ +import { ORIGIN } from '../../../js/api'; + +export const INCOME_API = { + consumeCountDetailList:`${ORIGIN}/admin/stadium/consumeCountDetail/list`, // 收款明细列表 + consumeRecordSceneLs:`${ORIGIN}/consumeRecordScene/list`, // 收款明细列表 + stadiumList: `${ORIGIN}/admin/stadium/list`, // 店铺列表 +} + +export default { ORIGIN, INCOME_API }; \ No newline at end of file diff --git a/src/subpackage/income/js/server.js b/src/subpackage/income/js/server.js new file mode 100644 index 0000000..55fd0bf --- /dev/null +++ b/src/subpackage/income/js/server.js @@ -0,0 +1,10 @@ +import { Server } from '../../../js/server'; + +class Servers extends Server { + constructor(props){ + super(props) + } +} + + +export default new Servers(); \ No newline at end of file diff --git a/src/subpackage/income/pages/details_record/details_record.vue b/src/subpackage/income/pages/details_record/details_record.vue new file mode 100644 index 0000000..7b149ec --- /dev/null +++ b/src/subpackage/income/pages/details_record/details_record.vue @@ -0,0 +1,685 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/income/pages/search/search.vue b/src/subpackage/income/pages/search/search.vue new file mode 100644 index 0000000..4ea2433 --- /dev/null +++ b/src/subpackage/income/pages/search/search.vue @@ -0,0 +1,183 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/income/static/images/account_null.png b/src/subpackage/income/static/images/account_null.png new file mode 100644 index 0000000..34aad1f Binary files /dev/null and b/src/subpackage/income/static/images/account_null.png differ diff --git a/src/subpackage/income/static/images/bot_arrow.png b/src/subpackage/income/static/images/bot_arrow.png new file mode 100644 index 0000000..832ff96 Binary files /dev/null and b/src/subpackage/income/static/images/bot_arrow.png differ diff --git a/src/subpackage/income/static/images/calendar.png b/src/subpackage/income/static/images/calendar.png new file mode 100644 index 0000000..ddceee6 Binary files /dev/null and b/src/subpackage/income/static/images/calendar.png differ diff --git a/src/subpackage/income/static/images/close.png b/src/subpackage/income/static/images/close.png new file mode 100644 index 0000000..9b9d620 Binary files /dev/null and b/src/subpackage/income/static/images/close.png differ diff --git a/src/subpackage/income/static/images/filter.png b/src/subpackage/income/static/images/filter.png new file mode 100644 index 0000000..76517f8 Binary files /dev/null and b/src/subpackage/income/static/images/filter.png differ diff --git a/src/subpackage/income/static/images/search.png b/src/subpackage/income/static/images/search.png new file mode 100644 index 0000000..78220ee Binary files /dev/null and b/src/subpackage/income/static/images/search.png differ diff --git a/src/subpackage/order/components/club_rental/end_billing/end_billing.vue b/src/subpackage/order/components/club_rental/end_billing/end_billing.vue index e31d5b0..43b7c89 100644 --- a/src/subpackage/order/components/club_rental/end_billing/end_billing.vue +++ b/src/subpackage/order/components/club_rental/end_billing/end_billing.vue @@ -10,7 +10,7 @@ 结算金额(元) - + @@ -46,6 +46,9 @@ export default { } }, methods: { + setAmount(amount){ + this.amount = amount || ''; + }, close(){ this.$emit('close'); }, diff --git a/src/subpackage/order/pages/club_rental/detail/detail.vue b/src/subpackage/order/pages/club_rental/detail/detail.vue index c5b380e..41bae4c 100644 --- a/src/subpackage/order/pages/club_rental/detail/detail.vue +++ b/src/subpackage/order/pages/club_rental/detail/detail.vue @@ -227,7 +227,7 @@ - 结束计费 + 结束计费 @@ -368,6 +369,13 @@ export default { let _order = res.order || { extension: {} }; this.orderInfo = _order; this.isShowEndBilling = isEndBilling; + + // 自动填充金额 + this.$nextTick(_=>{ + if(this.$refs&&this.$refs.endBilling&&this.$refs.endBilling.setAmount){ + this.$refs.endBilling.setAmount(_order.amount || 0); + } + }) }) }, // 20220728 取消退押金操作