diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue
index a4a4c17..c2c3a2b 100644
--- a/src/components/site/order_modal/order_modal.vue
+++ b/src/components/site/order_modal/order_modal.vue
@@ -1,7 +1,7 @@
- {{ queryInfo.venueInfo.zh_text || '-' }}
+ {{ getTitle(queryInfo.venueInfo.type) }}
{{ orderInfo.stadium_name || '-' }}
@@ -13,25 +13,53 @@
{{ orderInfo.order_no || '-' }}
-
+
创建时间：
- {{ orderInfo.create_at || '-' }}
+ {{ orderInfo.created_at || '-' }}
-
- 手机号码：
+
+ 验证码：
- {{ orderInfo.phone || '-' }}
+ {{ orderInfo.verifyt_code || '-' }}
-
- 验证码：
+
+ 手机号码：
- {{ orderInfo.verify_code || '-' }}
+ {{ orderInfo.mobile || '-' }}
+
+
+ 是否联动开灯：
+
+ {{ orderInfo.light_up?'是':'否'}}
+
+
+
+ 收取金额：
+
+ {{ orderInfo.amount || '0' }}
+
+
+
+ 占用原因：
+
+ {{ orderInfo.reason || '-' }}
+
+
+
+ 操作人：
+
+ {{ orderInfo.operator || '-' }}
+
+
+
+
+
@@ -57,10 +85,26 @@
- 实付款 ￥{{ orderInfo.amount || '0' }}
-
+ 实付款 ￥{{ orderInfo.amount || '0' }}
+
+
分享给朋友
- 取消占用
+ 取消占用
+
+
+
+ 订单详情
+ 退款
+
+
+
+ 约课详情
+
+
+
+ 取消订场
+ 订单详情
+ 退款
@@ -88,14 +132,61 @@ export default {
this.getOrderInfo();
},
methods: {
+ getTitle(type){
+ switch(type){
+ case 'no_price_venue':
+ return '无法订场'
+ case 'empty_venue':
+ return '-'
+ case 'mini_program':
+ return '小程序订场'
+ case 'take_up_venue':
+ return '管理员占用'
+ case 'course_venue':
+ return '课程预定'
+ case 'pay_venue':
+ return '约玩占用'
+ case 'fixed_venue':
+ return '固定场锁定'
+ default: return '-'
+
+
+ }
+ },
+ cancelOccupy: util.debounce(function(){
+ let { orderInfo, queryInfo } = this;
+ servers.get({
+ url: API.venue.takeUpCancel,
+ data: {
+ brand_id: queryInfo.brand_id,
+ order_no: orderInfo.order_no,
+ },
+ isDefaultGet: false,
+ })
+ .then(res=>{
+ if(res.data.code == 0){
+ this.$emit('refresh');
+ util.showNone(res.data.message || '操作成功！');
+ }else{
+ util.showNone(res.data.message || '操作失败！');
+ }
+ })
+ }, 300, true),
modalClose(){
this.$emit('close');
},
getOrderInfo(){
util.showLoad();
- servers.get({
+ let { queryInfo } = this;
+ servers.post({
url: API.venue.dashboardInfo,
- data: this.queryInfo,
+ data: {
+ brand_id: queryInfo.brand_id,
+ stadium_id: queryInfo.stadium_id,
+ venue_id: queryInfo.venue_id,
+ date: queryInfo.date,
+ duration: queryInfo.duration,
+ },
isDefaultGet: false,
})
.then(res=>{
@@ -212,6 +303,7 @@ export default {
color: #1a1a1a;
}
.om-btns{
+ margin-top: 40upx;
margin-bottom: 10upx;
@include centerFlex(flex-end);
.ob-view{
@@ -225,6 +317,10 @@ export default {
font-size: 32upx;
font-weight: 500;
color: $themeColor;
+ &.red{
+ border-color: #EA5061;
+ color: #EA5061;
+ }
}
}
}
diff --git a/src/js/api.js b/src/js/api.js
index abc6d31..859529e 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -62,13 +62,16 @@ API['venue'] = {
venueTypes: `${ORIGIN}/stadium/venue/types`, // 场馆类型
// venueList: `${ORIGIN}/stadium/book/list`, // 场地列表
- venueTakeUp: `${ORIGIN}/admin/assistant/venue/takeUp`, // 商家助手-占用场地提交
+ venueTakeUp: `${ORIGIN}/admin/stadium/venue/takeUp`, // 商家助手-占用场地提交
takeUpList: `${ORIGIN}/admin/timeSelect/list/4`, // 商家助手-占用场地列表
setStatus: `${ORIGIN}/admin/timeSelect/setStatus`, // 商家助手-占用场地列表
// 20210726 新增
venueList: `${ORIGIN}/admin/stadium/venue/dashboard/list`, // 场地列表 20210726 看板新增修改
- dashboardInfo: `${ORIGIN}/admin/stadium/venue/dashboard/detail`, // 商家助手-占用场地列表
+ dashboardInfo: `${ORIGIN}/admin/stadium/venue/dashboard/detail`, // 看板详情
+ takeUpVerifyQr: `${ORIGIN}/admin/stadium/venue/takeUpVerifyQr`, // 商家助手 - 占用核销码
+ takeUpShareQr: `${ORIGIN}/admin/stadium/venue/takeUpShareQr`, // 商家助手 - 占用分享码
+ takeUpCancel: `${ORIGIN}/admin/stadium/venue/takeUpCancel`, // 商家助手-取消占用场地
}
diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue
index 76a887a..8ef82ea 100644
--- a/src/pages/site/confirm/confirm.vue
+++ b/src/pages/site/confirm/confirm.vue
@@ -78,6 +78,7 @@ export default {
servers.post({
url: API.venue.venueTakeUp,
data: {
+ brand_id: storeInfo.brand_id,
reason: ocReaon,
amount: +ocPrice,
group: storeInfo.id,
@@ -86,7 +87,7 @@ export default {
return {
venue_id: el.parentObj.venue_id,
venue_name: el.parentObj.venue_name,
- duration: el.duration,
+ duration: el.durations,
price: el.price
}
})
@@ -97,7 +98,9 @@ export default {
if(res.data.code == 0){
util.showNone(res.data.message || '操作成功！');
- util.routeTo(`/pages/site/occupy_success/occupy_success`, 'rT');
+ let _res = res.data.data || {};
+ let _qrStr = `?brand_id=${_res.brand_id}&order_no=${_res.order_no}`
+ util.routeTo(`/pages/site/occupy_success/occupy_success${_qrStr}`, 'rT');
// setTimeout(_=>{
// util.routeTo();
// util.previousPageFunction({ // 刷新占用列表
diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue
index c9a4121..79e39ee 100644
--- a/src/pages/site/manage/manage.vue
+++ b/src/pages/site/manage/manage.vue
@@ -114,7 +114,7 @@
{{occupyTip || '-'}}
-
+
@@ -203,19 +203,19 @@ export default {
getVenueStatusnInfo(info){
switch(info.type){
case 'no_price_venue':
- return { zh_text: '无法订场', type: info.type, className: 'grey', }
+ return { zh_text: info.message || '无法订场', type: info.type, className: 'grey', }
case 'empty_venue':
return { zh_text: info.message, type: info.type, className: '', }
case 'mini_program':
- return { zh_text: '小程序订场', type: info.type, className: 'green', }
+ return { zh_text: info.message || '小程序订场', type: info.type, className: 'green', }
case 'take_up_venue':
- return { zh_text: '管理员占用', type: info.type, className: 'black', }
+ return { zh_text: info.message || '管理员占用', type: info.type, className: 'black', }
case 'course_venue':
- return { zh_text: '课程预定', type: info.type, className: 'pistac', }
+ return { zh_text: info.message || '课程预定', type: info.type, className: 'pistac', }
case 'pay_venue':
- return { zh_text: '约玩占用', type: info.type, className: 'black', }
+ return { zh_text: info.message || '约玩占用', type: info.type, className: 'black', }
case 'fixed_venue':
- return { zh_text: '固定场', type: info.type, className: 'blue', }
+ return { zh_text: info.message || '固定场锁定', type: info.type, className: 'blue', }
default: return {}
@@ -263,6 +263,7 @@ export default {
try{
util.showLoad();
this.venueList = [];
+ this.boardInfo = null;
let _res = await this.getVenueList({
type_key: curTypeInfo.key || '',
stadium_id: curStoreInfo.id || '',
diff --git a/src/pages/site/occupy_share/occupy_share.vue b/src/pages/site/occupy_share/occupy_share.vue
index 6947d37..81cfc36 100644
--- a/src/pages/site/occupy_share/occupy_share.vue
+++ b/src/pages/site/occupy_share/occupy_share.vue
@@ -2,12 +2,12 @@
-
- 欧轩智能场馆(羽毛球馆永泰店)
+
+ {{ shareInfo.stadium_name || '-' }}
地址：
- 广州市白云区永平街道学山塘街世联空间D2座5楼
+ {{ shareInfo.stadium_address || '-' }}
@@ -17,15 +17,40 @@
③ 接收微信消息，领取入场码
④ 领取成功后仅限本人使用
-
+
注：此码非入场码
@@ -50,7 +75,6 @@ export default {
margin-right: 10upx;
width: 34upx;
height: 34upx;
- background-color: skyblue;
}
>view{
line-height: 40upx;
@@ -101,7 +125,6 @@ export default {
margin-bottom: 12upx;
width: 300upx;
height: 300upx;
- background-color: skyblue;
}
}
.os-tip{
diff --git a/src/pages/site/occupy_success/occupy_success.vue b/src/pages/site/occupy_success/occupy_success.vue
index 5515267..88a473c 100644
--- a/src/pages/site/occupy_success/occupy_success.vue
+++ b/src/pages/site/occupy_success/occupy_success.vue
@@ -1,9 +1,9 @@
- 欧轩智能场馆(羽毛球馆永泰店)
-
- 验证码：12235 51234
-
+ {{ qrInfo.stadium_name || '-' }}
+
+ 验证码：{{ qrInfo.verify_code || '-' }}
+
分享给朋友
@@ -12,15 +12,52 @@