From 2da4f39d73b41b644bae0e5d49b46dee8333c578 Mon Sep 17 00:00:00 2001
From: ISFP_T <68358856@qq.com>
Date: Thu, 18 Jun 2026 00:14:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
env/.env.development | 2 +-
env/.env.production | 2 +-
src/components/order-item/order-item.vue | 25 ++-
src/constant/enums.ts | 10 ++
src/locale/en.json | 25 +++
src/locale/zh-Hans.json | 25 +++
src/manifest.json | 4 +-
.../pages/group-meal-reservation/index.vue | 53 +++++-
.../pages/home-order/reservation.vue | 5 +-
.../components/price-detail/price-detail.vue | 40 +++--
.../reject-order-popup/reject-order-popup.vue | 90 ++++++++++
src/pages-user/pages/order/index.vue | 154 ++++++++++--------
src/pages-user/service/index.ts | 5 -
.../components/tabbar-home/tabbar-home.vue | 33 ++--
.../order-swiper-list/order-swiper-list.vue | 7 +-
src/pages/home/index.vue | 34 +---
src/service/groupMealReservation.ts | 8 +-
src/service/merchantOrder.ts | 27 ++-
src/service/types.ts | 29 +++-
src/store/module/user.ts | 26 ++-
src/utils/http.ts | 35 ++--
src/utils/merchantOrder.ts | 62 +++++++
src/utils/merchantToken.ts | 56 +++++++
23 files changed, 568 insertions(+), 189 deletions(-)
create mode 100644 src/pages-user/pages/order/components/reject-order-popup/reject-order-popup.vue
create mode 100644 src/utils/merchantOrder.ts
create mode 100644 src/utils/merchantToken.ts
diff --git a/env/.env.development b/env/.env.development
index e84eb83..1a94a56 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -6,6 +6,6 @@ VITE_DELETE_CONSOLE=false
#本地环境
#VITE_SERVER_BASEURL=http://liuyao.nat100.top/meiguowaimai
#VITE_SERVER_BASEURL=http://192.168.5.11:8080
-VITE_SERVER_BASEURL=https://howhowfresh.com/prod-api
+VITE_SERVER_BASEURL=https://www.hhcheflink.com/prod-api
#VITE_SERVER_BASEURL=http://192.168.1.8:8811
#VITE_SERVER_BASEURL=http://mifengchuantou.natapp1.cc/meiguowaimai
diff --git a/env/.env.production b/env/.env.production
index 4839794..f7dc9f4 100644
--- a/env/.env.production
+++ b/env/.env.production
@@ -5,6 +5,6 @@ VITE_DELETE_CONSOLE=true
#正式环境
-VITE_SERVER_BASEURL=https://howhowfresh.com/prod-api
+VITE_SERVER_BASEURL=https://www.hhcheflink.com/prod-api
#VITE_SERVER_BASEURL=http://liuyao.nat100.top/meiguowaimai
diff --git a/src/components/order-item/order-item.vue b/src/components/order-item/order-item.vue
index 2c7fc2a..9f50907 100644
--- a/src/components/order-item/order-item.vue
+++ b/src/components/order-item/order-item.vue
@@ -1,6 +1,7 @@
-
+
{{ t('pages.order.DEL') }}
-
-
+
{{ t('pages.order.PU') }}
@@ -44,9 +45,11 @@ function navigateTo(url: string) {
{{ t('pages.order.cancel') }}
{{ t('pages.order.refund') }}
+ {{ t('pages-user.order.status.unpaid') }}
{{ t('pages.order.CONF') }}
{{ t('pages.order.ACPT') }}
{{ t('pages.order.OTW') }}
+ {{ t('pages-user.order.status.merchantRejected') }}
{{ t('pages.order.DCOMP') }}
@@ -72,8 +75,9 @@ function navigateTo(url: string) {
- ${{ item.paidAmount }}
-
+ ${{ getMerchantReceiveAmount(item) }}
+ {{ t('pages-user.order.merchantReceiveAmount') }}
+
{{ t('common.itemNum') }}
{{ item.merchantOrderDishVoList.length }}
{{ t('common.item') }}
@@ -103,14 +107,17 @@ function navigateTo(url: string) {
>{{ t('pages-user.order.delivered') }}
-
+
{{ t('pages-user.order.receiving') }}
-
+
+
{{ t('pages-user.order.writeOff') }}
diff --git a/src/constant/enums.ts b/src/constant/enums.ts
index a140e7c..dffa389 100644
--- a/src/constant/enums.ts
+++ b/src/constant/enums.ts
@@ -144,6 +144,16 @@ export enum OrderCancelStatus {
REJECTED = 3,
}
+/** 支付状态 */
+export enum PayStatus {
+ /** 支付中 */
+ PAYING = 1,
+ /** 支付成功 */
+ SUCCESS = 2,
+ /** 支付失败 */
+ FAILED = 3,
+}
+
/** 消息类型 */
export enum MessageTypeEnum {
/** 有人评论了你 */
diff --git a/src/locale/en.json b/src/locale/en.json
index 2fe1c54..506f705 100644
--- a/src/locale/en.json
+++ b/src/locale/en.json
@@ -386,6 +386,10 @@
"userCancelled": "Cancelled by user"
},
"contactPhone": "Contact phone",
+ "contactNamePlaceholder": "Contact name",
+ "contactPhonePlaceholder": "Contact phone",
+ "search": "Search",
+ "reset": "Reset",
"peopleCount": "People count",
"perCapitaPrice": "Price per person",
"estimatedTotal": "Estimated total",
@@ -484,10 +488,13 @@
"cancelOrder": "User has applied to cancel the order",
"checkout": {
"priceDetail": {
+ "deliveryFee": "Delivery fee",
"desc": "These fees are only due to factors such as the number of shopping carts, and are used to pay for expenses related to your order, including platform services and delivery services.",
"memberDiscount": "Member discount",
+ "platformFeeNote": "Delivery fee and tip go to the platform and are not included in merchant receive amount.",
"serviceFees": "Service fees and other expenses",
"taxation": "Taxation",
+ "tip": "Tip",
"title": "What content is included"
}
},
@@ -522,7 +529,15 @@
"receiving": "Receiving",
"refundReason": "Reason for refund",
"refuseReason": "Reason for rejection",
+ "rejectOrderReason": "Reason for rejecting order",
"refuseRefund": "You have rejected the user's refund application",
+ "merchantReceiveAmount": "Merchant receive",
+ "customerPaidAmount": "Customer paid",
+ "platformServiceFee": "Platform fees (delivery/tip)",
+ "deliveryOrderInfo": "Delivery order info",
+ "deliveryDate": "Delivery date",
+ "groupDeliveryFee": "Group delivery fee",
+ "groupTip": "Group tip",
"reject": "Rejected",
"remark": "Remark:",
"reply": "Reply:",
@@ -544,6 +559,12 @@
"orderIdRequired": "Please enter order ID"
}
},
+ "payStatus": {
+ "title": "Payment status",
+ "paying": "Paying",
+ "success": "Paid",
+ "failed": "Payment failed"
+ },
"status": {
"completed": "Completed",
"completedDesc": "Order completed",
@@ -554,11 +575,13 @@
"merchantRejected": "Rejected",
"merchantRejectedDesc": "The merchant has rejected the order",
"pendingPayment": "Pending Order",
+ "unpaid": "Unpaid",
"waitingForOrder": "Waiting for order..."
},
"toast": {
"receiveSuccess": "Order successfully accepted",
"refuseReasonRequired": "Please enter a reason for rejection",
+ "rejectOrderReasonRequired": "Please enter a reason for rejecting the order",
"refuseSuccess": "Order successfully rejected"
},
"total": "Total",
@@ -722,8 +745,10 @@
"order": "History"
},
"toast": {
+ "agreeSuccess": "Order cancellation agreed",
"commentSuccess": "Comment successful",
"deleteSuccess": "Delete successfully",
+ "orderNumberCopied": "Order number copied",
"orderWriteOffSuccess": "Order verification successfully",
"pleasePhone": "Please pay attention to answering the phone.",
"pleaseSelectStore": "select a store",
diff --git a/src/locale/zh-Hans.json b/src/locale/zh-Hans.json
index 0fd3549..518e493 100644
--- a/src/locale/zh-Hans.json
+++ b/src/locale/zh-Hans.json
@@ -386,6 +386,10 @@
"userCancelled": "用户取消"
},
"contactPhone": "联系电话",
+ "contactNamePlaceholder": "联系人姓名",
+ "contactPhonePlaceholder": "联系电话",
+ "search": "搜索",
+ "reset": "重置",
"peopleCount": "团餐人数",
"perCapitaPrice": "人均单价",
"estimatedTotal": "预计总价",
@@ -484,10 +488,13 @@
"cancelOrder": "用户已申请取消订单",
"checkout": {
"priceDetail": {
+ "deliveryFee": "配送费",
"desc": "这些费用仅基于购物车数量等因素，并用于支付与您的订单相关的费用，包括平台服务和配送服务。",
"memberDiscount": "会员折扣",
+ "platformFeeNote": "配送费和小费归平台，不计入商家到账金额。",
"serviceFees": "服务费及其他费用",
"taxation": "税收",
+ "tip": "小费",
"title": "包含哪些内容"
}
},
@@ -521,7 +528,15 @@
"receiving": "接单",
"refundReason": "退款原因",
"refuseReason": "拒绝原因",
+ "rejectOrderReason": "拒绝接单原因",
"refuseRefund": "您已拒绝用户的退款申请",
+ "merchantReceiveAmount": "商家到账",
+ "customerPaidAmount": "顾客实付",
+ "platformServiceFee": "平台服务费（配送费/小费）",
+ "deliveryOrderInfo": "配送单信息",
+ "deliveryDate": "配送日期",
+ "groupDeliveryFee": "配送单配送费",
+ "groupTip": "配送单小费",
"reject": "已拒绝",
"remark": "备注：",
"reply": "回复：",
@@ -543,6 +558,12 @@
"orderIdRequired": "请输入订单ID"
}
},
+ "payStatus": {
+ "title": "支付状态",
+ "paying": "支付中",
+ "success": "支付成功",
+ "failed": "支付失败"
+ },
"status": {
"completed": "已完成",
"completedDesc": "订单已完成",
@@ -551,6 +572,7 @@
"merchantAccepted": "已接单",
"merchantAcceptedDesc": "商家已接单",
"pendingPayment": "待接单",
+ "unpaid": "待付款",
"waitingForOrder": "等待接单中...",
"merchantRejected": "已拒绝",
"merchantRejectedDesc": "商家已拒绝接单"
@@ -558,6 +580,7 @@
"toast": {
"receiveSuccess": "接单成功",
"refuseReasonRequired": "请输入拒绝原因",
+ "rejectOrderReasonRequired": "请输入拒绝接单原因",
"refuseSuccess": "拒绝成功"
},
"total": "共",
@@ -722,8 +745,10 @@
"order": "订单"
},
"toast": {
+ "agreeSuccess": "已同意取消订单",
"commentSuccess": "评论成功",
"deleteSuccess": "删除成功",
+ "orderNumberCopied": "订单号已复制",
"orderWriteOffSuccess": "订单核销成功",
"pleasePhone": "请注意接听电话。",
"pleaseSelectStore": "请选择店铺",
diff --git a/src/manifest.json b/src/manifest.json
index 51d9b19..c4ee26e 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
"name" : "CHEFLINK Merchant",
"appid" : "__UNI__BB8E3C9",
"description" : "美国外卖商户端",
- "versionName" : "3.0.2",
- "versionCode" : 302,
+ "versionName" : "3.0.3",
+ "versionCode" : 303,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/src/pages-user/pages/group-meal-reservation/index.vue b/src/pages-user/pages/group-meal-reservation/index.vue
index db445a7..e6128da 100644
--- a/src/pages-user/pages/group-meal-reservation/index.vue
+++ b/src/pages-user/pages/group-meal-reservation/index.vue
@@ -44,14 +44,37 @@ function statusClass(status?: number) {
return 'text-#666 bg-#F6F6F6'
}
-const {paging, dataList, loading, queryList} = usePage((pageNum, pageSize) => {
+const contactNameKeyword = ref('')
+const contactPhoneKeyword = ref('')
+
+function buildGroupMealQueryBody() {
const tab = tabsList.value[currentTab.value]
+ const body: Record = {}
+ if (tab?.status != null) body.status = tab.status
+ const name = contactNameKeyword.value.trim()
+ const phone = contactPhoneKeyword.value.trim()
+ if (name) body.contactName = name
+ if (phone) body.contactPhone = phone
+ return body
+}
+
+const {paging, dataList, loading, queryList} = usePage((pageNum, pageSize) => {
return appGroupMealReservationMerchantListPost({
params: {pageNum, pageSize},
- body: tab?.status != null ? {status: tab.status} : {},
+ body: buildGroupMealQueryBody(),
})
})
+function handleSearch() {
+ paging.value?.reload()
+}
+
+function handleResetSearch() {
+ contactNameKeyword.value = ''
+ contactPhoneKeyword.value = ''
+ paging.value?.reload()
+}
+
function tabsChange(e: { index: number }) {
currentTab.value = e.index
paging.value?.reload()
@@ -80,6 +103,32 @@ onShow(() => {
+
+
+
+
+
+
+
+ {{ t('pages-user.groupMealReservation.search') }}
+
+
+ {{ t('pages-user.groupMealReservation.reset') }}
+
+
+
diff --git a/src/pages-user/pages/home-order/reservation.vue b/src/pages-user/pages/home-order/reservation.vue
index 152c5cc..b64954b 100644
--- a/src/pages-user/pages/home-order/reservation.vue
+++ b/src/pages-user/pages/home-order/reservation.vue
@@ -6,12 +6,11 @@ const {t} = useI18n()
const {paging, dataList, loading, queryList, firstLoaded} = usePage((pageNum, pageSize) => {
return appMerchantOrderDishListPost({
+ params: {pageNum, pageSize},
body: {
- pageNum,
- pageSize,
createBeginTime: dayjs().startOf('day').valueOf(),
createEndTime: dayjs().endOf('day').valueOf(),
- }
+ },
})
})
diff --git a/src/pages-user/pages/order/components/price-detail/price-detail.vue b/src/pages-user/pages/order/components/price-detail/price-detail.vue
index c97dfc4..c584e9c 100644
--- a/src/pages-user/pages/order/components/price-detail/price-detail.vue
+++ b/src/pages-user/pages/order/components/price-detail/price-detail.vue
@@ -1,16 +1,15 @@
+
+
+
+
+
+ {{ t('pages-user.order.rejectOrderReason') }}
+
+
+
+
+
+
+
+
+
+ {{ t('common.submit') }}
+
+
+
+
+
+
diff --git a/src/pages-user/pages/order/index.vue b/src/pages-user/pages/order/index.vue
index 7b503db..164e8a6 100644
--- a/src/pages-user/pages/order/index.vue
+++ b/src/pages-user/pages/order/index.vue
@@ -4,23 +4,29 @@ import {
appMerchantOrderAgreeRefundPost,
appMerchantOrderDetailPost,
appMerchantOrderReceiveOrderPost,
- type MerchantOrderVo,
} from "@/service";
import RefusePopup from "./components/refuse-popup/refuse-popup.vue";
+import RejectOrderPopup from "./components/reject-order-popup/reject-order-popup.vue";
import {OrderCancelStatus, OrderStatus} from "@/constant/enums";
import {callPhone, formatDateTimeRange, formatTimestampWithMonthName, navGoogleMap} from "@/utils/utils";
+import {
+ formatOrderAmount,
+ getMerchantReceiveAmount,
+ getPlatformServiceFee,
+ payStatusLabel,
+ toOrderIdString,
+ type MerchantOrderDetailVo,
+} from "@/utils/merchantOrder";
+import {requireMerchantToken} from "@/utils/merchantToken";
import PriceDetail from "./components/price-detail/price-detail.vue";
import startDelivery from "./components/start-delivery/start-delivery.vue";
import OrderSkeleton from "./components/order-skeleton.vue";
-import {useMessage} from "wot-design-uni";
-import {rejectUserOrderApi} from "@/pages-user/service";
-
-const message = useMessage();
const {t} = useI18n();
const configStore = useConfigStore()
const userStore = useUserStore()
const refusePopup = ref()
+const rejectOrderPopup = ref()
const collapseValue = ref(false)
// 拨打电话
@@ -87,7 +93,7 @@ onShow(() => {
}
})
-const orderDetail = ref()
+const orderDetail = ref()
const loading = ref(false)
function appMerchantOrderDetail() {
@@ -136,10 +142,12 @@ const priceDetailRef = ref(null)
// 打开价格明细
const openPriceDetail = () => {
priceDetailRef.value?.onOpen({
- tip: orderDetail.value.tip,
- tax: orderDetail.value.tax,
- deliveryFee: orderDetail.value.deliveryFee
- }, 0);
+ tip: orderDetail.value?.tip,
+ tax: orderDetail.value?.tax,
+ deliveryFee: orderDetail.value?.deliveryFee,
+ deliveryFeeCharged: orderDetail.value?.deliveryFeeCharged,
+ tipCharged: orderDetail.value?.tipCharged,
+ });
};
// 接单
@@ -165,23 +173,16 @@ function startReceiving() {
const startDeliveryRef = ref(null)
function startDeliveryFun() {
- startDeliveryRef.value?.onOpen(orderDetail.value.id)
+ startDeliveryRef.value?.onOpen(toOrderIdString(orderDetail.value?.id))
}
-// 点击已送达
function deliveredOrder() {
- navigateTo('/pages-user/pages/order/delivered-order?id=' + orderDetail.value.id)
+ navigateTo('/pages-user/pages/order/delivered-order?id=' + toOrderIdString(orderDetail.value?.id))
}
// 核销订单
function writeOff() {
- if (!userStore.currentMerchantToken) {
- uni.showToast({
- title: t('toast.pleaseSelectStore'),
- icon: 'none',
- })
- return
- }
+ if (!requireMerchantToken(userStore)) return
navigateTo('/pages-user/pages/scan-code/index')
}
@@ -190,39 +191,8 @@ function submitDelivery() {
}
-// 拒绝开始订单， 直接拒绝用户的订单
function rejectStartOrder() {
- message
- .confirm({
- title: t("common.prompt.system-prompt"),
- msg: `${t("common.prompt.system-prompt-reject")}`,
- confirmButtonText: t("common.yes"),
- cancelButtonText: t("common.no"),
- cancelButtonProps: {
- customClass:
- "!h-88rpx !w-258rpx !min-w-auto !text-30rpx !lh-42rpx !font-bold !border-#666666 !rounded-20rpx",
- },
- confirmButtonProps: {
- customClass:
- "!h-88rpx !w-258rpx !min-w-auto !text-30rpx !lh-42rpx !font-bold !bg-primary !rounded-20rpx",
- },
- })
- .then(async () => {
- rejectUserOrderApi({
- orderId: orderId.value,
- }).then(res => {
- uni.showToast({
- title: t('toast.rejectSuccess'),
- icon: 'none'
- })
- setTimeout(() => {
- // 获取订单详情
- appMerchantOrderDetail()
- }, 500)
- })
- })
- .catch(() => {
- });
+ rejectOrderPopup.value?.onOpen(orderId.value)
}
@@ -397,8 +367,8 @@ function rejectStartOrder() {
-
-
+
+
{{ t('pages-user.order.pickUp') }}:
@@ -466,24 +436,61 @@ function rejectStartOrder() {
- {{ t('pages.order.subtotal') }}
- ${{ orderDetail?.actualPrice }}
+ {{ t('pages.order.subtotal') }}
+ ${{ formatOrderAmount(orderDetail?.actualPrice) }}
- {{ t('pages.order.taxesAndFees') }}
-
-
-
- ${{
- (Number(orderDetail?.tax) + Number(orderDetail?.tip) + Number(orderDetail?.deliveryFee)).toFixed(2)
- }}
-
+ {{ t('pages.order.taxesAndFees') }}
+
+ ${{ formatOrderAmount(orderDetail?.tax) }}
-
- {{ t('pages.order.total') }}
- ${{ orderDetail?.paidAmount }}
+
+ {{ t('pages-user.order.platformServiceFee') }}
+ ${{ getPlatformServiceFee(orderDetail) }}
+
+
+ {{ t('pages-user.order.customerPaidAmount') }}
+ ${{ formatOrderAmount(orderDetail?.paidAmount) }}
+
+
+ {{ t('pages-user.order.merchantReceiveAmount') }}
+ ${{ getMerchantReceiveAmount(orderDetail) }}
+
+
+
+
+
+
+
+
+ {{ t('pages-user.order.deliveryOrderInfo') }}
+
+
+
+ {{ t('pages-user.order.deliveryDate') }}
+ {{ orderDetail.deliveryDate }}
+
+
+ {{ t('pages-user.order.groupDeliveryFee') }}
+ ${{ formatOrderAmount(orderDetail.merchantDeliveryOrderVo.groupDeliveryFee) }}
+
+
+ {{ t('pages-user.order.groupTip') }}
+ ${{ formatOrderAmount(orderDetail.merchantDeliveryOrderVo.groupTip) }}
@@ -522,7 +529,7 @@ function rejectStartOrder() {
-
+
{{ t('pages-user.order.payMethod') }}
{{
@@ -530,6 +537,11 @@ function rejectStartOrder() {
}}
+
+
+ {{ t('pages-user.order.payStatus.title') }}
+ {{ payStatusLabel(orderDetail?.payStatus, t) }}
+
@@ -637,8 +649,8 @@ function rejectStartOrder() {
-
-
+
+
@@ -675,6 +687,8 @@ function rejectStartOrder() {
+
+
diff --git a/src/pages-user/service/index.ts b/src/pages-user/service/index.ts
index a68e787..817c55f 100644
--- a/src/pages-user/service/index.ts
+++ b/src/pages-user/service/index.ts
@@ -4,11 +4,6 @@ import {http} from '@/utils/http'
// 获取州列表
export const getStateListApi = () => http.post>('/app/continent/list')
-// 拒绝用户订单
-export const rejectUserOrderApi = (data: {
- orderId: string
-}) => http.post>('/app/merchantOrder/rejectOrder', data)
-
// 获取字典列表信息
export const getDictFineList = (data: Record) =>
http.post('/app/dict/findList', data);
diff --git a/src/pages/home/components/tabbar-home/tabbar-home.vue b/src/pages/home/components/tabbar-home/tabbar-home.vue
index f31af9e..3d6a6df 100644
--- a/src/pages/home/components/tabbar-home/tabbar-home.vue
+++ b/src/pages/home/components/tabbar-home/tabbar-home.vue
@@ -5,6 +5,7 @@ import {appMerchantIndexDataGet, appMerchantOrderDishListPost, appMerchantOrderO
import {OrderStatus} from "@/constant/enums";
import dayjs from "dayjs";
import Config from "@/config";
+import {requireMerchantToken} from "@/utils/merchantToken";
const configStore = useConfigStore()
const userStore = useUserStore()
@@ -12,26 +13,15 @@ const emits = defineEmits(['changeStore'])
const {t} = useI18n()
+const MERCHANT_TOKEN_REQUIRED_PATHS = [
+ '/pages-user/pages/scan-code/index',
+ '/pages-user/pages/group-meal-reservation/index',
+]
+
function navigateTo(url: string) {
- if (userStore.checkLogin()) {
- if (url === '/pages-user/pages/scan-code/index' && !userStore.currentMerchantToken) {
- uni.showToast({
- title: t('toast.pleaseSelectStore'),
- icon: 'none',
- })
- return
- }
- if (url === '/pages-user/pages/group-meal-reservation/index' && !userStore.currentMerchantToken) {
- uni.showToast({
- title: t('toast.pleaseSelectStore'),
- icon: 'none',
- })
- return
- }
- uni.navigateTo({
- url,
- })
- }
+ if (!userStore.checkLogin()) return
+ if (MERCHANT_TOKEN_REQUIRED_PATHS.includes(url) && !requireMerchantToken(userStore)) return
+ uni.navigateTo({url})
}
const orderTabsList = ref([
@@ -186,12 +176,11 @@ const reservationList = ref([])
function getReservationList() {
appMerchantOrderDishListPost({
+ params: {pageNum: 1, pageSize: 10},
body: {
- pageNum: 1,
- pageSize: 10,
createBeginTime: dayjs().startOf('day').valueOf(),
createEndTime: dayjs().endOf('day').valueOf(),
- }
+ },
}).then(res => {
reservationList.value = res.rows
})
diff --git a/src/pages/home/components/tabbar-order/components/order-swiper-list/order-swiper-list.vue b/src/pages/home/components/tabbar-order/components/order-swiper-list/order-swiper-list.vue
index be3b8f7..a3cf198 100644
--- a/src/pages/home/components/tabbar-order/components/order-swiper-list/order-swiper-list.vue
+++ b/src/pages/home/components/tabbar-order/components/order-swiper-list/order-swiper-list.vue
@@ -124,14 +124,15 @@ defineExpose({
>{{ t('pages-user.order.delivered') }}
-
+
{{ t('pages-user.order.receiving') }}
+
{{ t('pages-user.order.writeOff') }}
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index cbf9a63..ed4a117 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -11,7 +11,7 @@ import store from "./components/tabbar-home/components/store.vue";
import Config from "@/config";
import {useMessage} from "wot-design-uni";
import type UseCode from "@/components/use-code/use-code.vue";
-import {appMerchantSwitchMerchantIdGet, appMessageUnreadCountPost} from "@/service";
+import {appMessageUnreadCountPost} from "@/service";
import {getDictFineList} from "@/pages-user/service";
import {appUpdate} from "@/utils/update";
@@ -94,23 +94,13 @@ function changeStore() {
}
// 确认切换店铺了
-function confirmChangeStore(data) {
+async function confirmChangeStore(data: { value: string }) {
console.log('切换店铺了', data)
if (userStore.currenMerchantInfo && data.value === userStore.currenMerchantInfo?.id) return
- appMerchantSwitchMerchantIdGet({
- params: {
- merchantId: data.value
- }
- }).then(res => {
- if (res.data) {
- userStore.currentMerchantToken = res.data
- userStore.getSwitchableMerchantInfo()
-
- handleTabbarChange({value: activeIndex.value})
- }
- // 查询商户首页数据
- // tabbarHomeRef.value?.initData()
- })
+ const ok = await userStore.switchMerchant(String(data.value))
+ if (ok) {
+ handleTabbarChange({value: activeIndex.value})
+ }
}
function handleTabbarChange({value}: { value: string }) {
@@ -230,17 +220,7 @@ onShow(() => {
getUnreadMessageCount()
userStore.getFirstShopSettled()
userStore.getSwitchableMerchants(() => {
- // 自动切换店铺
- setTimeout(() => {
- console.log('开始自动切换店铺')
- if (!userStore.currentMerchantToken && userStore.merchants.length > 0) {
- console.log('自动切换店铺', userStore.merchants[0].id)
- console.log('自动切换店铺', userStore.merchants[0].merchantName)
- confirmChangeStore({
- value: userStore.merchants[0].id
- })
- }
- }, 10)
+ userStore.ensureMerchantTokenOnLogin()
})
userStore.getSwitchableMerchantInfo()
}
diff --git a/src/service/groupMealReservation.ts b/src/service/groupMealReservation.ts
index 4ccdf0d..4d4118a 100644
--- a/src/service/groupMealReservation.ts
+++ b/src/service/groupMealReservation.ts
@@ -3,9 +3,9 @@ import request from '@/http/vue-query';
import type { CustomRequestOptions } from '@/http/types';
export type GroupMealReservationVo = {
- id?: number;
- merchantId?: number;
- userId?: number;
+ id?: string;
+ merchantId?: string;
+ userId?: string;
peopleCount?: number;
perCapitaPrice?: number;
scene?: string;
@@ -41,7 +41,7 @@ export type GroupMealReservationQueryBo = {
};
export type GroupMealReservationStatusBo = {
- id: number;
+ id: string;
status: 2 | 3 | 4 | 5;
handleRemark?: string;
};
diff --git a/src/service/merchantOrder.ts b/src/service/merchantOrder.ts
index bc77080..ca1f398 100644
--- a/src/service/merchantOrder.ts
+++ b/src/service/merchantOrder.ts
@@ -5,6 +5,24 @@ import type { CustomRequestOptions } from '@/http/types';
import * as API from './types';
+/** 商家拒绝接单 POST /app/merchantOrder/rejectOrder */
+export async function appMerchantOrderRejectOrderPost({
+ body,
+ options,
+}: {
+ body: { orderId: string; reason: string };
+ options?: CustomRequestOptions;
+}) {
+ return request('/app/merchantOrder/rejectOrder', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 商家同意退款 POST /app/merchantOrder/agreeRefund */
export async function appMerchantOrderAgreeRefundPost({
params,
@@ -208,10 +226,12 @@ export async function appMerchantOrderDetailPost({
/** 菜品列表(根据预约时间查询) POST /app/merchantOrder/dishList */
export async function appMerchantOrderDishListPost({
+ params,
body,
options,
}: {
- body: API.TimeSearchBo;
+ params: { pageNum: number; pageSize: number };
+ body?: API.TimeSearchBo;
options?: CustomRequestOptions;
}) {
return request(
@@ -221,7 +241,10 @@ export async function appMerchantOrderDishListPost({
headers: {
'Content-Type': 'application/json',
},
- data: body,
+ params: {
+ ...params,
+ },
+ data: body || {},
...(options || {}),
}
);
diff --git a/src/service/types.ts b/src/service/types.ts
index 31e608b..652c956 100644
--- a/src/service/types.ts
+++ b/src/service/types.ts
@@ -277,7 +277,7 @@ export type AppMerchantMenuRemovePostBody = number[];
export type AppMerchantOrderAgreeRefundPostParams =
{
- 'orderId'?: number;
+ 'orderId'?: string;
}
@@ -289,7 +289,7 @@ export type AppMerchantOrderCanUseCouponListmerchantIdGetParams =
export type AppMerchantOrderDetailPostParams =
{
- 'orderId'?: number;
+ 'orderId'?: string;
}
@@ -308,7 +308,7 @@ export type AppMerchantOrderOrderListPostParams =
export type AppMerchantOrderReceiveOrderPostParams =
{
- 'orderId'?: number;
+ 'orderId'?: string;
}
@@ -747,7 +747,7 @@ export type AppVersionVo =
export type ArrivedOrderBo =
{
/** 订单id */
- 'orderId'?: number;
+ 'orderId'?: string;
/** 送达图片 */
'deliveryPhotos'?: string;
}
@@ -1640,7 +1640,7 @@ export type DeleteCartBo =
export type DeliverOrderBo =
{
/** 订单id */
- 'orderId'?: number;
+ 'orderId'?: string;
/** 配送员手机号 */
'deliveryPhone'?: string;
/** 配送员头像 */
@@ -3338,7 +3338,7 @@ export type MerchantOrderVo =
/** 请求参数 */
'params'?: MapObject;
/** 主键ID */
- 'id'?: number;
+ 'id'?: string | number;
/** 用户ID */
'userId'?: number;
/** 商家ID */
@@ -3363,6 +3363,21 @@ export type MerchantOrderVo =
'tipDiscount'?: number;
/** 配送费 */
'deliveryFee'?: number;
+ /** 当前订单是否承载顾客配送费支付 */
+ 'deliveryFeeCharged'?: boolean;
+ /** 当前订单是否承载顾客小费支付 */
+ 'tipCharged'?: boolean;
+ /** 关联配送单 ID */
+ 'merchantDeliveryOrderId'?: string;
+ /** 配送日期 yyyy-MM-dd */
+ 'deliveryDate'?: string;
+ /** 配送单信息 */
+ 'merchantDeliveryOrderVo'?: {
+ 'id'?: string;
+ 'deliveryDate'?: string;
+ 'groupDeliveryFee'?: number;
+ 'groupTip'?: number;
+ };
/** 是否支付周配送费(1-是 2-否) */
'weeklyDeliveryFee'?: number;
/** 周配送费 */
@@ -4246,7 +4261,7 @@ export type RecommendMerchantBo =
export type RejectRefundBo =
{
/** 订单id */
- 'orderId'?: number;
+ 'orderId'?: string;
/** 拒绝原因 */
'rejectReason'?: string;
}
diff --git a/src/store/module/user.ts b/src/store/module/user.ts
index d360fc3..9ba44c3 100644
--- a/src/store/module/user.ts
+++ b/src/store/module/user.ts
@@ -8,6 +8,7 @@ import {
appUserGetLoginUserGet
} from '@/service'
import Config from '@/config'
+import {extractMerchantTokenFromSwitchRes} from '@/utils/merchantToken'
export const useUserStore = defineStore(
'user',
@@ -128,14 +129,30 @@ export const useUserStore = defineStore(
// 切换商户 /app/merchant/switch/{merchantId}
const switchMerchant = async (merchantId: string) => {
- if (!isLogin.value) return
+ if (!isLogin.value) return false
try {
const res = await appMerchantSwitchMerchantIdGet({
- merchantId,
- options: {}
+ params: {merchantId},
})
- console.log('切换商户', res)
+ const token = extractMerchantTokenFromSwitchRes(res)
+ if (!token) return false
+ currentMerchantToken.value = token
+ await getSwitchableMerchantInfo()
+ return true
} catch (e) {
+ return false
+ }
+ }
+
+ /** 登录后若无 merchantToken，自动切换到第一个店铺 */
+ const ensureMerchantTokenOnLogin = async () => {
+ if (!isLogin.value || currentMerchantToken.value) return
+ if (!merchants.value.length) {
+ await getSwitchableMerchants()
+ }
+ const first = merchants.value[0] as { id?: string | number } | undefined
+ if (first?.id) {
+ await switchMerchant(String(first.id))
}
}
@@ -168,6 +185,7 @@ export const useUserStore = defineStore(
getSwitchableMerchants,
getSwitchableMerchantInfo,
switchMerchant,
+ ensureMerchantTokenOnLogin,
getFirstShopSettled,
}
},
diff --git a/src/utils/http.ts b/src/utils/http.ts
index 76018c6..9830bc9 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -2,21 +2,17 @@ import type {CustomRequestOptions} from '@/interceptor/request'
import {useConfigStore, useUserStore} from '@/store'
import Config from '@/config'
import {i18n} from "@/locale";
+import {isMerchantTokenMissingMessage, refreshMerchantToken} from '@/utils/merchantToken'
type IRes = T extends ArrayBuffer ? ArrayBuffer : IResData
+type HttpOptions = CustomRequestOptions & { _merchantTokenRetried?: boolean }
-
-export const http = (options: CustomRequestOptions) => {
- console.log(options, 'options')
- // 1. 返回 Promise 对象
+function requestOnce(options: HttpOptions): Promise> {
return new Promise>((resolve, reject) => {
uni.request({
...options,
dataType: 'json',
- // 响应成功
success(res) {
- console.log(res, '111111')
-
const ErrorMessage = {
401: i18n.global.t('common.prompt.authentication-failed-please-log-in'),
700: i18n.global.t('common.prompt.login-expired-please-log-in-again'),
@@ -29,7 +25,8 @@ export const http = (options: CustomRequestOptions) => {
// @ts-ignore
configStore.serverTime = +data.systemTime
}
- if (data instanceof ArrayBuffer || data.code === 200) {
+ const jeecgSuccess = (data as any).code === 0 && (data as any).success === true
+ if (data instanceof ArrayBuffer || data.code === 200 || jeecgSuccess) {
resolve(data)
} else if (data.code === 401 || data.code === 700) {
uni.showToast({
@@ -43,16 +40,30 @@ export const http = (options: CustomRequestOptions) => {
} else if (data.code === 711) {
reject(data)
} else {
- // 其他错误 -> 根据后端错误信息轻提示
+ const errMsg = (res.data as IResData).msg || (res.data as any).message || ''
+ if (isMerchantTokenMissingMessage(errMsg) && !options._merchantTokenRetried) {
+ refreshMerchantToken(userStore).then((ok) => {
+ if (ok) {
+ http({...options, _merchantTokenRetried: true}).then(resolve).catch(reject)
+ } else {
+ !options.hideErrorToast &&
+ uni.showToast({
+ icon: 'none',
+ title: errMsg || i18n.global.t('toast.pleaseSelectStore'),
+ })
+ reject(data)
+ }
+ })
+ return
+ }
!options.hideErrorToast &&
uni.showToast({
icon: 'none',
- title: (res.data as IResData).msg || i18n.global.t('common.prompt.request-incorrect'),
+ title: errMsg || i18n.global.t('common.prompt.request-incorrect'),
})
reject(data)
}
},
- // 响应失败
fail(err) {
uni.showToast({
icon: 'none',
@@ -64,6 +75,8 @@ export const http = (options: CustomRequestOptions) => {
})
}
+export const http = (options: HttpOptions) => requestOnce(options)
+
/**
* GET 请求
* @param url 后台地址
diff --git a/src/utils/merchantOrder.ts b/src/utils/merchantOrder.ts
new file mode 100644
index 0000000..a5ff6f6
--- /dev/null
+++ b/src/utils/merchantOrder.ts
@@ -0,0 +1,62 @@
+import type {MerchantOrderVo} from '@/service'
+
+/** 配送单信息（按文档扩展） */
+export type MerchantDeliveryOrderVo = {
+ id?: string
+ deliveryDate?: string
+ groupDeliveryFee?: number
+ groupTip?: number
+}
+
+/** 商家端订单详情扩展字段 */
+export type MerchantOrderDetailVo = MerchantOrderVo & {
+ id?: string | number
+ deliveryFeeCharged?: boolean
+ tipCharged?: boolean
+ merchantDeliveryOrderId?: string
+ deliveryDate?: string
+ merchantDeliveryOrderVo?: MerchantDeliveryOrderVo
+}
+
+export function formatOrderAmount(value?: number | string | null) {
+ if (value == null || value === '') return '0.00'
+ const num = Number(value)
+ if (Number.isNaN(num)) return '0.00'
+ return num.toFixed(2)
+}
+
+/** 商家到账金额，优先 merchantReceiveAmount */
+export function getMerchantReceiveAmount(order?: Pick) {
+ if (order?.merchantReceiveAmount != null) {
+ return formatOrderAmount(order.merchantReceiveAmount)
+ }
+ return formatOrderAmount(order?.actualPrice)
+}
+
+/** 平台费用（配送费+小费，归平台） */
+export function getPlatformServiceFee(order?: Pick) {
+ if (!order) return '0.00'
+ let total = 0
+ if (order.deliveryFeeCharged !== false) {
+ total += Number(order.deliveryFee) || 0
+ }
+ if (order.tipCharged !== false) {
+ total += Number(order.tip) || 0
+ }
+ return total.toFixed(2)
+}
+
+export function toOrderIdString(id?: string | number | null) {
+ if (id == null || id === '') return ''
+ return String(id)
+}
+
+export function payStatusLabel(status?: number, t?: (key: string) => string) {
+ if (status == null || !t) return '-'
+ const map: Record = {
+ 1: t('pages-user.order.payStatus.paying'),
+ 2: t('pages-user.order.payStatus.success'),
+ 3: t('pages-user.order.payStatus.failed'),
+ }
+ return map[status] || String(status)
+}
diff --git a/src/utils/merchantToken.ts b/src/utils/merchantToken.ts
new file mode 100644
index 0000000..23674e4
--- /dev/null
+++ b/src/utils/merchantToken.ts
@@ -0,0 +1,56 @@
+import type {useUserStore} from '@/store'
+import {i18n} from '@/locale'
+
+type UserStore = ReturnType
+
+/** 切换店铺接口：文档约定 msg 返回 merchantToken，兼容 data */
+export function extractMerchantTokenFromSwitchRes(res: { data?: unknown; msg?: string }) {
+ const msg = typeof res.msg === 'string' ? res.msg.trim() : ''
+ if (msg && msg !== '操作成功' && msg.length > 10 && !/^[\u4e00-\u9fa5]+$/.test(msg)) {
+ return msg
+ }
+ if (typeof res.data === 'string' && res.data.trim()) {
+ return res.data.trim()
+ }
+ return ''
+}
+
+export function isMerchantTokenMissingMessage(message?: string) {
+ if (!message) return false
+ return message.includes('商户端请先切换店铺') || message.includes('请先切换店铺')
+}
+
+/** 登录后或 token 失效时，自动切换到第一个可用店铺 */
+export async function ensureMerchantToken(userStore: UserStore) {
+ if (!userStore.isLogin) return false
+ if (userStore.currentMerchantToken) return true
+
+ if (!userStore.merchants?.length) {
+ await userStore.getSwitchableMerchants()
+ }
+ const first = userStore.merchants?.[0]
+ if (!first?.id) return false
+
+ return userStore.switchMerchant(String(first.id))
+}
+
+/** 切换指定店铺并保存 merchantToken */
+export async function switchToMerchant(userStore: UserStore, merchantId: string) {
+ if (!userStore.isLogin || !merchantId) return false
+ return userStore.switchMerchant(merchantId)
+}
+
+export async function refreshMerchantToken(userStore: UserStore) {
+ userStore.currentMerchantToken = ''
+ return ensureMerchantToken(userStore)
+}
+
+/** 商家端接口调用前检查 merchantToken */
+export function requireMerchantToken(userStore: UserStore): boolean {
+ if (userStore.currentMerchantToken) return true
+ uni.showToast({
+ icon: 'none',
+ title: i18n.global.t('toast.pleaseSelectStore'),
+ })
+ return false
+}