diff --git a/src/pages.json b/src/pages.json
index 5748c6f..51fe09c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -171,18 +171,6 @@
}
},
{
- "path": "pages/write_off/mall/list/list",
- "style": {
- "navigationBarTitleText": "商城订单核销"
- }
- },
- {
- "path": "pages/write_off/menu/menu",
- "style": {
- "navigationBarTitleText": "核销订单"
- }
- },
- {
"path": "pages/write_off/ym_card_gated/ym_card_gated",
"style": {
"navigationBarTitleText": "核销订单"
@@ -195,36 +183,12 @@
}
},
{
- "path": "pages/write_off/search_result/search_result",
- "style": {
- "navigationBarTitleText": "核销查询"
- }
- },
- {
- "path": "pages/write_off/operate/operate",
- "style": {
- "navigationBarTitleText": "核销订单"
- }
- },
- {
"path": "pages/write_off/confirm_order/confirm_order",
"style": {
"navigationBarTitleText": "核销订单"
}
},
{
- "path": "pages/write_off/null/null",
- "style": {
- "navigationBarTitleText": "确认订单信息"
- }
- },
- {
- "path": "pages/write_off/douyin/poi_list",
- "style": {
- "navigationBarTitleText": "核销订单"
- }
- },
- {
"path": "pages/employee/review_list/review_list",
"style": {
"navigationBarTitleText": "员工管理"
diff --git a/src/pages/write_off/douyin/poi_list.vue b/src/pages/write_off/douyin/poi_list.vue
deleted file mode 100644
index 2ee4882..0000000
--- a/src/pages/write_off/douyin/poi_list.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
-
-
-
-
-
- 核销团购券
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/write_off/mall/list/list.vue b/src/pages/write_off/mall/list/list.vue
deleted file mode 100644
index d8379cd..0000000
--- a/src/pages/write_off/mall/list/list.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-
-
-
- 核销日期
-
-
-
-
-
-
-
-
- 至
-
-
-
-
-
-
-
-
-
-
-
-
- 订单编号:{{ e.product_order_no || '-' }}
- 复制
-
-
- 取货码:{{ e.product_order_no || '-' }}
- 取货人:{{ e.product_order_self_pickup_info.name || '-' }} {{ e.product_order_self_pickup_info.phone || '-' }}
- 商品:{{ e.product_order_goods.join(';') }}
- 核验人:{{ e.optuname }}
- 取货时间:{{ e.created_at || '-' }}
-
-
-
-
-
- 核销订单
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/write_off/menu/menu.vue b/src/pages/write_off/menu/menu.vue
deleted file mode 100644
index 5e75f0b..0000000
--- a/src/pages/write_off/menu/menu.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/write_off/null/null.vue b/src/pages/write_off/null/null.vue
deleted file mode 100644
index 1bccb32..0000000
--- a/src/pages/write_off/null/null.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
- 很抱歉!获取不到二维码订单信息
- 很抱歉!获取不到验证码订单信息
- 返回
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/write_off/number_of_people/number_of_people.vue b/src/pages/write_off/number_of_people/number_of_people.vue
deleted file mode 100644
index bdeb3c9..0000000
--- a/src/pages/write_off/number_of_people/number_of_people.vue
+++ /dev/null
@@ -1,496 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- 日期:{{ dateStr || '-' }}
- 现场散客人数
-
-
- {{peopleInfo.present_person_number || 0}}
-
- 查看未离场订单
- 修改人数
-
- 凌晨自动清零
-
-
-
-
-
- * 不开启凌晨自动清零,则现场灯光按【现场散客人数】去判断是否开启或关闭;修改人数会直接影响现场灯光开关!\n\r* 开启凌晨自动清零,则现场灯光按【散客订单未离场数量】去判断是否开启或关闭;修改人数不会影响现场灯光开关!但如有散客订单一直未扫码离场,可能会无法关灯,需要将未离场的散客订单设置为已离场后才可关闭灯光!
-
-
-
-
-
- 修改现场散客人数
-
- 当前现场散客人数为:{{peopleInfo.present_person_number || 0}}
-
-
-
- 修改现场人数可能会影响现场灯光开关,请谨慎操作!
-
-
- 取消
- 确认
-
-
-
-
-
-
-
- 未离场订单
-
- 次卡未离场:{{orderNum.person_number || 0}}
- 查看
-
-
- 计时未离场:{{orderNum.person_timing || 0}}
- 查看
-
-
- 年月卡未离场:{{orderNum.monthly_card||0}}
- 查看
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/write_off/operate/operate.vue b/src/pages/write_off/operate/operate.vue
deleted file mode 100644
index 628e492..0000000
--- a/src/pages/write_off/operate/operate.vue
+++ /dev/null
@@ -1,363 +0,0 @@
-
-
-
- 当前门店
-
-
-
-
-
-
-
-
-
-
-
-
- 确认核销
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/write_off/search_result/search_result.vue b/src/pages/write_off/search_result/search_result.vue
deleted file mode 100644
index 993764c..0000000
--- a/src/pages/write_off/search_result/search_result.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-
-
-
- 当前门店
-
-
-
-
-
-
-
-
-
-
- 核销日期:{{curDate || '-'}}
-
-
-
- 核销数量:{{writeOffList.length || 0}}
-
-
-
- {{ e.extension.stadium_name || '-' }}
-
-
- 订单编号:{{ e.order_no || '-' }}
- ({{ e.type || '-' }})
-
-
- 用户信息:{{ e.extension.user_phone || '-' }}({{ e.extension.nickname || '-' }})
-
-
- 核销码: {{e.verify_code || '-' }}
-
-
- 验证方式:{{ e.desc || '-' }}
-
-
- 核销时间:{{ e.verify_time || '-'}}
-
-
- 离场时间:{{ e.verify_leave_time || ''}}
-
-
- 手动离场
-
-
- 核销订单
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/static/images/code_null.png b/src/static/images/code_null.png
deleted file mode 100644
index 8b41375..0000000
Binary files a/src/static/images/code_null.png and /dev/null differ
diff --git a/src/static/images/countdown_bg.png b/src/static/images/countdown_bg.png
deleted file mode 100644
index 5df6951..0000000
Binary files a/src/static/images/countdown_bg.png and /dev/null differ
diff --git a/src/static/images/order_null.png b/src/static/images/order_null.png
deleted file mode 100644
index 5183533..0000000
Binary files a/src/static/images/order_null.png and /dev/null differ
diff --git a/src/static/images/scan_null.png b/src/static/images/scan_null.png
deleted file mode 100644
index d9ffc21..0000000
Binary files a/src/static/images/scan_null.png and /dev/null differ
diff --git a/src/static/images/write_off/mall.png b/src/static/images/write_off/mall.png
deleted file mode 100644
index 12e4248..0000000
Binary files a/src/static/images/write_off/mall.png and /dev/null differ
diff --git a/src/static/images/write_off/order.png b/src/static/images/write_off/order.png
deleted file mode 100644
index 2ef7ab0..0000000
Binary files a/src/static/images/write_off/order.png and /dev/null differ
diff --git a/src/static/images/write_off/people.png b/src/static/images/write_off/people.png
deleted file mode 100644
index 2f24e54..0000000
Binary files a/src/static/images/write_off/people.png and /dev/null differ
diff --git a/src/static/images/write_off/site.png b/src/static/images/write_off/site.png
deleted file mode 100644
index 9aa1577..0000000
Binary files a/src/static/images/write_off/site.png and /dev/null differ
diff --git a/src/subpackage/verification/pages/index.vue b/src/subpackage/verification/pages/index.vue
index 3a8f01e..a064ed0 100644
--- a/src/subpackage/verification/pages/index.vue
+++ b/src/subpackage/verification/pages/index.vue
@@ -155,7 +155,7 @@ export default {
// 商城订单
if(_orderData?.extension?.verify_order_type === 'product_order'){
$_emit(WRITE_OFF_MALL_ORDER_INFO, { data: _orderData });
- routeTo(`/pages/write_off/ym_confirm/ym_confirm?type=${_vType}`, 'nT');
+ routeTo(`/pages/write_off/mall/confirm/confirm?type=${_vType}`, 'nT');
return
}
// 年月卡
@@ -172,8 +172,12 @@ export default {
return
}
// 场次、次卡
- $_emit(WRITE_OFF_ORDER_INFO, { ..._orderData });
- routeTo(`/pages/write_off/confirm_order/confirm_order?type=${_vType}`, 'nT');
+ if(['person_number', 'venue_number'].includes(_orderData?.extension?.verify_order_type)){
+ $_emit(WRITE_OFF_ORDER_INFO, { ..._orderData });
+ routeTo(`/pages/write_off/confirm_order/confirm_order?type=${_vType}`, 'nT');
+ return
+ }
+ showModal({ content: '暂不支持该类型核销!' })
}else if(_data.code === 805){
routeTo(`/subpackage/verification/pages/null?tip=${jsonStr(_data?.message ?? '')}`, 'nT');
}else{
diff --git a/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue b/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue
index 3bc401d..38fbae4 100644
--- a/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue
+++ b/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue
@@ -27,7 +27,8 @@ export default {
data(){
return {
visible: false,
- notLeaveInfo: {}
+ notLeaveInfo: {},
+ brand_id: '',
}
},
methods: {
@@ -39,6 +40,7 @@ export default {
},
initData(e){
let { igsType, key, stadium_id, brand_id } = e;
+ this.brand_id = brand_id ?? '';
this.show();
let _keyName = igsType === 1 ? 'gate_id' : igsType === 2 ? 'venue_type_key' : '';
let _query = { brand_id, stadium_id };
@@ -69,7 +71,8 @@ export default {
})
},
checkBtn(type){
- if(type == 0)return routeTo(`/pages/write_off/search_result/search_result`, 'nT');
+ let { brand_id } = this;
+ if(type == 0)return routeTo(`/subpackage/verification/pages/record?brand_id=${brand_id?? ''}`, 'nT');
if(type == 1)return routeTo(`/pages/order_list/order_list?order_type=1`, 'nT');
},
}