diff --git a/app/(order)/chat/[id]/page.tsx b/app/(order)/chat/[id]/page.tsx
index 1dbd0ec..ad98c7a 100644
--- a/app/(order)/chat/[id]/page.tsx
+++ b/app/(order)/chat/[id]/page.tsx
@@ -4,6 +4,7 @@ import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
 import { Badge } from "@/components/ui/badge"
 import { Button } from "@/components/ui/button"
 import { Card } from "@/components/ui/card"
+import { EmptyState } from "@/components/ui/empty-state"
 import { Input } from "@/components/ui/input"
 import { ScrollArea } from "@/components/ui/scroll-area"
 import { getChatSessionById, listChatMessages } from "@/lib/api"
@@ -11,7 +12,7 @@ import { sendImageMessage, sendTextMessage } from "@/lib/api/chat"
 import { notifyInfo } from "@/lib/toast"
 import { cn } from "@/lib/utils"
 import { useAuthStore } from "@/store/auth"
-import { ArrowLeft, ImagePlus, Send } from "lucide-react"
+import { ArrowLeft, ImagePlus, MessageSquare, Send } from "lucide-react"
 import Image from "next/image"
 import Link from "next/link"
 import { use, useEffect, useRef, useState } from "react"
@@ -55,22 +56,32 @@ export default function ChatDetailPage({ params }: { params: Promise<{ id: strin
 
   if (loading) {
     return (
-      <div className="container mx-auto py-8 px-4 text-center text-muted-foreground">加载中...</div>
+      <div className="container mx-auto max-w-2xl px-4 py-8">
+        <EmptyState title="加载中" description="正在读取会话内容..." icon={MessageSquare} />
+      </div>
     )
   }
 
   if (!session) {
     return (
-      <div className="container mx-auto py-8 px-4 text-center text-muted-foreground">
-        会话不存在
+      <div className="container mx-auto max-w-2xl px-4 py-8">
+        <EmptyState
+          title="会话不存在"
+          description="该会话可能已被删除或暂不可访问。"
+          icon={MessageSquare}
+        />
       </div>
     )
   }
 
   if (!user?.id) {
     return (
-      <div className="container mx-auto py-8 px-4 text-center text-muted-foreground">
-        请先登录后查看会话
+      <div className="container mx-auto max-w-2xl px-4 py-8">
+        <EmptyState
+          title="请先登录"
+          description="登录后可查看会话并发送消息。"
+          icon={MessageSquare}
+        />
       </div>
     )
   }
@@ -79,8 +90,12 @@ export default function ChatDetailPage({ params }: { params: Promise<{ id: strin
   const isParticipant = session.participants.some((participant) => participant.id === userId)
   if (!isParticipant) {
     return (
-      <div className="container mx-auto py-8 px-4 text-center text-muted-foreground">
-        仅会话参与方可查看并发送消息
+      <div className="container mx-auto max-w-2xl px-4 py-8">
+        <EmptyState
+          title="无法查看会话"
+          description="仅会话参与方可查看并发送消息。"
+          icon={MessageSquare}
+        />
       </div>
     )
   }
@@ -89,8 +104,8 @@ export default function ChatDetailPage({ params }: { params: Promise<{ id: strin
 
   return (
     <div className="container mx-auto max-w-3xl px-4 py-8 h-[calc(100vh-3.5rem)] flex flex-col">
-      <Card className="flex-1 flex flex-col overflow-hidden hover:shadow-card-hover">
-        <div className="border-b px-4 py-3 flex items-center gap-3 bg-muted/30">
+      <Card className="flex-1 flex flex-col overflow-hidden border-border/80 shadow-sm">
+        <div className="border-b border-border/60 px-4 py-3 flex items-center gap-3 bg-background">
           <Link href="/chat" className="text-muted-foreground hover:text-foreground">
             <ArrowLeft className="h-5 w-5" />
           </Link>
@@ -101,7 +116,10 @@ export default function ChatDetailPage({ params }: { params: Promise<{ id: strin
           <div>
             <span className="text-sm font-medium">{other.nickname}</span>
             <div className="flex items-center gap-1">
-              <Badge variant="outline" className="text-[10px] px-1.5 py-0">
+              <Badge
+                variant={session.type === "order" ? "info" : "neutral"}
+                className="text-[10px] px-1.5 py-0 font-normal"
+              >
                 {session.type === "order" ? "订单会话" : "咨询会话"}
               </Badge>
             </div>
@@ -114,7 +132,7 @@ export default function ChatDetailPage({ params }: { params: Promise<{ id: strin
               if (msg.type === "system") {
                 return (
                   <div key={msg.id} className="text-center">
-                    <span className="text-xs text-muted-foreground bg-muted px-2 py-1 rounded">
+                    <span className="text-xs text-muted-foreground bg-muted/60 px-2 py-1 rounded-full">
                       {msg.content}
                     </span>
                   </div>
@@ -143,8 +161,10 @@ export default function ChatDetailPage({ params }: { params: Promise<{ id: strin
                     ) : (
                       <p
                         className={cn(
-                          "inline-block rounded-lg px-3 py-2 text-sm",
-                          isMine ? "bg-primary text-primary-foreground" : "bg-muted",
+                          "inline-block rounded-xl border px-3 py-2 text-sm",
+                          isMine
+                            ? "border-primary bg-primary text-primary-foreground"
+                            : "border-border/60 bg-muted/60",
                         )}
                       >
                         {msg.content}
@@ -163,7 +183,7 @@ export default function ChatDetailPage({ params }: { params: Promise<{ id: strin
           </div>
         </ScrollArea>
 
-        <div className="border-t p-4 bg-muted/30">
+        <div className="border-t border-border/60 p-4 bg-background">
           <input
             ref={imageInputRef}
             type="file"
@@ -209,7 +229,7 @@ export default function ChatDetailPage({ params }: { params: Promise<{ id: strin
               value={input}
               onChange={(e) => setInput(e.target.value)}
               placeholder="输入消息..."
-              className="flex-1"
+              className="flex-1 border-border/60"
             />
             <Button
               type="button"
diff --git a/app/(order)/chat/page.tsx b/app/(order)/chat/page.tsx
index 3feb340..4de9405 100644
--- a/app/(order)/chat/page.tsx
+++ b/app/(order)/chat/page.tsx
@@ -2,7 +2,7 @@
 
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
 import { Badge } from "@/components/ui/badge"
-import { Card, CardContent } from "@/components/ui/card"
+import { EmptyState } from "@/components/ui/empty-state"
 import { listChatSessions } from "@/lib/api"
 import { useAuthStore } from "@/store/auth"
 import { MessageSquare } from "lucide-react"
@@ -34,15 +34,19 @@ export default function ChatListPage() {
     <div className="container mx-auto max-w-2xl px-4 py-8 space-y-6">
       <h1 className="text-2xl font-bold">消息</h1>
 
-      <div className="flex flex-col gap-3">
-        {sessions.map((session) => {
-          const other =
-            session.participants.find((participant) => participant.id !== userId) ??
-            session.participants[0]
-          return (
-            <Link key={session.id} href={`/chat/${session.id}`} className="block">
-              <Card className="p-0 hover:bg-muted/50 transition-colors">
-                <CardContent className="flex items-center gap-3 p-4">
+      {sessions.length > 0 ? (
+        <div className="overflow-hidden rounded-xl border border-border/80 bg-card shadow-sm">
+          {sessions.map((session) => {
+            const other =
+              session.participants.find((participant) => participant.id !== userId) ??
+              session.participants[0]
+            return (
+              <Link
+                key={session.id}
+                href={`/chat/${session.id}`}
+                className="block border-b border-border/60 transition-colors last:border-0 hover:bg-muted/10"
+              >
+                <div className="flex items-center gap-3 p-4">
                   <Avatar className="h-10 w-10">
                     <AvatarImage src={other.avatar} />
                     <AvatarFallback>{other.nickname[0]}</AvatarFallback>
@@ -50,7 +54,10 @@ export default function ChatListPage() {
                   <div className="flex-1 min-w-0">
                     <div className="flex items-center gap-2">
                       <span className="text-sm font-medium">{other.nickname}</span>
-                      <Badge variant="outline" className="text-[10px] px-1.5 py-0">
+                      <Badge
+                        variant={session.type === "order" ? "info" : "neutral"}
+                        className="text-[10px] px-1.5 py-0 font-normal"
+                      >
                         {session.type === "order" ? "订单" : "咨询"}
                       </Badge>
                     </div>
@@ -58,26 +65,23 @@ export default function ChatListPage() {
                   </div>
                   <div className="flex flex-col items-end gap-1 shrink-0">
                     {session.unreadCount > 0 && (
-                      <Badge className="h-4 min-w-4 px-1 flex items-center justify-center text-[10px]">
+                      <Badge className="h-4 min-w-4 px-1 flex items-center justify-center rounded-full text-[10px]">
                         {session.unreadCount}
                       </Badge>
                     )}
                   </div>
-                </CardContent>
-              </Card>
-            </Link>
-          )
-        })}
-
-        {sessions.length === 0 && (
-          <Card className="hover:shadow-card-hover">
-            <CardContent className="py-8 text-center text-sm text-muted-foreground">
-              <MessageSquare className="h-12 w-12 mx-auto mb-2 opacity-50" />
-              暂无消息
-            </CardContent>
-          </Card>
-        )}
-      </div>
+                </div>
+              </Link>
+            )
+          })}
+        </div>
+      ) : (
+        <EmptyState
+          title="暂无消息"
+          description="订单沟通和咨询会话会显示在这里。"
+          icon={MessageSquare}
+        />
+      )}
     </div>
   )
 }
diff --git a/app/(order)/orders/page.tsx b/app/(order)/orders/page.tsx
index 39f8ac2..358611c 100644
--- a/app/(order)/orders/page.tsx
+++ b/app/(order)/orders/page.tsx
@@ -3,6 +3,8 @@
 import { Badge } from "@/components/ui/badge"
 import { Button } from "@/components/ui/button"
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+import { EmptyState } from "@/components/ui/empty-state"
+import { StatusBadge } from "@/components/ui/status-badge"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
 import { listChatSessions, listOrders } from "@/lib/api"
 import { statusLabels } from "@/lib/constants"
@@ -14,21 +16,22 @@ import {
 } from "@/lib/domain/order-filters"
 import { useMyShop } from "@/lib/hooks/use-my-shop"
 import type { OrderStatus, UserRole } from "@/lib/types"
-import { cn } from "@/lib/utils"
 import { useAuthStore } from "@/store/auth"
-import { Clock, MessageSquare, RefreshCw } from "lucide-react"
+import { ClipboardList, Clock, MessageSquare, RefreshCw } from "lucide-react"
 import Link from "next/link"
 import { useEffect, useState } from "react"
 
-const statusColors: Record<OrderStatus, string> = {
-  pending_payment: "bg-yellow-100 text-yellow-800",
-  pending_accept: "bg-blue-100 text-blue-800",
-  in_progress: "bg-green-100 text-green-800",
-  pending_close: "bg-orange-100 text-orange-800",
-  pending_review: "bg-purple-100 text-purple-800",
-  disputed: "bg-red-100 text-red-800",
-  completed: "bg-gray-100 text-gray-800",
-  cancelled: "bg-gray-100 text-gray-500",
+type OrderStatusBadgeVariant = "success" | "warning" | "info" | "neutral" | "destructive"
+
+const statusVariants: Record<OrderStatus, OrderStatusBadgeVariant> = {
+  pending_payment: "warning",
+  pending_accept: "info",
+  in_progress: "success",
+  pending_close: "info",
+  pending_review: "info",
+  disputed: "destructive",
+  completed: "success",
+  cancelled: "neutral",
 }
 
 type TabFilter = "all" | "active" | "completed" | "disputed"
@@ -71,11 +74,19 @@ export default function OrderListPage() {
   } = useMyShop(currentRole === "owner")
 
   if (currentRole === "owner" && shopLoading) {
-    return <div className="text-sm text-muted-foreground">加载中...</div>
+    return (
+      <div className="container mx-auto max-w-3xl px-4 py-8">
+        <EmptyState title="加载中" description="正在读取店铺订单视角..." icon={RefreshCw} />
+      </div>
+    )
   }
 
   if (currentRole === "owner" && shopError) {
-    return <div className="text-sm text-muted-foreground">{shopError}</div>
+    return (
+      <div className="container mx-auto max-w-3xl px-4 py-8">
+        <EmptyState title="无法读取订单" description={shopError} icon={ClipboardList} />
+      </div>
+    )
   }
 
   return (
@@ -179,14 +190,14 @@ function OrderListContent({
       </div>
 
       {!orderRole ? (
-        <Card className="hover:shadow-card-hover">
-          <CardContent className="py-8 text-center text-sm text-muted-foreground">
-            当前身份暂不支持订单视角
-          </CardContent>
-        </Card>
+        <EmptyState
+          title="当前身份暂不支持订单视角"
+          description="切换到客户、打手或店主身份后可查看对应订单。"
+          icon={ClipboardList}
+        />
       ) : (
         <Tabs value={tab} onValueChange={(v) => setTab(v as TabFilter | "pending")}>
-          <TabsList>
+          <TabsList variant="line">
             {tabs.map((item) => (
               <TabsTrigger key={item.value} value={item.value}>
                 {item.label}
@@ -196,20 +207,23 @@ function OrderListContent({
 
           <TabsContent value={tab} className="mt-4 space-y-4">
             {filtered.length === 0 ? (
-              <Card className="hover:shadow-card-hover">
-                <CardContent className="py-8 text-center text-sm text-muted-foreground">
-                  暂无订单
-                </CardContent>
-              </Card>
+              <EmptyState
+                title="暂无订单"
+                description="当前筛选下还没有订单记录。"
+                icon={ClipboardList}
+              />
             ) : (
               filtered.map((order) => (
-                <Card key={order.id} className="hover:shadow-card-hover">
+                <Card key={order.id} className="border-border/80 shadow-sm">
                   <CardHeader className="pb-3">
                     <div className="flex items-center justify-between">
                       <CardTitle className="text-base">{order.service.title}</CardTitle>
-                      <Badge className={cn("text-xs", statusColors[order.status])}>
+                      <StatusBadge
+                        status={statusVariants[order.status]}
+                        className="text-xs font-normal"
+                      >
                         {statusLabels[order.status]}
-                      </Badge>
+                      </StatusBadge>
                     </div>
                     <p className="text-sm text-muted-foreground">{order.service.title}</p>
                   </CardHeader>
diff --git a/components/order-actions.tsx b/components/order-actions.tsx
index e231379..f5a71e2 100644
--- a/components/order-actions.tsx
+++ b/components/order-actions.tsx
@@ -108,11 +108,12 @@ export default function OrderActions({
   )
 
   return (
-    <div className="flex gap-2 flex-wrap">
+    <div className="flex flex-wrap items-center gap-2">
       {status === "pending_payment" && isConsumer && (
         <>
           <Button
             variant="outline"
+            className="border-border/60"
             onClick={() => {
               if (!currentUserId) {
                 notifyInfo("请先登录")
@@ -144,6 +145,7 @@ export default function OrderActions({
           {isConsumer && (
             <Button
               variant="outline"
+              className="border-border/60"
               onClick={() => {
                 if (!currentUserId) {
                   notifyInfo("请先登录")
@@ -180,7 +182,7 @@ export default function OrderActions({
       )}
 
       {(status === "in_progress" || status === "pending_close") && resolvedChatSessionId && (
-        <Button asChild>
+        <Button variant="outline" className="border-border/60" asChild>
           <Link href={`/chat/${resolvedChatSessionId}`}>
             <MessageSquare className="mr-1 h-4 w-4" />
             聊天
@@ -245,7 +247,7 @@ export default function OrderActions({
       )}
 
       {status === "completed" && (
-        <Button variant="outline" asChild>
+        <Button variant="outline" className="border-border/60" asChild>
           <Link href={`/order/new?serviceId=${serviceId}`}>
             <RefreshCw className="mr-1 h-4 w-4" />
             再来一单
@@ -254,7 +256,7 @@ export default function OrderActions({
       )}
 
       {status === "cancelled" && (
-        <Button variant="outline" asChild>
+        <Button variant="outline" className="border-border/60" asChild>
           <Link href={`/order/new?serviceId=${serviceId}`}>
             <RefreshCw className="mr-1 h-4 w-4" />
             再来一单
@@ -263,7 +265,7 @@ export default function OrderActions({
       )}
 
       {status === "disputed" && (
-        <Button variant="outline" asChild>
+        <Button variant="outline" className="border-border/60" asChild>
           <Link href={`/dispute/${orderId}`}>查看详情</Link>
         </Button>
       )}