diff --git a/src/components/reservation_order/reservation_order.vue b/src/components/reservation_order/reservation_order.vue index 131bb34..3a87678 100644 --- a/src/components/reservation_order/reservation_order.vue +++ b/src/components/reservation_order/reservation_order.vue @@ -1,50 +1,50 @@ diff --git a/src/pages/employee/invite_code/invite_code.vue b/src/pages/employee/invite_code/invite_code.vue index f669e03..07f007b 100644 --- a/src/pages/employee/invite_code/invite_code.vue +++ b/src/pages/employee/invite_code/invite_code.vue @@ -6,24 +6,56 @@ 员工扫描二维码加入 - + 欧轩智能场馆 - + @@ -65,7 +97,6 @@ export default { width: 408upx; height: 408upx; margin-bottom: 48upx; - background-color: red; } >view{ text-align: center; @@ -78,6 +109,7 @@ export default { padding-left: 24upx; padding-right: 34upx; height: 128upx; + border: none; border-radius: 10upx; background-color: #fff; @include centerFlex(space-between); diff --git a/src/pages/employee/manage/manage.vue b/src/pages/employee/manage/manage.vue index f29b9d9..abf353e 100644 --- a/src/pages/employee/manage/manage.vue +++ b/src/pages/employee/manage/manage.vue @@ -12,7 +12,7 @@ 添加员工 - + 待审核员工 222 @@ -41,16 +41,16 @@ - + - + - 胡雪儿 + {{k.actual_name}} 权限： - 场馆订{{e}} + 场馆订{{e}} @@ -70,9 +70,41 @@ diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index b602457..e8532c2 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -118,6 +118,7 @@ const app = getApp(); export default { computed: { + }, data() { return { @@ -133,6 +134,9 @@ if(!!app.isLogin())this.getIndexInfo(); }, methods: { + isOrderTab(ID){ + return ID == 3 || ID == 4 || ID == 5 + }, getIndexInfo(){ servers.get({ url: API.calc, @@ -209,6 +213,7 @@ uni.setStorageSync('token',_data.token); setTimeout(_=>{ this.isLogin = app.isLogin(); + this.getIndexInfo(); this.closeAuthor(); }, 1200); }else{ @@ -222,6 +227,7 @@ toPageInfo(tabInfo){ if(!tabInfo.path)return util.showNone('暂未开放！'); let { indexData } = this; + if(this.isOrderTab(tabInfo.id))return util.routeTo(tabInfo.path + `?order_type=${tabInfo.id}`,'nT'); util.routeTo(tabInfo.path,'nT'); }, toStoreList(){ diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue index 43342b0..e10db9c 100644 --- a/src/pages/order_list/order_list.vue +++ b/src/pages/order_list/order_list.vue @@ -11,70 +11,70 @@ - - - 2020.08.01-2020.08.27 - - - + + + {{ + !!periodInfo.start&&!!periodInfo.end ? + `${periodInfo.start} ~ ${periodInfo.end}`: + '请选择时间' + }} + + + 成功交易245笔，退款25笔 - + - + - + - + - - + + - 预约订单 + {{titleName}} - 全部 - 待使用 - 已使用 - 已失效 - 已退款 + {{e.name}} - - + + 日期范围 - + 开始时间 - + - + 截止时间 - + - 确定 + 确定 @@ -86,6 +86,26 @@ import integral_order from '../../components/integral_order/integral_order'; import membership_order from '../../components/membership_order/membership_order'; import util from '../../utils/util'; + import { servers } from '../../js/server'; + import { API } from '../../js/api'; + const resClassify = [ // 预约tab + {id:0,name:'全部'}, + {id:1,name:'待使用'}, + {id:2,name:'已使用'}, + {id:3,name:'已失效'}, + {id:4,name:'已退款'}, + ]; + const memClassify = [ // 会员tab + {id:0,name:'全部'}, + {id:1,name:'使用中'}, + {id:2,name:'已失效'}, + ] + const intClassify = [ // 积分tab + {id:0,name:'全部'}, + {id:1,name:'待发货'}, + {id:2,name:'已发货'}, + {id:3,name:'已完成'}, + ] export default { components: { // 'reservation-order': order.reservation, @@ -93,14 +113,101 @@ 'membership-order': membership_order, 'integral-order': integral_order, }, + computed:{ + classifyArr(){ + let { orderType } = this; + if(orderType == 3)return resClassify; + if(orderType == 4)return memClassify; + if(orderType == 5)return intClassify; + return []; + }, + titleName(){ + let { orderType } = this; + if(orderType == 3)return '预约订单'; + if(orderType == 4)return '会员卡订单'; + if(orderType == 5)return '积分商城订单'; + return '订单' + } + }, + data(){ + return { + isShowClassify: false, + isShowPeriod: false, + periodInfo: { + start: '', + end: '' + }, + orderType: 3, // 3->预约,4->会员,5->积分 + } + }, + onLoad(options){ + this.orderType = options.order_type; + this.$nextTick(_=>{ + uni.setNavigationBarTitle({ + title: this.titleName + }) + }) + this.getReservatioOrder({}); + }, methods: { + startTimeChange(res){ + this.periodInfo.start = res.detail.value; + }, + endTimeChange(res){ + this.periodInfo.end = res.detail.value; + console.log(res) + }, toSearch(){ util.routeTo(`/pages/order_search/order_search`,'nT'); + }, + showClassify(){ + this.isShowClassify = true; + }, + hideClassify(){ + this.isShowClassify = false; + }, + confirmPeriod(){ + let { start, end } = this.periodInfo; + + if( + !start || !end || + new Date(start).getTime()>=new Date(end).getTime() + )return util.showNone('请选择合理时间！'); + + this.hidePeriodModal(); + }, + showPeriodModal(){ + this.isShowPeriod = true; + }, + hidePeriodModal(){ + this.isShowPeriod = false; + }, + getReservatioOrder({ + key='', + begin='', + end='', + status='', + brand_id='37', + verify_user_id='160', + }){ + servers.get({ + url: API.reservationOrder, + data: { + key, + begin, + end, + status, + brand_id, + verify_user_id, + }, + failMsg: '加载失败！' + }) + .then(res=>{ + console.log(res); + }) } }, - onLoad(){ - console.log(reservation_order) - } + } @@ -148,10 +255,8 @@ } .oh-ctrl{ padding: 24upx 40upx 26upx 24upx; - picker{ - margin-bottom: 16upx; - } .oc-period{ + margin-bottom: 16upx; @include centerFlex(flex-start); text{ line-height: 44upx; diff --git a/src/pages/write_off/confirm/confirm.vue b/src/pages/write_off/confirm/confirm.vue index 9d554c9..f3ca365 100644 --- a/src/pages/write_off/confirm/confirm.vue +++ b/src/pages/write_off/confirm/confirm.vue @@ -2,62 +2,134 @@ - 欧轩智能羽毛球馆(永泰店) + {{orderInfo.stadium_name || '-'}} 订单编号： - 20195175645666 + {{orderInfo.order_no || '-'}} 用户昵称： - 周大强 + {{orderInfo.nickname || '-'}} 支付时间： - 2019-05-17 11:12:50 + {{orderInfo.pay_time || '-'}} 预定日期： - 2019-05-18 周五 + {{ZH_order_date((orderInfo&&orderInfo.date) || '') || '-'}} 预定场次： - 1号馆 10:00-11:00；11:00-12:00 - 1号馆 10:00-11:00；11:00-12:00 - 1号馆 10:00-11:00；11:00-12:00 - 1号馆 10:00-11:00；11:00-12:00 - 1号馆 10:00-11:00；11:00-12:00 - 1号馆 10:00-11:00；11:00-12:00 + {{e.venue_name + ' ' }} {{ ' '+e.duration}} - 确认核销 - 不核销 + 确认核销 + 不核销 - + 很抱歉！获取不到二维码订单信息 - 返回 + 返回 diff --git a/src/pages/write_off/list/list.vue b/src/pages/write_off/list/list.vue index d2fdcb7..92e12f3 100644 --- a/src/pages/write_off/list/list.vue +++ b/src/pages/write_off/list/list.vue @@ -3,53 +3,48 @@ - 今日核销订单(2) + 今日核销订单({{orderList.length || 0}}) - + - 欧轩智能羽毛球馆(永泰店) - 已使用 + {{e.stadium_name || '-'}} + {{ZH_status(e.pay_type || '')}} 订单编号： - 20195175645666 + {{e.order_no || '-'}} 用户昵称： - 周大强 + {{e.nickname || '-'}} 支付时间： - 2019-05-17 11:12:50 + {{e.pay_time || '-'}} 预定日期： - 2019-05-18 周五 + {{ZH_order_date(e.date || '') || '-'}} 预定场次： - 1号馆 10:00-11:00；11:00-12:00 - 1号馆 10:00-11:00；11:00-12:00 - 1号馆 10:00-11:00；11:00-12:00 - 1号馆 10:00-11:00；11:00-12:00 - 1号馆 10:00-11:00；11:00-12:00 - 1号馆 10:00-11:00；11:00-12:00 + {{k.venue_name+' '}}{{' '+k.duration}} - 核销时间：2019-05-17 11:12:58 - 共5场次 + 核销时间：{{e.verify_time || '-'}} + 共{{e.sessions.length || 0}}场次 @@ -57,14 +52,46 @@