From 4f65b08c0697ea8d570c5d31e57257f662e22338 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Tue, 4 Mar 2025 18:30:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/coupon.js | 14 + api/handover.js | 66 +++ api/order.js | 28 ++ commons/orderEnum.js | 14 +- commons/utils/goodsUtil.js | 5 +- commons/utils/websocket.js | 16 +- manifest.json | 60 +-- pageCategory/index/components/category.vue | 6 +- pageConsumables/outbound.vue | 4 +- pageConsumables/viewrecords.vue | 9 - pageConsumables/warehouseEntry.vue | 2 +- pageGoodsGroup/index/components/edit-sort.vue | 3 +- pageUser/index/index.vue | 26 +- .../handover-confirm/handover-confirm.vue | 311 ------------- pageWorkControl/index/index.vue | 424 +++--------------- .../setting/components/add-banci.vue | 250 ----------- pageWorkControl/setting/setting.vue | 235 ---------- pages.json | 15 - .../confirm-order/confirm-order.vue | 134 ++++-- .../confirm-order/rotatingTables.vue | 34 +- pagesCreateOrder/index/components/car.vue | 9 +- pagesCreateOrder/index/components/guige.vue | 1 - pagesCreateOrder/index/index.vue | 84 +--- pagesCreateOrder/util.js | 9 +- pagesOrder/detail/components/list.vue | 47 +- pagesOrder/detail/components/order.vue | 22 +- pagesOrder/detail/components/tuicai.vue | 54 ++- pagesOrder/detail/detail.vue | 24 +- pagesOrder/index/compoents/order-item.vue | 55 +-- pagesOrder/pay-order/pay-order.vue | 243 ++++++---- pagesOrder/quan/quan.vue | 11 +- vue.config.js | 23 +- 32 files changed, 622 insertions(+), 1616 deletions(-) create mode 100644 api/handover.js delete mode 100644 pageWorkControl/handover-confirm/handover-confirm.vue delete mode 100644 pageWorkControl/setting/components/add-banci.vue delete mode 100644 pageWorkControl/setting/setting.vue diff --git a/api/coupon.js b/api/coupon.js index ee0344f..df2575c 100644 --- a/api/coupon.js +++ b/api/coupon.js @@ -15,6 +15,20 @@ export function getCouponList(data, urlType = 'account') { }) } +/** + * 生成订单后使用 + * @returns + */ +export function getFindCoupon(data, urlType = 'account') { + return request({ + url: `${urlType}/admin/coupon/findCoupon`, + method: "GET", + data: { + ...data + } + }) +} + /** * 店铺优惠券新增 * @returns diff --git a/api/handover.js b/api/handover.js new file mode 100644 index 0000000..d207905 --- /dev/null +++ b/api/handover.js @@ -0,0 +1,66 @@ +import http from '@/http/http.js' +const request = http.request + +/** + * 交班记录-分页 + * @returns + */ +export function getHandoverRecord(data, urlType = 'account') { + return request({ + url: `${urlType}/admin/handover-record/page`, + method: "GET", + data: { + ...data + } + }) +} + +/** + * 交班记录-查看 + * @returns + */ +export function getHandoverRecordView(id, urlType = 'account') { + return request({ + url: `${urlType}/admin/handover-record/${id}`, + method: "GET", + }) +} + +/** + * 交班记录-导出 + * @returns + */ +export function getHandoverRecordExport(id, urlType = 'account') { + return request({ + url: `${urlType}/admin/handover-record/export/${id}`, + method: "GET", + }) +} + +/** + * 收银机-交班数据统计 + * @returns + */ +export function getHandoverRecordTotal(data, urlType = 'account') { + return request({ + url: `${urlType}/admin/handover-record/total`, + method: "GET", + data: { + ...data + } + }) +} + +/** + * 收银机-交班/关班 + * @returns + */ +export function getHandoverRecordHandover(data, urlType = 'account') { + return request({ + url: `${urlType}/admin/handover-record/handover`, + method: "POST", + data: { + ...data + } + }) +} \ No newline at end of file diff --git a/api/order.js b/api/order.js index 17bc333..ed3a537 100644 --- a/api/order.js +++ b/api/order.js @@ -15,6 +15,20 @@ export function getOrderList(data, urlType = 'order') { }) } +/** + * 订单详情 + * @returns + */ +export function getOrderById(data, urlType = 'order') { + return request({ + url: `${urlType}/admin/order/getOrderById`, + method: "GET", + data: { + ...data + } + }) +} + /** * 历史订单(多次下单使用) * @returns @@ -43,4 +57,18 @@ export function createOrder(data, urlType = 'order') { }) } +/** + * 订单退款 只传订单id + * @returns + */ +export function refundOrder(data, urlType = 'order') { + return request({ + url: `${urlType}/admin/order/refundOrder`, + method: "POST", + data: { + ...data + } + }) +} + diff --git a/commons/orderEnum.js b/commons/orderEnum.js index 4a601b7..5962d41 100644 --- a/commons/orderEnum.js +++ b/commons/orderEnum.js @@ -25,7 +25,7 @@ export default { label: '退单' }, { - key: 'part-refund', + key: 'part_refund', label: '部分退单' }, { @@ -49,21 +49,17 @@ export default { // label: '支付中' // } ], - sendType: [ + dineMode: [ { - key: 'post', - label: '快递' - }, - { - key: 'takeaway', + key: 'take-away', label: '外卖' }, { - key: 'takeself', + key: 'take-out', label: '自提' }, { - key: 'table', + key: 'dine-in', label: '堂食' } ], diff --git a/commons/utils/goodsUtil.js b/commons/utils/goodsUtil.js index fe7f5dc..5ffb317 100644 --- a/commons/utils/goodsUtil.js +++ b/commons/utils/goodsUtil.js @@ -24,10 +24,11 @@ export function isTuiCai(item) { return item.status == 'return' } export function isTui(item) { - return item.status == 'return' || item.status == 'refund' || item.status == 'refunding' + console.log(item) + return item.status == 'return' || item.status == 'refund' || item.status == 'refunding' || item.status == 'part_refund' } export function isGift(item) { - return !isTui(item) && item.payAmount<=0 + return !isTui(item) && item.isGift == 1 } export function numSum(arr) { const sum = arr.reduce((a, b) => { diff --git a/commons/utils/websocket.js b/commons/utils/websocket.js index 64fad39..2b96b5f 100644 --- a/commons/utils/websocket.js +++ b/commons/utils/websocket.js @@ -39,15 +39,15 @@ class WebsocketUtil { // 连接成功后启动心跳和消息监听 this.startHeartbeat(); this.listenForMessages(); - // 注意：这里的 onClose 监听器应该放在 uni.connectSocket 调用之后 - this.socketTask.onClose((result) => { - this.isOpen = false; - // if( this.isOpen ){ - this.reconnect(); - // } - }); + }); - + // 注意：这里的 onClose 监听器应该放在 uni.connectSocket 调用之后 + this.socketTask.onClose((result) => { + this.isOpen = false; + // if( this.isOpen ){ + this.reconnect(); + // } + }); } diff --git a/manifest.json b/manifest.json index 19e7f8b..790a4f8 100644 --- a/manifest.json +++ b/manifest.json @@ -168,67 +168,13 @@ "devServer" : { "disableHostCheck" : true, "proxy" : { - "/shopApi" : { + "/api" : { // 需要被代理的后台地址 - "target" : "https://wxcashiertest.sxczgkj.cn/cashierService", + "target" : "https://tapi.cashier.sxczgkj.cn", "changeOrigin" : true, "secure" : false, "pathRewrite" : { - "^/shopApi" : "" - } - }, - "/mch" : { - // 需要被代理的后台地址 - "target" : "https://b.rscygroup.com", - "changeOrigin" : true, - "secure" : false, - "pathRewrite" : { - "^/mch" : "" - } - }, - "/server1" : { - // 需要被代理的后台地址 - "target" : "http://101.37.12.135:8080", - "changeOrigin" : true, - "secure" : false, - "pathRewrite" : { - "^/server1" : "" - } - }, - "/server3" : { - // 需要被代理的后台地址 - "target" : "http://101.37.12.135:8080", - "changeOrigin" : true, - "secure" : false, - "pathRewrite" : { - "^/server3" : "" - } - }, - "/ysk" : { - // 需要被代理的后台地址 - "target" : "https://admintestpapi.sxczgkj.cn", - "changeOrigin" : true, - "secure" : false, - "pathRewrite" : { - "/ysk" : "" - } - }, - "/yufabu" : { - // 需要被代理的后台地址 - "target" : "https://pre-cashier.sxczgkj.cn", - "changeOrigin" : true, - "secure" : false, - "pathRewrite" : { - "/yufabu" : "" - } - }, - "/ww" : { - // 需要被代理的后台地址 - "target" : "http://192.168.1.15:8000", - "changeOrigin" : true, - "secure" : false, - "pathRewrite" : { - "/ww" : "" + "^/api" : "" } } } diff --git a/pageCategory/index/components/category.vue b/pageCategory/index/components/category.vue index f3bf02f..99ab269 100644 --- a/pageCategory/index/components/category.vue +++ b/pageCategory/index/components/category.vue @@ -1,17 +1,17 @@