diff --git a/src/pages.json b/src/pages.json
index b09acc2..c9eb464 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -177,12 +177,6 @@
}
},
{
- "path": "pages/write_off/number_of_people/number_of_people",
- "style": {
- "navigationBarTitleText": "查询"
- }
- },
- {
"path": "pages/write_off/menu/menu",
"style": {
"navigationBarTitleText": "核销订单"
@@ -860,6 +854,17 @@
}
}
]
+ },
+ {
+ "root": "subpackage/verification",
+ "pages": [
+ {
+ "path": "pages/site_people/index",
+ "style" : {
+ "navigationBarTitleText": "现场人数"
+ }
+ }
+ ]
}
],
"globalStyle": {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 11e5583..bca99c3 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -251,7 +251,7 @@
});
}
- if(tabInfo.id === 10 || tabInfo.id === 11)return util.routeTo(tabInfo.path + `?brand_id=${indexData.brand.id}`,'nT');
+ if([ 10, 11, 4 ].includes(tabInfo.id))return util.routeTo(tabInfo.path + `?brand_id=${indexData.brand.id}`,'nT');
if(tabInfo.id === 12){
// if(!indexData.brand.mini_wechat_appid)return util.showNone('暂无appid!')
diff --git a/src/pages/write_off/menu/menu.vue b/src/pages/write_off/menu/menu.vue
index e84cae4..5e75f0b 100644
--- a/src/pages/write_off/menu/menu.vue
+++ b/src/pages/write_off/menu/menu.vue
@@ -56,9 +56,18 @@
import util from '../../../utils/util';
import { WRITE_OFF_STORE_NAME } from '../../../js/once_name';
export default {
+ data(){
+ return {
+ brand_id: ''
+ }
+ },
+ onLoad(options){
+ this.brand_id = options?.brand_id || ''
+ },
methods: {
toPeopleNum(){
- util.routeTo(`/pages/write_off/number_of_people/number_of_people`, 'nT');
+ let _qryStr = `brand_id=${this.brand_id}`
+ util.routeTo(`/subpackage/verification/pages/site_people/index?${_qryStr}`, 'nT');
},
toOperate(type){
util.$_emit(WRITE_OFF_STORE_NAME, null);
diff --git a/src/pages/write_off/operate/operate.vue b/src/pages/write_off/operate/operate.vue
index a00527f..001bbe4 100644
--- a/src/pages/write_off/operate/operate.vue
+++ b/src/pages/write_off/operate/operate.vue
@@ -252,7 +252,7 @@ export default {
// 年月卡
if(_data.extension&&_data.extension.verify_order_type === 'monthly_card'){
- util.$_emit(WRITE_OFF_ORDER_INFO, {..._data});
+ util.$_emit(WRITE_OFF_ORDER_INFO, { data: _data, query });
util.routeTo(`/pages/write_off/ym_confirm/ym_confirm?type=${vType}`, 'nT');
return
}
diff --git a/src/pages/write_off/ym_confirm/ym_confirm.vue b/src/pages/write_off/ym_confirm/ym_confirm.vue
index 9b5e221..8d68911 100644
--- a/src/pages/write_off/ym_confirm/ym_confirm.vue
+++ b/src/pages/write_off/ym_confirm/ym_confirm.vue
@@ -45,14 +45,16 @@ export default {
orderInfo: {
extension: {},
card_info: {}
- }
+ },
+ operate_stadium_id: '', // 操作的场馆id, 有多门店年月卡,不能随接口返回门店id
}
},
onLoad(options){
if(options.type)this.type = options.type || '';
util.$_once(WRITE_OFF_ORDER_INFO, data => {
console.warn(data)
- this.orderInfo = data;
+ this.orderInfo = data?.data || {};
+ this.operate_stadium_id = data?.query?.stadium_id ?? data?.data?.stadium_id ?? '';
})
},
methods: {
@@ -67,7 +69,7 @@ export default {
data: {
brand_id: orderInfo.brand_id,
card_no: orderInfo.card_no,
- stadium_id: orderInfo.stadium_id,
+ stadium_id: this.operate_stadium_id ?? '',
type: type == 'verify_code'? 5 : 6,
},
isDefaultGet: false,
diff --git a/src/subpackage/verification/js/api.js b/src/subpackage/verification/js/api.js
new file mode 100644
index 0000000..306d14d
--- /dev/null
+++ b/src/subpackage/verification/js/api.js
@@ -0,0 +1,12 @@
+import { ORIGIN } from '@/js/api';
+
+export const SUB_API = {
+ stadiumList: `${ORIGIN}/admin/stadium/list`, // 店铺列表
+ skNumber: `${ORIGIN}/stadium/sk/number`, // 散客人数 - 进场人数
+ skNotLeavingNums: `${ORIGIN}/stadium/sk/notLeavingNums`, // 【1001536】散客人数 - 未离场订单数量
+ setStadiumPresentNumber: `${ORIGIN}/admin/stadium/setStadiumPresentNumber`, // 商家助手散客人数校正
+ timingOpen: `${ORIGIN}/stadium/person/timing/open`, // 【20220208】凌晨自动清零【开/关】
+
+}
+
+export default SUB_API;
\ No newline at end of file
diff --git a/src/subpackage/verification/js/server.js b/src/subpackage/verification/js/server.js
new file mode 100644
index 0000000..e2b6244
--- /dev/null
+++ b/src/subpackage/verification/js/server.js
@@ -0,0 +1,10 @@
+import { Server } from '../../../js/server';
+
+class SubServer extends Server {
+ constructor(props){
+ super(props)
+ }
+}
+
+
+export default new SubServer();
\ No newline at end of file
diff --git a/src/subpackage/verification/pages/site_people/index.vue b/src/subpackage/verification/pages/site_people/index.vue
new file mode 100644
index 0000000..324395a
--- /dev/null
+++ b/src/subpackage/verification/pages/site_people/index.vue
@@ -0,0 +1,284 @@
+
+
+
+
+
+
+
+
+
+ 修改人数
+ 查看未离场订单
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/verification/pages/site_people/modules/auto_clean.vue b/src/subpackage/verification/pages/site_people/modules/auto_clean.vue
new file mode 100644
index 0000000..9c3a828
--- /dev/null
+++ b/src/subpackage/verification/pages/site_people/modules/auto_clean.vue
@@ -0,0 +1,66 @@
+
+
+
+ 凌晨自动清零
+
+
+
+ *不开启凌晨自动清零,则现场灯光按【现场散客人数】去判断是否开启或关闭;修改人数会直接影响现场灯光开关!
+
+
+ *开启凌晨自动清零,则现场灯光按【散客订单未离场数量】去判断是否开启或关闭,修改人数不会影响现场灯光开关!但如有散客订单一直未扫码离场,可能会无法关灯,需要将未离场的散客订单设置为已离场后才可关闭灯光!
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/verification/pages/site_people/modules/classify_tab.vue b/src/subpackage/verification/pages/site_people/modules/classify_tab.vue
new file mode 100644
index 0000000..6cff16f
--- /dev/null
+++ b/src/subpackage/verification/pages/site_people/modules/classify_tab.vue
@@ -0,0 +1,73 @@
+
+
+
+
+ {{ e.label }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/verification/pages/site_people/modules/methods_bar.vue b/src/subpackage/verification/pages/site_people/modules/methods_bar.vue
new file mode 100644
index 0000000..025887d
--- /dev/null
+++ b/src/subpackage/verification/pages/site_people/modules/methods_bar.vue
@@ -0,0 +1,62 @@
+
+
+
+ 现场人数统计方式:{{ typeForTxt }}
+ {{ date || '' }}
+
+ 统计方式如需修改请前往后台“散客开关灯规则”处修改
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/verification/pages/site_people/modules/modify_number.vue b/src/subpackage/verification/pages/site_people/modules/modify_number.vue
new file mode 100644
index 0000000..153b2a6
--- /dev/null
+++ b/src/subpackage/verification/pages/site_people/modules/modify_number.vue
@@ -0,0 +1,155 @@
+
+
+
+
+ 修改现场散客人数
+
+ 当前现场散客人数为:{{ nowNum || 0 }}
+
+ 修改现场人数可能会影响现场灯光开关,请谨慎操作!
+
+
+ 取消
+ 确认
+
+
+
+
+
+
+
+
\ No newline at end of file
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
new file mode 100644
index 0000000..3bc401d
--- /dev/null
+++ b/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue
@@ -0,0 +1,127 @@
+
+
+
+
+ 未离场订单
+
+ 次卡未离场:{{ notLeaveInfo.person_number || 0 }}
+ 查看
+
+
+ 计时未离场:{{ notLeaveInfo.person_timing || 0 }}
+ 查看
+
+
+ 年月卡未离场:{{ notLeaveInfo.monthly_card || 0 }}
+ 查看
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/verification/pages/site_people/modules/number_show.vue b/src/subpackage/verification/pages/site_people/modules/number_show.vue
new file mode 100644
index 0000000..f2687f9
--- /dev/null
+++ b/src/subpackage/verification/pages/site_people/modules/number_show.vue
@@ -0,0 +1,67 @@
+
+
+ 现场散客人数
+
+
+
+ {{ num || 0 }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/verification/pages/site_people/modules/stadium_select.vue b/src/subpackage/verification/pages/site_people/modules/stadium_select.vue
new file mode 100644
index 0000000..e7714e8
--- /dev/null
+++ b/src/subpackage/verification/pages/site_people/modules/stadium_select.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/subpackage/verification/static/images/arrow_c33.png b/src/subpackage/verification/static/images/arrow_c33.png
new file mode 100644
index 0000000..50fd024
Binary files /dev/null and b/src/subpackage/verification/static/images/arrow_c33.png differ
diff --git a/src/subpackage/verification/static/images/countdown_bg.png b/src/subpackage/verification/static/images/countdown_bg.png
new file mode 100644
index 0000000..5df6951
Binary files /dev/null and b/src/subpackage/verification/static/images/countdown_bg.png differ
diff --git a/src/subpackage/verification/static/images/x_close.png b/src/subpackage/verification/static/images/x_close.png
new file mode 100644
index 0000000..d8cc22a
Binary files /dev/null and b/src/subpackage/verification/static/images/x_close.png differ