diff --git a/env/.env.development b/env/.env.development
index f989e74..e84eb83 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -5,7 +5,7 @@ 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=http://192.168.5.11:8080
+VITE_SERVER_BASEURL=https://howhowfresh.com/prod-api
#VITE_SERVER_BASEURL=http://192.168.1.8:8811
#VITE_SERVER_BASEURL=http://mifengchuantou.natapp1.cc/meiguowaimai
diff --git a/src/constant/enums.ts b/src/constant/enums.ts
index a2a04bd..a140e7c 100644
--- a/src/constant/enums.ts
+++ b/src/constant/enums.ts
@@ -172,4 +172,20 @@ export enum MessageTypeEnum {
COMMENT_APPROVED = 13,
/** 评论审核未通过 */
COMMENT_REJECTED = 14,
+}
+
+/** 团餐预定状态 */
+export enum GroupMealReservationStatus {
+ /** 待处理 */
+ PENDING = 1,
+ /** 已联系 */
+ CONTACTED = 2,
+ /** 已确认 */
+ CONFIRMED = 3,
+ /** 已拒绝 */
+ REJECTED = 4,
+ /** 已完成 */
+ COMPLETED = 5,
+ /** 用户取消 */
+ USER_CANCELLED = 6,
}
\ No newline at end of file
diff --git a/src/locale/en.json b/src/locale/en.json
index 38e305f..2fe1c54 100644
--- a/src/locale/en.json
+++ b/src/locale/en.json
@@ -95,6 +95,7 @@
"navbar-future-order": "Future Order",
"navbar-month-order": "This Month's Order",
"navbar-refund-order": "Refund order",
+ "navbar-group-meal-reservation": "Group meal reservation",
"navbar-reservation": "Today's ordered dishes",
"navbar-set-payment-password": "Set a payment password",
"navbar-settings": "Settings",
@@ -108,6 +109,7 @@
"card-title": "CHEFLINK stir fry machine",
"commonTools": "Common tools",
"coupons": "Coupons",
+ "groupMealReservation": "Group meals",
"createStore": "Create a store",
"dataStatistics": "Data statistics",
"futureOrders": "Booking order",
@@ -371,6 +373,34 @@
"value": "Value"
}
},
+ "groupMealReservation": {
+ "tabs": {
+ "all": "All"
+ },
+ "status": {
+ "pending": "Pending",
+ "contacted": "Contacted",
+ "confirmed": "Confirmed",
+ "rejected": "Rejected",
+ "completed": "Completed",
+ "userCancelled": "Cancelled by user"
+ },
+ "contactPhone": "Contact phone",
+ "peopleCount": "People count",
+ "perCapitaPrice": "Price per person",
+ "estimatedTotal": "Estimated total",
+ "expectedTime": "Expected time",
+ "scene": "Scene",
+ "remark": "User remark",
+ "handleRemark": "Handle remark",
+ "cancelReason": "Cancel reason",
+ "userNickName": "User nickname",
+ "detailTitle": "Group meal details",
+ "handleTitle": "Update status",
+ "handleRemarkPlaceholder": "Handle remark (optional)",
+ "confirmHandle": "Update status to \"{status}\"?",
+ "userCancelledTip": "Cancelled by user. View only."
+ },
"income": {
"index": {
"accountToReceive": "Account to receive:",
diff --git a/src/locale/zh-Hans.json b/src/locale/zh-Hans.json
index 476d349..0fd3549 100644
--- a/src/locale/zh-Hans.json
+++ b/src/locale/zh-Hans.json
@@ -95,6 +95,7 @@
"navbar-future-order": "未来订单",
"navbar-month-order": "本月订单",
"navbar-refund-order": "退款订单",
+ "navbar-group-meal-reservation": "团餐预定",
"navbar-reservation": "今日预定菜品统计",
"navbar-set-payment-password": "设置支付密码",
"navbar-settings": "设置",
@@ -106,6 +107,7 @@
"bookDishesToday": "预订菜品",
"commonTools": "常用工具",
"coupons": "优惠券",
+ "groupMealReservation": "团餐预定",
"createStore": "创建店铺",
"dataStatistics": "数据统计",
"futureOrders": "预定单",
@@ -371,6 +373,34 @@
"value": "值"
}
},
+ "groupMealReservation": {
+ "tabs": {
+ "all": "全部"
+ },
+ "status": {
+ "pending": "待处理",
+ "contacted": "已联系",
+ "confirmed": "已确认",
+ "rejected": "已拒绝",
+ "completed": "已完成",
+ "userCancelled": "用户取消"
+ },
+ "contactPhone": "联系电话",
+ "peopleCount": "团餐人数",
+ "perCapitaPrice": "人均单价",
+ "estimatedTotal": "预计总价",
+ "expectedTime": "期望时间",
+ "scene": "场景",
+ "remark": "用户备注",
+ "handleRemark": "处理备注",
+ "cancelReason": "取消原因",
+ "userNickName": "用户昵称",
+ "detailTitle": "团餐预定详情",
+ "handleTitle": "处理状态",
+ "handleRemarkPlaceholder": "请输入处理备注(选填)",
+ "confirmHandle": "确认将状态更新为「{status}」?",
+ "userCancelledTip": "用户已取消,仅可查看详情"
+ },
"income": {
"index": {
"accountToReceive": "到账账户:",
diff --git a/src/manifest.json b/src/manifest.json
index c0d7d89..51d9b19 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
"name" : "CHEFLINK Merchant",
"appid" : "__UNI__BB8E3C9",
"description" : "美国外卖商户端",
- "versionName" : "3.0.1",
- "versionCode" : 301,
+ "versionName" : "3.0.2",
+ "versionCode" : 302,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/src/pages-user/pages/group-meal-reservation/detail.vue b/src/pages-user/pages/group-meal-reservation/detail.vue
new file mode 100644
index 0000000..f653b65
--- /dev/null
+++ b/src/pages-user/pages/group-meal-reservation/detail.vue
@@ -0,0 +1,247 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ detail.contactName || '-' }}
+ {{ statusLabel(detail.status) }}
+
+
+
+ {{ t('pages-user.groupMealReservation.contactPhone') }}
+
+ {{ getGroupMealContactPhone(detail) || '-' }}
+
+
+
+
+
+ {{ t('pages-user.groupMealReservation.scene') }}
+ {{ detail.scene || '-' }}
+
+
+
+ {{ t('pages-user.groupMealReservation.peopleCount') }}
+ {{ detail.peopleCount || 0 }}
+
+
+
+ {{ t('pages-user.groupMealReservation.perCapitaPrice') }}
+ ${{ detail.perCapitaPrice ?? 0 }}
+
+
+
+ {{ t('pages-user.groupMealReservation.estimatedTotal') }}
+ ${{ calcGroupMealTotal(detail.peopleCount, detail.perCapitaPrice) }}
+
+
+
+ {{ t('pages-user.groupMealReservation.expectedTime') }}
+
+ {{ detail.expectedTime ? formatTimestampWithMonthName(detail.expectedTime) : '-' }}
+
+
+
+
+ {{ t('pages-user.groupMealReservation.remark') }}
+ {{ detail.remark }}
+
+
+
+ {{ t('pages-user.groupMealReservation.handleRemark') }}
+ {{ detail.handleRemark }}
+
+
+
+ {{ t('pages-user.groupMealReservation.cancelReason') }}
+ {{ detail.cancelReason }}
+
+
+
+ {{ t('pages-user.groupMealReservation.userNickName') }}
+ {{ detail.user.nickName }}
+
+
+
+
+
+ {{ t('pages-user.groupMealReservation.handleTitle') }}
+
+
+
+
+
+
+
+
+ {{ action.label }}
+
+
+
+
+
+ {{ t('pages-user.groupMealReservation.userCancelledTip') }}
+
+
+
+
+
+
diff --git a/src/pages-user/pages/group-meal-reservation/index.vue b/src/pages-user/pages/group-meal-reservation/index.vue
new file mode 100644
index 0000000..db445a7
--- /dev/null
+++ b/src/pages-user/pages/group-meal-reservation/index.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.contactName || '-' }}
+
+ {{ statusLabel(item.status) }}
+
+
+
+
+ {{ t('pages-user.groupMealReservation.contactPhone') }}
+
+ {{ getGroupMealContactPhone(item) || '-' }}
+
+
+
+
+
+ {{ t('pages-user.groupMealReservation.peopleCount') }}
+ {{ item.peopleCount || 0 }}
+
+
+
+ {{ t('pages-user.groupMealReservation.perCapitaPrice') }}
+ ${{ item.perCapitaPrice ?? 0 }}
+
+
+
+ {{ t('pages-user.groupMealReservation.estimatedTotal') }}
+ ${{ calcGroupMealTotal(item.peopleCount, item.perCapitaPrice) }}
+
+
+
+ {{ t('pages-user.groupMealReservation.expectedTime') }}
+
+ {{ item.expectedTime ? formatTimestampWithMonthName(item.expectedTime) : '-' }}
+
+
+
+
+
+
+
+
diff --git a/src/pages.json b/src/pages.json
index d87ed72..6e5a9ae 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -99,6 +99,12 @@
{
"path": "pages/home-order/refund-order"
},
+ {
+ "path": "pages/group-meal-reservation/index"
+ },
+ {
+ "path": "pages/group-meal-reservation/detail"
+ },
{
"path": "pages/store-management/index"
},
diff --git a/src/pages/home/components/tabbar-home/tabbar-home.vue b/src/pages/home/components/tabbar-home/tabbar-home.vue
index b67bc16..f31af9e 100644
--- a/src/pages/home/components/tabbar-home/tabbar-home.vue
+++ b/src/pages/home/components/tabbar-home/tabbar-home.vue
@@ -21,6 +21,13 @@ function navigateTo(url: string) {
})
return
}
+ if (url === '/pages-user/pages/group-meal-reservation/index' && !userStore.currentMerchantToken) {
+ uni.showToast({
+ title: t('toast.pleaseSelectStore'),
+ icon: 'none',
+ })
+ return
+ }
uni.navigateTo({
url,
})
@@ -293,30 +300,40 @@ defineExpose({
{{ t('pages.home.commonTools') }}
-
-
+
+
+ class="absolute top--10rpx right-8rpx z-2 min-w-36rpx h-36rpx rounded-full bg-#FF1212 text-28rpx text-#fff center">
{{ +storeInfo?.refundOrderNum > 99 ? '99+' : storeInfo?.refundOrderNum }}
- {{ t('pages.home.refundOrders') }}
+ {{ t('pages.home.refundOrders') }}
-
+
- {{ t('pages.home.myIncome') }}
+ {{ t('pages.home.myIncome') }}
-
+
- {{ t('pages.home.recipes') }}
+ {{ t('pages.home.recipes') }}
-
+
- {{ t('pages.home.coupons') }}
+ {{ t('pages.home.coupons') }}
-
+
+
+ {{ t('pages.home.groupMealReservation') }}
+
+
+
@@ -407,6 +424,21 @@ defineExpose({