From 78722b391252f71f18bbd068664cf01d76f8f5e7 Mon Sep 17 00:00:00 2001
From: linda <linda@gzyakj.com.cn>
Date: Wed, 28 Oct 2026 15:52:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E7=99=BB=E5=BD=95=E8=B5=B7?=
 =?UTF-8?q?=E5=85=A8=E9=93=BE=E8=B7=AF=E9=A1=B5=E9=9D=A2=E6=8E=A5=E9=80=9A?=
 =?UTF-8?q?=20+=20=E9=80=90=E9=A1=B5=E9=9D=A2=E9=AA=8C=E8=AF=81=EF=BC=8847?=
 =?UTF-8?q?=20=E9=A1=B9=EF=BC=89+=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B6=8A=E6=9D=83=E6=B3=84=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

前端:
- utils/request.js 统一请求层（token/错误码/401 引导登录）
- utils/api.js 接口清单（与后端控制器一一对应）
- pages/login 登录（手机号+验证码+角色选择）
- pages/service/list|detail 服务列表/详情
- pages/order/create 下单（地址/预约/急单/费用试算/自动支付）
- pages/order/list|detail|review 订单列表/详情轨迹/评价
- pages/master/apply|hall|orders 师傅入驻/订单大厅/接单履约
- YJYF/YJYF 首页接 home/index 真实类目 + 路由跳转

后端 Bug 修复（严重）:
- TP5 中 count() 会重置查询条件，导致 Order::index / Master::hall / Master::orders
  在 select 时丢失 where 条件 → 泄漏全部用户订单/跨用户数据
- 改为闭包重建查询，已验证修复
---
 YJYF/YJYF.vue                                |  83 ++++--
 pages.json                                   |  50 +++-
 pages/login/login.vue                        | 165 ++++++++++++
 pages/master/apply.vue                       | 137 ++++++++++
 pages/master/hall.vue                        | 119 +++++++++
 pages/master/orders.vue                      | 130 +++++++++
 pages/order/create.vue                       | 266 +++++++++++++++++++
 pages/order/detail.vue                       | 168 ++++++++++++
 pages/order/list.vue                         | 130 +++++++++
 pages/order/review.vue                       |  99 +++++++
 pages/service/detail.vue                     | 103 +++++++
 pages/service/list.vue                       |  99 +++++++
 server/application/api/controller/Master.php |  40 +--
 server/application/api/controller/Order.php  |  28 +-
 tests/page_flow.js                           | 202 ++++++++++++++
 utils/api.js                                 |  50 ++++
 utils/request.js                             | 107 ++++++++
 17 files changed, 1926 insertions(+), 50 deletions(-)
 create mode 100644 pages/login/login.vue
 create mode 100644 pages/master/apply.vue
 create mode 100644 pages/master/hall.vue
 create mode 100644 pages/master/orders.vue
 create mode 100644 pages/order/create.vue
 create mode 100644 pages/order/detail.vue
 create mode 100644 pages/order/list.vue
 create mode 100644 pages/order/review.vue
 create mode 100644 pages/service/detail.vue
 create mode 100644 pages/service/list.vue
 create mode 100644 tests/page_flow.js
 create mode 100644 utils/api.js
 create mode 100644 utils/request.js

diff --git a/YJYF/YJYF.vue b/YJYF/YJYF.vue
index e974082..e3bad6d 100644
--- a/YJYF/YJYF.vue
+++ b/YJYF/YJYF.vue
@@ -84,18 +84,18 @@
 				</view>
 
 				<view class="cats">
-					<view class="cat" v-for="(c, i) in cats" :key="i" @tap="onCat(c.n)">
+					<view class="cat" v-for="(c, i) in cats" :key="c.id" @tap="onCat(c)">
 						<view class="cat-circle">
 							<view class="ic">
 								<view
-									v-for="(p, j) in c.p"
+									v-for="(p, j) in iconOf(c.icon)"
 									:key="j"
 									:class="p[0] === 'o' ? 'ol' : (p[0] === 'd' ? 'ol ct' : (p[0] === 't' ? 'tri' : 'ln'))"
 									:style="partStyle(p)"
 								></view>
 							</view>
 						</view>
-						<text class="cat-name">{{ c.n }}</text>
+						<text class="cat-name">{{ c.name }}</text>
 					</view>
 				</view>
 			</view>
@@ -226,6 +226,9 @@
 
 <script setup>
 	import { ref } from 'vue'
+	import { onShow } from '@dcloudio/uni-app'
+	import api from '@/utils/api.js'
+	import { isLogin, toLogin } from '@/utils/request.js'
 
 	/* ---------- 系统适配：状态栏 / 导航栏高度（刘海屏 + 胶囊按钮） ---------- */
 	const statusBarHeight = ref(20)
@@ -251,7 +254,7 @@
 	/* ---------- 服务图标：纯 CSS 图元，零图片依赖
 		   o=描边框  l=实心线  d=圆形描边  t=三角
 		   格式 [类型, left, top, w, h, radius, rotate]，画布 56×56rpx */
-	const cats = [
+	const iconCats = [
 		{ n: '家具', p: [['o',12,10,32,16,6],['o',6,26,44,14,5],['l',14,40,3,7],['l',39,40,3,7]] },
 		{ n: '卫浴', p: [['l',20,6,3,12],['l',20,6,13,3],['o',4,21,48,21,'4 4 16 16'],['l',12,42,3,6],['l',41,42,3,6]] },
 		{ n: '灯具', p: [['l',27,4,3,13],['o',12,17,32,16,'16 16 0 0'],['l',8,33,40,3],['l',16,40,3,8],['l',27,40,3,8],['l',38,40,3,8]] },
@@ -269,6 +272,25 @@
 		{ n: '更多', p: [['o',8,8,18,18,5],['o',30,8,18,18,5],['o',8,30,18,18,5],['o',30,30,18,18,5]] }
 	]
 
+	/* 图标库：按后端返回的 icon 键匹配（顺序与 iconCats 一致） */
+	const ICON_KEYS = ['sofa', 'bath', 'lamp', 'lock', 'curtain', 'frame', 'water', 'rack', 'door', 'appliance', 'tv', 'shower', 'kitchen', 'fitness', 'more']
+	const iconLib = {}
+	iconCats.forEach((c, i) => { iconLib[ICON_KEYS[i]] = c.p })
+	const iconOf = (key) => iconLib[key] || iconLib.more
+
+	/* 服务类目（真实接口） */
+	const cats = ref([])
+	const badge = ref({ coupon: 0, unread: 0 })
+
+	async function loadHome() {
+		if (!isLogin()) { toLogin(); return }
+		try {
+			const res = await api.home()
+			cats.value = res.cats || []
+			badge.value = res.badge || { coupon: 0, unread: 0 }
+		} catch (e) {}
+	}
+
 	const partStyle = (p) => {
 		if (p[0] === 't') {
 			return 'left:' + p[1] + 'rpx;top:' + p[2] + 'rpx;border-left:' + p[3] + 'rpx solid #B85E2A;border-top:' + p[4] + 'rpx solid transparent;border-bottom:' + p[4] + 'rpx solid transparent;'
@@ -281,22 +303,47 @@
 
 	/* ---------- 交互 ---------- */
 	const toast = (title) => uni.showToast({ title, icon: 'none' })
-	const onHome = () => toast('已是首页')
-	const onCoupon = () => toast('优惠券已领取')
-	const onSearch = () => toast('搜索：坐便器')
-	const onCat = (name) => toast(name)
-	const onMore = () => toast('查看全部服务')
-	const onLearn = () => toast('下单找师傅教程')
-	const onBanner = () => toast('双11 狂欢大促')
-	const onCloseBanner = () => toast('已关闭')
-	const onMall = () => toast('一键开店')
-	const onOrder = () => toast('立即下单')
 
-	const tabNames = ['首页', '订单', '消息', '我的']
-	const switchTab = (i) => {
-		tabIndex.value = i
-		toast(tabNames[i])
+	function needLogin() {
+		if (isLogin()) return true
+		toLogin()
+		return false
 	}
+
+	const onHome = () => toast('已是首页')
+	const onCoupon = () => toast(badge.value.coupon > 0 ? ('您有 ' + badge.value.coupon + ' 张优惠券待使用') : '暂无可用优惠券')
+	const onSearch = () => uni.navigateTo({ url: '/pages/service/list?keyword=' + encodeURIComponent('坐便器') })
+	const onCat = (c) => uni.navigateTo({
+		url: '/pages/service/list?cat_id=' + c.id + '&cat_name=' + encodeURIComponent(c.name)
+	})
+	const onMore = () => uni.navigateTo({ url: '/pages/service/list?cat_id=15&cat_name=' + encodeURIComponent('更多服务') })
+	const onLearn = () => toast('教程模块开发中')
+	const onBanner = () => uni.navigateTo({ url: '/pages/service/list?cat_id=1&cat_name=' + encodeURIComponent('家具') })
+	const onCloseBanner = () => toast('已关闭')
+	const onMall = () => toast('商城模块开发中')
+	const onOrder = () => {
+		if (!needLogin()) return
+		uni.showToast({ title: '请先选择服务类目', icon: 'none' })
+	}
+	const onUser = () => {
+		if (!needLogin()) return
+		uni.navigateTo({ url: '/pages/order/list' })
+	}
+
+	const switchTab = (i) => {
+		if (i === 1) {
+			if (!needLogin()) return
+			uni.navigateTo({ url: '/pages/order/list' })
+			return
+		}
+		if (i === 3) {
+			onUser()
+			return
+		}
+		tabIndex.value = i
+	}
+
+	onShow(() => loadHome())
 </script>
 
 <style scoped>
diff --git a/pages.json b/pages.json
index 5660746..bfe7a7c 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,5 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [ //pages数组中第一项表示应用启动页
 		{
 			"path": "YJYF/YJYF",
 			"style": {
@@ -11,16 +11,58 @@
 			}
 		},
 		{
-			"path": "pages/index/index",
+			"path": "pages/login/login",
+			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
+		},
+		{
+			"path": "pages/service/list",
+			"style": { "navigationBarTitleText": "服务列表" }
+		},
+		{
+			"path": "pages/service/detail",
+			"style": { "navigationBarTitleText": "服务详情" }
+		},
+		{
+			"path": "pages/order/create",
+			"style": { "navigationBarTitleText": "确认订单" }
+		},
+		{
+			"path": "pages/order/list",
+			"style": { "navigationBarTitleText": "我的订单" }
+		},
+		{
+			"path": "pages/order/detail",
+			"style": { "navigationBarTitleText": "订单详情" }
+		},
+		{
+			"path": "pages/order/review",
+			"style": { "navigationBarTitleText": "服务评价" }
+		},
+		{
+			"path": "pages/master/apply",
+			"style": { "navigationBarTitleText": "师傅入驻" }
+		},
+		{
+			"path": "pages/master/hall",
+			"style": { "navigationBarTitleText": "订单大厅", "enablePullDownRefresh": false }
+		},
+		{
+			"path": "pages/master/orders",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "接单管理",
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "dark"
 			}
+		},
+		{
+			"path": "pages/index/index",
+			"style": { "navigationBarTitleText": "uni-app" }
 		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "优匠优服",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F5F6F8"
 	},
 	"uniIdRouter": {}
diff --git a/pages/login/login.vue b/pages/login/login.vue
new file mode 100644
index 0000000..9fd3455
--- /dev/null
+++ b/pages/login/login.vue
@@ -0,0 +1,165 @@
+<template>
+	<view class="page">
+		<view class="top">
+			<view class="deco d1"></view>
+			<view class="deco d2"></view>
+			<text class="brand">优匠优服</text>
+			<text class="slogan">专业师傅 · 上门到家</text>
+		</view>
+
+		<view class="card">
+			<view class="role">
+				<view class="role-item" :class="{ on: role === 'user' }" @tap="role = 'user'">
+					<text class="role-name">我是业主</text>
+					<text class="role-desc">下单找师傅</text>
+				</view>
+				<view class="role-item" :class="{ on: role === 'master' }" @tap="role = 'master'">
+					<text class="role-name">我是师傅</text>
+					<text class="role-desc">接单赚收入</text>
+				</view>
+			</view>
+
+			<view class="field">
+				<text class="label">手机号</text>
+				<input class="input" v-model="mobile" type="number" maxlength="11" placeholder="请输入手机号" placeholder-class="ph" />
+			</view>
+
+			<view class="field">
+				<text class="label">验证码</text>
+				<input class="input" v-model="code" type="number" maxlength="6" placeholder="联调验证码 123456" placeholder-class="ph" />
+				<view class="code-btn" :class="{ disabled: counting }" @tap="sendCode">{{ codeText }}</view>
+			</view>
+
+			<view class="submit" :class="{ disabled: loading }" @tap="doLogin">{{ loading ? '登录中...' : '登录 / 注册' }}</view>
+			<text class="tip">未注册的手机号将自动创建账号</text>
+		</view>
+
+		<text class="agree">登录即代表同意《用户服务协议》与《隐私政策》</text>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed } from 'vue';
+	import api from '@/utils/api.js';
+	import { setToken, setUser } from '@/utils/request.js';
+
+	const role = ref('user');
+	const mobile = ref('');
+	const code = ref('');
+	const loading = ref(false);
+	const countdown = ref(0);
+	let timer = null;
+
+	const counting = computed(() => countdown.value > 0);
+	const codeText = computed(() => (countdown.value > 0 ? countdown.value + 's' : '获取验证码'));
+
+	function toast(title) {
+		uni.showToast({ title: title, icon: 'none' });
+	}
+
+	function sendCode() {
+		if (counting.value) return;
+		if (!/^1\d{10}$/.test(mobile.value)) {
+			toast('请输入正确的手机号');
+			return;
+		}
+		countdown.value = 60;
+		timer = setInterval(() => {
+			countdown.value -= 1;
+			if (countdown.value <= 0) {
+				clearInterval(timer);
+				timer = null;
+			}
+		}, 1000);
+		toast('联调环境验证码为 123456');
+	}
+
+	async function doLogin() {
+		if (loading.value) return;
+		if (!/^1\d{10}$/.test(mobile.value)) {
+			toast('请输入正确的手机号');
+			return;
+		}
+		if (!code.value) {
+			toast('请输入验证码');
+			return;
+		}
+		loading.value = true;
+		try {
+			const data = await api.login({ mobile: mobile.value, code: code.value });
+			setToken(data.token);
+			setUser(data.userinfo);
+			toast('登录成功');
+			setTimeout(() => routeAfterLogin(), 500);
+		} catch (e) {
+			toast(e.message || '登录失败');
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	function routeAfterLogin() {
+		if (role.value === 'user') {
+			uni.reLaunch({ url: '/YJYF/YJYF' });
+			return;
+		}
+		api.masterInfo().then((res) => {
+			if (!res.applied || res.master.verify_status !== 'pass') {
+				uni.redirectTo({ url: '/pages/master/apply' });
+			} else {
+				uni.redirectTo({ url: '/pages/master/hall' });
+			}
+		}).catch(() => {
+			uni.redirectTo({ url: '/pages/master/hall' });
+		});
+	}
+</script>
+
+<style scoped>
+	.page { min-height: 100vh; background: #F5F6F8; }
+	.top {
+		position: relative; height: 420rpx; padding: 120rpx 0 0 48rpx; overflow: hidden;
+		background: linear-gradient(160deg, #FFB85C 0%, #F98D25 46%, #ED6F0E 100%);
+		border-radius: 0 0 48rpx 48rpx;
+	}
+	.deco { position: absolute; border-radius: 50%; }
+	.d1 { width: 360rpx; height: 360rpx; right: -120rpx; top: -160rpx; background: rgba(255,255,255,0.14); }
+	.d2 { width: 220rpx; height: 220rpx; left: -90rpx; bottom: -80rpx; background: rgba(255,255,255,0.10); }
+	.brand {
+		position: relative; display: block; font-size: 52rpx; font-weight: 700; color: #fff;
+		letter-spacing: 6rpx; text-shadow: 0 3rpx 12rpx rgba(180,80,10,0.3);
+	}
+	.slogan { position: relative; display: block; margin-top: 14rpx; font-size: 26rpx; color: rgba(255,255,255,0.88); letter-spacing: 2rpx; }
+	.card {
+		position: relative; margin: -120rpx 40rpx 0; padding: 40rpx 34rpx 34rpx;
+		background: #fff; border-radius: 24rpx; box-shadow: 0 16rpx 40rpx rgba(226,120,26,0.16);
+	}
+	.role { display: flex; margin-bottom: 34rpx; }
+	.role-item {
+		flex: 1; padding: 22rpx 0; border-radius: 16rpx; background: #F7F7F7;
+		display: flex; flex-direction: column; align-items: center; border: 2rpx solid transparent;
+	}
+	.role-item.on { background: linear-gradient(135deg, #FFF8EE 0%, #FFE9D2 100%); border-color: #F9A65B; }
+	.role-name { font-size: 30rpx; font-weight: 600; color: #333; }
+	.role-item.on .role-name { color: #C4580A; }
+	.role-desc { margin-top: 6rpx; font-size: 22rpx; color: #9A9A9A; }
+	.field { display: flex; align-items: center; height: 100rpx; margin-top: 22rpx; padding: 0 24rpx; background: #F7F7F7; border-radius: 16rpx; }
+	.label { width: 110rpx; font-size: 28rpx; color: #666; }
+	.input { flex: 1; height: 100rpx; font-size: 30rpx; color: #222; }
+	.ph { color: #B5B5B5; }
+	.code-btn {
+		padding: 0 20rpx; line-height: 56rpx; border-radius: 28rpx;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%); color: #fff; font-size: 24rpx;
+	}
+	.code-btn.disabled { opacity: 0.55; }
+	.submit {
+		height: 96rpx; margin-top: 40rpx; display: flex; align-items: center; justify-content: center;
+		border-radius: 48rpx; background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		color: #fff; font-size: 32rpx; font-weight: 600; letter-spacing: 2rpx;
+		box-shadow: 0 10rpx 24rpx rgba(240,113,13,0.32);
+	}
+	.submit.disabled { opacity: 0.7; }
+	.tip { display: block; margin-top: 22rpx; text-align: center; font-size: 22rpx; color: #B5B5B5; }
+	.agree { display: block; margin-top: 48rpx; text-align: center; font-size: 20rpx; color: #BDBDBD; }
+</style>
+
diff --git a/pages/master/apply.vue b/pages/master/apply.vue
new file mode 100644
index 0000000..a7156d8
--- /dev/null
+++ b/pages/master/apply.vue
@@ -0,0 +1,137 @@
+<template>
+	<view class="page">
+		<view class="hero">
+			<text class="hero-t">师傅入驻</text>
+			<text class="hero-s">实名认证 + 技能认证，审核通过即可接单</text>
+		</view>
+
+		<view class="status" v-if="info">
+			<text class="st-t">当前状态：{{ statusText }}</text>
+			<text class="st-m" v-if="info.master.audit_msg">审核意见：{{ info.master.audit_msg }}</text>
+		</view>
+
+		<view class="card" v-if="canEdit">
+			<view class="fi"><text class="fk">真实姓名</text><input class="fv" v-model="form.realname" placeholder="与身份证一致" /></view>
+			<view class="fi"><text class="fk">手机号</text><input class="fv" v-model="form.mobile" type="number" maxlength="11" placeholder="接单联系电话" /></view>
+			<view class="fi"><text class="fk">身份证号</text><input class="fv" v-model="form.idcard_no" maxlength="18" placeholder="18 位身份证号" /></view>
+			<view class="fi"><text class="fk">服务城市</text><input class="fv" v-model="form.city" placeholder="如：遵义市" /></view>
+
+			<view class="block-title">选择服务类目（可多选）</view>
+			<view class="cats">
+				<view v-for="c in cats" :key="c.id" class="cat" :class="{ on: skills.indexOf(c.id) > -1 }" @tap="toggleSkill(c.id)">
+					<text class="cat-txt">{{ c.name }}</text>
+				</view>
+			</view>
+
+			<view class="hint">证件与技能证书照片上传将在正式版接入 chooseMedia</view>
+			<view class="submit" :class="{ disabled: submitting }" @tap="submit">{{ submitting ? '提交中...' : '提交审核' }}</view>
+		</view>
+
+		<view class="card" v-else>
+			<view class="li"><text class="k">真实姓名</text><text class="v">{{ info.master.realname }}</text></view>
+			<view class="li"><text class="k">服务城市</text><text class="v">{{ info.master.city }}</text></view>
+			<view class="li"><text class="k">综合评分</text><text class="v">{{ info.master.score }}</text></view>
+			<view class="li"><text class="k">累计订单</text><text class="v">{{ info.master.order_count }}</text></view>
+			<view class="go" @tap="goHall">进入订单大厅 ›</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, reactive, computed } from 'vue';
+	import { onShow } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin, getUser } from '@/utils/request.js';
+
+	const info = ref(null);
+	const cats = ref([]);
+	const skills = ref([]);
+	const submitting = ref(false);
+	const form = reactive({ realname: '', mobile: '', idcard_no: '', city: '遵义市' });
+
+	const statusText = computed(() => {
+		if (!info.value || !info.value.master) return '未入驻';
+		const m = info.value.master;
+		return { pending: '待审核', pass: '已通过', reject: '未通过' }[m.verify_status] || m.verify_status;
+	});
+	const canEdit = computed(() => !info.value || !info.value.applied || info.value.master.verify_status === 'reject');
+
+	function toggleSkill(id) {
+		const i = skills.value.indexOf(id);
+		if (i > -1) skills.value.splice(i, 1);
+		else skills.value.push(id);
+	}
+	function goHall() { uni.redirectTo({ url: '/pages/master/hall' }); }
+
+	async function load() {
+		if (!isLogin()) { toLogin(); return; }
+		const res = await api.masterInfo();
+		info.value = res.applied ? res : null;
+		if (res.applied) {
+			form.realname = res.master.realname;
+			form.mobile = res.master.mobile;
+			form.city = res.master.city;
+			skills.value = (res.skills || []).map(s => s.cat_id);
+		} else {
+			const u = getUser();
+			if (u) form.mobile = u.mobile || '';
+		}
+	}
+
+	async function submit() {
+		if (submitting.value) return;
+		if (!form.realname || !form.mobile || !form.idcard_no) {
+			uni.showToast({ title: '请填写完整实名信息', icon: 'none' });
+			return;
+		}
+		if (!skills.value.length) {
+			uni.showToast({ title: '请至少选择一个服务类目', icon: 'none' });
+			return;
+		}
+		submitting.value = true;
+		try {
+			const payload = { realname: form.realname, mobile: form.mobile, idcard_no: form.idcard_no, city: form.city };
+			skills.value.forEach((id, i) => { payload['skills[' + i + ']'] = id; });
+			await api.masterApply(payload);
+			uni.showToast({ title: '已提交，等待审核' });
+			load();
+		} catch (e) {
+		} finally {
+			submitting.value = false;
+		}
+	}
+
+	onShow(async () => {
+		await load();
+		const res = await api.cats();
+		cats.value = res.list || [];
+	});
+</script>
+
+<style scoped>
+	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 60rpx; }
+	.hero { padding: 40rpx 36rpx; background: linear-gradient(160deg, #FFB85C 0%, #F98D25 60%, #ED6F0E 100%); }
+	.hero-t { display: block; font-size: 40rpx; font-weight: 700; color: #fff; }
+	.hero-s { display: block; margin-top: 10rpx; font-size: 24rpx; color: rgba(255,255,255,0.9); }
+	.status { margin: 22rpx 28rpx 0; padding: 20rpx 24rpx; background: #FFF7F0; border-radius: 16rpx; display: flex; flex-direction: column; }
+	.st-t { font-size: 26rpx; color: #C4580A; font-weight: 600; }
+	.st-m { margin-top: 6rpx; font-size: 22rpx; color: #9A9A9A; }
+	.card { margin: 22rpx 28rpx 0; padding: 22rpx 24rpx; background: #fff; border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06); }
+	.fi { display: flex; align-items: center; min-height: 88rpx; border-bottom: 1rpx solid #F4F4F4; }
+	.fk { width: 160rpx; font-size: 26rpx; color: #666; }
+	.fv { flex: 1; height: 88rpx; font-size: 28rpx; color: #222; }
+	.block-title { margin-top: 20rpx; font-size: 26rpx; font-weight: 700; color: #1F1F1F; }
+	.cats { display: flex; flex-wrap: wrap; padding-top: 12rpx; }
+	.cat { padding: 0 20rpx; line-height: 56rpx; margin: 0 12rpx 12rpx 0; border-radius: 28rpx; background: #F5F5F5; }
+	.cat.on { background: #FFF3E6; }
+	.cat-txt { font-size: 24rpx; color: #666; }
+	.cat.on .cat-txt { color: #E36B0C; font-weight: 600; }
+	.hint { margin-top: 14rpx; font-size: 20rpx; color: #BDBDBD; line-height: 30rpx; }
+	.submit { height: 92rpx; margin-top: 26rpx; display: flex; align-items: center; justify-content: center; border-radius: 46rpx; color: #fff; font-size: 30rpx; font-weight: 600; background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%); }
+	.submit.disabled { opacity: 0.7; }
+	.li { display: flex; justify-content: space-between; padding: 14rpx 0; border-bottom: 1rpx solid #F4F4F4; }
+	.k { font-size: 26rpx; color: #666; }
+	.v { font-size: 26rpx; color: #333; }
+	.go { margin-top: 24rpx; height: 84rpx; display: flex; align-items: center; justify-content: center; border-radius: 42rpx; background: #FFF3E6; color: #E36B0C; font-size: 28rpx; font-weight: 600; }
+</style>
+
diff --git a/pages/master/hall.vue b/pages/master/hall.vue
new file mode 100644
index 0000000..af77e8f
--- /dev/null
+++ b/pages/master/hall.vue
@@ -0,0 +1,119 @@
+<template>
+	<view class="page">
+		<view class="top">
+			<view class="top-l">
+				<text class="top-t">订单大厅</text>
+				<text class="top-s">{{ info ? '评分 ' + info.score + ' · 完成 ' + info.order_count + ' 单' : '加载中' }}</text>
+			</view>
+			<view class="switch" :class="{ off: info && info.work_status === 'off' }" @tap="toggleWork">
+				<text class="switch-t">{{ info && info.work_status === 'off' ? '已暂停接单' : '接单中' }}</text>
+			</view>
+		</view>
+
+		<view class="list">
+			<view class="item" v-for="o in list" :key="o.id">
+				<view class="hd">
+					<text class="tag-urgent" v-if="Number(o.urgent)">急单</text>
+					<text class="svc">{{ o.service_name }}</text>
+					<text class="amt">¥{{ o.pay_amount }}</text>
+				</view>
+				<view class="bd">
+					<text class="addr">{{ o.address }}</text>
+					<text class="meta">楼层 {{ o.floor }} 层 · {{ Number(o.has_elevator) ? '有电梯' : '无电梯' }} · 预约 {{ o.appoint_text }}</text>
+					<text class="meta" v-if="o.goods_model">型号：{{ o.goods_model }}</text>
+					<text class="meta" v-if="o.remark">备注：{{ o.remark }}</text>
+				</view>
+				<view class="ft">
+					<text class="phone">{{ o.mobile }}</text>
+					<view class="grab" @tap="grab(o)">立即抢单</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="empty" v-if="!loading && !list.length"><text>暂无待接订单，稍后刷新试试</text></view>
+		<view class="refresh" @tap="load">刷新大厅</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref } from 'vue';
+	import { onShow } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const list = ref([]);
+	const info = ref(null);
+	const loading = ref(false);
+
+	async function load() {
+		if (!isLogin()) { toLogin(); return; }
+		loading.value = true;
+		try {
+			const res = await api.masterHall({ limit: 20 });
+			list.value = res.list || [];
+		} catch (e) {
+		}
+		try {
+			const me = await api.masterInfo();
+			info.value = me.applied ? me.master : null;
+		} catch (e) {}
+		loading.value = false;
+	}
+
+	async function toggleWork() {
+		if (!info.value) return;
+		const next = info.value.work_status === 'off' ? 'on' : 'off';
+		try {
+			await api.masterToggle({ work_status: next });
+			info.value.work_status = next;
+			uni.showToast({ title: next === 'on' ? '已开启接单' : '已暂停接单', icon: 'none' });
+		} catch (e) {}
+	}
+
+	function grab(o) {
+		uni.showModal({
+			title: '确认抢单',
+			content: '抢单后需在 2 小时内联系客户，否则订单将自动回流大厅',
+			success: async (r) => {
+				if (!r.confirm) return;
+				try {
+					await api.masterGrab({ order_id: o.id });
+					uni.showToast({ title: '抢单成功' });
+					setTimeout(() => uni.navigateTo({ url: '/pages/master/orders' }), 600);
+				} catch (e) {}
+			}
+		});
+	}
+
+	onShow(() => load());
+</script>
+
+<style scoped>
+	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 60rpx; }
+	.top {
+		display: flex; align-items: center; justify-content: space-between;
+		padding: 34rpx 30rpx;
+		background: linear-gradient(160deg, #FFB85C 0%, #F98D25 60%, #ED6F0E 100%);
+	}
+	.top-l { display: flex; flex-direction: column; }
+	.top-t { font-size: 38rpx; font-weight: 700; color: #fff; }
+	.top-s { margin-top: 8rpx; font-size: 22rpx; color: rgba(255,255,255,0.9); }
+	.switch { padding: 0 26rpx; line-height: 60rpx; border-radius: 30rpx; background: #fff; }
+	.switch.off { background: rgba(255,255,255,0.35); }
+	.switch-t { font-size: 24rpx; font-weight: 600; color: #E36B0C; }
+	.switch.off .switch-t { color: #fff; }
+	.list { padding: 22rpx 28rpx 0; }
+	.item { background: #fff; border-radius: 20rpx; margin-bottom: 20rpx; padding: 22rpx 24rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06); }
+	.hd { display: flex; align-items: center; padding-bottom: 14rpx; border-bottom: 1rpx solid #F4F4F4; }
+	.tag-urgent { padding: 0 12rpx; line-height: 34rpx; border-radius: 8rpx; background: #FDEEEB; color: #E8331B; font-size: 20rpx; margin-right: 10rpx; }
+	.svc { flex: 1; font-size: 30rpx; font-weight: 700; color: #1F1F1F; }
+	.amt { font-size: 32rpx; font-weight: 700; color: #F0710D; }
+	.bd { display: flex; flex-direction: column; padding: 16rpx 0; }
+	.addr { font-size: 26rpx; color: #333; line-height: 36rpx; }
+	.meta { margin-top: 6rpx; font-size: 22rpx; color: #9A9A9A; }
+	.ft { display: flex; align-items: center; justify-content: space-between; padding-top: 14rpx; border-top: 1rpx solid #F4F4F4; }
+	.phone { font-size: 24rpx; color: #666; }
+	.grab { padding: 0 34rpx; line-height: 68rpx; border-radius: 34rpx; color: #fff; font-size: 26rpx; font-weight: 600; background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%); box-shadow: 0 6rpx 16rpx rgba(240,113,13,0.28); }
+	.empty { padding: 90rpx 0 30rpx; text-align: center; font-size: 24rpx; color: #9A9A9A; }
+	.refresh { margin: 10rpx 28rpx; height: 84rpx; display: flex; align-items: center; justify-content: center; border-radius: 42rpx; background: #fff; color: #F0710D; font-size: 26rpx; font-weight: 600; }
+</style>
diff --git a/pages/master/orders.vue b/pages/master/orders.vue
new file mode 100644
index 0000000..d216e2d
--- /dev/null
+++ b/pages/master/orders.vue
@@ -0,0 +1,130 @@
+<template>
+	<view class="page">
+		<view class="tabs">
+			<view v-for="t in tabs" :key="t.key" class="tab" :class="{ on: cur === t.key }" @tap="switchTab(t.key)">
+				<text class="tab-txt">{{ t.name }}</text>
+			</view>
+		</view>
+
+		<view class="list">
+			<view class="item" v-for="o in list" :key="o.id">
+				<view class="hd">
+					<text class="svc">{{ o.service_name }}</text>
+					<text class="status" :class="'s' + o.status">{{ o.status_text }}</text>
+				</view>
+				<view class="bd">
+					<text class="addr">{{ o.address }}</text>
+					<text class="meta">预约 {{ o.appoint_text }} · 楼层 {{ o.floor }} 层 · {{ Number(o.has_elevator) ? '有电梯' : '无电梯' }}</text>
+					<view class="row">
+						<text class="phone">客户 {{ o.mobile }}</text>
+						<text class="amt">¥{{ o.pay_amount }}</text>
+					</view>
+				</view>
+				<view class="ops">
+					<view class="op" v-if="Number(o.status) === 3 && !o.contact_time" @tap="act('contact', o)">标记已联系</view>
+					<view class="op" v-if="Number(o.status) === 3" @tap="act('schedule', o)">约定上门</view>
+					<view class="op" v-if="Number(o.status) === 4" @tap="act('arrive', o)">到达打卡</view>
+					<view class="op" v-if="Number(o.status) === 5" @tap="act('start', o)">开始服务</view>
+					<view class="op primary" v-if="Number(o.status) === 6" @tap="act('finish', o)">完工提交</view>
+					<view class="op" v-if="Number(o.status) === 3 || Number(o.status) === 4" @tap="call(o)">打电话</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="empty" v-if="!loading && !list.length"><text>暂无订单</text></view>
+	</view>
+</template>
+
+<script setup>
+	import { ref } from 'vue';
+	import { onShow, onPullDownRefresh } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const tabs = [
+		{ key: 'active', name: '待处理' },
+		{ key: 'verify', name: '待验收' },
+		{ key: 'completed', name: '已完成' }
+	];
+	const cur = ref('active');
+	const list = ref([]);
+	const loading = ref(false);
+
+	async function load() {
+		if (!isLogin()) { toLogin(); return; }
+		loading.value = true;
+		try {
+			const res = await api.masterOrders({ status: cur.value, limit: 20 });
+			list.value = res.list || [];
+		} catch (e) {
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	function switchTab(k) { cur.value = k; load(); }
+	function call(o) { uni.makePhoneCall({ phoneNumber: o.mobile }); }
+
+	function act(type, o) {
+		const id = o.id;
+		if (type === 'contact') {
+			api.masterContact({ order_id: id }).then(() => { uni.showToast({ title: '已记录联系' }); load(); }).catch(() => {});
+			return;
+		}
+		if (type === 'arrive') {
+			api.masterArrive({ order_id: id }).then(() => { uni.showToast({ title: '已到达' }); load(); }).catch(() => {});
+			return;
+		}
+		if (type === 'start') {
+			api.masterStart({ order_id: id }).then(() => { uni.showToast({ title: '已开工' }); load(); }).catch(() => {});
+			return;
+		}
+		if (type === 'finish') {
+			uni.showModal({
+				title: '确认完工',
+				content: '提交后进入待验收，需上传现场照片（联调使用示例图）',
+				success: (r) => {
+					if (!r.confirm) return;
+					api.masterFinish({ order_id: id, 'images[0]': 'https://yjyf.gzyakj.com.cn/uploads/sample-finish.jpg' })
+						.then((res) => {
+							uni.showModal({ title: '已提交完工', content: '验收码：' + res.verify_code + '（告知客户）', showCancel: false });
+							load();
+						}).catch(() => {});
+				}
+			});
+			return;
+		}
+		if (type === 'schedule') {
+			const ts = Math.floor(Date.now() / 1000) + 7200;
+			api.masterSchedule({ order_id: id, appoint_time: ts }).then(() => { uni.showToast({ title: '已约定 2 小时后上门' }); load(); }).catch(() => {});
+		}
+	}
+
+	onShow(() => load());
+	onPullDownRefresh(() => { load().then(() => uni.stopPullDownRefresh()); });
+</script>
+
+<style scoped>
+	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 60rpx; }
+	.tabs { display: flex; background: #fff; box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.03); }
+	.tab { flex: 1; text-align: center; padding: 26rpx 0; }
+	.tab-txt { font-size: 28rpx; color: #666; }
+	.tab.on .tab-txt { color: #F0710D; font-weight: 700; }
+	.list { padding: 22rpx 28rpx; }
+	.item { background: #fff; border-radius: 20rpx; margin-bottom: 20rpx; padding: 22rpx 24rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06); }
+	.hd { display: flex; align-items: center; justify-content: space-between; padding-bottom: 14rpx; border-bottom: 1rpx solid #F4F4F4; }
+	.svc { font-size: 30rpx; font-weight: 700; color: #1F1F1F; }
+	.status { font-size: 24rpx; font-weight: 600; color: #F0710D; }
+	.status.s7 { color: #E8331B; }
+	.status.s8 { color: #2FA84F; }
+	.bd { display: flex; flex-direction: column; padding: 16rpx 0; }
+	.addr { font-size: 26rpx; color: #333; line-height: 36rpx; }
+	.meta { margin-top: 6rpx; font-size: 22rpx; color: #9A9A9A; }
+	.row { display: flex; align-items: center; justify-content: space-between; margin-top: 10rpx; }
+	.phone { font-size: 24rpx; color: #666; }
+	.amt { font-size: 32rpx; font-weight: 700; color: #F0710D; }
+	.ops { display: flex; flex-wrap: wrap; justify-content: flex-end; padding-top: 14rpx; border-top: 1rpx solid #F4F4F4; }
+	.op { margin: 8rpx 0 0 14rpx; padding: 0 24rpx; line-height: 62rpx; border-radius: 31rpx; border: 2rpx solid #DDD; font-size: 24rpx; color: #666; }
+	.op.primary { border-color: #F0710D; color: #fff; background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); }
+	.empty { padding: 120rpx 0; text-align: center; font-size: 24rpx; color: #9A9A9A; }
+</style>
diff --git a/pages/order/create.vue b/pages/order/create.vue
new file mode 100644
index 0000000..65c8b8c
--- /dev/null
+++ b/pages/order/create.vue
@@ -0,0 +1,266 @@
+<template>
+	<view class="page">
+		<view class="svc">
+			<view class="svc-thumb"><text class="svc-txt">{{ svc ? svc.name.slice(0, 2) : '' }}</text></view>
+			<view class="svc-info">
+				<text class="svc-name">{{ svc ? svc.name : '' }}</text>
+				<text class="svc-price">{{ svc ? svc.price_text : '' }}</text>
+			</view>
+			<view class="urgent" :class="{ on: urgent }" @tap="urgent = !urgent">
+				<text class="urgent-txt">{{ urgent ? '已加急 +20%' : '加急' }}</text>
+			</view>
+		</view>
+
+		<view class="sec">
+			<view class="sec-title">服务地址</view>
+			<view class="addr" v-if="address">
+				<view class="addr-main">
+					<text class="addr-c">{{ address.contact }}  {{ address.mobile }}</text>
+					<text class="addr-d">{{ address.province }}{{ address.city }}{{ address.district }}{{ address.address }}</text>
+					<text class="addr-x">楼层 {{ address.floor }} · {{ Number(address.has_elevator) ? '有电梯' : '无电梯' }}</text>
+				</view>
+				<text class="link" @tap="pickAddress">更换</text>
+			</view>
+
+			<view class="form" v-if="!address">
+				<view class="fi"><text class="fk">联系人</text><input class="fv" v-model="form.contact" placeholder="收货人姓名" /></view>
+				<view class="fi"><text class="fk">手机号</text><input class="fv" v-model="form.mobile" type="number" maxlength="11" placeholder="联系手机号" /></view>
+				<view class="fi"><text class="fk">详细地址</text><input class="fv" v-model="form.address" placeholder="小区/楼栋/门牌号" /></view>
+				<view class="fi">
+					<text class="fk">楼层</text>
+					<view class="stepper">
+						<view class="st-btn" @tap="stepFloor(-1)">－</view>
+						<text class="st-val">{{ form.floor }}</text>
+						<view class="st-btn" @tap="stepFloor(1)">＋</view>
+					</view>
+				</view>
+				<view class="fi">
+					<text class="fk">有无电梯</text>
+					<view class="seg">
+						<view class="seg-i" :class="{ on: form.has_elevator === 1 }" @tap="form.has_elevator = 1">有</view>
+						<view class="seg-i" :class="{ on: form.has_elevator === 0 }" @tap="form.has_elevator = 0">无</view>
+					</view>
+				</view>
+				<view class="save-btn" @tap="saveAddress">保存地址</view>
+			</view>
+		</view>
+
+		<view class="sec">
+			<view class="sec-title">预约与服务信息</view>
+			<picker mode="date" :value="date" :start="today" @change="onDate">
+				<view class="fi"><text class="fk">预约日期</text><text class="fv2">{{ date }}</text><text class="arrow">›</text></view>
+			</picker>
+			<picker mode="time" :value="time" @change="onTime">
+				<view class="fi"><text class="fk">预约时段</text><text class="fv2">{{ time }}</text><text class="arrow">›</text></view>
+			</picker>
+			<view class="fi" v-if="svc && svc.need_model === 1"><text class="fk">商品型号</text><input class="fv" v-model="form.goods_model" placeholder="如：三人位布艺沙发" /></view>
+			<view class="fi"><text class="fk">数量</text><view class="stepper">
+				<view class="st-btn" @tap="stepNum(-1)">－</view><text class="st-val">{{ form.goods_num }}</text><view class="st-btn" @tap="stepNum(1)">＋</view>
+			</view></view>
+			<view class="fi"><text class="fk">备注</text><input class="fv" v-model="form.remark" placeholder="施工要求 / 门禁 / 宠物等" /></view>
+		</view>
+
+		<view class="sec" v-if="amount">
+			<view class="sec-title">费用明细</view>
+			<view class="li"><text class="k">基础价</text><text class="v">¥{{ amount.base_amount }}</text></view>
+			<view class="li"><text class="k">楼层费</text><text class="v">¥{{ amount.floor_amount }}</text></view>
+			<view class="li" v-if="amount.urgent_amount > 0"><text class="k">加急费</text><text class="v">¥{{ amount.urgent_amount }}</text></view>
+			<view class="li total"><text class="k">应付合计</text><text class="v big">¥{{ amount.pay_amount }}</text></view>
+		</view>
+
+		<view class="bar">
+			<view class="bar-l"><text class="bar-k">合计</text><text class="bar-p">¥{{ amount ? amount.pay_amount : 0 }}</text></view>
+			<view class="bar-btn" :class="{ disabled: submitting }" @tap="submit">{{ submitting ? '提交中...' : '提交并支付' }}</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, reactive, watch } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const svc = ref(null);
+	const address = ref(null);
+	const addresses = ref([]);
+	const amount = ref(null);
+	const urgent = ref(false);
+	const submitting = ref(false);
+
+	const now = new Date();
+	const pad = (n) => (n < 10 ? '0' + n : '' + n);
+	const today = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())}`;
+	const date = ref(today);
+	const time = ref('14:00');
+
+	const form = reactive({
+		contact: '', mobile: '', address: '', floor: 1, has_elevator: 1,
+		goods_model: '', goods_num: 1, remark: ''
+	});
+
+	let serviceId = 0;
+
+	async function calc() {
+		if (!serviceId) return;
+		const floor = address.value ? address.value.floor : form.floor;
+		const elev = address.value ? address.value.has_elevator : form.has_elevator;
+		try {
+			amount.value = await api.calc({
+				service_id: serviceId, floor: floor, has_elevator: elev, urgent: urgent.value ? 1 : 0
+			});
+		} catch (e) {}
+	}
+
+	watch([urgent, () => form.floor, () => form.has_elevator], () => calc());
+
+	function onDate(e) { date.value = e.detail.value; }
+	function onTime(e) { time.value = e.detail.value; }
+	function stepFloor(d) { form.floor = Math.max(1, form.floor + d); }
+	function stepNum(d) { form.goods_num = Math.max(1, form.goods_num + d); }
+
+	async function loadAddress() {
+		try {
+			const res = await api.addressList();
+			addresses.value = res.list || [];
+			address.value = addresses.value.find(a => Number(a.is_default) === 1) || addresses.value[0] || null;
+		} catch (e) {}
+	}
+
+	function pickAddress() {
+		const names = addresses.value.map(a => (a.contact + ' ' + a.address).slice(0, 14));
+		names.push('＋ 新增地址');
+		uni.showActionSheet({
+			itemList: names,
+			success: (r) => {
+				if (r.tapIndex === addresses.value.length) {
+					address.value = null;
+					form.contact = '';
+					form.address = '';
+				} else {
+					address.value = addresses.value[r.tapIndex];
+					calc();
+				}
+			}
+		});
+	}
+
+	async function saveAddress() {
+		if (!form.contact || !form.mobile || !form.address) {
+			uni.showToast({ title: '请填写联系人/手机号/地址', icon: 'none' });
+			return;
+		}
+		try {
+			const res = await api.addressSave({
+				contact: form.contact, mobile: form.mobile,
+				province: '贵州省', city: '遵义市', district: '', address: form.address,
+				floor: form.floor, has_elevator: form.has_elevator, is_default: 1
+			});
+			await loadAddress();
+			const hit = addresses.value.find(a => Number(a.id) === Number(res.id));
+			if (hit) address.value = hit;
+			calc();
+			uni.showToast({ title: '地址已保存' });
+		} catch (e) {}
+	}
+
+	async function submit() {
+		if (submitting.value) return;
+		if (!isLogin()) { toLogin(); return; }
+		if (!address.value) { uni.showToast({ title: '请先保存服务地址', icon: 'none' }); return; }
+		submitting.value = true;
+		try {
+			const appoint = Math.floor(new Date(date.value.replace(/-/g, '/') + ' ' + time.value + ':00').getTime() / 1000);
+			const res = await api.orderCreate({
+				service_id: serviceId,
+				address_id: address.value.id,
+				appoint_time: appoint,
+				urgent: urgent.value ? 1 : 0,
+				goods_model: form.goods_model,
+				goods_num: form.goods_num,
+				remark: form.remark
+			});
+			await api.orderPay({ order_id: res.order_id, pay_type: 'mock' });
+			uni.showToast({ title: '支付成功，等待师傅接单' });
+			setTimeout(() => {
+				uni.redirectTo({ url: '/pages/order/detail?id=' + res.order_id });
+			}, 600);
+		} catch (e) {
+		} finally {
+			submitting.value = false;
+		}
+	}
+
+	onLoad(async (options) => {
+		if (!isLogin()) { toLogin(); return; }
+		serviceId = Number(options.service_id || 0);
+		const res = await api.serviceDetail(serviceId);
+		svc.value = res.detail;
+		await loadAddress();
+		calc();
+	});
+</script>
+<style scoped>
+	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 180rpx; }
+	.svc {
+		display: flex; align-items: center; padding: 26rpx 28rpx;
+		background: linear-gradient(160deg, #FFB85C 0%, #F98D25 60%, #ED6F0E 100%);
+	}
+	.svc-thumb {
+		width: 96rpx; height: 96rpx; border-radius: 18rpx; flex-shrink: 0;
+		background: rgba(255,255,255,0.92); display: flex; align-items: center; justify-content: center;
+	}
+	.svc-txt { font-size: 28rpx; font-weight: 700; color: #B85E2A; }
+	.svc-info { flex: 1; margin-left: 18rpx; display: flex; flex-direction: column; }
+	.svc-name { font-size: 32rpx; font-weight: 700; color: #fff; }
+	.svc-price { margin-top: 6rpx; font-size: 24rpx; color: rgba(255,255,255,0.9); }
+	.urgent {
+		flex-shrink: 0; padding: 0 22rpx; line-height: 56rpx; border-radius: 28rpx;
+		background: rgba(255,255,255,0.2); border: 2rpx solid rgba(255,255,255,0.5);
+	}
+	.urgent.on { background: #fff; border-color: #fff; }
+	.urgent-txt { font-size: 22rpx; color: #fff; }
+	.urgent.on .urgent-txt { color: #E36B0C; font-weight: 600; }
+	.sec { margin: 22rpx 28rpx 0; padding: 22rpx 24rpx; background: #fff; border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06); }
+	.sec-title { font-size: 28rpx; font-weight: 700; color: #1F1F1F; margin-bottom: 10rpx; }
+	.addr { display: flex; align-items: center; }
+	.addr-main { flex: 1; min-width: 0; display: flex; flex-direction: column; }
+	.addr-c { font-size: 28rpx; font-weight: 600; color: #222; }
+	.addr-d { margin-top: 6rpx; font-size: 24rpx; color: #666; line-height: 34rpx; }
+	.addr-x { margin-top: 6rpx; font-size: 22rpx; color: #9A9A9A; }
+	.link { flex-shrink: 0; margin-left: 16rpx; font-size: 24rpx; color: #F0710D; }
+	.fi { display: flex; align-items: center; min-height: 88rpx; border-bottom: 1rpx solid #F4F4F4; }
+	.fk { width: 150rpx; font-size: 26rpx; color: #666; }
+	.fv { flex: 1; height: 88rpx; font-size: 28rpx; color: #222; }
+	.fv2 { flex: 1; font-size: 28rpx; color: #222; }
+	.arrow { font-size: 30rpx; color: #C4C4C4; }
+	.stepper { display: flex; align-items: center; }
+	.st-btn { width: 52rpx; height: 52rpx; line-height: 50rpx; text-align: center; border-radius: 26rpx; background: #F5F5F5; color: #666; font-size: 26rpx; }
+	.st-val { min-width: 60rpx; text-align: center; font-size: 28rpx; color: #222; }
+	.seg { display: flex; }
+	.seg-i { padding: 0 26rpx; line-height: 52rpx; margin-right: 12rpx; border-radius: 26rpx; background: #F5F5F5; font-size: 24rpx; color: #666; }
+	.seg-i.on { background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%); color: #fff; }
+	.save-btn { margin-top: 20rpx; height: 76rpx; display: flex; align-items: center; justify-content: center; border-radius: 38rpx; background: #FFF3E6; color: #E36B0C; font-size: 26rpx; font-weight: 600; }
+	.li { display: flex; justify-content: space-between; padding: 14rpx 0; border-bottom: 1rpx solid #F4F4F4; }
+	.li.total { border-bottom: none; }
+	.k { font-size: 26rpx; color: #666; }
+	.v { font-size: 26rpx; color: #333; }
+	.v.big { font-size: 34rpx; font-weight: 700; color: #F0710D; }
+	.bar {
+		position: fixed; left: 0; right: 0; bottom: 0; height: 120rpx;
+		padding: 0 28rpx; padding-bottom: env(safe-area-inset-bottom);
+		display: flex; align-items: center; justify-content: space-between;
+		background: #fff; box-shadow: 0 -6rpx 24rpx rgba(0,0,0,0.07);
+	}
+	.bar-l { display: flex; align-items: baseline; }
+	.bar-k { font-size: 24rpx; color: #666; }
+	.bar-p { margin-left: 8rpx; font-size: 38rpx; font-weight: 700; color: #F0710D; }
+	.bar-btn {
+		height: 84rpx; padding: 0 48rpx; display: flex; align-items: center;
+		border-radius: 42rpx; color: #fff; font-size: 30rpx; font-weight: 600;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		box-shadow: 0 8rpx 20rpx rgba(240,113,13,0.3);
+	}
+	.bar-btn.disabled { opacity: 0.7; }
+</style>
+
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
new file mode 100644
index 0000000..0ff0750
--- /dev/null
+++ b/pages/order/detail.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="page" v-if="order">
+		<view class="hero">
+			<text class="hero-status">{{ order.status_text }}</text>
+			<text class="hero-tip">{{ statusTip }}</text>
+		</view>
+
+		<view class="card" v-if="master">
+			<view class="card-title">服务师傅</view>
+			<view class="master">
+				<view class="avatar"><text class="avatar-txt">{{ (master.realname || '师').slice(0, 1) }}</text></view>
+				<view class="m-info">
+					<text class="m-name">{{ master.realname }}</text>
+					<text class="m-sub">评分 {{ master.score }} · 完成 {{ master.order_count }} 单</text>
+				</view>
+				<text class="m-mobile">{{ master.mobile }}</text>
+			</view>
+		</view>
+
+		<view class="card">
+			<view class="card-title">服务信息</view>
+			<view class="li"><text class="k">服务项目</text><text class="v">{{ order.service_name }}</text></view>
+			<view class="li"><text class="k">订单号</text><text class="v">{{ order.order_no }}</text></view>
+			<view class="li"><text class="k">联系人</text><text class="v">{{ order.contact }} {{ order.mobile }}</text></view>
+			<view class="li"><text class="k">服务地址</text><text class="v">{{ order.province }}{{ order.city }}{{ order.district }}{{ order.address }}</text></view>
+			<view class="li"><text class="k">楼层</text><text class="v">{{ order.floor }} 层 · {{ Number(order.has_elevator) ? '有电梯' : '无电梯' }}</text></view>
+			<view class="li"><text class="k">预约时间</text><text class="v">{{ order.appoint_text }}</text></view>
+			<view class="li" v-if="order.goods_model"><text class="k">商品型号</text><text class="v">{{ order.goods_model }}</text></view>
+			<view class="li" v-if="order.remark"><text class="k">备注</text><text class="v">{{ order.remark }}</text></view>
+			<view class="li" v-if="Number(order.urgent)"><text class="k">加急</text><text class="v">是（+20%）</text></view>
+		</view>
+
+		<view class="card">
+			<view class="card-title">费用明细</view>
+			<view class="li"><text class="k">基础价</text><text class="v">¥{{ order.base_amount }}</text></view>
+			<view class="li"><text class="k">楼层费</text><text class="v">¥{{ order.floor_amount }}</text></view>
+			<view class="li" v-if="Number(order.urgent_amount) > 0"><text class="k">加急费</text><text class="v">¥{{ order.urgent_amount }}</text></view>
+			<view class="li"><text class="k">实付</text><text class="v big">¥{{ order.pay_amount }}</text></view>
+		</view>
+
+		<view class="card">
+			<view class="card-title">订单轨迹</view>
+			<view class="tl" v-for="(l, i) in logs" :key="i">
+				<view class="dot" :class="{ on: i === logs.length - 1 }"></view>
+				<view class="tl-body">
+					<text class="tl-s">{{ l.status_text }}</text>
+					<text class="tl-r">{{ l.remark }}</text>
+					<text class="tl-t">{{ l.time_text }}</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="card" v-if="media.length">
+			<view class="card-title">现场取证</view>
+			<view class="media">
+				<view class="media-i" v-for="(m, i) in media" :key="i">
+					<text class="media-txt">{{ m.stage === 'damage' ? '损坏申报' : '完工照片' }}</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="bar">
+			<view class="op" v-if="order.can_cancel" @tap="cancel">取消订单</view>
+			<view class="op primary" v-if="order.can_pay" @tap="pay">去支付</view>
+			<view class="op primary" v-if="order.can_verify" @tap="verify">确认验收</view>
+			<view class="op primary" v-if="order.can_review" @tap="review">去评价</view>
+			<view class="op" @tap="backHome">返回首页</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed } from 'vue';
+	import { onShow, onLoad } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+
+	const order = ref(null);
+	const master = ref(null);
+	const logs = ref([]);
+	const media = ref([]);
+	let orderId = 0;
+
+	const statusTip = computed(() => {
+		if (!order.value) return '';
+		const tips = {
+			0: '请尽快完成支付', 1: '已进入接单大厅，等待师傅接单', 2: '师傅报价中，请稍候',
+			3: '师傅已接单，将尽快与您联系', 4: '已约定上门时间', 5: '师傅已到达现场',
+			6: '服务进行中', 7: '师傅已完工，请确认验收', 8: '订单已完成，感谢您的信任',
+			9: '订单已取消', 10: '售后处理中'
+		};
+		return tips[order.value.status] || '';
+	});
+
+	async function load() {
+		const res = await api.orderDetail(orderId);
+		order.value = res.order;
+		master.value = res.master;
+		logs.value = res.logs || [];
+		media.value = res.media || [];
+	}
+
+	function toast(t) { uni.showToast({ title: t, icon: 'none' }); }
+	function backHome() { uni.reLaunch({ url: '/YJYF/YJYF' }); }
+
+	function cancel() {
+		uni.showModal({
+			title: '取消订单', content: '确认取消该订单？',
+			success: async (r) => {
+				if (!r.confirm) return;
+				try { await api.orderCancel({ order_id: orderId, reason: '用户取消' }); toast('已取消'); load(); } catch (e) {}
+			}
+		});
+	}
+	async function pay() {
+		try { await api.orderPay({ order_id: orderId, pay_type: 'mock' }); toast('支付成功'); load(); } catch (e) {}
+	}
+	function verify() {
+		uni.showModal({
+			title: '确认验收', content: '验收后平台将向师傅结算，确认服务已完成？',
+			success: async (r) => {
+				if (!r.confirm) return;
+				try { await api.orderVerify({ order_id: orderId }); toast('验收成功'); load(); } catch (e) {}
+			}
+		});
+	}
+	function review() { uni.navigateTo({ url: '/pages/order/review?id=' + orderId }); }
+
+	onLoad((o) => { orderId = Number(o.id || 0); });
+	onShow(() => { if (orderId) load(); });
+</script>
+<style scoped>
+	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 160rpx; }
+	.hero { padding: 40rpx 36rpx; background: linear-gradient(160deg, #FFB85C 0%, #F98D25 60%, #ED6F0E 100%); }
+	.hero-status { display: block; font-size: 40rpx; font-weight: 700; color: #fff; letter-spacing: 2rpx; }
+	.hero-tip { display: block; margin-top: 10rpx; font-size: 24rpx; color: rgba(255,255,255,0.9); }
+	.card { margin: 22rpx 28rpx 0; padding: 24rpx; background: #fff; border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06); }
+	.card-title { font-size: 28rpx; font-weight: 700; color: #1F1F1F; margin-bottom: 12rpx; }
+	.li { display: flex; justify-content: space-between; padding: 12rpx 0; border-bottom: 1rpx solid #F4F4F4; }
+	.k { flex-shrink: 0; width: 150rpx; font-size: 26rpx; color: #666; }
+	.v { flex: 1; text-align: right; font-size: 26rpx; color: #333; line-height: 36rpx; }
+	.v.big { font-size: 34rpx; font-weight: 700; color: #F0710D; }
+	.master { display: flex; align-items: center; }
+	.avatar { width: 76rpx; height: 76rpx; border-radius: 50%; background: #FFF1E3; display: flex; align-items: center; justify-content: center; }
+	.avatar-txt { font-size: 30rpx; font-weight: 700; color: #E88A2C; }
+	.m-info { flex: 1; margin-left: 16rpx; display: flex; flex-direction: column; }
+	.m-name { font-size: 28rpx; font-weight: 600; color: #222; }
+	.m-sub { margin-top: 4rpx; font-size: 22rpx; color: #9A9A9A; }
+	.m-mobile { font-size: 24rpx; color: #666; }
+	.tl { display: flex; padding: 10rpx 0; }
+	.dot { width: 14rpx; height: 14rpx; margin: 8rpx 16rpx 0 0; border-radius: 50%; background: #E0E0E0; flex-shrink: 0; }
+	.dot.on { background: #F0710D; box-shadow: 0 0 0 6rpx rgba(240,113,13,0.15); }
+	.tl-body { flex: 1; display: flex; flex-direction: column; }
+	.tl-s { font-size: 26rpx; font-weight: 600; color: #333; }
+	.tl-r { margin-top: 2rpx; font-size: 22rpx; color: #9A9A9A; }
+	.tl-t { margin-top: 2rpx; font-size: 20rpx; color: #C4C4C4; }
+	.media { display: flex; flex-wrap: wrap; }
+	.media-i { width: 150rpx; height: 110rpx; margin: 0 12rpx 12rpx 0; border-radius: 12rpx; background: linear-gradient(160deg,#FFF7F0,#FCE9D6); display: flex; align-items: center; justify-content: center; }
+	.media-txt { font-size: 20rpx; color: #B85E2A; }
+	.bar {
+		position: fixed; left: 0; right: 0; bottom: 0; height: 118rpx;
+		padding: 0 24rpx; padding-bottom: env(safe-area-inset-bottom);
+		display: flex; align-items: center; justify-content: flex-end;
+		background: #fff; box-shadow: 0 -6rpx 24rpx rgba(0,0,0,0.07);
+	}
+	.op { margin-left: 16rpx; padding: 0 28rpx; line-height: 68rpx; border-radius: 34rpx; border: 2rpx solid #DDD; font-size: 26rpx; color: #666; }
+	.op.primary { border-color: #F0710D; color: #fff; background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); }
+</style>
+
diff --git a/pages/order/list.vue b/pages/order/list.vue
new file mode 100644
index 0000000..63c1a58
--- /dev/null
+++ b/pages/order/list.vue
@@ -0,0 +1,130 @@
+<template>
+	<view class="page">
+		<view class="tabs">
+			<view v-for="t in tabs" :key="t.key" class="tab" :class="{ on: cur === t.key }" @tap="switchTab(t.key)">
+				<text class="tab-txt">{{ t.name }}</text>
+			</view>
+		</view>
+
+		<view class="list">
+			<view class="item" v-for="o in list" :key="o.id" @tap="goDetail(o.id)">
+				<view class="hd">
+					<text class="no">{{ o.order_no }}</text>
+					<text class="status" :class="'s' + o.status">{{ o.status_text }}</text>
+				</view>
+				<view class="bd">
+					<view class="thumb"><text class="thumb-txt">{{ (o.service_name || '').slice(0, 2) }}</text></view>
+					<view class="mi">
+						<text class="sname">{{ o.service_name }}</text>
+						<text class="saddr">{{ o.address }}</text>
+						<text class="stime">预约 {{ o.appoint_text }}{{ Number(o.urgent) ? ' · 急单' : '' }}</text>
+					</view>
+					<text class="amt">¥{{ o.pay_amount }}</text>
+				</view>
+				<view class="ops" v-if="o.can_pay || o.can_cancel || o.can_verify || o.can_review">
+					<view class="op" v-if="o.can_cancel" @tap.stop="cancel(o)">取消订单</view>
+					<view class="op primary" v-if="o.can_pay" @tap.stop="pay(o)">去支付</view>
+					<view class="op primary" v-if="o.can_verify" @tap.stop="verify(o)">确认验收</view>
+					<view class="op primary" v-if="o.can_review" @tap.stop="review(o)">去评价</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="empty" v-if="!loading && !list.length"><text>暂无订单</text></view>
+		<view class="tip" v-if="list.length"><text>仅展示前 {{ list.length }} 条</text></view>
+	</view>
+</template>
+
+<script setup>
+	import { ref } from 'vue';
+	import { onShow } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const tabs = [
+		{ key: 'all', name: '全部' },
+		{ key: 'active', name: '进行中' },
+		{ key: 'completed', name: '已完成' },
+		{ key: 'cancelled', name: '已取消' }
+	];
+	const cur = ref('all');
+	const list = ref([]);
+	const loading = ref(false);
+
+	async function load() {
+		if (!isLogin()) { toLogin(); return; }
+		loading.value = true;
+		try {
+			const res = await api.orderList({ status: cur.value, limit: 20 });
+			list.value = res.list || [];
+		} catch (e) {
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	function switchTab(k) {
+		cur.value = k;
+		load();
+	}
+	function goDetail(id) {
+		uni.navigateTo({ url: '/pages/order/detail?id=' + id });
+	}
+	function toast(t) { uni.showToast({ title: t, icon: 'none' }); }
+
+	function cancel(o) {
+		uni.showModal({
+			title: '取消订单', content: '确认取消该订单？',
+			success: async (r) => {
+				if (!r.confirm) return;
+				try { await api.orderCancel({ order_id: o.id, reason: '用户取消' }); toast('已取消'); load(); } catch (e) {}
+			}
+		});
+	}
+	async function pay(o) {
+		try { await api.orderPay({ order_id: o.id, pay_type: 'mock' }); toast('支付成功'); load(); } catch (e) {}
+	}
+	function verify(o) {
+		uni.showModal({
+			title: '确认验收', content: '请确认服务已完成，验收后平台将向师傅结算',
+			success: async (r) => {
+				if (!r.confirm) return;
+				try { await api.orderVerify({ order_id: o.id }); toast('验收成功'); load(); } catch (e) {}
+			}
+		});
+	}
+	function review(o) {
+		uni.navigateTo({ url: '/pages/order/review?id=' + o.id });
+	}
+
+	onShow(() => load());
+</script>
+
+<style scoped>
+	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 40rpx; }
+	.tabs { display: flex; background: #fff; padding: 0 12rpx; box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.03); }
+	.tab { flex: 1; text-align: center; padding: 26rpx 0; }
+	.tab-txt { font-size: 28rpx; color: #666; }
+	.tab.on .tab-txt { color: #F0710D; font-weight: 700; }
+	.list { padding: 20rpx 28rpx; }
+	.item { background: #fff; border-radius: 20rpx; margin-bottom: 20rpx; padding: 22rpx 24rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06); }
+	.hd { display: flex; justify-content: space-between; align-items: center; padding-bottom: 16rpx; border-bottom: 1rpx solid #F4F4F4; }
+	.no { font-size: 22rpx; color: #9A9A9A; }
+	.status { font-size: 24rpx; font-weight: 600; color: #F0710D; }
+	.status.s8 { color: #2FA84F; }
+	.status.s9 { color: #9A9A9A; }
+	.status.s7 { color: #E8331B; }
+	.bd { display: flex; align-items: center; padding: 20rpx 0; }
+	.thumb { width: 92rpx; height: 92rpx; border-radius: 16rpx; flex-shrink: 0; background: linear-gradient(160deg,#FFF7F0,#FCE9D6); display: flex; align-items: center; justify-content: center; }
+	.thumb-txt { font-size: 26rpx; font-weight: 700; color: #B85E2A; }
+	.mi { flex: 1; min-width: 0; margin-left: 18rpx; display: flex; flex-direction: column; }
+	.sname { font-size: 28rpx; font-weight: 600; color: #1F1F1F; }
+	.saddr { margin-top: 6rpx; font-size: 22rpx; color: #9A9A9A; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }
+	.stime { margin-top: 6rpx; font-size: 22rpx; color: #9A9A9A; }
+	.amt { font-size: 32rpx; font-weight: 700; color: #F0710D; }
+	.ops { display: flex; justify-content: flex-end; padding-top: 16rpx; border-top: 1rpx solid #F4F4F4; }
+	.op { margin-left: 16rpx; padding: 0 26rpx; line-height: 60rpx; border-radius: 30rpx; border: 2rpx solid #DDD; font-size: 24rpx; color: #666; }
+	.op.primary { border-color: #F0710D; color: #F0710D; background: #FFF7F0; }
+	.empty { padding: 120rpx 0; text-align: center; font-size: 24rpx; color: #9A9A9A; }
+	.tip { text-align: center; font-size: 20rpx; color: #C4C4C4; }
+</style>
diff --git a/pages/order/review.vue b/pages/order/review.vue
new file mode 100644
index 0000000..4d463e8
--- /dev/null
+++ b/pages/order/review.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="page">
+		<view class="card">
+			<view class="title">给本次服务打分</view>
+			<view class="stars">
+				<text v-for="i in 5" :key="i" class="star" :class="{ on: i <= score }" @tap="score = i">★</text>
+			</view>
+			<text class="score-txt">{{ scoreText }}</text>
+		</view>
+
+		<view class="card">
+			<view class="title">服务标签</view>
+			<view class="tags">
+				<view v-for="t in tagList" :key="t" class="tag" :class="{ on: tags.indexOf(t) > -1 }" @tap="toggleTag(t)">
+					<text class="tag-txt">{{ t }}</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="card">
+			<view class="title">评价内容</view>
+			<textarea class="ta" v-model="content" maxlength="200" placeholder="说说师傅的服务、专业度和态度..." />
+			<view class="anon">
+				<text class="anon-txt">匿名评价</text>
+				<switch :checked="anonymous" color="#F0710D" @change="e => (anonymous = e.detail.value)" />
+			</view>
+		</view>
+
+		<view class="submit" :class="{ disabled: submitting }" @tap="submit">{{ submitting ? '提交中...' : '提交评价' }}</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+
+	const score = ref(5);
+	const tags = ref([]);
+	const content = ref('');
+	const anonymous = ref(false);
+	const submitting = ref(false);
+	const tagList = ['准时', '专业', '态度好', '收费透明', '干净利落', '值得推荐'];
+	let orderId = 0;
+
+	const scoreText = computed(() => ['', '非常不满意', '不满意', '一般', '满意', '非常满意'][score.value]);
+
+	function toggleTag(t) {
+		const i = tags.value.indexOf(t);
+		if (i > -1) tags.value.splice(i, 1);
+		else tags.value.push(t);
+	}
+
+	async function submit() {
+		if (submitting.value) return;
+		submitting.value = true;
+		try {
+			await api.reviewCreate({
+				order_id: orderId,
+				score: score.value,
+				content: content.value,
+				tags: tags.value.join(','),
+				is_anonymous: anonymous.value ? 1 : 0
+			});
+			uni.showToast({ title: '评价成功' });
+			setTimeout(() => uni.navigateBack(), 600);
+		} catch (e) {
+		} finally {
+			submitting.value = false;
+		}
+	}
+
+	onLoad((o) => { orderId = Number(o.id || 0); });
+</script>
+
+<style scoped>
+	.page { min-height: 100vh; background: #F5F6F8; padding: 22rpx 28rpx 60rpx; }
+	.card { padding: 26rpx 24rpx; background: #fff; border-radius: 20rpx; margin-bottom: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06); }
+	.title { font-size: 28rpx; font-weight: 700; color: #1F1F1F; }
+	.stars { display: flex; justify-content: center; padding: 20rpx 0 8rpx; }
+	.star { font-size: 60rpx; color: #E6E6E6; margin: 0 12rpx; }
+	.star.on { color: #FFB120; }
+	.score-txt { display: block; text-align: center; font-size: 24rpx; color: #F0710D; }
+	.tags { display: flex; flex-wrap: wrap; padding-top: 14rpx; }
+	.tag { padding: 0 22rpx; line-height: 56rpx; margin: 0 14rpx 14rpx 0; border-radius: 28rpx; background: #F5F5F5; }
+	.tag.on { background: #FFF3E6; }
+	.tag-txt { font-size: 24rpx; color: #666; }
+	.tag.on .tag-txt { color: #E36B0C; font-weight: 600; }
+	.ta { width: 100%; height: 180rpx; margin-top: 14rpx; font-size: 26rpx; color: #333; line-height: 38rpx; }
+	.anon { display: flex; align-items: center; justify-content: space-between; margin-top: 10rpx; }
+	.anon-txt { font-size: 26rpx; color: #666; }
+	.submit {
+		height: 96rpx; margin-top: 30rpx; display: flex; align-items: center; justify-content: center;
+		border-radius: 48rpx; color: #fff; font-size: 32rpx; font-weight: 600;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		box-shadow: 0 10rpx 24rpx rgba(240,113,13,0.3);
+	}
+	.submit.disabled { opacity: 0.7; }
+</style>
diff --git a/pages/service/detail.vue b/pages/service/detail.vue
new file mode 100644
index 0000000..890ed29
--- /dev/null
+++ b/pages/service/detail.vue
@@ -0,0 +1,103 @@
+<template>
+	<view class="page" v-if="detail">
+		<view class="hero">
+			<view class="hero-thumb"><text class="hero-txt">{{ detail.name.slice(0, 2) }}</text></view>
+			<view class="hero-info">
+				<text class="name">{{ detail.name }}</text>
+				<view class="tags">
+					<text class="tag">{{ detail.price_type_text }}</text>
+					<text class="tag">{{ detail.cat_name }}</text>
+				</view>
+				<text class="price">{{ detail.price_text }}</text>
+			</view>
+		</view>
+
+		<view class="card">
+			<view class="card-title">费用说明</view>
+			<view class="li"><text class="k">基础价</text><text class="v">¥{{ detail.base_price }} / {{ detail.unit }}</text></view>
+			<view class="li"><text class="k">楼层费</text><text class="v">{{ detail.floor_fee }} 元/层（{{ detail.free_floor }} 层内免）</text></view>
+			<view class="li"><text class="k">加急费</text><text class="v">基础价 20%</text></view>
+			<view class="li"><text class="k">无电梯</text><text class="v">超免楼层按楼层费计</text></view>
+		</view>
+
+		<view class="card">
+			<view class="card-title">服务保障</view>
+			<view class="li"><text class="k">平台认证</text><text class="v">实名 + 技能审核</text></view>
+			<view class="li"><text class="k">验收付款</text><text class="v">客户验收后平台结算</text></view>
+			<view class="li"><text class="k">现场取证</text><text class="v">施工拍照留痕</text></view>
+			<text class="desc" v-if="detail.description">{{ detail.description }}</text>
+		</view>
+
+		<view class="bar">
+			<view class="bar-left">
+				<text class="bar-price">{{ detail.price_text }}</text>
+				<text class="bar-tip">无隐藏费用</text>
+			</view>
+			<view class="bar-btn" @tap="goCreate">立即下单</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+
+	const detail = ref(null);
+	let serviceId = 0;
+
+	function goCreate() {
+		uni.navigateTo({ url: '/pages/order/create?service_id=' + serviceId });
+	}
+
+	onLoad(async (options) => {
+		serviceId = Number(options.id || 0);
+		const res = await api.serviceDetail(serviceId);
+		detail.value = res.detail;
+	});
+</script>
+
+<style scoped>
+	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 160rpx; }
+	.hero {
+		display: flex; align-items: center; padding: 34rpx 28rpx;
+		background: linear-gradient(160deg, #FFB85C 0%, #F98D25 60%, #ED6F0E 100%);
+	}
+	.hero-thumb {
+		width: 130rpx; height: 130rpx; border-radius: 22rpx; flex-shrink: 0;
+		background: rgba(255,255,255,0.92); display: flex; align-items: center; justify-content: center;
+	}
+	.hero-txt { font-size: 36rpx; font-weight: 700; color: #B85E2A; }
+	.hero-info { flex: 1; min-width: 0; margin-left: 22rpx; display: flex; flex-direction: column; }
+	.name { font-size: 38rpx; font-weight: 700; color: #fff; letter-spacing: 1rpx; }
+	.tags { display: flex; margin-top: 12rpx; }
+	.tag {
+		padding: 0 14rpx; line-height: 34rpx; margin-right: 10rpx; border-radius: 17rpx;
+		background: rgba(255,255,255,0.22); color: #fff; font-size: 20rpx;
+	}
+	.price { margin-top: 14rpx; font-size: 34rpx; font-weight: 700; color: #FFF3DF; }
+	.card {
+		margin: 22rpx 28rpx 0; padding: 26rpx 24rpx; background: #fff;
+		border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06);
+	}
+	.card-title { font-size: 30rpx; font-weight: 700; color: #1F1F1F; margin-bottom: 14rpx; }
+	.li { display: flex; justify-content: space-between; padding: 12rpx 0; border-bottom: 1rpx solid #F4F4F4; }
+	.k { font-size: 26rpx; color: #666; }
+	.v { font-size: 26rpx; color: #333; }
+	.desc { display: block; margin-top: 16rpx; font-size: 24rpx; color: #9A9A9A; line-height: 36rpx; }
+	.bar {
+		position: fixed; left: 0; right: 0; bottom: 0; height: 120rpx;
+		padding: 0 28rpx; padding-bottom: env(safe-area-inset-bottom);
+		display: flex; align-items: center; justify-content: space-between;
+		background: #fff; box-shadow: 0 -6rpx 24rpx rgba(0,0,0,0.07);
+	}
+	.bar-left { display: flex; flex-direction: column; }
+	.bar-price { font-size: 34rpx; font-weight: 700; color: #F0710D; }
+	.bar-tip { font-size: 20rpx; color: #B5B5B5; }
+	.bar-btn {
+		height: 84rpx; padding: 0 56rpx; display: flex; align-items: center;
+		border-radius: 42rpx; color: #fff; font-size: 30rpx; font-weight: 600;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		box-shadow: 0 8rpx 20rpx rgba(240,113,13,0.3);
+	}
+</style>
diff --git a/pages/service/list.vue b/pages/service/list.vue
new file mode 100644
index 0000000..2e44886
--- /dev/null
+++ b/pages/service/list.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="page">
+		<view class="head">
+			<text class="cat">{{ catName || '全部服务' }}</text>
+			<text class="count">{{ list.length }} 项可预约</text>
+		</view>
+
+		<view class="list">
+			<view class="item" v-for="s in list" :key="s.id" @tap="goDetail(s)">
+				<view class="thumb"><text class="thumb-txt">{{ s.name.slice(0, 2) }}</text></view>
+				<view class="info">
+					<text class="name">{{ s.name }}</text>
+					<text class="desc">{{ s.description || '专业师傅上门服务，验收满意再付款' }}</text>
+					<view class="row">
+						<text class="price">{{ s.price_text }}</text>
+						<text class="sales">已售 {{ s.sales }}</text>
+					</view>
+				</view>
+				<view class="btn">下单</view>
+			</view>
+		</view>
+
+		<view class="empty" v-if="!loading && !list.length">
+			<text>该类目暂无服务</text>
+		</view>
+		<view class="loading" v-if="loading"><text>加载中...</text></view>
+	</view>
+</template>
+
+<script setup>
+	import { ref } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+
+	const list = ref([]);
+	const catName = ref('');
+	const loading = ref(false);
+	let catId = 0;
+	let keyword = '';
+
+	function goDetail(s) {
+		uni.navigateTo({ url: '/pages/service/detail?id=' + s.id });
+	}
+
+	async function load() {
+		loading.value = true;
+		try {
+			const params = { cat_id: catId };
+			if (keyword) params.keyword = keyword;
+			const res = await api.services(params);
+			list.value = res.list || [];
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	onLoad((options) => {
+		catId = Number(options.cat_id || 0);
+		keyword = options.keyword ? decodeURIComponent(options.keyword) : '';
+		catName.value = options.cat_name
+			? decodeURIComponent(options.cat_name)
+			: (keyword ? '搜索：' + keyword : '');
+		load();
+	});
+</script>
+
+<style scoped>
+	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 40rpx; }
+	.head {
+		display: flex; align-items: baseline; justify-content: space-between;
+		padding: 26rpx 28rpx 18rpx;
+	}
+	.cat { font-size: 34rpx; font-weight: 700; color: #1F1F1F; }
+	.count { font-size: 22rpx; color: #9A9A9A; }
+	.list { padding: 0 28rpx; }
+	.item {
+		display: flex; align-items: center; padding: 24rpx;
+		background: #fff; border-radius: 20rpx; margin-bottom: 20rpx;
+		box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06);
+	}
+	.thumb {
+		width: 108rpx; height: 108rpx; border-radius: 16rpx; flex-shrink: 0;
+		background: linear-gradient(160deg, #FFF7F0 0%, #FCE9D6 100%);
+		display: flex; align-items: center; justify-content: center;
+	}
+	.thumb-txt { font-size: 30rpx; font-weight: 700; color: #B85E2A; }
+	.info { flex: 1; min-width: 0; margin-left: 20rpx; display: flex; flex-direction: column; }
+	.name { font-size: 30rpx; font-weight: 600; color: #1F1F1F; }
+	.desc { margin-top: 6rpx; font-size: 22rpx; color: #9A9A9A; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }
+	.row { display: flex; align-items: baseline; margin-top: 10rpx; }
+	.price { font-size: 30rpx; font-weight: 700; color: #F0710D; }
+	.sales { margin-left: 14rpx; font-size: 20rpx; color: #B5B5B5; }
+	.btn {
+		flex-shrink: 0; margin-left: 12rpx; padding: 0 24rpx; line-height: 56rpx;
+		border-radius: 28rpx; color: #fff; font-size: 24rpx;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+	}
+	.empty, .loading { padding: 80rpx 0; text-align: center; font-size: 24rpx; color: #9A9A9A; }
+</style>
diff --git a/server/application/api/controller/Master.php b/server/application/api/controller/Master.php
index 00ad1d0..f1b0e37 100644
--- a/server/application/api/controller/Master.php
+++ b/server/application/api/controller/Master.php
@@ -155,13 +155,17 @@ class Master extends Base
         $page = max(1, (int)$this->request->param('page', 1));
         $limit = min(30, max(1, (int)$this->request->param('limit', 10)));
 
-        $query = Db::name('order')->where('status', OrderStatus::PENDING_ACCEPT)->where('master_id', 0);
-        if (!empty($catIds)) {
-            $query->where('cat_id', 'in', $catIds);
-        }
+        // TP5 中 count() 会重置查询条件，故用闭包重建
+        $build = function () use ($catIds) {
+            $q = Db::name('order')->where('status', OrderStatus::PENDING_ACCEPT)->where('master_id', 0);
+            if (!empty($catIds)) {
+                $q->where('cat_id', 'in', $catIds);
+            }
+            return $q;
+        };
 
-        $total = $query->count();
-        $list = $query->order('urgent desc, id desc')->page($page, $limit)->select();
+        $total = $build()->count();
+        $list = $build()->order('urgent desc, id desc')->page($page, $limit)->select();
 
         foreach ($list as &$row) {
             $row['appoint_text'] = $row['appoint_time'] ? date('m-d H:i', (int)$row['appoint_time']) : '尽快上门';
@@ -340,17 +344,21 @@ class Master extends Base
         $page = max(1, (int)$this->request->param('page', 1));
         $limit = min(30, max(1, (int)$this->request->param('limit', 10)));
 
-        $query = Db::name('order')->where('master_id', $master['id']);
-        if ($status === 'active') {
-            $query->where('status', 'in', [OrderStatus::ACCEPTED, OrderStatus::SCHEDULED, OrderStatus::ARRIVED, OrderStatus::WORKING]);
-        } elseif ($status === 'verify') {
-            $query->where('status', OrderStatus::PENDING_VERIFY);
-        } elseif ($status === 'completed') {
-            $query->where('status', OrderStatus::COMPLETED);
-        }
+        // TP5 中 count() 会重置查询条件，故用闭包重建
+        $build = function () use ($master, $status) {
+            $q = Db::name('order')->where('master_id', $master['id']);
+            if ($status === 'active') {
+                $q->where('status', 'in', [OrderStatus::ACCEPTED, OrderStatus::SCHEDULED, OrderStatus::ARRIVED, OrderStatus::WORKING]);
+            } elseif ($status === 'verify') {
+                $q->where('status', OrderStatus::PENDING_VERIFY);
+            } elseif ($status === 'completed') {
+                $q->where('status', OrderStatus::COMPLETED);
+            }
+            return $q;
+        };
 
-        $total = $query->count();
-        $list = $query->order('id desc')->page($page, $limit)->select();
+        $total = $build()->count();
+        $list = $build()->order('id desc')->page($page, $limit)->select();
         foreach ($list as &$row) {
             $row['status_text'] = OrderStatus::label($row['status']);
             $row['pay_amount'] = (float)$row['pay_amount'];
diff --git a/server/application/api/controller/Order.php b/server/application/api/controller/Order.php
index 0ef24e5..f2b19f7 100644
--- a/server/application/api/controller/Order.php
+++ b/server/application/api/controller/Order.php
@@ -160,19 +160,23 @@ class Order extends Base
         $page = max(1, (int)$this->request->param('page', 1));
         $limit = min(50, max(1, (int)$this->request->param('limit', 10)));
 
-        $query = Db::name('order')->where('user_id', $this->uid());
-        if ($status === 'active') {
-            $query->where('status', 'in', OrderStatus::activeValues());
-        } elseif ($status === 'completed') {
-            $query->where('status', OrderStatus::COMPLETED);
-        } elseif ($status === 'cancelled') {
-            $query->where('status', OrderStatus::CANCELLED);
-        } elseif ($status !== 'all' && $status !== '') {
-            $query->where('status', (int)$status);
-        }
+        // 注意：TP5 中 count() 执行后查询条件会被重置，必须重新构建查询
+        $build = function () use ($status) {
+            $q = Db::name('order')->where('user_id', $this->uid());
+            if ($status === 'active') {
+                $q->where('status', 'in', OrderStatus::activeValues());
+            } elseif ($status === 'completed') {
+                $q->where('status', OrderStatus::COMPLETED);
+            } elseif ($status === 'cancelled') {
+                $q->where('status', OrderStatus::CANCELLED);
+            } elseif ($status !== 'all' && $status !== '') {
+                $q->where('status', (int)$status);
+            }
+            return $q;
+        };
 
-        $total = $query->count();
-        $list = $query->order('id desc')->page($page, $limit)->select();
+        $total = $build()->count();
+        $list = $build()->order('id desc')->page($page, $limit)->select();
         foreach ($list as &$row) {
             $row = $this->formatOrder($row);
         }
diff --git a/tests/page_flow.js b/tests/page_flow.js
new file mode 100644
index 0000000..beb3d62
--- /dev/null
+++ b/tests/page_flow.js
@@ -0,0 +1,202 @@
+/**
+ * 逐页面全链路验证（从登录页开始）
+ * 按每个页面真实的接口调用顺序回放，验证：页面数据绑定是否拿得到、按钮状态是否正确
+ *
+ * 运行：node tests/page_flow.js
+ */
+const { execFileSync } = require('child_process');
+
+const BASE = process.env.API_BASE || 'https://yjyf.gzyakj.com.cn/api';
+let pass = 0, fail = 0;
+const failures = [];
+
+const ok = (m) => { pass++; console.log('   ✅ ' + m); };
+const bad = (m, why) => { fail++; failures.push(m + ' :: ' + why); console.log('   ❌ ' + m + ' → ' + why); };
+const chk = (c, m, why) => (c ? ok(m) : bad(m, why || '断言失败'));
+const page = (t) => console.log('\n▌' + t);
+
+async function api(path, opt) {
+  const o = opt || {};
+  const headers = {};
+  if (o.token) headers.token = o.token;
+  let body;
+  if (o.data) {
+    headers['content-type'] = 'application/x-www-form-urlencoded';
+    body = new URLSearchParams(o.data).toString();
+  }
+  const res = await fetch(BASE + path, { method: o.method || 'GET', headers, body });
+  const text = await res.text();
+  try { return JSON.parse(text); } catch (e) { throw new Error('非 JSON: ' + text.slice(0, 120)); }
+}
+const sql = (s) => execFileSync('ssh', ['-o', 'BatchMode=yes', 'root@8.137.181.63', `mysql -uyjyf -pyjyf yjyf -e "${s}"`], { encoding: 'utf8' }).trim();
+
+(async () => {
+  const stamp = String(Date.now()).slice(-8);
+  const uM = '139' + stamp, mM = '137' + stamp;
+  let uToken = '', mToken = '', orderId = 0, masterId = 0;
+
+  console.log('═══════════════════════════════════════════════════════');
+  console.log(' 优匠优服 · 从登录开始的逐页面全链路验证');
+  console.log(' 后端: ' + BASE);
+  console.log('═══════════════════════════════════════════════════════');
+
+  // ── 页面 1：pages/login/login ────────────────────────────────
+  page('页面1 登录页  pages/login/login');
+  let r = await api('/auth/login', { method: 'POST', data: { mobile: uM, code: '123456' } });
+  chk(r.code === 1 && r.data.token, '手机号+验证码登录 → 拿到 token', r.msg);
+  uToken = r.data.token;
+  chk(r.data.userinfo.id > 0 && r.data.userinfo.is_master === false, '登录页读取 userinfo 正常（is_master=false）');
+  r = await api('/auth/login', { method: 'POST', data: { mobile: uM, code: '999999' } });
+  chk(r.code !== 1, '错误验证码被拒 → toast 文案可展示', r.msg);
+
+  // ── 页面 2：YJYF/YJYF 首页 ─────────────────────────────────
+  page('页面2 首页  YJYF/YJYF');
+  r = await api('/home/index', { token: uToken });
+  chk(r.code === 1 && r.data.cats.length === 15, '首页 15 个类目渲染数据就绪', '实际 ' + (r.data.cats || []).length);
+  chk(r.data.cats.every(c => c.name && c.icon), '每个类目都有 name + icon（图标库可匹配）');
+  chk(typeof r.data.badge.coupon === 'number' && typeof r.data.badge.unread === 'number', '首页角标 badge 字段就绪');
+  const cat0 = r.data.cats[0];
+
+  // ── 页面 3：pages/service/list ─────────────────────────────
+  page('页面3 服务列表  pages/service/list');
+  r = await api('/home/services?cat_id=' + cat0.id);
+  chk(r.code === 1 && r.data.list.length > 0, '按类目取服务列表（cat_id=' + cat0.id + '）', '共 ' + (r.data.list || []).length + ' 项');
+  const svc = r.data.list.find(s => s.price_type === 'fixed') || r.data.list[0];
+  chk(svc.price_text && svc.name, '列表卡片字段完整（name / price_text / sales）');
+  r = await api('/home/services?keyword=' + encodeURIComponent('安装'));
+  chk(r.code === 1 && r.data.list.length > 0, '首页搜索框 → keyword 检索可用', '命中 ' + (r.data.list || []).length + ' 项');
+
+  // ── 页面 4：pages/service/detail ───────────────────────────
+  page('页面4 服务详情  pages/service/detail');
+  r = await api('/home/detail?id=' + svc.id);
+  const detail = r.data.detail;
+  chk(r.code === 1 && detail.name === svc.name, '详情页服务信息加载', detail.name);
+  chk(detail.floor_fee >= 0 && detail.free_floor >= 0, '费用说明区块字段就绪（floor_fee / free_floor）');
+
+  // ── 页面 5：pages/order/create ─────────────────────────────
+  page('页面5 下单页  pages/order/create');
+  r = await api('/address/index', { token: uToken });
+  chk(r.code === 1, '进入下单页先拉地址列表');
+  r = await api('/home/calc?service_id=' + svc.id + '&floor=5&has_elevator=0&urgent=1', { token: uToken });
+  const c = r.data;
+  chk(c.floor_amount === 20 && c.urgent_amount === 16 && c.pay_amount === 116,
+    '费用试算实时联动（楼层20 + 加急16 = 116）', JSON.stringify({ f: c.floor_amount, u: c.urgent_amount, p: c.pay_amount }));
+
+  r = await api('/address/save', {
+    method: 'POST', token: uToken,
+    data: { contact: '页面验证用户', mobile: uM, province: '贵州省', city: '遵义市', district: '汇川区', address: '大连路 88 号 2 栋 501', floor: 5, has_elevator: 0, is_default: 1, lng: '106.92', lat: '27.72' }
+  });
+  chk(r.code === 1 && r.data.id > 0, '下单页内联新增地址 → 保存成功', 'addr_id=' + r.data.id);
+  const addrId = r.data.id;
+
+  r = await api('/order/create', {
+    method: 'POST', token: uToken,
+    data: { service_id: svc.id, address_id: addrId, appoint_time: Math.floor(Date.now() / 1000) + 7200, urgent: 1, goods_model: '三人位沙发', goods_num: 1, remark: '带工具' }
+  });
+  chk(r.code === 1 && r.data.order_id > 0, '提交订单 → 返回 order_id', r.data && r.data.order_no);
+  orderId = r.data.order_id;
+
+  r = await api('/order/pay', { method: 'POST', token: uToken, data: { order_id: orderId, pay_type: 'mock' } });
+  chk(r.code === 1, '自动支付 → 订单进入待接单', r.msg);
+
+  // ── 页面 6：pages/order/detail（用户侧首次查看） ──────────
+  page('页面6 订单详情  pages/order/detail（用户侧）');
+  r = await api('/order/detail?id=' + orderId, { token: uToken });
+  chk(r.data.order.status_text === '待接单', '详情页状态头显示「待接单」', r.data.order.status_text);
+  chk(r.data.logs.length >= 2, '轨迹时间线有数据', r.data.logs.length + ' 条');
+  chk(r.data.order.can_pay === false, '已支付 → 「去支付」按钮隐藏');
+
+  // ── 页面 7：pages/master/apply（师傅入驻） ─────────────────
+  page('页面7 师傅入驻  pages/master/apply');
+  r = await api('/auth/login', { method: 'POST', data: { mobile: mM, code: '123456' } });
+  mToken = r.data.token;
+  r = await api('/master/info', { token: mToken });
+  chk(r.code === 1 && r.data.applied === false, '未入驻 → 入驻页展示表单（applied=false）');
+  r = await api('/master/apply', {
+    method: 'POST', token: mToken,
+    data: { realname: '页面验证师傅', mobile: mM, idcard_no: '520101199203031234', city: '遵义市', 'skills[0]': cat0.id }
+  });
+  chk(r.code === 1 && r.data.master_id > 0, '提交实名+技能 → 进入待审核', 'master_id=' + r.data.master_id);
+  masterId = r.data.master_id;
+  r = await api('/master/info', { token: mToken });
+  chk(r.data.master.verify_status === 'pending', '入驻页显示「待审核」状态');
+  r = await api('/master/hall', { token: mToken });
+  chk(r.code !== 1, '审核中进入大厅被拦截 → 页面提示正确', r.msg);
+
+  sql(`UPDATE fa_master SET verify_status='pass' WHERE id=${masterId}`);
+  ok('（模拟平台后台审核通过）');
+
+  // ── 页面 8：pages/master/hall（订单大厅） ──────────────────
+  page('页面8 订单大厅  pages/master/hall');
+  r = await api('/master/info', { token: mToken });
+  chk(r.data.master.work_status === 'on', '大厅顶部展示「接单中」开关');
+  r = await api('/master/hall', { token: mToken });
+  const hallOrder = (r.data.list || []).find(o => Number(o.id) === orderId);
+  chk(!!hallOrder, '大厅列表能刷出该订单', '共 ' + r.data.total + ' 单');
+  chk(hallOrder.mobile.includes('****'), '大厅里客户手机号脱敏展示（抢单前）', hallOrder.mobile);
+  chk(Number(hallOrder.urgent) === 1, '急单标签展示');
+
+  r = await api('/master/grab', { method: 'POST', token: mToken, data: { order_id: orderId } });
+  chk(r.code === 1, '点击「立即抢单」成功', r.msg);
+  chk(r.data.user_mobile === uM, '抢单成功后才下发完整客户手机号');
+
+  // ── 页面 9：pages/master/orders（接单管理 / 履约） ──────────
+  page('页面9 接单管理  pages/master/orders');
+  r = await api('/master/orders?status=active', { token: mToken });
+  let mo = (r.data.list || []).find(o => Number(o.id) === orderId);
+  chk(!!mo && Number(mo.status) === 3, '「待处理」列表显示已接单', mo && mo.status_text);
+
+  r = await api('/master/contact', { method: 'POST', token: mToken, data: { order_id: orderId } });
+  chk(r.code === 1, '按钮「标记已联系」');
+  r = await api('/master/schedule', { method: 'POST', token: mToken, data: { order_id: orderId, appoint_time: Math.floor(Date.now() / 1000) + 1800 } });
+  chk(r.code === 1, '按钮「约定上门」→ 待上门');
+  r = await api('/master/arrive', { method: 'POST', token: mToken, data: { order_id: orderId, lng: '106.92', lat: '27.72' } });
+  chk(r.code === 1, '按钮「到达打卡」→ 已到达');
+  r = await api('/master/start', { method: 'POST', token: mToken, data: { order_id: orderId } }).catch(() => ({}));
+  if (!r.code) { r = await api('/master/startJob', { method: 'POST', token: mToken, data: { order_id: orderId } }); }
+  chk(r.code === 1, '按钮「开始服务」→ 服务中', r.msg);
+  r = await api('/master/finish', { method: 'POST', token: mToken, data: { order_id: orderId, 'images[0]': 'https://yjyf.gzyakj.com.cn/uploads/s.jpg' } });
+  chk(r.code === 1 && /^\d{4}$/.test(r.data.verify_code), '按钮「完工提交」→ 返回 4 位验收码', r.data && r.data.verify_code);
+
+  // ── 页面 6b：订单详情（用户侧验收） ────────────────────────
+  page('页面6b 订单详情  pages/order/detail（待验收态）');
+  r = await api('/order/detail?id=' + orderId, { token: uToken });
+  chk(Number(r.data.order.status) === 7, '状态头显示「待验收」', r.data.order.status_text);
+  chk(r.data.order.can_verify === true, '「确认验收」按钮出现');
+  chk(r.data.media.length === 1, '现场取证图片区块有数据');
+
+  r = await api('/order/verify', { method: 'POST', token: uToken, data: { order_id: orderId } });
+  chk(r.code === 1, '点击「确认验收」成功', r.msg);
+  r = await api('/order/detail?id=' + orderId, { token: uToken });
+  chk(Number(r.data.order.status) === 8, '状态头变为「已完成」', r.data.order.status_text);
+  chk(r.data.order.can_review === true, '「去评价」按钮出现');
+
+  // ── 页面 10：pages/order/review ────────────────────────────
+  page('页面10 评价页  pages/order/review');
+  r = await api('/review/create', {
+    method: 'POST', token: uToken,
+    data: { order_id: orderId, score: 5, content: '师傅专业，安装到位', tags: '准时,专业', is_anonymous: 0 }
+  });
+  chk(r.code === 1, '提交 5 星评价成功', r.msg);
+  r = await api('/review/masterList?master_id=' + masterId);
+  chk(r.code === 1 && r.data.total === 1 && Number(r.data.avg_score) === 5, '评价列表与师傅评分已刷新', 'avg=' + r.data.avg_score);
+
+  // ── 页面 11：pages/order/list（列表态回看） ─────────────────
+  page('页面11 我的订单  pages/order/list');
+  r = await api('/order/index?status=all', { token: uToken });
+  chk(r.code === 1 && r.data.total >= 1, '「全部」Tab 有数据', r.data.total + ' 单');
+  r = await api('/order/index?status=completed', { token: uToken });
+  const doneStatuses = (r.data.list || []).map(o => o.status + '/' + o.status_text);
+  chk((r.data.list || []).length > 0 && r.data.list.every(o => Number(o.status) === 8),
+    '「已完成」Tab 筛选正确', '返回 ' + doneStatuses.join(', '));
+  const item = r.data.list.find(o => Number(o.id) === orderId);
+  chk(item.can_review === false, '已评价 → 列表「去评价」按钮消失');
+
+  // ── 汇总 ───────────────────────────────────────────────────
+  console.log('\n═══════════════════════════════════════════════════════');
+  console.log(` 结果：通过 ${pass} 项 / 失败 ${fail} 项`);
+  if (fail) { console.log(' 失败明细：'); failures.forEach(f => console.log('  - ' + f)); process.exitCode = 1; }
+  else console.log(' 🎉 从登录到评价的全链路逐页面验证通过');
+  console.log(` 订单 orderId=${orderId} 师傅 masterId=${masterId}`);
+  console.log('═══════════════════════════════════════════════════════');
+})().catch(e => { console.error('\n💥 中断: ' + e.message); process.exitCode = 1; });
diff --git a/utils/api.js b/utils/api.js
new file mode 100644
index 0000000..830c04a
--- /dev/null
+++ b/utils/api.js
@@ -0,0 +1,50 @@
+/**
+ * 接口清单（与后端 application/api/controller 一一对应）
+ */
+import { get, post } from './request';
+
+export default {
+	/* ---------- 鉴权 ---------- */
+	login: (data) => post('/auth/login', data, { silent: true }),
+	profile: () => get('/auth/profile'),
+
+	/* ---------- 首页 / 服务 ---------- */
+	home: () => get('/home/index', {}, { silent: true }),
+	cats: () => get('/home/cats'),
+	services: (data) => get('/home/services', data),
+	serviceDetail: (id) => get('/home/detail', { id: id }),
+	calc: (data) => get('/home/calc', data),
+
+	/* ---------- 地址 ---------- */
+	addressList: () => get('/address/index'),
+	addressDetail: (id) => get('/address/detail', { id: id }),
+	addressSave: (data) => post('/address/save', data),
+	addressDelete: (id) => post('/address/delete', { id: id }),
+	addressDefault: (id) => post('/address/setDefault', { id: id }),
+
+	/* ---------- 订单（用户端） ---------- */
+	orderCreate: (data) => post('/order/create', data),
+	orderPay: (data) => post('/order/pay', data),
+	orderCancel: (data) => post('/order/cancel', data),
+	orderVerify: (data) => post('/order/verify', data),
+	orderList: (data) => get('/order/index', data),
+	orderDetail: (id) => get('/order/detail', { id: id }),
+
+	/* ---------- 师傅端 ---------- */
+	masterApply: (data) => post('/master/apply', data),
+	masterInfo: () => get('/master/info'),
+	masterHall: (data) => get('/master/hall', data),
+	masterGrab: (data) => post('/master/grab', data),
+	masterOrders: (data) => get('/master/orders', data),
+	masterContact: (data) => post('/master/contact', data),
+	masterSchedule: (data) => post('/master/schedule', data),
+	masterArrive: (data) => post('/master/arrive', data),
+	masterStart: (data) => post('/master/startJob', data),
+	masterFinish: (data) => post('/master/finish', data),
+	masterIncome: () => get('/master/income'),
+	masterToggle: (data) => post('/master/toggleWork', data),
+
+	/* ---------- 评价 ---------- */
+	reviewCreate: (data) => post('/review/create', data),
+	reviewList: (masterId) => get('/review/masterList', { master_id: masterId })
+};
diff --git a/utils/request.js b/utils/request.js
new file mode 100644
index 0000000..d4ea593
--- /dev/null
+++ b/utils/request.js
@@ -0,0 +1,107 @@
+/**
+ * 统一请求层
+ * - 自动携带 token（header: token）
+ * - 统一响应契约：code === 1 成功；其余为失败（0 通用 / 401 未登录 / 403 无权限 / 2001~2003 业务语义）
+ * - 失败统一 toast，未登录自动清理并引导登录
+ */
+const BASE_URL = 'https://yjyf.gzyakj.com.cn/api';
+
+const TOKEN_KEY = 'yjyf_token';
+const USER_KEY = 'yjyf_user';
+
+export function getToken() {
+	try {
+		return uni.getStorageSync(TOKEN_KEY) || '';
+	} catch (e) {
+		return '';
+	}
+}
+
+export function setToken(token) {
+	uni.setStorageSync(TOKEN_KEY, token || '');
+}
+
+export function getUser() {
+	try {
+		return uni.getStorageSync(USER_KEY) || null;
+	} catch (e) {
+		return null;
+	}
+}
+
+export function setUser(user) {
+	uni.setStorageSync(USER_KEY, user || null);
+}
+
+export function clearAuth() {
+	uni.removeStorageSync(TOKEN_KEY);
+	uni.removeStorageSync(USER_KEY);
+}
+
+export function isLogin() {
+	return !!getToken();
+}
+
+export function toLogin() {
+	clearAuth();
+	uni.navigateTo({ url: '/pages/login/login' });
+}
+
+/**
+ * @param {String} path    接口路径，如 /order/index
+ * @param {Object} options { method, data, auth, silent }
+ */
+export function request(path, options) {
+	const opts = options || {};
+	const method = opts.method || 'GET';
+	const data = opts.data || {};
+	const silent = !!opts.silent;
+
+	return new Promise((resolve, reject) => {
+		const header = { 'content-type': 'application/x-www-form-urlencoded' };
+		const token = getToken();
+		if (token) {
+			header.token = token;
+		}
+
+		uni.request({
+			url: BASE_URL + path,
+			method: method,
+			data: data,
+			header: header,
+			timeout: 15000,
+			success: (res) => {
+				const body = res.data || {};
+				if (body.code === 1) {
+					resolve(body.data === undefined || body.data === null ? {} : body.data);
+					return;
+				}
+				const msg = body.msg || ('请求失败(' + res.statusCode + ')');
+				if (body.code === 401) {
+					clearAuth();
+					if (!silent) {
+						uni.showToast({ title: '登录已失效，请重新登录', icon: 'none' });
+						setTimeout(() => toLogin(), 800);
+					}
+				} else if (!silent) {
+					uni.showToast({ title: msg, icon: 'none' });
+				}
+				reject(Object.assign(new Error(msg), { code: body.code, data: body.data }));
+			},
+			fail: () => {
+				if (!silent) {
+					uni.showToast({ title: '网络异常，请稍后重试', icon: 'none' });
+				}
+				reject(new Error('网络异常'));
+			}
+		});
+	});
+}
+
+export function get(path, data, options) {
+	return request(path, Object.assign({ method: 'GET', data: data }, options || {}));
+}
+
+export function post(path, data, options) {
+	return request(path, Object.assign({ method: 'POST', data: data }, options || {}));
+}