diff --git a/components/ProductCard.vue b/components/ProductCard.vue
index 45d1b47..dea1217 100644
--- a/components/ProductCard.vue
+++ b/components/ProductCard.vue
@@ -1,15 +1,15 @@
-
- {{ product.emoji }}
+
+ {{ product.emoji }}
{{ product.alc }}%
{{ product.name }}
{{ product.en }}
{{ product.desc }}
- +
+ +
@@ -22,12 +22,13 @@ export default {
diff --git a/pages/menu/menu.vue b/pages/menu/menu.vue
index 0b8e623..094341e 100644
--- a/pages/menu/menu.vue
+++ b/pages/menu/menu.vue
@@ -146,7 +146,7 @@ export default {
.card-badge{background:linear-gradient(135deg,var(--gold-dark),var(--gold));color:#1A1A1A;padding:10rpx 24rpx;border-radius:28rpx;font-weight:800;font-size:26rpx;letter-spacing:6rpx;animation:card-appear-top .5s ease}
.my-btn{font-size:26rpx;color:var(--gold);font-weight:600}
.menu-scroll{flex:1}
-.product-grid{display:flex;flex-wrap:wrap;justify-content:space-between;padding:16rpx 20rpx}
+.product-grid{padding:16rpx 20rpx}
.empty-state{display:flex;flex-direction:column;align-items:center;padding:120rpx 0}
.empty-icon{font-size:112rpx;opacity:.3}
.empty-text{font-size:28rpx;color:var(--text-muted);margin-top:16rpx}
diff --git a/pages/orders/orders.vue b/pages/orders/orders.vue
index 660eadd..5e3b0b8 100644
--- a/pages/orders/orders.vue
+++ b/pages/orders/orders.vue
@@ -11,7 +11,10 @@
-
+
@@ -45,7 +48,14 @@ export default {
if (Array.isArray(res)) orders.value = res
} catch (e) {}
}
-
+ async function checkUnread() {
+ try {
+ const res = await get(API.MESSAGE_LIST, { card_no: card.cardNo, since: 0 })
+ if (Array.isArray(res)) {
+ card.incrementUnread(res.filter(m => m.senderType === 'staff').length)
+ }
+ } catch (e) {}
+ }
async function onRemind(id) {
try {
await post(API.ORDER_REMIND, { id, card_no: card.cardNo })
@@ -58,10 +68,10 @@ export default {
function goBack() { uni.navigateBack() }
function goMenu() { uni.navigateBack() }
- onMounted(() => { loadOrders(); startPoll('orders', loadOrders, 15000) })
- onUnmounted(() => stopPoll('orders'))
+ onMounted(() => { loadOrders(); checkUnread(); startPoll('orders', loadOrders, 15000); startPoll('ordersUnread', checkUnread, 10000) })
+ onUnmounted(() => { stopPoll('orders'); stopPoll('ordersUnread') })
- return { orders, onRemind, onChat, goBack, goMenu }
+ return { card, orders, onRemind, onChat, goBack, goMenu }
}
}
@@ -73,9 +83,10 @@ export default {
.nav-title{font-size:32rpx;font-weight:800;color:var(--gold)}
.orders-body{flex:1;padding:20rpx}
.card-actions{display:flex;gap:16rpx;padding-top:16rpx}
-.action-btn{padding:12rpx 28rpx;border-radius:24rpx;font-size:24rpx;font-weight:600;border:none}
+.action-btn{padding:12rpx 28rpx;border-radius:24rpx;font-size:24rpx;font-weight:600;border:none;position:relative}
.action-remind{background:rgba(255,59,59,.15);color:var(--red)}
.action-chat{background:rgba(74,144,217,.15);color:var(--blue)}
+.unread-dot{margin-left:6rpx;background:var(--red);color:#fff;font-size:18rpx;min-width:32rpx;height:32rpx;border-radius:16rpx;display:inline-flex;align-items:center;justify-content:center;padding:0 8rpx;vertical-align:middle}
.empty-state{flex:1;display:flex;flex-direction:column;align-items:center;justify-content:center}
.empty-icon{font-size:112rpx;opacity:.3}
.empty-text{font-size:28rpx;color:var(--text-muted);margin:16rpx 0}
diff --git a/pages/staff/board.vue b/pages/staff/board.vue
index b7c483b..789c096 100644
--- a/pages/staff/board.vue
+++ b/pages/staff/board.vue
@@ -10,12 +10,15 @@
- 🧑🍳 {{ staff.nickname }} — 别摸鱼了!
+
+ 🧑🍳 {{ staff.nickname }} — 别摸鱼了!
+ 💬 {{ staff.unread }}条新消息
+
{{ t.label }}
- {{ counts[t.status] }}
+ {{ counts[t.status] }}
@@ -58,16 +61,27 @@ export default {
const tabs = [{ status: 0, label: '🔔 新订单' },{ status: 1, label: '⚡ 进行中' },{ status: 2, label: '✅ 已完成' }]
const activeTab = ref(0)
const orders = ref([])
- const counts = ref({ 0: 0, 1: 0 })
- const recipeVisible = ref(false)
- const recipeCardNo = ref('')
- const recipeItems = ref([])
+ const counts = ref({ 0: 0, 1: 0, 2: 0 })
async function loadOrders() {
- try { const res = await get(API.STAFF_ORDERS, { status: activeTab.value }); if (Array.isArray(res)) orders.value = res } catch (e) {}
+ try {
+ const params = { status: activeTab.value }
+ if (activeTab.value === 2) params.include_cancel = 1
+ const res = await get(API.STAFF_ORDERS, params)
+ if (Array.isArray(res)) orders.value = res
+ } catch (e) {}
}
async function loadCounts() {
- try { const r0 = await get(API.STAFF_ORDERS, { status: 0 }); const r1 = await get(API.STAFF_ORDERS, { status: 1 }); counts.value = { 0: Array.isArray(r0) ? r0.length : 0, 1: Array.isArray(r1) ? r1.length : 0 } } catch (e) {}
+ try {
+ const r0 = await get(API.STAFF_ORDERS, { status: 0 })
+ const r1 = await get(API.STAFF_ORDERS, { status: 1 })
+ const r2 = await get(API.STAFF_ORDERS, { status: 2, include_cancel: 1 })
+ counts.value = {
+ 0: Array.isArray(r0) ? r0.length : 0,
+ 1: Array.isArray(r1) ? r1.length : 0,
+ 2: Array.isArray(r2) ? r2.length : 0
+ }
+ } catch (e) {}
}
function switchTab(s) { activeTab.value = s; loadOrders() }
async function onConfirm(id) { try { await post(API.STAFF_CONFIRM, { id }); uni.showToast({ title: '已接单 ✅', icon: 'none' }); loadOrders(); loadCounts() } catch (e) {} }
@@ -93,7 +107,8 @@ export default {
.nav-logo{font-size:44rpx}
.nav-brand{font-size:32rpx;font-weight:900;color:var(--gold)}
.logout-btn{font-size:26rpx;color:var(--red)}
-.staff-info{background:var(--bg-card);padding:16rpx 32rpx;font-size:24rpx;color:var(--text-dim);border-bottom:1px solid var(--border)}
+.staff-info{background:var(--bg-card);padding:16rpx 32rpx;font-size:24rpx;color:var(--text-dim);border-bottom:1px solid var(--border);display:flex;align-items:center;justify-content:space-between}
+.staff-unread{color:var(--red);font-weight:700;font-size:22rpx}
.board-tabs{display:flex;border-bottom:1px solid var(--border);position:sticky;top:0;z-index:50;background:var(--bg);flex-shrink:0}
.board-tab{flex:1;padding:24rpx;text-align:center;font-size:26rpx;font-weight:600;color:var(--text-dim);border-bottom:4rpx solid transparent}
.board-tab.active{color:var(--gold);border-bottom-color:var(--gold)}
diff --git a/uni.scss b/uni.scss
index 537c111..8d04cf4 100644
--- a/uni.scss
+++ b/uni.scss
@@ -1,4 +1,4 @@
-// 纯瘾大 全局样式 (严格对齐 UI/css/miniapp.css)
+// 纯瘾大 全局样式
view,text,button,input,scroll-view,image,navigator,swiper,swiper-item{box-sizing:border-box}
page {
@@ -22,13 +22,19 @@ page {
--radius-xs: 12rpx;
--nav-h: 100rpx;
--safe-b: 68rpx;
+ --status-h: var(--status-bar-height);
background-color: var(--bg);
color: var(--text);
font-family: -apple-system, BlinkMacSystemFont, 'PingFang SC', 'Microsoft YaHei', sans-serif;
font-size: 28rpx;
min-height: 100vh;
width: 100%;
- -webkit-font-smoothing: antialiased;
+}
+
+// 自定义导航栏基类(所有页面 nav-bar 继承)
+page .nav-bar {
+ padding-top: var(--status-bar-height);
+ box-sizing: content-box;
}
// 动画