diff --git a/src/components/period_select.vue b/src/components/period_select.vue new file mode 100644 index 0000000..9220387 --- /dev/null +++ b/src/components/period_select.vue @@ -0,0 +1,138 @@ + + + + + \ No newline at end of file diff --git a/src/manifest.json b/src/manifest.json index 3fe960c..0cc2bbc 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -72,7 +72,7 @@ // "provider": "wx1fe8d9a3cb067a75" // } // }, - /* 正式 wxf1294b279ad1b845 */ + /* 正式 wxf1294b279ad1b845 测试: wx7106e84614cf0060*/ "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false, diff --git a/src/pages.json b/src/pages.json index 807b35a..944d62d 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": "员工管理" @@ -759,6 +723,12 @@ } }, { + "path": "pages/index/recharge_record", + "style" : { + "navigationBarTitleText": "充值记录" + } + }, + { "path": "pages/douyin_withdraw/index", "style" : { "navigationBarTitleText": "平台提现" @@ -895,10 +865,34 @@ "root": "subpackage/verification", "pages": [ { + "path": "pages/null", + "style" : { + "navigationBarTitleText": "核销查询" + } + }, + { + "path": "pages/record_search", + "style" : { + "navigationBarTitleText": "核销查询" + } + }, + { + "path": "pages/index", + "style" : { + "navigationBarTitleText": "核销查询" + } + }, + { "path": "pages/site_people/index", "style" : { "navigationBarTitleText": "现场人数" } + }, + { + "path": "pages/record", + "style" : { + "navigationBarTitleText": "核销记录" + } } ] } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index bca99c3..f2cdedc 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -116,7 +116,7 @@ { id: 4, name: '核销查询', - path: '/pages/write_off/menu/menu', + path: '/subpackage/verification/pages/index', serverKey: 1008 // 后端对应权限编号 }, { diff --git a/src/pages/order_search/order_search.vue b/src/pages/order_search/order_search.vue index 55704f9..db552fc 100644 --- a/src/pages/order_search/order_search.vue +++ b/src/pages/order_search/order_search.vue @@ -3,7 +3,7 @@ - + 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 @@ - - - - - \ 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 @@ - - - - - \ 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 001bbe4..0000000 --- a/src/pages/write_off/operate/operate.vue +++ /dev/null @@ -1,364 +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 @@ - - - - - \ 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/blacklist/pages/abnormal_list/abnormal_list.vue b/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue index 9e30f69..e73ea36 100644 --- a/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue +++ b/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue @@ -102,10 +102,10 @@ export default { async onLoad(options){ try{ let _date = this.curDate = util.formatDate({}); - let _stadiumLs = await this.getStoreList({}); + let _stadiumLs = await this.getStoreList({ brand_id: options?.brand_id ?? '' }); let { curTimeTab } = this; this.getRecords({ - brand_id: options.brand_id, + brand_id: options?.brand_id ?? '', [ curTimeTab?.label || '-' ]: _date }); }catch(err){ diff --git a/src/subpackage/verification/components/head_bar.vue b/src/subpackage/verification/components/head_bar.vue new file mode 100644 index 0000000..b442c13 --- /dev/null +++ b/src/subpackage/verification/components/head_bar.vue @@ -0,0 +1,59 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/verification/components/record/dy_item.vue b/src/subpackage/verification/components/record/dy_item.vue new file mode 100644 index 0000000..95af761 --- /dev/null +++ b/src/subpackage/verification/components/record/dy_item.vue @@ -0,0 +1,78 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/verification/components/record/mall_item.vue b/src/subpackage/verification/components/record/mall_item.vue new file mode 100644 index 0000000..a703a57 --- /dev/null +++ b/src/subpackage/verification/components/record/mall_item.vue @@ -0,0 +1,95 @@ + + + \ No newline at end of file diff --git a/src/subpackage/verification/components/record/site_item.vue b/src/subpackage/verification/components/record/site_item.vue new file mode 100644 index 0000000..11345ae --- /dev/null +++ b/src/subpackage/verification/components/record/site_item.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/verification/components/stadium_picker.vue b/src/subpackage/verification/components/stadium_picker.vue new file mode 100644 index 0000000..95b9fa5 --- /dev/null +++ b/src/subpackage/verification/components/stadium_picker.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/verification/js/api.js b/src/subpackage/verification/js/api.js index 306d14d..e354cda 100644 --- a/src/subpackage/verification/js/api.js +++ b/src/subpackage/verification/js/api.js @@ -6,6 +6,13 @@ export const SUB_API = { skNotLeavingNums: `${ORIGIN}/stadium/sk/notLeavingNums`, // 【1001536】散客人数 - 未离场订单数量 setStadiumPresentNumber: `${ORIGIN}/admin/stadium/setStadiumPresentNumber`, // 商家助手散客人数校正 timingOpen: `${ORIGIN}/stadium/person/timing/open`, // 【20220208】凌晨自动清零【开/关】 + // tid1803 + enterVerifyOrder: `${ORIGIN}/admin/stadium/order/enterVerifyOrder`, // 商家助手-核销查询-输入验证码 + listVerifyRecord: `${ORIGIN}/admin/stadium/order/listVerifyRecord`, // 商家助手-核销查询列表 + leaveVerifyOrder:`${ORIGIN}/admin/stadium/order/leaveVerifyOrder`, // 【20220208】核销记录列表 - 手动离场 + dyPoiOrderList: `${ORIGIN}/admin/douyinPlatformProductOrder/list`, // 商家助手-dypoi订单 + shop2WriteoffList: `${ORIGIN}/admin/assistant/shop2/writeoffList`, // 商城订单核销 - 列表 + } diff --git a/src/subpackage/verification/pages/index.vue b/src/subpackage/verification/pages/index.vue new file mode 100644 index 0000000..3878e1a --- /dev/null +++ b/src/subpackage/verification/pages/index.vue @@ -0,0 +1,282 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/verification/pages/null.vue b/src/subpackage/verification/pages/null.vue new file mode 100644 index 0000000..1796319 --- /dev/null +++ b/src/subpackage/verification/pages/null.vue @@ -0,0 +1,62 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/verification/pages/record.vue b/src/subpackage/verification/pages/record.vue new file mode 100644 index 0000000..24d26c9 --- /dev/null +++ b/src/subpackage/verification/pages/record.vue @@ -0,0 +1,394 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/verification/pages/record_search.vue b/src/subpackage/verification/pages/record_search.vue new file mode 100644 index 0000000..8815cfc --- /dev/null +++ b/src/subpackage/verification/pages/record_search.vue @@ -0,0 +1,244 @@ + + + + + \ 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 index 324395a..60d0974 100644 --- a/src/subpackage/verification/pages/site_people/index.vue +++ b/src/subpackage/verification/pages/site_people/index.vue @@ -77,7 +77,10 @@ export default { } }, async onLoad(options){ - this.$refs.stadiumSelect.initStadium(options?.brand_id || '') + this.$refs.stadiumSelect.initStadium({ + brand_id: options?.brand_id ?? '', + stadium_id: options?.stadium_id ?? '', + }) .then(stadiumInfo=>{ if(!stadiumInfo?.id) return; this.stadiumInfo = stadiumInfo; 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..8d263f1 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,9 @@ export default { data(){ return { visible: false, - notLeaveInfo: {} + notLeaveInfo: {}, + brand_id: '', + stadium_id: '', } }, methods: { @@ -39,6 +41,8 @@ export default { }, initData(e){ let { igsType, key, stadium_id, brand_id } = e; + this.brand_id = brand_id ?? ''; + this.stadium_id = stadium_id ?? ''; this.show(); let _keyName = igsType === 1 ? 'gate_id' : igsType === 2 ? 'venue_type_key' : ''; let _query = { brand_id, stadium_id }; @@ -69,7 +73,8 @@ export default { }) }, checkBtn(type){ - if(type == 0)return routeTo(`/pages/write_off/search_result/search_result`, 'nT'); + let { brand_id, stadium_id } = this; + if(type == 0)return routeTo(`/subpackage/verification/pages/record?brand_id=${brand_id?? ''}&stadium_id=${stadium_id??''}`, 'nT'); if(type == 1)return routeTo(`/pages/order_list/order_list?order_type=1`, 'nT'); }, } diff --git a/src/subpackage/verification/pages/site_people/modules/stadium_select.vue b/src/subpackage/verification/pages/site_people/modules/stadium_select.vue index e7714e8..66441f3 100644 --- a/src/subpackage/verification/pages/site_people/modules/stadium_select.vue +++ b/src/subpackage/verification/pages/site_people/modules/stadium_select.vue @@ -27,7 +27,7 @@ export default { this.curStadium = stadiumLs?.[value] || {}; this.$emit('change:stadium', this.curStadium); }, - async initStadium(brand_id){ + async initStadium({ brand_id, stadium_id }){ try{ showLoad(); let _ls = await this.getStadiumLs({ brand_id }); @@ -36,10 +36,19 @@ export default { // }) this.stadiumLs = _ls || []; hideLoad(); - if(_ls.length){ + if(stadium_id&&_ls?.length){ + let _cur = _ls.find(e=>Number(e.id) === Number(stadium_id)); + if(_cur){ + this.curStadium = _cur; + return _cur; + } else { + this.curStadium = _ls[0]; + return _ls[0]; + } + } else if (_ls.length){ this.curStadium = _ls[0]; return _ls[0]; - }else{ + } else { showNone('暂无店铺信息!'); } }catch(err){ diff --git a/src/subpackage/verification/static/images/arrow_c9f.png b/src/subpackage/verification/static/images/arrow_c9f.png new file mode 100644 index 0000000..e8471dd Binary files /dev/null and b/src/subpackage/verification/static/images/arrow_c9f.png differ diff --git a/src/subpackage/verification/static/images/calendar.png b/src/subpackage/verification/static/images/calendar.png new file mode 100644 index 0000000..63425c2 Binary files /dev/null and b/src/subpackage/verification/static/images/calendar.png differ diff --git a/src/subpackage/verification/static/images/order/null_code.png b/src/subpackage/verification/static/images/order/null_code.png new file mode 100644 index 0000000..a1e5134 Binary files /dev/null and b/src/subpackage/verification/static/images/order/null_code.png differ diff --git a/src/subpackage/verification/static/images/order/null_range.png b/src/subpackage/verification/static/images/order/null_range.png new file mode 100644 index 0000000..9dcfdcb Binary files /dev/null and b/src/subpackage/verification/static/images/order/null_range.png differ diff --git a/src/subpackage/verification/static/images/order/null_search.png b/src/subpackage/verification/static/images/order/null_search.png new file mode 100644 index 0000000..b8a2037 Binary files /dev/null and b/src/subpackage/verification/static/images/order/null_search.png differ diff --git a/src/subpackage/verification/static/images/round_close.png b/src/subpackage/verification/static/images/round_close.png new file mode 100644 index 0000000..c563ecb Binary files /dev/null and b/src/subpackage/verification/static/images/round_close.png differ diff --git a/src/subpackage/verification/static/images/scan.png b/src/subpackage/verification/static/images/scan.png new file mode 100644 index 0000000..21cfa76 Binary files /dev/null and b/src/subpackage/verification/static/images/scan.png differ diff --git a/src/subpackage/verification/static/images/search.png b/src/subpackage/verification/static/images/search.png new file mode 100644 index 0000000..de695bf Binary files /dev/null and b/src/subpackage/verification/static/images/search.png differ diff --git a/src/subpackage/verification/static/images/tab0.png b/src/subpackage/verification/static/images/tab0.png new file mode 100644 index 0000000..c72f2c9 Binary files /dev/null and b/src/subpackage/verification/static/images/tab0.png differ diff --git a/src/subpackage/verification/static/images/tab1.png b/src/subpackage/verification/static/images/tab1.png new file mode 100644 index 0000000..79f4c07 Binary files /dev/null and b/src/subpackage/verification/static/images/tab1.png differ diff --git a/src/subpackage/verification/static/images/tab2.png b/src/subpackage/verification/static/images/tab2.png new file mode 100644 index 0000000..5d55288 Binary files /dev/null and b/src/subpackage/verification/static/images/tab2.png differ diff --git a/src/subpackage/wallet/js/api.js b/src/subpackage/wallet/js/api.js index 4ff0fc2..654bb3a 100644 --- a/src/subpackage/wallet/js/api.js +++ b/src/subpackage/wallet/js/api.js @@ -8,6 +8,9 @@ export const WALLET_API = { // 宝付 getPayAssureConfigs:`${ORIGIN}/admin/pay/assure/getPayAssureConfigs`, // 查看可选择的支付账户列表 baofuV2Gateway:`${ORIGIN}/admin/pay/assure/baofuV2/gateway`, // 宝付v2获取金额信息 + // tid1819 + wxpayinfo:`${ORIGIN}/admin/assistant/merchantwallet/wxpayinfo`, // 这个是充值 + rechargeList:`${ORIGIN}/admin/merchantwallet/recharge/list`, // 这是充值记录 } export default WALLET_API; \ No newline at end of file diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue index 9c3665a..f11b299 100644 --- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue +++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue @@ -26,7 +26,7 @@ diff --git a/src/subpackage/wallet/pages/index/modules/recharge_modal.vue b/src/subpackage/wallet/pages/index/modules/recharge_modal.vue new file mode 100644 index 0000000..784cc5b --- /dev/null +++ b/src/subpackage/wallet/pages/index/modules/recharge_modal.vue @@ -0,0 +1,82 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue index f450eb1..7826478 100644 --- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue +++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue @@ -7,10 +7,10 @@ 欧轩内部钱包账户余额 - + (用于购买服务使用) @@ -18,7 +18,7 @@ ¥ {{ balance }} - + 充值 diff --git a/src/subpackage/wallet/pages/index/recharge_record.vue b/src/subpackage/wallet/pages/index/recharge_record.vue new file mode 100644 index 0000000..d557240 --- /dev/null +++ b/src/subpackage/wallet/pages/index/recharge_record.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/src/utils/util.js b/src/utils/util.js index 1100b8e..34b57fe 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -362,7 +362,7 @@ function isProfile(){ return !!uni.getUserProfile } -function changeLowerCase(str){ +export function changeLowerCase(str){ return str.toString().toLocaleLowerCase(); } @@ -371,7 +371,7 @@ function changeLowerCase(str){ // 大数据量跨页/跨组件传参------$_once && $_emit // 单次监听器 // 到文件src\js\once_name.js,进行命名,防止命名冲突导致错误监听 -function $_once(name, cb){ +export function $_once(name, cb){ uni.$once(name + '',function(data){ cb&&cb(data); }) @@ -380,7 +380,7 @@ function $_once(name, cb){ }, 50) } // 促发单次监听 -function $_emit(name, data){ +export function $_emit(name, data){ uni.$once((name + '')+'1',function(){ uni.$emit(name + '', data); })