diff --git a/src/components/order_list/a_line/a_line.vue b/src/components/order_list/a_line/a_line.vue
index 53900c3..1c7ffda 100644
--- a/src/components/order_list/a_line/a_line.vue
+++ b/src/components/order_list/a_line/a_line.vue
@@ -56,7 +56,7 @@ export default {
line-height: 52upx;
font-size: 28upx;
color: #1a1a1a;
- @include textHide(1);
+ @include textHide(2);
}
}
diff --git a/src/components/order_list/competition/competition.vue b/src/components/order_list/competition/competition.vue
new file mode 100644
index 0000000..32f9a9b
--- /dev/null
+++ b/src/components/order_list/competition/competition.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+ 订单编号：
+
+
+ 赛事主题：
+
+
+ 赛事类型：
+
+
+ 赛事地址：
+
+
+
+ 支付金额：￥{{ orderInfo.pay_amount || '0' }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/order_list/locker/locker.vue b/src/components/order_list/locker/locker.vue
index 640b3e8..78adfeb 100644
--- a/src/components/order_list/locker/locker.vue
+++ b/src/components/order_list/locker/locker.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/components/order_list/spectacular_monent/spectacular_monent.vue b/src/components/order_list/spectacular_monent/spectacular_monent.vue
index c0951d6..27699ca 100644
--- a/src/components/order_list/spectacular_monent/spectacular_monent.vue
+++ b/src/components/order_list/spectacular_monent/spectacular_monent.vue
@@ -1,7 +1,7 @@
- 购买时间：{{ orderInfo.pay_time || '-' }}
+ 购买时间：{{ orderInfo.pay_time || '-' }}
@@ -69,6 +69,12 @@ export default {
.vcc-info{
padding-top: 20upx;
}
+ .hc-line{
+ margin-top: 12upx;
+ line-height: 34upx;
+ font-size: 24upx;
+ color: #9A9A9D;
+ }
}
.vcc-total{
padding: 10upx 0;
diff --git a/src/js/api.js b/src/js/api.js
index e01de78..f52947e 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -36,7 +36,9 @@ export const API = {
venueCourseOrderList: `${ORIGIN}/admin/venueCourse/orderList`, // 课程订单 - 列表
userValueCardList: `${ORIGIN}/admin/userValueCard/list`, // 用户储值卡-扣费_copy
momentOrderList: `${ORIGIN}/admin/perfect/moment/order/list`, // 后台-高光时刻订单列表_copy
- hardwareOrderList: `${ORIGIN}/admin/stadium/hardware/order/list`, // 硬件管理-订单列表_copy
+ // hardwareOrderList: `${ORIGIN}/admin/stadium/hardware/order/list`, // 硬件管理-订单列表_copy
+ hardwareOrderList: `${ORIGIN}/admin/assistant/hardware/order/list`, // 硬件管理-订单列表_copy
+ appointmentOrderList: `${ORIGIN}/admin/gameAppointment/orderList`, // 赛事订单列表_copy
// 营业额统计
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 31a63ce..3bc0667 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -59,27 +59,16 @@
+
-
@@ -141,6 +130,7 @@
import rent_and_sale from '../../components/order_list/rent_and_sale/rent_and_sale.vue';
import mall from '../../components/order_list/mall/mall.vue';
import device from '../../components/order_list/device/device.vue'; // 售货柜/浴室/咖啡
+ import competition from '../../components/order_list/competition/competition.vue'; // 赛事
import util from '../../utils/util';
import { servers } from '../../js/server';
@@ -164,6 +154,7 @@
'rent-and-sale': rent_and_sale,
'mall': mall,
'device': device,
+ 'competition': competition,
},
computed:{
isStoreInfo(){
@@ -407,6 +398,7 @@
if(type == 18)return API.userValueCardList; // 储值卡订单
if(type == 15)return API.momentOrderList; // 高光时刻
if(this.isDevice())return API.hardwareOrderList; // 硬件管理
+ if(type == 14)return API.appointmentOrderList; // 高光时刻
},
// 是否为设备，统一接口
isDevice(){
@@ -519,6 +511,8 @@
return '咖啡机订单列表';
case 7:
return '储物柜订单列表';
+ case 14:
+ return '赛事订单列表';
default:
return '订单'
}
@@ -552,6 +546,8 @@
return [ {id: '1,4', name: '全部'}, {id: 1, name: '交易成功'}, {id: 4, name: '退款完成 '}];
case 7: // 储物柜 筛选 status ： 全部 1,2,4 寄存中 1 已完成 2 退款完成 4
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '寄存中'}, {id: 2, name: '已完成'}, {id: 4, name: '退款完成 '}];
+ case 14: // 赛事订单列表 订单状态 全部1,2,4 1=进行中 4=已退款 2=已完成
+ return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款 '}];
default:
return []
}
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index 72abfa3..ae5deee 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -11,6 +11,9 @@ export const ORDER_API = {
hardwareOrderInfo:`${ORIGIN}/admin/stadium/hardware/order/details`, // 硬件管理-订单详情_copy
rentballRefundDeposit:`${ORIGIN}/admin/stadium/rentball/order/refundDeposit`, // 退押金-后台
hardwareOrderGet:`${ORIGIN}/admin/assistant/hardware/order/get`, // 硬件订单详情 储物柜/售货柜/水阀/咖啡机/租售柜
+ lockEndBill:`${ORIGIN}/admin/stadium/locker/endBill`, // 储物柜-结束计费
+ currentUser:`${ORIGIN}/admin/assistant/currentUser`, // 获取当前用户信息
+ appointmentOrderInfo:`${ORIGIN}/admin/gameAppointment/orderInfo`, // 赛事订单详情
}
export default ORDER_API;
\ No newline at end of file
diff --git a/src/subpackage/order/pages/events/detail/detail.vue b/src/subpackage/order/pages/events/detail/detail.vue
index e523fa9..573ca91 100644
--- a/src/subpackage/order/pages/events/detail/detail.vue
+++ b/src/subpackage/order/pages/events/detail/detail.vue
@@ -1,44 +1,55 @@
-
+
-
+
保险信息
-
+
姓名：
-
+
身份证号码：
-
+
参赛资料
-
+
姓名：
-
+
手机号码：
-
+
性别：
-
+
体重：
- 资质证书
-
-
-
-
-
-
-
+
+ 资质证书
+
+
+
+
+
-
+
团队负责人信息
@@ -62,43 +73,48 @@
赛事信息
-
+
赛事名称：
-
+
赛事类型：
-
+
赛事地址：
-
+
活动时间：
-
+
活动费用：
赛事信息
-
-
-
-
+
+
+
+
- 合计支付：￥98.99
+ 合计支付：￥{{orderInfo.pay_amount || 0}}
支付详情
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -118,6 +134,52 @@ export default {
's-line': s_line,
'p-line': p_line,
},
+ data(){
+ return {
+ orderInfo: {
+ extension: {},
+ user_info: {},
+ match_ext_msg: {},
+ match_info: {},
+ }
+ }
+ },
+ onLoad(options){
+ this.getInfo(options.order_id)
+ },
+ methods: {
+ // 支付类型
+ payTypeTxt: util.order_pay_type_txt,
+ previewImg(e){
+ uni.previewImage({
+ urls: [img]
+ })
+ },
+ getStatusTxt(status){
+ let _obj = { // 售货柜-> 6/ 浴室 -> 11 / 咖啡 -> 9
+ 'cancel' : '已取消', //已取消 订单超时未支付关闭/用户主动取消
+ 'no_pay' : '待付款', //待付款 下单后
+ 'signing' : '进行中', //进行中的报名中 付款了就是报名中
+ 'matching' : '进行中', //进行中的比赛中 赛事的开始时间到了
+ 'done' : '已取消', //已结束 赛事的结束时间到了
+ 'auto_refund' : '已退款', //已退款-不达人数/队伍数 系统自动退
+ 'back_refund' : '已退款', //已退款-后台主动退款
+ };
+ return _obj[status] || '-'
+ },
+ getInfo(order_id){
+ util.showLoad();
+ server.get({
+ url: ORDER_API.appointmentOrderInfo,
+ data: { id: order_id },
+ failMsg: '加载失败！'
+ })
+ .then(res=>{
+ util.hideLoad();
+ this.orderInfo = res || {};
+ })
+ },
+ }
}
@@ -161,7 +223,6 @@ export default {
margin-bottom: 30upx;
width: 180upx;
height: 180upx;
- background-color: skyblue;
}
}
.eb-btn{
diff --git a/src/subpackage/order/pages/locker/detail/detail.vue b/src/subpackage/order/pages/locker/detail/detail.vue
index 8acf786..0823c3c 100644
--- a/src/subpackage/order/pages/locker/detail/detail.vue
+++ b/src/subpackage/order/pages/locker/detail/detail.vue
@@ -1,95 +1,104 @@
-
+
租用详情
-
+
设备名称：
-
+
柜子编号：
-
+
租借时间：
-
+
归还时间：
-
+
租借时长：
费用详情
-
+
-
-
-
-
- 合计支付：￥5
+
+
+
+
+ 合计支付：￥{{ orderInfo.late_pay_amount || 0 }}
-
-
-
-
+
+
+
+
-
-
-
-
- 合计支付：￥5
+
+
+
+
+ 合计支付：￥{{ orderInfo.pay_amount || 0 }}
-
-
-
-
+
+
+
+
- 结束计费
-
-
+
+ 结束计费
+
+
+
+
结束计费
-
+
操作人：
-
+
时长合计：
-
+
金额合计：
*请输入金额
-
+
- 确认
+ 确认
@@ -100,12 +109,101 @@ import header from '../../../components/header/header.vue';
import a_line from '../../../../../components/order_list/a_line/a_line.vue';
import s_line from '../../../components/s_line/s_line.vue';
import p_line from '../../../components/p_line/p_line.vue';
+import { ORDER_API } from '../../../js/api';
+import server from '../../../js/server';
+import util from '../../../../../utils/util';
export default {
components: {
'o-header': header,
'a-line': a_line,
's-line': s_line,
'p-line': p_line,
+ },
+ data(){
+ return {
+ orderInfo: {},
+ isEndModal: false,
+ iptPrice: '',
+ userInfo: {},
+ }
+ },
+ onLoad(options){
+ this.getInfo(options.order_no);
+ },
+ methods: {
+ // 支付类型
+ status_txt: util.order_pay_type_txt,
+ pay_txt(status){
+ // status 全部 1,2,4 寄存中 1 已完成 2 已退款 4
+ let _obj = {
+ 1: '寄存中',
+ 2: '已完成',
+ 4: '已退款'
+ };
+ return _obj[status] || '-'
+ },
+ openEndModal(){
+ this.isEndModal = true;
+ },
+ closeEndModal(){
+ this.isEndModal = false;
+ },
+ endBtn:util.debounce(function(){
+ this.getCurUserInfo();
+ }, 300, true),
+ refreshInfo(){
+ let { orderInfo } = this;
+ this.closeEndModal();
+ this.getInfo(orderInfo.order_no);
+ },
+ getInfo(order_no){
+ util.showLoad();
+ server.get({
+ url: ORDER_API.hardwareOrderGet,
+ data: { order_no },
+ failMsg: '加载失败！'
+ })
+ .then(res=>{
+ util.hideLoad();
+ this.orderInfo = res || {};
+ })
+ },
+ getCurUserInfo(){
+ util.showLoad();
+ server.get({
+ url: ORDER_API.currentUser,
+ data: { },
+ failMsg: '加载用户信息失败！'
+ })
+ .then(res=>{
+ util.hideLoad();
+ let _data = res || {};
+ this.userInfo = _data;
+ if(_data&&_data.id)this.openEndModal();
+ console.warn('用户信息', res);
+ })
+ },
+ confirmEndBtn: util.debounce(function(){
+ let { orderInfo, iptPrice } = this;
+ if(iptPrice == '')return util.showNone('请输入金额！');
+ util.showLoad();
+ server.get({
+ url: ORDER_API.lockEndBill,
+ data: { order_no: orderInfo.order_no, amount: iptPrice },
+ isDefaultGet: false
+ })
+ .then(res=>{
+ util.hideLoad();
+ if(res.data.code == 0){
+ util.showNone(res.data.message || '操作成功！');
+ setTimeout(this.refreshInfo, 1200);
+ console.warn(res)
+ }else{
+ util.showNone(res.data.message || '操作失败！');
+ }
+ console.warn(res);
+ })
+ }, 300, true),
}
}
@@ -113,9 +211,9 @@ export default {