From 9c860ef946aa58e0a8ca27b9b689beac5ae59028 Mon Sep 17 00:00:00 2001 From: 5g0Wp7Zy Date: Sat, 28 Feb 2026 10:24:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tabbar/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tabbar/index.vue b/src/tabbar/index.vue index 3ab1f5b..e2478da 100644 --- a/src/tabbar/index.vue +++ b/src/tabbar/index.vue @@ -27,6 +27,7 @@ function handleClickBulge() { } }, fail: () => { + console.log('扫码失败') }, }) } From b8f814dd84522f679d8ca45007124b1f91e9ac58 Mon Sep 17 00:00:00 2001 From: mason Date: Sat, 28 Feb 2026 12:41:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order-manage.ts | 10 ++ src/pages-sub/common/config/menu.ts | 7 + src/pages-sub/order-manage/index.vue | 195 +++++++++++++++++++++++++++ 3 files changed, 212 insertions(+) create mode 100644 src/api/order-manage.ts create mode 100644 src/pages-sub/order-manage/index.vue diff --git a/src/api/order-manage.ts b/src/api/order-manage.ts new file mode 100644 index 0000000..4732ec5 --- /dev/null +++ b/src/api/order-manage.ts @@ -0,0 +1,10 @@ +import { http } from '@/http/http' + +/** + * @description 获取骑行中与待支付的订单列表 + * @param query + * @returns + */ +export function getOrderManageListApi(query: { pageNum: number, pageSize: number }) { + return http.get('/operations/statistics/getDiffOperatorOrderList', query) +} diff --git a/src/pages-sub/common/config/menu.ts b/src/pages-sub/common/config/menu.ts index 748ed05..87c6520 100644 --- a/src/pages-sub/common/config/menu.ts +++ b/src/pages-sub/common/config/menu.ts @@ -81,6 +81,13 @@ export const menu_list = [ }, ], }, + { + key: 'orderManagement', + name: '工单管理', + type: 'page', + path: '/pages-sub/order-manage/index', + customsrc: 'APPICON_ZHANDIANGUANLI_IMAGE', + }, ], }, { diff --git a/src/pages-sub/order-manage/index.vue b/src/pages-sub/order-manage/index.vue new file mode 100644 index 0000000..4e1a613 --- /dev/null +++ b/src/pages-sub/order-manage/index.vue @@ -0,0 +1,195 @@ + + + + + From 951528dadab7809288cf121194f175b0579b552e Mon Sep 17 00:00:00 2001 From: mason Date: Sat, 28 Feb 2026 15:18:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(=E5=B7=A5=E5=8D=95=E5=88=97=E8=A1=A8):?= =?UTF-8?q?=20add=20=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC=E5=92=8C=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E9=94=81=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order-manage.ts | 18 ++ src/pages-sub/order-manage/change-price.vue | 168 ++++++++++++++++++ src/pages-sub/order-manage/index.vue | 62 ++++++- src/pages-sub/order-manage/remove-locking.vue | 147 +++++++++++++++ 4 files changed, 390 insertions(+), 5 deletions(-) create mode 100644 src/pages-sub/order-manage/change-price.vue create mode 100644 src/pages-sub/order-manage/remove-locking.vue diff --git a/src/api/order-manage.ts b/src/api/order-manage.ts index 4732ec5..9e97086 100644 --- a/src/api/order-manage.ts +++ b/src/api/order-manage.ts @@ -8,3 +8,21 @@ import { http } from '@/http/http' export function getOrderManageListApi(query: { pageNum: number, pageSize: number }) { return http.get('/operations/statistics/getDiffOperatorOrderList', query) } + +/** + * @description 根据车辆编号修改当前订单金额 + * @param data + * @returns + */ +export function changePriceApi(data: { bikeCode: string, price: number }) { + return http.post('/operations/statistics/updateOrderAmount', data) +} + +/** + * @description 结束用户骑行订单 + * @param data + * @returns + */ +export function lockBikeApi(data: { bikeCode: string }) { + return http.post('/operations/statistics/closeOrder', data) +} diff --git a/src/pages-sub/order-manage/change-price.vue b/src/pages-sub/order-manage/change-price.vue new file mode 100644 index 0000000..a7a2036 --- /dev/null +++ b/src/pages-sub/order-manage/change-price.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/src/pages-sub/order-manage/index.vue b/src/pages-sub/order-manage/index.vue index 4e1a613..54ba66e 100644 --- a/src/pages-sub/order-manage/index.vue +++ b/src/pages-sub/order-manage/index.vue @@ -15,12 +15,16 @@ function handleBack() { const paging = ref(null) const orderList = ref([]) +const query = ref({ + bikeCode: '', +}) async function queryOrderList(pageNum: number, pageSize: number) { try { uni.showLoading({ title: '加载中', }) const { records } = await getOrderManageListApi({ + ...query.value, pageNum, pageSize, }) @@ -33,11 +37,29 @@ async function queryOrderList(pageNum: number, pageSize: number) { } } +function handleSearch() { + paging.value.reload() +} + const operatorStore = useOperatorStore() const operatorAllList = ref([]) onMounted(async () => { operatorAllList.value = await operatorStore.getOperatorList() }) + +function changePrice(row) { + uni.navigateTo({ + url: `/pages-sub/order-manage/change-price?data=${encodeURIComponent(JSON.stringify(row))}`, + }) +} +function lockBike(row) { + uni.navigateTo({ + url: `/pages-sub/order-manage/remove-locking?data=${encodeURIComponent(JSON.stringify(row))}`, + }) +} +onShow(() => { + handleSearch() +}) @@ -65,12 +96,12 @@ onMounted(async () => { :key="item.orderId" > - - - - 车辆编号:{{ item.bikeCode }} - + + + {{ item.bikeCode }} + + 订单编号:{{ item.orderId }} @@ -101,6 +132,7 @@ onMounted(async () => { marginLeft: '8rpx', }" text="修改价格" + @click="changePrice(item)" /> { marginLeft: '8rpx', }" text="远程锁车" + @click="lockBike(item)" /> @@ -156,6 +189,17 @@ onMounted(async () => { border-radius: 26rpx; background-color: #fff; box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.04); + & .header { + margin-bottom: 30rpx; + .title { + font-family: PingFangSC-Semibold; + font-size: 30rpx; + color: #333333; + letter-spacing: 0; + font-weight: 600; + margin: 0 25rpx 0 10rpx; + } + } & .body { & .row { width: 100%; @@ -192,4 +236,12 @@ onMounted(async () => { } } } +.search_bar { + width: calc(100% - 40rpx); + padding: 20rpx; + display: flex; + justify-content: space-between; + align-items: center; + background-color: #0f73ff; +} diff --git a/src/pages-sub/order-manage/remove-locking.vue b/src/pages-sub/order-manage/remove-locking.vue new file mode 100644 index 0000000..1ea11e5 --- /dev/null +++ b/src/pages-sub/order-manage/remove-locking.vue @@ -0,0 +1,147 @@ + + + + + From bc8cbe5e8d69a1f04bf55e022897eee7c0e3a8d5 Mon Sep 17 00:00:00 2001 From: mason Date: Sat, 28 Feb 2026 15:33:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E6=B6=89=E5=8F=8A=E5=9C=B0=E5=9B=BE=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages-sub/order-manage/change-price.vue | 14 +++++++++++--- src/pages-sub/order-manage/remove-locking.vue | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/pages-sub/order-manage/change-price.vue b/src/pages-sub/order-manage/change-price.vue index a7a2036..fbb90fc 100644 --- a/src/pages-sub/order-manage/change-price.vue +++ b/src/pages-sub/order-manage/change-price.vue @@ -12,8 +12,8 @@ @@ -63,6 +63,7 @@