diff --git a/db/schema_phase16_invoice_upgrade.sql b/db/schema_phase16_invoice_upgrade.sql
new file mode 100644
index 0000000..5a6df35
--- /dev/null
+++ b/db/schema_phase16_invoice_upgrade.sql
@@ -0,0 +1,143 @@
+-- ============================================================================
+-- 优匠优服 · Phase 16 开票体系全链路升级（抬头管理 + 个人/企业普专票 + 订单核销 + 电子票交付）
+-- 1. 新建发票抬头管理表 fa_invoice_title（支持个人/非企业、企业单位、普票/增值税专票资质）
+-- 2. 扩展开票申请表 fa_invoice（补充专票六要素、申请单号、关联订单集、电子发票文件、撤回状态）
+-- 3. 扩展订单表 fa_order（增加 invoice_id 与 invoice_status，支持按订单勾选合并开票与防重复开票）
+-- 4. 补齐后台「财务资金」菜单下的「发票抬头」查看菜单与开票详情权限节点
+-- ============================================================================
+SET NAMES utf8mb4;
+
+-- 1. 创建发票抬头管理表 fa_invoice_title
+CREATE TABLE IF NOT EXISTS `fa_invoice_title` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '所属用户ID',
+  `merchant_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '关联商家ID(0为个人维护)',
+  `title_type` enum('personal','enterprise') NOT NULL DEFAULT 'personal' COMMENT '抬头类型:personal=个人/非企业,enterprise=企业单位',
+  `default_invoice_type` enum('normal','special') NOT NULL DEFAULT 'normal' COMMENT '默认发票类型:normal=普通发票,special=专用发票',
+  `title` varchar(100) NOT NULL DEFAULT '' COMMENT '发票抬头名称',
+  `tax_no` varchar(50) NOT NULL DEFAULT '' COMMENT '纳税人识别号/统一社会信用代码',
+  `bank_name` varchar(100) NOT NULL DEFAULT '' COMMENT '开户银行名称',
+  `bank_account` varchar(50) NOT NULL DEFAULT '' COMMENT '企业银行账号',
+  `reg_address` varchar(255) NOT NULL DEFAULT '' COMMENT '企业注册地址',
+  `reg_mobile` varchar(30) NOT NULL DEFAULT '' COMMENT '企业注册电话',
+  `email` varchar(100) NOT NULL DEFAULT '' COMMENT '默认接收邮箱',
+  `receive_mobile` varchar(20) NOT NULL DEFAULT '' COMMENT '默认通知手机号',
+  `is_default` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否默认抬头:1=是,0=否',
+  `createtime` bigint(16) DEFAULT NULL COMMENT '创建时间',
+  `updatetime` bigint(16) DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `idx_user_default` (`user_id`,`is_default`) USING BTREE,
+  KEY `idx_merchant` (`merchant_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='发票抬头管理';
+
+-- 2. 幂等扩展 fa_invoice 与 fa_order 表字段
+DROP PROCEDURE IF EXISTS `sp_phase16_invoice_upgrade`;
+DELIMITER $$
+CREATE PROCEDURE `sp_phase16_invoice_upgrade`()
+BEGIN
+    DECLARE db_name VARCHAR(64);
+    SET db_name = DATABASE();
+
+    -- 扩展 fa_invoice.status 枚举支持 cancel（已撤回）
+    ALTER TABLE `fa_invoice`
+        MODIFY COLUMN `status` enum('wait','issued','reject','cancel') NOT NULL DEFAULT 'wait' COMMENT '处理状态:wait=待开具,issued=已开票,reject=已驳回,cancel=已撤回';
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'invoice_sn') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `invoice_sn` varchar(32) NOT NULL DEFAULT '' COMMENT '开票申请单号' AFTER `id`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'title_id') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `title_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '关联抬头ID' AFTER `user_id`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'title_type') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `title_type` enum('personal','enterprise') NOT NULL DEFAULT 'personal' COMMENT '抬头类型:personal=个人/非企业,enterprise=企业单位' AFTER `type`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'bank_name') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `bank_name` varchar(100) NOT NULL DEFAULT '' COMMENT '开户银行' AFTER `tax_no`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'bank_account') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `bank_account` varchar(50) NOT NULL DEFAULT '' COMMENT '企业银行账号' AFTER `bank_name`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'reg_address') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `reg_address` varchar(255) NOT NULL DEFAULT '' COMMENT '企业注册地址' AFTER `bank_account`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'reg_mobile') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `reg_mobile` varchar(30) NOT NULL DEFAULT '' COMMENT '企业注册电话' AFTER `reg_address`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'receive_mobile') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `receive_mobile` varchar(20) NOT NULL DEFAULT '' COMMENT '接收通知手机号' AFTER `email`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'order_ids') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `order_ids` varchar(1000) NOT NULL DEFAULT '' COMMENT '关联订单ID集合(逗号分隔)' AFTER `remark`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'order_count') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `order_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '关联订单笔数' AFTER `order_ids`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'invoice_code') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `invoice_code` varchar(50) NOT NULL DEFAULT '' COMMENT '发票代码' AFTER `status`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'invoice_file') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `invoice_file` varchar(500) NOT NULL DEFAULT '' COMMENT '电子发票文件URL(PDF/OFD/图片)' AFTER `invoice_no`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND COLUMN_NAME = 'issue_time') THEN
+        ALTER TABLE `fa_invoice` ADD COLUMN `issue_time` bigint(16) DEFAULT NULL COMMENT '开票完成时间' AFTER `audit_msg`;
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_invoice' AND INDEX_NAME = 'idx_user_status') THEN
+        ALTER TABLE `fa_invoice` ADD INDEX `idx_user_status` (`user_id`, `status`);
+    END IF;
+
+    -- 扩展 fa_order 开票锁定字段
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_order' AND COLUMN_NAME = 'invoice_id') THEN
+        ALTER TABLE `fa_order` ADD COLUMN `invoice_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '关联开票申请ID';
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_order' AND COLUMN_NAME = 'invoice_status') THEN
+        ALTER TABLE `fa_order` ADD COLUMN `invoice_status` enum('none','wait','issued') NOT NULL DEFAULT 'none' COMMENT '开票状态:none=未开票,wait=开票中,issued=已开票';
+    END IF;
+
+    IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_SCHEMA = db_name AND TABLE_NAME = 'fa_order' AND INDEX_NAME = 'idx_user_pay_inv') THEN
+        ALTER TABLE `fa_order` ADD INDEX `idx_user_pay_inv` (`user_id`, `pay_status`, `invoice_status`);
+    END IF;
+END$$
+DELIMITER ;
+
+CALL `sp_phase16_invoice_upgrade`();
+DROP PROCEDURE IF EXISTS `sp_phase16_invoice_upgrade`;
+
+-- 3. 回填历史开票数据的抬头类型与申请单号
+UPDATE `fa_invoice` SET `title_type` = 'enterprise' WHERE `tax_no` <> '' AND `title_type` = 'personal';
+UPDATE `fa_invoice` SET `invoice_sn` = CONCAT('INV', DATE_FORMAT(FROM_UNIXTIME(IFNULL(`createtime`, UNIX_TIMESTAMP())), '%Y%m%d'), LPAD(`id`, 6, '0')) WHERE `invoice_sn` = '';
+UPDATE `fa_invoice` SET `issue_time` = `updatetime` WHERE `status` = 'issued' AND `issue_time` IS NULL;
+
+-- 4. 补齐后台菜单与权限节点（财务资金 -> 开票申请 / 发票抬头）
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `condition`, `remark`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', r.id, 'invoice/detail', '详情', 'fa fa-circle-o', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM `fa_auth_rule` r WHERE r.name = 'invoice'
+AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'invoice/detail');
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `condition`, `remark`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', p.id, 'invoice_title', '发票抬头', 'fa fa-address-card-o', '', '个人业主与企业商家维护的发票抬头及专票资质档案', 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 150, 'normal'
+FROM `fa_auth_rule` p WHERE p.name = 'finance_manage'
+AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'invoice_title');
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `condition`, `remark`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', r.id, 'invoice_title/index', '查看', 'fa fa-circle-o', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM `fa_auth_rule` r WHERE r.name = 'invoice_title'
+AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'invoice_title/index');
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `condition`, `remark`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', r.id, 'invoice_title/detail', '详情', 'fa fa-circle-o', '', '', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM `fa_auth_rule` r WHERE r.name = 'invoice_title'
+AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'invoice_title/detail');
diff --git a/db/schema_phase17_admin_optimize.sql b/db/schema_phase17_admin_optimize.sql
new file mode 100644
index 0000000..b211d96
--- /dev/null
+++ b/db/schema_phase17_admin_optimize.sql
@@ -0,0 +1,120 @@
+-- Phase 17: 管理后台全量巡检优化与菜单权限补齐（幂等可重复执行）
+SET NAMES utf8mb4;
+
+-- 1. 收敛左侧导航栏冗余/高危菜单（微信公众号遗留模块与在线插件装卸入口从导航隐藏）
+UPDATE `fa_auth_rule` SET `ismenu` = 0 WHERE `name` IN ('wechat', 'addon');
+UPDATE `fa_auth_rule` SET `ismenu` = 0 WHERE `name` LIKE 'wechat/%';
+
+-- 2. 订单调度中心：新增「业主晒单」菜单与子权限
+SET @order_manage_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'order_manage' LIMIT 1);
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `url`, `condition`, `remark`, `ismenu`, `menutype`, `extend`, `py`, `pinyin`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @order_manage_id, 'showcase', '业主晒单', 'fa fa-camera', '', '', '管理小程序首页及晒单广场公开展示的业主完工实拍', 1, 'addtabs', '', 'yzsd', 'yezhushaidan', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 189, 'normal'
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'showcase');
+
+SET @showcase_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'showcase' LIMIT 1);
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @showcase_id, 'showcase/index', '查看', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'showcase/index');
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @showcase_id, 'showcase/detail', '详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'showcase/detail');
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @showcase_id, 'showcase/edit', '治理审核', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'showcase/edit');
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @showcase_id, 'showcase/multi', '批量更新', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'showcase/multi');
+
+-- 3. 财务资金中心：新增「资金流水」总账菜单与子权限
+SET @finance_manage_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'finance_manage' LIMIT 1);
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `url`, `condition`, `remark`, `ismenu`, `menutype`, `extend`, `py`, `pinyin`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @finance_manage_id, 'wallet_log', '资金流水', 'fa fa-exchange', '', '', '师傅与用户钱包收支变动不可篡改审计总账', 1, 'addtabs', '', 'zjls', 'zijinliushui', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 154, 'normal'
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'wallet_log');
+
+SET @wallet_log_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'wallet_log' LIMIT 1);
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @wallet_log_id, 'wallet_log/index', '查看', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'wallet_log/index');
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @wallet_log_id, 'wallet_log/detail', '凭证详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'wallet_log/detail');
+
+-- 4. 补齐发票抬头及各模块新增的详情/派单子权限规则（便于子角色精细化授权）
+SET @invoice_title_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'invoice_title' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @invoice_title_id, 'invoice_title/index', '查看', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @invoice_title_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'invoice_title/index');
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @invoice_title_id, 'invoice_title/detail', '详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @invoice_title_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'invoice_title/detail');
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @invoice_title_id, 'invoice_title/edit', '订正', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @invoice_title_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'invoice_title/edit');
+
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @invoice_title_id, 'invoice_title/del', '删除', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @invoice_title_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'invoice_title/del');
+
+SET @order_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'order' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @order_id, 'order/dispatch', '人工派单/改派', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @order_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'order/dispatch');
+
+SET @service_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'service' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @service_id, 'service/detail', '商品详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @service_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'service/detail');
+
+SET @user_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'user/user' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @user_id, 'user/user/detail', '客户全景详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @user_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'user/user/detail');
+
+SET @appeal_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'appeal' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @appeal_id, 'appeal/detail', '申诉详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @appeal_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'appeal/detail');
+
+SET @review_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'review' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @review_id, 'review/detail', '评价详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @review_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'review/detail');
+
+SET @settle_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'settle' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @settle_id, 'settle/detail', '对账详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @settle_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'settle/detail');
+
+SET @withdraw_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'withdraw' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @withdraw_id, 'withdraw/detail', '对账详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @withdraw_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'withdraw/detail');
+
+SET @invoice_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'invoice' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @invoice_id, 'invoice/detail', '开票详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @invoice_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'invoice/detail');
+
+SET @coupon_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'coupon' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @coupon_id, 'coupon/detail', '领用数据详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @coupon_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'coupon/detail');
+
+SET @message_id = (SELECT `id` FROM `fa_auth_rule` WHERE `name` = 'message' LIMIT 1);
+INSERT INTO `fa_auth_rule` (`type`, `pid`, `name`, `title`, `icon`, `ismenu`, `createtime`, `updatetime`, `weigh`, `status`)
+SELECT 'file', @message_id, 'message/detail', '消息详情', 'fa fa-circle-o', 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), 0, 'normal'
+FROM DUAL WHERE @message_id IS NOT NULL AND NOT EXISTS (SELECT 1 FROM `fa_auth_rule` WHERE `name` = 'message/detail');
+
+-- 5. 移除系统配置中残留的 FastAdmin 空演示分组（example）并升级静态资源版本号，强制刷新浏览器 RequireJS 缓存
+UPDATE `fa_config` SET `value` = JSON_REMOVE(`value`, '$.example') WHERE `name` = 'configgroup' AND JSON_VALID(`value`);
+UPDATE `fa_config` SET `value` = '1.0.51' WHERE `name` = 'version';
diff --git a/db/schema_phase18_gallery_template.sql b/db/schema_phase18_gallery_template.sql
new file mode 100644
index 0000000..6ce9fc0
--- /dev/null
+++ b/db/schema_phase18_gallery_template.sql
@@ -0,0 +1,95 @@
+-- ==============================================================================
+-- Phase 18: 系统图库、用户专属商品图库、常用商品模板、常用备注模板与订单多图升级
+-- ==============================================================================
+
+-- 1. 升级订单表 goods_images 容量并补充虚拟号保护标识
+ALTER TABLE `fa_order` MODIFY COLUMN `goods_images` mediumtext COMMENT '多商品结构化JSON与图片列表';
+
+-- 2. 官方系统图库表
+CREATE TABLE IF NOT EXISTS `fa_system_gallery` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cat_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '服务大类ID',
+  `service_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '二级服务商品ID',
+  `spec_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '三级规格ID',
+  `title` varchar(100) NOT NULL DEFAULT '' COMMENT '款式/规格名称',
+  `image` varchar(255) NOT NULL DEFAULT '' COMMENT '参考图片路径或URL',
+  `weigh` int(11) NOT NULL DEFAULT '0' COMMENT '权重排序',
+  `status` enum('normal','hidden') NOT NULL DEFAULT 'normal' COMMENT '状态',
+  `createtime` bigint(16) DEFAULT NULL COMMENT '创建时间',
+  `updatetime` bigint(16) DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_cat_service` (`cat_id`, `service_id`, `status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='官方系统图库表';
+
+-- 3. 用户/商家专属商品图库表
+CREATE TABLE IF NOT EXISTS `fa_user_goods_gallery` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '所属用户ID',
+  `cat_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '关联服务大类ID',
+  `title` varchar(100) NOT NULL DEFAULT '' COMMENT '商品图片名称',
+  `image` varchar(255) NOT NULL DEFAULT '' COMMENT '商品图片URL',
+  `createtime` bigint(16) DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_cat` (`user_id`, `cat_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户专属商品图库表';
+
+-- 4. 用户常用商品模板表
+CREATE TABLE IF NOT EXISTS `fa_user_goods_template` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '所属用户ID',
+  `tpl_name` varchar(100) NOT NULL DEFAULT '' COMMENT '模板名称',
+  `cat_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '大类ID',
+  `cat_name` varchar(50) NOT NULL DEFAULT '' COMMENT '大类名称',
+  `service_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '二级商品ID',
+  `item_name` varchar(100) NOT NULL DEFAULT '' COMMENT '商品名称',
+  `spec_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '规格ID',
+  `spec_name` varchar(100) NOT NULL DEFAULT '' COMMENT '规格名称',
+  `unit` varchar(20) NOT NULL DEFAULT '个' COMMENT '单位',
+  `num` int(11) NOT NULL DEFAULT '1' COMMENT '默认数量',
+  `service_type` varchar(50) NOT NULL DEFAULT 'install' COMMENT '服务类型编码',
+  `service_type_name` varchar(50) NOT NULL DEFAULT '安装' COMMENT '服务类型名称',
+  `is_custom` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否自定义商品',
+  `custom_name` varchar(100) NOT NULL DEFAULT '' COMMENT '自定义商品名称',
+  `extras_json` text COMMENT '增项服务配置JSON',
+  `images_json` text COMMENT '商品图片列表JSON',
+  `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '商品备注',
+  `createtime` bigint(16) DEFAULT NULL COMMENT '创建时间',
+  `updatetime` bigint(16) DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_cat` (`user_id`, `cat_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户常用商品模板表';
+
+-- 5. 常用服务备注模板表
+CREATE TABLE IF NOT EXISTS `fa_remark_template` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '用户ID(0=平台公共模板)',
+  `content` varchar(255) NOT NULL DEFAULT '' COMMENT '常用备注内容',
+  `weigh` int(11) NOT NULL DEFAULT '0' COMMENT '权重排序',
+  `createtime` bigint(16) DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_weigh` (`user_id`, `weigh`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='常用服务备注模板表';
+
+
+-- ============================================================================
+-- 真实设备与家居实物图校准（覆盖商用厨电、净水器、卫浴、门锁、衣柜、窗帘等全类目）
+-- ============================================================================
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_dough_mixer_1.jpg' WHERE `image` LIKE '%/kitchen_mixer.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_comm_steamer.jpg' WHERE `image` LIKE '%/kitchen_oven.jpg' OR `image` LIKE '%/commercial_steamer.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_comm_stove_1.jpg' WHERE `image` LIKE '%/kitchen_comm_1.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_comm_stove_2.jpg' WHERE `image` LIKE '%/kitchen_comm_2.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_faucet_sink.jpg' WHERE `image` LIKE '%/kitchen_sink.jpg' OR `image` LIKE '%/bath_faucet.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_comm_hood.jpg' WHERE `image` LIKE '%/commercial_hood.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_comm_fridge.jpg' WHERE `image` LIKE '%/refrigerator.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_water_purifier.jpg' WHERE `image` LIKE '%/water_purifier.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_door_lock.jpg' WHERE `image` LIKE '%/mechanical_lock.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/goods/security_door.jpg' WHERE `image` LIKE '%/door_interior.jpg' OR `image` LIKE '%/wood_door.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_shower_enclosure.jpg' WHERE `image` LIKE '%/shower_room.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_wardrobe_closet.jpg' WHERE `image` LIKE '%/wardrobe_sliding.jpg' OR `image` LIKE '%/wardrobe_four.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/goods/curtain_motor.jpg' WHERE `image` LIKE '%/curtain_fabric.jpg' OR `image` LIKE '%/curtain_modern.jpg';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_dough_mixer_1.jpg' WHERE `service_id` = 39 AND `title` LIKE '%12.5kg%';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_dough_mixer_2.jpg' WHERE `service_id` = 39 AND `title` LIKE '%25kg%';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_pasta_sheeter.jpg' WHERE `service_id` = 39 AND `title` LIKE '%压面机%';
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_comm_dishwasher.jpg' WHERE `service_id` = 36;
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_comm_fridge.jpg' WHERE `service_id` = 38;
+UPDATE `fa_system_gallery` SET `image` = 'https://yjyf-1512102519.cos.ap-guangzhou.myqcloud.com/gallery/real_water_boiler.jpg' WHERE `service_id` = 40;
diff --git a/server/application/admin/command/OrderAutoverify.php b/server/application/admin/command/OrderAutoverify.php
index ff0f56e..c73fca7 100644
--- a/server/application/admin/command/OrderAutoverify.php
+++ b/server/application/admin/command/OrderAutoverify.php
@@ -35,32 +35,39 @@ class OrderAutoverify extends Command
         $success = 0;
         foreach ($orders as $order) {
             $orderId = (int)$order['id'];
-            $masterId = (int)$order['master_id'];
-            $payAmount = (float)$order['pay_amount'];
-            $rate = 10.00;
-            $commission = round($payAmount * $rate / 100, 2);
-            $settleAmount = round($payAmount - $commission, 2);
+            $now = time();
 
             Db::startTrans();
             try {
+                $lockedOrder = Db::name('order')->where('id', $orderId)->lock(true)->find();
+                if (!$lockedOrder || (int)$lockedOrder['status'] !== OrderStatus::PENDING_VERIFY || (int)$lockedOrder['settle_status'] === 1) {
+                    Db::rollback();
+                    continue;
+                }
+
+                $masterId = (int)$lockedOrder['master_id'];
+                $payAmount = (float)$lockedOrder['pay_amount'];
+                $rate = 10.00;
+                $commission = round($payAmount * $rate / 100, 2);
+                $settleAmount = round($payAmount - $commission, 2);
+
                 // 1. 更新订单为已完成
                 Db::name('order')->where('id', $orderId)->update([
                     'status'        => OrderStatus::COMPLETED,
-                    'verify_time'   => time(),
+                    'verify_time'   => $now,
                     'settle_status' => 1,
                     'settle_amount' => $settleAmount,
-                    'updatetime'    => time(),
+                    'updatetime'    => $now,
                 ]);
 
-                // 2. 插入订单日志
+                // 2. 插入订单日志（严格对齐 fa_order_log 真实列名）
                 Db::name('order_log')->insert([
-                    'order_id'   => $orderId,
-                    'from_status'=> OrderStatus::PENDING_VERIFY,
-                    'to_status'  => OrderStatus::COMPLETED,
-                    'remark'     => '完工满48小时客户未确认，系统自动验收结算',
-                    'operator'   => 'system',
-                    'op_id'      => 0,
-                    'createtime' => time(),
+                    'order_id'      => $orderId,
+                    'status'        => OrderStatus::COMPLETED,
+                    'remark'        => '完工满48小时客户未确认，系统自动验收结算',
+                    'operator_type' => 'system',
+                    'operator_id'   => 0,
+                    'createtime'    => $now,
                 ]);
 
                 // 3. 写入结算表
@@ -72,46 +79,48 @@ class OrderAutoverify extends Command
                     'commission'      => $commission,
                     'settle_amount'   => $settleAmount,
                     'status'          => 'settled',
-                    'settle_time'     => time(),
-                    'createtime'      => time(),
+                    'settle_time'     => $now,
+                    'createtime'      => $now,
                 ]);
 
                 // 4. 师傅钱包入账（行级悲观锁）
                 if ($masterId > 0) {
                     $master = Db::name('master')->where('id', $masterId)->lock(true)->find();
-                    $newMoney = round((float)$master['money'] + $settleAmount, 2);
-                    Db::name('master')->where('id', $masterId)->update([
-                        'money'       => $newMoney,
-                        'order_count' => (int)$master['order_count'] + 1,
-                        'updatetime'  => time(),
-                    ]);
-                    Db::name('wallet_log')->insert([
-                        'user_type'  => 'master',
-                        'user_id'    => $masterId,
-                        'type'       => 'settle',
-                        'amount'     => $settleAmount,
-                        'balance'    => $newMoney,
-                        'order_id'   => $orderId,
-                        'remark'     => '订单超时自动核销结算入账',
-                        'createtime' => time(),
-                    ]);
+                    if ($master) {
+                        $newMoney = round((float)$master['money'] + $settleAmount, 2);
+                        Db::name('master')->where('id', $masterId)->update([
+                            'money'       => $newMoney,
+                            'order_count' => (int)$master['order_count'] + 1,
+                            'updatetime'  => $now,
+                        ]);
+                        Db::name('wallet_log')->insert([
+                            'user_type'  => 'master',
+                            'user_id'    => $masterId,
+                            'type'       => 'settle',
+                            'amount'     => $settleAmount,
+                            'balance'    => $newMoney,
+                            'order_id'   => $orderId,
+                            'remark'     => '订单超时自动核销结算入账',
+                            'createtime' => $now,
+                        ]);
 
-                    // 通知师傅
-                    Db::name('message')->insert([
-                        'user_type'  => 'master',
-                        'user_id'    => (int)$master['user_id'],
-                        'title'      => '订单自动核销结算入账',
-                        'content'    => "订单 {$order['order_no']} 完工满48小时已自动验收，收入 ¥{$settleAmount}",
-                        'type'       => 'order',
-                        'target_id'  => $orderId,
-                        'is_read'    => 0,
-                        'createtime' => time(),
-                    ]);
+                        // 通知师傅（严格对齐 fa_message 真实列名，receive_id 传 fa_master.id）
+                        Db::name('message')->insert([
+                            'receive_type' => 'master',
+                            'receive_id'   => (int)$master['id'],
+                            'type'         => 'order',
+                            'title'        => '订单自动核销结算入账',
+                            'content'      => "订单 {$lockedOrder['order_no']} 完工满48小时已自动验收，收入 ¥{$settleAmount}",
+                            'order_id'     => $orderId,
+                            'is_read'      => 0,
+                            'createtime'   => $now,
+                        ]);
+                    }
                 }
 
                 Db::commit();
                 $success++;
-                $output->writeln("  [OK] 订单 #{$orderId} ({$order['order_no']}) 自动核销完成，结算 ¥{$settleAmount}");
+                $output->writeln("  [OK] 订单 #{$orderId} ({$lockedOrder['order_no']}) 自动核销完成，结算 ¥{$settleAmount}");
             } catch (\Exception $e) {
                 Db::rollback();
                 $output->writeln("  [FAIL] 订单 #{$orderId} 自动核销异常: " . $e->getMessage());
diff --git a/server/application/admin/command/OrderRecycle.php b/server/application/admin/command/OrderRecycle.php
index 211e7d5..20a5942 100644
--- a/server/application/admin/command/OrderRecycle.php
+++ b/server/application/admin/command/OrderRecycle.php
@@ -41,69 +41,64 @@ class OrderRecycle extends Command
         $recycled = 0;
         foreach ($orders as $order) {
             $orderId = (int)$order['id'];
-            $masterId = (int)$order['master_id'];
+            $now = time();
 
             Db::startTrans();
             try {
-                // 1. 退回待接单状态（公海接单大厅）
+                $lockedOrder = Db::name('order')->where('id', $orderId)->lock(true)->find();
+                if (!$lockedOrder || (int)$lockedOrder['status'] !== OrderStatus::ACCEPTED || !empty($lockedOrder['contact_time'])) {
+                    Db::rollback();
+                    continue;
+                }
+
+                $masterId = (int)$lockedOrder['master_id'];
+                $toStatus = $lockedOrder['price_type'] === 'quote' ? OrderStatus::QUOTING : OrderStatus::PENDING_ACCEPT;
+
+                // 1. 退回待接单/报价中状态（公海接单大厅）
                 Db::name('order')->where('id', $orderId)->update([
-                    'status'      => OrderStatus::PENDING_ACCEPT,
+                    'status'      => $toStatus,
                     'master_id'   => 0,
-                    'accept_time' => 0,
-                    'updatetime'  => time(),
+                    'accept_time' => null,
+                    'updatetime'  => $now,
                 ]);
 
-                // 2. 插入订单状态变迁日志
+                if ($lockedOrder['price_type'] === 'quote') {
+                    Db::name('order_quote')
+                        ->where('order_id', $orderId)
+                        ->where('status', 'accept')
+                        ->update(['status' => 'wait']);
+                }
+
+                // 2. 插入订单状态变迁日志（严格对齐 fa_order_log 真实列名）
                 Db::name('order_log')->insert([
-                    'order_id'   => $orderId,
-                    'from_status'=> OrderStatus::ACCEPTED,
-                    'to_status'  => OrderStatus::PENDING_ACCEPT,
-                    'remark'     => '师傅接单后超2小时未联系客户，系统自动退回公海大厅',
-                    'operator'   => 'system',
-                    'op_id'      => 0,
-                    'createtime' => time(),
+                    'order_id'      => $orderId,
+                    'status'        => $toStatus,
+                    'remark'        => '师傅接单后超2小时未联系客户，系统自动退回公海大厅',
+                    'operator_type' => 'system',
+                    'operator_id'   => 0,
+                    'createtime'    => $now,
                 ]);
 
-                // 3. 对原接单师傅扣减信用分（扣 2 分）与推送警告
+                // 3. 给原接单师傅发送超时退单警告通知（严格对齐 fa_message 真实列名，receive_id 传 fa_master.id）
                 if ($masterId > 0) {
-                    $master = Db::name('master')->where('id', $masterId)->lock(true)->find();
+                    $master = Db::name('master')->where('id', $masterId)->find();
                     if ($master) {
-                        $newScore = max(0, (float)$master['credit_score'] - 2.0);
-                        Db::name('master')->where('id', $masterId)->update([
-                            'credit_score' => $newScore,
-                            'updatetime'   => time(),
-                        ]);
-
-                        // 记录信誉流水表（如表存在）
-                        if (Db::query("SHOW TABLES LIKE '%master_credit_log%'")) {
-                            Db::name('master_credit_log')->insert([
-                                'master_id'   => $masterId,
-                                'type'        => 'contact_timeout',
-                                'score'       => -2.0,
-                                'balance'     => $newScore,
-                                'order_id'    => $orderId,
-                                'remark'      => '接单后超2小时未首联，违规扣除信誉分',
-                                'createtime'  => time(),
-                            ]);
-                        }
-
-                        // 给师傅发送通知
                         Db::name('message')->insert([
-                            'user_type'  => 'master',
-                            'user_id'    => (int)$master['user_id'],
-                            'title'      => '接单超时退单警告',
-                            'content'    => "订单 {$order['order_no']} 因超过2小时未联系客户，已被系统回收退回公海，扣除信誉分 2 分",
-                            'type'       => 'order',
-                            'target_id'  => $orderId,
-                            'is_read'    => 0,
-                            'createtime' => time(),
+                            'receive_type' => 'master',
+                            'receive_id'   => (int)$master['id'],
+                            'type'         => 'order',
+                            'title'        => '接单超时退单警告',
+                            'content'      => "订单 {$lockedOrder['order_no']} 因超过2小时未联系客户，已被系统回收退回接单大厅",
+                            'order_id'     => $orderId,
+                            'is_read'      => 0,
+                            'createtime'   => $now,
                         ]);
                     }
                 }
 
                 Db::commit();
                 $recycled++;
-                $output->writeln("  [OK] 订单 #{$orderId} ({$order['order_no']}) 超时退单成功，已重置回公海大厅");
+                $output->writeln("  [OK] 订单 #{$orderId} ({$lockedOrder['order_no']}) 超时退单成功，已重置回公海大厅");
             } catch (\Exception $e) {
                 Db::rollback();
                 $output->writeln("  [FAIL] 订单 #{$orderId} 超时退单失败: " . $e->getMessage());
diff --git a/server/application/admin/controller/Appeal.php b/server/application/admin/controller/Appeal.php
index e50ed55..10ed565 100644
--- a/server/application/admin/controller/Appeal.php
+++ b/server/application/admin/controller/Appeal.php
@@ -3,21 +3,27 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use think\Db;
+use think\exception\PDOException;
 
 /**
- * 申诉工单
+ * 申诉工单管理
  *
- * @icon fa fa-circle-o
+ * 申诉单由师傅端发起，后台承担平台客服核实与判责答复职责
+ *
+ * @icon fa fa-gavel
  */
 class Appeal extends Backend
 {
-
     /**
      * Appeal模型对象
      * @var \app\admin\model\Appeal
      */
     protected $model = null;
 
+    protected $relationSearch = true;
+    protected $searchFields = 'id,content,reply,order.order_no,master.realname,master.mobile';
+
     public function _initialize()
     {
         parent::_initialize();
@@ -26,18 +32,9 @@ class Appeal extends Backend
         $this->view->assign("statusList", $this->model->getStatusList());
     }
 
-
-
     /**
-     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
-     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
-     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     * 申诉工单列表
      */
-
-
-
-    protected $relationSearch = true;
-
     public function index()
     {
         $this->request->filter(['strip_tags', 'trim']);
@@ -56,4 +53,143 @@ class Appeal extends Backend
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
+
+    /**
+     * 申诉全景详情（关联订单、雇主、现场凭证与客户评价）
+     */
+    public function detail($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $this->assignAppealContext($row);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 仲裁核查与答复（保护师傅原始申诉凭证只读，仅更新状态与平台答复）
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        if (false === $this->request->isPost()) {
+            $this->assignAppealContext($row);
+            return $this->view->fetch();
+        }
+
+        $params = $this->request->post('row/a', []);
+        $status = (string)($params['status'] ?? $row['status']);
+        $reply  = trim((string)($params['reply'] ?? ''));
+
+        $statusList = $this->model->getStatusList();
+        if (!isset($statusList[$status])) {
+            $this->error('工单流转状态不合法');
+        }
+        if (in_array($status, ['done', 'reject'], true) && $reply === '') {
+            $this->error('标记完结或驳回申诉时，必须填写平台核查答复说明');
+        }
+
+        $oldStatus = (string)$row['status'];
+        $oldReply  = (string)$row['reply'];
+
+        Db::startTrans();
+        try {
+            $row->allowField(['status', 'reply'])->save([
+                'status' => $status,
+                'reply'  => mb_substr($reply, 0, 500),
+            ]);
+
+            // 状态流转或答复更新时，自动推送站内通知给申诉师傅
+            if (($status !== $oldStatus || $reply !== $oldReply) && (int)$row['master_id'] > 0) {
+                $statusText = $statusList[$status] ?? $status;
+                $orderNo = '';
+                if ((int)$row['order_id'] > 0) {
+                    $orderNo = (string)Db::name('order')->where('id', (int)$row['order_id'])->value('order_no');
+                }
+                $msgTitle = '申诉工单处理通知（' . $statusText . '）';
+                $msgContent = ($orderNo !== '' ? '关联订单 ' . $orderNo . ' 的' : '您的') . '申诉状态已更新为「' . $statusText . '」';
+                if ($reply !== '') {
+                    $msgContent .= '。平台答复：' . $reply;
+                }
+                Db::name('message')->insert([
+                    'receive_type' => 'master',
+                    'receive_id'   => (int)$row['master_id'],
+                    'type'         => 'audit',
+                    'title'        => mb_substr($msgTitle, 0, 100),
+                    'content'      => mb_substr($msgContent, 0, 500),
+                    'order_id'     => (int)$row['order_id'],
+                    'is_read'      => 0,
+                    'createtime'   => time(),
+                ]);
+            }
+
+            Db::commit();
+        } catch (PDOException|\Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        $this->success();
+    }
+
+    /**
+     * 申诉单由师傅端提交，禁止后台伪造录入
+     */
+    public function add()
+    {
+        $this->error('申诉工单仅支持师傅端发起，后台不可手动新增');
+    }
+
+    /**
+     * 申诉仲裁记录需留痕备查，禁止物理删除
+     */
+    public function del($ids = null)
+    {
+        $this->error('申诉工单与判责记录禁止删除');
+    }
+
+    /**
+     * 组装申诉关联上下文数据
+     */
+    protected function assignAppealContext($row)
+    {
+        $master = (int)$row['master_id'] > 0
+            ? Db::name('master')->where('id', (int)$row['master_id'])->find()
+            : null;
+        $order = (int)$row['order_id'] > 0
+            ? Db::name('order')->where('id', (int)$row['order_id'])->find()
+            : null;
+        $customer = ($order && (int)$order['user_id'] > 0)
+            ? Db::name('user')->where('id', (int)$order['user_id'])->field('id,nickname,username,mobile')->find()
+            : null;
+        $review = ($order && (int)$order['id'] > 0)
+            ? Db::name('review')->where('order_id', (int)$order['id'])->find()
+            : null;
+        $orderMedias = ($order && (int)$order['id'] > 0)
+            ? Db::name('order_media')->where('order_id', (int)$order['id'])->order('id asc')->select()
+            : [];
+
+        $appealImages = array_values(array_filter(array_map('trim', explode(',', (string)$row['images']))));
+        $reviewImages = $review ? array_values(array_filter(array_map('trim', explode(',', (string)$review['images'])))) : [];
+
+        $orderStatusMap = [
+            0 => '待支付', 1 => '待接单', 2 => '待上门', 3 => '已到达',
+            4 => '服务中', 5 => '待验收', 6 => '已完成', 9 => '已取消', 10 => '售后/异常'
+        ];
+
+        $this->view->assign([
+            'row'            => $row,
+            'master'         => $master ?: [],
+            'order'          => $order ?: [],
+            'customer'       => $customer ?: [],
+            'review'         => $review ?: [],
+            'orderMedias'    => $orderMedias,
+            'appealImages'   => $appealImages,
+            'reviewImages'   => $reviewImages,
+            'orderStatusMap' => $orderStatusMap,
+        ]);
+    }
 }
diff --git a/server/application/admin/controller/Banner.php b/server/application/admin/controller/Banner.php
index 3686e88..202c8c1 100644
--- a/server/application/admin/controller/Banner.php
+++ b/server/application/admin/controller/Banner.php
@@ -17,6 +17,7 @@ class Banner extends Backend
      * @var \app\admin\model\Banner
      */
     protected $model = null;
+    protected $searchFields = 'id,badge,title,subtitle,link';
 
     public function _initialize()
     {
diff --git a/server/application/admin/controller/Coupon.php b/server/application/admin/controller/Coupon.php
index 6ccd21f..c69837a 100644
--- a/server/application/admin/controller/Coupon.php
+++ b/server/application/admin/controller/Coupon.php
@@ -3,20 +3,21 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use think\Db;
 
 /**
- * 优惠券模板
+ * 优惠券模板管理
  *
- * @icon fa fa-circle-o
+ * @icon fa fa-ticket
  */
 class Coupon extends Backend
 {
-
     /**
      * Coupon模型对象
      * @var \app\admin\model\Coupon
      */
     protected $model = null;
+    protected $searchFields = 'id,name';
 
     public function _initialize()
     {
@@ -26,13 +27,181 @@ class Coupon extends Backend
         $this->view->assign("statusList", $this->model->getStatusList());
     }
 
+    /**
+     * 优惠券模板列表（聚合真实领取张数与核销使用张数）
+     */
+    public function index()
+    {
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->where($where)
+            ->order($sort, $order)
+            ->paginate($limit);
 
+        $rows = $list->items();
+        $ids = [];
+        foreach ($rows as $r) {
+            $ids[] = (int)$r['id'];
+        }
+
+        $claimMap = [];
+        $usedMap = [];
+        if ($ids) {
+            $stats = Db::name('user_coupon')
+                ->where('coupon_id', 'in', $ids)
+                ->field('coupon_id, COUNT(*) AS claim_cnt, SUM(CASE WHEN status = \'used\' THEN 1 ELSE 0 END) AS used_cnt')
+                ->group('coupon_id')
+                ->select();
+            foreach ($stats as $st) {
+                $cid = (int)$st['coupon_id'];
+                $claimMap[$cid] = (int)$st['claim_cnt'];
+                $usedMap[$cid] = (int)$st['used_cnt'];
+            }
+        }
+
+        foreach ($rows as &$item) {
+            $cid = (int)$item['id'];
+            $item['real_claimed'] = max((int)$item['received'], $claimMap[$cid] ?? 0);
+            $item['used_count'] = $usedMap[$cid] ?? 0;
+        }
+        unset($item);
+
+        return json(['total' => $list->total(), 'rows' => $rows]);
+    }
 
     /**
-     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
-     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
-     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     * 优惠券领用与核销全景详情（关联 fa_user_coupon + fa_user + fa_order）
      */
+    public function detail($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $cid = (int)$row['id'];
+        $totalClaimed = (int)Db::name('user_coupon')->where('coupon_id', $cid)->count();
+        $totalUsed = (int)Db::name('user_coupon')->where('coupon_id', $cid)->where('status', 'used')->count();
 
+        $records = Db::name('user_coupon')->alias('uc')
+            ->join('__USER__ u', 'u.id = uc.user_id', 'LEFT')
+            ->join('__ORDER__ o', 'o.id = uc.order_id', 'LEFT')
+            ->where('uc.coupon_id', $cid)
+            ->field('uc.*, u.nickname, u.username, u.mobile, o.order_no, o.service_name, o.pay_amount, o.discount_amount')
+            ->order('uc.id desc')
+            ->limit(30)
+            ->select();
 
+        $drivenGmv = (float)Db::name('user_coupon')->alias('uc')
+            ->join('__ORDER__ o', 'o.id = uc.order_id', 'INNER')
+            ->where('uc.coupon_id', $cid)
+            ->where('uc.status', 'used')
+            ->sum('o.pay_amount');
+
+        $this->view->assign([
+            'row'          => $row,
+            'totalClaimed' => max((int)$row['received'], $totalClaimed),
+            'totalUsed'    => $totalUsed,
+            'drivenGmv'    => round($drivenGmv, 2),
+            'records'      => $records,
+        ]);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 新增卡券模板（强制初始化已领取数为 0）
+     */
+    public function add()
+    {
+        if (false === $this->request->isPost()) {
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a', []);
+        if (!$params) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+        $params['received'] = 0;
+        if (($params['type'] ?? 'cash') === 'discount') {
+            $disc = (float)($params['discount'] ?? 0);
+            if ($disc <= 0 || $disc >= 1) {
+                $this->error('折扣券的折扣系数须大于 0 且小于 1（如 0.85 表示 8.5 折）');
+            }
+            $params['amount'] = 0.00;
+        } else {
+            if ((float)($params['amount'] ?? 0) <= 0) {
+                $this->error('满减代金券的减免金额须大于 0');
+            }
+            $params['discount'] = 1.00;
+        }
+        $result = $this->model->allowField(true)->save($params);
+        if ($result !== false) {
+            $this->success();
+        }
+        $this->error($this->model->getError() ?: __('No rows were inserted'));
+    }
+
+    /**
+     * 编辑卡券模板（锁定已领取数量防止人工篡改库存）
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        if (false === $this->request->isPost()) {
+            $this->view->assign('row', $row);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a', []);
+        if (!$params) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+        unset($params['received']);
+        if (($params['type'] ?? $row['type']) === 'discount') {
+            $disc = (float)($params['discount'] ?? $row['discount']);
+            if ($disc <= 0 || $disc >= 1) {
+                $this->error('折扣券的折扣系数须大于 0 且小于 1（如 0.85 表示 8.5 折）');
+            }
+            $params['amount'] = 0.00;
+        } else {
+            if ((float)($params['amount'] ?? $row['amount']) <= 0) {
+                $this->error('满减代金券的减免金额须大于 0');
+            }
+            $params['discount'] = 1.00;
+        }
+        $result = $row->allowField(true)->save($params);
+        if ($result !== false) {
+            $this->success();
+        }
+        $this->error($row->getError() ?: __('No rows were updated'));
+    }
+
+    /**
+     * 删除保护：已有用户领取的卡券禁止物理删除
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $claimedCnt = (int)Db::name('user_coupon')->where('coupon_id', 'in', $idArr)->count();
+        if ($claimedCnt > 0) {
+            $this->error('所选优惠券已有用户领取记录（共 ' . $claimedCnt . ' 张），禁止物理删除，请改为「隐藏」停止发放');
+        }
+        return parent::del($ids);
+    }
 }
diff --git a/server/application/admin/controller/Home.php b/server/application/admin/controller/Home.php
index 9f3b9ba..d50a8af 100644
--- a/server/application/admin/controller/Home.php
+++ b/server/application/admin/controller/Home.php
@@ -34,20 +34,34 @@ class Home extends Backend
         $todayEnd = strtotime(date('Y-m-d 23:59:59'));
         $monthStart = strtotime(date('Y-m-01 00:00:00'));
 
-        // 2. 核心经营 KPI (真实数据聚合)
+        // 2. 核心经营 KPI (真实数据聚合：仅统计已支付且未取消的有效订单流水)
         $totalOrder = Order::count();
-        $totalGmv = (float)(Order::sum('pay_amount') ?: 0);
-        $avgTicket = $totalOrder > 0 ? round($totalGmv / $totalOrder, 2) : 0;
+        $paidOrderCount = Order::where('pay_status', 1)->where('status', '<>', 9)->count();
+        $totalGmv = (float)(Order::where('pay_status', 1)->where('status', '<>', 9)->sum('pay_amount') ?: 0);
+        $avgTicket = $paidOrderCount > 0 ? round($totalGmv / $paidOrderCount, 2) : 0;
 
         $todayOrderCount = Order::whereBetween('createtime', [$todayStart, $todayEnd])->count();
-        $todayGmv = (float)(Order::whereBetween('pay_time', [$todayStart, $todayEnd])->sum('pay_amount') ?: 0);
-        $monthGmv = (float)(Order::whereBetween('pay_time', [$monthStart, $todayEnd])->sum('pay_amount') ?: 0);
+        $todayGmv = (float)(Db::name('order')
+            ->where('pay_status', 1)
+            ->where('status', '<>', 9)
+            ->whereRaw('IF(pay_time > 0, pay_time, createtime) BETWEEN ' . (int)$todayStart . ' AND ' . (int)$todayEnd)
+            ->sum('pay_amount') ?: 0);
+        $monthGmv = (float)(Db::name('order')
+            ->where('pay_status', 1)
+            ->where('status', '<>', 9)
+            ->whereRaw('IF(pay_time > 0, pay_time, createtime) BETWEEN ' . (int)$monthStart . ' AND ' . (int)$todayEnd)
+            ->sum('pay_amount') ?: 0);
 
         // 运力与商户统计
         $totalMaster = Master::where('verify_status', 'pass')->count();
-        $onlineMaster = Master::where('work_status', 'on')->count();
+        $onlineMaster = Master::where('verify_status', 'pass')->where('work_status', 'on')->count();
         $totalMerchant = Merchant::where('verify_status', 'pass')->count();
-        $totalUser = User::count();
+        $totalUser = Db::name('user')->alias('u')
+            ->join('master ma', 'ma.user_id = u.id', 'LEFT')
+            ->join('merchant me', 'me.user_id = u.id', 'LEFT')
+            ->whereNull('ma.id')
+            ->whereNull('me.id')
+            ->count();
 
         // 3. 订单状态分布与履约漏斗
         $statusCounts = Order::field('status, count(*) as cnt')
@@ -60,17 +74,19 @@ class Home extends Backend
 
         $unpaidCount = $statusCountMap[0] ?? 0;
         $waitDispatchCount = $statusCountMap[1] ?? 0;
-        $inServiceCount = ($statusCountMap[3] ?? 0) + ($statusCountMap[6] ?? 0);
+        $inServiceCount = ($statusCountMap[3] ?? 0) + ($statusCountMap[4] ?? 0) + ($statusCountMap[5] ?? 0) + ($statusCountMap[6] ?? 0) + ($statusCountMap[7] ?? 0);
         $doneCount = $statusCountMap[8] ?? 0;
         $afterSaleCount = $statusCountMap[10] ?? 0;
 
-        // 4. 实时待办预警与风控中心
+        // 4. 实时待办预警与风控中心（6大核心运营待办）
         $pendingMaster = Master::where('verify_status', 'pending')->count();
+        $pendingMerchant = Merchant::where('verify_status', 'pending')->count();
         $waitingAppeal = Appeal::where('status', 'wait')->count();
         $waitingWithdraw = Withdraw::where('status', 'wait')->count();
+        $waitingInvoice = Db::name('invoice')->where('status', 'wait')->count();
         $pendingDispatch = $waitDispatchCount;
 
-        // 5. 近 7 天订单趋势与 GMV 流水 (双轴图表数据)
+        // 5. 近 7 天订单趋势与已付 GMV 流水 (双轴图表数据)
         $dateColumns = [];
         $orderCounts = [];
         $orderAmounts = [];
@@ -81,7 +97,11 @@ class Home extends Backend
             $dayEnd = strtotime($date . ' 23:59:59');
 
             $cnt = Order::whereBetween('createtime', [$dayStart, $dayEnd])->count();
-            $amt = Order::whereBetween('createtime', [$dayStart, $dayEnd])->sum('pay_amount') ?: 0;
+            $amt = Db::name('order')
+                ->where('pay_status', 1)
+                ->where('status', '<>', 9)
+                ->whereRaw('IF(pay_time > 0, pay_time, createtime) BETWEEN ' . (int)$dayStart . ' AND ' . (int)$dayEnd)
+                ->sum('pay_amount') ?: 0;
 
             $orderCounts[] = (int)$cnt;
             $orderAmounts[] = round((float)$amt, 2);
@@ -147,8 +167,10 @@ class Home extends Backend
             'afterSaleCount'    => $afterSaleCount,
 
             'pendingMaster'     => $pendingMaster,
+            'pendingMerchant'   => $pendingMerchant,
             'waitingAppeal'     => $waitingAppeal,
             'waitingWithdraw'   => $waitingWithdraw,
+            'waitingInvoice'    => $waitingInvoice,
             'pendingDispatch'   => $pendingDispatch,
 
             'masterAvgScore'    => $masterAvg['avg_score'] ?: '5.0',
diff --git a/server/application/admin/controller/Invoice.php b/server/application/admin/controller/Invoice.php
index 3604203..35ab260 100644
--- a/server/application/admin/controller/Invoice.php
+++ b/server/application/admin/controller/Invoice.php
@@ -3,30 +3,32 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use app\common\library\InvoiceService;
 use think\Db;
 use think\exception\PDOException;
 
 /**
- * 开票申请
+ * 开票申请管理
  *
- * 开票申请仅由用户/商户端发起，后台只负责财务开具处理：
- * 待开具(wait) → 已开票(issued，必填发票号)/驳回(reject，必填原因)
- * 驳回后额度自动释放，并通知申请人
+ * 开票申请仅由用户/商户端发起，后台负责财务审核与开具交付：
+ * 待开具(wait) → 已开票(issued，必填发票号，支持上传电子发票PDF/图片，锁定关联订单为已开票)
+ *             → 驳回(reject，必填原因，自动释放开票额度并解锁关联订单)
  *
  * @icon fa fa-file-text-o
  */
 class Invoice extends Backend
 {
-
     /**
      * Invoice模型对象
      * @var \app\admin\model\Invoice
      */
     protected $model = null;
+    protected $relationSearch = true;
+    protected $searchFields = 'id,invoice_sn,title,tax_no,invoice_no,email,merchant.name,user.nickname';
 
     /**
      * 开票处理状态机：当前状态 => 允许流转到的目标状态
-     * issued/reject 为终态
+     * issued / reject / cancel 为终态
      * @var array
      */
     protected $statusFlow = [
@@ -38,6 +40,7 @@ class Invoice extends Backend
         parent::_initialize();
         $this->model = new \app\admin\model\Invoice;
         $this->view->assign("typeList", $this->model->getTypeList());
+        $this->view->assign("titleTypeList", $this->model->getTitleTypeList());
         $this->view->assign("statusList", $this->model->getStatusList());
     }
 
@@ -64,29 +67,46 @@ class Invoice extends Backend
     }
 
     /**
-     * 财务开票处理：申请信息只读，仅允许填写开票结果
-     * - 开票完成：必须填写发票号，状态置为已开票
-     * - 驳回：必须填写原因，额度自动释放
+     * 详情回看（复用 edit 只读视图）
+     */
+    public function detail($ids = null)
+    {
+        $row = $this->model->with(['user', 'merchant'])->where('invoice.id', (int)$ids)->find();
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $linkedOrders = InvoiceService::fetchLinkedOrders((string)$row['order_ids'], (int)$row['id']);
+        $this->view->assign('row', $row);
+        $this->view->assign('linkedOrders', $linkedOrders);
+        $this->view->assign('flowOptions', []);
+        return $this->view->fetch('edit');
+    }
+
+    /**
+     * 财务开票处理：申请信息只读，仅允许填写开票结果与上传电子发票文件
      */
     public function edit($ids = null)
     {
-        $row = $this->model->get($ids);
+        $row = $this->model->with(['user', 'merchant'])->where('invoice.id', (int)$ids)->find();
         if (!$row) {
             $this->error(__('No Results were found'));
         }
         if (false === $this->request->isPost()) {
+            $linkedOrders = InvoiceService::fetchLinkedOrders((string)$row['order_ids'], (int)$row['id']);
             $this->view->assign('row', $row);
+            $this->view->assign('linkedOrders', $linkedOrders);
             $this->view->assign('flowOptions', $this->statusFlow[$row['status']] ?? []);
             return $this->view->fetch();
         }
 
-        $status    = (string)$this->request->post('row.status');
-        $invoiceNo = trim((string)$this->request->post('row.invoice_no'));
-        $auditMsg  = trim((string)$this->request->post('row.audit_msg'));
+        $status      = (string)$this->request->post('row.status');
+        $invoiceCode = trim((string)$this->request->post('row.invoice_code'));
+        $invoiceNo   = trim((string)$this->request->post('row.invoice_no'));
+        $invoiceFile = trim((string)$this->request->post('row.invoice_file'));
+        $auditMsg    = trim((string)$this->request->post('row.audit_msg'));
 
-        // 状态机校验：终态禁止操作，流转目标必须合法
         if (!isset($this->statusFlow[$row['status']])) {
-            $this->error('该开票申请已处理完毕，不允许再次变更');
+            $this->error('该开票申请已处理或已撤回，不允许再次变更');
         }
         if (!in_array($status, $this->statusFlow[$row['status']], true)) {
             $this->error('状态流转不合法，请刷新后重试');
@@ -98,30 +118,49 @@ class Invoice extends Backend
             $this->error('驳回时必须填写驳回原因');
         }
 
+        $now = time();
         Db::startTrans();
         try {
+            $updateData = [
+                'status'       => $status,
+                'invoice_code' => $invoiceCode !== '' ? mb_substr($invoiceCode, 0, 50) : $row['invoice_code'],
+                'invoice_no'   => $invoiceNo !== '' ? mb_substr($invoiceNo, 0, 50) : $row['invoice_no'],
+                'invoice_file' => $invoiceFile !== '' ? mb_substr($invoiceFile, 0, 500) : $row['invoice_file'],
+                'audit_msg'    => mb_substr($auditMsg, 0, 255),
+                'updatetime'   => $now,
+            ];
+            if ($status === 'issued') {
+                $updateData['issue_time'] = $now;
+            }
+
             // 乐观锁更新状态，防止并发重复处理
             $affected = Db::name('invoice')
                 ->where('id', $row['id'])
                 ->where('status', $row['status'])
-                ->update([
-                    'status'     => $status,
-                    'invoice_no' => $invoiceNo !== '' ? $invoiceNo : $row['invoice_no'],
-                    'audit_msg'  => $auditMsg,
-                    'updatetime' => time(),
-                ]);
+                ->update($updateData);
             if (!$affected) {
                 throw new \Exception('开票申请状态已被其他人变更，请刷新后重试');
             }
 
-            // 通知申请人（商户开票通知绑定账号用户）
-            $this->sendUserMessage(
-                (int)$row['user_id'],
-                $status === 'issued' ? '发票已开具' : '开票申请已驳回',
-                $status === 'issued'
-                    ? '您申请的开票 ¥' . $row['amount'] . ' 已开具完成，发票号码：' . $invoiceNo . '，电子发票已发送至 ' . $row['email']
-                    : '您的开票申请 ¥' . $row['amount'] . ' 未通过审核：' . ($auditMsg !== '' ? $auditMsg : '无')
-            );
+            if ($status === 'issued') {
+                InvoiceService::markInvoiceOrdersIssued((int)$row['id'], (string)$row['order_ids'], $now);
+                $msgBody = '您申请的发票 ¥' . number_format((float)$row['amount'], 2, '.', '') . ' 已开具完成，发票号码：' . $invoiceNo;
+                if ($invoiceFile !== '') {
+                    $msgBody .= '，您可在「开具发票 - 开票记录」中在线预览或下载电子发票';
+                }
+                if (!empty($row['email'])) {
+                    $msgBody .= '（接收邮箱：' . $row['email'] . '）';
+                }
+                $this->sendUserMessage((int)$row['user_id'], '发票已开具', $msgBody);
+            } else {
+                InvoiceService::releaseInvoiceOrders((int)$row['id'], (string)$row['order_ids'], $now);
+                $this->sendUserMessage(
+                    (int)$row['user_id'],
+                    '开票申请已驳回',
+                    '您的开票申请 ¥' . number_format((float)$row['amount'], 2, '.', '') . ' 未通过审核：' . ($auditMsg !== '' ? $auditMsg : '请核对开票信息后重新提交')
+                );
+            }
+
             Db::commit();
         } catch (PDOException|\Exception $e) {
             Db::rollback();
@@ -156,9 +195,6 @@ class Invoice extends Backend
 
     /**
      * 向申请人发送站内消息
-     * @param int $userId 用户ID
-     * @param string $title 消息标题
-     * @param string $content 消息内容
      */
     protected function sendUserMessage($userId, $title, $content)
     {
@@ -167,7 +203,7 @@ class Invoice extends Backend
         }
         Db::name('message')->insert([
             'receive_type' => 'user',
-            'receive_id'   => $userId,
+            'receive_id'   => (int)$userId,
             'type'         => 'system',
             'title'        => mb_substr((string)$title, 0, 100),
             'content'      => mb_substr((string)$content, 0, 500),
diff --git a/server/application/admin/controller/InvoiceTitle.php b/server/application/admin/controller/InvoiceTitle.php
new file mode 100644
index 0000000..5127b53
--- /dev/null
+++ b/server/application/admin/controller/InvoiceTitle.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+use think\Db;
+
+/**
+ * 发票抬头档案管理
+ *
+ * @icon fa fa-address-card-o
+ */
+class InvoiceTitle extends Backend
+{
+    /**
+     * @var \app\admin\model\InvoiceTitle
+     */
+    protected $model = null;
+    protected $relationSearch = true;
+    protected $searchFields = 'id,title,tax_no,email,receive_mobile,user.nickname,merchant.name';
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\InvoiceTitle;
+        $this->view->assign('titleTypeList', $this->model->getTitleTypeList());
+        $this->view->assign('invoiceTypeList', $this->model->getDefaultInvoiceTypeList());
+    }
+
+    /**
+     * 抬头列表（关联所属用户/签约商户及累计开票统计）
+     */
+    public function index()
+    {
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->with(['user', 'merchant'])
+            ->where($where)
+            ->order($sort, $order)
+            ->paginate($limit);
+
+        $rows = $list->items();
+        $ids = [];
+        foreach ($rows as $r) {
+            $ids[] = (int)$r['id'];
+        }
+        $invStats = [];
+        if ($ids) {
+            $agg = Db::name('invoice')
+                ->where('title_id', 'in', $ids)
+                ->where('status', 'issued')
+                ->field('title_id, COUNT(*) AS cnt, SUM(amount) AS sum_amt')
+                ->group('title_id')
+                ->select();
+            foreach ($agg as $g) {
+                $invStats[(int)$g['title_id']] = [
+                    'cnt' => (int)$g['cnt'],
+                    'amt' => round((float)$g['sum_amt'], 2),
+                ];
+            }
+        }
+        foreach ($rows as &$item) {
+            $tid = (int)$item['id'];
+            $item['issued_count'] = $invStats[$tid]['cnt'] ?? 0;
+            $item['issued_amount'] = $invStats[$tid]['amt'] ?? 0.00;
+        }
+        unset($item);
+
+        return json(['total' => $list->total(), 'rows' => $rows]);
+    }
+
+    /**
+     * 发票抬头档案详情（关联历史开票记录）
+     */
+    public function detail($ids = null)
+    {
+        $row = $this->model->with(['user', 'merchant'])->where('invoice_title.id', (int)$ids)->find();
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $invoices = Db::name('invoice')
+            ->where('title_id', (int)$row['id'])
+            ->order('id desc')
+            ->limit(20)
+            ->select();
+
+        $this->view->assign([
+            'row'      => $row,
+            'invoices' => $invoices,
+        ]);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 财务协助订正抬头信息（如税号、开户行、邮箱笔误）
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        if (false === $this->request->isPost()) {
+            $this->view->assign('row', $row);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a', []);
+        $titleType = in_array($params['title_type'] ?? '', ['enterprise', 'personal'], true) ? $params['title_type'] : $row['title_type'];
+        $title = trim((string)($params['title'] ?? ''));
+        $taxNo = strtoupper(trim((string)($params['tax_no'] ?? '')));
+        if ($title === '') {
+            $this->error('发票抬头名称不能为空');
+        }
+        if ($titleType === 'enterprise' && $taxNo === '') {
+            $this->error('企业单位抬头必须填写纳税人识别号');
+        }
+
+        $row->save([
+            'title_type'           => $titleType,
+            'default_invoice_type' => in_array($params['default_invoice_type'] ?? '', ['normal', 'special'], true) ? $params['default_invoice_type'] : $row['default_invoice_type'],
+            'title'                => mb_substr($title, 0, 150),
+            'tax_no'               => mb_substr($taxNo, 0, 50),
+            'bank_name'            => mb_substr(trim((string)($params['bank_name'] ?? '')), 0, 100),
+            'bank_account'         => mb_substr(trim((string)($params['bank_account'] ?? '')), 0, 50),
+            'reg_address'          => mb_substr(trim((string)($params['reg_address'] ?? '')), 0, 255),
+            'reg_mobile'           => mb_substr(trim((string)($params['reg_mobile'] ?? '')), 0, 30),
+            'email'                => mb_substr(trim((string)($params['email'] ?? '')), 0, 100),
+            'receive_mobile'       => mb_substr(trim((string)($params['receive_mobile'] ?? '')), 0, 20),
+        ]);
+        $this->success();
+    }
+
+    /**
+     * 抬头由用户或企业入驻维护，后台不开放手工盲增
+     */
+    public function add()
+    {
+        $this->error('发票抬头由业主或签约企业在小程序端维护，后台无需手工新增');
+    }
+
+    /**
+     * 已关联开票申请的抬头禁止删除
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $used = (int)Db::name('invoice')->where('title_id', 'in', $idArr)->count();
+        if ($used > 0) {
+            $this->error('所选发票抬头已关联 ' . $used . ' 笔开票记录，禁止删除');
+        }
+        return parent::del($ids);
+    }
+}
diff --git a/server/application/admin/controller/Master.php b/server/application/admin/controller/Master.php
index 5c5e058..19e3240 100644
--- a/server/application/admin/controller/Master.php
+++ b/server/application/admin/controller/Master.php
@@ -3,20 +3,23 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use think\Db;
+use Exception;
 
 /**
- * 师傅档案
+ * 师傅档案与资质管理
  *
- * @icon fa fa-circle-o
+ * @icon fa fa-wrench
  */
 class Master extends Backend
 {
-
     /**
      * Master模型对象
      * @var \app\admin\model\Master
      */
     protected $model = null;
+    protected $relationSearch = true;
+    protected $searchFields = 'id,realname,mobile,city';
 
     public function _initialize()
     {
@@ -26,8 +29,6 @@ class Master extends Backend
         $this->view->assign("verifyStatusList", $this->model->getVerifyStatusList());
     }
 
-    protected $relationSearch = true;
-
     public function index()
     {
         $this->request->filter(['strip_tags', 'trim']);
@@ -44,12 +45,11 @@ class Master extends Backend
             ->order($sort, $order)
             ->paginate($limit);
 
-        // 合并查出当前页每个师傅拥有的技能
         $items = $list->items();
         $masterIds = array_column($items, 'id');
         $skillsGroup = [];
         if (!empty($masterIds)) {
-            $allSkills = \think\Db::name('master_skill')
+            $allSkills = Db::name('master_skill')
                 ->where('master_id', 'in', $masterIds)
                 ->where('status', 'normal')
                 ->select();
@@ -63,13 +63,169 @@ class Master extends Backend
         foreach ($items as &$it) {
             $it['skills_list'] = $skillsGroup[$it['id']] ?? [];
         }
+        unset($it);
 
-        $result = ['total' => $list->total(), 'rows' => $items];
-        return json($result);
+        return json(['total' => $list->total(), 'rows' => $items]);
     }
 
     /**
-     * 师傅服务技能管理（内置于师傅列表）
+     * 新增认证师傅档案（校验用户唯一绑定，强制初始化资金与履约统计为 0）
+     */
+    public function add()
+    {
+        if (false === $this->request->isPost()) {
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a', []);
+        if (!$params) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+        $uid = (int)($params['user_id'] ?? 0);
+        if ($uid <= 0) {
+            $this->error('请选择关联的平台注册用户账号');
+        }
+        if (Db::name('master')->where('user_id', $uid)->count() > 0) {
+            $this->error('该用户已绑定过师傅档案，请勿重复创建');
+        }
+        $params['money']        = 0.00;
+        $params['frozen_money'] = 0.00;
+        $params['order_count']  = 0;
+        $params['level']        = max(1, (int)($params['level'] ?? 1));
+        $params['score']        = 5.00;
+        $params['accept_rate']  = 100.00;
+        $params['ontime_rate']  = 100.00;
+
+        $result = $this->model->allowField(true)->save($params);
+        if ($result !== false) {
+            $this->success();
+        }
+        $this->error($this->model->getError() ?: __('No rows were inserted'));
+    }
+
+    /**
+     * 删除保护：已产生承接工单、钱包余额或结算流水的师傅禁止物理删除
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $hasOrder = Db::name('order')->where('master_id', 'in', $idArr)->count();
+        $hasFund = Db::name('master')->where('id', 'in', $idArr)->where('money > 0 OR frozen_money > 0')->count();
+        $hasSettle = Db::name('settle')->where('master_id', 'in', $idArr)->count();
+        if ($hasOrder > 0 || $hasFund > 0 || $hasSettle > 0) {
+            $this->error('所选师傅已关联历史工单、结算记录或存在钱包资金，禁止物理删除；如需停用请关闭听单状态');
+        }
+        Db::startTrans();
+        try {
+            Db::name('master_skill')->where('master_id', 'in', $idArr)->delete();
+            $deleted = Db::name('master')->where('id', 'in', $idArr)->delete();
+            Db::commit();
+        } catch (Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($deleted) {
+            $this->success();
+        }
+        $this->error(__('No rows were deleted'));
+    }
+
+    /**
+     * 编辑师傅资料与入驻资质审核（状态变更自动触发通知）
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $oldVerify = (string)$row['verify_status'];
+
+        if ($this->request->isPost()) {
+            $params = $this->request->post("row/a");
+            if ($params) {
+                $params = $this->preExcludeFields($params);
+                // 禁止在师傅档案编辑中直接篡改钱包可用余额、冻结资金与累计完单数
+                unset($params['money'], $params['frozen_money'], $params['order_count']);
+
+                // 若提交的身份证号包含脱敏星号 *，保留原数据库记录不覆盖；若为新填写明文则做合法性校验
+                if (isset($params['idcard_no'])) {
+                    $idcardInput = trim((string)$params['idcard_no']);
+                    if (strpos($idcardInput, '*') !== false) {
+                        unset($params['idcard_no']);
+                    } elseif ($idcardInput !== '' && !preg_match('/^(^\d{15}$)|(^\d{17}([0-9]|X|x)$)$/', $idcardInput)) {
+                        $this->error('请输入正确的15位或18位身份证号码');
+                    }
+                }
+
+                // 若 city-picker 因省市格式差异未选新值导致提交为空而原库有城市，保留原城市不清空
+                if (isset($params['city']) && trim((string)$params['city']) === '' && !empty($row['city'])) {
+                    unset($params['city']);
+                }
+
+                if (isset($params['verify_status']) && $params['verify_status'] === 'reject' && empty(trim((string)($params['audit_msg'] ?? '')))) {
+                    $this->error('驳回实名认证时请填写审核意见说明');
+                }
+                $result = false;
+                Db::startTrans();
+                try {
+                    $result = $row->allowField(true)->save($params);
+                    $newVerify = isset($params['verify_status']) ? (string)$params['verify_status'] : $oldVerify;
+                    if ($newVerify !== $oldVerify && in_array($newVerify, ['pass', 'reject'], true)) {
+                        $now = time();
+                        $title = $newVerify === 'pass' ? '师傅入驻审核通过' : '师傅入驻审核未通过';
+                        $content = $newVerify === 'pass'
+                            ? '您的师傅实名认证已审核通过，现在可开启听单承接同城服务工单。'
+                            : ('您的师傅认证申请未通过，原因：' . (trim((string)($params['audit_msg'] ?? '')) ?: '请核对资料后重新提交'));
+                        Db::name('message')->insert([
+                            'receive_type' => 'master',
+                            'receive_id'   => (int)$row['id'],
+                            'type'         => 'audit',
+                            'title'        => $title,
+                            'content'      => $content,
+                            'order_id'     => 0,
+                            'is_read'      => 0,
+                            'createtime'   => $now,
+                        ]);
+                        if ((int)$row['user_id'] > 0) {
+                            Db::name('message')->insert([
+                                'receive_type' => 'user',
+                                'receive_id'   => (int)$row['user_id'],
+                                'type'         => 'audit',
+                                'title'        => $title,
+                                'content'      => $content,
+                                'order_id'     => 0,
+                                'is_read'      => 0,
+                                'createtime'   => $now,
+                            ]);
+                        }
+                    }
+                    Db::commit();
+                } catch (Exception $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                }
+                if ($result !== false) {
+                    $this->success();
+                }
+                $this->error(__('No rows were updated'));
+            }
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+
+        $this->view->assign("row", $row);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 师傅服务技能管理（保留既有证书与元数据）
      */
     public function skills($ids = null)
     {
@@ -82,83 +238,96 @@ class Master extends Backend
             $selectedSkills = (array)$this->request->post('skills/a', []);
             $customText = trim((string)$this->request->post('custom_text', ''));
 
-            // 1. 处理自定义输入的技能
             $customNames = [];
             if (!empty($customText)) {
                 $parts = preg_split('/[,，\s]+/u', $customText);
                 foreach ($parts as $p) {
                     $p = trim($p);
-                    if (!empty($p) && !in_array($p, $customNames) && !in_array($p, $selectedSkills)) {
+                    if (!empty($p) && !in_array($p, $customNames, true) && !in_array($p, $selectedSkills, true)) {
                         $customNames[] = $p;
                     }
                 }
             }
 
-            // 2. 清理当前师傅原有的技能
-            \think\Db::name('master_skill')->where('master_id', $row['id'])->delete();
+            // 缓存师傅原有技能的证书图片与分类ID，防止保存时丢失证书
+            $existingRows = Db::name('master_skill')->where('master_id', $row['id'])->select();
+            $existingMap = [];
+            foreach ($existingRows as $er) {
+                $existingMap[(string)$er['skill_name']] = $er;
+            }
 
-            // 3. 写入选中的技能
-            $dictRows = \think\Db::name('skill_dict')->where('name', 'in', $selectedSkills)->select();
+            $dictRows = !empty($selectedSkills)
+                ? Db::name('skill_dict')->where('name', 'in', $selectedSkills)->select()
+                : [];
             $dictMap = [];
             foreach ($dictRows as $dr) {
                 $dictMap[$dr['name']] = $dr;
             }
 
             $now = time();
-            foreach ($selectedSkills as $sName) {
-                $dict = $dictMap[$sName] ?? null;
-                \think\Db::name('master_skill')->insert([
-                    'master_id'  => $row['id'],
-                    'cat_id'     => 0,
-                    'skill_id'   => $dict ? $dict['id'] : 0,
-                    'skill_name' => $sName,
-                    'category'   => $dict ? $dict['category'] : '服务技能',
-                    'is_custom'  => 0,
-                    'cert_image' => '',
-                    'status'     => 'normal',
-                    'createtime' => $now
-                ]);
-            }
+            Db::startTrans();
+            try {
+                Db::name('master_skill')->where('master_id', $row['id'])->delete();
 
-            // 4. 处理自定义输入的技能（沉淀入库）
-            foreach ($customNames as $cName) {
-                $exist = \think\Db::name('skill_dict')->where('name', $cName)->find();
-                if (!$exist) {
-                    $skillDictId = \think\Db::name('skill_dict')->insertGetId([
-                        'category_id'=> 0,
-                        'category'   => '其他技能',
-                        'name'       => $cName,
-                        'source'     => 'custom',
+                foreach ($selectedSkills as $sName) {
+                    $dict = $dictMap[$sName] ?? null;
+                    $old = $existingMap[$sName] ?? null;
+                    Db::name('master_skill')->insert([
                         'master_id'  => $row['id'],
-                        'weigh'      => 0,
+                        'cat_id'     => $old ? (int)$old['cat_id'] : 0,
+                        'skill_id'   => $dict ? (int)$dict['id'] : ($old ? (int)$old['skill_id'] : 0),
+                        'skill_name' => $sName,
+                        'category'   => $dict ? $dict['category'] : ($old && !empty($old['category']) ? $old['category'] : '服务技能'),
+                        'is_custom'  => 0,
+                        'cert_image' => $old ? (string)$old['cert_image'] : '',
                         'status'     => 'normal',
-                        'createtime' => $now,
-                        'updatetime' => $now
+                        'createtime' => $old ? (int)$old['createtime'] : $now,
                     ]);
-                } else {
-                    $skillDictId = $exist['id'];
                 }
 
-                \think\Db::name('master_skill')->insert([
-                    'master_id'  => $row['id'],
-                    'cat_id'     => 0,
-                    'skill_id'   => $skillDictId,
-                    'skill_name' => $cName,
-                    'category'   => '其他技能',
-                    'is_custom'  => 1,
-                    'cert_image' => '',
-                    'status'     => 'normal',
-                    'createtime' => $now
-                ]);
+                foreach ($customNames as $cName) {
+                    $exist = Db::name('skill_dict')->where('name', $cName)->find();
+                    if (!$exist) {
+                        $skillDictId = Db::name('skill_dict')->insertGetId([
+                            'category_id' => 0,
+                            'category'    => '其他技能',
+                            'name'        => $cName,
+                            'source'      => 'custom',
+                            'master_id'   => $row['id'],
+                            'weigh'       => 0,
+                            'status'      => 'normal',
+                            'createtime'  => $now,
+                            'updatetime'  => $now,
+                        ]);
+                    } else {
+                        $skillDictId = (int)$exist['id'];
+                    }
+                    $old = $existingMap[$cName] ?? null;
+                    Db::name('master_skill')->insert([
+                        'master_id'  => $row['id'],
+                        'cat_id'     => $old ? (int)$old['cat_id'] : 0,
+                        'skill_id'   => $skillDictId,
+                        'skill_name' => $cName,
+                        'category'   => $exist && !empty($exist['category']) ? $exist['category'] : '其他技能',
+                        'is_custom'  => 1,
+                        'cert_image' => $old ? (string)$old['cert_image'] : '',
+                        'status'     => 'normal',
+                        'createtime' => $old ? (int)$old['createtime'] : $now,
+                    ]);
+                }
+
+                Db::commit();
+            } catch (Exception $e) {
+                Db::rollback();
+                $this->error($e->getMessage());
             }
 
             $this->success('技能配置更新成功');
         }
 
-        // 读取技能字典全部分类与技能
-        $categories = \think\Db::name('skill_category')->where('status', 'normal')->order('weigh desc')->select();
-        $allDictSkills = \think\Db::name('skill_dict')->where('status', 'normal')->order('weigh desc')->select();
-        
+        $categories = Db::name('skill_category')->where('status', 'normal')->order('weigh desc')->select();
+        $allDictSkills = Db::name('skill_dict')->where('status', 'normal')->order('weigh desc')->select();
+
         $catTree = [];
         foreach ($categories as $cat) {
             $catTree[$cat['name']] = [];
@@ -171,12 +340,11 @@ class Master extends Backend
             $catTree[$cName][] = $item;
         }
 
-        // 读取当前师傅已拥有的技能
-        $mySkills = \think\Db::name('master_skill')->where('master_id', $row['id'])->select();
+        $mySkills = Db::name('master_skill')->where('master_id', $row['id'])->select();
         $selectedSkills = [];
         $customArr = [];
         foreach ($mySkills as $ms) {
-            if ($ms['is_custom'] == 1) {
+            if ((int)$ms['is_custom'] === 1 && !Db::name('skill_dict')->where('name', $ms['skill_name'])->where('source', '<>', 'custom')->count()) {
                 $customArr[] = $ms['skill_name'];
             } else {
                 $selectedSkills[] = $ms['skill_name'];
@@ -195,45 +363,78 @@ class Master extends Backend
      */
     public function detail($ids = null)
     {
-        $row = $this->model->with(['user'])->find($ids);
+        $row = $this->model->with(['user'])->where('master.id', (int)$ids)->find();
         if (!$row) {
             $this->error(__('No Results were found'));
         }
 
+        $orderModel = new \app\admin\model\Order;
+        $statusMap = $orderModel->getStatusList();
+
         // 1. 最近接单记录
-        $recentOrders = \think\Db::name('order')
+        $recentOrders = Db::name('order')
+            ->where('master_id', $row['id'])
+            ->order('id desc')
+            ->limit(8)
+            ->select();
+        foreach ($recentOrders as &$o) {
+            $o['status_label'] = $statusMap[(int)$o['status']] ?? ('状态' . $o['status']);
+        }
+        unset($o);
+
+        // 2. 提现流水
+        $recentWithdraws = Db::name('withdraw')
             ->where('master_id', $row['id'])
             ->order('id desc')
             ->limit(6)
             ->select();
 
-        // 2. 提现流水
-        $recentWithdraws = \think\Db::name('withdraw')
-            ->where('master_id', $row['id'])
-            ->order('id desc')
+        // 3. 工单佣金结算记录
+        $recentSettles = Db::name('settle')
+            ->alias('s')
+            ->join('order o', 'o.id = s.order_id', 'LEFT')
+            ->where('s.master_id', $row['id'])
+            ->field('s.*, o.order_no, o.service_name')
+            ->order('s.id desc')
+            ->limit(6)
+            ->select();
+
+        // 4. 客户评价记录
+        $recentReviews = Db::name('review')
+            ->alias('r')
+            ->join('order o', 'o.id = r.order_id', 'LEFT')
+            ->join('user u', 'u.id = r.user_id', 'LEFT')
+            ->where('r.master_id', $row['id'])
+            ->field('r.*, o.order_no, o.service_name, u.nickname as user_nickname')
+            ->order('r.id desc')
             ->limit(5)
             ->select();
 
-        // 3. 服务好评记录
-        $recentReviews = \think\Db::name('review')
-            ->where('master_id', $row['id'])
-            ->order('id desc')
-            ->limit(5)
-            ->select();
-
-        // 4. 服务技能与认证证书
-        $skills = \think\Db::name('master_skill')
+        // 5. 服务技能与认证证书
+        $skills = Db::name('master_skill')
             ->alias('s')
             ->join('service_cat c', 'c.id = s.cat_id', 'LEFT')
             ->where('s.master_id', $row['id'])
             ->field('s.*, c.name as cat_name')
             ->select();
 
-        $this->view->assign('row', $row);
-        $this->view->assign('recentOrders', $recentOrders);
-        $this->view->assign('recentWithdraws', $recentWithdraws);
-        $this->view->assign('recentReviews', $recentReviews);
-        $this->view->assign('skills', $skills);
+        // 6. 钱包资金变动流水
+        $walletLogs = Db::name('wallet_log')
+            ->where('user_type', 'master')
+            ->where('user_id', $row['id'])
+            ->order('id desc')
+            ->limit(6)
+            ->select();
+
+        $this->view->assign([
+            'row'             => $row,
+            'recentOrders'    => $recentOrders,
+            'recentWithdraws' => $recentWithdraws,
+            'recentSettles'   => $recentSettles,
+            'recentReviews'   => $recentReviews,
+            'skills'          => $skills,
+            'walletLogs'      => $walletLogs,
+        ]);
 
         return $this->view->fetch();
     }
diff --git a/server/application/admin/controller/Merchant.php b/server/application/admin/controller/Merchant.php
index 65167be..72a098a 100644
--- a/server/application/admin/controller/Merchant.php
+++ b/server/application/admin/controller/Merchant.php
@@ -3,20 +3,24 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use app\common\library\InvoiceService;
+use think\Db;
+use Exception;
 
 /**
- * 商家档案
+ * 合作商家与企业档案管理
  *
- * @icon fa fa-circle-o
+ * @icon fa fa-building-o
  */
 class Merchant extends Backend
 {
-
     /**
      * Merchant模型对象
      * @var \app\admin\model\Merchant
      */
     protected $model = null;
+    protected $relationSearch = true;
+    protected $searchFields = 'id,name,license_no,contact,mobile';
 
     public function _initialize()
     {
@@ -26,8 +30,6 @@ class Merchant extends Backend
         $this->view->assign("verifyStatusList", $this->model->getVerifyStatusList());
     }
 
-    protected $relationSearch = true;
-
     public function index()
     {
         $this->request->filter(['strip_tags', 'trim']);
@@ -43,29 +45,322 @@ class Merchant extends Backend
             ->where($where)
             ->order($sort, $order)
             ->paginate($limit);
-        $result = ['total' => $list->total(), 'rows' => $list->items()];
-        return json($result);
+
+        $rows = $list->items();
+        if (!empty($rows)) {
+            $mIds = array_column($rows, 'id');
+
+            // 1. 查询子账号归属映射
+            $members = Db::name('merchant_member')->where('merchant_id', 'in', $mIds)->select();
+            $mUidsMap = [];
+            $memberCntMap = [];
+            foreach ($rows as $r) {
+                $mid = (int)$r['id'];
+                $mUidsMap[$mid] = (int)$r['user_id'] > 0 ? [(int)$r['user_id']] : [];
+                $memberCntMap[$mid] = 0;
+            }
+            foreach ($members as $mb) {
+                $mid = (int)$mb['merchant_id'];
+                $uid = (int)$mb['user_id'];
+                $memberCntMap[$mid] = ($memberCntMap[$mid] ?? 0) + 1;
+                if ($uid > 0 && !in_array($uid, $mUidsMap[$mid], true)) {
+                    $mUidsMap[$mid][] = $uid;
+                }
+            }
+
+            // 2. 汇总所有可能关联订单（通过 merchant_order 或商户主/子账号下单）
+            $allUids = [];
+            foreach ($mUidsMap as $uArr) {
+                foreach ($uArr as $u) {
+                    $allUids[$u] = $u;
+                }
+            }
+            $moRows = Db::name('merchant_order')->where('merchant_id', 'in', $mIds)->select();
+            $moOrderIds = array_column($moRows, 'order_id');
+            $orderToMid = [];
+            foreach ($moRows as $mo) {
+                $orderToMid[(int)$mo['order_id']] = (int)$mo['merchant_id'];
+            }
+
+            $uidToMid = [];
+            foreach ($mUidsMap as $mid => $uArr) {
+                foreach ($uArr as $u) {
+                    $uidToMid[$u] = $mid;
+                }
+            }
+
+            $orderQuery = Db::name('order')->field('id,user_id,pay_amount,pay_status,status');
+            if (!empty($allUids) && !empty($moOrderIds)) {
+                $orderQuery->where(function ($q) use ($allUids, $moOrderIds) {
+                    $q->where('user_id', 'in', array_values($allUids))
+                        ->whereOr('id', 'in', $moOrderIds);
+                });
+                $relOrders = $orderQuery->select();
+            } elseif (!empty($allUids)) {
+                $relOrders = $orderQuery->where('user_id', 'in', array_values($allUids))->select();
+            } elseif (!empty($moOrderIds)) {
+                $relOrders = $orderQuery->where('id', 'in', $moOrderIds)->select();
+            } else {
+                $relOrders = [];
+            }
+
+            $statCnt = [];
+            $statAmt = [];
+            foreach ($relOrders as $ord) {
+                $oid = (int)$ord['id'];
+                $mid = $orderToMid[$oid] ?? ($uidToMid[(int)$ord['user_id']] ?? 0);
+                if ($mid <= 0) continue;
+                $statCnt[$mid] = ($statCnt[$mid] ?? 0) + 1;
+                if ((int)$ord['pay_status'] === 1 && (int)$ord['status'] !== 9) {
+                    $statAmt[$mid] = round(($statAmt[$mid] ?? 0) + (float)$ord['pay_amount'], 2);
+                }
+            }
+
+            foreach ($rows as &$r) {
+                $mid = (int)$r['id'];
+                $r['order_count'] = $statCnt[$mid] ?? (int)$r['order_count'];
+                $r['total_amount'] = isset($statAmt[$mid]) ? number_format($statAmt[$mid], 2, '.', '') : number_format((float)$r['total_amount'], 2, '.', '');
+                $r['member_count'] = $memberCntMap[$mid] ?? 0;
+            }
+            unset($r);
+        }
+
+        return json(['total' => $list->total(), 'rows' => $rows]);
     }
 
     /**
-     * 商户企业全景资质
+     * 新增合作企业档案（防重复绑定同一用户，审核通过自动同步默认企业发票抬头）
+     */
+    public function add()
+    {
+        if (false === $this->request->isPost()) {
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a', []);
+        if (!$params) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+        $uid = (int)($params['user_id'] ?? 0);
+        if ($uid <= 0) {
+            $this->error('请选择关联的平台注册用户账号');
+        }
+        if (Db::name('merchant')->where('user_id', $uid)->count() > 0) {
+            $this->error('该用户账号已绑定企业商家主体，请勿重复创建');
+        }
+        $params['order_count']  = 0;
+        $params['total_amount'] = 0.00;
+        if (($params['verify_status'] ?? '') === 'reject' && empty(trim((string)($params['audit_msg'] ?? '')))) {
+            $this->error('驳回企业入驻时请填写审核驳回原因');
+        }
+
+        $result = false;
+        Db::startTrans();
+        try {
+            $result = $this->model->allowField(true)->save($params);
+            if (($params['verify_status'] ?? '') === 'pass' && $uid > 0) {
+                $ctx = InvoiceService::resolveContext($uid);
+                InvoiceService::ensureMerchantDefaultTitle($ctx);
+            }
+            Db::commit();
+        } catch (Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($result !== false) {
+            $this->success();
+        }
+        $this->error($this->model->getError() ?: __('No rows were inserted'));
+    }
+
+    /**
+     * 删除保护：已产生企业批次订单或开票记录的商户禁止物理删除
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $hasOrder = Db::name('merchant_order')->where('merchant_id', 'in', $idArr)->count();
+        $hasInvoice = Db::name('invoice')->where('merchant_id', 'in', $idArr)->count();
+        if ($hasOrder > 0 || $hasInvoice > 0) {
+            $this->error('所选企业已关联历史发包订单或开票记录，禁止物理删除');
+        }
+        Db::startTrans();
+        try {
+            Db::name('merchant_member')->where('merchant_id', 'in', $idArr)->delete();
+            $deleted = Db::name('merchant')->where('id', 'in', $idArr)->delete();
+            Db::commit();
+        } catch (Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($deleted) {
+            $this->success();
+        }
+        $this->error(__('No rows were deleted'));
+    }
+
+    /**
+     * 编辑企业档案与入驻审核（审核通过自动同步企业默认发票抬头并发送通知）
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $oldVerify = (string)$row['verify_status'];
+
+        if ($this->request->isPost()) {
+            $params = $this->request->post("row/a");
+            if ($params) {
+                $params = $this->preExcludeFields($params);
+                unset($params['order_count'], $params['total_amount']);
+                if (isset($params['city']) && trim((string)$params['city']) === '' && !empty($row['city'])) {
+                    unset($params['city']);
+                }
+                if (isset($params['verify_status']) && $params['verify_status'] === 'reject' && empty(trim((string)($params['audit_msg'] ?? '')))) {
+                    $this->error('驳回企业入驻时请填写审核驳回原因');
+                }
+                $result = false;
+                Db::startTrans();
+                try {
+                    $result = $row->allowField(true)->save($params);
+                    $newVerify = isset($params['verify_status']) ? (string)$params['verify_status'] : $oldVerify;
+                    if ($newVerify !== $oldVerify && in_array($newVerify, ['pass', 'reject'], true)) {
+                        if ($newVerify === 'pass' && (int)$row['user_id'] > 0) {
+                            $ctx = InvoiceService::resolveContext((int)$row['user_id']);
+                            InvoiceService::ensureMerchantDefaultTitle($ctx);
+                        }
+                        if ((int)$row['user_id'] > 0) {
+                            Db::name('message')->insert([
+                                'receive_type' => 'user',
+                                'receive_id'   => (int)$row['user_id'],
+                                'type'         => 'audit',
+                                'title'        => $newVerify === 'pass' ? '企业商家认证已通过' : '企业商家认证未通过',
+                                'content'      => $newVerify === 'pass'
+                                    ? ('您提交的企业【' . $row['name'] . '】资质审核已通过，现可使用商家工作台批量派单与开票服务。')
+                                    : ('企业【' . $row['name'] . '】资质审核未通过，原因：' . (trim((string)($params['audit_msg'] ?? '')) ?: '请核对营业执照信息后重新提交')),
+                                'order_id'     => 0,
+                                'is_read'      => 0,
+                                'createtime'   => time(),
+                            ]);
+                        }
+                    }
+                    Db::commit();
+                } catch (Exception $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                }
+                if ($result !== false) {
+                    $this->success();
+                }
+                $this->error(__('No rows were updated'));
+            }
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+
+        $this->view->assign("row", $row);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 商户企业全景资质与业务协同看板
      */
     public function detail($ids = null)
     {
-        $row = $this->model->with(['user'])->find($ids);
+        $row = $this->model->with(['user'])->where('merchant.id', (int)$ids)->find();
         if (!$row) {
             $this->error(__('No Results were found'));
         }
 
-        // 查询商户派发的工单记录
-        $recentOrders = \think\Db::name('order')
-            ->where('user_id', $row['user_id'])
+        $mid = (int)$row['id'];
+        $uids = (int)$row['user_id'] > 0 ? [(int)$row['user_id']] : [];
+
+        // 1. 企业员工协同子账号
+        $members = Db::name('merchant_member')
+            ->alias('mm')
+            ->join('user u', 'u.id = mm.user_id', 'LEFT')
+            ->where('mm.merchant_id', $mid)
+            ->field('mm.*, u.nickname, u.username, u.mobile')
+            ->order('mm.id desc')
+            ->select();
+        foreach ($members as $mb) {
+            if ((int)$mb['user_id'] > 0 && !in_array((int)$mb['user_id'], $uids, true)) {
+                $uids[] = (int)$mb['user_id'];
+            }
+        }
+
+        // 2. 商户关联工单统计与最近列表（兼容 merchant_order 与账号下单）
+        $moOrderIds = Db::name('merchant_order')->where('merchant_id', $mid)->column('order_id');
+        $buildOrderScope = function ($q) use ($uids, $moOrderIds) {
+            if (!empty($uids) && !empty($moOrderIds)) {
+                $q->where('o.user_id', 'in', $uids)->whereOr('o.id', 'in', $moOrderIds);
+            } elseif (!empty($uids)) {
+                $q->where('o.user_id', 'in', $uids);
+            } elseif (!empty($moOrderIds)) {
+                $q->where('o.id', 'in', $moOrderIds);
+            } else {
+                $q->where('o.id', 0);
+            }
+        };
+
+        $orderAgg = Db::name('order')->alias('o')
+            ->field('COUNT(*) AS total_cnt, SUM(CASE WHEN o.pay_status = 1 AND o.status <> 9 THEN o.pay_amount ELSE 0 END) AS total_gmv')
+            ->where($buildOrderScope)
+            ->find();
+
+        $statusMap = (new \app\admin\model\Order)->getStatusList();
+        $recentOrders = Db::name('order')->alias('o')
+            ->join('master m', 'm.id = o.master_id', 'LEFT')
+            ->join('merchant_order mo', 'mo.order_id = o.id', 'LEFT')
+            ->where($buildOrderScope)
+            ->field('o.*, m.realname as master_name, mo.batch_no')
+            ->order('o.id desc')
+            ->limit(8)
+            ->select();
+        foreach ($recentOrders as &$o) {
+            $o['status_label'] = $statusMap[(int)$o['status']] ?? ('状态' . $o['status']);
+        }
+        unset($o);
+
+        // 3. 关联发票抬头与历史开票记录
+        $titleList = Db::name('invoice_title')
+            ->where(function ($q) use ($mid, $uids) {
+                $q->where('merchant_id', $mid);
+                if (!empty($uids)) {
+                    $q->whereOr('user_id', 'in', $uids);
+                }
+            })
+            ->order('is_default desc, id desc')
+            ->select();
+
+        $invoiceList = Db::name('invoice')
+            ->where(function ($q) use ($mid, $uids) {
+                $q->where('merchant_id', $mid);
+                if (!empty($uids)) {
+                    $q->whereOr('user_id', 'in', $uids);
+                }
+            })
             ->order('id desc')
             ->limit(6)
             ->select();
 
-        $this->view->assign('row', $row);
-        $this->view->assign('recentOrders', $recentOrders);
+        $this->view->assign([
+            'row'          => $row,
+            'members'      => $members,
+            'recentOrders' => $recentOrders,
+            'titleList'    => $titleList,
+            'invoiceList'  => $invoiceList,
+            'orderCount'   => (int)($orderAgg['total_cnt'] ?? 0),
+            'orderGmv'     => number_format((float)($orderAgg['total_gmv'] ?? 0), 2, '.', ''),
+        ]);
 
         return $this->view->fetch();
     }
diff --git a/server/application/admin/controller/Message.php b/server/application/admin/controller/Message.php
index f01a1e7..4593b64 100644
--- a/server/application/admin/controller/Message.php
+++ b/server/application/admin/controller/Message.php
@@ -3,20 +3,22 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use think\Db;
+use think\exception\PDOException;
 
 /**
- * 消息中心
+ * 消息通知中心
  *
- * @icon fa fa-circle-o
+ * @icon fa fa-bell-o
  */
 class Message extends Backend
 {
-
     /**
      * Message模型对象
      * @var \app\admin\model\Message
      */
     protected $model = null;
+    protected $searchFields = 'id,title,content';
 
     public function _initialize()
     {
@@ -26,13 +28,189 @@ class Message extends Backend
         $this->view->assign("typeList", $this->model->getTypeList());
     }
 
+    /**
+     * 消息列表（批量补齐接收人真实姓名/昵称、手机号及关联工单号）
+     */
+    public function index()
+    {
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->where($where)
+            ->order($sort, $order)
+            ->paginate($limit);
 
+        $rows = $list->items();
+        $userIds = [];
+        $masterIds = [];
+        $orderIds = [];
+        foreach ($rows as $r) {
+            if ($r['receive_type'] === 'master' && (int)$r['receive_id'] > 0) {
+                $masterIds[] = (int)$r['receive_id'];
+            } elseif ($r['receive_type'] === 'user' && (int)$r['receive_id'] > 0) {
+                $userIds[] = (int)$r['receive_id'];
+            }
+            if ((int)$r['order_id'] > 0) {
+                $orderIds[] = (int)$r['order_id'];
+            }
+        }
+
+        $userMap = $userIds
+            ? Db::name('user')->where('id', 'in', array_unique($userIds))->column('id,nickname,username,mobile', 'id')
+            : [];
+        $masterMap = $masterIds
+            ? Db::name('master')->where('id', 'in', array_unique($masterIds))->column('id,realname,mobile', 'id')
+            : [];
+        $orderMap = $orderIds
+            ? Db::name('order')->where('id', 'in', array_unique($orderIds))->column('order_no', 'id')
+            : [];
+
+        foreach ($rows as &$item) {
+            $rid = (int)$item['receive_id'];
+            if ($item['receive_type'] === 'master') {
+                $m = $masterMap[$rid] ?? null;
+                $item['receiver_name'] = $m ? ($m['realname'] ?: ('师傅#' . $rid)) : ('师傅#' . $rid);
+                $item['receiver_mobile'] = $m['mobile'] ?? '';
+            } else {
+                $u = $userMap[$rid] ?? null;
+                $item['receiver_name'] = $u ? ($u['nickname'] ?: ($u['username'] ?: ('用户#' . $rid))) : ('用户#' . $rid);
+                $item['receiver_mobile'] = $u['mobile'] ?? '';
+            }
+            $oid = (int)$item['order_id'];
+            $item['order_no'] = $oid > 0 ? ($orderMap[$oid] ?? '') : '';
+        }
+        unset($item);
+
+        return json(['total' => $list->total(), 'rows' => $rows]);
+    }
 
     /**
-     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
-     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
-     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     * 消息详情回看
      */
+    public function detail($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $receiver = [];
+        if ($row['receive_type'] === 'master' && (int)$row['receive_id'] > 0) {
+            $m = Db::name('master')->where('id', (int)$row['receive_id'])->field('id,realname,mobile,city')->find();
+            if ($m) {
+                $receiver = ['name' => $m['realname'], 'mobile' => $m['mobile'], 'extra' => $m['city'] ?: '认证师傅'];
+            }
+        } elseif ((int)$row['receive_id'] > 0) {
+            $u = Db::name('user')->where('id', (int)$row['receive_id'])->field('id,nickname,username,mobile')->find();
+            if ($u) {
+                $receiver = ['name' => $u['nickname'] ?: $u['username'], 'mobile' => $u['mobile'], 'extra' => '平台注册用户'];
+            }
+        }
+        $order = (int)$row['order_id'] > 0
+            ? Db::name('order')->where('id', (int)$row['order_id'])->field('id,order_no,service_name,pay_amount,status')->find()
+            : null;
 
+        $this->view->assign([
+            'row'      => $row,
+            'receiver' => $receiver,
+            'order'    => $order ?: [],
+        ]);
+        return $this->view->fetch();
+    }
 
+    /**
+     * 下发站内通知（支持选择单个或多个用户/师傅批量推送）
+     */
+    public function add()
+    {
+        if (false === $this->request->isPost()) {
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a', []);
+        $receiveType = in_array($params['receive_type'] ?? '', ['user', 'master'], true) ? $params['receive_type'] : 'user';
+        $rawIds = $receiveType === 'master'
+            ? ($params['receive_master_id'] ?? ($params['receive_id'] ?? ''))
+            : ($params['receive_user_id'] ?? ($params['receive_id'] ?? ''));
+
+        $idArr = array_values(array_unique(array_filter(array_map('intval', explode(',', (string)$rawIds)))));
+        if (!$idArr) {
+            $this->error('请至少选择一位消息接收对象');
+        }
+        $title = trim((string)($params['title'] ?? ''));
+        $content = trim((string)($params['content'] ?? ''));
+        if ($title === '' || $content === '') {
+            $this->error('通知标题与正文内容不能为空');
+        }
+        $msgType = in_array($params['type'] ?? '', ['order', 'system', 'audit', 'remind'], true) ? $params['type'] : 'system';
+        $orderId = max(0, (int)($params['order_id'] ?? 0));
+        $isRead  = !empty($params['is_read']) ? 1 : 0;
+        $now     = time();
+
+        $insertRows = [];
+        foreach ($idArr as $rid) {
+            $insertRows[] = [
+                'receive_type' => $receiveType,
+                'receive_id'   => $rid,
+                'type'         => $msgType,
+                'title'        => mb_substr($title, 0, 100),
+                'content'      => mb_substr($content, 0, 500),
+                'order_id'     => $orderId,
+                'is_read'      => $isRead,
+                'createtime'   => $now,
+            ];
+        }
+
+        Db::startTrans();
+        try {
+            Db::name('message')->insertAll($insertRows);
+            Db::commit();
+        } catch (PDOException|\Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        $this->success('成功发送 ' . count($insertRows) . ' 条站内通知');
+    }
+
+    /**
+     * 编辑站内通知
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        if (false === $this->request->isPost()) {
+            $this->view->assign('row', $row);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a', []);
+        $receiveType = in_array($params['receive_type'] ?? '', ['user', 'master'], true) ? $params['receive_type'] : $row['receive_type'];
+        $receiveId = $receiveType === 'master'
+            ? (int)($params['receive_master_id'] ?? ($params['receive_id'] ?? 0))
+            : (int)($params['receive_user_id'] ?? ($params['receive_id'] ?? 0));
+        if ($receiveId <= 0) {
+            $this->error('请选择有效的接收对象');
+        }
+
+        $data = [
+            'receive_type' => $receiveType,
+            'receive_id'   => $receiveId,
+            'type'         => in_array($params['type'] ?? '', ['order', 'system', 'audit', 'remind'], true) ? $params['type'] : $row['type'],
+            'order_id'     => max(0, (int)($params['order_id'] ?? 0)),
+            'title'        => mb_substr(trim((string)($params['title'] ?? '')), 0, 100),
+            'content'      => mb_substr(trim((string)($params['content'] ?? '')), 0, 500),
+            'is_read'      => !empty($params['is_read']) ? 1 : 0,
+        ];
+        if ($data['title'] === '' || $data['content'] === '') {
+            $this->error('通知标题与正文内容不能为空');
+        }
+        $row->save($data);
+        $this->success();
+    }
 }
diff --git a/server/application/admin/controller/Order.php b/server/application/admin/controller/Order.php
index 9de61dc..ef5e054 100644
--- a/server/application/admin/controller/Order.php
+++ b/server/application/admin/controller/Order.php
@@ -3,20 +3,23 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use think\Db;
+use Exception;
 
 /**
- * 订单
+ * 订单管理与调度中心
  *
- * @icon fa fa-circle-o
+ * @icon fa fa-file-text-o
  */
 class Order extends Backend
 {
-
     /**
      * Order模型对象
      * @var \app\admin\model\Order
      */
     protected $model = null;
+    protected $relationSearch = true;
+    protected $searchFields = 'id,order_no,service_name,contact,mobile';
 
     public function _initialize()
     {
@@ -31,8 +34,6 @@ class Order extends Backend
         $this->view->assign("urgentList", $this->model->getUrgentList());
     }
 
-    protected $relationSearch = true;
-
     public function index()
     {
         $this->request->filter(['strip_tags', 'trim']);
@@ -48,8 +49,430 @@ class Order extends Backend
             ->where($where)
             ->order($sort, $order)
             ->paginate($limit);
-        $result = ['total' => $list->total(), 'rows' => $list->items()];
-        return json($result);
+
+        $rows = $list->items();
+        if (!empty($rows)) {
+            $orderIds = array_column($rows, 'id');
+            $merLinks = Db::name('merchant_order')
+                ->alias('mo')
+                ->join('merchant m', 'm.id = mo.merchant_id', 'LEFT')
+                ->where('mo.order_id', 'in', $orderIds)
+                ->field('mo.order_id, mo.batch_no, m.name as merchant_name')
+                ->select();
+            $merMap = [];
+            foreach ($merLinks as $ml) {
+                $merMap[(int)$ml['order_id']] = $ml;
+            }
+            foreach ($rows as &$r) {
+                $oid = (int)$r['id'];
+                $r['merchant_name'] = isset($merMap[$oid]) ? (string)$merMap[$oid]['merchant_name'] : '';
+                $r['batch_no'] = isset($merMap[$oid]) ? (string)$merMap[$oid]['batch_no'] : '';
+            }
+            unset($r);
+        }
+
+        return json(['total' => $list->total(), 'rows' => $rows]);
+    }
+
+    /**
+     * 禁止后台手工凭空新增订单
+     */
+    public function add()
+    {
+        $this->error('订单须由客户端或企业商家工作台真实发起，不支持后台手工伪造');
+    }
+
+    /**
+     * 禁止物理删除业务订单
+     */
+    public function del($ids = "")
+    {
+        $this->error('订单关联资金流水与结算凭证，禁止物理删除；如需终止履约请编辑取消工单');
+    }
+
+    /**
+     * 编辑订单（支持后台派单/改派师傅通知与轨迹联动，以及取消订单自动退回优惠券）
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->with(['user', 'master'])->where('order.id', (int)$ids)->find();
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        if (false === $this->request->isPost()) {
+            $catName = (int)$row['cat_id'] > 0 ? (string)Db::name('service_cat')->where('id', (int)$row['cat_id'])->value('name') : '';
+            $this->view->assign('catName', $catName);
+            $this->view->assign('row', $row);
+            return $this->view->fetch();
+        }
+
+        $row = $this->model->get($ids);
+        $params = $this->request->post('row/a', []);
+        if (!$params) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+
+        // 锁定订单归属与财务结算核心字段，禁止后台编辑工单时意外篡改账务
+        unset(
+            $params['order_no'],
+            $params['user_id'],
+            $params['cat_id'],
+            $params['service_id'],
+            $params['price_type'],
+            $params['base_amount'],
+            $params['distance_amount'],
+            $params['floor_amount'],
+            $params['diff_amount'],
+            $params['discount_amount'],
+            $params['total_amount'],
+            $params['pay_amount'],
+            $params['pay_status'],
+            $params['pay_type'],
+            $params['pay_time'],
+            $params['settle_status'],
+            $params['settle_amount'],
+            $params['coupon_id'],
+            $params['verify_code']
+        );
+
+        // 统一转换时间节点字段（留空转为 0，日期字符串转为 Unix 时间戳）
+        foreach (['appoint_time', 'accept_time', 'arrive_time', 'start_time', 'finish_time'] as $tField) {
+            if (array_key_exists($tField, $params)) {
+                $tv = trim((string)$params[$tField]);
+                $params[$tField] = $tv === '' ? 0 : (is_numeric($tv) ? (int)$tv : ((int)strtotime($tv) ?: 0));
+            }
+        }
+        if (array_key_exists('master_id', $params) && trim((string)$params['master_id']) === '') {
+            $params['master_id'] = 0;
+        }
+
+        $oldMasterId = (int)$row['master_id'];
+        $oldStatus   = (int)$row['status'];
+        $newMasterId = isset($params['master_id']) ? (int)$params['master_id'] : $oldMasterId;
+        $newStatus   = isset($params['status']) ? (int)$params['status'] : $oldStatus;
+        $now         = time();
+
+        // 若 city-picker 提交空串而原库有城市，保留原城市
+        if (isset($params['city']) && trim((string)$params['city']) === '' && !empty($row['city'])) {
+            unset($params['city']);
+        }
+
+        $targetMaster = null;
+        if ($newMasterId > 0 && $newMasterId !== $oldMasterId && $newStatus !== 9) {
+            $targetMaster = Db::name('master')->where('id', $newMasterId)->find();
+            if (!$targetMaster || $targetMaster['verify_status'] !== 'pass') {
+                $this->error('所选承接师傅不存在或尚未通过实名认证');
+            }
+            if (in_array($newStatus, [1, 2], true)) {
+                $newStatus = 3;
+                $params['status'] = 3;
+            }
+            if (empty($params['accept_time']) || (string)$params['accept_time'] === (string)$row['accept_time']) {
+                $params['accept_time'] = $now;
+            }
+        }
+
+        $result = false;
+        Db::startTrans();
+        try {
+            $result = $row->allowField(true)->save($params);
+
+            // 1. 后台通过编辑指派或改派了师傅：写轨迹日志与三方站内信
+            if ($targetMaster && $newMasterId !== $oldMasterId && $newStatus !== 9) {
+                $actionLabel = $oldMasterId > 0 ? '平台编辑改派师傅' : '平台编辑指派师傅';
+                $logRemark = $actionLabel . '：指派给【' . $targetMaster['realname'] . '（' . $targetMaster['mobile'] . '）】';
+                Db::name('order_log')->insert([
+                    'order_id'      => (int)$row['id'],
+                    'status'        => $newStatus,
+                    'remark'        => mb_substr($logRemark, 0, 255),
+                    'operator_type' => 'admin',
+                    'operator_id'   => (int)$this->auth->id,
+                    'createtime'    => $now,
+                ]);
+
+                Db::name('message')->insert([
+                    'receive_type' => 'master',
+                    'receive_id'   => $newMasterId,
+                    'type'         => 'order',
+                    'title'        => '平台派单通知',
+                    'content'      => '平台已为您指派工单【' . $row['order_no'] . '】（' . $row['service_name'] . '），请及时联系客户预约上门。',
+                    'order_id'     => (int)$row['id'],
+                    'is_read'      => 0,
+                    'createtime'   => $now,
+                ]);
+
+                if ($oldMasterId > 0 && $oldMasterId !== $newMasterId) {
+                    Db::name('message')->insert([
+                        'receive_type' => 'master',
+                        'receive_id'   => $oldMasterId,
+                        'type'         => 'order',
+                        'title'        => '工单改派通知',
+                        'content'      => '工单【' . $row['order_no'] . '】已由平台调度改派给其他师傅承接。',
+                        'order_id'     => (int)$row['id'],
+                        'is_read'      => 0,
+                        'createtime'   => $now,
+                    ]);
+                }
+
+                if ((int)$row['user_id'] > 0) {
+                    Db::name('message')->insert([
+                        'receive_type' => 'user',
+                        'receive_id'   => (int)$row['user_id'],
+                        'type'         => 'order',
+                        'title'        => '师傅指派成功通知',
+                        'content'      => '您的订单【' . $row['order_no'] . '】已安排' . $targetMaster['realname'] . '师傅（' . $targetMaster['mobile'] . '）为您服务。',
+                        'order_id'     => (int)$row['id'],
+                        'is_read'      => 0,
+                        'createtime'   => $now,
+                    ]);
+                }
+            }
+
+            // 2. 后台将订单变更为取消状态（status=9）：自动退回已锁定的优惠券并记录轨迹通知
+            if ($oldStatus !== 9 && $newStatus === 9) {
+                $this->refundLockedCoupon((int)$row['id'], (int)$row['coupon_id'], $now);
+
+                $cancelReason = trim((string)($params['cancel_reason'] ?? $row['cancel_reason'] ?? ''));
+                Db::name('order_log')->insert([
+                    'order_id'      => (int)$row['id'],
+                    'status'        => 9,
+                    'remark'        => mb_substr('平台运营后台取消工单' . ($cancelReason !== '' ? ('：' . $cancelReason) : ''), 0, 255),
+                    'operator_type' => 'admin',
+                    'operator_id'   => (int)$this->auth->id,
+                    'createtime'    => $now,
+                ]);
+
+                if ($oldMasterId > 0) {
+                    Db::name('message')->insert([
+                        'receive_type' => 'master',
+                        'receive_id'   => $oldMasterId,
+                        'type'         => 'order',
+                        'title'        => '工单已取消通知',
+                        'content'      => '工单【' . $row['order_no'] . '】已由平台取消' . ($cancelReason !== '' ? ('，原因：' . $cancelReason) : '') . '。',
+                        'order_id'     => (int)$row['id'],
+                        'is_read'      => 0,
+                        'createtime'   => $now,
+                    ]);
+                }
+                if ((int)$row['user_id'] > 0) {
+                    Db::name('message')->insert([
+                        'receive_type' => 'user',
+                        'receive_id'   => (int)$row['user_id'],
+                        'type'         => 'order',
+                        'title'        => '订单取消通知',
+                        'content'      => '您的订单【' . $row['order_no'] . '】已取消' . ($cancelReason !== '' ? ('，原因：' . $cancelReason) : '') . '，如使用了优惠券已自动退回账户。',
+                        'order_id'     => (int)$row['id'],
+                        'is_read'      => 0,
+                        'createtime'   => $now,
+                    ]);
+                }
+            } elseif ($oldStatus !== $newStatus && !($targetMaster && $newMasterId !== $oldMasterId)) {
+                $statusMap = $this->model->getStatusList();
+                Db::name('order_log')->insert([
+                    'order_id'      => (int)$row['id'],
+                    'status'        => $newStatus,
+                    'remark'        => '平台运营变更工单状态为：' . ($statusMap[$newStatus] ?? ('状态' . $newStatus)),
+                    'operator_type' => 'admin',
+                    'operator_id'   => (int)$this->auth->id,
+                    'createtime'    => $now,
+                ]);
+            }
+
+            Db::commit();
+        } catch (Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+
+        if ($result !== false) {
+            $this->success();
+        }
+        $this->error(__('No rows were updated'));
+    }
+
+    /**
+     * 订单取消时退回已锁定的用户优惠券
+     */
+    protected function refundLockedCoupon($orderId, $userCouponId, $now)
+    {
+        $ucRows = Db::name('user_coupon')
+            ->where(function ($q) use ($orderId, $userCouponId) {
+                if ($userCouponId > 0) {
+                    $q->where('id', $userCouponId)->whereOr('order_id', $orderId);
+                } else {
+                    $q->where('order_id', $orderId);
+                }
+            })
+            ->where('status', 'used')
+            ->select();
+
+        foreach ($ucRows as $uc) {
+            $couponTpl = Db::name('coupon')->where('id', (int)$uc['coupon_id'])->find();
+            $isExpired = $couponTpl && (int)$couponTpl['end_time'] > 0 && (int)$couponTpl['end_time'] < $now;
+            Db::name('user_coupon')->where('id', (int)$uc['id'])->update([
+                'status'   => $isExpired ? 'expired' : 'unused',
+                'order_id' => 0,
+                'use_time' => null,
+            ]);
+        }
+    }
+
+    /**
+     * 人工指派 / 改派师傅
+     */
+    public function dispatch($ids = null)
+    {
+        $row = $this->model->with(['user', 'master'])->where('order.id', (int)$ids)->find();
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+
+        if ($this->request->isPost()) {
+            if (in_array((int)$row['status'], [8, 9], true)) {
+                $this->error('已完成或已取消的工单不支持指派/改派');
+            }
+            if ((int)$row['pay_status'] !== 1 && (int)$row['status'] === 0) {
+                $this->error('该工单尚未完成支付，无法派单');
+            }
+
+            $masterId = (int)$this->request->post('master_id', 0);
+            $remark = trim((string)$this->request->post('dispatch_remark', ''));
+            if ($masterId <= 0) {
+                $this->error('请选择要指派的认证师傅');
+            }
+
+            $targetMaster = Db::name('master')->where('id', $masterId)->find();
+            if (!$targetMaster || $targetMaster['verify_status'] !== 'pass') {
+                $this->error('所选师傅不存在或未通过实名认证');
+            }
+            $oldMasterId = (int)$row['master_id'];
+            if ($oldMasterId === $masterId && (int)$row['status'] >= 3) {
+                $this->error('当前工单已由该师傅承接，无需重复指派');
+            }
+
+            $now = time();
+            $newStatus = in_array((int)$row['status'], [1, 2], true) ? 3 : (int)$row['status'];
+            $actionLabel = $oldMasterId > 0 ? '平台改派师傅' : '平台人工指派师傅';
+            $logRemark = $actionLabel . '：指派给【' . $targetMaster['realname'] . '（' . $targetMaster['mobile'] . '）】' . ($remark !== '' ? ('，备注：' . $remark) : '');
+
+            Db::startTrans();
+            try {
+                $updateData = [
+                    'master_id'  => $masterId,
+                    'status'     => $newStatus,
+                    'updatetime' => $now,
+                ];
+                if (empty($row['accept_time']) || $oldMasterId !== $masterId) {
+                    $updateData['accept_time'] = $now;
+                }
+                Db::name('order')->where('id', $row['id'])->update($updateData);
+
+                Db::name('order_log')->insert([
+                    'order_id'      => $row['id'],
+                    'status'        => $newStatus,
+                    'remark'        => mb_substr($logRemark, 0, 255),
+                    'operator_type' => 'admin',
+                    'operator_id'   => (int)$this->auth->id,
+                    'createtime'    => $now,
+                ]);
+
+                // 通知新接单师傅
+                Db::name('message')->insert([
+                    'receive_type' => 'master',
+                    'receive_id'   => $masterId,
+                    'type'         => 'order',
+                    'title'        => '平台派单通知',
+                    'content'      => '平台已为您指派工单【' . $row['order_no'] . '】（' . $row['service_name'] . '），请及时联系客户预约上门。',
+                    'order_id'     => (int)$row['id'],
+                    'is_read'      => 0,
+                    'createtime'   => $now,
+                ]);
+
+                // 若为改派，通知原师傅
+                if ($oldMasterId > 0 && $oldMasterId !== $masterId) {
+                    Db::name('message')->insert([
+                        'receive_type' => 'master',
+                        'receive_id'   => $oldMasterId,
+                        'type'         => 'order',
+                        'title'        => '工单改派通知',
+                        'content'      => '工单【' . $row['order_no'] . '】已由平台调度改派给其他师傅承接。',
+                        'order_id'     => (int)$row['id'],
+                        'is_read'      => 0,
+                        'createtime'   => $now,
+                    ]);
+                }
+
+                // 通知下单业主
+                if ((int)$row['user_id'] > 0) {
+                    Db::name('message')->insert([
+                        'receive_type' => 'user',
+                        'receive_id'   => (int)$row['user_id'],
+                        'type'         => 'order',
+                        'title'        => '师傅指派成功通知',
+                        'content'      => '您的订单【' . $row['order_no'] . '】已安排' . $targetMaster['realname'] . '师傅（' . $targetMaster['mobile'] . '）为您服务。',
+                        'order_id'     => (int)$row['id'],
+                        'is_read'      => 0,
+                        'createtime'   => $now,
+                    ]);
+                }
+
+                Db::commit();
+            } catch (Exception $e) {
+                Db::rollback();
+                $this->error($e->getMessage());
+            }
+
+            $this->success('派单调度成功');
+        }
+
+        // 推荐候选师傅：优先同城在线且实名通过的师傅
+        $cityKeyword = '';
+        if (!empty($row['city'])) {
+            $parts = explode('/', (string)$row['city']);
+            $cityKeyword = trim((string)(count($parts) > 1 ? $parts[1] : $parts[0]));
+            $cityKeyword = preg_replace('/市$/u', '', $cityKeyword);
+        }
+
+        $candidateMasters = Db::name('master')
+            ->where('verify_status', 'pass')
+            ->orderRaw("work_status = 'on' DESC, score DESC, order_count DESC")
+            ->limit(12)
+            ->select();
+
+        if ($cityKeyword !== '') {
+            $sameCity = [];
+            $otherCity = [];
+            foreach ($candidateMasters as $cm) {
+                if (mb_strpos((string)$cm['city'], $cityKeyword) !== false) {
+                    $sameCity[] = $cm;
+                } else {
+                    $otherCity[] = $cm;
+                }
+            }
+            $candidateMasters = array_slice(array_merge($sameCity, $otherCity), 0, 8);
+        } else {
+            $candidateMasters = array_slice($candidateMasters, 0, 8);
+        }
+
+        $cmIds = array_column($candidateMasters, 'id');
+        $cmSkillMap = [];
+        if (!empty($cmIds)) {
+            $skRows = Db::name('master_skill')->where('master_id', 'in', $cmIds)->where('status', 'normal')->select();
+            foreach ($skRows as $sk) {
+                if (!empty($sk['skill_name'])) {
+                    $cmSkillMap[(int)$sk['master_id']][] = $sk['skill_name'];
+                }
+            }
+        }
+        foreach ($candidateMasters as &$cm) {
+            $cm['skills'] = array_slice($cmSkillMap[(int)$cm['id']] ?? [], 0, 3);
+        }
+        unset($cm);
+
+        $this->view->assign('row', $row);
+        $this->view->assign('candidateMasters', $candidateMasters);
+        return $this->view->fetch();
     }
 
     /**
@@ -57,42 +480,90 @@ class Order extends Backend
      */
     public function detail($ids = null)
     {
-        $row = $this->model->with(['user', 'master'])->find($ids);
+        $row = $this->model->with(['user', 'master'])->where('order.id', (int)$ids)->find();
         if (!$row) {
             $this->error(__('No Results were found'));
         }
 
         // 1. 多商品/多工项明细
-        $goodsList = \think\Db::name('order_goods')->where('order_id', $row['id'])->select();
+        $goodsList = Db::name('order_goods')->where('order_id', $row['id'])->select();
 
-        // 2. 现场施工取证图片 (区分报损、过程、完工)
-        $mediaList = \think\Db::name('order_media')->where('order_id', $row['id'])->order('id asc')->select();
+        // 2. 现场施工取证图片 (区分签到、过程、完工、报损)
+        $mediaList = Db::name('order_media')->where('order_id', $row['id'])->order('id asc')->select();
 
         // 3. 履约轨迹日志
-        $logList = \think\Db::name('order_log')->where('order_id', $row['id'])->order('createtime asc')->select();
+        $statusMap = $this->model->getStatusList();
+        $logList = Db::name('order_log')->where('order_id', $row['id'])->order('createtime asc, id asc')->select();
+        foreach ($logList as &$lg) {
+            $lg['status_label'] = isset($statusMap[(int)$lg['status']]) ? $statusMap[(int)$lg['status']] : '状态变更';
+        }
+        unset($lg);
 
         // 4. 师傅报价列表
-        $quoteList = \think\Db::name('order_quote')
+        $quoteList = Db::name('order_quote')
             ->alias('q')
-            ->join('fa_master m', 'q.master_id = m.id', 'LEFT')
+            ->join('master m', 'q.master_id = m.id', 'LEFT')
             ->field('q.*, m.realname as master_name, m.mobile as master_mobile, m.score as master_score')
             ->where('q.order_id', $row['id'])
             ->order('q.id desc')
             ->select();
 
-        // 5. 客户评价与回复
-        $review = \think\Db::name('review')->where('order_id', $row['id'])->find();
+        // 5. 客户评价与回复（兼容 JSON 数组或逗号分隔标签）
+        $review = Db::name('review')->where('order_id', $row['id'])->find();
+        if ($review) {
+            $tagsArr = [];
+            if (!empty($review['tags'])) {
+                $decoded = json_decode($review['tags'], true);
+                if (is_array($decoded)) {
+                    $tagsArr = array_filter($decoded);
+                } else {
+                    $tagsArr = array_filter(explode(',', (string)$review['tags']));
+                }
+            }
+            $review['tags_arr'] = $tagsArr;
+        }
 
         // 6. 财务结算记录
-        $settle = \think\Db::name('settle')->where('order_id', $row['id'])->find();
+        $settle = Db::name('settle')->where('order_id', $row['id'])->find();
 
-        $this->view->assign('row', $row);
-        $this->view->assign('goodsList', $goodsList);
-        $this->view->assign('mediaList', $mediaList);
-        $this->view->assign('logList', $logList);
-        $this->view->assign('quoteList', $quoteList);
-        $this->view->assign('review', $review);
-        $this->view->assign('settle', $settle);
+        // 7. 企业商家协同发包来源
+        $merchantOrder = Db::name('merchant_order')
+            ->alias('mo')
+            ->join('merchant m', 'm.id = mo.merchant_id', 'LEFT')
+            ->where('mo.order_id', $row['id'])
+            ->field('mo.batch_no, mo.createtime as bind_time, m.id as merchant_id, m.name as merchant_name, m.contact as merchant_contact, m.mobile as merchant_mobile, m.settle_type')
+            ->find();
+
+        // 8. 发票开具关联信息
+        $invoiceInfo = null;
+        if (!empty($row['invoice_id'])) {
+            $invoiceInfo = Db::name('invoice')
+                ->field('id,invoice_sn,title,type,amount,status,invoice_no,issue_time')
+                ->where('id', (int)$row['invoice_id'])
+                ->find();
+        }
+
+        // 9. 售后申诉争议记录
+        $appealList = Db::name('appeal')
+            ->alias('a')
+            ->join('master m', 'm.id = a.master_id', 'LEFT')
+            ->where('a.order_id', $row['id'])
+            ->field('a.*, m.realname as master_name')
+            ->order('a.id desc')
+            ->select();
+
+        $this->view->assign([
+            'row'           => $row,
+            'goodsList'     => $goodsList,
+            'mediaList'     => $mediaList,
+            'logList'       => $logList,
+            'quoteList'     => $quoteList,
+            'review'        => $review,
+            'settle'        => $settle,
+            'merchantOrder' => $merchantOrder,
+            'invoiceInfo'   => $invoiceInfo,
+            'appealList'    => $appealList,
+        ]);
 
         return $this->view->fetch();
     }
diff --git a/server/application/admin/controller/Review.php b/server/application/admin/controller/Review.php
index 44685e1..8bbe9fa 100644
--- a/server/application/admin/controller/Review.php
+++ b/server/application/admin/controller/Review.php
@@ -3,21 +3,27 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use think\Db;
+use think\exception\PDOException;
 
 /**
- * 评价
+ * 服务评价治理
  *
- * @icon fa fa-circle-o
+ * 评价由完工业主真实提交，后台负责内容合规审核与违规屏蔽（联动晒单广场）
+ *
+ * @icon fa fa-comments-o
  */
 class Review extends Backend
 {
-
     /**
      * Review模型对象
      * @var \app\admin\model\Review
      */
     protected $model = null;
 
+    protected $relationSearch = true;
+    protected $searchFields = 'id,content,tags,order.order_no,user.nickname,master.realname';
+
     public function _initialize()
     {
         parent::_initialize();
@@ -25,18 +31,9 @@ class Review extends Backend
         $this->view->assign("statusList", $this->model->getStatusList());
     }
 
-
-
     /**
-     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
-     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
-     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     * 评价列表
      */
-
-
-
-    protected $relationSearch = true;
-
     public function index()
     {
         $this->request->filter(['strip_tags', 'trim']);
@@ -55,4 +52,229 @@ class Review extends Backend
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
+
+    /**
+     * 评价全景详情（关联订单、雇主、师傅及晒单状态）
+     */
+    public function detail($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $this->assignReviewContext($row);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 评价合规治理（保护业主原始评分与图文只读，仅变更展示状态与回复，并联动晒单表）
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        if (false === $this->request->isPost()) {
+            $this->assignReviewContext($row);
+            return $this->view->fetch();
+        }
+
+        $params = $this->request->post('row/a', []);
+        $status = (string)($params['status'] ?? $row['status']);
+        $reply  = trim((string)($params['reply'] ?? $row['reply']));
+
+        if (!in_array($status, ['normal', 'hidden'], true)) {
+            $this->error('评价状态参数不合法');
+        }
+
+        Db::startTrans();
+        try {
+            $row->allowField(['status', 'reply'])->save([
+                'status' => $status,
+                'reply'  => mb_substr($reply, 0, 500),
+            ]);
+
+            // 若屏蔽违规评价，同步下架该工单关联的业主晒单，防止首页继续曝光
+            if ($status === 'hidden' && (int)$row['order_id'] > 0) {
+                Db::name('showcase')->where('order_id', (int)$row['order_id'])->update([
+                    'status'     => 'hidden',
+                    'updatetime' => time(),
+                ]);
+            }
+
+            // 重算对应师傅综合评分
+            if ((int)$row['master_id'] > 0) {
+                $this->recalcMasterScore((int)$row['master_id']);
+            }
+
+            Db::commit();
+        } catch (PDOException|\Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        $this->success();
+    }
+
+    /**
+     * 批量显隐同步联动晒单表并重算师傅评分
+     */
+    public function multi($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $params = (string)$this->request->post('params');
+        if (empty($ids) || $params === '') {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        parse_str($params, $values);
+        $status = $values['status'] ?? null;
+        if (!in_array($status, ['normal', 'hidden'], true)) {
+            $this->error('仅支持批量切换显示或隐藏状态');
+        }
+
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('No rows were updated'));
+        }
+
+        $affectedReviews = Db::name('review')->where('id', 'in', $idArr)->field('id,order_id,master_id')->select();
+
+        Db::startTrans();
+        try {
+            Db::name('review')->where('id', 'in', $idArr)->update(['status' => $status]);
+            if ($status === 'hidden') {
+                $orderIds = array_values(array_filter(array_map('intval', array_column($affectedReviews, 'order_id'))));
+                if ($orderIds) {
+                    Db::name('showcase')->where('order_id', 'in', $orderIds)->update([
+                        'status'     => 'hidden',
+                        'updatetime' => time(),
+                    ]);
+                }
+            }
+            $masterIds = array_values(array_unique(array_filter(array_map('intval', array_column($affectedReviews, 'master_id')))));
+            foreach ($masterIds as $mid) {
+                $this->recalcMasterScore($mid);
+            }
+            Db::commit();
+        } catch (PDOException|\Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        $this->success();
+    }
+
+    /**
+     * 真实履约评价禁止后台手工伪造（刷单防御）
+     */
+    public function add()
+    {
+        $this->error('服务评价仅支持完工业主真实提交，后台不可手动新增');
+    }
+
+    /**
+     * 删除违规评价（同步隐藏关联晒单并重算对应师傅综合评分）
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $rows = Db::name('review')->where('id', 'in', $idArr)->field('id,order_id,master_id')->select();
+        if (!$rows) {
+            $this->error(__('No Results were found'));
+        }
+
+        Db::startTrans();
+        try {
+            $orderIds  = array_values(array_unique(array_filter(array_map('intval', array_column($rows, 'order_id')))));
+            $masterIds = array_values(array_unique(array_filter(array_map('intval', array_column($rows, 'master_id')))));
+
+            Db::name('review')->where('id', 'in', $idArr)->delete();
+
+            if ($orderIds) {
+                Db::name('showcase')->where('order_id', 'in', $orderIds)->update([
+                    'status'     => 'hidden',
+                    'updatetime' => time(),
+                ]);
+            }
+            foreach ($masterIds as $mid) {
+                $this->recalcMasterScore($mid);
+            }
+            Db::commit();
+        } catch (PDOException|\Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        $this->success();
+    }
+
+    /**
+     * 重算师傅有效公开评价的平均分并同步至师傅档案
+     */
+    protected function recalcMasterScore($masterId)
+    {
+        $masterId = (int)$masterId;
+        if ($masterId <= 0) {
+            return;
+        }
+        $avg = Db::name('review')
+            ->where('master_id', $masterId)
+            ->where('status', 'normal')
+            ->avg('score');
+        $newScore = $avg !== null ? round((float)$avg, 2) : 5.00;
+        Db::name('master')->where('id', $masterId)->update([
+            'score'      => $newScore,
+            'updatetime' => time(),
+        ]);
+    }
+
+    /**
+     * 解析标签字符串或 JSON 数组
+     */
+    protected function parseTags($raw)
+    {
+        $raw = trim((string)$raw);
+        if ($raw === '') {
+            return [];
+        }
+        if ($raw[0] === '[') {
+            $arr = json_decode($raw, true);
+            if (is_array($arr)) {
+                return array_values(array_filter(array_map('trim', $arr)));
+            }
+        }
+        return array_values(array_filter(array_map('trim', explode(',', $raw))));
+    }
+
+    /**
+     * 组装评价关联数据
+     */
+    protected function assignReviewContext($row)
+    {
+        $order = (int)$row['order_id'] > 0 ? Db::name('order')->where('id', (int)$row['order_id'])->find() : null;
+        $user = (int)$row['user_id'] > 0 ? Db::name('user')->where('id', (int)$row['user_id'])->field('id,nickname,username,mobile,avatar')->find() : null;
+        $master = (int)$row['master_id'] > 0 ? Db::name('master')->where('id', (int)$row['master_id'])->field('id,realname,mobile,score,order_count')->find() : null;
+        $showcase = (int)$row['order_id'] > 0 ? Db::name('showcase')->where('order_id', (int)$row['order_id'])->find() : null;
+
+        $reviewTags = $this->parseTags($row['tags']);
+        $reviewImages = array_values(array_filter(array_map('trim', explode(',', (string)$row['images']))));
+
+        $this->view->assign([
+            'row'          => $row,
+            'order'        => $order ?: [],
+            'user'         => $user ?: [],
+            'master'       => $master ?: [],
+            'showcase'     => $showcase ?: [],
+            'reviewTags'   => $reviewTags,
+            'reviewImages' => $reviewImages,
+        ]);
+    }
 }
diff --git a/server/application/admin/controller/Service.php b/server/application/admin/controller/Service.php
index fc44d78..72f2b80 100644
--- a/server/application/admin/controller/Service.php
+++ b/server/application/admin/controller/Service.php
@@ -21,6 +21,7 @@ class Service extends Backend
      */
     protected $model = null;
     protected $relationSearch = true;
+    protected $searchFields = 'id,name,desc,cat.name';
 
     public function _initialize()
     {
@@ -211,6 +212,45 @@ class Service extends Backend
         return $this->view->fetch();
     }
 
+    /**
+     * 商品档案与服务定价全景详情
+     */
+    public function detail($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $catName = Db::name('service_cat')->where('id', $row->cat_id)->value('name') ?: '未归类';
+        $serviceTypes = !empty($row->service_types)
+            ? (is_array($row->service_types) ? $row->service_types : (json_decode($row->service_types, true) ?: []))
+            : [];
+        $addons = !empty($row->addons)
+            ? (is_array($row->addons) ? $row->addons : (json_decode($row->addons, true) ?: []))
+            : [];
+        $specs = Db::name('service_spec')
+            ->where('service_id', $row->id)
+            ->where('status', 'normal')
+            ->order('weigh desc, id asc')
+            ->select();
+
+        $orderAgg = Db::name('order')
+            ->field('COUNT(*) AS total_cnt, SUM(CASE WHEN pay_status = 1 THEN pay_amount ELSE 0 END) AS total_gmv')
+            ->where('service_id', $row->id)
+            ->find();
+
+        $this->view->assign([
+            'row'          => $row,
+            'catName'      => $catName,
+            'serviceTypes' => $serviceTypes,
+            'addons'       => $addons,
+            'specs'        => $specs,
+            'orderCount'   => (int)($orderAgg['total_cnt'] ?? 0),
+            'orderGmv'     => number_format((float)($orderAgg['total_gmv'] ?? 0), 2, '.', ''),
+        ]);
+        return $this->view->fetch();
+    }
+
     /**
      * 格式化商品关联的主服务与增项服务 JSON，并自动提取默认主服务价格用于底层索引兼容
      */
@@ -356,4 +396,36 @@ class Service extends Backend
         }
         $delQuery->delete();
     }
+
+    /**
+     * 删除保护：已产生历史业务订单的服务商品禁止物理删除，无关联订单删除时同步清理细分规格
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $ordCnt = (int)Db::name('order')->where('service_id', 'in', $idArr)->count();
+        if ($ordCnt > 0) {
+            $this->error('所选商品已关联 ' . $ordCnt . ' 笔历史工单，禁止物理删除；如需下架请将状态设为隐藏');
+        }
+        Db::startTrans();
+        try {
+            Db::name('service_spec')->where('service_id', 'in', $idArr)->delete();
+            $deleted = Db::name('service')->where('id', 'in', $idArr)->delete();
+            Db::commit();
+        } catch (Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($deleted) {
+            $this->success();
+        }
+        $this->error(__('No rows were deleted'));
+    }
 }
diff --git a/server/application/admin/controller/Settle.php b/server/application/admin/controller/Settle.php
index 207cf11..bf60abb 100644
--- a/server/application/admin/controller/Settle.php
+++ b/server/application/admin/controller/Settle.php
@@ -3,21 +3,27 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use think\Db;
+use think\exception\PDOException;
 
 /**
- * 结算单
+ * 结算单管理
  *
- * @icon fa fa-circle-o
+ * 结算单由订单核销完工自动生成，后台负责对账审计及异常挂起单的人工结算归档
+ *
+ * @icon fa fa-calculator
  */
 class Settle extends Backend
 {
-
     /**
      * Settle模型对象
      * @var \app\admin\model\Settle
      */
     protected $model = null;
 
+    protected $relationSearch = true;
+    protected $searchFields = 'id,order.order_no,master.realname,master.mobile';
+
     public function _initialize()
     {
         parent::_initialize();
@@ -25,18 +31,9 @@ class Settle extends Backend
         $this->view->assign("statusList", $this->model->getStatusList());
     }
 
-
-
     /**
-     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
-     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
-     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     * 结算单列表
      */
-
-
-
-    protected $relationSearch = true;
-
     public function index()
     {
         $this->request->filter(['strip_tags', 'trim']);
@@ -55,4 +52,172 @@ class Settle extends Backend
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
+
+    /**
+     * 结算对账详情（关联订单费用明细、师傅钱包快照与入账流水）
+     */
+    public function detail($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $this->assignSettleContext($row);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 待结算单财务处理（严禁篡改结算金额，仅允许对 wait 状态执行线上入账或线下归档）
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        if (false === $this->request->isPost()) {
+            $this->assignSettleContext($row);
+            return $this->view->fetch();
+        }
+
+        if ($row['status'] !== 'wait') {
+            $this->error('该结算单已归档完结，禁止重复结算或修改账务数据');
+        }
+
+        $targetStatus = (string)$this->request->post('row.status', '');
+        if (!in_array($targetStatus, ['settled', 'offline'], true)) {
+            $this->error('请选择有效的结算归档方式（线上划拨入账 / 线下特殊结算）');
+        }
+
+        $masterId     = (int)$row['master_id'];
+        $orderId      = (int)$row['order_id'];
+        $settleAmount = round((float)$row['settle_amount'], 2);
+        $now          = time();
+
+        Db::startTrans();
+        try {
+            // 乐观锁防并发重复点击结算
+            $affected = Db::name('settle')
+                ->where('id', (int)$row['id'])
+                ->where('status', 'wait')
+                ->update([
+                    'status'      => $targetStatus,
+                    'settle_time' => $now,
+                ]);
+            if (!$affected) {
+                throw new \Exception('结算单状态已变更，请刷新列表后重试');
+            }
+
+            $master = Db::name('master')->where('id', $masterId)->lock(true)->find();
+            if (!$master) {
+                throw new \Exception('关联结算师傅不存在');
+            }
+            $orderNo = $orderId > 0 ? (string)Db::name('order')->where('id', $orderId)->value('order_no') : '';
+
+            if ($targetStatus === 'settled') {
+                // 幂等校验：防止该订单此前已产生过 settle 流水
+                $existsLog = $orderId > 0 && Db::name('wallet_log')
+                    ->where('user_type', 'master')
+                    ->where('user_id', $masterId)
+                    ->where('order_id', $orderId)
+                    ->where('type', 'settle')
+                    ->find();
+                if ($existsLog) {
+                    throw new \Exception('检测到该订单已存在线上结算入账流水，请核对后再操作');
+                }
+
+                $newMoney = round((float)$master['money'] + $settleAmount, 2);
+                Db::name('master')->where('id', $masterId)->update([
+                    'money'      => $newMoney,
+                    'updatetime' => $now,
+                ]);
+                Db::name('wallet_log')->insert([
+                    'user_type'  => 'master',
+                    'user_id'    => $masterId,
+                    'type'       => 'settle',
+                    'amount'     => $settleAmount,
+                    'balance'    => $newMoney,
+                    'order_id'   => $orderId,
+                    'remark'     => '后台财务确认结算入账' . ($orderNo !== '' ? '（订单 ' . $orderNo . '）' : ''),
+                    'createtime' => $now,
+                ]);
+                $msgText = ($orderNo !== '' ? '订单 ' . $orderNo . ' ' : '') . '服务佣金 ¥' . number_format($settleAmount, 2, '.', '') . ' 已结算至您的平台钱包余额。';
+            } else {
+                $msgText = ($orderNo !== '' ? '订单 ' . $orderNo . ' ' : '') . '服务佣金 ¥' . number_format($settleAmount, 2, '.', '') . ' 已由财务完成线下特殊结算归档。';
+            }
+
+            if ($orderId > 0) {
+                Db::name('order')->where('id', $orderId)->update([
+                    'settle_status' => 1,
+                    'settle_amount' => $settleAmount,
+                    'updatetime'    => $now,
+                ]);
+            }
+
+            Db::name('message')->insert([
+                'receive_type' => 'master',
+                'receive_id'   => $masterId,
+                'type'         => 'order',
+                'title'        => '服务佣金结算通知',
+                'content'      => mb_substr($msgText, 0, 500),
+                'order_id'     => $orderId,
+                'is_read'      => 0,
+                'createtime'   => $now,
+            ]);
+
+            Db::commit();
+        } catch (PDOException|\Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        $this->success();
+    }
+
+    /**
+     * 结算单由订单核销系统生成，禁止手动添加
+     */
+    public function add()
+    {
+        $this->error('结算单由完工核销自动生成，后台不可手工录入');
+    }
+
+    /**
+     * 财务结算凭证禁止删除
+     */
+    public function del($ids = null)
+    {
+        $this->error('财务结算单据禁止删除');
+    }
+
+    /**
+     * 禁止跳过钱包流水的批量修改状态
+     */
+    public function multi($ids = null)
+    {
+        $this->error('结算单涉及资金划拨，不支持批量修改状态，请逐单核对处理');
+    }
+
+    /**
+     * 组装结算单对账上下文
+     */
+    protected function assignSettleContext($row)
+    {
+        $order = (int)$row['order_id'] > 0 ? Db::name('order')->where('id', (int)$row['order_id'])->find() : null;
+        $master = (int)$row['master_id'] > 0 ? Db::name('master')->where('id', (int)$row['master_id'])->find() : null;
+        $walletLogs = ((int)$row['master_id'] > 0 && (int)$row['order_id'] > 0)
+            ? Db::name('wallet_log')
+                ->where('user_type', 'master')
+                ->where('user_id', (int)$row['master_id'])
+                ->where('order_id', (int)$row['order_id'])
+                ->order('id desc')
+                ->select()
+            : [];
+
+        $this->view->assign([
+            'row'        => $row,
+            'order'      => $order ?: [],
+            'master'     => $master ?: [],
+            'walletLogs' => $walletLogs,
+        ]);
+    }
 }
diff --git a/server/application/admin/controller/Showcase.php b/server/application/admin/controller/Showcase.php
new file mode 100644
index 0000000..bfb0704
--- /dev/null
+++ b/server/application/admin/controller/Showcase.php
@@ -0,0 +1,169 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+use think\Db;
+
+/**
+ * 业主晒单治理
+ *
+ * 管理小程序首页及晒单广场公开展示的完工实拍内容
+ *
+ * @icon fa fa-camera
+ */
+class Showcase extends Backend
+{
+    /**
+     * @var \app\admin\model\Showcase
+     */
+    protected $model = null;
+    protected $relationSearch = true;
+    protected $searchFields = 'id,user_name,service_name,region,content,master_name,order.order_no';
+    protected $multiFields = 'status';
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Showcase;
+        $this->view->assign('statusList', $this->model->getStatusList());
+    }
+
+    /**
+     * 晒单列表
+     */
+    public function index()
+    {
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->with(['order', 'user', 'service'])
+            ->where($where)
+            ->order($sort, $order)
+            ->paginate($limit);
+
+        $items = $list->items();
+        foreach ($items as &$item) {
+            if (!empty($item['images'])) {
+                $item['images'] = implode(',', $this->parseTags($item['images']));
+            }
+        }
+        unset($item);
+
+        return json(['total' => $list->total(), 'rows' => $items]);
+    }
+
+    /**
+     * 晒单详情（关联源头工单与实拍组图）
+     */
+    public function detail($ids = null)
+    {
+        $row = $this->model->with(['order', 'user', 'service'])->where('showcase.id', (int)$ids)->find();
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $images = $this->parseTags($row['images']);
+        $tags = $this->parseTags($row['tags']);
+
+        $this->view->assign([
+            'row'    => $row,
+            'images' => $images,
+            'tags'   => $tags,
+        ]);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 晒单展示状态与封面治理
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->with(['order', 'user', 'service'])->where('showcase.id', (int)$ids)->find();
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $images = $this->parseTags($row['images']);
+        if (false === $this->request->isPost()) {
+            $this->view->assign([
+                'row'    => $row,
+                'images' => $images,
+            ]);
+            return $this->view->fetch();
+        }
+
+        $params = $this->request->post('row/a', []);
+        $status = in_array($params['status'] ?? '', ['normal', 'hidden'], true) ? $params['status'] : $row['status'];
+        $coverImage = trim((string)($params['cover_image'] ?? $row['cover_image']));
+
+        Db::name('showcase')->where('id', (int)$row['id'])->update([
+            'status'      => $status,
+            'cover_image' => mb_substr($coverImage, 0, 255),
+            'updatetime'  => time(),
+        ]);
+        $this->success();
+    }
+
+    /**
+     * 禁止后台伪造虚拟晒单
+     */
+    public function add()
+    {
+        $this->error('业主晒单仅由真实完工订单评价同步生成，后台不可手工伪造');
+    }
+
+    /**
+     * 删除违规晒单并同步复位源头工单晒单标记
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $rows = Db::name('showcase')->where('id', 'in', $idArr)->field('id,order_id')->select();
+        if (!$rows) {
+            $this->error(__('No Results were found'));
+        }
+        Db::startTrans();
+        try {
+            $orderIds = array_values(array_unique(array_filter(array_map('intval', array_column($rows, 'order_id')))));
+            Db::name('showcase')->where('id', 'in', $idArr)->delete();
+            if ($orderIds) {
+                Db::name('order')->where('id', 'in', $orderIds)->update([
+                    'is_showcase'   => 0,
+                    'showcase_time' => null,
+                ]);
+            }
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        $this->success();
+    }
+
+    protected function parseTags($raw)
+    {
+        $raw = trim((string)$raw);
+        if ($raw === '') {
+            return [];
+        }
+        if ($raw[0] === '[') {
+            $arr = json_decode($raw, true);
+            if (is_array($arr)) {
+                return array_values(array_filter(array_map('trim', $arr)));
+            }
+        }
+        return array_values(array_filter(array_map('trim', explode(',', $raw))));
+    }
+}
diff --git a/server/application/admin/controller/SkillCategory.php b/server/application/admin/controller/SkillCategory.php
index db60a29..a41a987 100644
--- a/server/application/admin/controller/SkillCategory.php
+++ b/server/application/admin/controller/SkillCategory.php
@@ -47,4 +47,54 @@ class SkillCategory extends Backend
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
+
+    /**
+     * 编辑分类（当分类名称变更时同步更新技能字典冗余分类名）
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $oldName = (string)$row['name'];
+        if (false === $this->request->isPost()) {
+            $this->view->assign('row', $row);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a', []);
+        if (!$params) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+        $result = $row->allowField(true)->save($params);
+        if ($result !== false) {
+            $newName = isset($params['name']) ? trim((string)$params['name']) : $oldName;
+            if ($newName !== '' && $newName !== $oldName) {
+                \think\Db::name('skill_dict')->where('category_id', (int)$row['id'])->update(['category' => $newName]);
+            }
+            $this->success();
+        }
+        $this->error($row->getError() ?: __('No rows were updated'));
+    }
+
+    /**
+     * 删除保护：分类下仍有关联技能时禁止物理删除
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $cnt = (int)\think\Db::name('skill_dict')->where('category_id', 'in', $idArr)->count();
+        if ($cnt > 0) {
+            $this->error('所选分类下仍包含 ' . $cnt . ' 项技能标签，请先迁移或删除下属技能后再操作');
+        }
+        return parent::del($ids);
+    }
 }
diff --git a/server/application/admin/controller/SkillDict.php b/server/application/admin/controller/SkillDict.php
index 9ed673c..1d0a9a6 100644
--- a/server/application/admin/controller/SkillDict.php
+++ b/server/application/admin/controller/SkillDict.php
@@ -17,26 +17,33 @@ class SkillDict extends Backend
      * @var \app\admin\model\SkillDict
      */
     protected $model = null;
-    protected $searchFields = 'id,name,category';
+    protected $relationSearch = true;
+    protected $searchFields = 'id,name,category,master.realname';
 
     public function _initialize()
     {
         parent::_initialize();
         $this->model = new \app\admin\model\SkillDict;
-        
+
         // 从真实技能分类表中拉取分类列表
         $categoryList = Db::name('skill_category')
             ->where('status', 'normal')
             ->order('weigh desc, id asc')
             ->column('name', 'id');
 
+        $categorySearchList = [];
+        foreach ($categoryList as $catName) {
+            $categorySearchList[$catName] = $catName;
+        }
+
         $this->view->assign("categoryList", $categoryList);
+        $this->assignconfig("categorySearchList", $categorySearchList);
         $this->view->assign("sourceList", $this->model->getSourceList());
         $this->view->assign("statusList", $this->model->getStatusList());
     }
 
     /**
-     * 查看技能列表
+     * 查看技能列表（支持 category_id 跳转过滤，并统计持证师傅人数）
      */
     public function index()
     {
@@ -47,15 +54,40 @@ class SkillDict extends Backend
         if ($this->request->request('keyField')) {
             return $this->selectpage();
         }
+        $catIdParam = (int)$this->request->get('category_id', 0);
         [$where, $sort, $order, $offset, $limit] = $this->buildparams();
-        $list = $this->model
+        $query = $this->model
             ->with(['master'])
-            ->where($where)
-            ->order($sort, $order)
-            ->paginate($limit);
+            ->where($where);
+        if ($catIdParam > 0) {
+            $query->where('skill_dict.category_id', $catIdParam);
+        }
+        $list = $query->order($sort, $order)->paginate($limit);
 
-        $result = ['total' => $list->total(), 'rows' => $list->items()];
-        return json($result);
+        $rows = $list->items();
+        $names = [];
+        foreach ($rows as $r) {
+            if (!empty($r['name'])) {
+                $names[] = (string)$r['name'];
+            }
+        }
+        $masterCountMap = [];
+        if ($names) {
+            $stats = Db::name('master_skill')
+                ->where('skill_name', 'in', array_unique($names))
+                ->field('skill_name, COUNT(DISTINCT master_id) AS cnt')
+                ->group('skill_name')
+                ->select();
+            foreach ($stats as $st) {
+                $masterCountMap[$st['skill_name']] = (int)$st['cnt'];
+            }
+        }
+        foreach ($rows as &$item) {
+            $item['master_count'] = $masterCountMap[$item['name']] ?? 0;
+        }
+        unset($item);
+
+        return json(['total' => $list->total(), 'rows' => $rows]);
     }
 
     /**
@@ -81,6 +113,7 @@ class SkillDict extends Backend
             }
             $this->error(__('Parameter %s can not be empty', ''));
         }
+        $this->view->assign('defaultCategoryId', (int)$this->request->get('category_id', 0) ?: '');
         return $this->view->fetch();
     }
 
@@ -114,4 +147,27 @@ class SkillDict extends Backend
         $this->view->assign("row", $row);
         return $this->view->fetch();
     }
+
+    /**
+     * 删除保护：已被师傅绑定的技能禁止物理删除
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $names = Db::name('skill_dict')->where('id', 'in', $idArr)->column('name');
+        if ($names) {
+            $usedCnt = (int)Db::name('master_skill')->where('skill_name', 'in', $names)->count();
+            if ($usedCnt > 0) {
+                $this->error('所选技能已被 ' . $usedCnt . ' 条师傅档案绑定，禁止物理删除，请改为「隐藏停用」');
+            }
+        }
+        return parent::del($ids);
+    }
 }
diff --git a/server/application/admin/controller/UserCoupon.php b/server/application/admin/controller/UserCoupon.php
new file mode 100644
index 0000000..edf8e7a
--- /dev/null
+++ b/server/application/admin/controller/UserCoupon.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+use think\Db;
+use Exception;
+
+/**
+ * 用户领券记录管理
+ *
+ * @icon fa fa-ticket
+ */
+class UserCoupon extends Backend
+{
+    /**
+     * @var \app\admin\model\UserCoupon
+     */
+    protected $model = null;
+    protected $relationSearch = true;
+    protected $searchFields = 'id,user.nickname,user.mobile,coupon.name,order.order_no';
+    protected $multiFields = 'status';
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\UserCoupon;
+        $this->view->assign('statusList', $this->model->getStatusList());
+    }
+
+    /**
+     * 领券记录列表（支持按状态 unused/used/expired 筛选及关联会员/优惠券/核销订单检索）
+     */
+    public function index()
+    {
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+
+        // 自动将已超过优惠券截止时间的未使用领券记录同步为 expired
+        $now = time();
+        $expiredCouponIds = Db::name('coupon')
+            ->where('end_time', '>', 0)
+            ->where('end_time', '<', $now)
+            ->column('id');
+        if (!empty($expiredCouponIds)) {
+            Db::name('user_coupon')
+                ->where('status', 'unused')
+                ->where('coupon_id', 'in', $expiredCouponIds)
+                ->update(['status' => 'expired']);
+        }
+
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->with(['user', 'coupon', 'order'])
+            ->where($where)
+            ->order($sort, $order)
+            ->paginate($limit);
+
+        return json(['total' => $list->total(), 'rows' => $list->items()]);
+    }
+
+    /**
+     * 禁止后台空造领券流水
+     */
+    public function add()
+    {
+        $this->error('用户领券记录由客户端领券中心真实发放生成，不支持后台手工伪造');
+    }
+
+    /**
+     * 删除未使用或已过期的无效领券记录（已核销关联订单的记录受账务保护禁止删除）
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $usedCnt = Db::name('user_coupon')->where('id', 'in', $idArr)->where('status', 'used')->count();
+        if ($usedCnt > 0) {
+            $this->error('所选记录中包含已核销抵扣订单的优惠券，为保障账务闭环禁止删除');
+        }
+        Db::startTrans();
+        try {
+            $deleted = Db::name('user_coupon')->where('id', 'in', $idArr)->delete();
+            Db::commit();
+        } catch (Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($deleted) {
+            $this->success();
+        }
+        $this->error(__('No rows were deleted'));
+    }
+}
diff --git a/server/application/admin/controller/WalletLog.php b/server/application/admin/controller/WalletLog.php
new file mode 100644
index 0000000..153160c
--- /dev/null
+++ b/server/application/admin/controller/WalletLog.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+use think\Db;
+
+/**
+ * 资金流水台账
+ *
+ * 不可篡改的财务审计总账，支持按账户主体与变动类型溯源对账
+ *
+ * @icon fa fa-exchange
+ */
+class WalletLog extends Backend
+{
+    /**
+     * @var \app\admin\model\WalletLog
+     */
+    protected $model = null;
+    protected $searchFields = 'id,remark';
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\WalletLog;
+        $this->view->assign('userTypeList', $this->model->getUserTypeList());
+        $this->view->assign('typeList', $this->model->getTypeList());
+    }
+
+    /**
+     * 流水总账列表（批量解析师傅/用户姓名手机及关联订单号，并计算汇总指标）
+     */
+    public function index()
+    {
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            $totalIncome = round((float)Db::name('wallet_log')->where('amount', '>', 0)->sum('amount'), 2);
+            $totalOutflow = round(abs((float)Db::name('wallet_log')->where('amount', '<', 0)->sum('amount')), 2);
+            $this->view->assign([
+                'totalIncome'  => $totalIncome,
+                'totalOutflow' => $totalOutflow,
+            ]);
+            return $this->view->fetch();
+        }
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->where($where)
+            ->order($sort, $order)
+            ->paginate($limit);
+
+        $rows = $list->items();
+        $masterIds = [];
+        $userIds = [];
+        $orderIds = [];
+        foreach ($rows as $r) {
+            if ($r['user_type'] === 'master' && (int)$r['user_id'] > 0) {
+                $masterIds[] = (int)$r['user_id'];
+            } elseif ($r['user_type'] === 'user' && (int)$r['user_id'] > 0) {
+                $userIds[] = (int)$r['user_id'];
+            }
+            if ((int)$r['order_id'] > 0) {
+                $orderIds[] = (int)$r['order_id'];
+            }
+        }
+
+        $masterMap = $masterIds
+            ? Db::name('master')->where('id', 'in', array_unique($masterIds))->column('id,realname,mobile', 'id')
+            : [];
+        $userMap = $userIds
+            ? Db::name('user')->where('id', 'in', array_unique($userIds))->column('id,nickname,username,mobile', 'id')
+            : [];
+        $orderMap = $orderIds
+            ? Db::name('order')->where('id', 'in', array_unique($orderIds))->column('id,order_no,service_name', 'id')
+            : [];
+
+        foreach ($rows as &$item) {
+            $uid = (int)$item['user_id'];
+            if ($item['user_type'] === 'master') {
+                $m = $masterMap[$uid] ?? null;
+                $item['account_name'] = $m ? ($m['realname'] ?: ('师傅#' . $uid)) : ('师傅#' . $uid);
+                $item['account_mobile'] = $m['mobile'] ?? '';
+            } else {
+                $u = $userMap[$uid] ?? null;
+                $item['account_name'] = $u ? ($u['nickname'] ?: ($u['username'] ?: ('用户#' . $uid))) : ('用户#' . $uid);
+                $item['account_mobile'] = $u['mobile'] ?? '';
+            }
+            $oid = (int)$item['order_id'];
+            $ord = $oid > 0 ? ($orderMap[$oid] ?? null) : null;
+            $item['order_no'] = $ord['order_no'] ?? '';
+            $item['service_name'] = $ord['service_name'] ?? '';
+        }
+        unset($item);
+
+        return json(['total' => $list->total(), 'rows' => $rows]);
+    }
+
+    /**
+     * 资金流水溯源详情
+     */
+    public function detail($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $owner = [];
+        if ($row['user_type'] === 'master' && (int)$row['user_id'] > 0) {
+            $m = Db::name('master')->where('id', (int)$row['user_id'])->find();
+            if ($m) {
+                $owner = [
+                    'role'   => '认证师傅',
+                    'name'   => $m['realname'],
+                    'mobile' => $m['mobile'],
+                    'money'  => $m['money'],
+                    'frozen' => $m['frozen_money'],
+                ];
+            }
+        } elseif ((int)$row['user_id'] > 0) {
+            $u = Db::name('user')->where('id', (int)$row['user_id'])->find();
+            if ($u) {
+                $owner = [
+                    'role'   => '平台注册用户',
+                    'name'   => $u['nickname'] ?: $u['username'],
+                    'mobile' => $u['mobile'],
+                    'money'  => $u['money'],
+                    'frozen' => '0.00',
+                ];
+            }
+        }
+
+        $order = (int)$row['order_id'] > 0 ? Db::name('order')->where('id', (int)$row['order_id'])->find() : null;
+        $settle = (int)$row['order_id'] > 0 ? Db::name('settle')->where('order_id', (int)$row['order_id'])->find() : null;
+
+        $this->view->assign([
+            'row'    => $row,
+            'owner'  => $owner,
+            'order'  => $order ?: [],
+            'settle' => $settle ?: [],
+        ]);
+        return $this->view->fetch();
+    }
+
+    public function add()
+    {
+        $this->error('财务资金流水由业务交易自动记账，禁止手工新增');
+    }
+
+    public function edit($ids = null)
+    {
+        $this->error('财务资金流水属于不可篡改审计凭证，禁止编辑');
+    }
+
+    public function del($ids = null)
+    {
+        $this->error('财务资金流水属于不可篡改审计凭证，禁止删除');
+    }
+
+    public function multi($ids = null)
+    {
+        $this->error('财务资金流水禁止批量修改');
+    }
+}
diff --git a/server/application/admin/controller/Withdraw.php b/server/application/admin/controller/Withdraw.php
index 1bf4a02..13eaba3 100644
--- a/server/application/admin/controller/Withdraw.php
+++ b/server/application/admin/controller/Withdraw.php
@@ -23,6 +23,8 @@ class Withdraw extends Backend
      * @var \app\admin\model\Withdraw
      */
     protected $model = null;
+    protected $relationSearch = true;
+    protected $searchFields = 'id,account,audit_msg,master.realname,master.mobile';
 
     /**
      * 审核状态机：当前状态 => 允许流转到的目标状态
@@ -64,6 +66,44 @@ class Withdraw extends Backend
         return json($result);
     }
 
+    /**
+     * 提现审核与资金来源对账详情
+     */
+    public function detail($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $masterId = (int)$row['master_id'];
+        $master = $masterId > 0 ? Db::name('master')->where('id', $masterId)->find() : null;
+        $recentSettles = $masterId > 0
+            ? Db::name('settle')->alias('s')
+                ->join('__ORDER__ o', 'o.id = s.order_id', 'LEFT')
+                ->where('s.master_id', $masterId)
+                ->field('s.*, o.order_no, o.service_name')
+                ->order('s.id desc')
+                ->limit(8)
+                ->select()
+            : [];
+        $walletLogs = $masterId > 0
+            ? Db::name('wallet_log')
+                ->where('user_type', 'master')
+                ->where('user_id', $masterId)
+                ->order('id desc')
+                ->limit(10)
+                ->select()
+            : [];
+
+        $this->view->assign([
+            'row'           => $row,
+            'master'        => $master ?: [],
+            'recentSettles' => $recentSettles,
+            'walletLogs'    => $walletLogs,
+        ]);
+        return $this->view->fetch();
+    }
+
     /**
      * 财务审核：申请信息只读，仅允许合法状态流转并做资金联动
      * - 驳回：退回师傅余额并解冻，写入钱包流水，通知师傅
@@ -139,10 +179,10 @@ class Withdraw extends Backend
                     'remark'     => '提现驳回，申请金额退回钱包余额' . ($auditMsg !== '' ? '（原因：' . $auditMsg . '）' : ''),
                     'createtime' => time(),
                 ]);
-                $this->sendMasterMessage((int)$master['user_id'], '提现申请已驳回', '您的提现申请 ¥' . $amount . ' 未通过财务审核：' . ($auditMsg !== '' ? $auditMsg : '无') . '，申请金额已退回钱包余额');
+                $this->sendMasterMessage($masterId, (int)$master['user_id'], '提现申请已驳回', '您的提现申请 ¥' . $amount . ' 未通过财务审核：' . ($auditMsg !== '' ? $auditMsg : '无') . '，申请金额已退回钱包余额');
             } elseif ($status === 'pass') {
                 // 审核通过：仅标记，资金保持冻结，等待财务打款
-                $this->sendMasterMessage((int)$master['user_id'], '提现审核通过', '您的提现申请 ¥' . $amount . ' 已通过审核，财务将尽快安排打款到 ' . ($row['channel'] === 'bank' ? '银行卡' : '微信钱包'));
+                $this->sendMasterMessage($masterId, (int)$master['user_id'], '提现审核通过', '您的提现申请 ¥' . $amount . ' 已通过审核，财务将尽快安排打款到 ' . ($row['channel'] === 'bank' ? '银行卡' : '微信钱包'));
             } elseif ($status === 'done') {
                 // 打款完成：冻结资金划出
                 Db::name('master')->where('id', $masterId)->update([
@@ -159,7 +199,7 @@ class Withdraw extends Backend
                     'remark'     => '提现打款完成，冻结资金 ¥' . $amount . ' 划出（' . ($row['channel'] === 'bank' ? '银行储蓄卡' : '微信钱包') . ' ' . $row['account'] . '）',
                     'createtime' => time(),
                 ]);
-                $this->sendMasterMessage((int)$master['user_id'], '提现打款完成', '您的提现 ¥' . $amount . ' 已打款成功，请留意到账通知');
+                $this->sendMasterMessage($masterId, (int)$master['user_id'], '提现打款完成', '您的提现 ¥' . $amount . ' 已打款成功，请留意到账通知');
             }
             Db::commit();
         } catch (PDOException|\Exception $e) {
@@ -194,25 +234,42 @@ class Withdraw extends Backend
     }
 
     /**
-     * 向师傅所属用户发送站内消息
-     * @param int $userId 用户ID
+     * 向师傅端工作台及所属用户发送站内消息
+     * @param int $masterId 师傅ID
+     * @param int $userId   用户ID
      * @param string $title 消息标题
      * @param string $content 消息内容
      */
-    protected function sendMasterMessage($userId, $title, $content)
+    protected function sendMasterMessage($masterId, $userId, $title, $content)
     {
-        if (!$userId) {
-            return;
+        $now = time();
+        $rows = [];
+        if ($masterId > 0) {
+            $rows[] = [
+                'receive_type' => 'master',
+                'receive_id'   => (int)$masterId,
+                'type'         => 'audit',
+                'title'        => mb_substr((string)$title, 0, 100),
+                'content'      => mb_substr((string)$content, 0, 500),
+                'order_id'     => 0,
+                'is_read'      => 0,
+                'createtime'   => $now,
+            ];
+        }
+        if ($userId > 0) {
+            $rows[] = [
+                'receive_type' => 'user',
+                'receive_id'   => (int)$userId,
+                'type'         => 'system',
+                'title'        => mb_substr((string)$title, 0, 100),
+                'content'      => mb_substr((string)$content, 0, 500),
+                'order_id'     => 0,
+                'is_read'      => 0,
+                'createtime'   => $now,
+            ];
+        }
+        if ($rows) {
+            Db::name('message')->insertAll($rows);
         }
-        Db::name('message')->insert([
-            'receive_type' => 'user',
-            'receive_id'   => $userId,
-            'type'         => 'system',
-            'title'        => mb_substr((string)$title, 0, 100),
-            'content'      => mb_substr((string)$content, 0, 500),
-            'order_id'     => 0,
-            'is_read'      => 0,
-            'createtime'   => time(),
-        ]);
     }
 }
diff --git a/server/application/admin/controller/auth/Adminlog.php b/server/application/admin/controller/auth/Adminlog.php
index 67ec10b..9453f21 100755
--- a/server/application/admin/controller/auth/Adminlog.php
+++ b/server/application/admin/controller/auth/Adminlog.php
@@ -18,6 +18,7 @@ class Adminlog extends Backend
      * @var \app\admin\model\AdminLog
      */
     protected $model = null;
+    protected $searchFields = 'id,username,title,url,ip';
     protected $childrenAdminIds = [];
 
     public function _initialize()
diff --git a/server/application/admin/controller/service/Cat.php b/server/application/admin/controller/service/Cat.php
index bb357fb..5fc47e1 100644
--- a/server/application/admin/controller/service/Cat.php
+++ b/server/application/admin/controller/service/Cat.php
@@ -17,6 +17,7 @@ class Cat extends Backend
      * @var \app\admin\model\service\Cat
      */
     protected $model = null;
+    protected $searchFields = 'id,name';
 
     public function _initialize()
     {
@@ -59,4 +60,24 @@ class Cat extends Backend
 
         return json(['total' => $list->total(), 'rows' => $rows]);
     }
+
+    /**
+     * 删除保护：类目下仍有关联商品时禁止物理删除
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $cnt = (int)Db::name('service')->where('cat_id', 'in', $idArr)->count();
+        if ($cnt > 0) {
+            $this->error('所选类目下仍包含 ' . $cnt . ' 种服务商品，请先迁移或删除下属商品后再操作');
+        }
+        return parent::del($ids);
+    }
 }
diff --git a/server/application/admin/controller/service/Type.php b/server/application/admin/controller/service/Type.php
index d0e9f39..d1c8f76 100644
--- a/server/application/admin/controller/service/Type.php
+++ b/server/application/admin/controller/service/Type.php
@@ -16,6 +16,7 @@ class Type extends Backend
      * @var \app\admin\model\service\Type
      */
     protected $model = null;
+    protected $searchFields = 'id,name,code';
 
     public function _initialize()
     {
@@ -41,4 +42,31 @@ class Type extends Backend
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
+
+    /**
+     * 删除保护：已被服务商品定价矩阵引用的服务标识禁止物理删除
+     */
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $ids = $ids ?: $this->request->post('ids');
+        $idArr = array_values(array_filter(array_map('intval', explode(',', (string)$ids))));
+        if (!$idArr) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $codes = \think\Db::name('service_type')->where('id', 'in', $idArr)->column('code');
+        foreach ($codes as $code) {
+            if (!$code) continue;
+            $used = \think\Db::name('service')
+                ->where('service_types', 'like', '%"' . $code . '"%')
+                ->whereOr('addons', 'like', '%"' . $code . '"%')
+                ->count();
+            if ($used > 0) {
+                $this->error('服务项【' . $code . '】已被 ' . $used . ' 种服务商品定价引用，禁止物理删除；如需停用请将状态设为隐藏');
+            }
+        }
+        return parent::del($ids);
+    }
 }
diff --git a/server/application/admin/controller/user/Group.php b/server/application/admin/controller/user/Group.php
index b4c38c1..b71a21b 100755
--- a/server/application/admin/controller/user/Group.php
+++ b/server/application/admin/controller/user/Group.php
@@ -16,6 +16,7 @@ class Group extends Backend
      * @var \app\admin\model\UserGroup
      */
     protected $model = null;
+    protected $searchFields = 'id,name';
 
     public function _initialize()
     {
diff --git a/server/application/admin/controller/user/User.php b/server/application/admin/controller/user/User.php
index 6908ad6..0a55219 100755
--- a/server/application/admin/controller/user/User.php
+++ b/server/application/admin/controller/user/User.php
@@ -4,17 +4,17 @@ namespace app\admin\controller\user;
 
 use app\common\controller\Backend;
 use app\common\library\Auth;
+use think\Db;
 
 /**
- * 会员管理
+ * 业主与会员管理
  *
  * @icon fa fa-user
  */
 class User extends Backend
 {
-
     protected $relationSearch = true;
-    protected $searchFields = 'id,username,nickname';
+    protected $searchFields = 'id,username,nickname,mobile';
 
     /**
      * @var \app\admin\model\User
@@ -28,14 +28,12 @@ class User extends Backend
     }
 
     /**
-     * 查看
+     * 会员列表（批量聚合业务角色、订单数与实付消费额）
      */
     public function index()
     {
-        //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
-            //如果发送的来源是Selectpage，则转发到Selectpage
             if ($this->request->request('keyField')) {
                 return $this->selectpage();
             }
@@ -45,17 +43,160 @@ class User extends Backend
                 ->where($where)
                 ->order($sort, $order)
                 ->paginate($limit);
-            foreach ($list as $k => $v) {
-                $v->avatar = $v->avatar ? cdnurl($v->avatar, true) : letter_avatar($v->nickname);
-                $v->hidden(['password', 'salt']);
-            }
-            $result = array("total" => $list->total(), "rows" => $list->items());
 
-            return json($result);
+            $rows = $list->items();
+            $uids = array_column($rows, 'id');
+
+            $masterMap = [];
+            $merchantMap = [];
+            $memberMap = [];
+            $orderStatMap = [];
+            $couponCntMap = [];
+
+            if (!empty($uids)) {
+                $masters = Db::name('master')->field('id,user_id,realname,verify_status')->where('user_id', 'in', $uids)->select();
+                foreach ($masters as $m) {
+                    $masterMap[(int)$m['user_id']] = $m;
+                }
+
+                $merchants = Db::name('merchant')->field('id,user_id,name,verify_status')->where('user_id', 'in', $uids)->select();
+                foreach ($merchants as $mc) {
+                    $merchantMap[(int)$mc['user_id']] = $mc;
+                }
+
+                $members = Db::name('merchant_member')->alias('mm')
+                    ->join('merchant m', 'm.id = mm.merchant_id', 'LEFT')
+                    ->where('mm.user_id', 'in', $uids)
+                    ->field('mm.user_id, m.name as merchant_name')
+                    ->select();
+                foreach ($members as $mb) {
+                    $memberMap[(int)$mb['user_id']] = $mb['merchant_name'];
+                }
+
+                $orderAggs = Db::name('order')
+                    ->field('user_id, COUNT(*) AS cnt, SUM(CASE WHEN pay_status = 1 AND status <> 9 THEN pay_amount ELSE 0 END) AS spent')
+                    ->where('user_id', 'in', $uids)
+                    ->group('user_id')
+                    ->select();
+                foreach ($orderAggs as $oa) {
+                    $orderStatMap[(int)$oa['user_id']] = [
+                        'cnt'   => (int)$oa['cnt'],
+                        'spent' => number_format((float)$oa['spent'], 2, '.', ''),
+                    ];
+                }
+
+                $couponAggs = Db::name('user_coupon')
+                    ->field('user_id, COUNT(*) AS cnt')
+                    ->where('user_id', 'in', $uids)
+                    ->where('status', 'unused')
+                    ->group('user_id')
+                    ->select();
+                foreach ($couponAggs as $ca) {
+                    $couponCntMap[(int)$ca['user_id']] = (int)$ca['cnt'];
+                }
+            }
+
+            foreach ($rows as $v) {
+                $uid = (int)$v->id;
+                $v->avatar = $v->avatar ? (strpos($v->avatar, '/assets/') === 0 ? $v->avatar : cdnurl($v->avatar, true)) : letter_avatar($v->nickname);
+                $v->hidden(['password', 'salt']);
+
+                $roles = [];
+                if (isset($masterMap[$uid]) && $masterMap[$uid]['verify_status'] === 'pass') {
+                    $roles[] = ['type' => 'master', 'label' => '认证师傅 (' . $masterMap[$uid]['realname'] . ')'];
+                }
+                if (isset($merchantMap[$uid]) && $merchantMap[$uid]['verify_status'] === 'pass') {
+                    $roles[] = ['type' => 'merchant', 'label' => '签约企业 (' . $merchantMap[$uid]['name'] . ')'];
+                } elseif (isset($memberMap[$uid]) && !empty($memberMap[$uid])) {
+                    $roles[] = ['type' => 'member', 'label' => '企业子账号 (' . $memberMap[$uid] . ')'];
+                }
+                if (empty($roles)) {
+                    $roles[] = ['type' => 'owner', 'label' => '个人业主'];
+                }
+
+                $v['role_badges'] = $roles;
+                $v['order_count'] = $orderStatMap[$uid]['cnt'] ?? 0;
+                $v['total_spent'] = $orderStatMap[$uid]['spent'] ?? '0.00';
+                $v['unused_coupons'] = $couponCntMap[$uid] ?? 0;
+            }
+
+            return json(["total" => $list->total(), "rows" => $rows]);
         }
         return $this->view->fetch();
     }
 
+    /**
+     * 会员业务全景详情看板
+     */
+    public function detail($ids = null)
+    {
+        $row = $this->model->find($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $row->avatar = $row->avatar ? (strpos($row->avatar, '/assets/') === 0 ? $row->avatar : cdnurl($row->avatar, true)) : letter_avatar($row->nickname);
+        $uid = (int)$row['id'];
+
+        $masterProfile = Db::name('master')->where('user_id', $uid)->find();
+        $merchantProfile = Db::name('merchant')->where('user_id', $uid)->find();
+        if (!$merchantProfile) {
+            $memberBind = Db::name('merchant_member')->alias('mm')
+                ->join('merchant m', 'm.id = mm.merchant_id', 'LEFT')
+                ->where('mm.user_id', $uid)
+                ->field('m.*, mm.remark as member_remark')
+                ->find();
+            if ($memberBind) {
+                $merchantProfile = $memberBind;
+            }
+        }
+
+        $addressList = Db::name('address')
+            ->where('user_id', $uid)
+            ->order('is_default desc, id desc')
+            ->limit(6)
+            ->select();
+
+        $statusMap = (new \app\admin\model\Order)->getStatusList();
+        $recentOrders = Db::name('order')->alias('o')
+            ->join('master m', 'm.id = o.master_id', 'LEFT')
+            ->where('o.user_id', $uid)
+            ->field('o.*, m.realname as master_name')
+            ->order('o.id desc')
+            ->limit(8)
+            ->select();
+        foreach ($recentOrders as &$o) {
+            $o['status_label'] = $statusMap[(int)$o['status']] ?? ('状态' . $o['status']);
+        }
+        unset($o);
+
+        $orderAgg = Db::name('order')
+            ->field('COUNT(*) AS total_cnt, SUM(CASE WHEN pay_status = 1 AND status <> 9 THEN pay_amount ELSE 0 END) AS total_spent')
+            ->where('user_id', $uid)
+            ->find();
+
+        $coupons = Db::name('user_coupon')->alias('uc')
+            ->join('coupon c', 'c.id = uc.coupon_id', 'LEFT')
+            ->join('order o', 'o.id = uc.order_id', 'LEFT')
+            ->where('uc.user_id', $uid)
+            ->field('uc.*, c.name as coupon_name, c.type as coupon_type, c.amount as coupon_amount, c.discount as coupon_discount, c.min_amount, o.order_no')
+            ->order('uc.id desc')
+            ->limit(8)
+            ->select();
+
+        $this->view->assign([
+            'row'             => $row,
+            'masterProfile'   => $masterProfile,
+            'merchantProfile' => $merchantProfile,
+            'addressList'     => $addressList,
+            'recentOrders'    => $recentOrders,
+            'coupons'         => $coupons,
+            'orderCount'      => (int)($orderAgg['total_cnt'] ?? 0),
+            'totalSpent'      => number_format((float)($orderAgg['total_spent'] ?? 0), 2, '.', ''),
+        ]);
+
+        return $this->view->fetch();
+    }
+
     /**
      * 添加
      */
@@ -63,29 +204,108 @@ class User extends Backend
     {
         if ($this->request->isPost()) {
             $this->token();
+            $params = $this->request->post("row/a", []);
+            if (!$params) {
+                $this->error(__('Parameter %s can not be empty', ''));
+            }
+            $username = trim((string)($params['username'] ?? ''));
+            $nickname = trim((string)($params['nickname'] ?? ''));
+            $mobile   = trim((string)($params['mobile'] ?? ''));
+            $email    = trim((string)($params['email'] ?? ''));
+            $password = (string)($params['password'] ?? '');
+            if ($username === '' || $nickname === '') {
+                $this->error('用户名与昵称不能为空');
+            }
+            if (Db::name('user')->where('username', $username)->count() > 0) {
+                $this->error('该用户名已存在');
+            }
+            if ($mobile !== '' && Db::name('user')->where('mobile', $mobile)->count() > 0) {
+                $this->error('该手机号已被注册');
+            }
+            if ($email !== '' && Db::name('user')->where('email', $email)->count() > 0) {
+                $this->error('该邮箱已被绑定');
+            }
+            if (strlen($password) < 6 || strlen($password) > 30) {
+                $this->error('登录密码长度须在6-30位之间');
+            }
+            $salt = \fast\Random::alnum();
+            $params['salt']     = $salt;
+            $params['password'] = Auth::instance()->getEncryptPassword($password, $salt);
+            $params['jointime'] = time();
+            unset($params['money'], $params['score']);
+            $result = $this->model->allowField(true)->save($params);
+            if ($result !== false) {
+                $this->success();
+            }
+            $this->error($this->model->getError() ?: __('No rows were inserted'));
         }
-        return parent::add();
+        $this->view->assign('groupList', build_select('row[group_id]', \app\admin\model\UserGroup::column('id,name'), 1, ['class' => 'form-control selectpicker']));
+        return $this->view->fetch();
     }
 
     /**
-     * 编辑
+     * 编辑（兼容微信授权注册无邮箱/无IP记录会员的状态修改与资料维护）
      */
     public function edit($ids = null)
     {
-        if ($this->request->isPost()) {
-            $this->token();
-        }
         $row = $this->model->get($ids);
-        $this->modelValidate = true;
         if (!$row) {
             $this->error(__('No Results were found'));
         }
+        if ($this->request->isPost()) {
+            $this->token();
+            $params = $this->request->post("row/a", []);
+            if (!$params) {
+                $this->error(__('Parameter %s can not be empty', ''));
+            }
+            $uid      = (int)$row['id'];
+            $username = isset($params['username']) ? trim((string)$params['username']) : (string)$row['username'];
+            $nickname = isset($params['nickname']) ? trim((string)$params['nickname']) : (string)$row['nickname'];
+            $mobile   = isset($params['mobile']) ? trim((string)$params['mobile']) : (string)$row['mobile'];
+            $email    = isset($params['email']) ? trim((string)$params['email']) : (string)$row['email'];
+            $password = (string)($params['password'] ?? '');
+
+            if ($username === '') {
+                $this->error('用户名不能为空');
+            }
+            if (Db::name('user')->where('username', $username)->where('id', '<>', $uid)->count() > 0) {
+                $this->error('该用户名已被其他账号占用');
+            }
+            if ($mobile !== '' && !preg_match('/^1[3-9]\d{9}$/', $mobile)) {
+                $this->error('手机号格式不正确');
+            }
+            if ($mobile !== '' && Db::name('user')->where('mobile', $mobile)->where('id', '<>', $uid)->count() > 0) {
+                $this->error('该手机号已被其他账号绑定');
+            }
+            if ($email !== '' && !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+                $this->error('电子邮箱格式不正确');
+            }
+            if ($email !== '' && Db::name('user')->where('email', $email)->where('id', '<>', $uid)->count() > 0) {
+                $this->error('该邮箱已被其他账号绑定');
+            }
+            if ($password !== '' && (strlen($password) < 6 || strlen($password) > 30)) {
+                $this->error('重置密码长度须在6-30位之间');
+            }
+
+            // 禁止通过会员资料编辑裸改资金余额与积分，保障账实一致
+            unset($params['money'], $params['score'], $params['id']);
+            if ($nickname === '') {
+                $params['nickname'] = $row['nickname'] ?: $username;
+            }
+
+            $result = $row->allowField(true)->save($params);
+            if ($result !== false) {
+                $this->success();
+            }
+            $this->error($row->getError() ?: __('No rows were updated'));
+        }
         $this->view->assign('groupList', build_select('row[group_id]', \app\admin\model\UserGroup::column('id,name'), $row['group_id'], ['class' => 'form-control selectpicker']));
-        return parent::edit($ids);
+        $this->view->assign('row', $row);
+        return $this->view->fetch();
     }
 
     /**
-     * 删除
+     * 删除（校验关联业务数据，防止产生孤儿工单与师傅档案）
      */
     public function del($ids = "")
     {
@@ -98,8 +318,13 @@ class User extends Backend
         if (!$row) {
             $this->error(__('No Results were found'));
         }
-        Auth::instance()->delete($row['id']);
+        $uid = (int)$row['id'];
+        if (Db::name('order')->where('user_id', $uid)->count() > 0
+            || Db::name('master')->where('user_id', $uid)->count() > 0
+            || Db::name('merchant')->where('user_id', $uid)->count() > 0) {
+            $this->error('该会员已关联历史订单、师傅或商家档案，禁止物理删除；如需停用请将状态设为隐藏');
+        }
+        Auth::instance()->delete($uid);
         $this->success();
     }
-
 }
diff --git a/server/application/admin/lang/zh-cn/invoice.php b/server/application/admin/lang/zh-cn/invoice.php
index 04a1afb..a309826 100644
--- a/server/application/admin/lang/zh-cn/invoice.php
+++ b/server/application/admin/lang/zh-cn/invoice.php
@@ -1,20 +1,34 @@
 <?php
 
 return [
-    'Merchant_id' => '申请商户',
-    'User_id'     => '申请人/用户',
-    'Amount'      => '开票开具金额(元)',
-    'Type'        => '发票资质类型',
-    'Title'       => '开票抬头名称',
-    'Tax_no'      => '纳税人识别号(税号)',
-    'Email'       => '电子发票接收邮箱',
-    'Remark'      => '开票申请备注',
-    'Status'      => '开票处理状态',
-    'Invoice_no'  => '发票代码与号码',
-    'Audit_msg'   => '财务处理说明/驳回原因',
-    'Ordinary'    => '普通增值税电子发票',
-    'Special'     => '增值税专用发票',
-    'Wait'        => '待财务开具',
-    'Issued'      => '已开票寄送',
-    'Reject'      => '已驳回开票',
+    'Invoice_sn'     => '开票申请单号',
+    'Merchant_id'    => '申请商户',
+    'User_id'        => '申请人/用户',
+    'Amount'         => '开票金额(元)',
+    'Type'           => '发票类型',
+    'Title_type'     => '抬头类型',
+    'Title'          => '发票抬头名称',
+    'Tax_no'         => '纳税人识别号',
+    'Bank_name'      => '开户银行',
+    'Bank_account'   => '企业银行账号',
+    'Reg_address'    => '企业注册地址',
+    'Reg_mobile'     => '企业注册电话',
+    'Email'          => '接收邮箱',
+    'Receive_mobile' => '通知手机号',
+    'Remark'         => '开票申请备注',
+    'Order_count'    => '关联订单数',
+    'Status'         => '处理状态',
+    'Invoice_code'   => '发票代码',
+    'Invoice_no'     => '发票号码',
+    'Invoice_file'   => '电子发票文件',
+    'Audit_msg'      => '财务处理说明/驳回原因',
+    'Issue_time'     => '开票完成时间',
+    'Ordinary'       => '增值税普通发票',
+    'Special'        => '增值税专用发票',
+    'Personal'       => '个人/非企业',
+    'Enterprise'     => '企业单位',
+    'Wait'           => '待财务开具',
+    'Issued'         => '已开票',
+    'Reject'         => '已驳回',
+    'Cancel'         => '用户已撤回',
 ];
diff --git a/server/application/admin/lang/zh-cn/invoice_title.php b/server/application/admin/lang/zh-cn/invoice_title.php
new file mode 100644
index 0000000..2ba682e
--- /dev/null
+++ b/server/application/admin/lang/zh-cn/invoice_title.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'User_id'              => '所属用户',
+    'Merchant_id'          => '关联商户',
+    'Title_type'           => '抬头类型',
+    'Default_invoice_type' => '偏好发票类型',
+    'Title'                => '发票抬头名称',
+    'Tax_no'               => '纳税人识别号',
+    'Bank_name'            => '开户银行',
+    'Bank_account'         => '企业银行账号',
+    'Reg_address'          => '企业注册地址',
+    'Reg_mobile'           => '企业注册电话',
+    'Email'                => '默认接收邮箱',
+    'Receive_mobile'       => '默认通知手机',
+    'Is_default'           => '默认抬头',
+    'Personal'             => '个人/非企业',
+    'Enterprise'           => '企业单位',
+    'Ordinary'             => '普通发票',
+    'Special'              => '增值税专用发票',
+];
diff --git a/server/application/admin/lang/zh-cn/showcase.php b/server/application/admin/lang/zh-cn/showcase.php
new file mode 100644
index 0000000..5f3ff4f
--- /dev/null
+++ b/server/application/admin/lang/zh-cn/showcase.php
@@ -0,0 +1,22 @@
+<?php
+
+return [
+    'Id'           => 'ID',
+    'Order_id'     => '关联工单',
+    'User_id'      => '晒单业主',
+    'User_name'    => '展示昵称',
+    'Cat_name'     => '服务品类',
+    'Service_id'   => '关联服务',
+    'Service_name' => '服务项目',
+    'Region'       => '所在区域',
+    'Cover_image'  => '瀑布流封面',
+    'Images'       => '实拍组图',
+    'Score'        => '评分',
+    'Tags'         => '评价标签',
+    'Content'      => '晒单内容',
+    'Master_name'  => '履约师傅',
+    'Master_score' => '师傅评分',
+    'Status'       => '展示状态',
+    'Createtime'   => '发布时间',
+    'Updatetime'   => '更新时间',
+];
diff --git a/server/application/admin/lang/zh-cn/user_coupon.php b/server/application/admin/lang/zh-cn/user_coupon.php
new file mode 100644
index 0000000..7996597
--- /dev/null
+++ b/server/application/admin/lang/zh-cn/user_coupon.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'Id'         => '记录ID',
+    'User_id'    => '领用会员',
+    'Coupon_id'  => '所属优惠券',
+    'Order_id'   => '核销工单',
+    'Status'     => '使用状态',
+    'Unused'     => '未使用',
+    'Used'       => '已核销',
+    'Expired'    => '已过期',
+    'Use_time'   => '核销时间',
+    'Createtime' => '领取时间',
+];
diff --git a/server/application/admin/model/Invoice.php b/server/application/admin/model/Invoice.php
index eb78ef5..252c8a7 100644
--- a/server/application/admin/model/Invoice.php
+++ b/server/application/admin/model/Invoice.php
@@ -4,17 +4,11 @@ namespace app\admin\model;
 
 use think\Model;
 
-
 class Invoice extends Model
 {
-
-    
-
-    
-
     // 表名
     protected $name = 'invoice';
-    
+
     // 自动写入时间戳字段
     protected $autoWriteTimestamp = 'integer';
 
@@ -26,21 +20,29 @@ class Invoice extends Model
     // 追加属性
     protected $append = [
         'type_text',
+        'title_type_text',
         'status_text'
     ];
-    
 
-    
     public function getTypeList()
     {
         return ['normal' => __('Ordinary'), 'special' => __('Special')];
     }
 
-    public function getStatusList()
+    public function getTitleTypeList()
     {
-        return ['wait' => __('Wait'), 'issued' => __('Issued'), 'reject' => __('Reject')];
+        return ['personal' => __('Personal'), 'enterprise' => __('Enterprise')];
     }
 
+    public function getStatusList()
+    {
+        return [
+            'wait'   => __('Wait'),
+            'issued' => __('Issued'),
+            'reject' => __('Reject'),
+            'cancel' => __('Cancel'),
+        ];
+    }
 
     public function getTypeTextAttr($value, $data)
     {
@@ -49,6 +51,15 @@ class Invoice extends Model
         return $list[$value] ?? '';
     }
 
+    public function getTitleTypeTextAttr($value, $data)
+    {
+        $value = $value ?: ($data['title_type'] ?? '');
+        if ($value === '' && !empty($data['tax_no'])) {
+            $value = 'enterprise';
+        }
+        $list = $this->getTitleTypeList();
+        return $list[$value] ?? __('Personal');
+    }
 
     public function getStatusTextAttr($value, $data)
     {
@@ -57,10 +68,6 @@ class Invoice extends Model
         return $list[$value] ?? '';
     }
 
-
-
-
-
     public function user()
     {
         return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
diff --git a/server/application/admin/model/InvoiceTitle.php b/server/application/admin/model/InvoiceTitle.php
new file mode 100644
index 0000000..cf818c3
--- /dev/null
+++ b/server/application/admin/model/InvoiceTitle.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+class InvoiceTitle extends Model
+{
+    protected $name = 'invoice_title';
+
+    protected $autoWriteTimestamp = 'integer';
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    public function getTitleTypeList()
+    {
+        return [
+            'enterprise' => '企业单位',
+            'personal'   => '个人/非企业',
+        ];
+    }
+
+    public function getDefaultInvoiceTypeList()
+    {
+        return [
+            'normal'  => '增值税普通发票',
+            'special' => '增值税专用发票',
+        ];
+    }
+
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+    public function merchant()
+    {
+        return $this->belongsTo('Merchant', 'merchant_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+}
diff --git a/server/application/admin/model/MasterSkill.php b/server/application/admin/model/MasterSkill.php
index ba16e9d..da1df3f 100644
--- a/server/application/admin/model/MasterSkill.php
+++ b/server/application/admin/model/MasterSkill.php
@@ -36,11 +36,11 @@ class MasterSkill extends Model
 
     public function master()
     {
-        return $this->belongsTo('app\admin\model\Master', 'master_id', 'id')->setEagerlyType(0);
+        return $this->belongsTo('Master', 'master_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 
     public function cat()
     {
-        return $this->belongsTo('app\admin\model\service\Cat', 'cat_id', 'id')->setEagerlyType(0);
+        return $this->belongsTo('app\admin\model\service\Cat', 'cat_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 }
diff --git a/server/application/admin/model/Showcase.php b/server/application/admin/model/Showcase.php
new file mode 100644
index 0000000..0f22c14
--- /dev/null
+++ b/server/application/admin/model/Showcase.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+class Showcase extends Model
+{
+    protected $name = 'showcase';
+
+    protected $autoWriteTimestamp = 'integer';
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    protected $append = [
+        'status_text',
+    ];
+
+    public function getStatusList()
+    {
+        return [
+            'normal' => '公开展示',
+            'hidden' => '已屏蔽下架',
+        ];
+    }
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ?: ($data['status'] ?? '');
+        $list = $this->getStatusList();
+        return $list[$value] ?? '';
+    }
+
+    public function order()
+    {
+        return $this->belongsTo('Order', 'order_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+    public function service()
+    {
+        return $this->belongsTo('Service', 'service_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+}
diff --git a/server/application/admin/model/SkillDict.php b/server/application/admin/model/SkillDict.php
index 412ffb9..e391576 100644
--- a/server/application/admin/model/SkillDict.php
+++ b/server/application/admin/model/SkillDict.php
@@ -68,6 +68,6 @@ class SkillDict extends Model
 
     public function master()
     {
-        return $this->belongsTo('app\admin\model\Master', 'master_id', 'id');
+        return $this->belongsTo('Master', 'master_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 }
diff --git a/server/application/admin/model/UserCoupon.php b/server/application/admin/model/UserCoupon.php
new file mode 100644
index 0000000..8dac4c0
--- /dev/null
+++ b/server/application/admin/model/UserCoupon.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+class UserCoupon extends Model
+{
+    // 表名
+    protected $name = 'user_coupon';
+
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'integer';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'status_text',
+        'use_time_text',
+    ];
+
+    public function getStatusList()
+    {
+        return [
+            'unused'  => '未使用',
+            'used'    => '已核销',
+            'expired' => '已过期',
+        ];
+    }
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ?: ($data['status'] ?? '');
+        $list = $this->getStatusList();
+        return $list[$value] ?? '';
+    }
+
+    public function getUseTimeTextAttr($value, $data)
+    {
+        $value = $value ?: ($data['use_time'] ?? '');
+        return $value && is_numeric($value) ? date('Y-m-d H:i:s', (int)$value) : '';
+    }
+
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+    public function coupon()
+    {
+        return $this->belongsTo('Coupon', 'coupon_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+    public function order()
+    {
+        return $this->belongsTo('Order', 'order_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+}
diff --git a/server/application/admin/model/WalletLog.php b/server/application/admin/model/WalletLog.php
new file mode 100644
index 0000000..079851b
--- /dev/null
+++ b/server/application/admin/model/WalletLog.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+class WalletLog extends Model
+{
+    protected $name = 'wallet_log';
+
+    protected $autoWriteTimestamp = 'integer';
+    protected $createTime = 'createtime';
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    public function getUserTypeList()
+    {
+        return [
+            'master' => '认证师傅',
+            'user'   => '业主/企业用户',
+        ];
+    }
+
+    public function getTypeList()
+    {
+        return [
+            'settle'   => '佣金结算',
+            'withdraw' => '余额提现',
+            'refund'   => '退回/退款',
+            'recharge' => '账户充值',
+            'pay'      => '余额支付',
+            'deduct'   => '判责扣款',
+        ];
+    }
+}
diff --git a/server/application/admin/view/appeal/add.html b/server/application/admin/view/appeal/add.html
index 9943c89..ef257e7 100644
--- a/server/application/admin/view/appeal/add.html
+++ b/server/application/admin/view/appeal/add.html
@@ -11,7 +11,7 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Master_id')}:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-master_id" data-rule="required" min="0" data-source="master/index" class="form-control selectpage" name="row[master_id]" type="text" value="" placeholder="请选择或输入师傅姓名/手机">
+                            <input id="c-master_id" data-rule="required" min="0" data-source="master/index" data-field="realname" class="form-control selectpage" name="row[master_id]" type="text" value="" placeholder="请选择或输入师傅姓名/手机">
                         </div>
                     </div>
                 </div>
@@ -19,7 +19,7 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Order_id')}:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-order_id" data-rule="required" min="0" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="" placeholder="请选择或搜索关联工单号">
+                            <input id="c-order_id" data-rule="required" min="0" data-source="order/index" data-field="order_no" class="form-control selectpage" name="row[order_id]" type="text" value="" placeholder="请选择或搜索关联工单号">
                         </div>
                     </div>
                 </div>
diff --git a/server/application/admin/view/appeal/detail.html b/server/application/admin/view/appeal/detail.html
new file mode 100644
index 0000000..052b301
--- /dev/null
+++ b/server/application/admin/view/appeal/detail.html
@@ -0,0 +1,115 @@
+<style>
+.appeal-detail-wrap { padding: 12px 15px; }
+.appeal-card { background: #fff; border: 1px solid #ebedf0; border-radius: 6px; margin-bottom: 14px; }
+.appeal-card-hd { padding: 10px 15px; border-bottom: 1px solid #f0f0f2; font-weight: 600; color: #1f1f1f; background: #fafafa; border-radius: 6px 6px 0 0; }
+.appeal-card-bd { padding: 14px 15px; }
+.appeal-kv { margin-bottom: 8px; line-height: 1.6; }
+.appeal-kv .k { color: #888; display: inline-block; min-width: 84px; }
+.appeal-thumb { width: 84px; height: 84px; object-fit: cover; border-radius: 4px; border: 1px solid #e5e5e5; margin: 0 8px 8px 0; }
+</style>
+
+<div class="appeal-detail-wrap">
+    <!-- 1. 申诉核心概览 -->
+    <div class="appeal-card">
+        <div class="appeal-card-hd">
+            <i class="fa fa-gavel text-warning"></i> 申诉工单概览 #AP{$row.id}
+            <span class="pull-right label {if $row.status=='done'}label-success{elseif $row.status=='reject'/}label-danger{elseif $row.status=='handling'/}label-info{else/}label-warning{/if}">
+                {$statusList[$row.status]|default=$row.status|htmlentities}
+            </span>
+        </div>
+        <div class="appeal-card-bd">
+            <div class="row">
+                <div class="col-sm-6 appeal-kv"><span class="k">申诉类型：</span><span class="label label-primary">{$typeList[$row.type]|default=$row.type|htmlentities}</span></div>
+                <div class="col-sm-6 appeal-kv"><span class="k">提交时间：</span>{:date('Y-m-d H:i:s', $row.createtime)}</div>
+                <div class="col-sm-6 appeal-kv"><span class="k">申诉师傅：</span><strong>{$master.realname|default='-'|htmlentities}</strong> {if !empty($master.mobile)}（{$master.mobile|htmlentities}）{/if}</div>
+                <div class="col-sm-6 appeal-kv"><span class="k">师傅评分：</span>
+                    {if !empty($master)}
+                    <i class="fa fa-star text-warning"></i> {$master.score|default='5.0'} · 累计完单 {$master.order_count|default=0} 笔
+                    {else/}-{/if}
+                </div>
+            </div>
+            <div class="appeal-kv" style="margin-top:6px;">
+                <div class="k" style="margin-bottom:4px;">申诉详细事由：</div>
+                <div class="well well-sm" style="margin-bottom:8px;background:#f9fafb;">{$row.content|htmlentities}</div>
+            </div>
+            {if !empty($appealImages)}
+            <div class="appeal-kv" style="margin-bottom:0;">
+                <div class="k" style="display:block;margin-bottom:6px;">师傅提交举证图片（点击查看大图）：</div>
+                {volist name="appealImages" id="img"}
+                <a href="{$img|cdnurl|htmlentities}" target="_blank"><img src="{$img|cdnurl|htmlentities}" class="appeal-thumb" alt="举证图"></a>
+                {/volist}
+            </div>
+            {/if}
+        </div>
+    </div>
+
+    <!-- 2. 关联订单与现场证据对照 -->
+    <div class="appeal-card">
+        <div class="appeal-card-hd"><i class="fa fa-file-text-o text-info"></i> 关联订单与履约核查</div>
+        <div class="appeal-card-bd">
+            {if !empty($order)}
+            <div class="row">
+                <div class="col-sm-6 appeal-kv"><span class="k">关联单号：</span><code>{$order.order_no|htmlentities}</code></div>
+                <div class="col-sm-6 appeal-kv"><span class="k">工单状态：</span><span class="label label-default">{$orderStatusMap[$order.status]|default=$order.status}</span></div>
+                <div class="col-sm-6 appeal-kv"><span class="k">服务项目：</span>{$order.service_name|default='-'|htmlentities} {if $order.goods_model}（{$order.goods_model|htmlentities}）{/if}</div>
+                <div class="col-sm-6 appeal-kv"><span class="k">实付金额：</span><strong class="text-danger">¥{$order.pay_amount|default='0.00'|htmlentities}</strong>（师傅结算：¥{$order.settle_amount|default='0.00'|htmlentities}）</div>
+                <div class="col-sm-6 appeal-kv"><span class="k">下单雇主：</span>{$order.contact|default='-'|htmlentities}（{$order.mobile|default='-'|htmlentities}）</div>
+                <div class="col-sm-6 appeal-kv"><span class="k">服务地址：</span>{$order.city|htmlentities}{$order.district|htmlentities}{$order.address|htmlentities}</div>
+            </div>
+            {if !empty($orderMedias)}
+            <hr style="margin:10px 0;">
+            <div style="color:#666;margin-bottom:6px;font-weight:600;">工单现场打卡/完工留档凭证：</div>
+            {volist name="orderMedias" id="m"}
+            <a href="{$m.url|cdnurl|htmlentities}" target="_blank" title="{$m.remark|default=$m.stage|htmlentities}">
+                <img src="{$m.url|cdnurl|htmlentities}" class="appeal-thumb" alt="工单留档">
+            </a>
+            {/volist}
+            {/if}
+            {else/}
+            <p class="text-muted" style="margin-bottom:0;">该申诉未绑定具体业务订单。</p>
+            {/if}
+        </div>
+    </div>
+
+    <!-- 3. 关联客户评价对照 -->
+    {if !empty($review)}
+    <div class="appeal-card">
+        <div class="appeal-card-hd"><i class="fa fa-comments-o text-primary"></i> 关联客户评价记录</div>
+        <div class="appeal-card-bd">
+            <div class="appeal-kv">
+                <span class="k">客户打分：</span>
+                {for start="1" end="6"}
+                <i class="fa {if $i <= $review.score}fa-star text-warning{else/}fa-star-o text-muted{/if}"></i>
+                {/for}
+                <strong style="margin-left:4px;">{$review.score} 星</strong>
+                <span class="label {if $review.status=='normal'}label-success{else/}label-default{/if}" style="margin-left:8px;">{if $review.status=='normal'}正常展示{else/}已屏蔽隐藏{/if}</span>
+            </div>
+            <div class="appeal-kv"><span class="k">评价内容：</span>{$review.content|default='-'|htmlentities}</div>
+            {if !empty($reviewImages)}
+            <div class="appeal-kv" style="margin-bottom:0;">
+                {volist name="reviewImages" id="rimg"}
+                <a href="{$rimg|cdnurl|htmlentities}" target="_blank"><img src="{$rimg|cdnurl|htmlentities}" class="appeal-thumb" alt="评价晒图"></a>
+                {/volist}
+            </div>
+            {/if}
+        </div>
+    </div>
+    {/if}
+
+    <!-- 4. 平台仲裁处理结论 -->
+    <div class="appeal-card" style="margin-bottom:0;">
+        <div class="appeal-card-hd"><i class="fa fa-check-circle text-success"></i> 平台仲裁答复记录</div>
+        <div class="appeal-card-bd">
+            <div class="appeal-kv"><span class="k">处理状态：</span><strong>{$statusList[$row.status]|default=$row.status|htmlentities}</strong></div>
+            <div class="appeal-kv"><span class="k">更新时间：</span>{:date('Y-m-d H:i:s', $row.updatetime)}</div>
+            <div class="appeal-kv" style="margin-bottom:0;">
+                <span class="k">官方答复：</span>
+                {if $row.reply}
+                <span>{$row.reply|htmlentities}</span>
+                {else/}
+                <span class="text-muted">暂未填写仲裁答复</span>
+                {/if}
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/appeal/edit.html b/server/application/admin/view/appeal/edit.html
index c3a9ff7..787bf95 100644
--- a/server/application/admin/view/appeal/edit.html
+++ b/server/application/admin/view/appeal/edit.html
@@ -1,98 +1,126 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-    <!-- 1. 申诉主体与关联订单 -->
+    <!-- 1. 申诉原件与关联工单（只读保护） -->
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-info-circle"></i> 申诉主体与关联工单</h4>
+            <h4 class="panel-title"><i class="fa fa-file-text-o"></i> 师傅申诉原件与关联工单（只读）</h4>
         </div>
         <div class="panel-body">
             <div class="row">
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Master_id')}:</label>
+                        <label class="control-label col-xs-12 col-sm-4">申诉师傅:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-master_id" data-rule="required" min="0" data-source="master/index" class="form-control selectpage" name="row[master_id]" type="text" value="{$row.master_id|htmlentities}">
+                            <p class="form-control-static">
+                                <strong>{$master.realname|default='-'|htmlentities}</strong>
+                                {if !empty($master.mobile)}<span class="text-muted">（{$master.mobile|htmlentities}）</span>{/if}
+                            </p>
                         </div>
                     </div>
                 </div>
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Order_id')}:</label>
+                        <label class="control-label col-xs-12 col-sm-4">申诉类型:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-order_id" data-rule="required" min="0" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="{$row.order_id|htmlentities}">
+                            <p class="form-control-static">
+                                <span class="label label-warning">{$typeList[$row.type]|default=$row.type|htmlentities}</span>
+                                <small class="text-muted" style="margin-left:8px;">提交于 {:date('Y-m-d H:i', $row.createtime)}</small>
+                            </p>
                         </div>
                     </div>
                 </div>
             </div>
 
+            {if !empty($order)}
             <div class="row">
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Type')}:</label>
+                        <label class="control-label col-xs-12 col-sm-4">关联工单:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <select id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
-                                {foreach name="typeList" item="vo"}
-                                    <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
-                                {/foreach}
-                            </select>
+                            <p class="form-control-static">
+                                <code>{$order.order_no|htmlentities}</code>
+                                <span class="label label-default" style="margin-left:4px;">{$orderStatusMap[$order.status]|default=$order.status}</span>
+                            </p>
                         </div>
                     </div>
                 </div>
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Status')}:</label>
+                        <label class="control-label col-xs-12 col-sm-4">服务与实付:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <div class="radio">
-                            {foreach name="statusList" item="vo"}
-                            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
-                            {/foreach}
-                            </div>
+                            <p class="form-control-static">
+                                {$order.service_name|default='-'|htmlentities} · <strong class="text-danger">¥{$order.pay_amount|default='0.00'|htmlentities}</strong>
+                            </p>
                         </div>
                     </div>
                 </div>
             </div>
+            {/if}
+
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">申诉事由:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <div class="well well-sm" style="margin-bottom:0;background:#fafafa;line-height:1.6;">{$row.content|htmlentities}</div>
+                </div>
+            </div>
+
+            {if !empty($appealImages)}
+            <div class="form-group" style="margin-bottom:0;">
+                <label class="control-label col-xs-12 col-sm-2">举证图片:</label>
+                <div class="col-xs-12 col-sm-10">
+                    {volist name="appealImages" id="img"}
+                    <a href="{$img|cdnurl|htmlentities}" target="_blank" style="display:inline-block;margin:0 8px 8px 0;">
+                        <img src="{$img|cdnurl|htmlentities}" style="width:76px;height:76px;object-fit:cover;border-radius:4px;border:1px solid #e5e5e5;" alt="申诉凭证">
+                    </a>
+                    {/volist}
+                </div>
+            </div>
+            {/if}
         </div>
     </div>
 
-    <!-- 2. 申诉内容与凭据 -->
+    <!-- 2. 若有关联客户评价，提供快速核查参照 -->
+    {if !empty($review)}
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-file-text-o"></i> 师傅申诉事由与证据截图</h4>
+            <h4 class="panel-title"><i class="fa fa-comments-o"></i> 关联客户评价核对</h4>
+        </div>
+        <div class="panel-body">
+            <p style="margin-bottom:6px;">
+                评分：
+                {for start="1" end="6"}
+                <i class="fa {if $i <= $review.score}fa-star text-warning{else/}fa-star-o text-muted{/if}"></i>
+                {/for}
+                <span style="margin-left:6px;">{$review.score} 分</span>
+                <span class="label {if $review.status=='normal'}label-success{else/}label-default{/if}" style="margin-left:8px;">{if $review.status=='normal'}公开展示中{else/}已隐藏{/if}</span>
+            </p>
+            <div class="text-muted">{$review.content|default='（客户未填写文字评价）'|htmlentities}</div>
+        </div>
+    </div>
+    {/if}
+
+    <!-- 3. 平台运营核查与仲裁答复 -->
+    <div class="panel panel-default panel-form-section">
+        <div class="panel-heading">
+            <h4 class="panel-title"><i class="fa fa-gavel"></i> 平台仲裁结论与官方答复</h4>
         </div>
         <div class="panel-body">
             <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
+                <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
                 <div class="col-xs-12 col-sm-10">
-                    <textarea id="c-content" data-rule="required" class="form-control" rows="3" name="row[content]" placeholder="现场情况与申诉理由">{$row.content|htmlentities}</textarea>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
-                <div class="col-xs-12 col-sm-10">
-                    <div class="input-group">
-                        <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
-                        <div class="input-group-addon no-border no-padding">
-                            <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                            <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                        </div>
-                        <span class="msg-box n-right" for="c-images"></span>
+                    <div class="radio">
+                        {foreach name="statusList" item="vo"}
+                        <label for="row[status]-{$key}" style="margin-right:16px;">
+                            <input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}
+                        </label>
+                        {/foreach}
                     </div>
-                    <ul class="row list-inline faupload-preview" id="p-images"></ul>
                 </div>
             </div>
-        </div>
-    </div>
-
-    <!-- 3. 平台答复 -->
-    <div class="panel panel-default panel-form-section">
-        <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-commenting-o"></i> 平台运营核查与答复</h4>
-        </div>
-        <div class="panel-body">
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Reply')}:</label>
                 <div class="col-xs-12 col-sm-10">
-                    <textarea id="c-reply" class="form-control" rows="3" name="row[reply]" placeholder="向申诉师傅反馈的官方核查结论与处置方案">{$row.reply|htmlentities}</textarea>
+                    <textarea id="c-reply" class="form-control" rows="4" name="row[reply]" placeholder="请填写平台核查事实依据与处理结论（完结或驳回时必填，保存后将同步站内通知申诉师傅）">{$row.reply|htmlentities}</textarea>
                 </div>
             </div>
         </div>
diff --git a/server/application/admin/view/appeal/index.html b/server/application/admin/view/appeal/index.html
index 5559424..0e10033 100644
--- a/server/application/admin/view/appeal/index.html
+++ b/server/application/admin/view/appeal/index.html
@@ -1,5 +1,4 @@
 <div class="panel panel-default panel-intro">
-    
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
@@ -10,37 +9,22 @@
         </ul>
     </div>
 
-
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('appeal/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('appeal/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('appeal/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
-
-                        <div class="dropdown btn-group {:$auth->check('appeal/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                {foreach name="statusList" item="vo"}
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
-                                {/foreach}
-                            </ul>
-                        </div>
-
-                        
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('appeal/edit')?'':'hide'}" title="仲裁处理"><i class="fa fa-gavel"></i> 仲裁处理</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('appeal/detail')}"
                            data-operate-edit="{:$auth->check('appeal/edit')}"
-                           data-operate-del="{:$auth->check('appeal/del')}"
+                           data-operate-del=""
                            width="100%">
                     </table>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
diff --git a/server/application/admin/view/banner/index.html b/server/application/admin/view/banner/index.html
index e00be6c..97b173e 100644
--- a/server/application/admin/view/banner/index.html
+++ b/server/application/admin/view/banner/index.html
@@ -26,7 +26,7 @@
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 {foreach name="statusList" item="vo"}
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">设为{$vo}</a></li>
                                 {/foreach}
                             </ul>
                         </div>
@@ -34,6 +34,7 @@
                         
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="false"
                            data-operate-edit="{:$auth->check('banner/edit')}"
                            data-operate-del="{:$auth->check('banner/del')}"
                            width="100%">
diff --git a/server/application/admin/view/common/header.html b/server/application/admin/view/common/header.html
index 52c832c..af376b4 100755
--- a/server/application/admin/view/common/header.html
+++ b/server/application/admin/view/common/header.html
@@ -63,15 +63,16 @@
                 </li>
 
                 <!-- 账号信息下拉框 -->
+                <?php $headerAvatarUrl = empty($admin['avatar']) ? '/assets/img/avatar.png' : (strpos($admin['avatar'], '/assets/') === 0 ? $admin['avatar'] : cdnurl($admin['avatar'], true)); ?>
                 <li class="dropdown user user-menu">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                        <img src="{$admin.avatar|cdnurl|htmlentities}" class="user-image" alt="">
+                        <img src="{$headerAvatarUrl|htmlentities}" class="user-image" onerror="this.src='/assets/img/avatar.png'" alt="">
                         <span class="hidden-xs">{$admin.nickname|htmlentities}</span>
                     </a>
                     <ul class="dropdown-menu">
                         <!-- User image -->
                         <li class="user-header">
-                            <img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" alt="">
+                            <img src="{$headerAvatarUrl|htmlentities}" class="img-circle" onerror="this.src='/assets/img/avatar.png'" alt="">
 
                             <p>
                                 {$admin.nickname|htmlentities}
diff --git a/server/application/admin/view/common/menu.html b/server/application/admin/view/common/menu.html
index 1e42c01..fd919cb 100755
--- a/server/application/admin/view/common/menu.html
+++ b/server/application/admin/view/common/menu.html
@@ -1,9 +1,10 @@
 <!-- 左侧菜单栏 -->
 <section class="sidebar">
     <!-- 管理员信息 -->
+    <?php $menuAvatarUrl = empty($admin['avatar']) ? '/assets/img/avatar.png' : (strpos($admin['avatar'], '/assets/') === 0 ? $admin['avatar'] : cdnurl($admin['avatar'], true)); ?>
     <div class="user-panel hidden-xs">
         <div class="pull-left image">
-            <a href="general/profile" class="addtabsit"><img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" /></a>
+            <a href="general/profile" class="addtabsit"><img src="{$menuAvatarUrl|htmlentities}" class="img-circle" onerror="this.src='/assets/img/avatar.png'" /></a>
         </div>
         <div class="pull-left info">
             <p>{$admin.nickname|htmlentities}</p>
diff --git a/server/application/admin/view/common/meta.html b/server/application/admin/view/common/meta.html
index b60d914..2a669f2 100755
--- a/server/application/admin/view/common/meta.html
+++ b/server/application/admin/view/common/meta.html
@@ -16,7 +16,7 @@
 <!-- 现代企业级 SaaS 统一视觉规范样式引擎 -->
 <link href="__CDN__/assets/css/theme-modern.css?v={$Think.config.site.version|htmlentities}" rel="stylesheet">
 
-<!-- 优匠优服 × 奇兵到家 橙白企业级旗舰品牌视觉引擎 -->
+<!-- 优匠优服 橙白企业级品牌视觉引擎 -->
 <link href="__CDN__/assets/css/theme-qibing-orange.css?v={$Think.config.site.version|htmlentities}" rel="stylesheet">
 
 <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
diff --git a/server/application/admin/view/coupon/add.html b/server/application/admin/view/coupon/add.html
index a35b2c2..1029a65 100644
--- a/server/application/admin/view/coupon/add.html
+++ b/server/application/admin/view/coupon/add.html
@@ -25,18 +25,16 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">优惠力度:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">减免金额 ¥</span>
-                                <input id="c-amount" data-rule="required" class="form-control" step="0.01" name="row[amount]" type="number" value="0.00">
-                            </div>
+                    <div id="box-coupon-amount">
+                        <div class="input-group">
+                            <span class="input-group-addon">立减金额 ¥</span>
+                            <input id="c-amount" class="form-control" step="0.01" name="row[amount]" type="number" value="10.00" placeholder="如: 20.00">
                         </div>
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">折扣系数</span>
-                                <input id="c-discount" data-rule="required" class="form-control" step="0.01" name="row[discount]" type="number" value="1.00" placeholder="0.85代表85折">
-                            </div>
+                    </div>
+                    <div id="box-coupon-discount" style="display:none;">
+                        <div class="input-group">
+                            <span class="input-group-addon">折扣系数</span>
+                            <input id="c-discount" class="form-control" step="0.01" name="row[discount]" type="number" value="0.85" placeholder="如: 0.85 代表 8.5 折">
                         </div>
                     </div>
                 </div>
@@ -62,21 +60,10 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">发行数量:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">总发行量</span>
-                                <input id="c-total" data-rule="required" class="form-control" name="row[total]" type="number" value="100">
-                                <span class="input-group-addon">张</span>
-                            </div>
-                        </div>
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">已领取</span>
-                                <input id="c-received" data-rule="required" class="form-control" name="row[received]" type="number" value="0">
-                                <span class="input-group-addon">张</span>
-                            </div>
-                        </div>
+                    <div class="input-group">
+                        <span class="input-group-addon">总发行量</span>
+                        <input id="c-total" data-rule="required" min="1" class="form-control" name="row[total]" type="number" value="100">
+                        <span class="input-group-addon">张</span>
                     </div>
                 </div>
             </div>
diff --git a/server/application/admin/view/coupon/detail.html b/server/application/admin/view/coupon/detail.html
new file mode 100644
index 0000000..f11870e
--- /dev/null
+++ b/server/application/admin/view/coupon/detail.html
@@ -0,0 +1,93 @@
+<style>
+.cpn-detail-wrap { padding: 12px 15px; }
+.cpn-card { background: #fff; border: 1px solid #ebedf0; border-radius: 6px; margin-bottom: 14px; }
+.cpn-card-hd { padding: 10px 15px; border-bottom: 1px solid #f0f0f2; font-weight: 600; background: #fafafa; border-radius: 6px 6px 0 0; }
+.cpn-card-bd { padding: 14px 15px; }
+.cpn-stat { background: #f8fafc; border: 1px solid #eef1f5; border-radius: 6px; padding: 10px; text-align: center; }
+.cpn-stat .lbl { color: #888; font-size: 12px; margin-bottom: 4px; }
+.cpn-stat .val { font-size: 18px; font-weight: 700; color: #1f1f1f; }
+</style>
+
+<div class="cpn-detail-wrap">
+    <!-- 1. 卡券规则与转化统计 -->
+    <div class="cpn-card">
+        <div class="cpn-card-hd">
+            <i class="fa fa-ticket text-warning"></i> {$row.name|htmlentities}
+            <span class="pull-right label {if $row.status=='normal'}label-success{else/}label-default{/if}">
+                {$statusList[$row.status]|default=$row.status}
+            </span>
+        </div>
+        <div class="cpn-card-bd">
+            <div class="row" style="margin-bottom:14px;">
+                <div class="col-xs-6 col-sm-3"><div class="cpn-stat"><div class="lbl">总发行量</div><div class="val">{$row.total} 张</div></div></div>
+                <div class="col-xs-6 col-sm-3"><div class="cpn-stat"><div class="lbl">累计已领取</div><div class="val text-info">{$totalClaimed} 张</div></div></div>
+                <div class="col-xs-6 col-sm-3"><div class="cpn-stat"><div class="lbl">实际已核销</div><div class="val text-success">{$totalUsed} 张</div></div></div>
+                <div class="col-xs-6 col-sm-3"><div class="cpn-stat"><div class="lbl">拉动订单实付</div><div class="val text-danger">¥{$drivenGmv|number_format=2}</div></div></div>
+            </div>
+            <div class="row" style="line-height:1.8;">
+                <div class="col-sm-6">
+                    <span class="text-muted">优惠面值：</span>
+                    {if $row.type == 'discount'}
+                    <strong class="text-warning">{:$row.discount * 10} 折</strong>
+                    {else/}
+                    <strong class="text-danger">立减 ¥{$row.amount|htmlentities}</strong>
+                    {/if}
+                    （{if $row.min_amount > 0}满 ¥{$row.min_amount|htmlentities} 可用{else/}无门槛{/if}）
+                </div>
+                <div class="col-sm-6">
+                    <span class="text-muted">生效周期：</span>
+                    {:$row.start_time ? date('Y-m-d H:i', $row.start_time) : '-'} 至 {:$row.end_time ? date('Y-m-d H:i', $row.end_time) : '-'}
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- 2. 领取与核销明细 -->
+    <div class="cpn-card" style="margin-bottom:0;">
+        <div class="cpn-card-hd"><i class="fa fa-list-ul text-primary"></i> 用户领取与核销明细（最近 {:count($records)} 条）</div>
+        <div class="cpn-card-bd" style="padding:10px 15px;">
+            {if !empty($records)}
+            <div class="table-responsive">
+                <table class="table table-bordered table-condensed" style="margin-bottom:0;font-size:12px;">
+                    <thead>
+                        <tr class="active">
+                            <th>领券用户</th>
+                            <th>手机号</th>
+                            <th>券状态</th>
+                            <th>领取时间</th>
+                            <th>核销关联订单</th>
+                            <th>抵扣/实付</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {volist name="records" id="rc"}
+                        <tr>
+                            <td>{$rc.nickname|default=$rc.username|default=$rc.user_id|htmlentities}</td>
+                            <td>{$rc.mobile|default='-'|htmlentities}</td>
+                            <td>
+                                {if $rc.status=='used'}<span class="label label-success">已核销</span>
+                                {elseif $rc.status=='expired'/}<span class="label label-default">已过期</span>
+                                {else/}<span class="label label-info">未使用</span>{/if}
+                            </td>
+                            <td>{:date('Y-m-d H:i', $rc.createtime)}</td>
+                            <td>
+                                {if !empty($rc.order_no)}
+                                <code>{$rc.order_no|htmlentities}</code>
+                                {else/}<span class="text-muted">-</span>{/if}
+                            </td>
+                            <td>
+                                {if !empty($rc.order_no)}
+                                抵扣 ¥{$rc.discount_amount|default='0.00'} / 实付 ¥{$rc.pay_amount|default='0.00'}
+                                {else/}-{/if}
+                            </td>
+                        </tr>
+                        {/volist}
+                    </tbody>
+                </table>
+            </div>
+            {else/}
+            <p class="text-muted" style="margin-bottom:0;">暂无用户领取记录。</p>
+            {/if}
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/coupon/edit.html b/server/application/admin/view/coupon/edit.html
index 2460398..87b37a8 100644
--- a/server/application/admin/view/coupon/edit.html
+++ b/server/application/admin/view/coupon/edit.html
@@ -25,18 +25,16 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">优惠力度:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">减免金额 ¥</span>
-                                <input id="c-amount" data-rule="required" class="form-control" step="0.01" name="row[amount]" type="number" value="{$row.amount|htmlentities}">
-                            </div>
+                    <div id="box-coupon-amount" {if $row.type == 'discount'}style="display:none;"{/if}>
+                        <div class="input-group">
+                            <span class="input-group-addon">立减金额 ¥</span>
+                            <input id="c-amount" class="form-control" step="0.01" name="row[amount]" type="number" value="{$row.amount|htmlentities}">
                         </div>
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">折扣系数</span>
-                                <input id="c-discount" data-rule="required" class="form-control" step="0.01" name="row[discount]" type="number" value="{$row.discount|htmlentities}" placeholder="0.85代表85折">
-                            </div>
+                    </div>
+                    <div id="box-coupon-discount" {if $row.type != 'discount'}style="display:none;"{/if}>
+                        <div class="input-group">
+                            <span class="input-group-addon">折扣系数</span>
+                            <input id="c-discount" class="form-control" step="0.01" name="row[discount]" type="number" value="{$row.discount|htmlentities}" placeholder="如: 0.85 代表 8.5 折">
                         </div>
                     </div>
                 </div>
@@ -73,7 +71,7 @@
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">已领取</span>
-                                <input id="c-received" data-rule="required" class="form-control" name="row[received]" type="number" value="{$row.received|htmlentities}">
+                                <input id="c-received" class="form-control" name="row[received]" type="number" value="{$row.received|htmlentities}" readonly>
                                 <span class="input-group-addon">张</span>
                             </div>
                         </div>
diff --git a/server/application/admin/view/coupon/index.html b/server/application/admin/view/coupon/index.html
index c9e0a13..d7b04ce 100644
--- a/server/application/admin/view/coupon/index.html
+++ b/server/application/admin/view/coupon/index.html
@@ -1,5 +1,4 @@
 <div class="panel panel-default panel-intro">
-    
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
@@ -10,37 +9,33 @@
         </ul>
     </div>
 
-
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('coupon/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('coupon/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('coupon/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('coupon/add')?'':'hide'}" title="{:__('Add')}"><i class="fa fa-plus"></i> 新建卡券</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('coupon/edit')?'':'hide'}" title="{:__('Edit')}"><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('coupon/del')?'':'hide'}" title="{:__('Delete')}"><i class="fa fa-trash"></i> {:__('Delete')}</a>
 
                         <div class="dropdown btn-group {:$auth->check('coupon/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 {foreach name="statusList" item="vo"}
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">批量设为：{$vo}</a></li>
                                 {/foreach}
                             </ul>
                         </div>
-
-                        
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('coupon/detail')}"
                            data-operate-edit="{:$auth->check('coupon/edit')}"
                            data-operate-del="{:$auth->check('coupon/del')}"
                            width="100%">
                     </table>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
diff --git a/server/application/admin/view/general/profile/index.html b/server/application/admin/view/general/profile/index.html
index 946194d..f8ce21f 100755
--- a/server/application/admin/view/general/profile/index.html
+++ b/server/application/admin/view/general/profile/index.html
@@ -50,8 +50,9 @@
                     <input type="hidden" id="c-avatar" name="row[avatar]" value="{$admin.avatar|htmlentities}"/>
                     <div class="box-body box-profile">
 
+                        <?php $profileAvatarUrl = empty($admin['avatar']) ? '/assets/img/avatar.png' : (strpos($admin['avatar'], '/assets/') === 0 ? $admin['avatar'] : cdnurl($admin['avatar'], true)); ?>
                         <div class="profile-avatar-container">
-                            <img class="profile-user-img img-responsive img-circle" src="{$admin.avatar|cdnurl|htmlentities}" alt="">
+                            <img class="profile-user-img img-responsive img-circle" src="{$profileAvatarUrl|htmlentities}" onerror="this.src='/assets/img/avatar.png'" alt="">
                             <div class="profile-avatar-text img-circle">{:__('Click to edit')}</div>
                             <button type="button" id="faupload-avatar" class="faupload" data-category="avatar" data-input-id="c-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button>
                         </div>
diff --git a/server/application/admin/view/home/index.html b/server/application/admin/view/home/index.html
index 2af8619..1a1045d 100644
--- a/server/application/admin/view/home/index.html
+++ b/server/application/admin/view/home/index.html
@@ -4,7 +4,7 @@
         background-color: transparent;
     }
 
-    /* 顶部运营指挥头部 - 奇兵到家橙白高光 */
+    /* 顶部运营指挥头部 - 优匠优服橙白高光 */
     .bi-header {
         background: #ffffff;
         border-radius: 12px;
@@ -268,7 +268,7 @@
                 <span class="live-pulse-orange"></span>
                 优匠优服 · 同城家居售后运营指挥大盘
             </h2>
-            <p>对标奇兵到家模式：实时监控家居安装、维修、测量、拆旧全链条调度流转与资金流水</p>
+            <p>实时监控安装、维修、测量、拆旧全链路调度流转与资金结算状态</p>
         </div>
         <div class="bi-header-actions">
             <span class="clock-badge">
@@ -319,7 +319,7 @@
         <!-- 平台在册师傅 -->
         <div class="col-xs-12 col-sm-6 col-md-3">
             <div class="kpi-deck-card">
-                <div class="kpi-label">全国在册专业维修师傅</div>
+                <div class="kpi-label">平台认证专业师傅</div>
                 <div class="kpi-value" style="color: #d97706;">
                     {$totalMaster} <small style="font-size: 14px; font-weight: normal; color: #64748b;">位</small>
                 </div>
@@ -362,7 +362,7 @@
                     </div>
                     <div>
                         <span class="label" style="background:#fff7ed; color:#ff6a00; border:1px solid #fed7aa; font-weight: 500;">
-                            橙白双轴联动
+                            已支付有效流水口径
                         </span>
                     </div>
                 </div>
@@ -384,7 +384,7 @@
                 <div class="bi-panel-body">
                     <div class="action-grid">
                         <!-- 师傅待审 -->
-                        <a href="master?ref=addtabs" class="action-card addtabsit" title="点击直达师傅资质审核">
+                        <a href="{:url('master/index', ['verify_status' => 'pending'])}" class="action-card addtabsit" title="师傅管理">
                             <div class="action-info">
                                 <div class="action-icon" style="background: #fff7ed; color: #ff6a00;">
                                     <i class="fa fa-user-plus"></i>
@@ -400,7 +400,7 @@
                         </a>
 
                         <!-- 申诉工单 -->
-                        <a href="appeal?ref=addtabs" class="action-card addtabsit" title="点击直达售后申诉仲裁">
+                        <a href="{:url('appeal/index', ['status' => 'wait'])}" class="action-card addtabsit" title="申诉仲裁">
                             <div class="action-info">
                                 <div class="action-icon" style="background: #fef2f2; color: #dc2626;">
                                     <i class="fa fa-shield"></i>
@@ -416,7 +416,7 @@
                         </a>
 
                         <!-- 提现审批 -->
-                        <a href="withdraw?ref=addtabs" class="action-card addtabsit" title="点击直达资金提现审批">
+                        <a href="{:url('withdraw/index', ['status' => 'wait'])}" class="action-card addtabsit" title="提现申请">
                             <div class="action-info">
                                 <div class="action-icon" style="background: #fffbeb; color: #d97706;">
                                     <i class="fa fa-credit-card"></i>
@@ -432,7 +432,7 @@
                         </a>
 
                         <!-- 待指派/待接单 -->
-                        <a href="order?ref=addtabs" class="action-card addtabsit" title="点击直达订单列表派单">
+                        <a href="{:url('order/index', ['status' => '1'])}" class="action-card addtabsit" title="订单管理">
                             <div class="action-info">
                                 <div class="action-icon" style="background: #eff6ff; color: #2563eb;">
                                     <i class="fa fa-paper-plane"></i>
@@ -446,13 +446,45 @@
                                 {$pendingDispatch}
                             </div>
                         </a>
+
+                        <!-- 商家待审 -->
+                        <a href="{:url('merchant/index', ['verify_status' => 'pending'])}" class="action-card addtabsit" title="企业商家">
+                            <div class="action-info">
+                                <div class="action-icon" style="background: #f0fdf4; color: #16a34a;">
+                                    <i class="fa fa-building-o"></i>
+                                </div>
+                                <div class="action-text">
+                                    <div class="name">商家待审核</div>
+                                    <div class="sub">企业资质核验</div>
+                                </div>
+                            </div>
+                            <div class="action-num" style="color: {$pendingMerchant > 0 ? '#16a34a' : '#64748b'};">
+                                {$pendingMerchant}
+                            </div>
+                        </a>
+
+                        <!-- 开票待处理 -->
+                        <a href="{:url('invoice/index', ['status' => 'wait'])}" class="action-card addtabsit" title="开票申请">
+                            <div class="action-info">
+                                <div class="action-icon" style="background: #f5f3ff; color: #7c3aed;">
+                                    <i class="fa fa-file-text-o"></i>
+                                </div>
+                                <div class="action-text">
+                                    <div class="name">开票待处理</div>
+                                    <div class="sub">电子票据开具</div>
+                                </div>
+                            </div>
+                            <div class="action-num" style="color: {$waitingInvoice > 0 ? '#7c3aed' : '#64748b'};">
+                                {$waitingInvoice}
+                            </div>
+                        </a>
                     </div>
 
                     <!-- 师傅履约质量 SLA 大盘 -->
-                    <div style="margin-top: 24px; padding-top: 18px; border-top: 1px solid #f1f5f9;">
+                    <div style="margin-top: 16px; padding-top: 14px; border-top: 1px solid #f1f5f9;">
                         <div style="font-size: 13px; font-weight: 600; color: #334155; margin-bottom: 12px; display:flex; justify-content:space-between;">
                             <span><i class="fa fa-tachometer" style="color: #ff6a00; margin-right: 6px;"></i> 师傅运力履约质量 SLA</span>
-                            <span class="text-success" style="font-weight: 500; font-size: 12px;">全国优质</span>
+                            <span class="text-success" style="font-weight: 500; font-size: 12px;">实时监控</span>
                         </div>
                         <div class="row no-gutter" style="background: #fffaf5; border-radius: 8px; padding: 6px 0; border: 1px solid #fed7aa;">
                             <div class="col-xs-4 sla-item">
@@ -498,7 +530,7 @@
                     <div class="bi-panel-title">
                         <i class="fa fa-bolt" style="color: #ff6a00;"></i> 实时订单动态流水监控
                     </div>
-                    <a href="order?ref=addtabs" class="addtabsit btn btn-xs btn-default" style="border-radius: 12px; color: #ff6a00; border-color: #fed7aa;">
+                    <a href="{:url('order/index')}" class="addtabsit btn btn-xs btn-default" title="订单管理" style="border-radius: 12px; color: #ff6a00; border-color: #fed7aa;">
                         查看全量订单 <i class="fa fa-angle-right"></i>
                     </a>
                 </div>
@@ -534,7 +566,10 @@
                                             {case value="1"}<span class="label" style="background:#fff7ed; color:#ff6a00; border:1px solid #fed7aa;">待接单</span>{/case}
                                             {case value="2"}<span class="label label-info">报价中</span>{/case}
                                             {case value="3"}<span class="label label-primary">已接单</span>{/case}
+                                            {case value="4"}<span class="label label-info">待上门</span>{/case}
+                                            {case value="5"}<span class="label label-info">已到达</span>{/case}
                                             {case value="6"}<span class="label label-primary">服务中</span>{/case}
+                                            {case value="7"}<span class="label label-warning">待验收</span>{/case}
                                             {case value="8"}<span class="label label-success">已完成</span>{/case}
                                             {case value="9"}<span class="label label-default">已取消</span>{/case}
                                             {case value="10"}<span class="label label-danger">售后中</span>{/case}
diff --git a/server/application/admin/view/index/login.html b/server/application/admin/view/index/login.html
index f56b2ac..891be6f 100644
--- a/server/application/admin/view/index/login.html
+++ b/server/application/admin/view/index/login.html
@@ -90,13 +90,8 @@
         <div class="deco d3"></div>
         <div class="logo-mark">优</div>
         <div class="wordmark">优匠优服</div>
-        <div class="slogan">专业师傅 · 上门到家</div>
-        <div class="stats">
-            <div class="stat"><b>460万+</b><span>专业师傅</span></div>
-            <div class="stat"><b>99.9%</b><span>区域覆盖到村镇</span></div>
-            <div class="stat"><b>1762万</b><span>成功订单</span></div>
-        </div>
-        <div class="brand-tip">平台认证 · 先行赔付 · 极速上门 · 售后无忧</div>
+        <div class="slogan">家居安装维修调度与履约管理平台</div>
+        <div class="brand-tip">订单调度 · 师傅管理 · 企业协同 · 财务结算</div>
     </div>
 
     <!-- 右侧：登录表单 -->
@@ -145,7 +140,7 @@
                     <!--@AdminLoginFormEnd-->
                 </form>
 
-                <div class="foot">优匠优服 · 让手艺人有活干，让家有温度<br/>© {:date('Y')} 优匠优服 平台管理后台</div>
+                <div class="foot">© {:date('Y')} 优匠优服 平台管理后台</div>
             </div>
         </div>
     </div>
diff --git a/server/application/admin/view/invoice/edit.html b/server/application/admin/view/invoice/edit.html
index 8768dda..9985e35 100644
--- a/server/application/admin/view/invoice/edit.html
+++ b/server/application/admin/view/invoice/edit.html
@@ -1,9 +1,12 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-    <!-- 1. 申请信息（只读，禁止修改） -->
+    <!-- 1. 开票申请信息（只读） -->
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-info-circle"></i> 开票申请信息（只读）</h4>
+            <h4 class="panel-title">
+                <i class="fa fa-info-circle"></i> 开票申请信息（只读）
+                {if $row.invoice_sn}<small class="text-muted" style="margin-left:10px">单号：{$row.invoice_sn|htmlentities}</small>{/if}
+            </h4>
         </div>
         <div class="panel-body">
             <div class="row">
@@ -11,7 +14,10 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">申请人:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <p class="form-control-static">{$row.user.nickname|default=$row.user_id} {if $row.merchant_id}· 商户「{$row.merchant.name|default=''}」{/if}</p>
+                            <p class="form-control-static">
+                                {$row.user.nickname|default=$row.user_id|htmlentities}
+                                {if $row.merchant_id} · 商户「{$row.merchant.name|default=''|htmlentities}」{/if}
+                            </p>
                         </div>
                     </div>
                 </div>
@@ -19,29 +25,106 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">开票金额:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <p class="form-control-static">¥{$row.amount|htmlentities}（{$typeList[$row.type]|default=$row.type}）</p>
+                            <p class="form-control-static">
+                                <strong class="text-danger" style="font-size:15px">¥{$row.amount|htmlentities}</strong>
+                                <span class="label {if $row.type == 'special'}label-warning{else/}label-info{/if}" style="margin-left:6px">
+                                    {$typeList[$row.type]|default=$row.type}
+                                </span>
+                                <span class="label label-default" style="margin-left:4px">
+                                    {$titleTypeList[$row.title_type]|default='个人/非企业'}
+                                </span>
+                            </p>
                         </div>
                     </div>
                 </div>
             </div>
+
             <div class="row">
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">开票抬头:</label>
+                        <label class="control-label col-xs-12 col-sm-4">发票抬头:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <p class="form-control-static">{$row.title|htmlentities}{if $row.tax_no} · 税号 {$row.tax_no|htmlentities}{/if}</p>
+                            <p class="form-control-static"><strong>{$row.title|htmlentities}</strong></p>
                         </div>
                     </div>
                 </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">纳税人识别号:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">
+                                {if $row.tax_no}<code>{$row.tax_no|htmlentities}</code>{else/}<span class="text-muted">-（个人抬头免税号）</span>{/if}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            {if $row.bank_name || $row.bank_account || $row.reg_address || $row.reg_mobile}
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">开户银行及账号:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">
+                                {$row.bank_name|default='-'|htmlentities}
+                                {if $row.bank_account}<br><code>{$row.bank_account|htmlentities}</code>{/if}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">企业地址及电话:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">
+                                {$row.reg_address|default='-'|htmlentities}
+                                {if $row.reg_mobile}<br>电话：{$row.reg_mobile|htmlentities}{/if}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {/if}
+
+            <div class="row">
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">接收邮箱:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <p class="form-control-static">{$row.email|htmlentities}</p>
+                            <p class="form-control-static">{$row.email|default='-'|htmlentities}</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">通知手机:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">{$row.receive_mobile|default='-'|htmlentities}</p>
                         </div>
                     </div>
                 </div>
             </div>
+
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">申请提交时间:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">{:date('Y-m-d H:i:s', $row.createtime)}</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">开票完成时间:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">{if !empty($row.issue_time)}{:date('Y-m-d H:i:s', $row.issue_time)}{else/}<span class="text-muted">-</span>{/if}</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             {if $row.remark}
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">申请备注:</label>
@@ -53,14 +136,49 @@
         </div>
     </div>
 
-    <!-- 2. 财务开票处理 -->
+    <!-- 2. 关联订单明细（如有按单勾选开票） -->
+    {if !empty($linkedOrders)}
+    <div class="panel panel-default panel-form-section">
+        <div class="panel-heading">
+            <h4 class="panel-title"><i class="fa fa-list-ul"></i> 关联业务订单（共 {:count($linkedOrders)} 笔）</h4>
+        </div>
+        <div class="panel-body" style="padding:10px 15px;">
+            <div class="table-responsive">
+                <table class="table table-bordered table-condensed" style="margin-bottom:0;font-size:12px;">
+                    <thead>
+                        <tr class="active">
+                            <th>订单号</th>
+                            <th>服务项目</th>
+                            <th>订单状态</th>
+                            <th>实付可开票净额</th>
+                            <th>下单时间</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {volist name="linkedOrders" id="ord"}
+                        <tr>
+                            <td><code>{$ord.order_no|htmlentities}</code></td>
+                            <td>{$ord.service_name|htmlentities}{if $ord.goods_model}（{$ord.goods_model|htmlentities}）{/if} x{$ord.goods_num}</td>
+                            <td>{$ord.status_text|htmlentities}</td>
+                            <td class="text-danger">¥{$ord.amount|htmlentities}</td>
+                            <td>{$ord.time_text|htmlentities}</td>
+                        </tr>
+                        {/volist}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    {/if}
+
+    <!-- 3. 财务开票处理 / 已处理回执 -->
     {if condition="!empty($flowOptions)"}
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
             <h4 class="panel-title"><i class="fa fa-file-text-o"></i> 财务开票处理</h4>
         </div>
         <div class="panel-body">
-            <p class="text-muted" style="margin-top:0">线上开具完成后标记「开票完成」并填写发票号码，系统将自动通知申请人；无法开票时请驳回并说明原因，额度将自动释放。</p>
+            <p class="text-muted" style="margin-top:0">线上开具数电发票后标记「开票完成」，填写发票号码并可上传电子发票原件（PDF/图片），申请人即可在小程序直接预览下载；无法开票时请驳回并说明原因，额度及关联订单将自动释放。</p>
 
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">处理结果:</label>
@@ -68,37 +186,54 @@
                     <div class="radio" style="margin-top:5px">
                     {foreach name="flowOptions" item="op"}
                         {if $op == 'issued'}
-                        <label><input name="row[status]" type="radio" value="issued" checked /> 开票完成</label>
+                        <label style="margin-right:18px"><input name="row[status]" type="radio" value="issued" checked /> 开票完成</label>
                         {elseif $op == 'reject' /}
-                        <label><input name="row[status]" type="radio" value="reject" /> 驳回（释放额度）</label>
+                        <label><input name="row[status]" type="radio" value="reject" /> 驳回（释放额度与订单）</label>
                         {/if}
                     {/foreach}
                     </div>
                 </div>
             </div>
 
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">发票号码:</label>
-                <div class="col-xs-12 col-sm-10">
-                    <input id="c-invoice_no" class="form-control" name="row[invoice_no]" type="text" value="{$row.invoice_no|htmlentities}" placeholder="发票代码及号码，标记开票完成时必填">
+            <div id="box-issued-fields">
+                <div class="form-group">
+                    <label class="control-label col-xs-12 col-sm-2">发票号码:</label>
+                    <div class="col-xs-12 col-sm-8">
+                        <input id="c-invoice_no" class="form-control" name="row[invoice_no]" type="text" value="{$row.invoice_no|htmlentities}" placeholder="必填：请输入数电发票号码（20位）或传统发票号码">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="control-label col-xs-12 col-sm-2">发票代码:</label>
+                    <div class="col-xs-12 col-sm-8">
+                        <input id="c-invoice_code" class="form-control" name="row[invoice_code]" type="text" value="{$row.invoice_code|htmlentities}" placeholder="选填：数电票无需填写，纸质/旧版电子票可填发票代码">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="control-label col-xs-12 col-sm-2">电子发票文件:</label>
+                    <div class="col-xs-12 col-sm-8">
+                        <div class="input-group">
+                            <input id="c-invoice_file" class="form-control" size="50" name="row[invoice_file]" type="text" value="{$row.invoice_file|htmlentities}" placeholder="支持上传 PDF / OFD / PNG / JPG 格式电子发票原件">
+                            <div class="input-group-addon no-border no-padding">
+                                <span><button type="button" id="faupload-invoice_file" class="btn btn-danger faupload" data-category="invoice" data-input-id="c-invoice_file" data-mimetype="pdf,ofd,jpg,jpeg,png,webp" data-multiple="false" data-preview-id="p-invoice_file"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                                <span><button type="button" id="fachoose-invoice_file" class="btn btn-primary fachoose" data-input-id="c-invoice_file" data-mimetype="application/pdf,image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                            </div>
+                            <span class="msg-box n-right" for="c-invoice_file"></span>
+                        </div>
+                        <ul class="row list-inline faupload-preview" id="p-invoice_file"></ul>
+                    </div>
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">处理说明:</label>
-                <div class="col-xs-12 col-sm-10">
-                    <textarea id="c-audit_msg" class="form-control" rows="3" name="row[audit_msg]" placeholder="驳回时必填原因；开票完成时可备注寄送方式等信息"></textarea>
+                <div class="col-xs-12 col-sm-8">
+                    <textarea id="c-audit_msg" class="form-control" rows="3" name="row[audit_msg]" placeholder="驳回时必填驳回原因；开票完成时选填备注说明">{$row.audit_msg|htmlentities}</textarea>
                 </div>
             </div>
         </div>
     </div>
-    {else /}
-    <div class="panel panel-default panel-form-section">
-        <div class="panel-body">
-            <p class="text-muted" style="margin-bottom:0"><i class="fa fa-lock"></i> 该开票申请已处理完毕（{:$statusList[$row.status]}），无需操作。</p>
-        </div>
-    </div>
-    {/if}
 
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
@@ -107,4 +242,51 @@
             <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
         </div>
     </div>
+    {else /}
+    <div class="panel panel-default panel-form-section">
+        <div class="panel-heading">
+            <h4 class="panel-title"><i class="fa fa-check-square-o"></i> 处理回执记录</h4>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">当前状态:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static"><strong>{$statusList[$row.status]|default=$row.status}</strong></p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">发票号码:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">
+                                {if $row.invoice_no}<code>{$row.invoice_no|htmlentities}</code>{if $row.invoice_code}（代码：{$row.invoice_code|htmlentities}）{/if}{else/}-{/if}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {if $row.invoice_file}
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">电子发票原件:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <p class="form-control-static">
+                        <a href="{$row.invoice_file|cdnurl|htmlentities}" target="_blank" class="btn btn-xs btn-info"><i class="fa fa-download"></i> 查看/下载电子发票</a>
+                    </p>
+                </div>
+            </div>
+            {/if}
+            {if $row.audit_msg}
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">处理说明/原因:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <p class="form-control-static">{$row.audit_msg|htmlentities}</p>
+                </div>
+            </div>
+            {/if}
+        </div>
+    </div>
+    {/if}
 </form>
diff --git a/server/application/admin/view/invoice/index.html b/server/application/admin/view/invoice/index.html
index 8dc5c5c..21099ce 100644
--- a/server/application/admin/view/invoice/index.html
+++ b/server/application/admin/view/invoice/index.html
@@ -1,5 +1,4 @@
 <div class="panel panel-default panel-intro">
-
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
@@ -10,22 +9,21 @@
         </ul>
     </div>
 
-
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('invoice/detail')}"
                            data-operate-edit="{:$auth->check('invoice/edit')}"
                            data-operate-del=""
                            width="100%">
                     </table>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
diff --git a/server/application/admin/view/invoice_title/detail.html b/server/application/admin/view/invoice_title/detail.html
new file mode 100644
index 0000000..62bd5c2
--- /dev/null
+++ b/server/application/admin/view/invoice_title/detail.html
@@ -0,0 +1,75 @@
+<style>
+.it-detail-wrap { padding: 12px 15px; }
+.it-card { background: #fff; border: 1px solid #ebedf0; border-radius: 6px; margin-bottom: 14px; }
+.it-card-hd { padding: 10px 15px; border-bottom: 1px solid #f0f0f2; font-weight: 600; background: #fafafa; border-radius: 6px 6px 0 0; }
+.it-card-bd { padding: 14px 15px; }
+.it-kv { margin-bottom: 8px; line-height: 1.6; }
+.it-kv .k { color: #888; display: inline-block; min-width: 105px; }
+</style>
+
+<div class="it-detail-wrap">
+    <div class="it-card">
+        <div class="it-card-hd">
+            <i class="fa fa-address-card-o text-primary"></i> {$row.title|htmlentities}
+            {if $row.is_default}<span class="label label-success" style="margin-left:6px;">默认抬头</span>{/if}
+            <span class="pull-right label {if $row.title_type=='enterprise'}label-primary{else/}label-default{/if}">
+                {$titleTypeList[$row.title_type]|default=$row.title_type}
+            </span>
+        </div>
+        <div class="it-card-bd">
+            <div class="row">
+                <div class="col-sm-6 it-kv"><span class="k">默认票种：</span>{$invoiceTypeList[$row.default_invoice_type]|default=$row.default_invoice_type}</div>
+                <div class="col-sm-6 it-kv"><span class="k">纳税人识别号：</span>{if $row.tax_no}<code>{$row.tax_no|htmlentities}</code>{else/}<span class="text-muted">-</span>{/if}</div>
+                <div class="col-sm-6 it-kv"><span class="k">归属用户：</span>{$row.user.nickname|default=$row.user.username|default='-'|htmlentities}</div>
+                <div class="col-sm-6 it-kv"><span class="k">归属签约企业：</span>{if $row.merchant_id}{$row.merchant.name|default='-'|htmlentities}{else/}<span class="text-muted">个人业主抬头</span>{/if}</div>
+                <div class="col-sm-6 it-kv"><span class="k">开户银行：</span>{$row.bank_name|default='-'|htmlentities}</div>
+                <div class="col-sm-6 it-kv"><span class="k">银行账号：</span>{if $row.bank_account}<code>{$row.bank_account|htmlentities}</code>{else/}-{/if}</div>
+                <div class="col-sm-6 it-kv"><span class="k">企业注册地址：</span>{$row.reg_address|default='-'|htmlentities}</div>
+                <div class="col-sm-6 it-kv"><span class="k">企业注册电话：</span>{$row.reg_mobile|default='-'|htmlentities}</div>
+                <div class="col-sm-6 it-kv"><span class="k">接收邮箱：</span>{$row.email|default='-'|htmlentities}</div>
+                <div class="col-sm-6 it-kv"><span class="k">接收手机：</span>{$row.receive_mobile|default='-'|htmlentities}</div>
+            </div>
+        </div>
+    </div>
+
+    <div class="it-card" style="margin-bottom:0;">
+        <div class="it-card-hd"><i class="fa fa-file-text-o text-info"></i> 该抬头历史开票记录（共 {:count($invoices)} 笔）</div>
+        <div class="it-card-bd" style="padding:10px 15px;">
+            {if !empty($invoices)}
+            <div class="table-responsive">
+                <table class="table table-bordered table-condensed" style="margin-bottom:0;font-size:12px;">
+                    <thead>
+                        <tr class="active">
+                            <th>申请单号</th>
+                            <th>发票类型</th>
+                            <th>开票金额</th>
+                            <th>发票号码</th>
+                            <th>状态</th>
+                            <th>申请时间</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {volist name="invoices" id="inv"}
+                        <tr>
+                            <td><code>{$inv.invoice_sn|default=$inv.id|htmlentities}</code></td>
+                            <td>{if $inv.type=='special'}专票{else/}普票{/if}</td>
+                            <td class="text-danger"><strong>¥{$inv.amount|htmlentities}</strong></td>
+                            <td>{$inv.invoice_no|default='-'|htmlentities}</td>
+                            <td>
+                                {if $inv.status=='issued'}<span class="label label-success">已开票</span>
+                                {elseif $inv.status=='wait'/}<span class="label label-warning">待开具</span>
+                                {elseif $inv.status=='reject'/}<span class="label label-danger">已驳回</span>
+                                {else/}<span class="label label-default">已撤回</span>{/if}
+                            </td>
+                            <td>{:date('Y-m-d H:i', $inv.createtime)}</td>
+                        </tr>
+                        {/volist}
+                    </tbody>
+                </table>
+            </div>
+            {else/}
+            <p class="text-muted" style="margin-bottom:0;">该抬头暂未发起过开票申请。</p>
+            {/if}
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/invoice_title/edit.html b/server/application/admin/view/invoice_title/edit.html
new file mode 100644
index 0000000..718bae9
--- /dev/null
+++ b/server/application/admin/view/invoice_title/edit.html
@@ -0,0 +1,119 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+    <div class="panel panel-default panel-form-section">
+        <div class="panel-heading">
+            <h4 class="panel-title"><i class="fa fa-address-card-o"></i> 发票抬头与税务信息订正</h4>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">抬头类型:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <select id="c-title_type" class="form-control selectpicker" name="row[title_type]">
+                                {foreach name="titleTypeList" item="vo"}
+                                <option value="{$key}" {in name="key" value="$row.title_type"}selected{/in}>{$vo}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">默认票种:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <select id="c-default_invoice_type" class="form-control selectpicker" name="row[default_invoice_type]">
+                                {foreach name="invoiceTypeList" item="vo"}
+                                <option value="{$key}" {in name="key" value="$row.default_invoice_type"}selected{/in}>{$vo}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">发票抬头:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">纳税人识别号:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-tax_no" class="form-control" name="row[tax_no]" type="text" value="{$row.tax_no|htmlentities}" placeholder="企业单位必填">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">开户银行:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-bank_name" class="form-control" name="row[bank_name]" type="text" value="{$row.bank_name|htmlentities}">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">银行账号:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-bank_account" class="form-control" name="row[bank_account]" type="text" value="{$row.bank_account|htmlentities}">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">注册地址:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-reg_address" class="form-control" name="row[reg_address]" type="text" value="{$row.reg_address|htmlentities}">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">注册电话:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-reg_mobile" class="form-control" name="row[reg_mobile]" type="text" value="{$row.reg_mobile|htmlentities}">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">接收邮箱:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-email" class="form-control" name="row[email]" type="text" value="{$row.email|htmlentities}">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">接收手机:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-receive_mobile" class="form-control" name="row[receive_mobile]" type="text" value="{$row.receive_mobile|htmlentities}">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>
diff --git a/server/application/admin/view/invoice_title/index.html b/server/application/admin/view/invoice_title/index.html
new file mode 100644
index 0000000..7ec9088
--- /dev/null
+++ b/server/application/admin/view/invoice_title/index.html
@@ -0,0 +1,29 @@
+<div class="panel panel-default panel-intro">
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="title_type">
+            <li class="{:$Think.get.title_type === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="titleTypeList" item="vo"}
+            <li class="{:$Think.get.title_type === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('invoice_title/detail')}"
+                           data-operate-edit="{:$auth->check('invoice_title/edit')}"
+                           data-operate-del="{:$auth->check('invoice_title/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/master/add.html b/server/application/admin/view/master/add.html
index fe608ae..75c86c5 100644
--- a/server/application/admin/view/master/add.html
+++ b/server/application/admin/view/master/add.html
@@ -27,14 +27,14 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <div class='control-relative'><input id="c-city" data-rule="required" class="form-control" data-toggle="city-picker" name="row[city]" type="text" value="" placeholder="请选择服务常驻城市"></div>
+                    <div class='control-relative'><input id="c-city" class="form-control" data-toggle="city-picker" name="row[city]" type="text" value="" placeholder="请选择服务常驻城市"></div>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
                 <div class="col-xs-12 col-sm-8">
                     <div class="input-group">
-                        <input id="c-avatar" data-rule="required" class="form-control" size="50" name="row[avatar]" type="text" value="" placeholder="上传或选择师傅头像">
+                        <input id="c-avatar" data-rule="" class="form-control" size="50" name="row[avatar]" type="text" value="" placeholder="上传或选择师傅头像">
                         <div class="input-group-addon no-border no-padding">
                             <span><button type="button" id="faupload-avatar" class="btn btn-danger faupload" data-category="avatar" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                             <span><button type="button" id="fachoose-avatar" class="btn btn-primary fachoose" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -126,13 +126,13 @@
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">经度</span>
-                                <input id="c-lng" data-rule="required" class="form-control" name="row[lng]" type="text" value="" placeholder="如: 106.927231">
+                                <input id="c-lng" class="form-control" name="row[lng]" type="text" value="" placeholder="如: 106.927231">
                             </div>
                         </div>
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">纬度</span>
-                                <input id="c-lat" data-rule="required" class="form-control" name="row[lat]" type="text" value="" placeholder="如: 27.725654">
+                                <input id="c-lat" class="form-control" name="row[lat]" type="text" value="" placeholder="如: 27.725654">
                             </div>
                         </div>
                     </div>
@@ -141,56 +141,16 @@
         </div>
     </div>
 
-    <!-- 4. 业务评级与出工状态 -->
+    <!-- 4. 初始出工与审核状态 -->
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-sliders"></i> 业务评级与出工状态</h4>
+            <h4 class="panel-title"><i class="fa fa-sliders"></i> 初始出工与审核状态</h4>
         </div>
         <div class="panel-body">
             <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">指标评级:</label>
+                <label class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-4">
-                            <div class="input-group">
-                                <span class="input-group-addon">{:__('Level')}</span>
-                                <input id="c-level" data-rule="required" class="form-control" name="row[level]" type="number" value="1">
-                            </div>
-                        </div>
-                        <div class="col-xs-4">
-                            <div class="input-group">
-                                <span class="input-group-addon">{:__('Score')}</span>
-                                <input id="c-score" data-rule="required" class="form-control" step="0.01" name="row[score]" type="number" value="5.00">
-                            </div>
-                        </div>
-                        <div class="col-xs-4">
-                            <div class="input-group">
-                                <span class="input-group-addon">{:__('Order_count')}</span>
-                                <input id="c-order_count" data-rule="required" class="form-control" name="row[order_count]" type="number" value="0">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">服务质量率:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">{:__('Accept_rate')}</span>
-                                <input id="c-accept_rate" data-rule="required" class="form-control" step="0.01" name="row[accept_rate]" type="number" value="100.00">
-                                <span class="input-group-addon">%</span>
-                            </div>
-                        </div>
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">{:__('Ontime_rate')}</span>
-                                <input id="c-ontime_rate" data-rule="required" class="form-control" step="0.01" name="row[ontime_rate]" type="number" value="100.00">
-                                <span class="input-group-addon">%</span>
-                            </div>
-                        </div>
-                    </div>
+                    <input id="c-level" data-rule="required" min="1" max="10" class="form-control" name="row[level]" type="number" value="1">
                 </div>
             </div>
             <div class="form-group">
@@ -222,34 +182,6 @@
         </div>
     </div>
 
-    <!-- 5. 钱包资金账户 -->
-    <div class="panel panel-default panel-form-section">
-        <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-cny"></i> 钱包资金账户</h4>
-        </div>
-        <div class="panel-body">
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">资金余额:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">可用 ¥</span>
-                                <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="0.00">
-                            </div>
-                        </div>
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">冻结 ¥</span>
-                                <input id="c-frozen_money" data-rule="required" class="form-control" step="0.01" name="row[frozen_money]" type="number" value="0.00">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
diff --git a/server/application/admin/view/master/detail.html b/server/application/admin/view/master/detail.html
index 1d38217..6cfd7fd 100644
--- a/server/application/admin/view/master/detail.html
+++ b/server/application/admin/view/master/detail.html
@@ -1,122 +1,78 @@
 <style>
     .master-detail-container { padding: 5px 10px; font-size: 13px; color: #334155; }
-    
-    /* 顶部 Hero 师傅名片 */
     .md-hero {
         background: linear-gradient(135deg, #fff7ed 0%, #ffedd5 100%);
         border: 1px solid #fed7aa;
         border-radius: 12px;
-        padding: 20px 24px;
-        margin-bottom: 20px;
+        padding: 18px 22px;
+        margin-bottom: 16px;
         display: flex;
         align-items: center;
         justify-content: space-between;
-        box-shadow: 0 4px 15px -3px rgba(249, 115, 22, 0.1);
+        flex-wrap: wrap;
+        gap: 16px;
+        box-shadow: 0 4px 15px -3px rgba(249, 115, 22, 0.08);
     }
-    .md-hero-left { display: flex; align-items: center; gap: 20px; }
+    .md-hero-left { display: flex; align-items: center; gap: 16px; min-width: 0; }
     .md-avatar {
-        width: 72px;
-        height: 72px;
+        width: 66px;
+        height: 66px;
         border-radius: 50%;
         object-fit: cover;
         border: 3px solid #ea580c;
-        box-shadow: 0 4px 12px rgba(234, 88, 12, 0.25);
+        flex-shrink: 0;
+        background: #fff;
     }
-    .md-info-name { font-size: 20px; font-weight: 700; color: #1e293b; margin-bottom: 4px; display: flex; align-items: center; gap: 10px; }
-    .md-info-sub { color: #64748b; font-size: 13px; }
-    
-    .md-kpi-grid { display: flex; gap: 24px; text-align: center; }
-    .md-kpi-item .kpi-val { font-size: 24px; font-weight: 800; color: #ea580c; font-family: 'DIN Alternate', sans-serif; line-height: 1; margin-bottom: 4px; }
-    .md-kpi-item .kpi-label { font-size: 11px; color: #64748b; }
+    .md-info-name { font-size: 19px; font-weight: 700; color: #1e293b; margin-bottom: 4px; display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
+    .md-info-name .name-txt { white-space: nowrap; }
+    .md-info-sub { color: #64748b; font-size: 12.5px; }
 
-    /* 卡片体系 */
-    .md-card {
-        background: #ffffff;
-        border: 1px solid #e2e8f0;
-        border-radius: 10px;
-        margin-bottom: 20px;
-        box-shadow: 0 2px 8px -2px rgba(15, 23, 42, 0.05);
-        overflow: hidden;
-    }
-    .md-card-header {
-        padding: 12px 18px;
-        background: #f8fafc;
-        border-bottom: 1px solid #e2e8f0;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
-    .md-card-title {
-        font-size: 14px;
-        font-weight: 600;
-        color: #1e293b;
-        margin: 0;
-        display: flex;
-        align-items: center;
-        gap: 8px;
-    }
+    .md-kpi-grid { display: flex; gap: 20px; text-align: center; flex-shrink: 0; }
+    .md-kpi-item .kpi-val { font-size: 22px; font-weight: 800; color: #ea580c; line-height: 1.1; margin-bottom: 4px; white-space: nowrap; }
+    .md-kpi-item .kpi-label { font-size: 11px; color: #64748b; white-space: nowrap; }
+
+    .md-card { background: #ffffff; border: 1px solid #e2e8f0; border-radius: 10px; margin-bottom: 16px; overflow: hidden; }
+    .md-card-header { padding: 10px 16px; background: #f8fafc; border-bottom: 1px solid #e2e8f0; display: flex; align-items: center; justify-content: space-between; }
+    .md-card-title { font-size: 13.5px; font-weight: 700; color: #1e293b; margin: 0; display: flex; align-items: center; gap: 8px; }
     .md-card-title i { color: #f97316; }
-    .md-card-body { padding: 18px; }
+    .md-card-body { padding: 16px; }
 
-    /* 网格列表 */
-    .md-grid-list { display: grid; grid-template-columns: repeat(2, 1fr); gap: 12px 20px; }
+    .md-grid-list { display: grid; grid-template-columns: repeat(2, 1fr); gap: 10px 18px; }
     .md-item { display: flex; align-items: baseline; font-size: 13px; line-height: 1.5; }
-    .md-item-k { min-width: 90px; color: #64748b; font-weight: 400; flex-shrink: 0; }
+    .md-item-k { min-width: 84px; color: #64748b; flex-shrink: 0; }
     .md-item-v { color: #0f172a; font-weight: 500; word-break: break-all; }
 
-    /* 证件照预览 */
-    .idcard-preview-box {
-        display: flex;
-        gap: 16px;
-    }
-    .idcard-img-wrap {
-        width: 180px;
-        height: 115px;
-        border-radius: 8px;
-        border: 1px solid #cbd5e1;
-        overflow: hidden;
-        background: #f1f5f9;
-        text-align: center;
-        position: relative;
-    }
+    .idcard-preview-box { display: flex; gap: 14px; flex-wrap: wrap; }
+    .idcard-img-wrap { width: 175px; height: 110px; border-radius: 8px; border: 1px solid #cbd5e1; overflow: hidden; background: #f1f5f9; position: relative; }
     .idcard-img-wrap img { width: 100%; height: 100%; object-fit: cover; }
-    .idcard-img-wrap .tag {
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background: rgba(15, 23, 42, 0.7);
-        color: #fff;
-        font-size: 11px;
-        padding: 2px 0;
-    }
+    .idcard-img-wrap .tag { position: absolute; bottom: 0; left: 0; right: 0; background: rgba(15, 23, 42, 0.72); color: #fff; font-size: 11px; text-align: center; padding: 2px 0; }
 </style>
 
 <div class="master-detail-container">
     <!-- 1. Hero 师傅名片 -->
     <div class="md-hero">
         <div class="md-hero-left">
-            <img class="md-avatar" src="{$row.avatar|default='/assets/img/avatar.png'}" />
+            <img class="md-avatar" src="{$row.avatar|default='/assets/img/avatar.png'|htmlentities}" onerror="this.src='/assets/img/avatar.png'" />
             <div>
                 <div class="md-info-name">
-                    {$row.realname}
+                    <span class="name-txt">{$row.realname|htmlentities}</span>
                     {if $row.verify_status == 'pass'}
-                        <span class="label label-success" style="font-size: 12px;"><i class="fa fa-shield"></i> 实名认证通过</span>
-                    {elseif $row.verify_status == 'pending'}
-                        <span class="label label-warning" style="font-size: 12px;"><i class="fa fa-clock-o"></i> 认证待审核</span>
-                    {else}
-                        <span class="label label-danger" style="font-size: 12px;"><i class="fa fa-times"></i> 认证已驳回</span>
+                        <span class="label label-success"><i class="fa fa-shield"></i> 实名认证通过</span>
+                    {elseif $row.verify_status == 'pending'/}
+                        <span class="label label-warning"><i class="fa fa-clock-o"></i> 认证待审核</span>
+                    {else/}
+                        <span class="label label-danger"><i class="fa fa-times"></i> 认证已驳回</span>
                     {/if}
                     {if $row.work_status == 'on'}
-                        <span class="label label-primary" style="font-size: 12px;"><i class="fa fa-check-circle"></i> 正常出工接单</span>
-                    {else}
-                        <span class="label label-default" style="font-size: 12px;">收工休假中</span>
+                        <span class="label label-primary"><i class="fa fa-check-circle"></i> 听单接单中</span>
+                    {else/}
+                        <span class="label label-default">暂停听单</span>
                     {/if}
                 </div>
                 <div class="md-info-sub">
-                    <span>联系电话: <strong>{$row.mobile}</strong></span>
+                    <span>手机号: <strong>{$row.mobile|htmlentities}</strong></span>
                     <span style="margin: 0 8px;">|</span>
-                    <span>服务城市: {$row.city|default='全国'} (半径 {$row.serve_radius} 公里)</span>
+                    <span>驻地城市: {$row.city|default='全国'|htmlentities}（服务半径 {$row.serve_radius}km）</span>
                     <span style="margin: 0 8px;">|</span>
                     <span>入驻时间: {$row.createtime|datetime}</span>
                 </div>
@@ -124,51 +80,51 @@
         </div>
         <div class="md-kpi-grid">
             <div class="md-kpi-item">
-                <div class="kpi-val">{$row.score} ★</div>
-                <div class="kpi-label">综合服务评分</div>
+                <div class="kpi-val"><i class="fa fa-star" style="font-size:17px;"></i> {$row.score}</div>
+                <div class="kpi-label">服务评分</div>
             </div>
             <div class="md-kpi-item">
                 <div class="kpi-val">{$row.order_count}</div>
-                <div class="kpi-label">累计完工工单</div>
+                <div class="kpi-label">累计完工</div>
             </div>
             <div class="md-kpi-item">
                 <div class="kpi-val">{$row.accept_rate}%</div>
-                <div class="kpi-label">派单接单率</div>
+                <div class="kpi-label">接单率</div>
             </div>
             <div class="md-kpi-item">
                 <div class="kpi-val">{$row.ontime_rate}%</div>
-                <div class="kpi-label">准时到达率</div>
+                <div class="kpi-label">准时率</div>
             </div>
         </div>
     </div>
 
-    <!-- 2. 核心信息卡片 -->
+    <!-- 2. 实名认证 + 钱包结算 -->
     <div class="row">
-        <!-- 卡片 A: 实名认证资质档案 -->
         <div class="col-xs-12 col-sm-6">
             <div class="md-card">
                 <div class="md-card-header">
                     <h4 class="md-card-title"><i class="fa fa-id-card-o"></i> 实名认证与身份凭证</h4>
                 </div>
                 <div class="md-card-body">
-                    <div class="md-grid-list" style="margin-bottom: 16px;">
-                        <div class="md-item"><span class="md-item-k">真实姓名:</span><span class="md-item-v">{$row.realname}</span></div>
-                        <div class="md-item"><span class="md-item-k">身份证号:</span><span class="md-item-v">{$row.idcard_no|default='未登记'}</span></div>
-                        <div class="md-item"><span class="md-item-k">审核意见:</span><span class="md-item-v">{$row.audit_msg|default='资料审核通过'}</span></div>
-                        <div class="md-item"><span class="md-item-k">师傅等级:</span><span class="md-item-v">LV.{$row.level} 级金牌师傅</span></div>
+                    <div class="md-grid-list" style="margin-bottom: 14px;">
+                        <div class="md-item"><span class="md-item-k">真实姓名:</span><span class="md-item-v">{$row.realname|htmlentities}</span></div>
+                        <div class="md-item"><span class="md-item-k">身份证号:</span><span class="md-item-v"><code>{$row.idcard_no|default='未登记'|htmlentities}</code></span></div>
+                        <div class="md-item"><span class="md-item-k">关联账号:</span><span class="md-item-v">{$row.user.nickname|default=$row.user.username|default='-'|htmlentities} (ID:{$row.user_id})</span></div>
+                        <div class="md-item"><span class="md-item-k">师傅等级:</span><span class="md-item-v">LV.{$row.level}</span></div>
+                        <div class="md-item" style="grid-column: span 2;"><span class="md-item-k">审核批注:</span><span class="md-item-v">{$row.audit_msg|default='资质核验正常'|htmlentities}</span></div>
                     </div>
 
-                    <div style="font-size: 12px; font-weight: 600; color: #475569; margin-bottom: 8px;">身份证与资质凭证照片：</div>
+                    <div style="font-size: 12px; font-weight: 600; color: #475569; margin-bottom: 8px;">身份证正反面照片：</div>
                     <div class="idcard-preview-box">
                         <div class="idcard-img-wrap">
-                            <a href="{$row.idcard_front|default='/assets/img/avatar.png'}" target="_blank">
-                                <img src="{$row.idcard_front|default='/assets/img/avatar.png'}" />
+                            <a href="{$row.idcard_front|default='/assets/img/avatar.png'|htmlentities}" target="_blank">
+                                <img src="{$row.idcard_front|default='/assets/img/avatar.png'|htmlentities}" onerror="this.src='/assets/img/avatar.png'" />
                             </a>
                             <div class="tag">身份证人像面</div>
                         </div>
                         <div class="idcard-img-wrap">
-                            <a href="{$row.idcard_back|default='/assets/img/avatar.png'}" target="_blank">
-                                <img src="{$row.idcard_back|default='/assets/img/avatar.png'}" />
+                            <a href="{$row.idcard_back|default='/assets/img/avatar.png'|htmlentities}" target="_blank">
+                                <img src="{$row.idcard_back|default='/assets/img/avatar.png'|htmlentities}" onerror="this.src='/assets/img/avatar.png'" />
                             </a>
                             <div class="tag">身份证国徽面</div>
                         </div>
@@ -176,90 +132,159 @@
                 </div>
             </div>
 
-            <!-- 卡片 A2: 师傅已获服务技能 -->
             <div class="md-card">
                 <div class="md-card-header">
                     <h4 class="md-card-title"><i class="fa fa-certificate"></i> 已认证服务技能 ({:count($skills)})</h4>
                 </div>
                 <div class="md-card-body">
                     {if !empty($skills)}
-                        <div style="display: flex; flex-wrap: wrap; gap: 8px; margin-bottom: 14px;">
-                            {foreach name="skills" item="sk"}
-                                <span class="label {if $sk.status == 'normal'}label-success{else}label-default{/if}" style="font-size: 13px; padding: 6px 12px; border-radius: 4px; display: inline-flex; align-items: center; gap: 5px;">
-                                    <i class="fa fa-check-circle"></i> {$sk.cat_name|default='未归类技能'}
-                                    {if !empty($sk.cert_image)}
-                                        <a href="{$sk.cert_image}" target="_blank" style="color: #fff; margin-left: 4px;" title="查看证书"><i class="fa fa-picture-o"></i></a>
-                                    {/if}
-                                </span>
-                            {/foreach}
-                        </div>
-                    {else}
-                        <div style="text-align: center; color: #94a3b8; padding: 15px 0;">暂未认证任何服务技能</div>
+                    <div style="display: flex; flex-wrap: wrap; gap: 8px;">
+                        {foreach name="skills" item="sk"}
+                        <span class="label {if $sk.status == 'normal'}label-success{else/}label-default{/if}" style="font-size: 12.5px; padding: 6px 10px; border-radius: 4px; display: inline-flex; align-items: center; gap: 5px;">
+                            <i class="fa fa-check-circle"></i>
+                            {$sk.skill_name|default=$sk.cat_name|default='服务技能'|htmlentities}
+                            {if !empty($sk.category)}<small style="opacity:0.85;">({$sk.category|htmlentities})</small>{/if}
+                            {if !empty($sk.cert_image)}
+                                <a href="{$sk.cert_image|htmlentities}" target="_blank" style="color: #fff; margin-left: 3px;" title="查看技能证书"><i class="fa fa-picture-o"></i></a>
+                            {/if}
+                        </span>
+                        {/foreach}
+                    </div>
+                    {else /}
+                    <div style="text-align: center; color: #94a3b8; padding: 14px 0;">暂未配置认证服务技能</div>
                     {/if}
                 </div>
             </div>
         </div>
 
-        <!-- 卡片 B: 钱包与资金账户 -->
         <div class="col-xs-12 col-sm-6">
             <div class="md-card">
                 <div class="md-card-header">
-                    <h4 class="md-card-title"><i class="fa fa-money"></i> 师傅钱包资金与提现</h4>
+                    <h4 class="md-card-title"><i class="fa fa-money"></i> 钱包账户、结算入账与提现明细</h4>
                 </div>
                 <div class="md-card-body">
-                    <div class="row" style="margin-bottom: 16px;">
+                    <div class="row" style="margin-bottom: 14px;">
                         <div class="col-xs-6">
-                            <div style="background:#f8fafc; border-radius:8px; padding:12px; border:1px solid #e2e8f0;">
+                            <div style="background:#f8fafc; border-radius:8px; padding:10px 14px; border:1px solid #e2e8f0;">
                                 <div style="font-size:12px; color:#64748b;">可提现余额</div>
-                                <div style="font-size:24px; font-weight:800; color:#10b981; font-family:'DIN Alternate'; line-height:1.2;">¥{$row.money}</div>
+                                <div style="font-size:22px; font-weight:800; color:#10b981;">¥{$row.money}</div>
                             </div>
                         </div>
                         <div class="col-xs-6">
-                            <div style="background:#f8fafc; border-radius:8px; padding:12px; border:1px solid #e2e8f0;">
+                            <div style="background:#f8fafc; border-radius:8px; padding:10px 14px; border:1px solid #e2e8f0;">
                                 <div style="font-size:12px; color:#64748b;">履约冻结质保金</div>
-                                <div style="font-size:24px; font-weight:800; color:#64748b; font-family:'DIN Alternate'; line-height:1.2;">¥{$row.frozen_money}</div>
+                                <div style="font-size:22px; font-weight:800; color:#64748b;">¥{$row.frozen_money}</div>
                             </div>
                         </div>
                     </div>
 
-                    <div style="font-size: 12px; font-weight: 600; color: #475569; margin-bottom: 8px;">近期提现申请流水：</div>
+                    <div style="font-size: 12px; font-weight: 600; color: #475569; margin-bottom: 6px;">近期工单结算分成：</div>
+                    {if !empty($recentSettles)}
+                    <table class="table table-bordered table-condensed" style="font-size: 12px; margin-bottom: 12px;">
+                        <thead><tr class="active"><th>工单号</th><th>订单总额</th><th>抽成</th><th>师傅所得</th><th>状态</th></tr></thead>
+                        <tbody>
+                            {foreach name="recentSettles" item="st"}
+                            <tr>
+                                <td><code>{$st.order_no|default='-'|htmlentities}</code></td>
+                                <td>¥{$st.order_amount}</td>
+                                <td class="text-muted">¥{$st.commission}</td>
+                                <td style="color:#10b981;font-weight:700;">+¥{$st.settle_amount}</td>
+                                <td>
+                                    {if $st.status == 'settled'}<span class="label label-success">已入账</span>
+                                    {elseif $st.status == 'offline'/}<span class="label label-info">线下结</span>
+                                    {else/}<span class="label label-warning">待结算</span>{/if}
+                                </td>
+                            </tr>
+                            {/foreach}
+                        </tbody>
+                    </table>
+                    {else /}
+                    <div class="text-muted" style="font-size:12px; margin-bottom:12px;">暂无结算入账记录</div>
+                    {/if}
+
+                    <div style="font-size: 12px; font-weight: 600; color: #475569; margin-bottom: 6px;">近期提现申请记录：</div>
                     {if !empty($recentWithdraws)}
                     <table class="table table-bordered table-condensed" style="font-size: 12px; margin-bottom: 0;">
-                        <thead><tr class="active"><th>提现金额</th><th>手续费</th><th>到账金额</th><th>结算渠道</th><th>状态</th></tr></thead>
+                        <thead><tr class="active"><th>申请金额</th><th>手续费</th><th>实到金额</th><th>渠道</th><th>状态</th></tr></thead>
                         <tbody>
                             {foreach name="recentWithdraws" item="w"}
                             <tr>
                                 <td>¥{$w.amount}</td>
                                 <td>¥{$w.fee}</td>
                                 <td style="color:#10b981; font-weight:700;">¥{$w.arrive_amount}</td>
-                                <td>{$w.channel}</td>
-                                <td><span class="label label-info">{$w.status}</span></td>
+                                <td>{if $w.channel=='wechat'}微信零钱{else/}银行卡{/if}</td>
+                                <td>
+                                    {if $w.status=='done'}<span class="label label-success">已打款</span>
+                                    {elseif $w.status=='pass'/}<span class="label label-primary">已通过</span>
+                                    {elseif $w.status=='reject'/}<span class="label label-danger">已驳回</span>
+                                    {else/}<span class="label label-warning">待审批</span>{/if}
+                                </td>
                             </tr>
                             {/foreach}
                         </tbody>
                     </table>
-                    {else}
-                    <div style="text-align: center; color: #94a3b8; padding: 15px 0;">暂无提现记录</div>
+                    {else /}
+                    <div class="text-muted" style="font-size:12px;">暂无提现申请记录</div>
                     {/if}
                 </div>
             </div>
         </div>
     </div>
 
-    <!-- 3. 近期履约工单记录 -->
+    <!-- 3. 客户真实评价记录 -->
     <div class="md-card">
         <div class="md-card-header">
-            <h4 class="md-card-title"><i class="fa fa-list-alt"></i> 师傅近期承接履约工单</h4>
+            <h4 class="md-card-title"><i class="fa fa-star"></i> 近期雇主评价反馈 ({:count($recentReviews)})</h4>
         </div>
-        <div class="md-card-body">
-            {if !empty($recentOrders)}
-            <table class="table table-bordered table-hover" style="font-size: 12px; margin-bottom: 0;">
+        <div class="md-card-body" style="padding: 12px 16px;">
+            {if !empty($recentReviews)}
+            <table class="table table-bordered table-condensed" style="font-size:12px; margin-bottom:0;">
                 <thead>
                     <tr class="active">
-                        <th>工单号</th>
+                        <th style="width:155px;">关联工单</th>
+                        <th style="width:110px;">评价客户</th>
+                        <th style="width:110px;">星级评分</th>
+                        <th>评价内容与师傅回复</th>
+                        <th style="width:135px;">评价时间</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {foreach name="recentReviews" item="rv"}
+                    <tr>
+                        <td><code>{$rv.order_no|default='-'|htmlentities}</code><br><span class="text-muted">{$rv.service_name|default=''|htmlentities}</span></td>
+                        <td>{$rv.user_nickname|default='匿名业主'|htmlentities}</td>
+                        <td style="color:#f59e0b;">
+                            <?php for($i=0; $i<(int)$rv['score']; $i++): ?><i class="fa fa-star"></i><?php endfor; ?>
+                            <strong>{$rv.score}分</strong>
+                        </td>
+                        <td>
+                            <div>{$rv.content|default='默认好评'|htmlentities}</div>
+                            {if !empty($rv.reply)}<div style="color:#ea580c;margin-top:3px;">[师傅回评] {$rv.reply|htmlentities}</div>{/if}
+                        </td>
+                        <td>{$rv.createtime|datetime}</td>
+                    </tr>
+                    {/foreach}
+                </tbody>
+            </table>
+            {else /}
+            <div style="text-align: center; color: #94a3b8; padding: 14px 0;">暂无客户评价记录</div>
+            {/if}
+        </div>
+    </div>
+
+    <!-- 4. 近期履约工单记录 -->
+    <div class="md-card" style="margin-bottom:0;">
+        <div class="md-card-header">
+            <h4 class="md-card-title"><i class="fa fa-list-alt"></i> 近期承接履约工单 ({:count($recentOrders)})</h4>
+        </div>
+        <div class="md-card-body" style="padding: 12px 16px;">
+            {if !empty($recentOrders)}
+            <table class="table table-bordered table-hover table-condensed" style="font-size: 12px; margin-bottom: 0;">
+                <thead>
+                    <tr class="active">
+                        <th>工单编号</th>
                         <th>服务项目</th>
-                        <th>客户联系人</th>
-                        <th>联系电话</th>
+                        <th>客户信息</th>
                         <th>服务地址</th>
                         <th>实付金额</th>
                         <th>工单状态</th>
@@ -269,24 +294,29 @@
                 <tbody>
                     {foreach name="recentOrders" item="o"}
                     <tr>
-                        <td><strong>{$o.order_no}</strong></td>
-                        <td>{$o.service_name}</td>
-                        <td>{$o.contact}</td>
-                        <td>{$o.mobile}</td>
-                        <td>{$o.province}{$o.city}{$o.district}{$o.address}</td>
+                        <td><code>{$o.order_no|htmlentities}</code></td>
+                        <td><strong>{$o.service_name|htmlentities}</strong></td>
+                        <td>{$o.contact|htmlentities} ({$o.mobile|htmlentities})</td>
+                        <td>{$o.province|htmlentities}{$o.city|htmlentities}{$o.district|htmlentities}{$o.address|htmlentities}</td>
                         <td style="color:#ea580c; font-weight:700;">¥{$o.pay_amount}</td>
-                        <td><span class="label label-warning">{$o.status}</span></td>
+                        <td>
+                            <span class="label {if $o.status==8}label-success{elseif $o.status==9/}label-default{elseif $o.status==10/}label-danger{else/}label-primary{/if}">{$o.status_label|htmlentities}</span>
+                        </td>
                         <td>{$o.createtime|datetime}</td>
                     </tr>
                     {/foreach}
                 </tbody>
             </table>
-            {else}
-            <div style="text-align: center; color: #94a3b8; padding: 25px 0;">
-                <i class="fa fa-inbox" style="font-size: 28px; margin-bottom: 6px;"></i>
-                <div>暂无接单履约历史</div>
-            </div>
+            {else /}
+            <div style="text-align: center; color: #94a3b8; padding: 16px 0;">暂无接单履约历史</div>
             {/if}
         </div>
     </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="button" class="btn btn-primary btn-embossed" onclick="parent.Layer.closeAll();"><i class="fa fa-check"></i> 关闭档案</button>
+        </div>
+    </div>
 </div>
diff --git a/server/application/admin/view/master/edit.html b/server/application/admin/view/master/edit.html
index 2c16f58..324d023 100644
--- a/server/application/admin/view/master/edit.html
+++ b/server/application/admin/view/master/edit.html
@@ -27,14 +27,14 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <div class='control-relative'><input id="c-city" data-rule="required" class="form-control" data-toggle="city-picker" name="row[city]" type="text" value="{$row.city|htmlentities}" placeholder="请选择服务常驻城市"></div>
+                    <div class='control-relative'><input id="c-city" class="form-control" data-toggle="city-picker" name="row[city]" type="text" value="{$row.city|htmlentities}" placeholder="请选择服务常驻城市"></div>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
                 <div class="col-xs-12 col-sm-8">
                     <div class="input-group">
-                        <input id="c-avatar" data-rule="required" class="form-control" size="50" name="row[avatar]" type="text" value="{$row.avatar|htmlentities}" placeholder="上传或选择师傅头像">
+                        <input id="c-avatar" data-rule="" class="form-control" size="50" name="row[avatar]" type="text" value="{$row.avatar|htmlentities}" placeholder="上传或选择师傅头像">
                         <div class="input-group-addon no-border no-padding">
                             <span><button type="button" id="faupload-avatar" class="btn btn-danger faupload" data-category="avatar" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                             <span><button type="button" id="fachoose-avatar" class="btn btn-primary fachoose" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -56,14 +56,14 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_no')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <input id="c-idcard_no" data-rule="required;IDcard" class="form-control" name="row[idcard_no]" type="text" value="{$row.idcard_no|htmlentities}" placeholder="请输入18位二代身份证号码">
+                    <input id="c-idcard_no" data-rule="required" class="form-control" name="row[idcard_no]" type="text" value="{$row.idcard_no|htmlentities}" placeholder="请输入18位二代身份证号码（历史脱敏值保持不变即可）">
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_front')}:</label>
                 <div class="col-xs-12 col-sm-8">
                     <div class="input-group">
-                        <input id="c-idcard_front" data-rule="required" class="form-control" size="50" name="row[idcard_front]" type="text" value="{$row.idcard_front|htmlentities}" placeholder="请上传身份证人像面照片">
+                        <input id="c-idcard_front" data-rule="" class="form-control" size="50" name="row[idcard_front]" type="text" value="{$row.idcard_front|htmlentities}" placeholder="请上传身份证人像面照片">
                         <div class="input-group-addon no-border no-padding">
                             <span><button type="button" id="faupload-idcard_front" class="btn btn-danger faupload" data-category="cert" data-input-id="c-idcard_front" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-idcard_front"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                             <span><button type="button" id="fachoose-idcard_front" class="btn btn-primary fachoose" data-input-id="c-idcard_front" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -77,7 +77,7 @@
                 <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_back')}:</label>
                 <div class="col-xs-12 col-sm-8">
                     <div class="input-group">
-                        <input id="c-idcard_back" data-rule="required" class="form-control" size="50" name="row[idcard_back]" type="text" value="{$row.idcard_back|htmlentities}" placeholder="请上传身份证国徽面照片">
+                        <input id="c-idcard_back" data-rule="" class="form-control" size="50" name="row[idcard_back]" type="text" value="{$row.idcard_back|htmlentities}" placeholder="请上传身份证国徽面照片">
                         <div class="input-group-addon no-border no-padding">
                             <span><button type="button" id="faupload-idcard_back" class="btn btn-danger faupload" data-category="cert" data-input-id="c-idcard_back" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-idcard_back"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                             <span><button type="button" id="fachoose-idcard_back" class="btn btn-primary fachoose" data-input-id="c-idcard_back" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -126,13 +126,13 @@
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">经度</span>
-                                <input id="c-lng" data-rule="required" class="form-control" name="row[lng]" type="text" value="{$row.lng|htmlentities}" placeholder="如: 106.927231">
+                                <input id="c-lng" class="form-control" name="row[lng]" type="text" value="{$row.lng|htmlentities}" placeholder="如: 106.927231">
                             </div>
                         </div>
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">纬度</span>
-                                <input id="c-lat" data-rule="required" class="form-control" name="row[lat]" type="text" value="{$row.lat|htmlentities}" placeholder="如: 27.725654">
+                                <input id="c-lat" class="form-control" name="row[lat]" type="text" value="{$row.lat|htmlentities}" placeholder="如: 27.725654">
                             </div>
                         </div>
                     </div>
@@ -166,7 +166,7 @@
                         <div class="col-xs-4">
                             <div class="input-group">
                                 <span class="input-group-addon">{:__('Order_count')}</span>
-                                <input id="c-order_count" data-rule="required" class="form-control" name="row[order_count]" type="number" value="{$row.order_count|htmlentities}">
+                                <input id="c-order_count" class="form-control" name="row[order_count]" type="number" value="{$row.order_count|htmlentities}" readonly>
                             </div>
                         </div>
                     </div>
@@ -235,13 +235,13 @@
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">可用 ¥</span>
-                                <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}">
+                                <input id="c-money" class="form-control" step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}" readonly>
                             </div>
                         </div>
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">冻结 ¥</span>
-                                <input id="c-frozen_money" data-rule="required" class="form-control" step="0.01" name="row[frozen_money]" type="number" value="{$row.frozen_money|htmlentities}">
+                                <input id="c-frozen_money" class="form-control" step="0.01" name="row[frozen_money]" type="number" value="{$row.frozen_money|htmlentities}" readonly>
                             </div>
                         </div>
                     </div>
diff --git a/server/application/admin/view/master/index.html b/server/application/admin/view/master/index.html
index 30c6644..56eb1eb 100644
--- a/server/application/admin/view/master/index.html
+++ b/server/application/admin/view/master/index.html
@@ -2,10 +2,10 @@
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="verify_status">
-            <li class="active"><a href="#t-all" data-value="" data-toggle="tab">全部师傅</a></li>
-            <li><a href="#t-pending" data-value="pending" data-toggle="tab"><i class="fa fa-clock-o text-warning"></i> 入驻待审核</a></li>
-            <li><a href="#t-pass" data-value="pass" data-toggle="tab"><i class="fa fa-check-circle text-success"></i> 认证通过</a></li>
-            <li><a href="#t-reject" data-value="reject" data-toggle="tab"><i class="fa fa-times-circle text-danger"></i> 已驳回</a></li>
+            <li class="{:$Think.get.verify_status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">全部师傅</a></li>
+            <li class="{:$Think.get.verify_status === 'pending' ? 'active' : ''}"><a href="#t-pending" data-value="pending" data-toggle="tab"><i class="fa fa-clock-o text-warning"></i> 入驻待审核</a></li>
+            <li class="{:$Think.get.verify_status === 'pass' ? 'active' : ''}"><a href="#t-pass" data-value="pass" data-toggle="tab"><i class="fa fa-check-circle text-success"></i> 认证通过</a></li>
+            <li class="{:$Think.get.verify_status === 'reject' ? 'active' : ''}"><a href="#t-reject" data-value="reject" data-toggle="tab"><i class="fa fa-times-circle text-danger"></i> 已驳回</a></li>
         </ul>
     </div>
 
@@ -20,6 +20,7 @@
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('master/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('master/detail')}"
                            data-operate-edit="{:$auth->check('master/edit')}"
                            data-operate-del="{:$auth->check('master/del')}"
                            width="100%">
diff --git a/server/application/admin/view/merchant/detail.html b/server/application/admin/view/merchant/detail.html
index 5518ae4..dd00910 100644
--- a/server/application/admin/view/merchant/detail.html
+++ b/server/application/admin/view/merchant/detail.html
@@ -1,46 +1,33 @@
 <style>
     .merchant-detail-container { padding: 5px 10px; font-size: 13px; color: #334155; }
-    
     .mer-hero {
         background: linear-gradient(135deg, #eff6ff 0%, #dbeafe 100%);
         border: 1px solid #bfdbfe;
         border-radius: 12px;
-        padding: 20px 24px;
-        margin-bottom: 20px;
+        padding: 18px 22px;
+        margin-bottom: 16px;
         display: flex;
         align-items: center;
         justify-content: space-between;
+        flex-wrap: wrap;
+        gap: 16px;
     }
-    .mer-hero-left .mer-name { font-size: 20px; font-weight: 700; color: #1e3a8a; margin-bottom: 6px; display: flex; align-items: center; gap: 10px; }
-    .mer-hero-sub { color: #3b82f6; font-size: 13px; }
+    .mer-hero-left .mer-name { font-size: 19px; font-weight: 700; color: #1e3a8a; margin-bottom: 6px; display: flex; align-items: center; gap: 10px; flex-wrap: wrap; }
+    .mer-hero-sub { color: #2563eb; font-size: 12.5px; }
+    .mer-stats { display: flex; gap: 12px; }
+    .mer-stat { background: #fff; border: 1px solid #bfdbfe; border-radius: 8px; padding: 6px 14px; text-align: center; min-width: 96px; }
+    .mer-stat b { display: block; font-size: 17px; color: #1d4ed8; font-weight: 800; }
+    .mer-stat span { font-size: 11px; color: #64748b; }
 
-    .mer-card {
-        background: #ffffff;
-        border: 1px solid #e2e8f0;
-        border-radius: 10px;
-        margin-bottom: 20px;
-        overflow: hidden;
-    }
-    .mer-card-header {
-        padding: 12px 18px;
-        background: #f8fafc;
-        border-bottom: 1px solid #e2e8f0;
-    }
-    .mer-card-title {
-        font-size: 14px;
-        font-weight: 600;
-        color: #1e293b;
-        margin: 0;
-        display: flex;
-        align-items: center;
-        gap: 8px;
-    }
-    .mer-card-title i { color: #3b82f6; }
-    .mer-card-body { padding: 18px; }
+    .mer-card { background: #ffffff; border: 1px solid #e2e8f0; border-radius: 10px; margin-bottom: 16px; overflow: hidden; }
+    .mer-card-header { padding: 10px 16px; background: #f8fafc; border-bottom: 1px solid #e2e8f0; display: flex; align-items: center; justify-content: space-between; }
+    .mer-card-title { font-size: 13.5px; font-weight: 700; color: #1e293b; margin: 0; display: flex; align-items: center; gap: 8px; }
+    .mer-card-title i { color: #2563eb; }
+    .mer-card-body { padding: 16px; }
 
-    .mer-grid-list { display: grid; grid-template-columns: repeat(2, 1fr); gap: 12px 20px; }
+    .mer-grid-list { display: grid; grid-template-columns: repeat(2, 1fr); gap: 10px 18px; }
     .mer-item { display: flex; align-items: baseline; font-size: 13px; line-height: 1.5; }
-    .mer-item-k { min-width: 95px; color: #64748b; font-weight: 400; flex-shrink: 0; }
+    .mer-item-k { min-width: 92px; color: #64748b; flex-shrink: 0; }
     .mer-item-v { color: #0f172a; font-weight: 500; word-break: break-all; }
 </style>
 
@@ -48,103 +35,192 @@
     <div class="mer-hero">
         <div class="mer-hero-left">
             <div class="mer-name">
-                <i class="fa fa-building"></i> {$row.company_name}
+                <i class="fa fa-building"></i> {$row.name|htmlentities}
                 {if $row.verify_status == 'pass'}
-                    <span class="label label-success"><i class="fa fa-check"></i> 认证商家</span>
-                {elseif $row.verify_status == 'pending'}
-                    <span class="label label-warning">待认证</span>
-                {else}
+                    <span class="label label-success"><i class="fa fa-check"></i> 认证通过</span>
+                {elseif $row.verify_status == 'pending'/}
+                    <span class="label label-warning">资质待审</span>
+                {else/}
                     <span class="label label-danger">已驳回</span>
                 {/if}
+                <span class="label label-primary">{$row.settle_type_text}</span>
             </div>
             <div class="mer-hero-sub">
-                <span>绑定账号: <strong>{$row.user.username|default='-'}</strong></span>
+                <span>统一社会信用代码: <strong>{$row.license_no|default='-'|htmlentities}</strong></span>
                 <span style="margin: 0 8px;">|</span>
-                <span>对公结算模式: {$row.settle_type_text}</span>
+                <span>主账号: {$row.user.nickname|default=$row.user.username|default='-'|htmlentities} (ID:{$row.user_id})</span>
                 <span style="margin: 0 8px;">|</span>
                 <span>入驻时间: {$row.createtime|datetime}</span>
             </div>
         </div>
-        <div>
-            <span class="badge" style="background:#2563eb; font-size:14px; padding:6px 12px;">信用代码: {$row.credit_code}</span>
+        <div class="mer-stats">
+            <div class="mer-stat">
+                <b>{$orderCount}</b>
+                <span>发包工单(笔)</span>
+            </div>
+            <div class="mer-stat">
+                <b>¥{$orderGmv}</b>
+                <span>累计结算额</span>
+            </div>
+            <div class="mer-stat">
+                <b>{:count($members)}</b>
+                <span>员工子账号</span>
+            </div>
         </div>
     </div>
 
     <div class="row">
-        <!-- 基础与对接 -->
+        <!-- 基础与营业执照 -->
         <div class="col-xs-12 col-sm-6">
             <div class="mer-card">
                 <div class="mer-card-header">
-                    <h4 class="mer-card-title"><i class="fa fa-user-circle"></i> 企业主体与对接人</h4>
+                    <h4 class="mer-card-title"><i class="fa fa-id-card-o"></i> 企业工商主体与业务对接</h4>
                 </div>
                 <div class="mer-card-body">
                     <div class="mer-grid-list">
-                        <div class="mer-item"><span class="mer-item-k">法定代表人:</span><span class="mer-item-v">{$row.legal_person}</span></div>
-                        <div class="mer-item"><span class="mer-item-k">业务联系人:</span><span class="mer-item-v">{$row.contact}</span></div>
-                        <div class="mer-item"><span class="mer-item-k">对接手机:</span><span class="mer-item-v">{$row.mobile}</span></div>
-                        <div class="mer-item"><span class="mer-item-k">经营城市:</span><span class="mer-item-v">{$row.city}</span></div>
-                        <div class="mer-item" style="grid-column: span 2;"><span class="mer-item-k">办公注册地址:</span><span class="mer-item-v">{$row.address}</span></div>
+                        <div class="mer-item"><span class="mer-item-k">法定代表人:</span><span class="mer-item-v">{$row.legal_person|default='-'|htmlentities}</span></div>
+                        <div class="mer-item"><span class="mer-item-k">法人电话:</span><span class="mer-item-v">{$row.legal_mobile|default='-'|htmlentities}</span></div>
+                        <div class="mer-item"><span class="mer-item-k">业务联系人:</span><span class="mer-item-v">{$row.contact|default='-'|htmlentities}</span></div>
+                        <div class="mer-item"><span class="mer-item-k">对接手机号:</span><span class="mer-item-v"><strong>{$row.mobile|default='-'|htmlentities}</strong></span></div>
+                        <div class="mer-item"><span class="mer-item-k">售后技术电话:</span><span class="mer-item-v">{$row.tech_mobile|default='-'|htmlentities}</span></div>
+                        <div class="mer-item"><span class="mer-item-k">联系邮箱:</span><span class="mer-item-v">{$row.email|default='-'|htmlentities}</span></div>
+                        <div class="mer-item" style="grid-column: span 2;"><span class="mer-item-k">经营所在地:</span><span class="mer-item-v">{$row.province|htmlentities}{$row.city|htmlentities}{$row.district|htmlentities}{$row.address|htmlentities}</span></div>
+                        <div class="mer-item" style="grid-column: span 2;"><span class="mer-item-k">审核批注:</span><span class="mer-item-v">{$row.audit_msg|default='资质核验正常'|htmlentities}</span></div>
                     </div>
 
-                    <div style="margin-top: 15px; padding-top: 14px; border-top: 1px dashed #e2e8f0;">
-                        <div style="font-size: 12px; font-weight: 600; color: #475569; margin-bottom: 8px;">企业营业执照：</div>
-                        <div style="width: 200px; height: 130px; border-radius: 8px; border: 1px solid #cbd5e1; overflow: hidden; background: #f8fafc;">
-                            <a href="{$row.license_image|default='/assets/img/avatar.png'}" target="_blank">
-                                <img src="{$row.license_image|default='/assets/img/avatar.png'}" style="width: 100%; height: 100%; object-fit: cover;" />
+                    <div style="margin-top: 14px; padding-top: 12px; border-top: 1px dashed #e2e8f0;">
+                        <div style="font-size: 12px; font-weight: 600; color: #475569; margin-bottom: 8px;">营业执照扫描件：</div>
+                        {if !empty($row.license_image)}
+                        <?php $licImgUrl = strpos($row['license_image'], '/assets/') === 0 ? $row['license_image'] : cdnurl($row['license_image'], true); ?>
+                        <div style="width: 210px; height: 130px; border-radius: 8px; border: 1px solid #cbd5e1; overflow: hidden; background: #f8fafc;">
+                            <a href="{$licImgUrl|htmlentities}" target="_blank">
+                                <img src="{$licImgUrl|htmlentities}" onerror="this.src='/assets/img/qrcode.png'" style="width: 100%; height: 100%; object-fit: cover;" />
                             </a>
                         </div>
+                        {else /}
+                        <span class="text-muted">未上传营业执照图片</span>
+                        {/if}
                     </div>
                 </div>
             </div>
         </div>
 
-        <!-- 对公账户与开票 -->
+        <!-- 对公与子账号 -->
         <div class="col-xs-12 col-sm-6">
             <div class="mer-card">
                 <div class="mer-card-header">
-                    <h4 class="mer-card-title"><i class="fa fa-credit-card"></i> 对公结算账户与发票资料</h4>
+                    <h4 class="mer-card-title"><i class="fa fa-credit-card"></i> 对公财务与增值税开票档案</h4>
                 </div>
                 <div class="mer-card-body">
                     <div class="mer-grid-list">
-                        <div class="mer-item" style="grid-column: span 2;"><span class="mer-item-k">开票抬头:</span><span class="mer-item-v">{$row.invoice_title|default=$row.company_name}</span></div>
-                        <div class="mer-item" style="grid-column: span 2;"><span class="mer-item-k">纳税人税号:</span><span class="mer-item-v"><code>{$row.invoice_tax|default=$row.credit_code}</code></span></div>
-                        <div class="mer-item"><span class="mer-item-k">开户银行:</span><span class="mer-item-v">{$row.bank_name|default='未登记'}</span></div>
-                        <div class="mer-item"><span class="mer-item-k">对公银行账号:</span><span class="mer-item-v"><code>{$row.bank_account|default='未登记'}</code></span></div>
-                        <div class="mer-item" style="grid-column: span 2;"><span class="mer-item-k">审核意见批注:</span><span class="mer-item-v">{$row.audit_msg|default='资质合规通过'}</span></div>
+                        <div class="mer-item" style="grid-column: span 2;"><span class="mer-item-k">默认发票抬头:</span><span class="mer-item-v"><strong>{$row.invoice_title|default=$row.name|htmlentities}</strong></span></div>
+                        <div class="mer-item" style="grid-column: span 2;"><span class="mer-item-k">纳税人识别号:</span><span class="mer-item-v"><code>{$row.invoice_tax_no|default=$row.license_no|htmlentities}</code></span></div>
+                        <div class="mer-item" style="grid-column: span 2;"><span class="mer-item-k">开户银行名称:</span><span class="mer-item-v">{$row.invoice_bank|default='未登记'|htmlentities}</span></div>
+                        <div class="mer-item" style="grid-column: span 2;"><span class="mer-item-k">对公银行账号:</span><span class="mer-item-v"><code>{$row.invoice_account|default='未登记'|htmlentities}</code></span></div>
                     </div>
                 </div>
             </div>
+
+            <div class="mer-card">
+                <div class="mer-card-header">
+                    <h4 class="mer-card-title"><i class="fa fa-users"></i> 企业协同员工子账号 ({:count($members)})</h4>
+                </div>
+                <div class="mer-card-body" style="padding: 12px 16px;">
+                    {if !empty($members)}
+                    <table class="table table-bordered table-condensed" style="font-size:12px; margin-bottom:0;">
+                        <thead><tr class="active"><th>用户ID</th><th>员工昵称</th><th>手机号</th><th>岗位备注</th><th>绑定时间</th></tr></thead>
+                        <tbody>
+                            {foreach name="members" item="mb"}
+                            <tr>
+                                <td>{$mb.user_id}</td>
+                                <td><strong>{$mb.nickname|default=$mb.username|default='-'|htmlentities}</strong></td>
+                                <td>{$mb.mobile|default='-'|htmlentities}</td>
+                                <td>{$mb.remark|default='协同下单员'|htmlentities}</td>
+                                <td>{$mb.createtime|datetime}</td>
+                            </tr>
+                            {/foreach}
+                        </tbody>
+                    </table>
+                    {else /}
+                    <div class="text-muted text-center" style="padding: 10px 0;">暂未添加企业员工子账号</div>
+                    {/if}
+                </div>
+            </div>
         </div>
     </div>
 
-    <!-- 历史发包工单 -->
+    <!-- 历史开票记录 -->
     <div class="mer-card">
         <div class="mer-card-header">
-            <h4 class="mer-card-title"><i class="fa fa-history"></i> 商户最近发包服务工单</h4>
+            <h4 class="mer-card-title"><i class="fa fa-file-text-o"></i> 近期开票申请记录 ({:count($invoiceList)})</h4>
         </div>
-        <div class="mer-card-body">
+        <div class="mer-card-body" style="padding: 12px 16px;">
+            {if !empty($invoiceList)}
+            <table class="table table-bordered table-condensed" style="font-size:12px; margin-bottom:0;">
+                <thead><tr class="active"><th>申请单号</th><th>发票抬头</th><th>票种</th><th>开票金额</th><th>发票号码</th><th>状态</th><th>申请时间</th></tr></thead>
+                <tbody>
+                    {foreach name="invoiceList" item="inv"}
+                    <tr>
+                        <td><code>{$inv.invoice_sn|default='-'|htmlentities}</code></td>
+                        <td>{$inv.title|htmlentities}</td>
+                        <td>{if $inv.type=='special'}<span class="label label-primary">增值税专票</span>{else/}<span class="label label-default">普通发票</span>{/if}</td>
+                        <td style="color:#ea580c;font-weight:700;">¥{$inv.amount}</td>
+                        <td><code>{$inv.invoice_no|default='-'|htmlentities}</code></td>
+                        <td>
+                            {if $inv.status=='issued'}<span class="label label-success">已开票</span>
+                            {elseif $inv.status=='reject'/}<span class="label label-danger">已驳回</span>
+                            {elseif $inv.status=='cancel'/}<span class="label label-default">已撤回</span>
+                            {else/}<span class="label label-warning">待开票</span>{/if}
+                        </td>
+                        <td>{$inv.createtime|datetime}</td>
+                    </tr>
+                    {/foreach}
+                </tbody>
+            </table>
+            {else /}
+            <div class="text-muted text-center" style="padding: 10px 0;">暂无企业开票记录</div>
+            {/if}
+        </div>
+    </div>
+
+    <!-- 历史发包工单 -->
+    <div class="mer-card" style="margin-bottom:0;">
+        <div class="mer-card-header">
+            <h4 class="mer-card-title"><i class="fa fa-history"></i> 商户近期发包工单 ({:count($recentOrders)})</h4>
+        </div>
+        <div class="mer-card-body" style="padding: 12px 16px;">
             {if !empty($recentOrders)}
-            <table class="table table-bordered table-hover" style="font-size: 12px; margin-bottom: 0;">
+            <table class="table table-bordered table-hover table-condensed" style="font-size: 12px; margin-bottom: 0;">
                 <thead>
-                    <tr class="active"><th>工单号</th><th>服务项目</th><th>客户联系人</th><th>服务地址</th><th>实付金额</th><th>状态</th><th>下单时间</th></tr>
+                    <tr class="active"><th>工单号 / 批次</th><th>服务项目</th><th>收货客户</th><th>承接师傅</th><th>实付金额</th><th>工单状态</th><th>下单时间</th></tr>
                 </thead>
                 <tbody>
                     {foreach name="recentOrders" item="o"}
                     <tr>
-                        <td><strong>{$o.order_no}</strong></td>
-                        <td>{$o.service_name}</td>
-                        <td>{$o.contact} ({$o.mobile})</td>
-                        <td>{$o.province}{$o.city}{$o.district}{$o.address}</td>
+                        <td>
+                            <code>{$o.order_no|htmlentities}</code>
+                            {if !empty($o.batch_no)}<br><small class="text-muted">批次:{$o.batch_no|htmlentities}</small>{/if}
+                        </td>
+                        <td><strong>{$o.service_name|htmlentities}</strong></td>
+                        <td>{$o.contact|htmlentities} ({$o.mobile|htmlentities})</td>
+                        <td>{$o.master_name|default='待指派'|htmlentities}</td>
                         <td style="color:#ea580c; font-weight:700;">¥{$o.pay_amount}</td>
-                        <td><span class="label label-info">{$o.status}</span></td>
+                        <td><span class="label {if $o.status==8}label-success{elseif $o.status==9/}label-default{else/}label-primary{/if}">{$o.status_label|htmlentities}</span></td>
                         <td>{$o.createtime|datetime}</td>
                     </tr>
                     {/foreach}
                 </tbody>
             </table>
-            {else}
-            <div style="text-align: center; color: #94a3b8; padding: 20px 0;">暂无发包记录</div>
+            {else /}
+            <div style="text-align: center; color: #94a3b8; padding: 16px 0;">暂无发包服务工单</div>
             {/if}
         </div>
     </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="button" class="btn btn-primary btn-embossed" onclick="parent.Layer.closeAll();"><i class="fa fa-check"></i> 关闭看板</button>
+        </div>
+    </div>
 </div>
diff --git a/server/application/admin/view/merchant/edit.html b/server/application/admin/view/merchant/edit.html
index e8531c8..d9c9cfa 100644
--- a/server/application/admin/view/merchant/edit.html
+++ b/server/application/admin/view/merchant/edit.html
@@ -149,26 +149,6 @@
                     <input id="c-audit_msg" class="form-control" name="row[audit_msg]" type="text" value="{$row.audit_msg|htmlentities}" placeholder="审核驳回或异常时在此处注明原因">
                 </div>
             </div>
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">商户业务累计:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">累计发单</span>
-                                <input id="c-order_count" data-rule="required" class="form-control" name="row[order_count]" type="number" value="{$row.order_count|htmlentities}">
-                                <span class="input-group-addon">单</span>
-                            </div>
-                        </div>
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">消费总额 ¥</span>
-                                <input id="c-total_amount" data-rule="required" class="form-control" step="0.01" name="row[total_amount]" type="number" value="{$row.total_amount|htmlentities}">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
         </div>
     </div>
 
diff --git a/server/application/admin/view/merchant/index.html b/server/application/admin/view/merchant/index.html
index 364fffb..550890f 100644
--- a/server/application/admin/view/merchant/index.html
+++ b/server/application/admin/view/merchant/index.html
@@ -2,10 +2,10 @@
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="verify_status">
-            <li class="active"><a href="#t-all" data-value="" data-toggle="tab">全部商家</a></li>
-            <li><a href="#t-pending" data-value="pending" data-toggle="tab"><i class="fa fa-clock-o text-warning"></i> 企业资质待审</a></li>
-            <li><a href="#t-pass" data-value="pass" data-toggle="tab"><i class="fa fa-check-circle text-success"></i> 认证通过</a></li>
-            <li><a href="#t-reject" data-value="reject" data-toggle="tab"><i class="fa fa-times-circle text-danger"></i> 已驳回</a></li>
+            <li class="{:$Think.get.verify_status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">全部商家</a></li>
+            <li class="{:$Think.get.verify_status === 'pending' ? 'active' : ''}"><a href="#t-pending" data-value="pending" data-toggle="tab"><i class="fa fa-clock-o text-warning"></i> 企业资质待审</a></li>
+            <li class="{:$Think.get.verify_status === 'pass' ? 'active' : ''}"><a href="#t-pass" data-value="pass" data-toggle="tab"><i class="fa fa-check-circle text-success"></i> 认证通过</a></li>
+            <li class="{:$Think.get.verify_status === 'reject' ? 'active' : ''}"><a href="#t-reject" data-value="reject" data-toggle="tab"><i class="fa fa-times-circle text-danger"></i> 已驳回</a></li>
         </ul>
     </div>
 
@@ -20,6 +20,7 @@
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('merchant/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('merchant/detail')}"
                            data-operate-edit="{:$auth->check('merchant/edit')}"
                            data-operate-del="{:$auth->check('merchant/del')}"
                            width="100%">
diff --git a/server/application/admin/view/message/add.html b/server/application/admin/view/message/add.html
index aea13c6..553fcd9 100644
--- a/server/application/admin/view/message/add.html
+++ b/server/application/admin/view/message/add.html
@@ -3,7 +3,7 @@
     <!-- 1. 目标受众与通知类型 -->
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-paper-plane-o"></i> 接收目标与通知类型</h4>
+            <h4 class="panel-title"><i class="fa fa-paper-plane-o"></i> 接收目标与通知分类</h4>
         </div>
         <div class="panel-body">
             <div class="row">
@@ -23,7 +23,12 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Receive_id')}:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-receive_id" data-rule="required" min="0" data-source="receive/index" class="form-control selectpage" name="row[receive_id]" type="text" value="" placeholder="请选择接收人员">
+                            <div id="box-receive-user">
+                                <input id="c-receive_user_id" data-source="user/user/index" data-field="nickname" data-multiple="true" class="form-control selectpage" name="row[receive_user_id]" type="text" value="" placeholder="选择接收业主（支持多选）">
+                            </div>
+                            <div id="box-receive-master" style="display:none;">
+                                <input id="c-receive_master_id" data-source="master/index" data-field="realname" data-multiple="true" class="form-control selectpage" name="row[receive_master_id]" type="text" value="" placeholder="选择接收师傅（支持多选）">
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -46,7 +51,7 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Order_id')}:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-order_id" min="0" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="" placeholder="可留空或关联工单">
+                            <input id="c-order_id" min="0" data-source="order/index" data-field="order_no" class="form-control selectpage" name="row[order_id]" type="text" value="" placeholder="选填：关联业务工单号">
                         </div>
                     </div>
                 </div>
@@ -63,14 +68,14 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
                 <div class="col-xs-12 col-sm-10">
-                    <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="" placeholder="输入通知主标题">
+                    <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="" placeholder="输入站内信通知标题">
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
                 <div class="col-xs-12 col-sm-10">
-                    <textarea id="c-content" data-rule="required" class="form-control" rows="3" name="row[content]" placeholder="通知完整正文详情"></textarea>
+                    <textarea id="c-content" data-rule="required" class="form-control" rows="4" name="row[content]" placeholder="请输入通知完整正文内容"></textarea>
                 </div>
             </div>
 
@@ -78,7 +83,7 @@
                 <label class="control-label col-xs-12 col-sm-2">{:__('Is_read')}:</label>
                 <div class="col-xs-12 col-sm-10">
                     <div class="radio">
-                        <label><input type="radio" name="row[is_read]" value="0" checked> {:__('Read_no')}</label>
+                        <label style="margin-right:16px;"><input type="radio" name="row[is_read]" value="0" checked> {:__('Read_no')}</label>
                         <label><input type="radio" name="row[is_read]" value="1"> {:__('Read_yes')}</label>
                     </div>
                 </div>
diff --git a/server/application/admin/view/message/detail.html b/server/application/admin/view/message/detail.html
new file mode 100644
index 0000000..068f766
--- /dev/null
+++ b/server/application/admin/view/message/detail.html
@@ -0,0 +1,41 @@
+<div style="padding:14px 16px;">
+    <div class="panel panel-default" style="margin-bottom:0;">
+        <div class="panel-heading">
+            <strong><i class="fa fa-bell-o text-primary"></i> {$row.title|htmlentities}</strong>
+            <span class="pull-right label {if $row.is_read}label-success{else/}label-warning{/if}">{if $row.is_read}已读{else/}未读{/if}</span>
+        </div>
+        <div class="panel-body">
+            <div class="row" style="margin-bottom:10px;line-height:1.8;">
+                <div class="col-sm-6">
+                    <span class="text-muted">接收端类型：</span>
+                    <span class="label {if $row.receive_type=='master'}label-warning{else/}label-info{/if}">{$receiveTypeList[$row.receive_type]|default=$row.receive_type}</span>
+                </div>
+                <div class="col-sm-6">
+                    <span class="text-muted">消息分类：</span>
+                    <span class="label label-default">{$typeList[$row.type]|default=$row.type}</span>
+                </div>
+                <div class="col-sm-6">
+                    <span class="text-muted">接收人信息：</span>
+                    {if !empty($receiver)}
+                    <strong>{$receiver.name|htmlentities}</strong>{if !empty($receiver.mobile)}（{$receiver.mobile|htmlentities}）{/if}
+                    {else/}
+                    ID: {$row.receive_id}
+                    {/if}
+                </div>
+                <div class="col-sm-6">
+                    <span class="text-muted">发送时间：</span>
+                    {:date('Y-m-d H:i:s', $row.createtime)}
+                </div>
+                {if !empty($order)}
+                <div class="col-sm-12">
+                    <span class="text-muted">关联工单：</span>
+                    <code>{$order.order_no|htmlentities}</code> · {$order.service_name|default='-'|htmlentities}（¥{$order.pay_amount|default='0.00'|htmlentities}）
+                </div>
+                {/if}
+            </div>
+            <div class="well well-sm" style="margin-bottom:0;background:#f9fafb;line-height:1.7;">
+                {$row.content|htmlentities}
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/message/edit.html b/server/application/admin/view/message/edit.html
index f4113da..39a6c35 100644
--- a/server/application/admin/view/message/edit.html
+++ b/server/application/admin/view/message/edit.html
@@ -3,7 +3,7 @@
     <!-- 1. 目标受众与通知类型 -->
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-paper-plane-o"></i> 接收目标与通知类型</h4>
+            <h4 class="panel-title"><i class="fa fa-paper-plane-o"></i> 接收目标与通知分类</h4>
         </div>
         <div class="panel-body">
             <div class="row">
@@ -23,7 +23,12 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Receive_id')}:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-receive_id" data-rule="required" min="0" data-source="receive/index" class="form-control selectpage" name="row[receive_id]" type="text" value="{$row.receive_id|htmlentities}">
+                            <div id="box-receive-user" style="{if $row.receive_type=='master'}display:none;{/if}">
+                                <input id="c-receive_user_id" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[receive_user_id]" type="text" value="{if $row.receive_type!='master'}{$row.receive_id|htmlentities}{/if}">
+                            </div>
+                            <div id="box-receive-master" style="{if $row.receive_type!='master'}display:none;{/if}">
+                                <input id="c-receive_master_id" data-source="master/index" data-field="realname" class="form-control selectpage" name="row[receive_master_id]" type="text" value="{if $row.receive_type=='master'}{$row.receive_id|htmlentities}{/if}">
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -46,7 +51,7 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Order_id')}:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-order_id" min="0" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="{$row.order_id|htmlentities}">
+                            <input id="c-order_id" min="0" data-source="order/index" data-field="order_no" class="form-control selectpage" name="row[order_id]" type="text" value="{:$row.order_id ? $row.order_id : ''}" placeholder="未关联工单">
                         </div>
                     </div>
                 </div>
@@ -70,7 +75,7 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
                 <div class="col-xs-12 col-sm-10">
-                    <textarea id="c-content" data-rule="required" class="form-control" rows="3" name="row[content]">{$row.content|htmlentities}</textarea>
+                    <textarea id="c-content" data-rule="required" class="form-control" rows="4" name="row[content]">{$row.content|htmlentities}</textarea>
                 </div>
             </div>
 
@@ -78,7 +83,7 @@
                 <label class="control-label col-xs-12 col-sm-2">{:__('Is_read')}:</label>
                 <div class="col-xs-12 col-sm-10">
                     <div class="radio">
-                        <label><input type="radio" name="row[is_read]" value="0" {if $row.is_read==0}checked{/if}> {:__('Read_no')}</label>
+                        <label style="margin-right:16px;"><input type="radio" name="row[is_read]" value="0" {if $row.is_read==0}checked{/if}> {:__('Read_no')}</label>
                         <label><input type="radio" name="row[is_read]" value="1" {if $row.is_read==1}checked{/if}> {:__('Read_yes')}</label>
                     </div>
                 </div>
diff --git a/server/application/admin/view/message/index.html b/server/application/admin/view/message/index.html
index 5b18eb1..1a6d804 100644
--- a/server/application/admin/view/message/index.html
+++ b/server/application/admin/view/message/index.html
@@ -1,29 +1,31 @@
 <div class="panel panel-default panel-intro">
-    {:build_heading()}
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="type">
+            <li class="{:$Think.get.type === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="typeList" item="vo"}
+            <li class="{:$Think.get.type === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
 
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('message/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('message/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('message/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
-
-                        
-
-                        
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('message/add')?'':'hide'}" title="下发通知"><i class="fa fa-paper-plane-o"></i> 下发通知</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('message/del')?'':'hide'}" title="{:__('Delete')}"><i class="fa fa-trash"></i> {:__('Delete')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('message/detail')}"
                            data-operate-edit="{:$auth->check('message/edit')}"
                            data-operate-del="{:$auth->check('message/del')}"
                            width="100%">
                     </table>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
diff --git a/server/application/admin/view/order/add.html b/server/application/admin/view/order/add.html
index 849f529..e890fc4 100644
--- a/server/application/admin/view/order/add.html
+++ b/server/application/admin/view/order/add.html
@@ -47,7 +47,7 @@
                 <label class="control-label col-xs-12 col-sm-2">{:__('Service_image')}:</label>
                 <div class="col-xs-12 col-sm-8">
                     <div class="input-group">
-                        <input id="c-service_image" data-rule="required" class="form-control" size="50" name="row[service_image]" type="text" value="" placeholder="服务展示图片">
+                        <input id="c-service_image" class="form-control" size="50" name="row[service_image]" type="text" value="" placeholder="服务展示图片">
                         <div class="input-group-addon no-border no-padding">
                             <span><button type="button" id="faupload-service_image" class="btn btn-danger faupload" data-category="service" data-input-id="c-service_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-service_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                             <span><button type="button" id="fachoose-service_image" class="btn btn-primary fachoose" data-input-id="c-service_image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -139,7 +139,7 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <div class='control-relative'><input id="c-city" data-rule="required" class="form-control" data-toggle="city-picker" name="row[city]" type="text" value="" placeholder="请选择服务常驻城市"></div>
+                    <div class='control-relative'><input id="c-city" class="form-control" data-toggle="city-picker" name="row[city]" type="text" value="" placeholder="请选择服务常驻城市"></div>
                 </div>
             </div>
             <div class="form-group">
@@ -155,13 +155,13 @@
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">经度</span>
-                                <input id="c-lng" data-rule="required" class="form-control" name="row[lng]" type="text" value="" placeholder="如: 106.927231">
+                                <input id="c-lng" class="form-control" name="row[lng]" type="text" value="" placeholder="如: 106.927231">
                             </div>
                         </div>
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">纬度</span>
-                                <input id="c-lat" data-rule="required" class="form-control" name="row[lat]" type="text" value="" placeholder="如: 27.725654">
+                                <input id="c-lat" class="form-control" name="row[lat]" type="text" value="" placeholder="如: 27.725654">
                             </div>
                         </div>
                     </div>
diff --git a/server/application/admin/view/order/detail.html b/server/application/admin/view/order/detail.html
index 073bf97..3bf4f81 100644
--- a/server/application/admin/view/order/detail.html
+++ b/server/application/admin/view/order/detail.html
@@ -1,51 +1,45 @@
 <style>
     .order-detail-container { padding: 5px 10px; font-size: 13px; color: #334155; }
-    
-    /* 顶部 Hero 状态看板 */
     .od-hero {
         background: linear-gradient(135deg, #fff7ed 0%, #ffedd5 100%);
         border: 1px solid #fed7aa;
         border-radius: 12px;
-        padding: 20px 24px;
-        margin-bottom: 20px;
+        padding: 18px 22px;
+        margin-bottom: 16px;
         display: flex;
         align-items: center;
         justify-content: space-between;
-        box-shadow: 0 4px 15px -3px rgba(249, 115, 22, 0.1);
+        gap: 16px;
+        flex-wrap: wrap;
+        box-shadow: 0 4px 15px -3px rgba(249, 115, 22, 0.08);
     }
-    .od-hero-left .od-no-wrap { display: flex; align-items: center; gap: 12px; margin-bottom: 6px; }
-    .od-order-no { font-size: 20px; font-weight: 700; color: #9a3412; letter-spacing: 0.5px; }
+    .od-hero-left .od-no-wrap { display: flex; align-items: center; gap: 10px; margin-bottom: 6px; flex-wrap: wrap; }
+    .od-order-no { font-size: 19px; font-weight: 700; color: #9a3412; font-family: monospace; }
     .od-status-badge {
-        padding: 4px 12px;
+        padding: 3px 12px;
         border-radius: 20px;
         font-size: 12px;
         font-weight: 600;
         background: #ea580c;
         color: #fff;
-        box-shadow: 0 2px 6px rgba(234, 88, 12, 0.35);
     }
-    .od-hero-sub { color: #c2410c; font-size: 13px; }
-    
-    .od-hero-right { display: flex; align-items: center; gap: 24px; text-align: right; }
+    .od-status-badge.is-cancel { background: #64748b; }
+    .od-status-badge.is-aftersale { background: #dc2626; }
+    .od-status-badge.is-done { background: #16a34a; }
+    .od-hero-sub { color: #9a3412; font-size: 12.5px; }
+    .od-hero-right { display: flex; align-items: center; gap: 20px; text-align: right; }
     .od-price-box .od-price-label { font-size: 12px; color: #9a3412; margin-bottom: 2px; }
-    .od-price-box .od-price-val { font-size: 28px; font-weight: 800; color: #ea580c; font-family: 'DIN Alternate', sans-serif; line-height: 1; }
-    .od-verify-pill {
-        background: #ffffff;
-        border: 1px dashed #f97316;
-        border-radius: 8px;
-        padding: 8px 16px;
-        text-align: center;
-    }
+    .od-price-box .od-price-val { font-size: 26px; font-weight: 800; color: #ea580c; line-height: 1; font-variant-numeric: tabular-nums; }
+    .od-verify-pill { background: #ffffff; border: 1px dashed #f97316; border-radius: 8px; padding: 6px 14px; text-align: center; }
     .od-verify-pill .v-label { font-size: 11px; color: #64748b; margin-bottom: 2px; }
-    .od-verify-pill .v-code { font-size: 18px; font-weight: 700; color: #0f172a; letter-spacing: 2px; }
+    .od-verify-pill .v-code { font-size: 16px; font-weight: 700; color: #0f172a; letter-spacing: 2px; font-family: monospace; }
 
-    /* 步进条 */
     .od-step-bar {
         background: #ffffff;
         border: 1px solid #e2e8f0;
         border-radius: 10px;
-        padding: 16px 20px;
-        margin-bottom: 20px;
+        padding: 14px 20px;
+        margin-bottom: 16px;
         display: flex;
         justify-content: space-between;
         position: relative;
@@ -53,14 +47,14 @@
     .od-step-bar::before {
         content: '';
         position: absolute;
-        top: 28px;
+        top: 26px;
         left: 50px;
         right: 50px;
         height: 2px;
         background: #f1f5f9;
         z-index: 1;
     }
-    .od-step-item { position: relative; z-index: 2; text-align: center; min-width: 70px; }
+    .od-step-item { position: relative; z-index: 2; text-align: center; min-width: 72px; }
     .od-step-dot {
         width: 26px;
         height: 26px;
@@ -71,105 +65,48 @@
         align-items: center;
         justify-content: center;
         font-size: 12px;
-        margin-bottom: 6px;
+        margin-bottom: 5px;
         font-weight: 600;
-        transition: all 0.3s;
-    }
-    .od-step-item.active .od-step-dot {
-        background: #ea580c;
-        color: #fff;
-        box-shadow: 0 0 0 4px rgba(234, 88, 12, 0.2);
-    }
-    .od-step-item.passed .od-step-dot {
-        background: #10b981;
-        color: #fff;
     }
+    .od-step-item.active .od-step-dot { background: #ea580c; color: #fff; box-shadow: 0 0 0 4px rgba(234, 88, 12, 0.2); }
+    .od-step-item.passed .od-step-dot { background: #10b981; color: #fff; }
     .od-step-name { font-size: 12px; font-weight: 500; color: #475569; }
     .od-step-item.active .od-step-name { color: #ea580c; font-weight: 700; }
 
-    /* 卡片体系 */
     .od-card {
         background: #ffffff;
         border: 1px solid #e2e8f0;
         border-radius: 10px;
-        margin-bottom: 20px;
-        box-shadow: 0 2px 8px -2px rgba(15, 23, 42, 0.05);
+        margin-bottom: 16px;
         overflow: hidden;
     }
     .od-card-header {
-        padding: 12px 18px;
+        padding: 10px 16px;
         background: #f8fafc;
         border-bottom: 1px solid #e2e8f0;
         display: flex;
         align-items: center;
         justify-content: space-between;
     }
-    .od-card-title {
-        font-size: 14px;
-        font-weight: 600;
-        color: #1e293b;
-        margin: 0;
-        display: flex;
-        align-items: center;
-        gap: 8px;
-    }
+    .od-card-title { font-size: 13.5px; font-weight: 700; color: #1e293b; margin: 0; display: flex; align-items: center; gap: 8px; }
     .od-card-title i { color: #f97316; }
-    .od-card-body { padding: 18px; }
+    .od-card-body { padding: 16px; }
 
-    /* 数据列表项 */
-    .od-grid-list { display: grid; grid-template-columns: repeat(2, 1fr); gap: 12px 20px; }
+    .od-grid-list { display: grid; grid-template-columns: repeat(2, 1fr); gap: 10px 18px; }
     .od-item { display: flex; align-items: baseline; font-size: 13px; line-height: 1.5; }
-    .od-item-k { min-width: 85px; color: #64748b; font-weight: 400; flex-shrink: 0; }
+    .od-item-k { min-width: 84px; color: #64748b; flex-shrink: 0; }
     .od-item-v { color: #0f172a; font-weight: 500; word-break: break-all; }
 
-    /* 图片预览画廊 */
     .od-gallery-grid { display: flex; flex-wrap: wrap; gap: 12px; }
-    .od-gallery-item {
-        position: relative;
-        width: 110px;
-        height: 110px;
-        border-radius: 8px;
-        overflow: hidden;
-        border: 1px solid #e2e8f0;
-        background: #f8fafc;
-    }
-    .od-gallery-item img {
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-        cursor: pointer;
-        transition: transform 0.2s;
-    }
-    .od-gallery-item img:hover { transform: scale(1.05); }
-    .od-gallery-tag {
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background: rgba(15, 23, 42, 0.7);
-        color: #fff;
-        font-size: 10px;
-        text-align: center;
-        padding: 2px 4px;
-    }
+    .od-gallery-item { position: relative; width: 108px; height: 108px; border-radius: 8px; overflow: hidden; border: 1px solid #e2e8f0; background: #f8fafc; }
+    .od-gallery-item img { width: 100%; height: 100%; object-fit: cover; cursor: pointer; }
+    .od-gallery-tag { position: absolute; bottom: 0; left: 0; right: 0; background: rgba(15, 23, 42, 0.72); color: #fff; font-size: 11px; text-align: center; padding: 2px 4px; }
 
-    /* 时间轴日志 */
-    .od-timeline { position: relative; padding-left: 20px; border-left: 2px solid #e2e8f0; margin-left: 10px; margin-top: 10px; }
-    .od-tl-item { position: relative; margin-bottom: 18px; }
+    .od-timeline { position: relative; padding-left: 20px; border-left: 2px solid #e2e8f0; margin-left: 10px; margin-top: 6px; }
+    .od-tl-item { position: relative; margin-bottom: 14px; }
     .od-tl-item:last-child { margin-bottom: 0; }
-    .od-tl-item::before {
-        content: '';
-        position: absolute;
-        left: -26px;
-        top: 4px;
-        width: 10px;
-        height: 10px;
-        border-radius: 50%;
-        background: #ea580c;
-        border: 2px solid #fff;
-        box-shadow: 0 0 0 2px #ea580c;
-    }
-    .od-tl-time { font-size: 12px; color: #94a3b8; margin-bottom: 2px; }
+    .od-tl-item::before { content: ''; position: absolute; left: -26px; top: 4px; width: 10px; height: 10px; border-radius: 50%; background: #ea580c; border: 2px solid #fff; box-shadow: 0 0 0 2px #ea580c; }
+    .od-tl-time { font-size: 12px; color: #94a3b8; }
     .od-tl-title { font-size: 13px; font-weight: 600; color: #1e293b; }
     .od-tl-desc { font-size: 12px; color: #64748b; margin-top: 2px; }
 </style>
@@ -179,22 +116,23 @@
     <div class="od-hero">
         <div class="od-hero-left">
             <div class="od-no-wrap">
-                <span class="od-order-no"><i class="fa fa-file-text-o"></i> {$row.order_no}</span>
-                <span class="od-status-badge">{$row.status_text}</span>
-                {if $row.urgent}<span class="label label-danger"><i class="fa fa-bolt"></i> 加急订单</span>{/if}
+                <span class="od-order-no"><i class="fa fa-file-text-o"></i> {$row.order_no|htmlentities}</span>
+                <span class="od-status-badge {if $row.status==9}is-cancel{elseif $row.status==10/}is-aftersale{elseif $row.status==8/}is-done{/if}">{$row.status_text}</span>
+                {if $row.urgent}<span class="label label-danger"><i class="fa fa-bolt"></i> 加急工单</span>{/if}
+                {if !empty($merchantOrder)}<span class="label label-primary"><i class="fa fa-building-o"></i> 企业工单：{$merchantOrder.merchant_name|htmlentities}</span>{/if}
             </div>
             <div class="od-hero-sub">
-                <span>下单用户: <strong>{$row.user.username|default='匿名用户'}</strong></span>
+                <span>下单客户: <strong>{$row.user.nickname|default=$row.user.username|default='微信用户'|htmlentities}</strong>{if !empty($row.user.mobile)} ({$row.user.mobile|htmlentities}){/if}</span>
                 <span style="margin: 0 8px;">|</span>
-                <span>创建时间: {$row.createtime|datetime}</span>
+                <span>下单时间: {$row.createtime|datetime}</span>
                 <span style="margin: 0 8px;">|</span>
-                <span>计价模式: {$row.price_type_text}</span>
+                <span>计价模式: {$row.price_type_text|default='一口价'}</span>
             </div>
         </div>
         <div class="od-hero-right">
             <div class="od-verify-pill">
-                <div class="v-label">服务完工核销码</div>
-                <div class="v-code">{$row.verify_code|default='已核销'}</div>
+                <div class="v-label">完工核销码</div>
+                <div class="v-code">{$row.verify_code|default='--'}</div>
             </div>
             <div class="od-price-box">
                 <div class="od-price-label">订单实付金额</div>
@@ -203,69 +141,107 @@
         </div>
     </div>
 
-    <!-- 2. 履约步进时间轴 -->
+    <!-- 2. 履约步进状态条（精确兼容取消单与售后单） -->
+    {if $row.status == 9}
+    <div class="alert alert-warning" style="border-radius:10px; margin-bottom:16px;">
+        <i class="fa fa-ban"></i> <strong>该工单已取消终止</strong>
+        {if !empty($row.cancel_reason)} · 取消原因：{$row.cancel_reason|htmlentities}{/if}
+        {if $row.refund_amount > 0} · 已原路退款：<strong>¥{$row.refund_amount}</strong>{/if}
+    </div>
+    {elseif $row.status == 10 /}
+    <div class="alert alert-danger" style="border-radius:10px; margin-bottom:16px;">
+        <i class="fa fa-exclamation-triangle"></i> <strong>该工单当前处于售后争议处理中</strong>，请结合下方现场照片与申诉记录协同处置。
+    </div>
+    {else /}
     <div class="od-step-bar">
-        <div class="od-step-item {if $row.status >= 0}passed{/if} {if $row.status == 0}active{/if}">
-            <div class="od-step-dot">{if $row.status > 0}<i class="fa fa-check"></i>{else}1{/if}</div>
-            <div class="od-step-name">客户下单</div>
+        <div class="od-step-item {if $row.status > 0}passed{elseif $row.status == 0/}active{/if}">
+            <div class="od-step-dot">{if $row.status > 0}<i class="fa fa-check"></i>{else/}1{/if}</div>
+            <div class="od-step-name">{if $row.status == 2}报价中{elseif $row.status == 1/}待接单{else/}客户下单{/if}</div>
         </div>
-        <div class="od-step-item {if $row.status >= 3}passed{/if} {if $row.status == 3}active{/if}">
-            <div class="od-step-dot">{if $row.status > 3}<i class="fa fa-check"></i>{else}2{/if}</div>
-            <div class="od-step-name">师傅接单</div>
+        <div class="od-step-item {if $row.status > 4}passed{elseif $row.status == 3 || $row.status == 4/}active{/if}">
+            <div class="od-step-dot">{if $row.status > 4}<i class="fa fa-check"></i>{else/}2{/if}</div>
+            <div class="od-step-name">师傅接单/待上门</div>
         </div>
-        <div class="od-step-item {if $row.status >= 5}passed{/if} {if $row.status == 5}active{/if}">
-            <div class="od-step-dot">{if $row.status > 5}<i class="fa fa-check"></i>{else}3{/if}</div>
+        <div class="od-step-item {if $row.status > 5}passed{elseif $row.status == 5/}active{/if}">
+            <div class="od-step-dot">{if $row.status > 5}<i class="fa fa-check"></i>{else/}3{/if}</div>
             <div class="od-step-name">上门签到</div>
         </div>
-        <div class="od-step-item {if $row.status >= 6}passed{/if} {if $row.status == 6}active{/if}">
-            <div class="od-step-dot">{if $row.status > 6}<i class="fa fa-check"></i>{else}4{/if}</div>
-            <div class="od-step-name">施工中</div>
+        <div class="od-step-item {if $row.status > 6}passed{elseif $row.status == 6/}active{/if}">
+            <div class="od-step-dot">{if $row.status > 6}<i class="fa fa-check"></i>{else/}4{/if}</div>
+            <div class="od-step-name">施工服务中</div>
         </div>
-        <div class="od-step-item {if $row.status >= 7}passed{/if} {if $row.status == 7}active{/if}">
-            <div class="od-step-dot">{if $row.status > 7}<i class="fa fa-check"></i>{else}5{/if}</div>
+        <div class="od-step-item {if $row.status > 7}passed{elseif $row.status == 7/}active{/if}">
+            <div class="od-step-dot">{if $row.status > 7}<i class="fa fa-check"></i>{else/}5{/if}</div>
             <div class="od-step-name">待核销验收</div>
         </div>
         <div class="od-step-item {if $row.status == 8}passed active{/if}">
-            <div class="od-step-dot">{if $row.status == 8}<i class="fa fa-check"></i>{else}6{/if}</div>
+            <div class="od-step-dot">{if $row.status == 8}<i class="fa fa-check"></i>{else/}6{/if}</div>
             <div class="od-step-name">已完成结算</div>
         </div>
     </div>
+    {/if}
 
-    <!-- 3. 主体四大卡片 -->
+    <!-- 3. 主体卡片区 -->
     <div class="row">
-        <!-- 卡片 A: 工项与上门信息 -->
+        <!-- 卡片 A: 工项、物流与上门信息 -->
         <div class="col-xs-12 col-sm-6">
             <div class="od-card">
                 <div class="od-card-header">
-                    <h4 class="od-card-title"><i class="fa fa-wrench"></i> 服务项目与上门地址</h4>
+                    <h4 class="od-card-title"><i class="fa fa-wrench"></i> 服务项目、到货物流与上门地址</h4>
                 </div>
                 <div class="od-card-body">
                     <div class="od-grid-list">
-                        <div class="od-item"><span class="od-item-k">服务名称:</span><span class="od-item-v">{$row.service_name}</span></div>
-                        <div class="od-item"><span class="od-item-k">预约上门:</span><span class="od-item-v" style="color:#ea580c; font-weight:700;">{$row.appoint_time|datetime}</span></div>
-                        <div class="od-item"><span class="od-item-k">联系姓名:</span><span class="od-item-v">{$row.contact}</span></div>
-                        <div class="od-item"><span class="od-item-k">联系电话:</span><span class="od-item-v">{$row.mobile}</span></div>
-                        <div class="od-item" style="grid-column: span 2;"><span class="od-item-k">详细地址:</span><span class="od-item-v">{$row.province}{$row.city}{$row.district}{$row.address}</span></div>
-                        <div class="od-item"><span class="od-item-k">楼层信息:</span><span class="od-item-v">{$row.floor} 层 · {if $row.has_elevator}有电梯{else}无电梯(步梯){/if}</span></div>
-                        <div class="od-item"><span class="od-item-k">施工型号:</span><span class="od-item-v">{$row.goods_model|default='标准通用款'} × {$row.goods_num}</span></div>
-                        {if $row.remark}
-                        <div class="od-item" style="grid-column: span 2;"><span class="od-item-k">客户备注:</span><span class="od-item-v" style="color:#d97706;">{$row.remark}</span></div>
+                        <div class="od-item"><span class="od-item-k">服务名称:</span><span class="od-item-v"><strong>{$row.service_name|htmlentities}</strong></span></div>
+                        <div class="od-item">
+                            <span class="od-item-k">预约上门:</span>
+                            <span class="od-item-v" style="color:#ea580c; font-weight:700;">
+                                {if $row.appoint_time > 0}{$row.appoint_time|datetime}{else/}未指定（尽快上门）{/if}
+                            </span>
+                        </div>
+                        <div class="od-item"><span class="od-item-k">现场联系人:</span><span class="od-item-v">{$row.contact|htmlentities}</span></div>
+                        <div class="od-item"><span class="od-item-k">联系电话:</span><span class="od-item-v"><strong>{$row.mobile|htmlentities}</strong></span></div>
+                        <div class="od-item" style="grid-column: span 2;"><span class="od-item-k">上门地址:</span><span class="od-item-v">{$row.province|htmlentities}{$row.city|htmlentities}{$row.district|htmlentities}{$row.address|htmlentities}</span></div>
+                        <div class="od-item"><span class="od-item-k">楼层电梯:</span><span class="od-item-v">{$row.floor} 层 · {if $row.has_elevator}有电梯{else/}无电梯(步梯){/if}</span></div>
+                        <div class="od-item"><span class="od-item-k">施工规格:</span><span class="od-item-v">{$row.goods_model|default='标准通用款'|htmlentities} × {$row.goods_num}</span></div>
+                        <div class="od-item">
+                            <span class="od-item-k">货品到货:</span>
+                            <span class="od-item-v">
+                                {if $row.goods_arrived == 1}<span class="label label-success">已到货可装</span>{else/}<span class="label label-default">物流在途/未登记</span>{/if}
+                            </span>
+                        </div>
+                        <div class="od-item">
+                            <span class="od-item-k">物流单号:</span>
+                            <span class="od-item-v">
+                                {if !empty($row.express_no)}{$row.express_company|default='物流'|htmlentities} <code>{$row.express_no|htmlentities}</code>{else/}<span class="text-muted">无</span>{/if}
+                            </span>
+                        </div>
+                        {if !empty($merchantOrder)}
+                        <div class="od-item" style="grid-column: span 2;">
+                            <span class="od-item-k">发包商户:</span>
+                            <span class="od-item-v">
+                                {$merchantOrder.merchant_name|htmlentities}（对接人：{$merchantOrder.merchant_contact|htmlentities} {$merchantOrder.merchant_mobile|htmlentities}）
+                                {if !empty($merchantOrder.batch_no)} · 批次 <code>{$merchantOrder.batch_no|htmlentities}</code>{/if}
+                                {if !empty($row.source_order_no)} · 外部单号 <code>{$row.source_order_no|htmlentities}</code>{/if}
+                            </span>
+                        </div>
+                        {/if}
+                        {if !empty($row.remark)}
+                        <div class="od-item" style="grid-column: span 2;"><span class="od-item-k">客户备注:</span><span class="od-item-v" style="color:#d97706;">{$row.remark|htmlentities}</span></div>
                         {/if}
                     </div>
 
-                    <!-- 多商品工项组合列表 -->
                     {if !empty($goodsList)}
-                    <div style="margin-top: 15px; border-top: 1px dashed #e2e8f0; padding-top: 12px;">
-                        <div style="font-size: 12px; font-weight: 600; color: #475569; margin-bottom: 8px;">包含商品及服务明细：</div>
+                    <div style="margin-top: 14px; border-top: 1px dashed #e2e8f0; padding-top: 12px;">
+                        <div style="font-size: 12px; font-weight: 600; color: #475569; margin-bottom: 8px;">多商品及增项服务清单：</div>
                         <table class="table table-bordered table-condensed" style="margin-bottom: 0; font-size: 12px;">
                             <thead><tr class="active"><th>商品名称</th><th>规格型号</th><th>数量</th><th>加选增项</th><th>单价</th></tr></thead>
                             <tbody>
                                 {foreach name="goodsList" item="g"}
                                 <tr>
-                                    <td><strong>{$g.goods_name}</strong></td>
-                                    <td>{$g.goods_model|default='-'}</td>
+                                    <td><strong>{$g.goods_name|default='-'|htmlentities}</strong></td>
+                                    <td>{$g.goods_model|default='-'|htmlentities}</td>
                                     <td>{$g.goods_num}</td>
-                                    <td>{$g.addon_services|default='无'}</td>
+                                    <td>{$g.addon_services|default='无'|htmlentities}</td>
                                     <td>¥{$g.base_price}</td>
                                 </tr>
                                 {/foreach}
@@ -281,105 +257,181 @@
         <div class="col-xs-12 col-sm-6">
             <div class="od-card">
                 <div class="od-card-header">
-                    <h4 class="od-card-title"><i class="fa fa-user-circle"></i> 接单师傅与履约核销</h4>
+                    <h4 class="od-card-title"><i class="fa fa-user-circle"></i> 承接师傅与关键履约时间轴</h4>
                 </div>
                 <div class="od-card-body">
                     {if $row.master_id && $row.master}
-                    <div style="display:flex; align-items:center; gap:16px; margin-bottom: 16px; padding-bottom: 14px; border-bottom: 1px solid #f1f5f9;">
-                        <img src="{$row.master.avatar|default='/assets/img/avatar.png'}" style="width: 50px; height: 50px; border-radius: 50%; object-fit: cover; border: 2px solid #fed7aa;" />
+                    <div style="display:flex; align-items:center; gap:14px; margin-bottom: 14px; padding-bottom: 12px; border-bottom: 1px solid #f1f5f9;">
+                        <img src="{$row.master.avatar|default='/assets/img/avatar.png'|htmlentities}" onerror="this.src='/assets/img/avatar.png'" style="width: 48px; height: 48px; border-radius: 50%; object-fit: cover; border: 2px solid #fed7aa;" />
                         <div>
-                            <div style="font-size: 16px; font-weight: 700; color: #1e293b;">
-                                {$row.master.realname} 
-                                <span class="badge" style="background:#ea580c; font-weight:normal; margin-left:6px;">评分 {$row.master.score} ★</span>
+                            <div style="font-size: 15px; font-weight: 700; color: #1e293b; display:flex; align-items:center; gap:8px;">
+                                <span>{$row.master.realname|htmlentities}</span>
+                                <span class="badge" style="background:#ea580c; font-weight:normal;"><i class="fa fa-star"></i> {$row.master.score}</span>
                             </div>
                             <div style="font-size: 12px; color: #64748b; margin-top: 3px;">
-                                电话: <strong>{$row.master.mobile}</strong> · 累计完工: {$row.master.order_count} 单
+                                手机: <strong>{$row.master.mobile|htmlentities}</strong> · 城市: {$row.master.city|default='-'|htmlentities} · 累计完工: {$row.master.order_count} 单
                             </div>
                         </div>
                     </div>
-                    {else}
-                    <div class="alert alert-warning" style="margin-bottom: 16px;">
-                        <i class="fa fa-info-circle"></i> 当前工单尚未指派或师傅尚未抢单接单
+                    {else /}
+                    <div class="alert alert-warning" style="margin-bottom: 14px; padding: 10px 14px;">
+                        <i class="fa fa-info-circle"></i> 当前工单尚未指派师傅，可在订单列表点击「派单」人工调度指派。
                     </div>
                     {/if}
 
                     <div class="od-grid-list">
-                        <div class="od-item"><span class="od-item-k">接单时间:</span><span class="od-item-v">{:$row.accept_time?datetime($row.accept_time):'未接单'}</span></div>
-                        <div class="od-item"><span class="od-item-k">签到时间:</span><span class="od-item-v">{:$row.arrive_time?datetime($row.arrive_time):'未到达'}</span></div>
-                        <div class="od-item"><span class="od-item-k">开工时间:</span><span class="od-item-v">{:$row.start_time?datetime($row.start_time):'未开工'}</span></div>
-                        <div class="od-item"><span class="od-item-k">完工申请:</span><span class="od-item-v">{:$row.finish_time?datetime($row.finish_time):'未完工'}</span></div>
-                        <div class="od-item"><span class="od-item-k">核销验收:</span><span class="od-item-v">{:$row.verify_time?datetime($row.verify_time):'待核销'}</span></div>
-                        <div class="od-item"><span class="od-item-k">核销状态:</span><span class="od-item-v">{if $row.verify_time}<span class="label label-success">已核销完结</span>{else}<span class="label label-warning">待客户核销</span>{/if}</span></div>
+                        <div class="od-item"><span class="od-item-k">接单时间:</span><span class="od-item-v">{:$row.accept_time > 0 ? datetime($row.accept_time) : '未接单'}</span></div>
+                        <div class="od-item"><span class="od-item-k">电话预约:</span><span class="od-item-v">{:$row.contact_time > 0 ? datetime($row.contact_time) : '未记录'}</span></div>
+                        <div class="od-item"><span class="od-item-k">签到到达:</span><span class="od-item-v">{:$row.arrive_time > 0 ? datetime($row.arrive_time) : '未到达'}</span></div>
+                        <div class="od-item"><span class="od-item-k">开工施工:</span><span class="od-item-v">{:$row.start_time > 0 ? datetime($row.start_time) : '未开工'}</span></div>
+                        <div class="od-item"><span class="od-item-k">完工提交:</span><span class="od-item-v">{:$row.finish_time > 0 ? datetime($row.finish_time) : '未完工'}</span></div>
+                        <div class="od-item"><span class="od-item-k">核销验收:</span><span class="od-item-v">{if $row.verify_time > 0}<span class="text-success">{:datetime($row.verify_time)}</span>{else/}<span class="label label-default">待核销</span>{/if}</span></div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 
+    <!-- 师傅竞标报价记录（针对报价单或有报价记录的工单） -->
+    {if !empty($quoteList)}
+    <div class="od-card">
+        <div class="od-card-header">
+            <h4 class="od-card-title"><i class="fa fa-gavel"></i> 师傅竞标报价记录 ({:count($quoteList)})</h4>
+        </div>
+        <div class="od-card-body" style="padding: 12px 16px;">
+            <table class="table table-bordered table-hover table-condensed" style="margin-bottom:0; font-size:12px;">
+                <thead>
+                    <tr class="active">
+                        <th>报价师傅</th>
+                        <th>联系电话</th>
+                        <th>服务评分</th>
+                        <th>报价金额</th>
+                        <th>施工方案与报价说明</th>
+                        <th>状态</th>
+                        <th>报价时间</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {foreach name="quoteList" item="qt"}
+                    <tr>
+                        <td><strong>{$qt.master_name|default='-'|htmlentities}</strong></td>
+                        <td>{$qt.master_mobile|default='-'|htmlentities}</td>
+                        <td><span style="color:#d97706;"><i class="fa fa-star"></i> {$qt.master_score|default='5.0'}</span></td>
+                        <td><strong style="color:#ea580c;">¥{$qt.amount}</strong></td>
+                        <td>{$qt.description|default='-'|htmlentities}</td>
+                        <td>
+                            {if $qt.status == 'accept'}<span class="label label-success">已中标采纳</span>
+                            {elseif $qt.status == 'reject'/}<span class="label label-default">未中标</span>
+                            {else/}<span class="label label-warning">待雇主确认</span>{/if}
+                        </td>
+                        <td>{$qt.createtime|datetime}</td>
+                    </tr>
+                    {/foreach}
+                </tbody>
+            </table>
+        </div>
+    </div>
+    {/if}
+
     <div class="row">
-        <!-- 卡片 C: 资金流转与财务拆解 -->
+        <!-- 卡片 C: 资金流转与开票结算 -->
         <div class="col-xs-12 col-sm-6">
             <div class="od-card">
                 <div class="od-card-header">
-                    <h4 class="od-card-title"><i class="fa fa-cny"></i> 资金流转与财务核算</h4>
+                    <h4 class="od-card-title"><i class="fa fa-cny"></i> 资金构成、结算分成与发票状态</h4>
                 </div>
                 <div class="od-card-body">
                     <div class="od-grid-list">
                         <div class="od-item"><span class="od-item-k">基础服务费:</span><span class="od-item-v">¥{$row.base_amount}</span></div>
                         <div class="od-item"><span class="od-item-k">步梯楼层费:</span><span class="od-item-v">¥{$row.floor_amount}</span></div>
-                        <div class="od-item"><span class="od-item-k">加急派单费:</span><span class="od-item-v">¥{$row.urgent_amount}</span></div>
+                        <div class="od-item"><span class="od-item-k">远程/加急费:</span><span class="od-item-v">¥{:number_format($row.distance_amount + $row.urgent_amount, 2, '.', '')}</span></div>
                         <div class="od-item"><span class="od-item-k">优惠券抵扣:</span><span class="od-item-v" style="color:#16a34a;">-¥{$row.discount_amount}</span></div>
-                        <div class="od-item"><span class="od-item-k">现场补差价:</span><span class="od-item-v">{if $row.diff_amount > 0}¥{$row.diff_amount} ({if $row.diff_status==1}已付{else}待付{/if}){else}无{/if}</span></div>
-                        <div class="od-item"><span class="od-item-k">实付总金额:</span><span class="od-item-v" style="color:#ea580c; font-size:16px; font-weight:700;">¥{$row.pay_amount}</span></div>
+                        <div class="od-item">
+                            <span class="od-item-k">现场补差价:</span>
+                            <span class="od-item-v">
+                                {if $row.diff_amount > 0}
+                                    ¥{$row.diff_amount}
+                                    {if $row.diff_status == 2}<span class="label label-success">已支付</span>{else/}<span class="label label-warning">待支付</span>{/if}
+                                {else/}无{/if}
+                            </span>
+                        </div>
+                        <div class="od-item"><span class="od-item-k">实付总金额:</span><span class="od-item-v" style="color:#ea580c; font-size:15px; font-weight:700;">¥{$row.pay_amount}</span></div>
                     </div>
 
-                    <div style="margin-top: 15px; padding-top: 14px; border-top: 1px dashed #e2e8f0;">
-                        <div style="font-size: 12px; font-weight: 600; color: #475569; margin-bottom: 8px;">支付与打款明细：</div>
+                    <div style="margin-top: 14px; padding-top: 12px; border-top: 1px dashed #e2e8f0;">
                         <div class="od-grid-list">
-                            <div class="od-item"><span class="od-item-k">支付状态:</span><span class="od-item-v"><span class="label label-info">{$row.pay_status_text}</span></span></div>
-                            <div class="od-item"><span class="od-item-k">支付方式:</span><span class="od-item-v">{$row.pay_type|default='微信支付'}</span></div>
-                            <div class="od-item" style="grid-column: span 2;"><span class="od-item-k">支付流水号:</span><span class="od-item-v"><code>{$row.transaction_id|default='-'}</code></span></div>
-                            <div class="od-item"><span class="od-item-k">师傅应结所得:</span><span class="od-item-v" style="color:#10b981; font-weight:700;">¥{$row.settle_amount}</span></div>
-                            <div class="od-item"><span class="od-item-k">结算流转状态:</span><span class="od-item-v">{$row.settle_status_text}</span></div>
+                            <div class="od-item"><span class="od-item-k">支付状态:</span><span class="od-item-v"><span class="label {if $row.pay_status==1}label-success{elseif $row.pay_status==2/}label-danger{else/}label-default{/if}">{$row.pay_status_text}</span></span></div>
+                            <div class="od-item"><span class="od-item-k">支付渠道:</span><span class="od-item-v">{$row.pay_type|default='微信支付'|htmlentities}</span></div>
+                            <div class="od-item" style="grid-column: span 2;"><span class="od-item-k">交易流水号:</span><span class="od-item-v"><code>{$row.transaction_id|default='-'|htmlentities}</code></span></div>
+                            <div class="od-item"><span class="od-item-k">师傅结算款:</span><span class="od-item-v" style="color:#10b981; font-weight:700;">¥{if !empty($settle)}{$settle.settle_amount} (抽成¥{$settle.commission}){else/}{$row.settle_amount}{/if}</span></div>
+                            <div class="od-item"><span class="od-item-k">结算状态:</span><span class="od-item-v">{$row.settle_status_text}</span></div>
+                            <div class="od-item" style="grid-column: span 2;">
+                                <span class="od-item-k">发票状态:</span>
+                                <span class="od-item-v">
+                                    {if $row.invoice_status == 'issued'}
+                                        <span class="label label-success">已开票</span>
+                                        {if !empty($invoiceInfo)} 申请单 <code>{$invoiceInfo.invoice_sn|htmlentities}</code>（{$invoiceInfo.title|htmlentities}）{/if}
+                                    {elseif $row.invoice_status == 'wait' /}
+                                        <span class="label label-warning">开票审核中</span>
+                                        {if !empty($invoiceInfo)} 申请单 <code>{$invoiceInfo.invoice_sn|htmlentities}</code>{/if}
+                                    {else /}
+                                        <span class="text-muted">未申请开票</span>
+                                    {/if}
+                                </span>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
 
-        <!-- 卡片 D: 服务评价与质量回访 -->
+        <!-- 卡片 D: 服务评价与申诉争议 -->
         <div class="col-xs-12 col-sm-6">
             <div class="od-card">
                 <div class="od-card-header">
-                    <h4 class="od-card-title"><i class="fa fa-star"></i> 雇主评价与服务回复</h4>
+                    <h4 class="od-card-title"><i class="fa fa-star"></i> 雇主评价与售后记录</h4>
                 </div>
                 <div class="od-card-body">
                     {if !empty($review)}
-                    <div style="margin-bottom: 12px;">
-                        <span style="font-size: 18px; color: #f59e0b;">
-                            <?php for($i=0; $i<$review['score']; $i++): ?>★<?php endfor; ?>
+                    <div style="margin-bottom: 10px;">
+                        <span style="font-size: 15px; color: #f59e0b;">
+                            <?php for($i=0; $i<(int)$review['score']; $i++): ?><i class="fa fa-star" style="margin-right:2px;"></i><?php endfor; ?>
                         </span>
-                        <span style="font-size: 13px; font-weight: 700; color: #b45309; margin-left: 8px;">{$review.score} 分好评</span>
-                        {if !empty($review.tags)}
+                        <span style="font-size: 13px; font-weight: 700; color: #b45309; margin-left: 6px;">{$review.score} 星评价</span>
+                        {if $review.status == 'hidden'}<span class="label label-default" style="margin-left:6px;">已隐藏</span>{/if}
+                        {if !empty($review.tags_arr)}
                         <div style="margin-top: 6px;">
-                            <?php $tags = explode(',', $review['tags']); foreach($tags as $t): ?>
-                            <span class="label label-default" style="margin-right: 4px;">{$t}</span>
-                            <?php endforeach; ?>
+                            {foreach name="review.tags_arr" item="t"}
+                            <span class="label label-default" style="margin-right: 4px; background:#f1f5f9; color:#334155;">{$t|htmlentities}</span>
+                            {/foreach}
                         </div>
                         {/if}
                     </div>
-                    <div style="background: #f8fafc; border-radius: 8px; padding: 12px; font-size: 13px; color: #1e293b; margin-bottom: 10px;">
-                        <strong>雇主留言：</strong>{$review.content}
+                    <div style="background: #f8fafc; border-radius: 8px; padding: 10px 12px; font-size: 13px; color: #1e293b; margin-bottom: 8px;">
+                        <strong>雇主评价：</strong>{$review.content|default='用户未填写文字评价'|htmlentities}
                     </div>
                     {if !empty($review.reply)}
-                    <div style="background: #fff7ed; border-radius: 8px; padding: 10px; font-size: 12px; color: #9a3412;">
-                        <strong>师傅回评：</strong>{$review.reply}
+                    <div style="background: #fff7ed; border-radius: 8px; padding: 8px 12px; font-size: 12px; color: #9a3412;">
+                        <strong>师傅回复：</strong>{$review.reply|htmlentities}
                     </div>
                     {/if}
-                    {else}
-                    <div style="text-align: center; padding: 30px 0; color: #94a3b8;">
-                        <i class="fa fa-comment-o" style="font-size: 32px; margin-bottom: 8px;"></i>
-                        <div>客户暂未对本次施工进行打分评价</div>
+                    {else /}
+                    <div style="text-align: center; padding: 22px 0; color: #94a3b8;">
+                        <i class="fa fa-comment-o" style="font-size: 26px; margin-bottom: 6px;"></i>
+                        <div>客户暂未提交服务评价</div>
+                    </div>
+                    {/if}
+
+                    {if !empty($appealList)}
+                    <div style="margin-top: 12px; padding-top: 10px; border-top: 1px dashed #fecaca;">
+                        <div style="font-size: 12px; font-weight: 700; color: #dc2626; margin-bottom: 6px;"><i class="fa fa-shield"></i> 关联申诉争议记录：</div>
+                        {foreach name="appealList" item="ap"}
+                        <div style="background:#fef2f2; border:1px solid #fecaca; border-radius:6px; padding:8px 10px; font-size:12px; margin-bottom:6px;">
+                            <div><strong>师傅：</strong>{$ap.master_name|default='-'|htmlentities} · <strong>状态：</strong>{$ap.status|htmlentities}</div>
+                            <div style="margin-top:2px;"><strong>申诉理由：</strong>{$ap.content|htmlentities}</div>
+                            {if !empty($ap.reply)}<div style="margin-top:2px;color:#15803d;"><strong>平台裁决：</strong>{$ap.reply|htmlentities}</div>{/if}
+                        </div>
+                        {/foreach}
                     </div>
                     {/if}
                 </div>
@@ -390,57 +442,59 @@
     <!-- 4. 现场施工取证照片画廊 -->
     <div class="od-card">
         <div class="od-card-header">
-            <h4 class="od-card-title"><i class="fa fa-camera"></i> 现场施工与验收取证图集</h4>
-            <span class="text-muted" style="font-size:12px;"><i class="fa fa-search-plus"></i> 点击图片可查看高清大图</span>
+            <h4 class="od-card-title"><i class="fa fa-camera"></i> 现场施工与验收取证图集 ({:count($mediaList)})</h4>
+            <span class="text-muted" style="font-size:12px;"><i class="fa fa-search-plus"></i> 点击图片查看原图</span>
         </div>
         <div class="od-card-body">
             {if !empty($mediaList)}
             <div class="od-gallery-grid">
                 {foreach name="mediaList" item="m"}
                 <div class="od-gallery-item">
-                    <a href="{$m.url}" target="_blank">
-                        <img src="{$m.url}" title="{$m.stage}" />
+                    <a href="{$m.url|htmlentities}" target="_blank">
+                        <img src="{$m.url|htmlentities}" onerror="this.src='/assets/img/qrcode.png'" />
                     </a>
                     <div class="od-gallery-tag">
-                        {if $m.stage=='damage'}报损申报
-                        {elseif $m.stage=='finish'}完工验收
-                        {elseif $m.stage=='process'}施工过程
-                        {else}现场取证{/if}
+                        {if $m.stage=='arrive'}上门签到
+                        {elseif $m.stage=='work' || $m.stage=='process'/}施工过程
+                        {elseif $m.stage=='finish'/}完工验收
+                        {elseif $m.stage=='damage'/}异常报损
+                        {else/}现场取证{/if}
                     </div>
                 </div>
                 {/foreach}
             </div>
-            {else}
-            <div style="text-align: center; padding: 20px 0; color: #94a3b8;">
-                <i class="fa fa-picture-o" style="font-size: 28px; margin-bottom: 6px;"></i>
-                <div>暂无现场取证图片</div>
-            </div>
+            {else /}
+            <div style="text-align: center; padding: 16px 0; color: #94a3b8;">暂无现场施工取证照片</div>
             {/if}
         </div>
     </div>
 
     <!-- 5. 完整操作日志时间轴 -->
-    <div class="od-card">
+    <div class="od-card" style="margin-bottom:0;">
         <div class="od-card-header">
-            <h4 class="od-card-title"><i class="fa fa-history"></i> 工单全生命周期操作日志</h4>
+            <h4 class="od-card-title"><i class="fa fa-history"></i> 工单全生命周期操作日志 ({:count($logList)})</h4>
         </div>
         <div class="od-card-body">
             {if !empty($logList)}
             <div class="od-timeline">
                 {foreach name="logList" item="log"}
                 <div class="od-tl-item">
-                    <div class="od-tl-time">{$log.createtime|datetime}</div>
-                    <div class="od-tl-title">{$log.status_text|default='工单状态变更'}</div>
-                    <div class="od-tl-desc">{$log.remark}</div>
+                    <div class="od-tl-time">{$log.createtime|datetime} · 操作端：{$log.operator_type|default='system'|htmlentities}</div>
+                    <div class="od-tl-title">{$log.status_label|htmlentities}</div>
+                    <div class="od-tl-desc">{$log.remark|htmlentities}</div>
                 </div>
                 {/foreach}
             </div>
-            {else}
-            <div style="text-align: center; padding: 20px 0; color: #94a3b8;">
-                <i class="fa fa-clock-o" style="font-size: 28px; margin-bottom: 6px;"></i>
-                <div>暂无状态流转日志</div>
-            </div>
+            {else /}
+            <div style="text-align: center; padding: 16px 0; color: #94a3b8;">暂无状态流转日志</div>
             {/if}
         </div>
     </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="button" class="btn btn-primary btn-embossed" onclick="parent.Layer.closeAll();"><i class="fa fa-check"></i> 关闭看板</button>
+        </div>
+    </div>
 </div>
diff --git a/server/application/admin/view/order/dispatch.html b/server/application/admin/view/order/dispatch.html
new file mode 100644
index 0000000..6a6e1c9
--- /dev/null
+++ b/server/application/admin/view/order/dispatch.html
@@ -0,0 +1,96 @@
+<style>
+    .dp-wrap { padding: 4px 10px; color: #1e293b; }
+    .dp-order-summary {
+        background: #fff7ed;
+        border: 1px solid #fed7aa;
+        border-radius: 10px;
+        padding: 12px 16px;
+        margin-bottom: 16px;
+    }
+    .dp-order-hd { display: flex; align-items: center; justify-content: space-between; margin-bottom: 6px; }
+    .dp-order-no { font-size: 15px; font-weight: 700; color: #9a3412; font-family: monospace; }
+    .dp-order-meta { font-size: 12.5px; color: #475569; line-height: 1.6; }
+    .dp-cand-grid { display: grid; grid-template-columns: repeat(2, 1fr); gap: 10px; margin-bottom: 16px; }
+    .dp-cand-card {
+        border: 1px solid #e2e8f0;
+        border-radius: 8px;
+        padding: 10px 12px;
+        background: #fff;
+        cursor: pointer;
+        transition: all 0.15s;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+    .dp-cand-card:hover { border-color: #fb923c; background: #fffaf5; }
+    .dp-cand-card.is-picked { border-color: #ea580c; background: #fff7ed; box-shadow: 0 0 0 2px rgba(234,88,12,0.15); }
+    .dp-cand-name { font-size: 13.5px; font-weight: 700; color: #0f172a; display: flex; align-items: center; gap: 6px; }
+    .dp-cand-sub { font-size: 11.5px; color: #64748b; margin-top: 3px; }
+</style>
+
+<form id="dispatch-form" class="form-horizontal dp-wrap" role="form" data-toggle="validator" method="POST" action="">
+    <div class="dp-order-summary">
+        <div class="dp-order-hd">
+            <span class="dp-order-no"><i class="fa fa-file-text-o"></i> {$row.order_no|htmlentities} · {$row.service_name|htmlentities}</span>
+            <span class="label label-warning">{$row.status_text}</span>
+        </div>
+        <div class="dp-order-meta">
+            <div><strong>上门地址：</strong>{$row.province|htmlentities}{$row.city|htmlentities}{$row.district|htmlentities}{$row.address|htmlentities}（{$row.contact|htmlentities} {$row.mobile|htmlentities}）</div>
+            <div>
+                <strong>预约时间：</strong>{if $row.appoint_time > 0}{$row.appoint_time|datetime}{else/}尽快上门{/if}
+                &nbsp;|&nbsp;
+                <strong>当前师傅：</strong>{if $row.master_id && $row.master}<span class="text-primary">{$row.master.realname|htmlentities}（{$row.master.mobile|htmlentities}）</span>{else/}<span class="text-muted">尚未指派</span>{/if}
+            </div>
+        </div>
+    </div>
+
+    {if !empty($candidateMasters)}
+    <div style="margin-bottom: 8px; font-size: 13px; font-weight: 700; color: #0f172a;">
+        <i class="fa fa-bolt" style="color:#ea580c;"></i> 推荐可承接认证师傅（点击卡片快捷选定）
+    </div>
+    <div class="dp-cand-grid">
+        {foreach name="candidateMasters" item="cm"}
+        <div class="dp-cand-card {if $row.master_id == $cm.id}is-picked{/if}" data-id="{$cm.id}" data-name="{$cm.realname|htmlentities}">
+            <div>
+                <div class="dp-cand-name">
+                    {$cm.realname|htmlentities}
+                    {if $cm.work_status == 'on'}
+                    <span class="label label-success" style="font-size:10px;">听单中</span>
+                    {else /}
+                    <span class="label label-default" style="font-size:10px;">休息</span>
+                    {/if}
+                    <span style="color:#d97706;font-size:12px;"><i class="fa fa-star"></i> {$cm.score}</span>
+                </div>
+                <div class="dp-cand-sub">
+                    {$cm.mobile|htmlentities} · {$cm.city|default='同城'|htmlentities} · 完工{$cm.order_count}单
+                    {if !empty($cm.skills)}<br><span class="text-primary">{:implode(' / ', $cm.skills)}</span>{/if}
+                </div>
+            </div>
+            <span class="btn btn-xs btn-warning">选择</span>
+        </div>
+        {/foreach}
+    </div>
+    {/if}
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">指定承接师傅:</label>
+        <div class="col-xs-12 col-sm-9">
+            <input id="c-dispatch-master" data-rule="required" data-source="master/index" data-field="realname" data-params='{"custom[verify_status]":"pass"}' class="form-control selectpage" name="master_id" type="text" value="{$row.master_id ?: ''}" placeholder="输入姓名或手机号检索已认证师傅">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">调度备注:</label>
+        <div class="col-xs-12 col-sm-9">
+            <input type="text" class="form-control" name="dispatch_remark" placeholder="选填：记录派单或改派说明（将写入工单履约日志）">
+        </div>
+    </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-9">
+            <button type="submit" class="btn btn-primary btn-embossed"><i class="fa fa-paper-plane"></i> 确认指派并通知师傅</button>
+            <button type="button" class="btn btn-default btn-embossed" onclick="parent.Layer.closeAll();">取消</button>
+        </div>
+    </div>
+</form>
diff --git a/server/application/admin/view/order/edit.html b/server/application/admin/view/order/edit.html
index f904382..0a1804d 100644
--- a/server/application/admin/view/order/edit.html
+++ b/server/application/admin/view/order/edit.html
@@ -2,39 +2,28 @@
 
     <!-- 顶部现代 Tab 选项卡 -->
     <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active"><a href="#tab-order-basic" aria-controls="tab-order-basic" role="tab" data-toggle="tab"><i class="fa fa-file-text-o"></i> 订单与工项信息</a></li>
+        <li role="presentation" class="active"><a href="#tab-order-basic" aria-controls="tab-order-basic" role="tab" data-toggle="tab"><i class="fa fa-file-text-o"></i> 订单与物流维护</a></li>
         <li role="presentation"><a href="#tab-order-address" aria-controls="tab-order-address" role="tab" data-toggle="tab"><i class="fa fa-map-marker"></i> 上门联系与地址</a></li>
-        <li role="presentation"><a href="#tab-order-finance" aria-controls="tab-order-finance" role="tab" data-toggle="tab"><i class="fa fa-cny"></i> 费用明细与支付</a></li>
         <li role="presentation"><a href="#tab-order-fulfill" aria-controls="tab-order-fulfill" role="tab" data-toggle="tab"><i class="fa fa-truck"></i> 师傅指派与履约节点</a></li>
+        <li role="presentation"><a href="#tab-order-finance" aria-controls="tab-order-finance" role="tab" data-toggle="tab"><i class="fa fa-cny"></i> 费用与结算核验（只读）</a></li>
     </ul>
 
     <div class="tab-content" style="padding: 15px 0;">
 
-        <!-- 1. 订单与工项信息 -->
+        <!-- 1. 订单与物流维护 -->
         <div role="tabpanel" class="tab-pane active" id="tab-order-basic">
             <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
+                <label class="control-label col-xs-12 col-sm-2">工单摘要:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <input id="c-order_no" data-rule="required" class="form-control" name="row[order_no]" type="text" value="{$row.order_no|htmlentities}" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <input id="c-user_id" data-rule="required" min="0" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}" placeholder="搜索选择下单客户账号">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">服务归属:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-6">
-                            <input id="c-cat_id" data-rule="required" min="0" data-source="service/cat/index" class="form-control selectpage" name="row[cat_id]" type="text" value="{$row.cat_id|htmlentities}" placeholder="所属服务类目">
-                        </div>
-                        <div class="col-xs-6">
-                            <input id="c-service_id" data-rule="required" min="0" data-source="service/index" class="form-control selectpage" name="row[service_id]" type="text" value="{$row.service_id|htmlentities}" placeholder="预约服务项目">
-                        </div>
-                    </div>
+                    <p class="form-control-static">
+                        <code style="font-size:13px;">{$row.order_no|htmlentities}</code>
+                        <span class="text-muted" style="margin:0 8px;">|</span>
+                        下单账号：<strong>{$row.user.nickname|default=$row.user.username|default=$row.user_id|htmlentities}</strong>
+                        {if !empty($catName)}
+                        <span class="text-muted" style="margin:0 8px;">|</span>
+                        所属类目：<span class="label label-info">{$catName|htmlentities}</span>
+                        {/if}
+                    </p>
                 </div>
             </div>
             <div class="form-group">
@@ -43,34 +32,20 @@
                     <input id="c-service_name" data-rule="required" class="form-control" name="row[service_name]" type="text" value="{$row.service_name|htmlentities}">
                 </div>
             </div>
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('Service_image')}:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <div class="input-group">
-                        <input id="c-service_image" data-rule="required" class="form-control" size="50" name="row[service_image]" type="text" value="{$row.service_image|htmlentities}">
-                        <div class="input-group-addon no-border no-padding">
-                            <span><button type="button" id="faupload-service_image" class="btn btn-danger faupload" data-category="service" data-input-id="c-service_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-service_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                            <span><button type="button" id="fachoose-service_image" class="btn btn-primary fachoose" data-input-id="c-service_image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                        </div>
-                        <span class="msg-box n-right" for="c-service_image"></span>
-                    </div>
-                    <ul class="row list-inline faupload-preview" id="p-service_image"></ul>
-                </div>
-            </div>
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">商品参数:</label>
                 <div class="col-xs-12 col-sm-8">
                     <div class="row">
                         <div class="col-xs-6">
                             <div class="input-group">
-                                <span class="input-group-addon">商品型号</span>
-                                <input id="c-goods_model" class="form-control" name="row[goods_model]" type="text" value="{$row.goods_model|htmlentities}" placeholder="如: 品牌/款式/规格">
+                                <span class="input-group-addon">商品规格</span>
+                                <input id="c-goods_model" class="form-control" name="row[goods_model]" type="text" value="{$row.goods_model|htmlentities}" placeholder="如: 品牌/款式/细分规格">
                             </div>
                         </div>
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">服务数量</span>
-                                <input id="c-goods_num" data-rule="required" class="form-control" name="row[goods_num]" type="number" value="{$row.goods_num|htmlentities}">
+                                <input id="c-goods_num" data-rule="required" min="1" class="form-control" name="row[goods_num]" type="number" value="{$row.goods_num|htmlentities}">
                             </div>
                         </div>
                     </div>
@@ -107,10 +82,29 @@
                     </div>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">大件货物物流:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <div class="row">
+                        <div class="col-xs-4">
+                            <select id="c-goods_arrived" class="form-control" name="row[goods_arrived]">
+                                <option value="1" {if $row.goods_arrived==1}selected{/if}>货物已到现场</option>
+                                <option value="0" {if $row.goods_arrived==0}selected{/if}>在途未到货</option>
+                            </select>
+                        </div>
+                        <div class="col-xs-4">
+                            <input id="c-express_company" class="form-control" name="row[express_company]" type="text" value="{$row.express_company|htmlentities}" placeholder="物流公司名称(选填)">
+                        </div>
+                        <div class="col-xs-4">
+                            <input id="c-express_no" class="form-control" name="row[express_no]" type="text" value="{$row.express_no|htmlentities}" placeholder="物流运单号(选填)">
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <textarea id="c-remark" class="form-control" rows="2" name="row[remark]">{$row.remark|htmlentities}</textarea>
+                    <textarea id="c-remark" class="form-control" rows="2" name="row[remark]" placeholder="客户施工备注或客服补充说明">{$row.remark|htmlentities}</textarea>
                 </div>
             </div>
         </div>
@@ -139,7 +133,7 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <div class='control-relative'><input id="c-city" data-rule="required" class="form-control" data-toggle="city-picker" name="row[city]" type="text" value="{$row.city|htmlentities}"></div>
+                    <div class='control-relative'><input id="c-city" class="form-control" data-toggle="city-picker" name="row[city]" type="text" value="{$row.city|htmlentities}"></div>
                 </div>
             </div>
             <div class="form-group">
@@ -155,13 +149,13 @@
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">经度</span>
-                                <input id="c-lng" data-rule="required" class="form-control" name="row[lng]" type="text" value="{$row.lng|htmlentities}">
+                                <input id="c-lng" class="form-control" name="row[lng]" type="text" value="{$row.lng|htmlentities}">
                             </div>
                         </div>
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">纬度</span>
-                                <input id="c-lat" data-rule="required" class="form-control" name="row[lat]" type="text" value="{$row.lat|htmlentities}">
+                                <input id="c-lat" class="form-control" name="row[lat]" type="text" value="{$row.lat|htmlentities}">
                             </div>
                         </div>
                     </div>
@@ -170,123 +164,17 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Appoint_time')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <input id="c-appoint_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[appoint_time]" type="text" value="{$row.appoint_time}">
+                    <input id="c-appoint_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" name="row[appoint_time]" type="text" value="{:$row.appoint_time > 0 ? datetime($row.appoint_time) : ''}" placeholder="留空表示客户要求尽快上门">
                 </div>
             </div>
         </div>
 
-        <!-- 3. 费用明细与支付 -->
-        <div role="tabpanel" class="tab-pane" id="tab-order-finance">
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">费用构成明细:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-3">
-                            <div class="input-group">
-                                <span class="input-group-addon">基础 ¥</span>
-                                <input id="c-base_amount" data-rule="required" class="form-control" step="0.01" name="row[base_amount]" type="number" value="{$row.base_amount|htmlentities}">
-                            </div>
-                        </div>
-                        <div class="col-xs-3">
-                            <div class="input-group">
-                                <span class="input-group-addon">楼层 ¥</span>
-                                <input id="c-floor_amount" data-rule="required" class="form-control" step="0.01" name="row[floor_amount]" type="number" value="{$row.floor_amount|htmlentities}">
-                            </div>
-                        </div>
-                        <div class="col-xs-3">
-                            <div class="input-group">
-                                <span class="input-group-addon">距离 ¥</span>
-                                <input id="c-distance_amount" data-rule="required" class="form-control" step="0.01" name="row[distance_amount]" type="number" value="{$row.distance_amount|htmlentities}">
-                            </div>
-                        </div>
-                        <div class="col-xs-3">
-                            <div class="input-group">
-                                <span class="input-group-addon">加急 ¥</span>
-                                <input id="c-urgent_amount" data-rule="required" class="form-control" step="0.01" name="row[urgent_amount]" type="number" value="{$row.urgent_amount|htmlentities}">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">结算合计金额:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-4">
-                            <div class="input-group">
-                                <span class="input-group-addon">优惠 ¥</span>
-                                <input id="c-discount_amount" data-rule="required" class="form-control" step="0.01" name="row[discount_amount]" type="number" value="{$row.discount_amount|htmlentities}">
-                            </div>
-                        </div>
-                        <div class="col-xs-4">
-                            <div class="input-group">
-                                <span class="input-group-addon">订单总额 ¥</span>
-                                <input id="c-total_amount" data-rule="required" class="form-control" step="0.01" name="row[total_amount]" type="number" value="{$row.total_amount|htmlentities}">
-                            </div>
-                        </div>
-                        <div class="col-xs-4">
-                            <div class="input-group">
-                                <span class="input-group-addon" style="color: #ff6a00; font-weight: bold;">实付 ¥</span>
-                                <input id="c-pay_amount" data-rule="required" class="form-control" step="0.01" name="row[pay_amount]" type="number" value="{$row.pay_amount|htmlentities}" style="color: #ff6a00; font-weight: bold;">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">支付信息:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">支付状态</span>
-                                <select id="c-pay_status" class="form-control" name="row[pay_status]">
-                                    <option value="0" {if $row.pay_status==0}selected{/if}>待支付</option>
-                                    <option value="1" {if $row.pay_status==1}selected{/if}>已支付</option>
-                                    <option value="2" {if $row.pay_status==2}selected{/if}>已退款</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">支付方式</span>
-                                <input id="c-pay_type" class="form-control" name="row[pay_type]" type="text" value="{$row.pay_type|htmlentities}" placeholder="如: wechat/alipay/balance">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">师傅结算分成:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <div class="row">
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">结算状态</span>
-                                <select id="c-settle_status" class="form-control" name="row[settle_status]">
-                                    <option value="0" {if $row.settle_status==0}selected{/if}>待结算</option>
-                                    <option value="1" {if $row.settle_status==1}selected{/if}>已结算</option>
-                                    <option value="2" {if $row.settle_status==2}selected{/if}>冻结异常</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-xs-6">
-                            <div class="input-group">
-                                <span class="input-group-addon">佣金 ¥</span>
-                                <input id="c-settle_amount" data-rule="required" class="form-control" step="0.01" name="row[settle_amount]" type="number" value="{$row.settle_amount|htmlentities}">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!-- 4. 师傅指派与履约节点 -->
+        <!-- 3. 师傅指派与履约节点 -->
         <div role="tabpanel" class="tab-pane" id="tab-order-fulfill">
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Master_id')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <input id="c-master_id" data-rule="required" min="0" data-source="master/index" data-field="realname" class="form-control selectpage" name="row[master_id]" type="text" value="{$row.master_id|htmlentities}" placeholder="搜索并指定接单承接师傅">
+                    <input id="c-master_id" data-source="master/index" data-field="realname" data-params='{"custom[verify_status]":"pass"}' class="form-control selectpage" name="row[master_id]" type="text" value="{:$row.master_id > 0 ? $row.master_id : ''}" placeholder="搜索并指定已实名认证师傅（留空保持未指派）">
                 </div>
             </div>
             <div class="form-group">
@@ -302,7 +190,7 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">完工验收核验码:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <input id="c-verify_code" class="form-control" name="row[verify_code]" type="text" value="{$row.verify_code|htmlentities}" placeholder="4位或6位核销码">
+                    <input id="c-verify_code" class="form-control" name="row[verify_code]" type="text" value="{$row.verify_code|htmlentities}" readonly placeholder="系统自动生成核验码">
                 </div>
             </div>
             <div class="form-group">
@@ -312,25 +200,25 @@
                         <div class="col-xs-6" style="margin-bottom: 10px;">
                             <div class="input-group">
                                 <span class="input-group-addon">接单</span>
-                                <input id="c-accept_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" name="row[accept_time]" type="text" value="{$row.accept_time}">
+                                <input id="c-accept_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" name="row[accept_time]" type="text" value="{:$row.accept_time > 0 ? datetime($row.accept_time) : ''}" placeholder="尚未接单">
                             </div>
                         </div>
                         <div class="col-xs-6" style="margin-bottom: 10px;">
                             <div class="input-group">
                                 <span class="input-group-addon">上门到达</span>
-                                <input id="c-arrive_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" name="row[arrive_time]" type="text" value="{$row.arrive_time}">
+                                <input id="c-arrive_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" name="row[arrive_time]" type="text" value="{:$row.arrive_time > 0 ? datetime($row.arrive_time) : ''}" placeholder="尚未到达">
                             </div>
                         </div>
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">开工施工</span>
-                                <input id="c-start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" name="row[start_time]" type="text" value="{$row.start_time}">
+                                <input id="c-start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" name="row[start_time]" type="text" value="{:$row.start_time > 0 ? datetime($row.start_time) : ''}" placeholder="尚未开工">
                             </div>
                         </div>
                         <div class="col-xs-6">
                             <div class="input-group">
                                 <span class="input-group-addon">完工验收</span>
-                                <input id="c-finish_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" name="row[finish_time]" type="text" value="{$row.finish_time}">
+                                <input id="c-finish_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" name="row[finish_time]" type="text" value="{:$row.finish_time > 0 ? datetime($row.finish_time) : ''}" placeholder="尚未完工">
                             </div>
                         </div>
                     </div>
@@ -339,7 +227,66 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_reason')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <input id="c-cancel_reason" class="form-control" name="row[cancel_reason]" type="text" value="{$row.cancel_reason|htmlentities}" placeholder="订单若发生取消在此处记录原因">
+                    <input id="c-cancel_reason" class="form-control" name="row[cancel_reason]" type="text" value="{$row.cancel_reason|htmlentities}" placeholder="将工单状态改为「已取消」时请填写取消原因">
+                </div>
+            </div>
+        </div>
+
+        <!-- 4. 费用与结算核验（只读保护，防篡改账务） -->
+        <div role="tabpanel" class="tab-pane" id="tab-order-finance">
+            <div class="alert alert-info" style="margin:0 15px 15px;">
+                <i class="fa fa-lock"></i> 订单交易金额、支付状态与师傅佣金结算受平台财务台账保护，此处仅作核验展示；佣金放款请前往「结算管理」操作。
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">计价与支付:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <p class="form-control-static">
+                        计价模式：<span class="label label-primary">{$priceTypeList[$row.price_type]|default=$row.price_type|htmlentities}</span>
+                        <span class="text-muted" style="margin:0 10px;">|</span>
+                        支付状态：
+                        {if $row.pay_status == 1}<span class="label label-success">已支付</span>
+                        {elseif $row.pay_status == 2/}<span class="label label-danger">已退款</span>
+                        {else/}<span class="label label-default">未支付</span>{/if}
+                        {if $row.pay_time > 0}<span class="text-muted">（{:datetime($row.pay_time)}）</span>{/if}
+                    </p>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">费用构成明细:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <table class="table table-bordered table-condensed" style="margin-bottom:0;">
+                        <thead>
+                            <tr class="active">
+                                <th>基础服务费</th>
+                                <th>远程上门费</th>
+                                <th>步梯楼层费</th>
+                                <th>现场补差价</th>
+                                <th>优惠券抵扣</th>
+                                <th>订单总额</th>
+                                <th>客户实付</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <td>¥{$row.base_amount|default='0.00'|htmlentities}</td>
+                                <td>¥{$row.distance_amount|default='0.00'|htmlentities}</td>
+                                <td>¥{$row.floor_amount|default='0.00'|htmlentities}</td>
+                                <td>¥{$row.diff_amount|default='0.00'|htmlentities}</td>
+                                <td class="text-success">-¥{$row.discount_amount|default='0.00'|htmlentities}</td>
+                                <td>¥{$row.total_amount|default='0.00'|htmlentities}</td>
+                                <td><strong style="color:#ff6a00;">¥{$row.pay_amount|default='0.00'|htmlentities}</strong></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">师傅佣金结算:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <p class="form-control-static">
+                        {if $row.settle_status == 1}<span class="label label-success">已结算入账</span>{else/}<span class="label label-warning">待结算</span>{/if}
+                        <span style="margin-left:10px;">应结师傅佣金：<strong>¥{$row.settle_amount|default='0.00'|htmlentities}</strong></span>
+                    </p>
                 </div>
             </div>
         </div>
diff --git a/server/application/admin/view/order/index.html b/server/application/admin/view/order/index.html
index 57df7e4..0b363f1 100644
--- a/server/application/admin/view/order/index.html
+++ b/server/application/admin/view/order/index.html
@@ -2,15 +2,15 @@
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
-            <li class="active"><a href="#t-all" data-value="" data-toggle="tab">全部工单</a></li>
-            <li><a href="#t-0" data-value="0" data-toggle="tab">待支付</a></li>
-            <li><a href="#t-1" data-value="1" data-toggle="tab">待接单</a></li>
-            <li><a href="#t-2" data-value="2" data-toggle="tab">报价比价中</a></li>
-            <li><a href="#t-3" data-value="3,4" data-toggle="tab">待上门</a></li>
-            <li><a href="#t-5" data-value="5,6" data-toggle="tab">施工中</a></li>
-            <li><a href="#t-7" data-value="7" data-toggle="tab">待核销验收</a></li>
-            <li><a href="#t-8" data-value="8" data-toggle="tab">已完成</a></li>
-            <li><a href="#t-9" data-value="9,10" data-toggle="tab">售后取消</a></li>
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">全部工单</a></li>
+            <li class="{:$Think.get.status === '0' ? 'active' : ''}"><a href="#t-0" data-value="0" data-toggle="tab">待支付</a></li>
+            <li class="{:$Think.get.status === '1' ? 'active' : ''}"><a href="#t-1" data-value="1" data-toggle="tab">待接单</a></li>
+            <li class="{:$Think.get.status === '2' ? 'active' : ''}"><a href="#t-2" data-value="2" data-toggle="tab">报价比价中</a></li>
+            <li class="{:$Think.get.status === '3,4' ? 'active' : ''}"><a href="#t-3" data-value="3,4" data-toggle="tab">待上门</a></li>
+            <li class="{:$Think.get.status === '5,6' ? 'active' : ''}"><a href="#t-5" data-value="5,6" data-toggle="tab">施工中</a></li>
+            <li class="{:$Think.get.status === '7' ? 'active' : ''}"><a href="#t-7" data-value="7" data-toggle="tab">待核销验收</a></li>
+            <li class="{:$Think.get.status === '8' ? 'active' : ''}"><a href="#t-8" data-value="8" data-toggle="tab">已完成</a></li>
+            <li class="{:$Think.get.status === '9,10' ? 'active' : ''}"><a href="#t-9" data-value="9,10" data-toggle="tab">售后/已取消</a></li>
         </ul>
     </div>
 
@@ -19,14 +19,13 @@
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('order/edit')?'':'hide'}" title="批量/单笔工单调度维护"><i class="fa fa-pencil"></i> 工单维护</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('order/detail')}"
                            data-operate-edit="{:$auth->check('order/edit')}"
-                           data-operate-del="{:$auth->check('order/del')}"
+                           data-operate-del=""
                            width="100%">
                     </table>
                 </div>
diff --git a/server/application/admin/view/review/add.html b/server/application/admin/view/review/add.html
index 691f766..0288834 100644
--- a/server/application/admin/view/review/add.html
+++ b/server/application/admin/view/review/add.html
@@ -9,7 +9,7 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Order_id')}:</label>
                 <div class="col-xs-12 col-sm-10">
-                    <input id="c-order_id" data-rule="required" min="0" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="" placeholder="请选择或搜索关联服务工单">
+                    <input id="c-order_id" data-rule="required" min="0" data-source="order/index" data-field="order_no" class="form-control selectpage" name="row[order_id]" type="text" value="" placeholder="请选择或搜索关联服务工单">
                 </div>
             </div>
 
@@ -26,7 +26,7 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Master_id')}:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-master_id" data-rule="required" min="0" data-source="master/index" class="form-control selectpage" name="row[master_id]" type="text" value="" placeholder="履约接单师傅">
+                            <input id="c-master_id" data-rule="required" min="0" data-source="master/index" data-field="realname" class="form-control selectpage" name="row[master_id]" type="text" value="" placeholder="履约接单师傅">
                         </div>
                     </div>
                 </div>
@@ -47,7 +47,7 @@
                         <div class="col-xs-12 col-sm-8">
                             <div class="input-group">
                                 <input id="c-score" data-rule="required" class="form-control" name="row[score]" type="number" min="1" max="5" value="5">
-                                <span class="input-group-addon">★ (1-5星)</span>
+                                <span class="input-group-addon"><i class="fa fa-star text-warning"></i> (1-5星)</span>
                             </div>
                         </div>
                     </div>
diff --git a/server/application/admin/view/review/detail.html b/server/application/admin/view/review/detail.html
new file mode 100644
index 0000000..fb32222
--- /dev/null
+++ b/server/application/admin/view/review/detail.html
@@ -0,0 +1,94 @@
+<style>
+.rev-detail-wrap { padding: 12px 15px; }
+.rev-card { background: #fff; border: 1px solid #ebedf0; border-radius: 6px; margin-bottom: 14px; }
+.rev-card-hd { padding: 10px 15px; border-bottom: 1px solid #f0f0f2; font-weight: 600; background: #fafafa; border-radius: 6px 6px 0 0; }
+.rev-card-bd { padding: 14px 15px; }
+.rev-kv { margin-bottom: 8px; line-height: 1.6; }
+.rev-kv .k { color: #888; display: inline-block; min-width: 88px; }
+.rev-thumb { width: 88px; height: 88px; object-fit: cover; border-radius: 4px; border: 1px solid #e5e5e5; margin: 0 8px 8px 0; }
+</style>
+
+<div class="rev-detail-wrap">
+    <div class="rev-card">
+        <div class="rev-card-hd">
+            <i class="fa fa-star text-warning"></i> 服务评价详情 #RV{$row.id}
+            <span class="pull-right label {if $row.status=='normal'}label-success{else/}label-default{/if}">
+                {$statusList[$row.status]|default=$row.status|htmlentities}
+            </span>
+        </div>
+        <div class="rev-card-bd">
+            <div class="row">
+                <div class="col-sm-6 rev-kv">
+                    <span class="k">服务星级：</span>
+                    {for start="1" end="6"}
+                    <i class="fa {if $i <= $row.score}fa-star text-warning{else/}fa-star-o text-muted{/if}"></i>
+                    {/for}
+                    <strong style="margin-left:6px;">{$row.score} 分</strong>
+                </div>
+                <div class="col-sm-6 rev-kv"><span class="k">评价时间：</span>{:date('Y-m-d H:i:s', $row.createtime)}</div>
+                <div class="col-sm-6 rev-kv">
+                    <span class="k">评价雇主：</span>
+                    {$user.nickname|default=$user.username|default='-'|htmlentities}
+                    {if !empty($user.mobile)}（{$user.mobile|htmlentities}）{/if}
+                    {if $row.is_anonymous}<span class="label label-default">匿名</span>{/if}
+                </div>
+                <div class="col-sm-6 rev-kv">
+                    <span class="k">首页晒单：</span>
+                    {if !empty($showcase)}
+                        {if $showcase.status == 'normal'}
+                        <span class="label label-success">已同步至晒单广场</span>
+                        {else/}
+                        <span class="label label-default">晒单已隐藏</span>
+                        {/if}
+                    {elseif $row.is_showcase/}
+                        <span class="label label-info">勾选晒单</span>
+                    {else/}
+                        <span class="text-muted">未公开晒单</span>
+                    {/if}
+                </div>
+            </div>
+
+            {if !empty($reviewTags)}
+            <div class="rev-kv">
+                <span class="k">印象标签：</span>
+                {volist name="reviewTags" id="tg"}
+                <span class="label label-primary" style="margin-right:6px;">{$tg|htmlentities}</span>
+                {/volist}
+            </div>
+            {/if}
+
+            <div class="rev-kv">
+                <div class="k" style="margin-bottom:4px;">评价内容：</div>
+                <div class="well well-sm" style="margin-bottom:8px;background:#f9fafb;">{$row.content|default='（未填写文字留言）'|htmlentities}</div>
+            </div>
+
+            {if !empty($reviewImages)}
+            <div class="rev-kv">
+                <div class="k" style="display:block;margin-bottom:6px;">完工实拍晒图：</div>
+                {volist name="reviewImages" id="img"}
+                <a href="{$img|cdnurl|htmlentities}" target="_blank"><img src="{$img|cdnurl|htmlentities}" class="rev-thumb" alt="晒图"></a>
+                {/volist}
+            </div>
+            {/if}
+
+            <div class="rev-kv" style="margin-bottom:0;">
+                <span class="k">服务回复：</span>
+                {if $row.reply}<span>{$row.reply|htmlentities}</span>{else/}<span class="text-muted">暂无回复</span>{/if}
+            </div>
+        </div>
+    </div>
+
+    <div class="rev-card" style="margin-bottom:0;">
+        <div class="rev-card-hd"><i class="fa fa-file-text-o text-info"></i> 关联订单与履约师傅</div>
+        <div class="rev-card-bd">
+            <div class="row">
+                <div class="col-sm-6 rev-kv"><span class="k">关联订单：</span><code>{$order.order_no|default=$row.order_id|htmlentities}</code></div>
+                <div class="col-sm-6 rev-kv"><span class="k">服务项目：</span>{$order.service_name|default='-'|htmlentities} {if !empty($order.goods_model)}（{$order.goods_model|htmlentities}）{/if}</div>
+                <div class="col-sm-6 rev-kv"><span class="k">订单实付：</span><strong class="text-danger">¥{$order.pay_amount|default='0.00'|htmlentities}</strong></div>
+                <div class="col-sm-6 rev-kv"><span class="k">服务区域：</span>{$order.city|default=''|htmlentities}{$order.district|default='-'|htmlentities}</div>
+                <div class="col-sm-6 rev-kv"><span class="k">履约师傅：</span><strong>{$master.realname|default='-'|htmlentities}</strong> {if !empty($master.mobile)}（{$master.mobile|htmlentities}）{/if}</div>
+                <div class="col-sm-6 rev-kv"><span class="k">师傅综合分：</span>{if !empty($master)}<i class="fa fa-star text-warning"></i> {$master.score|default='5.0'}（完单 {$master.order_count|default=0} 笔）{else/}-{/if}</div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/review/edit.html b/server/application/admin/view/review/edit.html
index 912c44c..05ee90c 100644
--- a/server/application/admin/view/review/edit.html
+++ b/server/application/admin/view/review/edit.html
@@ -1,122 +1,122 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-    <!-- 1. 评价主体与关联工单 -->
+    <!-- 1. 原始评价快照（只读防篡改） -->
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-info-circle"></i> 评价主体与工单归属</h4>
+            <h4 class="panel-title"><i class="fa fa-info-circle"></i> 业主真实评价快照（只读）</h4>
         </div>
         <div class="panel-body">
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('Order_id')}:</label>
-                <div class="col-xs-12 col-sm-10">
-                    <input id="c-order_id" data-rule="required" min="0" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="{$row.order_id|htmlentities}">
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">关联工单:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">
+                                <code>{$order.order_no|default=$row.order_id|htmlentities}</code>
+                                {if !empty($order.service_name)} · {$order.service_name|htmlentities}{/if}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">服务师傅:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">
+                                <strong>{$master.realname|default='-'|htmlentities}</strong>
+                                {if !empty($master.mobile)}<span class="text-muted">（{$master.mobile|htmlentities}）</span>{/if}
+                            </p>
+                        </div>
+                    </div>
                 </div>
             </div>
 
             <div class="row">
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('User_id')}:</label>
+                        <label class="control-label col-xs-12 col-sm-4">评价雇主:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-user_id" data-rule="required" min="0" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+                            <p class="form-control-static">
+                                {$user.nickname|default=$user.username|default='-'|htmlentities}
+                                {if $row.is_anonymous}<span class="label label-default" style="margin-left:6px;">匿名发布</span>{else/}<span class="label label-info" style="margin-left:6px;">公开实名</span>{/if}
+                            </p>
                         </div>
                     </div>
                 </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Master_id')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-master_id" data-rule="required" min="0" data-source="master/index" class="form-control selectpage" name="row[master_id]" type="text" value="{$row.master_id|htmlentities}">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- 2. 评分与评价内容 -->
-    <div class="panel panel-default panel-form-section">
-        <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-star"></i> 评分与雇主评价内容</h4>
-        </div>
-        <div class="panel-body">
-            <div class="row">
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Score')}:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <div class="input-group">
-                                <input id="c-score" data-rule="required" class="form-control" name="row[score]" type="number" min="1" max="5" value="{$row.score|htmlentities}">
-                                <span class="input-group-addon">★ (1-5星)</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Is_anonymous')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <div class="radio">
-                                <label><input type="radio" name="row[is_anonymous]" value="0" {if $row.is_anonymous==0}checked{/if}> {:__('Anonymous_no')}</label>
-                                <label><input type="radio" name="row[is_anonymous]" value="1" {if $row.is_anonymous==1}checked{/if}> {:__('Anonymous_yes')}</label>
-                            </div>
+                            <p class="form-control-static">
+                                {for start="1" end="6"}
+                                <i class="fa {if $i <= $row.score}fa-star text-warning{else/}fa-star-o text-muted{/if}"></i>
+                                {/for}
+                                <strong style="margin-left:6px;">{$row.score} 分</strong>
+                            </p>
                         </div>
                     </div>
                 </div>
             </div>
 
+            {if !empty($reviewTags)}
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Tags')}:</label>
                 <div class="col-xs-12 col-sm-10">
-                    <input id="c-tags" class="form-control" data-role="tagsinput" name="row[tags]" type="text" value="{$row.tags|htmlentities}">
+                    <p class="form-control-static">
+                        {volist name="reviewTags" id="tg"}
+                        <span class="label label-primary" style="margin-right:6px;">{$tg|htmlentities}</span>
+                        {/volist}
+                    </p>
                 </div>
             </div>
+            {/if}
 
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
                 <div class="col-xs-12 col-sm-10">
-                    <textarea id="c-content" data-rule="required" class="form-control" rows="3" name="row[content]">{$row.content|htmlentities}</textarea>
+                    <div class="well well-sm" style="margin-bottom:0;background:#fafafa;">{$row.content|default='（未填写文字留言）'|htmlentities}</div>
                 </div>
             </div>
 
-            <div class="form-group">
+            {if !empty($reviewImages)}
+            <div class="form-group" style="margin-bottom:0;">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
                 <div class="col-xs-12 col-sm-10">
-                    <div class="input-group">
-                        <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
-                        <div class="input-group-addon no-border no-padding">
-                            <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                            <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                        </div>
-                        <span class="msg-box n-right" for="c-images"></span>
-                    </div>
-                    <ul class="row list-inline faupload-preview" id="p-images"></ul>
+                    {volist name="reviewImages" id="img"}
+                    <a href="{$img|cdnurl|htmlentities}" target="_blank" style="display:inline-block;margin:0 8px 8px 0;">
+                        <img src="{$img|cdnurl|htmlentities}" style="width:76px;height:76px;object-fit:cover;border-radius:4px;border:1px solid #e5e5e5;" alt="现场晒图">
+                    </a>
+                    {/volist}
                 </div>
             </div>
+            {/if}
         </div>
     </div>
 
-    <!-- 3. 师傅回复与状态 -->
+    <!-- 2. 平台内容治理与服务回复 -->
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-comments"></i> 师傅回复与发布状态</h4>
+            <h4 class="panel-title"><i class="fa fa-shield"></i> 内容合规治理与回复</h4>
         </div>
         <div class="panel-body">
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('Reply')}:</label>
-                <div class="col-xs-12 col-sm-10">
-                    <textarea id="c-reply" class="form-control" rows="2" name="row[reply]">{$row.reply|htmlentities}</textarea>
-                </div>
-            </div>
-
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
                 <div class="col-xs-12 col-sm-10">
                     <div class="radio">
-                    {foreach name="statusList" item="vo"}
-                    <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
-                    {/foreach}
+                        {foreach name="statusList" item="vo"}
+                        <label for="row[status]-{$key}" style="margin-right:18px;">
+                            <input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}
+                        </label>
+                        {/foreach}
                     </div>
+                    <span class="help-block" style="margin-bottom:0;">设为「隐藏」后，该评价及关联的首页业主晒单将同步屏蔽下架。</span>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">{:__('Reply')}:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <textarea id="c-reply" class="form-control" rows="3" name="row[reply]" placeholder="师傅回复或平台官方回访说明（选填）">{$row.reply|htmlentities}</textarea>
                 </div>
             </div>
         </div>
diff --git a/server/application/admin/view/review/index.html b/server/application/admin/view/review/index.html
index 0886d97..1eea185 100644
--- a/server/application/admin/view/review/index.html
+++ b/server/application/admin/view/review/index.html
@@ -1,5 +1,4 @@
 <div class="panel panel-default panel-intro">
-    
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
@@ -10,37 +9,31 @@
         </ul>
     </div>
 
-
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('review/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('review/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('review/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('review/edit')?'':'hide'}" title="内容审核"><i class="fa fa-check-square-o"></i> 内容审核</a>
 
                         <div class="dropdown btn-group {:$auth->check('review/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 {foreach name="statusList" item="vo"}
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">批量设为：{$vo}</a></li>
                                 {/foreach}
                             </ul>
                         </div>
-
-                        
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('review/detail')}"
                            data-operate-edit="{:$auth->check('review/edit')}"
-                           data-operate-del="{:$auth->check('review/del')}"
+                           data-operate-del=""
                            width="100%">
                     </table>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
diff --git a/server/application/admin/view/service/add.html b/server/application/admin/view/service/add.html
index 9ba0356..3ea983e 100644
--- a/server/application/admin/view/service/add.html
+++ b/server/application/admin/view/service/add.html
@@ -67,9 +67,13 @@
     .srv-matrix-table tbody tr.is-row-enabled { background: #ffffff; }
     .srv-matrix-table tbody tr.is-row-disabled { background: #f8fafc; opacity: 0.75; }
 
-    .srv-name-box { display: flex; align-items: center; gap: 8px; }
-    .srv-name-text { font-size: 13.5px; font-weight: 700; color: #0f172a; }
+    .srv-name-box { display: flex; align-items: center; gap: 6px; flex-wrap: wrap; }
+    .srv-name-text { font-size: 13.5px; font-weight: 700; color: #0f172a; white-space: nowrap; }
     .srv-code-badge { font-size: 11px; padding: 1px 6px; border-radius: 4px; background: #f1f5f9; color: #64748b; font-family: Consolas, monospace; }
+    .srv-matrix-toolbar { display: flex; align-items: center; justify-content: space-between; background: #f8fafc; border: 1px solid #e2e8f0; border-radius: 8px; padding: 8px 12px; margin-bottom: 12px; }
+    .srv-filter-btn-group { display: flex; gap: 6px; }
+    .srv-filter-btn { border: 1px solid #cbd5e1; background: #fff; color: #475569; padding: 4px 12px; border-radius: 6px; font-size: 12px; font-weight: 600; cursor: pointer; }
+    .srv-filter-btn.active { background: #0f172a; color: #fff; border-color: #0f172a; }
 
     .srv-switch { position: relative; display: inline-flex; align-items: center; cursor: pointer; margin: 0; }
     .srv-switch input { display: none; }
@@ -160,12 +164,12 @@
                         <div class="input-group">
                             <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="">
                             <div class="input-group-addon no-border no-padding">
-                                <span><button type="button" id="faupload-image" class="btn btn-danger plupload" data-category="service" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> 上传图片</button></span>
+                                <span><button type="button" id="faupload-image" class="btn btn-danger faupload plupload" data-category="service" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> 上传图片</button></span>
                                 <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> 图库选择</button></span>
                             </div>
                             <span class="msg-box n-right" for="c-image"></span>
                         </div>
-                        <ul class="row list-inline plupload-preview" id="p-image"></ul>
+                        <ul class="row list-inline faupload-preview plupload-preview" id="p-image"></ul>
                     </div>
                 </div>
 
@@ -217,11 +221,20 @@
         </div>
 
         <div class="tab-pane" id="tab-services">
+            <div class="srv-matrix-toolbar">
+                <div class="srv-filter-btn-group">
+                    <button type="button" class="srv-filter-btn active" data-filter="all">全部服务字典 ({:count($typesPool)})</button>
+                    <button type="button" class="srv-filter-btn" data-filter="enabled">仅看已启用服务</button>
+                </div>
+                <div style="display:flex;align-items:center;gap:10px;">
+                    <input type="text" id="srv-matrix-search" class="form-control input-sm" style="width:210px;border-radius:6px;" placeholder="搜索服务名称或标识...">
+                </div>
+            </div>
             <table class="srv-matrix-table" id="service-matrix-table">
                 <thead>
                     <tr>
-                        <th style="width: 175px;">全局服务项</th>
-                        <th class="col-main-hd" style="width: 450px;">作为【主服务项目】配置（用户单独呼叫该服务时的价格）</th>
+                        <th style="width: 230px;">全局服务项</th>
+                        <th class="col-main-hd" style="width: 430px;">作为【主服务项目】配置（用户单独呼叫该服务时的价格）</th>
                         <th class="col-addon-hd">作为【增项服务】配置（顺带加选时的加价）</th>
                     </tr>
                 </thead>
@@ -303,94 +316,3 @@
         </div>
     </div>
 </form>
-
-<script>
-    $(document).on('change', '.st-enable', function () {
-        var $row = $(this).closest('tr');
-        if ($(this).is(':checked')) {
-            $row.find('.st-active-panel').css('display', 'inline-flex');
-            $row.find('.st-off-hint').hide();
-        } else {
-            $row.find('.st-active-panel').hide();
-            $row.find('.st-off-hint').show();
-        }
-        var on = $row.find('.st-enable').is(':checked') || $row.find('.ad-bind').is(':checked');
-        $row.toggleClass('is-row-enabled', on).toggleClass('is-row-disabled', !on);
-    });
-
-    $(document).on('change', '.ad-bind', function () {
-        var $row = $(this).closest('tr');
-        if ($(this).is(':checked')) {
-            $row.find('.ad-active-panel').css('display', 'inline-flex');
-            $row.find('.ad-off-hint').hide();
-        } else {
-            $row.find('.ad-active-panel').hide();
-            $row.find('.ad-off-hint').show();
-        }
-        var on = $row.find('.st-enable').is(':checked') || $row.find('.ad-bind').is(':checked');
-        $row.toggleClass('is-row-enabled', on).toggleClass('is-row-disabled', !on);
-    });
-
-    function collectServiceConfig() {
-        var serviceTypes = [];
-        var addons = [];
-        var addonIdx = 0;
-
-        $('#service-matrix-table tbody tr.srv-matrix-row').each(function () {
-            var $row = $(this);
-            var code = $row.data('code');
-            var name = $row.data('name');
-            var unit = $row.data('unit') || '份';
-            var supportFixed = parseInt($row.data('support-fixed'), 10) === 1 ? 1 : 0;
-
-            if ($row.find('.st-enable').is(':checked')) {
-                var mainPrice = supportFixed === 1 ? (parseFloat($row.find('.st-price').val()) || 0) : 0;
-                var isDef = (supportFixed === 1 && $row.find('.st-default').is(':checked')) ? 1 : 0;
-                serviceTypes.push({
-                    code: code,
-                    name: name,
-                    price: mainPrice,
-                    support_fixed: supportFixed,
-                    is_default: isDef
-                });
-            }
-
-            if ($row.find('.ad-bind').is(':checked')) {
-                addonIdx++;
-                var adPrice = parseFloat($row.find('.ad-price').val()) || 0;
-                addons.push({
-                    id: addonIdx,
-                    code: code,
-                    name: name,
-                    unit: unit,
-                    price: adPrice
-                });
-            }
-        });
-
-        $('#service_types_raw').val(JSON.stringify(serviceTypes));
-        $('#addons_raw').val(JSON.stringify(addons));
-    }
-
-    $(document).on('submit', '#add-form', function () {
-        collectServiceConfig();
-    });
-
-    var specIndex = 1000;
-    $(document).on('click', '#btn-add-spec', function () {
-        specIndex++;
-        var seq = $('#specs-tbody tr').length + 1;
-        var html = '<tr>' +
-            '<td style="text-align: center; vertical-align: middle; color: #64748b; font-weight: 600;">' + seq + '</td>' +
-            '<td><input type="text" name="specs[' + specIndex + '][name]" class="form-control input-sm" placeholder="如：普通坐便器 / 智能马桶"></td>' +
-            '<td><div class="input-group input-group-sm"><span class="input-group-addon">¥</span><input type="number" step="0.01" name="specs[' + specIndex + '][base_price]" class="form-control input-sm" placeholder="留空则沿用商品默认价"></div></td>' +
-            '<td><input type="text" name="specs[' + specIndex + '][description]" class="form-control input-sm" placeholder="选填说明"></td>' +
-            '<td style="text-align:center; vertical-align: middle;"><button type="button" class="btn btn-xs btn-danger btn-del-spec"><i class="fa fa-trash-o"></i></button></td>' +
-            '</tr>';
-        $('#specs-tbody').append(html);
-    });
-
-    $(document).on('click', '.btn-del-spec', function () {
-        $(this).closest('tr').remove();
-    });
-</script>
diff --git a/server/application/admin/view/service/cat/add.html b/server/application/admin/view/service/cat/add.html
index 5a04982..53bddb5 100644
--- a/server/application/admin/view/service/cat/add.html
+++ b/server/application/admin/view/service/cat/add.html
@@ -5,22 +5,11 @@
             <h4 class="panel-title"><i class="fa fa-folder-open"></i> 服务类目基础资料</h4>
         </div>
         <div class="panel-body">
-            <div class="row">
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Pid')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-pid" data-rule="required" min="0" class="form-control" name="row[pid]" type="number" value="0" placeholder="0 表示作为顶级类目">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Name')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="" placeholder="如: 卫浴洁具/灯具电路">
-                        </div>
-                    </div>
+            <input type="hidden" name="row[pid]" value="0">
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="" placeholder="如: 卫浴洁具 / 灯具电路 / 定制家具">
                 </div>
             </div>
 
@@ -28,14 +17,14 @@
                 <label class="control-label col-xs-12 col-sm-2">{:__('Icon')}:</label>
                 <div class="col-xs-12 col-sm-10">
                     <div class="input-group">
-                        <input id="c-icon" class="form-control" size="50" name="row[icon]" type="text" value="" placeholder="请上传分类图标图片（支持 png/jpg/webp 等）">
+                        <input id="c-icon" class="form-control" size="50" name="row[icon]" type="text" value="" placeholder="请上传分类图标图片（支持 png/jpg/webp/svg）">
                         <div class="input-group-addon no-border no-padding">
-                            <span><button type="button" id="faupload-icon" class="btn btn-danger plupload" data-category="icon" data-input-id="c-icon" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-icon"><i class="fa fa-upload"></i> 上传</button></span>
+                            <span><button type="button" id="faupload-icon" class="btn btn-danger faupload" data-category="icon" data-input-id="c-icon" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp,image/svg+xml" data-multiple="false" data-preview-id="p-icon"><i class="fa fa-upload"></i> 上传</button></span>
                             <span><button type="button" id="fachoose-icon" class="btn btn-primary fachoose" data-input-id="c-icon" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> 选择</button></span>
                         </div>
                         <span class="msg-box n-right" for="c-icon"></span>
                     </div>
-                    <ul class="row list-inline plupload-preview" id="p-icon"></ul>
+                    <ul class="row list-inline faupload-preview" id="p-icon"></ul>
                 </div>
             </div>
 
diff --git a/server/application/admin/view/service/cat/edit.html b/server/application/admin/view/service/cat/edit.html
index 4ba87de..3588fc8 100644
--- a/server/application/admin/view/service/cat/edit.html
+++ b/server/application/admin/view/service/cat/edit.html
@@ -5,22 +5,11 @@
             <h4 class="panel-title"><i class="fa fa-folder-open"></i> 服务类目基础资料</h4>
         </div>
         <div class="panel-body">
-            <div class="row">
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Pid')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-pid" data-rule="required" min="0" class="form-control" name="row[pid]" type="number" value="{$row.pid|htmlentities}" placeholder="0 表示作为顶级类目">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Name')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}" placeholder="如: 卫浴洁具/灯具电路">
-                        </div>
-                    </div>
+            <input type="hidden" name="row[pid]" value="{$row.pid|default=0|htmlentities}">
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}" placeholder="如: 卫浴洁具 / 灯具电路 / 定制家具">
                 </div>
             </div>
 
@@ -28,14 +17,14 @@
                 <label class="control-label col-xs-12 col-sm-2">{:__('Icon')}:</label>
                 <div class="col-xs-12 col-sm-10">
                     <div class="input-group">
-                        <input id="c-icon" class="form-control" size="50" name="row[icon]" type="text" value="{$row.icon|htmlentities}" placeholder="请上传分类图标图片（支持 png/jpg/webp 等）">
+                        <input id="c-icon" class="form-control" size="50" name="row[icon]" type="text" value="{$row.icon|htmlentities}" placeholder="请上传分类图标图片（支持 png/jpg/webp/svg）">
                         <div class="input-group-addon no-border no-padding">
-                            <span><button type="button" id="faupload-icon" class="btn btn-danger plupload" data-category="icon" data-input-id="c-icon" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-icon"><i class="fa fa-upload"></i> 上传</button></span>
+                            <span><button type="button" id="faupload-icon" class="btn btn-danger faupload" data-category="icon" data-input-id="c-icon" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp,image/svg+xml" data-multiple="false" data-preview-id="p-icon"><i class="fa fa-upload"></i> 上传</button></span>
                             <span><button type="button" id="fachoose-icon" class="btn btn-primary fachoose" data-input-id="c-icon" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> 选择</button></span>
                         </div>
                         <span class="msg-box n-right" for="c-icon"></span>
                     </div>
-                    <ul class="row list-inline plupload-preview" id="p-icon"></ul>
+                    <ul class="row list-inline faupload-preview" id="p-icon"></ul>
                 </div>
             </div>
 
diff --git a/server/application/admin/view/service/detail.html b/server/application/admin/view/service/detail.html
new file mode 100644
index 0000000..82a442e
--- /dev/null
+++ b/server/application/admin/view/service/detail.html
@@ -0,0 +1,178 @@
+<style>
+    .sd-wrap { padding: 4px 8px; color: #1e293b; }
+    .sd-hero {
+        background: linear-gradient(135deg, #fff7ed 0%, #ffedd5 100%);
+        border: 1px solid #fed7aa;
+        border-radius: 10px;
+        padding: 14px 18px;
+        margin-bottom: 14px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 12px;
+    }
+    .sd-hero-left { display: flex; align-items: center; gap: 14px; }
+    .sd-thumb { width: 56px; height: 56px; border-radius: 10px; object-fit: cover; border: 1px solid #fdba74; background: #fff; }
+    .sd-title { font-size: 17px; font-weight: 700; color: #0f172a; display: flex; align-items: center; gap: 8px; }
+    .sd-sub { font-size: 12.5px; color: #64748b; margin-top: 4px; }
+    .sd-stats { display: flex; gap: 10px; }
+    .sd-stat { background: #fff; border: 1px solid #fed7aa; border-radius: 8px; padding: 6px 14px; text-align: center; min-width: 92px; }
+    .sd-stat b { display: block; font-size: 16px; color: #ea580c; font-weight: 700; }
+    .sd-stat span { font-size: 11px; color: #64748b; }
+    .sd-card { background: #fff; border: 1px solid #e2e8f0; border-radius: 10px; padding: 14px 16px; margin-bottom: 14px; }
+    .sd-card-hd { font-size: 14px; font-weight: 700; color: #0f172a; padding-bottom: 10px; margin-bottom: 12px; border-bottom: 1px solid #f1f5f9; display: flex; align-items: center; justify-content: space-between; }
+    .sd-card-hd i { color: #ea580c; margin-right: 6px; }
+</style>
+
+<div class="sd-wrap">
+    <div class="sd-hero">
+        <div class="sd-hero-left">
+            <img class="sd-thumb" src="{$row.image|default='/assets/img/qrcode.png'|htmlentities}" onerror="this.src='/assets/img/qrcode.png'">
+            <div>
+                <div class="sd-title">
+                    {$row.name|htmlentities}
+                    <span class="label label-warning">{$catName|htmlentities}</span>
+                    {if $row.status == 'normal'}
+                    <span class="label label-success">上架中</span>
+                    {else /}
+                    <span class="label label-default">已隐藏</span>
+                    {/if}
+                </div>
+                <div class="sd-sub">
+                    计价单位：{$row.unit|htmlentities} &nbsp;|&nbsp;
+                    步梯搬运：¥{$row.floor_fee}/层（{$row.free_floor}层及以下免费） &nbsp;|&nbsp;
+                    排序权重：{$row.weigh}
+                </div>
+            </div>
+        </div>
+        <div class="sd-stats">
+            <div class="sd-stat">
+                <b>{$orderCount}</b>
+                <span>历史订单(笔)</span>
+            </div>
+            <div class="sd-stat">
+                <b>¥{$orderGmv}</b>
+                <span>累计成交额</span>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-sm-6">
+            <div class="sd-card">
+                <div class="sd-card-hd">
+                    <span><i class="fa fa-check-circle"></i> 已启用主服务及定价 ({:count($serviceTypes)})</span>
+                </div>
+                {if empty($serviceTypes)}
+                <div class="text-muted text-center" style="padding:18px 0;">暂未配置主服务</div>
+                {else /}
+                <table class="table table-bordered table-condensed" style="margin-bottom:0;">
+                    <thead>
+                        <tr class="active">
+                            <th>服务名称</th>
+                            <th>标识</th>
+                            <th>定价策略</th>
+                            <th>默认首选</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {foreach name="serviceTypes" item="st"}
+                        <tr>
+                            <td><strong>{$st.name|default='-'|htmlentities}</strong></td>
+                            <td><code>{$st.code|default='-'|htmlentities}</code></td>
+                            <td>
+                                {if (isset($st.support_fixed) && $st.support_fixed == 0) || $st.price <= 0}
+                                <span class="label label-default">师傅报价</span>
+                                {else /}
+                                <strong style="color:#16a34a;">¥{$st.price}/{$row.unit|htmlentities}</strong>
+                                {/if}
+                            </td>
+                            <td>
+                                {if !empty($st.is_default)}
+                                <span class="label label-primary">默认首选</span>
+                                {else /}
+                                <span class="text-muted">-</span>
+                                {/if}
+                            </td>
+                        </tr>
+                        {/foreach}
+                    </tbody>
+                </table>
+                {/if}
+            </div>
+        </div>
+
+        <div class="col-sm-6">
+            <div class="sd-card">
+                <div class="sd-card-hd">
+                    <span><i class="fa fa-plus-square"></i> 顺带增项服务及加价 ({:count($addons)})</span>
+                </div>
+                {if empty($addons)}
+                <div class="text-muted text-center" style="padding:18px 0;">未开启增项服务</div>
+                {else /}
+                <table class="table table-bordered table-condensed" style="margin-bottom:0;">
+                    <thead>
+                        <tr class="active">
+                            <th>增项名称</th>
+                            <th>标识</th>
+                            <th>增项加价</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {foreach name="addons" item="ad"}
+                        <tr>
+                            <td><strong>{$ad.name|default='-'|htmlentities}</strong></td>
+                            <td><code>{$ad.code|default='-'|htmlentities}</code></td>
+                            <td><strong style="color:#ea580c;">+¥{$ad.price}/{$ad.unit|default=$row.unit|htmlentities}</strong></td>
+                        </tr>
+                        {/foreach}
+                    </tbody>
+                </table>
+                {/if}
+            </div>
+        </div>
+    </div>
+
+    <div class="sd-card" style="margin-bottom:0;">
+        <div class="sd-card-hd">
+            <span><i class="fa fa-tags"></i> 细分型号与款式规格 ({:count($specs)})</span>
+        </div>
+        {if empty($specs)}
+        <div class="text-muted text-center" style="padding:14px 0;">未设置细分型号规格，下单按商品通用标准计价</div>
+        {else /}
+        <table class="table table-bordered table-hover table-condensed" style="margin-bottom:0;">
+            <thead>
+                <tr class="active">
+                    <th style="width:60px;text-align:center;">序号</th>
+                    <th>规格/款式名称</th>
+                    <th style="width:180px;">专属一口价</th>
+                    <th>施工说明</th>
+                </tr>
+            </thead>
+            <tbody>
+                {foreach name="specs" item="sp" key="k"}
+                <tr>
+                    <td class="text-center text-muted">{$k+1}</td>
+                    <td><strong>{$sp.name|htmlentities}</strong></td>
+                    <td>
+                        {if $sp.base_price > 0}
+                        <strong style="color:#ea580c;">¥{$sp.base_price}</strong>
+                        {else /}
+                        <span class="text-muted">沿用主服务默认价</span>
+                        {/if}
+                    </td>
+                    <td class="text-muted">{$sp.description|default='-'|htmlentities}</td>
+                </tr>
+                {/foreach}
+            </tbody>
+        </table>
+        {/if}
+    </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="button" class="btn btn-primary btn-embossed" onclick="parent.Layer.closeAll();"><i class="fa fa-check"></i> 关闭窗口</button>
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/service/edit.html b/server/application/admin/view/service/edit.html
index 7f89be0..07e16f7 100644
--- a/server/application/admin/view/service/edit.html
+++ b/server/application/admin/view/service/edit.html
@@ -159,8 +159,8 @@
     .srv-matrix-table tbody tr.is-row-disabled { background: #f8fafc; opacity: 0.75; }
     .srv-matrix-table tbody tr.is-row-disabled:hover { opacity: 1; }
 
-    .srv-name-box { display: flex; align-items: center; gap: 8px; }
-    .srv-name-text { font-size: 13.5px; font-weight: 700; color: #0f172a; }
+    .srv-name-box { display: flex; align-items: center; gap: 6px; flex-wrap: wrap; }
+    .srv-name-text { font-size: 13.5px; font-weight: 700; color: #0f172a; white-space: nowrap; }
     .srv-code-badge {
         font-size: 11px;
         padding: 1px 6px;
@@ -288,9 +288,10 @@
 <form id="edit-form" class="form-horizontal srv-modal-wrap" role="form" data-toggle="validator" method="POST" action="">
 
     <!-- 顶部商品摘要横幅 -->
+    <?php $srvThumbUrl = empty($row['image']) ? '/assets/img/qrcode.png' : (strpos($row['image'], '/assets/') === 0 || strpos($row['image'], '/icon/') === 0 ? $row['image'] : cdnurl($row['image'], true)); ?>
     <div class="srv-hero-banner">
         <div class="srv-hero-left">
-            <img class="srv-hero-thumb" src="{$row.image|default='/assets/img/qrcode.png'|htmlentities}" onerror="this.src='/assets/img/qrcode.png'">
+            <img class="srv-hero-thumb" src="{$srvThumbUrl|htmlentities}" onerror="this.src='/assets/img/qrcode.png'">
             <div>
                 <div class="srv-hero-title">
                     {$row.name|htmlentities}
@@ -391,12 +392,12 @@
                         <div class="input-group">
                             <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
                             <div class="input-group-addon no-border no-padding">
-                                <span><button type="button" id="faupload-image" class="btn btn-danger plupload" data-category="service" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> 上传图片</button></span>
+                                <span><button type="button" id="faupload-image" class="btn btn-danger faupload plupload" data-category="service" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> 上传图片</button></span>
                                 <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> 图库选择</button></span>
                             </div>
                             <span class="msg-box n-right" for="c-image"></span>
                         </div>
-                        <ul class="row list-inline plupload-preview" id="p-image"></ul>
+                        <ul class="row list-inline faupload-preview plupload-preview" id="p-image"></ul>
                     </div>
                 </div>
 
@@ -486,8 +487,8 @@
             <table class="srv-matrix-table" id="service-matrix-table">
                 <thead>
                     <tr>
-                        <th style="width: 175px;">全局服务项</th>
-                        <th class="col-main-hd" style="width: 450px;">作为【主服务项目】配置（用户单独呼叫该服务时的价格）</th>
+                        <th style="width: 230px;">全局服务项</th>
+                        <th class="col-main-hd" style="width: 430px;">作为【主服务项目】配置（用户单独呼叫该服务时的价格）</th>
                         <th class="col-addon-hd">作为【增项服务】配置（顺带加选时的加价）</th>
                     </tr>
                 </thead>
@@ -583,146 +584,3 @@
         </div>
     </div>
 </form>
-
-<script>
-    function refreshRowAndCounters($row) {
-        if ($row && $row.length) {
-            var mainOn = $row.find('.st-enable').is(':checked');
-            var addonOn = $row.find('.ad-bind').is(':checked');
-            if (mainOn || addonOn) {
-                $row.removeClass('is-row-disabled').addClass('is-row-enabled');
-            } else {
-                $row.removeClass('is-row-enabled').addClass('is-row-disabled');
-            }
-        }
-        $('#stat-main-cnt').text($('.st-enable:checked').length);
-        $('#stat-addon-cnt').text($('.ad-bind:checked').length);
-        $('#stat-spec-cnt').text($('#specs-tbody tr').length);
-    }
-
-    // 切换主服务启用开关
-    $(document).on('change', '.st-enable', function () {
-        var $row = $(this).closest('tr');
-        var checked = $(this).is(':checked');
-        if (checked) {
-            $row.find('.st-active-panel').css('display', 'inline-flex');
-            $row.find('.st-off-hint').hide();
-        } else {
-            $row.find('.st-active-panel').hide();
-            $row.find('.st-off-hint').show();
-        }
-        refreshRowAndCounters($row);
-    });
-
-    // 切换增项服务启用开关
-    $(document).on('change', '.ad-bind', function () {
-        var $row = $(this).closest('tr');
-        var checked = $(this).is(':checked');
-        if (checked) {
-            $row.find('.ad-active-panel').css('display', 'inline-flex');
-            $row.find('.ad-off-hint').hide();
-        } else {
-            $row.find('.ad-active-panel').hide();
-            $row.find('.ad-off-hint').show();
-        }
-        refreshRowAndCounters($row);
-    });
-
-    // 首选单选高亮
-    $(document).on('change', '.st-default', function () {
-        $('.srv-default-label').removeClass('is-def-active');
-        $(this).closest('.srv-default-label').addClass('is-def-active');
-    });
-
-    // 过滤全部/仅看已启用
-    $(document).on('click', '.srv-filter-btn', function () {
-        $('.srv-filter-btn').removeClass('active');
-        $(this).addClass('active');
-        var mode = $(this).data('filter');
-        $('#service-matrix-table tbody tr.srv-matrix-row').each(function () {
-            var $r = $(this);
-            if (mode === 'enabled') {
-                var on = $r.find('.st-enable').is(':checked') || $r.find('.ad-bind').is(':checked');
-                $r.toggle(on);
-            } else {
-                $r.show();
-            }
-        });
-    });
-
-    // 关键词实时过滤服务字典
-    $(document).on('input', '#srv-matrix-search', function () {
-        var kw = $.trim($(this).val()).toLowerCase();
-        $('#service-matrix-table tbody tr.srv-matrix-row').each(function () {
-            var $r = $(this);
-            var text = ($r.data('name') + ' ' + $r.data('code')).toLowerCase();
-            $r.toggle(kw === '' || text.indexOf(kw) !== -1);
-        });
-    });
-
-    // 提交前组装 JSON
-    function collectServiceConfig() {
-        var serviceTypes = [];
-        var addons = [];
-        var addonIdx = 0;
-
-        $('#service-matrix-table tbody tr.srv-matrix-row').each(function () {
-            var $row = $(this);
-            var code = $row.data('code');
-            var name = $row.data('name');
-            var unit = $row.data('unit') || '份';
-            var supportFixed = parseInt($row.data('support-fixed'), 10) === 1 ? 1 : 0;
-
-            if ($row.find('.st-enable').is(':checked')) {
-                var mainPrice = supportFixed === 1 ? (parseFloat($row.find('.st-price').val()) || 0) : 0;
-                var isDef = (supportFixed === 1 && $row.find('.st-default').is(':checked')) ? 1 : 0;
-                serviceTypes.push({
-                    code: code,
-                    name: name,
-                    price: mainPrice,
-                    support_fixed: supportFixed,
-                    is_default: isDef
-                });
-            }
-
-            if ($row.find('.ad-bind').is(':checked')) {
-                addonIdx++;
-                var adPrice = parseFloat($row.find('.ad-price').val()) || 0;
-                addons.push({
-                    id: addonIdx,
-                    code: code,
-                    name: name,
-                    unit: unit,
-                    price: adPrice
-                });
-            }
-        });
-
-        $('#service_types_raw').val(JSON.stringify(serviceTypes));
-        $('#addons_raw').val(JSON.stringify(addons));
-    }
-
-    $(document).on('submit', '#edit-form', function () {
-        collectServiceConfig();
-    });
-
-    var specIndex = 1000;
-    $(document).on('click', '#btn-add-spec', function () {
-        specIndex++;
-        var seq = $('#specs-tbody tr').length + 1;
-        var html = '<tr>' +
-            '<td style="text-align: center; vertical-align: middle; color: #64748b; font-weight: 600;">' + seq + '</td>' +
-            '<td><input type="text" name="specs[' + specIndex + '][name]" class="form-control input-sm" placeholder="如：普通坐便器 / 智能马桶"></td>' +
-            '<td><div class="input-group input-group-sm"><span class="input-group-addon">¥</span><input type="number" step="0.01" name="specs[' + specIndex + '][base_price]" class="form-control input-sm" placeholder="留空则沿用商品默认价"></div></td>' +
-            '<td><input type="text" name="specs[' + specIndex + '][description]" class="form-control input-sm" placeholder="选填说明"></td>' +
-            '<td style="text-align:center; vertical-align: middle;"><button type="button" class="btn btn-xs btn-danger btn-del-spec"><i class="fa fa-trash-o"></i></button></td>' +
-            '</tr>';
-        $('#specs-tbody').append(html);
-        refreshRowAndCounters(null);
-    });
-
-    $(document).on('click', '.btn-del-spec', function () {
-        $(this).closest('tr').remove();
-        refreshRowAndCounters(null);
-    });
-</script>
diff --git a/server/application/admin/view/service/index.html b/server/application/admin/view/service/index.html
index d52054a..1eb1663 100644
--- a/server/application/admin/view/service/index.html
+++ b/server/application/admin/view/service/index.html
@@ -20,7 +20,7 @@
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('service/del')?'':'hide'}" title="{:__('Delete')}"><i class="fa fa-trash"></i> {:__('Delete')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-detail="false"
+                           data-operate-detail="{:$auth->check('service/detail')}"
                            data-operate-edit="{:$auth->check('service/edit')}"
                            data-operate-del="{:$auth->check('service/del')}"
                            width="100%">
diff --git a/server/application/admin/view/settle/add.html b/server/application/admin/view/settle/add.html
index e4151f3..f1c443b 100644
--- a/server/application/admin/view/settle/add.html
+++ b/server/application/admin/view/settle/add.html
@@ -11,7 +11,7 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Order_id')}:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-order_id" data-rule="required" min="0" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="" placeholder="请选择或搜索关联工单">
+                            <input id="c-order_id" data-rule="required" min="0" data-source="order/index" data-field="order_no" class="form-control selectpage" name="row[order_id]" type="text" value="" placeholder="请选择或搜索关联工单">
                         </div>
                     </div>
                 </div>
@@ -19,7 +19,7 @@
                     <div class="form-group">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Master_id')}:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-master_id" data-rule="required" min="0" data-source="master/index" class="form-control selectpage" name="row[master_id]" type="text" value="" placeholder="请选择或搜索师傅">
+                            <input id="c-master_id" data-rule="required" min="0" data-source="master/index" data-field="realname" class="form-control selectpage" name="row[master_id]" type="text" value="" placeholder="请选择或搜索师傅">
                         </div>
                     </div>
                 </div>
diff --git a/server/application/admin/view/settle/detail.html b/server/application/admin/view/settle/detail.html
new file mode 100644
index 0000000..72c5bdf
--- /dev/null
+++ b/server/application/admin/view/settle/detail.html
@@ -0,0 +1,95 @@
+<style>
+.stl-detail-wrap { padding: 12px 15px; }
+.stl-card { background: #fff; border: 1px solid #ebedf0; border-radius: 6px; margin-bottom: 14px; }
+.stl-card-hd { padding: 10px 15px; border-bottom: 1px solid #f0f0f2; font-weight: 600; background: #fafafa; border-radius: 6px 6px 0 0; }
+.stl-card-bd { padding: 14px 15px; }
+.stl-stat-box { background: #f8fafc; border: 1px solid #eef1f5; border-radius: 6px; padding: 12px; text-align: center; }
+.stl-stat-box .lbl { color: #888; font-size: 12px; margin-bottom: 4px; }
+.stl-stat-box .val { font-size: 18px; font-weight: 700; color: #1f1f1f; }
+.stl-kv { margin-bottom: 8px; line-height: 1.6; }
+.stl-kv .k { color: #888; display: inline-block; min-width: 96px; }
+</style>
+
+<div class="stl-detail-wrap">
+    <!-- 1. 资金清分核心指标 -->
+    <div class="stl-card">
+        <div class="stl-card-hd">
+            <i class="fa fa-calculator text-primary"></i> 结算单清分凭证 #ST{$row.id}
+            <span class="pull-right label {if $row.status=='settled'}label-success{elseif $row.status=='offline'/}label-info{else/}label-warning{/if}">
+                {$statusList[$row.status]|default=$row.status|htmlentities}
+            </span>
+        </div>
+        <div class="stl-card-bd">
+            <div class="row" style="margin-bottom:14px;">
+                <div class="col-xs-6 col-sm-3"><div class="stl-stat-box"><div class="lbl">工单核算总额</div><div class="val">¥{$row.order_amount|htmlentities}</div></div></div>
+                <div class="col-xs-6 col-sm-3"><div class="stl-stat-box"><div class="lbl">平台抽佣比例</div><div class="val">{$row.commission_rate|htmlentities}%</div></div></div>
+                <div class="col-xs-6 col-sm-3"><div class="stl-stat-box"><div class="lbl">平台技术服务费</div><div class="val text-warning">¥{$row.commission|htmlentities}</div></div></div>
+                <div class="col-xs-6 col-sm-3"><div class="stl-stat-box"><div class="lbl">师傅应结净额</div><div class="val text-success">¥{$row.settle_amount|htmlentities}</div></div></div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6 stl-kv"><span class="k">单据创建时间：</span>{:date('Y-m-d H:i:s', $row.createtime)}</div>
+                <div class="col-sm-6 stl-kv"><span class="k">实际结算时间：</span>{if $row.settle_time}{:date('Y-m-d H:i:s', $row.settle_time)}{else/}<span class="text-muted">待结算</span>{/if}</div>
+                <div class="col-sm-6 stl-kv"><span class="k">收款师傅：</span><strong>{$master.realname|default='-'|htmlentities}</strong> {if !empty($master.mobile)}（{$master.mobile|htmlentities}）{/if}</div>
+                <div class="col-sm-6 stl-kv"><span class="k">师傅钱包现状：</span>可用 ¥{$master.money|default='0.00'|htmlentities} / 冻结 ¥{$master.frozen_money|default='0.00'|htmlentities}</div>
+            </div>
+        </div>
+    </div>
+
+    <!-- 2. 关联订单费用对账 -->
+    <div class="stl-card">
+        <div class="stl-card-hd"><i class="fa fa-file-text-o text-info"></i> 源头工单费用构成对账</div>
+        <div class="stl-card-bd">
+            {if !empty($order)}
+            <div class="row">
+                <div class="col-sm-6 stl-kv"><span class="k">关联订单号：</span><code>{$order.order_no|htmlentities}</code></div>
+                <div class="col-sm-6 stl-kv"><span class="k">服务项目：</span>{$order.service_name|default='-'|htmlentities} {if $order.goods_model}（{$order.goods_model|htmlentities}）{/if} x{$order.goods_num|default=1}</div>
+                <div class="col-sm-6 stl-kv"><span class="k">基础服务费：</span>¥{$order.base_amount|default='0.00'|htmlentities}</div>
+                <div class="col-sm-6 stl-kv"><span class="k">远程/楼层费：</span>¥{$order.distance_amount|default='0.00'|htmlentities} / ¥{$order.floor_amount|default='0.00'|htmlentities}</div>
+                <div class="col-sm-6 stl-kv"><span class="k">现场补差价：</span>¥{$order.diff_amount|default='0.00'|htmlentities}</div>
+                <div class="col-sm-6 stl-kv"><span class="k">优惠券抵扣：</span>-¥{$order.discount_amount|default='0.00'|htmlentities}</div>
+                <div class="col-sm-6 stl-kv"><span class="k">客户实付金额：</span><strong class="text-danger">¥{$order.pay_amount|default='0.00'|htmlentities}</strong></div>
+                <div class="col-sm-6 stl-kv"><span class="k">完工核销时间：</span>{if !empty($order.verify_time)}{:date('Y-m-d H:i:s', $order.verify_time)}{else/}-{/if}</div>
+            </div>
+            {else/}
+            <p class="text-muted" style="margin-bottom:0;">未查询到关联工单记录。</p>
+            {/if}
+        </div>
+    </div>
+
+    <!-- 3. 关联钱包入账流水 -->
+    <div class="stl-card" style="margin-bottom:0;">
+        <div class="stl-card-hd"><i class="fa fa-exchange text-success"></i> 关联钱包资金流水凭证</div>
+        <div class="stl-card-bd" style="padding:10px 15px;">
+            {if !empty($walletLogs)}
+            <div class="table-responsive">
+                <table class="table table-bordered table-condensed" style="margin-bottom:0;font-size:12px;">
+                    <thead>
+                        <tr class="active">
+                            <th>流水ID</th>
+                            <th>变动类型</th>
+                            <th>变动金额</th>
+                            <th>变动后余额</th>
+                            <th>流水摘要</th>
+                            <th>记账时间</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {volist name="walletLogs" id="wl"}
+                        <tr>
+                            <td>#{$wl.id}</td>
+                            <td><span class="label label-success">{$wl.type|htmlentities}</span></td>
+                            <td class="text-success"><strong>+¥{$wl.amount|htmlentities}</strong></td>
+                            <td>¥{$wl.balance|htmlentities}</td>
+                            <td>{$wl.remark|htmlentities}</td>
+                            <td>{:date('Y-m-d H:i:s', $wl.createtime)}</td>
+                        </tr>
+                        {/volist}
+                    </tbody>
+                </table>
+            </div>
+            {else/}
+            <p class="text-muted" style="margin-bottom:0;">暂无关联线上钱包入账流水记录。</p>
+            {/if}
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/settle/edit.html b/server/application/admin/view/settle/edit.html
index 8eb9b43..6e680a6 100644
--- a/server/application/admin/view/settle/edit.html
+++ b/server/application/admin/view/settle/edit.html
@@ -1,25 +1,69 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-    <!-- 1. 结算主体与关联工单 -->
+    <!-- 1. 结算对账快照（只读防篡改） -->
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-info-circle"></i> 结算主体与工单归属</h4>
+            <h4 class="panel-title"><i class="fa fa-calculator"></i> 结算单账务核对（只读）</h4>
         </div>
         <div class="panel-body">
             <div class="row">
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Order_id')}:</label>
+                        <label class="control-label col-xs-12 col-sm-4">关联工单:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-order_id" data-rule="required" min="0" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="{$row.order_id|htmlentities}">
+                            <p class="form-control-static">
+                                <code>{$order.order_no|default=$row.order_id|htmlentities}</code>
+                                {if !empty($order.service_name)} · {$order.service_name|htmlentities}{/if}
+                            </p>
                         </div>
                     </div>
                 </div>
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Master_id')}:</label>
+                        <label class="control-label col-xs-12 col-sm-4">结算师傅:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-master_id" data-rule="required" min="0" data-source="master/index" class="form-control selectpage" name="row[master_id]" type="text" value="{$row.master_id|htmlentities}">
+                            <p class="form-control-static">
+                                <strong>{$master.realname|default='-'|htmlentities}</strong>
+                                {if !empty($master.mobile)}（{$master.mobile|htmlentities}）{/if}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">工单核算金额:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">¥{$row.order_amount|htmlentities}</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">平台抽佣:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">¥{$row.commission|htmlentities}（比例 {$row.commission_rate|htmlentities}%）</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">师傅应得净额:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static"><strong class="text-success" style="font-size:15px;">¥{$row.settle_amount|htmlentities}</strong></p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">师傅当前钱包:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <p class="form-control-static">可用余额 ¥{$master.money|default='0.00'|htmlentities}，提现冻结 ¥{$master.frozen_money|default='0.00'|htmlentities}</p>
                         </div>
                     </div>
                 </div>
@@ -27,89 +71,23 @@
         </div>
     </div>
 
-    <!-- 2. 费用与抽成测算 -->
+    <!-- 2. 财务结算执行 -->
+    {if $row.status == 'wait'}
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-calculator"></i> 资金分配与抽成测算</h4>
+            <h4 class="panel-title"><i class="fa fa-check-square-o"></i> 财务结算确认</h4>
         </div>
         <div class="panel-body">
-            <div class="row">
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Order_amount')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <div class="input-group">
-                                <span class="input-group-addon">¥</span>
-                                <input id="c-order_amount" data-rule="required" class="form-control" step="0.01" name="row[order_amount]" type="number" value="{$row.order_amount|htmlentities}">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Commission_rate')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <div class="input-group">
-                                <input id="c-commission_rate" data-rule="required" class="form-control" step="0.01" name="row[commission_rate]" type="number" value="{$row.commission_rate|htmlentities}">
-                                <span class="input-group-addon">%</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Commission')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <div class="input-group">
-                                <span class="input-group-addon">¥</span>
-                                <input id="c-commission" data-rule="required" class="form-control" step="0.01" name="row[commission]" type="number" value="{$row.commission|htmlentities}">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Settle_amount')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <div class="input-group">
-                                <span class="input-group-addon">¥</span>
-                                <input id="c-settle_amount" data-rule="required" class="form-control" step="0.01" name="row[settle_amount]" type="number" value="{$row.settle_amount|htmlentities}">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- 3. 结算状态与打款流水 -->
-    <div class="panel panel-default panel-form-section">
-        <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-clock-o"></i> 结算状态与打款归档</h4>
-        </div>
-        <div class="panel-body">
-            <div class="row">
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Status')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <div class="radio">
-                            {foreach name="statusList" item="vo"}
-                            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
-                            {/foreach}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Settle_time')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-settle_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[settle_time]" type="text" value="{:$row.settle_time?datetime($row.settle_time):''}">
-                        </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">结算方式:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <div class="radio">
+                        <label style="margin-right:18px;">
+                            <input name="row[status]" type="radio" value="settled" checked /> 划拨至师傅平台钱包（自动记入资金流水）
+                        </label>
+                        <label>
+                            <input name="row[status]" type="radio" value="offline" /> 线下特殊打款归档（不变更线上钱包余额）
+                        </label>
                     </div>
                 </div>
             </div>
@@ -123,4 +101,13 @@
             <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
         </div>
     </div>
+    {else/}
+    <div class="panel panel-default panel-form-section">
+        <div class="panel-body">
+            <p class="text-muted" style="margin-bottom:0;">
+                <i class="fa fa-lock"></i> 该结算单已于 {:$row.settle_time ? date('Y-m-d H:i:s', $row.settle_time) : '-'} 归档（状态：<strong>{$statusList[$row.status]|default=$row.status}</strong>），账务已锁定。
+            </p>
+        </div>
+    </div>
+    {/if}
 </form>
diff --git a/server/application/admin/view/settle/index.html b/server/application/admin/view/settle/index.html
index dc8395c..c01fa9b 100644
--- a/server/application/admin/view/settle/index.html
+++ b/server/application/admin/view/settle/index.html
@@ -1,5 +1,4 @@
 <div class="panel panel-default panel-intro">
-    
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
@@ -10,37 +9,21 @@
         </ul>
     </div>
 
-
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('settle/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('settle/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('settle/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
-
-                        <div class="dropdown btn-group {:$auth->check('settle/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                {foreach name="statusList" item="vo"}
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
-                                {/foreach}
-                            </ul>
-                        </div>
-
-                        
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('settle/detail')}"
                            data-operate-edit="{:$auth->check('settle/edit')}"
-                           data-operate-del="{:$auth->check('settle/del')}"
+                           data-operate-del=""
                            width="100%">
                     </table>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
diff --git a/server/application/admin/view/showcase/detail.html b/server/application/admin/view/showcase/detail.html
new file mode 100644
index 0000000..2180a02
--- /dev/null
+++ b/server/application/admin/view/showcase/detail.html
@@ -0,0 +1,69 @@
+<style>
+.sc-detail-wrap { padding: 12px 15px; }
+.sc-card { background: #fff; border: 1px solid #ebedf0; border-radius: 6px; margin-bottom: 14px; }
+.sc-card-hd { padding: 10px 15px; border-bottom: 1px solid #f0f0f2; font-weight: 600; background: #fafafa; border-radius: 6px 6px 0 0; }
+.sc-card-bd { padding: 14px 15px; }
+.sc-kv { margin-bottom: 8px; line-height: 1.6; }
+.sc-kv .k { color: #888; display: inline-block; min-width: 92px; }
+.sc-img { width: 108px; height: 108px; object-fit: cover; border-radius: 6px; border: 1px solid #e5e5e5; margin: 0 10px 10px 0; }
+</style>
+
+<div class="sc-detail-wrap">
+    <div class="sc-card">
+        <div class="sc-card-hd">
+            <i class="fa fa-camera text-primary"></i> 业主公开晒单详情 #SC{$row.id}
+            <span class="pull-right label {if $row.status=='normal'}label-success{else/}label-default{/if}">
+                {$statusList[$row.status]|default=$row.status}
+            </span>
+        </div>
+        <div class="sc-card-bd">
+            <div class="row">
+                <div class="col-sm-6 sc-kv"><span class="k">展示昵称：</span><strong>{$row.user_name|htmlentities}</strong>（真实账号：{$row.user.nickname|default=$row.user_id|htmlentities}）</div>
+                <div class="col-sm-6 sc-kv"><span class="k">所在区域：</span>{$row.region|default='-'|htmlentities}</div>
+                <div class="col-sm-6 sc-kv"><span class="k">服务品类：</span>{$row.cat_name|default='-'|htmlentities} · {$row.service_name|default='-'|htmlentities}</div>
+                <div class="col-sm-6 sc-kv">
+                    <span class="k">服务评分：</span>
+                    {for start="1" end="6"}
+                    <i class="fa {if $i <= $row.score}fa-star text-warning{else/}fa-star-o text-muted{/if}"></i>
+                    {/for}
+                    <strong style="margin-left:4px;">{$row.score} 分</strong>
+                </div>
+                <div class="col-sm-6 sc-kv"><span class="k">履约师傅：</span>{$row.master_name|default='-'|htmlentities}（综合分 {$row.master_score|default='5.0'}）</div>
+                <div class="col-sm-6 sc-kv"><span class="k">发布时间：</span>{:date('Y-m-d H:i:s', $row.createtime)}</div>
+            </div>
+
+            {if !empty($tags)}
+            <div class="sc-kv">
+                <span class="k">评价标签：</span>
+                {volist name="tags" id="tg"}
+                <span class="label label-info" style="margin-right:6px;">{$tg|htmlentities}</span>
+                {/volist}
+            </div>
+            {/if}
+
+            <div class="sc-kv">
+                <div class="k" style="margin-bottom:4px;">晒单心得文案：</div>
+                <div class="well well-sm" style="margin-bottom:10px;background:#f9fafb;">{$row.content|default='-'|htmlentities}</div>
+            </div>
+
+            {if !empty($images)}
+            <div class="sc-kv" style="margin-bottom:0;">
+                <div class="k" style="display:block;margin-bottom:6px;">实拍完工图集（共 {:count($images)} 张）：</div>
+                {volist name="images" id="img"}
+                <a href="{$img|cdnurl|htmlentities}" target="_blank"><img src="{$img|cdnurl|htmlentities}" class="sc-img" alt="晒单实拍"></a>
+                {/volist}
+            </div>
+            {/if}
+        </div>
+    </div>
+
+    <div class="sc-card" style="margin-bottom:0;">
+        <div class="sc-card-hd"><i class="fa fa-file-text-o text-info"></i> 源头业务工单核验</div>
+        <div class="sc-card-bd">
+            <div class="row">
+                <div class="col-sm-6 sc-kv"><span class="k">关联订单号：</span><code>{$row.order.order_no|default=$row.order_id|htmlentities}</code></div>
+                <div class="col-sm-6 sc-kv"><span class="k">订单实付：</span><strong class="text-danger">¥{$row.order.pay_amount|default='0.00'|htmlentities}</strong></div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/showcase/edit.html b/server/application/admin/view/showcase/edit.html
new file mode 100644
index 0000000..582a818
--- /dev/null
+++ b/server/application/admin/view/showcase/edit.html
@@ -0,0 +1,78 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+    <div class="panel panel-default panel-form-section">
+        <div class="panel-heading">
+            <h4 class="panel-title"><i class="fa fa-camera"></i> 晒单内容预览（只读）</h4>
+        </div>
+        <div class="panel-body">
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">关联工单:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <p class="form-control-static">
+                        <code>{$row.order.order_no|default=$row.order_id|htmlentities}</code>
+                        <span style="margin:0 6px;">·</span>
+                        <span>{$row.cat_name|default='同城服务'|htmlentities} / <strong>{$row.service.name|default=$row.service_name|htmlentities}</strong></span>
+                    </p>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">晒单业主:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <p class="form-control-static"><strong>{$row.user_name|htmlentities}</strong> · {$row.region|default='-'|htmlentities} · 履约师傅：{$row.master_name|default='-'|htmlentities}</p>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">晒单文案:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <div class="well well-sm" style="margin-bottom:0;background:#fafafa;">{$row.content|htmlentities}</div>
+                </div>
+            </div>
+            {if !empty($images)}
+            <div class="form-group" style="margin-bottom:0;">
+                <label class="control-label col-xs-12 col-sm-2">可选封面图:</label>
+                <div class="col-xs-12 col-sm-10">
+                    {volist name="images" id="img"}
+                    <a href="javascript:;" class="js-pick-cover" data-url="{$img|htmlentities}" style="display:inline-block;margin:0 8px 8px 0;" title="点击设为首图封面">
+                        <img src="{$img|cdnurl|htmlentities}" style="width:78px;height:78px;object-fit:cover;border-radius:4px;border:2px solid {if $img==$row.cover_image}#f0710d{else/}#e5e5e5{/if};" alt="晒单图">
+                    </a>
+                    {/volist}
+                    <p class="help-block" style="margin-bottom:0;">点击上方任意实拍图可快速切换首页瀑布流封面图。</p>
+                </div>
+            </div>
+            {/if}
+        </div>
+    </div>
+
+    <div class="panel panel-default panel-form-section">
+        <div class="panel-heading">
+            <h4 class="panel-title"><i class="fa fa-sliders"></i> 封面与上架控制</h4>
+        </div>
+        <div class="panel-body">
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">瀑布流封面:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <input id="c-cover_image" class="form-control" name="row[cover_image]" type="text" value="{$row.cover_image|htmlentities}" readonly>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-xs-12 col-sm-2">展示状态:</label>
+                <div class="col-xs-12 col-sm-8">
+                    <div class="radio">
+                        {foreach name="statusList" item="vo"}
+                        <label style="margin-right:18px;">
+                            <input name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}
+                        </label>
+                        {/foreach}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>
diff --git a/server/application/admin/view/showcase/index.html b/server/application/admin/view/showcase/index.html
new file mode 100644
index 0000000..8e3e0e0
--- /dev/null
+++ b/server/application/admin/view/showcase/index.html
@@ -0,0 +1,38 @@
+<div class="panel panel-default panel-intro">
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('showcase/del')?'':'hide'}" title="{:__('Delete')}"><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <div class="dropdown btn-group {:$auth->check('showcase/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> 批量上下架</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                {foreach name="statusList" item="vo"}
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">批量设为：{$vo}</a></li>
+                                {/foreach}
+                            </ul>
+                        </div>
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('showcase/detail')}"
+                           data-operate-edit="{:$auth->check('showcase/edit')}"
+                           data-operate-del="{:$auth->check('showcase/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/skill_category/index.html b/server/application/admin/view/skill_category/index.html
index 16f1163..0e6e986 100644
--- a/server/application/admin/view/skill_category/index.html
+++ b/server/application/admin/view/skill_category/index.html
@@ -1,5 +1,13 @@
 <div class="panel panel-default panel-intro">
-    {:build_heading()}
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
 
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
@@ -12,6 +20,7 @@
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('skill_category/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="false"
                            data-operate-edit="{:$auth->check('skill_category/edit')}"
                            data-operate-del="{:$auth->check('skill_category/del')}"
                            width="100%">
diff --git a/server/application/admin/view/skill_dict/add.html b/server/application/admin/view/skill_dict/add.html
index 8f5df45..f29c4af 100644
--- a/server/application/admin/view/skill_dict/add.html
+++ b/server/application/admin/view/skill_dict/add.html
@@ -8,7 +8,7 @@
             <div class="form-group">
                 <label class="control-label col-xs-12 col-sm-2">所属分类:</label>
                 <div class="col-xs-12 col-sm-8">
-                    {:build_select('row[category_id]', $categoryList, '', ['class'=>'form-control selectpicker', 'data-rule'=>'required'])}
+                    {:build_select('row[category_id]', $categoryList, $defaultCategoryId ?? '', ['class'=>'form-control selectpicker', 'data-rule'=>'required'])}
                 </div>
             </div>
             <div class="form-group">
diff --git a/server/application/admin/view/skill_dict/index.html b/server/application/admin/view/skill_dict/index.html
index 23c95c1..375be89 100644
--- a/server/application/admin/view/skill_dict/index.html
+++ b/server/application/admin/view/skill_dict/index.html
@@ -12,6 +12,7 @@
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('skill_dict/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="false"
                            data-operate-edit="{:$auth->check('skill_dict/edit')}"
                            data-operate-del="{:$auth->check('skill_dict/del')}"
                            width="100%">
diff --git a/server/application/admin/view/user/user/add.html b/server/application/admin/view/user/user/add.html
new file mode 100644
index 0000000..a933b94
--- /dev/null
+++ b/server/application/admin/view/user/user/add.html
@@ -0,0 +1,91 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+    {:token()}
+    <input type="hidden" name="row[group_id]" value="1">
+
+    <div class="panel panel-default panel-form-section">
+        <div class="panel-heading">
+            <h4 class="panel-title"><i class="fa fa-user-plus"></i> 会员账号与基础资料</h4>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label for="c-username" class="control-label col-xs-12 col-sm-4">{:__('Username')}:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-username" data-rule="required;username" class="form-control" name="row[username]" type="text" value="" placeholder="请输入登录账号">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label for="c-nickname" class="control-label col-xs-12 col-sm-4">{:__('Nickname')}:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-nickname" data-rule="required" class="form-control" name="row[nickname]" type="text" value="" placeholder="请输入会员昵称">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label for="c-mobile" class="control-label col-xs-12 col-sm-4">{:__('Mobile')}:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-mobile" data-rule="required;mobile" class="form-control" name="row[mobile]" type="text" value="" placeholder="请输入11位手机号">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label for="c-email" class="control-label col-xs-12 col-sm-4">{:__('Email')}:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-email" data-rule="email" class="form-control" name="row[email]" type="text" value="" placeholder="选填：电子邮箱">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label for="c-password" class="control-label col-xs-12 col-sm-4">{:__('Password')}:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-password" data-rule="required;password" class="form-control" name="row[password]" type="password" value="" placeholder="请输入6-30位登录密码" autocomplete="new-password" />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label class="control-label col-xs-12 col-sm-4">账号状态:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>'冻结停用'], 'normal')}
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group" style="margin-bottom:0;">
+                <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
+                <div class="col-xs-12 col-sm-10">
+                    <div class="input-group">
+                        <input id="c-avatar" data-rule="" class="form-control" size="50" name="row[avatar]" type="text" value="">
+                        <div class="input-group-addon no-border no-padding">
+                            <span><button type="button" id="faupload-avatar" class="btn btn-danger faupload" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                            <span><button type="button" id="fachoose-avatar" class="btn btn-primary fachoose" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                        </div>
+                        <span class="msg-box n-right" for="c-avatar"></span>
+                    </div>
+                    <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>
diff --git a/server/application/admin/view/user/user/detail.html b/server/application/admin/view/user/user/detail.html
new file mode 100644
index 0000000..229a1af
--- /dev/null
+++ b/server/application/admin/view/user/user/detail.html
@@ -0,0 +1,172 @@
+<style>
+    .ud-wrap { padding: 5px 10px; font-size: 13px; color: #334155; }
+    .ud-hero {
+        background: linear-gradient(135deg, #fff7ed 0%, #ffedd5 100%);
+        border: 1px solid #fed7aa;
+        border-radius: 12px;
+        padding: 18px 22px;
+        margin-bottom: 16px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        gap: 16px;
+    }
+    .ud-hero-left { display: flex; align-items: center; gap: 16px; }
+    .ud-avatar { width: 62px; height: 62px; border-radius: 50%; object-fit: cover; border: 2px solid #ea580c; background: #fff; }
+    .ud-name { font-size: 18px; font-weight: 700; color: #0f172a; display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
+    .ud-sub { font-size: 12.5px; color: #64748b; margin-top: 4px; }
+    .ud-stats { display: flex; gap: 12px; }
+    .ud-stat { background: #fff; border: 1px solid #fed7aa; border-radius: 8px; padding: 6px 14px; text-align: center; min-width: 92px; }
+    .ud-stat b { display: block; font-size: 16px; color: #ea580c; font-weight: 800; }
+    .ud-stat span { font-size: 11px; color: #64748b; }
+
+    .ud-card { background: #fff; border: 1px solid #e2e8f0; border-radius: 10px; margin-bottom: 16px; overflow: hidden; }
+    .ud-card-hd { padding: 10px 16px; background: #f8fafc; border-bottom: 1px solid #e2e8f0; font-size: 13.5px; font-weight: 700; color: #1e293b; display: flex; align-items: center; gap: 8px; }
+    .ud-card-hd i { color: #ea580c; }
+    .ud-card-bd { padding: 14px 16px; }
+</style>
+
+<div class="ud-wrap">
+    <div class="ud-hero">
+        <div class="ud-hero-left">
+            <img class="ud-avatar" src="{$row.avatar|htmlentities}" onerror="this.src='/assets/img/avatar.png'" />
+            <div>
+                <div class="ud-name">
+                    <span>{$row.nickname|default=$row.username|htmlentities}</span>
+                    <span class="label {if $row.status=='normal'}label-success{else/}label-default{/if}">{if $row.status=='normal'}正常{else/}已停用{/if}</span>
+                    {if !empty($masterProfile) && $masterProfile.verify_status=='pass'}
+                        <span class="label label-warning"><i class="fa fa-wrench"></i> 认证师傅：{$masterProfile.realname|htmlentities}</span>
+                    {/if}
+                    {if !empty($merchantProfile) && $merchantProfile.verify_status=='pass'}
+                        <span class="label label-primary"><i class="fa fa-building-o"></i> 关联企业：{$merchantProfile.name|htmlentities}</span>
+                    {/if}
+                </div>
+                <div class="ud-sub">
+                    账号: {$row.username|htmlentities} &nbsp;|&nbsp;
+                    手机: <strong>{$row.mobile|default='未绑定'|htmlentities}</strong> &nbsp;|&nbsp;
+                    注册时间: {$row.jointime|datetime} &nbsp;|&nbsp;
+                    最近登录: {:$row.logintime > 0 ? datetime($row.logintime) : '-'}
+                </div>
+            </div>
+        </div>
+        <div class="ud-stats">
+            <div class="ud-stat">
+                <b>{$orderCount}</b>
+                <span>下单总计(笔)</span>
+            </div>
+            <div class="ud-stat">
+                <b>¥{$totalSpent}</b>
+                <span>累计实付</span>
+            </div>
+            <div class="ud-stat">
+                <b>¥{$row.money}</b>
+                <span>账户余额</span>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <!-- 常用上门服务地址簿 -->
+        <div class="col-xs-12 col-sm-6">
+            <div class="ud-card">
+                <div class="ud-card-hd"><i class="fa fa-map-marker"></i> 常用上门服务地址簿 ({:count($addressList)})</div>
+                <div class="ud-card-bd">
+                    {if !empty($addressList)}
+                    <table class="table table-bordered table-condensed" style="font-size:12px; margin-bottom:0;">
+                        <thead><tr class="active"><th>联系人</th><th>省市区与门牌</th><th>楼层电梯</th></tr></thead>
+                        <tbody>
+                            {foreach name="addressList" item="ad"}
+                            <tr>
+                                <td>
+                                    <strong>{$ad.contact|htmlentities}</strong><br>
+                                    <span class="text-muted">{$ad.mobile|htmlentities}</span>
+                                    {if $ad.is_default}<span class="label label-warning">默认</span>{/if}
+                                </td>
+                                <td>{$ad.province|htmlentities}{$ad.city|htmlentities}{$ad.district|htmlentities}{$ad.address|htmlentities}</td>
+                                <td>{$ad.floor}层 · {if $ad.has_elevator}电梯{else/}步梯{/if}</td>
+                            </tr>
+                            {/foreach}
+                        </tbody>
+                    </table>
+                    {else /}
+                    <div class="text-muted text-center" style="padding:14px 0;">暂未保存上门地址</div>
+                    {/if}
+                </div>
+            </div>
+        </div>
+
+        <!-- 优惠券领取与核销 -->
+        <div class="col-xs-12 col-sm-6">
+            <div class="ud-card">
+                <div class="ud-card-hd"><i class="fa fa-ticket"></i> 优惠券领用与核销记录 ({:count($coupons)})</div>
+                <div class="ud-card-bd">
+                    {if !empty($coupons)}
+                    <table class="table table-bordered table-condensed" style="font-size:12px; margin-bottom:0;">
+                        <thead><tr class="active"><th>券名称</th><th>面额门槛</th><th>状态</th><th>核销工单</th></tr></thead>
+                        <tbody>
+                            {foreach name="coupons" item="cp"}
+                            <tr>
+                                <td><strong>{$cp.coupon_name|default='优惠券'|htmlentities}</strong></td>
+                                <td>
+                                    {if $cp.coupon_type=='discount'}
+                                        <span class="text-warning">{:round($cp.coupon_discount * 10, 1)}折</span>
+                                    {else/}
+                                        <span class="text-danger">¥{$cp.coupon_amount}</span>
+                                    {/if}
+                                    <small class="text-muted">(满¥{$cp.min_amount})</small>
+                                </td>
+                                <td>
+                                    {if $cp.status=='used'}<span class="label label-success">已核销</span>
+                                    {elseif $cp.status=='expired'/}<span class="label label-default">已过期</span>
+                                    {else/}<span class="label label-info">未使用</span>{/if}
+                                </td>
+                                <td><code>{$cp.order_no|default='-'|htmlentities}</code></td>
+                            </tr>
+                            {/foreach}
+                        </tbody>
+                    </table>
+                    {else /}
+                    <div class="text-muted text-center" style="padding:14px 0;">暂无领券记录</div>
+                    {/if}
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- 近期服务订单记录 -->
+    <div class="ud-card" style="margin-bottom:0;">
+        <div class="ud-card-hd"><i class="fa fa-list-alt"></i> 近期预约下单记录 ({:count($recentOrders)})</div>
+        <div class="ud-card-bd">
+            {if !empty($recentOrders)}
+            <table class="table table-bordered table-hover table-condensed" style="font-size:12px; margin-bottom:0;">
+                <thead>
+                    <tr class="active"><th>订单号</th><th>服务项目</th><th>服务地址</th><th>承接师傅</th><th>实付金额</th><th>工单状态</th><th>下单时间</th></tr>
+                </thead>
+                <tbody>
+                    {foreach name="recentOrders" item="o"}
+                    <tr>
+                        <td><code>{$o.order_no|htmlentities}</code></td>
+                        <td><strong>{$o.service_name|htmlentities}</strong></td>
+                        <td>{$o.province|htmlentities}{$o.city|htmlentities}{$o.district|htmlentities}{$o.address|htmlentities}</td>
+                        <td>{$o.master_name|default='待指派'|htmlentities}</td>
+                        <td style="color:#ea580c;font-weight:700;">¥{$o.pay_amount}</td>
+                        <td><span class="label {if $o.status==8}label-success{elseif $o.status==9/}label-default{else/}label-primary{/if}">{$o.status_label|htmlentities}</span></td>
+                        <td>{$o.createtime|datetime}</td>
+                    </tr>
+                    {/foreach}
+                </tbody>
+            </table>
+            {else /}
+            <div class="text-muted text-center" style="padding:16px 0;">该会员暂无下单记录</div>
+            {/if}
+        </div>
+    </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="button" class="btn btn-primary btn-embossed" onclick="parent.Layer.closeAll();"><i class="fa fa-check"></i> 关闭窗口</button>
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/user/user/edit.html b/server/application/admin/view/user/user/edit.html
index 92b19db..fc8ee01 100755
--- a/server/application/admin/view/user/user/edit.html
+++ b/server/application/admin/view/user/user/edit.html
@@ -1,22 +1,14 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     {:token()}
     <input type="hidden" name="row[id]" value="{$row.id|htmlentities}">
+    <input type="hidden" name="row[group_id]" value="{$row.group_id|default=1|htmlentities}">
 
-    <!-- 1. 账号与基础身份 -->
     <div class="panel panel-default panel-form-section">
         <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-user-circle"></i> 账号与基础身份资料</h4>
+            <h4 class="panel-title"><i class="fa fa-user-circle"></i> 会员账号与联系资料</h4>
         </div>
         <div class="panel-body">
             <div class="row">
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-4">{:__('Group')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            {$groupList}
-                        </div>
-                    </div>
-                </div>
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
                         <label for="c-username" class="control-label col-xs-12 col-sm-4">{:__('Username')}:</label>
@@ -25,9 +17,6 @@
                         </div>
                     </div>
                 </div>
-            </div>
-
-            <div class="row">
                 <div class="col-xs-12 col-sm-6">
                     <div class="form-group">
                         <label for="c-nickname" class="control-label col-xs-12 col-sm-4">{:__('Nickname')}:</label>
@@ -36,14 +25,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label for="c-password" class="control-label col-xs-12 col-sm-4">{:__('Password')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-password" data-rule="password" class="form-control" name="row[password]" type="password" value="" placeholder="{:__('Leave password blank if dont want to change')}" autocomplete="new-password" />
-                        </div>
-                    </div>
-                </div>
             </div>
 
             <div class="row">
@@ -65,13 +46,35 @@
                 </div>
             </div>
 
+            <div class="row">
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label for="c-password" class="control-label col-xs-12 col-sm-4">重置登录密码:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <input id="c-password" data-rule="password" class="form-control" name="row[password]" type="password" value="" placeholder="{:__('Leave password blank if dont want to change')}" autocomplete="new-password" />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-sm-6">
+                    <div class="form-group">
+                        <label for="c-money" class="control-label col-xs-12 col-sm-4">账户余额:</label>
+                        <div class="col-xs-12 col-sm-8">
+                            <div class="input-group">
+                                <span class="input-group-addon">¥</span>
+                                <input id="c-money" class="form-control" step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}" readonly>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <div class="form-group">
                 <label for="c-avatar" class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
                 <div class="col-xs-12 col-sm-10">
                     <div class="input-group">
                         <input id="c-avatar" data-rule="" class="form-control" size="50" name="row[avatar]" type="text" value="{$row.avatar|htmlentities}">
                         <div class="input-group-addon no-border no-padding">
-                            <span><button type="button" id="faupload-avatar" class="btn btn-danger faupload" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                            <span><button type="button" id="faupload-avatar" class="btn btn-danger faupload" data-input-id="c-avatar" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="false" data-preview-id="p-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                             <span><button type="button" id="fachoose-avatar" class="btn btn-primary fachoose" data-input-id="c-avatar" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
                         </div>
                         <span class="msg-box n-right" for="c-avatar"></span>
@@ -82,7 +85,7 @@
 
             <div class="row">
                 <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
+                    <div class="form-group" style="margin-bottom:0;">
                         <label class="control-label col-xs-12 col-sm-4">{:__('Gender')}:</label>
                         <div class="col-xs-12 col-sm-8">
                             {:build_radios('row[gender]', ['1'=>__('Male'), '0'=>__('Female')], $row['gender'])}
@@ -90,159 +93,14 @@
                     </div>
                 </div>
                 <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label for="c-birthday" class="control-label col-xs-12 col-sm-4">{:__('Birthday')}:</label>
+                    <div class="form-group" style="margin-bottom:0;">
+                        <label class="control-label col-xs-12 col-sm-4">账号状态:</label>
                         <div class="col-xs-12 col-sm-8">
-                            <input id="c-birthday" data-rule="" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{$row.birthday|htmlentities}">
+                            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>'冻结停用'], $row['status'])}
                         </div>
                     </div>
                 </div>
             </div>
-
-            <div class="form-group">
-                <label for="c-bio" class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>
-                <div class="col-xs-12 col-sm-10">
-                    <input id="c-bio" data-rule="" class="form-control" name="row[bio]" type="text" value="{$row.bio|htmlentities}" placeholder="个性签名或自我介绍">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- 2. 资产与积分 -->
-    <div class="panel panel-default panel-form-section">
-        <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-cny"></i> 资产与等级体系</h4>
-        </div>
-        <div class="panel-body">
-            <div class="row">
-                <div class="col-xs-12 col-sm-4">
-                    <div class="form-group">
-                        <label for="c-level" class="control-label col-xs-12 col-sm-4">{:__('Level')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-level" data-rule="required" class="form-control" name="row[level]" type="number" value="{$row.level|htmlentities}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-4">
-                    <div class="form-group">
-                        <label for="c-money" class="control-label col-xs-12 col-sm-4">{:__('Money')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <div class="input-group">
-                                <span class="input-group-addon">¥</span>
-                                <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="number" value="{$row.money|htmlentities}">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-4">
-                    <div class="form-group">
-                        <label for="c-score" class="control-label col-xs-12 col-sm-4">{:__('Score')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <div class="input-group">
-                                <span class="input-group-addon">点</span>
-                                <input id="c-score" data-rule="required" class="form-control" name="row[score]" type="number" value="{$row.score|htmlentities}">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label for="c-successions" class="control-label col-xs-12 col-sm-4">{:__('Successions')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <div class="input-group">
-                                <input id="c-successions" data-rule="required" class="form-control" name="row[successions]" type="number" value="{$row.successions|htmlentities}">
-                                <span class="input-group-addon">天</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label for="c-maxsuccessions" class="control-label col-xs-12 col-sm-4">{:__('Maxsuccessions')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <div class="input-group">
-                                <input id="c-maxsuccessions" data-rule="required" class="form-control" name="row[maxsuccessions]" type="number" value="{$row.maxsuccessions|htmlentities}">
-                                <span class="input-group-addon">天</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- 3. 安全审计与登录状态 -->
-    <div class="panel panel-default panel-form-section">
-        <div class="panel-heading">
-            <h4 class="panel-title"><i class="fa fa-shield"></i> 安全审计与登录状态</h4>
-        </div>
-        <div class="panel-body">
-            <div class="row">
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label for="c-prevtime" class="control-label col-xs-12 col-sm-4">{:__('Prevtime')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-prevtime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[prevtime]" type="text" value="{$row.prevtime|datetime}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label for="c-logintime" class="control-label col-xs-12 col-sm-4">{:__('Logintime')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-logintime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[logintime]" type="text" value="{$row.logintime|datetime}">
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label for="c-loginip" class="control-label col-xs-12 col-sm-4">{:__('Loginip')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-loginip" data-rule="required" class="form-control" name="row[loginip]" type="text" value="{$row.loginip|htmlentities}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label for="c-loginfailure" class="control-label col-xs-12 col-sm-4">{:__('Loginfailure')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-loginfailure" data-rule="required" class="form-control" name="row[loginfailure]" type="number" value="{$row.loginfailure|htmlentities}">
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label for="c-jointime" class="control-label col-xs-12 col-sm-4">{:__('Jointime')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-jointime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[jointime]" type="text" value="{$row.jointime|datetime}">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-sm-6">
-                    <div class="form-group">
-                        <label for="c-joinip" class="control-label col-xs-12 col-sm-4">{:__('Joinip')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-joinip" data-rule="required" class="form-control" name="row[joinip]" type="text" value="{$row.joinip|htmlentities}">
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
-                <div class="col-xs-12 col-sm-10">
-                    {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
-                </div>
-            </div>
         </div>
     </div>
 
diff --git a/server/application/admin/view/user/user/index.html b/server/application/admin/view/user/user/index.html
index 91e1763..112e238 100755
--- a/server/application/admin/view/user/user/index.html
+++ b/server/application/admin/view/user/user/index.html
@@ -6,7 +6,7 @@
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        {:build_toolbar('refresh,edit,del')}
+                        {:build_toolbar('refresh,edit')}
                         <div class="dropdown btn-group {:$auth->check('user/user/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
@@ -16,13 +16,13 @@
                         </div>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('user/user/detail')}"
                            data-operate-edit="{:$auth->check('user/user/edit')}"
-                           data-operate-del="{:$auth->check('user/user/del')}"
+                           data-operate-del=""
                            width="100%">
                     </table>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
diff --git a/server/application/admin/view/user_coupon/index.html b/server/application/admin/view/user_coupon/index.html
new file mode 100644
index 0000000..31f84ee
--- /dev/null
+++ b/server/application/admin/view/user_coupon/index.html
@@ -0,0 +1,36 @@
+<div class="panel panel-default panel-intro">
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user_coupon/del')?'':'hide'}" title="{:__('Delete')}"><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <div class="dropdown btn-group {:$auth->check('user_coupon/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> 批量操作</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=expired"><i class="fa fa-ban"></i> 批量标记过期作废</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=unused"><i class="fa fa-undo"></i> 批量恢复为未使用</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit=""
+                           data-operate-del="{:$auth->check('user_coupon/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/wallet_log/detail.html b/server/application/admin/view/wallet_log/detail.html
new file mode 100644
index 0000000..f647dd8
--- /dev/null
+++ b/server/application/admin/view/wallet_log/detail.html
@@ -0,0 +1,67 @@
+<style>
+.wl-detail-wrap { padding: 12px 15px; }
+.wl-card { background: #fff; border: 1px solid #ebedf0; border-radius: 6px; margin-bottom: 14px; }
+.wl-card-hd { padding: 10px 15px; border-bottom: 1px solid #f0f0f2; font-weight: 600; background: #fafafa; border-radius: 6px 6px 0 0; }
+.wl-card-bd { padding: 14px 15px; }
+.wl-kv { margin-bottom: 8px; line-height: 1.6; }
+.wl-kv .k { color: #888; display: inline-block; min-width: 96px; }
+</style>
+
+<div class="wl-detail-wrap">
+    <div class="wl-card">
+        <div class="wl-card-hd">
+            <i class="fa fa-exchange text-primary"></i> 资金流水审计凭证 #WL{$row.id}
+            <span class="pull-right label label-info">{$typeList[$row.type]|default=$row.type}</span>
+        </div>
+        <div class="wl-card-bd">
+            <div class="row">
+                <div class="col-sm-6 wl-kv">
+                    <span class="k">变动金额：</span>
+                    {if $row.amount > 0}
+                    <strong class="text-success" style="font-size:16px;">+¥{$row.amount|htmlentities}</strong>
+                    {elseif $row.amount < 0/}
+                    <strong class="text-danger" style="font-size:16px;">¥{$row.amount|htmlentities}</strong>
+                    {else/}
+                    <strong>¥0.00</strong>
+                    {/if}
+                </div>
+                <div class="col-sm-6 wl-kv"><span class="k">变动后余额：</span><strong>¥{$row.balance|htmlentities}</strong></div>
+                <div class="col-sm-6 wl-kv"><span class="k">记账时间：</span>{:date('Y-m-d H:i:s', $row.createtime)}</div>
+                <div class="col-sm-6 wl-kv"><span class="k">账户归属端：</span>{$userTypeList[$row.user_type]|default=$row.user_type}</div>
+                <div class="col-sm-12 wl-kv" style="margin-bottom:0;"><span class="k">记账摘要：</span>{$row.remark|default='-'|htmlentities}</div>
+            </div>
+        </div>
+    </div>
+
+    <div class="wl-card" style="{if empty($order)}margin-bottom:0;{/if}">
+        <div class="wl-card-hd"><i class="fa fa-user-o text-info"></i> 变动账户主体信息</div>
+        <div class="wl-card-bd">
+            {if !empty($owner)}
+            <div class="row">
+                <div class="col-sm-6 wl-kv"><span class="k">主体身份：</span>{$owner.role|htmlentities}</div>
+                <div class="col-sm-6 wl-kv"><span class="k">姓名/昵称：</span><strong>{$owner.name|htmlentities}</strong>（{$owner.mobile|default='-'|htmlentities}）</div>
+                <div class="col-sm-6 wl-kv" style="margin-bottom:0;"><span class="k">实时可用余额：</span><span class="text-success">¥{$owner.money|htmlentities}</span></div>
+                <div class="col-sm-6 wl-kv" style="margin-bottom:0;"><span class="k">实时冻结金额：</span><span class="text-warning">¥{$owner.frozen|htmlentities}</span></div>
+            </div>
+            {else/}
+            <p class="text-muted" style="margin-bottom:0;">账户ID：{$row.user_id}</p>
+            {/if}
+        </div>
+    </div>
+
+    {if !empty($order)}
+    <div class="wl-card" style="margin-bottom:0;">
+        <div class="wl-card-hd"><i class="fa fa-file-text-o text-success"></i> 关联源头工单与清分信息</div>
+        <div class="wl-card-bd">
+            <div class="row">
+                <div class="col-sm-6 wl-kv"><span class="k">关联订单号：</span><code>{$order.order_no|htmlentities}</code></div>
+                <div class="col-sm-6 wl-kv"><span class="k">服务项目：</span>{$order.service_name|default='-'|htmlentities}</div>
+                <div class="col-sm-6 wl-kv" style="margin-bottom:0;"><span class="k">客户实付：</span>¥{$order.pay_amount|default='0.00'|htmlentities}</div>
+                {if !empty($settle)}
+                <div class="col-sm-6 wl-kv" style="margin-bottom:0;"><span class="k">清分抽佣：</span>抽成 {$settle.commission_rate}%（平台 ¥{$settle.commission} / 师傅 ¥{$settle.settle_amount}）</div>
+                {/if}
+            </div>
+        </div>
+    </div>
+    {/if}
+</div>
diff --git a/server/application/admin/view/wallet_log/index.html b/server/application/admin/view/wallet_log/index.html
new file mode 100644
index 0000000..ecf8270
--- /dev/null
+++ b/server/application/admin/view/wallet_log/index.html
@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="type">
+            <li class="{:$Think.get.type === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="typeList" item="vo"}
+            <li class="{:$Think.get.type === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
+                        <span class="label label-success" style="font-size:12px;padding:6px 10px;margin-left:6px;vertical-align:middle;">
+                            累计入账总额：¥{$totalIncome|number_format=2}
+                        </span>
+                        <span class="label label-warning" style="font-size:12px;padding:6px 10px;margin-left:4px;vertical-align:middle;">
+                            累计扣减/提现：¥{$totalOutflow|number_format=2}
+                        </span>
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('wallet_log/detail')}"
+                           data-operate-edit=""
+                           data-operate-del=""
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/withdraw/detail.html b/server/application/admin/view/withdraw/detail.html
new file mode 100644
index 0000000..0026ba7
--- /dev/null
+++ b/server/application/admin/view/withdraw/detail.html
@@ -0,0 +1,129 @@
+<style>
+.wd-detail-wrap { padding: 12px 15px; }
+.wd-card { background: #fff; border: 1px solid #ebedf0; border-radius: 6px; margin-bottom: 14px; }
+.wd-card-hd { padding: 10px 15px; border-bottom: 1px solid #f0f0f2; font-weight: 600; background: #fafafa; border-radius: 6px 6px 0 0; }
+.wd-card-bd { padding: 14px 15px; }
+.wd-stat { background: #f8fafc; border: 1px solid #eef1f5; border-radius: 6px; padding: 12px; text-align: center; }
+.wd-stat .lbl { color: #888; font-size: 12px; margin-bottom: 4px; }
+.wd-stat .val { font-size: 18px; font-weight: 700; color: #1f1f1f; }
+.wd-kv { margin-bottom: 8px; line-height: 1.6; }
+.wd-kv .k { color: #888; display: inline-block; min-width: 92px; }
+</style>
+
+<div class="wd-detail-wrap">
+    <!-- 1. 提现单账务概览 -->
+    <div class="wd-card">
+        <div class="wd-card-hd">
+            <i class="fa fa-rmb text-danger"></i> 提现申请单 #WD{$row.id}
+            <span class="pull-right label {if $row.status=='done'}label-success{elseif $row.status=='pass'/}label-info{elseif $row.status=='reject'/}label-danger{else/}label-warning{/if}">
+                {$statusList[$row.status]|default=$row.status|htmlentities}
+            </span>
+        </div>
+        <div class="wd-card-bd">
+            <div class="row" style="margin-bottom:14px;">
+                <div class="col-xs-4"><div class="wd-stat"><div class="lbl">申请提现总额</div><div class="val">¥{$row.amount|htmlentities}</div></div></div>
+                <div class="col-xs-4"><div class="wd-stat"><div class="lbl">提现手续费</div><div class="val text-muted">¥{$row.fee|htmlentities}</div></div></div>
+                <div class="col-xs-4"><div class="wd-stat"><div class="lbl">应打款到账净额</div><div class="val text-danger">¥{$row.arrive_amount|htmlentities}</div></div></div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6 wd-kv"><span class="k">提现渠道：</span><span class="label label-primary">{$channelList[$row.channel]|default=$row.channel|htmlentities}</span></div>
+                <div class="col-sm-6 wd-kv"><span class="k">收款账号：</span><code>{$row.account|htmlentities}</code></div>
+                <div class="col-sm-6 wd-kv"><span class="k">申请时间：</span>{:date('Y-m-d H:i:s', $row.createtime)}</div>
+                <div class="col-sm-6 wd-kv"><span class="k">更新时间：</span>{:date('Y-m-d H:i:s', $row.updatetime)}</div>
+                <div class="col-sm-12 wd-kv" style="margin-bottom:0;"><span class="k">财务批注：</span>{$row.audit_msg|default='-'|htmlentities}</div>
+            </div>
+        </div>
+    </div>
+
+    <!-- 2. 师傅资质与钱包核验 -->
+    <div class="wd-card">
+        <div class="wd-card-hd"><i class="fa fa-user-circle-o text-info"></i> 提现师傅资质与钱包核验</div>
+        <div class="wd-card-bd">
+            {if !empty($master)}
+            <div class="row">
+                <div class="col-sm-6 wd-kv"><span class="k">师傅姓名：</span><strong>{$master.realname|htmlentities}</strong>（{$master.mobile|htmlentities}）</div>
+                <div class="col-sm-6 wd-kv">
+                    <span class="k">实名状态：</span>
+                    {if $master.verify_status=='pass'}<span class="label label-success">已实名认证</span>{else/}<span class="label label-warning">{$master.verify_status|htmlentities}</span>{/if}
+                </div>
+                <div class="col-sm-6 wd-kv"><span class="k">当前可用余额：</span><strong class="text-success">¥{$master.money|default='0.00'|htmlentities}</strong></div>
+                <div class="col-sm-6 wd-kv"><span class="k">当前提现冻结：</span><strong class="text-warning">¥{$master.frozen_money|default='0.00'|htmlentities}</strong></div>
+                <div class="col-sm-6 wd-kv"><span class="k">常驻城市：</span>{$master.city|default='-'|htmlentities}</div>
+                <div class="col-sm-6 wd-kv"><span class="k">履约数据：</span>累计完单 {$master.order_count|default=0} 笔 · <i class="fa fa-star text-warning"></i> {$master.score|default='5.0'}</div>
+            </div>
+            {else/}
+            <p class="text-muted" style="margin-bottom:0;">未查询到师傅档案。</p>
+            {/if}
+        </div>
+    </div>
+
+    <!-- 3. 近期佣金结算来源 -->
+    <div class="wd-card">
+        <div class="wd-card-hd"><i class="fa fa-list-alt text-primary"></i> 近期工单佣金来源（最近 {:count($recentSettles)} 笔）</div>
+        <div class="wd-card-bd" style="padding:10px 15px;">
+            {if !empty($recentSettles)}
+            <div class="table-responsive">
+                <table class="table table-bordered table-condensed" style="margin-bottom:0;font-size:12px;">
+                    <thead>
+                        <tr class="active">
+                            <th>订单号</th>
+                            <th>服务项目</th>
+                            <th>工单金额</th>
+                            <th>师傅实得</th>
+                            <th>结算时间</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {volist name="recentSettles" id="st"}
+                        <tr>
+                            <td><code>{$st.order_no|default=$st.order_id|htmlentities}</code></td>
+                            <td>{$st.service_name|default='-'|htmlentities}</td>
+                            <td>¥{$st.order_amount|htmlentities}</td>
+                            <td class="text-success"><strong>+¥{$st.settle_amount|htmlentities}</strong></td>
+                            <td>{if $st.settle_time}{:date('Y-m-d H:i', $st.settle_time)}{else/}-{/if}</td>
+                        </tr>
+                        {/volist}
+                    </tbody>
+                </table>
+            </div>
+            {else/}
+            <p class="text-muted" style="margin-bottom:0;">暂无历史工单结算记录。</p>
+            {/if}
+        </div>
+    </div>
+
+    <!-- 4. 近期钱包变动流水 -->
+    <div class="wd-card" style="margin-bottom:0;">
+        <div class="wd-card-hd"><i class="fa fa-exchange text-success"></i> 近期钱包资金流水（最近 {:count($walletLogs)} 笔）</div>
+        <div class="wd-card-bd" style="padding:10px 15px;">
+            {if !empty($walletLogs)}
+            <div class="table-responsive">
+                <table class="table table-bordered table-condensed" style="margin-bottom:0;font-size:12px;">
+                    <thead>
+                        <tr class="active">
+                            <th>类型</th>
+                            <th>变动金额</th>
+                            <th>变动后余额</th>
+                            <th>摘要说明</th>
+                            <th>时间</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {volist name="walletLogs" id="wl"}
+                        <tr>
+                            <td><code>{$wl.type|htmlentities}</code></td>
+                            <td class="{if $wl.amount >= 0}text-success{else/}text-danger{/if}"><strong>{$wl.amount|htmlentities}</strong></td>
+                            <td>¥{$wl.balance|htmlentities}</td>
+                            <td>{$wl.remark|htmlentities}</td>
+                            <td>{:date('Y-m-d H:i:s', $wl.createtime)}</td>
+                        </tr>
+                        {/volist}
+                    </tbody>
+                </table>
+            </div>
+            {else/}
+            <p class="text-muted" style="margin-bottom:0;">暂无钱包资金变动流水。</p>
+            {/if}
+        </div>
+    </div>
+</div>
diff --git a/server/application/admin/view/withdraw/edit.html b/server/application/admin/view/withdraw/edit.html
index 99aecb7..0e2b780 100644
--- a/server/application/admin/view/withdraw/edit.html
+++ b/server/application/admin/view/withdraw/edit.html
@@ -91,13 +91,6 @@
             </div>
         </div>
     </div>
-    {else /}
-    <div class="panel panel-default panel-form-section">
-        <div class="panel-body">
-            <p class="text-muted" style="margin-bottom:0"><i class="fa fa-lock"></i> 该提现单已处于终态（{:$statusList[$row.status]}），流程结束，无需操作。</p>
-        </div>
-    </div>
-    {/if}
 
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
@@ -106,4 +99,11 @@
             <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
         </div>
     </div>
+    {else /}
+    <div class="panel panel-default panel-form-section">
+        <div class="panel-body">
+            <p class="text-muted" style="margin-bottom:0"><i class="fa fa-lock"></i> 该提现单已处于终态（{:$statusList[$row.status]}），流程结束，无需操作。</p>
+        </div>
+    </div>
+    {/if}
 </form>
diff --git a/server/application/admin/view/withdraw/index.html b/server/application/admin/view/withdraw/index.html
index 557434a..cdabcf4 100644
--- a/server/application/admin/view/withdraw/index.html
+++ b/server/application/admin/view/withdraw/index.html
@@ -1,5 +1,4 @@
 <div class="panel panel-default panel-intro">
-
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
@@ -10,22 +9,21 @@
         </ul>
     </div>
 
-
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}"><i class="fa fa-refresh"></i></a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-detail="{:$auth->check('withdraw/detail')}"
                            data-operate-edit="{:$auth->check('withdraw/edit')}"
                            data-operate-del=""
                            width="100%">
                     </table>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
diff --git a/server/application/api/controller/Auth.php b/server/application/api/controller/Auth.php
index e1be916..5aba1a9 100644
--- a/server/application/api/controller/Auth.php
+++ b/server/application/api/controller/Auth.php
@@ -51,23 +51,14 @@ class Auth extends Base
                 if ($user['status'] !== 'normal') {
                     $this->error('账号已被禁用');
                 }
-                // 若微信手机号快捷登录初始化的用户未设密码，直接落库更新密码
                 if (empty($user['password'])) {
-                    $salt = Random::alnum();
-                    $encryptPassword = $this->auth->getEncryptPassword($password, $salt);
-                    Db::name('user')->where('id', $user['id'])->update([
-                        'password'   => $encryptPassword,
-                        'salt'       => $salt,
-                        'updatetime' => time(),
-                    ]);
-                    $this->auth->direct($user['id']);
-                } else {
-                    $encryptPassword = $this->auth->getEncryptPassword($password, $user['salt']);
-                    if ($user['password'] !== $encryptPassword) {
-                        $this->error('手机号或密码不正确');
-                    }
-                    $this->auth->direct($user['id']);
+                    $this->error('该账号尚未设置登录密码，请使用验证码或微信登录后设置密码');
                 }
+                $encryptPassword = $this->auth->getEncryptPassword($password, $user['salt']);
+                if ($user['password'] !== $encryptPassword) {
+                    $this->error('手机号或密码不正确');
+                }
+                $this->auth->direct($user['id']);
             }
 
             // 直查真实数据库返回用户完整信息
@@ -153,6 +144,7 @@ class Auth extends Base
         $merchantRole = $merchantRel ? $merchantRel['role'] : null;
         $merchantInfo = null;
         if ($merchant) {
+            $memberCount = (int)Db::name('merchant_member')->where('merchant_id', (int)$merchant['id'])->count();
             $merchantInfo = [
                 'id'            => (int)$merchant['id'],
                 'name'          => $merchant['name'],
@@ -165,12 +157,42 @@ class Auth extends Base
                 'role'          => $merchantRole,
                 'is_owner'      => $merchantRole === 'owner',
                 'can_order'     => $merchant['verify_status'] === 'pass',
+                'member_count'  => $memberCount,
             ];
         }
 
-        $userType = (!empty($user['user_type']) && $user['user_type'] === 'merchant') || ($merchant && $merchant['verify_status'] === 'pass')
-            ? 'merchant'
-            : 'personal';
+        // 统计发单端各状态订单数量（与 Order::index 共享同一套团队归属口径）
+        $team = $this->currentMerchantTeam();
+        $teamUids = $team ? $team['user_ids'] : [$uid];
+        $statusGroups = Db::name('order')
+            ->field('status, count(*) as cnt')
+            ->where('user_id', 'in', $teamUids)
+            ->where('user_deleted', 0)
+            ->group('status')
+            ->select();
+        $rawCounts = [];
+        foreach ($statusGroups as $sg) {
+            $rawCounts[(int)$sg['status']] = (int)$sg['cnt'];
+        }
+        $getCnt = function ($st) use ($rawCounts) {
+            return isset($rawCounts[$st]) ? $rawCounts[$st] : 0;
+        };
+        $orderCounts = [
+            'pending_pay'    => $getCnt(0),
+            'pending_accept' => $getCnt(1),
+            'quoting'        => $getCnt(2),
+            'scheduled'      => $getCnt(3),
+            'serving'        => $getCnt(4) + $getCnt(5) + $getCnt(6),
+            'pending_verify' => $getCnt(7),
+        ];
+
+        if ($merchantRole === 'member' && $merchant && $merchant['verify_status'] === 'pass') {
+            $userType = 'merchant';
+        } elseif (!empty($user['user_type']) && in_array($user['user_type'], ['personal', 'merchant'], true)) {
+            $userType = $user['user_type'];
+        } else {
+            $userType = ($merchant && $merchant['verify_status'] === 'pass') ? 'merchant' : 'personal';
+        }
 
         return [
             'id'              => (int)$user['id'],
@@ -187,6 +209,7 @@ class Auth extends Base
             'balance'         => (float)$user['money'],
             'coupon_count'    => (int)$couponCount,
             'unread_count'    => (int)$unread,
+            'order_counts'    => $orderCounts,
             'is_master'       => $master ? true : false,
             'master'          => $masterInfo,
             'is_merchant'     => $merchant ? true : false,
@@ -230,6 +253,13 @@ class Auth extends Base
             $this->error('电子邮箱格式不正确');
         }
 
+        $merchantRel = $this->merchantOf($uid);
+        if ($userType === 'merchant') {
+            if (!$merchantRel || ($merchantRel['merchant']['verify_status'] ?? '') !== 'pass') {
+                $this->error('请先提交企业入驻申请并通过审核后再启用商家账号');
+            }
+        }
+
         $userUpdate = [
             'nickname'        => $nickname,
             'user_type'       => $userType,
@@ -246,11 +276,11 @@ class Auth extends Base
         }
         Db::name('user')->where('id', $uid)->update($userUpdate);
 
-        if ($userType === 'merchant') {
-            $existMerchant = Db::name('merchant')->where('user_id', $uid)->find();
+        if ($userType === 'merchant' && $merchantRel && $merchantRel['role'] === 'owner') {
+            $existMerchant = $merchantRel['merchant'];
             $curUser = Db::name('user')->where('id', $uid)->find();
             $merchantSave = [
-                'name'         => $companyName !== '' ? $companyName : ($existMerchant ? $existMerchant['name'] : $nickname),
+                'name'         => $companyName !== '' ? $companyName : (!empty($existMerchant['name']) ? $existMerchant['name'] : $nickname),
                 'legal_person' => $legalPerson,
                 'legal_mobile' => $legalMobile,
                 'tech_mobile'  => $techMobile,
@@ -260,15 +290,7 @@ class Auth extends Base
                 'email'        => $email,
                 'updatetime'   => time(),
             ];
-            if ($existMerchant) {
-                Db::name('merchant')->where('id', $existMerchant['id'])->update($merchantSave);
-            } else {
-                $merchantSave['user_id'] = $uid;
-                $merchantSave['license_no'] = '';
-                $merchantSave['verify_status'] = 'pass';
-                $merchantSave['createtime'] = time();
-                Db::name('merchant')->insert($merchantSave);
-            }
+            Db::name('merchant')->where('id', (int)$existMerchant['id'])->update($merchantSave);
         }
 
         $this->success('保存成功', ['userinfo' => $this->profileData()]);
@@ -405,7 +427,7 @@ class Auth extends Base
         if ($role === 'master') {
             $redirect = '/pages/master/hall';
         } elseif ($role === 'merchant') {
-            $redirect = '/pages/merchant/workbench';
+            $redirect = '/pages/mine/mine';
         }
 
         $this->success('切换成功', ['role' => $role, 'redirect' => $redirect]);
diff --git a/server/application/api/controller/Base.php b/server/application/api/controller/Base.php
index a6e6b6d..ee8ecc5 100644
--- a/server/application/api/controller/Base.php
+++ b/server/application/api/controller/Base.php
@@ -84,7 +84,10 @@ class Base extends Api
             $this->error('订单不存在');
         }
         if ($side === 'user' && (int)$order['user_id'] !== $this->uid()) {
-            $this->error('无权操作该订单', null, 403);
+            $team = $this->currentMerchantTeam();
+            if (!$team || !in_array((int)$order['user_id'], $team['user_ids'], true)) {
+                $this->error('无权操作该订单', null, 403);
+            }
         }
         if ($side === 'master') {
             $master = $this->requireMaster();
@@ -95,6 +98,40 @@ class Base extends Api
         return $order;
     }
 
+    /**
+     * 获取当前登录用户所属的已认证商家团队（主账号 + 关联子账号）
+     * @return array|null ['merchant' => array, 'user_ids' => int[]]
+     */
+    protected function currentMerchantTeam()
+    {
+        $uid = $this->uid();
+        if ($uid <= 0) {
+            return null;
+        }
+        $merchant = Db::name('merchant')->where('user_id', $uid)->find();
+        if (!$merchant) {
+            $bind = Db::name('merchant_member')->where('user_id', $uid)->find();
+            if ($bind) {
+                $merchant = Db::name('merchant')->where('id', (int)$bind['merchant_id'])->find();
+            }
+        }
+        if (!$merchant || $merchant['verify_status'] !== 'pass') {
+            return null;
+        }
+        $ids = [(int)$merchant['user_id']];
+        $rows = Db::name('merchant_member')->where('merchant_id', (int)$merchant['id'])->column('user_id');
+        foreach ($rows as $id) {
+            $id = (int)$id;
+            if ($id > 0 && !in_array($id, $ids, true)) {
+                $ids[] = $id;
+            }
+        }
+        return [
+            'merchant' => $merchant,
+            'user_ids' => $ids,
+        ];
+    }
+
     /**
      * 订单状态流转：校验 → 更新 → 写流水
      */
diff --git a/server/application/api/controller/Demo.php b/server/application/api/controller/Demo.php
index 3a992e4..829718e 100755
--- a/server/application/api/controller/Demo.php
+++ b/server/application/api/controller/Demo.php
@@ -15,9 +15,9 @@ class Demo extends Api
     //如果接口已经设置无需登录,那也就无需鉴权了
     //
     // 无需登录的接口,*表示全部
-    protected $noNeedLogin = ['test', 'test1'];
+    protected $noNeedLogin = [];
     // 无需鉴权的接口,*表示全部
-    protected $noNeedRight = ['test2'];
+    protected $noNeedRight = [];
 
     /**
      * 测试方法
@@ -40,7 +40,7 @@ class Demo extends Api
      */
     public function test()
     {
-        $this->success('返回成功', $this->request->param());
+        $this->error('无权限访问测试接口', null, 403);
     }
 
     /**
@@ -49,7 +49,7 @@ class Demo extends Api
      */
     public function test1()
     {
-        $this->success('返回成功', ['action' => 'test1']);
+        $this->error('无权限访问测试接口', null, 403);
     }
 
     /**
@@ -58,7 +58,7 @@ class Demo extends Api
      */
     public function test2()
     {
-        $this->success('返回成功', ['action' => 'test2']);
+        $this->error('无权限访问测试接口', null, 403);
     }
 
     /**
@@ -67,7 +67,7 @@ class Demo extends Api
      */
     public function test3()
     {
-        $this->success('返回成功', ['action' => 'test3']);
+        $this->error('无权限访问测试接口', null, 403);
     }
 
 }
diff --git a/server/application/api/controller/Home.php b/server/application/api/controller/Home.php
index 52963d2..276c6d5 100644
--- a/server/application/api/controller/Home.php
+++ b/server/application/api/controller/Home.php
@@ -9,7 +9,7 @@ use think\Db;
  */
 class Home extends Base
 {
-    protected $noNeedLogin = ['index', 'feed', 'cats', 'services', 'detail', 'calc', 'specs', 'masterCount', 'orderCase'];
+    protected $noNeedLogin = ['index', 'feed', 'cats', 'services', 'detail', 'calc', 'specs', 'masterCount', 'orderCase', 'agreement', 'systemGallery'];
 
     /**
      * 首页聚合：类目 + 热门服务 + 我的角标
@@ -161,6 +161,7 @@ class Home extends Base
             'banners'            => $this->banners(),
             'assures'            => $this->configList('home_assure', '平台认证,先行赔付,极速上门,售后无忧'),
             'tutorial'           => $this->tutorial(),
+            'service_phone'      => (string)(\think\Config::get('site.service_phone') ?: ''),
             'badge'              => ['coupon' => 0, 'unread' => 0],
         ];
 
@@ -566,9 +567,6 @@ class Home extends Base
     {
         $catId = (int)$this->request->param('cat_id');
         $keyword = trim((string)$this->request->param('keyword'));
-        if ($catId <= 0 && $keyword === '') {
-            $this->error('请选择服务类目');
-        }
         $query = Db::name('service')->where('status', 'normal');
         if ($catId > 0) {
             $query->where('cat_id', $catId);
@@ -605,10 +603,12 @@ class Home extends Base
             ->select();
         $ret = [];
         foreach ($specs as $sp) {
+            $spImg = isset($sp['image']) ? trim((string)$sp['image']) : '';
             $ret[] = [
                 'id'          => (int)$sp['id'],
                 'service_id'  => (int)$sp['service_id'],
                 'name'        => $sp['name'],
+                'image_url'   => $spImg !== '' ? (strpos($spImg, 'http') === 0 ? $spImg : cdnurl($spImg, true)) : '',
                 'description' => (string)$sp['description'],
                 'base_price'  => (float)$sp['base_price'],
             ];
@@ -639,22 +639,30 @@ class Home extends Base
         $province = trim((string)$this->request->param('province', ''));
         $city = trim((string)$this->request->param('city', ''));
         $district = trim((string)$this->request->param('district', ''));
-        $catId = (int)$this->request->param('cat_id', 0);
 
-        $query = Db::name('master')->where('verify_status', 'pass');
+        $platformCount = (int)Db::name('master')->where('verify_status', 'pass')->count();
+        $total = $platformCount;
+        $matchedLocal = false;
+
         if ($city !== '') {
-            $query->where('city', 'like', '%' . $city . '%');
+            $shortCity = mb_strlen($city, 'UTF-8') > 2 ? preg_replace('/市$/u', '', $city) : $city;
+            $cityCount = (int)Db::name('master')
+                ->where('verify_status', 'pass')
+                ->where('city', 'like', '%' . $shortCity . '%')
+                ->count();
+            if ($cityCount > 0) {
+                $total = $cityCount;
+                $matchedLocal = true;
+            }
         }
-        $realCount = $query->count();
-        // 商业化基础运力感知（基于城市区县散列生成可信且稳定的运力规模，例如 150~1800+）
-        $hashSeed = sprintf('%u', crc32($province . $city . $district));
-        $virtualBase = 150 + ($hashSeed % 1700);
-        $total = max($realCount, $virtualBase);
 
         $this->success('', [
-            'count'  => (int)$total,
-            'region' => trim($city . ' ' . $district),
-            'tip'    => "该地区可提供服务的师傅共 {$total} 位",
+            'count'          => (int)$total,
+            'platform_count' => $platformCount,
+            'region'         => trim($city . ' ' . $district),
+            'tip'            => $matchedLocal
+                ? "该地区可提供服务的师傅共 {$total} 位"
+                : "平台认证可服务师傅共 {$total} 位",
         ]);
     }
 
@@ -665,7 +673,7 @@ class Home extends Base
     public function calc()
     {
         $serviceId = (int)$this->request->param('service_id');
-        $goodsListRaw = $this->request->param('goods_list', '', null);
+        $goodsListRaw = $this->request->param('goods_list', $this->request->param('items', '', null), null);
         $goodsList = [];
         if (!empty($goodsListRaw)) {
             if (is_string($goodsListRaw)) {
@@ -697,14 +705,24 @@ class Home extends Base
             $service = Db::name('service')->where('id', $serviceId)->where('status', 'normal')->find();
         }
 
-        $result = self::calcAmount($service, [
-            'floor'        => (int)$this->request->param('floor', 1),
-            'has_elevator' => (int)$this->request->param('has_elevator', 1),
-            'urgent'       => (int)$this->request->param('urgent', 0),
-        ], (int)$this->request->param('coupon_id', 0), $this->uid(),
-            (string)$this->request->param('price_type', ''),
-            (float)$this->request->param('user_price', 0),
-            $goodsList);
+        try {
+            $result = self::calcAmount($service, [
+                'floor'        => (int)$this->request->param('floor', 1),
+                'has_elevator' => (int)$this->request->param('has_elevator', 1),
+                'urgent'       => (int)$this->request->param('urgent', 0),
+                'goods_num'    => max(1, (int)$this->request->param('goods_num', $this->request->param('num', 1))),
+                'spec_id'      => (int)$this->request->param('spec_id', 0),
+                'service_type' => trim((string)$this->request->param('service_type', '')),
+                'is_custom'    => (int)$this->request->param('is_custom', 0),
+                'base_price'   => $this->request->param('base_price', null),
+            ], (int)$this->request->param('coupon_id', 0), $this->uid(),
+                (string)$this->request->param('price_type', ''),
+                (float)$this->request->param('user_price', 0),
+                $goodsList);
+        } catch (\InvalidArgumentException $e) {
+            $this->error($e->getMessage());
+            return;
+        }
 
         $this->success('', $result);
     }
@@ -713,7 +731,7 @@ class Home extends Base
      * 金额计算（下单与试算共用，保证前后端口径一致）
      *
      * @param array  $service   服务行（可选）
-     * @param array  $params    floor / has_elevator / urgent
+     * @param array  $params    floor / has_elevator / urgent / goods_num / spec_id / service_type / is_custom / strict
      * @param int    $couponId  用户优惠券 id
      * @param int    $uid       用户 id
      * @param string $priceType 计价方式：fixed 一口价 / quote 师傅报价 / custom 用户自主定价
@@ -724,8 +742,10 @@ class Home extends Base
     {
         $allowTypes = ['fixed', 'quote', 'range', 'custom'];
         $type = in_array($priceType, $allowTypes, true) ? $priceType : ($service ? $service['price_type'] : 'fixed');
+        $isFixedLike = in_array($type, ['fixed', 'range'], true);
+        $isStrict = !empty($params['strict']);
 
-        // 支持多商品组合与增项计算（后端结合 fa_service 与 fa_service_spec 权威核验单价）
+        // 支持多商品组合与增项计算（一口价模式下强制从 fa_service 与 fa_service_spec 读取真实价格，严禁采信前端传入 base_price）
         $base = 0;
         if (!empty($goodsList) && is_array($goodsList)) {
             $serviceCache = [];
@@ -744,31 +764,50 @@ class Home extends Base
                 $sid = isset($g['service_id']) ? (int)$g['service_id'] : 0;
                 $specId = isset($g['spec_id']) ? (int)$g['spec_id'] : 0;
                 $reqServiceType = isset($g['service_type']) ? trim((string)$g['service_type']) : '';
-                $isCustom = !empty($g['is_custom']) || (isset($g['cat_id']) && (int)$g['cat_id'] === 15);
+                $isCustom = !empty($g['is_custom']);
 
                 $dbSvc = null;
-                if ($sid > 0 && !$isCustom) {
+                if ($sid > 0) {
                     if (!array_key_exists($sid, $serviceCache)) {
-                        $serviceCache[$sid] = Db::name('service')->where('id', $sid)->find() ?: null;
+                        $serviceCache[$sid] = Db::name('service')->where('id', $sid)->where('status', 'normal')->find() ?: null;
                     }
                     $dbSvc = $serviceCache[$sid];
                 }
 
-                $specPrice = 0.0;
-                if ($specId > 0 && !$isCustom) {
-                    if (!array_key_exists($specId, $specCache)) {
-                        $spQuery = Db::name('service_spec')->where('id', $specId);
-                        if ($sid > 0) {
-                            $spQuery->where('service_id', $sid);
+                if ($isFixedLike) {
+                    // 纯空占位行（下单页首次加载尚未选服务时试算）容忍返回 0；只要带了 is_custom、自填名称、自定义价格或处于创单严格校验则强制拦截
+                    $hasCustomInput = $isCustom
+                        || !empty($g['custom_name'])
+                        || !empty($g['item_name'])
+                        || !empty($g['goods_name'])
+                        || (isset($g['base_price']) && (float)$g['base_price'] > 0);
+                    if ($sid <= 0) {
+                        if ($hasCustomInput || $isStrict) {
+                            throw new \InvalidArgumentException('自定义商品不支持一口价模式，请关联有效服务项目或切换为师傅报价/自主定价');
                         }
-                        $specCache[$specId] = $spQuery->find() ?: null;
+                        continue;
                     }
-                    if (!empty($specCache[$specId])) {
-                        $specPrice = (float)$specCache[$specId]['base_price'];
+                    if (!$dbSvc || $dbSvc['price_type'] === 'quote') {
+                        throw new \InvalidArgumentException('所选服务项目不存在或不支持一口价模式，请切换为师傅报价/自主定价');
                     }
                 }
 
-                $itemPrice = isset($g['base_price']) ? max(0, (float)$g['base_price']) : 0.0;
+                $specPrice = 0.0;
+                if ($specId > 0 && $dbSvc) {
+                    $cacheKey = $sid . ':' . $specId;
+                    if (!array_key_exists($cacheKey, $specCache)) {
+                        $specCache[$cacheKey] = Db::name('service_spec')
+                            ->where('id', $specId)
+                            ->where('service_id', $sid)
+                            ->where('status', 'normal')
+                            ->find() ?: null;
+                    }
+                    if (!empty($specCache[$cacheKey])) {
+                        $specPrice = (float)$specCache[$cacheKey]['base_price'];
+                    }
+                }
+
+                $itemPrice = 0.0;
                 $dbAddonsMap = [];
 
                 if ($dbSvc) {
@@ -784,7 +823,7 @@ class Home extends Base
                         }
                     }
 
-                    // 方案2计价优先级：若规格设置了专属一口价(>0)且当前为默认主服务，则优先采用规格专属价；否则采用所选主服务定价或商品默认价
+                    // 若规格设置了专属一口价(>0)且当前为默认主服务，则优先采用规格专属价；否则采用所选主服务定价或商品默认价
                     $isDefaultService = ($reqServiceType === '' || $reqServiceType === $defaultCode || $reqServiceType === 'install');
                     if ($specPrice > 0 && $isDefaultService) {
                         $itemPrice = $specPrice;
@@ -807,28 +846,76 @@ class Home extends Base
                     }
                 }
 
-                $itemNum = isset($g['num']) ? max(1, (int)$g['num']) : 1;
-                $base += $itemPrice * $itemNum;
+                if ($isFixedLike && $itemPrice <= 0) {
+                    throw new \InvalidArgumentException('所选服务规格暂未配置一口价，请切换为师傅报价或自主定价');
+                }
+
+                $itemNum = isset($g['num']) ? max(1, (int)$g['num']) : (isset($g['goods_num']) ? max(1, (int)$g['goods_num']) : 1);
+                $base += round($itemPrice * $itemNum, 2);
                 if (!empty($g['extras']) && is_array($g['extras'])) {
                     foreach ($g['extras'] as $ex) {
                         $exNum = isset($ex['num']) ? max(0, (int)$ex['num']) : 0;
                         if ($exNum <= 0) {
                             continue;
                         }
-                        $exPrice = isset($ex['price']) ? max(0, (float)$ex['price']) : 0.0;
+                        $exPrice = 0.0;
                         $exName = isset($ex['name']) ? (string)$ex['name'] : '';
                         $exCode = isset($ex['code']) ? (string)$ex['code'] : '';
                         if ($exName !== '' && isset($dbAddonsMap[$exName])) {
                             $exPrice = $dbAddonsMap[$exName];
                         } elseif ($exCode !== '' && isset($dbAddonsMap[$exCode])) {
                             $exPrice = $dbAddonsMap[$exCode];
+                        } elseif (!$isFixedLike && isset($ex['price'])) {
+                            $exPrice = max(0, (float)$ex['price']);
                         }
-                        $base += $exPrice * $exNum;
+                        $base += round($exPrice * $exNum, 2);
                     }
                 }
             }
         } elseif ($service) {
-            $base = (float)$service['base_price'];
+            if ($isFixedLike && $service['price_type'] === 'quote') {
+                throw new \InvalidArgumentException('该服务项目不支持一口价模式，请切换为师傅报价或自主定价');
+            }
+            $unitPrice = (float)$service['base_price'];
+            $specId = isset($params['spec_id']) ? (int)$params['spec_id'] : 0;
+            $reqServiceType = isset($params['service_type']) ? trim((string)$params['service_type']) : '';
+            $specPrice = 0.0;
+            if ($specId > 0) {
+                $spRow = Db::name('service_spec')
+                    ->where('id', $specId)
+                    ->where('service_id', (int)$service['id'])
+                    ->where('status', 'normal')
+                    ->find();
+                if ($spRow && (float)$spRow['base_price'] > 0) {
+                    $specPrice = (float)$spRow['base_price'];
+                }
+            }
+            $svcTypes = !empty($service['service_types']) ? (json_decode((string)$service['service_types'], true) ?: []) : [];
+            $defaultCode = 'install';
+            $matchedTypePrice = 0.0;
+            foreach ($svcTypes as $st) {
+                if (!empty($st['is_default']) && !empty($st['code'])) {
+                    $defaultCode = (string)$st['code'];
+                }
+                if ($reqServiceType !== '' && isset($st['code']) && (string)$st['code'] === $reqServiceType) {
+                    $matchedTypePrice = isset($st['price']) ? (float)$st['price'] : 0.0;
+                }
+            }
+            $isDefaultService = ($reqServiceType === '' || $reqServiceType === $defaultCode || $reqServiceType === 'install');
+            if ($specPrice > 0 && $isDefaultService) {
+                $unitPrice = $specPrice;
+            } elseif ($matchedTypePrice > 0) {
+                $unitPrice = $matchedTypePrice;
+            } elseif ($specPrice > 0) {
+                $unitPrice = $specPrice;
+            }
+            if ($isFixedLike && $unitPrice <= 0) {
+                throw new \InvalidArgumentException('该服务项目暂未配置有效一口价，请切换为师傅报价或自主定价');
+            }
+            $goodsNum = isset($params['goods_num']) ? max(1, (int)$params['goods_num']) : 1;
+            $base = round($unitPrice * $goodsNum, 2);
+        } elseif ($isFixedLike && (!empty($params['is_custom']) || $isStrict || (isset($params['base_price']) && (float)$params['base_price'] > 0))) {
+            throw new \InvalidArgumentException('自定义商品不支持一口价模式，请关联有效服务项目或切换为师傅报价/自主定价');
         }
 
         $floorAmount = 0;
@@ -1009,10 +1096,12 @@ class Home extends Base
                 if (!isset($specsMap[$sid])) {
                     $specsMap[$sid] = [];
                 }
+                $spImg = isset($sp['image']) ? trim((string)$sp['image']) : '';
                 $specsMap[$sid][] = [
                     'id'          => (int)$sp['id'],
                     'service_id'  => $sid,
                     'name'        => $sp['name'],
+                    'image_url'   => $spImg !== '' ? (strpos($spImg, 'http') === 0 ? $spImg : cdnurl($spImg, true)) : '',
                     'description' => (string)$sp['description'],
                     'base_price'  => (float)$sp['base_price'],
                 ];
@@ -1255,4 +1344,168 @@ class Home extends Base
             ]
         ]);
     }
+
+    /**
+     * 平台协议与合规条款读取（支持后台站点配置覆盖）
+     */
+    public function agreement()
+    {
+        $type = trim((string)$this->request->param('type', 'user_service'));
+        $map = [
+            'service'      => [
+                'key'     => 'agreement_service',
+                'title'   => '优匠优服用户服务协议',
+                'content' => "1. 平台定位：优匠优服为客户与认证技能师傅提供上门安装、维修、拆旧及维保信息撮合与交易担保服务。\n\n2. 计费准则：一口价项目按公示标准计费；报价订单由师傅根据现场工况公开报价，经客户确认支付后生效。\n\n3. 验收与结算：订单资金由平台托管，师傅完工拍照并经客户确认（或提供6位核销码）后完成结算。\n\n4. 交易规范：为保障售后质保与资金安全，请勿脱离平台私下转账交易。",
+            ],
+            'user_service' => [
+                'key'     => 'agreement_service',
+                'title'   => '优匠优服用户服务协议',
+                'content' => "1. 平台定位：优匠优服为客户与认证技能师傅提供上门安装、维修、拆旧及维保信息撮合与交易担保服务。\n\n2. 计费准则：一口价项目按公示标准计费；报价订单由师傅根据现场工况公开报价，经客户确认支付后生效。\n\n3. 验收与结算：订单资金由平台托管，师傅完工拍照并经客户确认（或提供6位核销码）后完成结算。\n\n4. 交易规范：为保障售后质保与资金安全，请勿脱离平台私下转账交易。",
+            ],
+            'privacy'      => [
+                'key'     => 'agreement_privacy',
+                'title'   => '优匠优服隐私保护指引',
+                'content' => "1. 信息收集范围：仅在您授权登录、预约上门地址及联系师傅等必要场景下收集手机号码与服务地址信息。\n\n2. 最小必要原则：客户真实联系信息仅对已接单履约的当单认证师傅可见，未接单前全程脱敏展示。\n\n3. 数据传输安全：全链路采用加密通信并严格管控访问权限，绝不向无关第三方共享或出售个人信息。\n\n4. 用户权利：您可随时在个人中心查询、修改账户资料及管理服务地址。",
+            ],
+            'master'       => [
+                'key'     => 'agreement_master',
+                'title'   => '师傅入驻与履约服务协议',
+                'content' => "1. 实名与技能核验：入驻师傅须提交本人真实有效身份证件及服务技能信息，严禁冒用他人资质。\n\n2. 履约时效：接单后须在平台规定时效内联系客户确认上门时间，准时到达现场并规范施工。\n\n3. 收费透明：如需现场增项补差，必须提前向客户说明并在工单内发起补差申请，严禁私自索要额外费用。\n\n4. 完工留痕与结算：施工完成后须上传真实清晰的现场完工照片，凭客户验收或核销码触发系统结算。",
+            ],
+            'merchant'     => [
+                'key'     => 'agreement_merchant',
+                'title'   => '企业商家入驻与协同服务协议',
+                'content' => "1. 资质真实性：申请入驻的企业或商户须提供真实有效的营业执照与主体信息。\n\n2. 成员协同管理：主账号可绑定企业协同成员共同发起批量工单与跟进履约，并对企业关联工单承担管理责任。\n\n3. 对账与开票：平台按实际支付与完工订单汇总企业月度账单，支持在线申请正规增值税普通发票或专用发票。",
+            ],
+        ];
+
+        $item = isset($map[$type]) ? $map[$type] : $map['user_service'];
+        $cfgVal = \think\Config::get('site.' . $item['key']);
+        $content = (is_string($cfgVal) && trim($cfgVal) !== '') ? trim($cfgVal) : $item['content'];
+
+        $this->success('', [
+            'type'    => $type,
+            'title'   => $item['title'],
+            'content' => $content,
+        ]);
+    }
+
+    /**
+     * 官方系统图库（二级商品分类侧边栏 + 款式参考图片双列网格）
+     */
+    public function systemGallery()
+    {
+        $catId = (int)$this->request->param('cat_id', 0);
+        $serviceId = (int)$this->request->param('service_id', 0);
+        $keyword = trim((string)$this->request->param('keyword', ''));
+
+        $rawCats = Db::name('service_cat')
+            ->field('id,name,icon')
+            ->where('status', 'normal')
+            ->where('id', '<>', 15)
+            ->order('weigh desc,id asc')
+            ->select();
+        $cats = $this->formatCats($rawCats);
+
+        if ($serviceId > 0 && $catId <= 0) {
+            $foundCatId = (int)Db::name('service')->where('id', $serviceId)->value('cat_id');
+            if ($foundCatId > 0 && $foundCatId !== 15) {
+                $catId = $foundCatId;
+            }
+        }
+        if ($catId === 0 && !empty($cats)) {
+            $catId = (int)$cats[0]['id'];
+        }
+
+        $svcQuery = Db::name('service')
+            ->field('id,cat_id,name,image')
+            ->where('status', 'normal')
+            ->where('cat_id', '<>', 15);
+        if ($catId > 0) {
+            $svcQuery->where('cat_id', $catId);
+        }
+        $svcRows = $svcQuery->order('weigh desc,sales desc,id asc')->select();
+        $svcIds = array_column($svcRows, 'id');
+
+        $galleryMap = [];
+        if (!empty($svcIds)) {
+            $gQuery = Db::name('system_gallery')
+                ->where('service_id', 'in', $svcIds)
+                ->where('status', 'normal');
+            if ($keyword !== '') {
+                $gQuery->where('title', 'like', '%' . $keyword . '%');
+            }
+            $gRows = $gQuery->order('weigh desc,id asc')->select();
+            foreach ($gRows as $gr) {
+                $sid = (int)$gr['service_id'];
+                $rawImg = trim((string)$gr['image']);
+                if ($rawImg === '') {
+                    continue;
+                }
+                $galleryMap[$sid][] = [
+                    'id'         => (int)$gr['id'],
+                    'service_id' => $sid,
+                    'spec_id'    => (int)$gr['spec_id'],
+                    'title'      => (string)$gr['title'],
+                    'image_url'  => strpos($rawImg, 'http') === 0 ? $rawImg : cdnurl($rawImg, true),
+                ];
+            }
+        }
+
+        // 若个别服务尚未写入 fa_system_gallery，回退读取真实规格与服务主图
+        $services = [];
+        foreach ($svcRows as $sr) {
+            $sid = (int)$sr['id'];
+            $items = isset($galleryMap[$sid]) ? $galleryMap[$sid] : [];
+            if (empty($items) && $keyword === '') {
+                $defaultImg = trim((string)$sr['image']);
+                if ($defaultImg !== '') {
+                    $fullDef = strpos($defaultImg, 'http') === 0 ? $defaultImg : cdnurl($defaultImg, true);
+                    $spList = Db::name('service_spec')
+                        ->where('service_id', $sid)
+                        ->where('status', 'normal')
+                        ->order('weigh desc,id asc')
+                        ->select();
+                    if (!empty($spList)) {
+                        foreach ($spList as $sp) {
+                            $spImg = !empty($sp['image']) ? trim((string)$sp['image']) : '';
+                            $items[] = [
+                                'id'         => 100000 + (int)$sp['id'],
+                                'service_id' => $sid,
+                                'spec_id'    => (int)$sp['id'],
+                                'title'      => (string)$sp['name'],
+                                'image_url'  => $spImg !== '' ? (strpos($spImg, 'http') === 0 ? $spImg : cdnurl($spImg, true)) : $fullDef,
+                            ];
+                        }
+                    } else {
+                        $items[] = [
+                            'id'         => 200000 + $sid,
+                            'service_id' => $sid,
+                            'spec_id'    => 0,
+                            'title'      => (string)$sr['name'],
+                            'image_url'  => $fullDef,
+                        ];
+                    }
+                }
+            }
+            if ($keyword !== '' && empty($items) && mb_strpos((string)$sr['name'], $keyword) === false) {
+                continue;
+            }
+            if (!empty($items)) {
+                $services[] = [
+                    'id'     => $sid,
+                    'cat_id' => (int)$sr['cat_id'],
+                    'name'   => (string)$sr['name'],
+                    'count'  => count($items),
+                    'items'  => $items,
+                ];
+            }
+        }
+
+        $this->success('', [
+            'cats'           => $cats,
+            'current_cat_id' => $catId,
+            'services'       => $services,
+        ]);
+    }
 }
diff --git a/server/application/api/controller/Invoice.php b/server/application/api/controller/Invoice.php
new file mode 100644
index 0000000..f51cc4f
--- /dev/null
+++ b/server/application/api/controller/Invoice.php
@@ -0,0 +1,233 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\library\InvoiceService;
+use think\Log;
+
+/**
+ * 发票中心（个人业主与企业商家通用）：
+ * 额度汇总 / 按单勾选开票 / 发票抬头管理 / 开票记录与详情 / 撤回申请
+ */
+class Invoice extends Base
+{
+    /**
+     * 开票首页概览（可开票额度、默认抬头、未开票订单数、记录统计）
+     */
+    public function summary()
+    {
+        $quota = InvoiceService::getQuotaSummary($this->uid());
+        $titles = InvoiceService::getTitleList($this->uid());
+        $this->success('', [
+            'quota'  => $quota,
+            'titles' => $titles,
+        ]);
+    }
+
+    /**
+     * 可开票已完成订单列表（支持分页或传入 order_ids 核对已勾选订单）
+     */
+    public function orders()
+    {
+        $page = max(1, (int)$this->request->param('page', 1));
+        $limit = min(100, max(1, (int)$this->request->param('limit', 20)));
+        $rawIds = $this->request->param('order_ids/a', []);
+        $filterIds = InvoiceService::parseIds($rawIds);
+        $res = InvoiceService::getInvoiceableOrders($this->uid(), $page, $limit, $filterIds);
+        $this->success('', $res);
+    }
+
+    /**
+     * 提交开票申请（支持按勾选订单合并开票或按可用额度开票，严格校验专票要素）
+     * @ApiMethod (POST)
+     */
+    public function apply()
+    {
+        $params = [
+            'order_ids'      => $this->request->post('order_ids/a', []),
+            'amount'         => $this->request->post('amount', 0),
+            'title_id'       => $this->request->post('title_id', 0),
+            'type'           => $this->request->post('type', 'normal'),
+            'title_type'     => $this->request->post('title_type', ''),
+            'title'          => $this->request->post('title', ''),
+            'tax_no'         => $this->request->post('tax_no', ''),
+            'bank_name'      => $this->request->post('bank_name', ''),
+            'bank_account'   => $this->request->post('bank_account', ''),
+            'reg_address'    => $this->request->post('reg_address', ''),
+            'reg_mobile'     => $this->request->post('reg_mobile', ''),
+            'email'          => $this->request->post('email', ''),
+            'receive_mobile' => $this->request->post('receive_mobile', ''),
+            'remark'         => $this->request->post('remark', ''),
+            'save_title'     => $this->request->post('save_title', 0),
+        ];
+
+        try {
+            $result = InvoiceService::submitInvoice($this->uid(), $params, true);
+        } catch (\InvalidArgumentException $e) {
+            $this->error($e->getMessage());
+            return;
+        } catch (\Exception $e) {
+            Log::error('[Invoice::apply] ' . $e->getMessage());
+            $this->error('提交开票申请失败，请稍后重试');
+            return;
+        }
+
+        $this->success('开票申请已提交，预计 1-3 个工作日内开具', $result);
+    }
+
+    /**
+     * 开票记录分页列表
+     */
+    public function records()
+    {
+        $status = trim((string)$this->request->param('status', 'all'));
+        $page = max(1, (int)$this->request->param('page', 1));
+        $limit = min(50, max(1, (int)$this->request->param('limit', 20)));
+
+        $res = InvoiceService::getRecordList($this->uid(), $status, $page, $limit);
+        $quota = InvoiceService::getQuotaSummary($this->uid());
+        $res['quota'] = [
+            'available'     => $quota['available'],
+            'paid_amount'   => $quota['paid_amount'],
+            'used_amount'   => $quota['used_amount'],
+            'issued_amount' => $quota['issued_amount'],
+            'wait_count'    => $quota['wait_count'],
+            'record_count'  => $quota['record_count'],
+        ];
+        $this->success('', $res);
+    }
+
+    /**
+     * 开票申请详情（含完整票面信息、电子发票附件、驳回说明、关联订单明细）
+     */
+    public function detail()
+    {
+        $id = (int)$this->request->param('id', 0);
+        try {
+            $detail = InvoiceService::getInvoiceDetail($this->uid(), $id);
+        } catch (\InvalidArgumentException $e) {
+            $this->error($e->getMessage());
+            return;
+        }
+        $this->success('', ['detail' => $detail]);
+    }
+
+    /**
+     * 撤回待处理（wait）开票申请
+     * @ApiMethod (POST)
+     */
+    public function cancel()
+    {
+        $id = (int)$this->request->post('id', 0);
+        try {
+            InvoiceService::cancelInvoice($this->uid(), $id);
+        } catch (\InvalidArgumentException $e) {
+            $this->error($e->getMessage());
+            return;
+        } catch (\Exception $e) {
+            Log::error('[Invoice::cancel] ' . $e->getMessage());
+            $this->error('撤回失败，请刷新后重试');
+            return;
+        }
+        $this->success('已撤回开票申请，可开票额度已释放');
+    }
+
+    /**
+     * 发票抬头列表
+     */
+    public function titles()
+    {
+        $list = InvoiceService::getTitleList($this->uid());
+        $this->success('', ['list' => $list]);
+    }
+
+    /**
+     * 发票抬头详情
+     */
+    public function titleDetail()
+    {
+        $id = (int)$this->request->param('id', 0);
+        try {
+            $detail = InvoiceService::getOwnTitle($this->uid(), $id);
+        } catch (\InvalidArgumentException $e) {
+            $this->error($e->getMessage());
+            return;
+        }
+        $this->success('', ['detail' => $detail]);
+    }
+
+    /**
+     * 新增 / 编辑发票抬头
+     * @ApiMethod (POST)
+     */
+    public function titleSave()
+    {
+        $input = [
+            'id'                   => (int)$this->request->post('id', 0),
+            'title_type'           => $this->request->post('title_type', 'personal'),
+            'default_invoice_type' => $this->request->post('default_invoice_type', 'normal'),
+            'title'                => $this->request->post('title', ''),
+            'tax_no'               => $this->request->post('tax_no', ''),
+            'bank_name'            => $this->request->post('bank_name', ''),
+            'bank_account'         => $this->request->post('bank_account', ''),
+            'reg_address'          => $this->request->post('reg_address', ''),
+            'reg_mobile'           => $this->request->post('reg_mobile', ''),
+            'email'                => $this->request->post('email', ''),
+            'receive_mobile'       => $this->request->post('receive_mobile', ''),
+            'is_default'           => (int)$this->request->post('is_default', 0),
+        ];
+
+        try {
+            $saved = InvoiceService::saveTitle($this->uid(), $input);
+        } catch (\InvalidArgumentException $e) {
+            $this->error($e->getMessage());
+            return;
+        } catch (\Exception $e) {
+            Log::error('[Invoice::titleSave] ' . $e->getMessage());
+            $this->error('保存失败，请稍后重试');
+            return;
+        }
+
+        $this->success('保存成功', ['detail' => $saved, 'id' => (int)$saved['id']]);
+    }
+
+    /**
+     * 设为默认发票抬头
+     * @ApiMethod (POST)
+     */
+    public function titleDefault()
+    {
+        $id = (int)$this->request->post('id', 0);
+        try {
+            InvoiceService::setDefaultTitle($this->uid(), $id);
+        } catch (\InvalidArgumentException $e) {
+            $this->error($e->getMessage());
+            return;
+        } catch (\Exception $e) {
+            Log::error('[Invoice::titleDefault] ' . $e->getMessage());
+            $this->error('设置失败，请稍后重试');
+            return;
+        }
+        $this->success('已设为默认抬头');
+    }
+
+    /**
+     * 删除发票抬头
+     * @ApiMethod (POST)
+     */
+    public function titleDelete()
+    {
+        $id = (int)$this->request->post('id', 0);
+        try {
+            InvoiceService::deleteTitle($this->uid(), $id);
+        } catch (\InvalidArgumentException $e) {
+            $this->error($e->getMessage());
+            return;
+        } catch (\Exception $e) {
+            Log::error('[Invoice::titleDelete] ' . $e->getMessage());
+            $this->error('删除失败，请稍后重试');
+            return;
+        }
+        $this->success('已删除');
+    }
+}
diff --git a/server/application/api/controller/Master.php b/server/application/api/controller/Master.php
index 23a6c95..5819c86 100644
--- a/server/application/api/controller/Master.php
+++ b/server/application/api/controller/Master.php
@@ -12,7 +12,7 @@ use think\Db;
  */
 class Master extends Base
 {
-    protected $noNeedLogin = ['orderDetail'];
+    protected $noNeedLogin = [];
 
     /**
      * 师傅入驻申请
@@ -20,24 +20,67 @@ class Master extends Base
      */
     public function apply()
     {
-        $data = [
-            'realname'     => trim((string)$this->request->post('realname')),
-            'mobile'       => trim((string)$this->request->post('mobile')),
-            'idcard_no'    => trim((string)$this->request->post('idcard_no')),
-            'idcard_front' => (string)$this->request->post('idcard_front'),
-            'idcard_back'  => (string)$this->request->post('idcard_back'),
-            'cert_images'  => (string)$this->request->post('cert_images'),
-            'city'         => trim((string)$this->request->post('city')),
-            'skills'       => (array)$this->request->post('skills/a', []),
-        ];
+        $realname = trim((string)$this->request->post('realname'));
+        $mobile = preg_replace('/[^\d]/', '', trim((string)$this->request->post('mobile')));
+        $rawIdcard = strtoupper(trim((string)$this->request->post('idcard_no', $this->request->post('idcard', ''))));
+        $idcardFront = trim((string)$this->request->post('idcard_front'));
+        $idcardBack = trim((string)$this->request->post('idcard_back'));
+        $certImages = trim((string)$this->request->post('cert_images'));
 
-        if ($data['realname'] === '' || $data['mobile'] === '' || $data['idcard_no'] === '') {
+        $province = trim((string)$this->request->post('province', ''));
+        $city = trim((string)$this->request->post('city', ''));
+        $district = trim((string)$this->request->post('district', ''));
+
+        $cityParts = [];
+        foreach ([$province, $city, $district] as $part) {
+            if ($part === '') {
+                continue;
+            }
+            $duplicated = false;
+            foreach ($cityParts as $ep) {
+                if (mb_strpos($ep, $part) !== false) {
+                    $duplicated = true;
+                    break;
+                }
+            }
+            if (!$duplicated) {
+                $cityParts[] = $part;
+            }
+        }
+        $normalizedCity = mb_substr(implode(' ', $cityParts), 0, 50);
+
+        $skillsRaw = $this->request->post('skills', null, null);
+        $skillCatIds = [];
+        if (is_string($skillsRaw)) {
+            $decSkills = json_decode(htmlspecialchars_decode(trim($skillsRaw)), true);
+            $skillsArr = is_array($decSkills) ? $decSkills : explode(',', $skillsRaw);
+        } elseif (is_array($skillsRaw)) {
+            $skillsArr = $skillsRaw;
+        } else {
+            $skillsArr = [];
+        }
+        foreach ($skillsArr as $sv) {
+            if (is_array($sv)) {
+                continue;
+            }
+            foreach (explode(',', (string)$sv) as $partId) {
+                $cid = (int)trim($partId, " \t\n\r\0\x0B\"'[]");
+                if ($cid > 0 && !in_array($cid, $skillCatIds, true)) {
+                    $skillCatIds[] = $cid;
+                }
+            }
+        }
+
+        if ($realname === '' || $mobile === '' || $rawIdcard === '') {
             $this->error('请填写真实姓名、手机号和身份证号');
         }
-        if (!preg_match('/^1\d{10}$/', $data['mobile'])) {
+        if (!preg_match('/^1\d{10}$/', $mobile)) {
             $this->error('手机号格式不正确');
         }
-        if (empty($data['skills'])) {
+        if ($normalizedCity === '') {
+            $this->error('请选择服务城市');
+        }
+        if (empty($skillCatIds)) {
             $this->error('请至少选择一个服务类目');
         }
 
@@ -46,14 +89,31 @@ class Master extends Base
             $this->error('您已是认证师傅，无需重复入驻');
         }
 
+        // 若是驳回后重提且未修改脱敏展示号，沿用原存储的完整身份证号；否则校验完整身份证号并真实入库
+        if (strpos($rawIdcard, '*') !== false) {
+            if ($exist && !empty($exist['idcard_no']) && strpos((string)$exist['idcard_no'], '*') === false) {
+                $finalIdcard = (string)$exist['idcard_no'];
+            } else {
+                $this->error('请填写真实完整的18位身份证号码');
+                return;
+            }
+        } else {
+            if (!preg_match('/^(\d{15}|\d{17}[0-9X])$/', $rawIdcard)) {
+                $this->error('身份证号码格式不正确');
+            }
+            $finalIdcard = $rawIdcard;
+        }
+
+        $catNameMap = Db::name('service_cat')->where('id', 'in', $skillCatIds)->column('name', 'id');
+
         $save = [
-            'realname'      => $data['realname'],
-            'mobile'        => $data['mobile'],
-            'idcard_no'     => substr($data['idcard_no'], 0, 6) . '********' . substr($data['idcard_no'], -4),
-            'idcard_front'  => $data['idcard_front'],
-            'idcard_back'   => $data['idcard_back'],
-            'cert_images'   => $data['cert_images'],
-            'city'          => $data['city'],
+            'realname'      => mb_substr($realname, 0, 50),
+            'mobile'        => $mobile,
+            'idcard_no'     => $finalIdcard,
+            'idcard_front'  => $idcardFront,
+            'idcard_back'   => $idcardBack,
+            'cert_images'   => $certImages,
+            'city'          => $normalizedCity,
             'verify_status' => 'pending',
             'audit_msg'     => '',
             'updatetime'    => time(),
@@ -70,10 +130,15 @@ class Master extends Base
                 $save['createtime'] = time();
                 $masterId = Db::name('master')->insertGetId($save);
             }
-            foreach ($data['skills'] as $catId) {
+            foreach ($skillCatIds as $catId) {
+                $cName = isset($catNameMap[$catId]) ? (string)$catNameMap[$catId] : '';
                 Db::name('master_skill')->insert([
                     'master_id'  => $masterId,
                     'cat_id'     => (int)$catId,
+                    'skill_id'   => 0,
+                    'skill_name' => $cName,
+                    'category'   => '安装维修',
+                    'is_custom'  => 0,
                     'status'     => 'normal',
                     'createtime' => time(),
                 ]);
@@ -122,12 +187,22 @@ class Master extends Base
         $pendingVerify = Db::name('order')->where('master_id', $master['id'])
             ->where('status', OrderStatus::PENDING_VERIFY)->count();
 
+        $rawIdcard = (string)($master['idcard_no'] ?? '');
+        $maskedIdcard = strlen($rawIdcard) >= 10
+            ? (substr($rawIdcard, 0, 6) . str_repeat('*', max(4, strlen($rawIdcard) - 10)) . substr($rawIdcard, -4))
+            : $rawIdcard;
+
         $this->success('', [
             'applied' => true,
             'master'  => [
                 'id'            => (int)$master['id'],
                 'realname'      => $master['realname'],
                 'mobile'        => $master['mobile'],
+                'idcard_no'     => $maskedIdcard,
+                'idcard'        => $maskedIdcard,
+                'idcard_front'  => (string)($master['idcard_front'] ?? ''),
+                'idcard_back'   => (string)($master['idcard_back'] ?? ''),
+                'cert_images'   => (string)($master['cert_images'] ?? ''),
                 'avatar'        => $master['avatar'],
                 'city'          => $master['city'],
                 'level'         => (int)$master['level'],
@@ -139,6 +214,7 @@ class Master extends Base
                 'verify_status' => $master['verify_status'],
                 'audit_msg'     => $master['audit_msg'],
                 'money'         => (float)$master['money'],
+                'frozen_money'  => (float)$master['frozen_money'],
                 'todo_count'    => (int)$todo,
                 'verify_count'  => (int)$pendingVerify,
             ],
@@ -217,10 +293,14 @@ class Master extends Base
         $total = $build()->count();
         $list = $build()->order($order)->page($page, $limit)->select();
 
-        $userLat = (float)$this->request->param('lat', 26.5783);
-        $userLng = (float)$this->request->param('lng', 106.7135);
+        $masterRecord = $this->masterInfo();
+        $defaultLat = ($masterRecord && !empty($masterRecord['lat'])) ? (float)$masterRecord['lat'] : 0.0;
+        $defaultLng = ($masterRecord && !empty($masterRecord['lng'])) ? (float)$masterRecord['lng'] : 0.0;
+        $userLat = (float)$this->request->param('lat', $defaultLat);
+        $userLng = (float)$this->request->param('lng', $defaultLng);
         $now = time();
         foreach ($list as &$row) {
+            unset($row['verify_code']);
             $row['appoint_text'] = $row['appoint_time'] ? date('Y-m-d H:i', (int)$row['appoint_time']) : '接单后与业主预约';
             $row['pay_amount'] = (float)$row['pay_amount'];
             $row['urgent'] = (int)$row['urgent'];
@@ -237,10 +317,7 @@ class Master extends Base
 
             $row['status_text'] = OrderStatus::label($row['status']);
             $remain = (int)$row['createtime'] + 7 * 86400 - $now;
-            if ($remain <= 0) {
-                $remain = (((int)$row['id'] * 4127) % 43200) + 5400;
-            }
-            $row['left_seconds'] = $remain;
+            $row['left_seconds'] = max(0, $remain);
             $row['quote_count'] = (int)Db::name('order_quote')->where('order_id', $row['id'])->count();
             $row['remaining_quote_slots'] = max(0, 4 - $row['quote_count']);
             $row['price_type_text'] = $row['price_type'] === 'fixed' ? '一口价'
@@ -252,12 +329,32 @@ class Master extends Base
             $addonServices = '';
             $fallbackImg = '';
             if (!empty($row['goods_images'])) {
-                $parsed = json_decode($row['goods_images'], true);
+                $parsed = json_decode((string)$row['goods_images'], true);
                 if (is_array($parsed) && !empty($parsed['goods_list']) && is_array($parsed['goods_list'])) {
                     $firstItem = $parsed['goods_list'][0];
-                    $goodsName = $firstItem['goods_name'] ?? ($firstItem['item_name'] ?? '');
-                    $addonServices = $firstItem['addon_services'] ?? '';
-                    $fallbackImg = $firstItem['goods_image'] ?? '';
+                    if (is_array($firstItem)) {
+                        $goodsName = isset($firstItem['goods_name']) && is_string($firstItem['goods_name'])
+                            ? $firstItem['goods_name']
+                            : (isset($firstItem['item_name']) && is_string($firstItem['item_name']) ? $firstItem['item_name'] : '');
+                        if (!empty($firstItem['addon_services'])) {
+                            if (is_array($firstItem['addon_services'])) {
+                                $adLabels = [];
+                                foreach ($firstItem['addon_services'] as $adIt) {
+                                    if (is_string($adIt)) {
+                                        $adLabels[] = $adIt;
+                                    } elseif (is_array($adIt) && !empty($adIt['name'])) {
+                                        $adLabels[] = $adIt['name'] . (!empty($adIt['num']) ? 'x' . (int)$adIt['num'] : '');
+                                    }
+                                }
+                                $addonServices = implode(' · ', $adLabels);
+                            } else {
+                                $addonServices = (string)$firstItem['addon_services'];
+                            }
+                        }
+                        if (!empty($firstItem['goods_image']) && is_string($firstItem['goods_image'])) {
+                            $fallbackImg = $firstItem['goods_image'];
+                        }
+                    }
                 }
             }
             $row['goods_name'] = $goodsName ?: $row['service_name'];
@@ -280,17 +377,18 @@ class Master extends Base
 
             $distKm = $this->calculateDistance($userLat, $userLng, (float)$row['lat'], (float)$row['lng']);
             $row['distance_km'] = $distKm;
-            $row['distance_text'] = $distKm . 'km';
+            $row['distance_text'] = $distKm !== null ? ($distKm . 'km') : '';
         }
         unset($row);
 
         $this->success('', [
-            'list'   => $list,
-            'total'  => (int)$total,
-            'counts' => $counts,
-            'page'   => $page,
-            'sort'   => $sort,
-            'type'   => $type,
+            'list'     => $list,
+            'total'    => (int)$total,
+            'counts'   => $counts,
+            'page'     => $page,
+            'has_more' => ($page * $limit) < (int)$total,
+            'sort'     => $sort,
+            'type'     => $type,
         ]);
     }
 
@@ -309,6 +407,9 @@ class Master extends Base
         if (!$order) {
             $this->error('订单不存在');
         }
+        if ((int)$order['user_id'] === (int)$this->uid()) {
+            $this->error('不能承接或报价自己发布的订单');
+        }
         if ($order['price_type'] === 'quote') {
             $this->error('该订单为师傅报价订单，请提交报价');
         }
@@ -362,39 +463,44 @@ class Master extends Base
     public function schedule()
     {
         $order = $this->ownOrder((int)$this->request->post('order_id'), 'master');
+        if (!in_array((int)$order['status'], [OrderStatus::ACCEPTED, OrderStatus::APPOINTED], true)) {
+            $this->error('当前状态（' . OrderStatus::label((int)$order['status']) . '）不可修改预约时间');
+        }
         $appointTime = (int)$this->request->post('appoint_time');
         if ($appointTime <= 0) {
             $this->error('请选择上门时间');
         }
         if ((int)$order['status'] === OrderStatus::ACCEPTED) {
-            $this->transit($order, OrderStatus::SCHEDULED, '已与客户约定上门时间', [
+            $this->transit($order, OrderStatus::SCHEDULED, '已与客户约定上门时间：' . date('Y-m-d H:i', $appointTime), [
                 'appoint_time' => $appointTime,
                 'contact_time' => (int)$order['contact_time'] ?: time(),
             ], 'master', (int)$order['master_id']);
         } else {
             Db::name('order')->where('id', $order['id'])->update(['appoint_time' => $appointTime, 'updatetime' => time()]);
+            $this->addLog((int)$order['id'], OrderStatus::SCHEDULED, '师傅变更预约上门时间为：' . date('Y-m-d H:i', $appointTime), 'master', (int)$order['master_id']);
         }
         $this->notify('user', (int)$order['user_id'], '师傅已预约上门', '约定时间：' . date('m-d H:i', $appointTime), 'order', (int)$order['id']);
         $this->success('预约成功');
     }
 
     /**
-     * 到达现场（定位打卡）
+     * 到达现场（定位打卡，不覆盖客户收货地址经纬度，签到坐标记录入日志）
      * @ApiMethod (POST)
      */
     public function arrive()
     {
         $order = $this->ownOrder((int)$this->request->post('order_id'), 'master');
-        $lng = (string)$this->request->post('lng', '');
-        $lat = (string)$this->request->post('lat', '');
+        $lng = trim((string)$this->request->post('lng', ''));
+        $lat = trim((string)$this->request->post('lat', ''));
         $extra = ['arrive_time' => time()];
         $remark = '师傅已到达现场';
         if ($lng !== '' && $lat !== '') {
-            $extra['lng'] = $lng;
-            $extra['lat'] = $lat;
-            $check = TiandituService::checkArriveDistance((float)$order['lat'], (float)$order['lng'], (float)$lat, (float)$lng, 1500.0);
-            if (!$check['is_pass']) {
-                $remark .= " [异地打卡预警: 偏离{$check['distance']}米]";
+            $remark .= sprintf('（签到坐标: %.6f, %.6f）', (float)$lng, (float)$lat);
+            if (!empty($order['lat']) && !empty($order['lng'])) {
+                $check = TiandituService::checkArriveDistance((float)$order['lat'], (float)$order['lng'], (float)$lat, (float)$lng, 1500.0);
+                if (!$check['is_pass']) {
+                    $remark .= " [异地打卡预警: 偏离{$check['distance']}米]";
+                }
             }
         }
         $this->transit($order, OrderStatus::ARRIVED, $remark, $extra, 'master', (int)$order['master_id']);
@@ -456,7 +562,7 @@ class Master extends Base
             SmsService::sendVerifyCode($order['mobile'], $code, $order['order_no']);
         }
         $this->notify('user', (int)$order['user_id'], '师傅已完工，待您验收', '验收码：' . $code . '，请核对后确认完成', 'order', (int)$order['id']);
-        $this->success('已提交完工，等待客户验收', ['verify_code' => $code]);
+        $this->success('已提交完工，等待客户验收');
     }
 
     /**
@@ -497,9 +603,18 @@ class Master extends Base
         $commission = round($payAmount * $rate / 100, 2);
         $settleAmount = round($payAmount - $commission, 2);
 
+        $newMoney = 0.00;
         Db::startTrans();
         try {
-            $this->transit($order, OrderStatus::COMPLETED, '师傅已录入客户 6 位短信验证码，核销完工', [
+            $lockedOrder = Db::name('order')->where('id', $orderId)->lock(true)->find();
+            if (!$lockedOrder || (int)$lockedOrder['status'] !== OrderStatus::PENDING_VERIFY || (int)$lockedOrder['settle_status'] === 1) {
+                throw new \InvalidArgumentException('该工单已核销完成或状态已变更，请勿重复提交');
+            }
+            $payAmount = (float)$lockedOrder['pay_amount'];
+            $commission = round($payAmount * $rate / 100, 2);
+            $settleAmount = round($payAmount - $commission, 2);
+
+            $this->transit($lockedOrder, OrderStatus::COMPLETED, '师傅已录入客户 6 位短信验证码，核销完工', [
                 'verify_time'   => time(),
                 'settle_status' => 1,
                 'settle_amount' => $settleAmount,
@@ -532,14 +647,23 @@ class Master extends Base
                 'amount'     => $settleAmount,
                 'balance'    => $newMoney,
                 'order_id'   => $orderId,
-                'remark'     => '工单 ' . $order['order_no'] . ' 短信验证码核销入账',
+                'remark'     => '工单 ' . $lockedOrder['order_no'] . ' 短信验证码核销入账',
                 'createtime' => time(),
             ]);
 
             Db::commit();
+        } catch (\think\exception\HttpResponseException $e) {
+            Db::rollback();
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+            return;
         } catch (\Exception $e) {
             Db::rollback();
+            \think\Log::error('[Master::verifyCode] ' . $e->getMessage());
             $this->error('核销失败：' . $e->getMessage());
+            return;
         }
 
         $this->notify('user', (int)$order['user_id'], '订单已核销完成', '您的工单已由师傅现场核销完成，感谢您的支持！', 'order', $orderId);
@@ -549,6 +673,11 @@ class Master extends Base
         ]);
     }
 
+    public function myOrders()
+    {
+        return $this->orders();
+    }
+
     public function orders()
     {
         $master = $this->requireMaster();
@@ -571,16 +700,20 @@ class Master extends Base
 
         $total = $build()->count();
         $list = $build()->order('id desc')->page($page, $limit)->select();
+
+        $serviceIds = array_values(array_unique(array_filter(array_map('intval', array_column($list, 'service_id')))));
+        $serviceImgMap = $serviceIds ? Db::name('service')->where('id', 'in', $serviceIds)->column('image', 'id') : [];
+
         foreach ($list as &$row) {
+            unset($row['verify_code']);
             $row['status_text'] = OrderStatus::label($row['status']);
             $row['pay_amount'] = (float)$row['pay_amount'];
             $row['appoint_text'] = $row['appoint_time'] ? date('m-d H:i', (int)$row['appoint_time']) : '尽快上门';
             $row['urgent'] = (int)$row['urgent'];
             $row['masked_mobile'] = substr_replace($row['mobile'], '****', 3, 4);
             $img = !empty($row['service_image']) ? $row['service_image'] : '';
-            if (empty($img) && !empty($row['service_id'])) {
-                $s = Db::name('service')->where('id', (int)$row['service_id'])->find();
-                $img = $s ? $s['image'] : '';
+            if (empty($img) && !empty($row['service_id']) && isset($serviceImgMap[(int)$row['service_id']])) {
+                $img = $serviceImgMap[(int)$row['service_id']];
             }
             if ($img && strpos($img, 'http') !== 0) {
                 $img = cdnurl($img, true);
@@ -590,7 +723,12 @@ class Master extends Base
         }
         unset($row);
 
-        $this->success('', ['list' => $list, 'total' => (int)$total, 'page' => $page]);
+        $this->success('', [
+            'list'     => $list,
+            'total'    => (int)$total,
+            'page'     => $page,
+            'has_more' => ($page * $limit) < (int)$total,
+        ]);
     }
 
     /**
@@ -624,6 +762,9 @@ class Master extends Base
     public function quote()
     {
         $master = $this->requireMaster();
+        if ($master['work_status'] !== 'on') {
+            $this->error('您已暂停接单，请先开启');
+        }
         $orderId = (int)$this->request->post('order_id');
         $amount = (float)$this->request->post('amount');
         $desc = trim((string)$this->request->post('description', ''));
@@ -633,6 +774,9 @@ class Master extends Base
         if (!$order) {
             $this->error('订单不存在');
         }
+        if ((int)$order['user_id'] === (int)$this->uid()) {
+            $this->error('不能承接或报价自己发布的订单');
+        }
         if ($order['price_type'] !== 'quote') {
             $this->error('该订单不是报价竞价订单');
         }
@@ -680,40 +824,66 @@ class Master extends Base
         if ($amount < 10) {
             $this->error('单次提现金额不少于 10 元');
         }
-        if ($amount > (float)$master['money']) {
-            $this->error('可提现余额不足');
+        $channel = trim((string)$this->request->post('channel', 'wechat'));
+        if (!in_array($channel, ['wechat', 'bank'], true)) {
+            $channel = 'wechat';
         }
+        $account = mb_substr(trim((string)$this->request->post('account', '')), 0, 100);
         $fee = round($amount * 0.006, 2);
         $arrive = round($amount - $fee, 2);
+        $now = time();
 
         Db::startTrans();
         try {
+            $lockedMaster = Db::name('master')->where('id', (int)$master['id'])->lock(true)->find();
+            if (!$lockedMaster || $amount > (float)$lockedMaster['money']) {
+                throw new \InvalidArgumentException('可提现余额不足');
+            }
+
+            $newMoney = round((float)$lockedMaster['money'] - $amount, 2);
+            $newFrozen = round((float)$lockedMaster['frozen_money'] + $amount, 2);
+
+            Db::name('master')->where('id', (int)$lockedMaster['id'])->update([
+                'money'        => $newMoney,
+                'frozen_money' => $newFrozen,
+                'updatetime'   => $now,
+            ]);
+
             Db::name('withdraw')->insert([
-                'master_id'     => (int)$master['id'],
+                'master_id'     => (int)$lockedMaster['id'],
                 'amount'        => $amount,
                 'fee'           => $fee,
                 'arrive_amount' => $arrive,
-                'channel'       => $this->request->post('channel', 'wechat'),
-                'account'       => (string)$this->request->post('account', ''),
+                'channel'       => $channel,
+                'account'       => $account,
                 'status'        => 'wait',
-                'createtime'    => time(),
-                'updatetime'    => time(),
-            ]);
-            $newMoney = round((float)$master['money'] - $amount, 2);
-            Db::name('master')->where('id', $master['id'])->update([
-                'money'        => $newMoney,
-                'frozen_money' => round((float)$master['frozen_money'] + $amount, 2),
-                'updatetime'   => time(),
+                'createtime'    => $now,
+                'updatetime'    => $now,
             ]);
+
             Db::name('wallet_log')->insert([
-                'user_type' => 'master', 'user_id' => (int)$master['id'], 'type' => 'withdraw',
-                'amount' => -$amount, 'balance' => $newMoney, 'order_id' => 0,
-                'remark' => '提现申请（手续费 ¥' . $fee . '）', 'createtime' => time(),
+                'user_type'  => 'master',
+                'user_id'    => (int)$lockedMaster['id'],
+                'type'       => 'withdraw',
+                'amount'     => -$amount,
+                'balance'    => $newMoney,
+                'order_id'   => 0,
+                'remark'     => '提现申请（手续费 ¥' . $fee . '）',
+                'createtime' => $now,
             ]);
             Db::commit();
+        } catch (\think\exception\HttpResponseException $e) {
+            Db::rollback();
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+            return;
         } catch (\Exception $e) {
             Db::rollback();
+            \think\Log::error('[Master::withdraw] ' . $e->getMessage());
             $this->error('提现申请失败：' . $e->getMessage());
+            return;
         }
 
         $this->success('提现申请已提交，等待审核', ['arrive_amount' => $arrive]);
@@ -791,6 +961,34 @@ class Master extends Base
             $row['type_text'] = isset($typeText[$row['type']]) ? $typeText[$row['type']] : '其他';
             $row['status_text'] = isset($statusText[$row['status']]) ? $statusText[$row['status']] : $row['status'];
             $row['time_text'] = date('Y-m-d H:i', (int)$row['createtime']);
+
+            $imgs = [];
+            if (!empty($row['images'])) {
+                $dec = json_decode((string)$row['images'], true);
+                $rawImgs = is_array($dec) ? $dec : explode(',', (string)$row['images']);
+                foreach ($rawImgs as $im) {
+                    $im = trim((string)$im);
+                    if ($im !== '') {
+                        $imgs[] = strpos($im, 'http') === 0 ? $im : cdnurl($im, true);
+                    }
+                }
+            }
+            // 兼容清洗历史拼接在文本末尾的 [举证图片: ...]
+            $content = (string)$row['content'];
+            if (preg_match('/\[举证图片:\s*(.+?)\]\s*$/u', $content, $matches)) {
+                $content = trim(preg_replace('/\[举证图片:\s*(.+?)\]\s*$/u', '', $content));
+                foreach (explode(',', $matches[1]) as $extraIm) {
+                    $extraIm = trim($extraIm);
+                    if ($extraIm !== '') {
+                        $full = strpos($extraIm, 'http') === 0 ? $extraIm : cdnurl($extraIm, true);
+                        if (!in_array($full, $imgs, true)) {
+                            $imgs[] = $full;
+                        }
+                    }
+                }
+            }
+            $row['content'] = $content;
+            $row['image_list'] = $imgs;
         }
         unset($row);
         $this->success('', ['list' => $list]);
@@ -857,7 +1055,7 @@ class Master extends Base
     protected function calculateDistance($lat1, $lon1, $lat2, $lon2)
     {
         if (empty($lat1) || empty($lon1) || empty($lat2) || empty($lon2)) {
-            return 14.40;
+            return null;
         }
         $earthRadius = 6371;
         $dLat = deg2rad((float)$lat2 - (float)$lat1);
@@ -915,9 +1113,9 @@ class Master extends Base
 
     public function orderDetail()
     {
-        $master = $this->masterInfo();
-        $masterId = ($master && $master['verify_status'] === 'pass') ? (int)$master['id'] : 0;
-        $orderId = (int)$this->request->param('id');
+        $master = $this->requireMaster();
+        $masterId = (int)$master['id'];
+        $orderId = (int)$this->request->param('id') ?: (int)$this->request->param('order_id');
         if ($orderId <= 0) {
             $this->error('参数错误');
         }
@@ -941,41 +1139,298 @@ class Master extends Base
 
         $maxQuotes = 4;
         $remainingQuoteSlots = max(0, $maxQuotes - $quoteCount);
-        $viewCount = 2 + ($orderId % 3);
         $deadline = (int)$order['createtime'] + 3 * 86400;
         $countdownSeconds = max(0, $deadline - $now);
 
-        $mobile = $order['mobile'];
-        $address = $order['address'];
+        $mobile = (string)$order['mobile'];
+        $address = (string)$order['address'];
         if (!$isMyOrder) {
-            $mobile = substr_replace($mobile, '******', 3, 6);
+            $mobile = strlen($mobile) >= 7 ? substr_replace($mobile, '****', 3, 4) : $mobile;
             $address = preg_replace('/\d+号|\d+栋|\d+单元|\d+室/', '***', $address);
             if (mb_strlen($address) > 10) {
                 $address = mb_substr($address, 0, 8) . '****号';
             }
         }
 
-        $userLat = (float)$this->request->param('lat', 0);
-        $userLng = (float)$this->request->param('lng', 0);
+        $defaultLat = ($master && !empty($master['lat'])) ? (float)$master['lat'] : 0.0;
+        $defaultLng = ($master && !empty($master['lng'])) ? (float)$master['lng'] : 0.0;
+        $userLat = (float)$this->request->param('lat', $defaultLat);
+        $userLng = (float)$this->request->param('lng', $defaultLng);
         $dist = $this->calculateDistance($userLat, $userLng, (float)$order['lat'], (float)$order['lng']);
 
         $service = Db::name('service')->where('id', $order['service_id'])->find();
         $category = Db::name('service_cat')->where('id', $order['cat_id'])->find();
 
-        $goodsImages = [];
-        if (!empty($order['goods_images'])) {
-            $decoded = json_decode($order['goods_images'], true);
-            $rawG = is_array($decoded) ? $decoded : explode(',', (string)$order['goods_images']);
-            foreach ($rawG as $gi) {
-                $gi = trim((string)$gi);
-                if ($gi !== '') {
-                    $goodsImages[] = strpos($gi, 'http') === 0 ? $gi : cdnurl($gi, true);
+        // 安全解析商品图片、视频、备注与多商品清单（彻底杜绝子数组强转 (string) 报错）
+        $normalizeMediaList = function ($rawMedia) {
+            $urls = [];
+            if (empty($rawMedia)) {
+                return $urls;
+            }
+            if (is_string($rawMedia)) {
+                $dec = json_decode($rawMedia, true);
+                $items = is_array($dec) ? $dec : explode(',', $rawMedia);
+            } elseif (is_array($rawMedia)) {
+                $items = $rawMedia;
+            } else {
+                return $urls;
+            }
+            foreach ($items as $it) {
+                $u = '';
+                if (is_string($it) || is_numeric($it)) {
+                    $u = trim((string)$it);
+                } elseif (is_array($it)) {
+                    if (isset($it['url']) && is_string($it['url'])) {
+                        $u = trim($it['url']);
+                    } elseif (isset($it['path']) && is_string($it['path'])) {
+                        $u = trim($it['path']);
+                    } elseif (isset($it['tempFilePath']) && is_string($it['tempFilePath'])) {
+                        $u = trim($it['tempFilePath']);
+                    }
+                }
+                if ($u !== '' && $u !== 'Array') {
+                    $full = strpos($u, 'http') === 0 ? $u : cdnurl($u, true);
+                    if (!in_array($full, $urls, true)) {
+                        $urls[] = $full;
+                    }
                 }
             }
+            return $urls;
+        };
+
+        $goodsImages = [];
+        $envImages = [];
+        $goodsVideos = [];
+        $parsedGoodsList = [];
+        $topGoodsRemark = '';
+        $topServiceRemark = '';
+        $topExtras = [];
+
+        if (!empty($order['goods_images'])) {
+            $decoded = json_decode((string)$order['goods_images'], true);
+            if (is_array($decoded)) {
+                if (isset($decoded['images'])) {
+                    $goodsImages = array_merge($goodsImages, $normalizeMediaList($decoded['images']));
+                } elseif (!isset($decoded['goods_list'])) {
+                    $goodsImages = array_merge($goodsImages, $normalizeMediaList($decoded));
+                }
+                if (isset($decoded['videos'])) {
+                    $goodsVideos = array_merge($goodsVideos, $normalizeMediaList($decoded['videos']));
+                }
+                if (isset($decoded['goods_videos'])) {
+                    $goodsVideos = array_merge($goodsVideos, $normalizeMediaList($decoded['goods_videos']));
+                }
+                if (!empty($decoded['goods_remark']) && is_string($decoded['goods_remark'])) {
+                    $topGoodsRemark = trim($decoded['goods_remark']);
+                }
+                if (!empty($decoded['service_remark']) && is_string($decoded['service_remark'])) {
+                    $topServiceRemark = trim($decoded['service_remark']);
+                }
+                if (!empty($decoded['extras']) && is_array($decoded['extras'])) {
+                    $topExtras = $decoded['extras'];
+                }
+                if (!empty($decoded['goods_list']) && is_array($decoded['goods_list'])) {
+                    $parsedGoodsList = $decoded['goods_list'];
+                }
+            } else {
+                $goodsImages = array_merge($goodsImages, $normalizeMediaList((string)$order['goods_images']));
+            }
         }
+
+        // 解析 parsedGoodsList 中的多媒体、增项与备注，以便补充到 order_goods 行
+        $parsedMetaByIdx = [];
+        foreach ($parsedGoodsList as $pIdx => $pgItem) {
+            if (!is_array($pgItem)) {
+                continue;
+            }
+            $itemImgs = [];
+            if (!empty($pgItem['images'])) {
+                $itemImgs = array_merge($itemImgs, $normalizeMediaList($pgItem['images']));
+            }
+            if (!empty($pgItem['goods_images'])) {
+                $itemImgs = array_merge($itemImgs, $normalizeMediaList($pgItem['goods_images']));
+            }
+            if (!empty($pgItem['goods_image'])) {
+                $itemImgs = array_merge($itemImgs, $normalizeMediaList([$pgItem['goods_image']]));
+            }
+            foreach ($itemImgs as $imUrl) {
+                if (!in_array($imUrl, $goodsImages, true)) {
+                    $goodsImages[] = $imUrl;
+                }
+            }
+
+            $itemEnvImgs = [];
+            if (!empty($pgItem['envImages'])) {
+                $itemEnvImgs = array_merge($itemEnvImgs, $normalizeMediaList($pgItem['envImages']));
+            }
+            if (!empty($pgItem['env_images'])) {
+                $itemEnvImgs = array_merge($itemEnvImgs, $normalizeMediaList($pgItem['env_images']));
+            }
+            foreach ($itemEnvImgs as $envUrl) {
+                if (!in_array($envUrl, $envImages, true)) {
+                    $envImages[] = $envUrl;
+                }
+            }
+
+            $itemVids = [];
+            if (!empty($pgItem['videos'])) {
+                $itemVids = array_merge($itemVids, $normalizeMediaList($pgItem['videos']));
+            }
+            if (!empty($pgItem['goods_videos'])) {
+                $itemVids = array_merge($itemVids, $normalizeMediaList($pgItem['goods_videos']));
+            }
+            foreach ($itemVids as $vdUrl) {
+                if (!in_array($vdUrl, $goodsVideos, true)) {
+                    $goodsVideos[] = $vdUrl;
+                }
+            }
+
+            $gRem = isset($pgItem['goods_remark']) && is_string($pgItem['goods_remark'])
+                ? trim($pgItem['goods_remark'])
+                : (isset($pgItem['remark']) && is_string($pgItem['remark']) ? trim($pgItem['remark']) : '');
+            $sRem = isset($pgItem['service_remark']) && is_string($pgItem['service_remark']) ? trim($pgItem['service_remark']) : '';
+            $itemExtras = [];
+            if (!empty($pgItem['extras']) && is_array($pgItem['extras'])) {
+                foreach ($pgItem['extras'] as $ex) {
+                    if (is_array($ex) && (!isset($ex['num']) || (int)$ex['num'] > 0)) {
+                        $itemExtras[] = $ex;
+                        $topExtras[] = $ex;
+                    }
+                }
+            }
+
+            if ($gRem !== '' && $topGoodsRemark === '') {
+                $topGoodsRemark = $gRem;
+            }
+            if ($sRem !== '' && $topServiceRemark === '') {
+                $topServiceRemark = $sRem;
+            }
+
+            $parsedMetaByIdx[$pIdx] = [
+                'images'         => $itemImgs,
+                'goods_videos'   => $itemVids,
+                'goods_remark'   => $gRem,
+                'service_remark' => $sRem,
+                'extras'         => $itemExtras,
+            ];
+        }
+
+        $orderGoodsRows = Db::name('order_goods')->where('order_id', $orderId)->order('id asc')->select();
+        $goodsList = [];
+        if ($orderGoodsRows) {
+            foreach ($orderGoodsRows as $rIdx => $og) {
+                $gImg = !empty($og['goods_image']) ? (strpos($og['goods_image'], 'http') === 0 ? $og['goods_image'] : cdnurl($og['goods_image'], true)) : '';
+                $meta = isset($parsedMetaByIdx[$rIdx]) ? $parsedMetaByIdx[$rIdx] : [
+                    'images'         => $gImg !== '' ? [$gImg] : [],
+                    'goods_videos'   => [],
+                    'goods_remark'   => '',
+                    'service_remark' => '',
+                    'extras'         => [],
+                ];
+                $rowExtras = $meta['extras'];
+                $addonRaw = (string)$og['addon_services'];
+                if (empty($rowExtras) && $addonRaw !== '' && $addonRaw[0] === '[') {
+                    $decAddon = json_decode($addonRaw, true);
+                    if (is_array($decAddon)) {
+                        $rowExtras = $decAddon;
+                        if (empty($topExtras)) {
+                            $topExtras = $decAddon;
+                        }
+                    }
+                }
+                $goodsList[] = [
+                    'id'             => (int)$og['id'],
+                    'service_id'     => (int)$og['service_id'],
+                    'goods_name'     => (string)$og['goods_name'],
+                    'goods_model'    => (string)$og['goods_model'],
+                    'goods_num'      => (int)$og['goods_num'] ?: 1,
+                    'goods_image'    => $gImg ?: (!empty($meta['images']) ? $meta['images'][0] : ''),
+                    'images'         => $meta['images'],
+                    'goods_videos'   => $meta['goods_videos'],
+                    'goods_remark'   => $meta['goods_remark'],
+                    'service_remark' => $meta['service_remark'],
+                    'extras'         => $rowExtras,
+                    'addon_services' => $addonRaw,
+                    'base_price'     => (float)$og['base_price'],
+                ];
+            }
+        } elseif ($parsedGoodsList) {
+            foreach ($parsedGoodsList as $idx => $pg) {
+                if (!is_array($pg)) {
+                    continue;
+                }
+                $meta = isset($parsedMetaByIdx[$idx]) ? $parsedMetaByIdx[$idx] : [
+                    'images'         => [],
+                    'goods_videos'   => [],
+                    'goods_remark'   => '',
+                    'service_remark' => '',
+                    'extras'         => [],
+                ];
+                $rawImg = '';
+                if (!empty($pg['goods_image']) && is_string($pg['goods_image'])) {
+                    $rawImg = trim($pg['goods_image']);
+                } elseif (!empty($pg['image']) && is_string($pg['image'])) {
+                    $rawImg = trim($pg['image']);
+                }
+                $firstMetaImg = !empty($meta['images']) ? $meta['images'][0] : '';
+                $addonText = '';
+                if (!empty($pg['addon_services'])) {
+                    $addonText = is_array($pg['addon_services'])
+                        ? json_encode($pg['addon_services'], JSON_UNESCAPED_UNICODE)
+                        : (string)$pg['addon_services'];
+                } elseif (!empty($meta['extras'])) {
+                    $addonText = json_encode($meta['extras'], JSON_UNESCAPED_UNICODE);
+                }
+                $gNameVal = '';
+                foreach (['custom_name', 'goods_name', 'item_name', 'name'] as $nk) {
+                    if (!empty($pg[$nk]) && is_string($pg[$nk])) {
+                        $gNameVal = trim($pg[$nk]);
+                        break;
+                    }
+                }
+                $gModelVal = '';
+                foreach (['spec_name', 'goods_model', 'spec'] as $mk) {
+                    if (!empty($pg[$mk]) && is_string($pg[$mk])) {
+                        $gModelVal = trim($pg[$mk]);
+                        break;
+                    }
+                }
+                $goodsList[] = [
+                    'id'             => $idx + 1,
+                    'service_id'     => (int)($pg['service_id'] ?? $order['service_id']),
+                    'goods_name'     => $gNameVal !== '' ? $gNameVal : ($order['service_name'] ?: '服务商品'),
+                    'goods_model'    => $gModelVal,
+                    'goods_num'      => max(1, (int)($pg['goods_num'] ?? ($pg['num'] ?? 1))),
+                    'goods_image'    => $rawImg !== '' ? (strpos($rawImg, 'http') === 0 ? $rawImg : cdnurl($rawImg, true)) : $firstMetaImg,
+                    'images'         => $meta['images'],
+                    'goods_videos'   => $meta['goods_videos'],
+                    'goods_remark'   => $meta['goods_remark'],
+                    'service_remark' => $meta['service_remark'],
+                    'extras'         => $meta['extras'],
+                    'addon_services' => $addonText,
+                    'base_price'     => (float)($pg['base_price'] ?? ($pg['price'] ?? 0)),
+                ];
+            }
+        }
+
         $rawServiceImg = $order['service_image'] ?: ($service ? $service['image'] : '');
         $serviceImageUrl = $rawServiceImg ? (strpos($rawServiceImg, 'http') === 0 ? $rawServiceImg : cdnurl($rawServiceImg, true)) : '';
 
+        $contactDisplay = $isMyOrder
+            ? ($order['contact'] ?: '业主客户')
+            : ($order['contact'] ? mb_substr($order['contact'], 0, 1) . '客户' : '业主客户');
+
+        $prefix = trim($order['province'] . $order['city'] . $order['district']);
+        $fullAddr = ($prefix !== '' && strpos($address, $order['district']) === false && strpos($address, $order['city']) === false)
+            ? ($prefix . $address)
+            : $address;
+
+        // 计算结算比例与预计收益
+        $commissionRate = 10.00;
+        $payAmt = (float)$order['pay_amount'] > 0 ? (float)$order['pay_amount'] : (float)$order['total_amount'];
+        $estCommission = round($payAmt * $commissionRate / 100, 2);
+        $estMasterFee = round(max(0, $payAmt - $estCommission), 2);
+
         $data = [
             'id'                    => (int)$order['id'],
             'order_no'              => $order['order_no'],
@@ -985,30 +1440,47 @@ class Master extends Base
             'status_text'           => OrderStatus::label($order['status']),
             'total_amount'          => (float)$order['total_amount'],
             'base_amount'           => (float)$order['base_amount'],
+            'floor_amount'          => (float)($order['floor_amount'] ?? 0),
+            'urgent_amount'         => (float)($order['urgent_amount'] ?? 0),
+            'pay_amount'            => (float)($order['pay_amount'] ?? 0),
+            'master_fee'            => $estMasterFee,
             'user_price'            => $order['price_type'] === 'custom' ? (float)$order['base_amount'] : (float)$order['total_amount'],
             'service_name'          => $order['service_name'] ?: ($service ? $service['name'] : '家庭维修服务'),
             'service_image'         => $serviceImageUrl,
             'goods_images'          => $goodsImages,
+            'env_images'            => $envImages,
+            'goods_videos'          => $goodsVideos,
+            'goods_remark'          => $topGoodsRemark,
+            'service_remark'        => $topServiceRemark !== '' ? $topServiceRemark : (string)($order['remark'] ?: ''),
+            'extras'                => $topExtras,
+            'goods_list'            => $goodsList,
             'goods_model'           => $order['goods_model'] ?: '标准规格',
             'goods_num'             => (int)$order['goods_num'] ?: 1,
+            'floor'                 => (int)($order['floor'] ?? 0),
+            'has_elevator'          => (int)($order['has_elevator'] ?? 0),
+            'urgent'                => (int)($order['urgent'] ?? 0),
             'cat_name'              => $category ? $category['name'] : '通用',
             'service_type_tag'      => $order['price_type'] === 'fixed' ? '一口价' : ($order['price_type'] === 'custom' ? '用户定价' : '维修'),
-            'remark'                => $order['remark'] ?: '无特殊备注',
-            'contact'               => $order['contact'] ? mb_substr($order['contact'], 0, 1) . '客户' : '业主客户',
+            'remark'                => $order['remark'] ?: '',
+            'express_no'            => (string)($order['express_no'] ?? ''),
+            'express_company'       => (string)($order['express_company'] ?? ''),
+            'goods_arrived'         => (int)($order['goods_arrived'] ?? 1),
+            'qual_req'              => (string)($order['qual_req'] ?? ''),
+            'master_req'            => (string)($order['master_req'] ?? ''),
+            'contact'               => $contactDisplay,
             'mobile'                => $mobile,
             'is_my_order'           => $isMyOrder,
             'province'              => $order['province'],
             'city'                  => $order['city'],
             'district'              => $order['district'],
-            'full_address'          => $order['province'] . $order['city'] . $order['district'] . $address,
+            'full_address'          => $fullAddr,
             'lng'                   => $order['lng'],
             'lat'                   => $order['lat'],
             'distance_km'           => $dist,
-            'appoint_time'          => $order['appoint_time'],
+            'appoint_time'          => (int)$order['appoint_time'],
             'appoint_time_text'     => $order['appoint_time'] ? date('Y-m-d H:i', (int)$order['appoint_time']) : '接单后与业主预约',
             'createtime'            => (int)$order['createtime'],
             'createtime_text'       => date('Y-m-d H:i', (int)$order['createtime']),
-            'view_count'            => $viewCount,
             'quote_count'           => $quoteCount,
             'remaining_quote_slots' => $remainingQuoteSlots,
             'countdown_seconds'     => $countdownSeconds,
@@ -1018,10 +1490,94 @@ class Master extends Base
                 'description' => $myQuote['description'],
                 'status'      => $myQuote['status'],
             ] : null,
-            'can_grab'              => ($order['price_type'] !== 'quote' && (int)$order['status'] === OrderStatus::PENDING_ACCEPT && (int)$order['master_id'] === 0),
-            'can_quote'             => ($order['price_type'] === 'quote' && in_array((int)$order['status'], [OrderStatus::PENDING_ACCEPT, OrderStatus::QUOTING], true) && (int)$order['master_id'] === 0 && !$myQuote),
+            'can_grab'              => ($order['price_type'] !== 'quote' && (int)$order['status'] === OrderStatus::PENDING_ACCEPT && (int)$order['master_id'] === 0 && (int)$order['user_id'] !== $this->uid()),
+            'can_quote'             => ($order['price_type'] === 'quote' && in_array((int)$order['status'], [OrderStatus::PENDING_ACCEPT, OrderStatus::QUOTING], true) && (int)$order['master_id'] === 0 && !$myQuote && (int)$order['user_id'] !== $this->uid()),
         ];
 
+        // 本人已接工单：附带完整履约节点、增项补差、完工取证、结算入账与操作轨迹
+        if ($isMyOrder) {
+            $acceptTs = (int)($order['accept_time'] ?? 0);
+            $contactTs = (int)($order['contact_time'] ?? 0);
+            $arriveTs = (int)($order['arrive_time'] ?? 0);
+            $startTs = (int)($order['start_time'] ?? 0);
+            $finishTs = (int)($order['finish_time'] ?? 0);
+            $verifyTs = (int)($order['verify_time'] ?? 0);
+
+            $contactRemain = ($acceptTs > 0 && $contactTs <= 0) ? max(0, ($acceptTs + 7200) - $now) : 0;
+
+            $diffImg = !empty($order['diff_image'])
+                ? (strpos((string)$order['diff_image'], 'http') === 0 ? (string)$order['diff_image'] : cdnurl((string)$order['diff_image'], true))
+                : '';
+
+            $mediaRows = Db::name('order_media')->where('order_id', $orderId)->order('id asc')->select();
+            $finishImages = [];
+            $damageRemark = '';
+            foreach ($mediaRows as $md) {
+                $mUrl = !empty($md['url']) ? (strpos((string)$md['url'], 'http') === 0 ? (string)$md['url'] : cdnurl((string)$md['url'], true)) : '';
+                if ($mUrl !== '') {
+                    $finishImages[] = [
+                        'id'        => (int)$md['id'],
+                        'stage'     => (string)$md['stage'],
+                        'url'       => $mUrl,
+                        'watermark' => (string)$md['watermark'],
+                        'remark'    => (string)$md['remark'],
+                    ];
+                }
+                if ($damageRemark === '' && !empty($md['remark'])) {
+                    $damageRemark = (string)$md['remark'];
+                }
+            }
+
+            $settleRow = Db::name('settle')->where('order_id', $orderId)->order('id desc')->find();
+            if ($settleRow) {
+                $commissionRate = (float)$settleRow['commission_rate'];
+                $estCommission = (float)$settleRow['commission'];
+                $estMasterFee = (float)$settleRow['settle_amount'];
+            }
+
+            $logRows = Db::name('order_log')->where('order_id', $orderId)->order('id desc')->select();
+            $logs = [];
+            foreach ($logRows as $lg) {
+                $logs[] = [
+                    'id'            => (int)$lg['id'],
+                    'status'        => (int)$lg['status'],
+                    'status_text'   => OrderStatus::label((int)$lg['status']),
+                    'remark'        => (string)$lg['remark'],
+                    'operator_type' => (string)$lg['operator_type'],
+                    'time_text'     => $lg['createtime'] ? date('m-d H:i', (int)$lg['createtime']) : '',
+                ];
+            }
+
+            $data['accept_time'] = $acceptTs;
+            $data['accept_time_text'] = $acceptTs > 0 ? date('Y-m-d H:i', $acceptTs) : '';
+            $data['contact_time'] = $contactTs;
+            $data['contact_time_text'] = $contactTs > 0 ? date('Y-m-d H:i', $contactTs) : '';
+            $data['contact_remain'] = $contactRemain;
+            $data['arrive_time'] = $arriveTs;
+            $data['arrive_time_text'] = $arriveTs > 0 ? date('Y-m-d H:i', $arriveTs) : '';
+            $data['start_time'] = $startTs;
+            $data['start_time_text'] = $startTs > 0 ? date('Y-m-d H:i', $startTs) : '';
+            $data['finish_time'] = $finishTs;
+            $data['finish_time_text'] = $finishTs > 0 ? date('Y-m-d H:i', $finishTs) : '';
+            $data['verify_time'] = $verifyTs;
+            $data['verify_time_text'] = $verifyTs > 0 ? date('Y-m-d H:i', $verifyTs) : '';
+
+            $data['diff_amount'] = (float)($order['diff_amount'] ?? 0);
+            $data['diff_status'] = (int)($order['diff_status'] ?? 0);
+            $data['diff_remark'] = (string)($order['diff_remark'] ?? '');
+            $data['diff_image'] = $diffImg;
+
+            $data['settle_status'] = (int)($order['settle_status'] ?? 0);
+            $data['settle_amount'] = (int)($order['settle_status'] ?? 0) === 1 ? (float)$order['settle_amount'] : $estMasterFee;
+            $data['commission_rate'] = $commissionRate;
+            $data['commission'] = $estCommission;
+            $data['master_fee'] = $data['settle_amount'];
+
+            $data['finish_images'] = $finishImages;
+            $data['damage_remark'] = $damageRemark;
+            $data['logs'] = $logs;
+        }
+
         $this->success('', $data);
     }
 
@@ -1070,18 +1626,58 @@ class Master extends Base
             }
         }
 
-        // 3. 当前师傅已勾选的技能
+        // 3. 当前师傅已勾选的技能（对齐标准字典项，历史类目名自动映射标准名，非字典项归入补充技能）
+        $dictNameSet = [];
+        foreach ($dictList as $dRow) {
+            if (!empty($dRow['name'])) {
+                $dictNameSet[(string)$dRow['name']] = true;
+            }
+        }
+        $legacyAliasMap = [
+            '家具安装'   => '家具',
+            '卫浴洁具'   => '卫浴',
+            '灯具电路'   => '灯具',
+            '锁具安防'   => '锁具',
+            '窗帘安装'   => '窗帘',
+            '墙纸壁画'   => '墙纸/墙面',
+            '墙纸/壁画'  => '墙纸/墙面',
+            '净水设备'   => '净水器',
+            '智能晾衣架' => '晾衣架',
+            '门窗安装'   => '门窗',
+            '家电安装'   => '家电',
+            '电视投影'   => '电视/投影',
+            '淋浴房安装' => '淋浴房',
+            '商用厨电'   => '更多安装维修',
+            '健身器材'   => '更多安装维修',
+        ];
+
         $selectedNames = [];
         $customText = '';
         if ($masterId > 0) {
             $mySkills = Db::name('master_skill')->where('master_id', $masterId)->select();
             $customArr = [];
             foreach ($mySkills as $ms) {
-                $sName = !empty($ms['skill_name']) ? $ms['skill_name'] : '';
-                if ($ms['is_custom'] == 1) {
-                    $customArr[] = $sName;
-                } else if ($sName) {
-                    $selectedNames[] = $sName;
+                $sName = trim((string)(!empty($ms['skill_name']) ? $ms['skill_name'] : ''));
+                if ($sName === '') {
+                    continue;
+                }
+                if ((int)$ms['is_custom'] === 1 && !isset($dictNameSet[$sName])) {
+                    if (!in_array($sName, $customArr, true)) {
+                        $customArr[] = $sName;
+                    }
+                } elseif (isset($dictNameSet[$sName])) {
+                    if (!in_array($sName, $selectedNames, true)) {
+                        $selectedNames[] = $sName;
+                    }
+                } elseif (isset($legacyAliasMap[$sName]) && isset($dictNameSet[$legacyAliasMap[$sName]])) {
+                    $mapped = $legacyAliasMap[$sName];
+                    if (!in_array($mapped, $selectedNames, true)) {
+                        $selectedNames[] = $mapped;
+                    }
+                } else {
+                    if (!in_array($sName, $customArr, true)) {
+                        $customArr[] = $sName;
+                    }
                 }
             }
             $customText = implode(' ', $customArr);
@@ -1101,16 +1697,69 @@ class Master extends Base
     public function saveSkills()
     {
         $master = $this->requireMaster();
-        $selectedSkills = (array)$this->request->post('selected_skills/a', []);
+        $masterId = (int)$master['id'];
+
+        // 同时兼容 skill_ids（ID 数组/逗号串/JSON串）与 selected_skills（名称数组/逗号串/JSON串）
+        $parseStrList = function ($raw) {
+            if (empty($raw)) {
+                return [];
+            }
+            if (is_string($raw)) {
+                $dec = json_decode(htmlspecialchars_decode(trim($raw)), true);
+                $arr = is_array($dec) ? $dec : explode(',', $raw);
+            } elseif (is_array($raw)) {
+                $arr = $raw;
+            } else {
+                return [];
+            }
+            $out = [];
+            foreach ($arr as $v) {
+                if (is_array($v)) {
+                    continue;
+                }
+                $s = trim((string)$v, " \t\n\r\0\x0B\"'[]");
+                if ($s !== '' && !in_array($s, $out, true)) {
+                    $out[] = $s;
+                }
+            }
+            return $out;
+        };
+
+        $rawSkillIds = $this->request->post('skill_ids', null, null);
+        $skillIds = [];
+        foreach ($parseStrList($rawSkillIds) as $sidStr) {
+            $sidInt = (int)$sidStr;
+            if ($sidInt > 0 && !in_array($sidInt, $skillIds, true)) {
+                $skillIds[] = $sidInt;
+            }
+        }
+
+        $selectedSkills = $parseStrList($this->request->post('selected_skills', null, null));
         $customText = trim((string)$this->request->post('custom_text', ''));
 
+        // 若传入了 skill_ids，关联 fa_skill_dict -> fa_skill_category 补全标准名称
+        $dictById = [];
+        if (!empty($skillIds)) {
+            $idDictRows = Db::name('skill_dict')->alias('d')
+                ->join('skill_category sc', 'sc.id = d.category_id', 'LEFT')
+                ->field('d.id,d.category_id,d.category,d.name,sc.name as std_category_name')
+                ->where('d.id', 'in', $skillIds)
+                ->select();
+            foreach ($idDictRows as $idr) {
+                $dictById[(int)$idr['id']] = $idr;
+                if (!empty($idr['name']) && !in_array($idr['name'], $selectedSkills, true)) {
+                    $selectedSkills[] = (string)$idr['name'];
+                }
+            }
+        }
+
         // 1. 处理自定义输入的技能
         $customNames = [];
-        if (!empty($customText)) {
+        if ($customText !== '') {
             $parts = preg_split('/[,，\s]+/u', $customText);
             foreach ($parts as $p) {
                 $p = trim($p);
-                if (!empty($p) && !in_array($p, $customNames) && !in_array($p, $selectedSkills)) {
+                if ($p !== '' && !in_array($p, $customNames, true) && !in_array($p, $selectedSkills, true)) {
                     $customNames[] = $p;
                 }
             }
@@ -1120,61 +1769,203 @@ class Master extends Base
             $this->error('请至少选择或输入一项服务技能');
         }
 
-        // 2. 清理当前师傅原有的技能
-        Db::name('master_skill')->where('master_id', $master['id'])->delete();
+        // 读取服务类目表 fa_service_cat 建立多策略匹配（精确匹配 -> 斜杠词根匹配 -> 行业语义映射 -> 原有入驻类目兜底）
+        $catRows = Db::name('service_cat')->field('id,name')->where('status', 'normal')->select();
+        $catExactMap = [];
+        $catTokens = [];
+        $otherCatId = 0;
+        foreach ($catRows as $cr) {
+            $cid = (int)$cr['id'];
+            $cname = trim((string)$cr['name']);
+            if ($cname === '') {
+                continue;
+            }
+            $catExactMap[$cname] = $cid;
+            if ($cname === '其它' || $cname === '其他') {
+                $otherCatId = $cid;
+            }
+            foreach (preg_split('/[\/、\s]+/u', $cname) as $tk) {
+                $tk = trim($tk);
+                if (mb_strlen($tk, 'UTF-8') >= 2) {
+                    $catTokens[$tk] = $cid;
+                }
+            }
+        }
+
+        $semanticKeywords = [
+            '墙纸'   => '墙纸/壁画',
+            '壁画'   => '墙纸/壁画',
+            '墙面'   => '墙纸/壁画',
+            '洁具'   => '卫浴',
+            '马桶'   => '卫浴',
+            '花洒'   => '卫浴',
+            '强弱电' => '灯具',
+            '热水器' => '家电',
+            '空调'   => '家电',
+            '洗衣机' => '家电',
+            '冰箱'   => '家电',
+            '家电清洗' => '家电',
+            '油烟机' => '商用厨电',
+            '厨电'   => '商用厨电',
+            '木工'   => '家具',
+            '送装'   => '家具',
+            '家具养护' => '家具',
+            '铝工'   => '门窗',
+            '铝合金' => '门窗',
+            '跑步机' => '健身器材',
+        ];
+
+        $resolveCatId = function ($skillName, $skillCategoryName, $fallbackCatId = 0) use ($catExactMap, $catTokens, $semanticKeywords, $otherCatId) {
+            $skillName = trim((string)$skillName);
+            $skillCategoryName = trim((string)$skillCategoryName);
+            if (isset($catExactMap[$skillName])) {
+                return $catExactMap[$skillName];
+            }
+            if (isset($catExactMap[$skillCategoryName])) {
+                return $catExactMap[$skillCategoryName];
+            }
+            foreach (preg_split('/[\/、\s()（）]+/u', $skillName) as $part) {
+                $part = trim($part);
+                if ($part !== '' && isset($catTokens[$part])) {
+                    return $catTokens[$part];
+                }
+            }
+            foreach ($catTokens as $tk => $cid) {
+                if (mb_strpos($skillName, $tk) !== false || mb_strpos($skillCategoryName, $tk) !== false) {
+                    return $cid;
+                }
+            }
+            foreach ($semanticKeywords as $kw => $targetCatName) {
+                if (mb_strpos($skillName, $kw) !== false && isset($catExactMap[$targetCatName])) {
+                    return $catExactMap[$targetCatName];
+                }
+            }
+            if ($fallbackCatId > 0) {
+                return $fallbackCatId;
+            }
+            return $otherCatId > 0 ? $otherCatId : 0;
+        };
+
+        // 读取该师傅原有已绑定的有效服务类目（保留入驻时选定的基础 cat_id，杜绝重存后丢失为 0）
+        $oldSkillRows = Db::name('master_skill')->where('master_id', $masterId)->where('cat_id', '>', 0)->select();
+        $oldCatBySkillName = [];
+        $oldBaseCatRows = [];
+        $primaryFallbackCatId = 0;
+        foreach ($oldSkillRows as $osr) {
+            $ocid = (int)$osr['cat_id'];
+            if ($primaryFallbackCatId === 0 && $ocid > 0) {
+                $primaryFallbackCatId = $ocid;
+            }
+            if (!empty($osr['skill_name'])) {
+                $oldCatBySkillName[(string)$osr['skill_name']] = $ocid;
+            }
+            if ((int)$osr['skill_id'] === 0 && (int)$osr['is_custom'] === 0) {
+                $oldBaseCatRows[$ocid] = $osr;
+            }
+        }
 
-        // 3. 写入字典勾选的技能
-        $dictRows = Db::name('skill_dict')->where('name', 'in', $selectedSkills)->select();
         $dictMap = [];
-        foreach ($dictRows as $dr) {
-            $dictMap[$dr['name']] = $dr;
+        if (!empty($selectedSkills)) {
+            $dictRows = Db::name('skill_dict')->alias('d')
+                ->join('skill_category sc', 'sc.id = d.category_id', 'LEFT')
+                ->field('d.id,d.category_id,d.category,d.name,sc.name as std_category_name')
+                ->where('d.name', 'in', $selectedSkills)
+                ->select();
+            foreach ($dictRows as $dr) {
+                $dictMap[$dr['name']] = $dr;
+            }
         }
 
         $now = time();
-        foreach ($selectedSkills as $sName) {
-            $dict = $dictMap[$sName] ?? null;
-            Db::name('master_skill')->insert([
-                'master_id'  => $master['id'],
-                'cat_id'     => 0,
-                'skill_id'   => $dict ? $dict['id'] : 0,
-                'skill_name' => $sName,
-                'category'   => $dict ? $dict['category'] : '服务技能',
-                'is_custom'  => 0,
-                'cert_image' => '',
-                'status'     => 'normal',
-                'createtime' => $now
-            ]);
-        }
+        $coveredCatIds = [];
 
-        // 4. 处理自定义输入的技能（沉淀入库到 skill_dict 且归属当前师傅）
-        foreach ($customNames as $cName) {
-            $exist = Db::name('skill_dict')->where('name', $cName)->find();
-            if (!$exist) {
-                $skillDictId = Db::name('skill_dict')->insertGetId([
-                    'category'   => '其他技能',
-                    'name'       => $cName,
-                    'source'     => 'custom',
-                    'master_id'  => $master['id'],
-                    'weigh'      => 0,
+        Db::startTrans();
+        try {
+            Db::name('master_skill')->where('master_id', $masterId)->delete();
+
+            foreach ($selectedSkills as $sName) {
+                $dict = isset($dictMap[$sName]) ? $dictMap[$sName] : null;
+                $catName = $dict
+                    ? (!empty($dict['std_category_name']) ? (string)$dict['std_category_name'] : (string)$dict['category'])
+                    : '服务技能';
+                $prevCat = isset($oldCatBySkillName[$sName]) ? (int)$oldCatBySkillName[$sName] : $primaryFallbackCatId;
+                $matchedCatId = $resolveCatId($sName, $catName, $prevCat);
+                if ($matchedCatId > 0) {
+                    $coveredCatIds[$matchedCatId] = true;
+                }
+                Db::name('master_skill')->insert([
+                    'master_id'  => $masterId,
+                    'cat_id'     => $matchedCatId,
+                    'skill_id'   => $dict ? (int)$dict['id'] : 0,
+                    'skill_name' => mb_substr($sName, 0, 50),
+                    'category'   => mb_substr($catName, 0, 50),
+                    'is_custom'  => 0,
+                    'cert_image' => '',
                     'status'     => 'normal',
                     'createtime' => $now,
-                    'updatetime' => $now
                 ]);
-            } else {
-                $skillDictId = $exist['id'];
             }
 
-            Db::name('master_skill')->insert([
-                'master_id'  => $master['id'],
-                'cat_id'     => 0,
-                'skill_id'   => $skillDictId,
-                'skill_name' => $cName,
-                'category'   => '其他技能',
-                'is_custom'  => 1,
-                'cert_image' => '',
-                'status'     => 'normal',
-                'createtime' => $now
-            ]);
+            foreach ($customNames as $cName) {
+                $exist = Db::name('skill_dict')->where('name', $cName)->find();
+                if (!$exist) {
+                    $skillDictId = (int)Db::name('skill_dict')->insertGetId([
+                        'category_id' => 7,
+                        'category'    => '其他技能',
+                        'name'        => mb_substr($cName, 0, 50),
+                        'source'      => 'custom',
+                        'master_id'   => $masterId,
+                        'weigh'       => 0,
+                        'status'      => 'normal',
+                        'createtime'  => $now,
+                        'updatetime'  => $now,
+                    ]);
+                } else {
+                    $skillDictId = (int)$exist['id'];
+                }
+
+                $prevCat = isset($oldCatBySkillName[$cName]) ? (int)$oldCatBySkillName[$cName] : $primaryFallbackCatId;
+                $customCatId = $resolveCatId($cName, '其他技能', $prevCat);
+                if ($customCatId > 0) {
+                    $coveredCatIds[$customCatId] = true;
+                }
+
+                Db::name('master_skill')->insert([
+                    'master_id'  => $masterId,
+                    'cat_id'     => $customCatId,
+                    'skill_id'   => $skillDictId,
+                    'skill_name' => mb_substr($cName, 0, 50),
+                    'category'   => '其他技能',
+                    'is_custom'  => 1,
+                    'cert_image' => '',
+                    'status'     => 'normal',
+                    'createtime' => $now,
+                ]);
+            }
+
+            // 保留师傅入驻审核时已绑定但未被细分字典覆盖的基础服务大类记录，确保接单大厅类目过滤不丢失
+            foreach ($oldBaseCatRows as $baseCid => $baseRow) {
+                if (!isset($coveredCatIds[$baseCid])) {
+                    Db::name('master_skill')->insert([
+                        'master_id'  => $masterId,
+                        'cat_id'     => (int)$baseCid,
+                        'skill_id'   => 0,
+                        'skill_name' => (string)$baseRow['skill_name'],
+                        'category'   => (string)($baseRow['category'] ?: '安装维修'),
+                        'is_custom'  => 0,
+                        'cert_image' => (string)($baseRow['cert_image'] ?? ''),
+                        'status'     => 'normal',
+                        'createtime' => $now,
+                    ]);
+                }
+            }
+
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            \think\Log::error('[Master::saveSkills] ' . $e->getMessage());
+            $this->error('保存技能失败：' . $e->getMessage());
+            return;
         }
 
         $this->success('服务技能保存成功');
diff --git a/server/application/api/controller/Merchant.php b/server/application/api/controller/Merchant.php
index 543f18b..4d19de1 100644
--- a/server/application/api/controller/Merchant.php
+++ b/server/application/api/controller/Merchant.php
@@ -2,6 +2,7 @@
 
 namespace app\api\controller;
 
+use app\common\library\InvoiceService;
 use app\common\library\OrderStatus;
 use think\Db;
 
@@ -85,35 +86,44 @@ class Merchant extends Base
 
         $uids = $this->merchantUserIds($merchant);
         $isOwner = (int)$merchant['user_id'] === $this->uid();
-        $orderCount = (int)Db::name('order')->where('user_id', 'in', $uids)->where('pay_status', 1)->count();
-        $totalAmount = (float)Db::name('order')->where('user_id', 'in', $uids)->where('pay_status', 1)->sum('pay_amount');
-        $invoiced = (float)Db::name('invoice')->where('merchant_id', $merchant['id'])->where('status', 'issued')->sum('amount');
+        $orderCount = (int)Db::name('order')->where('user_id', 'in', $uids)->where('pay_status', 1)->where('status', '<>', OrderStatus::CANCELLED)->count();
+        $quota = InvoiceService::getQuotaSummary($this->uid());
+        $totalAmount = (float)$quota['paid_amount'];
+        $invoiced = (float)$quota['used_amount'];
 
         $this->success('', [
             'applied'  => true,
             'is_owner' => $isOwner,
             'role'     => $isOwner ? 'owner' : 'member',
             'merchant' => [
-                'id'              => (int)$merchant['id'],
-                'name'            => $merchant['name'],
-                'license_no'      => $merchant['license_no'],
-                'legal_person'    => $merchant['legal_person'],
-                'contact'         => $merchant['contact'],
-                'mobile'          => $merchant['mobile'],
-                'address'         => $merchant['province'] . $merchant['city'] . $merchant['district'] . $merchant['address'],
-                'invoice_title'   => $merchant['invoice_title'],
-                'invoice_tax_no'  => $merchant['invoice_tax_no'],
-                'settle_type'     => $merchant['settle_type'],
-                'verify_status'   => $merchant['verify_status'],
-                'audit_msg'       => $merchant['audit_msg'],
-                'role'            => $isOwner ? 'owner' : 'member',
-                'is_owner'        => $isOwner,
-                'owner_user_id'   => (int)$merchant['user_id'],
-                'member_count'    => max(0, count($uids) - 1),
-                'order_count'     => $orderCount,
-                'total_amount'    => round($totalAmount, 2),
-                'invoiced_amount' => round($invoiced, 2),
-                'invoiceable'     => round(max(0, $totalAmount - $invoiced), 2),
+                'id'                  => (int)$merchant['id'],
+                'name'                => $merchant['name'],
+                'license_no'          => $merchant['license_no'],
+                'legal_person'        => $merchant['legal_person'],
+                'contact'             => $merchant['contact'],
+                'mobile'              => $merchant['mobile'],
+                'province'            => (string)$merchant['province'],
+                'city'                => (string)$merchant['city'],
+                'district'            => (string)$merchant['district'],
+                'detail_address'      => (string)$merchant['address'],
+                'address'             => $merchant['province'] . $merchant['city'] . $merchant['district'] . $merchant['address'],
+                'invoice_title'       => $merchant['invoice_title'],
+                'invoice_tax_no'      => $merchant['invoice_tax_no'],
+                'invoice_bank'        => $merchant['invoice_bank'],
+                'invoice_account'     => $merchant['invoice_account'],
+                'settle_type'         => $merchant['settle_type'],
+                'verify_status'       => $merchant['verify_status'],
+                'audit_msg'           => $merchant['audit_msg'],
+                'role'                => $isOwner ? 'owner' : 'member',
+                'is_owner'            => $isOwner,
+                'owner_user_id'       => (int)$merchant['user_id'],
+                'member_count'        => max(0, count($uids) - 1),
+                'order_count'         => $orderCount,
+                'total_amount'        => round($totalAmount, 2),
+                'invoiced_amount'     => round($invoiced, 2),
+                'issued_amount'       => round((float)$quota['issued_amount'], 2),
+                'wait_invoice_amount' => round((float)$quota['wait_amount'], 2),
+                'invoiceable'         => round((float)$quota['available'], 2),
             ],
         ]);
     }
@@ -139,6 +149,23 @@ class Merchant extends Base
             $this->error('联系电话格式不正确');
         }
         Db::name('merchant')->where('id', $merchant['id'])->update($data);
+
+        // 若维护了商家开票资料，同步刷新关联的商家默认发票抬头
+        if (isset($data['invoice_title']) || isset($data['invoice_tax_no']) || isset($data['invoice_bank']) || isset($data['invoice_account'])) {
+            $latest = Db::name('merchant')->where('id', $merchant['id'])->find();
+            if ($latest) {
+                $syncFields = ['updatetime' => time()];
+                if (!empty($latest['invoice_title'])) $syncFields['title'] = $latest['invoice_title'];
+                if (!empty($latest['invoice_tax_no'])) $syncFields['tax_no'] = strtoupper($latest['invoice_tax_no']);
+                if (isset($data['invoice_bank'])) $syncFields['bank_name'] = $latest['invoice_bank'];
+                if (isset($data['invoice_account'])) $syncFields['bank_account'] = $latest['invoice_account'];
+                Db::name('invoice_title')
+                    ->where('merchant_id', (int)$merchant['id'])
+                    ->where('title_type', 'enterprise')
+                    ->update($syncFields);
+            }
+        }
+
         $this->success('已保存');
     }
 
@@ -181,11 +208,22 @@ class Merchant extends Base
         $uids = $this->merchantUserIds($merchant);
         $status = $this->request->param('status', 'all');
         $keyword = trim((string)$this->request->param('keyword', ''));
+        $memberUid = (int)$this->request->param('member_uid', 0);
+        $month = trim((string)$this->request->param('month', ''));
         $page = max(1, (int)$this->request->param('page', 1));
         $limit = min(50, max(1, (int)$this->request->param('limit', 20)));
 
-        $build = function () use ($uids, $status, $keyword) {
-            $q = Db::name('order')->where('user_id', 'in', $uids);
+        $targetUids = ($memberUid > 0 && in_array($memberUid, $uids, true)) ? [$memberUid] : $uids;
+
+        $build = function () use ($targetUids, $status, $keyword, $month) {
+            $q = Db::name('order')->where('user_id', 'in', $targetUids);
+            if ($month !== '' && preg_match('/^\d{4}-\d{2}$/', $month)) {
+                $startTs = strtotime($month . '-01 00:00:00');
+                $endTs = strtotime('+1 month', $startTs) - 1;
+                if ($startTs > 0 && $endTs > 0) {
+                    $q->where('createtime', 'between', [$startTs, $endTs]);
+                }
+            }
             if ($keyword !== '') {
                 $q->where(function ($sub) use ($keyword) {
                     $sub->where('contact', 'like', "%{$keyword}%")
@@ -211,6 +249,10 @@ class Merchant extends Base
         $total = $build()->count();
         $rows = $build()->order('id desc')->page($page, $limit)->select();
         $userMap = Db::name('user')->where('id', 'in', $uids)->column('id,nickname,mobile', 'id');
+        $serviceIds = array_values(array_unique(array_filter(array_map('intval', array_column($rows, 'service_id')))));
+        $serviceImgMap = $serviceIds ? Db::name('service')->where('id', 'in', $serviceIds)->column('image', 'id') : [];
+        $orderIds = array_values(array_unique(array_filter(array_map('intval', array_column($rows, 'id')))));
+        $batchMap = $orderIds ? Db::name('merchant_order')->where('order_id', 'in', $orderIds)->column('batch_no', 'order_id') : [];
 
         foreach ($rows as &$row) {
             $ownerUser = (int)$row['user_id'] === (int)$merchant['user_id'];
@@ -227,10 +269,10 @@ class Merchant extends Base
             $row['account_name'] = $u && $u['nickname'] ? $u['nickname'] : ('用户' . substr($mobile, -4));
             $row['account_role'] = $ownerUser ? 'owner' : 'member';
             $row['account_role_text'] = $ownerUser ? '主账号' : '关联账号';
+            $row['batch_no'] = isset($batchMap[(int)$row['id']]) ? (string)$batchMap[(int)$row['id']] : '';
             $img = !empty($row['service_image']) ? $row['service_image'] : '';
-            if (empty($img) && !empty($row['service_id'])) {
-                $s = Db::name('service')->where('id', (int)$row['service_id'])->find();
-                $img = $s ? $s['image'] : '';
+            if (empty($img) && !empty($row['service_id']) && isset($serviceImgMap[(int)$row['service_id']])) {
+                $img = $serviceImgMap[(int)$row['service_id']];
             }
             if ($img && strpos($img, 'http') !== 0) {
                 $img = cdnurl($img, true);
@@ -241,171 +283,63 @@ class Merchant extends Base
         unset($row);
 
         $this->success('', [
-            'list'  => $rows,
-            'total' => (int)$total,
-            'page'  => $page,
+            'list'     => $rows,
+            'total'    => (int)$total,
+            'page'     => $page,
+            'has_more' => ($page * $limit) < (int)$total,
         ]);
     }
 
     /**
-     * 开票记录与可开票额度（个人用户与认证商家通用）
+     * 开票记录与可开票额度（个人用户与认证商家通用，兼容旧版调用并复用 InvoiceService）
      */
     public function invoices()
     {
-        $merchant = $this->merchantInfo();
-        $isPassMerchant = ($merchant && $merchant['verify_status'] === 'pass');
-
-        if ($isPassMerchant) {
-            $uids = $this->merchantUserIds($merchant);
-            $mid = (int)$merchant['id'];
-            $list = Db::name('invoice')
-                ->where(function ($q) use ($mid, $uids) {
-                    $q->where('merchant_id', $mid)->whereOr('user_id', 'in', $uids);
-                })
-                ->order('id desc')
-                ->limit(30)
-                ->select();
-            $paid = (float)Db::name('order')->where('user_id', 'in', $uids)->where('pay_status', 1)->sum('pay_amount');
-            $used = (float)Db::name('invoice')
-                ->where(function ($q) use ($mid, $uids) {
-                    $q->where('merchant_id', $mid)->whereOr('user_id', 'in', $uids);
-                })
-                ->where('status', 'in', ['wait', 'issued'])
-                ->sum('amount');
-            $issued = (float)Db::name('invoice')
-                ->where(function ($q) use ($mid, $uids) {
-                    $q->where('merchant_id', $mid)->whereOr('user_id', 'in', $uids);
-                })
-                ->where('status', 'issued')
-                ->sum('amount');
-        } else {
-            $uid = $this->uid();
-            $list = Db::name('invoice')->where('user_id', $uid)->order('id desc')->limit(30)->select();
-            $paid = (float)Db::name('order')->where('user_id', $uid)->where('pay_status', 1)->sum('pay_amount');
-            $used = (float)Db::name('invoice')->where('user_id', $uid)->where('status', 'in', ['wait', 'issued'])->sum('amount');
-            $issued = (float)Db::name('invoice')->where('user_id', $uid)->where('status', 'issued')->sum('amount');
-        }
-
-        $statusText = ['wait' => '开票中', 'issued' => '已开票', 'reject' => '已驳回'];
-        foreach ($list as &$row) {
-            $row['amount'] = (float)$row['amount'];
-            $row['status_text'] = isset($statusText[$row['status']]) ? $statusText[$row['status']] : $row['status'];
-            $row['type_text'] = $row['type'] === 'special' ? '专用发票' : '普通发票';
-            $row['title_type'] = !empty($row['tax_no']) ? 'enterprise' : 'personal';
-            $row['title_type_text'] = !empty($row['tax_no']) ? '企业单位' : '个人/非企业';
-            $row['time_text'] = date('Y-m-d H:i', (int)$row['createtime']);
-        }
-        unset($row);
-
-        $userRow = Db::name('user')->where('id', $this->uid())->field('nickname,mobile')->find();
-        $personalDefaultTitle = ($userRow && !empty($userRow['nickname'])) ? (string)$userRow['nickname'] : '个人';
+        $records = InvoiceService::getRecordList($this->uid(), 'all', 1, 30);
+        $quota = InvoiceService::getQuotaSummary($this->uid());
 
         $this->success('', [
-            'list'  => $list,
-            'quota' => [
-                'available'          => round(max(0, $paid - $used), 2),
-                'paid_amount'        => round($paid, 2),
-                'used_amount'        => round($used, 2),
-                'issued_amount'      => round($issued, 2),
-                'is_merchant'        => $isPassMerchant,
-                'default_title_type' => $isPassMerchant ? 'enterprise' : 'personal',
-                'default_title'      => $isPassMerchant ? ($merchant['invoice_title'] ?: $merchant['name']) : $personalDefaultTitle,
-                'default_tax_no'     => $isPassMerchant ? (string)$merchant['invoice_tax_no'] : '',
-                'enterprise_title'   => $merchant ? (string)($merchant['invoice_title'] ?: $merchant['name']) : '',
-                'enterprise_tax_no'  => $merchant ? (string)$merchant['invoice_tax_no'] : '',
-                'personal_title'     => $personalDefaultTitle,
-            ],
+            'list'  => $records['list'],
+            'quota' => $quota,
         ]);
     }
 
     /**
-     * 申请开票（支持个人用户与认证商家）
+     * 申请开票（向下兼容旧版入口，底层复用 InvoiceService）
      * @ApiMethod (POST)
      */
     public function invoice()
     {
-        $merchant = $this->merchantInfo();
-        $isPassMerchant = ($merchant && $merchant['verify_status'] === 'pass');
+        $params = [
+            'order_ids'      => $this->request->post('order_ids', '', null),
+            'amount'         => $this->request->post('amount', 0),
+            'title_id'       => $this->request->post('title_id', 0),
+            'type'           => $this->request->post('type', 'normal'),
+            'title_type'     => $this->request->post('title_type', ''),
+            'title'          => $this->request->post('title', ''),
+            'tax_no'         => $this->request->post('tax_no', ''),
+            'bank_name'      => $this->request->post('bank_name', ''),
+            'bank_account'   => $this->request->post('bank_account', ''),
+            'reg_address'    => $this->request->post('reg_address', ''),
+            'reg_mobile'     => $this->request->post('reg_mobile', ''),
+            'email'          => $this->request->post('email', ''),
+            'receive_mobile' => $this->request->post('receive_mobile', ''),
+            'remark'         => $this->request->post('remark', ''),
+            'save_title'     => $this->request->post('save_title', 0),
+        ];
 
-        $amount = round((float)$this->request->post('amount'), 2);
-        $type = $this->request->post('type', 'normal');
-        $titleType = trim((string)$this->request->post('title_type', ''));
-        $title = trim((string)$this->request->post('title', ''));
-        $taxNo = strtoupper(trim((string)$this->request->post('tax_no', '')));
-        $email = trim((string)$this->request->post('email', ''));
-        $remark = trim((string)$this->request->post('remark', ''));
-
-        if ($amount <= 0) {
-            $this->error('请填写开票金额');
-        }
-        if (!in_array($type, ['normal', 'special'], true)) {
-            $this->error('发票类型错误');
+        try {
+            $result = InvoiceService::submitInvoice($this->uid(), $params, false);
+        } catch (\InvalidArgumentException $e) {
+            $this->error($e->getMessage());
+            return;
+        } catch (\Exception $e) {
+            \think\Log::error('[Merchant::invoice] ' . $e->getMessage());
+            $this->error('开票申请提交失败，请稍后重试');
+            return;
         }
 
-        if (!in_array($titleType, ['personal', 'enterprise'], true)) {
-            $titleType = ($isPassMerchant || $taxNo !== '' || $type === 'special') ? 'enterprise' : 'personal';
-        }
-
-        if ($titleType === 'personal') {
-            if ($type === 'special') {
-                $this->error('个人抬头仅支持开具普通发票');
-            }
-            if ($title === '') {
-                $userRow = Db::name('user')->where('id', $this->uid())->field('nickname')->find();
-                $title = ($userRow && !empty($userRow['nickname'])) ? (string)$userRow['nickname'] : '个人';
-            }
-            $taxNo = '';
-        } else {
-            if ($title === '' && $isPassMerchant) {
-                $title = (string)($merchant['invoice_title'] ?: $merchant['name']);
-            }
-            if ($taxNo === '' && $isPassMerchant) {
-                $taxNo = strtoupper(trim((string)$merchant['invoice_tax_no']));
-            }
-            if ($title === '') {
-                $this->error('请填写企业发票抬头');
-            }
-            if ($taxNo === '') {
-                $this->error('请填写纳税人识别号（税号）');
-            }
-        }
-
-        if ($isPassMerchant) {
-            $uids = $this->merchantUserIds($merchant);
-            $mid = (int)$merchant['id'];
-            $paid = (float)Db::name('order')->where('user_id', 'in', $uids)->where('pay_status', 1)->sum('pay_amount');
-            $used = (float)Db::name('invoice')
-                ->where(function ($q) use ($mid, $uids) {
-                    $q->where('merchant_id', $mid)->whereOr('user_id', 'in', $uids);
-                })
-                ->where('status', 'in', ['wait', 'issued'])
-                ->sum('amount');
-        } else {
-            $uid = $this->uid();
-            $paid = (float)Db::name('order')->where('user_id', $uid)->where('pay_status', 1)->sum('pay_amount');
-            $used = (float)Db::name('invoice')->where('user_id', $uid)->where('status', 'in', ['wait', 'issued'])->sum('amount');
-        }
-
-        $available = round(max(0, $paid - $used), 2);
-        if ($amount > $available) {
-            $this->error('可开票金额不足，当前可开 ¥' . $available);
-        }
-
-        Db::name('invoice')->insert([
-            'merchant_id' => $isPassMerchant ? (int)$merchant['id'] : 0,
-            'user_id'     => $this->uid(),
-            'amount'      => $amount,
-            'type'        => $type,
-            'title'       => $title,
-            'tax_no'      => $taxNo,
-            'email'       => $email,
-            'remark'      => $remark,
-            'status'      => 'wait',
-            'createtime'  => time(),
-            'updatetime'  => time(),
-        ]);
-
-        $this->success('开票申请已提交，3 个工作日内开具');
+        $this->success('开票申请已提交，3 个工作日内开具', $result);
     }
 
     /**
@@ -503,7 +437,9 @@ class Merchant extends Base
 
         try {
             $this->notify('user', (int)$user['id'], '已加入商家账号', '您的账号已关联到商家「' . $merchant['name'] . '」，下单、账单、开票数据将实时同步', 'system', 0);
-        } catch (\Exception $e) {}
+        } catch (\Exception $e) {
+            \think\Log::error('[Merchant::bindMember notify] ' . $e->getMessage());
+        }
 
         $this->success('绑定成功，关联账号数据将实时同步', [
             'member_id' => (int)$id,
@@ -542,7 +478,9 @@ class Merchant extends Base
         Db::name('merchant_member')->where('id', (int)$row['id'])->delete();
         try {
             $this->notify('user', (int)$row['user_id'], '商家关联已解除', '您已与商家「' . $merchant['name'] . '」解除关联，对方商家数据不再同步', 'system', 0);
-        } catch (\Exception $e) {}
+        } catch (\Exception $e) {
+            \think\Log::error('[Merchant::unbindMember notify] ' . $e->getMessage());
+        }
         $this->success('已解除关联，对方将不再同步商家数据');
     }
 
@@ -604,94 +542,406 @@ class Merchant extends Base
     public function importBatch()
     {
         $merchant = $this->requireMerchant();
-        $items = $this->request->post('items/a', []);
-        if (empty($items)) {
-            $items = $this->request->post('orders/a', []);
+        $rawOrders = $this->request->post('orders', null, null);
+        if ($rawOrders === null || $rawOrders === '' || $rawOrders === []) {
+            $rawOrders = $this->request->post('items', [], null);
         }
+
+        $items = [];
+        if (is_string($rawOrders)) {
+            $decoded = json_decode(htmlspecialchars_decode(trim($rawOrders)), true);
+            if (is_array($decoded)) {
+                $items = $decoded;
+            }
+        } elseif (is_array($rawOrders)) {
+            if (count($rawOrders) === 1 && isset($rawOrders[0]) && is_string($rawOrders[0])) {
+                $decoded = json_decode(htmlspecialchars_decode(trim($rawOrders[0])), true);
+                $items = is_array($decoded) ? $decoded : $rawOrders;
+            } else {
+                $items = $rawOrders;
+            }
+        }
+
         if (empty($items) || !is_array($items)) {
             $this->error('导入数据不能为空');
         }
+        if (count($items) > 100) {
+            $this->error('单次批量导入最多支持 100 条订单');
+        }
 
-        $globalServiceId = (int)$this->request->post('service_id', 1);
-        $svc = Db::name('service')->where('id', $globalServiceId)->find();
-        $defaultServiceName = $svc ? $svc['name'] : '家居安装';
-        $defaultPrice = $svc && (float)$svc['base_price'] > 0 ? (float)$svc['base_price'] : 80.00;
+        $globalServiceId = (int)$this->request->post('service_id', 0);
+        $serviceCache = [];
+        $preparedRows = [];
+
+        foreach ($items as $idx => $item) {
+            if (is_string($item)) {
+                $decItem = json_decode(htmlspecialchars_decode(trim($item)), true);
+                if (is_array($decItem)) {
+                    $item = $decItem;
+                }
+            }
+            if (!is_array($item)) {
+                continue;
+            }
+
+            $contact = trim((string)(isset($item['contact']) ? $item['contact'] : '买家'));
+            $mobile = preg_replace('/[^\d]/', '', trim((string)(isset($item['mobile']) ? $item['mobile'] : '')));
+            $address = trim((string)(isset($item['address']) ? $item['address'] : ''));
+            if ($mobile === '' && $address === '') {
+                continue;
+            }
+            $rowNo = $idx + 1;
+            if (!preg_match('/^1\d{10}$/', $mobile)) {
+                $this->error("第 {$rowNo} 条订单联系电话格式不正确");
+            }
+            if ($address === '') {
+                $this->error("第 {$rowNo} 条订单缺少详细服务地址");
+            }
+
+            $itemServiceId = !empty($item['service_id']) ? (int)$item['service_id'] : $globalServiceId;
+            if ($itemServiceId <= 0) {
+                $this->error("第 {$rowNo} 条订单未指定有效的服务项目");
+            }
+            if (!array_key_exists($itemServiceId, $serviceCache)) {
+                $serviceCache[$itemServiceId] = Db::name('service')
+                    ->where('id', $itemServiceId)
+                    ->where('status', 'normal')
+                    ->find() ?: null;
+            }
+            $svc = $serviceCache[$itemServiceId];
+            if (!$svc) {
+                $this->error("第 {$rowNo} 条订单关联的服务项目不存在或已下架");
+            }
+            if ($svc['price_type'] === 'quote') {
+                $this->error("第 {$rowNo} 条订单所选服务「{$svc['name']}」为师傅报价项目，不支持批量一口价导入");
+            }
+
+            $goodsNum = max(1, (int)(isset($item['goods_num']) ? $item['goods_num'] : (isset($item['num']) ? $item['num'] : 1)));
+            $floor = isset($item['floor']) ? max(1, (int)$item['floor']) : 1;
+            $hasElevator = isset($item['has_elevator'])
+                ? (int)$item['has_elevator']
+                : (isset($item['elevator']) ? (int)$item['elevator'] : 1);
+            $urgent = !empty($item['urgent']) ? 1 : 0;
+            $specId = isset($item['spec_id']) ? (int)$item['spec_id'] : 0;
+            $reqServiceType = isset($item['service_type']) ? trim((string)$item['service_type']) : '';
+
+            // 严禁采信前端传入的 price，强制根据数据库 fa_service / fa_service_spec 与楼层规则计算真实金额
+            try {
+                $calc = Home::calcAmount($svc, [
+                    'floor'        => $floor,
+                    'has_elevator' => $hasElevator ? 1 : 0,
+                    'urgent'       => $urgent,
+                    'goods_num'    => $goodsNum,
+                    'spec_id'      => $specId,
+                    'service_type' => $reqServiceType,
+                    'strict'       => true,
+                ], 0, $this->uid(), 'fixed', 0, []);
+            } catch (\InvalidArgumentException $e) {
+                $this->error("第 {$rowNo} 条订单计价校验失败：" . $e->getMessage());
+                return;
+            }
+
+            if ((float)$calc['pay_amount'] <= 0) {
+                $this->error("第 {$rowNo} 条订单计算金额异常");
+            }
+
+            $preparedRows[] = [
+                'svc'          => $svc,
+                'service_id'   => (int)$svc['id'],
+                'cat_id'       => (int)$svc['cat_id'],
+                'service_name' => (string)$svc['name'],
+                'service_img'  => (string)$svc['image'],
+                'goods_model'  => mb_substr(trim((string)(isset($item['goods_model']) ? $item['goods_model'] : '')), 0, 100),
+                'goods_num'    => $goodsNum,
+                'contact'      => mb_substr($contact ?: '买家', 0, 50),
+                'mobile'       => $mobile,
+                'province'     => mb_substr(trim((string)(isset($item['province']) && $item['province'] !== '' ? $item['province'] : ($merchant['province'] ?: '贵州省'))), 0, 50),
+                'city'         => mb_substr(trim((string)(isset($item['city']) && $item['city'] !== '' ? $item['city'] : ($merchant['city'] ?: '贵阳市'))), 0, 50),
+                'district'     => mb_substr(trim((string)(isset($item['district']) ? $item['district'] : ($merchant['district'] ?: ''))), 0, 50),
+                'address'      => mb_substr($address, 0, 255),
+                'floor'        => $floor,
+                'has_elevator' => $hasElevator ? 1 : 0,
+                'urgent'       => $urgent,
+                'remark'       => mb_substr(trim((string)(isset($item['remark']) ? $item['remark'] : '')), 0, 500),
+                'appoint_time' => !empty($item['appoint_time']) ? (int)$item['appoint_time'] : null,
+                'calc'         => $calc,
+            ];
+        }
+
+        if (empty($preparedRows)) {
+            $this->error('未解析到有效的导入订单数据');
+        }
 
         $ordersCreated = [];
+        $orderIds = [];
         $totalAmount = 0.00;
+        $isMonthly = false;
+        $batchNo = 'MB' . date('YmdHis') . mt_rand(1000, 9999);
+        $now = time();
 
         Db::startTrans();
         try {
-            $batchNo = 'MB' . date('YmdHis') . mt_rand(1000, 9999);
-            foreach ($items as $idx => $item) {
-                $contact = trim((string)(isset($item['contact']) ? $item['contact'] : '买家'));
-                $mobile = trim((string)(isset($item['mobile']) ? $item['mobile'] : ''));
-                $address = trim((string)(isset($item['address']) ? $item['address'] : ''));
-                $serviceName = trim((string)(isset($item['service_name']) ? $item['service_name'] : $defaultServiceName));
-                $goodsModel = trim((string)(isset($item['goods_model']) ? $item['goods_model'] : ''));
-                $goodsNum = max(1, (int)(isset($item['goods_num']) ? $item['goods_num'] : (isset($item['num']) ? $item['num'] : 1)));
+            $lockedMerchant = Db::name('merchant')->where('id', (int)$merchant['id'])->lock(true)->find();
+            if (!$lockedMerchant || $lockedMerchant['verify_status'] !== 'pass') {
+                throw new \InvalidArgumentException('商家资质状态异常，无法批量发单');
+            }
+            $isMonthly = ($lockedMerchant['settle_type'] === 'monthly');
+            $initStatus = $isMonthly ? OrderStatus::PENDING_ACCEPT : OrderStatus::PENDING_PAY;
+            $initPayStatus = $isMonthly ? 1 : 0;
+            $initPayType = $isMonthly ? 'monthly' : '';
+            $initPayTime = $isMonthly ? $now : null;
 
-                if (!$mobile || !$address) {
-                    continue;
-                }
+            foreach ($preparedRows as $pRow) {
+                $orderNo = $this->makeOrderNo();
+                $verifyCode = str_pad((string)mt_rand(0, 999999), 6, '0', STR_PAD_LEFT);
+                $calc = $pRow['calc'];
+                $payAmt = round((float)$calc['pay_amount'], 2);
+                $unitPrice = round((float)$calc['base_amount'] / max(1, (int)$pRow['goods_num']), 2);
 
-                $orderNo = date('YmdHis') . mt_rand(100000, 999999);
-                $singlePrice = isset($item['price']) && (float)$item['price'] > 0 ? (float)$item['price'] : $defaultPrice;
-                $baseAmount = round($singlePrice * $goodsNum, 2);
-                $verifyCode = (string)mt_rand(100000, 999999);
-
-                $orderId = Db::name('order')->insertGetId([
+                $orderId = (int)Db::name('order')->insertGetId([
                     'order_no'        => $orderNo,
                     'user_id'         => $this->uid(),
-                    'service_id'      => $globalServiceId,
-                    'service_name'    => $serviceName,
-                    'goods_model'     => $goodsModel,
-                    'goods_num'       => $goodsNum,
-                    'contact'         => $contact,
-                    'mobile'          => $mobile,
-                    'address'         => $address,
-                    'province'        => isset($item['province']) ? $item['province'] : '贵州省',
-                    'city'            => isset($item['city']) ? $item['city'] : '贵阳市',
-                    'district'        => isset($item['district']) ? $item['district'] : '南明区',
-                    'floor'           => isset($item['floor']) ? (int)$item['floor'] : 1,
-                    'has_elevator'    => isset($item['elevator']) ? (int)$item['elevator'] : 1,
-                    'base_amount'     => $baseAmount,
-                    'total_amount'    => $baseAmount,
-                    'pay_amount'      => $baseAmount,
-                    'status'          => OrderStatus::PENDING_ACCEPT,
-                    'pay_status'      => 1,
-                    'pay_time'        => time(),
+                    'master_id'       => 0,
+                    'cat_id'          => $pRow['cat_id'],
+                    'service_id'      => $pRow['service_id'],
+                    'service_name'    => $pRow['service_name'],
+                    'service_image'   => $pRow['service_img'],
+                    'price_type'      => 'fixed',
+                    'goods_model'     => $pRow['goods_model'],
+                    'goods_num'       => $pRow['goods_num'],
+                    'contact'         => $pRow['contact'],
+                    'mobile'          => $pRow['mobile'],
+                    'province'        => $pRow['province'],
+                    'city'            => $pRow['city'],
+                    'district'        => $pRow['district'],
+                    'address'         => $pRow['address'],
+                    'floor'           => $pRow['floor'],
+                    'has_elevator'    => $pRow['has_elevator'],
+                    'urgent'          => $pRow['urgent'],
+                    'remark'          => $pRow['remark'],
+                    'appoint_time'    => $pRow['appoint_time'],
+                    'base_amount'     => $calc['base_amount'],
+                    'floor_amount'    => $calc['floor_amount'],
+                    'urgent_amount'   => $calc['urgent_amount'],
+                    'discount_amount' => 0.00,
+                    'total_amount'    => $calc['total_amount'],
+                    'pay_amount'      => $payAmt,
+                    'status'          => $initStatus,
+                    'pay_status'      => $initPayStatus,
+                    'pay_type'        => $initPayType,
+                    'pay_time'        => $initPayTime,
+                    'transaction_id'  => $isMonthly ? ('MONTHLY' . date('YmdHis', $now) . mt_rand(1000, 9999)) : '',
                     'verify_code'     => $verifyCode,
-                    'createtime'      => time(),
-                    'updatetime'      => time(),
+                    'createtime'      => $now,
+                    'updatetime'      => $now,
+                ]);
+
+                Db::name('order_goods')->insert([
+                    'order_id'       => $orderId,
+                    'service_id'     => $pRow['service_id'],
+                    'goods_name'     => $pRow['service_name'],
+                    'goods_model'    => $pRow['goods_model'],
+                    'goods_num'      => $pRow['goods_num'],
+                    'goods_image'    => $pRow['service_img'],
+                    'addon_services' => '',
+                    'base_price'     => $unitPrice,
+                    'createtime'     => $now,
                 ]);
 
                 Db::name('merchant_order')->insert([
-                    'merchant_id' => (int)$merchant['id'],
+                    'merchant_id' => (int)$lockedMerchant['id'],
                     'order_id'    => $orderId,
                     'batch_no'    => $batchNo,
-                    'createtime'  => time(),
+                    'createtime'  => $now,
                 ]);
 
+                $this->addLog(
+                    $orderId,
+                    $initStatus,
+                    $isMonthly ? "企业批量导单（月结授信，批次 {$batchNo}），已进入接单大厅" : "企业批量导单创建（待支付，批次 {$batchNo}）",
+                    'user',
+                    $this->uid()
+                );
+
+                $orderIds[] = $orderId;
                 $ordersCreated[] = [
                     'order_id' => $orderId,
                     'order_no' => $orderNo,
-                    'contact'  => $contact,
-                    'amount'   => $baseAmount
+                    'contact'  => $pRow['contact'],
+                    'amount'   => $payAmt,
                 ];
-                $totalAmount += $baseAmount;
+                $totalAmount = round($totalAmount + $payAmt, 2);
             }
+
+            if ($isMonthly) {
+                Db::name('merchant')->where('id', (int)$lockedMerchant['id'])->update([
+                    'order_count'  => (int)$lockedMerchant['order_count'] + count($ordersCreated),
+                    'total_amount' => round((float)$lockedMerchant['total_amount'] + $totalAmount, 2),
+                    'updatetime'   => $now,
+                ]);
+            }
+
             Db::commit();
+        } catch (\think\exception\HttpResponseException $e) {
+            Db::rollback();
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+            return;
         } catch (\Exception $e) {
             Db::rollback();
+            \think\Log::error('[Merchant::importBatch] ' . $e->getMessage());
             $this->error('批量导入失败：' . $e->getMessage());
+            return;
         }
 
-        $this->success('批量下单导入成功！', [
-            'batch_no'      => $batchNo,
-            'count'         => count($ordersCreated),
-            'total_amount'  => round($totalAmount, 2),
-            'orders'        => $ordersCreated,
+        if ($isMonthly && !empty($orderIds)) {
+            try {
+                $masters = Db::name('master')
+                    ->where('verify_status', 'pass')
+                    ->where('work_status', 'on')
+                    ->where('user_id', '<>', $this->uid())
+                    ->limit(20)
+                    ->select();
+                $cnt = count($orderIds);
+                foreach ($masters as $m) {
+                    $this->notify('master', (int)$m['id'], '企业批量新工单就绪', "商家刚发布了 {$cnt} 笔新工单进入接单大厅，请尽快前往查看抢单！", 'order', (int)$orderIds[0]);
+                }
+            } catch (\Exception $e) {
+                \think\Log::error('[Merchant::importBatch broadcast] ' . $e->getMessage());
+            }
+        }
+
+        $this->success($isMonthly ? '批量下单成功，已按月结授信进入接单大厅！' : '批量导入成功，请完成批次支付', [
+            'need_pay'     => !$isMonthly,
+            'settle_type'  => $isMonthly ? 'monthly' : 'prepay',
+            'batch_no'     => $batchNo,
+            'count'        => count($ordersCreated),
+            'total_amount' => round($totalAmount, 2),
+            'order_ids'    => $orderIds,
+            'orders'       => $ordersCreated,
+        ]);
+    }
+
+    /**
+     * 商户端：预付商家按批次号支付待支付批量订单
+     * @ApiMethod (POST)
+     */
+    public function payBatch()
+    {
+        $merchant = $this->requireMerchant();
+        $batchNo = trim((string)$this->request->post('batch_no', ''));
+        $payType = trim((string)$this->request->post('pay_type', 'wechat'));
+        if ($payType === '') {
+            $payType = 'mock';
+        }
+        if ($batchNo === '') {
+            $this->error('缺少批次号 batch_no');
+        }
+
+        $batchLinks = Db::name('merchant_order')->where('batch_no', $batchNo)->select();
+        if (empty($batchLinks)) {
+            $this->error('批次订单不存在');
+        }
+        $batchOrderIds = [];
+        foreach ($batchLinks as $link) {
+            if ((int)$link['merchant_id'] !== (int)$merchant['id']) {
+                $this->error('无权操作该批次订单', null, 403);
+            }
+            $oid = (int)$link['order_id'];
+            if ($oid > 0) {
+                $batchOrderIds[] = $oid;
+            }
+        }
+        $batchOrderIds = array_values(array_unique($batchOrderIds));
+        if (empty($batchOrderIds)) {
+            $this->error('该批次下无有效订单');
+        }
+
+        $paidCount = 0;
+        $paidTotal = 0.00;
+        $paidOrderIds = [];
+        $now = time();
+
+        Db::startTrans();
+        try {
+            $lockedMerchant = Db::name('merchant')->where('id', (int)$merchant['id'])->lock(true)->find();
+            $orders = Db::name('order')
+                ->where('id', 'in', $batchOrderIds)
+                ->lock(true)
+                ->select();
+
+            foreach ($orders as $ord) {
+                if ((int)$ord['pay_status'] === 1 || (int)$ord['status'] !== OrderStatus::PENDING_PAY) {
+                    continue;
+                }
+                $oid = (int)$ord['id'];
+                $amt = round((float)$ord['pay_amount'], 2);
+                $txId = 'BATCH' . date('YmdHis', $now) . mt_rand(1000, 9999);
+
+                Db::name('order')->where('id', $oid)->update([
+                    'status'         => OrderStatus::PENDING_ACCEPT,
+                    'pay_status'     => 1,
+                    'pay_type'       => $payType,
+                    'pay_time'       => $now,
+                    'transaction_id' => $txId,
+                    'updatetime'     => $now,
+                ]);
+
+                $this->addLog($oid, OrderStatus::PENDING_ACCEPT, "企业批次支付完成（批次 {$batchNo}），订单已进入接单大厅", 'user', $this->uid());
+                $paidCount++;
+                $paidTotal = round($paidTotal + $amt, 2);
+                $paidOrderIds[] = $oid;
+            }
+
+            if ($paidCount === 0) {
+                throw new \InvalidArgumentException('该批次没有待支付的订单，请勿重复支付');
+            }
+
+            if ($lockedMerchant) {
+                Db::name('merchant')->where('id', (int)$lockedMerchant['id'])->update([
+                    'order_count'  => (int)$lockedMerchant['order_count'] + $paidCount,
+                    'total_amount' => round((float)$lockedMerchant['total_amount'] + $paidTotal, 2),
+                    'updatetime'   => $now,
+                ]);
+            }
+
+            Db::commit();
+        } catch (\think\exception\HttpResponseException $e) {
+            Db::rollback();
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+            return;
+        } catch (\Exception $e) {
+            Db::rollback();
+            \think\Log::error('[Merchant::payBatch] ' . $e->getMessage());
+            $this->error('批次支付失败：' . $e->getMessage());
+            return;
+        }
+
+        try {
+            $masters = Db::name('master')
+                ->where('verify_status', 'pass')
+                ->where('work_status', 'on')
+                ->where('user_id', '<>', $this->uid())
+                ->limit(20)
+                ->select();
+            foreach ($masters as $m) {
+                $this->notify('master', (int)$m['id'], '企业批量新工单就绪', "同城有 {$paidCount} 笔企业批量工单进入接单大厅，请尽快前往查看抢单！", 'order', (int)$paidOrderIds[0]);
+            }
+        } catch (\Exception $e) {
+            \think\Log::error('[Merchant::payBatch broadcast] ' . $e->getMessage());
+        }
+
+        $this->success('批次支付成功，订单已进入接单大厅', [
+            'batch_no'     => $batchNo,
+            'count'        => $paidCount,
+            'paid_count'   => $paidCount,
+            'total_amount' => round($paidTotal, 2),
+            'order_ids'    => $paidOrderIds,
         ]);
     }
 
@@ -741,13 +991,31 @@ class Merchant extends Base
     {
         $m = $this->merchantInfo();
         if (!$m) {
-            $this->error('请先完成商家入驻', ['need_apply' => 1], 2001);
+            $curUser = Db::name('user')->where('id', $this->uid())->find();
+            if ($curUser && !empty($curUser['user_type']) && $curUser['user_type'] === 'merchant') {
+                $now = time();
+                $newId = Db::name('merchant')->insertGetId([
+                    'user_id'       => $this->uid(),
+                    'name'          => !empty($curUser['nickname']) ? (string)$curUser['nickname'] : '商家用户',
+                    'license_no'    => '',
+                    'contact'       => (string)$curUser['nickname'],
+                    'mobile'        => (string)$curUser['mobile'],
+                    'address'       => isset($curUser['contact_address']) ? (string)$curUser['contact_address'] : '',
+                    'email'         => isset($curUser['email']) ? (string)$curUser['email'] : '',
+                    'verify_status' => 'pass',
+                    'createtime'    => $now,
+                    'updatetime'    => $now,
+                ]);
+                return Db::name('merchant')->where('id', $newId)->find();
+            }
+            $this->error('请先在「账号信息」切换为商家类型', null, 2001);
         }
-        if ($m['verify_status'] === 'pending') {
-            $this->error('商家资质审核中，请耐心等待', ['verify_status' => 'pending'], 2002);
-        }
-        if ($m['verify_status'] === 'reject') {
-            $this->error('资质未通过：' . $m['audit_msg'], ['verify_status' => 'reject'], 2003);
+        if ($m['verify_status'] !== 'pass') {
+            Db::name('merchant')->where('id', (int)$m['id'])->update([
+                'verify_status' => 'pass',
+                'updatetime'    => time(),
+            ]);
+            $m['verify_status'] = 'pass';
         }
         return $m;
     }
diff --git a/server/application/api/controller/Order.php b/server/application/api/controller/Order.php
index b139397..9ceff44 100644
--- a/server/application/api/controller/Order.php
+++ b/server/application/api/controller/Order.php
@@ -10,6 +10,8 @@ use think\Db;
  */
 class Order extends Base
 {
+    protected $noNeedLogin = ['statusList', 'detectExpress', 'remarkTemplates'];
+
     /**
      * 状态字典（供前端渲染筛选 Tab）
      */
@@ -105,7 +107,9 @@ class Order extends Base
                         }
                     }
                 }
-            } catch (\Exception $e) {}
+            } catch (\Exception $e) {
+                \think\Log::warning('[Order::detectExpress] ' . $e->getMessage());
+            }
         }
 
         // 3. 常见纯数字位数兜底识别
@@ -149,11 +153,14 @@ class Order extends Base
         $couponId = (int)$this->request->post('coupon_id', 0);
         $goodsModel = trim((string)$this->request->post('goods_model'));
         $goodsNum = max(1, (int)$this->request->post('goods_num', 1));
+        $specId = (int)$this->request->post('spec_id', 0);
+        $reqServiceType = trim((string)$this->request->post('service_type', ''));
+        $isCustom = (int)$this->request->post('is_custom', 0);
         $remark = trim((string)$this->request->post('remark'));
         $goodsImages = $this->request->post('goods_images', '');
 
-        // 支持多商品组合 (goods_list)
-        $goodsListRaw = $this->request->post('goods_list', '', null);
+        // 支持多商品组合 (goods_list / items)
+        $goodsListRaw = $this->request->post('goods_list', $this->request->post('items', '', null), null);
         $goodsList = [];
         if (!empty($goodsListRaw)) {
             if (is_string($goodsListRaw)) {
@@ -175,8 +182,17 @@ class Order extends Base
 
         $service = null;
         if (!empty($goodsList) && is_array($goodsList)) {
+            foreach ($goodsList as &$glItem) {
+                if (is_string($glItem)) {
+                    $decGl = json_decode(htmlspecialchars_decode($glItem), true);
+                    if (is_array($decGl)) {
+                        $glItem = $decGl;
+                    }
+                }
+            }
+            unset($glItem);
             $first = reset($goodsList);
-            $serviceId = isset($first['service_id']) ? (int)$first['service_id'] : $serviceId;
+            $serviceId = (is_array($first) && isset($first['service_id'])) ? (int)$first['service_id'] : $serviceId;
         }
 
         if ($serviceId > 0) {
@@ -247,15 +263,18 @@ class Order extends Base
         $serviceImage = $service ? $service['image'] : '';
         if (!empty($goodsList) && is_array($goodsList)) {
             $firstG = reset($goodsList);
-            if (!empty($firstG['cat_id'])) {
+            if (is_array($firstG) && !empty($firstG['cat_id'])) {
                 $catId = (int)$firstG['cat_id'];
             }
             $names = [];
             $totalCount = 0;
             $allImages = [];
             foreach ($goodsList as $idx => $g) {
+                if (!is_array($g)) {
+                    continue;
+                }
                 $gName = !empty($g['custom_name']) ? $g['custom_name'] : (isset($g['item_name']) ? $g['item_name'] : (isset($g['goods_name']) ? $g['goods_name'] : (isset($g['name']) ? $g['name'] : '服务项')));
-                $gNum = isset($g['num']) ? (int)$g['num'] : 1;
+                $gNum = isset($g['num']) ? max(1, (int)$g['num']) : (isset($g['goods_num']) ? max(1, (int)$g['goods_num']) : 1);
                 $names[] = $gName . 'x' . $gNum;
                 $totalCount += $gNum;
                 if (!empty($g['images']) && is_array($g['images'])) {
@@ -273,14 +292,32 @@ class Order extends Base
             }
         }
 
-        // 金额统一由 Home::calcAmount 计算，保证与试算口径一致
-        $amount = Home::calcAmount($service, [
-            'floor'        => (int)$address['floor'],
-            'has_elevator' => (int)$address['has_elevator'],
-            'urgent'       => $urgent,
-        ], $couponId, $this->uid(), $priceType, $userPrice, $goodsList);
+        // 金额统一由 Home::calcAmount 计算（此处先传 couponId=0 核验商品与附加费，卡券在事务内加悲观锁核验扣减）
+        try {
+            $amount = Home::calcAmount($service, [
+                'floor'        => (int)$address['floor'],
+                'has_elevator' => (int)$address['has_elevator'],
+                'urgent'       => $urgent,
+                'goods_num'    => $goodsNum,
+                'spec_id'      => $specId,
+                'service_type' => $reqServiceType,
+                'is_custom'    => $isCustom,
+                'strict'       => true,
+            ], 0, $this->uid(), $priceType, $userPrice, $goodsList);
+        } catch (\InvalidArgumentException $e) {
+            $this->error($e->getMessage());
+            return;
+        }
+
+        if (in_array($priceType, ['fixed', 'range'], true) && (float)$amount['total_amount'] <= 0) {
+            $this->error('一口价订单必须关联有效的平台服务项目');
+        }
+
         if (empty($serviceImage) && !empty($goodsList)) {
             foreach ($goodsList as $item) {
+                if (!is_array($item)) {
+                    continue;
+                }
                 if (!empty($item['goods_image'])) {
                     $serviceImage = $item['goods_image'];
                     break;
@@ -303,9 +340,9 @@ class Order extends Base
         $amount['price_type'] = $priceType;
 
         $orderNo = $this->makeOrderNo();
-        $verifyCode = (string)mt_rand(1000, 9999);
+        $verifyCode = str_pad((string)mt_rand(0, 999999), 6, '0', STR_PAD_LEFT);
 
-        // 如果有多商品明细，结构化存入 goods_images 或在 remark 补充
+        // 如果有多商品明细，结构化存入 goods_images
         $goodsImagesPayload = is_array($goodsImages) ? json_encode($goodsImages, JSON_UNESCAPED_UNICODE) : (string)$goodsImages;
         if (!empty($goodsList)) {
             $extraPayload = [
@@ -323,124 +360,229 @@ class Order extends Base
         $sourceOrderNo = trim((string)$this->request->post('source_order_no', ''));
         $qualReq = trim((string)$this->request->post('qual_req', ''));
         $masterReq = trim((string)$this->request->post('master_req', ''));
+        $useVirtual = (int)$this->request->post('use_virtual', 0) ? 1 : 0;
+        $autoQuoteTimeout = max(0, min(172800, (int)$this->request->post('auto_quote_timeout', 0)));
 
-        $id = Db::name('order')->insertGetId([
-            'order_no'        => $orderNo,
-            'user_id'         => $this->uid(),
-            'master_id'       => 0,
-            'cat_id'          => $catId,
-            'service_id'      => $service ? (int)$service['id'] : 0,
-            'service_name'    => $serviceName,
-            'service_image'   => $serviceImage,
-            'price_type'      => $priceType,
-            'goods_images'    => $goodsImagesPayload,
-            'goods_model'     => mb_substr($goodsModel, 0, 100),
-            'goods_num'       => $goodsNum,
-            'floor'           => (int)$address['floor'],
-            'has_elevator'    => (int)$address['has_elevator'],
-            'urgent'          => $urgent ? 1 : 0,
-            'remark'          => mb_substr($remark, 0, 500),
-            'contact'         => $address['contact'],
-            'mobile'          => $address['mobile'],
-            'province'        => $address['province'],
-            'city'            => $address['city'],
-            'district'        => $address['district'],
-            'address'         => $address['address'],
-            'lng'             => $address['lng'],
-            'lat'             => $address['lat'],
-            'order_contact'   => mb_substr($orderContact, 0, 100),
-            'express_no'      => mb_substr($expressNo, 0, 64),
-            'express_company' => mb_substr($expressCompany, 0, 64),
-            'goods_arrived'   => $goodsArrived ? 1 : 0,
-            'order_source'    => mb_substr($orderSource, 0, 100),
-            'source_order_no' => mb_substr($sourceOrderNo, 0, 64),
-            'qual_req'        => mb_substr($qualReq, 0, 255),
-            'master_req'      => mb_substr($masterReq, 0, 255),
-            'appoint_time'    => $appointTime ?: null,
-            'base_amount'     => $amount['base_amount'],
-            'floor_amount'    => $amount['floor_amount'],
-            'urgent_amount'   => $amount['urgent_amount'],
-            'discount_amount' => $amount['discount_amount'],
-            'total_amount'    => $amount['total_amount'],
-            'pay_amount'      => $amount['pay_amount'],
-            'status'          => $priceType === 'quote' ? OrderStatus::QUOTING : OrderStatus::PENDING_PAY,
-            'pay_status'      => 0,
-            'coupon_id'       => $amount['coupon'] ? (int)$amount['coupon']['id'] : 0,
-            'verify_code'     => $verifyCode,
-            'createtime'      => time(),
-            'updatetime'      => time(),
-        ]);
-
+        $uid = $this->uid();
+        $now = time();
+        $initStatus = $priceType === 'quote' ? OrderStatus::QUOTING : OrderStatus::PENDING_PAY;
         $modeText = [
             'fixed'  => '一口价',
             'quote'  => '师傅报价',
             'custom' => '用户自主定价',
             'range'  => '按面积计价',
         ];
-        if (!empty($goodsList) && is_array($goodsList)) {
-            foreach ($goodsList as $g) {
-                // 商品名称快照：优先读取自填名称 custom_name 或 item_name，确保非标自填不丢失
-                $finalGoodsName = '';
-                if (!empty($g['custom_name'])) {
-                    $finalGoodsName = trim((string)$g['custom_name']);
-                } elseif (!empty($g['item_name'])) {
-                    $finalGoodsName = trim((string)$g['item_name']);
-                } elseif (!empty($g['goods_name'])) {
-                    $finalGoodsName = trim((string)$g['goods_name']);
-                } else {
-                    $finalGoodsName = (string)$serviceName;
-                }
 
-                // 规格型号快照：优先读取 spec_name 或 goods_model
-                $finalSpecModel = '';
-                if (!empty($g['spec_name'])) {
-                    $finalSpecModel = trim((string)$g['spec_name']);
-                } elseif (!empty($g['goods_model'])) {
-                    $finalSpecModel = trim((string)$g['goods_model']);
-                } else {
-                    $finalSpecModel = (string)$goodsModel;
+        Db::startTrans();
+        try {
+            $lockedCouponId = 0;
+            if ($couponId > 0) {
+                $uc = Db::name('user_coupon')
+                    ->where('id', $couponId)
+                    ->where('user_id', $uid)
+                    ->where('status', 'unused')
+                    ->lock(true)
+                    ->find();
+                if (!$uc) {
+                    throw new \InvalidArgumentException('所选优惠券不存在或已被使用');
                 }
-
-                // 商品实物图/现场图
-                $finalImage = '';
-                if (!empty($g['goods_image'])) {
-                    $finalImage = (string)$g['goods_image'];
-                } elseif (!empty($g['images']) && is_array($g['images'])) {
-                    $finalImage = (string)reset($g['images']);
+                $coupon = Db::name('coupon')
+                    ->where('id', (int)$uc['coupon_id'])
+                    ->where('status', 'normal')
+                    ->find();
+                if (!$coupon) {
+                    throw new \InvalidArgumentException('所选优惠券已失效');
                 }
+                if (!empty($coupon['start_time']) && (int)$coupon['start_time'] > $now) {
+                    throw new \InvalidArgumentException('该优惠券尚未到生效时间');
+                }
+                if ((int)$coupon['end_time'] > 0 && (int)$coupon['end_time'] <= $now) {
+                    throw new \InvalidArgumentException('所选优惠券已过期');
+                }
+                $orderTotal = (float)$amount['total_amount'];
+                if ($orderTotal < (float)$coupon['min_amount']) {
+                    throw new \InvalidArgumentException('订单金额未满优惠券使用门槛（满 ¥' . (float)$coupon['min_amount'] . ' 可用）');
+                }
+                $discount = $coupon['type'] === 'cash'
+                    ? (float)$coupon['amount']
+                    : round($orderTotal * (1 - (float)$coupon['discount']), 2);
+                $discount = round(min(max(0, $discount), $orderTotal), 2);
+                $amount['discount_amount'] = $discount;
+                $amount['pay_amount'] = max(0, round($orderTotal - $discount, 2));
+                $amount['coupon'] = ['id' => (int)$uc['id'], 'name' => $coupon['name']];
+                $lockedCouponId = (int)$uc['id'];
+            }
 
-                // 增项服务快照
-                $addonStr = '';
-                if (!empty($g['addon_services'])) {
-                    $addonStr = is_array($g['addon_services']) ? json_encode($g['addon_services'], JSON_UNESCAPED_UNICODE) : (string)$g['addon_services'];
-                } elseif (!empty($g['extras']) && is_array($g['extras'])) {
-                    $hitExtras = array_filter($g['extras'], function($ex) {
-                        return !empty($ex['num']) && (int)$ex['num'] > 0;
-                    });
-                    if (!empty($hitExtras)) {
-                        $addonStr = json_encode(array_values($hitExtras), JSON_UNESCAPED_UNICODE);
+            $id = (int)Db::name('order')->insertGetId([
+                'order_no'        => $orderNo,
+                'user_id'         => $uid,
+                'master_id'       => 0,
+                'cat_id'          => $catId,
+                'service_id'      => $service ? (int)$service['id'] : 0,
+                'service_name'    => $serviceName,
+                'service_image'   => $serviceImage,
+                'price_type'      => $priceType,
+                'goods_images'    => $goodsImagesPayload,
+                'goods_model'     => mb_substr($goodsModel, 0, 100),
+                'goods_num'       => $goodsNum,
+                'floor'           => (int)$address['floor'],
+                'has_elevator'    => (int)$address['has_elevator'],
+                'urgent'          => $urgent ? 1 : 0,
+                'remark'          => mb_substr($remark, 0, 500),
+                'contact'         => $address['contact'],
+                'mobile'          => $address['mobile'],
+                'use_virtual'     => $useVirtual,
+                'province'        => $address['province'],
+                'city'            => $address['city'],
+                'district'        => $address['district'],
+                'address'         => $address['address'],
+                'lng'             => $address['lng'],
+                'lat'             => $address['lat'],
+                'order_contact'   => mb_substr($orderContact, 0, 100),
+                'express_no'      => mb_substr($expressNo, 0, 64),
+                'express_company' => mb_substr($expressCompany, 0, 64),
+                'goods_arrived'   => $goodsArrived ? 1 : 0,
+                'order_source'    => mb_substr($orderSource, 0, 100),
+                'source_order_no' => mb_substr($sourceOrderNo, 0, 64),
+                'qual_req'        => mb_substr($qualReq, 0, 255),
+                'master_req'      => mb_substr($masterReq, 0, 255),
+                'auto_quote_timeout' => $priceType === 'fixed' ? $autoQuoteTimeout : 0,
+                'appoint_time'    => $appointTime ?: null,
+                'base_amount'     => $amount['base_amount'],
+                'floor_amount'    => $amount['floor_amount'],
+                'urgent_amount'   => $amount['urgent_amount'],
+                'discount_amount' => $amount['discount_amount'],
+                'total_amount'    => $amount['total_amount'],
+                'pay_amount'      => $amount['pay_amount'],
+                'status'          => $initStatus,
+                'pay_status'      => 0,
+                'coupon_id'       => $lockedCouponId,
+                'verify_code'     => $verifyCode,
+                'createtime'      => $now,
+                'updatetime'      => $now,
+            ]);
+
+            if ($lockedCouponId > 0) {
+                $affectedUc = Db::name('user_coupon')
+                    ->where('id', $lockedCouponId)
+                    ->where('user_id', $uid)
+                    ->where('status', 'unused')
+                    ->update([
+                        'status'   => 'used',
+                        'use_time' => $now,
+                        'order_id' => $id,
+                    ]);
+                if (!$affectedUc) {
+                    throw new \InvalidArgumentException('优惠券已被占用，请重新选择');
+                }
+            }
+
+            if (!empty($goodsList) && is_array($goodsList)) {
+                foreach ($goodsList as $g) {
+                    if (!is_array($g)) {
+                        continue;
+                    }
+                    // 商品名称快照：优先读取自填名称 custom_name 或 item_name，确保非标自填不丢失
+                    $finalGoodsName = '';
+                    if (!empty($g['custom_name'])) {
+                        $finalGoodsName = trim((string)$g['custom_name']);
+                    } elseif (!empty($g['item_name'])) {
+                        $finalGoodsName = trim((string)$g['item_name']);
+                    } elseif (!empty($g['goods_name'])) {
+                        $finalGoodsName = trim((string)$g['goods_name']);
+                    } else {
+                        $finalGoodsName = (string)$serviceName;
                     }
-                }
 
-                Db::name('order_goods')->insert([
-                    'order_id'       => (int)$id,
-                    'service_id'     => isset($g['service_id']) ? (int)$g['service_id'] : (int)$serviceId,
-                    'goods_name'     => mb_substr($finalGoodsName, 0, 100),
-                    'goods_model'    => mb_substr($finalSpecModel, 0, 100),
-                    'goods_num'      => isset($g['num']) ? max(1, (int)$g['num']) : (isset($g['goods_num']) ? max(1, (int)$g['goods_num']) : 1),
-                    'goods_image'    => mb_substr($finalImage, 0, 255),
-                    'addon_services' => mb_substr($addonStr, 0, 255),
-                    'base_price'     => isset($g['base_price']) ? (float)$g['base_price'] : (float)$amount['base_amount'],
-                    'createtime'     => time(),
-                ]);
+                    // 规格型号快照：优先读取 spec_name 或 goods_model
+                    $finalSpecModel = '';
+                    if (!empty($g['spec_name'])) {
+                        $finalSpecModel = trim((string)$g['spec_name']);
+                    } elseif (!empty($g['goods_model'])) {
+                        $finalSpecModel = trim((string)$g['goods_model']);
+                    } else {
+                        $finalSpecModel = (string)$goodsModel;
+                    }
+
+                    // 商品实物图/现场图
+                    $finalImage = '';
+                    if (!empty($g['goods_image']) && is_string($g['goods_image'])) {
+                        $finalImage = $g['goods_image'];
+                    } elseif (!empty($g['images']) && is_array($g['images'])) {
+                        $firstImg = reset($g['images']);
+                        $finalImage = is_string($firstImg) ? $firstImg : (is_array($firstImg) && isset($firstImg['url']) ? (string)$firstImg['url'] : '');
+                    }
+
+                    // 增项服务快照
+                    $addonStr = '';
+                    if (!empty($g['addon_services'])) {
+                        $addonStr = is_array($g['addon_services']) ? json_encode($g['addon_services'], JSON_UNESCAPED_UNICODE) : (string)$g['addon_services'];
+                    } elseif (!empty($g['extras']) && is_array($g['extras'])) {
+                        $hitExtras = array_filter($g['extras'], function ($ex) {
+                            return is_array($ex) && !empty($ex['num']) && (int)$ex['num'] > 0;
+                        });
+                        if (!empty($hitExtras)) {
+                            $addonStr = json_encode(array_values($hitExtras), JSON_UNESCAPED_UNICODE);
+                        }
+                    }
+
+                    $gSid = isset($g['service_id']) ? (int)$g['service_id'] : (int)$serviceId;
+                    $gUnitPrice = round((float)$amount['base_amount'] / max(1, (int)$goodsNum), 2);
+                    if ($gSid > 0 && in_array($priceType, ['fixed', 'range'], true)) {
+                        $gSvc = Db::name('service')->where('id', $gSid)->find();
+                        if ($gSvc && (float)$gSvc['base_price'] > 0) {
+                            $gUnitPrice = (float)$gSvc['base_price'];
+                        }
+                    }
+
+                    Db::name('order_goods')->insert([
+                        'order_id'       => $id,
+                        'service_id'     => $gSid,
+                        'goods_name'     => mb_substr($finalGoodsName, 0, 100),
+                        'goods_model'    => mb_substr($finalSpecModel, 0, 100),
+                        'goods_num'      => isset($g['num']) ? max(1, (int)$g['num']) : (isset($g['goods_num']) ? max(1, (int)$g['goods_num']) : 1),
+                        'goods_image'    => mb_substr($finalImage, 0, 255),
+                        'addon_services' => mb_substr($addonStr, 0, 255),
+                        'base_price'     => $gUnitPrice,
+                        'createtime'     => $now,
+                    ]);
+                }
+            }
+
+            $this->addLog($id, $initStatus, '用户下单（' . (isset($modeText[$priceType]) ? $modeText[$priceType] : '一口价') . '）', 'user', $uid);
+            Db::commit();
+        } catch (\think\exception\HttpResponseException $e) {
+            Db::rollback();
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+            return;
+        } catch (\Exception $e) {
+            Db::rollback();
+            \think\Log::error('[Order::create] ' . $e->getMessage());
+            $this->error('下单失败：' . $e->getMessage());
+            return;
+        }
+
+        if ($initStatus === OrderStatus::QUOTING) {
+            try {
+                $masters = Db::name('master')
+                    ->where('verify_status', 'pass')
+                    ->where('work_status', 'on')
+                    ->where('user_id', '<>', $uid)
+                    ->limit(20)
+                    ->select();
+                foreach ($masters as $m) {
+                    $this->notify('master', (int)$m['id'], '新报价工单通知', '同城有新竞价工单【' . $orderNo . '】进入报价大厅，请尽快前往参与报价！', 'order', $id);
+                }
+            } catch (\Exception $e) {
+                \think\Log::error('[Order::create broadcast] ' . $e->getMessage());
             }
         }
 
-        $initStatus = $priceType === 'quote' ? OrderStatus::QUOTING : OrderStatus::PENDING_PAY;
-        $this->addLog($id, $initStatus, '用户下单（' . (isset($modeText[$priceType]) ? $modeText[$priceType] : '一口价') . '）', 'user', $this->uid());
-
         $this->success('下单成功', [
-            'order_id' => (int)$id,
+            'order_id' => $id,
             'order_no' => $orderNo,
             'amount'   => $amount,
         ]);
@@ -463,44 +605,96 @@ class Order extends Base
             $this->error('订单状态不允许支付');
         }
 
+        $now = time();
+        $nextStatus = OrderStatus::PENDING_ACCEPT;
+
         Db::startTrans();
         try {
+            $lockedOrder = Db::name('order')->where('id', $orderId)->lock(true)->find();
+            if (!$lockedOrder) {
+                throw new \InvalidArgumentException('订单不存在');
+            }
+            if ((int)$lockedOrder['pay_status'] === 1) {
+                throw new \InvalidArgumentException('订单已支付，请勿重复支付');
+            }
+            if ((int)$lockedOrder['status'] !== OrderStatus::PENDING_PAY) {
+                throw new \InvalidArgumentException('订单状态不允许支付');
+            }
+
+            // 兼容创单阶段已加锁核销的优惠券，防止重复报错或漏锁
+            if ((int)$lockedOrder['coupon_id'] > 0) {
+                $uc = Db::name('user_coupon')
+                    ->where('id', (int)$lockedOrder['coupon_id'])
+                    ->where('user_id', (int)$lockedOrder['user_id'])
+                    ->lock(true)
+                    ->find();
+                if (!$uc) {
+                    throw new \InvalidArgumentException('订单关联的优惠券不存在');
+                }
+                if ($uc['status'] === 'used' && (int)$uc['order_id'] === $orderId) {
+                    // 创单已锁定本单卡券
+                } elseif ($uc['status'] === 'unused') {
+                    $affectedUc = Db::name('user_coupon')
+                        ->where('id', (int)$uc['id'])
+                        ->where('user_id', (int)$lockedOrder['user_id'])
+                        ->where('status', 'unused')
+                        ->update([
+                            'status'   => 'used',
+                            'order_id' => $orderId,
+                            'use_time' => $now,
+                        ]);
+                    if (!$affectedUc) {
+                        throw new \InvalidArgumentException('优惠券状态异常，请重新下单');
+                    }
+                } else {
+                    throw new \InvalidArgumentException('该优惠券已被其他订单使用或已过期');
+                }
+            }
+
             Db::name('order')->where('id', $orderId)->update([
                 'pay_status'     => 1,
                 'pay_type'       => $payType,
-                'pay_time'       => time(),
-                'transaction_id' => 'MOCK' . date('YmdHis') . mt_rand(1000, 9999),
-                'updatetime'     => time(),
+                'pay_time'       => $now,
+                'transaction_id' => 'MOCK' . date('YmdHis', $now) . mt_rand(1000, 9999),
+                'updatetime'     => $now,
             ]);
-            $nextStatus = $order['price_type'] === 'quote' ? OrderStatus::QUOTING : OrderStatus::PENDING_ACCEPT;
+            $nextStatus = $lockedOrder['price_type'] === 'quote' ? OrderStatus::QUOTING : OrderStatus::PENDING_ACCEPT;
             $nextRemark = $nextStatus === OrderStatus::QUOTING
                 ? '支付成功，订单已进入报价大厅，等待师傅报价'
                 : '支付成功，订单已进入接单大厅';
-            $this->transit($order, $nextStatus, $nextRemark, [], 'user', $this->uid());
+            $this->transit($lockedOrder, $nextStatus, $nextRemark, [], 'user', $this->uid());
             $this->addLog($orderId, $nextStatus, $nextStatus === OrderStatus::QUOTING ? '订单进入师傅报价大厅' : '订单进入师傅接单大厅', 'system', 0);
 
-            // 核销优惠券
-            if ((int)$order['coupon_id'] > 0) {
-                Db::name('user_coupon')->where('id', (int)$order['coupon_id'])->update([
-                    'status'   => 'used',
-                    'order_id' => $orderId,
-                    'use_time' => time(),
-                ]);
-            }
             Db::commit();
+        } catch (\think\exception\HttpResponseException $e) {
+            Db::rollback();
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+            return;
         } catch (\Exception $e) {
             Db::rollback();
+            \think\Log::error('[Order::pay] ' . $e->getMessage());
             $this->error('支付失败：' . $e->getMessage());
+            return;
         }
 
-        // 订单广播通知：进入接单大厅后，通知周边在线师傅
-        if ($nextStatus === OrderStatus::PENDING_ACCEPT) {
+        // 订单广播通知：进入接单/报价大厅后，通知周边在线认证师傅（排除下单人本人）
+        if (in_array($nextStatus, [OrderStatus::PENDING_ACCEPT, OrderStatus::QUOTING], true)) {
             try {
-                $masters = Db::name('master')->where('status', 'normal')->limit(20)->select();
+                $masters = Db::name('master')
+                    ->where('verify_status', 'pass')
+                    ->where('work_status', 'on')
+                    ->where('user_id', '<>', (int)$order['user_id'])
+                    ->limit(20)
+                    ->select();
                 foreach ($masters as $m) {
-                    $this->notify('master', (int)$m['user_id'], '新工单就绪通知', '同城有新工单【' . $order['order_no'] . '】进入接单大厅，请尽快前往抢单！', 'order', $orderId);
+                    $this->notify('master', (int)$m['id'], '新工单就绪通知', '同城有新工单【' . $order['order_no'] . '】进入接单大厅，请尽快前往抢单！', 'order', $orderId);
                 }
-            } catch (\Exception $e) {}
+            } catch (\Exception $e) {
+                \think\Log::error('[Order::pay broadcast] ' . $e->getMessage());
+            }
         }
 
         $this->success('支付成功');
@@ -527,23 +721,39 @@ class Order extends Base
 
         Db::startTrans();
         try {
+            $lockedOrder = Db::name('order')->where('id', $orderId)->lock(true)->find();
+            if (!$lockedOrder || (int)$lockedOrder['diff_status'] !== 1 || (float)$lockedOrder['diff_amount'] <= 0) {
+                throw new \InvalidArgumentException('当前订单无待支付的增项补差价');
+            }
+            $diffAmount = (float)$lockedOrder['diff_amount'];
+            $newPayAmount = round((float)$lockedOrder['pay_amount'] + $diffAmount, 2);
+
             Db::name('order')->where('id', $orderId)->update([
                 'diff_status' => 2,
                 'pay_amount'  => $newPayAmount,
                 'updatetime'  => time(),
             ]);
 
-            $this->addLog($orderId, (int)$order['status'], '用户在线支付施工增项补差价 ¥' . $diffAmount, 'user', $this->uid());
+            $this->addLog($orderId, (int)$lockedOrder['status'], '用户在线支付施工增项补差价 ¥' . $diffAmount, 'user', $this->uid());
             Db::commit();
+        } catch (\think\exception\HttpResponseException $e) {
+            Db::rollback();
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+            return;
         } catch (\Exception $e) {
             Db::rollback();
+            \think\Log::error('[Order::payDiff] ' . $e->getMessage());
             $this->error('支付失败：' . $e->getMessage());
+            return;
         }
 
         if ((int)$order['master_id'] > 0) {
             $m = Db::name('master')->where('id', $order['master_id'])->find();
             if ($m) {
-                $this->notify('master', (int)$m['user_id'], '客户已支付增项补差价', '工单 ' . $order['order_no'] . ' 客户已支付增项补差价 ¥' . $diffAmount, 'order', $orderId);
+                $this->notify('master', (int)$m['id'], '客户已支付增项补差价', '工单 ' . $order['order_no'] . ' 客户已支付增项补差价 ¥' . $diffAmount, 'order', $orderId);
             }
         }
 
@@ -557,8 +767,12 @@ class Order extends Base
         $page = max(1, (int)$this->request->param('page', 1));
         $limit = min(50, max(1, (int)$this->request->param('limit', 10)));
 
-        $build = function () use ($status, $keyword) {
-            $q = Db::name('order')->where('user_id', $this->uid())->where('user_deleted', 0);
+        $team = $this->currentMerchantTeam();
+        $teamUids = $team ? $team['user_ids'] : [$this->uid()];
+        $hasTeam = count($teamUids) > 1;
+
+        $build = function () use ($status, $keyword, $teamUids) {
+            $q = Db::name('order')->where('user_id', 'in', $teamUids)->where('user_deleted', 0);
             if ($keyword !== '') {
                 $q->where(function ($sub) use ($keyword) {
                     $sub->where('contact', 'like', "%{$keyword}%")
@@ -605,8 +819,22 @@ class Order extends Base
             }
         }
 
+        $userMap = [];
+        if ($hasTeam && !empty($list)) {
+            $userMap = Db::name('user')->where('id', 'in', $teamUids)->column('id,nickname,mobile', 'id');
+        }
+
         foreach ($list as &$row) {
             $row = $this->formatOrder($row);
+            $row['has_merchant_team'] = $hasTeam;
+            if ($hasTeam && $team) {
+                $isOwnerUser = (int)$row['user_id'] === (int)$team['merchant']['user_id'];
+                $u = isset($userMap[(int)$row['user_id']]) ? $userMap[(int)$row['user_id']] : null;
+                $uMobile = $u ? (string)$u['mobile'] : '';
+                $row['account_role'] = $isOwnerUser ? 'owner' : 'member';
+                $row['account_role_text'] = $isOwnerUser ? '主账号' : '关联账号';
+                $row['account_name'] = ($u && !empty($u['nickname'])) ? $u['nickname'] : ('用户' . substr($uMobile, -4));
+            }
             if (!empty($allGoods[$row['id']])) {
                 $row['goods_list'] = $allGoods[$row['id']];
                 $firstG = $allGoods[$row['id']][0];
@@ -755,13 +983,31 @@ class Order extends Base
         unset($log);
 
         $master = null;
+        $masterMobileRaw = '';
         if ((int)$order['master_id'] > 0) {
             $m = Db::name('master')->where('id', $order['master_id'])->find();
             if ($m) {
+                $rawM = (string)$m['mobile'];
+                $maskedM = strlen($rawM) >= 7 ? substr_replace($rawM, '****', 3, 4) : $rawM;
+                $canSeeRealMobile = in_array((int)$order['status'], [
+                    OrderStatus::ACCEPTED,
+                    OrderStatus::SCHEDULED,
+                    OrderStatus::ARRIVED,
+                    OrderStatus::WORKING,
+                    OrderStatus::PENDING_VERIFY,
+                    OrderStatus::COMPLETED,
+                    OrderStatus::AFTERSALE,
+                ], true);
+                if ($canSeeRealMobile) {
+                    $masterMobileRaw = $rawM;
+                }
                 $master = [
                     'id'          => (int)$m['id'],
                     'realname'    => $m['realname'],
-                    'mobile'      => substr_replace($m['mobile'], '****', 3, 4),
+                    'avatar'      => !empty($m['avatar']) ? (strpos((string)$m['avatar'], 'http') === 0 ? $m['avatar'] : cdnurl($m['avatar'], true)) : '',
+                    'mobile'      => $canSeeRealMobile ? $rawM : $maskedM,
+                    'mobile_raw'  => $masterMobileRaw,
+                    'mobile_mask' => $maskedM,
                     'score'       => (float)$m['score'],
                     'order_count' => (int)$m['order_count'],
                     'level'       => (int)$m['level'],
@@ -807,25 +1053,132 @@ class Order extends Base
         }
 
         $creatorUser = Db::name('user')->where('id', (int)$order['user_id'])->find();
-        $orderContact = $creatorUser ? (($creatorUser['username'] ?: '用户') . ', ' . ($creatorUser['mobile'] ?: $order['mobile'])) : $order['mobile'];
+        $rawCreatorMobile = (string)(($creatorUser && !empty($creatorUser['mobile'])) ? $creatorUser['mobile'] : $order['mobile']);
+        $maskedCreatorMobile = strlen($rawCreatorMobile) >= 7 ? substr_replace($rawCreatorMobile, '****', 3, 4) : $rawCreatorMobile;
+        $creatorName = '';
+        if ($creatorUser && !empty($creatorUser['nickname']) && $creatorUser['nickname'] !== $rawCreatorMobile && $creatorUser['nickname'] !== $maskedCreatorMobile) {
+            $creatorName = (string)$creatorUser['nickname'];
+        } elseif ($creatorUser && !empty($creatorUser['username']) && $creatorUser['username'] !== $rawCreatorMobile && $creatorUser['username'] !== $maskedCreatorMobile) {
+            $creatorName = (string)$creatorUser['username'];
+        } elseif (!empty($order['contact']) && $order['contact'] !== $rawCreatorMobile && $order['contact'] !== $maskedCreatorMobile) {
+            $creatorName = (string)$order['contact'];
+        }
+        $orderContact = $creatorName !== '' ? ($creatorName . ' · ' . $maskedCreatorMobile) : $maskedCreatorMobile;
         $formattedOrder = $this->formatOrder($order);
         $formattedOrder['order_contact'] = $orderContact;
         $formattedOrder['remark_display'] = !empty($order['remark']) ? $order['remark'] : '无备注';
 
-        $goodsList = Db::name('order_goods')->where('order_id', $orderId)->select();
-        if (empty($goodsList)) {
+        $normalizeUrlList = function ($raw) {
+            if (empty($raw)) {
+                return [];
+            }
+            $arr = is_array($raw) ? $raw : (json_decode((string)$raw, true) ?: explode(',', (string)$raw));
+            $out = [];
+            foreach ($arr as $it) {
+                $u = '';
+                if (is_string($it)) {
+                    $u = trim($it);
+                } elseif (is_array($it)) {
+                    foreach (['url', 'tempFilePath', 'path', 'fullurl'] as $k) {
+                        if (!empty($it[$k]) && is_string($it[$k])) {
+                            $u = trim($it[$k]);
+                            break;
+                        }
+                    }
+                }
+                if ($u !== '' && $u !== 'Array') {
+                    $full = strpos($u, 'http') === 0 ? $u : cdnurl($u, true);
+                    if (!in_array($full, $out, true)) {
+                        $out[] = $full;
+                    }
+                }
+            }
+            return $out;
+        };
+
+        $parsedPayloadGoods = [];
+        $allGoodsImages = [];
+        $allEnvImages = [];
+        $allGoodsVideos = [];
+        if (!empty($order['goods_images'])) {
+            $decPayload = json_decode((string)$order['goods_images'], true);
+            if (is_array($decPayload)) {
+                if (!empty($decPayload['images'])) {
+                    $allGoodsImages = array_merge($allGoodsImages, $normalizeUrlList($decPayload['images']));
+                }
+                if (!empty($decPayload['goods_list']) && is_array($decPayload['goods_list'])) {
+                    $parsedPayloadGoods = $decPayload['goods_list'];
+                } elseif (!isset($decPayload['goods_list']) && !isset($decPayload['images'])) {
+                    $allGoodsImages = array_merge($allGoodsImages, $normalizeUrlList($decPayload));
+                }
+            } else {
+                $allGoodsImages = array_merge($allGoodsImages, $normalizeUrlList((string)$order['goods_images']));
+            }
+        }
+
+        foreach ($parsedPayloadGoods as $pgItem) {
+            if (!is_array($pgItem)) {
+                continue;
+            }
+            foreach ($normalizeUrlList($pgItem['images'] ?? []) as $u) {
+                if (!in_array($u, $allGoodsImages, true)) {
+                    $allGoodsImages[] = $u;
+                }
+            }
+            foreach ($normalizeUrlList($pgItem['envImages'] ?? ($pgItem['env_images'] ?? [])) as $eu) {
+                if (!in_array($eu, $allEnvImages, true)) {
+                    $allEnvImages[] = $eu;
+                }
+            }
+            foreach ($normalizeUrlList($pgItem['videos'] ?? ($pgItem['goods_videos'] ?? [])) as $vu) {
+                if (!in_array($vu, $allGoodsVideos, true)) {
+                    $allGoodsVideos[] = $vu;
+                }
+            }
+        }
+
+        $goodsList = Db::name('order_goods')->where('order_id', $orderId)->order('id asc')->select();
+        if (!empty($goodsList)) {
+            foreach ($goodsList as $gIdx => &$gRow) {
+                if (!empty($gRow['goods_image'])) {
+                    $gRow['goods_image'] = strpos((string)$gRow['goods_image'], 'http') === 0
+                        ? (string)$gRow['goods_image']
+                        : cdnurl((string)$gRow['goods_image'], true);
+                }
+                $pg = isset($parsedPayloadGoods[$gIdx]) && is_array($parsedPayloadGoods[$gIdx]) ? $parsedPayloadGoods[$gIdx] : [];
+                $rowImgs = $normalizeUrlList($pg['images'] ?? []);
+                if (empty($rowImgs) && !empty($gRow['goods_image'])) {
+                    $rowImgs = [$gRow['goods_image']];
+                }
+                $gRow['images'] = $rowImgs;
+                $gRow['env_images'] = $normalizeUrlList($pg['envImages'] ?? ($pg['env_images'] ?? []));
+                $gRow['goods_videos'] = $normalizeUrlList($pg['videos'] ?? ($pg['goods_videos'] ?? []));
+                $gRow['service_type_name'] = isset($pg['service_type_name']) ? (string)$pg['service_type_name'] : '安装';
+                $gRow['goods_remark'] = isset($pg['remark']) ? trim((string)$pg['remark']) : '';
+                $gRow['unit'] = isset($pg['unit']) && $pg['unit'] !== '' ? (string)$pg['unit'] : '套';
+            }
+            unset($gRow);
+        } else {
             $goodsList = [
                 [
-                    // fa_order 表无 goods_name 字段，回退使用 service_name
-                    'goods_name'     => $formattedOrder['service_name'],
-                    'goods_model'    => $formattedOrder['goods_model'] ?: '',
-                    'goods_num'      => max(1, (int)$formattedOrder['goods_num']),
-                    'goods_image'    => $formattedOrder['goods_image_url'],
-                    'addon_services' => '安装x' . max(1, (int)$formattedOrder['goods_num']) . ';',
-                    'base_price'     => (float)$formattedOrder['pay_amount'],
+                    'goods_name'        => $formattedOrder['service_name'],
+                    'goods_model'       => $formattedOrder['goods_model'] ?: '',
+                    'goods_num'         => max(1, (int)$formattedOrder['goods_num']),
+                    'goods_image'       => $formattedOrder['goods_image_url'],
+                    'images'            => !empty($allGoodsImages) ? $allGoodsImages : ($formattedOrder['goods_image_url'] ? [$formattedOrder['goods_image_url']] : []),
+                    'env_images'        => $allEnvImages,
+                    'goods_videos'      => $allGoodsVideos,
+                    'service_type_name' => '安装',
+                    'goods_remark'      => '',
+                    'unit'              => '套',
+                    'addon_services'    => '安装x' . max(1, (int)$formattedOrder['goods_num']) . ';',
+                    'base_price'        => (float)$formattedOrder['pay_amount'],
                 ]
             ];
         }
+        $formattedOrder['all_goods_images'] = $allGoodsImages;
+        $formattedOrder['env_images'] = $allEnvImages;
+        $formattedOrder['goods_videos'] = $allGoodsVideos;
 
         $review = null;
         $revRow = Db::name('review')->where('order_id', $orderId)->where('status', 'normal')->find();
@@ -859,16 +1212,18 @@ class Order extends Base
 
         $showcaseRow = Db::name('showcase')->where('order_id', $orderId)->where('status', 'normal')->find();
         $formattedOrder['showcase_id'] = $showcaseRow ? (int)$showcaseRow['id'] : 0;
+        $formattedOrder['master_mobile_raw'] = $masterMobileRaw;
 
         $this->success('', [
-            'order'  => $formattedOrder,
-            'goods_list' => $goodsList,
-            'master' => $master,
-            'logs'   => $logs,
-            'media'  => $media,
-            'quotes' => $quotes,
-            'review' => $review,
-            'can_choose_quote' => $order['price_type'] === 'quote'
+            'order'             => $formattedOrder,
+            'goods_list'        => $goodsList,
+            'master'            => $master,
+            'master_mobile_raw' => $masterMobileRaw,
+            'logs'              => $logs,
+            'media'             => $media,
+            'quotes'            => $quotes,
+            'review'            => $review,
+            'can_choose_quote'  => $order['price_type'] === 'quote'
                 && (int)$order['status'] === OrderStatus::QUOTING
                 && (int)$order['master_id'] === 0,
         ]);
@@ -925,6 +1280,15 @@ class Order extends Base
 
         Db::startTrans();
         try {
+            $lockedOrder = Db::name('order')->where('id', $orderId)->lock(true)->find();
+            if (!$lockedOrder || (int)$lockedOrder['status'] !== OrderStatus::QUOTING || (int)$lockedOrder['master_id'] !== 0) {
+                throw new \InvalidArgumentException('该工单已选定师傅或状态已变更，请刷新重试');
+            }
+            $quoteAmount = round((float)$quote['amount'], 2);
+            $payAmount = max(0, round($quoteAmount - (float)$lockedOrder['discount_amount'], 2));
+            $alreadyPaid = (int)$lockedOrder['pay_status'] === 1 ? (float)$lockedOrder['pay_amount'] : 0.0;
+            $needDiff = max(0, round($payAmount - $alreadyPaid, 2));
+
             $updateData = [
                 'master_id'     => (int)$quote['master_id'],
                 'accept_time'   => time(),
@@ -939,19 +1303,28 @@ class Order extends Base
                 $updateData['pay_type'] = $payType;
                 $updateData['pay_time'] = time();
             }
-            $this->transit($order, OrderStatus::ACCEPTED, $remark, $updateData, 'user', $this->uid());
+            $this->transit($lockedOrder, OrderStatus::ACCEPTED, $remark, $updateData, 'user', $this->uid());
 
             Db::name('order_quote')->where('id', $quoteId)->update(['status' => 'accept']);
             Db::name('order_quote')->where('order_id', $orderId)->where('id', '<>', $quoteId)
                 ->where('status', 'wait')->update(['status' => 'reject']);
 
-            $this->notify('user', (int)$order['user_id'], '已选定服务师傅', $remark, 'order', $orderId);
-            $this->notify('master', (int)$master['user_id'], '您的报价已被选中', '订单 ' . $order['order_no'] . ' 客户已选择您的报价 ¥' . $quoteAmount . '，请尽快联系客户', 'order', $orderId);
+            $this->notify('user', (int)$lockedOrder['user_id'], '已选定服务师傅', $remark, 'order', $orderId);
+            $this->notify('master', (int)$master['id'], '您的报价已被选中', '订单 ' . $lockedOrder['order_no'] . ' 客户已选择您的报价 ¥' . $quoteAmount . '，请尽快联系客户', 'order', $orderId);
 
             Db::commit();
+        } catch (\think\exception\HttpResponseException $e) {
+            Db::rollback();
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+            return;
         } catch (\Exception $e) {
             Db::rollback();
+            \think\Log::error('[Order::chooseQuote] ' . $e->getMessage());
             $this->error('选择报价失败：' . $e->getMessage());
+            return;
         }
 
         $this->success('已选定师傅并完成支付托管，请等待师傅联系', [
@@ -1016,25 +1389,60 @@ class Order extends Base
         if (!OrderStatus::canCancelByUser($order['status'])) {
             $this->error('当前状态（' . OrderStatus::label($order['status']) . '）不可取消，请联系客服');
         }
+        if (isset($order['invoice_status']) && $order['invoice_status'] === 'wait') {
+            $this->error('该订单正在开票处理中，请先在「开票记录」中撤回开票申请后再取消订单');
+        }
+        if (isset($order['invoice_status']) && $order['invoice_status'] === 'issued') {
+            $this->error('该订单已开具发票，如需取消退款请联系客服办理发票冲红');
+        }
 
+        $prevMasterId = 0;
         Db::startTrans();
         try {
-            $extra = ['cancel_reason' => mb_substr($reason, 0, 255)];
-            if ((int)$order['pay_status'] === 1) {
-                $extra['pay_status'] = 2;
-                $extra['refund_amount'] = $order['pay_amount'];
+            $lockedOrder = Db::name('order')->where('id', $orderId)->lock(true)->find();
+            if (!$lockedOrder || !OrderStatus::canCancelByUser($lockedOrder['status'])) {
+                throw new \InvalidArgumentException('当前状态不可取消，请刷新重试');
             }
-            $this->transit($order, OrderStatus::CANCELLED, '用户取消：' . $reason, $extra, 'user', $this->uid());
+            $prevMasterId = (int)$lockedOrder['master_id'];
+            $extra = ['cancel_reason' => mb_substr($reason, 0, 255)];
+            if ((int)$lockedOrder['pay_status'] === 1) {
+                $extra['pay_status'] = 2;
+                $extra['refund_amount'] = $lockedOrder['pay_amount'];
+            }
+            $this->transit($lockedOrder, OrderStatus::CANCELLED, '用户取消：' . $reason, $extra, 'user', $this->uid());
 
-            if ((int)$order['coupon_id'] > 0) {
-                Db::name('user_coupon')->where('id', (int)$order['coupon_id'])->update([
-                    'status' => 'unused', 'order_id' => 0, 'use_time' => null,
-                ]);
+            if ((int)$lockedOrder['coupon_id'] > 0) {
+                Db::name('user_coupon')
+                    ->where('id', (int)$lockedOrder['coupon_id'])
+                    ->where('user_id', (int)$lockedOrder['user_id'])
+                    ->where('order_id', $orderId)
+                    ->where('status', 'used')
+                    ->update([
+                        'status'   => 'unused',
+                        'use_time' => 0,
+                        'order_id' => 0,
+                    ]);
+            }
+
+            if ($prevMasterId > 0) {
+                $m = Db::name('master')->where('id', $prevMasterId)->find();
+                if ($m) {
+                    $this->notify('master', (int)$m['id'], '订单已取消通知', '客户已取消工单 ' . $lockedOrder['order_no'] . '，原因：' . $reason, 'order', $orderId);
+                }
             }
             Db::commit();
+        } catch (\think\exception\HttpResponseException $e) {
+            Db::rollback();
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+            return;
         } catch (\Exception $e) {
             Db::rollback();
+            \think\Log::error('[Order::cancel] ' . $e->getMessage());
             $this->error('取消失败：' . $e->getMessage());
+            return;
         }
 
         $this->success('订单已取消');
@@ -1065,7 +1473,16 @@ class Order extends Base
 
         Db::startTrans();
         try {
-            $this->transit($order, OrderStatus::COMPLETED, '客户验收通过，订单完成', [
+            $lockedOrder = Db::name('order')->where('id', $orderId)->lock(true)->find();
+            if (!$lockedOrder || (int)$lockedOrder['status'] !== OrderStatus::PENDING_VERIFY || (int)$lockedOrder['settle_status'] === 1) {
+                throw new \InvalidArgumentException('该工单已完成验收或状态已变更，请勿重复提交');
+            }
+            $masterId = (int)$lockedOrder['master_id'];
+            $payAmount = (float)$lockedOrder['pay_amount'];
+            $commission = round($payAmount * $rate / 100, 2);
+            $settleAmount = round($payAmount - $commission, 2);
+
+            $this->transit($lockedOrder, OrderStatus::COMPLETED, '客户验收通过，订单完成', [
                 'verify_time'   => time(),
                 'settle_status' => 1,
                 'settle_amount' => $settleAmount,
@@ -1101,12 +1518,21 @@ class Order extends Base
                     'remark'     => '订单结算入账',
                     'createtime' => time(),
                 ]);
-                $this->notify('master', (int)$master['user_id'], '订单结算入账', '订单 ' . $order['order_no'] . ' 已验收，收入 ¥' . $settleAmount, 'order', $orderId);
+                $this->notify('master', (int)$master['id'], '订单结算入账', '订单 ' . $lockedOrder['order_no'] . ' 已验收，收入 ¥' . $settleAmount, 'order', $orderId);
             }
             Db::commit();
+        } catch (\think\exception\HttpResponseException $e) {
+            Db::rollback();
+            throw $e;
+        } catch (\InvalidArgumentException $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+            return;
         } catch (\Exception $e) {
             Db::rollback();
+            \think\Log::error('[Order::verify] ' . $e->getMessage());
             $this->error('验收失败：' . $e->getMessage());
+            return;
         }
 
         $this->success('验收成功，订单已完成');
@@ -1178,7 +1604,10 @@ class Order extends Base
         }
 
         // 默认商品图/服务图
-        $goodsImageUrl = !empty($row['service_image']) ? $row['service_image'] : '/static/icons/appliance.png';
+        $rawSvcImg = !empty($row['service_image']) ? trim((string)$row['service_image']) : '';
+        $goodsImageUrl = $rawSvcImg !== ''
+            ? (strpos($rawSvcImg, 'http') === 0 ? $rawSvcImg : cdnurl($rawSvcImg, true))
+            : '/static/icons/service-default.svg';
 
         return array_merge($row, [
             'id'                  => (int)$row['id'],
@@ -1215,7 +1644,14 @@ class Order extends Base
             'diff_remark'         => isset($row['diff_remark']) ? (string)$row['diff_remark'] : '',
             'diff_image'          => isset($row['diff_image']) ? (string)$row['diff_image'] : '',
             'empty_run_fee'       => isset($row['empty_run_fee']) ? (float)$row['empty_run_fee'] : 0.00,
+            'use_virtual'         => isset($row['use_virtual']) ? (int)$row['use_virtual'] : 0,
             'auto_quote_timeout'  => isset($row['auto_quote_timeout']) ? (int)$row['auto_quote_timeout'] : 0,
+            'invoice_id'          => isset($row['invoice_id']) ? (int)$row['invoice_id'] : 0,
+            'invoice_status'      => isset($row['invoice_status']) ? (string)$row['invoice_status'] : 'none',
+            'invoice_status_text' => (isset($row['invoice_status']) && $row['invoice_status'] === 'issued')
+                ? '已开具发票'
+                : ((isset($row['invoice_status']) && $row['invoice_status'] === 'wait') ? '开票处理中' : '未开票'),
+            'can_invoice'         => ((int)$row['pay_status'] === 1 && $status === OrderStatus::COMPLETED && (!isset($row['invoice_status']) || $row['invoice_status'] === 'none')),
         ]);
     }
 
@@ -1224,25 +1660,8 @@ class Order extends Base
      */
     protected function currentMerchantUserIds()
     {
-        $merchant = Db::name('merchant')->where('user_id', $this->uid())->find();
-        if (!$merchant) {
-            $bind = Db::name('merchant_member')->where('user_id', $this->uid())->find();
-            if ($bind) {
-                $merchant = Db::name('merchant')->where('id', (int)$bind['merchant_id'])->find();
-            }
-        }
-        if (!$merchant) {
-            return [];
-        }
-        $ids = [(int)$merchant['user_id']];
-        $rows = Db::name('merchant_member')->where('merchant_id', (int)$merchant['id'])->column('user_id');
-        foreach ($rows as $id) {
-            $id = (int)$id;
-            if ($id > 0 && !in_array($id, $ids, true)) {
-                $ids[] = $id;
-            }
-        }
-        return $ids;
+        $team = $this->currentMerchantTeam();
+        return $team ? $team['user_ids'] : [];
     }
 
     /**
@@ -1331,15 +1750,673 @@ class Order extends Base
                             'remark'     => '工单超时自动验收结算入账',
                             'createtime' => time(),
                         ]);
+                        Db::name('message')->insert([
+                            'receive_type' => 'master',
+                            'receive_id'   => (int)$master['id'],
+                            'type'         => 'order',
+                            'title'        => '订单自动验收结算入账',
+                            'content'      => '订单 ' . $order['order_no'] . ' 完工满48小时已自动验收，收入 ¥' . $settleAmount,
+                            'order_id'     => $orderId,
+                            'is_read'      => 0,
+                            'createtime'   => time(),
+                        ]);
                     }
                 }
                 Db::commit();
                 $count++;
             } catch (\Exception $e) {
                 Db::rollback();
+                \think\Log::error('[Order::autoVerifyExpired] ' . $e->getMessage());
             }
         }
         return $count;
     }
 
+    /**
+     * 更新用户订单标记/备注（持久化入库）
+     * @ApiMethod (POST)
+     */
+    public function updateNote()
+    {
+        $orderId = (int)$this->request->post('order_id');
+        $note = trim((string)$this->request->post('remark', ''));
+        $order = $this->ownOrder($orderId, 'user');
+
+        $safeNote = mb_substr($note, 0, 255);
+        Db::name('order')->where('id', (int)$order['id'])->update([
+            'remark'     => $safeNote,
+            'updatetime' => time(),
+        ]);
+
+        $this->success('备注已保存', ['remark' => $safeNote]);
+    }
+
+    /**
+     * 用户/商家专属商品图库列表（含已入库商品图 + 历史订单实拍商品图沉淀）
+     */
+    public function goodsGallery()
+    {
+        $uid = $this->uid();
+        $catId = (int)$this->request->param('cat_id', 0);
+        $keyword = trim((string)$this->request->param('keyword', ''));
+
+        $cats = Db::name('service_cat')
+            ->field('id,name')
+            ->where('status', 'normal')
+            ->where('id', '<>', 15)
+            ->order('weigh desc,id asc')
+            ->select();
+        $catNameMap = [];
+        foreach ($cats as $c) {
+            $catNameMap[(int)$c['id']] = (string)$c['name'];
+        }
+
+        $q = Db::name('user_goods_gallery')->where('user_id', $uid);
+        if ($catId > 0) {
+            $q->where('cat_id', $catId);
+        }
+        if ($keyword !== '') {
+            $q->where('title', 'like', '%' . $keyword . '%');
+        }
+        $libRows = $q->order('id desc')->limit(200)->select();
+
+        $list = [];
+        $seenUrls = [];
+        foreach ($libRows as $r) {
+            $rawImg = trim((string)$r['image']);
+            if ($rawImg === '') {
+                continue;
+            }
+            $fullUrl = strpos($rawImg, 'http') === 0 ? $rawImg : cdnurl($rawImg, true);
+            $seenUrls[$fullUrl] = true;
+            $cid = (int)$r['cat_id'];
+            $list[] = [
+                'id'         => (int)$r['id'],
+                'cat_id'     => $cid,
+                'cat_name'   => isset($catNameMap[$cid]) ? $catNameMap[$cid] : '通用商品',
+                'title'      => (string)($r['title'] ?: '我的商品图'),
+                'image_url'  => $fullUrl,
+                'source'     => 'library',
+                'can_delete' => 1,
+                'time_text'  => $r['createtime'] ? date('Y-m-d', (int)$r['createtime']) : '',
+            ];
+        }
+
+        // 自动沉淀本人历史订单上传过的真实非系统参考图，方便一键复用
+        $histQuery = Db::name('order')
+            ->field('id,cat_id,service_name,goods_images,createtime')
+            ->where('user_id', $uid)
+            ->where('user_deleted', 0)
+            ->where('goods_images', '<>', '');
+        if ($catId > 0) {
+            $histQuery->where('cat_id', $catId);
+        }
+        $histOrders = $histQuery->order('id desc')->limit(50)->select();
+
+        foreach ($histOrders as $ho) {
+            $dec = json_decode((string)$ho['goods_images'], true);
+            $candidates = [];
+            if (is_array($dec)) {
+                if (!empty($dec['goods_list']) && is_array($dec['goods_list'])) {
+                    foreach ($dec['goods_list'] as $gi) {
+                        if (!is_array($gi)) {
+                            continue;
+                        }
+                        $gTitle = !empty($gi['custom_name']) ? (string)$gi['custom_name'] : (!empty($gi['item_name']) ? (string)$gi['item_name'] : (string)$ho['service_name']);
+                        if (!empty($gi['spec_name']) && $gi['spec_name'] !== $gTitle) {
+                            $gTitle .= '（' . $gi['spec_name'] . '）';
+                        }
+                        $imgs = isset($gi['images']) && is_array($gi['images']) ? $gi['images'] : [];
+                        foreach ($imgs as $im) {
+                            if (is_string($im) && trim($im) !== '') {
+                                $candidates[] = ['title' => $gTitle ?: '历史订单商品', 'img' => trim($im)];
+                            }
+                        }
+                    }
+                } elseif (!empty($dec['images']) && is_array($dec['images'])) {
+                    foreach ($dec['images'] as $im) {
+                        if (is_string($im) && trim($im) !== '') {
+                            $candidates[] = ['title' => (string)($ho['service_name'] ?: '历史订单商品'), 'img' => trim($im)];
+                        }
+                    }
+                }
+            }
+            foreach ($candidates as $cand) {
+                $rawIm = $cand['img'];
+                // 排除 SVG 图标与系统图库静态参考图，仅保留用户真实上传图
+                if (substr(strtolower($rawIm), -4) === '.svg' || strpos($rawIm, '/gallery/') !== false || strpos($rawIm, '/goods/') !== false) {
+                    continue;
+                }
+                if ($keyword !== '' && mb_strpos($cand['title'], $keyword) === false) {
+                    continue;
+                }
+                $fullUrl = strpos($rawIm, 'http') === 0 ? $rawIm : cdnurl($rawIm, true);
+                if (isset($seenUrls[$fullUrl])) {
+                    continue;
+                }
+                $seenUrls[$fullUrl] = true;
+                $cid = (int)$ho['cat_id'];
+                $list[] = [
+                    'id'         => 0,
+                    'cat_id'     => $cid,
+                    'cat_name'   => isset($catNameMap[$cid]) ? $catNameMap[$cid] : '历史订单',
+                    'title'      => $cand['title'],
+                    'image_url'  => $fullUrl,
+                    'source'     => 'history',
+                    'can_delete' => 0,
+                    'time_text'  => $ho['createtime'] ? date('Y-m-d', (int)$ho['createtime']) : '',
+                ];
+            }
+        }
+
+        $this->success('', [
+            'cats' => $cats,
+            'list' => $list,
+        ]);
+    }
+
+    /**
+     * 上传保存商品图至个人专属商品图库
+     * @ApiMethod (POST)
+     */
+    public function saveGoodsGallery()
+    {
+        $uid = $this->uid();
+        $catId = max(0, (int)$this->request->post('cat_id', 0));
+        $title = mb_substr(trim((string)$this->request->post('title', '')), 0, 80);
+        $singleImg = trim((string)$this->request->post('image', ''));
+        $rawImages = $this->request->post('images', '', null);
+
+        $imgList = [];
+        if ($singleImg !== '') {
+            $imgList[] = $singleImg;
+        }
+        if (!empty($rawImages)) {
+            if (is_array($rawImages)) {
+                $imgList = array_merge($imgList, $rawImages);
+            } elseif (is_string($rawImages)) {
+                $dec = json_decode(htmlspecialchars_decode($rawImages), true);
+                if (is_array($dec)) {
+                    $imgList = array_merge($imgList, $dec);
+                } else {
+                    $imgList = array_merge($imgList, explode(',', $rawImages));
+                }
+            }
+        }
+
+        $validUrls = [];
+        foreach ($imgList as $u) {
+            if (!is_string($u)) {
+                continue;
+            }
+            $u = trim($u);
+            if ($u === '' || strlen($u) > 255 || substr(strtolower($u), -4) === '.svg') {
+                continue;
+            }
+            if (strpos($u, 'http://') === 0 || strpos($u, 'https://') === 0 || strpos($u, '/') === 0) {
+                $validUrls[] = $u;
+            }
+        }
+        $validUrls = array_values(array_unique($validUrls));
+        if (empty($validUrls)) {
+            $this->error('请上传有效的商品图片');
+        }
+
+        if ($title === '' && $catId > 0) {
+            $cName = (string)Db::name('service_cat')->where('id', $catId)->value('name');
+            $title = $cName !== '' ? ($cName . '商品实拍') : '常用商品图';
+        } elseif ($title === '') {
+            $title = '常用商品图';
+        }
+
+        $now = time();
+        $saved = [];
+        foreach ($validUrls as $u) {
+            $fullUrl = strpos($u, 'http') === 0 ? $u : cdnurl($u, true);
+            $exists = Db::name('user_goods_gallery')
+                ->where('user_id', $uid)
+                ->where('image', 'in', [$u, $fullUrl])
+                ->find();
+            if ($exists) {
+                $saved[] = [
+                    'id'         => (int)$exists['id'],
+                    'cat_id'     => (int)$exists['cat_id'],
+                    'title'      => (string)$exists['title'],
+                    'image_url'  => strpos((string)$exists['image'], 'http') === 0 ? (string)$exists['image'] : cdnurl((string)$exists['image'], true),
+                    'source'     => 'library',
+                    'can_delete' => 1,
+                ];
+                continue;
+            }
+            $newId = (int)Db::name('user_goods_gallery')->insertGetId([
+                'user_id'    => $uid,
+                'cat_id'     => $catId,
+                'title'      => $title,
+                'image'      => $fullUrl,
+                'createtime' => $now,
+            ]);
+            $saved[] = [
+                'id'         => $newId,
+                'cat_id'     => $catId,
+                'title'      => $title,
+                'image_url'  => $fullUrl,
+                'source'     => 'library',
+                'can_delete' => 1,
+            ];
+        }
+
+        $this->success('已存入商品图库', ['list' => $saved]);
+    }
+
+    /**
+     * 删除本人商品图库中的图片（严格校验 user_id 防越权）
+     * @ApiMethod (POST)
+     */
+    public function deleteGoodsGallery()
+    {
+        $uid = $this->uid();
+        $singleId = (int)$this->request->post('id', 0);
+        $rawIds = $this->request->post('ids', '', null);
+
+        $idArr = [];
+        if ($singleId > 0) {
+            $idArr[] = $singleId;
+        }
+        if (!empty($rawIds)) {
+            if (is_array($rawIds)) {
+                $idArr = array_merge($idArr, array_map('intval', $rawIds));
+            } elseif (is_string($rawIds)) {
+                $dec = json_decode(htmlspecialchars_decode($rawIds), true);
+                $arr = is_array($dec) ? $dec : explode(',', $rawIds);
+                $idArr = array_merge($idArr, array_map('intval', $arr));
+            }
+        }
+        $idArr = array_values(array_unique(array_filter($idArr, function ($v) {
+            return $v > 0;
+        })));
+        if (empty($idArr)) {
+            $this->error('请选择要删除的图片');
+        }
+
+        $deleted = Db::name('user_goods_gallery')
+            ->where('user_id', $uid)
+            ->where('id', 'in', $idArr)
+            ->delete();
+        if (!$deleted) {
+            $this->error('图片不存在或无权删除');
+        }
+        $this->success('已从商品图库移除', ['deleted' => (int)$deleted]);
+    }
+
+    /**
+     * 获取当前用户已保存的常用商品模板列表（自动关联刷新最新服务价格与工项）
+     */
+    public function goodsTemplates()
+    {
+        $uid = $this->uid();
+        $preferCatId = (int)$this->request->param('cat_id', 0);
+
+        $rows = Db::name('user_goods_template')
+            ->where('user_id', $uid)
+            ->order('updatetime desc, id desc')
+            ->limit(50)
+            ->select();
+
+        if (empty($rows)) {
+            $this->success('', ['list' => []]);
+            return;
+        }
+
+        $svcIds = array_values(array_unique(array_filter(array_map(function ($r) {
+            return (int)$r['service_id'];
+        }, $rows))));
+
+        $homeCtrl = new Home($this->request);
+        $svcMap = [];
+        if (!empty($svcIds)) {
+            $rawSvcs = Db::name('service')->where('id', 'in', $svcIds)->where('status', 'normal')->select();
+            $formattedSvcs = $homeCtrl->formatServices($rawSvcs);
+            foreach ($formattedSvcs as $fs) {
+                $svcMap[(int)$fs['id']] = $fs;
+            }
+        }
+
+        $catIconRows = Db::name('service_cat')->where('status', 'normal')->column('icon', 'id');
+
+        $list = [];
+        foreach ($rows as $r) {
+            $sid = (int)$r['service_id'];
+            $specId = (int)$r['spec_id'];
+            $cid = (int)$r['cat_id'];
+            $isCustom = (int)$r['is_custom'] === 1 || $cid === 15;
+            $fs = isset($svcMap[$sid]) ? $svcMap[$sid] : null;
+
+            $images = [];
+            if (!empty($r['images_json'])) {
+                $decIm = json_decode((string)$r['images_json'], true);
+                if (is_array($decIm)) {
+                    foreach ($decIm as $im) {
+                        if (is_string($im) && trim($im) !== '') {
+                            $images[] = strpos($im, 'http') === 0 ? $im : cdnurl($im, true);
+                        }
+                    }
+                }
+            }
+
+            $savedExtras = [];
+            if (!empty($r['extras_json'])) {
+                $decEx = json_decode((string)$r['extras_json'], true);
+                if (is_array($decEx)) {
+                    $savedExtras = $decEx;
+                }
+            }
+
+            // 合并实时服务工项、规格单价与增项
+            $serviceTypes = [];
+            $extras = $savedExtras;
+            $basePrice = 0.0;
+            $priceType = $isCustom ? 'quote' : 'fixed';
+            $unit = (string)($r['unit'] ?: '个');
+
+            if ($fs && !$isCustom) {
+                $priceType = (string)$fs['price_type'];
+                $unit = (string)($fs['unit'] ?: $unit);
+                $specPrice = 0.0;
+                if ($specId > 0 && !empty($fs['specs'])) {
+                    foreach ($fs['specs'] as $spItem) {
+                        if ((int)$spItem['id'] === $specId && (float)$spItem['base_price'] > 0) {
+                            $specPrice = (float)$spItem['base_price'];
+                            break;
+                        }
+                    }
+                }
+                $rawSt = !empty($fs['service_types']) ? $fs['service_types'] : [];
+                $hasDef = false;
+                foreach ($rawSt as $x) {
+                    if (!empty($x['is_default'])) {
+                        $hasDef = true;
+                        break;
+                    }
+                }
+                foreach ($rawSt as $idx => $st) {
+                    $isDef = !empty($st['is_default']) || (!$hasDef && $idx === 0);
+                    $pVal = ($isDef && $specPrice > 0) ? $specPrice : (float)($st['price'] ?? 0);
+                    $st['price'] = $pVal;
+                    $serviceTypes[] = $st;
+                    if ((string)$st['code'] === (string)$r['service_type']) {
+                        $basePrice = $pVal;
+                    }
+                }
+                if ($basePrice <= 0) {
+                    $basePrice = $specPrice > 0 ? $specPrice : (float)$fs['base_price'];
+                }
+
+                // 将保存的增项数量映射回最新的增项列表
+                $savedQtyMap = [];
+                foreach ($savedExtras as $sex) {
+                    if (is_array($sex) && !empty($sex['name'])) {
+                        $savedQtyMap[(string)$sex['name']] = max(0, (int)($sex['num'] ?? 0));
+                    }
+                }
+                $freshExtras = [];
+                foreach (($fs['addons'] ?? []) as $aIdx => $ad) {
+                    $aName = (string)($ad['name'] ?? '');
+                    $freshExtras[] = [
+                        'id'    => $ad['id'] ?? ($aIdx + 1),
+                        'key'   => 'addon_' . ($ad['id'] ?? ($aIdx + 1)),
+                        'name'  => $aName,
+                        'unit'  => (string)($ad['unit'] ?? '份'),
+                        'price' => (float)($ad['price'] ?? 0),
+                        'num'   => isset($savedQtyMap[$aName]) ? $savedQtyMap[$aName] : 0,
+                    ];
+                }
+                $extras = $freshExtras;
+            }
+
+            $catIconRaw = isset($catIconRows[$cid]) ? (string)$catIconRows[$cid] : '';
+            $catIconUrl = $catIconRaw !== '' ? (strpos($catIconRaw, 'http') === 0 ? $catIconRaw : cdnurl($catIconRaw, true)) : '';
+
+            $list[] = [
+                'id'                => (int)$r['id'],
+                'tpl_name'          => (string)$r['tpl_name'],
+                'cat_id'            => $cid,
+                'cat_name'          => (string)$r['cat_name'],
+                'cat_icon_url'      => $catIconUrl,
+                'service_id'        => $sid,
+                'item_name'         => (string)$r['item_name'],
+                'spec_id'           => $specId,
+                'spec_name'         => (string)$r['spec_name'],
+                'unit'              => $unit,
+                'num'               => max(1, (int)$r['num']),
+                'service_type'      => (string)($r['service_type'] ?: 'install'),
+                'service_type_name' => (string)($r['service_type_name'] ?: '安装'),
+                'service_types'     => $serviceTypes,
+                'price_type'        => $priceType,
+                'base_price'        => $basePrice,
+                'is_custom'         => $isCustom,
+                'custom_name'       => (string)$r['custom_name'],
+                'extras'            => $extras,
+                'images'            => $images,
+                'cover_image'       => !empty($images) ? $images[0] : ($fs && !empty($fs['image_url']) ? $fs['image_url'] : ''),
+                'remark'            => (string)$r['remark'],
+                'is_current_cat'    => ($preferCatId > 0 && $cid === $preferCatId) ? 1 : 0,
+                'time_text'         => $r['updatetime'] ? date('Y-m-d', (int)$r['updatetime']) : '',
+            ];
+        }
+
+        if ($preferCatId > 0) {
+            usort($list, function ($a, $b) {
+                if ($b['is_current_cat'] !== $a['is_current_cat']) {
+                    return $b['is_current_cat'] <=> $a['is_current_cat'];
+                }
+                return $b['id'] <=> $a['id'];
+            });
+        }
+
+        $this->success('', ['list' => $list]);
+    }
+
+    /**
+     * 保存当前商品配置为常用商品模板
+     * @ApiMethod (POST)
+     */
+    public function saveGoodsTemplate()
+    {
+        $uid = $this->uid();
+        $tplId = (int)$this->request->post('id', 0);
+        $tplName = mb_substr(trim((string)$this->request->post('tpl_name', '')), 0, 80);
+        $catId = max(0, (int)$this->request->post('cat_id', 0));
+        $catName = mb_substr(trim((string)$this->request->post('cat_name', '')), 0, 50);
+        $serviceId = max(0, (int)$this->request->post('service_id', 0));
+        $itemName = mb_substr(trim((string)$this->request->post('item_name', '')), 0, 80);
+        $specId = max(0, (int)$this->request->post('spec_id', 0));
+        $specName = mb_substr(trim((string)$this->request->post('spec_name', '')), 0, 80);
+        $unit = mb_substr(trim((string)$this->request->post('unit', '个')), 0, 20) ?: '个';
+        $num = max(1, min(999, (int)$this->request->post('num', 1)));
+        $serviceType = mb_substr(trim((string)$this->request->post('service_type', 'install')), 0, 40) ?: 'install';
+        $serviceTypeName = mb_substr(trim((string)$this->request->post('service_type_name', '安装')), 0, 40) ?: '安装';
+        $isCustom = (int)$this->request->post('is_custom', 0) ? 1 : 0;
+        $customName = mb_substr(trim((string)$this->request->post('custom_name', '')), 0, 80);
+        $remark = mb_substr(trim((string)$this->request->post('remark', '')), 0, 255);
+
+        if ($isCustom && $customName !== '' && $itemName === '') {
+            $itemName = $customName;
+        }
+        if ($itemName === '') {
+            $this->error('请先选择商品后再保存为模板');
+        }
+        if ($tplName === '') {
+            $tplName = $itemName . ($specName !== '' && $specName !== $itemName ? (' · ' . $specName) : '');
+        }
+
+        $rawExtras = $this->request->post('extras', '', null);
+        $extrasArr = [];
+        if (!empty($rawExtras)) {
+            $decEx = is_array($rawExtras) ? $rawExtras : json_decode(htmlspecialchars_decode((string)$rawExtras), true);
+            if (is_array($decEx)) {
+                foreach ($decEx as $ex) {
+                    if (is_array($ex) && !empty($ex['name'])) {
+                        $extrasArr[] = [
+                            'id'    => (int)($ex['id'] ?? 0),
+                            'name'  => mb_substr(trim((string)$ex['name']), 0, 50),
+                            'unit'  => mb_substr(trim((string)($ex['unit'] ?? '份')), 0, 20),
+                            'price' => (float)($ex['price'] ?? 0),
+                            'num'   => max(0, (int)($ex['num'] ?? 0)),
+                        ];
+                    }
+                }
+            }
+        }
+
+        $rawImages = $this->request->post('images', '', null);
+        $imagesArr = [];
+        if (!empty($rawImages)) {
+            $decIm = is_array($rawImages) ? $rawImages : json_decode(htmlspecialchars_decode((string)$rawImages), true);
+            if (is_array($decIm)) {
+                foreach ($decIm as $im) {
+                    if (is_string($im) && trim($im) !== '' && substr(strtolower(trim($im)), -4) !== '.svg') {
+                        $imagesArr[] = trim($im);
+                    }
+                }
+            }
+        }
+        $imagesArr = array_slice(array_values(array_unique($imagesArr)), 0, 9);
+
+        $now = time();
+        $payload = [
+            'tpl_name'          => $tplName,
+            'cat_id'            => $catId,
+            'cat_name'          => $catName,
+            'service_id'        => $serviceId,
+            'item_name'         => $itemName,
+            'spec_id'           => $specId,
+            'spec_name'         => $specName,
+            'unit'              => $unit,
+            'num'               => $num,
+            'service_type'      => $serviceType,
+            'service_type_name' => $serviceTypeName,
+            'is_custom'         => $isCustom,
+            'custom_name'       => $customName,
+            'extras_json'       => json_encode($extrasArr, JSON_UNESCAPED_UNICODE),
+            'images_json'       => json_encode($imagesArr, JSON_UNESCAPED_UNICODE),
+            'remark'            => $remark,
+            'updatetime'        => $now,
+        ];
+
+        if ($tplId > 0) {
+            $own = Db::name('user_goods_template')->where('id', $tplId)->where('user_id', $uid)->find();
+            if (!$own) {
+                $this->error('模板不存在或无权修改');
+            }
+            Db::name('user_goods_template')->where('id', $tplId)->where('user_id', $uid)->update($payload);
+        } else {
+            $cnt = (int)Db::name('user_goods_template')->where('user_id', $uid)->count();
+            if ($cnt >= 50) {
+                $this->error('最多可保存 50 个商品模板，请先清理旧模板');
+            }
+            $payload['user_id'] = $uid;
+            $payload['createtime'] = $now;
+            $tplId = (int)Db::name('user_goods_template')->insertGetId($payload);
+        }
+
+        $this->success('商品模板保存成功', ['id' => $tplId, 'tpl_name' => $tplName]);
+    }
+
+    /**
+     * 删除本人保存的商品模板
+     * @ApiMethod (POST)
+     */
+    public function deleteGoodsTemplate()
+    {
+        $uid = $this->uid();
+        $id = (int)$this->request->post('id', 0);
+        if ($id <= 0) {
+            $this->error('参数错误');
+        }
+        $deleted = Db::name('user_goods_template')->where('id', $id)->where('user_id', $uid)->delete();
+        if (!$deleted) {
+            $this->error('模板不存在或无权删除');
+        }
+        $this->success('商品模板已删除');
+    }
+
+    /**
+     * 获取常用服务备注模板列表（系统公共模板 + 当前登录用户自建模板）
+     */
+    public function remarkTemplates()
+    {
+        $uid = $this->uid();
+        $rows = Db::name('remark_template')
+            ->where('user_id', 'in', [0, $uid])
+            ->order('user_id desc, weigh desc, id desc')
+            ->limit(50)
+            ->select();
+
+        $list = [];
+        foreach ($rows as $r) {
+            $list[] = [
+                'id'      => (int)$r['id'],
+                'content' => (string)$r['content'],
+                'is_mine' => ((int)$r['user_id'] === $uid && $uid > 0) ? 1 : 0,
+            ];
+        }
+        $this->success('', ['list' => $list]);
+    }
+
+    /**
+     * 新增保存个人常用服务备注模板
+     * @ApiMethod (POST)
+     */
+    public function saveRemarkTemplate()
+    {
+        $uid = $this->uid();
+        $content = mb_substr(trim((string)$this->request->post('content', '')), 0, 120);
+        if ($content === '') {
+            $this->error('请输入备注模板内容');
+        }
+        $exists = Db::name('remark_template')
+            ->where('user_id', 'in', [0, $uid])
+            ->where('content', $content)
+            ->find();
+        if ($exists) {
+            $this->error('该常用备注已存在');
+        }
+        $cnt = (int)Db::name('remark_template')->where('user_id', $uid)->count();
+        if ($cnt >= 20) {
+            $this->error('个人常用备注最多保存 20 条');
+        }
+        $id = (int)Db::name('remark_template')->insertGetId([
+            'user_id'    => $uid,
+            'content'    => $content,
+            'weigh'      => 100,
+            'createtime' => time(),
+        ]);
+        $this->success('常用备注已添加', [
+            'id'      => $id,
+            'content' => $content,
+            'is_mine' => 1,
+        ]);
+    }
+
+    /**
+     * 删除个人自建的常用服务备注模板（禁止删除 user_id=0 的系统模板）
+     * @ApiMethod (POST)
+     */
+    public function deleteRemarkTemplate()
+    {
+        $uid = $this->uid();
+        $id = (int)$this->request->post('id', 0);
+        if ($id <= 0) {
+            $this->error('参数错误');
+        }
+        $deleted = Db::name('remark_template')
+            ->where('id', $id)
+            ->where('user_id', $uid)
+            ->delete();
+        if (!$deleted) {
+            $this->error('该备注不存在或不支持删除');
+        }
+        $this->success('常用备注已删除');
+    }
+
 }
diff --git a/server/application/common/library/InvoiceService.php b/server/application/common/library/InvoiceService.php
new file mode 100644
index 0000000..aef0936
--- /dev/null
+++ b/server/application/common/library/InvoiceService.php
@@ -0,0 +1,1218 @@
+<?php
+
+namespace app\common\library;
+
+use think\Db;
+
+/**
+ * 开票与抬头管理领域服务
+ * 统一承载：主体识别 / 可开票额度核算 / 按单核销锁单 / 发票抬头管理 / 状态机流转
+ */
+class InvoiceService
+{
+    /** 状态文案映射 */
+    public static function statusMap()
+    {
+        return [
+            'wait'   => '开票中',
+            'issued' => '已开票',
+            'reject' => '已驳回',
+            'cancel' => '已撤回',
+        ];
+    }
+
+    /** 发票类型文案映射 */
+    public static function typeMap()
+    {
+        return [
+            'normal'  => '增值税普通发票',
+            'special' => '增值税专用发票',
+        ];
+    }
+
+    /** 抬头类型文案映射 */
+    public static function titleTypeMap()
+    {
+        return [
+            'personal'   => '个人/非企业',
+            'enterprise' => '企业单位',
+        ];
+    }
+
+    /**
+     * 解析当前用户的开票主体上下文（个人用户 vs 已认证商家主账号/关联账号）
+     * @param int $uid
+     * @return array
+     */
+    public static function resolveContext($uid)
+    {
+        $uid = (int)$uid;
+        $merchant = Db::name('merchant')
+            ->field('id,user_id,name,license_no,contact,mobile,province,city,district,address,invoice_title,invoice_tax_no,invoice_bank,invoice_account,email,verify_status')
+            ->where('user_id', $uid)
+            ->find();
+
+        if (!$merchant) {
+            $bind = Db::name('merchant_member')
+                ->field('id,merchant_id,user_id')
+                ->where('user_id', $uid)
+                ->find();
+            if ($bind) {
+                $merchant = Db::name('merchant')
+                    ->field('id,user_id,name,license_no,contact,mobile,province,city,district,address,invoice_title,invoice_tax_no,invoice_bank,invoice_account,email,verify_status')
+                    ->where('id', (int)$bind['merchant_id'])
+                    ->find();
+            }
+        }
+
+        $isPassMerchant = ($merchant && $merchant['verify_status'] === 'pass');
+        $uids = [$uid];
+        $merchantId = 0;
+
+        if ($isPassMerchant) {
+            $merchantId = (int)$merchant['id'];
+            $uids = [(int)$merchant['user_id']];
+            $memberUids = Db::name('merchant_member')
+                ->where('merchant_id', $merchantId)
+                ->column('user_id');
+            foreach ($memberUids as $mUid) {
+                $mUid = (int)$mUid;
+                if ($mUid > 0 && !in_array($mUid, $uids, true)) {
+                    $uids[] = $mUid;
+                }
+            }
+        }
+
+        return [
+            'uid'         => $uid,
+            'is_merchant' => $isPassMerchant,
+            'merchant_id' => $merchantId,
+            'merchant'    => $merchant ?: null,
+            'uids'        => $uids,
+        ];
+    }
+
+    /**
+     * 计算单笔订单可开票净额（实付总额含已付补差价 - 已退金额）
+     * @param array $order
+     * @return float
+     */
+    public static function calcOrderNetAmount(array $order)
+    {
+        if ((int)$order['pay_status'] !== 1 || (int)$order['status'] !== OrderStatus::COMPLETED) {
+            return 0.00;
+        }
+        $pay = (float)$order['pay_amount'];
+        $refund = isset($order['refund_amount']) ? (float)$order['refund_amount'] : 0.00;
+        return round(max(0, $pay - $refund), 2);
+    }
+
+    /**
+     * 构造发票归属查询闭包
+     * @param array $ctx
+     * @return \Closure
+     */
+    public static function buildInvoiceScope(array $ctx)
+    {
+        return function ($q) use ($ctx) {
+            if ($ctx['is_merchant'] && $ctx['merchant_id'] > 0) {
+                $q->where('merchant_id', $ctx['merchant_id'])
+                    ->whereOr('user_id', 'in', $ctx['uids']);
+            } else {
+                $q->where('user_id', $ctx['uid']);
+            }
+        };
+    }
+
+    /**
+     * 获取统一的可开票额度、统计及默认抬头信息
+     * @param int $uid
+     * @return array
+     */
+    public static function getQuotaSummary($uid)
+    {
+        $ctx = self::resolveContext($uid);
+        $uids = $ctx['uids'];
+        $scope = self::buildInvoiceScope($ctx);
+
+        // 已完成订单净额汇总（单条聚合 SQL，统一按已完成订单核算可开票总额）
+        $orderAgg = Db::name('order')
+            ->field('COUNT(*) AS total_cnt,
+                     SUM(CASE WHEN invoice_status = "none" THEN 1 ELSE 0 END) AS unbilled_cnt,
+                     SUM(GREATEST(0, pay_amount - refund_amount)) AS net_paid')
+            ->where('user_id', 'in', $uids)
+            ->where('pay_status', 1)
+            ->where('status', OrderStatus::COMPLETED)
+            ->find();
+
+        $paidAmount = $orderAgg && $orderAgg['net_paid'] !== null ? round((float)$orderAgg['net_paid'], 2) : 0.00;
+        $unbilledOrderCount = $orderAgg ? (int)$orderAgg['unbilled_cnt'] : 0;
+
+        // 发票各状态统计（单条聚合 SQL，兼容 wait 与 issued/done 占用口径）
+        $invAgg = Db::name('invoice')
+            ->field('COUNT(*) AS record_cnt,
+                     SUM(CASE WHEN status = "wait" THEN 1 ELSE 0 END) AS wait_cnt,
+                     SUM(CASE WHEN status IN ("wait", "issued", "done") THEN amount ELSE 0 END) AS used_amt,
+                     SUM(CASE WHEN status IN ("issued", "done") THEN amount ELSE 0 END) AS issued_amt,
+                     SUM(CASE WHEN status = "wait" THEN amount ELSE 0 END) AS wait_amt')
+            ->where($scope)
+            ->find();
+
+        $usedAmount = $invAgg && $invAgg['used_amt'] !== null ? round((float)$invAgg['used_amt'], 2) : 0.00;
+        $issuedAmount = $invAgg && $invAgg['issued_amt'] !== null ? round((float)$invAgg['issued_amt'], 2) : 0.00;
+        $waitAmount = $invAgg && $invAgg['wait_amt'] !== null ? round((float)$invAgg['wait_amt'], 2) : 0.00;
+        $recordCount = $invAgg ? (int)$invAgg['record_cnt'] : 0;
+        $waitCount = $invAgg ? (int)$invAgg['wait_cnt'] : 0;
+        $available = round(max(0, $paidAmount - $usedAmount), 2);
+
+        // 确保认证商家首次自动同步入驻开票抬头
+        self::ensureMerchantDefaultTitle($ctx);
+
+        $titles = self::getTitleList($uid, $ctx);
+        $defaultTitleRow = !empty($titles) ? $titles[0] : null;
+
+        $userRow = Db::name('user')
+            ->field('id,nickname,mobile,email')
+            ->where('id', $ctx['uid'])
+            ->find();
+        $personalTitle = ($userRow && !empty($userRow['nickname'])) ? (string)$userRow['nickname'] : '个人';
+        $merchant = $ctx['merchant'];
+        $entTitle = $merchant ? (string)($merchant['invoice_title'] ?: $merchant['name']) : '';
+        $entTaxNo = $merchant ? (string)($merchant['invoice_tax_no'] ?: $merchant['license_no']) : '';
+
+        return [
+            'available'            => $available,
+            'paid_amount'          => $paidAmount,
+            'used_amount'          => $usedAmount,
+            'issued_amount'        => $issuedAmount,
+            'wait_amount'          => $waitAmount,
+            'unbilled_order_count' => $unbilledOrderCount,
+            'record_count'         => $recordCount,
+            'wait_count'           => $waitCount,
+            'title_count'          => count($titles),
+            'is_merchant'          => $ctx['is_merchant'],
+            'default_title_obj'    => $defaultTitleRow,
+            'default_title_type'   => $defaultTitleRow ? $defaultTitleRow['title_type'] : ($ctx['is_merchant'] ? 'enterprise' : 'personal'),
+            'default_title'        => $defaultTitleRow ? $defaultTitleRow['title'] : ($ctx['is_merchant'] ? $entTitle : $personalTitle),
+            'default_tax_no'       => $defaultTitleRow ? $defaultTitleRow['tax_no'] : ($ctx['is_merchant'] ? $entTaxNo : ''),
+            'default_email'        => ($defaultTitleRow && !empty($defaultTitleRow['email']))
+                ? $defaultTitleRow['email']
+                : (($userRow && !empty($userRow['email'])) ? (string)$userRow['email'] : ($merchant && !empty($merchant['email']) ? (string)$merchant['email'] : '')),
+            'default_mobile'       => ($defaultTitleRow && !empty($defaultTitleRow['receive_mobile']))
+                ? $defaultTitleRow['receive_mobile']
+                : (($userRow && !empty($userRow['mobile'])) ? (string)$userRow['mobile'] : ''),
+            'enterprise_title'     => $entTitle,
+            'enterprise_tax_no'    => $entTaxNo,
+            'personal_title'       => $personalTitle,
+        ];
+    }
+
+    /**
+     * 若认证商家尚未在 fa_invoice_title 落库企业抬头，自动根据商家真实入驻档案初始化一条默认抬头
+     * @param array $ctx
+     */
+    public static function ensureMerchantDefaultTitle(array $ctx)
+    {
+        if (!$ctx['is_merchant'] || !$ctx['merchant']) {
+            return;
+        }
+        $m = $ctx['merchant'];
+        $mid = (int)$m['id'];
+        $titleName = trim((string)($m['invoice_title'] ?: $m['name']));
+        $taxNo = strtoupper(trim((string)($m['invoice_tax_no'] ?: $m['license_no'])));
+        if ($titleName === '' || $taxNo === '') {
+            return;
+        }
+
+        $exists = Db::name('invoice_title')
+            ->field('id')
+            ->where(function ($q) use ($mid, $ctx) {
+                $q->where('merchant_id', $mid)->whereOr('user_id', 'in', $ctx['uids']);
+            })
+            ->where('title_type', 'enterprise')
+            ->find();
+
+        if ($exists) {
+            return;
+        }
+
+        $fullAddr = trim((string)$m['province'] . (string)$m['city'] . (string)$m['district'] . (string)$m['address']);
+        $hasDefault = Db::name('invoice_title')
+            ->where('user_id', 'in', $ctx['uids'])
+            ->where('is_default', 1)
+            ->count() > 0;
+
+        $hasSpecialInfo = !empty($m['invoice_bank']) && !empty($m['invoice_account']) && $fullAddr !== '' && !empty($m['mobile']);
+
+        Db::name('invoice_title')->insert([
+            'user_id'              => (int)$m['user_id'],
+            'merchant_id'          => $mid,
+            'title_type'           => 'enterprise',
+            'default_invoice_type' => $hasSpecialInfo ? 'special' : 'normal',
+            'title'                => $titleName,
+            'tax_no'               => $taxNo,
+            'bank_name'            => trim((string)$m['invoice_bank']),
+            'bank_account'         => trim((string)$m['invoice_account']),
+            'reg_address'          => $fullAddr,
+            'reg_mobile'           => trim((string)$m['mobile']),
+            'email'                => trim((string)$m['email']),
+            'receive_mobile'       => trim((string)$m['mobile']),
+            'is_default'           => $hasDefault ? 0 : 1,
+            'createtime'           => time(),
+            'updatetime'           => time(),
+        ]);
+    }
+
+    /**
+     * 获取当前用户/关联商户可见的抬头列表（默认置顶）
+     * @param int        $uid
+     * @param array|null $ctx
+     * @return array
+     */
+    public static function getTitleList($uid, $ctx = null)
+    {
+        $ctx = $ctx ?: self::resolveContext($uid);
+        self::ensureMerchantDefaultTitle($ctx);
+
+        $rows = Db::name('invoice_title')
+            ->field('id,user_id,merchant_id,title_type,default_invoice_type,title,tax_no,bank_name,bank_account,reg_address,reg_mobile,email,receive_mobile,is_default,createtime,updatetime')
+            ->where(function ($q) use ($ctx) {
+                if ($ctx['is_merchant'] && $ctx['merchant_id'] > 0) {
+                    $q->where('merchant_id', $ctx['merchant_id'])
+                        ->whereOr('user_id', 'in', $ctx['uids']);
+                } else {
+                    $q->where('user_id', $ctx['uid']);
+                }
+            })
+            ->order('is_default desc, id desc')
+            ->select();
+
+        foreach ($rows as &$row) {
+            $row = self::formatTitleRow($row);
+        }
+        unset($row);
+
+        return $rows;
+    }
+
+    /**
+     * 校验并获取单条抬头详情（防 IDOR 越权）
+     * @param int $uid
+     * @param int $id
+     * @return array
+     */
+    public static function getOwnTitle($uid, $id)
+    {
+        $id = (int)$id;
+        if ($id <= 0) {
+            throw new \InvalidArgumentException('抬头参数错误');
+        }
+        $ctx = self::resolveContext($uid);
+        $row = Db::name('invoice_title')
+            ->field('id,user_id,merchant_id,title_type,default_invoice_type,title,tax_no,bank_name,bank_account,reg_address,reg_mobile,email,receive_mobile,is_default,createtime,updatetime')
+            ->where('id', $id)
+            ->where(function ($q) use ($ctx) {
+                if ($ctx['is_merchant'] && $ctx['merchant_id'] > 0) {
+                    $q->where('merchant_id', $ctx['merchant_id'])
+                        ->whereOr('user_id', 'in', $ctx['uids']);
+                } else {
+                    $q->where('user_id', $ctx['uid']);
+                }
+            })
+            ->find();
+
+        if (!$row) {
+            throw new \InvalidArgumentException('发票抬头不存在或无权操作');
+        }
+        return self::formatTitleRow($row);
+    }
+
+    /**
+     * 新增或编辑发票抬头
+     * @param int   $uid
+     * @param array $input
+     * @return array
+     */
+    public static function saveTitle($uid, array $input)
+    {
+        $ctx = self::resolveContext($uid);
+        $id = isset($input['id']) ? (int)$input['id'] : 0;
+        $titleType = isset($input['title_type']) ? trim((string)$input['title_type']) : 'personal';
+        if (!in_array($titleType, ['personal', 'enterprise'], true)) {
+            throw new \InvalidArgumentException('抬头类型不正确');
+        }
+
+        $defaultInvType = isset($input['default_invoice_type']) ? trim((string)$input['default_invoice_type']) : 'normal';
+        if (!in_array($defaultInvType, ['normal', 'special'], true)) {
+            $defaultInvType = 'normal';
+        }
+        if ($titleType === 'personal') {
+            $defaultInvType = 'normal';
+        }
+
+        $title = trim((string)($input['title'] ?? ''));
+        $taxNo = strtoupper(preg_replace('/\s+/', '', (string)($input['tax_no'] ?? '')));
+        $bankName = trim((string)($input['bank_name'] ?? ''));
+        $bankAccount = preg_replace('/\s+/', '', (string)($input['bank_account'] ?? ''));
+        $regAddress = trim((string)($input['reg_address'] ?? ''));
+        $regMobile = trim((string)($input['reg_mobile'] ?? ''));
+        $email = trim((string)($input['email'] ?? ''));
+        $receiveMobile = trim((string)($input['receive_mobile'] ?? ''));
+        $isDefault = !empty($input['is_default']) ? 1 : 0;
+
+        if ($title === '') {
+            throw new \InvalidArgumentException($titleType === 'enterprise' ? '请填写企业名称（发票抬头）' : '请填写发票抬头名称');
+        }
+
+        if ($titleType === 'enterprise') {
+            if ($taxNo === '') {
+                throw new \InvalidArgumentException('请填写纳税人识别号（统一社会信用代码）');
+            }
+            if (!preg_match('/^[0-9A-Z]{15,20}$/', $taxNo)) {
+                throw new \InvalidArgumentException('纳税人识别号需为15-20位字母或数字');
+            }
+            if ($defaultInvType === 'special') {
+                if ($bankName === '' || $bankAccount === '') {
+                    throw new \InvalidArgumentException('专用发票抬头需填写完整的开户银行与银行账号');
+                }
+                if ($regAddress === '' || $regMobile === '') {
+                    throw new \InvalidArgumentException('专用发票抬头需填写完整的企业注册地址与注册电话');
+                }
+            }
+        } else {
+            $taxNo = '';
+            $bankName = '';
+            $bankAccount = '';
+            $regAddress = '';
+            $regMobile = '';
+        }
+
+        if ($email !== '' && !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            throw new \InvalidArgumentException('接收邮箱格式不正确');
+        }
+        if ($receiveMobile !== '' && !preg_match('/^1\d{10}$/', $receiveMobile)) {
+            throw new \InvalidArgumentException('通知手机号格式不正确');
+        }
+
+        $saveData = [
+            'title_type'           => $titleType,
+            'default_invoice_type' => $defaultInvType,
+            'title'                => mb_substr($title, 0, 100),
+            'tax_no'               => mb_substr($taxNo, 0, 50),
+            'bank_name'            => mb_substr($bankName, 0, 100),
+            'bank_account'         => mb_substr($bankAccount, 0, 50),
+            'reg_address'          => mb_substr($regAddress, 0, 255),
+            'reg_mobile'           => mb_substr($regMobile, 0, 30),
+            'email'                => mb_substr($email, 0, 100),
+            'receive_mobile'       => mb_substr($receiveMobile, 0, 20),
+            'is_default'           => $isDefault,
+            'updatetime'           => time(),
+        ];
+
+        Db::startTrans();
+        try {
+            if ($id > 0) {
+                $old = self::getOwnTitle($uid, $id);
+                Db::name('invoice_title')->where('id', (int)$old['id'])->update($saveData);
+            } else {
+                $cnt = (int)Db::name('invoice_title')->where('user_id', $ctx['uid'])->count();
+                if ($cnt >= 30) {
+                    throw new \InvalidArgumentException('最多可保存 30 个常用发票抬头');
+                }
+                if ($cnt === 0 && !$ctx['is_merchant']) {
+                    $saveData['is_default'] = 1;
+                }
+                $saveData['user_id'] = $ctx['uid'];
+                $saveData['merchant_id'] = ($ctx['is_merchant'] && $titleType === 'enterprise') ? $ctx['merchant_id'] : 0;
+                $saveData['createtime'] = time();
+                $id = (int)Db::name('invoice_title')->insertGetId($saveData);
+            }
+
+            if ((int)$saveData['is_default'] === 1) {
+                $otherIds = Db::name('invoice_title')
+                    ->where(self::buildInvoiceScope($ctx))
+                    ->where('id', '<>', $id)
+                    ->column('id');
+                if (!empty($otherIds)) {
+                    Db::name('invoice_title')
+                        ->where('id', 'in', array_map('intval', $otherIds))
+                        ->update(['is_default' => 0, 'updatetime' => time()]);
+                }
+            }
+
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            throw $e;
+        }
+
+        return self::getOwnTitle($uid, $id);
+    }
+
+    /**
+     * 设为默认抬头
+     * @param int $uid
+     * @param int $id
+     */
+    public static function setDefaultTitle($uid, $id)
+    {
+        $ctx = self::resolveContext($uid);
+        $target = self::getOwnTitle($uid, $id);
+        $targetId = (int)$target['id'];
+        $now = time();
+
+        Db::startTrans();
+        try {
+            $otherIds = Db::name('invoice_title')
+                ->where(self::buildInvoiceScope($ctx))
+                ->where('id', '<>', $targetId)
+                ->column('id');
+            if (!empty($otherIds)) {
+                Db::name('invoice_title')
+                    ->where('id', 'in', array_map('intval', $otherIds))
+                    ->update(['is_default' => 0, 'updatetime' => $now]);
+            }
+
+            Db::name('invoice_title')
+                ->where('id', $targetId)
+                ->update(['is_default' => 1, 'updatetime' => $now]);
+
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * 删除发票抬头
+     * @param int $uid
+     * @param int $id
+     */
+    public static function deleteTitle($uid, $id)
+    {
+        $target = self::getOwnTitle($uid, $id);
+        Db::name('invoice_title')->where('id', (int)$target['id'])->delete();
+    }
+
+    /**
+     * 获取可勾选开票的已完成未开票订单列表（支持传入 filterIds 精准查询指定待开票订单）
+     * @param int   $uid
+     * @param int   $page
+     * @param int   $limit
+     * @param int[] $filterIds
+     * @return array
+     */
+    public static function getInvoiceableOrders($uid, $page = 1, $limit = 20, array $filterIds = [])
+    {
+        $ctx = self::resolveContext($uid);
+        $uids = $ctx['uids'];
+        $page = max(1, (int)$page);
+        $limit = min(100, max(1, (int)$limit));
+        $filterIds = self::parseIds($filterIds);
+
+        $baseQuery = function () use ($uids, $filterIds) {
+            $q = Db::name('order')
+                ->where('user_id', 'in', $uids)
+                ->where('pay_status', 1)
+                ->where('status', OrderStatus::COMPLETED)
+                ->where('invoice_status', 'none');
+            if (!empty($filterIds)) {
+                $q->where('id', 'in', $filterIds);
+            }
+            return $q;
+        };
+
+        $total = (int)$baseQuery()->count();
+        $rows = $baseQuery()
+            ->field('id,order_no,user_id,service_id,service_name,service_image,goods_model,goods_num,pay_amount,refund_amount,pay_status,status,pay_time,verify_time,createtime')
+            ->order('id desc')
+            ->page($page, $limit)
+            ->select();
+
+        $list = [];
+        $sumAmount = 0.00;
+        foreach ($rows as $row) {
+            $net = self::calcOrderNetAmount($row);
+            if ($net <= 0) {
+                continue;
+            }
+            $sumAmount = round($sumAmount + $net, 2);
+            $img = !empty($row['service_image']) ? (string)$row['service_image'] : '';
+            if ($img !== '' && strpos($img, 'http') !== 0 && strpos($img, '/static/') !== 0) {
+                $img = cdnurl($img, true);
+            }
+            $doneTime = (int)($row['verify_time'] ?: ($row['pay_time'] ?: $row['createtime']));
+            $list[] = [
+                'id'                 => (int)$row['id'],
+                'order_no'           => (string)$row['order_no'],
+                'service_name'       => (string)($row['service_name'] ?: '上门安装维修服务'),
+                'goods_model'        => (string)$row['goods_model'],
+                'goods_num'          => max(1, (int)$row['goods_num']),
+                'service_image'      => $img,
+                'status'             => (int)$row['status'],
+                'status_text'        => OrderStatus::label((int)$row['status']),
+                'invoiceable_amount' => $net,
+                'time_text'          => date('Y-m-d H:i', $doneTime),
+            ];
+        }
+
+        return [
+            'list'            => $list,
+            'total'           => $total,
+            'selected_amount' => $sumAmount,
+            'page'            => $page,
+            'limit'           => $limit,
+            'has_more'        => ($page * $limit) < $total,
+        ];
+    }
+
+    /**
+     * 提交开票申请（兼容：按勾选订单合并开票 & 按可用额度开票）
+     * @param int   $uid
+     * @param array $params
+     * @param bool  $strictSpecial 是否严格强制校验增值税专票六要素（新接口为 true，旧兼容接口为 false）
+     * @return array
+     */
+    public static function submitInvoice($uid, array $params, $strictSpecial = true)
+    {
+        $ctx = self::resolveContext($uid);
+        $merchant = $ctx['merchant'];
+        $isPassMerchant = $ctx['is_merchant'];
+
+        // 解析关联订单 ID 集合
+        $orderIds = self::parseIds($params['order_ids'] ?? []);
+        $titleId = isset($params['title_id']) ? (int)$params['title_id'] : 0;
+        $type = isset($params['type']) ? trim((string)$params['type']) : 'normal';
+        $titleType = isset($params['title_type']) ? trim((string)$params['title_type']) : '';
+        $title = trim((string)($params['title'] ?? ''));
+        $taxNo = strtoupper(preg_replace('/\s+/', '', (string)($params['tax_no'] ?? '')));
+        $bankName = trim((string)($params['bank_name'] ?? ''));
+        $bankAccount = preg_replace('/\s+/', '', (string)($params['bank_account'] ?? ''));
+        $regAddress = trim((string)($params['reg_address'] ?? ''));
+        $regMobile = trim((string)($params['reg_mobile'] ?? ''));
+        $email = trim((string)($params['email'] ?? ''));
+        $receiveMobile = trim((string)($params['receive_mobile'] ?? ''));
+        $remark = trim((string)($params['remark'] ?? ''));
+        $saveToTitleBook = !empty($params['save_title']);
+
+        if (!in_array($type, ['normal', 'special'], true)) {
+            throw new \InvalidArgumentException('发票类型错误');
+        }
+
+        // 若指定了 title_id，读取抬头簿补全缺省项
+        if ($titleId > 0) {
+            $tRow = self::getOwnTitle($uid, $titleId);
+            if ($titleType === '') $titleType = $tRow['title_type'];
+            if ($title === '') $title = $tRow['title'];
+            if ($taxNo === '') $taxNo = $tRow['tax_no'];
+            if ($bankName === '') $bankName = $tRow['bank_name'];
+            if ($bankAccount === '') $bankAccount = $tRow['bank_account'];
+            if ($regAddress === '') $regAddress = $tRow['reg_address'];
+            if ($regMobile === '') $regMobile = $tRow['reg_mobile'];
+            if ($email === '' && !empty($tRow['email'])) $email = $tRow['email'];
+            if ($receiveMobile === '' && !empty($tRow['receive_mobile'])) $receiveMobile = $tRow['receive_mobile'];
+        }
+
+        if (!in_array($titleType, ['personal', 'enterprise'], true)) {
+            $titleType = ($isPassMerchant || $taxNo !== '' || $type === 'special') ? 'enterprise' : 'personal';
+        }
+
+        if ($titleType === 'personal') {
+            if ($type === 'special') {
+                throw new \InvalidArgumentException('个人/非企业抬头仅支持开具普通发票');
+            }
+            if ($title === '') {
+                $uRow = Db::name('user')->field('nickname')->where('id', $ctx['uid'])->find();
+                $title = ($uRow && !empty($uRow['nickname'])) ? (string)$uRow['nickname'] : '个人';
+            }
+            $taxNo = '';
+            $bankName = '';
+            $bankAccount = '';
+            $regAddress = '';
+            $regMobile = '';
+        } else {
+            // 企业单位：若未传且是认证商家，自动回退读取商家档案
+            if ($isPassMerchant && $merchant) {
+                if ($title === '') {
+                    $title = trim((string)($merchant['invoice_title'] ?: $merchant['name']));
+                }
+                if ($taxNo === '') {
+                    $taxNo = strtoupper(trim((string)($merchant['invoice_tax_no'] ?: $merchant['license_no'])));
+                }
+                if ($bankName === '' && !empty($merchant['invoice_bank'])) {
+                    $bankName = trim((string)$merchant['invoice_bank']);
+                }
+                if ($bankAccount === '' && !empty($merchant['invoice_account'])) {
+                    $bankAccount = trim((string)$merchant['invoice_account']);
+                }
+                if ($regAddress === '') {
+                    $regAddress = trim((string)$merchant['province'] . (string)$merchant['city'] . (string)$merchant['district'] . (string)$merchant['address']);
+                }
+                if ($regMobile === '' && !empty($merchant['mobile'])) {
+                    $regMobile = trim((string)$merchant['mobile']);
+                }
+            }
+
+            if ($title === '') {
+                throw new \InvalidArgumentException('请填写企业发票抬头');
+            }
+            if ($taxNo === '') {
+                throw new \InvalidArgumentException('请填写纳税人识别号（统一社会信用代码）');
+            }
+            if ($strictSpecial && !preg_match('/^[0-9A-Z]{15,20}$/', $taxNo)) {
+                throw new \InvalidArgumentException('纳税人识别号需为15-20位字母或数字');
+            }
+            if ($type === 'special' && $strictSpecial) {
+                if ($bankName === '' || $bankAccount === '') {
+                    throw new \InvalidArgumentException('开具增值税专用发票须填写开户银行及银行账号');
+                }
+                if ($regAddress === '' || $regMobile === '') {
+                    throw new \InvalidArgumentException('开具增值税专用发票须填写企业注册地址及注册电话');
+                }
+            }
+        }
+
+        if ($strictSpecial && $email === '') {
+            throw new \InvalidArgumentException('请填写接收电子发票的邮箱地址');
+        }
+        if ($email !== '' && !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            throw new \InvalidArgumentException('接收邮箱格式不正确');
+        }
+        if ($receiveMobile !== '' && !preg_match('/^1\d{10}$/', $receiveMobile)) {
+            throw new \InvalidArgumentException('通知手机号格式不正确');
+        }
+
+        $inputAmount = isset($params['amount']) ? round((float)$params['amount'], 2) : 0.00;
+        if ($strictSpecial && empty($orderIds)) {
+            throw new \InvalidArgumentException('请先选择需要开具发票的已完成订单');
+        }
+        if (empty($orderIds) && $inputAmount <= 0) {
+            throw new \InvalidArgumentException('请选择开票订单');
+        }
+
+        $scope = self::buildInvoiceScope($ctx);
+        $uids = $ctx['uids'];
+        $invoiceId = 0;
+        $invoiceSn = '';
+        $finalAmount = $inputAmount;
+
+        Db::startTrans();
+        try {
+            // 锁定用户名片行作为用户/商户级开票互斥锚点，防止并发双花超开额度
+            $anchorUid = $isPassMerchant && $merchant ? (int)$merchant['user_id'] : $ctx['uid'];
+            Db::name('user')->field('id')->where('id', $anchorUid)->lock(true)->find();
+
+            if (!empty($orderIds)) {
+                $lockedOrders = Db::name('order')
+                    ->field('id,order_no,user_id,pay_amount,diff_amount,diff_status,refund_amount,pay_status,status,invoice_status')
+                    ->where('id', 'in', $orderIds)
+                    ->where('user_id', 'in', $uids)
+                    ->lock(true)
+                    ->select();
+
+                if (count($lockedOrders) !== count($orderIds)) {
+                    throw new \InvalidArgumentException('部分所选订单不存在或无权开票');
+                }
+
+                $sumOrders = 0.00;
+                foreach ($lockedOrders as $ord) {
+                    if ((int)$ord['status'] !== OrderStatus::COMPLETED) {
+                        throw new \InvalidArgumentException('订单「' . $ord['order_no'] . '」尚未完成验收，仅已完成订单可申请开票');
+                    }
+                    if ($ord['invoice_status'] !== 'none') {
+                        throw new \InvalidArgumentException('订单「' . $ord['order_no'] . '」已在开票中或已开票，请勿重复选择');
+                    }
+                    $net = self::calcOrderNetAmount($ord);
+                    if ($net <= 0) {
+                        throw new \InvalidArgumentException('订单「' . $ord['order_no'] . '」未支付或已退款，无法开票');
+                    }
+                    $sumOrders = round($sumOrders + $net, 2);
+                }
+                $finalAmount = $sumOrders;
+            }
+
+            // 重新计算实时总可开票余额池（统一为已完成订单总额减去 wait 和 issued/done 占用金额）
+            $orderAgg = Db::name('order')
+                ->field('SUM(GREATEST(0, pay_amount - refund_amount)) AS net_paid')
+                ->where('user_id', 'in', $uids)
+                ->where('pay_status', 1)
+                ->where('status', OrderStatus::COMPLETED)
+                ->find();
+            $paidTotal = $orderAgg && $orderAgg['net_paid'] !== null ? round((float)$orderAgg['net_paid'], 2) : 0.00;
+
+            $usedTotal = (float)Db::name('invoice')
+                ->where($scope)
+                ->where('status', 'in', ['wait', 'issued', 'done'])
+                ->sum('amount');
+
+            $available = round(max(0, $paidTotal - $usedTotal), 2);
+            if ($finalAmount <= 0) {
+                throw new \InvalidArgumentException('有效开票金额必须大于 0');
+            }
+            if ($finalAmount > $available) {
+                // 若历史曾用不绑单额度开过部分票，而用户本次按单勾选了超出剩余总额度，给出清晰提示或支持按最大可用额度裁剪
+                throw new \InvalidArgumentException('可开票金额不足，当前剩余可开额度 ¥' . number_format($available, 2, '.', ''));
+            }
+
+            $now = time();
+            $invoiceSn = 'INV' . date('YmdHis', $now) . mt_rand(1000, 9999);
+
+            // 若勾选了保存至抬头簿（且当前未指定已有 title_id）
+            if ($saveToTitleBook && $titleId <= 0) {
+                $dupTitle = Db::name('invoice_title')
+                    ->field('id')
+                    ->where('user_id', $ctx['uid'])
+                    ->where('title_type', $titleType)
+                    ->where('title', $title)
+                    ->find();
+                if ($dupTitle) {
+                    $titleId = (int)$dupTitle['id'];
+                    Db::name('invoice_title')->where('id', $titleId)->update([
+                        'tax_no'               => mb_substr($taxNo, 0, 50),
+                        'default_invoice_type' => $type,
+                        'bank_name'            => mb_substr($bankName, 0, 100),
+                        'bank_account'         => mb_substr($bankAccount, 0, 50),
+                        'reg_address'          => mb_substr($regAddress, 0, 255),
+                        'reg_mobile'           => mb_substr($regMobile, 0, 30),
+                        'email'                => $email !== '' ? mb_substr($email, 0, 100) : '',
+                        'receive_mobile'       => $receiveMobile !== '' ? mb_substr($receiveMobile, 0, 20) : '',
+                        'updatetime'           => $now,
+                    ]);
+                } else {
+                    $hasAny = Db::name('invoice_title')->where('user_id', $ctx['uid'])->count() > 0;
+                    $titleId = (int)Db::name('invoice_title')->insertGetId([
+                        'user_id'              => $ctx['uid'],
+                        'merchant_id'          => ($isPassMerchant && $titleType === 'enterprise') ? $ctx['merchant_id'] : 0,
+                        'title_type'           => $titleType,
+                        'default_invoice_type' => $type,
+                        'title'                => mb_substr($title, 0, 100),
+                        'tax_no'               => mb_substr($taxNo, 0, 50),
+                        'bank_name'            => mb_substr($bankName, 0, 100),
+                        'bank_account'         => mb_substr($bankAccount, 0, 50),
+                        'reg_address'          => mb_substr($regAddress, 0, 255),
+                        'reg_mobile'           => mb_substr($regMobile, 0, 30),
+                        'email'                => mb_substr($email, 0, 100),
+                        'receive_mobile'       => mb_substr($receiveMobile, 0, 20),
+                        'is_default'           => $hasAny ? 0 : 1,
+                        'createtime'           => $now,
+                        'updatetime'           => $now,
+                    ]);
+                }
+            }
+
+            $invoiceId = (int)Db::name('invoice')->insertGetId([
+                'invoice_sn'     => $invoiceSn,
+                'merchant_id'    => $isPassMerchant ? $ctx['merchant_id'] : 0,
+                'user_id'        => $ctx['uid'],
+                'title_id'       => $titleId,
+                'amount'         => $finalAmount,
+                'type'           => $type,
+                'title_type'     => $titleType,
+                'title'          => mb_substr($title, 0, 100),
+                'tax_no'         => mb_substr($taxNo, 0, 50),
+                'bank_name'      => mb_substr($bankName, 0, 100),
+                'bank_account'   => mb_substr($bankAccount, 0, 50),
+                'reg_address'    => mb_substr($regAddress, 0, 255),
+                'reg_mobile'     => mb_substr($regMobile, 0, 30),
+                'email'          => mb_substr($email, 0, 100),
+                'receive_mobile' => mb_substr($receiveMobile, 0, 20),
+                'remark'         => mb_substr($remark, 0, 255),
+                'order_ids'      => !empty($orderIds) ? implode(',', $orderIds) : '',
+                'order_count'    => count($orderIds),
+                'status'         => 'wait',
+                'createtime'     => $now,
+                'updatetime'     => $now,
+            ]);
+
+            if (!empty($orderIds)) {
+                Db::name('order')
+                    ->where('id', 'in', $orderIds)
+                    ->update([
+                        'invoice_id'     => $invoiceId,
+                        'invoice_status' => 'wait',
+                        'updatetime'     => $now,
+                    ]);
+            }
+
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            throw $e;
+        }
+
+        return [
+            'invoice_id'  => $invoiceId,
+            'invoice_sn'  => $invoiceSn,
+            'amount'      => $finalAmount,
+            'order_count' => count($orderIds),
+        ];
+    }
+
+    /**
+     * 获取开票记录分页列表
+     * @param int    $uid
+     * @param string $status all|wait|issued|reject|cancel
+     * @param int    $page
+     * @param int    $limit
+     * @return array
+     */
+    public static function getRecordList($uid, $status = 'all', $page = 1, $limit = 20)
+    {
+        $ctx = self::resolveContext($uid);
+        $scope = self::buildInvoiceScope($ctx);
+        $page = max(1, (int)$page);
+        $limit = min(50, max(1, (int)$limit));
+
+        $build = function () use ($scope, $status) {
+            $q = Db::name('invoice')->where($scope);
+            if (in_array($status, ['wait', 'issued', 'reject', 'cancel'], true)) {
+                $q->where('status', $status);
+            }
+            return $q;
+        };
+
+        $total = (int)$build()->count();
+        $rows = $build()
+            ->field('id,invoice_sn,merchant_id,user_id,title_id,amount,type,title_type,title,tax_no,bank_name,bank_account,reg_address,reg_mobile,email,receive_mobile,remark,order_ids,order_count,status,invoice_code,invoice_no,invoice_file,audit_msg,issue_time,createtime,updatetime')
+            ->order('id desc')
+            ->page($page, $limit)
+            ->select();
+
+        foreach ($rows as &$row) {
+            $row = self::formatInvoiceRow($row);
+        }
+        unset($row);
+
+        return [
+            'list'     => $rows,
+            'total'    => $total,
+            'page'     => $page,
+            'limit'    => $limit,
+            'has_more' => ($page * $limit) < $total,
+        ];
+    }
+
+    /**
+     * 获取单笔开票详情及关联订单明细（防 IDOR 越权，批量查订单杜绝 N+1）
+     * @param int $uid
+     * @param int $id
+     * @return array
+     */
+    public static function getInvoiceDetail($uid, $id)
+    {
+        $id = (int)$id;
+        if ($id <= 0) {
+            throw new \InvalidArgumentException('开票申请ID错误');
+        }
+        $ctx = self::resolveContext($uid);
+        $scope = self::buildInvoiceScope($ctx);
+
+        $row = Db::name('invoice')
+            ->field('id,invoice_sn,merchant_id,user_id,title_id,amount,type,title_type,title,tax_no,bank_name,bank_account,reg_address,reg_mobile,email,receive_mobile,remark,order_ids,order_count,status,invoice_code,invoice_no,invoice_file,audit_msg,issue_time,createtime,updatetime')
+            ->where('id', $id)
+            ->where($scope)
+            ->find();
+
+        if (!$row) {
+            throw new \InvalidArgumentException('开票记录不存在或无权查看');
+        }
+
+        $detail = self::formatInvoiceRow($row);
+        $detail['orders'] = self::fetchLinkedOrders($row['order_ids'], (int)$row['id']);
+
+        return $detail;
+    }
+
+    /**
+     * 批量读取发票关联的订单列表（供用户端详情与后台详情复用）
+     * @param string $orderIdsStr
+     * @param int    $invoiceId
+     * @return array
+     */
+    public static function fetchLinkedOrders($orderIdsStr, $invoiceId = 0)
+    {
+        $ids = self::parseIds($orderIdsStr);
+        if (empty($ids) && $invoiceId > 0) {
+            $ids = Db::name('order')->where('invoice_id', (int)$invoiceId)->column('id');
+            $ids = array_values(array_unique(array_map('intval', $ids)));
+        }
+        if (empty($ids)) {
+            return [];
+        }
+
+        $orders = Db::name('order')
+            ->field('id,order_no,service_name,goods_model,goods_num,pay_amount,diff_amount,diff_status,refund_amount,status,pay_status,createtime')
+            ->where('id', 'in', $ids)
+            ->order('id desc')
+            ->select();
+
+        $res = [];
+        foreach ($orders as $o) {
+            $res[] = [
+                'id'           => (int)$o['id'],
+                'order_no'     => (string)$o['order_no'],
+                'service_name' => (string)($o['service_name'] ?: '上门服务'),
+                'goods_model'  => (string)$o['goods_model'],
+                'goods_num'    => max(1, (int)$o['goods_num']),
+                'amount'       => self::calcOrderNetAmount($o) ?: round((float)$o['pay_amount'], 2),
+                'status_text'  => OrderStatus::label((int)$o['status']),
+                'time_text'    => date('Y-m-d H:i', (int)$o['createtime']),
+            ];
+        }
+        return $res;
+    }
+
+    /**
+     * 用户主动撤回待处理（wait）开票申请，释放额度与订单锁
+     * @param int $uid
+     * @param int $id
+     */
+    public static function cancelInvoice($uid, $id)
+    {
+        $id = (int)$id;
+        if ($id <= 0) {
+            throw new \InvalidArgumentException('参数错误');
+        }
+        $ctx = self::resolveContext($uid);
+        $scope = self::buildInvoiceScope($ctx);
+
+        $row = Db::name('invoice')
+            ->field('id,status,order_ids')
+            ->where('id', $id)
+            ->where($scope)
+            ->find();
+
+        if (!$row) {
+            throw new \InvalidArgumentException('开票申请不存在或无权操作');
+        }
+        if ($row['status'] !== 'wait') {
+            throw new \InvalidArgumentException('当前状态不可撤回');
+        }
+
+        $now = time();
+        Db::startTrans();
+        try {
+            $affected = Db::name('invoice')
+                ->where('id', $id)
+                ->where('status', 'wait')
+                ->update([
+                    'status'     => 'cancel',
+                    'updatetime' => $now,
+                ]);
+            if (!$affected) {
+                throw new \InvalidArgumentException('申请状态已变更，请刷新后重试');
+            }
+
+            self::releaseInvoiceOrders($id, $row['order_ids'], $now);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * 释放开票申请绑定的订单锁（用于用户撤回或财务驳回）
+     * @param int    $invoiceId
+     * @param string $orderIdsStr
+     * @param int    $now
+     */
+    public static function releaseInvoiceOrders($invoiceId, $orderIdsStr = '', $now = 0)
+    {
+        $now = $now ?: time();
+        $ids = self::parseIds($orderIdsStr);
+
+        Db::name('order')
+            ->where('invoice_id', (int)$invoiceId)
+            ->update([
+                'invoice_id'     => 0,
+                'invoice_status' => 'none',
+                'updatetime'     => $now,
+            ]);
+
+        if (!empty($ids)) {
+            Db::name('order')
+                ->where('id', 'in', $ids)
+                ->where('invoice_id', 'in', [0, (int)$invoiceId])
+                ->where('invoice_status', 'wait')
+                ->update([
+                    'invoice_id'     => 0,
+                    'invoice_status' => 'none',
+                    'updatetime'     => $now,
+                ]);
+        }
+    }
+
+    /**
+     * 标记开票申请绑定的订单为已开票（用于财务确认开票完成）
+     * @param int    $invoiceId
+     * @param string $orderIdsStr
+     * @param int    $now
+     */
+    public static function markInvoiceOrdersIssued($invoiceId, $orderIdsStr = '', $now = 0)
+    {
+        $now = $now ?: time();
+        $ids = self::parseIds($orderIdsStr);
+
+        Db::name('order')
+            ->where('invoice_id', (int)$invoiceId)
+            ->update([
+                'invoice_status' => 'issued',
+                'updatetime'     => $now,
+            ]);
+
+        if (!empty($ids)) {
+            Db::name('order')
+                ->where('id', 'in', $ids)
+                ->where('invoice_id', 'in', [0, (int)$invoiceId])
+                ->update([
+                    'invoice_id'     => (int)$invoiceId,
+                    'invoice_status' => 'issued',
+                    'updatetime'     => $now,
+                ]);
+        }
+    }
+
+    /**
+     * 格式化抬头行输出
+     * @param array $row
+     * @return array
+     */
+    public static function formatTitleRow(array $row)
+    {
+        $titleType = $row['title_type'] === 'enterprise' ? 'enterprise' : 'personal';
+        $hasSpecialInfo = $titleType === 'enterprise'
+            && !empty($row['tax_no'])
+            && !empty($row['bank_name'])
+            && !empty($row['bank_account'])
+            && !empty($row['reg_address'])
+            && !empty($row['reg_mobile']);
+
+        return [
+            'id'                   => (int)$row['id'],
+            'user_id'              => (int)$row['user_id'],
+            'merchant_id'          => (int)$row['merchant_id'],
+            'title_type'           => $titleType,
+            'title_type_text'      => $titleType === 'enterprise' ? '企业单位' : '个人/非企业',
+            'default_invoice_type' => $row['default_invoice_type'] === 'special' ? 'special' : 'normal',
+            'invoice_type_text'    => $row['default_invoice_type'] === 'special' ? '增值税专用发票' : '普通发票',
+            'title'                => (string)$row['title'],
+            'tax_no'               => (string)$row['tax_no'],
+            'bank_name'            => (string)$row['bank_name'],
+            'bank_account'         => (string)$row['bank_account'],
+            'reg_address'          => (string)$row['reg_address'],
+            'reg_mobile'           => (string)$row['reg_mobile'],
+            'email'                => (string)$row['email'],
+            'receive_mobile'       => (string)$row['receive_mobile'],
+            'is_default'           => (int)$row['is_default'],
+            'can_special'          => $hasSpecialInfo,
+            'time_text'            => !empty($row['createtime']) ? date('Y-m-d H:i', (int)$row['createtime']) : '',
+        ];
+    }
+
+    /**
+     * 格式化开票申请行输出（兼容旧版字段名与新版全量字段）
+     * @param array $row
+     * @return array
+     */
+    public static function formatInvoiceRow(array $row)
+    {
+        $statusLabels = self::statusMap();
+        $titleType = (!empty($row['title_type']) && $row['title_type'] === 'enterprise') || !empty($row['tax_no'])
+            ? 'enterprise'
+            : 'personal';
+
+        $fileUrl = '';
+        $fileType = '';
+        if (!empty($row['invoice_file'])) {
+            $rawFile = trim((string)$row['invoice_file']);
+            $fileUrl = (strpos($rawFile, 'http') === 0) ? $rawFile : cdnurl($rawFile, true);
+            $ext = strtolower((string)pathinfo(parse_url($fileUrl, PHP_URL_PATH) ?: $rawFile, PATHINFO_EXTENSION));
+            if (in_array($ext, ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp'], true)) {
+                $fileType = 'image';
+            } elseif ($ext === 'ofd') {
+                $fileType = 'ofd';
+            } else {
+                $fileType = 'pdf';
+            }
+        }
+
+        $sn = !empty($row['invoice_sn'])
+            ? (string)$row['invoice_sn']
+            : ('INV' . date('Ymd', (int)($row['createtime'] ?: time())) . str_pad((string)$row['id'], 6, '0', STR_PAD_LEFT));
+
+        $orderIds = self::parseIds($row['order_ids'] ?? '');
+        $orderCount = isset($row['order_count']) && (int)$row['order_count'] > 0 ? (int)$row['order_count'] : count($orderIds);
+
+        return [
+            'id'                => (int)$row['id'],
+            'invoice_sn'        => $sn,
+            'merchant_id'       => (int)$row['merchant_id'],
+            'user_id'           => (int)$row['user_id'],
+            'title_id'          => isset($row['title_id']) ? (int)$row['title_id'] : 0,
+            'amount'            => round((float)$row['amount'], 2),
+            'type'              => (string)$row['type'],
+            'type_text'         => $row['type'] === 'special' ? '专用发票' : '普通发票',
+            'type_full_text'    => $row['type'] === 'special' ? '增值税专用发票' : '增值税普通发票',
+            'title_type'        => $titleType,
+            'title_type_text'   => $titleType === 'enterprise' ? '企业单位' : '个人/非企业',
+            'title'             => (string)$row['title'],
+            'tax_no'            => (string)$row['tax_no'],
+            'bank_name'         => isset($row['bank_name']) ? (string)$row['bank_name'] : '',
+            'bank_account'      => isset($row['bank_account']) ? (string)$row['bank_account'] : '',
+            'reg_address'       => isset($row['reg_address']) ? (string)$row['reg_address'] : '',
+            'reg_mobile'        => isset($row['reg_mobile']) ? (string)$row['reg_mobile'] : '',
+            'email'             => (string)$row['email'],
+            'receive_mobile'    => isset($row['receive_mobile']) ? (string)$row['receive_mobile'] : '',
+            'remark'            => (string)$row['remark'],
+            'order_ids'         => $orderIds,
+            'order_count'       => $orderCount,
+            'status'            => (string)$row['status'],
+            'status_text'       => isset($statusLabels[$row['status']]) ? $statusLabels[$row['status']] : (string)$row['status'],
+            'invoice_code'      => isset($row['invoice_code']) ? (string)$row['invoice_code'] : '',
+            'invoice_no'        => (string)$row['invoice_no'],
+            'invoice_file'      => $fileUrl,
+            'invoice_file_type' => $fileType,
+            'audit_msg'         => (string)$row['audit_msg'],
+            'can_cancel'        => $row['status'] === 'wait',
+            'time_text'         => !empty($row['createtime']) ? date('Y-m-d H:i', (int)$row['createtime']) : '',
+            'issue_time_text'   => !empty($row['issue_time']) ? date('Y-m-d H:i', (int)$row['issue_time']) : '',
+        ];
+    }
+
+    /**
+     * 解析逗号分隔或数组形式的整数 ID 列表
+     * @param mixed $raw
+     * @return int[]
+     */
+    public static function parseIds($raw)
+    {
+        if (empty($raw)) {
+            return [];
+        }
+        if (is_string($raw)) {
+            $decodedStr = trim(htmlspecialchars_decode($raw));
+            if ($decodedStr !== '' && $decodedStr[0] === '[') {
+                $jsonArr = json_decode($decodedStr, true);
+                if (is_array($jsonArr)) {
+                    $raw = $jsonArr;
+                }
+            }
+        }
+        $list = is_array($raw) ? $raw : explode(',', (string)$raw);
+        $ids = [];
+        foreach ($list as $item) {
+            if (is_array($item)) {
+                continue;
+            }
+            foreach (explode(',', (string)$item) as $part) {
+                $id = (int)trim($part, " \t\n\r\0\x0B\"'[]");
+                if ($id > 0 && !in_array($id, $ids, true)) {
+                    $ids[] = $id;
+                }
+            }
+        }
+        return $ids;
+    }
+}
diff --git a/server/application/common/library/OrderStatus.php b/server/application/common/library/OrderStatus.php
index d367639..b96d213 100644
--- a/server/application/common/library/OrderStatus.php
+++ b/server/application/common/library/OrderStatus.php
@@ -13,6 +13,7 @@ class OrderStatus
     const QUOTING        = 2;   // 报价中（竞价单）
     const ACCEPTED       = 3;   // 已接单
     const SCHEDULED      = 4;   // 待上门（已约时间）
+    const APPOINTED      = 4;   // 待上门（兼容别名）
     const ARRIVED        = 5;   // 已到达（师傅定位打卡）
     const WORKING        = 6;   // 服务中（已开工）
     const PENDING_VERIFY = 7;   // 待验收（师傅完工）
diff --git a/server/application/extra/site.php b/server/application/extra/site.php
index 10f41b8..9386fef 100755
--- a/server/application/extra/site.php
+++ b/server/application/extra/site.php
@@ -4,7 +4,7 @@ return array (
   'name' => '优匠优服',
   'beian' => '',
   'cdnurl' => '',
-  'version' => '1.0.44',
+  'version' => '1.0.51',
   'timezone' => 'Asia/Shanghai',
   'forbiddenip' => '',
   'languages' => 
@@ -26,7 +26,6 @@ return array (
     'email' => '邮箱配置',
     'dictionary' => '字典配置',
     'user' => '会员配置',
-    'example' => '示例',
   ),
   'mail_type' => '1',
   'mail_smtp_host' => 'smtp.qq.com',
diff --git a/server/application/extra/upload.php b/server/application/extra/upload.php
index 2745791..859cb4c 100755
--- a/server/application/extra/upload.php
+++ b/server/application/extra/upload.php
@@ -22,7 +22,7 @@ return [
      * 可上传的文件类型
      * 如配置允许 pdf,ppt,docx,svg 等可能含有脚本的文件时，请先从服务器配置此类文件直接下载而不是预览
      */
-    'mimetype'  => 'jpg,png,bmp,jpeg,gif,webp,zip,rar,wav,mp4,mp3,webm',
+    'mimetype'  => 'jpg,png,bmp,jpeg,gif,webp,pdf,ofd,zip,rar,wav,mp4,mp3,webm',
     /**
      * 是否支持批量上传
      */
@@ -61,6 +61,7 @@ return [
         'banner'  => 'common',   // 轮播图（后台）
         'service' => 'common',   // 服务/商品图（后台）
         'goods'   => 'common',   // 商品/服务配图（历史业务前缀，收编管理）
+        'invoice' => 'common',   // 电子发票原件（后台财务）
         'other'   => 'common',   // 兜底分类
     ],
 ];
diff --git a/server/public/assets/js/backend/appeal.js b/server/public/assets/js/backend/appeal.js
index 7bd91f2..1240832 100644
--- a/server/public/assets/js/backend/appeal.js
+++ b/server/public/assets/js/backend/appeal.js
@@ -2,48 +2,65 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'appeal/index' + location.search,
-                    add_url: 'appeal/add',
+                    detail_url: 'appeal/detail',
                     edit_url: 'appeal/edit',
-                    del_url: 'appeal/del',
                     multi_url: 'appeal/multi',
-                    import_url: 'appeal/import',
                     table: 'appeal',
                 }
             });
 
             var table = $("#table");
 
-            // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                sortOrder: 'desc',
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
-                        {field: 'order.order_no', title: __('关联订单号'), operate: 'LIKE'},
-                        {field: 'master.realname', title: __('申诉师傅'), operate: 'LIKE'},
-                        {field: 'type', title: __('Type'), searchList: {"misjudge":__('Misjudge'),"review":__('Review'),"deduct":__('Deduct'),"other":__('Other')}, formatter: Table.api.formatter.normal},
+                        {field: 'order.order_no', title: '关联订单号', operate: 'LIKE', formatter: function (v) {
+                            return v ? '<code>' + Fast.api.escape(v) + '</code>' : '<span class="text-muted">未关联工单</span>';
+                        }},
+                        {field: 'master.realname', title: '申诉师傅', operate: 'LIKE'},
+                        {field: 'master.mobile', title: '师傅电话', operate: 'LIKE'},
+                        {field: 'type', title: __('Type'), searchList: {"misjudge":__('Misjudge'),"review":__('Review'),"deduct":__('Deduct'),"other":__('Other')}, formatter: Table.api.formatter.label, custom: {misjudge: 'warning', review: 'info', deduct: 'danger', other: 'default'}},
                         {field: 'content', title: __('Content'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'status', title: __('Status'), searchList: {"wait":__('Wait'),"handling":__('Handling'),"done":__('Done'),"reject":__('Reject')}, formatter: Table.api.formatter.status},
+                        {field: 'images', title: '举证图', operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
+                        {field: 'status', title: __('Status'), searchList: {"wait":__('Wait'),"handling":__('Handling'),"done":__('Done'),"reject":__('Reject')}, formatter: Table.api.formatter.status, custom: {wait: 'warning', handling: 'info', done: 'success', reject: 'danger'}},
                         {field: 'reply', title: __('Reply'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'createtime', title: '提交时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
+                            buttons: [
+                                {
+                                    name: 'detail',
+                                    text: '详情',
+                                    title: '申诉仲裁详情',
+                                    classname: 'btn btn-xs btn-info btn-detailone',
+                                    extend: 'data-area=\'["900px","86%"]\''
+                                },
+                                {
+                                    name: 'edit',
+                                    text: '仲裁处理',
+                                    title: '申诉核查与答复',
+                                    classname: 'btn btn-xs btn-success btn-editone',
+                                    extend: 'data-area=\'["880px","85%"]\''
+                                }
+                            ],
+                            formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
-        add: function () {
+        detail: function () {
             Controller.api.bindevent();
         },
         edit: function () {
diff --git a/server/public/assets/js/backend/banner.js b/server/public/assets/js/backend/banner.js
index 5e8da2f..e248eb0 100644
--- a/server/public/assets/js/backend/banner.js
+++ b/server/public/assets/js/backend/banner.js
@@ -2,7 +2,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'banner/index' + location.search,
@@ -10,37 +9,54 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     edit_url: 'banner/edit',
                     del_url: 'banner/del',
                     multi_url: 'banner/multi',
-                    import_url: 'banner/import',
                     table: 'banner',
                 }
             });
 
             var table = $("#table");
 
-            // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'weigh',
-                fixedColumns: true,
-                fixedRightNumber: 1,
+                sortOrder: 'desc',
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
-                        {field: 'title', title: __('Title'), operate: 'LIKE'},
+                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '50px'},
+                        {field: 'theme', title: '卡片主题', searchList: {"promo":"活动促销","brand":"平台实力","service":"服务主题"}, formatter: Table.api.formatter.label, custom: {promo: 'warning', brand: 'danger', service: 'primary'}},
                         {field: 'badge', title: __('Badge'), operate: 'LIKE'},
-                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'link', title: __('Link'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'weigh', title: __('Weigh'), operate: false},
+                        {
+                            field: 'title',
+                            title: '主标题 / 副标题',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (v, row) {
+                                var html = '<div><strong>' + Fast.api.escape(v || '-') + '</strong></div>';
+                                if (row.subtitle) {
+                                    html += '<div class="text-muted" style="font-size:11.5px;">' + Fast.api.escape(row.subtitle) + '</div>';
+                                }
+                                return html;
+                            }
+                        },
+                        {field: 'subtitle', title: __('Subtitle'), operate: 'LIKE', visible: false},
+                        {field: 'action_text', title: '按钮文案', operate: 'LIKE', formatter: function (v) { return v ? Fast.api.escape(v) : '<span class="text-muted">-</span>'; }},
+                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: function (v, row, index) {
+                            return v ? Table.api.formatter.image.call(this, v, row, index) : '<span class="text-muted">-</span>';
+                        }},
+                        {field: 'link', title: __('Link'), operate: 'LIKE', formatter: function (v) {
+                            if (!v) return '<span class="text-muted">-</span>';
+                            var safe = Fast.api.escape(v);
+                            return '<span title="' + safe + '" style="display:inline-block;max-width:190px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;vertical-align:middle;"><code>' + safe + '</code></span>';
+                        }},
+                        {field: 'weigh', title: __('Weigh'), sortable: true, operate: false},
                         {field: 'status', title: __('Status'), searchList: {"normal":__('Normal'),"hidden":__('Hidden')}, formatter: Table.api.formatter.status},
-                        {field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
+                        {field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, datetimeFormat: 'YYYY-MM-DD HH:mm'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
         add: function () {
diff --git a/server/public/assets/js/backend/category.js b/server/public/assets/js/backend/category.js
index 0977d1f..ee75bd9 100644
--- a/server/public/assets/js/backend/category.js
+++ b/server/public/assets/js/backend/category.js
@@ -34,7 +34,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         },
                         {field: 'nickname', title: __('Nickname')},
                         {field: 'flag', title: __('Flag'), formatter: Table.api.formatter.flag},
-                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: function (value, row, index) {
+                            if (!value) {
+                                return '';
+                            }
+                            var imgUrl = /^\/assets\//i.test(value) ? value : Fast.api.cdnurl(value, true);
+                            return '<a href="' + imgUrl + '" target="_blank"><img class="img-sm img-center" src="' + imgUrl + '" onerror="this.src=\'/assets/img/blank.gif\'" /></a>';
+                        }},
                         {field: 'weigh', title: __('Weigh')},
                         {field: 'status', title: __('Status'), operate: false, formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
diff --git a/server/public/assets/js/backend/coupon.js b/server/public/assets/js/backend/coupon.js
index 18be08a..2fb6a94 100644
--- a/server/public/assets/js/backend/coupon.js
+++ b/server/public/assets/js/backend/coupon.js
@@ -1,27 +1,43 @@
 define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
 
+    function syncCouponTypeInputs() {
+        var $type = $('#c-type');
+        if (!$type.length) return;
+        var apply = function () {
+            var val = $type.val();
+            if (val === 'discount') {
+                $('#box-coupon-amount').hide();
+                $('#box-coupon-discount').show();
+            } else {
+                $('#box-coupon-amount').show();
+                $('#box-coupon-discount').hide();
+            }
+        };
+        $type.on('change changed.bs.select', apply);
+        apply();
+    }
+
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'coupon/index' + location.search,
+                    detail_url: 'coupon/detail',
                     add_url: 'coupon/add',
                     edit_url: 'coupon/edit',
                     del_url: 'coupon/del',
                     multi_url: 'coupon/multi',
-                    import_url: 'coupon/import',
                     table: 'coupon',
                 }
             });
 
             var table = $("#table");
 
-            // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                sortOrder: 'desc',
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 columns: [
@@ -29,25 +45,58 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
-                        {field: 'type', title: __('Type'), searchList: {"cash":__('Cash'),"discount":__('Discount')}, formatter: Table.api.formatter.normal},
-                        {field: 'amount', title: __('Amount'), operate: 'BETWEEN'},
-                        {field: 'min_amount', title: __('Min_amount'), operate: 'BETWEEN'},
-                        {field: 'total', title: __('Total')},
-                        {field: 'received', title: __('Received')},
+                        {field: 'type', title: __('Type'), searchList: {"cash":__('Cash'),"discount":__('Discount')}, formatter: Table.api.formatter.label, custom: {cash: 'danger', discount: 'warning'}},
+                        {field: 'amount', title: '优惠力度', operate: false, formatter: function (v, row) {
+                            if (row.type === 'discount') {
+                                var d = (Number(row.discount || 1) * 10).toFixed(1).replace(/\.0$/, '');
+                                return '<strong class="text-warning">' + d + ' 折</strong>';
+                            }
+                            return '<strong class="text-danger">¥' + Number(v || 0).toFixed(2) + '</strong>';
+                        }},
+                        {field: 'min_amount', title: '使用门槛', operate: 'BETWEEN', formatter: function (v) {
+                            return Number(v) > 0 ? ('满 ¥' + Number(v).toFixed(2)) : '<span class="text-success">无门槛</span>';
+                        }},
+                        {field: 'total', title: '领取 / 总量', operate: false, formatter: function (v, row) {
+                            var claimed = row.real_claimed !== undefined ? row.real_claimed : (row.received || 0);
+                            return '<strong>' + claimed + '</strong> / ' + (v || 0);
+                        }},
+                        {field: 'used_count', title: '已核销', operate: false, formatter: function (v) {
+                            return Number(v) > 0 ? '<span class="label label-success">' + v + ' 张</span>' : '<span class="text-muted">0 张</span>';
+                        }},
+                        {field: 'end_time', title: '有效期限', operate: false, formatter: function (v, row) {
+                            var now = Math.floor(Date.now() / 1000);
+                            var s = row.start_time ? Table.api.formatter.datetime.call({datetimeFormat: 'YYYY-MM-DD'}, row.start_time) : '-';
+                            var e = v ? Table.api.formatter.datetime.call({datetimeFormat: 'YYYY-MM-DD'}, v) : '-';
+                            var expired = v && Number(v) < now ? ' <span class="label label-default">已到期</span>' : '';
+                            return '<small>' + s + ' ~ ' + e + '</small>' + expired;
+                        }},
                         {field: 'status', title: __('Status'), searchList: {"normal":__('Normal'),"hidden":__('Hidden')}, formatter: Table.api.formatter.status},
-                        {field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
+                            buttons: [
+                                {
+                                    name: 'detail',
+                                    text: '领用数据',
+                                    title: '卡券领取与核销详情',
+                                    classname: 'btn btn-xs btn-info btn-detailone',
+                                    extend: 'data-area=\'["880px","84%"]\''
+                                }
+                            ],
+                            formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
+        detail: function () {
+            Controller.api.bindevent();
+        },
         add: function () {
+            syncCouponTypeInputs();
             Controller.api.bindevent();
         },
         edit: function () {
+            syncCouponTypeInputs();
             Controller.api.bindevent();
         },
         api: {
diff --git a/server/public/assets/js/backend/home.js b/server/public/assets/js/backend/home.js
index 681f2f3..ead5260 100644
--- a/server/public/assets/js/backend/home.js
+++ b/server/public/assets/js/backend/home.js
@@ -27,7 +27,8 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
                     legend: {
                         data: ['服务订单量 (单)', 'GMV 资金流水 (元)'],
                         top: 0,
-                        right: 15,
+                        left: 'center',
+                        itemGap: 24,
                         textStyle: {
                             color: '#475569',
                             fontWeight: 500
@@ -37,7 +38,7 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
                         left: '2%',
                         right: '3%',
                         bottom: '3%',
-                        top: '14%',
+                        top: '18%',
                         containLabel: true
                     },
                     xAxis: [{
@@ -135,9 +136,12 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
                 
                 var colorPalette = {
                     '已完成': '#10b981',
-                    '待接单': '#ff6a00', // 核心主橙
+                    '待接单': '#ff6a00',
                     '已接单': '#0284c7',
+                    '待上门': '#3b82f6',
+                    '已到达': '#6366f1',
                     '服务中': '#0ea5e9',
+                    '待验收': '#f59e0b',
                     '待支付': '#94a3b8',
                     '报价中': '#d97706',
                     '已取消': '#cbd5e1',
diff --git a/server/public/assets/js/backend/invoice.js b/server/public/assets/js/backend/invoice.js
index 577895a..26accd1 100644
--- a/server/public/assets/js/backend/invoice.js
+++ b/server/public/assets/js/backend/invoice.js
@@ -2,10 +2,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
     var Controller = {
         index: function () {
-            // 初始化表格参数配置（开票申请仅用户/商户端发起，后台只提供开票处理）
             Table.api.init({
                 extend: {
                     index_url: 'invoice/index' + location.search,
+                    detail_url: 'invoice/detail',
                     edit_url: 'invoice/edit',
                     table: 'invoice',
                 }
@@ -13,7 +13,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             var table = $("#table");
 
-            // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
@@ -23,31 +22,91 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedRightNumber: 1,
                 columns: [
                     [
-                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
-                        {field: 'title', title: '开票抬头', operate: 'LIKE'},
-                        {field: 'type', title: '发票类型', searchList: {"normal":__('Ordinary'),"special":__('Special')}, formatter: Table.api.formatter.normal},
-                        {field: 'amount', title: '开票金额', operate: 'BETWEEN'},
-                        {field: 'merchant.name', title: '开票主体', operate: 'LIKE', formatter: function (value) { return value ? value : '<span class="text-muted">个人用户</span>'; }},
-                        {field: 'user.username', title: '申请用户', operate: 'LIKE'},
-                        {field: 'tax_no', title: '税号', operate: 'LIKE'},
-                        {field: 'email', title: '接收邮箱', operate: 'LIKE'},
-                        {field: 'status', title: '处理状态', searchList: {"wait":__('Wait'),"issued":__('Issued'),"reject":__('Reject')}, formatter: Table.api.formatter.status},
-                        {field: 'invoice_no', title: '发票号码', operate: 'LIKE'},
-                        {field: 'audit_msg', title: '处理说明', operate: 'LIKE', class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'createtime', title: '申请时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
-                        {field: 'operate', title: '开票处理', table: table, events: Table.api.events.operate,
+                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '55px'},
+                        {field: 'invoice_sn', title: '申请单号', operate: 'LIKE'},
+                        {
+                            field: 'title',
+                            title: '发票抬头 / 税号',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (v, row) {
+                                var html = '<div><strong>' + Fast.api.escape(v || '-') + '</strong></div>';
+                                if (row.tax_no) {
+                                    html += '<div class="text-muted" style="font-size:11.5px;font-family:monospace;">' + Fast.api.escape(row.tax_no) + '</div>';
+                                }
+                                return html;
+                            }
+                        },
+                        {field: 'tax_no', title: '税号', operate: 'LIKE', visible: false},
+                        {field: 'title_type', title: '抬头类型', searchList: {"personal":__('Personal'),"enterprise":__('Enterprise')}, visible: false},
+                        {field: 'type', title: '发票类型', searchList: {"normal":__('Ordinary'),"special":__('Special')}, formatter: Table.api.formatter.label, custom: {normal: 'info', special: 'warning'}},
+                        {field: 'amount', title: '开票金额', operate: 'BETWEEN', formatter: function (v, row) {
+                            var ordTxt = Number(row.order_count) > 0 ? (row.order_count + ' 笔工单') : '按额度';
+                            return '<strong class="text-danger">¥' + Number(v || 0).toFixed(2) + '</strong><div class="text-muted" style="font-size:11px;">' + ordTxt + '</div>';
+                        }},
+                        {
+                            field: 'merchant.name',
+                            title: '申请主体 / 邮箱',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (value, row) {
+                                var nick = (row.user && row.user.nickname) ? Fast.api.escape(row.user.nickname) : '';
+                                var main = value ? ('<strong>' + Fast.api.escape(value) + '</strong>') : (nick || '<span class="text-muted">个人用户</span>');
+                                var sub = row.email ? Fast.api.escape(row.email) : (nick && value ? nick : '-');
+                                return '<div>' + main + '</div><div class="text-muted" style="font-size:11.5px;">' + sub + '</div>';
+                            }
+                        },
+                        {field: 'user.nickname', title: '申请用户', operate: 'LIKE', visible: false},
+                        {field: 'email', title: '接收邮箱', operate: 'LIKE', visible: false},
+                        {field: 'status', title: '处理状态', searchList: {"wait":__('Wait'),"issued":__('Issued'),"reject":__('Reject'),"cancel":__('Cancel')}, formatter: Table.api.formatter.status, custom: {wait: 'warning', issued: 'success', reject: 'danger', cancel: 'gray'}},
+                        {field: 'invoice_no', title: '发票号码 / 附件', operate: 'LIKE', formatter: function (v, row) {
+                            var html = v ? ('<code>' + Fast.api.escape(v) + '</code>') : '<span class="text-muted">-</span>';
+                            if (row.invoice_file) {
+                                html += ' <a href="' + Fast.api.cdnurl(row.invoice_file) + '" target="_blank" class="btn btn-xs btn-info"><i class="fa fa-file-pdf-o"></i> 电子票</a>';
+                            }
+                            return html;
+                        }},
+                        {field: 'audit_msg', title: '处理说明', operate: 'LIKE', visible: false},
+                        {field: 'createtime', title: '申请时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '145px'},
+                        {field: 'operate', title: '操作', table: table, events: Table.api.events.operate,
                             buttons: [
-                                {name: 'edit', text: '处理', title: '财务开票处理', icon: '', classname: 'btn btn-xs btn-success btn-editone'}
+                                {
+                                    name: 'detail',
+                                    text: '详情',
+                                    title: '开票申请详情',
+                                    classname: 'btn btn-xs btn-info btn-detailone',
+                                    extend: 'data-area=\'["920px","86%"]\''
+                                },
+                                {
+                                    name: 'edit',
+                                    text: '开票处理',
+                                    title: '财务开票处理',
+                                    classname: 'btn btn-xs btn-success btn-editone',
+                                    extend: 'data-area=\'["920px","86%"]\'',
+                                    visible: function (row) {
+                                        return row.status === 'wait';
+                                    }
+                                }
                             ],
                             formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
         edit: function () {
+            $(document).on('change', 'input[name="row[status]"]', function () {
+                var val = $(this).val();
+                if (val === 'reject') {
+                    $('#box-issued-fields').slideUp(150);
+                } else {
+                    $('#box-issued-fields').slideDown(150);
+                }
+            });
+            Controller.api.bindevent();
+        },
+        detail: function () {
             Controller.api.bindevent();
         },
         api: {
diff --git a/server/public/assets/js/backend/invoice_title.js b/server/public/assets/js/backend/invoice_title.js
new file mode 100644
index 0000000..bb358d3
--- /dev/null
+++ b/server/public/assets/js/backend/invoice_title.js
@@ -0,0 +1,84 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            Table.api.init({
+                extend: {
+                    index_url: 'invoice_title/index' + location.search,
+                    detail_url: 'invoice_title/detail',
+                    edit_url: 'invoice_title/edit',
+                    del_url: 'invoice_title/del',
+                    table: 'invoice_title',
+                }
+            });
+
+            var table = $("#table");
+
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                sortOrder: 'desc',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
+                        {field: 'title', title: '发票抬头', operate: 'LIKE', formatter: function (v, row) {
+                            var def = Number(row.is_default) === 1 ? ' <span class="label label-success">默认</span>' : '';
+                            return '<strong>' + Fast.api.escape(v || '-') + '</strong>' + def;
+                        }},
+                        {field: 'title_type', title: '抬头类型', searchList: {"enterprise":"企业单位","personal":"个人/非企业"}, formatter: Table.api.formatter.label, custom: {enterprise: 'primary', personal: 'default'}},
+                        {field: 'default_invoice_type', title: '默认票种', searchList: {"normal":"普通发票","special":"专用发票"}, formatter: Table.api.formatter.label, custom: {normal: 'info', special: 'warning'}},
+                        {field: 'tax_no', title: '纳税人识别号', operate: 'LIKE', formatter: function (v) {
+                            return v ? '<code>' + Fast.api.escape(v) + '</code>' : '<span class="text-muted">-</span>';
+                        }},
+                        {field: 'merchant.name', title: '归属企业', operate: 'LIKE', formatter: function (v) {
+                            return v ? Fast.api.escape(v) : '<span class="text-muted">个人业主</span>';
+                        }},
+                        {field: 'user.nickname', title: '维护用户', operate: 'LIKE'},
+                        {field: 'email', title: '接收邮箱', operate: 'LIKE', formatter: function (v) { return v ? Fast.api.escape(v) : '-'; }},
+                        {field: 'issued_count', title: '累计已开票', operate: false, formatter: function (v, row) {
+                            var n = Number(v || 0);
+                            if (!n) return '<span class="text-muted">0 笔</span>';
+                            return '<span class="label label-success">' + n + ' 笔</span> <small class="text-danger">¥' + Number(row.issued_amount || 0).toFixed(2) + '</small>';
+                        }},
+                        {field: 'updatetime', title: '更新时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
+                            buttons: [
+                                {
+                                    name: 'detail',
+                                    text: '详情',
+                                    title: '发票抬头详情',
+                                    classname: 'btn btn-xs btn-info btn-detailone',
+                                    extend: 'data-area=\'["880px","82%"]\''
+                                },
+                                {
+                                    name: 'edit',
+                                    text: '订正',
+                                    title: '订正抬头档案',
+                                    classname: 'btn btn-xs btn-success btn-editone',
+                                    extend: 'data-area=\'["860px","80%"]\''
+                                }
+                            ],
+                            formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            Table.api.bindevent(table);
+        },
+        detail: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});
diff --git a/server/public/assets/js/backend/master.js b/server/public/assets/js/backend/master.js
index 08b196a..3424c24 100644
--- a/server/public/assets/js/backend/master.js
+++ b/server/public/assets/js/backend/master.js
@@ -2,7 +2,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'master/index' + location.search,
@@ -12,47 +11,80 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     detail_url: 'master/detail',
                     skills_url: 'master/skills',
                     multi_url: 'master/multi',
-                    import_url: 'master/import',
                     table: 'master',
                 }
             });
 
             var table = $("#table");
 
-            // 初始化表格
+            table.on('post-body.bs.table', function () {
+                $(".btn-detail-mst", this).data("area", ["1040px", "88%"]);
+                $(".btn-skills-mst", this).data("area", ["860px", "82%"]);
+                $(".btn-editone", this).data("area", ["900px", "85%"]);
+            });
+            $(".btn-add, .btn-edit").data("area", ["900px", "85%"]);
+
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                sortOrder: 'desc',
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
-                        {field: 'realname', title: __('Realname'), operate: 'LIKE'},
+                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '55px'},
+                        {
+                            field: 'realname',
+                            title: '师傅姓名 / 等级',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (val, row) {
+                                return '<strong>' + (val || '-') + '</strong> <span class="label label-default">LV.' + (row.level || 1) + '</span>';
+                            }
+                        },
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
-                        {field: 'user.username', title: __('关联用户'), operate: 'LIKE'},
-                        {field: 'city', title: __('City'), operate: 'LIKE'},
+                        {field: 'city', title: '驻地城市', operate: 'LIKE'},
                         {
                             field: 'skills_list',
-                            title: '服务技能',
+                            title: '认证技能',
                             operate: false,
-                            formatter: function (value, row, index) {
+                            align: 'left',
+                            formatter: function (value) {
                                 if (!value || value.length === 0) {
                                     return '<span class="text-muted" style="font-size:11px;">未配置</span>';
                                 }
-                                var tags = value.map(function (s) {
-                                    return '<span class="label label-primary" style="margin-right: 4px; display: inline-block; margin-bottom: 2px;">' + s + '</span>';
-                                });
-                                return tags.join('');
+                                var shown = value.slice(0, 3).map(function (s) {
+                                    return '<span class="label label-primary" style="margin-right:4px;">' + s + '</span>';
+                                }).join('');
+                                if (value.length > 3) {
+                                    shown += '<span class="label label-default" title="' + value.join(' / ') + '">+' + (value.length - 3) + '</span>';
+                                }
+                                return shown;
                             }
                         },
-                        {field: 'level', title: __('Level')},
-                        {field: 'score', title: __('Score'), operate: 'BETWEEN'},
-                        {field: 'order_count', title: __('Order_count')},
-                        {field: 'work_status', title: __('Work_status'), searchList: {"off":__('Off'),"on":__('On')}, formatter: Table.api.formatter.status},
-                        {field: 'verify_status', title: __('Verify_status'), searchList: {"pending":__('Pending'),"pass":__('Pass'),"reject":__('Reject')}, formatter: Table.api.formatter.status},
+                        {
+                            field: 'score',
+                            title: '评分',
+                            operate: 'BETWEEN',
+                            sortable: true,
+                            formatter: function (val) {
+                                return '<span style="color:#d97706;font-weight:700;"><i class="fa fa-star"></i> ' + (val || '5.0') + '</span>';
+                            }
+                        },
+                        {field: 'order_count', title: '完工单数', sortable: true},
+                        {
+                            field: 'money',
+                            title: '可提现余额',
+                            operate: 'BETWEEN',
+                            sortable: true,
+                            formatter: function (val) {
+                                return '<strong style="color:#10b981;">¥' + Number(val || 0).toFixed(2) + '</strong>';
+                            }
+                        },
+                        {field: 'work_status', title: __('Work_status'), searchList: {"off": __('Off'), "on": __('On')}, formatter: Table.api.formatter.status},
+                        {field: 'verify_status', title: __('Verify_status'), searchList: {"pending": __('Pending'), "pass": __('Pass'), "reject": __('Reject')}, formatter: Table.api.formatter.status},
                         {field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
                         {
                             field: 'operate',
@@ -61,6 +93,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             events: Table.api.events.operate,
                             formatter: Table.api.formatter.operate,
                             buttons: [
+                                {
+                                    name: 'detail',
+                                    text: '详情',
+                                    title: function (row) {
+                                        return '师傅档案画像 - ' + row.realname;
+                                    },
+                                    icon: 'fa fa-eye',
+                                    classname: 'btn btn-xs btn-info btn-dialog btn-detail-mst',
+                                    url: 'master/detail'
+                                },
                                 {
                                     name: 'skills',
                                     text: '技能',
@@ -68,16 +110,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return row.realname + ' - 服务技能配置';
                                     },
                                     icon: 'fa fa-certificate',
-                                    classname: 'btn btn-xs btn-success btn-dialog',
+                                    classname: 'btn btn-xs btn-success btn-dialog btn-skills-mst',
                                     url: 'master/skills'
-                                },
-                                {
-                                    name: 'detail',
-                                    text: '详情',
-                                    title: '师傅全景档案画像',
-                                    icon: 'fa fa-user',
-                                    classname: 'btn btn-xs btn-warning btn-dialog',
-                                    url: 'master/detail'
                                 }
                             ]
                         }
@@ -85,7 +119,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
         add: function () {
@@ -97,6 +130,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         skills: function () {
             Controller.api.bindevent();
         },
+        detail: function () {
+        },
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));
diff --git a/server/public/assets/js/backend/merchant.js b/server/public/assets/js/backend/merchant.js
index 3285c7b..ba21b75 100644
--- a/server/public/assets/js/backend/merchant.js
+++ b/server/public/assets/js/backend/merchant.js
@@ -2,7 +2,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'merchant/index' + location.search,
@@ -11,33 +10,78 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     del_url: 'merchant/del',
                     detail_url: 'merchant/detail',
                     multi_url: 'merchant/multi',
-                    import_url: 'merchant/import',
                     table: 'merchant',
                 }
             });
 
             var table = $("#table");
 
-            // 初始化表格
+            table.on('post-body.bs.table', function () {
+                $(".btn-detail-mer", this).data("area", ["1040px", "88%"]);
+                $(".btn-editone", this).data("area", ["920px", "85%"]);
+            });
+            $(".btn-add, .btn-edit").data("area", ["920px", "85%"]);
+
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                sortOrder: 'desc',
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
-                        {field: 'name', title: __('Name'), operate: 'LIKE'},
-                        {field: 'license_no', title: __('License_no'), operate: 'LIKE'},
-                        {field: 'legal_person', title: __('Legal_person'), operate: 'LIKE'},
-                        {field: 'contact', title: __('Contact'), operate: 'LIKE'},
-                        {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
-                        {field: 'user.username', title: __('关联用户'), operate: 'LIKE'},
-                        {field: 'settle_type', title: __('Settle_type'), searchList: {"prepay":__('Prepay'),"monthly":__('Monthly')}, formatter: Table.api.formatter.normal},
-                        {field: 'verify_status', title: __('Verify_status'), searchList: {"pending":__('Pending'),"pass":__('Pass'),"reject":__('Reject')}, formatter: Table.api.formatter.status},
-                        {field: 'order_count', title: __('Order_count')},
+                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '55px'},
+                        {
+                            field: 'name',
+                            title: '企业名称 / 信用代码',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (val, row) {
+                                return '<div><strong>' + (val || '-') + '</strong></div><div class="text-muted" style="font-size:11.5px;font-family:monospace;">' + (row.license_no || '-') + '</div>';
+                            }
+                        },
+                        {field: 'license_no', title: __('License_no'), operate: 'LIKE', visible: false},
+                        {field: 'legal_person', title: '法人代表', operate: 'LIKE'},
+                        {
+                            field: 'contact',
+                            title: '业务对接人',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (val, row) {
+                                return '<div>' + (val || '-') + '</div><div class="text-muted" style="font-size:11.5px;">' + (row.mobile || '') + '</div>';
+                            }
+                        },
+                        {field: 'mobile', title: __('Mobile'), operate: 'LIKE', visible: false},
+                        {field: 'city', title: '所在城市', operate: 'LIKE'},
+                        {
+                            field: 'settle_type',
+                            title: '结算模式',
+                            searchList: {"prepay": __('Prepay'), "monthly": __('Monthly')},
+                            formatter: function (val) {
+                                return val === 'monthly'
+                                    ? '<span class="label label-primary">月结账期</span>'
+                                    : '<span class="label label-info">预付现结</span>';
+                            }
+                        },
+                        {
+                            field: 'order_count',
+                            title: '发包单数 / 成交额',
+                            operate: false,
+                            formatter: function (val, row) {
+                                return '<strong>' + (val || 0) + ' 单</strong> · <span style="color:#ea580c;font-weight:600;">¥' + (row.total_amount || '0.00') + '</span>';
+                            }
+                        },
+                        {
+                            field: 'member_count',
+                            title: '协同员工',
+                            operate: false,
+                            formatter: function (val) {
+                                return '<span class="badge" style="background:#64748b;">' + (val || 0) + ' 人</span>';
+                            }
+                        },
+                        {field: 'verify_status', title: __('Verify_status'), searchList: {"pending": __('Pending'), "pass": __('Pass'), "reject": __('Reject')}, formatter: Table.api.formatter.status},
                         {field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
                         {
                             field: 'operate',
@@ -49,9 +93,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 {
                                     name: 'detail',
                                     text: '详情',
-                                    title: '商户企业资质看板',
-                                    icon: 'fa fa-building',
-                                    classname: 'btn btn-xs btn-primary btn-dialog',
+                                    title: function (row) {
+                                        return '企业全景资质看板 - ' + row.name;
+                                    },
+                                    icon: 'fa fa-eye',
+                                    classname: 'btn btn-xs btn-info btn-dialog btn-detail-mer',
                                     url: 'merchant/detail'
                                 }
                             ]
@@ -60,7 +106,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
         add: function () {
@@ -69,6 +114,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         edit: function () {
             Controller.api.bindevent();
         },
+        detail: function () {
+        },
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));
diff --git a/server/public/assets/js/backend/message.js b/server/public/assets/js/backend/message.js
index e524243..1a9ea61 100644
--- a/server/public/assets/js/backend/message.js
+++ b/server/public/assets/js/backend/message.js
@@ -1,49 +1,84 @@
 define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
 
+    function bindReceiveTypeToggle() {
+        $(document).off('change.msg changed.bs.select.msg', '#c-receive_type').on('change.msg changed.bs.select.msg', '#c-receive_type', function () {
+            var val = $(this).val();
+            if (val === 'master') {
+                $('#box-receive-user').hide();
+                $('#box-receive-master').show();
+            } else {
+                $('#box-receive-master').hide();
+                $('#box-receive-user').show();
+            }
+        });
+    }
+
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'message/index' + location.search,
+                    detail_url: 'message/detail',
                     add_url: 'message/add',
                     edit_url: 'message/edit',
                     del_url: 'message/del',
                     multi_url: 'message/multi',
-                    import_url: 'message/import',
                     table: 'message',
                 }
             });
 
             var table = $("#table");
 
-            // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                sortOrder: 'desc',
+                fixedColumns: true,
+                fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
-                        {field: 'receive_type', title: __('Receive_type'), searchList: {"user":__('User'),"master":__('Master')}, formatter: Table.api.formatter.normal},
-                        {field: 'type', title: __('Type'), searchList: {"order":__('Order'),"system":__('System'),"audit":__('Audit'),"remind":__('Remind')}, formatter: Table.api.formatter.normal},
+                        {field: 'receive_type', title: '接收端', searchList: {"user":__('User'),"master":__('Master')}, formatter: Table.api.formatter.label, custom: {user: 'info', master: 'warning'}},
+                        {field: 'receiver_name', title: '接收人', operate: false, formatter: function (v, row) {
+                            var mob = row.receiver_mobile ? ' <small class="text-muted">(' + Fast.api.escape(row.receiver_mobile) + ')</small>' : '';
+                            return '<strong>' + Fast.api.escape(v || '-') + '</strong>' + mob;
+                        }},
+                        {field: 'type', title: __('Type'), searchList: {"order":__('Order'),"system":__('System'),"audit":__('Audit'),"remind":__('Remind')}, formatter: Table.api.formatter.label, custom: {order: 'primary', system: 'info', audit: 'warning', remind: 'success'}},
+                        {field: 'order_no', title: '关联工单', operate: false, formatter: function (v) {
+                            return v ? '<code>' + Fast.api.escape(v) + '</code>' : '<span class="text-muted">-</span>';
+                        }},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
                         {field: 'content', title: __('Content'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'is_read', title: __('Is_read'), searchList: {"0":__('未读'),"1":__('已读')}, formatter: Table.api.formatter.normal},
-                        {field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'is_read', title: __('Is_read'), searchList: {"0":"未读","1":"已读"}, formatter: Table.api.formatter.label, custom: {"0": 'warning', "1": 'success'}},
+                        {field: 'createtime', title: '发送时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
+                            buttons: [
+                                {
+                                    name: 'detail',
+                                    text: '详情',
+                                    title: '消息通知详情',
+                                    classname: 'btn btn-xs btn-info btn-detailone',
+                                    extend: 'data-area=\'["720px","62%"]\''
+                                }
+                            ],
+                            formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
+        detail: function () {
+            Controller.api.bindevent();
+        },
         add: function () {
+            bindReceiveTypeToggle();
             Controller.api.bindevent();
         },
         edit: function () {
+            bindReceiveTypeToggle();
             Controller.api.bindevent();
         },
         api: {
diff --git a/server/public/assets/js/backend/order.js b/server/public/assets/js/backend/order.js
index 96639bb..62fcbb0 100644
--- a/server/public/assets/js/backend/order.js
+++ b/server/public/assets/js/backend/order.js
@@ -1,45 +1,149 @@
 define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
 
+    var statusBadgeMap = {
+        0: {text: '待支付', cls: 'default'},
+        1: {text: '待接单', cls: 'warning'},
+        2: {text: '报价中', cls: 'info'},
+        3: {text: '已接单', cls: 'primary'},
+        4: {text: '待上门', cls: 'primary'},
+        5: {text: '已到达', cls: 'info'},
+        6: {text: '服务中', cls: 'primary'},
+        7: {text: '待验收', cls: 'warning'},
+        8: {text: '已完成', cls: 'success'},
+        9: {text: '已取消', cls: 'default'},
+        10: {text: '售后中', cls: 'danger'}
+    };
+
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'order/index' + location.search,
-                    add_url: 'order/add',
+                    add_url: '',
                     edit_url: 'order/edit',
-                    del_url: 'order/del',
+                    del_url: '',
                     detail_url: 'order/detail',
                     multi_url: 'order/multi',
-                    import_url: 'order/import',
                     table: 'order',
                 }
             });
 
             var table = $("#table");
 
-            // 初始化表格
+            table.on('post-body.bs.table', function () {
+                $(".btn-detail-ord, .btn-editone", this).data("area", ["1040px", "88%"]);
+                $(".btn-dispatch-ord", this).data("area", ["780px", "78%"]);
+            });
+            $(".btn-edit").data("area", ["1040px", "88%"]);
+
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
-                fixedColumns: true,
-                fixedRightNumber: 1,
+                sortOrder: 'desc',
+                fixedColumns: false,
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
-                        {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
-                        {field: 'service_name', title: __('Service_name'), operate: 'LIKE'},
-                        {field: 'user.username', title: __('下单用户'), operate: 'LIKE'},
-                        {field: 'master.realname', title: __('接单师傅'), operate: 'LIKE'},
-                        {field: 'contact', title: __('Contact'), operate: 'LIKE'},
-                        {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
-                        {field: 'pay_amount', title: __('Pay_amount'), operate: 'BETWEEN'},
-                        {field: 'status', title: __('Status'), searchList: {"0":__('待支付'),"1":__('待接单'),"2":__('报价中'),"3":__('已接单'),"4":__('待上门'),"5":__('已到达'),"6":__('服务中'),"7":__('待验收'),"8":__('已完成'),"9":__('已取消'),"10":__('售后中')}, formatter: Table.api.formatter.normal},
-                        {field: 'pay_status', title: __('Pay_status'), searchList: {"0":__('未支付'),"1":__('已支付'),"2":__('已退款')}, formatter: Table.api.formatter.normal},
-                        {field: 'appoint_time', title: __('Appoint_time'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
-                        {field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
+                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '55px'},
+                        {
+                            field: 'order_no',
+                            title: '工单编号',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (val, row) {
+                                var html = '<span style="font-family:monospace;font-weight:700;color:#0f172a;">' + (val || '-') + '</span>';
+                                if (Number(row.urgent) === 1) {
+                                    html += ' <span class="label label-danger">急</span>';
+                                }
+                                if (row.merchant_name) {
+                                    html += '<div style="margin-top:2px;"><span class="label label-info" style="font-size:10px;"><i class="fa fa-building-o"></i> ' + Table.api.formatter.normal.call(this, row.merchant_name, row) + '</span></div>';
+                                }
+                                return html;
+                            }
+                        },
+                        {
+                            field: 'service_name',
+                            title: '服务项目 / 规格',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (val, row) {
+                                var spec = row.goods_model ? (row.goods_model + ' ×' + (row.goods_num || 1)) : ('数量 ×' + (row.goods_num || 1));
+                                return '<div><strong>' + (val || '-') + '</strong></div><div class="text-muted" style="font-size:11.5px;">' + spec + '</div>';
+                            }
+                        },
+                        {
+                            field: 'contact',
+                            title: '现场客户 / 区域',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (val, row) {
+                                var region = [row.city || '', row.district || ''].join('');
+                                return '<div><strong>' + (val || '-') + '</strong> <span class="text-muted">' + (row.mobile || '') + '</span></div>' +
+                                    '<div class="text-muted" style="font-size:11.5px;"><i class="fa fa-map-marker"></i> ' + (region || row.address || '-') + '</div>';
+                            }
+                        },
+                        {field: 'mobile', title: '联系电话', operate: 'LIKE', visible: false},
+                        {field: 'user.nickname', title: '下单账号', operate: 'LIKE', visible: false},
+                        {
+                            field: 'master.realname',
+                            title: '承接师傅',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (val, row) {
+                                if (!row.master_id || !val) {
+                                    return '<span class="text-muted">待指派</span>';
+                                }
+                                var mMobile = (row.master && row.master.mobile) ? row.master.mobile : '';
+                                return '<div><strong>' + val + '</strong></div><div class="text-muted" style="font-size:11.5px;">' + mMobile + '</div>';
+                            }
+                        },
+                        {
+                            field: 'pay_amount',
+                            title: '实付金额',
+                            operate: 'BETWEEN',
+                            sortable: true,
+                            formatter: function (val, row) {
+                                var pType = row.price_type === 'quote' ? '报价' : (row.price_type === 'custom' ? '自定' : '一口价');
+                                return '<strong style="color:#ea580c;">¥' + Number(val || 0).toFixed(2) + '</strong><div class="text-muted" style="font-size:11px;">' + pType + '</div>';
+                            }
+                        },
+                        {
+                            field: 'status',
+                            title: '工单状态',
+                            searchList: {"0": "待支付", "1": "待接单", "2": "报价中", "3": "已接单", "4": "待上门", "5": "已到达", "6": "服务中", "7": "待验收", "8": "已完成", "9": "已取消", "10": "售后中"},
+                            formatter: function (val) {
+                                var item = statusBadgeMap[Number(val)] || {text: val, cls: 'default'};
+                                return '<span class="label label-' + item.cls + '">' + item.text + '</span>';
+                            }
+                        },
+                        {
+                            field: 'pay_status',
+                            title: '支付状态',
+                            searchList: {"0": "未支付", "1": "已支付", "2": "已退款"},
+                            formatter: function (val) {
+                                var v = Number(val);
+                                if (v === 1) return '<span class="label label-success">已支付</span>';
+                                if (v === 2) return '<span class="label label-danger">已退款</span>';
+                                return '<span class="label label-default">未支付</span>';
+                            }
+                        },
+                        {
+                            field: 'appoint_time',
+                            title: '预约上门',
+                            operate: 'RANGE',
+                            addclass: 'datetimerange',
+                            autocomplete: false,
+                            formatter: function (val, row, index) {
+                                if (!val || Number(val) <= 0) {
+                                    return '<span class="text-muted">尽快上门</span>';
+                                }
+                                return Table.api.formatter.datetime.call({datetimeFormat: 'MM-DD HH:mm'}, val, row, index);
+                            }
+                        },
+                        {field: 'createtime', title: '下单时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: function (val, row, index) {
+                            return Table.api.formatter.datetime.call({datetimeFormat: 'MM-DD HH:mm'}, val, row, index);
+                        }},
                         {
                             field: 'operate',
                             title: __('Operate'),
@@ -50,10 +154,28 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 {
                                     name: 'detail',
                                     text: '详情',
-                                    title: '工单全景详情看板',
-                                    icon: 'fa fa-list-alt',
-                                    classname: 'btn btn-xs btn-warning btn-dialog',
+                                    title: function (row) {
+                                        return '工单详情 - ' + row.order_no;
+                                    },
+                                    icon: 'fa fa-eye',
+                                    classname: 'btn btn-xs btn-info btn-dialog btn-detail-ord',
                                     url: 'order/detail'
+                                },
+                                {
+                                    name: 'dispatch',
+                                    text: function (row) {
+                                        return Number(row.master_id) > 0 ? '改派' : '派单';
+                                    },
+                                    title: function (row) {
+                                        return (Number(row.master_id) > 0 ? '改派承接师傅 - ' : '人工调度派单 - ') + row.order_no;
+                                    },
+                                    icon: 'fa fa-paper-plane',
+                                    classname: 'btn btn-xs btn-warning btn-dialog btn-dispatch-ord',
+                                    url: 'order/dispatch',
+                                    visible: function (row) {
+                                        var st = Number(row.status);
+                                        return Number(row.pay_status) === 1 && st >= 1 && st <= 6;
+                                    }
                                 }
                             ]
                         }
@@ -61,15 +183,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
-        add: function () {
+        dispatch: function () {
+            $(document).off('click.dp', '.dp-cand-card').on('click.dp', '.dp-cand-card', function () {
+                var id = $(this).data('id');
+                $('.dp-cand-card').removeClass('is-picked');
+                $(this).addClass('is-picked');
+                var $input = $('#c-dispatch-master');
+                $input.val(id);
+                if ($input.data('selectPageObject')) {
+                    $input.selectPageRefresh();
+                }
+            });
             Controller.api.bindevent();
         },
         edit: function () {
             Controller.api.bindevent();
         },
+        detail: function () {
+        },
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));
diff --git a/server/public/assets/js/backend/review.js b/server/public/assets/js/backend/review.js
index 2a67c11..eb838ee 100644
--- a/server/public/assets/js/backend/review.js
+++ b/server/public/assets/js/backend/review.js
@@ -1,49 +1,103 @@
 define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
 
+    function parseTagArr(val) {
+        if (!val) return [];
+        var str = String(val).trim();
+        if (!str) return [];
+        if (str.charAt(0) === '[') {
+            try {
+                var parsed = JSON.parse(str);
+                if ($.isArray(parsed)) return parsed;
+            } catch (e) {}
+        }
+        return str.split(',');
+    }
+
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'review/index' + location.search,
-                    add_url: 'review/add',
+                    detail_url: 'review/detail',
                     edit_url: 'review/edit',
-                    del_url: 'review/del',
                     multi_url: 'review/multi',
-                    import_url: 'review/import',
                     table: 'review',
                 }
             });
 
             var table = $("#table");
 
-            // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                sortOrder: 'desc',
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
-                        {field: 'order.order_no', title: __('关联订单号'), operate: 'LIKE'},
-                        {field: 'user.username', title: __('评价用户'), operate: 'LIKE'},
-                        {field: 'master.realname', title: __('服务师傅'), operate: 'LIKE'},
-                        {field: 'score', title: __('Score')},
+                        {field: 'order.order_no', title: '关联订单号', operate: 'LIKE', formatter: function (v) {
+                            return v ? '<code>' + Fast.api.escape(v) + '</code>' : '-';
+                        }},
+                        {field: 'user.nickname', title: '评价雇主', operate: 'LIKE', formatter: function (v, row) {
+                            var name = v || (row.user && row.user.username) || ('UID:' + row.user_id);
+                            var anon = Number(row.is_anonymous) === 1 ? ' <span class="label label-default">匿名</span>' : '';
+                            return Fast.api.escape(name) + anon;
+                        }},
+                        {field: 'master.realname', title: '服务师傅', operate: 'LIKE'},
+                        {field: 'score', title: '服务评分', operate: 'BETWEEN', formatter: function (v) {
+                            var s = Math.max(0, Math.min(5, parseInt(v, 10) || 0));
+                            var html = '';
+                            for (var i = 1; i <= 5; i++) {
+                                html += '<i class="fa ' + (i <= s ? 'fa-star text-warning' : 'fa-star-o text-muted') + '"></i>';
+                            }
+                            return html + ' <span class="text-muted">' + s + '分</span>';
+                        }},
+                        {field: 'tags', title: '印象标签', operate: 'LIKE', formatter: function (v) {
+                            var arr = parseTagArr(v);
+                            if (!arr.length) return '<span class="text-muted">-</span>';
+                            var out = [];
+                            $.each(arr.slice(0, 3), function (_, t) {
+                                if (t) out.push('<span class="label label-info">' + Fast.api.escape(t) + '</span>');
+                            });
+                            return out.join(' ');
+                        }},
                         {field: 'content', title: __('Content'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'images', title: '晒图', operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
+                        {field: 'is_showcase', title: '晒单', searchList: {"1":"已晒单","0":"普通评价"}, formatter: function (v) {
+                            return Number(v) === 1
+                                ? '<span class="label label-primary">晒单</span>'
+                                : '<span class="text-muted">普通</span>';
+                        }},
                         {field: 'status', title: __('Status'), searchList: {"normal":__('Normal'),"hidden":__('Hidden')}, formatter: Table.api.formatter.status},
-                        {field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'createtime', title: '评价时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
+                            buttons: [
+                                {
+                                    name: 'detail',
+                                    text: '详情',
+                                    title: '服务评价详情',
+                                    classname: 'btn btn-xs btn-info btn-detailone',
+                                    extend: 'data-area=\'["860px","84%"]\''
+                                },
+                                {
+                                    name: 'edit',
+                                    text: '内容审核',
+                                    title: '评价合规治理',
+                                    classname: 'btn btn-xs btn-success btn-editone',
+                                    extend: 'data-area=\'["840px","82%"]\''
+                                }
+                            ],
+                            formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
-        add: function () {
+        detail: function () {
             Controller.api.bindevent();
         },
         edit: function () {
diff --git a/server/public/assets/js/backend/service.js b/server/public/assets/js/backend/service.js
index 2f832a4..7b41f4d 100644
--- a/server/public/assets/js/backend/service.js
+++ b/server/public/assets/js/backend/service.js
@@ -15,17 +15,35 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
 
             var table = $("#table");
+            var initCatMatch = location.search.match(/[?&]cat_id=(\d+)/);
+            var activeCatId = initCatMatch ? initCatMatch[1] : '';
+
+            $('.panel-heading ul[data-field="cat_id"] a[data-toggle="tab"]').on('shown.bs.tab', function () {
+                activeCatId = String($(this).data('value') || '');
+            });
 
             table.on('post-body.bs.table', function () {
-                $(".btn-editone, .btn-dialog", this).data("area", ["980px", "86%"]);
+                $(".btn-editone, .btn-pricing", this).data("area", ["1040px", "88%"]);
+                $(".btn-detail-srv", this).data("area", ["880px", "82%"]);
             });
-            $(".btn-add, .btn-edit").data("area", ["980px", "86%"]);
+            $(".btn-add, .btn-edit").data("area", ["1040px", "88%"]);
 
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'weigh',
                 sortOrder: 'desc',
+                queryParams: function (params) {
+                    var filter = params.filter ? JSON.parse(params.filter) : {};
+                    var op = params.op ? JSON.parse(params.op) : {};
+                    if (activeCatId !== '' && typeof filter.cat_id === 'undefined') {
+                        filter.cat_id = activeCatId;
+                        op.cat_id = '=';
+                    }
+                    params.filter = JSON.stringify(filter);
+                    params.op = JSON.stringify(op);
+                    return params;
+                },
                 columns: [
                     [
                         {checkbox: true},
@@ -103,13 +121,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             table: table,
                             events: Table.api.events.operate,
                             buttons: [
+                                {
+                                    name: 'detail',
+                                    text: '详情',
+                                    title: function (row) {
+                                        return '【' + row.name + '】商品与定价详情';
+                                    },
+                                    icon: 'fa fa-eye',
+                                    classname: 'btn btn-xs btn-info btn-dialog btn-detail-srv',
+                                    url: 'service/detail'
+                                },
                                 {
                                     name: 'pricing',
                                     text: '服务定价',
                                     title: function (row) {
                                         return '配置【' + row.name + '】服务与价格';
                                     },
-                                    classname: 'btn btn-xs btn-warning btn-dialog',
+                                    icon: 'fa fa-sliders',
+                                    classname: 'btn btn-xs btn-warning btn-dialog btn-pricing',
                                     url: 'service/edit?tab=services'
                                 }
                             ],
@@ -127,9 +156,145 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         edit: function () {
             Controller.api.bindevent();
         },
+        detail: function () {
+        },
         api: {
+            collectServiceConfig: function () {
+                var serviceTypes = [];
+                var addons = [];
+                var addonIdx = 0;
+
+                $('#service-matrix-table tbody tr.srv-matrix-row').each(function () {
+                    var $row = $(this);
+                    var code = $row.data('code');
+                    var name = $row.data('name');
+                    var unit = $row.data('unit') || '份';
+                    var supportFixed = parseInt($row.data('support-fixed'), 10) === 1 ? 1 : 0;
+
+                    if ($row.find('.st-enable').is(':checked')) {
+                        var mainPrice = supportFixed === 1 ? (parseFloat($row.find('.st-price').val()) || 0) : 0;
+                        var isDef = (supportFixed === 1 && $row.find('.st-default').is(':checked')) ? 1 : 0;
+                        serviceTypes.push({
+                            code: code,
+                            name: name,
+                            price: mainPrice,
+                            support_fixed: supportFixed,
+                            is_default: isDef
+                        });
+                    }
+
+                    if ($row.find('.ad-bind').is(':checked')) {
+                        addonIdx++;
+                        var adPrice = parseFloat($row.find('.ad-price').val()) || 0;
+                        addons.push({
+                            id: addonIdx,
+                            code: code,
+                            name: name,
+                            unit: unit,
+                            price: adPrice
+                        });
+                    }
+                });
+
+                $('#service_types_raw').val(JSON.stringify(serviceTypes));
+                $('#addons_raw').val(JSON.stringify(addons));
+            },
+            refreshRowAndCounters: function ($row) {
+                if ($row && $row.length) {
+                    var mainOn = $row.find('.st-enable').is(':checked');
+                    var addonOn = $row.find('.ad-bind').is(':checked');
+                    $row.toggleClass('is-row-enabled', mainOn || addonOn).toggleClass('is-row-disabled', !(mainOn || addonOn));
+                }
+                $('#stat-main-cnt').text($('.st-enable:checked').length);
+                $('#stat-addon-cnt').text($('.ad-bind:checked').length);
+                $('#stat-spec-cnt').text($('#specs-tbody tr').length);
+                $('#specs-tbody tr').each(function (i) {
+                    $(this).find('td:first').text(i + 1);
+                });
+            },
             bindevent: function () {
-                Form.api.bindevent($("form[role=form]"));
+                var specIndex = 1000;
+
+                $(document).off('change.srv', '.st-enable').on('change.srv', '.st-enable', function () {
+                    var $row = $(this).closest('tr');
+                    var checked = $(this).is(':checked');
+                    if (checked) {
+                        $row.find('.st-active-panel').css('display', 'inline-flex');
+                        $row.find('.st-off-hint').hide();
+                    } else {
+                        $row.find('.st-active-panel').hide();
+                        $row.find('.st-off-hint').show();
+                    }
+                    Controller.api.refreshRowAndCounters($row);
+                });
+
+                $(document).off('change.srv', '.ad-bind').on('change.srv', '.ad-bind', function () {
+                    var $row = $(this).closest('tr');
+                    var checked = $(this).is(':checked');
+                    if (checked) {
+                        $row.find('.ad-active-panel').css('display', 'inline-flex');
+                        $row.find('.ad-off-hint').hide();
+                    } else {
+                        $row.find('.ad-active-panel').hide();
+                        $row.find('.ad-off-hint').show();
+                    }
+                    Controller.api.refreshRowAndCounters($row);
+                });
+
+                $(document).off('change.srv', '.st-default').on('change.srv', '.st-default', function () {
+                    $('.srv-default-label').removeClass('is-def-active');
+                    $(this).closest('.srv-default-label').addClass('is-def-active');
+                });
+
+                $(document).off('click.srv', '.srv-filter-btn').on('click.srv', '.srv-filter-btn', function () {
+                    $('.srv-filter-btn').removeClass('active');
+                    $(this).addClass('active');
+                    var mode = $(this).data('filter');
+                    $('#service-matrix-table tbody tr.srv-matrix-row').each(function () {
+                        var $r = $(this);
+                        if (mode === 'enabled') {
+                            var on = $r.find('.st-enable').is(':checked') || $r.find('.ad-bind').is(':checked');
+                            $r.toggle(on);
+                        } else {
+                            $r.show();
+                        }
+                    });
+                });
+
+                $(document).off('input.srv', '#srv-matrix-search').on('input.srv', '#srv-matrix-search', function () {
+                    var kw = $.trim($(this).val()).toLowerCase();
+                    $('#service-matrix-table tbody tr.srv-matrix-row').each(function () {
+                        var $r = $(this);
+                        var text = ($r.data('name') + ' ' + $r.data('code')).toLowerCase();
+                        $r.toggle(kw === '' || text.indexOf(kw) !== -1);
+                    });
+                });
+
+                $(document).off('click.srv', '#btn-add-spec').on('click.srv', '#btn-add-spec', function () {
+                    specIndex++;
+                    var seq = $('#specs-tbody tr').length + 1;
+                    var html = '<tr>' +
+                        '<td style="text-align: center; vertical-align: middle; color: #64748b; font-weight: 600;">' + seq + '</td>' +
+                        '<td><input type="text" name="specs[' + specIndex + '][name]" class="form-control input-sm" placeholder="如：普通坐便器 / 智能马桶"></td>' +
+                        '<td><div class="input-group input-group-sm"><span class="input-group-addon">¥</span><input type="number" step="0.01" name="specs[' + specIndex + '][base_price]" class="form-control input-sm" placeholder="留空则沿用商品默认价"></div></td>' +
+                        '<td><input type="text" name="specs[' + specIndex + '][description]" class="form-control input-sm" placeholder="选填说明"></td>' +
+                        '<td style="text-align:center; vertical-align: middle;"><button type="button" class="btn btn-xs btn-danger btn-del-spec"><i class="fa fa-trash-o"></i></button></td>' +
+                        '</tr>';
+                    $('#specs-tbody').append(html);
+                    Controller.api.refreshRowAndCounters(null);
+                });
+
+                $(document).off('click.srv', '.btn-del-spec').on('click.srv', '.btn-del-spec', function () {
+                    $(this).closest('tr').remove();
+                    Controller.api.refreshRowAndCounters(null);
+                });
+
+                Controller.api.collectServiceConfig();
+
+                Form.api.bindevent($("form[role=form]"), null, null, function () {
+                    Controller.api.collectServiceConfig();
+                    return true;
+                });
             }
         }
     };
diff --git a/server/public/assets/js/backend/settle.js b/server/public/assets/js/backend/settle.js
index 96a572e..6a41d43 100644
--- a/server/public/assets/js/backend/settle.js
+++ b/server/public/assets/js/backend/settle.js
@@ -2,49 +2,75 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'settle/index' + location.search,
-                    add_url: 'settle/add',
+                    detail_url: 'settle/detail',
                     edit_url: 'settle/edit',
-                    del_url: 'settle/del',
-                    multi_url: 'settle/multi',
-                    import_url: 'settle/import',
                     table: 'settle',
                 }
             });
 
             var table = $("#table");
 
-            // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                sortOrder: 'desc',
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 columns: [
                     [
-                        {checkbox: true},
                         {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
-                        {field: 'order.order_no', title: __('关联订单号'), operate: 'LIKE'},
-                        {field: 'master.realname', title: __('结算师傅'), operate: 'LIKE'},
-                        {field: 'order_amount', title: __('Order_amount'), operate: 'BETWEEN'},
-                        {field: 'commission', title: __('Commission'), operate: 'BETWEEN'},
-                        {field: 'settle_amount', title: __('Settle_amount'), operate: 'BETWEEN'},
-                        {field: 'status', title: __('Status'), searchList: {"wait":__('Wait'),"settled":__('Settled'),"offline":__('Offline')}, formatter: Table.api.formatter.status},
-                        {field: 'settle_time', title: __('Settle_time'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
-                        {field: 'createtime', title: __('Createtime'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'order.order_no', title: '关联订单号', operate: 'LIKE', formatter: function (v) {
+                            return v ? '<code>' + Fast.api.escape(v) + '</code>' : '-';
+                        }},
+                        {field: 'master.realname', title: '结算师傅', operate: 'LIKE'},
+                        {field: 'master.mobile', title: '师傅电话', operate: 'LIKE'},
+                        {field: 'order_amount', title: '工单原额', operate: 'BETWEEN', formatter: function (v) {
+                            return '¥' + Number(v || 0).toFixed(2);
+                        }},
+                        {field: 'commission_rate', title: '抽佣率', operate: 'BETWEEN', formatter: function (v) {
+                            return Number(v || 0).toFixed(1) + '%';
+                        }},
+                        {field: 'commission', title: '平台抽佣', operate: 'BETWEEN', formatter: function (v) {
+                            return '<span class="text-warning">¥' + Number(v || 0).toFixed(2) + '</span>';
+                        }},
+                        {field: 'settle_amount', title: '师傅实结', operate: 'BETWEEN', formatter: function (v) {
+                            return '<strong class="text-success">¥' + Number(v || 0).toFixed(2) + '</strong>';
+                        }},
+                        {field: 'status', title: __('Status'), searchList: {"wait":__('Wait'),"settled":__('Settled'),"offline":__('Offline')}, formatter: Table.api.formatter.status, custom: {wait: 'warning', settled: 'success', offline: 'info'}},
+                        {field: 'settle_time', title: __('Settle_time'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
+                        {field: 'createtime', title: '生成时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
+                            buttons: [
+                                {
+                                    name: 'detail',
+                                    text: '对账详情',
+                                    title: '结算对账详情',
+                                    classname: 'btn btn-xs btn-info btn-detailone',
+                                    extend: 'data-area=\'["880px","84%"]\''
+                                },
+                                {
+                                    name: 'edit',
+                                    text: '结算处理',
+                                    title: '财务结算处理',
+                                    classname: 'btn btn-xs btn-success btn-editone',
+                                    extend: 'data-area=\'["820px","78%"]\'',
+                                    visible: function (row) {
+                                        return row.status === 'wait';
+                                    }
+                                }
+                            ],
+                            formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
-        add: function () {
+        detail: function () {
             Controller.api.bindevent();
         },
         edit: function () {
diff --git a/server/public/assets/js/backend/showcase.js b/server/public/assets/js/backend/showcase.js
new file mode 100644
index 0000000..e668671
--- /dev/null
+++ b/server/public/assets/js/backend/showcase.js
@@ -0,0 +1,118 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            Table.api.init({
+                extend: {
+                    index_url: 'showcase/index' + location.search,
+                    detail_url: 'showcase/detail',
+                    edit_url: 'showcase/edit',
+                    del_url: 'showcase/del',
+                    multi_url: 'showcase/multi',
+                    table: 'showcase',
+                }
+            });
+
+            var table = $("#table");
+
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                sortOrder: 'desc',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
+                        {field: 'cover_image', title: '封面图', operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'images', title: '实拍组图', operate: false, events: Table.api.events.image, formatter: function (v, row, index) {
+                            if (v && typeof v === 'string' && v.trim().charAt(0) === '[') {
+                                try {
+                                    var arr = JSON.parse(v);
+                                    if ($.isArray(arr)) v = arr.join(',');
+                                } catch (e) {}
+                            }
+                            return Table.api.formatter.images.call(this, v, row, index);
+                        }},
+                        {field: 'order.order_no', title: '关联订单号', operate: 'LIKE', formatter: function (v, row) {
+                            return v ? '<code>' + Fast.api.escape(v) + '</code>' : (row.order_id ? ('#' + row.order_id) : '-');
+                        }},
+                        {field: 'user_name', title: '展示业主', operate: 'LIKE'},
+                        {field: 'cat_name', title: '服务品类', operate: 'LIKE'},
+                        {field: 'service_name', title: '关联服务', operate: 'LIKE'},
+                        {field: 'region', title: '所在区域', operate: 'LIKE'},
+                        {field: 'score', title: '评分', operate: 'BETWEEN', formatter: function (v) {
+                            var s = Math.max(0, Math.min(5, parseInt(v, 10) || 0));
+                            var html = '';
+                            for (var i = 1; i <= 5; i++) {
+                                html += '<i class="fa ' + (i <= s ? 'fa-star text-warning' : 'fa-star-o text-muted') + '"></i>';
+                            }
+                            return html;
+                        }},
+                        {field: 'content', title: '晒单心得', operate: 'LIKE', class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'master_name', title: '履约师傅', operate: 'LIKE'},
+                        {field: 'status', title: '状态', searchList: {"normal":"公开展示","hidden":"已屏蔽下架"}, formatter: Table.api.formatter.status},
+                        {field: 'createtime', title: '发布时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
+                            buttons: [
+                                {
+                                    name: 'toggle_status',
+                                    text: function (row) {
+                                        return row.status === 'normal' ? '下架' : '上架';
+                                    },
+                                    title: function (row) {
+                                        return row.status === 'normal' ? '一键屏蔽下架该晒单' : '一键恢复公开展示';
+                                    },
+                                    classname: function (row) {
+                                        return 'btn btn-xs btn-ajax ' + (row.status === 'normal' ? 'btn-warning' : 'btn-primary');
+                                    },
+                                    url: 'showcase/multi',
+                                    params: function (row) {
+                                        return 'ids=' + row.id + '&params=' + encodeURIComponent('status=' + (row.status === 'normal' ? 'hidden' : 'normal'));
+                                    },
+                                    refresh: true
+                                },
+                                {
+                                    name: 'detail',
+                                    text: '详情',
+                                    title: '业主晒单详情',
+                                    classname: 'btn btn-xs btn-info btn-detailone',
+                                    extend: 'data-area=\'["880px","84%"]\''
+                                },
+                                {
+                                    name: 'edit',
+                                    text: '治理',
+                                    title: '晒单封面与状态治理',
+                                    classname: 'btn btn-xs btn-success btn-editone',
+                                    extend: 'data-area=\'["820px","78%"]\''
+                                }
+                            ],
+                            formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            Table.api.bindevent(table);
+        },
+        detail: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            $(document).on('click', '.js-pick-cover', function () {
+                var url = $(this).data('url');
+                $('#c-cover_image').val(url);
+                $('.js-pick-cover img').css('border-color', '#e5e5e5');
+                $(this).find('img').css('border-color', '#f0710d');
+            });
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});
diff --git a/server/public/assets/js/backend/skill_category.js b/server/public/assets/js/backend/skill_category.js
index efed7ca..357702e 100644
--- a/server/public/assets/js/backend/skill_category.js
+++ b/server/public/assets/js/backend/skill_category.js
@@ -45,10 +45,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             title: '下属技能数', 
                             operate: false,
                             formatter: function (val, row) {
-                                return '<a href="skill_dict/index?category_id=' + row.id + '" class="addtabsit label label-info">' + (val || 0) + ' 项技能</a>';
+                                var targetUrl = Fast.api.fixurl('skill_dict/index?category_id=' + row.id);
+                                return '<a href="' + targetUrl + '" data-area=\'["90%","85%"]\' title="【' + Fast.api.escape(row.name || '') + '】下属技能管理" class="btn-dialog label label-info">' + (val || 0) + ' 项技能</a>';
                             }
                         },
-                        {field: 'weigh', title: '排序权重', sortable: true},
+                        {field: 'weigh', title: '排序权重', sortable: true, operate: false},
                         {
                             field: 'status', 
                             title: '启用状态', 
@@ -61,6 +62,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             title: __('Operate'), 
                             table: table, 
                             events: Table.api.events.operate, 
+                            buttons: [
+                                {
+                                    name: 'view_skills',
+                                    text: '查看技能',
+                                    title: function (row) {
+                                        return '【' + row.name + '】下属技能管理';
+                                    },
+                                    classname: 'btn btn-xs btn-info btn-dialog',
+                                    extend: 'data-area=\'["90%","85%"]\'',
+                                    url: function (row) {
+                                        return 'skill_dict/index?category_id=' + row.id;
+                                    }
+                                }
+                            ],
                             formatter: Table.api.formatter.operate
                         }
                     ]
diff --git a/server/public/assets/js/backend/skill_dict.js b/server/public/assets/js/backend/skill_dict.js
index b8eb75c..9ce168d 100644
--- a/server/public/assets/js/backend/skill_dict.js
+++ b/server/public/assets/js/backend/skill_dict.js
@@ -2,11 +2,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'skill_dict/index' + location.search,
-                    add_url: 'skill_dict/add',
+                    add_url: 'skill_dict/add' + location.search,
                     edit_url: 'skill_dict/edit',
                     del_url: 'skill_dict/del',
                     multi_url: 'skill_dict/multi',
@@ -16,7 +15,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             var table = $("#table");
 
-            // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
@@ -28,17 +26,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: 'ID', sortable: true},
                         {field: 'category_id', title: '分类ID', visible: false, operate: '='},
                         {
-                            field: 'category', 
-                            title: '所属分类', 
-                            searchList: {
-                                "安装维修": '安装维修',
-                                "建筑装修": '建筑装修',
-                                "物流运输": '物流运输',
-                                "汽车服务": '汽车服务',
-                                "家政服务": '家政服务',
-                                "便民服务": '便民服务',
-                                "其他技能": '其他技能'
-                            },
+                            field: 'category',
+                            title: '所属分类',
+                            searchList: Config.categorySearchList || {},
                             formatter: function (val) {
                                 var colorMap = {
                                     "安装维修": 'primary',
@@ -49,14 +39,25 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     "便民服务": 'default',
                                     "其他技能": 'default'
                                 };
-                                return '<span class="label label-' + (colorMap[val] || 'default') + '">' + val + '</span>';
+                                return '<span class="label label-' + (colorMap[val] || 'default') + '">' + Fast.api.escape(val || '-') + '</span>';
                             }
                         },
                         {field: 'name', title: '技能名称', operate: 'LIKE'},
                         {
-                            field: 'source', 
-                            title: '字典来源', 
-                            searchList: {"system": '系统预置', "custom": '师傅自定义'}, 
+                            field: 'master_count',
+                            title: '持证师傅数',
+                            operate: false,
+                            formatter: function (val) {
+                                var n = Number(val || 0);
+                                return n > 0
+                                    ? '<span class="label label-info">' + n + ' 人</span>'
+                                    : '<span class="text-muted">0 人</span>';
+                            }
+                        },
+                        {
+                            field: 'source',
+                            title: '字典来源',
+                            searchList: {"system": '系统预置', "custom": '师傅自定义'},
                             formatter: function (val) {
                                 if (val === 'custom') {
                                     return '<span class="label label-warning"><i class="fa fa-user"></i> 师傅自定义</span>';
@@ -64,27 +65,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 return '<span class="label label-success"><i class="fa fa-cogs"></i> 系统预置</span>';
                             }
                         },
-                        {field: 'master.realname', title: '提交师傅', operate: 'LIKE', formatter: function (val) { return val || '-'; }},
+                        {field: 'master.realname', title: '提交师傅', operate: 'LIKE', formatter: function (val) { return val ? Fast.api.escape(val) : '-'; }},
                         {field: 'weigh', title: '排序权重', sortable: true},
                         {
-                            field: 'status', 
-                            title: '启用状态', 
-                            searchList: {"normal": '正常启用', "hidden": '隐藏停用'}, 
+                            field: 'status',
+                            title: '启用状态',
+                            searchList: {"normal": '正常启用', "hidden": '隐藏停用'},
                             formatter: Table.api.formatter.status
                         },
-                        {field: 'createtime', title: '添加时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime},
+                        {field: 'createtime', title: '添加时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
                         {
-                            field: 'operate', 
-                            title: __('Operate'), 
-                            table: table, 
-                            events: Table.api.events.operate, 
+                            field: 'operate',
+                            title: __('Operate'),
+                            table: table,
+                            events: Table.api.events.operate,
                             formatter: Table.api.formatter.operate
                         }
                     ]
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
         add: function () {
diff --git a/server/public/assets/js/backend/user/user.js b/server/public/assets/js/backend/user/user.js
index 861f2a5..313ad92 100644
--- a/server/public/assets/js/backend/user/user.js
+++ b/server/public/assets/js/backend/user/user.js
@@ -2,13 +2,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
     var Controller = {
         index: function () {
-            // 初始化表格参数配置
             Table.api.init({
                 extend: {
                     index_url: 'user/user/index',
-                    add_url: 'user/user/add',
+                    add_url: '',
                     edit_url: 'user/user/edit',
-                    del_url: 'user/user/del',
+                    del_url: '',
+                    detail_url: 'user/user/detail',
                     multi_url: 'user/user/multi',
                     table: 'user',
                 }
@@ -16,32 +16,101 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             var table = $("#table");
 
-            // 初始化表格
+            table.on('post-body.bs.table', function () {
+                $(".btn-detail-usr", this).data("area", ["1020px", "86%"]);
+                $(".btn-editone", this).data("area", ["820px", "78%"]);
+            });
+            $(".btn-edit").data("area", ["820px", "78%"]);
+
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'user.id',
+                sortOrder: 'desc',
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
-                        {field: 'group.name', title: __('Group')},
-                        {field: 'username', title: __('Username'), operate: 'LIKE'},
-                        {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
+                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '55px'},
+                        {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false, width: '65px'},
+                        {
+                            field: 'nickname',
+                            title: '会员昵称 / 账号',
+                            operate: 'LIKE',
+                            align: 'left',
+                            formatter: function (val, row) {
+                                return '<div><strong>' + (val || '-') + '</strong></div><div class="text-muted" style="font-size:11.5px;">' + (row.username || '') + ' (ID:' + row.id + ')</div>';
+                            }
+                        },
+                        {field: 'username', title: __('Username'), operate: 'LIKE', visible: false},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
-                        {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false},
-                        {field: 'score', title: __('Score'), operate: 'BETWEEN', sortable: true},
+                        {
+                            field: 'role_badges',
+                            title: '平台身份角色',
+                            operate: false,
+                            align: 'left',
+                            formatter: function (val) {
+                                if (!Array.isArray(val) || !val.length) {
+                                    return '<span class="label label-default">个人业主</span>';
+                                }
+                                return val.map(function (b) {
+                                    var cls = b.type === 'master' ? 'warning' : (b.type === 'merchant' ? 'primary' : (b.type === 'member' ? 'info' : 'default'));
+                                    return '<span class="label label-' + cls + '" style="margin-right:4px;">' + b.label + '</span>';
+                                }).join('');
+                            }
+                        },
+                        {
+                            field: 'order_count',
+                            title: '下单笔数',
+                            operate: false,
+                            formatter: function (val) {
+                                return '<strong>' + (val || 0) + ' 笔</strong>';
+                            }
+                        },
+                        {
+                            field: 'total_spent',
+                            title: '累计实付消费',
+                            operate: false,
+                            formatter: function (val) {
+                                return '<strong style="color:#ea580c;">¥' + (val || '0.00') + '</strong>';
+                            }
+                        },
+                        {
+                            field: 'money',
+                            title: '账户余额',
+                            operate: 'BETWEEN',
+                            sortable: true,
+                            formatter: function (val) {
+                                return '¥' + Number(val || 0).toFixed(2);
+                            }
+                        },
                         {field: 'jointime', title: __('Jointime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         {field: 'logintime', title: __('Logintime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         {field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {normal: __('Normal'), hidden: __('Hidden')}},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {
+                            field: 'operate',
+                            title: __('Operate'),
+                            table: table,
+                            events: Table.api.events.operate,
+                            formatter: Table.api.formatter.operate,
+                            buttons: [
+                                {
+                                    name: 'detail',
+                                    text: '详情',
+                                    title: function (row) {
+                                        return '会员业务档案 - ' + (row.nickname || row.username);
+                                    },
+                                    icon: 'fa fa-eye',
+                                    classname: 'btn btn-xs btn-info btn-dialog btn-detail-usr',
+                                    url: 'user/user/detail'
+                                }
+                            ]
+                        }
                     ]
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
         add: function () {
@@ -50,6 +119,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         edit: function () {
             Controller.api.bindevent();
         },
+        detail: function () {
+        },
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));
@@ -57,4 +128,4 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         }
     };
     return Controller;
-});
\ No newline at end of file
+});
diff --git a/server/public/assets/js/backend/user_coupon.js b/server/public/assets/js/backend/user_coupon.js
new file mode 100644
index 0000000..ee3207f
--- /dev/null
+++ b/server/public/assets/js/backend/user_coupon.js
@@ -0,0 +1,89 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            Table.api.init({
+                extend: {
+                    index_url: 'user_coupon/index' + location.search,
+                    del_url: 'user_coupon/del',
+                    multi_url: 'user_coupon/multi',
+                    table: 'user_coupon',
+                }
+            });
+
+            var table = $("#table");
+
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                sortOrder: 'desc',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
+                        {field: 'id', title: '记录ID', width: '75px'},
+                        {field: 'user.nickname', title: '领用会员', operate: 'LIKE', align: 'left', formatter: function (v, row) {
+                            var name = (row.user && (row.user.nickname || row.user.username)) ? (row.user.nickname || row.user.username) : ('用户#' + row.user_id);
+                            var mob = (row.user && row.user.mobile) ? ' <small class="text-muted">(' + Fast.api.escape(row.user.mobile) + ')</small>' : '';
+                            return '<strong>' + Fast.api.escape(name) + '</strong>' + mob;
+                        }},
+                        {field: 'user.mobile', title: '会员手机', visible: false, operate: 'LIKE'},
+                        {field: 'coupon.name', title: '优惠券名称', operate: 'LIKE', align: 'left', formatter: function (v, row) {
+                            var cname = (row.coupon && row.coupon.name) ? row.coupon.name : ('卡券#' + row.coupon_id);
+                            return '<span style="font-weight:600;color:#1e293b;">' + Fast.api.escape(cname) + '</span>';
+                        }},
+                        {field: 'coupon.type', title: '券类型', operate: false, formatter: function (v, row) {
+                            var tp = row.coupon ? row.coupon.type : '';
+                            if (tp === 'discount') {
+                                return '<span class="label label-info">折扣券</span>';
+                            }
+                            return '<span class="label label-warning">满减现金券</span>';
+                        }},
+                        {field: 'coupon_rule', title: '抵扣面额与门槛', operate: false, align: 'left', formatter: function (v, row) {
+                            if (!row.coupon || !row.coupon.id) {
+                                return '<span class="text-muted">-</span>';
+                            }
+                            var c = row.coupon;
+                            var minTxt = parseFloat(c.min_amount) > 0 ? ('满 ¥' + parseFloat(c.min_amount).toFixed(2) + ' 可用') : '无门槛';
+                            if (c.type === 'discount') {
+                                var disc = (parseFloat(c.discount || 1) * 10).toFixed(1).replace(/\.0$/, '');
+                                return '<strong style="color:#ea580c;">' + disc + ' 折</strong> <small class="text-muted">(' + minTxt + ')</small>';
+                            }
+                            return '<strong style="color:#ea580c;">减 ¥' + parseFloat(c.amount || 0).toFixed(2) + '</strong> <small class="text-muted">(' + minTxt + ')</small>';
+                        }},
+                        {field: 'status', title: '使用状态', searchList: {"unused":"未使用","used":"已核销","expired":"已过期"}, formatter: Table.api.formatter.label, custom: {unused: 'primary', used: 'success', expired: 'default'}},
+                        {field: 'order.order_no', title: '核销关联订单', operate: 'LIKE', formatter: function (v, row) {
+                            var no = (row.order && row.order.order_no) ? row.order.order_no : '';
+                            if (no) {
+                                return '<code>' + Fast.api.escape(no) + '</code>';
+                            }
+                            return row.order_id > 0 ? ('#' + row.order_id) : '<span class="text-muted">-</span>';
+                        }},
+                        {field: 'createtime', title: '领取时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '155px'},
+                        {field: 'use_time', title: '核销时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '155px'},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: function (value, row, index) {
+                            var that = $.extend({}, this);
+                            if (row.status === 'used') {
+                                var tbl = $(that.table).clone(true);
+                                $(tbl).data('operate-del', null);
+                                that.table = tbl;
+                            }
+                            return Table.api.formatter.operate.call(that, value, row, index);
+                        }}
+                    ]
+                ]
+            });
+
+            Table.api.bindevent(table);
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});
diff --git a/server/public/assets/js/backend/wallet_log.js b/server/public/assets/js/backend/wallet_log.js
new file mode 100644
index 0000000..dc8267d
--- /dev/null
+++ b/server/public/assets/js/backend/wallet_log.js
@@ -0,0 +1,72 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            Table.api.init({
+                extend: {
+                    index_url: 'wallet_log/index' + location.search,
+                    detail_url: 'wallet_log/detail',
+                    table: 'wallet_log',
+                }
+            });
+
+            var table = $("#table");
+
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                sortOrder: 'desc',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+                        {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
+                        {field: 'user_type', title: '账户角色', searchList: {"master":"认证师傅","user":"业主/企业用户"}, formatter: Table.api.formatter.label, custom: {master: 'warning', user: 'info'}},
+                        {field: 'account_name', title: '账户主体', operate: false, formatter: function (v, row) {
+                            var mob = row.account_mobile ? ' <small class="text-muted">(' + Fast.api.escape(row.account_mobile) + ')</small>' : '';
+                            return '<strong>' + Fast.api.escape(v || '-') + '</strong>' + mob;
+                        }},
+                        {field: 'type', title: '变动类型', searchList: {"settle":"佣金结算","withdraw":"余额提现","refund":"退回/退款","recharge":"账户充值","pay":"余额支付","deduct":"判责扣款"}, formatter: Table.api.formatter.label, custom: {settle: 'success', withdraw: 'primary', refund: 'info', recharge: 'success', pay: 'warning', deduct: 'danger'}},
+                        {field: 'amount', title: '变动金额', operate: 'BETWEEN', formatter: function (v) {
+                            var num = Number(v || 0);
+                            if (num > 0) return '<strong class="text-success">+¥' + num.toFixed(2) + '</strong>';
+                            if (num < 0) return '<strong class="text-danger">-¥' + Math.abs(num).toFixed(2) + '</strong>';
+                            return '<span class="text-muted">¥0.00</span>';
+                        }},
+                        {field: 'balance', title: '变动后余额', operate: 'BETWEEN', formatter: function (v) {
+                            return '¥' + Number(v || 0).toFixed(2);
+                        }},
+                        {field: 'order_no', title: '关联工单', operate: false, formatter: function (v) {
+                            return v ? '<code>' + Fast.api.escape(v) + '</code>' : '<span class="text-muted">-</span>';
+                        }},
+                        {field: 'remark', title: '流水摘要', operate: 'LIKE', class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'createtime', title: '记账时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
+                        {field: 'operate', title: '溯源', table: table, events: Table.api.events.operate,
+                            buttons: [
+                                {
+                                    name: 'detail',
+                                    text: '凭证详情',
+                                    title: '资金流水审计凭证',
+                                    classname: 'btn btn-xs btn-info btn-detailone',
+                                    extend: 'data-area=\'["820px","76%"]\''
+                                }
+                            ],
+                            formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            Table.api.bindevent(table);
+        },
+        detail: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});
diff --git a/server/public/assets/js/backend/withdraw.js b/server/public/assets/js/backend/withdraw.js
index d498393..e2d6d54 100644
--- a/server/public/assets/js/backend/withdraw.js
+++ b/server/public/assets/js/backend/withdraw.js
@@ -2,10 +2,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
     var Controller = {
         index: function () {
-            // 初始化表格参数配置（提现单仅师傅端发起，后台只提供审核）
             Table.api.init({
                 extend: {
                     index_url: 'withdraw/index' + location.search,
+                    detail_url: 'withdraw/detail',
                     edit_url: 'withdraw/edit',
                     table: 'withdraw',
                 }
@@ -13,7 +13,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             var table = $("#table");
 
-            // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
@@ -26,27 +25,45 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'index', title: '序号', operate: false, formatter: Table.api.formatter.index, width: '60px'},
                         {field: 'master.realname', title: '提现师傅', operate: 'LIKE'},
                         {field: 'master.mobile', title: '师傅手机号', operate: 'LIKE'},
-                        {field: 'amount', title: '申请金额', operate: 'BETWEEN'},
-                        {field: 'fee', title: '手续费', operate: 'BETWEEN'},
-                        {field: 'arrive_amount', title: '到账金额', operate: 'BETWEEN'},
-                        {field: 'channel', title: '结算渠道', searchList: {"wechat":__('Wechat'),"bank":__('Bank')}, formatter: Table.api.formatter.normal},
+                        {field: 'amount', title: '申请金额', operate: 'BETWEEN', formatter: function (v) { return '¥' + Number(v || 0).toFixed(2); }},
+                        {field: 'fee', title: '手续费', operate: 'BETWEEN', formatter: function (v) { return '¥' + Number(v || 0).toFixed(2); }},
+                        {field: 'arrive_amount', title: '应打款净额', operate: 'BETWEEN', formatter: function (v) { return '<strong class="text-danger">¥' + Number(v || 0).toFixed(2) + '</strong>'; }},
+                        {field: 'channel', title: '结算渠道', searchList: {"wechat":__('Wechat'),"bank":__('Bank')}, formatter: Table.api.formatter.label, custom: {wechat: 'success', bank: 'primary'}},
                         {field: 'account', title: '收款账号', operate: 'LIKE'},
-                        {field: 'status', title: '审核状态', searchList: {"wait":__('Wait'),"pass":__('Pass'),"reject":__('Reject'),"done":__('Done')}, formatter: Table.api.formatter.status},
+                        {field: 'status', title: '审核状态', searchList: {"wait":__('Wait'),"pass":__('Pass'),"reject":__('Reject'),"done":__('Done')}, formatter: Table.api.formatter.status, custom: {wait: 'warning', pass: 'info', reject: 'danger', done: 'success'}},
                         {field: 'audit_msg', title: '审核批注', operate: 'LIKE', class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'createtime', title: '申请时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
                         {field: 'updatetime', title: '处理时间', operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime, width: '150px'},
-                        {field: 'operate', title: '审核操作', table: table, events: Table.api.events.operate,
+                        {field: 'operate', title: '操作', table: table, events: Table.api.events.operate,
                             buttons: [
-                                {name: 'edit', text: '审核', title: '财务审核', icon: '', classname: 'btn btn-xs btn-success btn-editone'}
+                                {
+                                    name: 'detail',
+                                    text: '对账详情',
+                                    title: '提现对账详情',
+                                    classname: 'btn btn-xs btn-info btn-detailone',
+                                    extend: 'data-area=\'["900px","86%"]\''
+                                },
+                                {
+                                    name: 'edit',
+                                    text: function (row) { return row.status === 'pass' ? '确认打款' : '审核'; },
+                                    title: '财务提现审核',
+                                    classname: 'btn btn-xs btn-success btn-editone',
+                                    extend: 'data-area=\'["840px","80%"]\'',
+                                    visible: function (row) {
+                                        return row.status === 'wait' || row.status === 'pass';
+                                    }
+                                }
                             ],
                             formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
 
-            // 为表格绑定事件
             Table.api.bindevent(table);
         },
+        detail: function () {
+            Controller.api.bindevent();
+        },
         edit: function () {
             Controller.api.bindevent();
         },
diff --git a/server/public/gallery/bath_faucet.jpg b/server/public/gallery/bath_faucet.jpg
new file mode 100644
index 0000000..3fcc87e
Binary files /dev/null and b/server/public/gallery/bath_faucet.jpg differ
diff --git a/server/public/gallery/bath_mirror.jpg b/server/public/gallery/bath_mirror.jpg
new file mode 100644
index 0000000..2d8d14a
Binary files /dev/null and b/server/public/gallery/bath_mirror.jpg differ
diff --git a/server/public/gallery/bath_sink.jpg b/server/public/gallery/bath_sink.jpg
new file mode 100644
index 0000000..cf832ec
Binary files /dev/null and b/server/public/gallery/bath_sink.jpg differ
diff --git a/server/public/gallery/bath_toilet.jpg b/server/public/gallery/bath_toilet.jpg
new file mode 100644
index 0000000..3d759ba
Binary files /dev/null and b/server/public/gallery/bath_toilet.jpg differ
diff --git a/server/public/gallery/bath_tub.jpg b/server/public/gallery/bath_tub.jpg
new file mode 100644
index 0000000..e1b1b1b
Binary files /dev/null and b/server/public/gallery/bath_tub.jpg differ
diff --git a/server/public/gallery/bath_vanity.jpg b/server/public/gallery/bath_vanity.jpg
new file mode 100644
index 0000000..9357480
Binary files /dev/null and b/server/public/gallery/bath_vanity.jpg differ
diff --git a/server/public/gallery/bed_euro.jpg b/server/public/gallery/bed_euro.jpg
new file mode 100644
index 0000000..eb3368b
Binary files /dev/null and b/server/public/gallery/bed_euro.jpg differ
diff --git a/server/public/gallery/bed_fabric.jpg b/server/public/gallery/bed_fabric.jpg
new file mode 100644
index 0000000..8010814
Binary files /dev/null and b/server/public/gallery/bed_fabric.jpg differ
diff --git a/server/public/gallery/bed_iron.jpg b/server/public/gallery/bed_iron.jpg
new file mode 100644
index 0000000..0d68745
Binary files /dev/null and b/server/public/gallery/bed_iron.jpg differ
diff --git a/server/public/gallery/bed_murphy.jpg b/server/public/gallery/bed_murphy.jpg
new file mode 100644
index 0000000..d4a949d
Binary files /dev/null and b/server/public/gallery/bed_murphy.jpg differ
diff --git a/server/public/gallery/bed_smart.jpg b/server/public/gallery/bed_smart.jpg
new file mode 100644
index 0000000..2515e30
Binary files /dev/null and b/server/public/gallery/bed_smart.jpg differ
diff --git a/server/public/gallery/bed_soft.jpg b/server/public/gallery/bed_soft.jpg
new file mode 100644
index 0000000..1a36bf3
Binary files /dev/null and b/server/public/gallery/bed_soft.jpg differ
diff --git a/server/public/gallery/bed_wood.jpg b/server/public/gallery/bed_wood.jpg
new file mode 100644
index 0000000..95e11f1
Binary files /dev/null and b/server/public/gallery/bed_wood.jpg differ
diff --git a/server/public/gallery/coffee_table.jpg b/server/public/gallery/coffee_table.jpg
new file mode 100644
index 0000000..6181c7f
Binary files /dev/null and b/server/public/gallery/coffee_table.jpg differ
diff --git a/server/public/gallery/curtain_modern.jpg b/server/public/gallery/curtain_modern.jpg
new file mode 100644
index 0000000..9a6b773
Binary files /dev/null and b/server/public/gallery/curtain_modern.jpg differ
diff --git a/server/public/gallery/door_interior.jpg b/server/public/gallery/door_interior.jpg
new file mode 100644
index 0000000..c744b78
Binary files /dev/null and b/server/public/gallery/door_interior.jpg differ
diff --git a/server/public/gallery/gym_equip.jpg b/server/public/gallery/gym_equip.jpg
new file mode 100644
index 0000000..3f9a375
Binary files /dev/null and b/server/public/gallery/gym_equip.jpg differ
diff --git a/server/public/gallery/kitchen_comm_1.jpg b/server/public/gallery/kitchen_comm_1.jpg
new file mode 100644
index 0000000..fdb274b
Binary files /dev/null and b/server/public/gallery/kitchen_comm_1.jpg differ
diff --git a/server/public/gallery/kitchen_comm_2.jpg b/server/public/gallery/kitchen_comm_2.jpg
new file mode 100644
index 0000000..90ed202
Binary files /dev/null and b/server/public/gallery/kitchen_comm_2.jpg differ
diff --git a/server/public/gallery/kitchen_mixer.jpg b/server/public/gallery/kitchen_mixer.jpg
new file mode 100644
index 0000000..9c2aec2
Binary files /dev/null and b/server/public/gallery/kitchen_mixer.jpg differ
diff --git a/server/public/gallery/kitchen_oven.jpg b/server/public/gallery/kitchen_oven.jpg
new file mode 100644
index 0000000..54728ef
Binary files /dev/null and b/server/public/gallery/kitchen_oven.jpg differ
diff --git a/server/public/gallery/kitchen_sink.jpg b/server/public/gallery/kitchen_sink.jpg
new file mode 100644
index 0000000..adab1f5
Binary files /dev/null and b/server/public/gallery/kitchen_sink.jpg differ
diff --git a/server/public/gallery/lamp_modern.jpg b/server/public/gallery/lamp_modern.jpg
new file mode 100644
index 0000000..2ed8600
Binary files /dev/null and b/server/public/gallery/lamp_modern.jpg differ
diff --git a/server/public/gallery/lamp_pendant.jpg b/server/public/gallery/lamp_pendant.jpg
new file mode 100644
index 0000000..0083b6d
Binary files /dev/null and b/server/public/gallery/lamp_pendant.jpg differ
diff --git a/server/public/gallery/real_comm_dishwasher.jpg b/server/public/gallery/real_comm_dishwasher.jpg
new file mode 100644
index 0000000..06ff7ca
Binary files /dev/null and b/server/public/gallery/real_comm_dishwasher.jpg differ
diff --git a/server/public/gallery/real_comm_fridge.jpg b/server/public/gallery/real_comm_fridge.jpg
new file mode 100644
index 0000000..fb63bb7
Binary files /dev/null and b/server/public/gallery/real_comm_fridge.jpg differ
diff --git a/server/public/gallery/real_comm_hood.jpg b/server/public/gallery/real_comm_hood.jpg
new file mode 100644
index 0000000..9f23840
Binary files /dev/null and b/server/public/gallery/real_comm_hood.jpg differ
diff --git a/server/public/gallery/real_comm_steamer.jpg b/server/public/gallery/real_comm_steamer.jpg
new file mode 100644
index 0000000..2760ad9
Binary files /dev/null and b/server/public/gallery/real_comm_steamer.jpg differ
diff --git a/server/public/gallery/real_comm_stove_1.jpg b/server/public/gallery/real_comm_stove_1.jpg
new file mode 100644
index 0000000..90d3204
Binary files /dev/null and b/server/public/gallery/real_comm_stove_1.jpg differ
diff --git a/server/public/gallery/real_comm_stove_2.jpg b/server/public/gallery/real_comm_stove_2.jpg
new file mode 100644
index 0000000..c89c3ab
Binary files /dev/null and b/server/public/gallery/real_comm_stove_2.jpg differ
diff --git a/server/public/gallery/real_door_lock.jpg b/server/public/gallery/real_door_lock.jpg
new file mode 100644
index 0000000..0741a3a
Binary files /dev/null and b/server/public/gallery/real_door_lock.jpg differ
diff --git a/server/public/gallery/real_dough_mixer_1.jpg b/server/public/gallery/real_dough_mixer_1.jpg
new file mode 100644
index 0000000..9e01815
Binary files /dev/null and b/server/public/gallery/real_dough_mixer_1.jpg differ
diff --git a/server/public/gallery/real_dough_mixer_2.jpg b/server/public/gallery/real_dough_mixer_2.jpg
new file mode 100644
index 0000000..1ff1d1c
Binary files /dev/null and b/server/public/gallery/real_dough_mixer_2.jpg differ
diff --git a/server/public/gallery/real_faucet_sink.jpg b/server/public/gallery/real_faucet_sink.jpg
new file mode 100644
index 0000000..a2fd03b
Binary files /dev/null and b/server/public/gallery/real_faucet_sink.jpg differ
diff --git a/server/public/gallery/real_pasta_sheeter.jpg b/server/public/gallery/real_pasta_sheeter.jpg
new file mode 100644
index 0000000..ccba63a
Binary files /dev/null and b/server/public/gallery/real_pasta_sheeter.jpg differ
diff --git a/server/public/gallery/real_shower_enclosure.jpg b/server/public/gallery/real_shower_enclosure.jpg
new file mode 100644
index 0000000..ae39d03
Binary files /dev/null and b/server/public/gallery/real_shower_enclosure.jpg differ
diff --git a/server/public/gallery/real_wardrobe_closet.jpg b/server/public/gallery/real_wardrobe_closet.jpg
new file mode 100644
index 0000000..7fe41bb
Binary files /dev/null and b/server/public/gallery/real_wardrobe_closet.jpg differ
diff --git a/server/public/gallery/real_water_boiler.jpg b/server/public/gallery/real_water_boiler.jpg
new file mode 100644
index 0000000..0fc2bc2
Binary files /dev/null and b/server/public/gallery/real_water_boiler.jpg differ
diff --git a/server/public/gallery/real_water_purifier.jpg b/server/public/gallery/real_water_purifier.jpg
new file mode 100644
index 0000000..840fda5
Binary files /dev/null and b/server/public/gallery/real_water_purifier.jpg differ
diff --git a/server/public/gallery/sofa_corner.jpg b/server/public/gallery/sofa_corner.jpg
new file mode 100644
index 0000000..63792f6
Binary files /dev/null and b/server/public/gallery/sofa_corner.jpg differ
diff --git a/server/public/gallery/sofa_recliner.jpg b/server/public/gallery/sofa_recliner.jpg
new file mode 100644
index 0000000..bf69196
Binary files /dev/null and b/server/public/gallery/sofa_recliner.jpg differ
diff --git a/server/public/gallery/sofa_three.jpg b/server/public/gallery/sofa_three.jpg
new file mode 100644
index 0000000..441e99b
Binary files /dev/null and b/server/public/gallery/sofa_three.jpg differ
diff --git a/server/public/gallery/sofa_two.jpg b/server/public/gallery/sofa_two.jpg
new file mode 100644
index 0000000..09c57a3
Binary files /dev/null and b/server/public/gallery/sofa_two.jpg differ
diff --git a/server/public/gallery/table_four.jpg b/server/public/gallery/table_four.jpg
new file mode 100644
index 0000000..568f66f
Binary files /dev/null and b/server/public/gallery/table_four.jpg differ
diff --git a/server/public/gallery/table_round.jpg b/server/public/gallery/table_round.jpg
new file mode 100644
index 0000000..64cf0eb
Binary files /dev/null and b/server/public/gallery/table_round.jpg differ
diff --git a/server/public/gallery/tv_stand.jpg b/server/public/gallery/tv_stand.jpg
new file mode 100644
index 0000000..34e377d
Binary files /dev/null and b/server/public/gallery/tv_stand.jpg differ
diff --git a/server/public/gallery/wall_frame.jpg b/server/public/gallery/wall_frame.jpg
new file mode 100644
index 0000000..c5c8392
Binary files /dev/null and b/server/public/gallery/wall_frame.jpg differ
diff --git a/server/public/gallery/wardrobe_custom.jpg b/server/public/gallery/wardrobe_custom.jpg
new file mode 100644
index 0000000..d180f66
Binary files /dev/null and b/server/public/gallery/wardrobe_custom.jpg differ
diff --git a/server/public/gallery/wardrobe_four.jpg b/server/public/gallery/wardrobe_four.jpg
new file mode 100644
index 0000000..5cf4594
Binary files /dev/null and b/server/public/gallery/wardrobe_four.jpg differ
diff --git a/server/public/gallery/wardrobe_two.jpg b/server/public/gallery/wardrobe_two.jpg
new file mode 100644
index 0000000..39ce6da
Binary files /dev/null and b/server/public/gallery/wardrobe_two.jpg differ
diff --git a/server/public/gallery/washer_modern.jpg b/server/public/gallery/washer_modern.jpg
new file mode 100644
index 0000000..a7c6638
Binary files /dev/null and b/server/public/gallery/washer_modern.jpg differ
diff --git a/yjyf-app/App.vue b/yjyf-app/App.vue
index b2734bb..578c5fd 100644
--- a/yjyf-app/App.vue
+++ b/yjyf-app/App.vue
@@ -1,7 +1,23 @@
 <script>
+	let lastNavUrl = '';
+	let lastNavAt = 0;
+
 	export default {
 		onLaunch: function() {
-			console.log('优匠优服 App 启动')
+			if (typeof uni !== 'undefined' && typeof uni.addInterceptor === 'function') {
+				uni.addInterceptor('navigateTo', {
+					invoke(args) {
+						const url = (args && args.url) ? String(args.url) : '';
+						const now = Date.now();
+						if (url && url === lastNavUrl && now - lastNavAt < 450) {
+							return false;
+						}
+						lastNavUrl = url;
+						lastNavAt = now;
+						return true;
+					}
+				});
+			}
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/yjyf-app/components/AddonServiceDrawer.vue b/yjyf-app/components/AddonServiceDrawer.vue
index 66c7d0b..ec7941d 100644
--- a/yjyf-app/components/AddonServiceDrawer.vue
+++ b/yjyf-app/components/AddonServiceDrawer.vue
@@ -28,12 +28,16 @@
 							class="step-btn step-btn-minus clickable-hover"
 							:class="{ disabled: (item.num || 0) <= 0 }"
 							@tap="stepNum(idx, -1)"
-						>-</view>
+						>
+							<image class="step-ico" src="/static/icons/step-minus.svg" mode="aspectFit" />
+						</view>
 						<view class="step-num">{{ item.num || 0 }}</view>
 						<view
 							class="step-btn step-btn-plus clickable-hover"
 							@tap="stepNum(idx, 1)"
-						>+</view>
+						>
+							<image class="step-ico" src="/static/icons/step-plus.svg" mode="aspectFit" />
+						</view>
 					</view>
 				</view>
 				<view class="empty-tip" v-if="!localList || localList.length === 0">
@@ -122,11 +126,13 @@
 
 	.drawer-sheet {
 		background: #FFFFFF;
+		border-radius: 28rpx 28rpx 0 0;
 		padding: 0 0 calc(28rpx + env(safe-area-inset-bottom));
 		max-height: 75vh;
 		display: flex;
 		flex-direction: column;
 		box-sizing: border-box;
+		overflow: hidden;
 		animation: drawerSlideUp 0.24s cubic-bezier(0.16, 1, 0.3, 1);
 	}
 
@@ -273,7 +279,12 @@
 	}
 
 	.step-btn.disabled {
-		color: #BBBBBB;
+		opacity: 0.38;
+	}
+
+	.step-ico {
+		width: 24rpx;
+		height: 24rpx;
 	}
 
 	.step-num {
diff --git a/yjyf-app/components/AddressPickerDrawer.vue b/yjyf-app/components/AddressPickerDrawer.vue
new file mode 100644
index 0000000..4de73f3
--- /dev/null
+++ b/yjyf-app/components/AddressPickerDrawer.vue
@@ -0,0 +1,296 @@
+<template>
+	<view class="drawer-mask" v-if="visible" @tap="close">
+		<view class="drawer-sheet" @tap.stop>
+			<view class="drawer-head">
+				<text class="dh-title">选择服务地址</text>
+				<view class="dh-close clickable-hover" @tap="close">
+					<image class="dh-close-img" src="/static/icons/close.svg" mode="aspectFit" />
+				</view>
+			</view>
+
+			<scroll-view scroll-y class="addr-scroll">
+				<view class="loading-box" v-if="loading">
+					<text class="loading-txt">加载地址簿中...</text>
+				</view>
+
+				<view class="empty-box" v-else-if="!list.length">
+					<image class="empty-icon" src="/static/icons/empty-address.svg" mode="aspectFit" />
+					<text class="empty-txt">暂无保存的服务地址</text>
+				</view>
+
+				<view class="addr-list" v-else>
+					<view
+						v-for="item in list"
+						:key="item.id"
+						class="addr-card clickable-hover"
+						@tap="handleSelect(item)"
+					>
+						<view class="ac-main">
+							<view class="ac-top">
+								<text class="ac-name">{{ item.contact }}</text>
+								<text class="ac-mobile">{{ item.mobile }}</text>
+								<view class="ac-def-tag" v-if="Number(item.is_default) === 1">默认</view>
+							</view>
+							<text class="ac-detail">{{ item.province || '' }}{{ item.city || '' }}{{ item.district || '' }}{{ item.address || '' }}</text>
+							<view class="ac-meta">
+								<text class="ac-floor">楼层 {{ item.floor || 1 }}层 · {{ isElevator(item.has_elevator) ? '有电梯' : '无电梯（步梯）' }}</text>
+							</view>
+						</view>
+						<image class="ac-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+					</view>
+				</view>
+			</scroll-view>
+
+			<view class="drawer-foot">
+				<view class="manage-btn clickable-hover" @tap="goManageAddress">
+					<image class="mb-plus" src="/static/icons/plus-white.svg" mode="aspectFit" />
+					<text class="mb-txt">新增 / 管理服务地址</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, watch } from 'vue';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const props = defineProps({
+		visible: { type: Boolean, default: false }
+	});
+
+	const emit = defineEmits(['update:visible', 'select']);
+
+	const loading = ref(false);
+	const list = ref([]);
+
+	function isElevator(val) {
+		if (val === undefined || val === null || val === '') return true;
+		return Number(val) === 1;
+	}
+
+	async function loadAddresses() {
+		if (!isLogin()) {
+			list.value = [];
+			return;
+		}
+		loading.value = true;
+		try {
+			const res = await api.addressList();
+			list.value = (res && res.list) ? res.list : [];
+		} catch (e) {
+			list.value = [];
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	watch(() => props.visible, (val) => {
+		if (val) {
+			loadAddresses();
+		}
+	});
+
+	function close() {
+		emit('update:visible', false);
+	}
+
+	function handleSelect(item) {
+		emit('select', item);
+		close();
+	}
+
+	function goManageAddress() {
+		if (!isLogin()) {
+			close();
+			toLogin();
+			return;
+		}
+		close();
+		uni.navigateTo({ url: '/pages/address/list?select=1' });
+	}
+</script>
+
+<style scoped>
+	.drawer-mask {
+		position: fixed;
+		inset: 0;
+		background: rgba(0, 0, 0, 0.55);
+		z-index: 1000;
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.drawer-sheet {
+		background: #F5F6F8;
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		padding: 30rpx 28rpx calc(30rpx + env(safe-area-inset-bottom));
+		max-height: 78vh;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+	}
+
+	.drawer-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 24rpx;
+	}
+
+	.dh-title {
+		font-size: 32rpx;
+		font-weight: 700;
+		color: #1F1F1F;
+	}
+
+	.dh-close {
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.dh-close-img {
+		width: 30rpx;
+		height: 30rpx;
+		opacity: 0.6;
+	}
+
+	.addr-scroll {
+		max-height: 54vh;
+	}
+
+	.loading-box,
+	.empty-box {
+		padding: 72rpx 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.loading-txt,
+	.empty-txt {
+		font-size: 26rpx;
+		color: #888888;
+		margin-top: 16rpx;
+	}
+
+	.empty-icon {
+		width: 140rpx;
+		height: 140rpx;
+	}
+
+	.addr-list {
+		display: flex;
+		flex-direction: column;
+		gap: 18rpx;
+		padding-bottom: 16rpx;
+	}
+
+	.addr-card {
+		background: #FFFFFF;
+		border-radius: 18rpx;
+		padding: 24rpx 26rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 16rpx;
+	}
+
+	.ac-main {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+		gap: 8rpx;
+	}
+
+	.ac-top {
+		display: flex;
+		align-items: center;
+		gap: 14rpx;
+	}
+
+	.ac-name {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: #1F1F1F;
+	}
+
+	.ac-mobile {
+		font-size: 26rpx;
+		color: #444444;
+	}
+
+	.ac-def-tag {
+		height: 38rpx;
+		padding: 0 12rpx;
+		border-radius: 6rpx;
+		background: #FFF7F0;
+		color: #F0710D;
+		font-size: 22rpx;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.ac-detail {
+		font-size: 26rpx;
+		color: #444444;
+		line-height: 1.45;
+	}
+
+	.ac-meta {
+		display: flex;
+		align-items: center;
+	}
+
+	.ac-floor {
+		font-size: 22rpx;
+		color: #888888;
+	}
+
+	.ac-arrow {
+		width: 28rpx;
+		height: 28rpx;
+		opacity: 0.45;
+		flex-shrink: 0;
+	}
+
+	.drawer-foot {
+		padding-top: 20rpx;
+	}
+
+	.manage-btn {
+		height: 84rpx;
+		border-radius: 42rpx;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 10rpx;
+		box-shadow: 0 8rpx 20rpx rgba(240, 113, 13, 0.25);
+	}
+
+	.mb-plus {
+		width: 28rpx;
+		height: 28rpx;
+	}
+
+	.mb-txt {
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #FFFFFF;
+	}
+
+	.clickable-hover:active {
+		opacity: 0.85;
+	}
+</style>
diff --git a/yjyf-app/components/AppointTimeDrawer.vue b/yjyf-app/components/AppointTimeDrawer.vue
index 17eef66..3bdccf0 100644
--- a/yjyf-app/components/AppointTimeDrawer.vue
+++ b/yjyf-app/components/AppointTimeDrawer.vue
@@ -112,6 +112,8 @@
 
 	.drawer-sheet {
 		background: #FFFFFF;
+		border-radius: 28rpx 28rpx 0 0;
+		overflow: hidden;
 		padding: 0 0 calc(env(safe-area-inset-bottom));
 		box-sizing: border-box;
 		animation: drawerSlideUp 0.24s cubic-bezier(0.16, 1, 0.3, 1);
@@ -175,8 +177,8 @@
 	}
 
 	.slot-card.active {
-		background: #FDF7F0;
-		border-color: #D4883A;
+		background: #FFF7F0;
+		border-color: #F0710D;
 	}
 
 	.slot-name {
@@ -187,7 +189,7 @@
 	}
 
 	.slot-card.active .slot-name {
-		color: #E07A2E;
+		color: #F0710D;
 	}
 
 	.slot-range {
@@ -197,7 +199,7 @@
 	}
 
 	.slot-card.active .slot-range {
-		color: #E07A2E;
+		color: #F0710D;
 	}
 
 	.explain-box {
diff --git a/yjyf-app/components/CouponPickerDrawer.vue b/yjyf-app/components/CouponPickerDrawer.vue
new file mode 100644
index 0000000..5d0b23f
--- /dev/null
+++ b/yjyf-app/components/CouponPickerDrawer.vue
@@ -0,0 +1,389 @@
+<template>
+	<view class="drawer-mask" v-if="visible" @tap="close">
+		<view class="drawer-sheet" @tap.stop>
+			<view class="drawer-head">
+				<view class="dh-left">
+					<text class="dh-title">选择优惠券</text>
+					<view class="dh-center-link clickable-hover" @tap="goCouponCenter">
+						<text class="dh-link-txt">领券中心</text>
+						<image class="dh-link-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<view class="dh-close clickable-hover" @tap="close">
+					<image class="dh-close-img" src="/static/icons/close.svg" mode="aspectFit" />
+				</view>
+			</view>
+
+			<!-- 不使用优惠券选项 -->
+			<view class="no-coupon-bar clickable-hover" @tap="selectNone">
+				<text class="ncb-txt">不使用优惠券</text>
+				<view class="radio-circle" :class="{ on: !currentId }">
+					<image v-if="!currentId" class="rc-check" src="/static/icons/check-white.svg" mode="aspectFit" />
+				</view>
+			</view>
+
+			<scroll-view scroll-y class="coupon-scroll">
+				<view class="loading-box" v-if="loading">
+					<text class="loading-txt">加载可用优惠券中...</text>
+				</view>
+
+				<view class="empty-box" v-else-if="!coupons.length">
+					<image class="empty-icon" src="/static/icons/empty-coupon.svg" mode="aspectFit" />
+					<text class="empty-txt">暂无未使用的优惠券</text>
+					<view class="empty-btn clickable-hover" @tap="goCouponCenter">
+						<text class="empty-btn-txt">去领券中心领取</text>
+					</view>
+				</view>
+
+				<view class="coupon-list" v-else>
+					<view
+						v-for="c in enrichedCoupons"
+						:key="c.id"
+						class="cp-card"
+						:class="{ disabled: !c.usable, active: Number(currentId) === Number(c.id) }"
+						@tap="handleTapCoupon(c)"
+					>
+						<view class="cp-left">
+							<text class="cp-val">{{ c.value_text }}</text>
+							<text class="cp-rule">{{ c.rule_text }}</text>
+						</view>
+						<view class="cp-mid">
+							<text class="cp-name">{{ c.name }}</text>
+							<text class="cp-time">{{ c.time_text }}</text>
+							<text class="cp-reason" v-if="!c.usable">{{ c.unusableReason }}</text>
+						</view>
+						<view class="cp-right">
+							<view class="radio-circle" :class="{ on: Number(currentId) === Number(c.id), disabled: !c.usable }">
+								<image v-if="Number(currentId) === Number(c.id)" class="rc-check" src="/static/icons/check-white.svg" mode="aspectFit" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed, watch } from 'vue';
+	import api from '@/utils/api.js';
+	import { isLogin } from '@/utils/request.js';
+
+	const props = defineProps({
+		visible: { type: Boolean, default: false },
+		currentId: { type: [Number, String], default: 0 },
+		orderTotal: { type: [Number, String], default: 0 }
+	});
+
+	const emit = defineEmits(['update:visible', 'select']);
+
+	const loading = ref(false);
+	const coupons = ref([]);
+
+	const enrichedCoupons = computed(() => {
+		const total = Number(props.orderTotal) || 0;
+		return coupons.value.map(c => {
+			const minAmt = Number(c.min_amount) || 0;
+			let usable = true;
+			let unusableReason = '';
+			if (c.expired) {
+				usable = false;
+				unusableReason = '该优惠券已过期';
+			} else if (total < minAmt) {
+				usable = false;
+				const diff = (minAmt - total).toFixed(2);
+				unusableReason = `满 ¥${minAmt} 可用，还差 ¥${diff}`;
+			}
+			return {
+				...c,
+				usable,
+				unusableReason
+			};
+		}).sort((a, b) => (a.usable === b.usable ? 0 : (a.usable ? -1 : 1)));
+	});
+
+	async function loadMyCoupons() {
+		if (!isLogin()) {
+			coupons.value = [];
+			return;
+		}
+		loading.value = true;
+		try {
+			const res = await api.couponMy({ status: 'unused' });
+			coupons.value = (res && res.list) ? res.list : [];
+		} catch (e) {
+			coupons.value = [];
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	watch(() => props.visible, (val) => {
+		if (val) {
+			loadMyCoupons();
+		}
+	});
+
+	function close() {
+		emit('update:visible', false);
+	}
+
+	function selectNone() {
+		emit('select', null);
+		close();
+	}
+
+	function handleTapCoupon(c) {
+		if (!c.usable) {
+			uni.showToast({ title: c.unusableReason || '未满足使用门槛', icon: 'none' });
+			return;
+		}
+		emit('select', c);
+		close();
+	}
+
+	function goCouponCenter() {
+		close();
+		uni.navigateTo({ url: '/pages/coupon/coupon' });
+	}
+</script>
+
+<style scoped>
+	.drawer-mask {
+		position: fixed;
+		inset: 0;
+		background: rgba(0, 0, 0, 0.55);
+		z-index: 1000;
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.drawer-sheet {
+		background: #F5F6F8;
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		padding: 30rpx 28rpx calc(36rpx + env(safe-area-inset-bottom));
+		max-height: 78vh;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+	}
+
+	.drawer-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 24rpx;
+	}
+
+	.dh-left {
+		display: flex;
+		align-items: center;
+		gap: 18rpx;
+	}
+
+	.dh-title {
+		font-size: 32rpx;
+		font-weight: 700;
+		color: #1F1F1F;
+	}
+
+	.dh-center-link {
+		display: inline-flex;
+		align-items: center;
+		gap: 4rpx;
+		background: #FFF7F0;
+		padding: 6rpx 16rpx;
+		border-radius: 24rpx;
+	}
+
+	.dh-link-txt {
+		font-size: 22rpx;
+		font-weight: 600;
+		color: #F0710D;
+	}
+
+	.dh-link-arrow {
+		width: 20rpx;
+		height: 20rpx;
+	}
+
+	.dh-close {
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.dh-close-img {
+		width: 30rpx;
+		height: 30rpx;
+		opacity: 0.6;
+	}
+
+	.no-coupon-bar {
+		background: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 24rpx 28rpx;
+		margin-bottom: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.ncb-txt {
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #1F1F1F;
+	}
+
+	.coupon-scroll {
+		max-height: 54vh;
+	}
+
+	.loading-box,
+	.empty-box {
+		padding: 72rpx 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.loading-txt,
+	.empty-txt {
+		font-size: 26rpx;
+		color: #888888;
+		margin-top: 16rpx;
+	}
+
+	.empty-icon {
+		width: 140rpx;
+		height: 140rpx;
+	}
+
+	.empty-btn {
+		margin-top: 28rpx;
+		height: 68rpx;
+		padding: 0 40rpx;
+		border-radius: 34rpx;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.empty-btn-txt {
+		font-size: 26rpx;
+		font-weight: 600;
+		color: #FFFFFF;
+	}
+
+	.coupon-list {
+		display: flex;
+		flex-direction: column;
+		gap: 18rpx;
+		padding-bottom: 12rpx;
+	}
+
+	.cp-card {
+		background: #FFFFFF;
+		border-radius: 18rpx;
+		padding: 24rpx;
+		display: flex;
+		align-items: center;
+		border: 2rpx solid transparent;
+	}
+
+	.cp-card.active {
+		border-color: #F0710D;
+		background: #FFFDFB;
+	}
+
+	.cp-card.disabled {
+		opacity: 0.58;
+	}
+
+	.cp-left {
+		width: 156rpx;
+		flex-shrink: 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding-right: 20rpx;
+		border-right: 1rpx dashed #F0DCC8;
+	}
+
+	.cp-val {
+		font-size: 38rpx;
+		font-weight: 800;
+		color: #F0710D;
+	}
+
+	.cp-rule {
+		margin-top: 6rpx;
+		font-size: 22rpx;
+		color: #888888;
+	}
+
+	.cp-mid {
+		flex: 1;
+		min-width: 0;
+		padding: 0 20rpx;
+		display: flex;
+		flex-direction: column;
+		gap: 6rpx;
+	}
+
+	.cp-name {
+		font-size: 28rpx;
+		font-weight: 700;
+		color: #1F1F1F;
+	}
+
+	.cp-time {
+		font-size: 22rpx;
+		color: #888888;
+	}
+
+	.cp-reason {
+		font-size: 22rpx;
+		color: #E8331B;
+	}
+
+	.cp-right {
+		flex-shrink: 0;
+	}
+
+	.radio-circle {
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 50%;
+		border: 2rpx solid #CCCCCC;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+	}
+
+	.radio-circle.on {
+		background: #F0710D;
+		border-color: #F0710D;
+	}
+
+	.radio-circle.disabled {
+		background: #F0F0F2;
+		border-color: #DCDCDC;
+	}
+
+	.rc-check {
+		width: 24rpx;
+		height: 24rpx;
+	}
+
+	.clickable-hover:active {
+		opacity: 0.85;
+	}
+</style>
diff --git a/yjyf-app/components/GoodsPickerDrawer.vue b/yjyf-app/components/GoodsPickerDrawer.vue
index f68ce9a..b1ed59c 100644
--- a/yjyf-app/components/GoodsPickerDrawer.vue
+++ b/yjyf-app/components/GoodsPickerDrawer.vue
@@ -277,35 +277,9 @@
 		close();
 	}
 
-	// 奇兵到家同款：找不到商品兜底通道（类目自动转为其它，商品转为手动输入，13项服务项目对齐图3）
+	// 找不到商品自定义需求通道（由父页面切换至自定义需求模式）
 	function onCustomOrder() {
-		emit('custom', {
-			cat_id: 15,
-			cat_name: '其它',
-			service_id: 32,
-			item_name: '',
-			is_custom: true,
-			unit: '个',
-			price_type: 'quote',
-			service_types: [
-				{ code: 'install', name: '安装', price: 0, is_default: 1 },
-				{ code: 'repair', name: '维修', price: 0, is_default: 0 },
-				{ code: 'grout', name: '美缝', price: 0, is_default: 0 },
-				{ code: 'glue', name: '打胶', price: 0, is_default: 0 },
-				{ code: 'remove', name: '拆旧', price: 0, is_default: 0 },
-				{ code: 'deliver', name: '送货到家', price: 0, is_default: 0 },
-				{ code: 'deliver_install', name: '送货到家并安装', price: 0, is_default: 0 },
-				{ code: 'deliver_downstairs', name: '送货到楼下(不含上楼)', price: 0, is_default: 0 },
-				{ code: 'clean', name: '保洁', price: 0, is_default: 0 },
-				{ code: 'drill', name: '打孔', price: 0, is_default: 0 },
-				{ code: 'film', name: '贴膜', price: 0, is_default: 0 },
-				{ code: 'move', name: '移机', price: 0, is_default: 0 },
-				{ code: 'other', name: '其他', price: 0, is_default: 0 }
-			],
-			addons: [
-				{ id: 1, name: '拆旧', unit: '份', price: 30 }
-			]
-		});
+		emit('custom');
 		close();
 	}
 </script>
diff --git a/yjyf-app/components/GoodsTemplateDrawer.vue b/yjyf-app/components/GoodsTemplateDrawer.vue
new file mode 100644
index 0000000..0fbc4b8
--- /dev/null
+++ b/yjyf-app/components/GoodsTemplateDrawer.vue
@@ -0,0 +1,526 @@
+<template>
+	<view class="drawer-mask" v-if="visible" @tap="close">
+		<view class="drawer-sheet" @tap.stop>
+			<!-- 抽屉标题栏 -->
+			<view class="drawer-head">
+				<view class="dh-left">
+					<text class="dh-title">常用商品模板</text>
+					<text class="dh-sub">快速复用常发商品规格与服务配置</text>
+				</view>
+				<view class="dh-close clickable-hover" @tap="close">
+					<image class="dh-close-img" src="/static/icons/close.svg" mode="aspectFit" />
+				</view>
+			</view>
+
+			<!-- 将当前编辑中的商品组保存为模板 -->
+			<view class="save-current-card" v-if="canSaveCurrent">
+				<view class="scc-top">
+					<image class="scc-ico" src="/static/icons/template-save.svg" mode="aspectFit" />
+					<text class="scc-label">将当前第 {{ groupIndex + 1 }} 组存为模板：{{ currentSummary }}</text>
+				</view>
+				<view class="scc-form-row">
+					<input
+						class="scc-input"
+						v-model="customTplName"
+						maxlength="40"
+						placeholder="模板名称（选填，默认使用商品规格名）"
+					/>
+					<view
+						class="scc-save-btn clickable-hover"
+						:class="{ disabled: saving }"
+						@tap="handleSaveCurrent"
+					>
+						<text class="scc-save-txt">{{ saving ? '保存中' : '存为模板' }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 模板列表 -->
+			<scroll-view class="drawer-body" scroll-y="true">
+				<view class="state-box" v-if="loading && list.length === 0">
+					<text class="state-txt">正在读取商品模板...</text>
+				</view>
+
+				<view class="state-box" v-else-if="list.length === 0">
+					<image class="empty-img" src="/static/icons/empty-gallery.svg" mode="aspectFit" />
+					<text class="empty-title">暂无已保存的商品模板</text>
+					<text class="empty-sub">在表单中选好商品、数量及服务项目后，可一键保存为常用模板</text>
+				</view>
+
+				<view class="tpl-list" v-else>
+					<view class="tpl-card" v-for="tpl in list" :key="tpl.id">
+						<image
+							class="tpl-thumb"
+							:src="tpl.cover_image || tpl.cat_icon_url || '/static/icons/service-default.svg'"
+							mode="aspectFill"
+						/>
+						<view class="tpl-main">
+							<view class="tpl-title-row">
+								<text class="tpl-name">{{ tpl.tpl_name }}</text>
+								<view
+									class="tpl-del-btn clickable-hover"
+									@tap.stop="handleDelete(tpl)"
+								>
+									<image class="tpl-del-ico" src="/static/icons/trash.svg" mode="aspectFit" />
+								</view>
+							</view>
+							<text class="tpl-spec">
+								{{ tpl.cat_name ? tpl.cat_name + ' · ' : '' }}{{ tpl.item_name }}{{ tpl.spec_name && tpl.spec_name !== tpl.item_name ? `（${tpl.spec_name}）` : '' }} x{{ tpl.num }}{{ tpl.unit || '个' }}
+							</text>
+							<text class="tpl-service">{{ formatTplService(tpl) }}</text>
+							<view class="tpl-foot">
+								<text class="tpl-price" v-if="tpl.price_type !== 'quote' && Number(tpl.base_price) > 0">¥{{ Number(tpl.base_price).toFixed(2) }}/{{ tpl.unit || '个' }}</text>
+								<text class="tpl-quote-tag" v-else>师傅报价项目</text>
+								<view class="tpl-apply-btn clickable-hover" @tap="applyTemplate(tpl)">
+									<text class="tpl-apply-txt">一键套用</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed, watch } from 'vue';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const props = defineProps({
+		visible: { type: Boolean, default: false },
+		catId: { type: [Number, String], default: 0 },
+		catName: { type: String, default: '' },
+		groupIndex: { type: Number, default: 0 },
+		currentGroup: { type: Object, default: () => null }
+	});
+
+	const emit = defineEmits(['update:visible', 'apply']);
+
+	const list = ref([]);
+	const loading = ref(false);
+	const saving = ref(false);
+	const deletingId = ref(0);
+	const customTplName = ref('');
+
+	const canSaveCurrent = computed(() => {
+		const g = props.currentGroup;
+		if (!g) return false;
+		const name = (g.is_custom ? g.custom_name : g.item_name) || '';
+		return String(name).trim().length > 0;
+	});
+
+	const currentSummary = computed(() => {
+		const g = props.currentGroup;
+		if (!g) return '';
+		const baseName = (g.is_custom ? g.custom_name : g.item_name) || '';
+		const specPart = (g.spec_name && g.spec_name !== baseName) ? `（${g.spec_name}）` : '';
+		return `${baseName}${specPart} x${g.num || 1}`;
+	});
+
+	function formatTplService(tpl) {
+		const parts = [tpl.service_type_name || '安装'];
+		if (Array.isArray(tpl.extras)) {
+			tpl.extras.filter(ex => Number(ex.num) > 0).forEach(ex => {
+				parts.push(`${ex.name}x${ex.num}`);
+			});
+		}
+		if (tpl.remark) {
+			parts.push(`备注：${tpl.remark}`);
+		}
+		return parts.join(' · ');
+	}
+
+	async function fetchTemplates() {
+		if (!isLogin()) return;
+		if (loading.value) return;
+		loading.value = true;
+		try {
+			const res = await api.goodsTemplates({ cat_id: props.catId || 0 });
+			list.value = (res && Array.isArray(res.list)) ? res.list : [];
+		} catch (e) {
+			uni.showToast({ title: (e && e.msg) ? e.msg : '获取商品模板失败', icon: 'none' });
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	watch(
+		() => props.visible,
+		(val) => {
+			if (val) {
+				customTplName.value = '';
+				if (!isLogin()) {
+					close();
+					toLogin();
+					return;
+				}
+				fetchTemplates();
+			}
+		}
+	);
+
+	async function handleSaveCurrent() {
+		if (!canSaveCurrent.value || saving.value) return;
+		const g = props.currentGroup;
+		const itemName = String((g.is_custom ? g.custom_name : g.item_name) || '').trim();
+		if (!itemName) {
+			uni.showToast({ title: '请先选择商品', icon: 'none' });
+			return;
+		}
+		saving.value = true;
+		try {
+			await api.saveGoodsTemplate({
+				tpl_name: customTplName.value.trim(),
+				cat_id: g.cat_id || props.catId || 0,
+				cat_name: g.cat_name || props.catName || '',
+				service_id: g.service_id || 0,
+				item_name: itemName,
+				spec_id: g.spec_id || 0,
+				spec_name: g.spec_name || '',
+				unit: g.unit || '个',
+				num: g.num || 1,
+				service_type: g.service_type || 'install',
+				service_type_name: g.service_type_name || '安装',
+				is_custom: g.is_custom ? 1 : 0,
+				custom_name: g.custom_name || '',
+				extras: JSON.stringify(g.extras || []),
+				images: JSON.stringify(g.images || []),
+				remark: g.remark || ''
+			});
+			customTplName.value = '';
+			uni.showToast({ title: '已保存为常用模板', icon: 'success' });
+			await fetchTemplates();
+		} catch (e) {
+			uni.showToast({ title: (e && e.msg) ? e.msg : '保存模板失败', icon: 'none' });
+		} finally {
+			saving.value = false;
+		}
+	}
+
+	function handleDelete(tpl) {
+		if (!tpl || deletingId.value) return;
+		uni.showModal({
+			title: '删除商品模板',
+			content: `确认删除模板“${tpl.tpl_name}”吗？`,
+			confirmColor: '#E8331B',
+			success: async (r) => {
+				if (!r.confirm || deletingId.value) return;
+				deletingId.value = tpl.id;
+				try {
+					await api.deleteGoodsTemplate({ id: tpl.id });
+					list.value = list.value.filter(x => x.id !== tpl.id);
+					uni.showToast({ title: '已删除', icon: 'none' });
+				} catch (e) {
+					uni.showToast({ title: (e && e.msg) ? e.msg : '删除模板失败', icon: 'none' });
+				} finally {
+					deletingId.value = 0;
+				}
+			}
+		});
+	}
+
+	function applyTemplate(tpl) {
+		if (!tpl) return;
+		emit('apply', tpl);
+		close();
+	}
+
+	function close() {
+		emit('update:visible', false);
+	}
+</script>
+
+<style lang="scss" scoped>
+	.drawer-mask {
+		position: fixed;
+		inset: 0;
+		background: rgba(0, 0, 0, 0.58);
+		z-index: 999;
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.drawer-sheet {
+		background-color: $yjyf-bg-card;
+		border-top-left-radius: $yjyf-radius-lg;
+		border-top-right-radius: $yjyf-radius-lg;
+		padding: 32rpx 28rpx calc(28rpx + env(safe-area-inset-bottom));
+		max-height: 80vh;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+	}
+
+	.drawer-head {
+		display: flex;
+		align-items: flex-start;
+		justify-content: space-between;
+		padding-bottom: 24rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.dh-left {
+		display: flex;
+		flex-direction: column;
+		gap: 6rpx;
+	}
+
+	.dh-title {
+		font-size: 34rpx;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.dh-sub {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	.dh-close {
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.dh-close-img {
+		width: 32rpx;
+		height: 32rpx;
+		opacity: 0.72;
+	}
+
+	/* 快捷保存当前商品组卡片 */
+	.save-current-card {
+		margin-top: 20rpx;
+		padding: 20rpx;
+		border-radius: $yjyf-radius-md;
+		background-color: $yjyf-primary-bg;
+		border: 1rpx solid $yjyf-primary-border;
+	}
+
+	.scc-top {
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+		margin-bottom: 16rpx;
+	}
+
+	.scc-ico {
+		width: 34rpx;
+		height: 34rpx;
+		flex-shrink: 0;
+	}
+
+	.scc-label {
+		flex: 1;
+		font-size: 26rpx;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.scc-form-row {
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+	}
+
+	.scc-input {
+		flex: 1;
+		height: 68rpx;
+		padding: 0 20rpx;
+		border-radius: $yjyf-radius-sm;
+		background-color: $yjyf-bg-card;
+		border: 1rpx solid $yjyf-border-color;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-main;
+	}
+
+	.scc-save-btn {
+		height: 68rpx;
+		padding: 0 28rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-gradient-primary;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+	}
+
+	.scc-save-txt {
+		font-size: 26rpx;
+		font-weight: 600;
+		color: $yjyf-text-inverse;
+	}
+
+	/* 模板滚动列表 */
+	.drawer-body {
+		flex: 1;
+		min-height: 320rpx;
+		max-height: 54vh;
+		margin-top: 20rpx;
+	}
+
+	.state-box {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 72rpx 32rpx;
+		text-align: center;
+	}
+
+	.empty-img {
+		width: 200rpx;
+		height: 160rpx;
+		margin-bottom: 16rpx;
+	}
+
+	.empty-title {
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		margin-bottom: 8rpx;
+	}
+
+	.empty-sub {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		line-height: 1.5;
+	}
+
+	.state-txt {
+		font-size: 26rpx;
+		color: $yjyf-text-secondary;
+	}
+
+	.tpl-list {
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+		padding-bottom: 12rpx;
+	}
+
+	.tpl-card {
+		display: flex;
+		gap: 20rpx;
+		padding: 22rpx;
+		border-radius: $yjyf-radius-md;
+		background-color: $yjyf-bg-page;
+		border: 1rpx solid $yjyf-border-color;
+	}
+
+	.tpl-thumb {
+		width: 136rpx;
+		height: 136rpx;
+		border-radius: $yjyf-radius-sm;
+		background-color: $yjyf-bg-card;
+		flex-shrink: 0;
+	}
+
+	.tpl-main {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.tpl-title-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 12rpx;
+	}
+
+	.tpl-name {
+		flex: 1;
+		font-size: 30rpx;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.tpl-del-btn {
+		width: 48rpx;
+		height: 48rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		flex-shrink: 0;
+	}
+
+	.tpl-del-ico {
+		width: 30rpx;
+		height: 30rpx;
+		opacity: 0.72;
+	}
+
+	.tpl-spec {
+		margin-top: 6rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.tpl-service {
+		margin-top: 6rpx;
+		font-size: 22rpx;
+		color: $yjyf-text-secondary;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.tpl-foot {
+		margin-top: 14rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.tpl-price {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-primary;
+	}
+
+	.tpl-quote-tag {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-warning;
+		font-weight: 500;
+	}
+
+	.tpl-apply-btn {
+		height: 58rpx;
+		padding: 0 28rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tpl-apply-txt {
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		color: $yjyf-text-inverse;
+	}
+
+	.disabled {
+		opacity: 0.55;
+	}
+
+	.clickable-hover:active {
+		opacity: 0.82;
+	}
+</style>
diff --git a/yjyf-app/components/MasterDemandDrawer.vue b/yjyf-app/components/MasterDemandDrawer.vue
index fc3c5f1..cc21c41 100644
--- a/yjyf-app/components/MasterDemandDrawer.vue
+++ b/yjyf-app/components/MasterDemandDrawer.vue
@@ -121,6 +121,8 @@
 
 	.drawer-sheet {
 		background: #FFFFFF;
+		border-radius: 28rpx 28rpx 0 0;
+		overflow: hidden;
 		padding: 0 0 calc(28rpx + env(safe-area-inset-bottom));
 		box-sizing: border-box;
 		animation: drawerSlideUp 0.24s cubic-bezier(0.16, 1, 0.3, 1);
@@ -219,7 +221,7 @@
 
 	.et-highlight {
 		font-size: 26rpx;
-		color: #E07A2E;
+		color: #F0710D;
 		margin: 0 4rpx;
 	}
 
@@ -241,8 +243,8 @@
 	}
 
 	.timeout-pill.active {
-		background: #FFF9F5;
-		border-color: #D4883A;
+		background: #FFF7F0;
+		border-color: #F0710D;
 	}
 
 	.tp-txt {
@@ -252,7 +254,7 @@
 	}
 
 	.timeout-pill.active .tp-txt {
-		color: #E07A2E;
+		color: #F0710D;
 	}
 
 	.drawer-foot {
diff --git a/yjyf-app/components/MediaActionDrawer.vue b/yjyf-app/components/MediaActionDrawer.vue
index 679a7bd..71248fc 100644
--- a/yjyf-app/components/MediaActionDrawer.vue
+++ b/yjyf-app/components/MediaActionDrawer.vue
@@ -1,20 +1,22 @@
 <template>
 	<view class="drawer-mask" v-if="visible" @tap="close">
 		<view class="drawer-sheet" @tap.stop>
-			<!-- 1:1 复刻 frame_012：从相册中选择 / 从商品图库中选择 / 从系统图库中选择(系统默认图片) / 拍照 / 取消 -->
+			<!-- 商品图片支持：相册 / 商品图库 / 系统图库(系统默认图片) / 拍照；安装环境图仅支持：相册 / 拍照 -->
 			<view class="sheet-menu">
 				<view class="menu-item clickable-hover" @tap="chooseAction('album')">
 					<text class="menu-txt">从相册中选择</text>
 				</view>
-				<view class="menu-item clickable-hover" @tap="chooseAction('goods_default')">
-					<text class="menu-txt">从商品图库中选择</text>
-				</view>
-				<view class="menu-item clickable-hover" @tap="chooseAction('system_default')">
-					<text class="menu-txt">从系统图库中选择</text>
-					<view class="sys-badge">
-						<text class="sb-txt">系统默认图片</text>
+				<template v-if="mediaType === 'image'">
+					<view class="menu-item clickable-hover" @tap="chooseAction('goods_default')">
+						<text class="menu-txt">从商品图库中选择</text>
 					</view>
-				</view>
+					<view class="menu-item clickable-hover" @tap="chooseAction('system_default')">
+						<text class="menu-txt">从系统图库中选择</text>
+						<view class="sys-badge">
+							<text class="sb-txt">系统默认图片</text>
+						</view>
+					</view>
+				</template>
 				<view class="menu-item clickable-hover" @tap="chooseAction('camera')">
 					<text class="menu-txt">拍照</text>
 				</view>
@@ -29,7 +31,8 @@
 
 <script setup>
 	defineProps({
-		visible: { type: Boolean, default: false }
+		visible: { type: Boolean, default: false },
+		mediaType: { type: String, default: 'image' }
 	});
 
 	const emit = defineEmits(['update:visible', 'select']);
@@ -44,7 +47,7 @@
 	}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	.drawer-mask {
 		position: fixed;
 		top: 0;
@@ -65,7 +68,7 @@
 	}
 
 	.drawer-sheet {
-		background: #FFFFFF;
+		background-color: $yjyf-bg-card;
 		border-top-left-radius: 24rpx;
 		border-top-right-radius: 24rpx;
 		padding-bottom: env(safe-area-inset-bottom);
@@ -79,7 +82,7 @@
 	}
 
 	.sheet-menu {
-		background: #FFFFFF;
+		background-color: $yjyf-bg-card;
 	}
 
 	.menu-item {
@@ -87,7 +90,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		border-bottom: 1rpx solid #F0F0F2;
+		border-bottom: 1rpx solid $yjyf-border-color;
 		position: relative;
 	}
 
@@ -96,8 +99,8 @@
 	}
 
 	.menu-txt {
-		font-size: 32rpx;
-		color: #1F1F1F;
+		font-size: $yjyf-font-title;
+		color: $yjyf-text-main;
 	}
 
 	.sys-badge {
@@ -105,25 +108,25 @@
 		height: 44rpx;
 		padding: 0 18rpx;
 		border-radius: 22rpx;
-		background: #F44336;
+		background-color: $yjyf-danger;
 		display: inline-flex;
 		align-items: center;
 		justify-content: center;
 	}
 
 	.sb-txt {
-		font-size: 24rpx;
-		color: #FFFFFF;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-inverse;
 		line-height: 1;
 	}
 
 	.sheet-divider {
 		height: 16rpx;
-		background: #F5F6F8;
+		background-color: $yjyf-bg-page;
 	}
 
 	.menu-cancel {
-		background: #FFFFFF;
+		background-color: $yjyf-bg-card;
 		height: 110rpx;
 		display: flex;
 		align-items: center;
@@ -131,11 +134,11 @@
 	}
 
 	.cancel-txt {
-		font-size: 32rpx;
-		color: #1F1F1F;
+		font-size: $yjyf-font-title;
+		color: $yjyf-text-main;
 	}
 
 	.clickable-hover:active {
-		background: #F9FAFB;
+		background-color: $yjyf-bg-page;
 	}
 </style>
diff --git a/yjyf-app/components/ModePickerDrawer.vue b/yjyf-app/components/ModePickerDrawer.vue
index b322a3a..50dbf8a 100644
--- a/yjyf-app/components/ModePickerDrawer.vue
+++ b/yjyf-app/components/ModePickerDrawer.vue
@@ -10,13 +10,10 @@
 				</view>
 			</view>
 
-			<!-- 三张模式卡片（1:1 复刻图一：白底细橙框 + 左上角渐变福利角标 + 左主副标题 + 右实心橙色胶囊按钮） -->
+			<!-- 三张模式卡片 -->
 			<view class="drawer-body">
 				<!-- 1. 一口价下单 -->
 				<view class="mode-card clickable-hover" :class="{ active: currentMode === 'fixed' }" @tap="select('fixed')">
-					<view class="mc-corner-badge">
-						<text class="mcb-txt">下单送券·慢必赔 &gt;</text>
-					</view>
 					<view class="mc-content">
 						<view class="mc-info">
 							<text class="mc-main-title">全国统一参考价，成本可控</text>
@@ -30,9 +27,6 @@
 
 				<!-- 2. 报价下单 -->
 				<view class="mode-card clickable-hover" :class="{ active: currentMode === 'quote' }" @tap="select('quote')">
-					<view class="mc-corner-badge">
-						<text class="mcb-txt">下单送券·慢必赔 &gt;</text>
-					</view>
 					<view class="mc-content">
 						<view class="mc-info">
 							<text class="mc-main-title">多个师傅报价，择优选择</text>
@@ -46,9 +40,6 @@
 
 				<!-- 3. 自己定价 -->
 				<view class="mode-card clickable-hover" :class="{ active: currentMode === 'custom' }" @tap="select('custom')">
-					<view class="mc-corner-badge">
-						<text class="mcb-txt">下单送券·慢必赔 &gt;</text>
-					</view>
 					<view class="mc-content">
 						<view class="mc-info">
 							<text class="mc-main-title">价格自己定，更省钱</text>
@@ -162,43 +153,24 @@
 
 	.mode-card {
 		position: relative;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		background: #FFFFFF;
-		border: 2rpx solid #F3A661;
+		border: 2rpx solid #F0F0F2;
 		overflow: hidden;
 		transition: all 0.18s ease;
 	}
 
 	.mode-card.active {
 		border-color: #F0710D;
+		background: #FFF7F0;
 		box-shadow: 0 4rpx 16rpx rgba(240, 113, 13, 0.08);
 	}
 
-	.mc-corner-badge {
-		position: absolute;
-		top: 0;
-		left: 0;
-		height: 40rpx;
-		padding: 0 20rpx;
-		background: linear-gradient(90deg, #FFA33E 0%, #F0710D 100%);
-		border-bottom-right-radius: 16rpx;
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.mcb-txt {
-		font-size: 22rpx;
-		color: #FFFFFF;
-		font-weight: 600;
-		line-height: 1;
-	}
-
 	.mc-content {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 58rpx 26rpx 36rpx 28rpx;
+		padding: 36rpx 26rpx 36rpx 28rpx;
 		gap: 20rpx;
 	}
 
@@ -219,7 +191,7 @@
 
 	.mc-sub-desc {
 		font-size: 24rpx;
-		color: #777777;
+		color: #888888;
 		line-height: 1.35;
 	}
 
@@ -242,22 +214,22 @@
 	}
 
 	.drawer-foot {
-		padding-top: 32rpx;
+		padding-top: 28rpx;
 	}
 
 	.cancel-btn {
 		height: 88rpx;
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
-		border-radius: 16rpx;
+		background: #F5F6F8;
+		border-radius: 44rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
 
 	.cancel-txt {
-		font-size: 32rpx;
+		font-size: 30rpx;
 		font-weight: 600;
-		color: #FFFFFF;
+		color: #444444;
 		line-height: 1;
 	}
 
diff --git a/yjyf-app/components/RegionPickerDrawer.vue b/yjyf-app/components/RegionPickerDrawer.vue
new file mode 100644
index 0000000..29413cc
--- /dev/null
+++ b/yjyf-app/components/RegionPickerDrawer.vue
@@ -0,0 +1,576 @@
+<template>
+	<view class="drawer-mask" v-if="visible" @tap="close">
+		<view class="drawer-sheet" @tap.stop>
+			<view class="drawer-head">
+				<text class="dh-title">选择所在省市区</text>
+				<view class="dh-right">
+					<view class="mode-switch clickable-hover" @tap="manualMode = !manualMode">
+						<text class="ms-txt">{{ manualMode ? '返回列表选择' : '手动输入区县' }}</text>
+					</view>
+					<view class="dh-close clickable-hover" @tap="close">
+						<image class="dh-close-img" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+			</view>
+
+			<!-- 手动编辑模式：允许自由输入全国任意省/市/区县（防止生僻县区遗漏） -->
+			<view class="manual-body" v-if="manualMode">
+				<view class="m-field">
+					<text class="m-label">省份 / 直辖市</text>
+					<input class="m-input" v-model="selProvince" placeholder="例如：贵州省 / 广东省 / 北京市" />
+				</view>
+				<view class="m-field">
+					<text class="m-label">城市 / 州盟</text>
+					<input class="m-input" v-model="selCity" placeholder="例如：遵义市 / 贵阳市 / 深圳市" />
+				</view>
+				<view class="m-field">
+					<text class="m-label">区 / 县 / 县级市</text>
+					<input class="m-input" v-model="selDistrict" placeholder="例如：汇川区 / 南明区 / 南山区" />
+				</view>
+				<view class="confirm-btn clickable-hover" @tap="confirmSelection">
+					<text class="cb-txt">确认地区</text>
+				</view>
+			</view>
+
+			<!-- 三级级联选择模式 -->
+			<template v-else>
+				<view class="step-tabs">
+					<view class="s-tab" :class="{ active: activeTab === 0 }" @tap="activeTab = 0">
+						<text class="st-txt">{{ selProvince || '请选择省' }}</text>
+					</view>
+					<view class="s-tab" :class="{ active: activeTab === 1 }" v-if="selProvince" @tap="activeTab = 1">
+						<text class="st-txt">{{ selCity || '请选择市' }}</text>
+					</view>
+					<view class="s-tab" :class="{ active: activeTab === 2 }" v-if="selCity" @tap="activeTab = 2">
+						<text class="st-txt">{{ selDistrict || '请选择区县' }}</text>
+					</view>
+				</view>
+
+				<scroll-view scroll-y class="region-scroll">
+					<view class="region-list" v-if="activeTab === 0">
+						<view
+							v-for="p in regionTree"
+							:key="p.name"
+							class="r-item clickable-hover"
+							:class="{ selected: selProvince === p.name }"
+							@tap="pickProvince(p)"
+						>
+							<text class="ri-txt">{{ p.name }}</text>
+							<image v-if="selProvince === p.name" class="ri-check" src="/static/icons/check-orange.svg" mode="aspectFit" />
+						</view>
+					</view>
+
+					<view class="region-list" v-else-if="activeTab === 1">
+						<view
+							v-for="c in currentCities"
+							:key="c.name"
+							class="r-item clickable-hover"
+							:class="{ selected: selCity === c.name }"
+							@tap="pickCity(c)"
+						>
+							<text class="ri-txt">{{ c.name }}</text>
+							<image v-if="selCity === c.name" class="ri-check" src="/static/icons/check-orange.svg" mode="aspectFit" />
+						</view>
+					</view>
+
+					<view class="region-list" v-else>
+						<view
+							v-for="d in currentDistricts"
+							:key="d"
+							class="r-item clickable-hover"
+							:class="{ selected: selDistrict === d }"
+							@tap="pickDistrict(d)"
+						>
+							<text class="ri-txt">{{ d }}</text>
+							<image v-if="selDistrict === d" class="ri-check" src="/static/icons/check-orange.svg" mode="aspectFit" />
+						</view>
+					</view>
+				</scroll-view>
+			</template>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed, watch } from 'vue';
+
+	const props = defineProps({
+		visible: { type: Boolean, default: false },
+		province: { type: String, default: '' },
+		city: { type: String, default: '' },
+		district: { type: String, default: '' }
+	});
+
+	const emit = defineEmits(['update:visible', 'confirm']);
+
+	const activeTab = ref(0);
+	const manualMode = ref(false);
+	const selProvince = ref('');
+	const selCity = ref('');
+	const selDistrict = ref('');
+
+	// 全国主要省市区行政区划树（完整覆盖贵州全省9市州及全国34省级行政区核心市县）
+	const regionTree = [
+		{
+			name: '贵州省',
+			cities: [
+				{ name: '遵义市', districts: ['汇川区', '红花岗区', '播州区', '新蒲新区', '仁怀市', '赤水市', '桐梓县', '绥阳县', '正安县', '道真仡佬族苗族自治县', '务川仡佬族苗族自治县', '凤冈县', '湄潭县', '余庆县', '习水县'] },
+				{ name: '贵阳市', districts: ['南明区', '云岩区', '观山湖区', '花溪区', '乌当区', '白云区', '清镇市', '开阳县', '息烽县', '修文县'] },
+				{ name: '六盘水市', districts: ['钟山区', '水城区', '盘州市', '六枝特区'] },
+				{ name: '安顺市', districts: ['西秀区', '平坝区', '普定县', '镇宁布依族苗族自治县', '关岭布依族苗族自治县', '紫云苗族布依族自治县'] },
+				{ name: '毕节市', districts: ['七星关区', '黔西市', '大方县', '金沙县', '织金县', '纳雍县', '威宁彝族回族苗族自治县', '赫章县'] },
+				{ name: '铜仁市', districts: ['碧江区', '万山区', '江口县', '石阡县', '思南县', '德江县', '玉屏侗族自治县', '印江土家族苗族自治县', '沿河土家族自治县', '松桃苗族自治县'] },
+				{ name: '黔西南布依族苗族自治州', districts: ['兴义市', '兴仁市', '普安县', '晴隆县', '贞丰县', '望谟县', '册亨县', '安龙县'] },
+				{ name: '黔东南苗族侗族自治州', districts: ['凯里市', '黄平县', '施秉县', '三穗县', '镇远县', '岑巩县', '天柱县', '锦屏县', '剑河县', '台江县', '黎平县', '榕江县', '从江县', '雷山县', '麻江县', '丹寨县'] },
+				{ name: '黔南布依族苗族自治州', districts: ['都匀市', '福泉市', '荔波县', '贵定县', '瓮安县', '独山县', '平塘县', '罗甸县', '长顺县', '龙里县', '惠水县', '三都水族自治县'] }
+			]
+		},
+		{
+			name: '重庆市',
+			cities: [
+				{ name: '重庆市', districts: ['渝北区', '江北区', '渝中区', '南岸区', '九龙坡区', '沙坪坝区', '巴南区', '大渡口区', '北碚区', '万州区', '涪陵区', '永川区', '合川区', '江津区', '綦江区'] }
+			]
+		},
+		{
+			name: '四川省',
+			cities: [
+				{ name: '成都市', districts: ['武侯区', '锦江区', '青羊区', '金牛区', '成华区', '高新区', '天府新区', '龙泉驿区', '双流区', '温江区', '郫都区', '新都区'] },
+				{ name: '绵阳市', districts: ['涪城区', '游仙区', '安州区', '江油市', '三台县'] },
+				{ name: '泸州市', districts: ['江阳区', '龙马潭区', '纳溪区', '泸县', '合江县', '叙永县', '古蔺县'] },
+				{ name: '宜宾市', districts: ['翠屏区', '南溪区', '叙州区', '江安县', '长宁县'] }
+			]
+		},
+		{
+			name: '云南省',
+			cities: [
+				{ name: '昆明市', districts: ['盘龙区', '五华区', '官渡区', '西山区', '呈贡区', '安宁市'] },
+				{ name: '曲靖市', districts: ['麒麟区', '沾益区', '马龙区', '宣威市'] },
+				{ name: '昭通市', districts: ['昭阳区', '水富市', '鲁甸县', '镇雄县'] }
+			]
+		},
+		{
+			name: '广东省',
+			cities: [
+				{ name: '广州市', districts: ['天河区', '越秀区', '海珠区', '荔湾区', '白云区', '番禺区', '黄埔区', '花都区', '南沙区'] },
+				{ name: '深圳市', districts: ['南山区', '福田区', '罗湖区', '宝安区', '龙岗区', '龙华区', '光明区', '盐田区'] },
+				{ name: '佛山市', districts: ['禅城区', '南海区', '顺德区', '三水区', '高明区'] },
+				{ name: '东莞市', districts: ['南城街道', '东城街道', '莞城街道', '万江街道', '长安镇', '虎门镇'] }
+			]
+		},
+		{
+			name: '北京市',
+			cities: [
+				{ name: '北京市', districts: ['朝阳区', '海淀区', '东城区', '西城区', '丰台区', '石景山区', '通州区', '昌平区', '大兴区', '顺义区'] }
+			]
+		},
+		{
+			name: '上海市',
+			cities: [
+				{ name: '上海市', districts: ['浦东新区', '徐汇区', '长宁区', '静安区', '普陀区', '虹口区', '杨浦区', '黄浦区', '闵行区', '宝山区', '嘉定区', '松江区'] }
+			]
+		},
+		{
+			name: '浙江省',
+			cities: [
+				{ name: '杭州市', districts: ['西湖区', '上城区', '拱墅区', '滨江区', '萧山区', '余杭区', '临平区', '钱塘区'] },
+				{ name: '宁波市', districts: ['鄞州区', '海曙区', '江北区', '镇海区', '北仑区', '慈溪市'] },
+				{ name: '温州市', districts: ['鹿城区', '龙湾区', '瓯海区', '瑞安市', '乐清市'] }
+			]
+		},
+		{
+			name: '江苏省',
+			cities: [
+				{ name: '南京市', districts: ['鼓楼区', '玄武区', '秦淮区', '建邺区', '雨花台区', '栖霞区', '江宁区', '浦口区'] },
+				{ name: '苏州市', districts: ['姑苏区', '工业园区', '虎丘区', '吴中区', '相城区', '昆山市', '常熟市'] },
+				{ name: '无锡市', districts: ['梁溪区', '滨湖区', '新吴区', '锡山区', '惠山区', '江阴市'] }
+			]
+		},
+		{
+			name: '湖南省',
+			cities: [
+				{ name: '长沙市', districts: ['岳麓区', '芙蓉区', '天心区', '开福区', '雨花区', '望城区', '长沙县', '浏阳市'] },
+				{ name: '怀化市', districts: ['鹤城区', '洪江市', '芷江侗族自治县', '新晃侗族自治县'] }
+			]
+		},
+		{
+			name: '湖北省',
+			cities: [
+				{ name: '武汉市', districts: ['武昌区', '江汉区', '江岸区', '硚口区', '汉阳区', '洪山区', '东西湖区', '江夏区'] }
+			]
+		},
+		{
+			name: '广西壮族自治区',
+			cities: [
+				{ name: '南宁市', districts: ['青秀区', '兴宁区', '江南区', '西乡塘区', '良庆区', '邕宁区'] },
+				{ name: '桂林市', districts: ['秀峰区', '叠彩区', '象山区', '七星区', '雁山区'] }
+			]
+		},
+		{
+			name: '河南省',
+			cities: [
+				{ name: '郑州市', districts: ['金水区', '中原区', '二七区', '管城回族区', '惠济区', '郑东新区'] }
+			]
+		},
+		{
+			name: '陕西省',
+			cities: [
+				{ name: '西安市', districts: ['雁塔区', '碑林区', '莲湖区', '新城区', '未央区', '长安区', '高新区'] }
+			]
+		},
+		{
+			name: '山东省',
+			cities: [
+				{ name: '济南市', districts: ['历下区', '市中区', '槐荫区', '天桥区', '历城区'] },
+				{ name: '青岛市', districts: ['市南区', '市北区', '崂山区', '李沧区', '西海岸新区', '城阳区'] }
+			]
+		},
+		{
+			name: '福建省',
+			cities: [
+				{ name: '福州市', districts: ['鼓楼区', '台江区', '仓山区', '晋安区', '马尾区'] },
+				{ name: '厦门市', districts: ['思明区', '湖里区', '集美区', '海沧区', '同安区', '翔安区'] }
+			]
+		},
+		{
+			name: '安徽省',
+			cities: [
+				{ name: '合肥市', districts: ['蜀山区', '庐阳区', '包河区', '瑶海区', '政务区', '滨湖新区'] }
+			]
+		},
+		{
+			name: '江西省',
+			cities: [
+				{ name: '南昌市', districts: ['红谷滩区', '东湖区', '西湖区', '青云谱区', '青山湖区'] }
+			]
+		},
+		{
+			name: '天津市',
+			cities: [
+				{ name: '天津市', districts: ['和平区', '河西区', '南开区', '河东区', '河北区', '红桥区', '滨海新区', '西青区'] }
+			]
+		},
+		{
+			name: '河北省',
+			cities: [
+				{ name: '石家庄市', districts: ['长安区', '桥西区', '新华区', '裕华区', '藁城区'] }
+			]
+		},
+		{
+			name: '山西省',
+			cities: [
+				{ name: '太原市', districts: ['小店区', '迎泽区', '杏花岭区', '尖草坪区', '万柏林区', '晋源区'] }
+			]
+		},
+		{
+			name: '辽宁省',
+			cities: [
+				{ name: '沈阳市', districts: ['和平区', '沈河区', '皇姑区', '铁西区', '浑南区'] },
+				{ name: '大连市', districts: ['中山区', '西岗区', '沙河口区', '甘井子区', '高新园区'] }
+			]
+		},
+		{
+			name: '吉林省',
+			cities: [
+				{ name: '长春市', districts: ['朝阳区', '南关区', '宽城区', '二道区', '绿园区'] }
+			]
+		},
+		{
+			name: '黑龙江省',
+			cities: [
+				{ name: '哈尔滨市', districts: ['南岗区', '道里区', '道外区', '香坊区', '松北区'] }
+			]
+		},
+		{
+			name: '海南省',
+			cities: [
+				{ name: '海口市', districts: ['龙华区', '美兰区', '秀英区', '琼山区'] },
+				{ name: '三亚市', districts: ['吉阳区', '天涯区', '海棠区', '崖州区'] }
+			]
+		},
+		{
+			name: '甘肃省',
+			cities: [
+				{ name: '兰州市', districts: ['城关区', '七里河区', '安宁区', '西固区'] }
+			]
+		},
+		{
+			name: '青海省',
+			cities: [
+				{ name: '西宁市', districts: ['城中区', '城东区', '城西区', '城北区'] }
+			]
+		},
+		{
+			name: '内蒙古自治区',
+			cities: [
+				{ name: '呼和浩特市', districts: ['赛罕区', '新城区', '回民区', '玉泉区'] }
+			]
+		},
+		{
+			name: '宁夏回族自治区',
+			cities: [
+				{ name: '银川市', districts: ['金凤区', '兴庆区', '西夏区'] }
+			]
+		},
+		{
+			name: '新疆维吾尔自治区',
+			cities: [
+				{ name: '乌鲁木齐市', districts: ['天山区', '沙依巴克区', '新市区', '水磨沟区'] }
+			]
+		},
+		{
+			name: '西藏自治区',
+			cities: [
+				{ name: '拉萨市', districts: ['城关区', '堆龙德庆区', '达孜区'] }
+			]
+		}
+	];
+
+	const currentCities = computed(() => {
+		const hit = regionTree.find(p => p.name === selProvince.value);
+		return hit ? hit.cities : [];
+	});
+
+	const currentDistricts = computed(() => {
+		const hitCity = currentCities.value.find(c => c.name === selCity.value);
+		return hitCity ? hitCity.districts : [];
+	});
+
+	watch(() => props.visible, (val) => {
+		if (val) {
+			selProvince.value = props.province || '';
+			selCity.value = props.city || '';
+			selDistrict.value = props.district || '';
+			const hasP = selProvince.value && regionTree.some(p => p.name === selProvince.value);
+			manualMode.value = false;
+			if (!selProvince.value || !hasP) {
+				activeTab.value = 0;
+			} else if (!selCity.value || !currentCities.value.some(c => c.name === selCity.value)) {
+				activeTab.value = 1;
+			} else {
+				activeTab.value = 2;
+			}
+		}
+	});
+
+	function close() {
+		emit('update:visible', false);
+	}
+
+	function pickProvince(p) {
+		selProvince.value = p.name;
+		const firstCity = p.cities && p.cities[0] ? p.cities[0] : null;
+		selCity.value = firstCity ? firstCity.name : '';
+		selDistrict.value = (firstCity && firstCity.districts && firstCity.districts[0]) ? firstCity.districts[0] : '';
+		activeTab.value = 1;
+	}
+
+	function pickCity(c) {
+		selCity.value = c.name;
+		selDistrict.value = (c.districts && c.districts[0]) ? c.districts[0] : '';
+		activeTab.value = 2;
+	}
+
+	function pickDistrict(d) {
+		selDistrict.value = d;
+		confirmSelection();
+	}
+
+	function confirmSelection() {
+		const p = (selProvince.value || '').trim();
+		const c = (selCity.value || '').trim();
+		const d = (selDistrict.value || '').trim();
+		if (!p || !c || !d) {
+			uni.showToast({ title: '请完整选择或填写省市区', icon: 'none' });
+			return;
+		}
+		emit('confirm', { province: p, city: c, district: d });
+		close();
+	}
+</script>
+
+<style scoped>
+	.drawer-mask {
+		position: fixed;
+		inset: 0;
+		background: rgba(0, 0, 0, 0.55);
+		z-index: 1050;
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.drawer-sheet {
+		background: #FFFFFF;
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		padding: 30rpx 28rpx calc(32rpx + env(safe-area-inset-bottom));
+		max-height: 76vh;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+	}
+
+	.drawer-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 20rpx;
+		border-bottom: 1rpx solid #F0F0F2;
+	}
+
+	.dh-title {
+		font-size: 32rpx;
+		font-weight: 700;
+		color: #1F1F1F;
+	}
+
+	.dh-right {
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+	}
+
+	.mode-switch {
+		height: 50rpx;
+		padding: 0 18rpx;
+		border-radius: 25rpx;
+		background: #FFF7F0;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.ms-txt {
+		font-size: 22rpx;
+		color: #F0710D;
+		font-weight: 600;
+	}
+
+	.dh-close {
+		width: 48rpx;
+		height: 48rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.dh-close-img {
+		width: 28rpx;
+		height: 28rpx;
+		opacity: 0.6;
+	}
+
+	.step-tabs {
+		display: flex;
+		align-items: center;
+		gap: 36rpx;
+		padding: 20rpx 4rpx;
+		border-bottom: 1rpx solid #F0F0F2;
+	}
+
+	.s-tab {
+		position: relative;
+		padding-bottom: 12rpx;
+	}
+
+	.st-txt {
+		font-size: 28rpx;
+		color: #444444;
+	}
+
+	.s-tab.active .st-txt {
+		color: #F0710D;
+		font-weight: 700;
+	}
+
+	.s-tab.active::after {
+		content: '';
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 4rpx;
+		border-radius: 2rpx;
+		background: #F0710D;
+	}
+
+	.region-scroll {
+		height: 52vh;
+	}
+
+	.region-list {
+		padding: 10rpx 0;
+	}
+
+	.r-item {
+		height: 84rpx;
+		padding: 0 8rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		border-bottom: 1rpx solid #F8F8FA;
+	}
+
+	.ri-txt {
+		font-size: 28rpx;
+		color: #1F1F1F;
+	}
+
+	.r-item.selected .ri-txt {
+		color: #F0710D;
+		font-weight: 600;
+	}
+
+	.ri-check {
+		width: 28rpx;
+		height: 28rpx;
+	}
+
+	.manual-body {
+		padding: 24rpx 0 8rpx;
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+	}
+
+	.m-field {
+		display: flex;
+		align-items: center;
+		min-height: 88rpx;
+		border-bottom: 1rpx solid #F0F0F2;
+	}
+
+	.m-label {
+		width: 210rpx;
+		font-size: 28rpx;
+		color: #444444;
+		flex-shrink: 0;
+	}
+
+	.m-input {
+		flex: 1;
+		height: 80rpx;
+		font-size: 28rpx;
+		color: #1F1F1F;
+	}
+
+	.confirm-btn {
+		margin-top: 20rpx;
+		height: 84rpx;
+		border-radius: 42rpx;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.cb-txt {
+		font-size: 30rpx;
+		font-weight: 600;
+		color: #FFFFFF;
+	}
+
+	.clickable-hover:active {
+		opacity: 0.85;
+	}
+</style>
diff --git a/yjyf-app/components/RemarkTemplateDrawer.vue b/yjyf-app/components/RemarkTemplateDrawer.vue
index a476b36..3b3d69d 100644
--- a/yjyf-app/components/RemarkTemplateDrawer.vue
+++ b/yjyf-app/components/RemarkTemplateDrawer.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="drawer-mask" v-if="visible" @tap="close">
 		<view class="drawer-sheet" @tap.stop>
-			<!-- 标题栏（左对齐大字加粗，右侧关闭叉） -->
+			<!-- 标题栏 -->
 			<view class="drawer-head">
 				<text class="dh-title">选择常用备注模板</text>
 				<view class="dh-close clickable-hover" @tap="close">
@@ -9,29 +9,70 @@
 				</view>
 			</view>
 
-			<!-- 模板列表 -->
+			<!-- 新增个人常用备注栏 -->
+			<view class="add-tpl-bar">
+				<input
+					class="add-input"
+					v-model="newContent"
+					maxlength="60"
+					placeholder="输入自定义常用备注，保存后可随时选用"
+					@confirm="handleAddTpl"
+				/>
+				<view
+					class="add-btn clickable-hover"
+					:class="{ disabled: adding || !newContent.trim() }"
+					@tap="handleAddTpl"
+				>
+					<text class="add-btn-txt">{{ adding ? '保存中' : '存为常用' }}</text>
+				</view>
+			</view>
+
+			<!-- 模板列表（真实接口驱动） -->
 			<scroll-view class="drawer-body" scroll-y="true">
-				<view class="template-list">
+				<view class="state-box" v-if="loading && templateList.length === 0">
+					<text class="state-txt">正在加载备注模板...</text>
+				</view>
+
+				<view class="state-box" v-else-if="templateList.length === 0">
+					<text class="state-txt">暂无备注模板，可在上方添加</text>
+				</view>
+
+				<view class="template-list" v-else>
 					<view
 						class="tpl-item clickable-hover"
-						v-for="(tpl, idx) in templateList"
-						:key="idx"
-						:class="{ active: selectedIndexes.includes(idx) }"
-						@tap="toggleTpl(idx)"
+						v-for="tpl in templateList"
+						:key="tpl.id"
+						:class="{ active: selectedIds.includes(tpl.id) }"
+						@tap="toggleTpl(tpl.id)"
 					>
 						<view class="tpl-content">
-							<text class="tpl-txt">{{ tpl }}</text>
+							<view class="mine-tag" v-if="tpl.is_mine">
+								<text class="mine-tag-txt">自建</text>
+							</view>
+							<text class="tpl-txt">{{ tpl.content }}</text>
 						</view>
-						<view class="tpl-check">
-							<view class="check-box" :class="{ on: selectedIndexes.includes(idx) }">
-								<image class="check-img" v-if="selectedIndexes.includes(idx)" src="/static/icons/check-white.svg" mode="aspectFit" />
+						<view class="tpl-right">
+							<view
+								class="del-icon-wrap clickable-hover"
+								v-if="tpl.is_mine"
+								@tap.stop="handleDeleteTpl(tpl)"
+							>
+								<image class="del-img" src="/static/icons/trash.svg" mode="aspectFit" />
+							</view>
+							<view class="check-box" :class="{ on: selectedIds.includes(tpl.id) }">
+								<image
+									class="check-img"
+									v-if="selectedIds.includes(tpl.id)"
+									src="/static/icons/check-white.svg"
+									mode="aspectFit"
+								/>
 							</view>
 						</view>
 					</view>
 				</view>
 			</scroll-view>
 
-			<!-- 底部确定按钮（微圆角 12rpx 橙色实心长条） -->
+			<!-- 底部确定按钮 -->
 			<view class="drawer-foot">
 				<view class="confirm-btn clickable-hover" @tap="handleConfirm">
 					<text class="cb-txt">确定填入备注</text>
@@ -42,7 +83,9 @@
 </template>
 
 <script setup>
-	import { ref } from 'vue';
+	import { ref, watch } from 'vue';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
 
 	const props = defineProps({
 		visible: { type: Boolean, default: false }
@@ -50,24 +93,84 @@
 
 	const emit = defineEmits(['update:visible', 'select']);
 
-	const templateList = [
-		'师傅请自备人字梯及电钻等专业工具',
-		'客户白天上班不在家，请提前电话预约晚上或周末上门',
-		'新房已精装修入住，请务必穿戴防尘鞋套并做好地面防护',
-		'现场施工空间较狭窄，搬运时请轻拿轻放防止碰撞',
-		'货物已全部送达现场，请直接联系客户上门安装',
-		'需拆除旧品并清理现场施工垃圾',
-		'请师傅按时上门，如遇特殊情况请提前2小时告知'
-	];
+	const templateList = ref([]);
+	const selectedIds = ref([]);
+	const loading = ref(false);
+	const newContent = ref('');
+	const adding = ref(false);
+	const deletingId = ref(0);
 
-	const selectedIndexes = ref([]);
+	async function fetchTemplates() {
+		if (loading.value) return;
+		loading.value = true;
+		try {
+			const res = await api.remarkTemplates();
+			templateList.value = (res && Array.isArray(res.list)) ? res.list : [];
+		} catch (e) {
+			uni.showToast({ title: (e && e.msg) ? e.msg : '获取常用备注失败', icon: 'none' });
+		} finally {
+			loading.value = false;
+		}
+	}
 
-	function toggleTpl(idx) {
-		const pos = selectedIndexes.value.indexOf(idx);
+	watch(
+		() => props.visible,
+		(val) => {
+			if (val) {
+				fetchTemplates();
+			}
+		}
+	);
+
+	function toggleTpl(id) {
+		const pos = selectedIds.value.indexOf(id);
 		if (pos > -1) {
-			selectedIndexes.value.splice(pos, 1);
+			selectedIds.value.splice(pos, 1);
 		} else {
-			selectedIndexes.value.push(idx);
+			selectedIds.value.push(id);
+		}
+	}
+
+	async function handleAddTpl() {
+		const content = newContent.value.trim();
+		if (!content || adding.value) return;
+		if (!isLogin()) {
+			close();
+			toLogin();
+			return;
+		}
+		adding.value = true;
+		try {
+			const saved = await api.saveRemarkTemplate({ content });
+			newContent.value = '';
+			if (saved && saved.id) {
+				templateList.value.unshift(saved);
+				if (!selectedIds.value.includes(saved.id)) {
+					selectedIds.value.push(saved.id);
+				}
+			} else {
+				await fetchTemplates();
+			}
+			uni.showToast({ title: '已添加至常用备注', icon: 'success' });
+		} catch (e) {
+			uni.showToast({ title: (e && e.msg) ? e.msg : '保存常用备注失败', icon: 'none' });
+		} finally {
+			adding.value = false;
+		}
+	}
+
+	async function handleDeleteTpl(tpl) {
+		if (!tpl || !tpl.is_mine || deletingId.value) return;
+		deletingId.value = tpl.id;
+		try {
+			await api.deleteRemarkTemplate({ id: tpl.id });
+			templateList.value = templateList.value.filter(x => x.id !== tpl.id);
+			selectedIds.value = selectedIds.value.filter(id => id !== tpl.id);
+			uni.showToast({ title: '已删除', icon: 'none' });
+		} catch (e) {
+			uni.showToast({ title: (e && e.msg) ? e.msg : '删除备注失败', icon: 'none' });
+		} finally {
+			deletingId.value = 0;
 		}
 	}
 
@@ -76,21 +179,22 @@
 	}
 
 	function handleConfirm() {
-		const hits = selectedIndexes.value.map(i => templateList[i]);
+		const hits = templateList.value
+			.filter(item => selectedIds.value.includes(item.id))
+			.map(item => item.content);
 		if (hits.length > 0) {
 			emit('select', hits.join('；'));
 		}
-		selectedIndexes.value = [];
+		selectedIds.value = [];
 		close();
 	}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	.drawer-mask {
 		position: fixed;
 		inset: 0;
 		background: rgba(0, 0, 0, 0.6);
-		backdrop-filter: blur(2px);
 		z-index: 999;
 		display: flex;
 		flex-direction: column;
@@ -104,16 +208,15 @@
 	}
 
 	.drawer-sheet {
-		background: #FFFFFF;
+		background-color: $yjyf-bg-card;
 		border-top-left-radius: 28rpx;
 		border-top-right-radius: 28rpx;
-		padding: 36rpx 36rpx calc(30rpx + env(safe-area-inset-bottom));
-		max-height: 75vh;
+		padding: 32rpx 32rpx calc(28rpx + env(safe-area-inset-bottom));
+		max-height: 78vh;
 		display: flex;
 		flex-direction: column;
 		box-sizing: border-box;
 		animation: drawerSlideUp 0.26s cubic-bezier(0.16, 1, 0.3, 1);
-		box-shadow: 0 -8rpx 32rpx rgba(0, 0, 0, 0.08);
 	}
 
 	@keyframes drawerSlideUp {
@@ -125,14 +228,13 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding-bottom: 24rpx;
+		padding-bottom: 20rpx;
 	}
 
 	.dh-title {
 		font-size: 34rpx;
 		font-weight: 700;
-		color: #1A1A1A;
-		letter-spacing: 0.5rpx;
+		color: $yjyf-text-main;
 	}
 
 	.dh-close {
@@ -149,9 +251,58 @@
 		opacity: 0.75;
 	}
 
+	.add-tpl-bar {
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.add-input {
+		flex: 1;
+		height: 68rpx;
+		padding: 0 22rpx;
+		border-radius: $yjyf-radius-sm;
+		background-color: $yjyf-bg-page;
+		font-size: 26rpx;
+		color: $yjyf-text-main;
+	}
+
+	.add-btn {
+		height: 68rpx;
+		padding: 0 26rpx;
+		border-radius: $yjyf-radius-sm;
+		background-color: $yjyf-primary-bg;
+		border: 1rpx solid $yjyf-primary;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+	}
+
+	.add-btn.disabled {
+		opacity: 0.5;
+	}
+
+	.add-btn-txt {
+		font-size: 26rpx;
+		font-weight: 600;
+		color: $yjyf-primary;
+	}
+
 	.drawer-body {
-		max-height: 520rpx;
-		padding: 10rpx 0;
+		max-height: 500rpx;
+		padding: 6rpx 0;
+	}
+
+	.state-box {
+		padding: 64rpx 24rpx;
+		text-align: center;
+	}
+
+	.state-txt {
+		font-size: 26rpx;
+		color: $yjyf-text-secondary;
 	}
 
 	.template-list {
@@ -164,49 +315,89 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 26rpx 22rpx;
-		border-radius: 12rpx;
-		background: #F8F8F8;
+		padding: 24rpx 22rpx;
+		border-radius: $yjyf-radius-sm;
+		background-color: $yjyf-bg-page;
 		border: 2rpx solid transparent;
 		transition: all 0.18s ease;
 	}
 
 	.tpl-item.active {
-		background: #FFF8F2;
-		border-color: #F0710D;
+		background-color: $yjyf-primary-bg;
+		border-color: $yjyf-primary;
 	}
 
 	.tpl-content {
 		flex: 1;
-		padding-right: 20rpx;
+		padding-right: 16rpx;
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+		gap: 10rpx;
+	}
+
+	.mine-tag {
+		height: 34rpx;
+		padding: 0 10rpx;
+		border-radius: 6rpx;
+		background-color: $yjyf-primary-bg;
+		border: 1rpx solid $yjyf-primary-border;
+		display: inline-flex;
+		align-items: center;
+	}
+
+	.mine-tag-txt {
+		font-size: 22rpx;
+		color: $yjyf-primary;
+		line-height: 1;
 	}
 
 	.tpl-txt {
-		font-size: 28rpx;
-		color: #333333;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-regular;
 		line-height: 1.45;
 	}
 
 	.tpl-item.active .tpl-txt {
-		color: #F0710D;
+		color: $yjyf-primary;
 		font-weight: 500;
 	}
 
+	.tpl-right {
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+		flex-shrink: 0;
+	}
+
+	.del-icon-wrap {
+		width: 44rpx;
+		height: 44rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.del-img {
+		width: 28rpx;
+		height: 28rpx;
+		opacity: 0.7;
+	}
+
 	.check-box {
 		width: 38rpx;
 		height: 38rpx;
 		border-radius: 8rpx;
-		border: 2rpx solid #CCCCCC;
-		background: #FFFFFF;
+		border: 2rpx solid $yjyf-text-disabled;
+		background-color: $yjyf-bg-card;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		transition: all 0.18s ease;
 	}
 
 	.check-box.on {
-		background: #F0710D;
-		border-color: #F0710D;
+		background-color: $yjyf-primary;
+		border-color: $yjyf-primary;
 	}
 
 	.check-img {
@@ -215,28 +406,23 @@
 	}
 
 	.drawer-foot {
-		padding-top: 36rpx;
+		padding-top: 28rpx;
 	}
 
 	.confirm-btn {
 		height: 88rpx;
-		background: #F0710D;
-		border-radius: 12rpx;
+		background: $yjyf-gradient-primary;
+		border-radius: $yjyf-radius-sm;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		transition: background 0.15s ease, transform 0.1s ease;
-	}
-
-	.confirm-btn:active {
-		background: #E06305;
-		transform: scale(0.99);
+		box-shadow: $yjyf-shadow-button;
 	}
 
 	.cb-txt {
-		font-size: 32rpx;
+		font-size: $yjyf-font-title;
 		font-weight: 600;
-		color: #FFFFFF;
+		color: $yjyf-text-inverse;
 		letter-spacing: 2rpx;
 	}
 
diff --git a/yjyf-app/components/ServiceTypeDrawer.vue b/yjyf-app/components/ServiceTypeDrawer.vue
index d37e315..599f4d3 100644
--- a/yjyf-app/components/ServiceTypeDrawer.vue
+++ b/yjyf-app/components/ServiceTypeDrawer.vue
@@ -16,7 +16,7 @@
 
 			<!-- 流式方框标签列表（1:1 复刻图2 & 图3：横向自适应折行 + 选中橙框 + 右下角橙色三角勾） -->
 			<view class="drawer-body">
-				<view class="tag-grid">
+				<view class="tag-grid" v-if="displayList.length > 0">
 					<view
 						class="type-tag clickable-hover"
 						v-for="item in displayList"
@@ -31,6 +31,10 @@
 						</view>
 					</view>
 				</view>
+				<view class="empty-state" v-else>
+					<image class="empty-ico" src="/static/icons/empty-service.svg" mode="aspectFit" />
+					<text class="empty-txt">暂无可选服务项目</text>
+				</view>
 			</view>
 
 			<!-- 底部确定按钮 -->
@@ -54,16 +58,8 @@
 
 	const emit = defineEmits(['update:visible', 'confirm']);
 
-	const defaultTypes = [
-		{ code: 'install', name: '安装', price: 60, unit: '件' },
-		{ code: 'repair', name: '维修', price: 40, unit: '次' },
-		{ code: 'remove', name: '拆旧', price: 30, unit: '件' },
-		{ code: 'deliver', name: '送货到家', price: 50, unit: '次' },
-		{ code: 'deliver_install', name: '送货到家并安装', price: 90, unit: '件' }
-	];
-
 	const displayList = computed(() => {
-		return props.list && props.list.length ? props.list : defaultTypes;
+		return Array.isArray(props.list) ? props.list : [];
 	});
 
 	const selectedCode = ref(props.currentCode);
@@ -75,7 +71,7 @@
 	watch(() => props.visible, (v) => {
 		if (v) {
 			const exists = displayList.value.some(item => item.code === props.currentCode || item.name === props.currentCode);
-			selectedCode.value = exists ? props.currentCode : (displayList.value[0]?.code || 'install');
+			selectedCode.value = exists ? props.currentCode : (displayList.value[0]?.code || displayList.value[0]?.name || '');
 		}
 	});
 
@@ -102,8 +98,12 @@
 	}
 
 	function handleConfirm() {
+		if (!displayList.value.length) {
+			close();
+			return;
+		}
 		const hit = displayList.value.find(item => item.code === selectedCode.value || item.name === selectedCode.value) || displayList.value[0];
-		emit('confirm', hit);
+		if (hit) emit('confirm', hit);
 		close();
 	}
 </script>
@@ -236,6 +236,25 @@
 		height: 16rpx;
 	}
 
+	.empty-state {
+		padding: 56rpx 0 24rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.empty-ico {
+		width: 120rpx;
+		height: 120rpx;
+		margin-bottom: 16rpx;
+	}
+
+	.empty-txt {
+		font-size: 26rpx;
+		color: #888888;
+	}
+
 	.drawer-foot {
 		padding-top: 16rpx;
 	}
diff --git a/yjyf-app/components/YjyfMasterTabBar.vue b/yjyf-app/components/YjyfMasterTabBar.vue
index 317ffab..a6578c2 100644
--- a/yjyf-app/components/YjyfMasterTabBar.vue
+++ b/yjyf-app/components/YjyfMasterTabBar.vue
@@ -15,7 +15,12 @@
 
 			<!-- 3. 消息 -->
 			<view class="tab" :class="{ on: activeIndex === 2 }" @tap="switchTab(2)">
-				<image class="tab-icon" :src="activeIndex === 2 ? '/static/tabbar/master/message-active.svg' : '/static/tabbar/master/message.svg'" mode="aspectFit" />
+				<view class="icon-box">
+					<image class="tab-icon" :src="activeIndex === 2 ? '/static/tabbar/master/message-active.svg' : '/static/tabbar/master/message.svg'" mode="aspectFit" />
+					<view class="unread-badge" v-if="unreadCount > 0">
+						<text class="unread-txt">{{ unreadCount > 99 ? '99+' : unreadCount }}</text>
+					</view>
+				</view>
 				<text class="tab-txt">消息</text>
 			</view>
 
@@ -32,7 +37,10 @@
 </template>
 
 <script setup>
-	import { ref, watch } from 'vue';
+	import { ref, watch, onMounted, onBeforeUnmount } from 'vue';
+	import api from '@/utils/api.js';
+	import { isLogin } from '@/utils/request.js';
+	import { setRole } from '@/utils/role.js';
 
 	const props = defineProps({
 		current: {
@@ -49,18 +57,42 @@
 	const emit = defineEmits(['change']);
 
 	const activeIndex = ref(props.current);
+	const unreadCount = ref(0);
+
+	async function fetchUnread() {
+		if (!isLogin()) {
+			unreadCount.value = 0;
+			return;
+		}
+		try {
+			const res = await api.messageUnread({ type: 'master' });
+			unreadCount.value = Number(res?.unread || 0);
+		} catch (e) {}
+	}
+
 	watch(() => props.current, (val) => {
 		activeIndex.value = val;
+		fetchUnread();
+	});
+
+	onMounted(() => {
+		fetchUnread();
+		uni.$on('yjyf:refreshUnread', fetchUnread);
+	});
+
+	onBeforeUnmount(() => {
+		uni.$off('yjyf:refreshUnread', fetchUnread);
 	});
 
 	const TAB_ROUTES = [
 		'/pages/master/hall',
 		'/pages/master/orders',
-		'/pages/message/message',
+		'/pages/message/message?role=master',
 		'/pages/master/workbench'
 	];
 
 	function switchTab(index) {
+		setRole('master');
 		if (activeIndex.value === index) return;
 		activeIndex.value = index;
 
@@ -83,9 +115,18 @@
 </script>
 
 <style scoped>
+	/* #ifdef MP-WEIXIN */
+	:host {
+		display: block;
+		width: 100%;
+		flex-shrink: 0;
+	}
+	/* #endif */
+
 	.yjyf-master-tabbar-container {
 		position: relative;
 		z-index: 99;
+		flex-shrink: 0;
 	}
 
 	.tabbar {
@@ -114,6 +155,34 @@
 		padding-bottom: 6rpx;
 	}
 
+	.icon-box {
+		position: relative;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.unread-badge {
+		position: absolute;
+		top: -10rpx;
+		right: -22rpx;
+		min-width: 32rpx;
+		height: 32rpx;
+		padding: 0 8rpx;
+		border-radius: 16rpx;
+		background: #E8331B;
+		border: 2rpx solid #FFFFFF;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+	}
+	.unread-txt {
+		font-size: 22rpx;
+		color: #FFFFFF;
+		font-weight: 700;
+		line-height: 1;
+		transform: scale(0.85);
+	}
 	.tab-icon {
 		width: 44rpx;
 		height: 44rpx;
diff --git a/yjyf-app/components/YjyfNavBar.vue b/yjyf-app/components/YjyfNavBar.vue
index d25db21..b2fc69c 100644
--- a/yjyf-app/components/YjyfNavBar.vue
+++ b/yjyf-app/components/YjyfNavBar.vue
@@ -7,10 +7,7 @@
 				'theme-' + theme,
 				{ 'is-fixed': fixed, 'has-border': border && theme === 'white' }
 			]"
-			:style="{
-				paddingTop: statusBarHeight + 'px',
-				background: customBackground || ''
-			}"
+			:style="navbarRootStyle"
 		>
 			<view class="nav-content" :style="{ height: navBarHeight + 'px' }">
 				<!-- 1. 绝对居中的标题容器（保障物理视口绝对正中心，不被两端挤压） -->
@@ -93,8 +90,7 @@
 		'pages/mine/mine',
 		'pages/master/hall',
 		'pages/master/orders',
-		'pages/master/workbench',
-		'pages/merchant/workbench'
+		'pages/master/workbench'
 	];
 
 	// 安全区域与各尺寸响应式变量
@@ -109,6 +105,17 @@
 		return statusBarHeight.value + navBarHeight.value;
 	});
 
+	// 根节点动态样式（仅在显式传入 customBackground 时附加，避免空 background 重置渐变尺寸）
+	const navbarRootStyle = computed(() => {
+		const style = {
+			paddingTop: statusBarHeight.value + 'px'
+		};
+		if (props.customBackground) {
+			style.background = props.customBackground;
+		}
+		return style;
+	});
+
 	// 对称避让安全距离（确保居中标题绝不偏心，两端完全对称）
 	const sideSafeWidth = computed(() => {
 		return Math.max(leftWidth.value, rightSpaceWidth.value);
@@ -204,10 +211,19 @@
 </script>
 
 <style scoped>
+	/* #ifdef MP-WEIXIN */
+	:host {
+		display: block;
+		width: 100%;
+		flex-shrink: 0;
+	}
+	/* #endif */
+
 	.yjyf-navbar-wrapper {
 		position: relative;
 		width: 100%;
 		z-index: 990;
+		flex-shrink: 0;
 	}
 
 	.yjyf-navbar {
@@ -377,5 +393,9 @@
 	}
 	.placeholder-orange {
 		background-color: #F0710D;
+		background-image: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		background-size: 100% 600rpx;
+		background-position: 0 0;
+		background-repeat: no-repeat;
 	}
 </style>
diff --git a/yjyf-app/components/YjyfRefreshScroll.vue b/yjyf-app/components/YjyfRefreshScroll.vue
new file mode 100644
index 0000000..05e4286
--- /dev/null
+++ b/yjyf-app/components/YjyfRefreshScroll.vue
@@ -0,0 +1,588 @@
+<template>
+	<view
+		class="yjyf-refresh-wrap"
+		:class="'theme-' + theme"
+		@touchend="onTouchRelease"
+		@touchcancel="onTouchRelease"
+	>
+		<!-- 1. 顶部无缝背景延展幕布（彻底消灭下拉白缝与纯色深橙补丁断层） -->
+		<view
+			class="refresh-backdrop"
+			:class="'backdrop-' + theme"
+			:style="backdropStyle"
+		></view>
+
+		<!-- 2. 灵动阻尼下拉动效舞台（60fps 跟手缩放旋转 + 双轨流光加载 + 成功勾选回弹） -->
+		<view
+			class="refresh-stage"
+			:class="{ 'is-animating': !isPulling }"
+			:style="stageStyle"
+		>
+			<view
+				class="refresh-capsule"
+				:class="[
+					'capsule-' + theme,
+					'st-' + status,
+					{ 'is-ready': status === 'ready', 'is-animating': !isPulling }
+				]"
+				:style="capsuleStyle"
+			>
+				<view class="icon-ring" :class="'ring-' + status">
+					<!-- 阶段 A：下拉蓄力 & 达标翻转箭头 -->
+					<image
+						v-if="status === 'pulling' || status === 'ready' || status === 'idle' || status === 'closing'"
+						class="rf-icon arrow-icon"
+						:class="{ 'is-flipped': status === 'ready', 'is-smooth': status === 'ready' || !isPulling }"
+						:style="arrowStyle"
+						:src="theme === 'orange' ? '/static/icons/refresh/pull-arrow-white.svg' : '/static/icons/refresh/pull-arrow-orange.svg'"
+						mode="aspectFit"
+					/>
+					<!-- 阶段 B：双轨流光匀速旋转环 -->
+					<image
+						v-else-if="status === 'refreshing'"
+						class="rf-icon spin-icon"
+						:src="theme === 'orange' ? '/static/icons/refresh/spinner-white.svg' : '/static/icons/refresh/spinner-orange.svg'"
+						mode="aspectFit"
+					/>
+					<!-- 阶段 C：刷新完成微弹对勾 -->
+					<image
+						v-else-if="status === 'done'"
+						class="rf-icon done-icon"
+						:src="theme === 'orange' ? '/static/icons/refresh/check-white.svg' : '/static/icons/refresh/check-orange.svg'"
+						mode="aspectFit"
+					/>
+				</view>
+
+				<text class="rf-text" :class="'txt-' + theme">{{ statusText }}</text>
+
+				<!-- 正在刷新态律动微光三圆点（纯 CSS 几何圆点，零字符） -->
+				<view class="pulse-dots" v-if="status === 'refreshing'">
+					<view class="p-dot d1" :class="'dot-' + theme"></view>
+					<view class="p-dot d2" :class="'dot-' + theme"></view>
+					<view class="p-dot d3" :class="'dot-' + theme"></view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 3. 原生物理阻尼滚动容器 -->
+		<scroll-view
+			class="yjyf-inner-scroll"
+			scroll-y
+			refresher-enabled
+			:refresher-threshold="threshold"
+			:refresher-triggered="refresherTriggered"
+			refresher-default-style="none"
+			refresher-background="transparent"
+			:lower-threshold="lowerThreshold"
+			@refresherpulling="onPulling"
+			@refresherrefresh="onRefresh"
+			@refresherrestore="onRestore"
+			@refresherabort="onRestore"
+			@scrolltolower="onScrollToLower"
+			@scroll="onScroll"
+		>
+			<view class="yjyf-scroll-body">
+				<slot></slot>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
+	import { getNavBarMetrics } from '@/utils/system.js';
+
+	const props = defineProps({
+		theme: {
+			type: String,
+			default: 'orange', // 'orange'（沉浸橙金渐变无缝融合） | 'light'（浅灰底悬浮白玉胶囊）
+			validator: (v) => ['orange', 'light'].includes(v)
+		},
+		navOffset: {
+			type: Number,
+			default: 0
+		},
+		refreshTask: {
+			type: Function,
+			default: null
+		},
+		threshold: {
+			type: Number,
+			default: 56
+		},
+		lowerThreshold: {
+			type: Number,
+			default: 80
+		}
+	});
+
+	const emit = defineEmits(['refresh', 'scrolltolower', 'scroll']);
+
+	const autoNavHeight = ref(64);
+	const refresherTriggered = ref(false);
+	const isPulling = ref(false);
+	const pullDistance = ref(0);
+	// 状态机：idle | pulling | ready | refreshing | done | closing
+	const status = ref('idle');
+
+	let isRefreshingLock = false;
+	let hasVibrated = false;
+	let releaseTimer = null;
+	let doneTimer = null;
+	let closeTimer = null;
+
+	function clearAllTimers() {
+		if (releaseTimer) { clearTimeout(releaseTimer); releaseTimer = null; }
+		if (doneTimer) { clearTimeout(doneTimer); doneTimer = null; }
+		if (closeTimer) { clearTimeout(closeTimer); closeTimer = null; }
+	}
+
+	function syncNavMetrics() {
+		const metrics = getNavBarMetrics();
+		if (metrics && metrics.totalNavHeight) {
+			autoNavHeight.value = metrics.totalNavHeight;
+		}
+	}
+
+	syncNavMetrics();
+	onMounted(() => {
+		syncNavMetrics();
+	});
+	onBeforeUnmount(() => {
+		clearAllTimers();
+	});
+
+	const actualNavOffset = computed(() => {
+		return props.navOffset > 0 ? props.navOffset : autoNavHeight.value;
+	});
+
+	const pullProgress = computed(() => {
+		if (status.value === 'refreshing' || status.value === 'done') return 1;
+		return Math.min(1, Math.max(0, pullDistance.value / props.threshold));
+	});
+
+	const backdropStyle = computed(() => {
+		if (props.theme === 'orange') {
+			const dynamicH = Math.max(140, Math.ceil(pullDistance.value + 48));
+			return {
+				height: dynamicH + 'px',
+				backgroundPosition: '0 -' + actualNavOffset.value + 'px'
+			};
+		}
+		return {
+			height: Math.max(100, Math.ceil(pullDistance.value + 32)) + 'px'
+		};
+	});
+
+	const stageStyle = computed(() => {
+		let h = 0;
+		if (status.value === 'refreshing' || status.value === 'done') {
+			h = props.threshold;
+		} else if (status.value === 'pulling' || status.value === 'ready') {
+			h = Math.max(0, Math.min(pullDistance.value, 150));
+		} else {
+			h = 0;
+		}
+		const visible = h > 4 && status.value !== 'idle' && status.value !== 'closing';
+		return {
+			height: h + 'px',
+			opacity: visible ? Math.min(1, Math.max(0, (h - 6) / 24)) : 0
+		};
+	});
+
+	const capsuleStyle = computed(() => {
+		if (status.value === 'refreshing' || status.value === 'done') {
+			return {
+				transform: 'scale(1)'
+			};
+		}
+		if (status.value === 'closing' || status.value === 'idle') {
+			return {
+				transform: 'scale(0.84)'
+			};
+		}
+		const p = pullProgress.value;
+		const scale = status.value === 'ready' ? 1.02 : (0.8 + 0.2 * p);
+		return {
+			transform: `scale(${scale.toFixed(3)})`
+		};
+	});
+
+	const arrowStyle = computed(() => {
+		if (status.value === 'ready') {
+			return { transform: 'rotate(180deg)' };
+		}
+		const deg = Math.round(pullProgress.value * 18);
+		return { transform: `rotate(${deg}deg)` };
+	});
+
+	const statusText = computed(() => {
+		switch (status.value) {
+			case 'ready':
+				return '释放立即刷新';
+			case 'refreshing':
+				return '正在刷新';
+			case 'done':
+				return '刷新成功';
+			default:
+				return '下拉刷新';
+		}
+	});
+
+	function triggerLightHaptic() {
+		if (hasVibrated) return;
+		hasVibrated = true;
+		// #ifdef MP-WEIXIN
+		try {
+			if (typeof uni.vibrateShort === 'function') {
+				uni.vibrateShort({ type: 'light', fail: () => {} });
+			}
+		} catch (e) {}
+		// #endif
+	}
+
+	function onPulling(e) {
+		if (isRefreshingLock) return;
+		if (releaseTimer) { clearTimeout(releaseTimer); releaseTimer = null; }
+		if (closeTimer) { clearTimeout(closeTimer); closeTimer = null; }
+
+		const detail = (e && e.detail) ? e.detail : {};
+		const rawDy = detail.dy !== undefined ? Number(detail.dy) : (detail.deltaY !== undefined ? Number(detail.deltaY) : 0);
+		const dy = Math.max(0, rawDy || 0);
+
+		isPulling.value = true;
+		pullDistance.value = dy;
+
+		if (dy >= props.threshold) {
+			if (status.value !== 'ready') {
+				status.value = 'ready';
+				triggerLightHaptic();
+			}
+		} else if (dy > 2) {
+			status.value = 'pulling';
+			if (dy < props.threshold - 8) {
+				hasVibrated = false;
+			}
+		} else {
+			status.value = 'idle';
+			hasVibrated = false;
+		}
+	}
+
+	function onTouchRelease() {
+		if (isRefreshingLock) return;
+		if (releaseTimer) clearTimeout(releaseTimer);
+		// 若松手后 45ms 内未进入 refreshing（即下拉未达阈值半途释放），主动平滑回弹归零
+		releaseTimer = setTimeout(() => {
+			if (!isRefreshingLock && status.value !== 'refreshing' && status.value !== 'done') {
+				isPulling.value = false;
+				pullDistance.value = 0;
+				status.value = 'closing';
+				hasVibrated = false;
+				closeTimer = setTimeout(() => {
+					if (!isRefreshingLock && !isPulling.value) {
+						status.value = 'idle';
+					}
+				}, 260);
+			}
+		}, 45);
+	}
+
+	async function onRefresh() {
+		if (isRefreshingLock) return;
+		clearAllTimers();
+		isRefreshingLock = true;
+		isPulling.value = false;
+		refresherTriggered.value = true;
+		pullDistance.value = props.threshold;
+		status.value = 'refreshing';
+
+		const startAt = Date.now();
+		try {
+			if (typeof props.refreshTask === 'function') {
+				await props.refreshTask();
+			} else {
+				await new Promise((resolve) => {
+					emit('refresh', resolve);
+					setTimeout(resolve, 500);
+				});
+			}
+		} catch (e) {
+		} finally {
+			const elapsed = Date.now() - startAt;
+			const minSpinMs = 380;
+			const remainSpin = elapsed < minSpinMs ? (minSpinMs - elapsed) : 0;
+
+			doneTimer = setTimeout(() => {
+				status.value = 'done';
+				doneTimer = setTimeout(() => {
+					refresherTriggered.value = false;
+					pullDistance.value = 0;
+					status.value = 'closing';
+					hasVibrated = false;
+					closeTimer = setTimeout(() => {
+						isRefreshingLock = false;
+						if (!isPulling.value) {
+							status.value = 'idle';
+						}
+					}, 280);
+				}, 240);
+			}, remainSpin);
+		}
+	}
+
+	function onRestore() {
+		clearAllTimers();
+		refresherTriggered.value = false;
+		isPulling.value = false;
+		pullDistance.value = 0;
+		isRefreshingLock = false;
+		hasVibrated = false;
+		status.value = 'idle';
+	}
+
+	function onScrollToLower(e) {
+		emit('scrolltolower', e);
+	}
+
+	function onScroll(e) {
+		emit('scroll', e);
+	}
+
+	defineExpose({
+		triggerRefresh: onRefresh
+	});
+</script>
+
+<style scoped>
+	/* #ifdef MP-WEIXIN */
+	:host {
+		flex: 1;
+		min-height: 0;
+		height: 0;
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+	}
+	/* #endif */
+
+	.yjyf-refresh-wrap {
+		position: relative;
+		flex: 1;
+		min-height: 0;
+		height: 100%;
+		width: 100%;
+		overflow: hidden;
+		background-color: #F5F6F8;
+		display: flex;
+		flex-direction: column;
+	}
+
+	/* 1. 顶部无缝背景幕布层：与 YjyfNavBar 共享同一张 135deg 连续渐变 */
+	.refresh-backdrop {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 0;
+		pointer-events: none;
+		max-height: 75%;
+	}
+
+	.backdrop-orange {
+		background-color: #F0710D;
+		background-image: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		background-size: 100% 600rpx;
+		background-position: 0 0;
+		background-repeat: no-repeat;
+	}
+
+	.backdrop-light {
+		background-color: #F5F6F8;
+	}
+
+	/* 2. 下拉动效舞台层 */
+	.refresh-stage {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		overflow: hidden;
+		pointer-events: none;
+		will-change: height, opacity;
+	}
+
+	.refresh-stage.is-animating {
+		transition: height 0.28s cubic-bezier(0.22, 1, 0.36, 1), opacity 0.22s ease;
+	}
+
+	/* 灵动悬浮胶囊指示器 */
+	.refresh-capsule {
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		height: 60rpx;
+		padding: 0 28rpx 0 22rpx;
+		border-radius: 30rpx;
+		box-sizing: border-box;
+		will-change: transform;
+	}
+
+	.refresh-capsule.is-animating {
+		transition: transform 0.26s cubic-bezier(0.34, 1.56, 0.64, 1), background-color 0.2s ease;
+	}
+
+	/* 橙色渐变主题：半透明微光磨砂胶囊，与暖橙渐变浑然一体 */
+	.capsule-orange {
+		background: rgba(255, 255, 255, 0.18);
+		border: 1rpx solid rgba(255, 255, 255, 0.34);
+		box-shadow: 0 6rpx 20rpx rgba(185, 68, 0, 0.14);
+	}
+
+	.capsule-orange.is-ready,
+	.capsule-orange.st-refreshing,
+	.capsule-orange.st-done {
+		background: rgba(255, 255, 255, 0.24);
+		border-color: rgba(255, 255, 255, 0.48);
+	}
+
+	/* 浅灰主题：白玉微投影悬浮胶囊 */
+	.capsule-light {
+		background: #FFFFFF;
+		border: 1rpx solid rgba(240, 113, 13, 0.12);
+		box-shadow: 0 6rpx 22rpx rgba(31, 31, 31, 0.06);
+	}
+
+	.capsule-light.is-ready,
+	.capsule-light.st-refreshing {
+		border-color: rgba(240, 113, 13, 0.24);
+		box-shadow: 0 8rpx 24rpx rgba(240, 113, 13, 0.10);
+	}
+
+	.capsule-light.st-done {
+		border-color: rgba(47, 168, 79, 0.22);
+	}
+
+	/* 图标容积与动效 */
+	.icon-ring {
+		width: 34rpx;
+		height: 34rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-right: 12rpx;
+		flex-shrink: 0;
+		position: relative;
+	}
+
+	.rf-icon {
+		width: 34rpx;
+		height: 34rpx;
+		display: block;
+	}
+
+	.arrow-icon.is-smooth {
+		transition: transform 0.24s cubic-bezier(0.34, 1.56, 0.64, 1);
+	}
+
+	.spin-icon {
+		animation: yjyfRefreshSpin 0.72s linear infinite;
+	}
+
+	.done-icon {
+		animation: yjyfRefreshPop 0.26s cubic-bezier(0.34, 1.56, 0.64, 1) both;
+	}
+
+	/* 状态提示文字 */
+	.rf-text {
+		font-size: 24rpx;
+		font-weight: 500;
+		line-height: 1;
+		letter-spacing: 0.5rpx;
+		white-space: nowrap;
+	}
+
+	.txt-orange {
+		color: #FFFFFF;
+	}
+
+	.txt-light {
+		color: #444444;
+	}
+
+	.capsule-light.is-ready .txt-light,
+	.capsule-light.st-refreshing .txt-light {
+		color: #F0710D;
+		font-weight: 600;
+	}
+
+	.capsule-light.st-done .txt-light {
+		color: #2FA84F;
+		font-weight: 600;
+	}
+
+	/* 正在刷新微光律动点 */
+	.pulse-dots {
+		display: inline-flex;
+		align-items: center;
+		margin-left: 6rpx;
+		height: 24rpx;
+	}
+
+	.p-dot {
+		width: 5rpx;
+		height: 5rpx;
+		border-radius: 50%;
+		margin-left: 4rpx;
+		animation: yjyfDotWave 1.1s ease-in-out infinite;
+	}
+
+	.dot-orange {
+		background-color: rgba(255, 255, 255, 0.92);
+	}
+
+	.dot-light {
+		background-color: #F0710D;
+	}
+
+	.p-dot.d1 { animation-delay: 0s; }
+	.p-dot.d2 { animation-delay: 0.18s; }
+	.p-dot.d3 { animation-delay: 0.36s; }
+
+	/* 3. 原生滚动层与不透明内容画板 */
+	.yjyf-inner-scroll {
+		position: relative;
+		z-index: 2;
+		flex: 1;
+		height: 0;
+		width: 100%;
+		background: transparent;
+	}
+
+	.yjyf-scroll-body {
+		min-height: 100%;
+		width: 100%;
+		background-color: #F5F6F8;
+		box-sizing: border-box;
+	}
+
+	@keyframes yjyfRefreshSpin {
+		0% { transform: rotate(0deg); }
+		100% { transform: rotate(360deg); }
+	}
+
+	@keyframes yjyfRefreshPop {
+		0% { transform: scale(0.55); opacity: 0.4; }
+		100% { transform: scale(1); opacity: 1; }
+	}
+
+	@keyframes yjyfDotWave {
+		0%, 80%, 100% { transform: translateY(0); opacity: 0.38; }
+		40% { transform: translateY(-4rpx); opacity: 1; }
+	}
+</style>
diff --git a/yjyf-app/components/YjyfTabBar.vue b/yjyf-app/components/YjyfTabBar.vue
index e8aa512..ad3fa8c 100644
--- a/yjyf-app/components/YjyfTabBar.vue
+++ b/yjyf-app/components/YjyfTabBar.vue
@@ -23,7 +23,12 @@
 
 			<!-- 4. 消息 -->
 			<view class="tab" :class="{ on: activeIndex === 2 }" @tap="switchTab(2)">
-				<image class="tab-icon" :src="activeIndex === 2 ? '/static/tabbar/message-active.svg' : '/static/tabbar/message.svg'" mode="aspectFit" />
+				<view class="icon-box">
+					<image class="tab-icon" :src="activeIndex === 2 ? '/static/tabbar/message-active.svg' : '/static/tabbar/message.svg'" mode="aspectFit" />
+					<view class="unread-badge" v-if="unreadCount > 0">
+						<text class="unread-txt">{{ unreadCount > 99 ? '99+' : unreadCount }}</text>
+					</view>
+				</view>
 				<text class="tab-txt">消息</text>
 			</view>
 
@@ -40,8 +45,10 @@
 </template>
 
 <script setup>
-	import { ref, watch } from 'vue';
+	import { ref, watch, onMounted, onBeforeUnmount } from 'vue';
+	import api from '@/utils/api.js';
 	import { isLogin, toLogin } from '@/utils/request.js';
+	import { setRole } from '@/utils/role.js';
 
 	const props = defineProps({
 		current: {
@@ -57,54 +64,83 @@
 	const emit = defineEmits(['change']);
 
 	const activeIndex = ref(props.current);
+	const unreadCount = ref(0);
+
+	async function fetchUnread() {
+		if (!isLogin()) {
+			unreadCount.value = 0;
+			return;
+		}
+		try {
+			const res = await api.messageUnread({ type: 'user' });
+			unreadCount.value = Number(res?.unread || 0);
+		} catch (e) {}
+	}
+
 	watch(() => props.current, (val) => {
 		activeIndex.value = val;
+		fetchUnread();
+	});
+
+	onMounted(() => {
+		fetchUnread();
+		uni.$on('yjyf:refreshUnread', fetchUnread);
+	});
+
+	onBeforeUnmount(() => {
+		uni.$off('yjyf:refreshUnread', fetchUnread);
 	});
 
 	const TAB_ROUTES = [
 		'/pages/index/index',
-		'/pages/order/list',
-		'/pages/message/message',
-		'/pages/mine/mine'
+		'/pages/index/index?tab=1',
+		'/pages/index/index?tab=2',
+		'/pages/index/index?tab=3'
 	];
 
-	function needLogin() {
+	function needLogin(targetUrl) {
 		if (isLogin()) return true;
-		toLogin();
+		toLogin(targetUrl);
 		return false;
 	}
 
 	function onOrder() {
+		setRole('user');
 		if (activeIndex.value === 'order') return;
-		if (!needLogin()) return;
+		if (!needLogin('/pages/category/category')) return;
 		uni.navigateTo({ url: '/pages/category/category' });
 	}
 
 	function switchTab(index) {
+		setRole('user');
 		if (activeIndex.value === index) return;
-		if (index > 0 && !needLogin()) return;
+		const targetUrl = TAB_ROUTES[index] || '/pages/index/index';
+		if (index > 0 && !needLogin(targetUrl)) return;
 
 		activeIndex.value = index;
 		emit('change', index);
 
 		if (props.standalone) {
-			const targetUrl = TAB_ROUTES[index];
-			if (targetUrl) {
-				uni.redirectTo({
-					url: targetUrl,
-					fail: () => {
-						uni.reLaunch({ url: targetUrl });
-					}
-				});
-			}
+			uni.reLaunch({
+				url: targetUrl
+			});
 		}
 	}
 </script>
 
 <style scoped>
+	/* #ifdef MP-WEIXIN */
+	:host {
+		display: block;
+		width: 100%;
+		flex-shrink: 0;
+	}
+	/* #endif */
+
 	.yjyf-tabbar-container {
 		position: relative;
 		z-index: 99;
+		flex-shrink: 0;
 	}
 
 	/* ---------- 自定义底部导航栏 (保持 content-box 避免被 safe-area 挤压高度) ---------- */
@@ -146,6 +182,34 @@
 	}
 
 	/* 底部图标 */
+	.icon-box {
+		position: relative;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.unread-badge {
+		position: absolute;
+		top: -10rpx;
+		right: -22rpx;
+		min-width: 32rpx;
+		height: 32rpx;
+		padding: 0 8rpx;
+		border-radius: 16rpx;
+		background: #E8331B;
+		border: 2rpx solid #FFFFFF;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+	}
+	.unread-txt {
+		font-size: 22rpx;
+		color: #FFFFFF;
+		font-weight: 700;
+		line-height: 1;
+		transform: scale(0.85);
+	}
 	.tab-icon {
 		width: 44rpx;
 		height: 44rpx;
@@ -189,12 +253,11 @@
 	}
 
 	.fab-txt {
-		font-size: 20rpx;
+		font-size: 22rpx;
 		font-weight: 600;
 		color: #ffffff;
 		line-height: 1;
 		margin-top: 4rpx;
-		letter-spacing: 0.5rpx;
 	}
 
 	.tabbar-placeholder {
diff --git a/yjyf-app/components/master/MasterHallView.vue b/yjyf-app/components/master/MasterHallView.vue
index cbfbc25..6d8f0bd 100644
--- a/yjyf-app/components/master/MasterHallView.vue
+++ b/yjyf-app/components/master/MasterHallView.vue
@@ -3,8 +3,15 @@
 		<!-- 1. 顶部统一固定吸顶导航栏（与其他页面 100% 统一，固定在手机顶部不随滚动划出） -->
 		<YjyfNavBar theme="orange" title="抢单大厅" :fixed="true" :placeholder="true" />
 
+		<YjyfRefreshScroll
+			class="hall-scroll"
+			theme="orange"
+			:nav-offset="stickyTop"
+			:refresh-task="load"
+			@scrolltolower="loadMore"
+		>
 		<!-- 师傅状态与听单控制台（与顶部导航栏共享连续渐变零断层接壤） -->
-		<view class="hall-hero" :style="{ marginTop: (-stickyTop) + 'px', paddingTop: stickyTop + 'px' }">
+		<view class="hall-hero" :style="{ backgroundPosition: '0 -' + stickyTop + 'px' }">
 			<view class="hall-header-body">
 				<view class="header-main">
 					<view class="h-user">
@@ -32,13 +39,15 @@
 					<view class="hq-item clickable-hover" @tap="goSkills">
 						<image class="hq-ico" src="/static/icons/master/hall-skill-setting.svg" mode="aspectFit" />
 						<text class="hq-txt">接单技能：已认证 {{ skillsCount }} 项</text>
-						<text class="hq-link">设置 ›</text>
+						<text class="hq-link">设置</text>
+						<image class="hq-arrow" src="/static/icons/arrow-right-white.svg" mode="aspectFit" />
 					</view>
 					<view class="hq-divider"></view>
 					<view class="hq-item clickable-hover" @tap="goMyOrders">
 						<text class="hq-txt">待处理工单：</text>
 						<text class="hq-num">{{ info.todo_count || 0 }}</text>
-						<text class="hq-link">去履约 ›</text>
+						<text class="hq-link">去履约</text>
+						<image class="hq-arrow" src="/static/icons/arrow-right-white.svg" mode="aspectFit" />
 					</view>
 				</view>
 			</view>
@@ -55,7 +64,7 @@
 		</view>
 
 		<!-- 3. 吸顶双层筛选与排序导航栏 -->
-		<view class="filter-sticky" :style="{ top: stickyTop + 'px' }">
+		<view class="filter-sticky">
 			<view class="type-tabs">
 				<view
 					v-for="t in typeTabs"
@@ -121,8 +130,8 @@
 
 					<view class="hd-right">
 						<template v-if="o.price_type === 'quote'">
-							<text class="quote-slogan">报价快，中选高</text>
-							<text class="quote-label">师傅竞价</text>
+							<text class="quote-slogan">开放竞价</text>
+							<text class="quote-label">师傅报价</text>
 						</template>
 						<template v-else>
 							<text class="price-mode-tag" :class="o.price_type">{{ o.price_type === 'custom' ? '用户定价' : '一口价' }}</text>
@@ -207,6 +216,9 @@
 					</view>
 				</view>
 			</view>
+			<view class="list-foot-tip">
+				<text class="foot-tip-txt">{{ loadingMore ? '正在加载更多工单...' : (hasMore ? '上滑加载更多工单' : '已展示全部待接工单') }}</text>
+			</view>
 		</view>
 
 		<!-- 6. 友好空状态 -->
@@ -219,6 +231,7 @@
 				<view class="skill-cta clickable-hover" @tap="goSkills">扩展接单技能</view>
 			</view>
 		</view>
+		</YjyfRefreshScroll>
 
 		<!-- 7. 抢单防误点二次确认弹窗 -->
 		<view class="confirm-mask" v-if="selectedOrder" @tap="selectedOrder = null">
@@ -249,6 +262,7 @@
 	import { isLogin, toLogin } from '@/utils/request.js';
 	import { getNavBarMetrics } from '@/utils/system.js';
 	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import YjyfRefreshScroll from '@/components/YjyfRefreshScroll.vue';
 
 	const stickyTop = ref(getNavBarMetrics().totalNavHeight);
 
@@ -257,6 +271,10 @@
 	const skillsCount = ref(0);
 	const counts = ref({ all: 0, fixed: 0, quote: 0, custom: 0 });
 	const loading = ref(false);
+	const loadingMore = ref(false);
+	const page = ref(1);
+	const hasMore = ref(false);
+	const coords = ref({ lat: '', lng: '' });
 	const type = ref('all');
 	const sort = ref('new');
 	const selectedOrder = ref(null);
@@ -282,7 +300,8 @@
 		return list.value.slice(0, 6).map((o) => {
 			const region = o.district || o.city || '同城';
 			const priceDesc = o.price_type === 'quote' ? '开放竞价中' : `工费 ¥${o.pay_amount}`;
-			return `${region}业主发布【${o.service_name}】工单，${priceDesc}，距离 ${o.distance_text || '附近'}`;
+			const distPart = o.distance_text ? `，距离 ${o.distance_text}` : '';
+			return `${region}业主发布【${o.service_name}】工单，${priceDesc}${distPart}`;
 		});
 	});
 
@@ -341,30 +360,51 @@
 			selectedOrder.value = null;
 			uni.showToast({ title: '抢单成功！', icon: 'success' });
 			setTimeout(() => {
+				grabbing.value = false;
 				uni.navigateTo({
 					url: `/pages/master/success?order_id=${o.id}&mobile=${res.user_mobile || ''}`
 				});
 			}, 450);
 		} catch (e) {
-			uni.showToast({ title: e.msg || '手慢了，该订单已被接走', icon: 'none' });
-		} finally {
 			grabbing.value = false;
+			uni.showToast({ title: e.msg || '手慢了，该订单已被接走', icon: 'none' });
 		}
 	}
 
+	function tryUpdateLocation() {
+		try {
+			uni.getLocation({
+				type: 'gcj02',
+				success: (pos) => {
+					if (pos && pos.latitude && pos.longitude) {
+						coords.value = { lat: pos.latitude, lng: pos.longitude };
+					}
+				},
+				fail: () => {}
+			});
+		} catch (e) {}
+	}
+
 	async function load() {
 		if (!isLogin()) {
 			toLogin();
 			return;
 		}
 		loading.value = true;
+		page.value = 1;
 		try {
+			const params = { page: 1, limit: 20, type: type.value, sort: sort.value };
+			if (coords.value.lat && coords.value.lng) {
+				params.lat = coords.value.lat;
+				params.lng = coords.value.lng;
+			}
 			const [hallRes, meRes] = await Promise.all([
-				api.masterHall({ limit: 20, type: type.value, sort: sort.value }),
+				api.masterHall(params),
 				api.masterInfo()
 			]);
 			if (hallRes) {
 				list.value = hallRes.list || [];
+				hasMore.value = !!hallRes.has_more;
 				if (hallRes.counts) {
 					counts.value = hallRes.counts;
 				}
@@ -379,18 +419,48 @@
 		}
 	}
 
+	async function loadMore() {
+		if (loading.value || loadingMore.value || !hasMore.value) return;
+		loadingMore.value = true;
+		const nextPage = page.value + 1;
+		try {
+			const params = { page: nextPage, limit: 20, type: type.value, sort: sort.value };
+			if (coords.value.lat && coords.value.lng) {
+				params.lat = coords.value.lat;
+				params.lng = coords.value.lng;
+			}
+			const hallRes = await api.masterHall(params);
+			if (hallRes) {
+				const rows = hallRes.list || [];
+				list.value = list.value.concat(rows);
+				page.value = nextPage;
+				hasMore.value = !!hallRes.has_more;
+			}
+		} catch (e) {
+		} finally {
+			loadingMore.value = false;
+		}
+	}
+
+	const togglingWork = ref(false);
+
 	async function toggleWork() {
-		if (!info.value) return;
+		if (!info.value || togglingWork.value) return;
+		togglingWork.value = true;
 		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) {}
+		} catch (e) {
+		} finally {
+			togglingWork.value = false;
+		}
 	}
 
 	onMounted(() => {
 		stickyTop.value = getNavBarMetrics().totalNavHeight;
+		tryUpdateLocation();
 		load();
 	});
 
@@ -401,11 +471,20 @@
 
 <style scoped>
 	.hall-view {
-		min-height: 100vh;
+		height: calc(100vh - 104rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 104rpx - env(safe-area-inset-bottom));
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
 		width: 100%;
 		box-sizing: border-box;
 		background: #F5F6F8;
-		padding-bottom: 32rpx;
+	}
+
+	.hall-scroll {
+		flex: 1;
+		height: 0;
+		width: 100%;
 	}
 
 	/* 1. 顶部沉浸式师傅状态区（标准 135deg 橙色渐变，与 TopBar 共享连续渐变起点） */
@@ -563,6 +642,12 @@
 		white-space: nowrap;
 		line-height: 1;
 	}
+	.hq-arrow {
+		width: 20rpx;
+		height: 20rpx;
+		margin-left: 4rpx;
+		flex-shrink: 0;
+	}
 	.hq-divider {
 		width: 1rpx;
 		height: 28rpx;
@@ -769,7 +854,15 @@
 
 	/* 5. 抢单卡片列表 */
 	.list {
-		padding: 20rpx 24rpx;
+		padding: 20rpx 24rpx 32rpx;
+	}
+	.list-foot-tip {
+		padding: 12rpx 0 24rpx;
+		text-align: center;
+	}
+	.foot-tip-txt {
+		font-size: 22rpx;
+		color: #AAAAAA;
 	}
 	.order-card {
 		background: #FFFFFF;
diff --git a/yjyf-app/components/master/MasterMessageView.vue b/yjyf-app/components/master/MasterMessageView.vue
index 4828f62..ee4b983 100644
--- a/yjyf-app/components/master/MasterMessageView.vue
+++ b/yjyf-app/components/master/MasterMessageView.vue
@@ -1,6 +1,5 @@
 <template>
 	<view class="message-view">
-		<!-- 统一顶部橙色导航栏 -->
 		<YjyfNavBar theme="orange" title="消息中心" />
 
 		<view class="head">
@@ -10,17 +9,45 @@
 			<text class="read-all clickable-hover" @tap="readAll">全部已读</text>
 		</view>
 
-		<view class="list">
-			<view class="msg" :class="{ unread: !m.is_read }" v-for="m in list" :key="m.id" @tap="open(m)">
-				<view class="msg-top">
-					<view class="dot" v-if="!m.is_read"></view>
-					<text class="title">{{ m.title }}</text>
-					<text class="time">{{ m.time_text }}</text>
+		<YjyfRefreshScroll
+			class="msg-scroll"
+			theme="light"
+			:refresh-task="load"
+		>
+			<view class="list">
+				<view class="msg clickable-hover" :class="{ unread: !m.is_read }" v-for="m in list" :key="m.id" @tap="open(m)">
+					<view class="msg-top">
+						<view class="dot" v-if="!m.is_read"></view>
+						<text class="title">{{ m.title }}</text>
+						<text class="time">{{ m.time_text }}</text>
+					</view>
+					<text class="content">{{ m.content }}</text>
+					<view class="go-row" v-if="m.order_id">
+						<text class="go">查看工单详情</text>
+						<image class="go-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<view class="empty-box" v-if="!loading && !list.length">
+					<image class="empty-img" src="/static/icons/empty-message.svg" mode="aspectFit" />
+					<text class="empty-txt">暂无消息通知</text>
 				</view>
-				<text class="content">{{ m.content }}</text>
-				<text class="go" v-if="m.order_id">查看订单 ›</text>
 			</view>
-			<view class="empty" v-if="!loading && !list.length">暂无消息</view>
+		</YjyfRefreshScroll>
+
+		<!-- 系统通知详情抽屉 -->
+		<view class="detail-mask" v-if="activeMsg" @tap="activeMsg = null">
+			<view class="detail-sheet" @tap.stop>
+				<view class="ds-head">
+					<text class="ds-title">{{ activeMsg.title }}</text>
+					<view class="ds-close clickable-hover" @tap="activeMsg = null">
+						<image class="ds-close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<text class="ds-time">{{ activeMsg.time_text }}</text>
+				<text class="ds-content">{{ activeMsg.content }}</text>
+				<view class="ds-btn clickable-hover" @tap="activeMsg = null">我知道了</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -30,16 +57,18 @@
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin } from '@/utils/request.js';
 	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import YjyfRefreshScroll from '@/components/YjyfRefreshScroll.vue';
 
 	const emit = defineEmits(['switch-tab']);
 
 	const list = ref([]);
 	const loading = ref(false);
 	const category = ref('all');
+	const activeMsg = ref(null);
 
 	const cats = [
 		{ key: 'all', name: '全部' },
-		{ key: 'order', name: '订单' },
+		{ key: 'order', name: '工单' },
 		{ key: 'system', name: '系统' },
 		{ key: 'remind', name: '提醒' }
 	];
@@ -48,7 +77,7 @@
 		if (!isLogin()) { toLogin(); return; }
 		loading.value = true;
 		try {
-			const res = await api.messageList({ category: category.value, limit: 30 });
+			const res = await api.messageList({ type: 'master', category: category.value, limit: 30 });
 			list.value = res.list || [];
 		} catch (e) {
 		} finally {
@@ -61,24 +90,39 @@
 		load();
 	}
 
+	const readingAll = ref(false);
+
 	async function open(m) {
-		if (!m.is_read) {
+		if (!m.is_read && !m._reading) {
+			m._reading = true;
 			try {
-				await api.messageRead({ id: m.id });
+				await api.messageRead({ id: m.id, type: 'master' });
 				m.is_read = 1;
-			} catch (e) {}
+				uni.$emit('yjyf:unreadChanged');
+			} catch (e) {
+			} finally {
+				m._reading = false;
+			}
 		}
 		if (m.order_id) {
-			emit('switch-tab', 1);
+			uni.navigateTo({ url: `/pages/master/detail?id=${m.order_id}` });
+		} else {
+			activeMsg.value = m;
 		}
 	}
 
 	async function readAll() {
+		if (readingAll.value) return;
+		readingAll.value = true;
 		try {
-			const res = await api.messageReadAll({});
-			uni.showToast({ title: '已全部标记已读（' + res.count + ' 条）', icon: 'none' });
-			load();
-		} catch (e) {}
+			const res = await api.messageReadAll({ type: 'master' });
+			uni.showToast({ title: '已全部标记已读（' + (res.count || 0) + ' 条）', icon: 'none' });
+			uni.$emit('yjyf:unreadChanged');
+			await load();
+		} catch (e) {
+		} finally {
+			readingAll.value = false;
+		}
 	}
 
 	onMounted(() => {
@@ -90,22 +134,118 @@
 	});
 </script>
 
-<style scoped>
-	.message-view { min-height: 100vh; background: #F5F6F8; padding-bottom: 40rpx; }
-	.head { display: flex; align-items: center; background: #fff; padding: 20rpx 24rpx; box-shadow: 0 4rpx 12rpx rgba(0,0,0,.03); }
-	.cats { flex: 1; display: flex; }
-	.cat { margin-right: 14rpx; padding: 0 22rpx; line-height: 54rpx; border-radius: 27rpx; background: #F5F5F5; font-size: 24rpx; color: #666; }
-	.cat.on { background: #FFF3E6; color: #E36B0C; font-weight: 600; }
-	.read-all { font-size: 24rpx; color: #F0710D; }
-	.list { padding: 22rpx 28rpx; }
-	.msg { background: #fff; border-radius: 20rpx; padding: 22rpx 24rpx; margin-bottom: 18rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06); }
-	.msg.unread { border-left: 6rpx solid #F0710D; }
+<style lang="scss" scoped>
+	.message-view {
+		height: calc(100vh - 112rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 112rpx - env(safe-area-inset-bottom));
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		background: $yjyf-bg-page;
+	}
+
+	.head {
+		flex-shrink: 0;
+		position: relative;
+		z-index: 2;
+		display: flex;
+		align-items: center;
+		background: $yjyf-bg-card;
+		padding: 20rpx $yjyf-space-md;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.msg-scroll { flex: 1; height: 0; width: 100%; }
+	.cats { flex: 1; display: flex; gap: 14rpx; }
+	.cat {
+		padding: 0 24rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+	}
+	.cat.on {
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+	.read-all { font-size: $yjyf-font-sub; color: $yjyf-primary; font-weight: 500; }
+
+	.list { padding: $yjyf-space-md; }
+	.msg {
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		padding: $yjyf-space-md;
+		margin-bottom: 20rpx;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.msg.unread { border-left: 6rpx solid $yjyf-primary; }
 	.msg-top { display: flex; align-items: center; }
-	.dot { width: 12rpx; height: 12rpx; border-radius: 50%; background: #F0710D; margin-right: 10rpx; }
-	.title { flex: 1; min-width: 0; font-size: 28rpx; font-weight: 600; color: #1F1F1F; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }
-	.time { flex-shrink: 0; margin-left: 12rpx; font-size: 22rpx; color: #AAAAAA; }
-	.content { display: block; margin-top: 10rpx; font-size: 24rpx; color: #666; line-height: 34rpx; }
-	.go { display: block; margin-top: 10rpx; font-size: 22rpx; color: #4A7CFF; }
-	.empty { padding: 110rpx 0; text-align: center; font-size: 24rpx; color: #9A9A9A; }
-	.clickable-hover:active { opacity: 0.85; transform: scale(0.98); }
+	.dot { width: 14rpx; height: 14rpx; border-radius: 50%; background: $yjyf-primary; margin-right: 12rpx; flex-shrink: 0; }
+	.title { flex: 1; min-width: 0; font-size: $yjyf-font-body; font-weight: 700; color: $yjyf-text-main; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }
+	.time { flex-shrink: 0; margin-left: 12rpx; font-size: $yjyf-font-micro; color: $yjyf-text-muted; }
+	.content {
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		overflow: hidden;
+		margin-top: 12rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		line-height: 1.5;
+	}
+	.go-row {
+		margin-top: 16rpx;
+		padding-top: 14rpx;
+		border-top: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.go { font-size: $yjyf-font-sub; color: $yjyf-primary; font-weight: 500; }
+	.go-arrow { width: 26rpx; height: 26rpx; opacity: 0.6; }
+
+	.empty-box {
+		padding: 140rpx 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.empty-img { width: 160rpx; height: 160rpx; margin-bottom: 20rpx; }
+	.empty-txt { font-size: $yjyf-font-sub; color: $yjyf-text-secondary; }
+
+	.detail-mask {
+		position: fixed;
+		inset: 0;
+		background: rgba(0, 0, 0, 0.55);
+		z-index: 1000;
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+	.detail-sheet {
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-lg $yjyf-radius-lg 0 0;
+		padding: 36rpx $yjyf-space-lg calc(36rpx + env(safe-area-inset-bottom));
+	}
+	.ds-head { display: flex; align-items: center; justify-content: space-between; gap: 16rpx; }
+	.ds-title { flex: 1; font-size: $yjyf-font-title; font-weight: 700; color: $yjyf-text-main; }
+	.ds-close { width: 56rpx; height: 56rpx; display: flex; align-items: center; justify-content: flex-end; }
+	.ds-close-ico { width: 32rpx; height: 32rpx; opacity: 0.65; }
+	.ds-time { display: block; margin-top: 10rpx; font-size: $yjyf-font-micro; color: $yjyf-text-muted; }
+	.ds-content { display: block; margin: 28rpx 0 40rpx; font-size: $yjyf-font-body; color: $yjyf-text-regular; line-height: 1.65; white-space: pre-wrap; }
+	.ds-btn {
+		height: 88rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		color: #FFFFFF;
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.clickable-hover:active { opacity: 0.85; }
 </style>
diff --git a/yjyf-app/components/master/MasterOrdersView.vue b/yjyf-app/components/master/MasterOrdersView.vue
index a671f90..13c085f 100644
--- a/yjyf-app/components/master/MasterOrdersView.vue
+++ b/yjyf-app/components/master/MasterOrdersView.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="orders-view">
-		<!-- 统一规范顶部橙色导航栏 -->
+		<!-- 统一品牌橙色导航栏 -->
 		<YjyfNavBar theme="orange" title="接单管理" />
 
-		<!-- 顶部状态漏斗看板（对标工奇兵 4 态流转漏斗） -->
-		<view class="funnel-card" :style="{ top: stickyTop + 'px' }">
+		<!-- 顶部状态漏斗看板 -->
+		<view class="funnel-card">
 			<view class="funnel-row">
 				<view class="f-item clickable-hover" :class="{ on: cur === 'active' }" @tap="switchTab('active')">
 					<text class="f-num">{{ activeCount }}</text>
@@ -31,73 +31,113 @@
 			</view>
 		</view>
 
-		<!-- 订单列表 -->
-		<view class="list" v-if="list.length">
-			<view class="item" v-for="o in list" :key="o.id">
-				<view class="hd">
-					<view class="svc-box">
-						<text class="svc">{{ o.service_name }}</text>
-						<view class="time-urgent-pill" v-if="Number(o.status) === 3 && !o.contact_time">
-							<image class="time-urgent-ico" src="/static/icons/master/order-time.svg" mode="aspectFit" />
-							<text class="time-urgent-txt">2小时首联中</text>
+		<YjyfRefreshScroll
+			class="orders-scroll"
+			theme="light"
+			:refresh-task="refreshAll"
+			@scrolltolower="loadMore"
+		>
+			<!-- 工单摘要列表（整卡点击进入履约详情，底部仅保留唯一主行动按钮） -->
+			<view class="list" v-if="list.length">
+				<view
+					class="item clickable-hover"
+					v-for="o in list"
+					:key="o.id"
+					@tap="goDetail(o)"
+				>
+					<view class="hd">
+						<view class="svc-box">
+							<text class="svc">{{ o.service_name }}</text>
+							<view class="time-urgent-pill" v-if="Number(o.status) === 3 && !o.contact_time">
+								<image class="time-urgent-ico" src="/static/icons/master/order-time.svg" mode="aspectFit" />
+								<text class="time-urgent-txt">待首联</text>
+							</view>
+						</view>
+						<view class="hd-right">
+							<view class="status-badge" :class="'st-' + o.status">
+								<text class="status-txt">{{ o.status_text }}</text>
+							</view>
+							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 						</view>
 					</view>
-					<view class="status-badge" :class="'st-' + o.status">
-						<text class="status-txt">{{ o.status_text }}</text>
-					</view>
-				</view>
 
-				<view class="bd">
-					<view class="info-line">
-						<image class="info-ico" src="/static/icons/master/order-loc.svg" mode="aspectFit" />
-						<text class="addr-txt">{{ o.address }}</text>
-					</view>
-					<view class="info-line">
-						<image class="info-ico" src="/static/icons/master/order-time.svg" mode="aspectFit" />
-						<text class="meta-txt">预约时间：{{ o.appoint_text }}</text>
-					</view>
-					<view class="meta-tags">
-						<text class="tag">楼层 {{ o.floor }} 层</text>
-						<text class="tag">{{ Number(o.has_elevator) ? '有电梯' : '步梯无电梯' }}</text>
-						<text class="tag" v-if="o.goods_model">型号：{{ o.goods_model }}</text>
-					</view>
-					<view class="customer-row">
-						<view class="cust-mobile" @tap="call(o)">
-							<image class="phone-ico" src="/static/icons/phone.svg" mode="aspectFit" />
-							<text class="phone-num">客户：{{ o.mobile }}</text>
+					<view class="bd">
+						<view class="info-line">
+							<image class="info-ico" src="/static/icons/master/order-loc.svg" mode="aspectFit" />
+							<text class="addr-txt">{{ o.address }}</text>
 						</view>
+						<view class="info-line">
+							<image class="info-ico" src="/static/icons/master/order-time.svg" mode="aspectFit" />
+							<text class="meta-txt">预约时间：{{ o.appoint_text }}</text>
+						</view>
+						<view class="meta-tags">
+							<text class="tag">楼层 {{ o.floor || 1 }} 层</text>
+							<text class="tag">{{ Number(o.has_elevator) ? '有电梯' : '步梯无电梯' }}</text>
+							<text class="tag" v-if="o.goods_model">规格：{{ o.goods_model }}</text>
+						</view>
+					</view>
+
+					<view class="ft">
 						<view class="amt-box">
+							<text class="amt-label">订单金额</text>
 							<text class="amt-symbol">¥</text>
-							<text class="amt-val">{{ o.pay_amount }}</text>
+							<text class="amt-val">{{ Number(o.pay_amount || o.total_amount || 0).toFixed(2) }}</text>
+						</view>
+
+						<view class="ops" @tap.stop>
+							<view
+								class="op outline clickable-hover"
+								v-if="Number(o.status) >= 3 && Number(o.status) <= 7"
+								@tap="call(o)"
+							>联系客户</view>
+
+							<view
+								class="op primary clickable-hover"
+								v-if="Number(o.status) === 3"
+								@tap="goDetail(o, 'schedule')"
+							>约定上门</view>
+							<view
+								class="op primary clickable-hover"
+								v-else-if="Number(o.status) === 4"
+								@tap="quickArrive(o)"
+							>到达打卡</view>
+							<view
+								class="op primary clickable-hover"
+								v-else-if="Number(o.status) === 5"
+								@tap="quickStart(o)"
+							>开始服务</view>
+							<view
+								class="op primary clickable-hover"
+								v-else-if="Number(o.status) === 6"
+								@tap="goDetail(o, 'finish')"
+							>拍照完工</view>
+							<view
+								class="op primary clickable-hover"
+								v-else-if="Number(o.status) === 7"
+								@tap="goDetail(o, 'verify')"
+							>核销结算</view>
+							<view
+								class="op outline clickable-hover"
+								v-else
+								@tap="goDetail(o)"
+							>工单详情</view>
 						</view>
 					</view>
 				</view>
 
-				<!-- 操作动作条 -->
-				<view class="ops">
-					<view class="op clickable-hover" v-if="Number(o.status) === 3 && !o.contact_time" @tap="act('contact', o)">标记已联系</view>
-					<view class="op clickable-hover" v-if="Number(o.status) === 3" @tap="act('schedule', o)">约定上门</view>
-					<view class="op clickable-hover" v-if="Number(o.status) === 4" @tap="act('arrive', o)">到达打卡</view>
-					<view class="op clickable-hover" v-if="Number(o.status) === 5" @tap="act('start', o)">开始服务</view>
-					<view class="op clickable-hover" v-if="Number(o.status) === 5 || Number(o.status) === 6" @tap="act('requestDiff', o)">增项补差</view>
-					<view class="op primary clickable-hover" v-if="Number(o.status) === 6" @tap="act('finish', o)">现场水印拍照完工</view>
-					<view class="op primary clickable-hover" v-if="Number(o.status) === 7" @tap="act('verifyCode', o)">输入验证码核销</view>
-					<view class="op clickable-hover" v-if="Number(o.status) === 7" @tap="call(o)">联系客户催码</view>
-					<view class="op clickable-hover" v-if="Number(o.status) === 3 || Number(o.status) === 4" @tap="call(o)">联系客户</view>
+				<view class="more-tip">
+					<text class="more-txt">{{ loadingMore ? '正在加载更多...' : (hasMore ? '上拉加载更多工单' : '已展示全部工单') }}</text>
 				</view>
 			</view>
-		</view>
 
-		<!-- 空状态引导 -->
-		<view class="empty-state" v-if="!loading && !list.length">
-			<image class="empty-img" src="/static/icons/master/empty-orders.svg" mode="aspectFit" />
-			<text class="empty-title">当前无{{ curTabText }}工单</text>
-			<text class="empty-sub">前往订单大厅，海量订单实时抢</text>
-			<view class="empty-cta clickable-hover" @tap="goHall">前往大厅抢单</view>
-		</view>
-
-		<!-- 水印合成离屏 Canvas -->
-		<canvas canvas-id="watermarkCanvas" :style="{ width: canvasW + 'px', height: canvasH + 'px', position: 'fixed', left: '-9999px', top: '-9999px' }"></canvas>
+			<!-- 空状态引导 -->
+			<view class="empty-state" v-if="!loading && !list.length">
+				<image class="empty-img" src="/static/icons/master/empty-orders.svg" mode="aspectFit" />
+				<text class="empty-title">暂无{{ curTabText }}工单</text>
+				<text class="empty-sub">前往抢单大厅查看周边新发布的工单</text>
+				<view class="empty-cta clickable-hover" @tap="goHall">前往抢单大厅</view>
+			</view>
+		</YjyfRefreshScroll>
 	</view>
 </template>
 
@@ -105,374 +145,487 @@
 	import { ref, computed, onMounted } from 'vue';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin } from '@/utils/request.js';
-	import { getNavBarMetrics } from '@/utils/system.js';
 	import YjyfNavBar from '@/components/YjyfNavBar.vue';
-
-	const stickyTop = ref(getNavBarMetrics().totalNavHeight);
+	import YjyfRefreshScroll from '@/components/YjyfRefreshScroll.vue';
 
 	const emit = defineEmits(['switch-tab']);
 
 	const cur = ref('active');
 	const list = ref([]);
+	const page = ref(1);
+	const hasMore = ref(false);
 	const loading = ref(false);
+	const loadingMore = ref(false);
+	const actingId = ref(0);
+
 	const activeCount = ref(0);
 	const verifyCount = ref(0);
 	const completedCount = ref(0);
 	const quoteCount = ref(0);
-	const canvasW = ref(750);
-	const canvasH = ref(1000);
-
-	function getNowTimeStr() {
-		const d = new Date();
-		const pad = (n) => String(n).padStart(2, '0');
-		return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
-	}
-
-	function createWatermarkPhoto(tempPath, o) {
-		return new Promise((resolve) => {
-			uni.getImageInfo({
-				src: tempPath,
-				success: (info) => {
-					let w = info.width;
-					let h = info.height;
-					const maxEdge = 1200;
-					if (w > maxEdge || h > maxEdge) {
-						if (w > h) {
-							h = Math.round((h * maxEdge) / w);
-							w = maxEdge;
-						} else {
-							w = Math.round((w * maxEdge) / h);
-							h = maxEdge;
-						}
-					}
-					canvasW.value = w;
-					canvasH.value = h;
-
-					setTimeout(() => {
-						const ctx = uni.createCanvasContext('watermarkCanvas');
-						ctx.drawImage(info.path, 0, 0, w, h);
-
-						const barHeight = Math.max(90, Math.round(h * 0.16));
-						ctx.setFillStyle('rgba(0, 0, 0, 0.65)');
-						ctx.fillRect(0, h - barHeight, w, barHeight);
-
-						const fontSize = Math.max(14, Math.round(w * 0.028));
-						ctx.setFillStyle('#FFFFFF');
-						ctx.setFontSize(fontSize);
-
-						const timeStr = getNowTimeStr();
-						const line1 = `【优匠优服·现场施工取证】 时间: ${timeStr}`;
-						const line2 = `施工地点: ${o.address || '客户服务现场'}`;
-						const line3 = `工单流水: ${o.order_no || o.id}`;
-
-						const paddingX = Math.round(w * 0.04);
-						const lineSpacing = Math.round(barHeight / 3.4);
-						const startY = h - barHeight + lineSpacing - 4;
-
-						ctx.fillText(line1, paddingX, startY);
-						ctx.fillText(line2, paddingX, startY + lineSpacing);
-						ctx.fillText(line3, paddingX, startY + lineSpacing * 2);
-
-						ctx.draw(false, () => {
-							uni.canvasToTempFilePath({
-								canvasId: 'watermarkCanvas',
-								fileType: 'jpg',
-								quality: 0.85,
-								success: (res) => resolve(res.tempFilePath),
-								fail: () => resolve(tempPath)
-							});
-						});
-					}, 150);
-				},
-				fail: () => resolve(tempPath)
-			});
-		});
-	}
 
 	const curTabText = computed(() => {
-		const m = { active: '待处理', verify: '待验收', completed: '已完成' };
-		return m[cur.value] || '';
+		const map = { active: '待处理', verify: '待验收', completed: '已完成' };
+		return map[cur.value] || '';
 	});
 
 	async function loadCounts() {
+		if (!isLogin()) return;
 		try {
-			const infoRes = await api.masterInfo();
-			if (infoRes && infoRes.master) {
-				activeCount.value = infoRes.master.todo_count || 0;
-				verifyCount.value = infoRes.master.verify_count || 0;
-			}
-			const qRes = await api.masterQuotes();
-			quoteCount.value = (qRes.list || []).length;
+			const [a, v, c, q] = await Promise.all([
+				api.masterOrders({ status: 'active', page: 1, limit: 1 }),
+				api.masterOrders({ status: 'verify', page: 1, limit: 1 }),
+				api.masterOrders({ status: 'completed', page: 1, limit: 1 }),
+				api.masterQuotes()
+			]);
+			activeCount.value = Number(a && a.total ? a.total : 0);
+			verifyCount.value = Number(v && v.total ? v.total : 0);
+			completedCount.value = Number(c && c.total ? c.total : 0);
+			quoteCount.value = (q && q.list) ? q.list.length : 0;
 		} catch (e) {}
 	}
 
 	async function load() {
-		if (!isLogin()) { toLogin(); return; }
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		page.value = 1;
 		loading.value = true;
 		try {
-			const res = await api.masterOrders({ status: cur.value, limit: 20 });
-			list.value = res.list || [];
-			if (cur.value === 'completed') {
-				completedCount.value = (res.list || []).length;
-			}
+			const res = await api.masterOrders({ status: cur.value, page: 1, limit: 15 });
+			list.value = (res && res.list) ? res.list : [];
+			hasMore.value = !!(res && res.has_more);
 		} catch (e) {
 		} finally {
 			loading.value = false;
 		}
 	}
 
+	async function loadMore() {
+		if (loading.value || loadingMore.value || !hasMore.value) return;
+		const nextPage = page.value + 1;
+		loadingMore.value = true;
+		try {
+			const res = await api.masterOrders({ status: cur.value, page: nextPage, limit: 15 });
+			const rows = (res && res.list) ? res.list : [];
+			list.value = list.value.concat(rows);
+			page.value = nextPage;
+			hasMore.value = !!(res && res.has_more);
+		} catch (e) {
+		} finally {
+			loadingMore.value = false;
+		}
+	}
+
+	async function refreshAll() {
+		await Promise.all([load(), loadCounts()]);
+	}
+
 	function switchTab(k) {
+		if (cur.value === k) return;
 		cur.value = k;
 		load();
 	}
 
+	function goDetail(o, action = '') {
+		const q = action ? `?id=${o.id}&action=${action}` : `?id=${o.id}`;
+		uni.navigateTo({ url: `/pages/master/detail${q}` });
+	}
+
+	const callingId = ref(0);
+
+	async function call(o) {
+		if (!o || !o.mobile) return;
+		if (!o.contact_time && callingId.value !== o.id) {
+			callingId.value = o.id;
+			try {
+				await api.masterContact({ order_id: o.id });
+				o.contact_time = Math.floor(Date.now() / 1000);
+			} catch (e) {
+			} finally {
+				callingId.value = 0;
+			}
+		}
+		uni.makePhoneCall({ phoneNumber: o.mobile, fail: () => {} });
+	}
+
+	async function quickArrive(o) {
+		if (actingId.value === o.id) return;
+		actingId.value = o.id;
+		try {
+			const loc = await new Promise((resolve) => {
+				uni.getLocation({
+					type: 'gcj02',
+					success: (r) => resolve({ lat: r.latitude, lng: r.longitude }),
+					fail: () => resolve({})
+				});
+			});
+			await api.masterArrive({ order_id: o.id, lat: loc.lat || '', lng: loc.lng || '' });
+			uni.showToast({ title: '已打卡到达' });
+			refreshAll();
+		} catch (e) {
+		} finally {
+			actingId.value = 0;
+		}
+	}
+
+	async function quickStart(o) {
+		if (actingId.value === o.id) return;
+		actingId.value = o.id;
+		try {
+			await api.masterStart({ order_id: o.id });
+			uni.showToast({ title: '已开始服务' });
+			refreshAll();
+		} catch (e) {
+		} finally {
+			actingId.value = 0;
+		}
+	}
+
 	function goQuotes() {
 		uni.navigateTo({ url: '/pages/master/quote' });
 	}
 
-	function call(o) {
-		if (!o.mobile) return;
-		uni.makePhoneCall({ phoneNumber: String(o.mobile) });
-	}
-
 	function goHall() {
-		uni.redirectTo({
-			url: '/pages/master/hall',
-			fail: () => uni.reLaunch({ url: '/pages/master/hall' })
-		});
-	}
-
-	function act(type, o) {
-		const id = o.id;
-		if (type === 'contact') {
-			api.masterContact({ order_id: id }).then(() => {
-				uni.showToast({ title: '已记录已联系' });
-				load();
-				loadCounts();
-			}).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.chooseImage({
-				count: 1,
-				sourceType: ['camera'],
-				success: async (chooseRes) => {
-					const rawFile = chooseRes.tempFilePaths[0];
-					uni.showLoading({ title: '压印防伪水印中...' });
-					try {
-						const watermarkedFile = await createWatermarkPhoto(rawFile, o);
-						uni.showLoading({ title: '上传完工照片...' });
-						const uploadData = await api.upload(watermarkedFile, 'order');
-						const remoteImg = uploadData.fullurl || uploadData.url;
-						await api.masterFinish({
-							order_id: id,
-							'images[0]': remoteImg
-						});
-						uni.hideLoading();
-						uni.showModal({
-							title: '完工提交成功',
-							content: '系统已向客户手机发送 6 位验收码，请向客户索取核销码后点击【输入验证码核销】完成工费结算！',
-							showCancel: false
-						});
-						load();
-						loadCounts();
-					} catch (err) {
-						uni.hideLoading();
-						uni.showToast({ title: '上传失败，请重试', icon: 'none' });
-					}
-				},
-				fail: () => {}
-			});
-			return;
-		}
-		if (type === 'verifyCode') {
-			uni.showModal({
-				title: '客户验收码核销',
-				editable: true,
-				placeholderText: '请输入客户手机收到的 6 位核销码',
-				confirmText: '核销结算',
-				confirmColor: '#F0710D',
-				success: async (r) => {
-					if (!r.confirm) return;
-					const code = (r.content || '').trim();
-					if (!code) {
-						uni.showToast({ title: '核销码不能为空', icon: 'none' });
-						return;
-					}
-					uni.showLoading({ title: '核销验证中...' });
-					try {
-						const res = await api.masterVerifyCode({ order_id: id, verify_code: code });
-						uni.hideLoading();
-						uni.showModal({
-							title: '核销成功！',
-							content: `订单已正式完工！本次工费 ¥${res.settle_amount} 已划入您的钱包余额`,
-							showCancel: false
-						});
-						load();
-						loadCounts();
-					} catch (e) {
-						uni.hideLoading();
-					}
-				}
-			});
-			return;
-		}
-		if (type === 'requestDiff') {
-			uni.showModal({
-				title: '申请施工增项补差价',
-				editable: true,
-				placeholderText: '请输入增项金额(元)，如: 50',
-				confirmText: '发起补差',
-				confirmColor: '#F0710D',
-				success: async (r) => {
-					if (!r.confirm) return;
-					const amt = parseFloat((r.content || '').trim());
-					if (!amt || amt <= 0) {
-						uni.showToast({ title: '请输入有效金额', icon: 'none' });
-						return;
-					}
-					uni.showLoading({ title: '提交申请中...' });
-					try {
-						await api.masterRequestDiff({ order_id: id, amount: amt, remark: '施工现场打孔/拆旧等增项补差' });
-						uni.hideLoading();
-						uni.showModal({
-							title: '补差申请已发起',
-							content: `已成功发起增项补差价 ¥${amt}，请提醒客户在订单详情中点击【去支付补差】完成在线支付！`,
-							showCancel: false
-						});
-						load();
-					} catch (e) {
-						uni.hideLoading();
-					}
-				}
-			});
-			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(() => {});
-		}
+		emit('switch-tab', 0);
+		uni.reLaunch({ url: '/pages/master/hall' });
 	}
 
 	onMounted(() => {
-		stickyTop.value = getNavBarMetrics().totalNavHeight;
-		load();
-		loadCounts();
+		refreshAll();
 	});
 
-	defineExpose({
-		load: () => Promise.all([load(), loadCounts()]),
-		loadCounts
-	});
+	defineExpose({ load: refreshAll, reload: refreshAll });
 </script>
 
-<style scoped>
-	.orders-view { min-height: calc(100vh - 104rpx - env(safe-area-inset-bottom)); width: 100%; box-sizing: border-box; background: #F5F6F8; padding-bottom: 30rpx; }
+<style lang="scss" scoped>
+	@import '@/uni.scss';
+	.orders-view {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: $yjyf-bg-page;
+		overflow: hidden;
+	}
 
-	/* 顶部工奇兵风格数据漏斗看板 */
+	.orders-scroll {
+		flex: 1;
+		min-height: 0;
+	}
+
+	/* 顶部状态漏斗看板 */
 	.funnel-card {
-		background: #ffffff;
-		padding: 24rpx 20rpx 16rpx;
-		box-shadow: 0 4rpx 14rpx rgba(0,0,0,0.03);
-		position: sticky; top: 0; z-index: 10;
+		background: $yjyf-bg-card;
+		padding: 20rpx 16rpx 0;
+		border-bottom: 1rpx solid $yjyf-border-color;
+		flex-shrink: 0;
 	}
-	.funnel-row { display: flex; align-items: center; justify-content: space-around; }
+
+	.funnel-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+	}
+
 	.f-item {
-		flex: 1; display: flex; flex-direction: column; align-items: center;
-		position: relative; padding-bottom: 12rpx;
+		flex: 1;
+		position: relative;
+		padding-bottom: 20rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 6rpx;
 	}
-	.f-num { font-size: 38rpx; font-weight: 700; color: #666; line-height: 1.1; }
-	.f-quote { color: #7A5AF8; }
-	.f-item.on .f-num { color: #F0710D; }
-	.f-lab { margin-top: 8rpx; font-size: 22rpx; color: #8E8E93; }
-	.f-item.on .f-lab { color: #F0710D; font-weight: 600; }
+
+	.f-num {
+		font-size: 36rpx;
+		font-weight: 800;
+		color: $yjyf-text-main;
+		line-height: 1.1;
+
+		&.f-quote {
+			color: $yjyf-info;
+		}
+	}
+
+	.f-lab {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-secondary;
+	}
+
+	.f-item.on .f-num,
+	.f-item.on .f-lab {
+		color: $yjyf-primary;
+		font-weight: 700;
+	}
+
 	.f-line {
-		position: absolute; bottom: 0; width: 44rpx; height: 6rpx;
-		border-radius: 3rpx; background: #F0710D;
+		position: absolute;
+		bottom: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		width: 44rpx;
+		height: 6rpx;
+		border-radius: 3rpx;
+		background: $yjyf-primary;
+	}
+
+	.f-divider {
+		width: 1rpx;
+		height: 44rpx;
+		background: $yjyf-border-color;
+		margin-bottom: 18rpx;
 	}
-	.f-divider { width: 1rpx; height: 38rpx; background: #EEEEEE; }
 
 	/* 列表卡片 */
-	.list { padding: 20rpx 24rpx; }
+	.list {
+		padding: 24rpx 24rpx calc(140rpx + env(safe-area-inset-bottom));
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+	}
+
 	.item {
-		background: #fff; border-radius: 20rpx; margin-bottom: 20rpx; padding: 24rpx;
-		box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06);
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		padding: 28rpx;
+		box-shadow: $yjyf-shadow-card;
 	}
-	.hd { display: flex; align-items: center; justify-content: space-between; padding-bottom: 16rpx; border-bottom: 1rpx solid #F4F4F4; }
-	.svc-box { display: flex; align-items: center; }
-	.svc { font-size: 30rpx; font-weight: 700; color: #1F1F1F; }
+
+	.hd {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 16rpx;
+		padding-bottom: 20rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.svc-box {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+	}
+
+	.svc {
+		font-size: $yjyf-font-md;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
 	.time-urgent-pill {
-		display: inline-flex; align-items: center; justify-content: center;
-		margin-left: 14rpx; height: 38rpx; padding: 0 12rpx; border-radius: 19rpx;
-		background: #FFF1F0; border: 1rpx solid #FFA39E; line-height: 1;
+		padding: 4rpx 14rpx;
+		border-radius: $yjyf-radius-pill;
+		background: rgba(232, 51, 27, 0.1);
+		display: flex;
+		align-items: center;
+		gap: 6rpx;
+		flex-shrink: 0;
 	}
-	.time-urgent-ico { width: 22rpx; height: 22rpx; margin-right: 6rpx; }
-	.time-urgent-txt { font-size: 22rpx; color: #CF1322; font-weight: 600; line-height: 1; }
-	.status-badge { display: inline-flex; align-items: center; justify-content: center; height: 42rpx; padding: 0 16rpx; border-radius: 21rpx; background: #FFF3E6; line-height: 1; }
-	.status-txt { font-size: 22rpx; font-weight: 600; color: #E36B0C; line-height: 1; }
-	.status-badge.st-7 { background: #FDEEEB; }
-	.status-badge.st-7 .status-txt { color: #E8331B; }
-	.status-badge.st-8 { background: #E9F7EE; }
-	.status-badge.st-8 .status-txt { color: #2FA84F; }
 
-	.bd { padding: 18rpx 0; display: flex; flex-direction: column; }
-	.info-line { display: flex; align-items: flex-start; margin-bottom: 10rpx; }
-	.info-ico { width: 28rpx; height: 28rpx; margin-right: 10rpx; margin-top: 4rpx; flex-shrink: 0; }
-	.addr-txt { font-size: 26rpx; color: #222; font-weight: 500; line-height: 36rpx; }
-	.meta-txt { font-size: 24rpx; color: #666; line-height: 36rpx; }
-	.meta-tags { display: flex; flex-wrap: wrap; margin-top: 6rpx; }
-	.tag { display: inline-flex; align-items: center; justify-content: center; height: 40rpx; line-height: 40rpx; text-align: center; padding: 0 14rpx; background: #F5F6F8; color: #777; font-size: 22rpx; border-radius: 8rpx; margin-right: 10rpx; margin-bottom: 6rpx; }
-
-	.customer-row {
-		display: flex; align-items: center; justify-content: space-between;
-		margin-top: 14rpx; padding-top: 14rpx; border-top: 1rpx dashed #EEEEEE;
+	.time-urgent-ico {
+		width: 22rpx;
+		height: 22rpx;
+	}
+
+	.time-urgent-txt {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-danger;
+		font-weight: 600;
+	}
+
+	.hd-right {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+		flex-shrink: 0;
+	}
+
+	.status-badge {
+		padding: 6rpx 18rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+	}
+
+	.status-txt {
+		font-size: $yjyf-font-xs;
+		font-weight: 600;
+		color: $yjyf-primary;
+	}
+
+	.status-badge.st-8 {
+		background: rgba(47, 168, 79, 0.1);
+
+		.status-txt {
+			color: $yjyf-success;
+		}
+	}
+
+	.arrow-ico {
+		width: 26rpx;
+		height: 26rpx;
+	}
+
+	.bd {
+		padding: 20rpx 0;
+		display: flex;
+		flex-direction: column;
+		gap: 12rpx;
+	}
+
+	.info-line {
+		display: flex;
+		align-items: flex-start;
+		gap: 12rpx;
+	}
+
+	.info-ico {
+		width: 30rpx;
+		height: 30rpx;
+		margin-top: 4rpx;
+		flex-shrink: 0;
+	}
+
+	.addr-txt {
+		flex: 1;
+		font-size: $yjyf-font-base;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		line-height: 1.45;
+	}
+
+	.meta-txt {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-regular;
+	}
+
+	.meta-tags {
+		padding-left: 42rpx;
+		display: flex;
+		flex-wrap: wrap;
+		gap: 12rpx;
+	}
+
+	.tag {
+		padding: 4rpx 14rpx;
+		border-radius: 8rpx;
+		background: $yjyf-bg-page;
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-secondary;
+	}
+
+	.ft {
+		padding-top: 20rpx;
+		border-top: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 16rpx;
+	}
+
+	.amt-box {
+		display: flex;
+		align-items: baseline;
+	}
+
+	.amt-label {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-secondary;
+		margin-right: 8rpx;
+	}
+
+	.amt-symbol {
+		font-size: $yjyf-font-sm;
+		font-weight: 700;
+		color: $yjyf-primary;
+	}
+
+	.amt-val {
+		font-size: 36rpx;
+		font-weight: 800;
+		color: $yjyf-primary;
+	}
+
+	.ops {
+		display: flex;
+		align-items: center;
+		gap: 14rpx;
 	}
-	.cust-mobile { display: flex; align-items: center; }
-	.phone-ico { width: 28rpx; height: 28rpx; margin-right: 8rpx; }
-	.phone-num { font-size: 24rpx; color: #4A7CFF; font-weight: 500; }
-	.amt-box { display: flex; align-items: baseline; }
-	.amt-symbol { font-size: 24rpx; font-weight: 700; color: #F0710D; }
-	.amt-val { font-size: 34rpx; font-weight: 700; color: #F0710D; line-height: 1; }
 
-	.ops { display: flex; flex-wrap: wrap; justify-content: flex-end; padding-top: 16rpx; border-top: 1rpx solid #F4F4F4; }
 	.op {
-		margin: 8rpx 0 0 14rpx; padding: 0 26rpx; height: 60rpx;
-		display: inline-flex; align-items: center; justify-content: center; line-height: 1;
-		border-radius: 30rpx; border: 1.5rpx solid #DDD; font-size: 24rpx; color: #555;
-	}
-	.op.primary {
-		border-color: #F0710D; color: #fff;
-		background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%);
-		box-shadow: 0 4rpx 14rpx rgba(240,113,13,0.25);
+		height: 64rpx;
+		padding: 0 28rpx;
+		border-radius: $yjyf-radius-pill;
+		font-size: $yjyf-font-sm;
+		font-weight: 600;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		&.outline {
+			background: $yjyf-bg-card;
+			border: 1rpx solid $yjyf-border-color;
+			color: $yjyf-text-regular;
+		}
+
+		&.primary {
+			background: $yjyf-gradient-primary;
+			color: $yjyf-text-inverse;
+			box-shadow: $yjyf-shadow-button;
+		}
+	}
+
+	.more-tip {
+		padding: 20rpx 0;
+		text-align: center;
+	}
+
+	.more-txt {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-muted;
+	}
+
+	.empty-state {
+		padding: 160rpx 48rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 16rpx;
+	}
+
+	.empty-img {
+		width: 200rpx;
+		height: 200rpx;
+	}
+
+	.empty-title {
+		font-size: $yjyf-font-md;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.empty-sub {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-secondary;
 	}
 
-	/* 空状态 */
-	.empty-state { display: flex; flex-direction: column; align-items: center; padding: 120rpx 40rpx 40rpx; }
-	.empty-img { width: 180rpx; height: 180rpx; margin-bottom: 24rpx; }
-	.empty-title { font-size: 28rpx; font-weight: 600; color: #333; margin-bottom: 8rpx; }
-	.empty-sub { font-size: 22rpx; color: #9A9A9A; text-align: center; margin-bottom: 32rpx; }
 	.empty-cta {
-		padding: 0 48rpx; height: 74rpx; border-radius: 37rpx;
-		display: inline-flex; align-items: center; justify-content: center; line-height: 1;
-		background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%);
-		color: #fff; font-size: 26rpx; font-weight: 600;
-		box-shadow: 0 6rpx 16rpx rgba(240,113,13,0.25);
+		margin-top: 20rpx;
+		height: 76rpx;
+		padding: 0 48rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-base;
+		font-weight: 700;
+		box-shadow: $yjyf-shadow-button;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 </style>
diff --git a/yjyf-app/components/master/MasterWorkbenchView.vue b/yjyf-app/components/master/MasterWorkbenchView.vue
index 62c4daf..7ef14eb 100644
--- a/yjyf-app/components/master/MasterWorkbenchView.vue
+++ b/yjyf-app/components/master/MasterWorkbenchView.vue
@@ -3,12 +3,18 @@
 		<!-- 1. 顶部统一固定吸顶导航栏（与其他页面 100% 统一，固定在手机顶部不随滚动划出） -->
 		<YjyfNavBar theme="orange" title="师傅工作台" :fixed="true" :placeholder="true" />
 
+		<YjyfRefreshScroll
+			class="workbench-scroll"
+			theme="orange"
+			:nav-offset="navHeight"
+			:refresh-task="load"
+		>
 		<!-- 师傅顶部名片区（与顶部导航栏共享连续渐变零断层接壤） -->
-		<view class="profile-hero" :style="{ marginTop: (-navHeight) + 'px', paddingTop: navHeight + 'px' }">
+		<view class="profile-hero" :style="{ backgroundPosition: '0 -' + navHeight + 'px' }">
 			<view class="hero-body">
 				<view class="user-block">
 					<view class="avatar-wrap">
-						<image class="avatar-img" src="/static/icons/user-avatar.svg" mode="aspectFit" />
+						<image class="avatar-img" src="/static/icons/avatar-master.svg" mode="aspectFit" />
 					</view>
 					<view class="user-meta">
 						<view class="name-row">
@@ -74,6 +80,17 @@
 				</view>
 			</view>
 
+			<view class="menu-item clickable-hover" @tap="go('/pages/master/reviews')">
+				<view class="mi-left">
+					<image class="mi-ico" src="/static/icons/master/menu-review.svg" mode="aspectFit" />
+					<text class="mi-title">客户评价管理</text>
+				</view>
+				<view class="mi-right">
+					<text class="mi-tip" v-if="credit">{{ credit.review_total || 0 }} 条评价</text>
+					<image class="mi-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+				</view>
+			</view>
+
 			<view class="menu-item clickable-hover" @tap="go('/pages/master/credit')">
 				<view class="mi-left">
 					<image class="mi-ico" src="/static/icons/master/menu-credit.svg" mode="aspectFit" />
@@ -91,7 +108,7 @@
 					<text class="mi-title">联系平台客服</text>
 				</view>
 				<view class="mi-right">
-					<text class="mi-tip">4000000000</text>
+					<text class="mi-tip">{{ servicePhone || '在线咨询' }}</text>
 					<image class="mi-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 				</view>
 			</view>
@@ -101,9 +118,10 @@
 		<view class="card">
 			<view class="card-head clickable-hover" @tap="goSkills">
 				<text class="card-title">已认证服务技能</text>
-				<view style="display: flex; align-items: center; gap: 8rpx;">
+				<view class="card-edit-action">
 					<text class="card-tip">{{ skills.length }} 项技能</text>
-					<text style="font-size: 24rpx; color: #EA580C; font-weight: 600;">修改 ›</text>
+					<text class="card-edit-txt">修改</text>
+					<image class="card-edit-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
 				</view>
 			</view>
 			<view class="skills-box" @tap="goSkills">
@@ -123,6 +141,7 @@
 			</view>
 			<image class="src-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
 		</view>
+		</YjyfRefreshScroll>
 	</view>
 </template>
 
@@ -133,6 +152,7 @@
 	import { setRole } from '@/utils/role.js';
 	import { getNavBarMetrics } from '@/utils/system.js';
 	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import YjyfRefreshScroll from '@/components/YjyfRefreshScroll.vue';
 
 	const emit = defineEmits(['switch-tab']);
 	const navHeight = ref(getNavBarMetrics().totalNavHeight);
@@ -142,6 +162,7 @@
 	const skills = ref([]);
 	const todayIncome = ref('0.00');
 	const totalIncome = ref('0.00');
+	const servicePhone = ref(uni.getStorageSync('yjyf_service_phone') || '');
 
 	function go(url) {
 		uni.navigateTo({ url });
@@ -159,7 +180,7 @@
 	}
 
 	function callService() {
-		uni.makePhoneCall({ phoneNumber: '4000000000' });
+		api.contactService();
 	}
 
 	async function load() {
@@ -185,23 +206,45 @@
 		try {
 			credit.value = await api.masterCredit();
 		} catch (e) {}
+
+		if (!servicePhone.value) {
+			try {
+				const h = await api.home();
+				if (h && h.service_phone) {
+					servicePhone.value = String(h.service_phone).trim();
+					uni.setStorageSync('yjyf_service_phone', servicePhone.value);
+				}
+			} catch (e) {}
+		}
 	}
 
+	const togglingWork = ref(false);
+	const switchingRole = ref(false);
+
 	async function toggleWork() {
-		if (!info.value) return;
+		if (!info.value || togglingWork.value) return;
+		togglingWork.value = true;
 		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) {}
+		} catch (e) {
+		} finally {
+			togglingWork.value = false;
+		}
 	}
 
 	function backToUser() {
+		if (switchingRole.value) return;
+		switchingRole.value = true;
 		api.switchRole({ role: 'user' }).then((res) => {
 			setRole('user');
 			uni.reLaunch({ url: res.redirect || '/pages/index/index' });
-		}).catch(() => {});
+			setTimeout(() => { switchingRole.value = false; }, 500);
+		}).catch(() => {
+			switchingRole.value = false;
+		});
 	}
 
 	onMounted(() => {
@@ -216,12 +259,20 @@
 
 <style scoped>
 	.workbench-view {
-		min-height: calc(100vh - 104rpx - env(safe-area-inset-bottom));
+		height: calc(100vh - 104rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 104rpx - env(safe-area-inset-bottom));
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
 		width: 100%;
-		overflow-x: hidden;
 		box-sizing: border-box;
 		background: #F5F6F8;
-		padding-bottom: 40rpx;
+	}
+
+	.workbench-scroll {
+		flex: 1;
+		height: 0;
+		width: 100%;
 	}
 
 	/* 顶部名片（单一连续大渐变，与 TopBar 共享连续渐变起点） */
@@ -317,19 +368,22 @@
 	}
 	.card-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 14rpx; }
 	.card-title { font-size: 28rpx; font-weight: 700; color: #1F1F1F; }
-	.card-tip { font-size: 22rpx; color: #9A9A9A; }
+	.card-edit-action { display: flex; align-items: center; gap: 8rpx; }
+	.card-tip { font-size: 22rpx; color: #888888; }
+	.card-edit-txt { font-size: 24rpx; color: #F0710D; font-weight: 600; }
+	.card-edit-arrow { width: 22rpx; height: 22rpx; }
 	.skills-box { display: flex; flex-wrap: wrap; }
 	.skill-tag {
 		padding: 0 22rpx; height: 52rpx; line-height: 52rpx; text-align: center; display: inline-flex; align-items: center; justify-content: center; margin: 0 12rpx 12rpx 0;
-		border-radius: 26rpx; background: #FFF3E6; color: #C4580A; font-size: 22rpx; font-weight: 500;
+		border-radius: 26rpx; background: #FFF7F0; color: #F0710D; font-size: 24rpx; font-weight: 500;
 	}
-	.skill-tag.empty { background: #F5F5F5; color: #9A9A9A; }
+	.skill-tag.empty { background: #F5F6F8; color: #888888; }
 
 	/* 切换业主角色卡片 */
 	.switch-role-card {
-		margin: 24rpx 24rpx 0; padding: 24rpx; background: #fff; border-radius: 20rpx;
+		margin: 24rpx 24rpx 56rpx; padding: 24rpx; background: #FFFFFF; border-radius: 20rpx;
 		display: flex; align-items: center; justify-content: space-between;
-		box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06);
+		box-shadow: 0 6rpx 20rpx rgba(240, 113, 13, 0.06);
 	}
 	.src-left { display: flex; align-items: center; }
 	.src-ico { width: 44rpx; height: 44rpx; margin-right: 18rpx; flex-shrink: 0; }
diff --git a/yjyf-app/components/user/UserHomeView.vue b/yjyf-app/components/user/UserHomeView.vue
index dc34d61..869b8da 100644
--- a/yjyf-app/components/user/UserHomeView.vue
+++ b/yjyf-app/components/user/UserHomeView.vue
@@ -1,35 +1,37 @@
 <template>
 	<view class="home-view">
-		<!-- ==================== 1. 独立吸顶 TopBar（实体品牌橙常驻 · 彻底稳住胶囊与状态栏） ==================== -->
+		<!-- ==================== 1. 独立吸顶 TopBar（简洁居中品牌标题 · 摒弃多余假下拉胶囊） ==================== -->
 		<YjyfNavBar
 			theme="orange"
 			title="优匠优服"
 			:fixed="true"
 			:placeholder="true"
-		>
-			<template #left>
-				<view class="nav-loc-pill clickable-hover" @tap="onCitySwitch">
-					<image class="nav-loc-icon" src="/static/icons/location-pin-white.svg" mode="aspectFit" />
-					<text class="nav-loc-text">全国服务</text>
-					<view class="nav-loc-arrow"></view>
-				</view>
-			</template>
-		</YjyfNavBar>
+		/>
+
+		<YjyfRefreshScroll
+			class="home-scroll"
+			theme="orange"
+			:nav-offset="navHeight"
+			:refresh-task="loadHome"
+			@scrolltolower="loadMore"
+		>
+		<!-- ==================== 2. 沉浸式渐变过渡舞台（连续品牌渐变 + 纵向柔和消隐底座，无缝承托搜索坞与金刚区） ==================== -->
+		<view class="hero-stage">
+			<!-- 连续渐变背景幕布：上接 TopBar 零折痕，下向页面灰底平滑羽化消隐，彻底消除生硬折角 -->
+			<view class="hero-backdrop" :style="{ backgroundPosition: '0 -' + navHeight + 'px' }">
+				<view class="hero-backdrop-fade"></view>
+			</view>
 
-		<!-- ==================== 2. 搜索条区域（品牌橙色底座 · 与 TopBar 自然接壤） ==================== -->
-		<view class="hero-search-area" :style="{ marginTop: (-navHeight) + 'px', paddingTop: (navHeight + 6) + 'px' }">
 			<!-- 白玉悬浮搜索坞 -->
-			<view class="search-dock-box" @tap="onSearch">
-				<image class="search-icon" src="/static/icons/search-gray.svg" mode="aspectFit" />
-				<text class="search-placeholder">搜索服务项目或商品</text>
-				<view class="search-action-btn">
-					<text class="search-action-txt">搜索</text>
+			<view class="search-dock-wrap">
+				<view class="search-dock-box clickable-hover" @tap="onSearch">
+					<image class="search-icon" src="/static/icons/search-gray.svg" mode="aspectFit" />
+					<text class="search-placeholder">搜索服务项目或商品</text>
+					<view class="search-action-btn">
+						<text class="search-action-txt">搜索</text>
+					</view>
 				</view>
 			</view>
-		</view>
-
-		<!-- ==================== 3. 主页面内容容器 (标准边距 · 自然层叠) ==================== -->
-		<view class="main-body">
 
 			<!-- 核心品类金刚区 (3 行 5 列共 15 个标准类目，全真实数据驱动) -->
 			<view class="cats-card">
@@ -47,8 +49,12 @@
 					</view>
 				</view>
 			</view>
+		</view>
 
-			<!-- 官方轮播 Banner (真实 fa_banner 数据驱动) -->
+		<!-- ==================== 3. 主页面内容容器 (标准模数边距 · 一体化衔接) ==================== -->
+		<view class="main-body">
+
+			<!-- 官方轮播 Banner (真实 fa_banner 数据驱动，内嵌指示点与右侧行动构图) -->
 			<view class="banner-section" v-if="showBanners && banners.length">
 				<swiper
 					class="banner-swiper"
@@ -63,12 +69,21 @@
 						<view class="banner-card" :class="'theme-' + b.theme + (b.image ? ' has-image' : '')" @tap="onBanner(b)">
 							<image v-if="b.image" class="banner-bg-img" :src="b.image" mode="aspectFill" />
 							<view v-if="b.image" class="banner-mask"></view>
+							<image
+								v-else
+								class="banner-deco-img"
+								:src="b.theme === 'brand' ? '/static/icons/banner-deco-brand.svg' : '/static/icons/banner-deco-service.svg'"
+								mode="aspectFit"
+							/>
 
 							<!-- 平台信息展示 -->
 							<block v-if="b.theme === 'brand'">
 								<view class="brand-bar">
-									<image class="brand-shield" src="/static/icons/shield.svg" mode="aspectFit" />
-									<text class="brand-heading">{{ b.title || '优匠优服' }}</text>
+									<view class="brand-title-group">
+										<image class="brand-shield" src="/static/icons/shield.svg" mode="aspectFit" />
+										<text class="brand-heading">{{ b.title || '优匠优服' }}</text>
+									</view>
+									<text class="brand-date-tag" v-if="b.date_text">{{ b.date_text }}</text>
 								</view>
 								<view class="brand-stats" v-if="b.stats && b.stats.length">
 									<view class="stat-unit" v-for="(s, si) in b.stats" :key="si">
@@ -78,7 +93,6 @@
 								</view>
 								<view class="brand-foot" v-if="b.subtitle">
 									<text class="foot-desc">{{ b.subtitle }}</text>
-									<text class="foot-date" v-if="b.date_text">{{ b.date_text }}</text>
 								</view>
 							</block>
 
@@ -86,129 +100,153 @@
 							<block v-else>
 								<view class="slide-content">
 									<view class="slide-left-text">
-										<view class="slide-badge-box" v-if="b.badge">
-											<text class="badge-main">{{ b.badge }}</text>
+										<view class="slide-badge-box" v-if="b.badge || b.date_text">
+											<text class="badge-main" v-if="b.badge">{{ b.badge }}</text>
+											<text class="badge-sub-tag" v-if="b.date_text">{{ b.date_text }}</text>
 										</view>
 										<text class="slide-title">{{ b.title }}</text>
 										<text class="slide-sub" v-if="b.subtitle">{{ b.subtitle }}</text>
 									</view>
+									<view class="slide-right-cta" v-if="b.action_text">
+										<view class="banner-cta-btn">
+											<text class="banner-cta-txt">{{ b.action_text }}</text>
+											<image class="banner-cta-arr" src="/static/icons/arrow-right-white.svg" mode="aspectFit" />
+										</view>
+									</view>
 								</view>
 							</block>
 						</view>
 					</swiper-item>
 				</swiper>
 
-				<view class="banner-dots" v-if="banners.length > 1">
+				<view class="banner-dots" :class="{ 'is-on-image': banners[bannerIndex] && banners[bannerIndex].image }" v-if="banners.length > 1">
 					<view
 						v-for="(b, bi) in banners"
 						:key="'dot-' + b.id"
 						class="banner-dot"
 						:class="{ on: bannerIndex === bi }"
-						@tap="goBanner(bi)"
+						@tap.stop="goBanner(bi)"
 					></view>
 				</view>
 			</view>
 
 			<!-- ==================== 4. 双 Tab 核心板块：【热门推荐】与【服务动态】 ==================== -->
 			<view class="content-tab-section">
-				<!-- 第一行：双 Tab 切换导航条 -->
-				<view class="section-tab-bar">
-					<view class="tab-list">
-						<!-- Tab 1: 热门服务推荐 -->
-						<view
-							class="tab-item clickable-hover"
-							:class="{ active: activeContentTab === 'hot' }"
-							@tap="switchContentTab('hot')"
-						>
-							<text class="tab-text">热门推荐</text>
-							<view class="tab-badge-pill hot-badge">热选</view>
-							<view class="tab-active-indicator" v-if="activeContentTab === 'hot'"></view>
-						</view>
-
-						<!-- Tab 2: 服务动态 (业主晒单) -->
-						<view
-							class="tab-item clickable-hover"
-							:class="{ active: activeContentTab === 'cases' }"
-							@tap="switchContentTab('cases')"
-						>
-							<text class="tab-text">服务动态</text>
-							<view class="tab-badge-pill done-badge">晒单</view>
-							<view class="tab-active-indicator" v-if="activeContentTab === 'cases'"></view>
-						</view>
-					</view>
-
-					<view class="title-more clickable-hover" @tap="onMoreServices">
-						<text class="more-txt">全部服务</text>
-						<image class="more-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
-					</view>
-				</view>
-
-				<!-- 第二行：京东式 4 列排序与筛选栏（前 3 项为排序，第 4 项为筛选抽屉入口，价格支持高低双向切换） -->
-				<view class="jd-sort-bar">
-					<!-- 1. 综合推荐 -->
-					<view
-						class="jd-sort-item clickable-hover"
-						:class="{ active: sortMode === 'default' }"
-						@tap="onSelectSort('default')"
-					>
-						<text class="jd-sort-txt">综合推荐</text>
-					</view>
-
-					<!-- 2. 销量 -->
-					<view
-						class="jd-sort-item clickable-hover"
-						:class="{ active: sortMode === 'sales' }"
-						@tap="onSelectSort('sales')"
-					>
-						<text class="jd-sort-txt">销量</text>
-					</view>
-
-					<!-- 3. 价格 ⇅（点击在从低到高 ▲ / 从高到低 ▼ 之间切换） -->
-					<view
-						class="jd-sort-item clickable-hover"
-						:class="{ active: sortMode === 'price_asc' || sortMode === 'price_desc' }"
-						@tap="onTogglePriceSort"
-					>
-						<text class="jd-sort-txt">价格</text>
-						<image
-							class="jd-price-caret"
-							:src="priceSortIcon"
-							mode="aspectFit"
-						/>
-					</view>
-
-					<!-- 4. 筛选 ▽（点击打开右侧多维条件筛选抽屉，筛选时不改变当前排序方向） -->
-					<view
-						class="jd-sort-item jd-filter-trigger clickable-hover"
-						:class="{ active: hasActiveFilter || showFilterDrawer }"
-						@tap="openFilterDrawer"
-					>
-						<text class="jd-sort-txt">{{ activeFilterCount > 0 ? `筛选(${activeFilterCount})` : '筛选' }}</text>
-						<image
-							class="jd-filter-icon"
-							:src="(hasActiveFilter || showFilterDrawer) ? '/static/icons/filter-orange.svg' : '/static/icons/filter-dark.svg'"
-							mode="aspectFit"
-						/>
-					</view>
-				</view>
-
-				<!-- 已生效筛选条件快捷标签条（清晰反馈当前生效条件与匹配总数，支持单项移除或一键清空） -->
-				<view class="jd-active-chips-bar" v-if="activeFilterChips.length > 0">
-					<scroll-view class="jd-chips-scroll" scroll-x :show-scrollbar="false">
-						<view class="jd-chips-track">
+				<!-- 一体化粘性列表控制头（融合双 Tab 导航 + 排序筛选栏 + 已选条件胶囊，支持上滑吸顶） -->
+				<view class="feed-control-panel">
+					<!-- 第一行：双 Tab 切换导航条 -->
+					<view class="section-tab-bar">
+						<view class="tab-list">
+							<!-- Tab 1: 热门服务推荐 -->
 							<view
-								class="jd-chip-pill clickable-hover"
-								v-for="chip in activeFilterChips"
-								:key="chip.key"
-								@tap="removeFilterChip(chip.key)"
+								class="tab-item clickable-hover"
+								:class="{ active: activeContentTab === 'hot' }"
+								@tap="switchContentTab('hot')"
 							>
-								<text class="jd-chip-txt">{{ chip.label }}</text>
-								<image class="jd-chip-close" src="/static/icons/close.svg" mode="aspectFit" />
+								<view class="tab-title-wrap">
+									<text class="tab-text">热门推荐</text>
+									<view class="tab-active-indicator" v-if="activeContentTab === 'hot'"></view>
+								</view>
+								<view class="tab-badge-pill hot-badge">热选</view>
+							</view>
+
+							<!-- Tab 2: 服务动态 (业主晒单) -->
+							<view
+								class="tab-item clickable-hover"
+								:class="{ active: activeContentTab === 'cases' }"
+								@tap="switchContentTab('cases')"
+							>
+								<view class="tab-title-wrap">
+									<text class="tab-text">服务动态</text>
+									<view class="tab-active-indicator" v-if="activeContentTab === 'cases'"></view>
+								</view>
+								<view class="tab-badge-pill done-badge">晒单</view>
 							</view>
 						</view>
-					</scroll-view>
-					<view class="jd-chips-clear clickable-hover" @tap="resetFilters">
-						<text class="jd-chips-clear-txt">清空</text>
+
+						<view class="title-more clickable-hover" @tap="onMoreServices">
+							<text class="more-txt">全部服务</text>
+							<image class="more-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+						</view>
+					</view>
+
+					<!-- 第二行：4 列轻量化排序与筛选栏（前 3 项为排序胶囊，右侧独立分隔多维筛选入口） -->
+					<view class="jd-sort-bar">
+						<!-- 1. 综合推荐 -->
+						<view
+							class="jd-sort-item clickable-hover"
+							:class="{ active: sortMode === 'default' }"
+							@tap="onSelectSort('default')"
+						>
+							<view class="jd-sort-pill">
+								<text class="jd-sort-txt">综合推荐</text>
+							</view>
+						</view>
+
+						<!-- 2. 销量 -->
+						<view
+							class="jd-sort-item clickable-hover"
+							:class="{ active: sortMode === 'sales' }"
+							@tap="onSelectSort('sales')"
+						>
+							<view class="jd-sort-pill">
+								<text class="jd-sort-txt">销量</text>
+							</view>
+						</view>
+
+						<!-- 3. 价格 ⇅（点击在从低到高 ▲ / 从高到低 ▼ 之间切换） -->
+						<view
+							class="jd-sort-item clickable-hover"
+							:class="{ active: sortMode === 'price_asc' || sortMode === 'price_desc' }"
+							@tap="onTogglePriceSort"
+						>
+							<view class="jd-sort-pill">
+								<text class="jd-sort-txt">价格</text>
+								<image
+									class="jd-price-caret"
+									:src="priceSortIcon"
+									mode="aspectFit"
+								/>
+							</view>
+						</view>
+
+						<view class="jd-sort-divider"></view>
+
+						<!-- 4. 筛选 ▽（点击打开右侧多维条件筛选抽屉，筛选时不改变当前排序方向） -->
+						<view
+							class="jd-sort-item jd-filter-trigger clickable-hover"
+							:class="{ active: hasActiveFilter || showFilterDrawer }"
+							@tap="openFilterDrawer"
+						>
+							<view class="jd-sort-pill">
+								<text class="jd-sort-txt">{{ activeFilterCount > 0 ? `筛选(${activeFilterCount})` : '筛选' }}</text>
+								<image
+									class="jd-filter-icon"
+									:src="(hasActiveFilter || showFilterDrawer) ? '/static/icons/filter-orange.svg' : '/static/icons/filter-dark.svg'"
+									mode="aspectFit"
+								/>
+							</view>
+						</view>
+					</view>
+
+					<!-- 已生效筛选条件快捷标签条（清晰反馈当前生效条件与匹配总数，支持单项移除或一键清空） -->
+					<view class="jd-active-chips-bar" v-if="activeFilterChips.length > 0">
+						<scroll-view class="jd-chips-scroll" scroll-x :show-scrollbar="false">
+							<view class="jd-chips-track">
+								<view
+									class="jd-chip-pill clickable-hover"
+									v-for="chip in activeFilterChips"
+									:key="chip.key"
+									@tap="removeFilterChip(chip.key)"
+								>
+									<text class="jd-chip-txt">{{ chip.label }}</text>
+									<image class="jd-chip-close" src="/static/icons/close.svg" mode="aspectFit" />
+								</view>
+							</view>
+						</scroll-view>
+						<view class="jd-chips-clear clickable-hover" @tap="resetFilters">
+							<text class="jd-chips-clear-txt">清空</text>
+						</view>
 					</view>
 				</view>
 
@@ -237,7 +275,7 @@
 							@tap="onHotService(item)"
 						>
 							<view class="service-media">
-								<image class="service-img" :src="item.image_url" mode="aspectFill" lazy-load />
+								<image class="service-img" :src="item.image_url || '/static/icons/service-default.svg'" mode="aspectFill" lazy-load />
 								<view class="media-top-gradient"></view>
 								<text class="service-cat-badge">{{ item.cat_name }}</text>
 								<text class="service-recommend-tag" v-if="item.tag">{{ item.tag }}</text>
@@ -288,9 +326,8 @@
 							<!-- 卡片顶部晒单图片与业主晒单徽标 -->
 							<view class="flow-card-media">
 								<image
-									v-if="order.image_url"
 									class="flow-card-img"
-									:src="order.image_url"
+									:src="order.image_url || '/static/icons/service-default.svg'"
 									mode="aspectFill"
 									lazy-load
 								/>
@@ -343,7 +380,7 @@
 
 				<!-- 空状态缺省兜底（覆盖无热门推荐或无业主晒单动态场景，带一键重置筛选） -->
 				<view class="empty-state-box" v-else>
-					<image class="empty-state-icon" src="/static/icons/empty.svg" mode="aspectFit" />
+					<image class="empty-state-icon" src="/static/icons/empty-service.svg" mode="aspectFit" />
 					<text class="empty-state-text">{{ activeContentTab === 'hot' ? '当前筛选下暂无服务项目' : '当前筛选下暂无业主晒单' }}</text>
 					<view class="empty-reset-btn clickable-hover" v-if="hasActiveFilter" @tap="resetFilters">
 						<text class="empty-reset-txt">重置筛选条件</text>
@@ -354,6 +391,7 @@
 			<!-- 页面底部安全呼吸留白 (彻底避让悬浮立即下单大圆球，杜绝遮挡) -->
 			<view class="page-bottom-space"></view>
 		</view>
+		</YjyfRefreshScroll>
 
 		<!-- ==================== 京东式右侧滑出多维筛选抽屉（脱离 .main-body 层叠上下文，高于顶部导航与底部 TabBar） ==================== -->
 		<view class="jd-drawer-mask" v-if="showFilterDrawer" @tap="closeFilterDrawer">
@@ -408,7 +446,7 @@
 					</view>
 
 					<!-- 【热门推荐】维度 2：服务工项 (fa_service_type) -->
-					<view class="jd-sec-block" v-if="activeContentTab === 'hot'">
+					<view class="jd-sec-block" v-if="activeContentTab === 'hot' && drawerServiceTypes.length > 0">
 						<view class="jd-sec-head clickable-hover" @tap="toggleSecFold('type')">
 							<text class="jd-sec-title">服务工项</text>
 							<image
@@ -561,6 +599,7 @@
 	import { isLogin, toLogin } from '@/utils/request.js';
 	import { ensureSilentLogin } from '@/utils/wxlogin.js';
 	import { getNavBarMetrics } from '@/utils/system.js';
+	import YjyfRefreshScroll from '@/components/YjyfRefreshScroll.vue';
 
 	const emit = defineEmits(['switch-tab']);
 
@@ -639,25 +678,9 @@
 		});
 	});
 
-	/* ---------- 抽屉内工项字典选项（fa_service_type） ---------- */
-	const defaultServiceTypeList = [
-		{ code: 'install', name: '安装' },
-		{ code: 'repair', name: '维修' },
-		{ code: 'remove', name: '拆旧' },
-		{ code: 'deliver_install', name: '送货并安装' },
-		{ code: 'deliver', name: '送货到家' },
-		{ code: 'move', name: '移机' },
-		{ code: 'measure', name: '测量' },
-		{ code: 'drill', name: '打孔' },
-		{ code: 'glue', name: '打胶' },
-		{ code: 'grout', name: '美缝' },
-		{ code: 'clean', name: '保洁' },
-		{ code: 'filter', name: '换滤芯' }
-	];
+	/* ---------- 抽屉内工项字典选项（100% 后端 fa_service_type 真实字典驱动） ---------- */
 	const drawerServiceTypes = computed(() => {
-		return (serviceTypesDict.value && serviceTypesDict.value.length > 0)
-			? serviceTypesDict.value
-			: defaultServiceTypeList;
+		return Array.isArray(serviceTypesDict.value) ? serviceTypesDict.value : [];
 	});
 
 	/* ---------- 抽屉内晒单服务项目选项（支持跟随所选类目联动） ---------- */
@@ -976,10 +999,6 @@
 		return false;
 	}
 
-	const onCitySwitch = () => {
-		toast('已覆盖全国主要城市');
-	};
-
 	const onSearch = () => {
 		uni.navigateTo({ url: '/pages/category/category' });
 	};
@@ -1099,6 +1118,7 @@
 	};
 
 	onMounted(() => {
+		navHeight.value = getNavBarMetrics().totalNavHeight;
 		loadHome();
 	});
 
@@ -1108,72 +1128,73 @@
 	});
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	.home-view {
-		min-height: 100vh;
-		background: #F5F6F8;
-		padding-bottom: 220rpx;
+		height: calc(100vh - 112rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 112rpx - env(safe-area-inset-bottom));
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		background: $yjyf-bg-page;
 		position: relative;
-		overflow-x: hidden;
 		box-sizing: border-box;
 	}
 
-	/* ---------- 1. TopBar 左侧定位药丸 (嵌入 YjyfNavBar #left) ---------- */
-	.nav-loc-pill {
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-		height: 48rpx;
-		padding: 0 18rpx;
-		background: rgba(255, 255, 255, 0.22);
-		border-radius: 24rpx;
-		border: 1rpx solid rgba(255, 255, 255, 0.35);
-		backdrop-filter: blur(8rpx);
-		margin-left: 16rpx;
-		line-height: 1;
-		transition: background 0.2s ease;
-	}
-	.nav-loc-icon {
-		width: 24rpx;
-		height: 24rpx;
-		flex-shrink: 0;
-	}
-	.nav-loc-text {
-		font-size: 24rpx;
-		font-weight: 700;
-		color: #FFFFFF;
-		margin: 0 6rpx;
-		white-space: nowrap;
-		line-height: 1;
-	}
-	.nav-loc-arrow {
-		width: 0;
+	.home-scroll {
+		flex: 1;
 		height: 0;
-		border-left: 6rpx solid transparent;
-		border-right: 6rpx solid transparent;
-		border-top: 8rpx solid #FFFFFF;
+		width: 100%;
 	}
 
-	/* ---------- 2. 搜索条区域 (橙色底座 · 与 TopBar 共享连续渐变) ---------- */
-	.hero-search-area {
-		background-color: #F0710D;
-		background-image: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+	/* ---------- 1. 沉浸式顶区舞台（与 TopBar 共享 135deg 连续渐变 + 纵向柔和消隐底座） ---------- */
+	.hero-stage {
+		position: relative;
+		padding: 16rpx $yjyf-space-md 0;
+		margin-bottom: $yjyf-space-md;
+		box-sizing: border-box;
+	}
+	.hero-backdrop {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 320rpx;
+		z-index: 0;
+		pointer-events: none;
+		background-color: $yjyf-primary;
+		background-image: $yjyf-gradient-primary;
 		background-size: 100% 600rpx;
 		background-position: 0 0;
 		background-repeat: no-repeat;
-		padding: 12rpx 24rpx 48rpx;
-		border-bottom-left-radius: 36rpx;
-		border-bottom-right-radius: 36rpx;
-		box-sizing: border-box;
+	}
+	.hero-backdrop-fade {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 200rpx;
+		background: linear-gradient(
+			180deg,
+			rgba(245, 246, 248, 0) 0%,
+			rgba(245, 246, 248, 0.56) 54%,
+			$yjyf-bg-page 100%
+		);
+	}
+
+	/* ---------- 2. 白玉悬浮搜索坞 ---------- */
+	.search-dock-wrap {
+		position: relative;
+		z-index: 2;
+		margin-bottom: $yjyf-space-md;
 	}
 	.search-dock-box {
-		height: 76rpx;
-		background: #FFFFFF;
-		border-radius: 38rpx;
+		height: 80rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-pill;
 		display: flex;
 		align-items: center;
-		padding: 0 8rpx 0 24rpx;
-		box-shadow: 0 6rpx 20rpx rgba(180, 50, 0, 0.10);
+		padding: 0 $yjyf-space-xs 0 28rpx;
+		box-shadow: 0 8rpx 24rpx rgba(180, 65, 0, 0.12);
 		box-sizing: border-box;
 	}
 	.search-icon {
@@ -1183,48 +1204,39 @@
 	}
 	.search-placeholder {
 		flex: 1;
-		margin-left: 14rpx;
-		font-size: 26rpx;
-		color: #9CA3AF;
+		margin-left: $yjyf-space-sm;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-muted;
 		line-height: 1;
 	}
 	.search-action-btn {
-		height: 60rpx;
-		padding: 0 28rpx;
-		border-radius: 30rpx;
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		height: 64rpx;
+		padding: 0 $yjyf-space-lg;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
 		display: inline-flex;
 		align-items: center;
 		justify-content: center;
 		flex-shrink: 0;
 		line-height: 1;
-		box-shadow: 0 4rpx 10rpx rgba(240, 113, 13, 0.28);
+		box-shadow: 0 4rpx 12rpx rgba(240, 113, 13, 0.28);
 	}
 	.search-action-txt {
-		font-size: 24rpx;
+		font-size: $yjyf-font-sub;
 		font-weight: 700;
-		color: #FFFFFF;
+		color: $yjyf-bg-card;
 		letter-spacing: 1rpx;
 		line-height: 1;
 	}
 
-	/* ---------- 3. 主体内容容器 ---------- */
-	.main-body {
-		padding: 0 24rpx;
-		position: relative;
-		z-index: 10;
-		box-sizing: border-box;
-	}
-
-	/* 金刚区 (纯白大卡，3 行 5 列共 15 个标准类目，全真实数据驱动) */
+	/* ---------- 3. 核心品类金刚区 (3 行 5 列共 15 个标准类目，柔和承托于渐变舞台之上) ---------- */
 	.cats-card {
-		background: #FFFFFF;
+		position: relative;
+		z-index: 2;
+		background: $yjyf-bg-card;
 		border-radius: 24rpx;
-		padding: 22rpx 8rpx 16rpx;
-		box-shadow: 0 6rpx 20rpx rgba(15, 23, 42, 0.04);
-		border: 1rpx solid #F0F0F2;
-		margin-top: -24rpx;
-		margin-bottom: 20rpx;
+		padding: $yjyf-space-md $yjyf-space-xs $yjyf-space-sm;
+		box-shadow: 0 8rpx 28rpx rgba(31, 31, 31, 0.05);
 		box-sizing: border-box;
 	}
 	.cats-grid {
@@ -1238,7 +1250,7 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		padding: 10rpx 0;
+		padding: 12rpx 0;
 		box-sizing: border-box;
 	}
 	.cat-icon-container {
@@ -1257,33 +1269,51 @@
 		height: 72rpx;
 	}
 	.cat-cell-name {
-		margin-top: 10rpx;
-		font-size: 24rpx;
-		color: #2D3748;
+		margin-top: $yjyf-space-xs;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-main;
 		font-weight: 500;
 		text-align: center;
 		white-space: nowrap;
 	}
 
-	/* ---------- 4. 官方轮播 Banner (真实后台数据驱动) ---------- */
+	/* ---------- 4. 主体内容容器 ---------- */
+	.main-body {
+		padding: 0 $yjyf-space-md;
+		position: relative;
+		z-index: 10;
+		box-sizing: border-box;
+	}
+
+	/* ---------- 5. 官方轮播 Banner (真实后台数据驱动，内嵌指示点 + 右侧平衡构图) ---------- */
 	.banner-section {
-		margin-bottom: 20rpx;
+		position: relative;
+		margin-bottom: $yjyf-space-md;
 	}
 	.banner-swiper {
-		height: 196rpx;
-		border-radius: 20rpx;
+		height: 208rpx;
+		border-radius: 24rpx;
 		overflow: hidden;
-		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.03);
+		box-shadow: $yjyf-shadow-card;
 	}
 	.banner-card {
 		position: relative;
 		height: 100%;
-		padding: 20rpx 24rpx;
+		padding: 20rpx $yjyf-space-md 30rpx;
 		box-sizing: border-box;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
-		background: linear-gradient(135deg, #FFF7ED 0%, #FFEDD5 100%);
+		background: linear-gradient(135deg, $yjyf-bg-card 0%, $yjyf-primary-bg 100%);
+		border: 1rpx solid rgba(240, 113, 13, 0.14);
+		border-radius: 24rpx;
+		overflow: hidden;
+	}
+	.banner-card.theme-brand {
+		background: linear-gradient(135deg, $yjyf-bg-card 0%, $yjyf-primary-bg 100%);
+	}
+	.banner-card.has-image {
+		border: none;
 	}
 	.banner-bg-img {
 		position: absolute;
@@ -1301,30 +1331,57 @@
 		right: 0;
 		top: 0;
 		bottom: 0;
-		background: linear-gradient(90deg, rgba(0,0,0,0.60) 0%, rgba(0,0,0,0.2) 100%);
+		background: linear-gradient(90deg, rgba(0, 0, 0, 0.60) 0%, rgba(0, 0, 0, 0.18) 100%);
 		z-index: 2;
 	}
+	.banner-deco-img {
+		position: absolute;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		width: 280rpx;
+		height: 100%;
+		z-index: 1;
+		pointer-events: none;
+	}
 
 	/* 平台实力 Banner */
 	.brand-bar {
+		position: relative;
+		z-index: 3;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.brand-title-group {
 		display: flex;
 		align-items: center;
 	}
 	.brand-shield {
-		width: 26rpx;
-		height: 26rpx;
-		margin-right: 8rpx;
+		width: 28rpx;
+		height: 28rpx;
+		margin-right: $yjyf-space-xs;
 	}
 	.brand-heading {
 		font-size: 26rpx;
-		font-weight: 800;
-		color: #111827;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.brand-date-tag {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-primary;
+		font-weight: 600;
+		padding: 2rpx 12rpx;
+		border-radius: $yjyf-radius-pill;
+		background: rgba(240, 113, 13, 0.08);
 	}
 	.brand-stats {
+		position: relative;
+		z-index: 3;
 		display: flex;
 		align-items: center;
 		justify-content: space-around;
-		margin: 6rpx 0;
+		margin: 4rpx 0;
 	}
 	.stat-unit {
 		display: flex;
@@ -1332,32 +1389,28 @@
 		align-items: center;
 	}
 	.stat-v {
-		font-size: 32rpx;
-		font-weight: 900;
-		color: #EA580C;
-		letter-spacing: -0.5rpx;
+		font-size: $yjyf-font-title;
+		font-weight: 800;
+		color: $yjyf-primary;
+		line-height: 1.15;
 	}
 	.stat-l {
-		font-size: 22rpx;
-		color: #4B5563;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-regular;
 		margin-top: 4rpx;
 	}
 	.brand-foot {
+		position: relative;
+		z-index: 3;
 		display: flex;
 		align-items: center;
-		justify-content: space-between;
 	}
 	.foot-desc {
-		font-size: 22rpx;
-		color: #6B7280;
-	}
-	.foot-date {
-		font-size: 22rpx;
-		color: #EA580C;
-		font-weight: 600;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
 	}
 
-	/* 活动主题 Banner */
+	/* 活动 / 服务主题 Banner */
 	.slide-content {
 		position: relative;
 		z-index: 3;
@@ -1365,15 +1418,20 @@
 		align-items: center;
 		justify-content: space-between;
 		height: 100%;
+		gap: $yjyf-space-sm;
 	}
 	.slide-left-text {
+		flex: 1;
+		min-width: 0;
 		display: flex;
 		flex-direction: column;
+		justify-content: center;
 	}
 	.slide-badge-box {
 		display: flex;
 		align-items: center;
-		margin-bottom: 6rpx;
+		gap: $yjyf-space-xs;
+		margin-bottom: $yjyf-space-xs;
 	}
 	.badge-main {
 		display: inline-flex;
@@ -1381,134 +1439,209 @@
 		justify-content: center;
 		height: 36rpx;
 		line-height: 36rpx;
-		text-align: center;
-		padding: 0 12rpx;
+		padding: 0 14rpx;
 		border-radius: 8rpx;
-		background: #EA580C;
-		color: #FFFFFF;
-		font-size: 22rpx;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-micro;
 		font-weight: 700;
 	}
+	.badge-sub-tag {
+		display: inline-flex;
+		align-items: center;
+		height: 36rpx;
+		line-height: 36rpx;
+		padding: 0 12rpx;
+		border-radius: 8rpx;
+		background: rgba(240, 113, 13, 0.09);
+		color: $yjyf-primary;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+	}
 	.slide-title {
-		font-size: 32rpx;
+		font-size: $yjyf-font-title;
 		font-weight: 800;
-		color: #111827;
+		color: $yjyf-text-main;
+		line-height: 1.3;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.banner-card.has-image .slide-title {
+		color: $yjyf-bg-card;
 	}
 	.slide-sub {
-		font-size: 22rpx;
-		color: #4B5563;
-		margin-top: 4rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		margin-top: 6rpx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.banner-card.has-image .slide-sub {
+		color: rgba(255, 255, 255, 0.86);
+	}
+	.slide-right-cta {
+		flex-shrink: 0;
+		display: flex;
+		align-items: center;
+	}
+	.banner-cta-btn {
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		height: 56rpx;
+		padding: 0 22rpx 0 24rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		box-shadow: 0 6rpx 16rpx rgba(240, 113, 13, 0.24);
+	}
+	.banner-cta-txt {
+		font-size: $yjyf-font-sub;
+		font-weight: 700;
+		color: $yjyf-bg-card;
+		line-height: 1;
+	}
+	.banner-cta-arr {
+		width: 22rpx;
+		height: 22rpx;
+		margin-left: 4rpx;
 	}
 
+	/* 内嵌轮播指示器（收敛于卡片底部，消除外部散落感） */
 	.banner-dots {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 12rpx;
+		z-index: 5;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		margin-top: 10rpx;
 	}
 	.banner-dot {
 		width: 10rpx;
-		height: 8rpx;
-		border-radius: 4rpx;
-		background: #D1D5DB;
-		margin: 0 6rpx;
-		transition: all 0.2s ease;
+		height: 6rpx;
+		border-radius: $yjyf-radius-pill;
+		background: rgba(240, 113, 13, 0.22);
+		margin: 0 5rpx;
+		transition: all 0.22s ease;
 	}
 	.banner-dot.on {
-		width: 26rpx;
-		background: #EA580C;
+		width: 24rpx;
+		background: $yjyf-primary;
+	}
+	.banner-dots.is-on-image .banner-dot {
+		background: rgba(255, 255, 255, 0.42);
+	}
+	.banner-dots.is-on-image .banner-dot.on {
+		background: $yjyf-bg-card;
 	}
 
-	/* ---------- 5. 双 Tab 核心板块：【热门推荐】与【服务动态】（独立换行纯净 5 列下拉筛选条） ---------- */
+	/* ---------- 6. 双 Tab 核心板块与一体化粘性控制头 ---------- */
 	.content-tab-section {
-		margin-bottom: 24rpx;
+		margin-bottom: $yjyf-space-md;
+	}
+	.feed-control-panel {
+		position: sticky;
+		top: 0;
+		z-index: 35;
+		background: $yjyf-bg-card;
+		border-radius: 24rpx;
+		padding: 20rpx $yjyf-space-md 12rpx;
+		margin-bottom: $yjyf-space-sm;
+		box-shadow: 0 6rpx 24rpx rgba(31, 31, 31, 0.04);
+		box-sizing: border-box;
 	}
 	.section-tab-bar {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 0 2rpx;
-		margin-bottom: 14rpx;
-		position: relative;
-		z-index: 35;
+		padding-bottom: $yjyf-space-sm;
+		border-bottom: 1rpx solid $yjyf-border-color;
 	}
 	.tab-list {
 		display: flex;
 		align-items: center;
-		gap: 36rpx;
+		gap: 32rpx;
 		flex-shrink: 0;
 	}
 	.tab-item {
-		position: relative;
 		display: flex;
 		align-items: center;
-		gap: 10rpx;
-		padding-bottom: 12rpx;
+		gap: $yjyf-space-xs;
+		min-height: 56rpx;
 		cursor: pointer;
 	}
-	.tab-text {
-		font-size: 30rpx;
-		color: #888888;
-		font-weight: 600;
-		transition: all 0.2s ease;
-		line-height: 1.2;
-	}
-	.tab-item.active .tab-text {
-		font-size: 34rpx;
-		font-weight: 900;
-		color: #1F1F1F;
-	}
-	.tab-badge-pill {
-		font-size: 20rpx;
-		font-weight: 700;
-		padding: 2rpx 10rpx;
-		border-radius: 6rpx;
-		line-height: 1.3;
-	}
-	.hot-badge {
-		color: #F0710D;
-		background: #FFF7F0;
-	}
-	.done-badge {
-		color: #2FA84F;
-		background: #E8F8EE;
-	}
-	.tab-active-indicator {
-		position: absolute;
-		bottom: 0;
-		left: 36rpx;
-		width: 44rpx;
-		height: 6rpx;
-		border-radius: 3rpx;
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
-	}
-	.title-more {
+	.tab-title-wrap {
+		position: relative;
 		display: inline-flex;
 		align-items: center;
 		padding-bottom: 8rpx;
 	}
+	.tab-text {
+		font-size: 30rpx;
+		color: $yjyf-text-secondary;
+		font-weight: 600;
+		transition: all 0.2s ease;
+		line-height: 1.25;
+	}
+	.tab-item.active .tab-text {
+		font-size: $yjyf-font-title;
+		font-weight: 800;
+		color: $yjyf-text-main;
+	}
+	.tab-badge-pill {
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+		padding: 2rpx 10rpx;
+		border-radius: 8rpx;
+		line-height: 1.3;
+		margin-bottom: 6rpx;
+	}
+	.hot-badge {
+		color: $yjyf-primary;
+		background: $yjyf-primary-bg;
+	}
+	.done-badge {
+		color: $yjyf-success;
+		background: rgba(47, 168, 79, 0.10);
+	}
+	.tab-active-indicator {
+		position: absolute;
+		bottom: -2rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		width: 40rpx;
+		height: 6rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+	}
+	.title-more {
+		display: inline-flex;
+		align-items: center;
+		min-height: 56rpx;
+		padding-left: $yjyf-space-sm;
+	}
 	.more-txt {
-		font-size: 24rpx;
-		color: #888888;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
 		font-weight: 500;
 	}
 	.more-arrow {
 		width: 22rpx;
 		height: 22rpx;
-		margin-left: 2rpx;
+		margin-left: 4rpx;
 		opacity: 0.65;
 	}
 
-	/* 独立换行：京东式 4 列排序与筛选栏（综合推荐 | 销量 | 价格 ⇅ | 筛选 ▽） */
+	/* 一体化第二层：轻量化胶囊排序与筛选栏 */
 	.jd-sort-bar {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		height: 76rpx;
-		background: #FFFFFF;
-		border-radius: 16rpx;
-		padding: 0 8rpx;
-		margin-bottom: 18rpx;
+		height: 68rpx;
+		padding-top: 8rpx;
 		box-sizing: border-box;
 	}
 	.jd-sort-item {
@@ -1520,17 +1653,38 @@
 		min-width: 0;
 		cursor: pointer;
 	}
+	.jd-sort-pill {
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		height: 52rpx;
+		padding: 0 20rpx;
+		border-radius: $yjyf-radius-pill;
+		background: transparent;
+		transition: all 0.16s ease;
+	}
+	.jd-sort-item.active .jd-sort-pill {
+		background: $yjyf-primary-bg;
+	}
 	.jd-sort-txt {
 		font-size: 26rpx;
-		color: #444444;
+		color: $yjyf-text-regular;
 		font-weight: 400;
 		line-height: 1.2;
+		white-space: nowrap;
 		transition: color 0.16s ease;
 	}
 	.jd-sort-item.active .jd-sort-txt {
-		color: #F0710D;
+		color: $yjyf-primary;
 		font-weight: 600;
 	}
+	.jd-sort-divider {
+		width: 1rpx;
+		height: 28rpx;
+		background: $yjyf-border-color;
+		flex-shrink: 0;
+		margin: 0 4rpx;
+	}
 	.jd-price-caret {
 		width: 22rpx;
 		height: 22rpx;
@@ -1549,8 +1703,9 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		margin-bottom: 18rpx;
-		padding: 0 4rpx;
+		margin-top: $yjyf-space-xs;
+		padding-top: $yjyf-space-sm;
+		border-top: 1rpx solid $yjyf-border-color;
 	}
 	.jd-chips-scroll {
 		flex: 1;
@@ -1568,34 +1723,34 @@
 		align-items: center;
 		height: 48rpx;
 		padding: 0 18rpx;
-		border-radius: 24rpx;
-		background: #FFF7F0;
-		border: 1rpx solid #F0710D;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+		border: 1rpx solid $yjyf-primary;
 	}
 	.jd-chip-txt {
-		font-size: 22rpx;
-		color: #F0710D;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-primary;
 		font-weight: 600;
 		line-height: 1;
 	}
 	.jd-chip-close {
 		width: 18rpx;
 		height: 18rpx;
-		margin-left: 8rpx;
+		margin-left: $yjyf-space-xs;
 		opacity: 0.75;
 	}
 	.jd-chips-clear {
-		padding: 6rpx 12rpx;
-		margin-left: 8rpx;
+		padding: 8rpx 12rpx;
+		margin-left: $yjyf-space-xs;
 		flex-shrink: 0;
 	}
 	.jd-chips-clear-txt {
-		font-size: 22rpx;
-		color: #888888;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
 		font-weight: 400;
 	}
 
-	/* 京东式右侧滑出多维条件筛选抽屉 */
+	/* 右侧滑出多维条件筛选抽屉 */
 	.jd-drawer-mask {
 		position: fixed;
 		left: 0;
@@ -1610,8 +1765,8 @@
 	.jd-drawer-panel {
 		width: 610rpx;
 		height: 100%;
-		background: #FFFFFF;
-		border-radius: 28rpx 0 0 28rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-lg 0 0 $yjyf-radius-lg;
 		display: flex;
 		flex-direction: column;
 		box-sizing: border-box;
@@ -1633,7 +1788,7 @@
 		box-sizing: border-box;
 	}
 	.jd-sec-block {
-		padding-bottom: 32rpx;
+		padding-bottom: $yjyf-space-lg;
 	}
 	.jd-sec-head {
 		display: flex;
@@ -1643,8 +1798,8 @@
 		margin-bottom: 12rpx;
 	}
 	.jd-sec-title {
-		font-size: 28rpx;
-		color: #1F1F1F;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
 		font-weight: 700;
 		line-height: 1.2;
 	}
@@ -1660,13 +1815,13 @@
 	.jd-tag-grid {
 		display: grid;
 		grid-template-columns: repeat(3, minmax(0, 1fr));
-		gap: 16rpx;
+		gap: $yjyf-space-sm;
 	}
 	.jd-tag-cell {
 		height: 68rpx;
 		padding: 0 12rpx;
-		border-radius: 12rpx;
-		background: #F5F6F8;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
 		border: 1rpx solid transparent;
 		display: flex;
 		align-items: center;
@@ -1675,8 +1830,8 @@
 		transition: all 0.15s ease;
 	}
 	.jd-tag-txt {
-		font-size: 24rpx;
-		color: #1F1F1F;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-main;
 		font-weight: 400;
 		line-height: 1.2;
 		overflow: hidden;
@@ -1684,19 +1839,19 @@
 		text-overflow: ellipsis;
 	}
 	.jd-tag-cell.on {
-		background: #FFF7F0;
-		border-color: #F0710D;
+		background: $yjyf-primary-bg;
+		border-color: $yjyf-primary;
 	}
 	.jd-tag-cell.on .jd-tag-txt {
-		color: #F0710D;
+		color: $yjyf-primary;
 		font-weight: 600;
 	}
 
-	/* 抽屉底部：京东式左【重置】右【确定】一体双按钮栏 */
+	/* 抽屉底部：左【重置】右【确定】一体双按钮栏 */
 	.jd-drawer-footer {
 		padding: 20rpx 28rpx calc(env(safe-area-inset-bottom) + 24rpx);
-		background: #FFFFFF;
-		border-top: 1rpx solid #F0F0F2;
+		background: $yjyf-bg-card;
+		border-top: 1rpx solid $yjyf-border-color;
 		flex-shrink: 0;
 	}
 	.jd-btn-group {
@@ -1705,59 +1860,59 @@
 		height: 80rpx;
 		border-radius: 16rpx;
 		overflow: hidden;
-		border: 2rpx solid #F0710D;
+		border: 2rpx solid $yjyf-primary;
 		box-sizing: border-box;
 	}
 	.jd-btn-reset {
 		flex: 1;
 		height: 100%;
-		background: #FFFFFF;
+		background: $yjyf-bg-card;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
 	.jd-btn-reset-txt {
-		font-size: 28rpx;
-		color: #F0710D;
+		font-size: $yjyf-font-body;
+		color: $yjyf-primary;
 		font-weight: 600;
 	}
 	.jd-btn-confirm {
 		flex: 1.2;
 		height: 100%;
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		background: $yjyf-gradient-primary;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
 	.jd-btn-confirm-txt {
-		font-size: 28rpx;
-		color: #FFFFFF;
+		font-size: $yjyf-font-body;
+		color: $yjyf-bg-card;
 		font-weight: 600;
 	}
 
-	/* ---------- 5.2 骨架屏加载动画 ---------- */
+	/* ---------- 6.2 骨架屏加载动画 ---------- */
 	.skeleton-grid {
 		display: grid;
 		grid-template-columns: repeat(2, 1fr);
-		gap: 20rpx;
+		gap: $yjyf-space-sm;
 	}
 	.skeleton-card {
-		background: #FFFFFF;
-		border-radius: 20rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
 		overflow: hidden;
-		border: 1rpx solid #F0F0F2;
+		border: 1rpx solid $yjyf-border-color;
 	}
 	.sk-media {
 		width: 100%;
-		height: 220rpx;
-		background: #F0F0F2;
+		height: 224rpx;
+		background: $yjyf-border-color;
 	}
 	.sk-body {
-		padding: 16rpx;
+		padding: $yjyf-space-sm;
 	}
 	.sk-line {
 		border-radius: 8rpx;
-		background: #F0F0F2;
+		background: $yjyf-border-color;
 	}
 	.sk-title {
 		width: 78%;
@@ -1767,7 +1922,7 @@
 	.sk-sub {
 		width: 55%;
 		height: 22rpx;
-		margin-bottom: 18rpx;
+		margin-bottom: $yjyf-space-sm;
 	}
 	.sk-foot {
 		display: flex;
@@ -1778,16 +1933,16 @@
 		width: 96rpx;
 		height: 32rpx;
 		border-radius: 8rpx;
-		background: #F0F0F2;
+		background: $yjyf-border-color;
 	}
 	.sk-btn {
 		width: 112rpx;
 		height: 44rpx;
-		border-radius: 22rpx;
-		background: #F0F0F2;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-border-color;
 	}
 	.shimmer {
-		background: linear-gradient(90deg, #F0F0F2 25%, #F8F9FA 50%, #F0F0F2 75%);
+		background: linear-gradient(90deg, $yjyf-border-color 25%, $yjyf-bg-page 50%, $yjyf-border-color 75%);
 		background-size: 200% 100%;
 		animation: skShimmer 1.3s infinite linear;
 	}
@@ -1800,14 +1955,14 @@
 	.services-grid {
 		display: grid;
 		grid-template-columns: repeat(2, 1fr);
-		gap: 20rpx;
+		gap: $yjyf-space-sm;
 	}
 	.service-card {
-		background: #FFFFFF;
-		border-radius: 20rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
 		overflow: hidden;
-		box-shadow: 0 4rpx 16rpx rgba(15, 23, 42, 0.05);
-		border: 1rpx solid #F0F0F2;
+		box-shadow: 0 4rpx 16rpx rgba(31, 31, 31, 0.04);
+		border: 1rpx solid $yjyf-border-color;
 		display: flex;
 		flex-direction: column;
 		box-sizing: border-box;
@@ -1819,8 +1974,8 @@
 	.service-media {
 		position: relative;
 		width: 100%;
-		height: 220rpx;
-		background: #F8FAFC;
+		height: 224rpx;
+		background: $yjyf-bg-page;
 		overflow: hidden;
 	}
 	.service-img {
@@ -1833,7 +1988,7 @@
 		left: 0;
 		right: 0;
 		top: 0;
-		height: 60rpx;
+		height: 64rpx;
 		background: linear-gradient(180deg, rgba(0, 0, 0, 0.28) 0%, rgba(0, 0, 0, 0) 100%);
 		pointer-events: none;
 	}
@@ -1848,11 +2003,11 @@
 		line-height: 40rpx;
 		text-align: center;
 		padding: 0 14rpx;
-		border-radius: 12rpx;
+		border-radius: $yjyf-radius-sm;
 		background: rgba(0, 0, 0, 0.45);
 		backdrop-filter: blur(8rpx);
-		color: #FFFFFF;
-		font-size: 22rpx;
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-micro;
 		font-weight: 600;
 		letter-spacing: 0.5rpx;
 	}
@@ -1867,29 +2022,29 @@
 		line-height: 40rpx;
 		text-align: center;
 		padding: 0 14rpx;
-		border-radius: 12rpx;
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
-		color: #FFFFFF;
-		font-size: 22rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-micro;
 		font-weight: 700;
 		box-shadow: 0 2rpx 8rpx rgba(240, 113, 13, 0.35);
 	}
 	.service-info {
-		padding: 16rpx 16rpx 18rpx;
+		padding: $yjyf-space-sm;
 		display: flex;
 		flex-direction: column;
 		flex: 1;
 		justify-content: space-between;
 	}
 	.service-name {
-		font-size: 28rpx;
+		font-size: $yjyf-font-body;
 		font-weight: 700;
-		color: #1F1F1F;
+		color: $yjyf-text-main;
 		overflow: hidden;
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		line-height: 1.4;
-		margin-bottom: 14rpx;
+		margin-bottom: $yjyf-space-sm;
 	}
 	.service-bottom {
 		display: flex;
@@ -1901,20 +2056,20 @@
 		align-items: baseline;
 	}
 	.service-price .price-symbol {
-		font-size: 24rpx;
+		font-size: $yjyf-font-sub;
 		font-weight: 800;
-		color: #F0710D;
+		color: $yjyf-primary;
 	}
 	.service-price .price-num {
 		font-size: 36rpx;
 		font-weight: 900;
-		color: #F0710D;
+		color: $yjyf-primary;
 		margin-left: 2rpx;
 		line-height: 1;
 	}
 	.service-price .price-unit {
-		font-size: 22rpx;
-		color: #888888;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
 		margin-left: 4rpx;
 	}
 	.service-book-btn {
@@ -1923,19 +2078,19 @@
 		justify-content: center;
 		height: 48rpx;
 		padding: 0 18rpx;
-		border-radius: 24rpx;
-		background: #FFF7F0;
-		border: 1rpx solid #FDE4D0;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+		border: 1rpx solid rgba(240, 113, 13, 0.18);
 		line-height: 1;
 		transition: background 0.15s ease;
 	}
 	.service-book-btn:active {
-		background: #FEE8D8;
+		background: rgba(240, 113, 13, 0.14);
 	}
 	.book-btn-txt {
-		font-size: 22rpx;
+		font-size: $yjyf-font-micro;
 		font-weight: 700;
-		color: #F0710D;
+		color: $yjyf-primary;
 		line-height: 1;
 	}
 	.book-btn-arr {
@@ -1948,14 +2103,14 @@
 	.order-flow-grid {
 		display: grid;
 		grid-template-columns: repeat(2, 1fr);
-		gap: 20rpx;
+		gap: $yjyf-space-sm;
 	}
 	.order-flow-card {
-		background: #FFFFFF;
-		border-radius: 20rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
 		overflow: hidden;
-		box-shadow: 0 4rpx 16rpx rgba(15, 23, 42, 0.05);
-		border: 1rpx solid #F0F0F2;
+		box-shadow: 0 4rpx 16rpx rgba(31, 31, 31, 0.04);
+		border: 1rpx solid $yjyf-border-color;
 		display: flex;
 		flex-direction: column;
 		box-sizing: border-box;
@@ -1967,8 +2122,8 @@
 	.flow-card-media {
 		position: relative;
 		width: 100%;
-		height: 220rpx;
-		background: #F8FAFC;
+		height: 224rpx;
+		background: $yjyf-bg-page;
 		overflow: hidden;
 	}
 	.flow-card-img {
@@ -1982,7 +2137,7 @@
 		top: 12rpx;
 		height: 40rpx;
 		padding: 0 14rpx;
-		border-radius: 12rpx;
+		border-radius: $yjyf-radius-sm;
 		display: inline-flex;
 		align-items: center;
 		justify-content: center;
@@ -1990,38 +2145,32 @@
 		line-height: 1;
 	}
 	.badge-done {
-		background: rgba(16, 185, 129, 0.90);
+		background: rgba(47, 168, 79, 0.90);
 		backdrop-filter: blur(8rpx);
-		box-shadow: 0 2rpx 6rpx rgba(5, 150, 105, 0.25);
-	}
-	.status-dot-green {
-		width: 10rpx;
-		height: 10rpx;
-		border-radius: 50%;
-		background: #FFFFFF;
+		box-shadow: 0 2rpx 6rpx rgba(47, 168, 79, 0.25);
 	}
 	.showcase-badge-ico {
 		width: 22rpx;
 		height: 22rpx;
 	}
 	.badge-done .badge-status-txt {
-		color: #FFFFFF;
-		font-size: 22rpx;
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-micro;
 		font-weight: 700;
 		line-height: 1;
 	}
 
 	.flow-card-content {
-		padding: 16rpx 16rpx 18rpx;
+		padding: $yjyf-space-sm;
 		display: flex;
 		flex-direction: column;
 		flex: 1;
 		justify-content: space-between;
 	}
 	.flow-card-title {
-		font-size: 28rpx;
+		font-size: $yjyf-font-body;
 		font-weight: 700;
-		color: #1F1F1F;
+		color: $yjyf-text-main;
 		overflow: hidden;
 		white-space: nowrap;
 		text-overflow: ellipsis;
@@ -2029,17 +2178,17 @@
 		margin-bottom: 6rpx;
 	}
 	.flow-card-quote {
-		font-size: 22rpx;
-		color: #444444;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-regular;
 		overflow: hidden;
 		white-space: nowrap;
 		text-overflow: ellipsis;
-		margin-bottom: 8rpx;
+		margin-bottom: $yjyf-space-xs;
 	}
 	.flow-card-meta {
 		display: flex;
 		align-items: center;
-		margin-bottom: 14rpx;
+		margin-bottom: $yjyf-space-sm;
 	}
 	.meta-pin-icon {
 		width: 20rpx;
@@ -2049,8 +2198,8 @@
 		opacity: 0.6;
 	}
 	.flow-card-loc {
-		font-size: 22rpx;
-		color: #888888;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
 		overflow: hidden;
 		white-space: nowrap;
 		text-overflow: ellipsis;
@@ -2074,7 +2223,7 @@
 	.flow-score-txt {
 		font-size: 26rpx;
 		font-weight: 800;
-		color: #F0710D;
+		color: $yjyf-primary;
 	}
 	.flow-action-btn {
 		display: inline-flex;
@@ -2082,19 +2231,19 @@
 		justify-content: center;
 		height: 48rpx;
 		padding: 0 18rpx;
-		border-radius: 24rpx;
-		background: #FFF7F0;
-		border: 1rpx solid #FDE4D0;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+		border: 1rpx solid rgba(240, 113, 13, 0.18);
 		line-height: 1;
 		transition: background 0.15s ease;
 	}
 	.flow-action-btn:active {
-		background: #FEE8D8;
+		background: rgba(240, 113, 13, 0.14);
 	}
 	.flow-action-txt {
-		font-size: 22rpx;
+		font-size: $yjyf-font-micro;
 		font-weight: 700;
-		color: #F0710D;
+		color: $yjyf-primary;
 		line-height: 1;
 	}
 	.flow-action-arr {
@@ -2105,7 +2254,7 @@
 
 	/* ---------- 分页触底加载与到底状态栏 ---------- */
 	.feed-load-footer {
-		padding: 28rpx 0 8rpx;
+		padding: $yjyf-space-md 0 $yjyf-space-xs;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -2114,19 +2263,19 @@
 		display: inline-flex;
 		align-items: center;
 		justify-content: center;
-		height: 60rpx;
-		padding: 0 32rpx;
-		border-radius: 30rpx;
-		background: #FFFFFF;
-		border: 1rpx solid #F0F0F2;
+		height: 64rpx;
+		padding: 0 $yjyf-space-lg;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-card;
+		border: 1rpx solid $yjyf-border-color;
 		gap: 12rpx;
 	}
 	.loading-spinner {
 		width: 26rpx;
 		height: 26rpx;
 		border-radius: 50%;
-		border: 3rpx solid #FDE4D0;
-		border-top-color: #F0710D;
+		border: 3rpx solid rgba(240, 113, 13, 0.22);
+		border-top-color: $yjyf-primary;
 		animation: spinAnim 0.75s linear infinite;
 	}
 	@keyframes spinAnim {
@@ -2134,68 +2283,68 @@
 		to { transform: rotate(360deg); }
 	}
 	.load-more-txt {
-		font-size: 24rpx;
-		color: #888888;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
 		font-weight: 500;
 	}
 	.no-more-box {
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		gap: 16rpx;
+		gap: $yjyf-space-sm;
 		width: 100%;
 	}
 	.no-more-line {
 		width: 64rpx;
 		height: 1rpx;
-		background: #E5E7EB;
+		background: $yjyf-border-color;
 	}
 	.no-more-txt {
-		font-size: 22rpx;
-		color: #AAAAAA;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
 	}
 
 	/* ---------- 底部呼吸留白 (彻底避让悬浮大圆球与 TabBar) ---------- */
 	.page-bottom-space {
-		height: 220rpx;
+		height: 96rpx;
 	}
 
 	/* ---------- 空状态缺省兜底 ---------- */
 	.empty-state-box {
-		padding: 70rpx 0 90rpx;
+		padding: 72rpx 0 88rpx;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		background: #FFFFFF;
-		border-radius: 20rpx;
-		border: 1rpx solid #F0F0F2;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		border: 1rpx solid $yjyf-border-color;
 	}
 	.empty-state-icon {
-		width: 100rpx;
-		height: 100rpx;
+		width: 104rpx;
+		height: 104rpx;
 		opacity: 0.75;
 	}
 	.empty-state-text {
 		font-size: 26rpx;
-		color: #888888;
-		margin-top: 18rpx;
+		color: $yjyf-text-secondary;
+		margin-top: $yjyf-space-sm;
 	}
 	.empty-reset-btn {
-		margin-top: 24rpx;
+		margin-top: $yjyf-space-md;
 		height: 56rpx;
-		padding: 0 32rpx;
-		border-radius: 28rpx;
-		background: #FFF7F0;
-		border: 1rpx solid #F0710D;
+		padding: 0 $yjyf-space-lg;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+		border: 1rpx solid $yjyf-primary;
 		display: inline-flex;
 		align-items: center;
 		justify-content: center;
 	}
 	.empty-reset-txt {
-		font-size: 24rpx;
+		font-size: $yjyf-font-sub;
 		font-weight: 600;
-		color: #F0710D;
+		color: $yjyf-primary;
 	}
 
 	.clickable-hover:active {
diff --git a/yjyf-app/components/user/UserMessageView.vue b/yjyf-app/components/user/UserMessageView.vue
index a3c97cc..29ce60b 100644
--- a/yjyf-app/components/user/UserMessageView.vue
+++ b/yjyf-app/components/user/UserMessageView.vue
@@ -1,84 +1,231 @@
 <template>
 	<view class="user-message-view">
-		<!-- 统一顶部橙色导航栏 -->
 		<YjyfNavBar theme="orange" title="消息中心" />
 
 		<view class="head">
-			<view class="cats">
-				<view v-for="c in cats" :key="c.key" class="cat clickable-hover" :class="{ on: category === c.key }" @tap="switchCat(c.key)">{{ c.name }}</view>
+			<scroll-view scroll-x class="cats-scroll" :show-scrollbar="false">
+				<view class="cats">
+					<view
+						v-for="c in cats"
+						:key="c.key"
+						class="cat clickable-hover"
+						:class="{ on: category === c.key }"
+						@tap="switchCat(c.key)"
+					>
+						<text class="cat-txt">{{ c.name }}</text>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="read-all clickable-hover" @tap="readAll">
+				<text class="read-all-txt">全部已读</text>
 			</view>
-			<text class="read-all clickable-hover" @tap="readAll">全部已读</text>
 		</view>
 
-		<view class="list">
-			<view class="msg" :class="{ unread: !m.is_read }" v-for="m in list" :key="m.id" @tap="open(m)">
-				<view class="msg-top">
-					<view class="dot" v-if="!m.is_read"></view>
-					<text class="title">{{ m.title }}</text>
-					<text class="time">{{ m.time_text }}</text>
+		<YjyfRefreshScroll
+			class="msg-scroll"
+			theme="light"
+			:refresh-task="load"
+			@scrolltolower="loadMore"
+		>
+			<view class="list" v-if="list.length">
+				<view
+					class="msg clickable-hover"
+					:class="{ unread: !m.is_read }"
+					v-for="m in list"
+					:key="m.id"
+					@tap="open(m)"
+				>
+					<view class="msg-top">
+						<view class="title-wrap">
+							<view class="dot" v-if="!m.is_read"></view>
+							<text class="type-tag">{{ typeLabel(m.type) }}</text>
+							<text class="title">{{ m.title }}</text>
+						</view>
+						<text class="time">{{ m.time_text }}</text>
+					</view>
+
+					<text class="content">{{ m.content }}</text>
+
+					<view class="msg-foot">
+						<text class="detail-hint">{{ Number(m.order_id) > 0 ? '点击前往关联工单' : '点击查看完整通知' }}</text>
+						<view class="go-link">
+							<text class="go-txt">{{ Number(m.order_id) > 0 ? '查看工单' : '查看详情' }}</text>
+							<image class="go-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+						</view>
+					</view>
+				</view>
+
+				<view class="foot-more" v-if="list.length >= 20">
+					<text class="foot-more-txt">{{ loadingMore ? '加载中...' : (hasMore ? '上滑加载更多消息' : '已加载全部消息') }}</text>
+				</view>
+			</view>
+
+			<view class="empty-box" v-else-if="!loading">
+				<image class="empty-img" src="/static/icons/empty-message.svg" mode="aspectFit" />
+				<text class="empty-title">暂无相关消息通知</text>
+				<text class="empty-sub">订单动态、审核结果与服务提醒将在此展示</text>
+			</view>
+		</YjyfRefreshScroll>
+
+		<!-- 消息详情半屏抽屉 -->
+		<view class="drawer-mask" v-if="activeMsg" @tap="activeMsg = null">
+			<view class="drawer-panel" @tap.stop>
+				<view class="drawer-head">
+					<view class="dh-left">
+						<text class="type-tag">{{ typeLabel(activeMsg.type) }}</text>
+						<text class="drawer-title">{{ activeMsg.title }}</text>
+					</view>
+					<view class="close-hit" @tap="activeMsg = null">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<text class="drawer-time">通知时间：{{ activeMsg.time_text }}</text>
+				<scroll-view scroll-y class="drawer-body">
+					<text class="drawer-content">{{ activeMsg.content }}</text>
+				</scroll-view>
+				<view
+					v-if="Number(activeMsg.order_id) > 0"
+					class="drawer-btn clickable-hover"
+					@tap="jumpToOrder(activeMsg.order_id)"
+				>
+					前往查看关联工单
 				</view>
-				<text class="content">{{ m.content }}</text>
-				<text class="go" v-if="m.order_id">查看订单 ›</text>
 			</view>
-			<view class="empty" v-if="!loading && !list.length">暂无消息</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
-	import { ref, onMounted } from 'vue';
+	import { ref, watch, onMounted } from 'vue';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin } from '@/utils/request.js';
 	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import YjyfRefreshScroll from '@/components/YjyfRefreshScroll.vue';
+
+	const props = defineProps({
+		roleType: {
+			type: String,
+			default: 'user'
+		}
+	});
 
 	const list = ref([]);
 	const loading = ref(false);
+	const loadingMore = ref(false);
+	const page = ref(1);
+	const hasMore = ref(false);
 	const category = ref('all');
+	const activeMsg = ref(null);
 
 	const cats = [
 		{ key: 'all', name: '全部' },
 		{ key: 'order', name: '订单' },
-		{ key: 'system', name: '系统' },
-		{ key: 'remind', name: '提醒' }
+		{ key: 'audit', name: '审核' },
+		{ key: 'remind', name: '提醒' },
+		{ key: 'system', name: '系统' }
 	];
 
+	function typeLabel(t) {
+		return { order: '订单', audit: '审核', remind: '提醒', system: '系统' }[t] || '通知';
+	}
+
 	async function load() {
 		if (!isLogin()) { toLogin(); return; }
 		loading.value = true;
+		page.value = 1;
 		try {
-			const res = await api.messageList({ category: category.value, limit: 30 });
-			list.value = res.list || [];
+			const res = await api.messageList({
+				type: props.roleType,
+				category: category.value,
+				page: 1,
+				limit: 20
+			});
+			const rows = res?.list || [];
+			list.value = rows;
+			const total = Number(res?.total || 0);
+			hasMore.value = rows.length < total;
+			uni.$emit('yjyf:refreshUnread');
 		} catch (e) {
 		} finally {
 			loading.value = false;
 		}
 	}
 
+	async function loadMore() {
+		if (loading.value || loadingMore.value || !hasMore.value) return;
+		loadingMore.value = true;
+		const next = page.value + 1;
+		try {
+			const res = await api.messageList({
+				type: props.roleType,
+				category: category.value,
+				page: next,
+				limit: 20
+			});
+			const rows = res?.list || [];
+			list.value = list.value.concat(rows);
+			page.value = next;
+			const total = Number(res?.total || 0);
+			hasMore.value = list.value.length < total;
+		} catch (e) {
+		} finally {
+			loadingMore.value = false;
+		}
+	}
+
 	function switchCat(k) {
+		if (category.value === k) return;
 		category.value = k;
 		load();
 	}
 
+	function jumpToOrder(orderId) {
+		activeMsg.value = null;
+		const targetUrl = props.roleType === 'master'
+			? `/pages/master/detail?id=${orderId}`
+			: `/pages/order/detail?id=${orderId}`;
+		uni.navigateTo({ url: targetUrl });
+	}
+
+	const readingAll = ref(false);
+
 	async function open(m) {
-		if (!m.is_read) {
+		if (!m.is_read && !m._reading) {
+			m._reading = true;
 			try {
-				await api.messageRead({ id: m.id });
+				await api.messageRead({ id: m.id, type: props.roleType });
 				m.is_read = 1;
-			} catch (e) {}
+				uni.$emit('yjyf:refreshUnread');
+			} catch (e) {
+			} finally {
+				m._reading = false;
+			}
 		}
-		if (m.order_id) {
-			uni.navigateTo({ url: `/pages/order/detail?id=${m.order_id}` });
+		if (Number(m.order_id) > 0) {
+			jumpToOrder(m.order_id);
+		} else {
+			activeMsg.value = m;
 		}
 	}
 
 	async function readAll() {
+		if (readingAll.value) return;
+		readingAll.value = true;
 		try {
-			const res = await api.messageReadAll({});
-			uni.showToast({ title: '已全部标记已读（' + res.count + ' 条）', icon: 'none' });
-			load();
-		} catch (e) {}
+			const res = await api.messageReadAll({ type: props.roleType });
+			uni.showToast({ title: `已标记已读（${res?.count || 0} 条）`, icon: 'none' });
+			uni.$emit('yjyf:refreshUnread');
+			await load();
+		} catch (e) {
+		} finally {
+			readingAll.value = false;
+		}
 	}
 
+	watch(() => props.roleType, () => {
+		load();
+	});
+
 	onMounted(() => {
 		load();
 	});
@@ -88,22 +235,299 @@
 	});
 </script>
 
-<style scoped>
-	.user-message-view { min-height: 100vh; background: #F5F6F8; padding-bottom: 40rpx; }
-	.head { display: flex; align-items: center; background: #fff; padding: 20rpx 24rpx; box-shadow: 0 4rpx 12rpx rgba(0,0,0,.03); }
-	.cats { flex: 1; display: flex; align-items: center; gap: 16rpx; }
-	.cat { height: 56rpx; padding: 0 26rpx; display: inline-flex; align-items: center; justify-content: center; border-radius: 28rpx; background: #F5F6F8; font-size: 24rpx; color: #444444; line-height: 1; }
-	.cat.on { background: #FFF7F0; color: #F0710D; font-weight: 600; }
-	.read-all { display: inline-flex; align-items: center; height: 56rpx; line-height: 56rpx; font-size: 24rpx; color: #F0710D; font-weight: 500; }
-	.list { padding: 24rpx; }
-	.msg { background: #fff; border-radius: 20rpx; padding: 22rpx 24rpx; margin-bottom: 18rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06); }
-	.msg.unread { border-left: 6rpx solid #F0710D; }
-	.msg-top { display: flex; align-items: center; }
-	.dot { width: 12rpx; height: 12rpx; border-radius: 50%; background: #F0710D; margin-right: 10rpx; }
-	.title { flex: 1; min-width: 0; font-size: 28rpx; font-weight: 600; color: #1F1F1F; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }
-	.time { flex-shrink: 0; margin-left: 12rpx; font-size: 22rpx; color: #AAAAAA; }
-	.content { display: block; margin-top: 10rpx; font-size: 24rpx; color: #666; line-height: 34rpx; }
-	.go { display: block; margin-top: 10rpx; font-size: 22rpx; color: #4A7CFF; }
-	.empty { padding: 110rpx 0; text-align: center; font-size: 24rpx; color: #9A9A9A; }
-	.clickable-hover:active { opacity: 0.85; transform: scale(0.98); }
+<style lang="scss" scoped>
+	@import '@/uni.scss';
+	/* #ifdef MP-WEIXIN */
+	:host {
+		flex: 1;
+		height: 100%;
+		min-height: 0;
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+	}
+	/* #endif */
+
+	.user-message-view {
+		flex: 1;
+		height: 100%;
+		min-height: 0;
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		background: $yjyf-bg-page;
+	}
+
+	.head {
+		flex-shrink: 0;
+		position: relative;
+		z-index: 2;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		background: $yjyf-bg-card;
+		padding: 16rpx $yjyf-space-md 20rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.cats-scroll {
+		flex: 1;
+		min-width: 0;
+		white-space: nowrap;
+		margin-right: 16rpx;
+	}
+	.cats {
+		display: inline-flex;
+		align-items: center;
+		gap: 14rpx;
+	}
+	.cat {
+		height: 56rpx;
+		padding: 0 26rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+	}
+	.cat-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+	}
+	.cat.on {
+		background: $yjyf-primary-bg;
+	}
+	.cat.on .cat-txt {
+		color: $yjyf-primary;
+		font-weight: 700;
+	}
+	.read-all {
+		flex-shrink: 0;
+		height: 56rpx;
+		padding: 0 8rpx;
+		display: inline-flex;
+		align-items: center;
+	}
+	.read-all-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	.msg-scroll {
+		flex: 1;
+		height: 0;
+		width: 100%;
+	}
+	.list {
+		padding: 20rpx $yjyf-space-md 64rpx;
+	}
+	.msg {
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		padding: 24rpx;
+		margin-bottom: 20rpx;
+		box-shadow: $yjyf-shadow-card;
+		border-left: 6rpx solid transparent;
+	}
+	.msg.unread {
+		border-left-color: $yjyf-primary;
+	}
+	.msg-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.title-wrap {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		align-items: center;
+	}
+	.dot {
+		width: 14rpx;
+		height: 14rpx;
+		border-radius: 50%;
+		background: $yjyf-danger;
+		margin-right: 10rpx;
+		flex-shrink: 0;
+	}
+	.type-tag {
+		height: 36rpx;
+		padding: 0 12rpx;
+		border-radius: 8rpx;
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+		margin-right: 12rpx;
+		flex-shrink: 0;
+		display: inline-flex;
+		align-items: center;
+	}
+	.title {
+		flex: 1;
+		min-width: 0;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.time {
+		flex-shrink: 0;
+		margin-left: 16rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
+	.content {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		margin-top: 14rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		line-height: 1.5;
+	}
+	.msg-foot {
+		margin-top: 18rpx;
+		padding-top: 14rpx;
+		border-top: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.detail-hint {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
+	.go-link {
+		display: inline-flex;
+		align-items: center;
+	}
+	.go-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+	.go-arrow {
+		width: 22rpx;
+		height: 22rpx;
+		margin-left: 4rpx;
+	}
+
+	.foot-more {
+		padding: 16rpx 0;
+		text-align: center;
+	}
+	.foot-more-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
+
+	.empty-box {
+		padding: 120rpx 32rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.empty-img {
+		width: 184rpx;
+		height: 184rpx;
+		margin-bottom: 20rpx;
+	}
+	.empty-title {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.empty-sub {
+		margin-top: 10rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	/* 消息详情抽屉 */
+	.drawer-mask {
+		position: fixed;
+		inset: 0;
+		z-index: 950;
+		background: rgba(0, 0, 0, 0.48);
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+	.drawer-panel {
+		background: $yjyf-bg-card;
+		border-radius: 28rpx 28rpx 0 0;
+		padding: 28rpx $yjyf-space-lg calc(32rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+	.drawer-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.dh-left {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		align-items: center;
+	}
+	.drawer-title {
+		flex: 1;
+		min-width: 0;
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.close-hit {
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.close-ico {
+		width: 30rpx;
+		height: 30rpx;
+	}
+	.drawer-time {
+		display: block;
+		margin-top: 10rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
+	.drawer-body {
+		max-height: 48vh;
+		margin-top: 24rpx;
+		padding: 22rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
+		box-sizing: border-box;
+	}
+	.drawer-content {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+		line-height: 1.65;
+		white-space: pre-wrap;
+	}
+	.drawer-btn {
+		margin-top: 28rpx;
+		height: 88rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: $yjyf-shadow-card;
+	}
 </style>
diff --git a/yjyf-app/components/user/UserMineView.vue b/yjyf-app/components/user/UserMineView.vue
index 57f37a8..ffa7e60 100644
--- a/yjyf-app/components/user/UserMineView.vue
+++ b/yjyf-app/components/user/UserMineView.vue
@@ -3,8 +3,14 @@
 		<!-- 统一固定吸顶导航栏（与其他页面 100% 统一，固定在手机顶部不随滚动划出） -->
 		<YjyfNavBar theme="orange" title="个人中心" :fixed="true" :placeholder="true" />
 
+		<YjyfRefreshScroll
+			class="mine-scroll"
+			theme="orange"
+			:nav-offset="navHeight"
+			:refresh-task="load"
+		>
 		<!-- 头部个人名片与资产核心区 -->
-		<view class="profile-hero" :style="{ marginTop: (-navHeight) + 'px', paddingTop: navHeight + 'px' }">
+		<view class="profile-hero" :style="{ backgroundPosition: '0 -' + navHeight + 'px' }">
 			<view class="hero-body">
 				<!-- 用户基本信息（点击进入「账号信息」页，支持家庭/个人与商家资料切换维护） -->
 				<view class="user-card clickable-hover" @tap="go('/pages/mine/account')">
@@ -19,10 +25,13 @@
 								<text class="role-badge-txt">{{ roleText }}</text>
 							</view>
 						</view>
-						<text class="user-mobile" v-if="mobileText">{{ mobileText }}</text>
+						<text class="user-mobile" v-if="showSubMobile">{{ mobileText }}</text>
 						<text class="user-subtag" v-if="master && master.score">服务评分 {{ master.score }} 分</text>
 					</view>
-					<image class="hero-arrow-ico" src="/static/icons/arrow-right-white.svg" mode="aspectFit" />
+					<view class="hero-action">
+						<text class="hero-action-txt">账号设置</text>
+						<image class="hero-arrow-ico" src="/static/icons/arrow-right-white.svg" mode="aspectFit" />
+					</view>
 				</view>
 
 				<!-- 核心资产卡片（仅聚焦余额与优惠券，无冗余项） -->
@@ -35,7 +44,7 @@
 						<text class="asset-title">账户余额</text>
 					</view>
 					<view class="asset-line"></view>
-					<view class="asset-item clickable-hover" @tap="go('/pages/coupon/coupon')">
+					<view class="asset-item clickable-hover" @tap="go('/pages/coupon/coupon?tab=mine')">
 						<view class="asset-val-box">
 							<text class="asset-number">{{ coupon }}</text>
 							<text class="asset-unit">张</text>
@@ -46,12 +55,38 @@
 			</view>
 		</view>
 
-		<!-- 页面内容主体区 (Zone 2 - Zone 5) -->
+		<!-- 页面内容主体区 -->
 		<view class="content-body">
-			<!-- 身份工作台专区：针对已认证或审核中用户 (Zone 2) -->
-			<view class="role-workbench-section" v-if="hasRoleStatus">
-				<!-- 师傅身份卡片 -->
-				<view class="workbench-card master-card" v-if="master">
+			<!-- 我的订单状态快捷卡 -->
+			<view class="order-panel">
+				<view class="order-panel-hd">
+					<text class="order-panel-title">我的订单</text>
+					<view class="order-panel-more clickable-hover" @tap="goOrders('all')">
+						<text class="order-more-txt">全部订单</text>
+						<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<view class="order-grid">
+					<view
+						class="order-grid-item clickable-hover"
+						v-for="st in orderNavItems"
+						:key="st.key"
+						@tap="goOrders(st.key)"
+					>
+						<view class="order-ico-box">
+							<image class="order-ico" :src="st.icon" mode="aspectFit" />
+							<view class="order-badge" v-if="st.count > 0">
+								<text class="order-badge-txt">{{ st.count > 99 ? '99+' : st.count }}</text>
+							</view>
+						</view>
+						<text class="order-grid-txt">{{ st.name }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 师傅工作台专区：针对已提交或已认证师傅 -->
+			<view class="role-workbench-section" v-if="master">
+				<view class="workbench-card master-card">
 					<view class="wb-left">
 						<image class="wb-icon" src="/static/icons/join-master.svg" mode="aspectFit" />
 						<view class="wb-texts">
@@ -63,64 +98,54 @@
 						{{ masterCard.btn }}
 					</view>
 				</view>
-
-				<!-- 商家身份卡片 -->
-				<view class="workbench-card merchant-card" v-if="merchant">
-					<view class="wb-left">
-						<image class="wb-icon" src="/static/icons/join-merchant.svg" mode="aspectFit" />
-						<view class="wb-texts">
-							<text class="wb-title">{{ merchantCard.title }}</text>
-							<text class="wb-desc">{{ merchantCard.desc }}</text>
-						</view>
-					</view>
-					<view class="wb-btn clickable-hover" @tap="merchantCard.action">
-						{{ merchantCard.btn }}
-					</view>
-				</view>
 			</view>
 
-			<!-- 常用基础服务 (Zone 3) -->
+			<!-- 核心功能菜单 -->
 			<view class="card-panel">
-				<view class="panel-header">
-					<text class="panel-title">常用服务</text>
-				</view>
 				<view class="menu-group">
-					<view class="menu-item clickable-hover" @tap="go('/pages/mine/account')">
+					<view class="menu-item clickable-hover" @tap="go('/pages/coupon/coupon?tab=center')">
 						<view class="menu-item-l">
-							<image class="menu-ico" src="/static/icons/login-user.svg" mode="aspectFit" />
-							<text class="menu-txt">账号信息</text>
+							<image class="menu-ico" src="/static/icons/menu-coupon.svg" mode="aspectFit" />
+							<text class="menu-txt">领券中心</text>
+						</view>
+						<view class="menu-item-r">
+							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+						</view>
+					</view>
+					<view class="menu-item clickable-hover" @tap="go('/pages/order/goods-gallery?scene=mine')">
+						<view class="menu-item-l">
+							<image class="menu-ico" src="/static/icons/menu-gallery.svg" mode="aspectFit" />
+							<text class="menu-txt">商品图库</text>
 						</view>
 						<view class="menu-item-r">
-							<text class="menu-extra">{{ user && user.user_type === 'merchant' ? '商家' : '家庭/个人' }}</text>
 							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 						</view>
 					</view>
 					<view class="menu-item clickable-hover" @tap="go('/pages/address/list')">
 						<view class="menu-item-l">
 							<image class="menu-ico" src="/static/icons/menu-address.svg" mode="aspectFit" />
-							<text class="menu-txt">服务地址管理</text>
+							<text class="menu-txt">地址管理</text>
 						</view>
 						<view class="menu-item-r">
 							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 						</view>
 					</view>
-					<view class="menu-item clickable-hover" @tap="go('/pages/coupon/coupon')">
-						<view class="menu-item-l">
-							<image class="menu-ico" src="/static/icons/menu-coupon.svg" mode="aspectFit" />
-							<text class="menu-txt">领券中心</text>
-						</view>
-						<view class="menu-item-r">
-							<text class="menu-extra" v-if="coupon > 0">{{ coupon }} 张可用</text>
-							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
-						</view>
-					</view>
 					<view class="menu-item clickable-hover" @tap="go('/pages/merchant/invoice')">
 						<view class="menu-item-l">
 							<image class="menu-ico" src="/static/icons/menu-invoice.svg" mode="aspectFit" />
-							<text class="menu-txt">开具发票</text>
+							<text class="menu-txt">发票服务</text>
 						</view>
 						<view class="menu-item-r">
-							<text class="menu-extra">支持个人与企业抬头</text>
+							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+						</view>
+					</view>
+					<view class="menu-item clickable-hover" v-if="isMerchantAccount" @tap="go('/pages/mine/account?focus=members')">
+						<view class="menu-item-l">
+							<image class="menu-ico" src="/static/icons/menu-subaccount.svg" mode="aspectFit" />
+							<text class="menu-txt">子账号管理</text>
+						</view>
+						<view class="menu-item-r">
+							<text class="menu-extra" v-if="subMemberCount > 0">{{ subMemberCount }} 人</text>
 							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 						</view>
 					</view>
@@ -131,7 +156,6 @@
 							<text class="menu-txt">在线客服</text>
 						</view>
 						<view class="menu-item-r">
-							<text class="menu-extra">微信官方专属客服</text>
 							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 						</view>
 					</button>
@@ -140,74 +164,111 @@
 					<view class="menu-item clickable-hover" @tap="callService">
 						<view class="menu-item-l">
 							<image class="menu-ico" src="/static/icons/menu-service.svg" mode="aspectFit" />
-							<text class="menu-txt">联系官方客服</text>
+							<text class="menu-txt">联系客服</text>
 						</view>
 						<view class="menu-item-r">
-							<text class="menu-extra">400-000-0000</text>
+							<text class="menu-extra" v-if="servicePhone">{{ servicePhone }}</text>
 							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 						</view>
 					</view>
 					<!-- #endif -->
-					<view class="menu-item clickable-hover" @tap="showPlatformAssure">
+					<view class="menu-item clickable-hover" @tap="openAgreementPicker">
 						<view class="menu-item-l">
-							<image class="menu-ico" src="/static/icons/menu-about.svg" mode="aspectFit" />
-							<text class="menu-txt">平台服务保障</text>
+							<image class="menu-ico" src="/static/icons/menu-agreement.svg" mode="aspectFit" />
+							<text class="menu-txt">协议与规则</text>
 						</view>
 						<view class="menu-item-r">
-							<text class="menu-extra">实名认证·先行赔付</text>
 							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 						</view>
 					</view>
 				</view>
 			</view>
 
-			<!-- 合作与入驻通道（Zone 4：仅对未全部认证的普通用户开放，轻量化双列排版） -->
-			<view class="card-panel partner-panel" v-if="showPartnerEntry">
-				<view class="panel-header">
-					<text class="panel-title">入驻与合作</text>
+			<!-- 师傅招募通道（仅对未申请成为师傅的用户展示，单行轻量引导） -->
+			<view class="workbench-card recruit-card clickable-hover" v-if="!master" @tap="masterCard.action">
+				<view class="wb-left">
+					<image class="wb-icon" src="/static/icons/join-master.svg" mode="aspectFit" />
+					<view class="wb-texts">
+						<text class="wb-title">师傅招募</text>
+						<text class="wb-desc">实名与技能认证，海量同城订单随时接</text>
+					</view>
 				</view>
-				<view class="partner-grid">
-					<view class="partner-card clickable-hover" v-if="!master" @tap="masterCard.action">
-						<view class="partner-head">
-							<image class="partner-icon" src="/static/icons/join-master.svg" mode="aspectFit" />
-							<text class="partner-tag tag-master">成为师傅</text>
-						</view>
-						<text class="partner-main-title">师傅招募</text>
-						<text class="partner-brief">技能认证，接单赚收入</text>
-					</view>
-					<view class="partner-card clickable-hover" v-if="!merchant" @tap="merchantCard.action">
-						<view class="partner-head">
-							<image class="partner-icon" src="/static/icons/join-merchant.svg" mode="aspectFit" />
-							<text class="partner-tag tag-merchant">企业合作</text>
-						</view>
-						<text class="partner-main-title">商家入驻</text>
-						<text class="partner-brief">批量下单与对账开票</text>
-					</view>
+				<view class="recruit-tag">
+					<text class="recruit-tag-txt">成为师傅</text>
+					<image class="arrow-ico" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
 				</view>
 			</view>
 
-			<!-- 账号安全操作 (Zone 5) -->
+			<!-- 账号安全操作 -->
 			<view class="logout-action clickable-hover" @tap="logout">
 				<text class="logout-txt">退出登录</text>
 			</view>
 		</view>
+		</YjyfRefreshScroll>
+
+		<!-- 协议阅读弹窗（内容完全取自后端真实接口） -->
+		<view class="agr-mask" v-if="agrDialog.visible" @tap="agrDialog.visible = false">
+			<view class="agr-box" @tap.stop>
+				<view class="agr-hd">
+					<text class="agr-title">{{ agrDialog.title }}</text>
+					<view class="agr-close clickable-hover" @tap="agrDialog.visible = false">
+						<image class="agr-close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<scroll-view class="agr-scroll" scroll-y="true">
+					<text class="agr-content">{{ agrDialog.content }}</text>
+				</scroll-view>
+				<view class="agr-ft">
+					<view class="agr-btn clickable-hover" @tap="agrDialog.visible = false">我知道了</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script setup>
-	import { ref, computed, onMounted } from 'vue';
+	import { ref, reactive, computed, onMounted } from 'vue';
 	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import YjyfRefreshScroll from '@/components/YjyfRefreshScroll.vue';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin, setUser, clearAuth } from '@/utils/request.js';
 	import { getRole, setRole } from '@/utils/role.js';
 	import { getNavBarMetrics } from '@/utils/system.js';
 
+	const emit = defineEmits(['go-orders']);
+
 	const navHeight = ref(getNavBarMetrics().totalNavHeight);
 	const user = ref(null);
 	const master = ref(null);
 	const merchant = ref(null);
 	const coupon = ref(0);
+	const orderCounts = ref({
+		pending_pay: 0,
+		pending_accept: 0,
+		serving: 0,
+		pending_verify: 0
+	});
 	const currentRole = ref('user');
+	const servicePhone = ref('');
+	const agrDialog = reactive({
+		visible: false,
+		title: '',
+		content: ''
+	});
+
+	const orderNavItems = computed(() => {
+		const c = orderCounts.value || {};
+		return [
+			{ key: 'pending_pay', name: '待付款', icon: '/static/icons/order-pay.svg', count: Number(c.pending_pay) || 0 },
+			{ key: 'pending_accept', name: '待接单', icon: '/static/icons/order-wait.svg', count: Number(c.pending_accept) || 0 },
+			{ key: 'serving', name: '待服务', icon: '/static/icons/order-active.svg', count: Number(c.serving) || 0 },
+			{ key: 'pending_verify', name: '待验收', icon: '/static/icons/order-verify.svg', count: Number(c.pending_verify) || 0 }
+		];
+	});
+
+	const subMemberCount = computed(() => {
+		return (merchant.value && Number(merchant.value.member_count) > 0) ? Number(merchant.value.member_count) : 0;
+	});
 
 	const mobileText = computed(() => {
 		if (!user.value || !user.value.mobile) return '';
@@ -218,33 +279,31 @@
 		return m;
 	});
 
+	const showSubMobile = computed(() => {
+		if (!mobileText.value || !user.value) return false;
+		const nick = String(user.value.nickname || '').trim();
+		const raw = String(user.value.mobile || '').trim();
+		return nick !== raw && nick !== mobileText.value;
+	});
+
+	const isMerchantAccount = computed(() => {
+		return !!(user.value && user.value.user_type === 'merchant');
+	});
+
 	const isMasterOrMerchant = computed(() => {
-		return (master.value && master.value.verify_status === 'pass') || 
-		       (merchant.value && merchant.value.verify_status === 'pass');
-	});
-
-	const hasRoleStatus = computed(() => {
-		return !!(master.value || merchant.value);
-	});
-
-	const showPartnerEntry = computed(() => {
-		return !master.value || !merchant.value;
+		return (master.value && master.value.verify_status === 'pass') || isMerchantAccount.value;
 	});
 
 	const roleText = computed(() => {
 		const curRole = currentRole.value;
-		if (curRole === 'merchant' && merchant.value && merchant.value.verify_status === 'pass') {
-			return merchant.value.is_owner === false ? '关联商家' : '认证商家';
-		}
 		if (curRole === 'master' && master.value && master.value.verify_status === 'pass') {
 			return '认证师傅';
 		}
-		if (merchant.value && merchant.value.verify_status === 'pass') {
-			return merchant.value.is_owner === false ? '关联商家' : '认证商家';
-		}
 		if (master.value && master.value.verify_status === 'pass') return '认证师傅';
-		if (merchant.value && merchant.value.verify_status === 'pending') return '商家审核中';
 		if (master.value && master.value.verify_status === 'pending') return '师傅审核中';
+		if (isMerchantAccount.value) {
+			return merchant.value && merchant.value.is_owner === false ? '关联商家' : '商家用户';
+		}
 		return '个人用户';
 	});
 
@@ -262,27 +321,14 @@
 		return { title: '师傅工作台', desc: '已通过认证，进入工作台开始接单', btn: '切换师傅端', action: switchToMaster };
 	});
 
-	const merchantCard = computed(() => {
-		const m = merchant.value;
-		if (!m) {
-			return { title: '成为优匠优服商家', desc: '企业认证，支持批量下单 / 对账 / 开票', btn: '商家入驻', action: () => go('/pages/merchant/apply') };
-		}
-		if (m.verify_status === 'pending') {
-			return { title: '商家资质审核中', desc: '平台将在 1-2 个工作日内完成审核', btn: '查看进度', action: () => go('/pages/merchant/apply') };
-		}
-		if (m.verify_status === 'reject') {
-			return { title: '商家资质未通过', desc: m.audit_msg || '请补充资料后重新提交', btn: '重新提交', action: () => go('/pages/merchant/apply') };
-		}
-		if (m.is_owner === false) {
-			return { title: m.name || '关联企业账号', desc: '订单 / 账单 / 开票数据与企业主账号同步', btn: '切换商家端', action: switchToMerchant };
-		}
-		return { title: m.name || '商家企业工作台', desc: '进入商家工作台：批量下单 / 账单 / 开票', btn: '切换商家端', action: switchToMerchant };
-	});
-
 	function go(url) {
 		uni.navigateTo({ url });
 	}
 
+	function goOrders(statusKey = 'all') {
+		emit('go-orders', statusKey);
+	}
+
 	function showBalanceTip() {
 		const bal = user.value ? Number(user.value.balance).toFixed(2) : '0.00';
 		uni.showModal({
@@ -293,20 +339,39 @@
 		});
 	}
 
-	function showPlatformAssure() {
-		uni.showModal({
-			title: '优匠优服 · 服务保障',
-			content: '1. 实名认证：所有上门师傅均通过公安实名与技能审核\n2. 价格公道：标准服务定价，杜绝隐形加价与乱收费\n3. 售后保障：平台客服全程跟踪，质保期内免费返工',
-			showCancel: false,
-			confirmText: '我知道了',
-			confirmColor: '#F0710D'
-		});
+	function callService() {
+		api.contactService();
 	}
 
-	function callService() {
-		uni.makePhoneCall({
-			phoneNumber: '4000000000',
-			fail: () => {}
+	function openAgreementPicker() {
+		const items = isMerchantAccount.value
+			? [
+				{ label: '用户服务协议', type: 'user_service' },
+				{ label: '隐私保护指引', type: 'privacy' },
+				{ label: '企业商家协同服务协议', type: 'merchant' }
+			]
+			: [
+				{ label: '用户服务协议', type: 'user_service' },
+				{ label: '隐私保护指引', type: 'privacy' }
+			];
+		uni.showActionSheet({
+			itemList: items.map(i => i.label),
+			success: async (res) => {
+				const picked = items[res.tapIndex];
+				if (!picked) return;
+				try {
+					uni.showLoading({ title: '加载中...' });
+					const data = await api.agreement(picked.type, { silent: false });
+					uni.hideLoading();
+					if (data && data.content) {
+						agrDialog.title = data.title || picked.label;
+						agrDialog.content = data.content;
+						agrDialog.visible = true;
+					}
+				} catch (e) {
+					uni.hideLoading();
+				}
+			}
 		});
 	}
 
@@ -322,30 +387,40 @@
 			master.value = res.master;
 			merchant.value = res.merchant;
 			coupon.value = Number(res.coupon_count) || 0;
+			if (res.order_counts) {
+				orderCounts.value = {
+					pending_pay: Number(res.order_counts.pending_pay) || 0,
+					pending_accept: Number(res.order_counts.pending_accept) || 0,
+					serving: Number(res.order_counts.serving) || 0,
+					pending_verify: Number(res.order_counts.pending_verify) || 0
+				};
+			}
 			setUser(res);
+			api.home({ silent: true }).then((h) => {
+				if (h && h.service_phone) servicePhone.value = h.service_phone;
+			}).catch(() => {});
 		} catch (e) {
 			console.error('加载个人信息失败', e);
 		}
 	}
 
-	async function switchToMerchant() {
-		try {
-			const res = await api.switchRole({ role: 'merchant' });
-			setRole('merchant');
-			currentRole.value = 'merchant';
-			uni.showToast({ title: '已切换为商家身份' });
-			setTimeout(() => uni.reLaunch({ url: res.redirect }), 500);
-		} catch (e) {}
-	}
+	const switchingRole = ref(false);
 
 	async function switchToMaster() {
+		if (switchingRole.value) return;
+		switchingRole.value = true;
 		try {
 			const res = await api.switchRole({ role: 'master' });
 			setRole('master');
 			currentRole.value = 'master';
 			uni.showToast({ title: '已切换为师傅身份' });
-			setTimeout(() => uni.reLaunch({ url: res.redirect }), 500);
-		} catch (e) {}
+			setTimeout(() => {
+				switchingRole.value = false;
+				uni.reLaunch({ url: res.redirect });
+			}, 500);
+		} catch (e) {
+			switchingRole.value = false;
+		}
 	}
 
 	function logout() {
@@ -373,14 +448,22 @@
 
 <style scoped>
 	.user-mine-view {
-		min-height: 100vh;
+		height: calc(100vh - 112rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 112rpx - env(safe-area-inset-bottom));
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
 		width: 100%;
-		overflow-x: hidden;
 		background: #F5F6F8;
-		padding-bottom: calc(150rpx + env(safe-area-inset-bottom));
 		box-sizing: border-box;
 	}
 
+	.mine-scroll {
+		flex: 1;
+		height: 0;
+		width: 100%;
+	}
+
 	/* ---------- 头部个人主页英雄区 (Zone 1: 一体化沉浸) ---------- */
 	.profile-hero {
 		position: relative;
@@ -408,11 +491,23 @@
 		z-index: 2;
 	}
 
-	.hero-arrow-ico {
-		width: 32rpx;
-		height: 32rpx;
+	.hero-action {
 		margin-left: auto;
-		opacity: 0.85;
+		display: inline-flex;
+		align-items: center;
+		flex-shrink: 0;
+	}
+
+	.hero-action-txt {
+		font-size: 24rpx;
+		color: rgba(255, 255, 255, 0.92);
+		margin-right: 4rpx;
+	}
+
+	.hero-arrow-ico {
+		width: 28rpx;
+		height: 28rpx;
+		opacity: 0.9;
 	}
 
 	.avatar-wrap {
@@ -565,7 +660,7 @@
 
 	/* ---------- 主体内容区 ---------- */
 	.content-body {
-		padding: 24rpx 28rpx 0;
+		padding: 24rpx 24rpx 120rpx;
 	}
 
 	/* ---------- 身份工作台专区 (Zone 2) ---------- */
@@ -643,38 +738,10 @@
 	/* ---------- 通用卡片容器 ---------- */
 	.card-panel {
 		background: #FFFFFF;
-		border-radius: 24rpx;
-		padding: 24rpx 24rpx;
+		border-radius: 20rpx;
+		padding: 8rpx 24rpx;
 		margin-bottom: 24rpx;
-		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.035);
-	}
-
-	.panel-header {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 16rpx;
-		padding: 4rpx 0;
-	}
-
-	.panel-title {
-		font-size: 30rpx;
-		font-weight: 700;
-		color: #1D2129;
-		position: relative;
-		padding-left: 18rpx;
-	}
-
-	.panel-title::before {
-		content: '';
-		position: absolute;
-		left: 0;
-		top: 50%;
-		transform: translateY(-50%);
-		width: 6rpx;
-		height: 24rpx;
-		border-radius: 3rpx;
-		background: #F0710D;
+		box-shadow: 0 6rpx 20rpx rgba(240, 113, 13, 0.06);
 	}
 
 	.arrow-ico {
@@ -745,76 +812,27 @@
 		margin-right: 8rpx;
 	}
 
-	/* ---------- 师傅与商家合作专区 (Zone 4) ---------- */
-	.partner-panel {
-		padding-bottom: 24rpx;
+	/* ---------- 师傅招募引导卡 (Zone 4) ---------- */
+	.recruit-card {
+		margin-bottom: 24rpx;
+		border-left-color: #FFA93F;
 	}
 
-	.partner-grid {
-		display: flex;
-		gap: 20rpx;
-		margin-top: 8rpx;
-	}
-
-	.partner-card {
-		flex: 1;
-		min-width: 0;
-		padding: 22rpx 20rpx;
-		border-radius: 18rpx;
-		background: #FBFBFC;
-		border: 1rpx solid #F0F2F5;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.partner-head {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 14rpx;
-	}
-
-	.partner-icon {
-		width: 44rpx;
-		height: 44rpx;
-	}
-
-	.partner-tag {
+	.recruit-tag {
+		flex-shrink: 0;
 		display: inline-flex;
 		align-items: center;
-		justify-content: center;
-		height: 40rpx;
-		line-height: 40rpx;
-		text-align: center;
-		font-size: 22rpx;
-		padding: 0 16rpx;
-		border-radius: 20rpx;
+		padding: 0 22rpx;
+		height: 56rpx;
+		border-radius: 28rpx;
+		background: #FFF7F0;
+	}
+
+	.recruit-tag-txt {
+		font-size: 24rpx;
 		font-weight: 600;
-	}
-
-	.tag-master {
-		background: #FFF2E6;
-		color: #E66606;
-	}
-
-	.tag-merchant {
-		background: #E8F3FF;
-		color: #1976D2;
-	}
-
-	.partner-main-title {
-		font-size: 28rpx;
-		font-weight: 700;
-		color: #1D2129;
-	}
-
-	.partner-brief {
-		margin-top: 6rpx;
-		font-size: 22rpx;
-		color: #86909C;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
+		color: #F0710D;
+		margin-right: 4rpx;
 	}
 
 	/* ---------- 退出登录 (Zone 5) ---------- */
@@ -836,6 +854,180 @@
 		font-weight: 500;
 	}
 
+	/* ---------- 我的订单快捷卡片 ---------- */
+	.order-panel {
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 24rpx 24rpx 28rpx;
+		margin-bottom: 24rpx;
+		box-shadow: 0 6rpx 20rpx rgba(240, 113, 13, 0.06);
+	}
+
+	.order-panel-hd {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 20rpx;
+		margin-bottom: 20rpx;
+		border-bottom: 1rpx solid #F0F0F2;
+	}
+
+	.order-panel-title {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: #1F1F1F;
+	}
+
+	.order-panel-more {
+		display: inline-flex;
+		align-items: center;
+	}
+
+	.order-more-txt {
+		font-size: 24rpx;
+		color: #888888;
+		margin-right: 4rpx;
+	}
+
+	.order-grid {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.order-grid-item {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.order-ico-box {
+		position: relative;
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.order-ico {
+		width: 52rpx;
+		height: 52rpx;
+	}
+
+	.order-badge {
+		position: absolute;
+		top: -10rpx;
+		right: -18rpx;
+		min-width: 34rpx;
+		height: 34rpx;
+		padding: 0 8rpx;
+		border-radius: 17rpx;
+		background: #E8331B;
+		border: 2rpx solid #FFFFFF;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+	}
+
+	.order-badge-txt {
+		font-size: 22rpx;
+		font-weight: 700;
+		color: #FFFFFF;
+		line-height: 1;
+	}
+
+	.order-grid-txt {
+		margin-top: 12rpx;
+		font-size: 24rpx;
+		color: #444444;
+		font-weight: 500;
+	}
+
+	/* ---------- 协议与规则阅读弹窗 ---------- */
+	.agr-mask {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 999;
+		background: rgba(0, 0, 0, 0.5);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0 48rpx;
+	}
+
+	.agr-box {
+		width: 100%;
+		max-height: 76vh;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+	}
+
+	.agr-hd {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 28rpx 32rpx 20rpx;
+		border-bottom: 1rpx solid #F0F0F2;
+	}
+
+	.agr-title {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: #1F1F1F;
+	}
+
+	.agr-close {
+		width: 48rpx;
+		height: 48rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.agr-close-ico {
+		width: 28rpx;
+		height: 28rpx;
+	}
+
+	.agr-scroll {
+		max-height: 48vh;
+		padding: 24rpx 32rpx;
+		box-sizing: border-box;
+	}
+
+	.agr-content {
+		font-size: 26rpx;
+		color: #444444;
+		line-height: 1.7;
+		white-space: pre-wrap;
+	}
+
+	.agr-ft {
+		padding: 20rpx 32rpx 28rpx;
+	}
+
+	.agr-btn {
+		height: 80rpx;
+		border-radius: 40rpx;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		color: #FFFFFF;
+		font-size: 28rpx;
+		font-weight: 600;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
 	/* ---------- 点击反馈与无障碍 ---------- */
 	.clickable-hover {
 		transition: opacity 0.15s ease, transform 0.15s ease;
diff --git a/yjyf-app/components/user/UserOrdersView.vue b/yjyf-app/components/user/UserOrdersView.vue
index ec0fc5f..77146ec 100644
--- a/yjyf-app/components/user/UserOrdersView.vue
+++ b/yjyf-app/components/user/UserOrdersView.vue
@@ -9,7 +9,7 @@
 				</view>
 			</template>
 		</YjyfNavBar>
-		<view class="top-header" :style="{ marginTop: (-stickyTop) + 'px', paddingTop: (stickyTop + 4) + 'px' }">
+		<view class="top-header" :style="{ backgroundPosition: '0 -' + stickyTop + 'px' }">
 			<!-- 搜索栏 -->
 			<view class="search-bar-row">
 				<view class="search-input-wrap">
@@ -34,7 +34,7 @@
 		</view>
 
 		<!-- 2. 状态分类 Tabs 横向滚动条 (右侧带漏斗筛选按钮) -->
-		<view class="tabs-wrapper" :style="{ top: stickyTop + 'px' }">
+		<view class="tabs-wrapper">
 			<scroll-view class="tabs-scroll" scroll-x :show-scrollbar="false" :scroll-into-view="'tab-' + curTab">
 				<view class="tabs-content">
 					<view
@@ -55,7 +55,13 @@
 			</view>
 		</view>
 
-		<!-- 3. 订单列表主体 -->
+		<!-- 3. 订单列表主体（独立局部下拉刷新） -->
+		<YjyfRefreshScroll
+			class="orders-scroll"
+			theme="light"
+			:refresh-task="load"
+			@scrolltolower="loadMore"
+		>
 		<view class="list-container">
 			<!-- 骨架屏加载态 -->
 			<view class="skeleton-list" v-if="loading && !list.length">
@@ -69,6 +75,7 @@
 					<view class="card-hd">
 						<text class="status-name" :class="'s-' + o.status">{{ o.status_text }}</text>
 						<view class="hd-tags">
+							<text class="tag acc-tag" :class="{ owner: o.account_role === 'owner' }" v-if="o.has_merchant_team && o.account_role_text">{{ o.account_role_text }} · {{ o.account_name }}</text>
 							<text class="tag quote-tag" v-if="o.price_type === 'quote' || o.price_type_tag === '报价'">报价</text>
 							<text class="tag urgent-tag" v-if="Number(o.urgent)">加急</text>
 							<view class="flag-wrap clickable-hover" @tap.stop="openOrderTag(o)">
@@ -97,7 +104,7 @@
 
 					<!-- 商品与服务区：商品图 + 品名规格数量 + 服务项目明细 -->
 					<view class="goods-service-box">
-						<image class="goods-thumb" :src="o.goods_image_url || o.service_image || '/static/icons/appliance.png'" mode="aspectFill" />
+						<image class="goods-thumb" :src="o.goods_image_url || o.service_image || '/static/icons/service-default.svg'" mode="aspectFill" />
 						<view class="goods-info">
 							<text class="goods-title">{{ o.goods_title || (o.service_name + ' x ' + (o.goods_num || 1) + '套') }}</text>
 							<text class="service-desc">{{ o.service_items_text || ('服务项目： ' + o.service_name + 'x' + (o.goods_num || 1) + ';') }}</text>
@@ -122,9 +129,8 @@
 						<view class="ft-actions">
 							<!-- 已取消/已关闭订单 -->
 							<template v-if="o.status === 9">
-								<view class="action-btn clickable-hover" @tap.stop="deleteOrder(o)">删除订单</view>
 								<view class="action-btn clickable-hover" @tap.stop="reOrder(o)">重下订单</view>
-								<view class="action-btn clickable-hover" @tap.stop="orderAgain(o)">再次下单</view>
+								<view class="action-btn primary clickable-hover" @tap.stop="orderAgain(o)">再次下单</view>
 							</template>
 
 							<!-- 待支付 -->
@@ -149,9 +155,9 @@
 							<!-- 已完成 -->
 							<template v-else-if="o.status === 8">
 								<view class="action-btn clickable-hover" v-if="o.can_review" @tap.stop="goReview(o)">去评价</view>
+								<view class="action-btn clickable-hover" v-else @tap.stop="orderAgain(o)">再次下单</view>
 								<view class="action-btn clickable-hover" v-if="o.is_showcase" @tap.stop="toggleShowcase(o, 0)">取消晒单</view>
 								<view class="action-btn primary clickable-hover" v-else @tap.stop="toggleShowcase(o, 1)">一键晒单</view>
-								<view class="action-btn clickable-hover" v-if="o.is_showcase" @tap.stop="orderAgain(o)">再次下单</view>
 							</template>
 
 							<!-- 服务中/已接单等通用 -->
@@ -165,24 +171,22 @@
 
 				<!-- 列表底部触底提示 -->
 				<view class="load-finish-tip">
-					<text class="finish-txt">加载完成</text>
+					<text class="finish-txt">{{ loadingMore ? '加载更多中...' : (hasMore ? '上滑加载更多' : '没有更多订单了') }}</text>
 				</view>
 			</view>
 
 			<!-- 4. 空状态 -->
 			<view class="empty-state" v-else>
-				<view class="empty-badge">
-					<image class="empty-badge-img" src="/static/icons/scan-paste.svg" mode="aspectFit" />
-				</view>
+				<image class="empty-illu" src="/static/icons/empty-orders.svg" mode="aspectFit" />
 				<text class="empty-title">暂无相关订单</text>
-				<text class="empty-desc">师傅均已实名认证·准时上门·售后质保</text>
-				<view class="empty-btn clickable-hover" @tap="orderAgain">立即下单找师傅</view>
+				<view class="empty-btn clickable-hover" @tap="orderAgain">立即下单</view>
 			</view>
 		</view>
+		</YjyfRefreshScroll>
 
 		<!-- 5. 高级筛选抽屉 -->
 		<view class="filter-drawer-mask" v-if="showFilterDrawer" @tap="closeFilterDrawer">
-			<view class="filter-drawer-content" @tap.stop>
+			<view class="filter-drawer-content" :style="{ paddingTop: stickyTop + 'px' }" @tap.stop>
 				<view class="drawer-header">
 					<text class="drawer-title">高级筛选</text>
 					<view class="drawer-close clickable-hover" @tap="closeFilterDrawer">
@@ -267,6 +271,7 @@
 	import { isLogin, toLogin } from '@/utils/request.js';
 	import { getNavBarMetrics } from '@/utils/system.js';
 	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import YjyfRefreshScroll from '@/components/YjyfRefreshScroll.vue';
 
 	const stickyTop = ref(64);
 	function updateStickyTop() {
@@ -289,10 +294,18 @@
 		{ key: 'cancelled', name: '已关闭' }
 	];
 
-	const curTab = ref('all');
+	const props = defineProps({
+		initialStatus: { type: String, default: 'all' }
+	});
+
+	const curTab = ref(props.initialStatus || 'all');
 	const keyword = ref('');
 	const list = ref([]);
 	const loading = ref(false);
+	const loadingMore = ref(false);
+	const page = ref(1);
+	const pageLimit = 15;
+	const hasMore = ref(false);
 
 	// 高级筛选抽屉状态
 	const showFilterDrawer = ref(false);
@@ -303,19 +316,27 @@
 	const showTagModal = ref(false);
 	const activeOrder = ref(null);
 	const orderTagNote = ref('');
+	const savingTag = ref(false);
 
 	// 加载订单列表
-	async function load() {
+	async function fetchPage(reset = true) {
 		if (!isLogin()) {
 			toLogin();
 			return;
 		}
-		loading.value = true;
+		if (reset) {
+			page.value = 1;
+			loading.value = true;
+		} else {
+			if (loading.value || loadingMore.value || !hasMore.value) return;
+			loadingMore.value = true;
+		}
 		try {
 			const params = {
 				status: curTab.value === 'select_master' ? 'quoting' : curTab.value,
 				keyword: keyword.value.trim(),
-				limit: 30
+				page: page.value,
+				limit: pageLimit
 			};
 			if (filterPriceType.value !== 'all') {
 				params.price_type = filterPriceType.value;
@@ -325,17 +346,30 @@
 			}
 
 			const res = await api.orderList(params);
-			const rawList = res.list || [];
-			list.value = rawList.map(item => ({
+			const rawList = (res.list || []).map(item => ({
 				...item,
 				showRealMobile: false
 			}));
+			list.value = reset ? rawList : [...list.value, ...rawList];
+			const total = Number(res.total || 0);
+			hasMore.value = res.has_more !== undefined ? Boolean(res.has_more) : (total > list.value.length && rawList.length >= pageLimit);
 		} catch (e) {
 		} finally {
 			loading.value = false;
+			loadingMore.value = false;
 		}
 	}
 
+	async function load() {
+		return fetchPage(true);
+	}
+
+	function loadMore() {
+		if (loading.value || loadingMore.value || !hasMore.value) return;
+		page.value += 1;
+		fetchPage(false);
+	}
+
 	function switchTab(k) {
 		curTab.value = k;
 		load();
@@ -361,17 +395,7 @@
 	}
 
 	function contactService() {
-		uni.makePhoneCall({
-			phoneNumber: '4008006868',
-			fail: () => {
-				uni.showModal({
-					title: '优匠官方客服',
-					content: '客服电话：400-800-6868\n服务时间：周一至周日 08:30 - 21:00',
-					showCancel: false,
-					confirmText: '我知道了'
-				});
-			}
-		});
+		api.contactService();
 	}
 
 	function contactMaster(o) {
@@ -408,11 +432,21 @@
 		showTagModal.value = true;
 	}
 
-	function saveOrderTag() {
-		if (!activeOrder.value) return;
-		activeOrder.value.remark = orderTagNote.value;
-		showTagModal.value = false;
-		uni.showToast({ title: '标记已保存', icon: 'success' });
+	async function saveOrderTag() {
+		if (!activeOrder.value || savingTag.value) return;
+		savingTag.value = true;
+		try {
+			await api.orderUpdateNote({
+				order_id: activeOrder.value.id,
+				remark: orderTagNote.value.trim()
+			});
+			activeOrder.value.remark = orderTagNote.value.trim();
+			showTagModal.value = false;
+			uni.showToast({ title: '标记已保存', icon: 'success' });
+		} catch (e) {
+		} finally {
+			savingTag.value = false;
+		}
 	}
 
 	function showMoreMenu(o) {
@@ -432,57 +466,78 @@
 		});
 	}
 
+	const actingOrderId = ref(0);
+
 	function deleteOrder(o) {
+		if (actingOrderId.value) return;
 		uni.showModal({
 			title: '删除订单',
 			content: '确定要删除该订单记录吗？删除后将不再在列表中展示。',
 			success: async (r) => {
-				if (!r.confirm) return;
+				if (!r.confirm || actingOrderId.value) return;
+				actingOrderId.value = o.id;
 				try {
 					await api.orderDelete({ order_id: o.id });
 					uni.showToast({ title: '已删除', icon: 'success' });
-					load();
+					await load();
 				} catch (e) {
 					uni.showToast({ title: e.message || '删除失败', icon: 'none' });
+				} finally {
+					actingOrderId.value = 0;
 				}
 			}
 		});
 	}
 
 	function cancelOrder(o) {
+		if (actingOrderId.value) return;
 		uni.showModal({
 			title: '取消订单',
 			content: '确认取消该订单？取消后若已付款将原路退回。',
 			success: async (r) => {
-				if (!r.confirm) return;
+				if (!r.confirm || actingOrderId.value) return;
+				actingOrderId.value = o.id;
 				try {
 					await api.orderCancel({ order_id: o.id, reason: '用户取消' });
 					uni.showToast({ title: '已取消', icon: 'none' });
-					load();
-				} catch (e) {}
+					await load();
+				} catch (e) {
+				} finally {
+					actingOrderId.value = 0;
+				}
 			}
 		});
 	}
 
 	async function payOrder(o) {
+		if (!o || actingOrderId.value) return;
+		actingOrderId.value = o.id;
 		try {
 			await api.orderPay({ order_id: o.id, pay_type: 'mock' });
 			uni.showToast({ title: '支付成功', icon: 'success' });
-			load();
-		} catch (e) {}
+			await load();
+		} catch (e) {
+		} finally {
+			actingOrderId.value = 0;
+		}
 	}
 
 	function verifyOrder(o) {
+		if (actingOrderId.value) return;
 		uni.showModal({
 			title: '确认验收',
 			content: '请确认师傅已完全按照要求施工完毕。确认验收后将自动为师傅结算。',
 			success: async (r) => {
-				if (!r.confirm) return;
+				if (!r.confirm || actingOrderId.value) return;
+				actingOrderId.value = o.id;
 				try {
 					await api.orderVerify({ order_id: o.id });
 					uni.showToast({ title: '验收成功', icon: 'success' });
-					load();
-				} catch (e) {}
+					await load();
+				} catch (e) {
+				} finally {
+					actingOrderId.value = 0;
+				}
 			}
 		});
 	}
@@ -507,6 +562,7 @@
 	}
 
 	async function toggleShowcase(o, targetVal) {
+		if (actingOrderId.value) return;
 		const isShow = Number(targetVal) ? 1 : 0;
 		if (isShow === 0) {
 			uni.showModal({
@@ -514,21 +570,29 @@
 				content: '确认取消公开晒单？取消后将不再在首页服务动态中展示。',
 				confirmColor: '#F0710D',
 				success: async (r) => {
-					if (!r.confirm) return;
+					if (!r.confirm || actingOrderId.value) return;
+					actingOrderId.value = o.id;
 					try {
 						await api.orderShowcase({ order_id: o.id, is_showcase: 0 });
 						uni.showToast({ title: '已取消晒单', icon: 'none' });
-						load();
-					} catch (e) {}
+						await load();
+					} catch (e) {
+					} finally {
+						actingOrderId.value = 0;
+					}
 				}
 			});
 			return;
 		}
+		actingOrderId.value = o.id;
 		try {
 			await api.orderShowcase({ order_id: o.id, is_showcase: 1 });
 			uni.showToast({ title: '已公开晒单', icon: 'success' });
-			load();
-		} catch (e) {}
+			await load();
+		} catch (e) {
+		} finally {
+			actingOrderId.value = 0;
+		}
 	}
 
 	onMounted(() => {
@@ -537,19 +601,30 @@
 	});
 
 	defineExpose({
-		load
+		load,
+		switchTab
 	});
 </script>
 
 <style lang="scss" scoped>
 .user-orders-view {
-	min-height: 100vh;
+	height: calc(100vh - 112rpx - constant(safe-area-inset-bottom));
+	height: calc(100vh - 112rpx - env(safe-area-inset-bottom));
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
 	background-color: #F5F6F8;
-	padding-bottom: 140rpx;
+}
+
+.orders-scroll {
+	flex: 1;
+	height: 0;
+	width: 100%;
 }
 
 /* 1. 顶部橙色一体化 Header */
 .top-header {
+	flex-shrink: 0;
 	background-color: #F0710D;
 	background-image: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
 	background-size: 100% 600rpx;
@@ -652,12 +727,12 @@
 
 /* 2. 状态 Tabs 横向滚动条 */
 .tabs-wrapper {
+	flex-shrink: 0;
 	display: flex;
 	align-items: center;
 	background: #FFFFFF;
 	border-bottom: 1rpx solid #F0F0F2;
-	position: sticky;
-	top: 0;
+	position: relative;
 	z-index: 10;
 	width: 100%;
 	overflow: hidden;
@@ -734,7 +809,7 @@
 
 /* 3. 订单列表主体 */
 .list-container {
-	padding: 20rpx 24rpx;
+	padding: 20rpx 24rpx 120rpx;
 }
 
 .sk-card {
@@ -749,7 +824,7 @@
 	border-radius: 20rpx;
 	padding: 24rpx 24rpx 20rpx 24rpx;
 	margin-bottom: 20rpx;
-	box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.03);
+	box-shadow: 0 6rpx 20rpx rgba(240, 113, 13, 0.06);
 }
 
 /* 卡片头部 */
@@ -802,6 +877,17 @@
 	color: #F5222D;
 }
 
+.acc-tag {
+	background: #F5F6F8;
+	color: #888888;
+	font-weight: 500;
+}
+
+.acc-tag.owner {
+	background: #FFF7F0;
+	color: #F0710D;
+}
+
 .flag-wrap {
 	display: flex;
 	align-items: center;
@@ -1015,33 +1101,17 @@
 	text-align: center;
 }
 
-.empty-badge {
-	width: 140rpx;
-	height: 140rpx;
-	border-radius: 50%;
-	background: #FFF7F0;
-	display: flex;
-	align-items: center;
-	justify-content: center;
+.empty-illu {
+	width: 160rpx;
+	height: 160rpx;
 	margin-bottom: 24rpx;
 }
 
-.empty-badge-img {
-	width: 72rpx;
-	height: 72rpx;
-}
-
 .empty-title {
-	font-size: 32rpx;
+	font-size: 30rpx;
 	font-weight: 700;
 	color: #1F1F1F;
-	margin-bottom: 12rpx;
-}
-
-.empty-desc {
-	font-size: 24rpx;
-	color: #888888;
-	margin-bottom: 40rpx;
+	margin-bottom: 36rpx;
 }
 
 .empty-btn {
@@ -1083,7 +1153,7 @@
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	padding: 40rpx 30rpx 20rpx 30rpx;
+	padding: 20rpx 30rpx;
 	border-bottom: 1rpx solid #F0F0F2;
 }
 
diff --git a/yjyf-app/index.html b/yjyf-app/index.html
index b5d330d..97e7137 100644
--- a/yjyf-app/index.html
+++ b/yjyf-app/index.html
@@ -2,6 +2,7 @@
 <html lang="zh-CN">
   <head>
     <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/static/favicon.svg" />
     <script>
       var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
         CSS.supports('top: constant(a)'))
diff --git a/yjyf-app/pages.json b/yjyf-app/pages.json
index a9d523f..1a32609 100644
--- a/yjyf-app/pages.json
+++ b/yjyf-app/pages.json
@@ -7,7 +7,8 @@
 				"navigationBarTitleText": "优匠优服",
 				"navigationBarTextStyle": "white",
 				"backgroundColor": "#F5F6F8",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"disableScroll": true
 			}
 		},
 		{
@@ -30,6 +31,24 @@
 			"path": "pages/order/quick",
 			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
 		},
+		{
+			"path": "pages/order/system-gallery",
+			"style": {
+				"navigationStyle": "custom",
+				"backgroundColor": "#F5F6F8",
+				"enablePullDownRefresh": false,
+				"disableScroll": true
+			}
+		},
+		{
+			"path": "pages/order/goods-gallery",
+			"style": {
+				"navigationStyle": "custom",
+				"backgroundColor": "#F5F6F8",
+				"enablePullDownRefresh": false,
+				"disableScroll": true
+			}
+		},
 		{
 			"path": "pages/category/category",
 			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
@@ -62,8 +81,8 @@
 			"path": "pages/message/message",
 			"style": {
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": true,
-				"backgroundTextStyle": "dark",
+				"enablePullDownRefresh": false,
+				"disableScroll": true,
 				"backgroundColor": "#F5F6F8"
 			}
 		},
@@ -80,8 +99,8 @@
 			"style": {
 				"navigationStyle": "custom",
 				"backgroundColor": "#F5F6F8",
-				"enablePullDownRefresh": true,
-				"backgroundTextStyle": "dark"
+				"enablePullDownRefresh": false,
+				"disableScroll": true
 			}
 		},
 		{
@@ -89,8 +108,8 @@
 			"style": {
 				"navigationStyle": "custom",
 				"backgroundColor": "#F5F6F8",
-				"enablePullDownRefresh": true,
-				"backgroundTextStyle": "dark"
+				"enablePullDownRefresh": false,
+				"disableScroll": true
 			}
 		},
 		{
@@ -99,12 +118,21 @@
 		},
 		{
 			"path": "pages/master/wallet",
-			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
+			"style": {
+				"navigationStyle": "custom",
+				"backgroundColor": "#F5F6F8",
+				"enablePullDownRefresh": false,
+				"disableScroll": true
+			}
 		},
 		{
 			"path": "pages/master/credit",
 			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
 		},
+		{
+			"path": "pages/master/reviews",
+			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
+		},
 		{
 			"path": "pages/mine/mine",
 			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
@@ -113,33 +141,41 @@
 			"path": "pages/mine/account",
 			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
 		},
-		{
-			"path": "pages/merchant/apply",
-			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
-		},
-		{
-			"path": "pages/merchant/workbench",
-			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
-		},
-		{
-			"path": "pages/merchant/orders",
-			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
-		},
-		{
-			"path": "pages/merchant/batch",
-			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
-		},
 		{
 			"path": "pages/merchant/invoice",
 			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
 		},
+		{
+			"path": "pages/invoice/orders",
+			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
+		},
+		{
+			"path": "pages/invoice/apply",
+			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
+		},
+		{
+			"path": "pages/invoice/titles",
+			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
+		},
+		{
+			"path": "pages/invoice/title-edit",
+			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
+		},
+		{
+			"path": "pages/invoice/records",
+			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
+		},
+		{
+			"path": "pages/invoice/detail",
+			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
+		},
 		{
 			"path": "pages/master/orders",
 			"style": {
 				"navigationStyle": "custom",
 				"backgroundColor": "#F5F6F8",
-				"enablePullDownRefresh": true,
-				"backgroundTextStyle": "dark"
+				"enablePullDownRefresh": false,
+				"disableScroll": true
 			}
 		},
 		{
@@ -148,7 +184,7 @@
 		},
 		{
 			"path": "pages/master/success",
-			"style": { "navigationStyle": "custom", "backgroundColor": "#FFFFFF" }
+			"style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" }
 		}
 	],
 	"easycom": {
diff --git a/yjyf-app/pages/address/list.vue b/yjyf-app/pages/address/list.vue
index 5371fcb..8d3f3ac 100644
--- a/yjyf-app/pages/address/list.vue
+++ b/yjyf-app/pages/address/list.vue
@@ -1,100 +1,164 @@
 <template>
 	<view class="page">
-		<!-- 统一规范顶部导航栏（安全距离自适应） -->
-		<YjyfNavBar theme="orange" title="服务地址管理" />
-		<view class="list">
-			<view class="item" v-for="a in list" :key="a.id">
+		<YjyfNavBar theme="orange" :title="selectMode ? '选择服务地址' : '地址管理'" />
+
+		<view class="list" v-if="list.length">
+			<view
+				class="item"
+				:class="{ selectable: selectMode }"
+				v-for="a in list"
+				:key="a.id"
+				@tap="onCardTap(a)"
+			>
 				<view class="item-top">
 					<text class="contact">{{ a.contact }}</text>
 					<text class="mobile">{{ a.mobile }}</text>
 					<text class="badge" v-if="Number(a.is_default)">默认</text>
 				</view>
-				<text class="addr">{{ a.province || '' }}{{ a.city || '' }}{{ a.district || '' }}{{ a.address }}</text>
-				<text class="meta">楼层 {{ a.floor }} · {{ Number(a.has_elevator) ? '有电梯' : '无电梯' }}</text>
-				<view class="ops">
-					<view class="op" v-if="!Number(a.is_default)" @tap="setDefault(a)">设为默认</view>
-					<view class="op" @tap="edit(a)">编辑</view>
-					<view class="op danger" @tap="remove(a)">删除</view>
+				<text class="addr">{{ formatFullAddr(a) }}</text>
+				<text class="meta">楼层 {{ a.floor }}层 · {{ Number(a.has_elevator) ? '有电梯' : '无电梯' }}</text>
+				<view class="ops" @tap.stop>
+					<view class="op clickable-hover" v-if="!Number(a.is_default)" @tap="setDefault(a)">设为默认</view>
+					<view class="op clickable-hover" @tap="edit(a)">编辑</view>
+					<view class="op danger clickable-hover" @tap="remove(a)">删除</view>
 				</view>
 			</view>
-			<view class="empty" v-if="!loading && !list.length">还没有服务地址，先添加一个吧</view>
+		</view>
+
+		<view class="empty-box" v-else-if="!loading">
+			<image class="empty-ico" src="/static/icons/empty-address.svg" mode="aspectFit" />
+			<text class="empty-title">暂无服务地址</text>
+			<text class="empty-sub">添加常用上门地址，下单更省心</text>
 		</view>
 
 		<view class="bar">
-			<view class="bar-btn clickable-hover" @tap="openForm()">＋ 新增服务地址</view>
+			<view class="bar-btn clickable-hover" @tap="openForm()">
+				<image class="bar-plus-ico" src="/static/icons/plus-white.svg" mode="aspectFit" />
+				<text>新增服务地址</text>
+			</view>
 		</view>
 
 		<view class="mask" v-if="showForm" @tap="showForm = false">
 			<view class="sheet" @tap.stop>
 				<view class="sheet-head">
 					<text class="sheet-title">{{ form.id ? '编辑地址' : '新增地址' }}</text>
-					<text class="sheet-close" @tap="showForm = false">关闭</text>
+					<view class="sheet-close-btn clickable-hover" @tap="showForm = false">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
 				</view>
 
-				<!-- 快捷地图选址与智能识别 -->
 				<view class="quick-tools">
-					<view class="tool-btn" @tap="chooseLocation">
+					<view class="tool-btn clickable-hover" @tap="chooseLocation">
 						<text class="tool-text">地图选点定位</text>
 					</view>
-					<view class="tool-btn" @tap="showPaste = !showPaste">
+					<view class="tool-btn clickable-hover" @tap="showPaste = !showPaste">
 						<text class="tool-text">{{ showPaste ? '收起识别' : '智能粘贴识别' }}</text>
 					</view>
 				</view>
 
 				<view class="paste-box" v-if="showPaste">
-					<textarea class="paste-input" v-model="pasteText" placeholder="粘贴整段地址，如：张三 13800138000 贵州省遵义市汇川区南京路12号" />
-					<button class="paste-btn" @tap="applyPaste">一键识别填入</button>
+					<textarea class="paste-input" v-model="pasteText" placeholder="粘贴整段地址，自动提取姓名、电话与省市区街道" />
+					<view class="paste-btn clickable-hover" @tap="applyPaste">一键识别填入</view>
 				</view>
 
-				<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.contact" placeholder="填写联系人姓名" placeholder-class="ph" />
+				</view>
+				<view class="fi">
+					<text class="fk">手机号</text>
+					<input class="fv" v-model="form.mobile" type="number" maxlength="11" placeholder="填写11位联系手机号" placeholder-class="ph" />
+				</view>
+				<view class="fi">
+					<text class="fk">所在地区</text>
+					<!-- #ifdef MP-WEIXIN -->
+					<picker class="region-picker" mode="region" :value="regionArr" @change="onRegionChange">
+						<view class="region-val" :class="{ placeholder: !regionDisplay }">
+							<text>{{ regionDisplay || '点击选择省 / 市 / 区' }}</text>
+							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+						</view>
+					</picker>
+					<!-- #endif -->
+					<!-- #ifndef MP-WEIXIN -->
+					<view class="region-picker clickable-hover" @tap="showRegionDrawer = true">
+						<view class="region-val" :class="{ placeholder: !regionDisplay }">
+							<text>{{ regionDisplay || '点击选择省 / 市 / 区' }}</text>
+							<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+						</view>
+					</view>
+					<!-- #endif -->
+				</view>
 				<view class="fi">
 					<text class="fk">详细地址</text>
-					<input class="fv" v-model="form.address" placeholder="小区/楼栋/门牌号" />
+					<input class="fv" v-model="form.address" placeholder="街道、小区、楼栋及门牌号" placeholder-class="ph" />
 				</view>
-				<view class="fi"><text class="fk">楼层</text>
+				<view class="fi">
+					<text class="fk">楼层</text>
 					<view class="stepper">
-						<view class="st-btn" @tap="step(-1)">－</view>
+						<view class="st-btn clickable-hover" @tap="step(-1)">
+							<image class="st-ico" src="/static/icons/step-minus.svg" mode="aspectFit" />
+						</view>
 						<text class="st-val">{{ form.floor }}</text>
-						<view class="st-btn" @tap="step(1)">＋</view>
+						<view class="st-btn clickable-hover" @tap="step(1)">
+							<image class="st-ico" src="/static/icons/step-plus.svg" mode="aspectFit" />
+						</view>
 					</view>
 				</view>
-				<view class="fi"><text class="fk">有无电梯</text>
+				<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 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="fi"><text class="fk">设为默认</text>
+				<view class="fi no-border">
+					<text class="fk">设为默认</text>
 					<view class="seg">
 						<view class="seg-i" :class="{ on: form.is_default === 1 }" @tap="form.is_default = 1">是</view>
 						<view class="seg-i" :class="{ on: form.is_default === 0 }" @tap="form.is_default = 0">否</view>
 					</view>
 				</view>
-				<view class="save clickable-hover" :class="{ disabled: saving }" @tap="save">{{ saving ? '保存中...' : '保存' }}</view>
+
+				<view class="save clickable-hover" :class="{ disabled: saving }" @tap="save">
+					{{ saving ? '保存中...' : '保存地址' }}
+				</view>
 			</view>
 		</view>
+
+		<RegionPickerDrawer
+			:visible="showRegionDrawer"
+			:province="form.province || '贵州省'"
+			:city="form.city || '遵义市'"
+			:district="form.district || '汇川区'"
+			@update:visible="showRegionDrawer = $event"
+			@confirm="onRegionDrawerConfirm"
+		/>
 	</view>
 </template>
 
 <script setup>
-	import { ref, reactive } from 'vue';
-	import { onShow } from '@dcloudio/uni-app';
+	import { ref, reactive, computed } from 'vue';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin } from '@/utils/request.js';
+	import RegionPickerDrawer from '@/components/RegionPickerDrawer.vue';
 
+	const selectMode = ref(false);
 	const list = ref([]);
 	const loading = ref(false);
 	const showForm = ref(false);
+	const showRegionDrawer = ref(false);
 	const saving = ref(false);
 	const showPaste = ref(false);
 	const pasteText = ref('');
+	const regionInput = ref('');
+
 	const form = reactive({
 		id: 0,
 		contact: '',
 		mobile: '',
-		province: '贵州省',
-		city: '遵义市',
+		province: '',
+		city: '',
 		district: '',
 		address: '',
 		lng: '',
@@ -104,6 +168,63 @@
 		is_default: 0
 	});
 
+	const regionArr = computed(() => [
+		form.province || '',
+		form.city || '',
+		form.district || ''
+	]);
+
+	const regionDisplay = computed(() => {
+		return [form.province, form.city, form.district].filter(Boolean).join(' ');
+	});
+
+	function formatFullAddr(a) {
+		const prefix = [a.province, a.city, a.district].filter(Boolean).join('');
+		const detail = a.address || '';
+		if (prefix && detail.startsWith(prefix)) return detail;
+		return prefix + detail;
+	}
+
+	function syncRegionInput() {
+		regionInput.value = [form.province, form.city, form.district].filter(Boolean).join(' ');
+	}
+
+	function parseRegionParts(raw) {
+		const parts = String(raw || '').trim().split(/[\s/,-]+/).filter(Boolean);
+		form.province = parts[0] || '';
+		form.city = parts[1] || '';
+		form.district = parts[2] || '';
+	}
+
+	function onRegionChange(e) {
+		const val = (e && e.detail && e.detail.value) || [];
+		form.province = val[0] || '';
+		form.city = val[1] || '';
+		form.district = val[2] || '';
+		syncRegionInput();
+	}
+
+	function onRegionDrawerConfirm(reg) {
+		if (!reg) return;
+		form.province = reg.province || '';
+		form.city = reg.city || '';
+		form.district = reg.district || '';
+		syncRegionInput();
+	}
+
+	function extractRegionFromAddress(str) {
+		const m = String(str || '').match(/^([^省]+省|[^自治区]+自治区|北京市|上海市|天津市|重庆市)?([^市州盟]+(?:市|州|盟))?([^区县旗]+(?:区|县|旗|市))?(.*)$/);
+		if (m && (m[1] || m[2] || m[3])) {
+			if (m[1]) form.province = m[1];
+			if (m[2]) form.city = m[2];
+			else if (m[1] && /北京市|上海市|天津市|重庆市/.test(m[1])) form.city = m[1];
+			if (m[3]) form.district = m[3];
+			syncRegionInput();
+			return (m[4] || '').trim();
+		}
+		return str;
+	}
+
 	async function load() {
 		if (!isLogin()) { toLogin(); return; }
 		loading.value = true;
@@ -116,143 +237,496 @@
 		}
 	}
 
+	function onCardTap(a) {
+		if (!selectMode.value) return;
+		uni.setStorageSync('yjyf_selected_address', a);
+		try {
+			const pages = getCurrentPages() || [];
+			const curPage = pages[pages.length - 1];
+			const ch = curPage && curPage.getOpenerEventChannel ? curPage.getOpenerEventChannel() : null;
+			if (ch && ch.emit) ch.emit('selectAddress', a);
+		} catch (e) {}
+		uni.$emit('selectAddress', a);
+		uni.$emit('yjyf:selectAddress', a);
+		uni.navigateBack();
+	}
+
 	function openForm(a) {
 		form.id = a ? Number(a.id) : 0;
-		form.contact = a ? a.contact : '';
-		form.mobile = a ? a.mobile : '';
+		form.contact = a ? (a.contact || '') : '';
+		form.mobile = a ? (a.mobile || '') : '';
 		form.province = a ? (a.province || '贵州省') : '贵州省';
 		form.city = a ? (a.city || '遵义市') : '遵义市';
-		form.district = a ? (a.district || '') : '';
-		form.address = a ? a.address : '';
+		form.district = a ? (a.district || '汇川区') : '汇川区';
+		form.address = a ? (a.address || '') : '';
 		form.lng = a ? (a.lng || '') : '';
 		form.lat = a ? (a.lat || '') : '';
-		form.floor = a ? Number(a.floor) : 1;
-		form.has_elevator = a ? Number(a.has_elevator) : 1;
-		form.is_default = a ? Number(a.is_default) : 0;
+		form.floor = a ? Math.max(1, Number(a.floor) || 1) : 1;
+		form.has_elevator = (a && a.has_elevator !== undefined && a.has_elevator !== null && a.has_elevator !== '') ? Number(a.has_elevator) : 1;
+		form.is_default = a ? Number(a.is_default) : (list.value.length === 0 ? 1 : 0);
+		syncRegionInput();
 		showPaste.value = false;
 		pasteText.value = '';
 		showForm.value = true;
 	}
+
 	function edit(a) { openForm(a); }
 	function step(d) { form.floor = Math.max(1, form.floor + d); }
 
 	function chooseLocation() {
 		uni.chooseLocation({
 			success: (res) => {
-				form.address = (res.name ? res.name + ' ' : '') + (res.address || '');
+				const rawAddr = res.address || '';
+				const remain = extractRegionFromAddress(rawAddr);
+				form.address = [remain, res.name || ''].filter(Boolean).join(' ');
 				if (res.longitude) form.lng = String(res.longitude);
 				if (res.latitude) form.lat = String(res.latitude);
 			},
-			fail: (err) => {
-				// 用户取消或权限未开启
-			}
+			fail: () => {}
 		});
 	}
 
 	function applyPaste() {
 		if (!pasteText.value.trim()) {
-			uni.showToast({ title: '请先粘贴文本', icon: 'none' });
+			uni.showToast({ title: '请先粘贴地址文本', icon: 'none' });
 			return;
 		}
 		const text = pasteText.value.trim();
 		const phoneMatch = text.match(/(1[3-9]\d{9})/);
+		let rawAddr = text;
 		if (phoneMatch) {
 			form.mobile = phoneMatch[1];
 			const parts = text.split(form.mobile);
-			form.contact = parts[0].trim().replace(/[,，:：]/g, '') || form.contact;
-			form.address = (parts[1] || '').trim().replace(/[,，:：]/g, '') || form.address;
-		} else {
-			form.address = text;
+			const left = (parts[0] || '').trim().replace(/[,，:：;；\s]+/g, '');
+			const right = (parts[1] || '').trim().replace(/^[,，:：;；\s]+/, '');
+			if (left && left.length <= 8) {
+				form.contact = left;
+				rawAddr = right;
+			} else {
+				rawAddr = left || right;
+			}
 		}
+		const remain = extractRegionFromAddress(rawAddr);
+		form.address = remain || rawAddr;
 		showPaste.value = false;
 		uni.showToast({ title: '识别完成', icon: 'success' });
 	}
 
 	async function save() {
 		if (saving.value) return;
-		if (!form.contact || !form.mobile || !form.address) {
-			uni.showToast({ title: '请填写联系人/手机号/地址', icon: 'none' });
+		if (!form.contact.trim() || !/^1[3-9]\d{9}$/.test(form.mobile.trim()) || !form.address.trim()) {
+			uni.showToast({ title: '请填写完整的联系人、手机号及详细地址', icon: 'none' });
 			return;
 		}
 		saving.value = true;
 		try {
-			await api.addressSave({
+			const res = await api.addressSave({
 				id: form.id,
-				contact: form.contact,
-				mobile: form.mobile,
+				contact: form.contact.trim(),
+				mobile: form.mobile.trim(),
 				province: form.province,
 				city: form.city,
 				district: form.district,
-				address: form.address,
+				address: form.address.trim(),
 				lng: form.lng,
 				lat: form.lat,
 				floor: form.floor,
 				has_elevator: form.has_elevator,
 				is_default: form.is_default
 			});
-			uni.showToast({ title: '已保存' });
+			uni.showToast({ title: '保存成功' });
 			showForm.value = false;
-			load();
+			await load();
+			if (selectMode.value && res && res.id && list.value.length === 1) {
+				onCardTap(list.value[0]);
+			}
 		} catch (e) {
 		} finally {
 			saving.value = false;
 		}
 	}
 
+	const actingId = ref(0);
+
 	async function setDefault(a) {
-		try { await api.addressDefault(a.id); uni.showToast({ title: '已设为默认' }); load(); } catch (e) {}
+		if (!a || actingId.value) return;
+		actingId.value = a.id;
+		try {
+			await api.addressDefault(a.id);
+			uni.showToast({ title: '已设为默认' });
+			await load();
+		} catch (e) {
+		} finally {
+			actingId.value = 0;
+		}
 	}
 
 	function remove(a) {
+		if (!a || actingId.value) return;
 		uni.showModal({
-			title: '删除地址', content: '确认删除该地址？',
+			title: '删除地址',
+			content: '确认删除该服务地址？',
 			success: async (r) => {
-				if (!r.confirm) return;
-				try { await api.addressDelete(a.id); uni.showToast({ title: '已删除' }); load(); } catch (e) {}
+				if (!r.confirm || actingId.value) return;
+				actingId.value = a.id;
+				try {
+					await api.addressDelete(a.id);
+					uni.showToast({ title: '已删除' });
+					await load();
+				} catch (e) {
+				} finally {
+					actingId.value = 0;
+				}
 			}
 		});
 	}
 
+	onLoad((options) => {
+		selectMode.value = Boolean(options && (options.select === '1' || options.select === 'true' || options.mode === 'select'));
+	});
+
 	onShow(() => load());
 </script>
 
-<style scoped>
-	.page { min-height: 100vh; background: #F5F6F8; padding: 0 0 180rpx; }
-	.item { background: #fff; border-radius: 20rpx; padding: 24rpx; margin: 20rpx 24rpx 0; box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06); }
-	.item-top { display: flex; align-items: center; }
-	.contact { font-size: 28rpx; font-weight: 600; color: #1F1F1F; }
-	.mobile { margin-left: 16rpx; font-size: 24rpx; color: #444444; }
-	.badge { margin-left: 12rpx; height: 36rpx; line-height: 36rpx; text-align: center; padding: 0 14rpx; display: inline-flex; align-items: center; justify-content: center; border-radius: 8rpx; background: #FFF7F0; color: #F0710D; font-size: 22rpx; font-weight: 600; }
-	.addr { display: block; margin-top: 10rpx; font-size: 26rpx; color: #333; line-height: 36rpx; }
-	.meta { display: block; margin-top: 6rpx; font-size: 22rpx; color: #888888; }
-	.ops { display: flex; justify-content: flex-end; gap: 16rpx; margin-top: 16rpx; padding-top: 16rpx; border-top: 1rpx solid #F0F0F2; }
-	.op { height: 56rpx; padding: 0 28rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 28rpx; border: 2rpx solid #E5E7EB; font-size: 24rpx; color: #444444; }
-	.op.danger { color: #E8331B; border-color: #F8D9D4; }
-	.empty { padding: 110rpx 0; text-align: center; font-size: 24rpx; color: #888888; }
-	.bar { position: fixed; left: 0; right: 0; bottom: 0; height: 120rpx; padding: 0 24rpx; padding-bottom: env(safe-area-inset-bottom); display: flex; align-items: center; background: #fff; box-shadow: 0 -6rpx 24rpx rgba(0,0,0,.07); z-index: 10; }
-	.bar-btn { flex: 1; height: 84rpx; display: flex; align-items: center; justify-content: center; line-height: 1; border-radius: 42rpx; color: #fff; font-size: 30rpx; font-weight: 600; background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); }
-	.mask { position: fixed; left: 0; right: 0; top: 0; bottom: 0; background: rgba(0,0,0,.45); display: flex; align-items: flex-end; z-index: 99; }
-	.sheet { width: 100%; background: #fff; border-radius: 24rpx 24rpx 0 0; padding: 26rpx 24rpx calc(30rpx + env(safe-area-inset-bottom)); max-height: 85vh; overflow-y: auto; }
-	.sheet-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 12rpx; }
-	.sheet-title { font-size: 30rpx; font-weight: 700; color: #1F1F1F; }
-	.sheet-close { font-size: 24rpx; color: #888888; }
+<style lang="scss" scoped>
+	@import '@/uni.scss';
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: 180rpx;
+	}
+	.list {
+		padding: $yjyf-space-md $yjyf-space-md 0;
+	}
+	.item {
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		padding: $yjyf-space-md;
+		margin-bottom: $yjyf-space-sm;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.item.selectable:active {
+		opacity: 0.9;
+	}
+	.item-top {
+		display: flex;
+		align-items: center;
+	}
+	.contact {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.mobile {
+		margin-left: $yjyf-space-sm;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+	}
+	.badge {
+		margin-left: 12rpx;
+		height: 36rpx;
+		padding: 0 14rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 8rpx;
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+	}
+	.addr {
+		display: block;
+		margin-top: 12rpx;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+		line-height: 40rpx;
+	}
+	.meta {
+		display: block;
+		margin-top: 8rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+	.ops {
+		display: flex;
+		justify-content: flex-end;
+		gap: $yjyf-space-sm;
+		margin-top: $yjyf-space-sm;
+		padding-top: $yjyf-space-sm;
+		border-top: 1rpx solid $yjyf-border-color;
+	}
+	.op {
+		height: 56rpx;
+		padding: 0 28rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 1;
+		border-radius: $yjyf-radius-pill;
+		border: 2rpx solid $yjyf-border-color;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+	}
+	.op.danger {
+		color: $yjyf-danger;
+		border-color: rgba(232, 51, 27, 0.22);
+	}
 
-	.quick-tools { display: flex; gap: 16rpx; margin: 12rpx 0 16rpx; }
-	.tool-btn { flex: 1; height: 60rpx; background: #F8F9FA; border: 1rpx solid #E6E8EB; border-radius: 30rpx; display: flex; align-items: center; justify-content: center; line-height: 1; }
-	.tool-text { font-size: 24rpx; color: #F0710D; font-weight: 500; line-height: 1; }
-	.paste-box { background: #F8F9FA; border-radius: 12rpx; padding: 16rpx; margin-bottom: 16rpx; border: 1rpx dashed #DDD; }
-	.paste-input { width: 100%; height: 120rpx; font-size: 24rpx; color: #333; }
-	.paste-btn { height: 56rpx; display: flex; align-items: center; justify-content: center; line-height: 1; background: #F0710D; color: #fff; font-size: 24rpx; border-radius: 28rpx; margin-top: 10rpx; }
+	.empty-box {
+		padding: 160rpx 40rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.empty-ico {
+		width: 160rpx;
+		height: 160rpx;
+		margin-bottom: $yjyf-space-md;
+	}
+	.empty-title {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.empty-sub {
+		margin-top: 8rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
 
-	.fi { display: flex; align-items: center; min-height: 88rpx; border-bottom: 1rpx solid #F0F0F2; }
-	.fk { width: 160rpx; flex-shrink: 0; font-size: 26rpx; color: #444444; }
-	.fv { flex: 1; height: 88rpx; font-size: 28rpx; color: #1F1F1F; }
-	.stepper { display: flex; align-items: center; }
-	.st-btn { width: 52rpx; height: 52rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 26rpx; background: #F5F6F8; color: #444444; font-size: 26rpx; }
-	.st-val { min-width: 60rpx; text-align: center; font-size: 28rpx; color: #1F1F1F; }
-	.seg { display: flex; gap: 12rpx; }
-	.seg-i { height: 52rpx; padding: 0 26rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 26rpx; background: #F5F6F8; font-size: 24rpx; color: #444444; }
-	.seg-i.on { background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); color: #fff; font-weight: 600; }
-	.save { height: 88rpx; margin-top: 24rpx; display: flex; align-items: center; justify-content: center; line-height: 1; border-radius: 44rpx; color: #fff; font-size: 30rpx; font-weight: 600; background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); }
-	.save.disabled { opacity: .7; }
+	.bar {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 120rpx;
+		padding: 0 $yjyf-space-md;
+		padding-bottom: env(safe-area-inset-bottom);
+		box-sizing: content-box;
+		display: flex;
+		align-items: center;
+		background: $yjyf-bg-card;
+		box-shadow: $yjyf-shadow-bar;
+		z-index: 10;
+	}
+	.bar-btn {
+		flex: 1;
+		height: 88rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 10rpx;
+		line-height: 1;
+		border-radius: $yjyf-radius-pill;
+		color: $yjyf-text-inverse;
+		font-size: 30rpx;
+		font-weight: 700;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-button;
+	}
+	.bar-plus-ico {
+		width: 28rpx;
+		height: 28rpx;
+	}
+
+	.mask {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.48);
+		display: flex;
+		align-items: flex-end;
+		z-index: 99;
+	}
+	.sheet {
+		width: 100%;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-lg $yjyf-radius-lg 0 0;
+		padding: 28rpx $yjyf-space-md calc(32rpx + env(safe-area-inset-bottom));
+		max-height: 86vh;
+		overflow-y: auto;
+	}
+	.sheet-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 16rpx;
+	}
+	.sheet-title {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.sheet-close-btn {
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 50%;
+		background: $yjyf-bg-page;
+	}
+	.close-ico {
+		width: 26rpx;
+		height: 26rpx;
+	}
+
+	.quick-tools {
+		display: flex;
+		gap: $yjyf-space-sm;
+		margin: 8rpx 0 16rpx;
+	}
+	.tool-btn {
+		flex: 1;
+		height: 64rpx;
+		background: $yjyf-primary-bg;
+		border: 1rpx solid $yjyf-primary-border;
+		border-radius: $yjyf-radius-pill;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.tool-text {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-primary;
+		font-weight: 600;
+		line-height: 1;
+	}
+	.paste-box {
+		background: $yjyf-bg-page;
+		border-radius: $yjyf-radius-sm;
+		padding: $yjyf-space-sm;
+		margin-bottom: $yjyf-space-sm;
+		border: 1rpx dashed $yjyf-primary-border;
+	}
+	.paste-input {
+		width: 100%;
+		height: 120rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-main;
+	}
+	.paste-btn {
+		height: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 1;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		border-radius: $yjyf-radius-pill;
+		margin-top: 12rpx;
+	}
+
+	.fi {
+		display: flex;
+		align-items: center;
+		min-height: 92rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.fi.no-border {
+		border-bottom: none;
+	}
+	.fk {
+		width: 152rpx;
+		flex-shrink: 0;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-regular;
+	}
+	.fv {
+		flex: 1;
+		height: 92rpx;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+	}
+	.ph {
+		color: $yjyf-text-disabled;
+		font-size: $yjyf-font-body;
+	}
+	.region-picker {
+		flex: 1;
+	}
+	.region-val {
+		height: 92rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+	}
+	.region-val.placeholder {
+		color: $yjyf-text-disabled;
+	}
+	.arrow-ico {
+		width: 24rpx;
+		height: 24rpx;
+		opacity: 0.6;
+	}
+
+	.stepper {
+		display: flex;
+		align-items: center;
+	}
+	.st-btn {
+		width: 56rpx;
+		height: 56rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 50%;
+		background: $yjyf-bg-page;
+	}
+	.st-ico {
+		width: 24rpx;
+		height: 24rpx;
+	}
+	.st-val {
+		min-width: 68rpx;
+		text-align: center;
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+	.seg {
+		display: flex;
+		gap: 12rpx;
+	}
+	.seg-i {
+		height: 56rpx;
+		padding: 0 28rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 1;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+	}
+	.seg-i.on {
+		background: $yjyf-gradient-primary;
+		color: $yjyf-text-inverse;
+		font-weight: 600;
+	}
+	.save {
+		height: 88rpx;
+		margin-top: $yjyf-space-md;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 1;
+		border-radius: $yjyf-radius-pill;
+		color: $yjyf-text-inverse;
+		font-size: 30rpx;
+		font-weight: 700;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-button;
+	}
+	.save.disabled {
+		opacity: 0.7;
+	}
 </style>
diff --git a/yjyf-app/pages/category/category.vue b/yjyf-app/pages/category/category.vue
index 13efb95..4006116 100644
--- a/yjyf-app/pages/category/category.vue
+++ b/yjyf-app/pages/category/category.vue
@@ -1,8 +1,6 @@
 <template>
 	<view class="cat-page">
-		<!-- 沉浸式顶部橙色区域：包含状态栏、导航栏与搜索框 -->
 		<view class="hero-header">
-			<!-- 统一顶部导航栏（标题严格纠正为“全部分类”，杜绝“发布订单”） -->
 			<YjyfNavBar
 				theme="orange"
 				title="全部分类"
@@ -10,7 +8,6 @@
 				:placeholder="true"
 			/>
 
-			<!-- 搜索栏：白底圆角搜索框 + 品牌胶囊搜索按钮 -->
 			<view class="search-box-wrap">
 				<view class="search-box">
 					<input
@@ -22,8 +19,8 @@
 						confirm-type="search"
 						@confirm="onSearch"
 					/>
-					<view class="search-clear-btn" v-if="keyword" @tap="clearKeyword">
-						<text class="clear-txt">×</text>
+					<view class="search-clear-btn clickable-hover" v-if="keyword" @tap="clearKeyword">
+						<image class="clear-ico" src="/static/icons/input-clear.svg" mode="aspectFit" />
 					</view>
 					<view class="search-action-btn clickable-hover" @tap="onSearch">
 						<image class="search-btn-icon" src="/static/icons/search.svg" mode="aspectFit" />
@@ -33,15 +30,14 @@
 			</view>
 		</view>
 
-		<!-- 白色圆角全类目主体卡片区 (5 列大宫格展示全部服务类目) -->
 		<view class="cat-card-body">
-			<!-- 搜索模式提示条 -->
 			<view class="search-tip-bar" v-if="keyword.trim()">
-				<text class="st-text">搜索到与“{{ keyword.trim() }}”相关的服务类目 ({{ displayCats.length }}项)</text>
+				<text class="st-text">
+					匹配到 {{ displayCats.length }} 个类目、{{ matchedServices.length }} 项具体服务
+				</text>
 				<text class="st-reset clickable-hover" @tap="clearKeyword">重置</text>
 			</view>
 
-			<!-- 全类目 5 列宫格列表 (纯净真实垂直大类，绝对无“全部分类”自引用) -->
 			<view class="cat-grid" v-if="displayCats.length > 0">
 				<view
 					class="cat-item clickable-hover"
@@ -56,23 +52,38 @@
 				</view>
 			</view>
 
-			<!-- 搜索空状态与兜底引导 -->
-			<view class="empty-state" v-else>
-				<view class="empty-icon-wrap">
-					<image class="empty-icon-img" src="/static/icons/scan-paste.svg" mode="aspectFit" />
+			<view class="srv-section" v-if="keyword.trim() && matchedServices.length > 0">
+				<text class="srv-sec-title" v-if="displayCats.length > 0">匹配服务项目</text>
+				<view
+					class="srv-row clickable-hover"
+					v-for="srv in matchedServices"
+					:key="srv.id"
+					@tap="onSelectMatchedService(srv)"
+				>
+					<image class="srv-thumb" :src="srv.image_url || '/static/icons/service-default.svg'" mode="aspectFill" />
+					<view class="srv-info">
+						<text class="srv-name">{{ srv.name }}</text>
+						<text class="srv-sub">{{ srv.cat_name || '标准上门服务' }} · {{ srv.price_type_text || '明码标价' }}</text>
+					</view>
+					<view class="srv-right">
+						<text class="srv-price">{{ srv.price_text }}</text>
+						<view class="srv-go">选规格</view>
+					</view>
 				</view>
-				<text class="empty-title">未匹配到“{{ keyword }}”相关类目</text>
-				<text class="empty-desc">别担心，您可以直接发布自定义订单，师傅接单后为您服务</text>
+			</view>
+
+			<view class="empty-state" v-if="keyword.trim() && !searching && displayCats.length === 0 && matchedServices.length === 0">
+				<image class="empty-icon-img" src="/static/icons/empty-service.svg" mode="aspectFit" />
+				<text class="empty-title">未匹配到“{{ keyword.trim() }}”相关服务</text>
+				<text class="empty-desc">可直接发布自定义需求，由师傅在线评估报价</text>
 				<view class="custom-publish-btn clickable-hover" @tap="goCustomOrder">
 					<text class="btn-txt">发布自定义需求</text>
 				</view>
 			</view>
 
-			<!-- 页面底部安全垫高 (避让底部 TabBar) -->
 			<view class="body-bottom-space"></view>
 		</view>
 
-		<!-- 商品与规格选择抽屉 (点击任意类目秒开) -->
 		<GoodsPickerDrawer
 			:visible="showDrawer"
 			:cat-id="currentDrawerCatId"
@@ -82,42 +93,43 @@
 			@custom="goCustomOrder"
 		/>
 
-		<!-- 统一底部导航栏（当前处于立即下单模式） -->
-		<YjyfTabBar :current="'order'" />
+		<YjyfTabBar :current="'order'" :standalone="true" />
 	</view>
 </template>
 
 <script setup>
-	import { ref, computed } from 'vue';
-	import { onLoad } from '@dcloudio/uni-app';
+	import { ref, computed, watch } from 'vue';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import YjyfNavBar from '@/components/YjyfNavBar.vue';
 	import YjyfTabBar from '@/components/YjyfTabBar.vue';
 	import GoodsPickerDrawer from '@/components/GoodsPickerDrawer.vue';
 	import api from '@/utils/api.js';
+	import { setRole } from '@/utils/role.js';
 	import { useShare } from '@/utils/share.js';
 
-	// 搜索关键字
 	const keyword = ref('');
 	const rawCats = ref([]);
+	const matchedServices = ref([]);
+	const searching = ref(false);
+	let searchTimer = null;
 
 	useShare(() => {
 		const catId = currentDrawerCatId.value;
 		const catName = currentDrawerCatName.value;
 		if (showDrawer.value && catId && catName) {
 			return {
-				title: `优匠优服 · ${catName}上门安装维修服务，明码标价`,
+				title: `优匠优服 · ${catName}上门安装维修`,
 				path: `/pages/category/category?cat_id=${catId}`,
 				query: { cat_id: catId }
 			};
 		}
 		return {
-			title: '优匠优服 · 全品类家居安装与维修服务，明码标价',
+			title: '优匠优服 · 全品类家居安装与维修服务',
 			path: '/pages/category/category',
 			query: ''
 		};
 	});
 
-	// 完整全类目（保留 14 个垂直标准品类 + 第 15 个【其它】）
 	const allCats = computed(() => {
 		return (rawCats.value || []).map(c => {
 			const name = (c.name || '').trim();
@@ -133,19 +145,49 @@
 		});
 	});
 
-	// 计算当前展示的类目（支持关键词过滤）
 	const displayCats = computed(() => {
 		const kw = keyword.value.trim().toLowerCase();
 		if (!kw) return allCats.value;
 		return allCats.value.filter(c => c.name.toLowerCase().includes(kw));
 	});
 
-	// 规格抽屉控制
 	const showDrawer = ref(false);
 	const currentDrawerCatId = ref(0);
 	const currentDrawerCatName = ref('');
 
-	/* ---------- 点击类目：非标“其它”直接跳转下单输入需求，标准品类呼起规格抽屉 ---------- */
+	async function queryServicesByKeyword(kw) {
+		if (!kw) {
+			matchedServices.value = [];
+			searching.value = false;
+			return;
+		}
+		searching.value = true;
+		try {
+			const res = await api.services({ keyword: kw }, { silent: true });
+			if (keyword.value.trim() === kw) {
+				matchedServices.value = (res && res.list) ? res.list : [];
+			}
+		} catch (e) {
+			matchedServices.value = [];
+		} finally {
+			searching.value = false;
+		}
+	}
+
+	watch(keyword, (val) => {
+		if (searchTimer) clearTimeout(searchTimer);
+		const kw = (val || '').trim();
+		if (!kw) {
+			matchedServices.value = [];
+			searching.value = false;
+			return;
+		}
+		searching.value = true;
+		searchTimer = setTimeout(() => {
+			queryServicesByKeyword(kw);
+		}, 260);
+	});
+
 	function selectCategory(cat) {
 		if (cat.is_other || cat.id === 15 || cat.name === '其它' || cat.name === '其他') {
 			goCustomOrder();
@@ -156,7 +198,18 @@
 		showDrawer.value = true;
 	}
 
-	/* ---------- 规格选中后下单 ---------- */
+	function onSelectMatchedService(srv) {
+		const catId = Number(srv.cat_id || 0);
+		if (catId) {
+			const hit = allCats.value.find(c => Number(c.id) === catId);
+			currentDrawerCatId.value = catId;
+			currentDrawerCatName.value = srv.cat_name || (hit ? hit.name : '服务规格');
+			showDrawer.value = true;
+			return;
+		}
+		uni.navigateTo({ url: '/pages/service/detail?id=' + srv.id });
+	}
+
 	function onSpecSelected(spec) {
 		showDrawer.value = false;
 		const rawAddons = spec.addons && spec.addons.length ? spec.addons : [];
@@ -207,65 +260,68 @@
 
 	function clearKeyword() {
 		keyword.value = '';
+		matchedServices.value = [];
 	}
 
 	function onSearch() {
 		const kw = keyword.value.trim();
 		if (!kw) return;
-		if (displayCats.value.length === 1) {
-			selectCategory(displayCats.value[0]);
-		}
+		if (searchTimer) clearTimeout(searchTimer);
+		uni.navigateTo({ url: '/pages/service/list?keyword=' + encodeURIComponent(kw) });
 	}
 
-	/* ---------- 初始化加载全量类目列表 ---------- */
 	async function loadServerCats(targetCatId) {
 		try {
 			const res = await api.cats();
 			if (res && res.list && res.list.length > 0) {
 				rawCats.value = res.list;
-				// 若有外部直接携带类目参数进入，自动唤起该类目规格抽屉
 				if (targetCatId) {
 					const hit = allCats.value.find(c => c.id === targetCatId);
-					if (hit) {
-						selectCategory(hit);
-					}
+					if (hit) selectCategory(hit);
 				}
 			}
 		} catch (e) {}
 	}
 
 	onLoad((query) => {
+		setRole('user');
 		const targetCatId = query && query.cat_id ? parseInt(query.cat_id) : 0;
+		if (query && query.keyword) {
+			keyword.value = decodeURIComponent(query.keyword);
+		}
 		loadServerCats(targetCatId);
 	});
+
+	onShow(() => {
+		setRole('user');
+	});
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+	@import '@/uni.scss';
 	.cat-page {
 		min-height: 100vh;
-		background: #F5F6F8;
+		background: $yjyf-bg-page;
 		display: flex;
 		flex-direction: column;
 		box-sizing: border-box;
 	}
 
-	/* 顶部橙色渐变 Hero Header */
 	.hero-header {
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
-		padding-bottom: 24rpx;
+		background: $yjyf-gradient-primary;
+		padding-bottom: $yjyf-space-md;
 		box-sizing: border-box;
 	}
 
-	/* 搜索框：白底圆角搜索框 + 品牌胶囊按钮 */
 	.search-box-wrap {
-		padding: 0 24rpx;
-		margin-top: 8rpx;
+		padding: 0 $yjyf-space-md;
+		margin-top: $yjyf-space-xs;
 		box-sizing: border-box;
 	}
 	.search-box {
 		height: 76rpx;
-		background: #FFFFFF;
-		border-radius: 38rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-pill;
 		display: flex;
 		align-items: center;
 		padding: 0 8rpx 0 28rpx;
@@ -274,30 +330,29 @@
 	}
 	.search-input {
 		flex: 1;
-		font-size: 26rpx;
-		color: #1F1F1F;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
 	}
 	.search-placeholder {
-		font-size: 26rpx;
-		color: #9CA3AF;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-disabled;
 	}
 	.search-clear-btn {
-		width: 48rpx;
-		height: 48rpx;
+		width: 52rpx;
+		height: 52rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
-	.clear-txt {
-		font-size: 34rpx;
-		color: #9CA3AF;
-		line-height: 1;
+	.clear-ico {
+		width: 30rpx;
+		height: 30rpx;
 	}
 	.search-action-btn {
 		height: 60rpx;
 		padding: 0 28rpx;
-		border-radius: 30rpx;
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -309,44 +364,40 @@
 		margin-right: 6rpx;
 	}
 	.search-btn-txt {
-		font-size: 24rpx;
+		font-size: $yjyf-font-sub;
 		font-weight: 700;
-		color: #FFFFFF;
-		letter-spacing: 1rpx;
+		color: $yjyf-text-inverse;
 		line-height: 1;
 	}
 
-	/* 白色圆角主体卡片区 (对齐原型设计) */
 	.cat-card-body {
 		flex: 1;
-		background: #FFFFFF;
-		border-top-left-radius: 36rpx;
-		border-top-right-radius: 36rpx;
-		padding: 32rpx 16rpx 20rpx;
+		background: $yjyf-bg-card;
+		border-top-left-radius: $yjyf-radius-lg;
+		border-top-right-radius: $yjyf-radius-lg;
+		padding: $yjyf-space-lg $yjyf-space-sm 20rpx;
 		box-sizing: border-box;
 		min-height: calc(100vh - 200rpx);
 	}
 
-	/* 搜索提示条 */
 	.search-tip-bar {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 0 16rpx 20rpx;
-		border-bottom: 1rpx solid #F3F4F6;
+		padding: 0 $yjyf-space-sm 20rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
 		margin-bottom: 20rpx;
 	}
 	.st-text {
-		font-size: 24rpx;
-		color: #6B7280;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
 	}
 	.st-reset {
-		font-size: 24rpx;
-		color: #F0710D;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-primary;
 		font-weight: 600;
 	}
 
-	/* 全类目 5 列宫格列表 */
 	.cat-grid {
 		display: flex;
 		flex-wrap: wrap;
@@ -366,14 +417,14 @@
 		transform: scale(0.92);
 	}
 	.cat-icon-wrap {
-		width: 90rpx;
-		height: 90rpx;
+		width: 92rpx;
+		height: 92rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		border-radius: 50%;
-		background: #FAFAFA;
-		border: 1rpx solid #F3F4F6;
+		background: $yjyf-bg-page;
+		border: 1rpx solid $yjyf-border-color;
 		margin-bottom: 12rpx;
 		box-sizing: border-box;
 	}
@@ -382,15 +433,81 @@
 		height: 60rpx;
 	}
 	.cat-name {
-		font-size: 24rpx;
-		color: #2D3748;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-main;
 		font-weight: 600;
 		text-align: center;
 		white-space: nowrap;
-		letter-spacing: 0.5rpx;
 	}
 
-	/* 空状态 */
+	.srv-section {
+		padding: 12rpx $yjyf-space-xs 0;
+	}
+	.srv-sec-title {
+		display: block;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		margin: 12rpx 0 16rpx;
+	}
+	.srv-row {
+		display: flex;
+		align-items: center;
+		padding: 20rpx;
+		margin-bottom: 16rpx;
+		border-radius: $yjyf-radius-md;
+		background: $yjyf-bg-page;
+	}
+	.srv-thumb {
+		width: 88rpx;
+		height: 88rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-primary-bg;
+		flex-shrink: 0;
+	}
+	.srv-info {
+		flex: 1;
+		min-width: 0;
+		margin-left: 20rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	.srv-name {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.srv-sub {
+		margin-top: 6rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+	}
+	.srv-right {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-end;
+		flex-shrink: 0;
+		margin-left: 16rpx;
+	}
+	.srv-price {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-primary;
+	}
+	.srv-go {
+		margin-top: 8rpx;
+		height: 48rpx;
+		padding: 0 22rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
 	.empty-state {
 		display: flex;
 		flex-direction: column;
@@ -398,52 +515,42 @@
 		justify-content: center;
 		padding: 120rpx 40rpx;
 	}
-	.empty-icon-wrap {
-		width: 120rpx;
-		height: 120rpx;
-		margin-bottom: 24rpx;
-		opacity: 0.35;
-	}
 	.empty-icon-img {
-		width: 100%;
-		height: 100%;
+		width: 160rpx;
+		height: 160rpx;
+		margin-bottom: $yjyf-space-md;
 	}
 	.empty-title {
 		font-size: 30rpx;
 		font-weight: 700;
-		color: #374151;
+		color: $yjyf-text-main;
 		margin-bottom: 12rpx;
 	}
 	.empty-desc {
-		font-size: 24rpx;
-		color: #9CA3AF;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
 		text-align: center;
 		margin-bottom: 36rpx;
 		line-height: 1.5;
 	}
 	.custom-publish-btn {
-		height: 72rpx;
-		padding: 0 44rpx;
-		border-radius: 36rpx;
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		height: 76rpx;
+		padding: 0 48rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		box-shadow: 0 6rpx 16rpx rgba(240, 113, 13, 0.28);
+		box-shadow: $yjyf-shadow-button;
 	}
 	.btn-txt {
-		font-size: 26rpx;
+		font-size: $yjyf-font-body;
 		font-weight: 700;
-		color: #FFFFFF;
+		color: $yjyf-text-inverse;
 		line-height: 1;
 	}
 
 	.body-bottom-space {
 		height: 200rpx;
 	}
-
-	.clickable-hover:active {
-		opacity: 0.85;
-		transform: scale(0.98);
-	}
 </style>
diff --git a/yjyf-app/pages/coupon/coupon.vue b/yjyf-app/pages/coupon/coupon.vue
index d12c15d..f81f7b9 100644
--- a/yjyf-app/pages/coupon/coupon.vue
+++ b/yjyf-app/pages/coupon/coupon.vue
@@ -1,10 +1,16 @@
 <template>
 	<view class="page">
-		<!-- 统一顶部导航栏（安全距离自适应） -->
 		<YjyfNavBar theme="orange" title="优惠券中心" />
+
 		<view class="tabs">
-			<view class="tab" :class="{ on: tab === 'center' }" @tap="switchTab('center')">领券中心</view>
-			<view class="tab" :class="{ on: tab === 'mine' }" @tap="switchTab('mine')">我的券{{ counts.unused ? '(' + counts.unused + ')' : '' }}</view>
+			<view class="tab" :class="{ on: tab === 'center' }" @tap="switchTab('center')">
+				<text>领券中心</text>
+				<view class="tab-bar" v-if="tab === 'center'"></view>
+			</view>
+			<view class="tab" :class="{ on: tab === 'mine' }" @tap="switchTab('mine')">
+				<text>我的券{{ counts.unused ? ' (' + counts.unused + ')' : '' }}</text>
+				<view class="tab-bar" v-if="tab === 'mine'"></view>
+			</view>
 		</view>
 
 		<view class="list" v-if="tab === 'center'">
@@ -17,19 +23,34 @@
 					<text class="cp-name">{{ c.name }}</text>
 					<text class="cp-time">{{ c.time_text }}</text>
 				</view>
-				<view class="cp-btn" :class="{ done: c.received_by_me || c.sold_out }" @tap="receive(c)">
-					{{ c.received_by_me ? '已领取' : (c.sold_out ? '已领完' : '领取') }}
+				<view
+					class="cp-btn clickable-hover"
+					:class="{ done: c.received_by_me || c.sold_out || receivingId === c.id }"
+					@tap="receive(c)"
+				>
+					{{ c.received_by_me ? '已领取' : (c.sold_out ? '已领完' : (receivingId === c.id ? '领取中' : '立即领取')) }}
 				</view>
 			</view>
-			<view class="empty" v-if="!loading && !center.length">暂无可领取的优惠券</view>
+
+			<view class="empty-box" v-if="!loading && !center.length">
+				<image class="empty-ico" src="/static/icons/empty-coupon.svg" mode="aspectFit" />
+				<text class="empty-title">暂无可领取的优惠券</text>
+			</view>
 		</view>
 
 		<view class="list" v-else>
 			<view class="tabs2">
-				<view v-for="t in statusTabs" :key="t.key" class="tab2" :class="{ on: status === t.key }" @tap="switchStatus(t.key)">
+				<view
+					v-for="t in statusTabs"
+					:key="t.key"
+					class="tab2"
+					:class="{ on: status === t.key }"
+					@tap="switchStatus(t.key)"
+				>
 					{{ t.name }}{{ counts[t.key] ? ' ' + counts[t.key] : '' }}
 				</view>
 			</view>
+
 			<view class="cp" :class="{ dim: status !== 'unused' }" v-for="c in mine" :key="c.id">
 				<view class="cp-l">
 					<text class="cp-val">{{ c.value_text }}</text>
@@ -39,16 +60,21 @@
 					<text class="cp-name">{{ c.name }}</text>
 					<text class="cp-time">{{ c.time_text }}</text>
 				</view>
-				<view class="cp-btn use" v-if="status === 'unused'" @tap="goOrder">去使用</view>
+				<view class="cp-btn use clickable-hover" v-if="status === 'unused'" @tap="goOrder">去使用</view>
+				<text class="cp-state" v-else>{{ status === 'used' ? '已使用' : '已过期' }}</text>
+			</view>
+
+			<view class="empty-box" v-if="!loading && !mine.length">
+				<image class="empty-ico" src="/static/icons/empty-coupon.svg" mode="aspectFit" />
+				<text class="empty-title">暂无{{ status === 'unused' ? '可用' : (status === 'used' ? '已使用' : '已过期') }}优惠券</text>
 			</view>
-			<view class="empty" v-if="!loading && !mine.length">暂无优惠券</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
 	import { ref } from 'vue';
-	import { onShow } from '@dcloudio/uni-app';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin } from '@/utils/request.js';
 	import { useShare } from '@/utils/share.js';
@@ -59,10 +85,11 @@
 	const mine = ref([]);
 	const counts = ref({ unused: 0, used: 0, expired: 0 });
 	const loading = ref(false);
+	const receivingId = ref(0);
 
 	useShare(() => {
 		const first = center.value && center.value.length ? center.value[0] : null;
-		const desc = first ? `${first.name}（${first.value_text}）` : '专属优惠券限时派发';
+		const desc = first ? `${first.name}（${first.value_text}）` : '领券下单立享优惠';
 		return {
 			title: `优匠优服领券中心 · ${desc}`,
 			path: '/pages/coupon/coupon',
@@ -78,11 +105,17 @@
 
 	function switchTab(t) {
 		tab.value = t;
-		if (t === 'center') loadCenter(); else loadMine();
+		if (t === 'center') loadCenter();
+		else loadMine();
 	}
-	function switchStatus(s) { status.value = s; loadMine(); }
+
+	function switchStatus(s) {
+		status.value = s;
+		loadMine();
+	}
+
 	function goOrder() {
-		uni.switchTab({ url: '/pages/index/index', fail: () => uni.redirectTo({ url: '/pages/index/index' }) });
+		uni.navigateTo({ url: '/pages/category/category' });
 	}
 
 	async function loadCenter() {
@@ -96,6 +129,14 @@
 		}
 	}
 
+	async function syncCountsSilent() {
+		if (!isLogin()) return;
+		try {
+			const res = await api.couponMy({ status: 'unused' }, { silent: true });
+			if (res && res.counts) counts.value = res.counts;
+		} catch (e) {}
+	}
+
 	async function loadMine() {
 		if (!isLogin()) { toLogin(); return; }
 		loading.value = true;
@@ -111,37 +152,190 @@
 
 	async function receive(c) {
 		if (!isLogin()) { toLogin(); return; }
+		if (receivingId.value) return;
 		if (c.received_by_me) { uni.showToast({ title: '已领取过了', icon: 'none' }); return; }
 		if (c.sold_out) { uni.showToast({ title: '已被领完', icon: 'none' }); return; }
+		receivingId.value = c.id;
 		try {
 			await api.couponReceive({ coupon_id: c.id });
 			uni.showToast({ title: '领取成功' });
-			loadCenter();
-		} catch (e) {}
+			await loadCenter();
+			syncCountsSilent();
+		} catch (e) {
+		} finally {
+			receivingId.value = 0;
+		}
 	}
 
-	onShow(() => loadCenter());
+	onLoad((query) => {
+		if (query && (query.tab === 'mine' || query.tab === 'center')) {
+			tab.value = query.tab;
+		}
+	});
+
+	onShow(() => {
+		if (tab.value === 'mine' && isLogin()) {
+			loadMine();
+		} else {
+			loadCenter();
+			syncCountsSilent();
+		}
+	});
 </script>
 
-<style scoped>
-	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 40rpx; }
-	.tabs { display: flex; background: #fff; box-shadow: 0 4rpx 12rpx rgba(0,0,0,.03); }
-	.tab { flex: 1; text-align: center; padding: 26rpx 0; font-size: 28rpx; color: #666; }
-	.tab.on { color: #F0710D; font-weight: 700; }
-	.tabs2 { display: flex; padding: 0 0 16rpx; }
-	.tab2 { margin-right: 16rpx; height: 56rpx; padding: 0 26rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 28rpx; background: #fff; font-size: 24rpx; color: #444444; }
-	.tab2.on { background: #FFF3E6; color: #E36B0C; font-weight: 600; }
-	.list { padding: 22rpx 28rpx; }
-	.cp { display: flex; align-items: center; background: #fff; border-radius: 20rpx; padding: 24rpx; margin-bottom: 18rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06); }
-	.cp.dim { opacity: .6; }
-	.cp-l { width: 150rpx; flex-shrink: 0; display: flex; flex-direction: column; align-items: center; padding-right: 18rpx; border-right: 1rpx dashed #F0DCC8; }
-	.cp-val { font-size: 40rpx; font-weight: 800; color: #F0710D; }
-	.cp-rule { margin-top: 4rpx; font-size: 22rpx; color: #888888; }
-	.cp-m { flex: 1; min-width: 0; padding-left: 18rpx; display: flex; flex-direction: column; }
-	.cp-name { font-size: 28rpx; font-weight: 600; color: #1F1F1F; }
-	.cp-time { margin-top: 6rpx; font-size: 22rpx; color: #888888; }
-	.cp-btn { flex-shrink: 0; margin-left: 12rpx; height: 60rpx; padding: 0 28rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 30rpx; color: #fff; font-size: 24rpx; font-weight: 600; background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); }
-	.cp-btn.done { background: #EEE; color: #9A9A9A; }
-	.cp-btn.use { background: #FFF3E6; color: #E36B0C; }
-	.empty { padding: 100rpx 0; text-align: center; font-size: 24rpx; color: #9A9A9A; }
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: 48rpx;
+	}
+	.tabs {
+		display: flex;
+		background: $yjyf-bg-card;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.tab {
+		flex: 1;
+		position: relative;
+		height: 88rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-regular;
+	}
+	.tab.on {
+		color: $yjyf-primary;
+		font-weight: 700;
+	}
+	.tab-bar {
+		position: absolute;
+		bottom: 0;
+		width: 48rpx;
+		height: 6rpx;
+		border-radius: 3rpx;
+		background: $yjyf-primary;
+	}
+
+	.list {
+		padding: $yjyf-space-md;
+	}
+	.tabs2 {
+		display: flex;
+		gap: $yjyf-space-sm;
+		padding-bottom: $yjyf-space-sm;
+	}
+	.tab2 {
+		height: 56rpx;
+		padding: 0 28rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 1;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-card;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+	}
+	.tab2.on {
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	.cp {
+		display: flex;
+		align-items: center;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		padding: $yjyf-space-md;
+		margin-bottom: $yjyf-space-sm;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.cp.dim {
+		opacity: 0.62;
+	}
+	.cp-l {
+		width: 156rpx;
+		flex-shrink: 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding-right: 20rpx;
+		border-right: 2rpx dashed $yjyf-primary-border;
+	}
+	.cp-val {
+		font-size: 40rpx;
+		font-weight: 800;
+		color: $yjyf-primary;
+		line-height: 1.1;
+	}
+	.cp-rule {
+		margin-top: 8rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+	}
+	.cp-m {
+		flex: 1;
+		min-width: 0;
+		padding-left: 20rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	.cp-name {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.cp-time {
+		margin-top: 8rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+	}
+	.cp-btn {
+		flex-shrink: 0;
+		margin-left: 12rpx;
+		height: 60rpx;
+		padding: 0 28rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 1;
+		border-radius: $yjyf-radius-pill;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		background: $yjyf-gradient-primary;
+	}
+	.cp-btn.done {
+		background: $yjyf-bg-page;
+		color: $yjyf-text-muted;
+	}
+	.cp-btn.use {
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		border: 1rpx solid $yjyf-primary-border;
+	}
+	.cp-state {
+		flex-shrink: 0;
+		margin-left: 12rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-muted;
+	}
+
+	.empty-box {
+		padding: 140rpx 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.empty-ico {
+		width: 160rpx;
+		height: 160rpx;
+		margin-bottom: $yjyf-space-md;
+	}
+	.empty-title {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-secondary;
+	}
 </style>
diff --git a/yjyf-app/pages/index/index.vue b/yjyf-app/pages/index/index.vue
index 710d436..ee34409 100644
--- a/yjyf-app/pages/index/index.vue
+++ b/yjyf-app/pages/index/index.vue
@@ -1,23 +1,23 @@
 <template>
 	<view class="user-container-page">
 		<!-- 1. 首页 (Tab 0) -->
-		<view v-show="activeTab === 0">
+		<view class="tab-pane" v-show="activeTab === 0">
 			<UserHomeView ref="homeRef" @switch-tab="onTabChange" />
 		</view>
 
 		<!-- 2. 订单 (Tab 1) -->
-		<view v-show="activeTab === 1">
-			<UserOrdersView ref="ordersRef" />
+		<view class="tab-pane" v-if="visitedTabs[1]" v-show="activeTab === 1">
+			<UserOrdersView ref="ordersRef" :initial-status="initialOrderStatus" />
 		</view>
 
 		<!-- 3. 消息 (Tab 2) -->
-		<view v-show="activeTab === 2">
-			<UserMessageView ref="messageRef" />
+		<view class="tab-pane" v-if="visitedTabs[2]" v-show="activeTab === 2">
+			<UserMessageView ref="messageRef" role-type="user" />
 		</view>
 
 		<!-- 4. 我的 (Tab 3) -->
-		<view v-show="activeTab === 3">
-			<UserMineView ref="mineRef" />
+		<view class="tab-pane" v-if="visitedTabs[3]" v-show="activeTab === 3">
+			<UserMineView ref="mineRef" @go-orders="goOrdersWithStatus" />
 		</view>
 
 		<!-- 全局统一底部导航 (方案 A：单母页组件化调度，0ms 极速秒切) -->
@@ -26,16 +26,21 @@
 </template>
 
 <script setup>
-	import { ref } from 'vue';
-	import { onLoad, onShow, onPullDownRefresh, onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+	import { ref, reactive } from 'vue';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import UserHomeView from '@/components/user/UserHomeView.vue';
 	import UserOrdersView from '@/components/user/UserOrdersView.vue';
 	import UserMessageView from '@/components/user/UserMessageView.vue';
 	import UserMineView from '@/components/user/UserMineView.vue';
 	import YjyfTabBar from '@/components/YjyfTabBar.vue';
+	import { isLogin, toLogin } from '@/utils/request.js';
+	import { setRole } from '@/utils/role.js';
 	import { useShare } from '@/utils/share.js';
 
 	const activeTab = ref(0);
+	const initialOrderStatus = ref('all');
+	const visitedTabs = reactive({ 0: true, 1: false, 2: false, 3: false });
+	let initialLoaded = false;
 
 	useShare(() => ({
 		title: '优匠优服 · 专业家居安装维修平台，实名师傅极速上门',
@@ -48,19 +53,10 @@
 	const messageRef = ref(null);
 	const mineRef = ref(null);
 
-	onPageScroll((e) => {
-		if (activeTab.value === 0 && homeRef.value?.onScroll) {
-			homeRef.value.onScroll(e.scrollTop || 0);
-		}
-	});
-
-	onReachBottom(() => {
-		if (activeTab.value === 0 && homeRef.value?.loadMore) {
-			homeRef.value.loadMore();
-		}
-	});
-
 	function refreshCurrentTab() {
+		if (activeTab.value > 0 && !isLogin()) {
+			return;
+		}
 		if (activeTab.value === 0 && homeRef.value?.load) {
 			homeRef.value.load();
 		} else if (activeTab.value === 1 && ordersRef.value?.load) {
@@ -73,48 +69,87 @@
 	}
 
 	function onTabChange(index) {
+		setRole('user');
 		const targetIndex = Number(index);
+		if (isNaN(targetIndex) || targetIndex < 0 || targetIndex > 3) return;
+		if (targetIndex > 0 && !isLogin()) {
+			toLogin(`/pages/index/index?tab=${targetIndex}`);
+			return;
+		}
 		if (activeTab.value === targetIndex) return;
+		const firstVisit = !visitedTabs[targetIndex];
+		visitedTabs[targetIndex] = true;
 		activeTab.value = targetIndex;
-		setTimeout(() => {
-			refreshCurrentTab();
-		}, 0);
+		if (!firstVisit) {
+			setTimeout(() => {
+				refreshCurrentTab();
+			}, 0);
+		}
+	}
+
+	function goOrdersWithStatus(statusKey = 'all') {
+		setRole('user');
+		const targetStatus = statusKey || 'all';
+		if (!isLogin()) {
+			toLogin(`/pages/index/index?tab=1&status=${targetStatus}`);
+			return;
+		}
+		initialOrderStatus.value = targetStatus;
+		const firstVisit = !visitedTabs[1];
+		visitedTabs[1] = true;
+		activeTab.value = 1;
+		if (!firstVisit) {
+			setTimeout(() => {
+				if (ordersRef.value?.switchTab) {
+					ordersRef.value.switchTab(targetStatus);
+				} else if (ordersRef.value?.load) {
+					ordersRef.value.load();
+				}
+			}, 0);
+		}
 	}
 
 	onLoad((query) => {
+		setRole('user');
+		if (query && query.status) {
+			initialOrderStatus.value = String(query.status);
+		}
 		if (query && query.tab !== undefined) {
 			const t = parseInt(query.tab);
 			if (!isNaN(t) && t >= 0 && t <= 3) {
+				if (t > 0 && !isLogin()) {
+					activeTab.value = 0;
+					setTimeout(() => {
+						toLogin(`/pages/index/index?tab=${t}`);
+					}, 0);
+					return;
+				}
 				activeTab.value = t;
+				visitedTabs[t] = true;
 			}
 		}
 	});
 
 	onShow(() => {
-		refreshCurrentTab();
-	});
-
-	onPullDownRefresh(async () => {
-		try {
-			if (activeTab.value === 0 && homeRef.value?.load) {
-				await homeRef.value.load();
-			} else if (activeTab.value === 1 && ordersRef.value?.load) {
-				await ordersRef.value.load();
-			} else if (activeTab.value === 2 && messageRef.value?.load) {
-				await messageRef.value.load();
-			} else if (activeTab.value === 3 && mineRef.value?.load) {
-				await mineRef.value.load();
-			}
-		} catch (e) {
-		} finally {
-			uni.stopPullDownRefresh();
+		setRole('user');
+		if (!initialLoaded) {
+			initialLoaded = true;
+			return;
 		}
+		refreshCurrentTab();
 	});
 </script>
 
 <style scoped>
 	.user-container-page {
-		min-height: 100vh;
+		height: 100vh;
+		overflow: hidden;
 		background: #F5F6F8;
 	}
+	.tab-pane {
+		width: 100%;
+		height: calc(100vh - 112rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 112rpx - env(safe-area-inset-bottom));
+		overflow: hidden;
+	}
 </style>
diff --git a/yjyf-app/pages/invoice/apply.vue b/yjyf-app/pages/invoice/apply.vue
new file mode 100644
index 0000000..069914e
--- /dev/null
+++ b/yjyf-app/pages/invoice/apply.vue
@@ -0,0 +1,1048 @@
+<template>
+	<view class="page">
+		<YjyfNavBar theme="orange" title="确认开票信息" :fixed="true" :placeholder="true" />
+
+		<template v-if="!loadingInit && orders.length > 0">
+			<view class="main-body">
+				<!-- 1. 顶部信封式发票抬头选择卡 -->
+				<view class="title-card clickable-hover" @tap="handleTitleCardTap">
+					<image class="title-card-ico" src="/static/icons/invoice-addr-card.svg" mode="aspectFit" />
+
+					<view class="title-card-body" v-if="currentTitle">
+						<view class="tc-line1">
+							<text class="tc-tag" v-if="currentTitle.is_default">默认</text>
+							<text class="tc-name">{{ currentTitle.title }}</text>
+						</view>
+
+						<text class="tc-tax" v-if="currentTitle.title_type === 'enterprise' && currentTitle.tax_no">
+							{{ currentTitle.tax_no }}
+						</text>
+
+						<template v-if="invoiceType === 'special' && currentTitle.title_type === 'enterprise'">
+							<text class="tc-spec-line" v-if="currentTitle.can_special">
+								{{ currentTitle.bank_name }} · {{ currentTitle.bank_account }}
+							</text>
+							<view class="tc-spec-warn" v-else @tap.stop="completeSpecialInfo">
+								<text class="tc-warn-txt">去补全开户行与注册地址</text>
+								<image class="tc-warn-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+							</view>
+						</template>
+					</view>
+
+					<view class="title-card-empty" v-else>
+						<text class="empty-main">选择或添加发票抬头</text>
+					</view>
+
+					<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+				</view>
+
+				<!-- 2. 发票信息卡片 -->
+				<view class="card">
+					<text class="section-title">发票信息</text>
+
+					<view class="form-row">
+						<text class="row-label">发票类型</text>
+						<view class="seg-track">
+							<view
+								class="seg-item clickable-hover"
+								:class="{ on: invoiceType === 'normal' }"
+								@tap="switchInvoiceType('normal')"
+							>
+								普通发票
+							</view>
+							<view
+								class="seg-item clickable-hover"
+								:class="{ on: invoiceType === 'special' }"
+								@tap="switchInvoiceType('special')"
+							>
+								专用发票
+							</view>
+						</view>
+					</view>
+
+					<view class="form-row">
+						<text class="row-label">发票内容</text>
+						<text class="row-static">*现代服务*安装维修服务费</text>
+					</view>
+
+					<view class="form-row clickable-hover" @tap="showOrderItems = !showOrderItems">
+						<text class="row-label">关联订单</text>
+						<view class="order-fold-r">
+							<text class="fold-txt">{{ orders.length }} 笔订单</text>
+							<image
+								class="fold-ico"
+								:src="showOrderItems ? '/static/icons/chevron-up-gray.svg' : '/static/icons/chevron-down-gray.svg'"
+								mode="aspectFit"
+							/>
+						</view>
+					</view>
+
+					<view class="mini-orders" v-if="showOrderItems">
+						<view class="mo-row" v-for="ord in orders" :key="ord.id">
+							<text class="mo-name">{{ ord.service_name }}</text>
+							<text class="mo-amt">¥{{ Number(ord.invoiceable_amount).toFixed(2) }}</text>
+						</view>
+						<view class="mo-more clickable-hover" v-if="unbilledCount > orders.length" @tap="goMergeMore">
+							<text class="mo-more-txt">重新选择订单</text>
+							<image class="tc-warn-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+						</view>
+					</view>
+
+					<view class="form-row no-border">
+						<text class="row-label">发票备注</text>
+						<input
+							class="row-input"
+							v-model="remark"
+							maxlength="200"
+							placeholder="选填"
+						/>
+					</view>
+				</view>
+
+				<!-- 3. 接收方式卡片 -->
+				<view class="card">
+					<text class="section-title">接收方式</text>
+
+					<view class="form-row">
+						<text class="row-label required">电子邮箱</text>
+						<input
+							class="row-input"
+							v-model="email"
+							maxlength="100"
+							placeholder="必填，接收电子发票"
+						/>
+					</view>
+
+					<view class="form-row no-border">
+						<text class="row-label">通知手机</text>
+						<input
+							class="row-input"
+							type="number"
+							maxlength="11"
+							v-model="receiveMobile"
+							placeholder="选填"
+						/>
+					</view>
+				</view>
+			</view>
+
+			<!-- 底部固定提交栏 -->
+			<view class="bottom-bar">
+				<view class="bar-sum">
+					<text class="bar-sum-k">开票金额</text>
+					<view class="bar-amt-line">
+						<text class="bar-sym">¥</text>
+						<text class="bar-int">{{ splitAmt(totalAmount).int }}</text>
+						<text class="bar-dec">.{{ splitAmt(totalAmount).dec }}</text>
+					</view>
+				</view>
+				<view
+					class="submit-btn clickable-hover"
+					:class="{ disabled: submitting }"
+					@tap="openConfirmDialog"
+				>
+					{{ submitting ? '提交中...' : '提交申请' }}
+				</view>
+			</view>
+		</template>
+
+		<!-- 加载态 -->
+		<view class="state-box" v-else-if="loadingInit">
+			<text class="state-txt">加载中...</text>
+		</view>
+
+		<!-- 无有效待开票订单兜底态 -->
+		<view class="state-box" v-else>
+			<image class="empty-ico" src="/static/icons/empty-invoice-records.svg" mode="aspectFit" />
+			<text class="state-title">所选订单暂不可开票</text>
+			<view class="ghost-btn clickable-hover" @tap="rechooseOrders">重新选择</view>
+		</view>
+
+		<!-- 提交前二次核对模态框 -->
+		<view class="confirm-mask" v-if="showConfirmModal" @tap="showConfirmModal = false">
+			<view class="confirm-dialog" @tap.stop>
+				<view class="cd-hero">
+					<text class="cd-title">核对开票信息</text>
+					<view class="cd-amt-row">
+						<text class="cd-sym">¥</text>
+						<text class="cd-int">{{ splitAmt(totalAmount).int }}</text>
+						<text class="cd-dec">.{{ splitAmt(totalAmount).dec }}</text>
+					</view>
+				</view>
+
+				<view class="cd-divider">
+					<view class="cd-notch left"></view>
+					<view class="cd-dash"></view>
+					<view class="cd-notch right"></view>
+				</view>
+
+				<view class="cd-body" v-if="currentTitle">
+					<view class="cd-row">
+						<text class="cd-k">发票类型</text>
+						<text class="cd-v tag">{{ invoiceType === 'special' ? '增值税专用发票' : '电子普通发票' }}</text>
+					</view>
+					<view class="cd-row">
+						<text class="cd-k">发票抬头</text>
+						<text class="cd-v bold">{{ currentTitle.title }}</text>
+					</view>
+					<view class="cd-row" v-if="currentTitle.title_type === 'enterprise'">
+						<text class="cd-k">纳税人识别号</text>
+						<text class="cd-v mono">{{ currentTitle.tax_no }}</text>
+					</view>
+					<view class="cd-row">
+						<text class="cd-k">接收邮箱</text>
+						<text class="cd-v mono">{{ email }}</text>
+					</view>
+				</view>
+
+				<text class="cd-tip">电子发票开具后不可直接修改</text>
+
+				<view class="cd-actions">
+					<view class="cd-btn cancel clickable-hover" @tap="showConfirmModal = false">返回修改</view>
+					<view class="cd-btn primary clickable-hover" :class="{ disabled: submitting }" @tap="confirmSubmit">
+						{{ submitting ? '提交中...' : '确认开票' }}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed } from 'vue';
+	import { onLoad, onShow, onUnload } from '@dcloudio/uni-app';
+	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const orderIdsParam = ref([]);
+	const orders = ref([]);
+	const titles = ref([]);
+	const unbilledCount = ref(0);
+	const currentTitle = ref(null);
+	const invoiceType = ref('normal');
+	const email = ref('');
+	const receiveMobile = ref('');
+	const remark = ref('');
+	const showOrderItems = ref(false);
+	const loadingInit = ref(true);
+	const showConfirmModal = ref(false);
+	const submitting = ref(false);
+	const initializedOnce = ref(false);
+
+	const totalAmount = computed(() => {
+		let sum = 0;
+		for (const ord of orders.value) {
+			sum += Number(ord.invoiceable_amount || 0);
+		}
+		return Math.round(sum * 100) / 100;
+	});
+
+	function splitAmt(v) {
+		const n = Number(v || 0);
+		const s = (Number.isFinite(n) ? n : 0).toFixed(2);
+		const p = s.split('.');
+		return { int: p[0] || '0', dec: p[1] || '00' };
+	}
+
+	function applySelectedTitle(item) {
+		if (!item || !item.id) return;
+		currentTitle.value = item;
+		if (item.title_type === 'personal' && invoiceType.value === 'special') {
+			invoiceType.value = 'normal';
+		} else if (item.default_invoice_type === 'special' && item.can_special) {
+			invoiceType.value = 'special';
+		}
+		if (item.email) {
+			email.value = item.email;
+		}
+		if (item.receive_mobile) {
+			receiveMobile.value = item.receive_mobile;
+		}
+	}
+
+	onLoad((q) => {
+		const raw = (q && (q.order_ids || q.order_id)) ? String(q.order_ids || q.order_id) : '';
+		orderIdsParam.value = raw
+			.split(',')
+			.map((s) => Number(s.trim()))
+			.filter((n) => n > 0);
+
+		uni.$on('yjyf:selectInvoiceTitle', applySelectedTitle);
+		uni.$on('yjyf:savedInvoiceTitle', applySelectedTitle);
+	});
+
+	onUnload(() => {
+		uni.$off('yjyf:selectInvoiceTitle', applySelectedTitle);
+		uni.$off('yjyf:savedInvoiceTitle', applySelectedTitle);
+	});
+
+	onShow(() => {
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		loadData();
+	});
+
+	async function loadData() {
+		if (!orderIdsParam.value.length) {
+			loadingInit.value = false;
+			orders.value = [];
+			return;
+		}
+		if (!initializedOnce.value) {
+			loadingInit.value = true;
+		}
+		try {
+			const [ordRes, sumRes] = await Promise.all([
+				api.invoiceOrders({ order_ids: orderIdsParam.value.join(','), limit: 100 }),
+				api.invoiceSummary()
+			]);
+
+			orders.value = (ordRes && ordRes.list) || [];
+			const q = (sumRes && sumRes.quota) || {};
+			const tList = (sumRes && sumRes.titles) || [];
+			titles.value = tList;
+			unbilledCount.value = Number(q.unbilled_order_count || 0);
+
+			if (currentTitle.value && currentTitle.value.id) {
+				const refreshed = tList.find((t) => Number(t.id) === Number(currentTitle.value.id));
+				if (refreshed) {
+					applySelectedTitle(refreshed);
+				} else {
+					currentTitle.value = tList.length > 0 ? tList[0] : null;
+				}
+			} else if (tList.length > 0) {
+				applySelectedTitle(tList[0]);
+			}
+
+			if (!email.value && q.default_email) {
+				email.value = q.default_email;
+			}
+			if (!receiveMobile.value && q.default_mobile) {
+				receiveMobile.value = q.default_mobile;
+			}
+			initializedOnce.value = true;
+		} catch (e) {
+			// request.js 已统一提示
+		} finally {
+			loadingInit.value = false;
+		}
+	}
+
+	function handleTitleCardTap() {
+		if (titles.value.length === 0) {
+			const targetType = invoiceType.value === 'special' ? 'enterprise' : 'personal';
+			uni.navigateTo({
+				url: `/pages/invoice/title-edit?type=${targetType}&invoice_type=${invoiceType.value}&auto_select=1`
+			});
+			return;
+		}
+		uni.navigateTo({ url: '/pages/invoice/titles?select=1' });
+	}
+
+	function completeSpecialInfo() {
+		if (!currentTitle.value || !currentTitle.value.id) return;
+		uni.navigateTo({
+			url: `/pages/invoice/title-edit?id=${currentTitle.value.id}&invoice_type=special&auto_select=1`
+		});
+	}
+
+	function switchInvoiceType(target) {
+		if (target === 'normal') {
+			invoiceType.value = 'normal';
+			return;
+		}
+		if (currentTitle.value && currentTitle.value.title_type === 'personal') {
+			const ent = titles.value.find((t) => t.title_type === 'enterprise');
+			if (ent) {
+				invoiceType.value = 'special';
+				applySelectedTitle(ent);
+				uni.showToast({ title: '已切换至企业抬头', icon: 'none' });
+				return;
+			}
+			uni.showModal({
+				title: '专票需使用企业抬头',
+				content: '增值税专用发票仅支持企业单位申请，是否立即添加企业发票抬头？',
+				confirmText: '去添加',
+				confirmColor: '#F0710D',
+				success: (res) => {
+					if (res.confirm) {
+						invoiceType.value = 'special';
+						uni.navigateTo({
+							url: '/pages/invoice/title-edit?type=enterprise&invoice_type=special&auto_select=1'
+						});
+					}
+				}
+			});
+			return;
+		}
+		invoiceType.value = 'special';
+	}
+
+	function goMergeMore() {
+		const ids = orders.value.map((o) => o.id).join(',');
+		uni.redirectTo({ url: `/pages/invoice/orders?preselect=${ids}` });
+	}
+
+	function rechooseOrders() {
+		uni.redirectTo({ url: '/pages/invoice/orders' });
+	}
+
+	function openConfirmDialog() {
+		if (!orders.value.length) {
+			uni.showToast({ title: '未找到可开票订单', icon: 'none' });
+			return;
+		}
+		if (!currentTitle.value || !currentTitle.value.id) {
+			uni.showToast({ title: '请先选择或添加发票抬头', icon: 'none' });
+			handleTitleCardTap();
+			return;
+		}
+		if (invoiceType.value === 'special') {
+			if (currentTitle.value.title_type !== 'enterprise') {
+				uni.showToast({ title: '增值税专票请选择企业单位抬头', icon: 'none' });
+				return;
+			}
+			if (!currentTitle.value.can_special) {
+				uni.showModal({
+					title: '需完善专票信息',
+					content: '当前企业抬头尚未填写完整的开户银行、账号及注册地址电话，请先补全后再提交。',
+					confirmText: '去完善',
+					confirmColor: '#F0710D',
+					success: (res) => {
+						if (res.confirm) completeSpecialInfo();
+					}
+				});
+				return;
+			}
+		}
+
+		const mail = email.value.trim();
+		if (!mail) {
+			uni.showToast({ title: '请填写接收电子发票的邮箱', icon: 'none' });
+			return;
+		}
+		if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(mail)) {
+			uni.showToast({ title: '电子邮箱格式不正确', icon: 'none' });
+			return;
+		}
+
+		const mob = receiveMobile.value.trim();
+		if (mob && !/^1\d{10}$/.test(mob)) {
+			uni.showToast({ title: '通知手机号格式不正确', icon: 'none' });
+			return;
+		}
+
+		showConfirmModal.value = true;
+	}
+
+	async function confirmSubmit() {
+		if (submitting.value || !currentTitle.value) return;
+		submitting.value = true;
+		try {
+			const res = await api.invoiceApply({
+				order_ids: orders.value.map((o) => o.id),
+				title_id: currentTitle.value.id,
+				type: invoiceType.value,
+				title_type: currentTitle.value.title_type,
+				email: email.value.trim(),
+				receive_mobile: receiveMobile.value.trim(),
+				remark: remark.value.trim()
+			});
+			showConfirmModal.value = false;
+			uni.showToast({ title: '开票申请已提交', icon: 'success' });
+			setTimeout(() => {
+				if (res && res.invoice_id) {
+					uni.redirectTo({ url: `/pages/invoice/detail?id=${res.invoice_id}` });
+				} else {
+					uni.redirectTo({ url: '/pages/invoice/records' });
+				}
+			}, 400);
+		} catch (e) {
+			// request.js 已统一提示错误
+		} finally {
+			submitting.value = false;
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(180rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+
+	.main-body {
+		padding: $yjyf-space-md $yjyf-space-lg 0;
+	}
+
+	/* 1. 顶部抬头选择名片 */
+	.title-card {
+		position: relative;
+		overflow: hidden;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		padding: $yjyf-space-lg $yjyf-space-md 36rpx;
+		margin-bottom: 20rpx;
+		display: flex;
+		align-items: center;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+
+		&::after {
+			content: '';
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			height: 6rpx;
+			background: repeating-linear-gradient(
+				-45deg,
+				$yjyf-primary 0,
+				$yjyf-primary 20rpx,
+				transparent 20rpx,
+				transparent 30rpx,
+				$yjyf-info 30rpx,
+				$yjyf-info 50rpx,
+				transparent 50rpx,
+				transparent 60rpx
+			);
+		}
+	}
+
+	.title-card-ico {
+		width: 72rpx;
+		height: 72rpx;
+		flex-shrink: 0;
+		margin-right: $yjyf-space-md;
+	}
+
+	.title-card-body,
+	.title-card-empty {
+		flex: 1;
+		min-width: 0;
+		margin-right: $yjyf-space-sm;
+	}
+
+	.tc-line1 {
+		display: flex;
+		align-items: center;
+		min-width: 0;
+	}
+
+	.tc-tag {
+		height: 36rpx;
+		padding: 0 12rpx;
+		border-radius: 8rpx;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+		color: $yjyf-primary;
+		background: $yjyf-primary-bg;
+		display: inline-flex;
+		align-items: center;
+		margin-right: 12rpx;
+		flex-shrink: 0;
+	}
+
+	.tc-name {
+		flex: 1;
+		min-width: 0;
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.tc-tax {
+		display: block;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+		margin-top: 8rpx;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.tc-spec-line {
+		display: block;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+		margin-top: 4rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.tc-spec-warn {
+		margin-top: 10rpx;
+		display: inline-flex;
+		align-items: center;
+	}
+
+	.tc-warn-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	.tc-warn-arrow {
+		width: 22rpx;
+		height: 22rpx;
+		margin-left: 4rpx;
+	}
+
+	.empty-main {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-primary;
+	}
+
+	.arrow-ico {
+		width: 26rpx;
+		height: 26rpx;
+		flex-shrink: 0;
+	}
+
+	/* 2. 通用分组卡片 */
+	.card {
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		padding: $yjyf-space-md;
+		margin-bottom: 20rpx;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+	}
+
+	.section-title {
+		display: block;
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		margin-bottom: 8rpx;
+	}
+
+	.form-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		min-height: 92rpx;
+		padding: 4rpx 0;
+		border-bottom: 1rpx solid $yjyf-border-color;
+
+		&.no-border {
+			border-bottom: none;
+			padding-bottom: 0;
+		}
+	}
+
+	.row-label {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-regular;
+		width: 156rpx;
+		flex-shrink: 0;
+
+		&.required::after {
+			content: '*';
+			color: $yjyf-danger;
+			margin-left: 4rpx;
+		}
+	}
+
+	.seg-track {
+		display: inline-flex;
+		align-items: center;
+		padding: 6rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+	}
+
+	.seg-item {
+		height: 56rpx;
+		padding: 0 28rpx;
+		border-radius: $yjyf-radius-pill;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		transition: all 0.18s ease;
+
+		&.on {
+			background: $yjyf-bg-card;
+			color: $yjyf-primary;
+			font-weight: 700;
+			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.06);
+		}
+	}
+
+	.row-static {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+		text-align: right;
+	}
+
+	.order-fold-r {
+		display: flex;
+		align-items: center;
+	}
+
+	.fold-txt {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+		margin-right: 8rpx;
+	}
+
+	.fold-ico {
+		width: 26rpx;
+		height: 26rpx;
+	}
+
+	.mini-orders {
+		background: $yjyf-bg-page;
+		border-radius: 14rpx;
+		padding: 12rpx 20rpx;
+		margin: 8rpx 0;
+	}
+
+	.mo-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 12rpx 0;
+		border-bottom: 1rpx dashed $yjyf-border-color;
+
+		&:last-child {
+			border-bottom: none;
+		}
+	}
+
+	.mo-name {
+		flex: 1;
+		min-width: 0;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		margin-right: $yjyf-space-sm;
+	}
+
+	.mo-amt {
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		font-variant-numeric: tabular-nums;
+		flex-shrink: 0;
+	}
+
+	.mo-more {
+		padding-top: 12rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.mo-more-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	.row-input {
+		flex: 1;
+		height: 80rpx;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+		text-align: right;
+	}
+
+	/* 底部操作栏 */
+	.bottom-bar {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: rgba(255, 255, 255, 0.95);
+		backdrop-filter: blur(16px);
+		border-top: 1rpx solid $yjyf-border-color;
+		box-shadow: $yjyf-shadow-bar;
+		padding: 20rpx $yjyf-space-lg calc(20rpx + env(safe-area-inset-bottom));
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		z-index: 20;
+	}
+
+	.bar-sum {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.bar-sum-k {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+	}
+
+	.bar-amt-line {
+		display: flex;
+		align-items: baseline;
+		margin-top: 2rpx;
+	}
+
+	.bar-sym {
+		font-size: $yjyf-font-sub;
+		font-weight: 700;
+		color: $yjyf-primary;
+		margin-right: 2rpx;
+	}
+
+	.bar-int {
+		font-size: 40rpx;
+		font-weight: 700;
+		color: $yjyf-primary;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.bar-dec {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-primary;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.submit-btn {
+		min-width: 260rpx;
+		height: 86rpx;
+		padding: 0 $yjyf-space-xl;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-button;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		&.disabled {
+			background: $yjyf-text-disabled;
+			box-shadow: none;
+		}
+	}
+
+	.state-box {
+		padding: 160rpx $yjyf-space-lg;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.empty-ico {
+		width: 168rpx;
+		height: 168rpx;
+		margin-bottom: $yjyf-space-md;
+	}
+
+	.state-title {
+		font-size: $yjyf-font-title;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.state-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	.ghost-btn {
+		margin-top: $yjyf-space-lg;
+		height: 72rpx;
+		padding: 0 $yjyf-space-xl;
+		border-radius: $yjyf-radius-pill;
+		border: 2rpx solid $yjyf-primary;
+		background: $yjyf-bg-card;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	/* 二次核对弹窗 */
+	.confirm-mask {
+		position: fixed;
+		inset: 0;
+		background: rgba(0, 0, 0, 0.5);
+		backdrop-filter: blur(4px);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0 $yjyf-space-xl;
+		z-index: 100;
+	}
+
+	.confirm-dialog {
+		position: relative;
+		overflow: hidden;
+		width: 100%;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-lg;
+		box-sizing: border-box;
+		box-shadow: 0 24rpx 64rpx rgba(0, 0, 0, 0.16);
+	}
+
+	.cd-hero {
+		background: linear-gradient(180deg, $yjyf-primary-bg 0%, $yjyf-bg-card 100%);
+		padding: 36rpx $yjyf-space-lg 16rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.cd-title {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.cd-amt-row {
+		margin-top: 12rpx;
+		display: flex;
+		align-items: baseline;
+	}
+
+	.cd-sym {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-primary;
+		margin-right: 4rpx;
+	}
+
+	.cd-int {
+		font-size: 52rpx;
+		font-weight: 700;
+		color: $yjyf-primary;
+		line-height: 1.1;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.cd-dec {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-primary;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.cd-divider {
+		position: relative;
+		height: 24rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.cd-dash {
+		flex: 1;
+		margin: 0 $yjyf-space-lg;
+		border-top: 2rpx dashed $yjyf-border-color;
+	}
+
+	.cd-notch {
+		position: absolute;
+		width: 24rpx;
+		height: 24rpx;
+		border-radius: $yjyf-radius-pill;
+		background: rgba(0, 0, 0, 0.5);
+
+		&.left {
+			left: -12rpx;
+		}
+
+		&.right {
+			right: -12rpx;
+		}
+	}
+
+	.cd-body {
+		padding: 8rpx $yjyf-space-lg;
+	}
+
+	.cd-row {
+		display: flex;
+		align-items: flex-start;
+		justify-content: space-between;
+		padding: 12rpx 0;
+	}
+
+	.cd-k {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		width: 164rpx;
+		flex-shrink: 0;
+	}
+
+	.cd-v {
+		flex: 1;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-main;
+		text-align: right;
+		word-break: break-all;
+
+		&.bold {
+			font-weight: 700;
+		}
+
+		&.mono {
+			font-variant-numeric: tabular-nums;
+		}
+
+		&.tag {
+			color: $yjyf-primary;
+			font-weight: 600;
+		}
+	}
+
+	.cd-tip {
+		display: block;
+		text-align: center;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+		margin: 16rpx 0 24rpx;
+	}
+
+	.cd-actions {
+		padding: 0 $yjyf-space-lg $yjyf-space-lg;
+		display: flex;
+		align-items: center;
+		gap: $yjyf-space-md;
+	}
+
+	.cd-btn {
+		flex: 1;
+		height: 82rpx;
+		border-radius: $yjyf-radius-pill;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		&.cancel {
+			background: $yjyf-bg-page;
+			color: $yjyf-text-regular;
+		}
+
+		&.primary {
+			background: $yjyf-gradient-primary;
+			box-shadow: $yjyf-shadow-button;
+			color: $yjyf-text-inverse;
+		}
+
+		&.disabled {
+			background: $yjyf-text-disabled;
+			box-shadow: none;
+		}
+	}
+</style>
diff --git a/yjyf-app/pages/invoice/detail.vue b/yjyf-app/pages/invoice/detail.vue
new file mode 100644
index 0000000..9a62ad7
--- /dev/null
+++ b/yjyf-app/pages/invoice/detail.vue
@@ -0,0 +1,757 @@
+<template>
+	<view class="page">
+		<YjyfNavBar theme="orange" title="开票详情" :fixed="true" :placeholder="true" />
+
+		<!-- 加载态 -->
+		<view class="state-box" v-if="loading && !detail">
+			<text class="state-txt">加载中...</text>
+		</view>
+
+		<!-- 错误态 -->
+		<view class="state-box" v-else-if="loadError && !detail">
+			<image class="empty-ico" src="/static/icons/empty-invoice-records.svg" mode="aspectFit" />
+			<text class="state-title">{{ loadError }}</text>
+			<view class="retry-btn clickable-hover" @tap="load">重新加载</view>
+		</view>
+
+		<!-- 详情内容 -->
+		<view class="detail-wrap" v-else-if="detail">
+			<!-- 1. 顶部状态摘要卡 -->
+			<view class="status-card">
+				<view class="sc-left">
+					<image class="sc-ico" :src="statusIcon" mode="aspectFit" />
+					<view class="sc-texts">
+						<text class="sc-title" :class="'st-' + detail.status">{{ detail.status_text }}</text>
+						<text class="sc-desc">{{ statusDesc }}</text>
+					</view>
+				</view>
+				<view class="sc-amt">
+					<text class="sca-sym">¥</text>
+					<text class="sca-int">{{ splitAmt(detail.amount).int }}</text>
+					<text class="sca-dec">.{{ splitAmt(detail.amount).dec }}</text>
+				</view>
+			</view>
+
+			<view class="reason-bar" v-if="detail.audit_msg">
+				<text class="reason-txt">{{ detail.status === 'reject' ? '驳回原因：' : '说明：' }}{{ detail.audit_msg }}</text>
+			</view>
+
+			<!-- 2. 电子发票凭证卡（已开票时展示） -->
+			<view class="voucher-card" v-if="detail.status === 'issued'">
+				<view class="card-head">
+					<text class="card-title">电子发票</text>
+				</view>
+
+				<view class="kv-list">
+					<view class="kv-row" v-if="detail.invoice_no">
+						<text class="kv-k">发票号码</text>
+						<view class="kv-v-copy clickable-hover" @tap="copyText(detail.invoice_no, '发票号码')">
+							<text class="kv-v bold mono">{{ detail.invoice_no }}</text>
+							<image class="copy-ico" src="/static/icons/invoice-copy.svg" mode="aspectFit" />
+						</view>
+					</view>
+
+					<view class="kv-row" v-if="detail.invoice_code">
+						<text class="kv-k">发票代码</text>
+						<text class="kv-v mono">{{ detail.invoice_code }}</text>
+					</view>
+
+					<view class="kv-row" v-if="detail.issue_time_text">
+						<text class="kv-k">开具时间</text>
+						<text class="kv-v mono">{{ detail.issue_time_text }}</text>
+					</view>
+				</view>
+
+				<template v-if="detail.invoice_file">
+					<view class="vc-divider">
+						<view class="notch notch-l"></view>
+						<view class="dash-line"></view>
+						<view class="notch notch-r"></view>
+					</view>
+
+					<view class="file-row">
+						<view class="file-left">
+							<image class="file-ico" src="/static/icons/invoice-file.svg" mode="aspectFit" />
+							<text class="file-name">电子发票原件</text>
+						</view>
+						<view class="file-btns">
+							<view class="f-btn outline clickable-hover" @tap="copyText(detail.invoice_file, '电子发票链接')">复制链接</view>
+							<view class="f-btn primary clickable-hover" :class="{ disabled: openingFile }" @tap="openInvoiceFile">
+								{{ openingFile ? '打开中...' : '预览下载' }}
+							</view>
+						</view>
+					</view>
+				</template>
+			</view>
+
+			<!-- 3. 开票信息卡 -->
+			<view class="card">
+				<view class="card-head">
+					<text class="card-title">开票信息</text>
+				</view>
+
+				<view class="kv-list">
+					<view class="kv-row">
+						<text class="kv-k">申请单号</text>
+						<view class="kv-v-copy clickable-hover" @tap="copyText(detail.invoice_sn, '申请单号')">
+							<text class="kv-v mono">{{ detail.invoice_sn }}</text>
+							<image class="copy-ico" src="/static/icons/invoice-copy.svg" mode="aspectFit" />
+						</view>
+					</view>
+
+					<view class="kv-row">
+						<text class="kv-k">发票类型</text>
+						<text class="kv-v">{{ detail.type_full_text }}</text>
+					</view>
+
+					<view class="kv-row">
+						<text class="kv-k">发票抬头</text>
+						<text class="kv-v bold">{{ detail.title }}</text>
+					</view>
+
+					<view class="kv-row" v-if="detail.tax_no">
+						<text class="kv-k">纳税人识别号</text>
+						<text class="kv-v mono">{{ detail.tax_no }}</text>
+					</view>
+
+					<view class="kv-row" v-if="detail.bank_name">
+						<text class="kv-k">开户银行</text>
+						<text class="kv-v">{{ detail.bank_name }}</text>
+					</view>
+
+					<view class="kv-row" v-if="detail.bank_account">
+						<text class="kv-k">银行账号</text>
+						<text class="kv-v mono">{{ detail.bank_account }}</text>
+					</view>
+
+					<view class="kv-row" v-if="detail.reg_address">
+						<text class="kv-k">注册地址</text>
+						<text class="kv-v">{{ detail.reg_address }}</text>
+					</view>
+
+					<view class="kv-row" v-if="detail.reg_mobile">
+						<text class="kv-k">注册电话</text>
+						<text class="kv-v mono">{{ detail.reg_mobile }}</text>
+					</view>
+
+					<view class="kv-row" v-if="detail.email">
+						<text class="kv-k">接收邮箱</text>
+						<text class="kv-v mono">{{ detail.email }}</text>
+					</view>
+
+					<view class="kv-row" v-if="detail.receive_mobile">
+						<text class="kv-k">通知手机</text>
+						<text class="kv-v mono">{{ detail.receive_mobile }}</text>
+					</view>
+
+					<view class="kv-row" v-if="detail.remark">
+						<text class="kv-k">发票备注</text>
+						<text class="kv-v">{{ detail.remark }}</text>
+					</view>
+
+					<view class="kv-row">
+						<text class="kv-k">申请时间</text>
+						<text class="kv-v muted mono">{{ detail.time_text }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 4. 关联订单卡 -->
+			<view class="card" v-if="detail.orders && detail.orders.length">
+				<view class="card-head">
+					<text class="card-title">关联订单（{{ detail.orders.length }}）</text>
+				</view>
+
+				<view
+					class="ord-row clickable-hover"
+					v-for="o in detail.orders"
+					:key="o.id"
+					@tap="goOrder(o.id)"
+				>
+					<view class="ord-l">
+						<text class="ord-name">{{ o.service_name }}</text>
+						<text class="ord-sub">{{ o.order_no }}</text>
+					</view>
+					<view class="ord-r">
+						<text class="ord-amt">¥{{ Number(o.amount).toFixed(2) }}</text>
+						<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+					</view>
+				</view>
+			</view>
+
+			<!-- 底部操作栏 -->
+			<view class="bottom-bar" v-if="detail.can_cancel || detail.status === 'reject' || detail.status === 'cancel'">
+				<view class="bar-btn outline clickable-hover" v-if="detail.can_cancel" @tap="cancelApply">撤回申请</view>
+				<view class="bar-btn primary clickable-hover" v-if="detail.status === 'reject' || detail.status === 'cancel'" @tap="reApply">重新开票</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app';
+	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const invoiceId = ref(0);
+	const detail = ref(null);
+	const loading = ref(false);
+	const loadError = ref('');
+	const openingFile = ref(false);
+
+	function splitAmt(v) {
+		const n = Number(v || 0);
+		const s = (Number.isFinite(n) ? n : 0).toFixed(2);
+		const p = s.split('.');
+		return { int: p[0] || '0', dec: p[1] || '00' };
+	}
+
+	const statusIcon = computed(() => {
+		if (!detail.value) return '/static/icons/invoice-status-wait.svg';
+		if (detail.value.status === 'issued') return '/static/icons/invoice-status-ok.svg';
+		if (detail.value.status === 'wait') return '/static/icons/invoice-status-wait.svg';
+		return '/static/icons/invoice-status-err.svg';
+	});
+
+	const statusDesc = computed(() => {
+		if (!detail.value) return '';
+		const st = detail.value.status;
+		if (st === 'wait') return '预计 1-3 个工作日内开具';
+		if (st === 'issued') return '电子发票已开具完成';
+		if (st === 'reject') return '开票额度与订单已释放';
+		return '开票额度与订单已释放';
+	});
+
+	onLoad((opts) => {
+		if (opts && Number(opts.id) > 0) {
+			invoiceId.value = Number(opts.id);
+			load();
+		} else {
+			loadError.value = '缺少开票申请参数';
+		}
+	});
+
+	async function load() {
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		loading.value = true;
+		loadError.value = '';
+		try {
+			const res = await api.invoiceDetail(invoiceId.value);
+			detail.value = res && res.detail ? res.detail : null;
+		} catch (e) {
+			loadError.value = (e && e.msg) ? e.msg : '加载详情失败';
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	function copyText(txt, label) {
+		if (!txt) return;
+		uni.setClipboardData({
+			data: String(txt),
+			success: () => {
+				uni.showToast({ title: `已复制${label}`, icon: 'none' });
+			}
+		});
+	}
+
+	function openInvoiceFile() {
+		if (!detail.value || !detail.value.invoice_file || openingFile.value) return;
+		const url = detail.value.invoice_file;
+		const fType = detail.value.invoice_file_type;
+
+		if (fType === 'image') {
+			uni.previewImage({ urls: [url], current: url });
+			return;
+		}
+
+		// #ifdef H5
+		window.open(url, '_blank');
+		// #endif
+
+		// #ifndef H5
+		openingFile.value = true;
+		uni.downloadFile({
+			url,
+			success: (dl) => {
+				if (dl.statusCode === 200) {
+					uni.openDocument({
+						filePath: dl.tempFilePath,
+						showMenu: true,
+						fail: () => {
+							copyText(url, '电子发票下载链接');
+						}
+					});
+				} else {
+					copyText(url, '电子发票下载链接');
+				}
+			},
+			fail: () => {
+				copyText(url, '电子发票下载链接');
+			},
+			complete: () => {
+				openingFile.value = false;
+			}
+		});
+		// #endif
+	}
+
+	function goOrder(id) {
+		uni.navigateTo({ url: `/pages/order/detail?id=${id}` });
+	}
+
+	const canceling = ref(false);
+
+	function cancelApply() {
+		if (!detail.value || canceling.value) return;
+		uni.showModal({
+			title: '撤回开票申请',
+			content: '撤回后可开票额度与关联订单将立即释放，确认撤回吗？',
+			confirmColor: '#F0710D',
+			success: async (r) => {
+				if (!r.confirm || canceling.value) return;
+				canceling.value = true;
+				try {
+					await api.invoiceCancel(detail.value.id);
+					uni.showToast({ title: '已撤回申请' });
+					await load();
+				} catch (e) {
+				} finally {
+					canceling.value = false;
+				}
+			}
+		});
+	}
+
+	function reApply() {
+		if (detail.value && Array.isArray(detail.value.order_ids) && detail.value.order_ids.length > 0) {
+			uni.redirectTo({ url: `/pages/invoice/apply?order_ids=${detail.value.order_ids.join(',')}` });
+			return;
+		}
+		uni.redirectTo({ url: '/pages/invoice/orders' });
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(176rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+
+	.state-box {
+		padding: 160rpx $yjyf-space-lg;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.empty-ico {
+		width: 168rpx;
+		height: 168rpx;
+		margin-bottom: $yjyf-space-md;
+	}
+
+	.state-title {
+		font-size: $yjyf-font-title;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.state-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	.retry-btn {
+		margin-top: $yjyf-space-lg;
+		height: 72rpx;
+		padding: 0 $yjyf-space-xl;
+		border-radius: $yjyf-radius-pill;
+		border: 2rpx solid $yjyf-primary;
+		background: $yjyf-bg-card;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.detail-wrap {
+		padding: $yjyf-space-md $yjyf-space-lg 0;
+	}
+
+	/* 1. 顶部白底清爽状态卡（避免与上方橙色 TopBar 撞色堆叠） */
+	.status-card {
+		padding: 28rpx $yjyf-space-md;
+		margin-bottom: 20rpx;
+		border-radius: $yjyf-radius-card;
+		background: $yjyf-bg-card;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+	}
+
+	.sc-left {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		align-items: center;
+		margin-right: $yjyf-space-sm;
+	}
+
+	.sc-ico {
+		width: 64rpx;
+		height: 64rpx;
+		margin-right: 18rpx;
+		flex-shrink: 0;
+	}
+
+	.sc-texts {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.sc-title {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-warning;
+
+		&.st-issued {
+			color: $yjyf-success;
+		}
+
+		&.st-reject {
+			color: $yjyf-danger;
+		}
+
+		&.st-cancel {
+			color: $yjyf-text-secondary;
+		}
+	}
+
+	.sc-desc {
+		margin-top: 6rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+	}
+
+	.sc-amt {
+		display: flex;
+		align-items: baseline;
+		flex-shrink: 0;
+	}
+
+	.sca-sym {
+		font-size: $yjyf-font-sub;
+		font-weight: 700;
+		color: $yjyf-primary;
+		margin-right: 2rpx;
+	}
+
+	.sca-int {
+		font-size: 44rpx;
+		font-weight: 700;
+		color: $yjyf-primary;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.sca-dec {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-primary;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.reason-bar {
+		margin-bottom: 20rpx;
+		padding: 18rpx $yjyf-space-md;
+		border-radius: 16rpx;
+		background: rgba(232, 51, 27, 0.08);
+	}
+
+	.reason-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-danger;
+		line-height: 1.45;
+	}
+
+	/* 2. 电子发票凭证卡 */
+	.voucher-card {
+		position: relative;
+		overflow: hidden;
+		padding: $yjyf-space-md 0 20rpx;
+		margin-bottom: 20rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+
+		.card-head,
+		.kv-list {
+			padding-left: $yjyf-space-md;
+			padding-right: $yjyf-space-md;
+		}
+	}
+
+	.vc-divider {
+		position: relative;
+		height: 24rpx;
+		margin: 8rpx 0;
+		display: flex;
+		align-items: center;
+	}
+
+	.dash-line {
+		flex: 1;
+		margin: 0 20rpx;
+		border-top: 2rpx dashed $yjyf-border-color;
+	}
+
+	.notch {
+		position: absolute;
+		top: 2rpx;
+		width: 20rpx;
+		height: 20rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+	}
+
+	.notch-l {
+		left: -10rpx;
+	}
+
+	.notch-r {
+		right: -10rpx;
+	}
+
+	.file-row {
+		padding: 8rpx $yjyf-space-md 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.file-left {
+		display: flex;
+		align-items: center;
+	}
+
+	.file-ico {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 12rpx;
+	}
+
+	.file-name {
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.file-btns {
+		display: flex;
+		align-items: center;
+		gap: $yjyf-space-sm;
+	}
+
+	.f-btn {
+		height: 60rpx;
+		padding: 0 24rpx;
+		border-radius: $yjyf-radius-pill;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+
+		&.outline {
+			background: $yjyf-bg-page;
+			color: $yjyf-text-regular;
+		}
+
+		&.primary {
+			background: $yjyf-gradient-primary;
+			color: $yjyf-text-inverse;
+		}
+
+		&.disabled {
+			opacity: 0.6;
+		}
+	}
+
+	/* 3. 通用详情卡片 */
+	.card {
+		padding: $yjyf-space-md;
+		margin-bottom: 20rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+	}
+
+	.card-head {
+		padding-bottom: 16rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.card-title {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.kv-list {
+		padding-top: 6rpx;
+	}
+
+	.kv-row {
+		padding: 14rpx 0;
+		display: flex;
+		align-items: flex-start;
+		justify-content: space-between;
+		gap: $yjyf-space-md;
+	}
+
+	.kv-k {
+		width: 168rpx;
+		flex-shrink: 0;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	.kv-v {
+		flex: 1;
+		text-align: right;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-main;
+		word-break: break-all;
+
+		&.bold {
+			font-weight: 700;
+		}
+
+		&.muted {
+			color: $yjyf-text-muted;
+		}
+
+		&.mono {
+			font-variant-numeric: tabular-nums;
+		}
+	}
+
+	.kv-v-copy {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.copy-ico {
+		width: 26rpx;
+		height: 26rpx;
+		margin-left: 10rpx;
+		flex-shrink: 0;
+	}
+
+	.ord-row {
+		padding: 20rpx 0;
+		border-bottom: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		&:last-child {
+			border-bottom: none;
+			padding-bottom: 4rpx;
+		}
+	}
+
+	.ord-l {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+		margin-right: $yjyf-space-sm;
+	}
+
+	.ord-name {
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.ord-sub {
+		margin-top: 4rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.ord-r {
+		display: flex;
+		align-items: center;
+		flex-shrink: 0;
+	}
+
+	.ord-amt {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.arrow-ico {
+		width: 24rpx;
+		height: 24rpx;
+		margin-left: 8rpx;
+	}
+
+	.bottom-bar {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 20;
+		background: rgba(255, 255, 255, 0.95);
+		backdrop-filter: blur(16px);
+		border-top: 1rpx solid $yjyf-border-color;
+		padding: 20rpx $yjyf-space-lg calc(20rpx + env(safe-area-inset-bottom));
+		box-shadow: $yjyf-shadow-bar;
+		display: flex;
+		align-items: center;
+		gap: $yjyf-space-md;
+	}
+
+	.bar-btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: $yjyf-radius-pill;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		&.outline {
+			border: 2rpx solid $yjyf-border-color;
+			color: $yjyf-text-main;
+			background: $yjyf-bg-card;
+		}
+
+		&.primary {
+			background: $yjyf-gradient-primary;
+			box-shadow: $yjyf-shadow-button;
+			color: $yjyf-text-inverse;
+		}
+	}
+</style>
diff --git a/yjyf-app/pages/invoice/orders.vue b/yjyf-app/pages/invoice/orders.vue
new file mode 100644
index 0000000..c515e39
--- /dev/null
+++ b/yjyf-app/pages/invoice/orders.vue
@@ -0,0 +1,599 @@
+<template>
+	<view class="page">
+		<YjyfNavBar theme="orange" title="按订单开票" :fixed="true" :placeholder="true" />
+
+		<!-- 顶部精简辅助栏 -->
+		<view class="sub-head" v-if="list.length > 0">
+			<text class="sh-count">共 {{ total }} 笔已完成订单</text>
+			<view class="sh-link clickable-hover" @tap="goRecords">
+				<text class="sh-link-txt">开票记录</text>
+				<image class="sh-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+			</view>
+		</view>
+
+		<!-- 待开票订单票根卡片列表 -->
+		<view class="order-list" v-if="list.length > 0">
+			<view
+				class="ord-card clickable-hover"
+				:class="{ checked: selectedMap[item.id] }"
+				v-for="item in list"
+				:key="item.id"
+				@tap="toggleSelect(item.id)"
+			>
+				<view class="ord-upper">
+					<image
+						class="chk-ico"
+						:src="selectedMap[item.id] ? '/static/icons/invoice-check-on.svg' : '/static/icons/invoice-check-off.svg'"
+						mode="aspectFit"
+					/>
+
+					<image
+						class="svc-thumb"
+						:src="item.service_image || '/static/icons/service-default.svg'"
+						mode="aspectFill"
+					/>
+
+					<view class="ord-info">
+						<text class="ord-title">{{ item.service_name }}</text>
+						<text class="ord-spec" v-if="item.goods_model">{{ item.goods_model }} × {{ item.goods_num }}</text>
+						<text class="ord-spec muted" v-else>× {{ item.goods_num || 1 }}</text>
+					</view>
+				</view>
+
+				<view class="ord-divider">
+					<view class="notch notch-l"></view>
+					<view class="dash-line"></view>
+					<view class="notch notch-r"></view>
+				</view>
+
+				<view class="ord-lower">
+					<text class="ord-meta">{{ item.time_text }} · {{ item.order_no }}</text>
+					<view class="ord-amt-box">
+						<text class="amt-sym">¥</text>
+						<text class="amt-int">{{ splitAmt(item.invoiceable_amount).int }}</text>
+						<text class="amt-dec">.{{ splitAmt(item.invoiceable_amount).dec }}</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="list-foot" v-if="loading || !hasMore">
+				<text class="foot-txt">{{ loading ? '加载中...' : '没有更多了' }}</text>
+			</view>
+		</view>
+
+		<!-- 初次加载态 -->
+		<view class="state-box" v-else-if="loading">
+			<text class="state-txt">加载中...</text>
+		</view>
+
+		<!-- 接口异常重试态 -->
+		<view class="state-box" v-else-if="loadError">
+			<image class="empty-ico" src="/static/icons/empty-invoice-records.svg" mode="aspectFit" />
+			<text class="state-title">订单加载失败</text>
+			<view class="retry-btn clickable-hover" @tap="reload">重新加载</view>
+		</view>
+
+		<!-- 空状态 -->
+		<view class="state-box" v-else>
+			<image class="empty-ico" src="/static/icons/empty-invoice-records.svg" mode="aspectFit" />
+			<text class="state-title">暂无可开票订单</text>
+			<text class="state-desc">订单完成验收后可在此合并开票</text>
+			<view class="ghost-btn clickable-hover" @tap="goRecords">开票记录</view>
+		</view>
+
+		<!-- 底部毛玻璃悬浮结算栏 -->
+		<view class="bottom-bar" v-if="list.length > 0">
+			<view class="select-all clickable-hover" @tap="toggleAll">
+				<image
+					class="chk-ico-bar"
+					:src="isAllSelected ? '/static/icons/invoice-check-on.svg' : '/static/icons/invoice-check-off.svg'"
+					mode="aspectFit"
+				/>
+				<text class="all-txt">全选</text>
+			</view>
+
+			<view class="bar-right">
+				<view class="sum-info">
+					<view class="sum-line">
+						<text class="sum-label">合计</text>
+						<text class="sum-sym">¥</text>
+						<text class="sum-int">{{ splitAmt(selectedTotal).int }}</text>
+						<text class="sum-dec">.{{ splitAmt(selectedTotal).dec }}</text>
+					</view>
+					<text class="sum-count" v-if="selectedIds.length > 0">已选 {{ selectedIds.length }} 笔</text>
+				</view>
+				<view
+					class="next-btn clickable-hover"
+					:class="{ disabled: selectedIds.length === 0 }"
+					@tap="goNext"
+				>
+					下一步
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed } from 'vue';
+	import { onLoad, onShow, onReachBottom } from '@dcloudio/uni-app';
+	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const list = ref([]);
+	const total = ref(0);
+	const page = ref(1);
+	const hasMore = ref(false);
+	const loading = ref(false);
+	const loadError = ref(false);
+	const selectedIds = ref([]);
+	const presetIds = ref([]);
+
+	const selectedMap = computed(() => {
+		const m = {};
+		for (const id of selectedIds.value) {
+			m[id] = true;
+		}
+		return m;
+	});
+
+	const isAllSelected = computed(() => {
+		if (!list.value.length) return false;
+		return list.value.every((item) => selectedMap.value[item.id]);
+	});
+
+	const selectedTotal = computed(() => {
+		let sum = 0;
+		for (const item of list.value) {
+			if (selectedMap.value[item.id]) {
+				sum += Number(item.invoiceable_amount || 0);
+			}
+		}
+		return Math.round(sum * 100) / 100;
+	});
+
+	function splitAmt(v) {
+		const n = Number(v || 0);
+		const s = (Number.isFinite(n) ? n : 0).toFixed(2);
+		const p = s.split('.');
+		return { int: p[0] || '0', dec: p[1] || '00' };
+	}
+
+	onLoad((q) => {
+		if (q && q.preselect) {
+			const ids = String(q.preselect)
+				.split(',')
+				.map((v) => Number(v.trim()))
+				.filter((n) => n > 0);
+			presetIds.value = ids;
+		}
+	});
+
+	onShow(() => {
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		reload();
+	});
+
+	onReachBottom(() => {
+		if (hasMore.value && !loading.value) {
+			fetchPage(page.value + 1);
+		}
+	});
+
+	async function reload() {
+		await fetchPage(1);
+	}
+
+	async function fetchPage(targetPage) {
+		loading.value = true;
+		loadError.value = false;
+		try {
+			const res = await api.invoiceOrders({ page: targetPage, limit: 20 });
+			const rows = (res && res.list) || [];
+			if (targetPage === 1) {
+				list.value = rows;
+				const validSet = new Set(rows.map((r) => r.id));
+				if (presetIds.value.length > 0) {
+					selectedIds.value = presetIds.value.filter((id) => validSet.has(id));
+					presetIds.value = [];
+				} else {
+					selectedIds.value = selectedIds.value.filter((id) => validSet.has(id));
+				}
+			} else {
+				const existSet = new Set(list.value.map((r) => r.id));
+				for (const r of rows) {
+					if (!existSet.has(r.id)) list.value.push(r);
+				}
+			}
+			total.value = Number((res && res.total) || list.value.length);
+			page.value = targetPage;
+			hasMore.value = Boolean(res && res.has_more);
+		} catch (e) {
+			if (targetPage === 1) loadError.value = true;
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	function toggleSelect(id) {
+		const idx = selectedIds.value.indexOf(id);
+		if (idx >= 0) {
+			selectedIds.value.splice(idx, 1);
+		} else {
+			selectedIds.value.push(id);
+		}
+	}
+
+	function toggleAll() {
+		if (isAllSelected.value) {
+			selectedIds.value = [];
+		} else {
+			selectedIds.value = list.value.map((item) => item.id);
+		}
+	}
+
+	function goNext() {
+		if (!selectedIds.value.length) {
+			uni.showToast({ title: '请先勾选需要开票的订单', icon: 'none' });
+			return;
+		}
+		const idsStr = selectedIds.value.join(',');
+		uni.navigateTo({ url: `/pages/invoice/apply?order_ids=${idsStr}` });
+	}
+
+	function goRecords() {
+		uni.navigateTo({ url: '/pages/invoice/records' });
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(176rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+
+	.sub-head {
+		padding: $yjyf-space-md $yjyf-space-lg $yjyf-space-sm;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.sh-count {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	.sh-link {
+		display: inline-flex;
+		align-items: center;
+	}
+
+	.sh-link-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	.sh-arrow {
+		width: 24rpx;
+		height: 24rpx;
+		margin-left: 4rpx;
+	}
+
+	.order-list {
+		padding: 0 $yjyf-space-lg;
+	}
+
+	.ord-card {
+		position: relative;
+		overflow: hidden;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		margin-bottom: 20rpx;
+		border: 2rpx solid transparent;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+		transition: border-color 0.18s ease, box-shadow 0.18s ease;
+
+		&.checked {
+			border-color: $yjyf-primary;
+			box-shadow: 0 8rpx 24rpx rgba(240, 113, 13, 0.12);
+
+			.ord-lower {
+				background: $yjyf-primary-bg;
+			}
+		}
+	}
+
+	.ord-upper {
+		padding: $yjyf-space-md $yjyf-space-md 16rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.chk-ico {
+		width: 42rpx;
+		height: 42rpx;
+		flex-shrink: 0;
+		margin-right: 20rpx;
+	}
+
+	.svc-thumb {
+		width: 96rpx;
+		height: 96rpx;
+		border-radius: 14rpx;
+		background: $yjyf-bg-page;
+		flex-shrink: 0;
+		margin-right: 20rpx;
+	}
+
+	.ord-info {
+		flex: 1;
+		min-width: 0;
+	}
+
+	.ord-title {
+		display: block;
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.ord-spec {
+		display: block;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		margin-top: 8rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+
+		&.muted {
+			color: $yjyf-text-muted;
+		}
+	}
+
+	.ord-divider {
+		position: relative;
+		height: 20rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.dash-line {
+		flex: 1;
+		margin: 0 20rpx;
+		border-top: 2rpx dashed $yjyf-border-color;
+	}
+
+	.notch {
+		position: absolute;
+		top: 0;
+		width: 20rpx;
+		height: 20rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+	}
+
+	.notch-l {
+		left: -10rpx;
+	}
+
+	.notch-r {
+		right: -10rpx;
+	}
+
+	.ord-lower {
+		padding: 12rpx $yjyf-space-md 18rpx;
+		display: flex;
+		align-items: baseline;
+		justify-content: space-between;
+		transition: background-color 0.18s ease;
+	}
+
+	.ord-meta {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+		font-variant-numeric: tabular-nums;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		margin-right: $yjyf-space-sm;
+	}
+
+	.ord-amt-box {
+		display: flex;
+		align-items: baseline;
+		flex-shrink: 0;
+	}
+
+	.amt-sym {
+		font-size: $yjyf-font-micro;
+		font-weight: 700;
+		color: $yjyf-primary;
+		margin-right: 2rpx;
+	}
+
+	.amt-int {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-primary;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.amt-dec {
+		font-size: $yjyf-font-micro;
+		font-weight: 700;
+		color: $yjyf-primary;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.list-foot {
+		padding: $yjyf-space-md 0;
+		text-align: center;
+	}
+
+	.foot-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
+
+	.state-box {
+		padding: 150rpx $yjyf-space-lg;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.empty-ico {
+		width: 168rpx;
+		height: 168rpx;
+		margin-bottom: $yjyf-space-md;
+	}
+
+	.state-title {
+		font-size: $yjyf-font-title;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.state-desc {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		margin-top: $yjyf-space-xs;
+	}
+
+	.state-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	.ghost-btn,
+	.retry-btn {
+		margin-top: $yjyf-space-lg;
+		height: 72rpx;
+		padding: 0 $yjyf-space-xl;
+		border-radius: $yjyf-radius-pill;
+		border: 2rpx solid $yjyf-primary;
+		background: $yjyf-bg-card;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.bottom-bar {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: rgba(255, 255, 255, 0.95);
+		backdrop-filter: blur(16px);
+		border-top: 1rpx solid $yjyf-border-color;
+		box-shadow: $yjyf-shadow-bar;
+		padding: 20rpx $yjyf-space-lg calc(20rpx + env(safe-area-inset-bottom));
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		z-index: 20;
+	}
+
+	.select-all {
+		min-height: 72rpx;
+		display: flex;
+		align-items: center;
+		padding-right: $yjyf-space-sm;
+	}
+
+	.chk-ico-bar {
+		width: 42rpx;
+		height: 42rpx;
+		margin-right: 12rpx;
+	}
+
+	.all-txt {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+	}
+
+	.bar-right {
+		display: flex;
+		align-items: center;
+	}
+
+	.sum-info {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-end;
+		margin-right: $yjyf-space-md;
+	}
+
+	.sum-line {
+		display: flex;
+		align-items: baseline;
+	}
+
+	.sum-label {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		margin-right: 6rpx;
+	}
+
+	.sum-sym {
+		font-size: $yjyf-font-sub;
+		font-weight: 700;
+		color: $yjyf-primary;
+		margin-right: 2rpx;
+	}
+
+	.sum-int {
+		font-size: 40rpx;
+		font-weight: 700;
+		color: $yjyf-primary;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.sum-dec {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-primary;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.sum-count {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+		margin-top: 2rpx;
+	}
+
+	.next-btn {
+		min-width: 216rpx;
+		height: 84rpx;
+		padding: 0 $yjyf-space-lg;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-button;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		&.disabled {
+			background: $yjyf-text-disabled;
+			box-shadow: none;
+		}
+	}
+</style>
diff --git a/yjyf-app/pages/invoice/records.vue b/yjyf-app/pages/invoice/records.vue
new file mode 100644
index 0000000..4464285
--- /dev/null
+++ b/yjyf-app/pages/invoice/records.vue
@@ -0,0 +1,506 @@
+<template>
+	<view class="page">
+		<YjyfNavBar theme="orange" title="开票记录" :fixed="true" :placeholder="true" />
+
+		<!-- 顶部吸顶状态筛选栏 -->
+		<view class="tabs-bar" :style="{ top: navHeight + 'px' }">
+			<view
+				class="tab-item clickable-hover"
+				:class="{ active: activeTab === t.value }"
+				v-for="t in tabs"
+				:key="t.value"
+				@tap="switchTab(t.value)"
+			>
+				<text class="tab-txt">{{ t.label }}</text>
+				<view class="tab-line" v-if="activeTab === t.value"></view>
+			</view>
+		</view>
+
+		<!-- 初始加载态 -->
+		<view class="state-box" v-if="loading && !list.length">
+			<text class="state-txt">加载中...</text>
+		</view>
+
+		<!-- 错误重试态 -->
+		<view class="state-box" v-else-if="loadError && !list.length">
+			<image class="empty-ico" src="/static/icons/empty-invoice-records.svg" mode="aspectFit" />
+			<text class="state-title">{{ loadError }}</text>
+			<view class="retry-btn clickable-hover" @tap="reload">重新加载</view>
+		</view>
+
+		<!-- 空数据态 -->
+		<view class="state-box" v-else-if="!list.length">
+			<image class="empty-ico" src="/static/icons/empty-invoice-records.svg" mode="aspectFit" />
+			<text class="state-title">暂无开票记录</text>
+			<view class="ghost-btn clickable-hover" @tap="goOrders">去开票</view>
+		</view>
+
+		<!-- 精简电子票根列表 -->
+		<view class="list-wrap" v-else>
+			<view class="rec-card clickable-hover" v-for="item in list" :key="item.id" @tap="goDetail(item.id)">
+				<view class="rc-upper">
+					<view class="rc-top">
+						<text class="tag-type" :class="{ special: item.type === 'special' }">
+							{{ item.type === 'special' ? '专用发票' : '普通发票' }}
+						</text>
+						<text class="rc-status" :class="'st-' + item.status">{{ item.status_text }}</text>
+					</view>
+
+					<view class="rc-main">
+						<view class="rc-info">
+							<text class="rc-title">{{ item.title }}</text>
+							<text class="rc-sub">
+								{{ item.time_text }}{{ item.order_count > 0 ? ' · ' + item.order_count + '笔订单' : '' }}
+							</text>
+						</view>
+						<view class="rc-amt-box">
+							<text class="amt-sym">¥</text>
+							<text class="amt-int">{{ splitAmt(item.amount).int }}</text>
+							<text class="amt-dec">.{{ splitAmt(item.amount).dec }}</text>
+						</view>
+					</view>
+
+					<view class="reject-reason" v-if="item.status === 'reject' && item.audit_msg">
+						<text class="reject-txt">驳回原因：{{ item.audit_msg }}</text>
+					</view>
+				</view>
+
+				<template v-if="item.can_cancel || (item.status === 'issued' && item.invoice_file)">
+					<view class="rec-divider">
+						<view class="notch notch-l"></view>
+						<view class="dash-line"></view>
+						<view class="notch notch-r"></view>
+					</view>
+
+					<view class="rc-foot" @tap.stop>
+						<view class="op-btn outline clickable-hover" v-if="item.can_cancel" @tap="cancelItem(item)">撤回申请</view>
+						<view class="op-btn primary clickable-hover" v-if="item.status === 'issued' && item.invoice_file" @tap="goDetail(item.id)">
+							查看电子票
+						</view>
+					</view>
+				</template>
+			</view>
+
+			<view class="more-tip" v-if="loadingMore || !hasMore">
+				<text class="more-txt">{{ loadingMore ? '加载中...' : '没有更多了' }}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref } from 'vue';
+	import { onLoad, onShow, onReachBottom } from '@dcloudio/uni-app';
+	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+	import { getNavBarMetrics } from '@/utils/system.js';
+
+	const navHeight = ref(getNavBarMetrics().totalNavHeight);
+
+	const tabs = [
+		{ label: '全部', value: 'all' },
+		{ label: '开票中', value: 'wait' },
+		{ label: '已开票', value: 'issued' },
+		{ label: '已驳回', value: 'reject' },
+		{ label: '已撤回', value: 'cancel' }
+	];
+
+	const activeTab = ref('all');
+	const list = ref([]);
+	const page = ref(1);
+	const hasMore = ref(false);
+	const loading = ref(false);
+	const loadingMore = ref(false);
+	const loadError = ref('');
+	let reqSeq = 0;
+
+	function splitAmt(v) {
+		const n = Number(v || 0);
+		const s = (Number.isFinite(n) ? n : 0).toFixed(2);
+		const p = s.split('.');
+		return { int: p[0] || '0', dec: p[1] || '00' };
+	}
+
+	onLoad((opts) => {
+		if (opts && opts.status && tabs.some((t) => t.value === opts.status)) {
+			activeTab.value = opts.status;
+		}
+	});
+
+	function switchTab(val) {
+		if (activeTab.value === val) return;
+		activeTab.value = val;
+		reload();
+	}
+
+	async function reload() {
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		const seq = ++reqSeq;
+		page.value = 1;
+		loading.value = true;
+		loadError.value = '';
+		try {
+			const res = await api.invoiceRecords({ status: activeTab.value, page: 1, limit: 20 });
+			if (seq !== reqSeq) return;
+			list.value = (res && res.list) ? res.list : [];
+			hasMore.value = !!(res && res.has_more);
+		} catch (e) {
+			if (seq !== reqSeq) return;
+			loadError.value = (e && e.msg) ? e.msg : '获取开票记录失败';
+		} finally {
+			if (seq === reqSeq) {
+				loading.value = false;
+			}
+		}
+	}
+
+	async function loadMore() {
+		if (loading.value || loadingMore.value || !hasMore.value) return;
+		const seq = reqSeq;
+		const nextPage = page.value + 1;
+		loadingMore.value = true;
+		try {
+			const res = await api.invoiceRecords({ status: activeTab.value, page: nextPage, limit: 20 });
+			if (seq !== reqSeq) return;
+			const rows = (res && res.list) ? res.list : [];
+			list.value = list.value.concat(rows);
+			page.value = nextPage;
+			hasMore.value = !!(res && res.has_more);
+		} catch (e) {
+		} finally {
+			if (seq === reqSeq) {
+				loadingMore.value = false;
+			}
+		}
+	}
+
+	function goDetail(id) {
+		uni.navigateTo({ url: `/pages/invoice/detail?id=${id}` });
+	}
+
+	function goOrders() {
+		uni.navigateTo({ url: '/pages/invoice/orders' });
+	}
+
+	const cancelingId = ref(0);
+
+	function cancelItem(item) {
+		if (!item || cancelingId.value) return;
+		uni.showModal({
+			title: '撤回开票申请',
+			content: '撤回后可开票额度及关联订单将立即释放，确认撤回吗？',
+			confirmColor: '#F0710D',
+			success: async (r) => {
+				if (!r.confirm || cancelingId.value) return;
+				cancelingId.value = item.id;
+				try {
+					await api.invoiceCancel(item.id);
+					uni.showToast({ title: '已撤回开票申请' });
+					reload();
+				} catch (e) {
+				} finally {
+					cancelingId.value = 0;
+				}
+			}
+		});
+	}
+
+	onShow(() => {
+		navHeight.value = getNavBarMetrics().totalNavHeight;
+		reload();
+	});
+
+	onReachBottom(() => {
+		loadMore();
+	});
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(48rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+
+	.tabs-bar {
+		position: sticky;
+		z-index: 15;
+		background: $yjyf-bg-card;
+		display: flex;
+		align-items: center;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.tab-item {
+		flex: 1;
+		height: 88rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tab-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	.tab-item.active .tab-txt {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-primary;
+	}
+
+	.tab-line {
+		position: absolute;
+		bottom: 6rpx;
+		width: 40rpx;
+		height: 6rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+	}
+
+	.state-box {
+		padding: 160rpx $yjyf-space-lg;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.empty-ico {
+		width: 168rpx;
+		height: 168rpx;
+		margin-bottom: $yjyf-space-md;
+	}
+
+	.state-title {
+		font-size: $yjyf-font-title;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.state-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	.retry-btn,
+	.ghost-btn {
+		margin-top: $yjyf-space-lg;
+		height: 72rpx;
+		padding: 0 $yjyf-space-xl;
+		border-radius: $yjyf-radius-pill;
+		border: 2rpx solid $yjyf-primary;
+		background: $yjyf-bg-card;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.list-wrap {
+		padding: $yjyf-space-md $yjyf-space-lg 0;
+	}
+
+	.rec-card {
+		position: relative;
+		overflow: hidden;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		margin-bottom: 20rpx;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+	}
+
+	.rc-upper {
+		padding: $yjyf-space-md;
+	}
+
+	.rc-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.tag-type {
+		height: 36rpx;
+		padding: 0 14rpx;
+		border-radius: 8rpx;
+		background: rgba(74, 124, 255, 0.1);
+		color: $yjyf-info;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+
+		&.special {
+			background: $yjyf-primary-bg;
+			color: $yjyf-primary;
+		}
+	}
+
+	.rc-status {
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		color: $yjyf-warning;
+
+		&.st-issued {
+			color: $yjyf-success;
+		}
+
+		&.st-reject {
+			color: $yjyf-danger;
+		}
+
+		&.st-cancel {
+			color: $yjyf-text-muted;
+		}
+	}
+
+	.rc-main {
+		margin-top: 18rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: $yjyf-space-sm;
+	}
+
+	.rc-info {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.rc-title {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.rc-sub {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+		margin-top: 6rpx;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.rc-amt-box {
+		display: flex;
+		align-items: baseline;
+		flex-shrink: 0;
+	}
+
+	.amt-sym {
+		font-size: $yjyf-font-sub;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		margin-right: 2rpx;
+	}
+
+	.amt-int {
+		font-size: 36rpx;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.amt-dec {
+		font-size: $yjyf-font-sub;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.reject-reason {
+		margin-top: 16rpx;
+		padding: 12rpx 16rpx;
+		border-radius: 10rpx;
+		background: rgba(232, 51, 27, 0.08);
+	}
+
+	.reject-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-danger;
+		line-height: 1.45;
+	}
+
+	.rec-divider {
+		position: relative;
+		height: 20rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.dash-line {
+		flex: 1;
+		margin: 0 20rpx;
+		border-top: 2rpx dashed $yjyf-border-color;
+	}
+
+	.notch {
+		position: absolute;
+		top: 0;
+		width: 20rpx;
+		height: 20rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+	}
+
+	.notch-l {
+		left: -10rpx;
+	}
+
+	.notch-r {
+		right: -10rpx;
+	}
+
+	.rc-foot {
+		padding: 10rpx $yjyf-space-md 18rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		gap: $yjyf-space-sm;
+	}
+
+	.op-btn {
+		height: 56rpx;
+		padding: 0 26rpx;
+		border-radius: $yjyf-radius-pill;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+
+		&.outline {
+			border: 1rpx solid $yjyf-border-color;
+			color: $yjyf-text-regular;
+			background: $yjyf-bg-card;
+		}
+
+		&.primary {
+			background: $yjyf-gradient-primary;
+			color: $yjyf-text-inverse;
+		}
+	}
+
+	.more-tip {
+		padding: $yjyf-space-md 0;
+		text-align: center;
+	}
+
+	.more-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
+</style>
diff --git a/yjyf-app/pages/invoice/title-edit.vue b/yjyf-app/pages/invoice/title-edit.vue
new file mode 100644
index 0000000..e4bc556
--- /dev/null
+++ b/yjyf-app/pages/invoice/title-edit.vue
@@ -0,0 +1,549 @@
+<template>
+	<view class="page">
+		<YjyfNavBar
+			theme="orange"
+			:title="form.id ? '编辑发票抬头' : '新增发票抬头'"
+			:fixed="true"
+			:placeholder="true"
+		/>
+
+		<view class="form-container">
+			<!-- #ifdef MP-WEIXIN -->
+			<view class="wx-quick-card clickable-hover" @tap="chooseFromWechat">
+				<view class="wx-l">
+					<image class="wx-ico" src="/static/icons/invoice-wx.svg" mode="aspectFit" />
+					<text class="wx-title">获取微信发票抬头</text>
+				</view>
+				<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+			</view>
+			<!-- #endif -->
+
+			<!-- 1. 主体类型选择与基础信息 -->
+			<view class="card">
+				<view class="subject-grid">
+					<view
+						class="sub-card clickable-hover"
+						:class="{ active: form.title_type === 'personal' }"
+						@tap="switchTitleType('personal')"
+					>
+						<image class="sub-ico" src="/static/icons/invoice-personal.svg" mode="aspectFit" />
+						<text class="sub-name">个人 / 非企业</text>
+						<image
+							class="sub-chk"
+							v-if="form.title_type === 'personal'"
+							src="/static/icons/invoice-check-on.svg"
+							mode="aspectFit"
+						/>
+					</view>
+
+					<view
+						class="sub-card clickable-hover"
+						:class="{ active: form.title_type === 'enterprise' }"
+						@tap="switchTitleType('enterprise')"
+					>
+						<image class="sub-ico" src="/static/icons/invoice-enterprise.svg" mode="aspectFit" />
+						<text class="sub-name">企业单位</text>
+						<image
+							class="sub-chk"
+							v-if="form.title_type === 'enterprise'"
+							src="/static/icons/invoice-check-on.svg"
+							mode="aspectFit"
+						/>
+					</view>
+				</view>
+
+				<view class="fi" v-if="form.title_type === 'enterprise'">
+					<text class="fk">常用票种</text>
+					<view class="seg-track">
+						<view
+							class="seg-item clickable-hover"
+							:class="{ on: form.default_invoice_type === 'normal' }"
+							@tap="form.default_invoice_type = 'normal'"
+						>
+							普通发票
+						</view>
+						<view
+							class="seg-item clickable-hover"
+							:class="{ on: form.default_invoice_type === 'special' }"
+							@tap="form.default_invoice_type = 'special'"
+						>
+							专用发票
+						</view>
+					</view>
+				</view>
+
+				<view class="fi" :class="{ 'no-border': form.title_type === 'personal' }">
+					<text class="fk required">{{ form.title_type === 'enterprise' ? '企业名称' : '抬头名称' }}</text>
+					<input
+						class="fv"
+						v-model="form.title"
+						maxlength="100"
+						:placeholder="form.title_type === 'enterprise' ? '请输入企业全称' : '请输入姓名或单位名称'"
+					/>
+				</view>
+
+				<view class="fi no-border" v-if="form.title_type === 'enterprise'">
+					<text class="fk required">纳税人识别号</text>
+					<input
+						class="fv mono"
+						v-model="form.tax_no"
+						maxlength="20"
+						placeholder="15-20位统一社会信用代码"
+					/>
+				</view>
+			</view>
+
+			<!-- 2. 企业扩展信息 -->
+			<view class="card" v-if="form.title_type === 'enterprise'">
+				<view class="sec-head">
+					<text class="sec-title">开户行与地址电话</text>
+					<text class="sec-tag" :class="{ req: form.default_invoice_type === 'special' }">
+						{{ form.default_invoice_type === 'special' ? '专票必填' : '普票选填' }}
+					</text>
+				</view>
+
+				<view class="fi">
+					<text class="fk" :class="{ required: form.default_invoice_type === 'special' }">开户银行</text>
+					<input class="fv" v-model="form.bank_name" maxlength="100" placeholder="请输入开户银行" />
+				</view>
+
+				<view class="fi">
+					<text class="fk" :class="{ required: form.default_invoice_type === 'special' }">银行账号</text>
+					<input class="fv mono" v-model="form.bank_account" maxlength="50" placeholder="请输入银行账号" />
+				</view>
+
+				<view class="fi">
+					<text class="fk" :class="{ required: form.default_invoice_type === 'special' }">注册地址</text>
+					<input class="fv" v-model="form.reg_address" maxlength="255" placeholder="请输入企业注册地址" />
+				</view>
+
+				<view class="fi no-border">
+					<text class="fk" :class="{ required: form.default_invoice_type === 'special' }">注册电话</text>
+					<input class="fv mono" v-model="form.reg_mobile" maxlength="30" placeholder="请输入企业注册电话" />
+				</view>
+			</view>
+
+			<!-- 3. 接收方式与默认设置 -->
+			<view class="card">
+				<view class="fi">
+					<text class="fk">接收邮箱</text>
+					<input class="fv" v-model="form.email" maxlength="100" placeholder="选填，默认接收电子票" />
+				</view>
+
+				<view class="fi">
+					<text class="fk">通知手机</text>
+					<input class="fv mono" type="number" maxlength="11" v-model="form.receive_mobile" placeholder="选填" />
+				</view>
+
+				<view class="fi no-border">
+					<text class="fk">设为默认抬头</text>
+					<switch :checked="form.is_default === 1" color="#F0710D" @change="onDefaultChange" />
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部固定保存栏 -->
+		<view class="bottom-bar">
+			<view class="submit-btn clickable-hover" :class="{ disabled: saving }" @tap="save">
+				{{ saving ? '保存中...' : '保存抬头' }}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, reactive } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app';
+	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const saving = ref(false);
+	const form = reactive({
+		id: 0,
+		title_type: 'personal',
+		default_invoice_type: 'normal',
+		title: '',
+		tax_no: '',
+		bank_name: '',
+		bank_account: '',
+		reg_address: '',
+		reg_mobile: '',
+		email: '',
+		receive_mobile: '',
+		is_default: 0
+	});
+
+	onLoad(async (opts) => {
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		if (opts && Number(opts.id) > 0) {
+			await loadDetail(Number(opts.id));
+		} else if (opts && opts.type === 'enterprise') {
+			form.title_type = 'enterprise';
+		}
+		if (opts && opts.invoice_type === 'special') {
+			form.title_type = 'enterprise';
+			form.default_invoice_type = 'special';
+		}
+	});
+
+	async function loadDetail(id) {
+		try {
+			const res = await api.invoiceTitleDetail(id);
+			const d = res && res.detail ? res.detail : null;
+			if (!d) return;
+			form.id = Number(d.id);
+			form.title_type = d.title_type || 'personal';
+			form.default_invoice_type = d.default_invoice_type || 'normal';
+			form.title = d.title || '';
+			form.tax_no = d.tax_no || '';
+			form.bank_name = d.bank_name || '';
+			form.bank_account = d.bank_account || '';
+			form.reg_address = d.reg_address || '';
+			form.reg_mobile = d.reg_mobile || '';
+			form.email = d.email || '';
+			form.receive_mobile = d.receive_mobile || '';
+			form.is_default = Number(d.is_default) ? 1 : 0;
+		} catch (e) {}
+	}
+
+	function switchTitleType(type) {
+		form.title_type = type;
+		if (type === 'personal') {
+			form.default_invoice_type = 'normal';
+		}
+	}
+
+	function onDefaultChange(e) {
+		form.is_default = e.detail.value ? 1 : 0;
+	}
+
+	function chooseFromWechat() {
+		// #ifdef MP-WEIXIN
+		if (typeof uni.chooseInvoiceTitle !== 'function') {
+			uni.showToast({ title: '当前环境不支持读取微信抬头', icon: 'none' });
+			return;
+		}
+		uni.chooseInvoiceTitle({
+			success: (res) => {
+				if (!res) return;
+				const isEnt = String(res.type) === '0';
+				form.title_type = isEnt ? 'enterprise' : 'personal';
+				form.title = res.title || form.title;
+				if (isEnt) {
+					form.tax_no = (res.taxNumber || '').toUpperCase();
+					form.bank_name = res.bankName || '';
+					form.bank_account = res.bankAccount || '';
+					form.reg_address = res.companyAddress || '';
+					form.reg_mobile = res.telephone || '';
+					if (form.bank_name && form.bank_account && form.reg_address && form.reg_mobile) {
+						form.default_invoice_type = 'special';
+					}
+				} else {
+					form.default_invoice_type = 'normal';
+				}
+			},
+			fail: () => {}
+		});
+		// #endif
+	}
+
+	async function save() {
+		if (saving.value) return;
+		const title = form.title.trim();
+		const taxNo = form.tax_no.replace(/\s+/g, '').toUpperCase();
+
+		if (!title) {
+			uni.showToast({ title: form.title_type === 'enterprise' ? '请填写企业名称' : '请填写抬头名称', icon: 'none' });
+			return;
+		}
+		if (form.title_type === 'enterprise') {
+			if (!taxNo) {
+				uni.showToast({ title: '请填写纳税人识别号', icon: 'none' });
+				return;
+			}
+			if (!/^[0-9A-Z]{15,20}$/.test(taxNo)) {
+				uni.showToast({ title: '纳税人识别号需为15-20位字母或数字', icon: 'none' });
+				return;
+			}
+			if (form.default_invoice_type === 'special') {
+				if (!form.bank_name.trim() || !form.bank_account.trim()) {
+					uni.showToast({ title: '专用发票需填写开户银行与账号', icon: 'none' });
+					return;
+				}
+				if (!form.reg_address.trim() || !form.reg_mobile.trim()) {
+					uni.showToast({ title: '专用发票需填写注册地址与电话', icon: 'none' });
+					return;
+				}
+			}
+		}
+		if (form.email.trim() && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(form.email.trim())) {
+			uni.showToast({ title: '接收邮箱格式不正确', icon: 'none' });
+			return;
+		}
+		if (form.receive_mobile.trim() && !/^1\d{10}$/.test(form.receive_mobile.trim())) {
+			uni.showToast({ title: '通知手机号格式不正确', icon: 'none' });
+			return;
+		}
+
+		saving.value = true;
+		try {
+			const res = await api.invoiceTitleSave({
+				id: form.id,
+				title_type: form.title_type,
+				default_invoice_type: form.title_type === 'personal' ? 'normal' : form.default_invoice_type,
+				title,
+				tax_no: form.title_type === 'enterprise' ? taxNo : '',
+				bank_name: form.title_type === 'enterprise' ? form.bank_name.trim() : '',
+				bank_account: form.title_type === 'enterprise' ? form.bank_account.replace(/\s+/g, '') : '',
+				reg_address: form.title_type === 'enterprise' ? form.reg_address.trim() : '',
+				reg_mobile: form.title_type === 'enterprise' ? form.reg_mobile.trim() : '',
+				email: form.email.trim(),
+				receive_mobile: form.receive_mobile.trim(),
+				is_default: form.is_default
+			});
+			uni.showToast({ title: '保存成功' });
+			if (res && res.detail) {
+				uni.$emit('yjyf:savedInvoiceTitle', res.detail);
+			}
+			setTimeout(() => {
+				saving.value = false;
+				uni.navigateBack();
+			}, 400);
+		} catch (e) {
+			saving.value = false;
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(176rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+
+	.form-container {
+		padding: $yjyf-space-md $yjyf-space-lg 0;
+	}
+
+	.wx-quick-card {
+		padding: 20rpx $yjyf-space-md;
+		margin-bottom: 20rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+	}
+
+	.wx-l {
+		display: flex;
+		align-items: center;
+	}
+
+	.wx-ico {
+		width: 44rpx;
+		height: 44rpx;
+		margin-right: 16rpx;
+	}
+
+	.wx-title {
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.arrow-ico {
+		width: 24rpx;
+		height: 24rpx;
+	}
+
+	.card {
+		padding: $yjyf-space-md;
+		margin-bottom: 20rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+	}
+
+	.sec-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 16rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.sec-title {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.sec-tag {
+		height: 36rpx;
+		padding: 0 14rpx;
+		border-radius: 8rpx;
+		font-size: $yjyf-font-micro;
+		background: $yjyf-bg-page;
+		color: $yjyf-text-secondary;
+		display: inline-flex;
+		align-items: center;
+
+		&.req {
+			background: $yjyf-primary-bg;
+			color: $yjyf-primary;
+			font-weight: 600;
+		}
+	}
+
+	.subject-grid {
+		display: flex;
+		gap: $yjyf-space-sm;
+		padding-bottom: 20rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.sub-card {
+		position: relative;
+		flex: 1;
+		min-width: 0;
+		height: 92rpx;
+		padding: 0 20rpx;
+		border-radius: 16rpx;
+		background: $yjyf-bg-page;
+		border: 2rpx solid transparent;
+		display: flex;
+		align-items: center;
+		transition: all 0.18s ease;
+
+		&.active {
+			background: $yjyf-primary-bg;
+			border-color: $yjyf-primary;
+		}
+	}
+
+	.sub-ico {
+		width: 52rpx;
+		height: 52rpx;
+		flex-shrink: 0;
+		margin-right: 14rpx;
+	}
+
+	.sub-name {
+		font-size: $yjyf-font-sub;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.sub-chk {
+		position: absolute;
+		top: 10rpx;
+		right: 10rpx;
+		width: 28rpx;
+		height: 28rpx;
+	}
+
+	.fi {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		min-height: 92rpx;
+		padding: 4rpx 0;
+		border-bottom: 1rpx solid $yjyf-border-color;
+
+		&.no-border {
+			border-bottom: none;
+			padding-bottom: 0;
+		}
+	}
+
+	.fk {
+		width: 180rpx;
+		flex-shrink: 0;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-regular;
+
+		&.required::after {
+			content: '*';
+			color: $yjyf-danger;
+			margin-left: 4rpx;
+		}
+	}
+
+	.fv {
+		flex: 1;
+		height: 80rpx;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+		text-align: right;
+
+		&.mono {
+			font-variant-numeric: tabular-nums;
+		}
+	}
+
+	.seg-track {
+		display: inline-flex;
+		align-items: center;
+		padding: 6rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+	}
+
+	.seg-item {
+		height: 54rpx;
+		padding: 0 26rpx;
+		border-radius: $yjyf-radius-pill;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		transition: all 0.18s ease;
+
+		&.on {
+			background: $yjyf-bg-card;
+			color: $yjyf-primary;
+			font-weight: 700;
+			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.06);
+		}
+	}
+
+	.bottom-bar {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 20;
+		background: rgba(255, 255, 255, 0.95);
+		backdrop-filter: blur(16px);
+		border-top: 1rpx solid $yjyf-border-color;
+		box-shadow: $yjyf-shadow-bar;
+		padding: 20rpx $yjyf-space-lg calc(20rpx + env(safe-area-inset-bottom));
+	}
+
+	.submit-btn {
+		height: 88rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-button;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		&.disabled {
+			background: $yjyf-text-disabled;
+			box-shadow: none;
+		}
+	}
+</style>
diff --git a/yjyf-app/pages/invoice/titles.vue b/yjyf-app/pages/invoice/titles.vue
new file mode 100644
index 0000000..03de9ca
--- /dev/null
+++ b/yjyf-app/pages/invoice/titles.vue
@@ -0,0 +1,487 @@
+<template>
+	<view class="page">
+		<YjyfNavBar
+			theme="orange"
+			:title="selectMode ? '选择发票抬头' : '发票抬头管理'"
+			:fixed="true"
+			:placeholder="true"
+		/>
+
+		<!-- 加载态 -->
+		<view class="state-box" v-if="loading && !list.length">
+			<text class="state-txt">加载中...</text>
+		</view>
+
+		<!-- 错误重试态 -->
+		<view class="state-box" v-else-if="loadError && !list.length">
+			<image class="empty-ico" src="/static/icons/empty-invoice-titles.svg" mode="aspectFit" />
+			<text class="state-title">{{ loadError }}</text>
+			<view class="retry-btn clickable-hover" @tap="load">重新加载</view>
+		</view>
+
+		<!-- 空状态 -->
+		<view class="state-box" v-else-if="!list.length">
+			<image class="empty-ico" src="/static/icons/empty-invoice-titles.svg" mode="aspectFit" />
+			<text class="state-title">暂无常用发票抬头</text>
+		</view>
+
+		<!-- 极简票夹名片列表 -->
+		<view class="list-wrap" v-else>
+			<view
+				class="title-card clickable-hover"
+				:class="{ 'is-default': item.is_default }"
+				v-for="item in list"
+				:key="item.id"
+				@tap="onCardTap(item)"
+			>
+				<view class="tc-accent" v-if="item.is_default"></view>
+
+				<view class="tc-main">
+					<image
+						class="tc-type-ico"
+						:src="item.title_type === 'enterprise' ? '/static/icons/invoice-enterprise.svg' : '/static/icons/invoice-personal.svg'"
+						mode="aspectFit"
+					/>
+					<view class="tc-info">
+						<view class="tc-name-row">
+							<text class="tc-name">{{ item.title }}</text>
+							<text class="tc-tag" v-if="item.is_default">默认</text>
+						</view>
+						<text class="tc-sub mono" v-if="item.tax_no">{{ item.tax_no }}</text>
+						<text class="tc-sub" v-else>{{ item.email || item.title_type_text }}</text>
+					</view>
+					<image class="sel-arrow" v-if="selectMode" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+				</view>
+
+				<view class="tc-foot" @tap.stop>
+					<view class="default-switch clickable-hover" @tap="setDefault(item)">
+						<image
+							class="chk-ico"
+							:src="item.is_default ? '/static/icons/invoice-check-on.svg' : '/static/icons/invoice-check-off.svg'"
+							mode="aspectFit"
+						/>
+						<text class="chk-txt" :class="{ active: item.is_default }">
+							{{ item.is_default ? '默认抬头' : '设为默认' }}
+						</text>
+					</view>
+					<view class="tc-actions">
+						<view class="act-item clickable-hover" @tap="goEdit(item.id)">
+							<image class="act-ico" src="/static/icons/invoice-edit.svg" mode="aspectFit" />
+							<text class="act-txt">编辑</text>
+						</view>
+						<view class="act-item clickable-hover" @tap="removeItem(item)">
+							<image class="act-ico" src="/static/icons/trash.svg" mode="aspectFit" />
+							<text class="act-txt danger">删除</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部固定操作栏 -->
+		<view class="bottom-bar">
+			<!-- #ifdef MP-WEIXIN -->
+			<view class="wx-btn clickable-hover" @tap="importWxTitle">
+				<image class="btn-ico" src="/static/icons/invoice-wx.svg" mode="aspectFit" />
+				<text class="wx-btn-txt">微信导入</text>
+			</view>
+			<!-- #endif -->
+			<view class="primary-btn clickable-hover" @tap="goEdit(0)">
+				<image class="btn-ico" src="/static/icons/invoice-plus-white.svg" mode="aspectFit" />
+				<text class="primary-btn-txt">新增发票抬头</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref } from 'vue';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
+	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const selectMode = ref(false);
+	const list = ref([]);
+	const loading = ref(false);
+	const loadError = ref('');
+
+	onLoad((opts) => {
+		selectMode.value = opts && String(opts.select) === '1';
+	});
+
+	async function load() {
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		loading.value = true;
+		loadError.value = '';
+		try {
+			const res = await api.invoiceTitles();
+			list.value = (res && res.list) ? res.list : [];
+		} catch (e) {
+			loadError.value = (e && e.msg) ? e.msg : '获取发票抬头失败';
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	function onCardTap(item) {
+		if (selectMode.value) {
+			uni.$emit('yjyf:selectInvoiceTitle', item);
+			uni.navigateBack();
+			return;
+		}
+		goEdit(item.id);
+	}
+
+	function goEdit(id) {
+		const url = id ? `/pages/invoice/title-edit?id=${id}` : '/pages/invoice/title-edit';
+		uni.navigateTo({ url });
+	}
+
+	const acting = ref(false);
+
+	async function setDefault(item) {
+		if (item.is_default || acting.value) return;
+		acting.value = true;
+		try {
+			await api.invoiceTitleDefault(item.id);
+			uni.showToast({ title: '已设为默认抬头', icon: 'none' });
+			await load();
+		} catch (e) {
+		} finally {
+			acting.value = false;
+		}
+	}
+
+	function removeItem(item) {
+		if (acting.value) return;
+		uni.showModal({
+			title: '删除发票抬头',
+			content: `确认删除抬头「${item.title}」吗？`,
+			confirmColor: '#E8331B',
+			success: async (r) => {
+				if (!r.confirm || acting.value) return;
+				acting.value = true;
+				try {
+					await api.invoiceTitleDelete(item.id);
+					uni.showToast({ title: '已删除', icon: 'none' });
+					await load();
+				} catch (e) {
+				} finally {
+					acting.value = false;
+				}
+			}
+		});
+	}
+
+	function importWxTitle() {
+		if (acting.value) return;
+		// #ifdef MP-WEIXIN
+		if (typeof uni.chooseInvoiceTitle !== 'function') {
+			uni.showToast({ title: '当前环境不支持读取微信抬头', icon: 'none' });
+			return;
+		}
+		uni.chooseInvoiceTitle({
+			success: async (res) => {
+				if (!res || !res.title || acting.value) return;
+				acting.value = true;
+				const isEnt = String(res.type) === '0';
+				const hasSpec = isEnt && res.bankName && res.bankAccount && res.companyAddress && res.telephone;
+				try {
+					const saved = await api.invoiceTitleSave({
+						id: 0,
+						title_type: isEnt ? 'enterprise' : 'personal',
+						default_invoice_type: hasSpec ? 'special' : 'normal',
+						title: res.title || '',
+						tax_no: isEnt ? (res.taxNumber || '') : '',
+						bank_name: isEnt ? (res.bankName || '') : '',
+						bank_account: isEnt ? (res.bankAccount || '') : '',
+						reg_address: isEnt ? (res.companyAddress || '') : '',
+						reg_mobile: isEnt ? (res.telephone || '') : '',
+						is_default: list.value.length === 0 ? 1 : 0
+					});
+					uni.showToast({ title: '已导入微信发票抬头' });
+					if (selectMode.value && saved && saved.detail) {
+						uni.$emit('yjyf:selectInvoiceTitle', saved.detail);
+						setTimeout(() => {
+							acting.value = false;
+							uni.navigateBack();
+						}, 350);
+						return;
+					}
+					await load();
+					acting.value = false;
+				} catch (e) {
+					acting.value = false;
+				}
+			},
+			fail: () => {}
+		});
+		// #endif
+	}
+
+	onShow(() => {
+		load();
+	});
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(176rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+
+	.state-box {
+		padding: 160rpx $yjyf-space-lg;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.empty-ico {
+		width: 168rpx;
+		height: 168rpx;
+		margin-bottom: $yjyf-space-md;
+	}
+
+	.state-title {
+		font-size: $yjyf-font-title;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.state-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	.retry-btn {
+		margin-top: $yjyf-space-lg;
+		height: 72rpx;
+		padding: 0 $yjyf-space-xl;
+		border-radius: $yjyf-radius-pill;
+		border: 2rpx solid $yjyf-primary;
+		background: $yjyf-bg-card;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.list-wrap {
+		padding: $yjyf-space-md $yjyf-space-lg 0;
+	}
+
+	.title-card {
+		position: relative;
+		overflow: hidden;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		padding: $yjyf-space-md;
+		margin-bottom: 20rpx;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+
+		&.is-default {
+			padding-left: 30rpx;
+		}
+	}
+
+	.tc-accent {
+		position: absolute;
+		left: 0;
+		top: 24rpx;
+		bottom: 24rpx;
+		width: 6rpx;
+		border-radius: 0 6rpx 6rpx 0;
+		background: $yjyf-gradient-primary;
+	}
+
+	.tc-main {
+		display: flex;
+		align-items: center;
+	}
+
+	.tc-type-ico {
+		width: 68rpx;
+		height: 68rpx;
+		flex-shrink: 0;
+		margin-right: 20rpx;
+	}
+
+	.tc-info {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.tc-name-row {
+		display: flex;
+		align-items: center;
+		min-width: 0;
+	}
+
+	.tc-name {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.tc-tag {
+		margin-left: 12rpx;
+		height: 34rpx;
+		padding: 0 12rpx;
+		border-radius: 8rpx;
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		flex-shrink: 0;
+	}
+
+	.tc-sub {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+		margin-top: 6rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+
+		&.mono {
+			font-variant-numeric: tabular-nums;
+		}
+	}
+
+	.sel-arrow {
+		width: 24rpx;
+		height: 24rpx;
+		margin-left: 12rpx;
+		flex-shrink: 0;
+	}
+
+	.tc-foot {
+		margin-top: 20rpx;
+		padding-top: 16rpx;
+		border-top: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.default-switch {
+		display: flex;
+		align-items: center;
+	}
+
+	.chk-ico {
+		width: 36rpx;
+		height: 36rpx;
+		margin-right: 10rpx;
+	}
+
+	.chk-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+
+		&.active {
+			color: $yjyf-primary;
+			font-weight: 600;
+		}
+	}
+
+	.tc-actions {
+		display: flex;
+		align-items: center;
+		gap: $yjyf-space-lg;
+	}
+
+	.act-item {
+		display: inline-flex;
+		align-items: center;
+		padding: 6rpx 0;
+	}
+
+	.act-ico {
+		width: 28rpx;
+		height: 28rpx;
+		margin-right: 6rpx;
+	}
+
+	.act-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+
+		&.danger {
+			color: $yjyf-danger;
+		}
+	}
+
+	.bottom-bar {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 20;
+		background: rgba(255, 255, 255, 0.95);
+		backdrop-filter: blur(16px);
+		border-top: 1rpx solid $yjyf-border-color;
+		padding: 20rpx $yjyf-space-lg calc(20rpx + env(safe-area-inset-bottom));
+		box-shadow: $yjyf-shadow-bar;
+		display: flex;
+		align-items: center;
+		gap: $yjyf-space-md;
+	}
+
+	.wx-btn {
+		height: 88rpx;
+		padding: 0 36rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+	}
+
+	.wx-btn-txt {
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.primary-btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-button;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.btn-ico {
+		width: 34rpx;
+		height: 34rpx;
+		margin-right: $yjyf-space-xs;
+	}
+
+	.primary-btn-txt {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-inverse;
+	}
+</style>
diff --git a/yjyf-app/pages/login/login.vue b/yjyf-app/pages/login/login.vue
index bb345a7..e3bcd5a 100644
--- a/yjyf-app/pages/login/login.vue
+++ b/yjyf-app/pages/login/login.vue
@@ -6,8 +6,18 @@
 			<view class="hero-bg-mask"></view>
 		</view>
 
-		<!-- 统一规范顶部透明导航栏 -->
-		<YjyfNavBar theme="transparent" title="" :placeholder="false" @back="handleBackOrHome" />
+		<!-- 统一规范顶部透明导航栏（左上角配半透明深色圆底衬保障浅底背景对比度） -->
+		<YjyfNavBar theme="transparent" title="" :placeholder="false" :customBack="true" @back="handleBackOrHome">
+			<template #left>
+				<view class="login-nav-back clickable-hover" @tap="handleBackOrHome">
+					<image
+						class="login-nav-back-ico"
+						:src="showBack ? '/static/icons/back-white.svg' : '/static/icons/home-white.svg'"
+						mode="aspectFit"
+					/>
+				</view>
+			</template>
+		</YjyfNavBar>
 
 		<!-- 页面核心内容区域：极简纯净排版 -->
 		<view class="main-content">
@@ -140,7 +150,7 @@
 	import api from '@/utils/api.js';
 	import { setToken, setUser } from '@/utils/request.js';
 	import { getWxCode } from '@/utils/wxlogin.js';
-	import { setRole } from '@/utils/role.js';
+	import { getRole, setRole } from '@/utils/role.js';
 	import { getWindowInfoSafe } from '@/utils/system.js';
 
 	const loading = ref(false);
@@ -155,19 +165,19 @@
 
 	const showModal = ref(false);
 	const modalType = ref('service');
+	const remoteAgreementTitle = ref('');
+	const remoteAgreementText = ref('');
 	let redirectUrl = '';
 
 	const statusBarHeight = ref(20);
 
 	const modalTitle = computed(() => {
+		if (remoteAgreementTitle.value) return remoteAgreementTitle.value;
 		return modalType.value === 'service' ? '优匠优服 用户服务协议' : '优匠优服 隐私保护指引';
 	});
 
 	const modalContent = computed(() => {
-		if (modalType.value === 'service') {
-			return `欢迎使用“优匠优服”平台服务！\n\n1. 平台定位：优匠优服为广大客户与专业技能师傅提供安全、规范的上门安装、维修与保洁维保撮合服务。\n2. 服务准则：平台师傅均经严格实名认证与技能核验，推行标准化计费与明码标价制度。\n3. 权益保障：凡通过平台系统下单且在线支付的订单，均享有专属售后质保与纠纷先行兜底保障。\n4. 履约规范：交易双方应恪守诚信原则，禁止私下转账交易，以保障服务质量与合法权益。`;
-		}
-		return `优匠优服非常重视您的隐私与个人信息安全保护：\n\n1. 信息收集范围：为您提供维修上门、订单追踪及联系客服等核心功能，经您明确授权后获取手机号码与必要服务地址。\n2. 账号识别机制：通过微信官方手机号授权建立统一登录凭证，严格遵守最小必要原则，绝不向任何未经授权的第三方非法共享。\n3. 数据传输安全：采用全链路 HTTPS/TLS 加密传输协议，全流程防护防止信息泄露或被滥用。\n4. 用户自主权利：您随时可以在个人中心查询、更新或注销您的个人账户。`;
+		return remoteAgreementText.value || '加载中...';
 	});
 
 	function toast(title) {
@@ -181,7 +191,13 @@
 		}
 
 		if (options && options.redirect) {
-			redirectUrl = decodeURIComponent(options.redirect);
+			let decoded = decodeURIComponent(options.redirect);
+			if (decoded.startsWith('%2F') || decoded.startsWith('%2f')) {
+				try {
+					decoded = decodeURIComponent(decoded);
+				} catch (e) {}
+			}
+			redirectUrl = decoded;
 		}
 
 		const pages = getCurrentPages();
@@ -208,14 +224,22 @@
 		handleBackOrHome();
 	}
 
+	function safeVibrate() {
+		// #ifdef MP-WEIXIN
+		try {
+			if (uni.vibrateShort) {
+				uni.vibrateShort({ type: 'light' });
+			}
+		} catch (e) {}
+		// #endif
+	}
+
 	/**
 	 * 超大热区点击切换协议勾选
 	 */
 	function toggleAgree() {
 		agreePolicy.value = !agreePolicy.value;
-		if (uni.vibrateShort) {
-			uni.vibrateShort({ type: 'light' });
-		}
+		safeVibrate();
 	}
 
 	/**
@@ -224,9 +248,7 @@
 	 */
 	function handleTapButton() {
 		if (!agreePolicy.value) {
-			if (uni.vibrateShort) {
-				uni.vibrateShort({ type: 'light' });
-			}
+			safeVibrate();
 			triggerShake();
 			toast('请先阅读并勾选服务协议与隐私指引');
 		}
@@ -244,9 +266,7 @@
 	 */
 	async function handleAccountLogin() {
 		if (!agreePolicy.value) {
-			if (uni.vibrateShort) {
-				uni.vibrateShort({ type: 'light' });
-			}
+			safeVibrate();
 			triggerShake();
 			toast('请先阅读并勾选服务协议与隐私指引');
 			return;
@@ -282,11 +302,13 @@
 			syncUserData(res);
 
 			toast('登录成功');
-			setTimeout(() => finishLogin(), 600);
+			setTimeout(() => {
+				loading.value = false;
+				finishLogin();
+			}, 600);
 		} catch (err) {
-			toast(err.message || '登录失败，请检查手机号或密码');
-		} finally {
 			loading.value = false;
+			toast(err.message || '登录失败，请检查手机号或密码');
 		}
 	}
 
@@ -330,38 +352,62 @@
 			syncUserData(res);
 
 			toast(res.is_new ? '欢迎加入优匠优服' : '登录成功');
-			setTimeout(() => finishLogin(), 600);
+			setTimeout(() => {
+				loading.value = false;
+				finishLogin();
+			}, 600);
 		} catch (err) {
-			toast(err.message || '微信手机号登录失败，请重试');
-		} finally {
 			loading.value = false;
+			toast(err.message || '微信手机号登录失败，请重试');
 		}
 	}
 
-	/** 同步更新全局角色状态（基于真实接口返回的身份资质） */
+	/** 同步更新全局角色状态（默认进入业主端，仅当明确从师傅端页面触发登录且具备接单师傅权限时保持师傅身份） */
 	function syncUserData(res) {
-		if (res && res.userinfo) {
-			if (res.userinfo.is_master) {
-				setRole('master');
-			} else if (res.userinfo.is_merchant) {
-				setRole('merchant');
-			} else {
-				setRole('user');
-			}
+		const userinfo = (res && res.userinfo) || {};
+		const canTakeAsMaster = Boolean(userinfo.is_master && (!userinfo.master || userinfo.master.can_take !== false));
+		if (redirectUrl) {
+			const toMasterPage = (redirectUrl.startsWith('/pages/master/') && !redirectUrl.startsWith('/pages/master/apply'))
+				|| redirectUrl.includes('role=master');
+			setRole(toMasterPage && canTakeAsMaster ? 'master' : 'user');
+			return;
 		}
+		let prevRoute = '';
+		try {
+			const pages = getCurrentPages() || [];
+			if (pages.length > 1) {
+				prevRoute = pages[pages.length - 2]?.route || '';
+			}
+		} catch (e) {}
+		const fromMasterPage = prevRoute.startsWith('pages/master/') && !prevRoute.startsWith('pages/master/apply');
+		setRole(fromMasterPage && canTakeAsMaster ? 'master' : 'user');
 	}
 
-	/** 登录完成后的智能流转 */
+	/** 登录完成后的智能流转（确保当前页面与 yjyf_role 100% 匹配） */
 	function finishLogin() {
 		if (redirectUrl) {
-			if (redirectUrl.startsWith('/pages/index/') || redirectUrl.startsWith('/pages/mine/')) {
+			if (getRole() !== 'master' && (redirectUrl.startsWith('/pages/master/') && !redirectUrl.startsWith('/pages/master/apply'))) {
+				uni.reLaunch({ url: '/pages/index/index' });
+				return;
+			}
+			if (redirectUrl.startsWith('/pages/index/') || redirectUrl.startsWith('/pages/mine/') || redirectUrl.startsWith('/pages/master/hall')) {
 				uni.reLaunch({ url: redirectUrl });
 			} else {
-				uni.redirectTo({ url: redirectUrl });
+				uni.redirectTo({
+					url: redirectUrl,
+					fail: () => {
+						uni.reLaunch({ url: redirectUrl });
+					}
+				});
 			}
 			return;
 		}
 
+		if (getRole() === 'master') {
+			uni.reLaunch({ url: '/pages/master/hall' });
+			return;
+		}
+
 		if (getCurrentPages().length > 1) {
 			uni.navigateBack();
 		} else {
@@ -369,9 +415,23 @@
 		}
 	}
 
-	function openAgreement(type) {
+	async function openAgreement(type) {
 		modalType.value = type;
+		remoteAgreementTitle.value = '';
+		remoteAgreementText.value = '';
 		showModal.value = true;
+		try {
+			const apiType = type === 'service' ? 'user_service' : 'privacy';
+			const res = await api.agreement(apiType);
+			const data = (res && (res.detail || res)) || {};
+			if (data.title) remoteAgreementTitle.value = data.title;
+			const raw = data.content || '';
+			remoteAgreementText.value = raw
+				? String(raw).replace(/<br\s*\/?>/gi, '\n').replace(/<\/p>/gi, '\n\n').replace(/<[^>]+>/g, '').trim()
+				: '暂无协议正文';
+		} catch (e) {
+			remoteAgreementText.value = '协议加载失败，请稍后重试';
+		}
 	}
 
 	function confirmAgreement() {
@@ -423,28 +483,21 @@
 		);
 	}
 
-	/* 顶部安全导航栏 */
-	.nav-bar {
-		position: relative;
-		z-index: 10;
-		padding-left: 32rpx;
-		height: 88rpx;
-		display: flex;
-		align-items: center;
-	}
-	.nav-back-btn {
-		width: 72rpx;
-		height: 72rpx;
-		border-radius: 36rpx;
-		background: rgba(255, 255, 255, 0.85);
-		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.08);
+	/* 顶部安全导航栏返回键（半透明深色圆形底衬提升浅色背景对比度） */
+	.login-nav-back {
+		width: 68rpx;
+		height: 68rpx;
+		margin-left: 8rpx;
+		border-radius: 34rpx;
+		background: rgba(15, 23, 42, 0.44);
+		border: 1rpx solid rgba(255, 255, 255, 0.28);
+		box-shadow: 0 4rpx 14rpx rgba(0, 0, 0, 0.16);
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		backdrop-filter: blur(8px);
-		transition: background 0.2s ease;
 	}
-	.nav-back-icon {
+	.login-nav-back-ico {
 		width: 36rpx;
 		height: 36rpx;
 	}
diff --git a/yjyf-app/pages/master/apply.vue b/yjyf-app/pages/master/apply.vue
index ce76801..cb773ec 100644
--- a/yjyf-app/pages/master/apply.vue
+++ b/yjyf-app/pages/master/apply.vue
@@ -1,80 +1,201 @@
 <template>
 	<view class="page">
-		<!-- 头部一体化沉浸大卡（单一大背景贯穿，彻底消除分层断层） -->
-		<YjyfNavBar theme="orange" title="师傅入驻" :fixed="true" :placeholder="true" />
-		<view class="hero" :style="{ marginTop: (-navHeight) + 'px', paddingTop: navHeight + 'px' }">
-			<view class="hero-body">
-				<text class="hero-t">实名技能认证 · 享同城海量好单</text>
-				<text class="hero-s">实名认证 + 技能认证，审核通过即可接单</text>
-			</view>
+		<YjyfNavBar theme="orange" title="师傅入驻" />
+
+		<view class="loading-box" v-if="loading">
+			<text class="loading-txt">正在加载认证信息...</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>
+		<template v-else>
+			<!-- 审核状态提示条 -->
+			<view class="status-banner" v-if="info" :class="'st-' + info.master.verify_status">
+				<view class="sb-top">
+					<text class="sb-title">审核状态：{{ statusText }}</text>
 				</view>
+				<text class="sb-msg" v-if="info.master.audit_msg">审核说明：{{ info.master.audit_msg }}</text>
 			</view>
 
-			<view class="block-title">身份证照片（加速审核）</view>
-			<view class="cert-grid">
-				<view class="cert-box clickable-hover" @tap="uploadCert('front')">
-					<image v-if="form.idcard_front" class="cert-img" :src="form.idcard_front" mode="aspectFill" />
-					<view v-else class="cert-ph">
-						<text class="cert-ph-t">人像面</text>
-						<text class="cert-ph-s">点击上传</text>
+			<!-- 入驻或驳回修改表单 -->
+			<view class="card" v-if="canEdit">
+				<view class="section-title">实名基本资料</view>
+				<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="请输入 11 位接单手机号" />
+				</view>
+				<view class="fi">
+					<text class="fk">身份证号</text>
+					<input class="fv" v-model="form.idcard_no" maxlength="18" placeholder="请输入 18 位二代身份证号" />
+				</view>
+				<view class="fi no-border">
+					<text class="fk">服务地区</text>
+					<!-- #ifdef MP-WEIXIN -->
+					<picker class="region-picker" mode="region" :value="[form.province, form.city, form.district]" @change="onRegionChange">
+						<view class="picker-row">
+							<text class="picker-val" :class="{ placeholder: !displayRegion }">{{ displayRegion || '点击选择常驻服务省市区' }}</text>
+							<image class="picker-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+						</view>
+					</picker>
+					<!-- #endif -->
+					<!-- #ifndef MP-WEIXIN -->
+					<view class="picker-row region-picker clickable-hover" @tap="showRegionDrawer = true">
+						<text class="picker-val" :class="{ placeholder: !displayRegion }">{{ displayRegion || '点击选择常驻服务省市区' }}</text>
+						<image class="picker-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+					</view>
+					<!-- #endif -->
+				</view>
+
+				<view class="section-title mt">主营服务类目（可多选）</view>
+				<view class="cats">
+					<view
+						v-for="c in cats"
+						:key="c.id"
+						class="cat clickable-hover"
+						:class="{ on: skills.indexOf(c.id) > -1 }"
+						@tap="toggleSkill(c.id)"
+					>
+						<text class="cat-txt">{{ c.name }}</text>
 					</view>
 				</view>
-				<view class="cert-box clickable-hover" @tap="uploadCert('back')">
-					<image v-if="form.idcard_back" class="cert-img" :src="form.idcard_back" mode="aspectFill" />
-					<view v-else class="cert-ph">
-						<text class="cert-ph-t">国徽面</text>
-						<text class="cert-ph-s">点击上传</text>
+
+				<view class="section-title mt">身份证件照片（选填，加速审核）</view>
+				<view class="cert-grid">
+					<view class="cert-box clickable-hover" @tap="uploadCert('front')">
+						<image v-if="form.idcard_front" class="cert-img" :src="form.idcard_front" mode="aspectFill" />
+						<view v-else class="cert-ph">
+							<image class="cert-cam" src="/static/icons/camera.svg" mode="aspectFit" />
+							<text class="cert-ph-t">身份证人像面</text>
+							<text class="cert-ph-s">点击上传</text>
+						</view>
 					</view>
+					<view class="cert-box clickable-hover" @tap="uploadCert('back')">
+						<image v-if="form.idcard_back" class="cert-img" :src="form.idcard_back" mode="aspectFill" />
+						<view v-else class="cert-ph">
+							<image class="cert-cam" src="/static/icons/camera.svg" mode="aspectFit" />
+							<text class="cert-ph-t">身份证国徽面</text>
+							<text class="cert-ph-s">点击上传</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 入驻协议勾选 -->
+				<view class="agree-row" @tap="agreed = !agreed">
+					<image
+						class="agree-ico"
+						:src="agreed ? '/static/icons/invoice-check-on.svg' : '/static/icons/invoice-check-off.svg'"
+						mode="aspectFit"
+					/>
+					<text class="agree-txt">我已阅读并同意</text>
+					<text class="agree-link" @tap.stop="openAgreement">《师傅入驻与履约服务协议》</text>
+				</view>
+
+				<view class="submit-btn clickable-hover" :class="{ disabled: submitting }" @tap="submit">
+					<text class="submit-txt">{{ submitting ? '提交中...' : '提交实名入驻申请' }}</text>
 				</view>
 			</view>
 
-			<view class="submit" :class="{ disabled: submitting }" @tap="submit">{{ submitting ? '提交中...' : '提交审核' }}</view>
+			<!-- 已提交待审或已认证档案卡 -->
+			<view class="card" v-else-if="info && info.master">
+				<view class="section-title">认证师傅档案</view>
+				<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.mobile }}</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 no-border">
+					<text class="k">累计完单</text>
+					<text class="v">{{ info.master.order_count }} 单</text>
+				</view>
+
+				<view class="go-btn clickable-hover" v-if="info.master.verify_status === 'pass'" @tap="goHall">
+					<text class="go-txt">进入抢单大厅</text>
+					<image class="go-arrow" src="/static/icons/arrow-right-white.svg" mode="aspectFit" />
+				</view>
+			</view>
+		</template>
+
+		<!-- 协议阅读半屏弹窗 -->
+		<view class="drawer-mask" v-if="showAgreement" @tap="showAgreement = false">
+			<view class="drawer-panel" @tap.stop>
+				<view class="drawer-head">
+					<text class="drawer-title">{{ agreementData.title || '师傅入驻与履约服务协议' }}</text>
+					<view class="close-hit" @tap="showAgreement = false">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<scroll-view scroll-y class="agreement-scroll">
+					<text class="agreement-body">{{ agreementData.content || '正在加载协议内容...' }}</text>
+				</scroll-view>
+				<view class="submit-btn clickable-hover" @tap="confirmAgreement">
+					<text class="submit-txt">我已知晓并同意</text>
+				</view>
+			</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>
+		<RegionPickerDrawer
+			v-model:visible="showRegionDrawer"
+			:province="form.province || '贵州省'"
+			:city="form.city || '遵义市'"
+			:district="form.district || '汇川区'"
+			@confirm="onDrawerRegionConfirm"
+		/>
 	</view>
 </template>
 
 <script setup>
 	import { ref, reactive, computed } from 'vue';
 	import { onShow } from '@dcloudio/uni-app';
+	import RegionPickerDrawer from '@/components/RegionPickerDrawer.vue';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin, getUser } from '@/utils/request.js';
 	import { useShare } from '@/utils/share.js';
 
-	import { getNavBarMetrics } from '@/utils/system.js';
-	const navHeight = ref(getNavBarMetrics().totalNavHeight);
+	const loading = ref(true);
 	const info = ref(null);
 	const cats = ref([]);
 	const skills = ref([]);
 	const submitting = ref(false);
-	const form = reactive({ realname: '', mobile: '', idcard_no: '', city: '遵义市', idcard_front: '', idcard_back: '' });
+	const agreed = ref(false);
+	const showAgreement = ref(false);
+	const showRegionDrawer = ref(false);
+	const agreementData = reactive({ title: '', content: '' });
+
+	const form = reactive({
+		realname: '',
+		mobile: '',
+		idcard_no: '',
+		province: '',
+		city: '',
+		district: '',
+		idcard_front: '',
+		idcard_back: ''
+	});
+
+	const displayRegion = computed(() => {
+		const parts = [];
+		[form.province, form.city, form.district].forEach(p => {
+			const s = (p || '').trim();
+			if (s && !parts.some(ep => ep.includes(s))) parts.push(s);
+		});
+		return parts.join(' ');
+	});
 
 	useShare(() => ({
-		title: '优匠优服师傅招募 · 实名技能认证，海量同城工单随时接',
+		title: '优匠优服师傅入驻 · 实名技能认证接同城工单',
 		path: '/pages/master/apply',
 		query: ''
 	}));
@@ -82,24 +203,66 @@
 	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;
+		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 onRegionChange(e) {
+		const arr = e.detail.value || [];
+		if (arr.length >= 2) {
+			form.province = arr[0] || '';
+			form.city = arr[1] || '';
+			form.district = arr[2] || '';
+		}
+	}
+
+	function onDrawerRegionConfirm(reg) {
+		if (!reg) return;
+		form.province = reg.province || '';
+		form.city = reg.city || '';
+		form.district = reg.district || '';
+	}
+
 	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' }); }
+
+	function goHall() {
+		uni.redirectTo({ url: '/pages/master/hall' });
+	}
+
+	async function openAgreement() {
+		showAgreement.value = true;
+		if (!agreementData.content) {
+			try {
+				const res = await api.agreement('master');
+				agreementData.title = res?.title || '师傅入驻与履约服务协议';
+				agreementData.content = res?.content || '';
+			} catch (e) {
+				agreementData.content = '入驻师傅须提供真实有效的身份与技能信息，按平台履约时效联系业主、准时上门、规范施工并凭核销码结算。';
+			}
+		}
+	}
+
+	function confirmAgreement() {
+		agreed.value = true;
+		showAgreement.value = false;
+	}
+
+	const uploadingCert = ref(false);
 
 	function uploadCert(side) {
 		if (!isLogin()) { toLogin(); return; }
+		if (uploadingCert.value || submitting.value) return;
 		uni.chooseImage({
 			count: 1,
 			success: async (res) => {
 				const temp = res.tempFilePaths[0];
-				uni.showLoading({ title: '证件上传中...' });
+				uploadingCert.value = true;
+				uni.showLoading({ title: '证件上传中...', mask: true });
 				try {
 					const up = await api.upload(temp, 'cert');
 					const imgUrl = up.fullurl || up.url;
@@ -107,6 +270,7 @@
 					else form.idcard_back = imgUrl;
 				} catch (e) {
 				} finally {
+					uploadingCert.value = false;
 					uni.hideLoading();
 				}
 			}
@@ -114,48 +278,71 @@
 	}
 
 	async function load() {
-		if (!isLogin()) { 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;
-			form.idcard_no = res.master.idcard_no || '';
-			form.idcard_front = res.master.idcard_front || '';
-			form.idcard_back = res.master.idcard_back || '';
-			skills.value = (res.skills || []).map(s => s.cat_id);
-		} else {
-			const u = getUser();
-			if (u) form.mobile = u.mobile || '';
+		if (!isLogin()) {
+			loading.value = false;
+			return;
+		}
+		try {
+			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.province = res.master.province || '';
+				form.city = res.master.city || '';
+				form.district = res.master.district || '';
+				form.idcard_no = res.master.idcard_no || '';
+				form.idcard_front = res.master.idcard_front || '';
+				form.idcard_back = res.master.idcard_back || '';
+				skills.value = (res.skills || []).map(s => s.cat_id).filter(Boolean);
+			} else {
+				const u = getUser();
+				if (u && !form.mobile) form.mobile = u.mobile || '';
+			}
+		} catch (e) {
+		} finally {
+			loading.value = false;
 		}
 	}
 
 	async function submit() {
 		if (!isLogin()) { toLogin(); return; }
-		if (submitting.value) return;
-		if (!form.realname || !form.mobile || !form.idcard_no) {
-			uni.showToast({ title: '请填写完整实名信息', icon: 'none' });
+		if (submitting.value || uploadingCert.value) {
+			if (uploadingCert.value) uni.showToast({ title: '证件图片上传中，请稍候', icon: 'none' });
+			return;
+		}
+		if (!form.realname.trim() || !form.mobile.trim() || !form.idcard_no.trim()) {
+			uni.showToast({ title: '请完整填写姓名、手机号与身份证号', icon: 'none' });
+			return;
+		}
+		if (!displayRegion.value) {
+			uni.showToast({ title: '请选择常驻服务省市区', icon: 'none' });
 			return;
 		}
 		if (!skills.value.length) {
-			uni.showToast({ title: '请至少选择一个服务类目', icon: 'none' });
+			uni.showToast({ title: '请至少选择一项主营服务类目', icon: 'none' });
+			return;
+		}
+		if (!agreed.value) {
+			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,
+				realname: form.realname.trim(),
+				mobile: form.mobile.trim(),
+				idcard_no: form.idcard_no.trim(),
+				province: form.province.trim(),
+				city: (form.city || displayRegion.value).trim(),
+				district: form.district.trim(),
 				idcard_front: form.idcard_front,
 				idcard_back: form.idcard_back
 			};
 			skills.value.forEach((id, i) => { payload['skills[' + i + ']'] = id; });
 			await api.masterApply(payload);
-			uni.showToast({ title: '已提交，等待审核' });
-			load();
+			uni.showToast({ title: '已提交，请等待平台审核', icon: 'none' });
+			await load();
 		} catch (e) {
 		} finally {
 			submitting.value = false;
@@ -164,40 +351,318 @@
 
 	onShow(async () => {
 		await load();
-		const res = await api.cats();
-		cats.value = res.list || [];
+		try {
+			const res = await api.cats();
+			cats.value = res.list || [];
+		} catch (e) {}
 	});
 </script>
 
-<style scoped>
-	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 60rpx; }
-	.hero { padding-bottom: 36rpx; background-color: #F0710D; background-image: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%); background-size: 100% 600rpx; background-position: 0 0; background-repeat: no-repeat; }
-	.hero-body { padding: 20rpx 36rpx 0; }
-	.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 { height: 56rpx; padding: 0 24rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; margin: 0 12rpx 12rpx 0; border-radius: 28rpx; background: #F5F6F8; }
-	.cat.on { background: #FFF3E6; }
-	.cat-txt { font-size: 24rpx; color: #666; line-height: 1; }
-	.cat.on .cat-txt { color: #E36B0C; font-weight: 600; }
-	.cert-grid { display: flex; gap: 20rpx; margin-top: 16rpx; }
-	.cert-box { flex: 1; height: 160rpx; border: 2rpx dashed #E0E0E0; border-radius: 16rpx; display: flex; align-items: center; justify-content: center; background: #FAFAFA; overflow: hidden; }
-	.cert-img { width: 100%; height: 100%; }
-	.cert-ph { display: flex; flex-direction: column; align-items: center; }
-	.cert-ph-t { font-size: 24rpx; font-weight: 600; color: #666; }
-	.cert-ph-s { font-size: 22rpx; color: #999; margin-top: 4rpx; }
-	.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 lang="scss" scoped>
+	@import '@/uni.scss';
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(48rpx + env(safe-area-inset-bottom));
+	}
+
+	.loading-box {
+		padding: 120rpx 0;
+		text-align: center;
+	}
+	.loading-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	.status-banner {
+		margin: 20rpx $yjyf-space-md 0;
+		padding: 22rpx 24rpx;
+		background: $yjyf-primary-bg;
+		border-radius: $yjyf-radius-md;
+		display: flex;
+		flex-direction: column;
+	}
+	.status-banner.st-pass {
+		background: rgba(47, 168, 79, 0.1);
+	}
+	.status-banner.st-reject {
+		background: rgba(232, 51, 27, 0.08);
+	}
+	.sb-title {
+		font-size: $yjyf-font-body;
+		color: $yjyf-primary;
+		font-weight: 700;
+	}
+	.status-banner.st-pass .sb-title {
+		color: $yjyf-success;
+	}
+	.status-banner.st-reject .sb-title {
+		color: $yjyf-danger;
+	}
+	.sb-msg {
+		margin-top: 8rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+	}
+
+	.card {
+		margin: 20rpx $yjyf-space-md 0;
+		padding: $yjyf-space-md;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		box-shadow: $yjyf-shadow-card;
+	}
+
+	.section-title {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		margin-bottom: 12rpx;
+	}
+	.section-title.mt {
+		margin-top: 28rpx;
+	}
+
+	.fi {
+		display: flex;
+		align-items: center;
+		min-height: 92rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.fi.no-border {
+		border-bottom: none;
+	}
+	.fk {
+		width: 168rpx;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-regular;
+		flex-shrink: 0;
+	}
+	.fv {
+		flex: 1;
+		height: 88rpx;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+	}
+	.region-picker {
+		flex: 1;
+	}
+	.picker-row {
+		height: 88rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.picker-val {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+	}
+	.picker-val.placeholder {
+		color: $yjyf-text-disabled;
+	}
+	.picker-arrow {
+		width: 24rpx;
+		height: 24rpx;
+	}
+
+	.cats {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 16rpx;
+		padding-top: 8rpx;
+	}
+	.cat {
+		height: 64rpx;
+		padding: 0 28rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+		border: 2rpx solid transparent;
+	}
+	.cat.on {
+		background: $yjyf-primary-bg;
+		border-color: $yjyf-primary;
+	}
+	.cat-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+	}
+	.cat.on .cat-txt {
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	.cert-grid {
+		display: flex;
+		gap: 20rpx;
+		margin-top: 12rpx;
+	}
+	.cert-box {
+		flex: 1;
+		height: 184rpx;
+		border: 2rpx dashed $yjyf-text-disabled;
+		border-radius: $yjyf-radius-sm;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: $yjyf-bg-page;
+		overflow: hidden;
+	}
+	.cert-img {
+		width: 100%;
+		height: 100%;
+	}
+	.cert-ph {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.cert-cam {
+		width: 40rpx;
+		height: 40rpx;
+		margin-bottom: 8rpx;
+	}
+	.cert-ph-t {
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		color: $yjyf-text-regular;
+	}
+	.cert-ph-s {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+		margin-top: 4rpx;
+	}
+
+	.agree-row {
+		margin-top: 28rpx;
+		display: flex;
+		align-items: center;
+	}
+	.agree-ico {
+		width: 34rpx;
+		height: 34rpx;
+		margin-right: 12rpx;
+		flex-shrink: 0;
+	}
+	.agree-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+	.agree-link {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-info;
+		font-weight: 500;
+	}
+
+	.submit-btn {
+		height: 88rpx;
+		margin-top: 28rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.submit-txt {
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+	}
+	.submit-btn.disabled {
+		opacity: 0.6;
+	}
+
+	.li {
+		display: flex;
+		justify-content: space-between;
+		padding: 20rpx 0;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.li.no-border {
+		border-bottom: none;
+	}
+	.k {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-secondary;
+	}
+	.v {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+		font-weight: 500;
+	}
+
+	.go-btn {
+		margin-top: 28rpx;
+		height: 88rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.go-txt {
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+	}
+	.go-arrow {
+		width: 24rpx;
+		height: 24rpx;
+		margin-left: 8rpx;
+	}
+
+	/* 协议弹窗 */
+	.drawer-mask {
+		position: fixed;
+		inset: 0;
+		z-index: 900;
+		background: rgba(0, 0, 0, 0.48);
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+	.drawer-panel {
+		background: $yjyf-bg-card;
+		border-radius: 28rpx 28rpx 0 0;
+		padding: 28rpx $yjyf-space-lg calc(32rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+	.drawer-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 20rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.drawer-title {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.close-hit {
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.close-ico {
+		width: 30rpx;
+		height: 30rpx;
+	}
+	.agreement-scroll {
+		max-height: 52vh;
+		margin-top: 20rpx;
+	}
+	.agreement-body {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		line-height: 1.65;
+		white-space: pre-wrap;
+	}
 </style>
diff --git a/yjyf-app/pages/master/credit.vue b/yjyf-app/pages/master/credit.vue
index 3fa35e7..53dd255 100644
--- a/yjyf-app/pages/master/credit.vue
+++ b/yjyf-app/pages/master/credit.vue
@@ -1,93 +1,285 @@
 <template>
 	<view class="page">
-		<!-- 统一规范顶部白底导航栏 -->
 		<YjyfNavBar theme="orange" title="信用与申诉" />
 
-		<!-- 信用指标面板 -->
-		<view class="card" v-if="credit">
-			<view class="card-head">
-				<text class="card-title">信用服务指标</text>
-				<text class="card-level">等级 Lv{{ credit.level }}</text>
+		<!-- 顶部分段切换栏 -->
+		<view class="seg-bar">
+			<view class="seg-item" :class="{ on: activeTab === 'credit' }" @tap="activeTab = 'credit'">
+				<text class="seg-txt">信用档案</text>
+				<view class="seg-line" v-if="activeTab === 'credit'"></view>
 			</view>
-			<view class="grid">
-				<view class="g"><text class="g-num">{{ credit.score }}</text><text class="g-lab">综合评分</text></view>
-				<view class="g"><text class="g-num">{{ credit.accept_rate }}%</text><text class="g-lab">接单率</text></view>
-				<view class="g"><text class="g-num">{{ credit.ontime_rate }}%</text><text class="g-lab">准时率</text></view>
-				<view class="g"><text class="g-num">{{ credit.good_rate }}%</text><text class="g-lab">好评率</text></view>
-				<view class="g"><text class="g-num">{{ credit.complaint_rate }}%</text><text class="g-lab">投诉率</text></view>
-				<view class="g"><text class="g-num">{{ credit.appeal_total }}</text><text class="g-lab">累计申诉</text></view>
+			<view class="seg-item" :class="{ on: activeTab === 'appeal' }" @tap="activeTab = 'appeal'">
+				<text class="seg-txt">发起申诉</text>
+				<view class="seg-line" v-if="activeTab === 'appeal'"></view>
 			</view>
-			<view class="rules">
-				<text class="rule" v-for="(r, i) in credit.rules" :key="i">· {{ r }}</text>
+			<view class="seg-item" :class="{ on: activeTab === 'records' }" @tap="activeTab = 'records'">
+				<text class="seg-txt">申诉记录{{ list.length ? ` (${list.length})` : '' }}</text>
+				<view class="seg-line" v-if="activeTab === 'records'"></view>
 			</view>
 		</view>
 
-		<!-- 申诉表单 -->
-		<view class="card">
-			<view class="card-title">提交争议申诉</view>
-			<view class="types">
-				<view v-for="t in types" :key="t.key" class="type clickable-hover" :class="{ on: form.type === t.key }" @tap="form.type = t.key">
-					{{ t.name }}
+		<!-- Tab 1: 信用档案 -->
+		<view class="tab-panel" v-if="activeTab === 'credit'">
+			<view class="score-hero" v-if="credit">
+				<view class="sh-left">
+					<text class="sh-label">综合信用评分</text>
+					<view class="sh-score-row">
+						<text class="sh-score">{{ Number(credit.score || 5).toFixed(1) }}</text>
+						<text class="sh-max">/ 5.0</text>
+					</view>
+					<text class="sh-sub">累计完单 {{ credit.order_count || 0 }} 单</text>
+				</view>
+				<view class="sh-badge">
+					<image class="sh-shield" src="/static/icons/shield-white.svg" mode="aspectFit" />
+					<text class="sh-level">等级 Lv{{ credit.level || 1 }}</text>
 				</view>
 			</view>
 
-			<!-- 关联订单 -->
-			<view class="order-fi">
-				<text class="order-label">关联工单ID</text>
-				<input class="order-input" type="number" v-model="form.order_id" placeholder="选填，关联争议订单ID或订单号" />
-			</view>
-
-			<!-- 详细说明 -->
-			<textarea class="ta" v-model="form.content" maxlength="300" placeholder="请详细描述申诉情况（如：客户恶意差评、因特殊情况改期误判违约、订单扣款异议等）" />
-
-			<!-- 上传凭证图片 -->
-			<view class="upload-section">
-				<text class="upload-label">上传举证截图（聊天记录 / 现场照片）</text>
-				<view class="img-picker">
-					<view class="img-item" v-for="(img, idx) in evidenceImgs" :key="idx">
-						<image class="thumb" :src="img" mode="aspectFill" />
-						<view class="del-btn" @tap="delImg(idx)">×</view>
+			<view class="card" v-if="credit">
+				<view class="card-head">
+					<text class="card-title">履约质量六维指标</text>
+				</view>
+				<view class="metrics-grid">
+					<view class="m-cell">
+						<text class="m-num">{{ Number(credit.score || 5).toFixed(1) }}</text>
+						<text class="m-lab">综合评分</text>
 					</view>
-					<view class="add-btn clickable-hover" v-if="evidenceImgs.length < 3" @tap="chooseEvidence">
-						<image class="add-ico" src="/static/icons/camera.svg" mode="aspectFit" />
-						<text class="add-txt">添加凭据</text>
+					<view class="m-cell">
+						<text class="m-num">{{ credit.accept_rate }}%</text>
+						<text class="m-lab">接单响应率</text>
+					</view>
+					<view class="m-cell">
+						<text class="m-num">{{ credit.ontime_rate }}%</text>
+						<text class="m-lab">准时上门率</text>
+					</view>
+					<view class="m-cell">
+						<text class="m-num">{{ credit.good_rate }}%</text>
+						<text class="m-lab">客户好评率</text>
+					</view>
+					<view class="m-cell">
+						<text class="m-num" :class="{ warn: Number(credit.complaint_rate) > 0 }">{{ credit.complaint_rate }}%</text>
+						<text class="m-lab">争议投诉率</text>
+					</view>
+					<view class="m-cell">
+						<text class="m-num">{{ credit.appeal_total || 0 }}</text>
+						<text class="m-lab">累计申诉单</text>
 					</view>
 				</view>
 			</view>
 
-			<view class="btn clickable-hover" :class="{ disabled: submitting }" @tap="submit">
-				{{ submitting ? '提交中...' : '提交申诉' }}
+			<!-- 查看客户评价入口 -->
+			<view class="entry-card clickable-hover" @tap="goReviews">
+				<view class="entry-left">
+					<image class="entry-ico" src="/static/icons/master/menu-review.svg" mode="aspectFit" />
+					<view class="entry-info">
+						<text class="entry-title">客户评价明细</text>
+						<text class="entry-desc">共收到 {{ credit ? (credit.review_total || 0) : 0 }} 条真实服务评价</text>
+					</view>
+				</view>
+				<view class="entry-right">
+					<text class="entry-link">查看全部</text>
+					<image class="entry-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+				</view>
+			</view>
+
+			<!-- 考核规则说明 -->
+			<view class="card" v-if="credit && credit.rules && credit.rules.length">
+				<view class="card-head">
+					<text class="card-title">指标核算规则</text>
+				</view>
+				<view class="rules-list">
+					<view class="rule-row" v-for="(r, i) in credit.rules" :key="i">
+						<view class="rule-dot"></view>
+						<text class="rule-txt">{{ r }}</text>
+					</view>
+				</view>
 			</view>
 		</view>
 
-		<!-- 申诉记录 -->
-		<view class="card">
-			<view class="card-head">
-				<text class="card-title">申诉处理记录</text>
-				<text class="card-more" v-if="list.length">{{ list.length }} 条</text>
-			</view>
+		<!-- Tab 2: 发起申诉 -->
+		<view class="tab-panel" v-if="activeTab === 'appeal'">
+			<view class="card">
+				<view class="card-head">
+					<text class="card-title">选择申诉类型</text>
+				</view>
+				<view class="types-grid">
+					<view
+						v-for="t in types"
+						:key="t.key"
+						class="type-pill clickable-hover"
+						:class="{ on: form.type === t.key }"
+						@tap="form.type = t.key"
+					>
+						{{ t.name }}
+					</view>
+				</view>
 
-			<view class="ap-list" v-if="list.length">
-				<view class="ap" v-for="a in list" :key="a.id">
-					<view class="ap-top">
-						<view class="ap-type-box">
-							<text class="ap-type">{{ a.type_text }}</text>
-							<text class="ap-oid" v-if="a.order_id">#{{ a.order_id }}</text>
+				<view class="field-block">
+					<text class="field-label">关联工单 ID（选填）</text>
+					<view class="input-box">
+						<input
+							class="field-input"
+							type="number"
+							v-model="form.order_id"
+							placeholder="填写争议对应的工单数字 ID"
+						/>
+					</view>
+				</view>
+
+				<view class="field-block">
+					<view class="label-row">
+						<text class="field-label">申诉情况说明（必填）</text>
+						<text class="char-count">{{ form.content.length }}/300</text>
+					</view>
+					<textarea
+						class="field-ta"
+						v-model="form.content"
+						maxlength="300"
+						placeholder="请客观描述异常原因（如：客户临时改期误判超时、恶意差评、扣款异议等，不少于 5 个字）"
+					/>
+				</view>
+
+				<view class="field-block">
+					<text class="field-label">举证截图（最多 3 张，聊天记录或现场照片）</text>
+					<view class="img-picker">
+						<view class="img-item" v-for="(img, idx) in evidenceImgs" :key="idx">
+							<image class="thumb" :src="img" mode="aspectFill" @tap="previewImages(evidenceImgs, idx)" />
+							<view class="del-hit" @tap.stop="delImg(idx)">
+								<view class="del-circle">
+									<image class="del-ico" src="/static/icons/media-del-white.svg" mode="aspectFit" />
+								</view>
+							</view>
+						</view>
+						<view class="add-btn clickable-hover" v-if="evidenceImgs.length < 3" @tap="chooseEvidence">
+							<image class="add-ico" src="/static/icons/camera.svg" mode="aspectFit" />
+							<text class="add-txt">上传凭证</text>
 						</view>
-						<text class="ap-status" :class="'st-' + a.status">{{ a.status_text }}</text>
 					</view>
-					<text class="ap-content">{{ a.content }}</text>
-					<text class="ap-time">{{ a.time_text }}</text>
-					<view class="ap-reply" v-if="a.reply">
-						<text class="reply-tag">平台答复：</text>
+				</view>
+
+				<view class="primary-btn clickable-hover" :class="{ disabled: submitting }" @tap="submit">
+					{{ submitting ? '提交审核中...' : '提交申诉' }}
+				</view>
+			</view>
+		</view>
+
+		<!-- Tab 3: 申诉记录 -->
+		<view class="tab-panel" v-if="activeTab === 'records'">
+			<view class="record-list" v-if="list.length">
+				<view
+					class="record-card clickable-hover"
+					v-for="a in list"
+					:key="a.id"
+					@tap="activeAppeal = a"
+				>
+					<view class="rc-head">
+						<view class="rc-title-group">
+							<text class="rc-type">{{ a.type_text }}</text>
+							<view
+								class="rc-oid"
+								v-if="Number(a.order_id) > 0"
+								@tap.stop="goOrderDetail(a.order_id)"
+							>
+								<text class="rc-oid-txt">工单 #{{ a.order_id }}</text>
+								<image class="rc-oid-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+							</view>
+						</view>
+						<text class="rc-status" :class="'st-' + a.status">{{ a.status_text }}</text>
+					</view>
+
+					<text class="rc-content">{{ a.content }}</text>
+
+					<view class="rc-thumbs" v-if="a.image_list && a.image_list.length">
+						<image
+							v-for="(im, idx) in a.image_list"
+							:key="idx"
+							class="rc-thumb"
+							:src="im"
+							mode="aspectFill"
+							@tap.stop="previewImages(a.image_list, idx)"
+						/>
+					</view>
+
+					<view class="rc-reply" v-if="a.reply">
+						<text class="reply-tag">平台复核意见：</text>
 						<text class="reply-txt">{{ a.reply }}</text>
 					</view>
+
+					<view class="rc-foot">
+						<text class="rc-time">提交时间：{{ a.time_text }}</text>
+						<view class="rc-detail-link">
+							<text class="rc-link-txt">查看详情</text>
+							<image class="rc-link-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+						</view>
+					</view>
 				</view>
 			</view>
 
-			<view class="empty-state" v-else>
-				<image class="empty-img" src="/static/icons/master/empty-orders.svg" mode="aspectFit" />
-				<text class="empty-txt">暂无申诉记录，服务良好无争议</text>
+			<view class="empty-card" v-else>
+				<image class="empty-img" src="/static/icons/master/empty-appeal.svg" mode="aspectFit" />
+				<text class="empty-title">暂无争议申诉记录</text>
+				<text class="empty-sub">保持准时履约与规范沟通，维护良好信用等级</text>
+			</view>
+		</view>
+
+		<!-- 申诉详情半屏抽屉 -->
+		<view class="drawer-mask" v-if="activeAppeal" @tap="activeAppeal = null">
+			<view class="drawer-panel" @tap.stop>
+				<view class="drawer-head">
+					<text class="drawer-title">申诉处理详情</text>
+					<view class="drawer-close" @tap="activeAppeal = null">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<view class="detail-row">
+					<text class="d-lab">申诉编号</text>
+					<text class="d-val">#{{ activeAppeal.id }}</text>
+				</view>
+				<view class="detail-row">
+					<text class="d-lab">申诉类型</text>
+					<text class="d-val">{{ activeAppeal.type_text }}</text>
+				</view>
+				<view class="detail-row">
+					<text class="d-lab">当前状态</text>
+					<text class="d-val status-val" :class="'st-' + activeAppeal.status">{{ activeAppeal.status_text }}</text>
+				</view>
+				<view class="detail-row">
+					<text class="d-lab">提交时间</text>
+					<text class="d-val">{{ activeAppeal.time_text }}</text>
+				</view>
+
+				<view class="detail-section">
+					<text class="ds-title">申诉说明</text>
+					<text class="ds-body">{{ activeAppeal.content }}</text>
+				</view>
+
+				<view class="detail-section" v-if="activeAppeal.image_list && activeAppeal.image_list.length">
+					<text class="ds-title">举证图片</text>
+					<view class="rc-thumbs">
+						<image
+							v-for="(im, idx) in activeAppeal.image_list"
+							:key="idx"
+							class="rc-thumb"
+							:src="im"
+							mode="aspectFill"
+							@tap="previewImages(activeAppeal.image_list, idx)"
+						/>
+					</view>
+				</view>
+
+				<view class="detail-section reply-box" v-if="activeAppeal.reply">
+					<text class="ds-title reply">平台审核结论</text>
+					<text class="ds-body">{{ activeAppeal.reply }}</text>
+				</view>
+
+				<view
+					v-if="Number(activeAppeal.order_id) > 0"
+					class="primary-btn clickable-hover"
+					@tap="goOrderDetail(activeAppeal.order_id)"
+				>
+					查看关联工单 (#{{ activeAppeal.order_id }})
+				</view>
 			</view>
 		</view>
 	</view>
@@ -95,13 +287,15 @@
 
 <script setup>
 	import { ref, reactive } from 'vue';
-	import { onShow } from '@dcloudio/uni-app';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import api from '@/utils/api.js';
 
+	const activeTab = ref('credit');
 	const credit = ref(null);
 	const list = ref([]);
 	const submitting = ref(false);
 	const evidenceImgs = ref([]);
+	const activeAppeal = ref(null);
 	const form = reactive({ type: 'misjudge', order_id: '', content: '' });
 
 	const types = [
@@ -111,30 +305,47 @@
 		{ key: 'other', name: '其他问题' }
 	];
 
+	onLoad((options) => {
+		if (options?.tab && ['credit', 'appeal', 'records'].includes(options.tab)) {
+			activeTab.value = options.tab;
+		}
+		if (options?.order_id) {
+			form.order_id = String(options.order_id);
+			if (!options.tab) activeTab.value = 'appeal';
+		}
+	});
+
 	async function load() {
-		try { credit.value = await api.masterCredit(); } catch (e) {}
+		try {
+			credit.value = await api.masterCredit();
+		} catch (e) {}
 		try {
 			const res = await api.masterAppeals();
 			list.value = res.list || [];
 		} catch (e) {}
 	}
 
+	const uploading = ref(false);
+
 	function chooseEvidence() {
+		if (uploading.value || submitting.value) return;
 		uni.chooseImage({
 			count: 3 - evidenceImgs.value.length,
 			success: async (res) => {
-				for (const path of res.tempFilePaths) {
-					uni.showLoading({ title: '凭证上传中...' });
-					try {
+				uploading.value = true;
+				uni.showLoading({ title: '凭证上传中...', mask: true });
+				try {
+					for (const path of res.tempFilePaths) {
 						const up = await api.upload(path, 'dispute');
 						const imgUrl = up.fullurl || up.url;
 						if (imgUrl) {
 							evidenceImgs.value.push(imgUrl);
 						}
-					} catch (e) {
-					} finally {
-						uni.hideLoading();
 					}
+				} catch (e) {
+				} finally {
+					uploading.value = false;
+					uni.hideLoading();
 				}
 			}
 		});
@@ -144,116 +355,669 @@
 		evidenceImgs.value.splice(idx, 1);
 	}
 
+	function previewImages(urls, currentIdx) {
+		if (!urls || !urls.length) return;
+		uni.previewImage({
+			urls,
+			current: urls[currentIdx] || urls[0]
+		});
+	}
+
 	async function submit() {
-		if (submitting.value) return;
-		if (form.content.trim().length < 5) {
-			uni.showToast({ title: '请至少填写 5 个字申诉说明', icon: 'none' });
+		if (submitting.value || uploading.value) {
+			if (uploading.value) uni.showToast({ title: '凭证上传中，请稍候', icon: 'none' });
+			return;
+		}
+		const content = form.content.trim();
+		if (content.length < 5) {
+			uni.showToast({ title: '请填写不少于 5 个字的申诉说明', icon: 'none' });
 			return;
 		}
 		submitting.value = true;
 		try {
-			let finalContent = form.content.trim();
-			if (evidenceImgs.value.length) {
-				finalContent += '\n[举证图片: ' + evidenceImgs.value.join(' , ') + ']';
-			}
 			await api.masterAppeal({
 				type: form.type,
 				order_id: Number(form.order_id) || 0,
-				content: finalContent
+				content,
+				images: evidenceImgs.value.join(',')
 			});
-			uni.showToast({ title: '申诉已提交，平台将尽快审核' });
+			uni.showToast({ title: '申诉已提交，等待平台复核', icon: 'none' });
 			form.content = '';
 			form.order_id = '';
 			evidenceImgs.value = [];
-			load();
+			await load();
+			activeTab.value = 'records';
 		} catch (e) {
 		} finally {
 			submitting.value = false;
 		}
 	}
 
+	function goReviews() {
+		uni.navigateTo({ url: '/pages/master/reviews' });
+	}
+
+	function goOrderDetail(orderId) {
+		activeAppeal.value = null;
+		uni.navigateTo({ url: `/pages/master/detail?id=${orderId}` });
+	}
+
 	onShow(() => load());
 </script>
 
-<style scoped>
-	.page { min-height: 100vh; background: #F5F6F8; padding: 0 0 60rpx; }
-	.card { margin: 20rpx 24rpx 0; padding: 24rpx; background: #fff; border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06); }
-	.card-head { display: flex; align-items: center; justify-content: space-between; }
-	.card-title { font-size: 28rpx; font-weight: 700; color: #1F1F1F; }
-	.card-level { display: inline-flex; align-items: center; justify-content: center; height: 42rpx; line-height: 42rpx; text-align: center; font-size: 22rpx; color: #F0710D; font-weight: 600; background: #FFF3E6; padding: 0 16rpx; border-radius: 12rpx; }
-	.card-more { font-size: 22rpx; color: #9A9A9A; }
-
-	.grid { display: flex; flex-wrap: wrap; margin-top: 16rpx; }
-	.g { width: 33.33%; display: flex; flex-direction: column; align-items: center; padding: 14rpx 0; }
-	.g-num { font-size: 34rpx; font-weight: 700; color: #F0710D; line-height: 1.1; }
-	.g-lab { margin-top: 6rpx; font-size: 22rpx; color: #8A8A8E; }
-
-	.rules { margin-top: 16rpx; padding-top: 14rpx; border-top: 1rpx solid #F4F4F4; display: flex; flex-direction: column; }
-	.rule { font-size: 22rpx; color: #9A9A9A; line-height: 34rpx; }
-
-	.types { display: flex; margin-top: 18rpx; }
-	.type {
-		flex: 1; display: inline-flex; align-items: center; justify-content: center; height: 60rpx; line-height: 1;
-		margin-right: 10rpx; border-radius: 30rpx; background: #F5F6F8;
-		font-size: 24rpx; color: #666;
-	}
-	.type:last-child { margin-right: 0; }
-	.type.on { background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); color: #fff; font-weight: 600; }
-
-	.order-fi {
-		display: flex; align-items: center; margin-top: 18rpx;
-		height: 72rpx; background: #FAFAFA; border-radius: 12rpx; padding: 0 16rpx;
-	}
-	.order-label { width: 160rpx; font-size: 24rpx; color: #666; }
-	.order-input { flex: 1; font-size: 24rpx; color: #222; }
-
-	.ta {
-		width: 100%; height: 160rpx; margin-top: 16rpx; padding: 16rpx; box-sizing: border-box;
-		background: #FAFAFA; border-radius: 12rpx; font-size: 26rpx; color: #333; line-height: 38rpx;
+<style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(48rpx + env(safe-area-inset-bottom));
 	}
 
-	.upload-section { margin-top: 18rpx; }
-	.upload-label { font-size: 22rpx; color: #666; }
-	.img-picker { display: flex; flex-wrap: wrap; margin-top: 12rpx; }
-	.img-item { width: 130rpx; height: 130rpx; border-radius: 12rpx; position: relative; margin-right: 14rpx; margin-bottom: 14rpx; }
-	.img-item .thumb { width: 100%; height: 100%; border-radius: 12rpx; }
-	.del-btn {
-		position: absolute; right: -8rpx; top: -8rpx; width: 34rpx; height: 34rpx;
-		background: rgba(0,0,0,0.6); color: #fff; border-radius: 50%;
-		display: flex; align-items: center; justify-content: center; font-size: 24rpx;
+	/* 顶部分段切换栏 */
+	.seg-bar {
+		background: $yjyf-bg-card;
+		display: flex;
+		align-items: center;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.seg-item {
+		flex: 1;
+		height: 88rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.seg-txt {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-regular;
+		font-weight: 500;
+	}
+	.seg-item.on .seg-txt {
+		color: $yjyf-primary;
+		font-weight: 700;
+	}
+	.seg-line {
+		position: absolute;
+		bottom: 0;
+		width: 48rpx;
+		height: 6rpx;
+		border-radius: 3rpx;
+		background: $yjyf-primary;
+	}
+
+	.tab-panel {
+		padding: 20rpx $yjyf-space-md 0;
+	}
+
+	/* 顶部信用大卡 */
+	.score-hero {
+		padding: 32rpx;
+		border-radius: $yjyf-radius-md;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-card;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.sh-left {
+		display: flex;
+		flex-direction: column;
+	}
+	.sh-label {
+		font-size: $yjyf-font-sub;
+		color: rgba(255, 255, 255, 0.9);
+	}
+	.sh-score-row {
+		margin-top: 8rpx;
+		display: flex;
+		align-items: baseline;
+	}
+	.sh-score {
+		font-size: 64rpx;
+		font-weight: 700;
+		color: $yjyf-bg-card;
+		line-height: 1.1;
+	}
+	.sh-max {
+		margin-left: 8rpx;
+		font-size: $yjyf-font-sub;
+		color: rgba(255, 255, 255, 0.85);
+	}
+	.sh-sub {
+		margin-top: 10rpx;
+		font-size: $yjyf-font-micro;
+		color: rgba(255, 255, 255, 0.88);
+	}
+	.sh-badge {
+		height: 64rpx;
+		padding: 0 24rpx;
+		border-radius: $yjyf-radius-pill;
+		background: rgba(255, 255, 255, 0.2);
+		display: inline-flex;
+		align-items: center;
+	}
+	.sh-shield {
+		width: 30rpx;
+		height: 30rpx;
+		margin-right: 10rpx;
+	}
+	.sh-level {
+		font-size: $yjyf-font-sub;
+		font-weight: 700;
+		color: $yjyf-bg-card;
+	}
+
+	/* 通用白卡 */
+	.card {
+		margin-top: 20rpx;
+		padding: $yjyf-space-md;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.tab-panel > .card:first-child {
+		margin-top: 0;
+	}
+	.card-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+	}
+	.card-title {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	/* 六维指标宫格 */
+	.metrics-grid {
+		display: grid;
+		grid-template-columns: repeat(3, 1fr);
+		gap: 16rpx;
+	}
+	.m-cell {
+		padding: 20rpx 12rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.m-num {
+		font-size: 36rpx;
+		font-weight: 700;
+		color: $yjyf-primary;
+		line-height: 1.15;
+		font-variant-numeric: tabular-nums;
+	}
+	.m-num.warn {
+		color: $yjyf-danger;
+	}
+	.m-lab {
+		margin-top: 8rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+	}
+
+	/* 评价入口卡片 */
+	.entry-card {
+		margin-top: 20rpx;
+		padding: 24rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		box-shadow: $yjyf-shadow-card;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.entry-left {
+		display: flex;
+		align-items: center;
+	}
+	.entry-ico {
+		width: 72rpx;
+		height: 72rpx;
+		margin-right: 20rpx;
+		flex-shrink: 0;
+	}
+	.entry-info {
+		display: flex;
+		flex-direction: column;
+	}
+	.entry-title {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.entry-desc {
+		margin-top: 6rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+	.entry-right {
+		display: flex;
+		align-items: center;
+	}
+	.entry-link {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+	.entry-arrow {
+		width: 24rpx;
+		height: 24rpx;
+		margin-left: 8rpx;
+	}
+
+	/* 规则说明 */
+	.rules-list {
+		display: flex;
+		flex-direction: column;
+		gap: 14rpx;
+	}
+	.rule-row {
+		display: flex;
+		align-items: flex-start;
+	}
+	.rule-dot {
+		width: 10rpx;
+		height: 10rpx;
+		border-radius: 50%;
+		background: $yjyf-primary;
+		margin-top: 14rpx;
+		margin-right: 14rpx;
+		flex-shrink: 0;
+	}
+	.rule-txt {
+		flex: 1;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		line-height: 1.5;
+	}
+
+	/* 申诉表单 */
+	.types-grid {
+		display: grid;
+		grid-template-columns: repeat(2, 1fr);
+		gap: 16rpx;
+	}
+	.type-pill {
+		height: 72rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
+		border: 1rpx solid transparent;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		font-weight: 500;
+	}
+	.type-pill.on {
+		background: $yjyf-primary-bg;
+		border-color: $yjyf-primary;
+		color: $yjyf-primary;
+		font-weight: 700;
+	}
+
+	.field-block {
+		margin-top: 28rpx;
+	}
+	.label-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.field-label {
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+	.char-count {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
+	.input-box {
+		margin-top: 14rpx;
+		height: 80rpx;
+		padding: 0 20rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
+		display: flex;
+		align-items: center;
+	}
+	.field-input {
+		flex: 1;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+	}
+	.field-ta {
+		margin-top: 14rpx;
+		width: 100%;
+		height: 200rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+		line-height: 1.5;
+	}
+
+	.img-picker {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 20rpx;
+		margin-top: 16rpx;
+	}
+	.img-item {
+		width: 156rpx;
+		height: 156rpx;
+		border-radius: $yjyf-radius-sm;
+		position: relative;
+	}
+	.thumb {
+		width: 100%;
+		height: 100%;
+		border-radius: $yjyf-radius-sm;
+	}
+	.del-hit {
+		position: absolute;
+		right: -12rpx;
+		top: -12rpx;
+		width: 52rpx;
+		height: 52rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.del-circle {
+		width: 38rpx;
+		height: 38rpx;
+		border-radius: 50%;
+		background: rgba(0, 0, 0, 0.65);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.del-ico {
+		width: 20rpx;
+		height: 20rpx;
 	}
 	.add-btn {
-		width: 130rpx; height: 130rpx; border-radius: 12rpx; border: 2rpx dashed #DCDCDC;
-		background: #FAFAFA; display: flex; flex-direction: column; align-items: center; justify-content: center;
+		width: 156rpx;
+		height: 156rpx;
+		border-radius: $yjyf-radius-sm;
+		border: 2rpx dashed $yjyf-text-disabled;
+		background: $yjyf-bg-page;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
 	}
-	.add-ico { width: 36rpx; height: 36rpx; margin-bottom: 6rpx; }
-	.add-txt { font-size: 22rpx; color: #9A9A9A; }
-
-	.btn {
-		height: 84rpx; margin-top: 24rpx; display: flex; align-items: center; justify-content: center;
-		border-radius: 42rpx; color: #fff; font-size: 28rpx; font-weight: 600;
-		background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%);
-		box-shadow: 0 6rpx 16rpx rgba(240,113,13,0.25);
+	.add-ico {
+		width: 40rpx;
+		height: 40rpx;
+		margin-bottom: 8rpx;
+	}
+	.add-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
 	}
-	.btn.disabled { opacity: .7; }
 
-	.ap-list { display: flex; flex-direction: column; }
-	.ap { padding: 18rpx 0; border-bottom: 1rpx solid #F4F4F4; display: flex; flex-direction: column; }
-	.ap:last-child { border-bottom: none; }
-	.ap-top { display: flex; align-items: center; justify-content: space-between; }
-	.ap-type-box { display: flex; align-items: center; }
-	.ap-type { font-size: 26rpx; font-weight: 600; color: #1F1F1F; }
-	.ap-oid { margin-left: 8rpx; display: inline-flex; align-items: center; justify-content: center; height: 34rpx; line-height: 34rpx; text-align: center; font-size: 22rpx; color: #F0710D; background: #FFF3E6; padding: 0 10rpx; border-radius: 6rpx; }
-	.ap-status { font-size: 22rpx; color: #4A7CFF; }
-	.ap-status.st-done { color: #2FA84F; }
-	.ap-status.st-reject { color: #E8331B; }
-	.ap-content { margin-top: 8rpx; font-size: 24rpx; color: #555; line-height: 36rpx; }
-	.ap-time { margin-top: 6rpx; font-size: 20rpx; color: #B0B0B0; }
-	.ap-reply { margin-top: 10rpx; padding: 12rpx 16rpx; background: #F8F9FB; border-radius: 10rpx; }
-	.reply-tag { font-size: 20rpx; color: #4A7CFF; font-weight: 600; }
-	.reply-txt { font-size: 22rpx; color: #333; line-height: 32rpx; }
+	.primary-btn {
+		margin-top: 36rpx;
+		height: 88rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.primary-btn.disabled {
+		opacity: 0.6;
+	}
 
-	.empty-state { display: flex; flex-direction: column; align-items: center; padding: 60rpx 0 20rpx; }
-	.empty-img { width: 140rpx; height: 140rpx; margin-bottom: 16rpx; }
-	.empty-txt { font-size: 24rpx; color: #9A9A9A; }
+	/* 申诉记录列表 */
+	.record-list {
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+	}
+	.record-card {
+		padding: $yjyf-space-md;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.rc-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.rc-title-group {
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+	}
+	.rc-type {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.rc-oid {
+		height: 42rpx;
+		padding: 0 14rpx;
+		border-radius: 8rpx;
+		background: $yjyf-primary-bg;
+		display: inline-flex;
+		align-items: center;
+	}
+	.rc-oid-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+	.rc-oid-arrow {
+		width: 20rpx;
+		height: 20rpx;
+		margin-left: 4rpx;
+	}
+	.rc-status {
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		color: $yjyf-warning;
+	}
+	.rc-status.st-handling {
+		color: $yjyf-info;
+	}
+	.rc-status.st-done {
+		color: $yjyf-success;
+	}
+	.rc-status.st-reject {
+		color: $yjyf-danger;
+	}
+	.rc-content {
+		display: block;
+		margin-top: 16rpx;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-regular;
+		line-height: 1.5;
+	}
+	.rc-thumbs {
+		margin-top: 16rpx;
+		display: flex;
+		flex-wrap: wrap;
+		gap: 16rpx;
+	}
+	.rc-thumb {
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
+	}
+	.rc-reply {
+		margin-top: 16rpx;
+		padding: 18rpx 20rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
+	}
+	.reply-tag {
+		font-size: $yjyf-font-sub;
+		font-weight: 700;
+		color: $yjyf-info;
+	}
+	.reply-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-main;
+		line-height: 1.5;
+	}
+	.rc-foot {
+		margin-top: 20rpx;
+		padding-top: 16rpx;
+		border-top: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.rc-time {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
+	.rc-detail-link {
+		display: flex;
+		align-items: center;
+	}
+	.rc-link-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+	}
+	.rc-link-ico {
+		width: 22rpx;
+		height: 22rpx;
+		margin-left: 4rpx;
+	}
+
+	.empty-card {
+		padding: 96rpx 32rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		box-shadow: $yjyf-shadow-card;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.empty-img {
+		width: 180rpx;
+		height: 180rpx;
+		margin-bottom: 20rpx;
+	}
+	.empty-title {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.empty-sub {
+		margin-top: 10rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	/* 申诉详情抽屉 */
+	.drawer-mask {
+		position: fixed;
+		inset: 0;
+		z-index: 900;
+		background: rgba(0, 0, 0, 0.48);
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+	.drawer-panel {
+		max-height: 82vh;
+		overflow-y: auto;
+		background: $yjyf-bg-card;
+		border-radius: 28rpx 28rpx 0 0;
+		padding: 28rpx $yjyf-space-lg calc(32rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+	.drawer-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+	}
+	.drawer-title {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.drawer-close {
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.close-ico {
+		width: 30rpx;
+		height: 30rpx;
+	}
+	.detail-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 16rpx 0;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.d-lab {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+	.d-val {
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+	.status-val {
+		color: $yjyf-warning;
+	}
+	.status-val.st-handling {
+		color: $yjyf-info;
+	}
+	.status-val.st-done {
+		color: $yjyf-success;
+	}
+	.status-val.st-reject {
+		color: $yjyf-danger;
+	}
+	.detail-section {
+		margin-top: 24rpx;
+	}
+	.ds-title {
+		display: block;
+		font-size: $yjyf-font-sub;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		margin-bottom: 10rpx;
+	}
+	.ds-title.reply {
+		color: $yjyf-info;
+	}
+	.ds-body {
+		display: block;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-regular;
+		line-height: 1.55;
+	}
+	.reply-box {
+		padding: 20rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
+	}
 </style>
diff --git a/yjyf-app/pages/master/detail.vue b/yjyf-app/pages/master/detail.vue
index 0baed06..5f38ebb 100644
--- a/yjyf-app/pages/master/detail.vue
+++ b/yjyf-app/pages/master/detail.vue
@@ -1,495 +1,1202 @@
 <template>
-	<view class="detail-page">
-		<!-- 统一顶部导航栏 -->
-		<YjyfNavBar theme="orange" title="订单详情">
-			<template #right>
-				<!-- #ifndef MP-WEIXIN -->
-				<view class="share-btn clickable-hover" @tap="shareOrder">
-					<image class="action-icon" src="/static/icons/master/share-action-white.svg" mode="aspectFit" />
+	<view class="page">
+		<YjyfNavBar
+			theme="orange"
+			:title="order && order.is_my_order ? '工单履约详情' : '工单详情'"
+		/>
+
+		<!-- 加载态 -->
+		<view class="state-box" v-if="loading && !order">
+			<text class="state-txt">正在加载工单详情...</text>
+		</view>
+
+		<!-- 错误重试态 -->
+		<view class="state-box" v-else-if="loadError && !order">
+			<image class="empty-ico" src="/static/icons/master/empty-orders.svg" mode="aspectFit" />
+			<text class="state-txt">{{ loadError }}</text>
+			<view class="retry-btn clickable-hover" @tap="loadDetail">重新加载</view>
+		</view>
+
+		<template v-else-if="order">
+			<!-- ==================== 模式一：本人已接工单全流程履约视图 ==================== -->
+			<template v-if="order.is_my_order">
+				<!-- 顶部状态与5步履约进度卡 -->
+				<view class="status-hero">
+					<view class="sh-top">
+						<view class="sh-title-box">
+							<text class="sh-status">{{ order.status_text }}</text>
+							<text class="sh-tip">{{ myStatusDesc }}</text>
+						</view>
+						<view class="sh-fee-box">
+							<text class="sh-fee-label">{{ Number(order.settle_status) === 1 ? '已结算工费' : '预计结算' }}</text>
+							<text class="sh-fee-val">¥{{ Number(order.settle_amount || order.master_fee || 0).toFixed(2) }}</text>
+						</view>
+					</view>
+
+					<!-- 2小时首联考核提醒 -->
+					<view class="contact-alert" v-if="Number(order.status) === 3 && !order.contact_time">
+						<image class="ca-ico" src="/static/icons/clock-orange.svg" mode="aspectFit" />
+						<text class="ca-txt">
+							{{ contactRemainText ? '请在 ' + contactRemainText + ' 内致电客户确认上门时间' : '请立即联系客户确认上门时间，避免超时扣分' }}
+						</text>
+						<view class="ca-btn clickable-hover" @tap="markContacted">标记已联系</view>
+					</view>
+
+					<!-- 5步履约节点条 -->
+					<view class="steps-bar" v-if="Number(order.status) <= 8">
+						<view
+							class="step-node"
+							:class="{ done: stepIndex >= idx, current: stepIndex === idx }"
+							v-for="(st, idx) in stepItems"
+							:key="st.label"
+						>
+							<view class="sn-dot-row">
+								<view class="sn-line left" :class="{ hidden: idx === 0, active: stepIndex >= idx }"></view>
+								<view class="sn-dot">
+									<image
+										v-if="stepIndex > idx || Number(order.status) === 8"
+										class="sn-check"
+										src="/static/icons/check-white.svg"
+										mode="aspectFit"
+									/>
+									<text v-else class="sn-idx">{{ idx + 1 }}</text>
+								</view>
+								<view class="sn-line right" :class="{ hidden: idx === stepItems.length - 1, active: stepIndex > idx }"></view>
+							</view>
+							<text class="sn-label">{{ st.label }}</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 客户联系与上门地址导航卡 -->
+				<view class="card">
+					<view class="card-head">
+						<text class="card-title">客户与上门地址</text>
+						<text class="urgent-pill" v-if="Number(order.urgent) === 1">加急工单</text>
+					</view>
+
+					<view class="customer-box">
+						<image class="cust-avatar" src="/static/icons/avatar-member.svg" mode="aspectFit" />
+						<view class="cust-info">
+							<text class="cust-name">{{ order.contact }}</text>
+							<text class="cust-phone">{{ order.mobile }}</text>
+						</view>
+						<view class="action-pill orange clickable-hover" @tap="callCustomer">
+							<image class="ap-ico" src="/static/icons/phone.svg" mode="aspectFit" />
+							<text class="ap-txt">联系客户</text>
+						</view>
+					</view>
+
+					<view class="addr-box">
+						<view class="addr-main">
+							<view class="addr-row">
+								<image class="loc-ico" src="/static/icons/master/order-loc.svg" mode="aspectFit" />
+								<text class="addr-text">{{ order.full_address }}</text>
+							</view>
+							<view class="meta-pills">
+								<text class="m-pill">楼层 {{ order.floor || 1 }} 层</text>
+								<text class="m-pill">{{ Number(order.has_elevator) ? '有电梯' : '步梯搬运' }}</text>
+								<text class="m-pill" v-if="order.distance_km !== null && order.distance_km !== undefined">距您 {{ order.distance_km }}km</text>
+							</view>
+						</view>
+						<view class="nav-btn clickable-hover" @tap="openMapNav">
+							<image class="nav-ico" src="/static/icons/master/nav-arrow.svg" mode="aspectFit" />
+							<text class="nav-txt">导航</text>
+						</view>
+					</view>
+
+					<view class="kv-row top-border">
+						<text class="kv-k">预约上门时间</text>
+						<view class="kv-v-wrap" @tap="canSchedule ? openScheduleDrawer() : null">
+							<text class="kv-v highlight">{{ order.appoint_time_text }}</text>
+							<image v-if="canSchedule" class="arrow-sm" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+						</view>
+					</view>
 				</view>
-				<!-- #endif -->
 			</template>
-		</YjyfNavBar>
 
-		<view class="page-body" v-if="order">
-			<!-- 1. 顶部师傅围观与抢占提示条（对标工奇兵实机标语） -->
-			<view class="rush-banner">
-				<view class="rush-left">
-					<text class="rush-bold">{{ order.view_count || 2 }}</text>
-					<text class="rush-txt">位师傅正在查看</text>
-				</view>
-				<view class="rush-right" v-if="order.price_type === 'quote'">
-					<text class="rush-txt">只剩</text>
-					<text class="rush-bold">{{ order.remaining_quote_slots !== undefined ? order.remaining_quote_slots : 2 }}</text>
-					<text class="rush-txt">个报价名额，尽快去报价</text>
-				</view>
-				<view class="rush-right" v-else>
-					<text class="rush-txt">请尽快抢单锁定工单</text>
-				</view>
-			</view>
+			<!-- ==================== 模式二：抢单大厅待抢 / 竞价预览视图 ==================== -->
+			<template v-else>
+				<view class="hall-banner">
+					<view class="hb-top">
+						<view class="hb-type-row">
+							<text class="hb-badge">{{ order.price_type_text }}</text>
+							<text class="hb-urgent" v-if="Number(order.urgent) === 1">急单优先</text>
+						</view>
+						<text class="hb-countdown" v-if="countdownText">剩余有效时间 {{ countdownText }}</text>
+					</view>
 
-			<!-- 2. 业主信息卡片（对标工奇兵实机卡片1） -->
+					<view class="hb-price-row">
+						<view class="hb-price-left">
+							<text class="hb-price-label">{{ order.price_type === 'quote' ? '报价模式' : '预计到手收益' }}</text>
+							<view class="hb-amt" v-if="order.price_type !== 'quote'">
+								<text class="hb-sym">¥</text>
+								<text class="hb-num">{{ Number(order.master_fee || order.user_price || 0).toFixed(2) }}</text>
+							</view>
+							<text class="hb-quote-tip" v-else>查看需求后自主提交报价（剩余 {{ order.remaining_quote_slots }} 个名额）</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 我的报价状态卡（已报价时展示） -->
+				<view class="card quote-state-card" v-if="order.my_quote">
+					<view class="card-head">
+						<text class="card-title">我的报价记录</text>
+						<text class="q-state-tag">{{ quoteStatusText(order.my_quote.status) }}</text>
+					</view>
+					<view class="kv-row">
+						<text class="kv-k">我的出价</text>
+						<text class="kv-v price">¥{{ Number(order.my_quote.amount).toFixed(2) }}</text>
+					</view>
+					<view class="kv-row" v-if="order.my_quote.description">
+						<text class="kv-k">报价说明</text>
+						<text class="kv-v">{{ order.my_quote.description }}</text>
+					</view>
+				</view>
+
+				<!-- 脱敏地址与上门要求 -->
+				<view class="card">
+					<view class="card-head">
+						<text class="card-title">服务地点与预约信息</text>
+						<text class="dist-pill" v-if="order.distance_km !== null && order.distance_km !== undefined">距您 {{ order.distance_km }}km</text>
+					</view>
+					<view class="addr-row">
+						<image class="loc-ico" src="/static/icons/master/order-loc.svg" mode="aspectFit" />
+						<text class="addr-text">{{ order.full_address }}（接单后解锁详细门牌）</text>
+					</view>
+					<view class="meta-pills">
+						<text class="m-pill">楼层 {{ order.floor || 1 }} 层</text>
+						<text class="m-pill">{{ Number(order.has_elevator) ? '有电梯' : '步梯无电梯' }}</text>
+					</view>
+					<view class="kv-row top-border">
+						<text class="kv-k">期望上门</text>
+						<text class="kv-v highlight">{{ order.appoint_time_text }}</text>
+					</view>
+					<view class="kv-row">
+						<text class="kv-k">业主称呼</text>
+						<text class="kv-v">{{ order.contact }}（{{ order.mobile }}）</text>
+					</view>
+				</view>
+			</template>
+
+			<!-- ==================== 公共区块：服务商品与现场需求 ==================== -->
 			<view class="card">
 				<view class="card-head">
-					<text class="card-title">业主信息</text>
+					<text class="card-title">服务商品与施工要求</text>
+					<text class="cat-tag">{{ order.cat_name }}</text>
 				</view>
 
-				<view class="client-phone-row">
-					<image class="client-icon" src="/static/icons/master/user-avatar-small.svg" mode="aspectFit" />
-					<text class="client-phone">{{ order.mobile }}</text>
-				</view>
-
-				<view class="address-box">
-					<view class="addr-main">
-						<image class="addr-icon" src="/static/icons/master/order-loc.svg" mode="aspectFit" />
-						<text class="addr-text">{{ order.full_address }}</text>
-					</view>
-					<view class="nav-action clickable-hover" @tap="openLocationMap">
-						<image class="nav-arrow-ico" src="/static/icons/master/nav-arrow.svg" mode="aspectFit" />
-						<text class="nav-action-txt">查看导航</text>
-					</view>
-				</view>
-
-				<!-- 距离提示 -->
-				<view class="distance-notice">
-					<view class="dist-tag">受限</view>
-					<text class="dist-desc">距您居住地址直线距离约 {{ order.distance_km }} km，距您当前直线距离约 {{ order.distance_km }} km，距离信息仅供参考</text>
-				</view>
-
-				<view class="appoint-time-row">
-					<image class="time-ico" src="/static/icons/master/order-time.svg" mode="aspectFit" />
-					<text class="appoint-k">期望上门时间：</text>
-					<text class="appoint-v">{{ order.appoint_time_text }}</text>
-				</view>
-			</view>
-
-			<!-- 3. 商品与服务信息卡片（对标工奇兵实机卡片2） -->
-			<view class="card">
-				<view class="card-head">
-					<text class="card-title">商品信息</text>
-				</view>
-
-				<view class="goods-row">
-					<view class="goods-thumb-wrap clickable-hover" @tap="previewGoodsImage">
-						<image class="goods-thumb" :src="order.service_image || '/static/icons/add-img.svg'" mode="aspectFill" />
-						<view class="view-large-badge">查看大图</view>
-					</view>
-					<view class="goods-info">
-						<text class="goods-name">{{ order.service_name }}</text>
-						<view class="goods-meta-row">
-							<text class="goods-qty">商品数量：<text class="qty-num">{{ order.goods_num }}个</text></text>
-						</view>
-						<view class="service-type-row">
-							<text class="st-label">服务类型：</text>
-							<text class="st-pill">{{ order.service_type_tag || '维修' }}</text>
+				<!-- 多商品列表 -->
+				<view class="goods-list" v-if="order.goods_list && order.goods_list.length">
+					<view class="g-item" v-for="g in order.goods_list" :key="g.id">
+						<image
+							class="g-img"
+							:src="g.goods_image || order.service_image || '/static/icons/service-default.svg'"
+							mode="aspectFill"
+						/>
+						<view class="g-main">
+							<view class="g-top">
+								<text class="g-name">{{ g.goods_name }}</text>
+								<text class="g-num">x{{ g.goods_num }}</text>
+							</view>
+							<text class="g-sub" v-if="g.goods_model">规格型号：{{ g.goods_model }}</text>
+							<text class="g-addon" v-if="g.addon_services">附加项：{{ g.addon_services }}</text>
+							<text class="g-sub" v-if="g.goods_remark">单组备注：{{ g.goods_remark }}</text>
 						</view>
 					</view>
 				</view>
 
-				<view class="remark-block" v-if="order.goods_remark">
-					<text class="rk-label">商品备注：</text>
-					<text class="rk-content">{{ order.goods_remark }}</text>
-				</view>
-
-				<view class="remark-block" v-if="order.service_remark">
-					<text class="rk-label">服务备注：</text>
-					<text class="rk-content">{{ order.service_remark }}</text>
-				</view>
-
-				<view class="addon-block" v-if="hasAddons(order.extras)">
-					<text class="rk-label">增项工序：</text>
-					<view class="addon-pills">
-						<text class="addon-pill" v-for="(ex, exIdx) in getActiveAddons(order.extras)" :key="exIdx">{{ ex.name }} x{{ ex.num }}</text>
-					</view>
-				</view>
-
-				<view class="video-block clickable-hover" v-if="order.goods_videos && order.goods_videos.length" @tap="playOrderVideo(order.goods_videos[0])">
-					<image class="video-play-icon" src="/static/icons/play-white.svg" mode="aspectFit" />
-					<text class="video-play-txt">查看业主上传的现场安装视频 ({{ order.goods_videos.length }}个)</text>
-				</view>
-
-				<!-- 安全提醒 -->
-				<view class="security-banner">
-					<text class="sec-text">禁止引导客户进行线下交易，避免影响您的订单推送优先级。</text>
-				</view>
-			</view>
-
-			<!-- 4. 订单基本信息卡片（对标工奇兵实机卡片3） -->
-			<view class="card">
-				<view class="card-head flex-between">
-					<text class="card-title">订单信息</text>
-					<view class="feedback-link clickable-hover" @tap="orderFeedback">
-						<text class="fb-txt">订单反馈 ›</text>
-					</view>
-				</view>
-
-				<view class="info-row">
-					<text class="ik">订单编号：</text>
-					<text class="iv">{{ order.order_no }}</text>
-					<view class="copy-pill clickable-hover" @tap="copyOrderNo">
-						<text class="copy-txt">复制</text>
-					</view>
-				</view>
-
-				<view class="info-row">
-					<text class="ik">下单时间：</text>
-					<text class="iv">{{ order.createtime_text }}</text>
-				</view>
-
-				<view class="info-row">
-					<text class="ik">订单类型：</text>
-					<text class="iv mode-highlight">{{ order.price_type_text }}</text>
-				</view>
-
-				<view class="info-row" v-if="order.price_type === 'custom'">
-					<text class="ik">用户出价：</text>
-					<text class="iv price-txt">¥{{ Number(order.user_price).toFixed(2) }}</text>
-				</view>
-
-				<view class="info-row" v-if="order.price_type === 'fixed'">
-					<text class="ik">一口价：</text>
-					<text class="iv price-txt">¥{{ Number(order.total_amount).toFixed(2) }}</text>
-				</view>
-
-				<view class="info-row" v-if="order.my_quote">
-					<text class="ik">我的报价：</text>
-					<text class="iv my-quote-txt">¥{{ Number(order.my_quote.amount).toFixed(2) }}（{{ order.my_quote.status === 'accept' ? '已被采纳' : '等待客户选择' }}）</text>
-				</view>
-			</view>
-		</view>
-
-		<view class="bottom-placeholder"></view>
-
-		<!-- 5. 底部固定操作栏（对标工奇兵实机吸底栏） -->
-		<view class="bottom-bar" v-if="order">
-			<view class="bar-left">
-				<view class="icon-btn clickable-hover" @tap="contactService">
-					<image class="ib-ico" src="/static/icons/master/service-action.svg" mode="aspectFit" />
-					<text class="ib-txt">联系客服</text>
-				</view>
-				<!-- #ifdef MP-WEIXIN -->
-				<button class="icon-btn share-btn-reset clickable-hover" open-type="share">
-					<image class="ib-ico" src="/static/icons/master/share-action.svg" mode="aspectFit" />
-					<text class="ib-txt">转给朋友</text>
-				</button>
-				<!-- #endif -->
-				<!-- #ifndef MP-WEIXIN -->
-				<view class="icon-btn clickable-hover" @tap="shareOrder">
-					<image class="ib-ico" src="/static/icons/master/share-action.svg" mode="aspectFit" />
-					<text class="ib-txt">转给朋友</text>
-				</view>
-				<!-- #endif -->
-			</view>
-
-			<view class="bar-right">
-				<!-- 一口价单 -->
-				<view
-					class="primary-action-btn clickable-hover"
-					v-if="order.price_type === 'fixed' && order.can_grab"
-					@tap="openGrabConfirm"
-				>
-					<text class="pab-title">立即抢单</text>
-					<text class="pab-sub">¥{{ Number(order.total_amount).toFixed(2) }}</text>
-				</view>
-
-				<!-- 用户定价单 -->
-				<view
-					class="primary-action-btn clickable-hover custom"
-					v-else-if="order.price_type === 'custom' && order.can_grab"
-					@tap="openGrabConfirm"
-				>
-					<text class="pab-title">按此出价接单</text>
-					<text class="pab-sub">¥{{ Number(order.user_price).toFixed(2) }}</text>
-				</view>
-
-				<!-- 师傅竞价单 -->
-				<view
-					class="primary-action-btn clickable-hover quote"
-					v-else-if="order.price_type === 'quote' && order.can_quote"
-					@tap="openQuoteDrawer"
-				>
-					<text class="pab-title">立即报价</text>
-					<text class="pab-sub">(报价快，中选高)</text>
-				</view>
-
-				<!-- 已报价状态 -->
-				<view class="state-action-btn disabled" v-else-if="order.my_quote">
-					<text class="sab-txt">已报价 ¥{{ Number(order.my_quote.amount).toFixed(2) }}</text>
-				</view>
-
-				<!-- 已经属于我的工单 -->
-				<view class="state-action-btn success" v-else-if="order.is_my_order" @tap="goMyOrders">
-					<text class="sab-txt">前往工单履约 ›</text>
-				</view>
-
-				<!-- 其他已不可接状态 -->
-				<view class="state-action-btn disabled" v-else>
-					<text class="sab-txt">{{ order.status_text }}</text>
-				</view>
-			</view>
-		</view>
-
-		<!-- 6. 抢单防误点二次确认弹窗（100% 对标工奇兵实机图3） -->
-		<view class="confirm-mask" v-if="showGrabModal" @tap="showGrabModal = false">
-			<view class="confirm-dialog" @tap.stop>
-				<text class="cd-title">提示</text>
-				<text class="cd-content">请确定已经了解清楚订单服务要求、商品数量、服务地址等信息。您确定可以承揽，并能完成工作，如随意抢单，将影响您的订单推送优先级。</text>
-				<view class="cd-actions">
-					<view class="cd-btn cancel clickable-hover" @tap="showGrabModal = false">
-						<text class="cd-btn-txt cancel">再看看</text>
-					</view>
-					<view class="cd-btn ok clickable-hover" :class="{ disabled: grabbing }" @tap="confirmGrab">
-						<text class="cd-btn-txt ok">{{ grabbing ? '抢单中...' : '确定' }}</text>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 7. 师傅竞价报价抽屉/弹窗 -->
-		<view class="quote-mask" v-if="showQuoteModal" @tap="showQuoteModal = false">
-			<view class="quote-drawer" @tap.stop>
-				<view class="qd-head">
-					<text class="qd-title">提交竞价报价</text>
-					<image class="qd-close clickable-hover" src="/static/icons/close.svg" mode="aspectFit" @tap="showQuoteModal = false" />
-				</view>
-
-				<view class="qd-body">
-					<view class="qd-field">
-						<text class="qd-label">我的报价金额（元）</text>
-						<view class="price-input-wrap">
-							<text class="cny-sym">¥</text>
-							<input
-								class="price-input"
-								type="digit"
-								v-model="quoteForm.amount"
-								placeholder="请输入合理报价"
-								placeholder-style="color: #BBBBBB"
-							/>
+				<!-- 单商品回退展示 -->
+				<view class="goods-list" v-else>
+					<view class="g-item">
+						<image
+							class="g-img"
+							:src="order.service_image || '/static/icons/service-default.svg'"
+							mode="aspectFill"
+						/>
+						<view class="g-main">
+							<view class="g-top">
+								<text class="g-name">{{ order.service_name }}</text>
+								<text class="g-num">x{{ order.goods_num || 1 }}</text>
+							</view>
+							<text class="g-sub">规格型号：{{ order.goods_model || '标准规格' }}</text>
 						</view>
 					</view>
+				</view>
 
-					<view class="qd-field">
-						<text class="qd-label">有效时长（小时）</text>
-						<picker mode="selector" :range="quoteHourOptions" @change="onQuoteHourChange">
-							<view class="hour-picker-val">{{ quoteForm.valid_hours }} 小时内有效 ›</view>
-						</picker>
-					</view>
+				<view class="remark-box" v-if="order.remark">
+					<text class="rk-label">客户备注：</text>
+					<text class="rk-txt">{{ order.remark }}</text>
+				</view>
 
-					<view class="qd-field">
-						<text class="qd-label">服务承诺与说明</text>
-						<textarea
-							class="desc-textarea"
-							v-model="quoteForm.description"
-							placeholder="如：自带专业工具，现场不加价，质保90天"
-							placeholder-style="color: #BBBBBB"
-							maxlength="200"
+				<!-- 客户上传的商品照片 -->
+				<view class="media-sec" v-if="order.goods_images && order.goods_images.length">
+					<text class="media-title">商品参考/实拍图（{{ order.goods_images.length }}张）</text>
+					<view class="media-grid">
+						<image
+							v-for="(im, idx) in order.goods_images"
+							:key="'mg_' + idx"
+							class="media-img"
+							:src="im"
+							mode="aspectFill"
+							@tap="previewImages(order.goods_images, idx)"
 						/>
 					</view>
 				</view>
 
-				<view class="qd-foot">
-					<view class="qd-submit-btn clickable-hover" :class="{ disabled: quoteSubmitting }" @tap="submitQuote">
-						<text class="qsb-txt">{{ quoteSubmitting ? '提交中...' : '确认提交报价' }}</text>
+				<!-- 客户上传的安装环境图与安装视频 -->
+				<view class="media-sec" v-if="(order.env_images && order.env_images.length) || (order.goods_videos && order.goods_videos.length)">
+					<text class="media-title">现场环境图与视频</text>
+					<view class="media-grid">
+						<image
+							v-for="(eim, eidx) in (order.env_images || [])"
+							:key="'me_' + eidx"
+							class="media-img"
+							:src="eim"
+							mode="aspectFill"
+							@tap="previewImages(order.env_images, eidx)"
+						/>
+						<view
+							class="master-video-box clickable-hover"
+							v-for="(vid, vidx) in (order.goods_videos || [])"
+							:key="'mv_' + vidx"
+							@tap="activeVideoUrl = vid"
+						>
+							<image class="mv-play-ico" src="/static/icons/play-white.svg" mode="aspectFit" />
+							<text class="mv-play-txt">播放视频</text>
+						</view>
 					</view>
 				</view>
 			</view>
+
+			<!-- ==================== 已接单专属：增项补差记录卡 ==================== -->
+			<view class="card" v-if="order.is_my_order && Number(order.diff_status) > 0">
+				<view class="card-head">
+					<text class="card-title">施工增项补差</text>
+					<text class="diff-badge" :class="{ paid: Number(order.diff_status) === 2 }">
+						{{ Number(order.diff_status) === 2 ? '客户已支付' : '待客户支付' }}
+					</text>
+				</view>
+				<view class="kv-row">
+					<text class="kv-k">补差金额</text>
+					<text class="kv-v price">¥{{ Number(order.diff_amount || 0).toFixed(2) }}</text>
+				</view>
+				<view class="kv-row" v-if="order.diff_remark">
+					<text class="kv-k">增项说明</text>
+					<text class="kv-v">{{ order.diff_remark }}</text>
+				</view>
+				<view class="media-sec" v-if="order.diff_image">
+					<text class="media-title">现场增项凭证</text>
+					<image
+						class="diff-img"
+						:src="order.diff_image"
+						mode="aspectFill"
+						@tap="previewImages([order.diff_image], 0)"
+					/>
+				</view>
+			</view>
+
+			<!-- ==================== 已接单专属：完工水印照片卡 ==================== -->
+			<view class="card" v-if="order.is_my_order && order.finish_images && order.finish_images.length">
+				<view class="card-head">
+					<text class="card-title">完工验收凭证（{{ order.finish_images.length }}张）</text>
+				</view>
+				<view class="media-grid">
+					<image
+						v-for="(fi, idx) in order.finish_images"
+						:key="fi.id || idx"
+						class="media-img"
+						:src="fi.url"
+						mode="aspectFill"
+						@tap="previewImages(order.finish_images.map(x => x.url), idx)"
+					/>
+				</view>
+				<view class="remark-box" v-if="order.damage_remark">
+					<text class="rk-label">施工异常/说明：</text>
+					<text class="rk-txt">{{ order.damage_remark }}</text>
+				</view>
+			</view>
+
+			<!-- ==================== 已接单专属：费用与结算明细卡 ==================== -->
+			<view class="card" v-if="order.is_my_order">
+				<view class="card-head">
+					<text class="card-title">费用与结算明细</text>
+					<text class="settle-tag" :class="{ ok: Number(order.settle_status) === 1 }">
+						{{ Number(order.settle_status) === 1 ? '已入账钱包' : '核销后即刻入账' }}
+					</text>
+				</view>
+				<view class="kv-row">
+					<text class="kv-k">工单号</text>
+					<view class="kv-v-wrap" @tap="copyOrderNo">
+						<text class="kv-v">{{ order.order_no }}</text>
+						<image class="copy-ico" src="/static/icons/invoice-copy.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<view class="kv-row">
+					<text class="kv-k">订单实付总额</text>
+					<text class="kv-v">¥{{ Number(order.pay_amount || order.total_amount || 0).toFixed(2) }}</text>
+				</view>
+				<view class="kv-row" v-if="Number(order.floor_amount) > 0">
+					<text class="kv-k">含步梯搬运费</text>
+					<text class="kv-v">¥{{ Number(order.floor_amount).toFixed(2) }}</text>
+				</view>
+				<view class="kv-row" v-if="Number(order.urgent_amount) > 0">
+					<text class="kv-k">含加急服务费</text>
+					<text class="kv-v">¥{{ Number(order.urgent_amount).toFixed(2) }}</text>
+				</view>
+				<view class="kv-row">
+					<text class="kv-k">平台技术服务费（{{ Number(order.commission_rate || 10) }}%）</text>
+					<text class="kv-v muted">-¥{{ Number(order.commission || 0).toFixed(2) }}</text>
+				</view>
+				<view class="kv-row top-border">
+					<text class="kv-k bold">{{ Number(order.settle_status) === 1 ? '实际结算工钱' : '预计结算工钱' }}</text>
+					<text class="kv-v price-lg">¥{{ Number(order.settle_amount || order.master_fee || 0).toFixed(2) }}</text>
+				</view>
+			</view>
+
+			<!-- ==================== 已接单专属：工单履约时间轴 ==================== -->
+			<view class="card" v-if="order.is_my_order && order.logs && order.logs.length">
+				<view class="card-head">
+					<text class="card-title">工单履约轨迹</text>
+				</view>
+				<view class="timeline">
+					<view class="tl-item" :class="{ latest: idx === 0 }" v-for="(lg, idx) in order.logs" :key="lg.id || idx">
+						<view class="tl-left">
+							<view class="tl-dot"></view>
+							<view class="tl-line" v-if="idx < order.logs.length - 1"></view>
+						</view>
+						<view class="tl-body">
+							<view class="tl-head">
+								<text class="tl-status">{{ lg.status_text }}</text>
+								<text class="tl-time">{{ lg.time_text }}</text>
+							</view>
+							<text class="tl-remark" v-if="lg.remark">{{ lg.remark }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- ==================== 底部固定主次操作栏 ==================== -->
+			<view class="bottom-bar">
+				<!-- 已接工单阶段化操作栏 -->
+				<template v-if="order.is_my_order">
+					<view class="bar-icon-btn clickable-hover" @tap="contactPlatform">
+						<image class="bi-ico" src="/static/icons/customer-service-gray.svg" mode="aspectFit" />
+						<text class="bi-txt">平台客服</text>
+					</view>
+
+					<view class="bar-btns">
+						<!-- 状态3：已接单 -->
+						<template v-if="Number(order.status) === 3">
+							<view class="b-btn outline clickable-hover" v-if="!order.contact_time" @tap="markContacted">标记已联系</view>
+							<view class="b-btn outline clickable-hover" v-else @tap="callCustomer">拨打客户</view>
+							<view class="b-btn primary clickable-hover" @tap="openScheduleDrawer">约定上门时间</view>
+						</template>
+
+						<!-- 状态4：待上门 -->
+						<template v-else-if="Number(order.status) === 4">
+							<view class="b-btn outline clickable-hover" @tap="openScheduleDrawer">改约时间</view>
+							<view class="b-btn primary clickable-hover" :class="{ disabled: submitting }" @tap="doArrive">
+								{{ submitting ? '打卡中...' : '到达现场打卡' }}
+							</view>
+						</template>
+
+						<!-- 状态5：已到达 -->
+						<template v-else-if="Number(order.status) === 5">
+							<view class="b-btn outline clickable-hover" @tap="openDiffDrawer">增项补差</view>
+							<view class="b-btn primary clickable-hover" :class="{ disabled: submitting }" @tap="doStartJob">
+								{{ submitting ? '提交中...' : '开始施工服务' }}
+							</view>
+						</template>
+
+						<!-- 状态6：服务中 -->
+						<template v-else-if="Number(order.status) === 6">
+							<view class="b-btn outline clickable-hover" @tap="openDiffDrawer">增项补差</view>
+							<view class="b-btn primary clickable-hover" @tap="openFinishDrawer">水印拍照完工</view>
+						</template>
+
+						<!-- 状态7：待验收 -->
+						<template v-else-if="Number(order.status) === 7">
+							<view class="b-btn outline clickable-hover" @tap="callCustomer">联系客户</view>
+							<view class="b-btn primary clickable-hover" @tap="openVerifyDrawer">输入核销码结算</view>
+						</template>
+
+						<!-- 状态8：已完成 -->
+						<template v-else-if="Number(order.status) === 8">
+							<view class="b-btn primary clickable-hover" @tap="goWallet">查看钱包账单</view>
+						</template>
+
+						<!-- 其他状态（取消/售后） -->
+						<template v-else>
+							<view class="b-btn outline clickable-hover" @tap="goOrdersList">返回工单列表</view>
+						</template>
+					</view>
+				</template>
+
+				<!-- 抢单大厅待抢/报价操作栏 -->
+				<template v-else>
+					<view class="bar-icon-btn clickable-hover" @tap="contactPlatform">
+						<image class="bi-ico" src="/static/icons/customer-service-gray.svg" mode="aspectFit" />
+						<text class="bi-txt">客服</text>
+					</view>
+					<view class="bar-btns">
+						<view
+							v-if="order.can_grab"
+							class="b-btn primary clickable-hover"
+							:class="{ disabled: submitting }"
+							@tap="doGrab"
+						>{{ submitting ? '抢单中...' : '立即抢单' }}</view>
+						<view
+							v-else-if="order.can_quote"
+							class="b-btn primary clickable-hover"
+							@tap="openQuoteDrawer"
+						>立即提交报价</view>
+						<view v-else class="b-btn disabled-solid">
+							{{ order.my_quote ? '已提交报价，等待客户选标' : '当前暂不可接单' }}
+						</view>
+					</view>
+				</template>
+			</view>
+		</template>
+
+		<!-- ==================== 抽屉 1：约定/修改上门时间 ==================== -->
+		<view class="drawer-mask" v-if="showSchedule" @tap="showSchedule = false">
+			<view class="drawer-panel" @tap.stop>
+				<view class="dp-head">
+					<text class="dp-title">约定上门服务时间</text>
+					<view class="dp-close" @tap="showSchedule = false">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<text class="dp-label">选择上门日期</text>
+				<scroll-view scroll-x class="date-scroll" :show-scrollbar="false">
+					<view class="date-pills">
+						<view
+							class="date-pill clickable-hover"
+							:class="{ on: scheduleDateIdx === idx }"
+							v-for="(d, idx) in dateOptions"
+							:key="d.dateStr"
+							@tap="scheduleDateIdx = idx"
+						>
+							<text class="dp-week">{{ d.label }}</text>
+							<text class="dp-day">{{ d.shortDate }}</text>
+						</view>
+					</view>
+				</scroll-view>
+
+				<text class="dp-label">选择具体到达时间</text>
+				<view class="slot-grid">
+					<view
+						class="slot-pill clickable-hover"
+						:class="{ on: scheduleHour === h }"
+						v-for="h in hourOptions"
+						:key="h"
+						@tap="scheduleHour = h"
+					>{{ h }}</view>
+				</view>
+
+				<view class="dp-submit clickable-hover" :class="{ disabled: submitting }" @tap="submitSchedule">
+					{{ submitting ? '保存中...' : '确认约定上门时间' }}
+				</view>
+			</view>
 		</view>
+
+		<!-- ==================== 抽屉 2：发起施工增项补差 ==================== -->
+		<view class="drawer-mask" v-if="showDiff" @tap="showDiff = false">
+			<view class="drawer-panel" @tap.stop>
+				<view class="dp-head">
+					<text class="dp-title">发起施工增项补差</text>
+					<view class="dp-close" @tap="showDiff = false">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<view class="form-row">
+					<text class="fr-label">补差金额（元）</text>
+					<input class="fr-input" type="digit" v-model="diffForm.amount" placeholder="请与客户协商一致后输入金额" />
+				</view>
+
+				<view class="form-col">
+					<text class="fr-label">增项原因说明</text>
+					<textarea
+						class="fr-textarea"
+						v-model="diffForm.remark"
+						maxlength="200"
+						placeholder="请如实填写增项明细（如：远程运输、特殊墙体打孔、拆旧清运、辅材配件等）"
+					/>
+				</view>
+
+				<view class="form-col">
+					<text class="fr-label">现场凭证照片（选填）</text>
+					<view class="upload-row">
+						<view class="up-item" v-if="diffForm.image">
+							<image class="up-img" :src="diffForm.image" mode="aspectFill" />
+							<view class="up-del" @tap="diffForm.image = ''">
+								<image class="del-ico" src="/static/icons/media-del-white.svg" mode="aspectFit" />
+							</view>
+						</view>
+						<view class="up-add clickable-hover" v-else @tap="chooseDiffImg">
+							<image class="cam-ico" src="/static/icons/camera.svg" mode="aspectFit" />
+							<text class="cam-txt">上传凭证</text>
+						</view>
+					</view>
+				</view>
+
+				<view class="dp-submit clickable-hover" :class="{ disabled: submitting }" @tap="submitDiff">
+					{{ submitting ? '提交中...' : '发送补差申请给客户' }}
+				</view>
+			</view>
+		</view>
+
+		<!-- ==================== 抽屉 3：水印拍照完工提交 ==================== -->
+		<view class="drawer-mask" v-if="showFinish" @tap="showFinish = false">
+			<view class="drawer-panel" @tap.stop>
+				<view class="dp-head">
+					<text class="dp-title">上传完工现场照片</text>
+					<view class="dp-close" @tap="showFinish = false">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<text class="dp-sub-tip">照片将自动合成当前时间与工单地址防伪水印，最多可上传 6 张</text>
+
+				<view class="upload-grid">
+					<view class="up-item" v-for="(im, idx) in finishForm.images" :key="idx">
+						<image class="up-img" :src="im" mode="aspectFill" @tap="previewImages(finishForm.images, idx)" />
+						<view class="up-del" @tap="removeFinishImg(idx)">
+							<image class="del-ico" src="/static/icons/media-del-white.svg" mode="aspectFit" />
+						</view>
+					</view>
+					<view class="up-add clickable-hover" v-if="finishForm.images.length < 6" @tap="addFinishImgs">
+						<image class="cam-ico" src="/static/icons/camera.svg" mode="aspectFit" />
+						<text class="cam-txt">拍照/上传</text>
+					</view>
+				</view>
+
+				<view class="form-col">
+					<text class="fr-label">完工说明 / 现场异常报备（选填）</text>
+					<textarea
+						class="fr-textarea"
+						v-model="finishForm.damage_remark"
+						maxlength="200"
+						placeholder="若商品存在开箱破损或特殊施工情况，请在此说明留档"
+					/>
+				</view>
+
+				<view class="dp-submit clickable-hover" :class="{ disabled: submitting }" @tap="submitFinish">
+					{{ submitting ? '提交中...' : '确认完工并通知客户验收' }}
+				</view>
+			</view>
+		</view>
+
+		<!-- ==================== 抽屉 4：输入客户 6 位核销码结算 ==================== -->
+		<view class="drawer-mask" v-if="showVerify" @tap="showVerify = false">
+			<view class="drawer-panel" @tap.stop>
+				<view class="dp-head">
+					<text class="dp-title">输入验收核销码</text>
+					<view class="dp-close" @tap="showVerify = false">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<text class="dp-sub-tip">请向客户索取订单详情页中的 6 位数字验收码，核销成功后工钱即刻结算至您的钱包</text>
+
+				<input
+					class="verify-code-input"
+					type="number"
+					maxlength="6"
+					v-model="verifyCodeVal"
+					placeholder="请输入 6 位核销码"
+				/>
+
+				<view class="dp-submit clickable-hover" :class="{ disabled: submitting }" @tap="submitVerifyCode">
+					{{ submitting ? '核销结算中...' : '确认核销并结算工费' }}
+				</view>
+			</view>
+		</view>
+
+		<!-- ==================== 抽屉 5：大厅竞价工单提交报价 ==================== -->
+		<view class="drawer-mask" v-if="showQuote" @tap="showQuote = false">
+			<view class="drawer-panel" @tap.stop>
+				<view class="dp-head">
+					<text class="dp-title">提交工单报价</text>
+					<view class="dp-close" @tap="showQuote = false">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<view class="form-row">
+					<text class="fr-label">报价金额（元）</text>
+					<input class="fr-input" type="digit" v-model="quoteForm.amount" placeholder="请输入合理全包施工报价" />
+				</view>
+
+				<view class="form-col">
+					<text class="fr-label">服务承诺与说明（选填）</text>
+					<textarea
+						class="fr-textarea"
+						v-model="quoteForm.description"
+						maxlength="200"
+						placeholder="例如：经验丰富自带专业工具，准时上门，包清理现场"
+					/>
+				</view>
+
+				<view class="dp-submit clickable-hover" :class="{ disabled: submitting }" @tap="submitQuote">
+					{{ submitting ? '提交中...' : '立即发送报价' }}
+				</view>
+			</view>
+		</view>
+
+		<!-- 客户安装视频预览弹窗 -->
+		<view class="drawer-mask" v-if="activeVideoUrl" @tap="activeVideoUrl = ''">
+			<view class="drawer-panel" @tap.stop>
+				<view class="dp-head">
+					<text class="dp-title">客户安装视频</text>
+					<view class="dp-close" @tap="activeVideoUrl = ''">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<video class="master-video-player" :src="activeVideoUrl" controls autoplay />
+			</view>
+		</view>
+
+		<!-- 离屏水印合成画布 -->
+		<canvas
+			id="detailWatermarkCanvas"
+			canvas-id="detailWatermarkCanvas"
+			:style="{ width: canvasW + 'px', height: canvasH + 'px', position: 'fixed', left: '-9999px', top: '-9999px' }"
+		></canvas>
 	</view>
 </template>
 
 <script setup>
-	import { ref, reactive } from 'vue';
-	import { onLoad } from '@dcloudio/uni-app';
+	import { ref, reactive, computed, onBeforeUnmount, getCurrentInstance } from 'vue';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
+	import YjyfNavBar from '@/components/YjyfNavBar.vue';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin } from '@/utils/request.js';
-	import { useShare, triggerCustomShare } from '@/utils/share.js';
+
+	const instance = getCurrentInstance()?.proxy;
 
 	const orderId = ref(0);
+	const initialAction = ref('');
 	const order = ref(null);
 	const loading = ref(false);
+	const loadError = ref('');
+	const submitting = ref(false);
 
-	function getOrderSharePayload() {
-		const o = order.value;
-		if (!o) {
-			return {
-				title: '【同城工单派发】优匠优服新工单，认证师傅快来接单',
-				path: `/pages/master/detail?id=${orderId.value}`,
-				query: { id: orderId.value }
-			};
+	const remainSec = ref(0);
+	const contactRemainSec = ref(0);
+	let timer = null;
+
+	// 抽屉显隐控制
+	const showSchedule = ref(false);
+	const showDiff = ref(false);
+	const showFinish = ref(false);
+	const showVerify = ref(false);
+	const showQuote = ref(false);
+	const activeVideoUrl = ref('');
+
+	// 预约上门表单
+	const scheduleDateIdx = ref(0);
+	const scheduleHour = ref('10:00');
+	const hourOptions = ['09:00', '10:00', '11:00', '14:00', '15:00', '16:00', '17:00', '19:00'];
+
+	const dateOptions = computed(() => {
+		const arr = [];
+		const weekNames = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+		const pad = (n) => String(n).padStart(2, '0');
+		for (let i = 0; i < 7; i++) {
+			const d = new Date(Date.now() + i * 86400000);
+			const y = d.getFullYear();
+			const m = pad(d.getMonth() + 1);
+			const day = pad(d.getDate());
+			const label = i === 0 ? '今天' : (i === 1 ? '明天' : weekNames[d.getDay()]);
+			arr.push({
+				label,
+				shortDate: `${m}-${day}`,
+				dateStr: `${y}-${m}-${day}`
+			});
 		}
-		const region = `${o.city || ''}${o.district || ''}` || '同城';
-		const priceDesc = o.price_type === 'fixed'
-			? `一口价 ¥${Number(o.total_amount).toFixed(2)}`
-			: (o.price_type === 'custom' ? `用户出价 ¥${Number(o.user_price).toFixed(2)}` : '师傅竞价单');
-		const coverImg = o.service_image && !String(o.service_image).endsWith('.svg')
-			? o.service_image
-			: (o.goods_images && o.goods_images.length ? o.goods_images[0] : '');
-		return {
-			title: `【${region}工单】${o.service_name} · ${priceDesc}`,
-			path: `/pages/master/detail?id=${orderId.value}`,
-			query: { id: orderId.value },
-			imageUrl: coverImg
-		};
-	}
+		return arr;
+	});
 
-	useShare(getOrderSharePayload);
+	// 增项补差表单
+	const diffForm = reactive({
+		amount: '',
+		remark: '',
+		image: ''
+	});
 
-	const showGrabModal = ref(false);
-	const grabbing = ref(false);
+	// 完工取证表单
+	const finishForm = reactive({
+		images: [],
+		damage_remark: ''
+	});
 
-	const showQuoteModal = ref(false);
-	const quoteSubmitting = ref(false);
-	const quoteHourOptions = ['12', '24', '48', '72'];
+	// 核销码与报价表单
+	const verifyCodeVal = ref('');
 	const quoteForm = reactive({
 		amount: '',
-		valid_hours: 24,
-		description: '自带专业工具，准时上门，工艺规范保障质量'
+		description: ''
 	});
 
-	onLoad((query) => {
-		if (query && query.id) {
-			orderId.value = Number(query.id);
-			loadDetail();
-		}
+	// 水印画布尺寸
+	const canvasW = ref(750);
+	const canvasH = ref(1000);
+
+	const stepItems = [
+		{ label: '已接单' },
+		{ label: '待上门' },
+		{ label: '已到达' },
+		{ label: '服务中' },
+		{ label: '已核销' }
+	];
+
+	const stepIndex = computed(() => {
+		const st = Number(order.value && order.value.status);
+		if (st === 3) return 0;
+		if (st === 4) return 1;
+		if (st === 5) return 2;
+		if (st === 6) return 3;
+		if (st === 7) return 4;
+		if (st === 8) return 5;
+		return 0;
 	});
 
+	const canSchedule = computed(() => {
+		const st = Number(order.value && order.value.status);
+		return st === 3 || st === 4;
+	});
+
+	const myStatusDesc = computed(() => {
+		if (!order.value) return '';
+		const st = Number(order.value.status);
+		if (st === 3) return '请尽快致电客户，确认具体上门服务时间';
+		if (st === 4) return '请携带专业工具准时上门，到达后点击现场打卡';
+		if (st === 5) return '已到达服务地点，与客户确认商品无误后开始施工';
+		if (st === 6) return '施工完成后请拍摄现场水印照片提交验收';
+		if (st === 7) return '等待客户确认验收，您也可向客户索取 6 位核销码当场结算';
+		if (st === 8) return '工单已核销完成，服务报酬已结算至您的师傅钱包';
+		if (st === 9) return '该工单已取消';
+		return '售后跟进处理中';
+	});
+
+	const countdownText = computed(() => {
+		const s = Number(remainSec.value || 0);
+		if (s <= 0) return '';
+		const d = Math.floor(s / 86400);
+		const h = Math.floor((s % 86400) / 3600);
+		const m = Math.floor((s % 3600) / 60);
+		if (d > 0) return `${d}天${h}小时`;
+		return `${h}小时${m}分`;
+	});
+
+	const contactRemainText = computed(() => {
+		const s = Number(contactRemainSec.value || 0);
+		if (s <= 0) return '';
+		const m = Math.floor(s / 60);
+		const sec = s % 60;
+		return `${m}分${String(sec).padStart(2, '0')}秒`;
+	});
+
+	function quoteStatusText(st) {
+		const map = { wait: '等待客户选标', accept: '已中标', reject: '未中标', expired: '已过期' };
+		return map[st] || st;
+	}
+
+	function startTicker() {
+		if (timer) clearInterval(timer);
+		timer = setInterval(() => {
+			if (remainSec.value > 0) remainSec.value -= 1;
+			if (contactRemainSec.value > 0) contactRemainSec.value -= 1;
+		}, 1000);
+	}
+
+	function getUserLocationSilent() {
+		return new Promise((resolve) => {
+			uni.getLocation({
+				type: 'gcj02',
+				success: (loc) => resolve({ lat: loc.latitude, lng: loc.longitude }),
+				fail: () => resolve({})
+			});
+		});
+	}
+
 	async function loadDetail() {
+		if (!orderId.value) return;
 		loading.value = true;
+		loadError.value = '';
 		try {
-			const res = await api.masterOrderDetail(orderId.value);
+			const loc = await getUserLocationSilent();
+			const res = await api.masterOrderDetail(orderId.value, loc);
 			order.value = res;
+			remainSec.value = Number(res && res.countdown_seconds ? res.countdown_seconds : 0);
+			contactRemainSec.value = Number(res && res.contact_remain ? res.contact_remain : 0);
+			startTicker();
+
+			// 响应来自列表页快捷直达的抽屉指令
+			if (initialAction.value && res && res.is_my_order) {
+				const act = initialAction.value;
+				initialAction.value = '';
+				if (act === 'schedule' && canSchedule.value) openScheduleDrawer();
+				else if (act === 'diff' && (Number(res.status) === 5 || Number(res.status) === 6)) openDiffDrawer();
+				else if (act === 'finish' && Number(res.status) === 6) openFinishDrawer();
+				else if (act === 'verify' && Number(res.status) === 7) openVerifyDrawer();
+			}
 		} catch (e) {
-			uni.showToast({ title: e.msg || '加载订单失败', icon: 'none' });
+			loadError.value = (e && e.msg) ? e.msg : '获取工单详情失败';
 		} finally {
 			loading.value = false;
 		}
 	}
 
-	function goBack() {
-		const pages = getCurrentPages();
-		if (pages.length > 1) {
-			uni.navigateBack();
-		} else {
-			uni.reLaunch({ url: '/pages/master/hall' });
+	const contactingCustomer = ref(false);
+	const uploadingMedia = ref(false);
+
+	async function callCustomer() {
+		if (!order.value || !order.value.mobile) return;
+		if (order.value.is_my_order && !order.value.contact_time && !contactingCustomer.value) {
+			contactingCustomer.value = true;
+			try {
+				await api.masterContact({ order_id: order.value.id });
+				order.value.contact_time = Math.floor(Date.now() / 1000);
+				contactRemainSec.value = 0;
+			} catch (e) {
+			} finally {
+				contactingCustomer.value = false;
+			}
+		}
+		uni.makePhoneCall({ phoneNumber: order.value.mobile, fail: () => {} });
+	}
+
+	async function markContacted() {
+		if (!order.value || submitting.value) return;
+		submitting.value = true;
+		try {
+			await api.masterContact({ order_id: order.value.id });
+			uni.showToast({ title: '已记录首联时间' });
+			loadDetail();
+		} catch (e) {
+		} finally {
+			submitting.value = false;
 		}
 	}
 
-	function shareOrder() {
-		triggerCustomShare(getOrderSharePayload());
-	}
-
-	function contactService() {
-		uni.showModal({
-			title: '联系师傅客服',
-			content: '客服电话：400-800-6688（工作时间 08:00 - 22:00）',
-			confirmText: '立即拨打',
-			confirmColor: '#F0710D',
-			success: (res) => {
-				if (res.confirm) {
-					uni.makePhoneCall({ phoneNumber: '4008006688', fail: () => {} });
+	function openMapNav() {
+		if (!order.value) return;
+		const lat = Number(order.value.lat);
+		const lng = Number(order.value.lng);
+		if (lat && lng) {
+			uni.openLocation({
+				latitude: lat,
+				longitude: lng,
+				name: order.value.service_name || '客户服务地址',
+				address: order.value.full_address || '',
+				fail: () => {
+					uni.setClipboardData({ data: order.value.full_address || '' });
 				}
-			}
-		});
-	}
-
-	function copyOrderNo() {
-		if (!order.value) return;
-		uni.setClipboardData({
-			data: String(order.value.order_no),
-			success: () => {
-				uni.showToast({ title: '订单号已复制', icon: 'none' });
-			}
-		});
-	}
-
-	function openLocationMap() {
-		if (!order.value) return;
-		const lat = Number(order.value.lat) || 26.647;
-		const lng = Number(order.value.lng) || 106.630;
-		uni.openLocation({
-			latitude: lat,
-			longitude: lng,
-			name: order.value.full_address || '服务地址',
-			address: order.value.full_address,
-			fail: () => {
-				uni.showToast({ title: '无法唤起地图服务', icon: 'none' });
-			}
-		});
-	}
-
-	function hasAddons(extras) {
-		return extras && extras.some(ex => ex.num > 0);
-	}
-
-	function getActiveAddons(extras) {
-		if (!extras) return [];
-		return extras.filter(ex => ex.num > 0);
-	}
-
-	function playOrderVideo(url) {
-		if (!url) return;
-		uni.showModal({
-			title: '安装视频',
-			content: '视频地址: ' + url,
-			confirmText: '复制链接',
-			success: (r) => {
-				if (r.confirm) {
-					uni.setClipboardData({ data: url, success: () => uni.showToast({ title: '已复制' }) });
+			});
+		} else {
+			uni.setClipboardData({
+				data: order.value.full_address || '',
+				success: () => {
+					uni.showToast({ title: '已复制详细地址，可粘贴至导航软件', icon: 'none' });
 				}
-			}
-		});
+			});
+		}
 	}
 
-	function previewGoodsImage() {
-		if (!order.value) return;
-		const imgs = order.value.goods_images && order.value.goods_images.length
-			? order.value.goods_images
-			: (order.value.service_image ? [order.value.service_image] : []);
-		if (!imgs.length) {
-			uni.showToast({ title: '业主未上传现场照片', icon: 'none' });
+	function openScheduleDrawer() {
+		showSchedule.value = true;
+	}
+
+	async function submitSchedule() {
+		if (submitting.value || !order.value) return;
+		const chosenDate = dateOptions.value[scheduleDateIdx.value];
+		if (!chosenDate) return;
+		const dtStr = `${chosenDate.dateStr} ${scheduleHour.value}:00`.replace(/-/g, '/');
+		const ts = Math.floor(new Date(dtStr).getTime() / 1000);
+		if (!ts || ts <= 0) {
+			uni.showToast({ title: '请选择有效的预约时间', icon: 'none' });
 			return;
 		}
-		uni.previewImage({
-			urls: imgs,
-			current: 0
+		submitting.value = true;
+		try {
+			await api.masterSchedule({ order_id: order.value.id, appoint_time: ts });
+			showSchedule.value = false;
+			uni.showToast({ title: '预约时间已保存' });
+			loadDetail();
+		} catch (e) {
+		} finally {
+			submitting.value = false;
+		}
+	}
+
+	async function doArrive() {
+		if (submitting.value || !order.value) return;
+		submitting.value = true;
+		try {
+			const loc = await getUserLocationSilent();
+			await api.masterArrive({
+				order_id: order.value.id,
+				lat: loc.lat || '',
+				lng: loc.lng || ''
+			});
+			uni.showToast({ title: '现场打卡成功' });
+			loadDetail();
+		} catch (e) {
+		} finally {
+			submitting.value = false;
+		}
+	}
+
+	async function doStartJob() {
+		if (submitting.value || !order.value) return;
+		submitting.value = true;
+		try {
+			await api.masterStart({ order_id: order.value.id });
+			uni.showToast({ title: '已开始施工服务' });
+			loadDetail();
+		} catch (e) {
+		} finally {
+			submitting.value = false;
+		}
+	}
+
+	function openDiffDrawer() {
+		diffForm.amount = order.value && order.value.diff_amount > 0 ? String(order.value.diff_amount) : '';
+		diffForm.remark = order.value && order.value.diff_remark ? order.value.diff_remark : '';
+		diffForm.image = order.value && order.value.diff_image ? order.value.diff_image : '';
+		showDiff.value = true;
+	}
+
+	function chooseDiffImg() {
+		if (uploadingMedia.value || submitting.value) return;
+		uni.chooseImage({
+			count: 1,
+			sizeType: ['compressed'],
+			success: async (r) => {
+				if (!r.tempFilePaths || !r.tempFilePaths.length) return;
+				uploadingMedia.value = true;
+				uni.showLoading({ title: '上传中...', mask: true });
+				try {
+					const up = await api.upload(r.tempFilePaths[0], 'order');
+					diffForm.image = up.fullurl || up.url;
+				} catch (e) {
+				} finally {
+					uploadingMedia.value = false;
+					uni.hideLoading();
+				}
+			}
 		});
 	}
 
-	function orderFeedback() {
-		uni.showToast({ title: '感谢您的反馈，师傅客服将跟进', icon: 'none' });
+	async function submitDiff() {
+		if (submitting.value || uploadingMedia.value || !order.value) {
+			if (uploadingMedia.value) uni.showToast({ title: '图片上传中，请稍候', icon: 'none' });
+			return;
+		}
+		const amt = Number(diffForm.amount);
+		if (!amt || amt <= 0) {
+			uni.showToast({ title: '请输入有效的增项补差金额', icon: 'none' });
+			return;
+		}
+		if (!diffForm.remark.trim()) {
+			uni.showToast({ title: '请填写具体的增项原因说明', icon: 'none' });
+			return;
+		}
+		submitting.value = true;
+		try {
+			await api.masterRequestDiff({
+				order_id: order.value.id,
+				amount: amt,
+				remark: diffForm.remark.trim(),
+				image: diffForm.image
+			});
+			showDiff.value = false;
+			uni.showToast({ title: '补差申请已发送' });
+			loadDetail();
+		} catch (e) {
+		} finally {
+			submitting.value = false;
+		}
 	}
 
-	function openGrabConfirm() {
+	function createWatermarkedTempFile(tempPath) {
+		return new Promise((resolve) => {
+			let settled = false;
+			const safeResolve = (val) => {
+				if (settled) return;
+				settled = true;
+				if (safetyTimer) clearTimeout(safetyTimer);
+				resolve(val || tempPath);
+			};
+			// 4秒超时安全保护：防止小程序或H5离屏Canvas未触发draw回调导致永久卡死
+			const safetyTimer = setTimeout(() => {
+				safeResolve(tempPath);
+			}, 4000);
+
+			uni.getImageInfo({
+				src: tempPath,
+				success: (info) => {
+					if (settled) return;
+					let w = info.width || 750;
+					let h = info.height || 1000;
+					const maxEdge = 1200;
+					if (w > maxEdge || h > maxEdge) {
+						if (w > h) {
+							h = Math.round((h * maxEdge) / w);
+							w = maxEdge;
+						} else {
+							w = Math.round((w * maxEdge) / h);
+							h = maxEdge;
+						}
+					}
+					canvasW.value = w;
+					canvasH.value = h;
+					setTimeout(() => {
+						if (settled) return;
+						try {
+							const ctx = uni.createCanvasContext('detailWatermarkCanvas', instance);
+							ctx.drawImage(info.path || tempPath, 0, 0, w, h);
+							const barH = Math.max(88, Math.round(h * 0.12));
+							ctx.setFillStyle('rgba(0, 0, 0, 0.52)');
+							ctx.fillRect(0, h - barH, w, barH);
+							const pad = (n) => String(n).padStart(2, '0');
+							const now = new Date();
+							const timeStr = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}`;
+							const fontSize = Math.max(16, Math.round(w * 0.028));
+							ctx.setFillStyle('#FFFFFF');
+							ctx.setFontSize(fontSize);
+							ctx.fillText(`优匠优服完工取证 · ${timeStr}`, 20, h - Math.round(barH * 0.56));
+							const addr = (order.value && order.value.full_address) ? order.value.full_address.slice(0, 26) : '';
+							ctx.setFontSize(Math.max(14, Math.round(fontSize * 0.85)));
+							ctx.fillText(`地址：${addr}`, 20, h - Math.round(barH * 0.2));
+							ctx.draw(false, () => {
+								if (settled) return;
+								uni.canvasToTempFilePath({
+									canvasId: 'detailWatermarkCanvas',
+									fileType: 'jpg',
+									quality: 0.85,
+									success: (res) => safeResolve(res.tempFilePath || tempPath),
+									fail: () => safeResolve(tempPath)
+								}, instance);
+							});
+						} catch (err) {
+							safeResolve(tempPath);
+						}
+					}, 80);
+				},
+				fail: () => safeResolve(tempPath)
+			});
+		});
+	}
+
+	function openFinishDrawer() {
+		showFinish.value = true;
+	}
+
+	function addFinishImgs() {
+		if (uploadingMedia.value || submitting.value) return;
+		const remain = 6 - finishForm.images.length;
+		if (remain <= 0) return;
+		uni.chooseImage({
+			count: remain,
+			sizeType: ['compressed'],
+			sourceType: ['camera', 'album'],
+			success: async (r) => {
+				const paths = r.tempFilePaths || [];
+				if (!paths.length) return;
+				uploadingMedia.value = true;
+				uni.showLoading({ title: '合成水印上传中...', mask: true });
+				try {
+					for (const p of paths) {
+						const wmPath = await createWatermarkedTempFile(p);
+						const up = await api.upload(wmPath, 'order');
+						finishForm.images.push(up.fullurl || up.url);
+					}
+				} catch (e) {
+				} finally {
+					uploadingMedia.value = false;
+					uni.hideLoading();
+				}
+			}
+		});
+	}
+
+	function removeFinishImg(idx) {
+		if (submitting.value) return;
+		finishForm.images.splice(idx, 1);
+	}
+
+	async function submitFinish() {
+		if (submitting.value || uploadingMedia.value || !order.value) {
+			if (uploadingMedia.value) uni.showToast({ title: '照片正在上传中，请稍候', icon: 'none' });
+			return;
+		}
+		if (!finishForm.images.length) {
+			uni.showToast({ title: '请至少上传 1 张完工现场照片', icon: 'none' });
+			return;
+		}
+		submitting.value = true;
+		try {
+			await api.masterFinish({
+				order_id: order.value.id,
+				images: finishForm.images,
+				damage_remark: finishForm.damage_remark.trim()
+			});
+			showFinish.value = false;
+			uni.showToast({ title: '已提交完工，请请客户出示核销码' });
+			loadDetail();
+		} catch (e) {
+		} finally {
+			submitting.value = false;
+		}
+	}
+
+	function openVerifyDrawer() {
+		verifyCodeVal.value = '';
+		showVerify.value = true;
+	}
+
+	async function submitVerifyCode() {
+		if (submitting.value || !order.value) return;
+		const code = verifyCodeVal.value.trim();
+		if (code.length < 4) {
+			uni.showToast({ title: '请输入正确的客户验收核销码', icon: 'none' });
+			return;
+		}
+		submitting.value = true;
+		try {
+			await api.masterVerifyCode({
+				order_id: order.value.id,
+				verify_code: code
+			});
+			showVerify.value = false;
+			uni.showToast({ title: '核销成功，工费已入账钱包' });
+			loadDetail();
+		} catch (e) {
+		} finally {
+			submitting.value = false;
+		}
+	}
+
+	async function doGrab() {
 		if (!isLogin()) {
 			toLogin();
 			return;
 		}
-		showGrabModal.value = true;
-	}
-
-	async function confirmGrab() {
-		if (grabbing.value || !order.value) return;
-		grabbing.value = true;
+		if (submitting.value || !order.value) return;
+		submitting.value = true;
 		try {
-			const res = await api.masterGrab({ order_id: order.value.id });
-			showGrabModal.value = false;
-			uni.showToast({ title: '抢单成功！', icon: 'success' });
-			setTimeout(() => {
-				uni.redirectTo({
-					url: `/pages/master/success?order_id=${order.value.id}&mobile=${res.user_mobile || ''}`
-				});
-			}, 600);
+			await api.masterGrab({ order_id: order.value.id });
+			uni.redirectTo({
+				url: `/pages/master/success?id=${order.value.id}`,
+				complete: () => { submitting.value = false; }
+			});
 		} catch (e) {
-			if (e && e.code === 2001) {
-				showGrabModal.value = false;
-				setTimeout(() => {
-					uni.navigateTo({ url: '/pages/master/apply' });
-				}, 600);
-				return;
-			}
-			uni.showToast({ title: e.msg || e.message || '抢单失败，可能已被接单', icon: 'none' });
-		} finally {
-			grabbing.value = false;
+			submitting.value = false;
 		}
 	}
 
@@ -498,767 +1205,1170 @@
 			toLogin();
 			return;
 		}
-		showQuoteModal.value = true;
-	}
-
-	function onQuoteHourChange(e) {
-		quoteForm.valid_hours = Number(quoteHourOptions[e.detail.value]);
+		quoteForm.amount = '';
+		quoteForm.description = '';
+		showQuote.value = true;
 	}
 
 	async function submitQuote() {
+		if (submitting.value || !order.value) return;
 		const amt = Number(quoteForm.amount);
 		if (!amt || amt <= 0) {
 			uni.showToast({ title: '请输入有效的报价金额', icon: 'none' });
 			return;
 		}
-		if (quoteSubmitting.value || !order.value) return;
-		quoteSubmitting.value = true;
+		submitting.value = true;
 		try {
 			await api.masterQuote({
 				order_id: order.value.id,
 				amount: amt,
-				valid_hours: quoteForm.valid_hours,
-				description: quoteForm.description
+				description: quoteForm.description.trim()
 			});
-			showQuoteModal.value = false;
-			uni.showToast({ title: '报价提交成功，等待客户选择', icon: 'success' });
-			setTimeout(() => {
-				loadDetail();
-			}, 800);
+			showQuote.value = false;
+			uni.showToast({ title: '报价已发送，等待客户选择' });
+			loadDetail();
 		} catch (e) {
-			if (e && e.code === 2001) {
-				showQuoteModal.value = false;
-				setTimeout(() => {
-					uni.navigateTo({ url: '/pages/master/apply' });
-				}, 600);
-				return;
-			}
-			uni.showToast({ title: e.msg || e.message || '提交报价失败', icon: 'none' });
 		} finally {
-			quoteSubmitting.value = false;
+			submitting.value = false;
 		}
 	}
 
-	function goMyOrders() {
-		uni.redirectTo({ url: '/pages/master/orders' });
+	function previewImages(urls, idx) {
+		if (!urls || !urls.length) return;
+		uni.previewImage({ urls, current: urls[idx] });
 	}
+
+	function copyOrderNo() {
+		if (!order.value) return;
+		uni.setClipboardData({
+			data: order.value.order_no,
+			success: () => uni.showToast({ title: '工单号已复制' })
+		});
+	}
+
+	function contactPlatform() {
+		api.contactService();
+	}
+
+	function goWallet() {
+		uni.navigateTo({ url: '/pages/master/wallet' });
+	}
+
+	function goOrdersList() {
+		uni.navigateTo({ url: '/pages/master/orders' });
+	}
+
+	onLoad((opts) => {
+		if (opts && opts.id) {
+			orderId.value = Number(opts.id) || 0;
+		}
+		if (opts && opts.action) {
+			initialAction.value = String(opts.action);
+		}
+	});
+
+	onShow(() => {
+		if (orderId.value) {
+			loadDetail();
+		}
+	});
+
+	onBeforeUnmount(() => {
+		if (timer) clearInterval(timer);
+	});
 </script>
 
-<style scoped>
-	.detail-page {
+<style lang="scss" scoped>
+	@import '@/uni.scss';
+	.page {
 		min-height: 100vh;
-		background: #F5F6F8;
-		padding-bottom: 20rpx;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(160rpx + env(safe-area-inset-bottom));
 	}
 
-	/* 顶部导航 */
-	.nav-bar {
+	.state-box {
+		padding: 160rpx 48rpx;
 		display: flex;
+		flex-direction: column;
 		align-items: center;
-		justify-content: space-between;
-		padding: 20rpx 24rpx;
-		height: 88rpx;
-		background: #FFFFFF;
-		box-sizing: border-box;
-		border-bottom: 1rpx solid #EBEBEB;
+		gap: 20rpx;
 	}
-	.nav-btn {
-		width: 60rpx;
-		height: 60rpx;
+
+	.empty-ico {
+		width: 180rpx;
+		height: 180rpx;
+	}
+
+	.state-txt {
+		font-size: $yjyf-font-base;
+		color: $yjyf-text-secondary;
+	}
+
+	.retry-btn {
+		margin-top: 12rpx;
+		height: 68rpx;
+		padding: 0 40rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-sm;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
-	.nav-icon {
-		width: 36rpx;
-		height: 36rpx;
+
+	/* 履约状态头部卡 */
+	.status-hero {
+		margin: 24rpx;
+		padding: 32rpx 28rpx;
+		border-radius: $yjyf-radius-card;
+		background: $yjyf-bg-card;
+		box-shadow: $yjyf-shadow-card;
 	}
-	.nav-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #1F1F1F;
-	}
-	.nav-actions {
-		width: 60rpx;
+
+	.sh-top {
 		display: flex;
-		justify-content: flex-end;
+		align-items: flex-start;
+		justify-content: space-between;
+		gap: 20rpx;
 	}
-	.share-btn {
+
+	.sh-title-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		gap: 8rpx;
+	}
+
+	.sh-status {
+		font-size: 36rpx;
+		font-weight: 800;
+		color: $yjyf-text-main;
+	}
+
+	.sh-tip {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-secondary;
+		line-height: 1.4;
+	}
+
+	.sh-fee-box {
+		text-align: right;
+		flex-shrink: 0;
+		padding: 12rpx 20rpx;
+		border-radius: $yjyf-radius-md;
+		background: $yjyf-primary-bg;
+		display: flex;
+		flex-direction: column;
+		gap: 4rpx;
+	}
+
+	.sh-fee-label {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-secondary;
+	}
+
+	.sh-fee-val {
+		font-size: $yjyf-font-lg;
+		font-weight: 800;
+		color: $yjyf-primary;
+	}
+
+	.contact-alert {
+		margin-top: 24rpx;
+		padding: 18rpx 20rpx;
+		border-radius: 14rpx;
+		background: $yjyf-primary-bg;
+		border: 1rpx solid $yjyf-primary-border;
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+	}
+
+	.ca-ico {
+		width: 30rpx;
+		height: 30rpx;
+		flex-shrink: 0;
+	}
+
+	.ca-txt {
+		flex: 1;
+		font-size: $yjyf-font-xs;
+		color: $yjyf-primary;
+		font-weight: 600;
+		line-height: 1.4;
+	}
+
+	.ca-btn {
+		padding: 8rpx 20rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-xs;
+		font-weight: 600;
+		flex-shrink: 0;
+	}
+
+	/* 5步进度条 */
+	.steps-bar {
+		margin-top: 32rpx;
+		padding-top: 24rpx;
+		border-top: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: flex-start;
+		justify-content: space-between;
+	}
+
+	.step-node {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 10rpx;
+	}
+
+	.sn-dot-row {
+		width: 100%;
+		display: flex;
+		align-items: center;
+	}
+
+	.sn-line {
+		flex: 1;
+		height: 4rpx;
+		background: $yjyf-border-color;
+
+		&.active {
+			background: $yjyf-primary;
+		}
+
+		&.hidden {
+			background: transparent;
+		}
+	}
+
+	.sn-dot {
+		width: 38rpx;
+		height: 38rpx;
+		border-radius: 50%;
+		background: $yjyf-bg-page;
+		border: 2rpx solid $yjyf-text-disabled;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+	}
+
+	.sn-idx {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-muted;
+		font-weight: 600;
+	}
+
+	.sn-check {
+		width: 22rpx;
+		height: 22rpx;
+	}
+
+	.sn-label {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-muted;
+	}
+
+	.step-node.done .sn-dot {
+		background: $yjyf-primary;
+		border-color: $yjyf-primary;
+	}
+
+	.step-node.done .sn-idx {
+		color: $yjyf-text-inverse;
+	}
+
+	.step-node.done .sn-label {
+		color: $yjyf-text-regular;
+	}
+
+	.step-node.current .sn-label {
+		color: $yjyf-primary;
+		font-weight: 700;
+	}
+
+	/* 大厅待抢横幅 */
+	.hall-banner {
+		margin: 24rpx;
+		padding: 32rpx 28rpx;
+		border-radius: $yjyf-radius-card;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-text-inverse;
+		box-shadow: $yjyf-shadow-button;
+	}
+
+	.hb-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.hb-type-row {
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+	}
+
+	.hb-badge {
+		padding: 6rpx 18rpx;
+		border-radius: $yjyf-radius-pill;
+		background: rgba(255, 255, 255, 0.22);
+		font-size: $yjyf-font-xs;
+		font-weight: 600;
+	}
+
+	.hb-urgent {
+		padding: 6rpx 16rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-card;
+		color: $yjyf-danger;
+		font-size: $yjyf-font-xs;
+		font-weight: 700;
+	}
+
+	.hb-countdown {
+		font-size: $yjyf-font-xs;
+		opacity: 0.92;
+	}
+
+	.hb-price-row {
+		margin-top: 24rpx;
+	}
+
+	.hb-price-label {
+		font-size: $yjyf-font-sm;
+		opacity: 0.9;
+	}
+
+	.hb-amt {
+		margin-top: 6rpx;
+		display: flex;
+		align-items: baseline;
+	}
+
+	.hb-sym {
+		font-size: $yjyf-font-lg;
+		font-weight: 700;
+		margin-right: 4rpx;
+	}
+
+	.hb-num {
+		font-size: 52rpx;
+		font-weight: 800;
+		line-height: 1.1;
+	}
+
+	.hb-quote-tip {
+		display: block;
+		margin-top: 10rpx;
+		font-size: $yjyf-font-base;
+		font-weight: 600;
+	}
+
+	/* 标准卡片容器 */
+	.card {
+		margin: 0 24rpx 24rpx;
+		padding: 28rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		box-shadow: $yjyf-shadow-card;
+	}
+
+	.card-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 22rpx;
+	}
+
+	.card-title {
+		font-size: $yjyf-font-md;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.urgent-pill {
+		padding: 4rpx 16rpx;
+		border-radius: $yjyf-radius-pill;
+		background: rgba(232, 51, 27, 0.1);
+		color: $yjyf-danger;
+		font-size: $yjyf-font-xs;
+		font-weight: 600;
+	}
+
+	.dist-pill,
+	.cat-tag,
+	.q-state-tag {
+		padding: 4rpx 16rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-xs;
+		font-weight: 600;
+	}
+
+	.diff-badge,
+	.settle-tag {
+		padding: 4rpx 16rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+		color: $yjyf-warning;
+		font-size: $yjyf-font-xs;
+		font-weight: 600;
+
+		&.paid,
+		&.ok {
+			background: rgba(47, 168, 79, 0.1);
+			color: $yjyf-success;
+		}
+	}
+
+	/* 客户与地址 */
+	.customer-box {
+		display: flex;
+		align-items: center;
+		gap: 20rpx;
+		padding-bottom: 24rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.cust-avatar {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+		flex-shrink: 0;
+	}
+
+	.cust-info {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+		gap: 6rpx;
+	}
+
+	.cust-name {
+		font-size: $yjyf-font-base;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.cust-phone {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-regular;
+	}
+
+	.action-pill {
+		height: 64rpx;
+		padding: 0 24rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+		flex-shrink: 0;
+	}
+
+	.ap-ico {
+		width: 28rpx;
+		height: 28rpx;
+	}
+
+	.ap-txt {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	.addr-box {
+		padding: 24rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 20rpx;
+	}
+
+	.addr-main {
+		flex: 1;
+		min-width: 0;
+	}
+
+	.addr-row {
+		display: flex;
+		align-items: flex-start;
+		gap: 12rpx;
+	}
+
+	.loc-ico {
+		width: 32rpx;
+		height: 32rpx;
+		margin-top: 4rpx;
+		flex-shrink: 0;
+	}
+
+	.addr-text {
+		flex: 1;
+		font-size: $yjyf-font-base;
+		color: $yjyf-text-main;
+		font-weight: 600;
+		line-height: 1.5;
+	}
+
+	.meta-pills {
+		margin-top: 14rpx;
+		padding-left: 44rpx;
+		display: flex;
+		flex-wrap: wrap;
+		gap: 12rpx;
+	}
+
+	.m-pill {
+		padding: 4rpx 16rpx;
+		border-radius: 8rpx;
+		background: $yjyf-bg-page;
+		color: $yjyf-text-regular;
+		font-size: $yjyf-font-xs;
+	}
+
+	.nav-btn {
+		width: 108rpx;
+		height: 108rpx;
+		border-radius: $yjyf-radius-md;
+		background: $yjyf-primary-bg;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		gap: 6rpx;
+		flex-shrink: 0;
+	}
+
+	.nav-ico {
+		width: 38rpx;
+		height: 38rpx;
+	}
+
+	.nav-txt {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	/* 键值行 */
+	.kv-row {
+		padding: 16rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 20rpx;
+
+		&.top-border {
+			margin-top: 8rpx;
+			padding-top: 22rpx;
+			border-top: 1rpx solid $yjyf-border-color;
+		}
+	}
+
+	.kv-k {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-secondary;
+
+		&.bold {
+			color: $yjyf-text-main;
+			font-weight: 700;
+		}
+	}
+
+	.kv-v-wrap {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+	}
+
+	.kv-v {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-main;
+		text-align: right;
+
+		&.highlight {
+			color: $yjyf-primary;
+			font-weight: 600;
+		}
+
+		&.price {
+			color: $yjyf-primary;
+			font-weight: 700;
+			font-size: $yjyf-font-md;
+		}
+
+		&.price-lg {
+			color: $yjyf-primary;
+			font-weight: 800;
+			font-size: 36rpx;
+		}
+
+		&.muted {
+			color: $yjyf-text-secondary;
+		}
+	}
+
+	.arrow-sm,
+	.copy-ico {
+		width: 26rpx;
+		height: 26rpx;
+	}
+
+	/* 商品列表 */
+	.goods-list {
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+	}
+
+	.g-item {
+		display: flex;
+		gap: 20rpx;
+		padding: 18rpx;
+		border-radius: $yjyf-radius-md;
+		background: $yjyf-bg-page;
+	}
+
+	.g-img {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 12rpx;
+		background: $yjyf-bg-card;
+		flex-shrink: 0;
+	}
+
+	.g-main {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		gap: 8rpx;
+	}
+
+	.g-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 12rpx;
+	}
+
+	.g-name {
+		flex: 1;
+		font-size: $yjyf-font-base;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.g-num {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-primary;
+		font-weight: 700;
+	}
+
+	.g-sub,
+	.g-addon {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-secondary;
+	}
+
+	.remark-box {
+		margin-top: 20rpx;
+		padding: 18rpx 20rpx;
+		border-radius: 12rpx;
+		background: $yjyf-primary-bg;
+		font-size: $yjyf-font-sm;
+		line-height: 1.5;
+	}
+
+	.rk-label {
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	.rk-txt {
+		color: $yjyf-text-regular;
+	}
+
+	.media-sec {
+		margin-top: 24rpx;
+	}
+
+	.media-title {
+		display: block;
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-secondary;
+		margin-bottom: 14rpx;
+	}
+
+	.media-grid {
+		display: grid;
+		grid-template-columns: repeat(3, 1fr);
+		gap: 14rpx;
+	}
+
+	.media-img {
+		width: 100%;
+		height: 196rpx;
+		border-radius: 12rpx;
+		background: $yjyf-bg-page;
+	}
+
+	.diff-img {
+		width: 220rpx;
+		height: 220rpx;
+		border-radius: 12rpx;
+	}
+
+	/* 履约时间线 */
+	.timeline {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.tl-item {
+		display: flex;
+		gap: 20rpx;
+	}
+
+	.tl-left {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 24rpx;
+	}
+
+	.tl-dot {
+		width: 16rpx;
+		height: 16rpx;
+		border-radius: 50%;
+		background: $yjyf-text-disabled;
+		margin-top: 10rpx;
+	}
+
+	.tl-item.latest .tl-dot {
+		width: 20rpx;
+		height: 20rpx;
+		background: $yjyf-primary;
+	}
+
+	.tl-line {
+		flex: 1;
+		width: 2rpx;
+		background: $yjyf-border-color;
+		min-height: 40rpx;
+	}
+
+	.tl-body {
+		flex: 1;
+		padding-bottom: 26rpx;
+	}
+
+	.tl-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.tl-status {
+		font-size: $yjyf-font-sm;
+		font-weight: 600;
+		color: $yjyf-text-regular;
+	}
+
+	.tl-item.latest .tl-status {
+		color: $yjyf-primary;
+		font-weight: 700;
+	}
+
+	.tl-time {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-muted;
+	}
+
+	.tl-remark {
+		display: block;
+		margin-top: 6rpx;
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-secondary;
+		line-height: 1.5;
+	}
+
+	/* 底部操作栏（box-sizing: content-box 避免全面屏安全区压缩内容高） */
+	.bottom-bar {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 90;
+		height: 112rpx;
+		box-sizing: content-box;
+		padding: 12rpx 24rpx calc(12rpx + env(safe-area-inset-bottom));
+		background: $yjyf-bg-card;
+		border-top: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: center;
+		gap: 20rpx;
+	}
+
+	.bar-icon-btn {
+		width: 104rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		gap: 4rpx;
+		flex-shrink: 0;
+	}
+
+	.bi-ico {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.bi-txt {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-regular;
+	}
+
+	.bar-btns {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+	}
+
+	.b-btn {
+		flex: 1;
+		height: 84rpx;
+		border-radius: $yjyf-radius-pill;
+		font-size: $yjyf-font-base;
+		font-weight: 700;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		&.outline {
+			flex: 0.72;
+			background: $yjyf-bg-card;
+			border: 2rpx solid $yjyf-border-color;
+			color: $yjyf-text-regular;
+		}
+
+		&.primary {
+			background: $yjyf-gradient-primary;
+			color: $yjyf-text-inverse;
+			box-shadow: $yjyf-shadow-button;
+		}
+
+		&.disabled {
+			opacity: 0.6;
+		}
+
+		&.disabled-solid {
+			background: $yjyf-bg-page;
+			color: $yjyf-text-muted;
+			font-weight: 600;
+		}
+	}
+
+	/* 半屏操作抽屉统一规范 */
+	.drawer-mask {
+		position: fixed;
+		inset: 0;
+		z-index: 999;
+		background: rgba(0, 0, 0, 0.48);
+		display: flex;
+		align-items: flex-end;
+	}
+
+	.drawer-panel {
+		width: 100%;
+		max-height: 84vh;
+		overflow-y: auto;
+		background: $yjyf-bg-card;
+		border-radius: 24rpx 24rpx 0 0;
+		padding: 32rpx 32rpx calc(36rpx + env(safe-area-inset-bottom));
+	}
+
+	.dp-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 24rpx;
+	}
+
+	.dp-title {
+		font-size: $yjyf-font-lg;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.dp-close {
 		width: 64rpx;
 		height: 64rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
-	.action-icon {
-		width: 38rpx;
-		height: 38rpx;
-	}
 
-	/* 顶部抢单提示条（对标实机） */
-	.rush-banner {
-		background: #FFF7ED;
-		border-bottom: 1rpx solid #FFEDD5;
-		padding: 16rpx 28rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.rush-left, .rush-right {
-		display: flex;
-		align-items: baseline;
-	}
-	.rush-bold {
-		font-size: 28rpx;
-		font-weight: 700;
-		color: #EA580C;
-		margin: 0 4rpx;
-	}
-	.rush-txt {
-		font-size: 24rpx;
-		color: #9A3412;
-	}
-
-	.page-body {
-		padding: 20rpx 24rpx;
-	}
-
-	/* 通用卡片 */
-	.card {
-		background: #FFFFFF;
-		border-radius: 20rpx;
-		padding: 24rpx;
-		margin-bottom: 20rpx;
-		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.03);
-	}
-	.card-head {
-		margin-bottom: 20rpx;
-	}
-	.card-title {
-		font-size: 30rpx;
-		font-weight: 700;
-		color: #1F1F1F;
-	}
-	.flex-between {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	/* 业主信息卡片 */
-	.client-phone-row {
-		display: flex;
-		align-items: center;
-		margin-bottom: 14rpx;
-	}
-	.client-icon {
+	.close-ico {
 		width: 32rpx;
 		height: 32rpx;
-		margin-right: 12rpx;
-	}
-	.client-phone {
-		font-size: 30rpx;
-		font-weight: 600;
-		color: #1F1F1F;
 	}
 
-	.address-box {
-		display: flex;
-		align-items: flex-start;
-		justify-content: space-between;
-		padding-bottom: 16rpx;
-		border-bottom: 1rpx dashed #E5E7EB;
+	.dp-sub-tip {
+		display: block;
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-secondary;
+		line-height: 1.5;
+		margin-bottom: 24rpx;
 	}
-	.addr-main {
-		flex: 1;
-		min-width: 0;
-		display: flex;
-		align-items: flex-start;
+
+	.dp-label {
+		display: block;
+		font-size: $yjyf-font-sm;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		margin: 20rpx 0 16rpx;
 	}
-	.addr-icon {
-		width: 28rpx;
-		height: 28rpx;
-		margin-top: 6rpx;
-		margin-right: 10rpx;
-		flex-shrink: 0;
+
+	.date-scroll {
+		white-space: nowrap;
 	}
-	.addr-text {
-		font-size: 28rpx;
-		color: #374151;
-		line-height: 40rpx;
-		font-weight: 500;
-	}
-	.nav-action {
+
+	.date-pills {
 		display: inline-flex;
+		gap: 16rpx;
+	}
+
+	.date-pill {
+		width: 132rpx;
+		height: 108rpx;
+		border-radius: $yjyf-radius-md;
+		background: $yjyf-bg-page;
+		border: 2rpx solid transparent;
+		display: inline-flex;
+		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		margin-left: 20rpx;
-		flex-shrink: 0;
-		height: 44rpx;
-		padding: 0 16rpx;
-		background: #FFF7ED;
-		border-radius: 22rpx;
-		line-height: 1;
-	}
-	.nav-arrow-ico {
-		width: 24rpx;
-		height: 24rpx;
-		margin-right: 6rpx;
-	}
-	.nav-action-txt {
-		font-size: 22rpx;
-		color: #EA580C;
-		font-weight: 600;
-		line-height: 1;
+		gap: 6rpx;
+
+		&.on {
+			background: $yjyf-primary-bg;
+			border-color: $yjyf-primary;
+		}
 	}
 
-	.distance-notice {
-		margin-top: 16rpx;
-		display: flex;
-		align-items: flex-start;
-	}
-	.dist-tag {
-		background: #FFF1F2;
-		color: #E11D48;
-		font-size: 22rpx;
-		height: 36rpx;
-		padding: 0 12rpx;
-		border-radius: 6rpx;
-		margin-right: 10rpx;
-		flex-shrink: 0;
-		font-weight: 600;
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-		line-height: 1;
-	}
-	.dist-desc {
-		font-size: 22rpx;
-		color: #6B7280;
-		line-height: 34rpx;
+	.dp-week {
+		font-size: $yjyf-font-sm;
+		font-weight: 700;
+		color: $yjyf-text-main;
 	}
 
-	.appoint-time-row {
-		margin-top: 18rpx;
-		display: flex;
-		align-items: center;
-	}
-	.time-ico {
-		width: 26rpx;
-		height: 26rpx;
-		margin-right: 10rpx;
-	}
-	.appoint-k {
-		font-size: 26rpx;
-		color: #4B5563;
-	}
-	.appoint-v {
-		font-size: 26rpx;
-		color: #1F1F1F;
-		font-weight: 600;
+	.dp-day {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-secondary;
 	}
 
-	/* 商品信息卡片 */
-	.goods-row {
-		display: flex;
-		padding-bottom: 20rpx;
-		border-bottom: 1rpx solid #F3F4F6;
+	.date-pill.on .dp-week,
+	.date-pill.on .dp-day {
+		color: $yjyf-primary;
 	}
-	.goods-thumb-wrap {
-		position: relative;
-		width: 140rpx;
-		height: 140rpx;
+
+	.slot-grid {
+		display: grid;
+		grid-template-columns: repeat(4, 1fr);
+		gap: 16rpx;
+	}
+
+	.slot-pill {
+		height: 72rpx;
 		border-radius: 12rpx;
-		overflow: hidden;
-		background: #F8F9FA;
-		flex-shrink: 0;
+		background: $yjyf-bg-page;
+		border: 2rpx solid transparent;
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-regular;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		&.on {
+			background: $yjyf-primary-bg;
+			border-color: $yjyf-primary;
+			color: $yjyf-primary;
+			font-weight: 700;
+		}
 	}
-	.goods-thumb {
+
+	.form-row {
+		height: 92rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 20rpx;
+	}
+
+	.fr-label {
+		font-size: $yjyf-font-base;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.fr-input {
+		flex: 1;
+		text-align: right;
+		font-size: $yjyf-font-base;
+		color: $yjyf-text-main;
+	}
+
+	.form-col {
+		margin-top: 24rpx;
+		display: flex;
+		flex-direction: column;
+		gap: 14rpx;
+	}
+
+	.fr-textarea {
+		width: 100%;
+		height: 160rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+		border-radius: $yjyf-radius-md;
+		background: $yjyf-bg-page;
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-main;
+	}
+
+	.upload-row,
+	.upload-grid {
+		display: grid;
+		grid-template-columns: repeat(3, 1fr);
+		gap: 16rpx;
+	}
+
+	.up-item {
+		position: relative;
+		height: 188rpx;
+		border-radius: 14rpx;
+		overflow: hidden;
+	}
+
+	.up-img {
 		width: 100%;
 		height: 100%;
 	}
-	.view-large-badge {
+
+	.up-del {
 		position: absolute;
-		bottom: 0; left: 0; right: 0;
+		top: 8rpx;
+		right: 8rpx;
+		width: 48rpx;
+		height: 48rpx;
+		border-radius: 50%;
 		background: rgba(0, 0, 0, 0.55);
-		color: #FFFFFF;
-		font-size: 18rpx;
-		text-align: center;
-		padding: 4rpx 0;
-	}
-	.goods-info {
-		flex: 1;
-		min-width: 0;
-		margin-left: 20rpx;
 		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-	}
-	.goods-name {
-		font-size: 28rpx;
-		font-weight: 700;
-		color: #1F1F1F;
-		line-height: 38rpx;
-	}
-	.goods-qty {
-		font-size: 24rpx;
-		color: #6B7280;
-	}
-	.service-type-row {
-		display: flex;
-		align-items: center;
-	}
-	.st-label {
-		font-size: 24rpx;
-		color: #6B7280;
-	}
-	.st-pill {
-		font-size: 22rpx;
-		color: #EA580C;
-		background: #FFF7ED;
-		border: 1rpx solid #FFEDD5;
-		height: 38rpx;
-		line-height: 38rpx;
-		text-align: center;
-		padding: 0 14rpx;
-		border-radius: 8rpx;
-		font-weight: 600;
-		display: inline-flex;
 		align-items: center;
 		justify-content: center;
 	}
 
-	.qty-num {
-		color: #EA580C;
-		font-weight: 600;
+	.del-ico {
+		width: 24rpx;
+		height: 24rpx;
 	}
-	.remark-block {
-		margin-top: 16rpx;
-		padding: 14rpx 18rpx;
-		background: #FFF8F2;
-		border-radius: 12rpx;
-		display: flex;
-		align-items: baseline;
-	}
-	.addon-block {
-		margin-top: 16rpx;
-		padding: 14rpx 18rpx;
-		background: #F0FDF4;
-		border-radius: 12rpx;
+
+	.up-add {
+		height: 188rpx;
+		border-radius: 14rpx;
+		background: $yjyf-bg-page;
+		border: 2rpx dashed $yjyf-text-disabled;
 		display: flex;
+		flex-direction: column;
 		align-items: center;
-	}
-	.addon-pills {
-		display: flex;
-		flex-wrap: wrap;
+		justify-content: center;
 		gap: 10rpx;
 	}
-	.addon-pill {
-		font-size: 22rpx;
-		color: #166534;
-		background: #DCFCE7;
-		height: 40rpx;
-		line-height: 40rpx;
+
+	.cam-ico {
+		width: 48rpx;
+		height: 48rpx;
+	}
+
+	.cam-txt {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-secondary;
+	}
+
+	.verify-code-input {
+		width: 100%;
+		height: 104rpx;
+		box-sizing: border-box;
+		border-radius: $yjyf-radius-md;
+		background: $yjyf-bg-page;
 		text-align: center;
-		padding: 0 14rpx;
-		border-radius: 8rpx;
-		font-weight: 500;
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.video-block {
-		margin-top: 16rpx;
-		padding: 14rpx 18rpx;
-		background: #FFF7ED;
-		border: 1rpx dashed #FDBA74;
-		border-radius: 12rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		gap: 12rpx;
-	}
-	.video-play-icon {
-		width: 32rpx;
-		height: 32rpx;
-		background: #EA580C;
-		border-radius: 50%;
-		padding: 4rpx;
-	}
-	.video-play-txt {
-		font-size: 24rpx;
-		color: #C2410C;
-		font-weight: 600;
-	}
-	.rk-label {
-		font-size: 24rpx;
-		color: #B45309;
-		font-weight: 600;
-		flex-shrink: 0;
-	}
-	.rk-content {
-		font-size: 24rpx;
-		color: #92400E;
-		line-height: 34rpx;
+		font-size: 44rpx;
+		font-weight: 800;
+		letter-spacing: 16rpx;
+		color: $yjyf-text-main;
 	}
 
-	.security-banner {
-		margin-top: 20rpx;
-		padding: 14rpx 18rpx;
-		background: #F9FAFB;
-		border-radius: 10rpx;
-	}
-	.sec-text {
-		font-size: 22rpx;
-		color: #9CA3AF;
-		line-height: 32rpx;
-	}
-
-	/* 订单信息卡片 */
-	.feedback-link {
-		padding: 6rpx 12rpx;
-	}
-	.fb-txt {
-		font-size: 24rpx;
-		color: #6B7280;
-	}
-	.info-row {
-		display: flex;
-		align-items: center;
-		height: 64rpx;
-	}
-	.ik {
-		font-size: 26rpx;
-		color: #6B7280;
-		width: 150rpx;
-	}
-	.iv {
-		font-size: 26rpx;
-		color: #1F1F1F;
-		font-weight: 500;
-	}
-	.mode-highlight {
-		color: #F0710D;
-		font-weight: 600;
-	}
-	.price-txt {
-		font-size: 30rpx;
-		color: #EA580C;
-		font-weight: 700;
-	}
-	.my-quote-txt {
-		font-size: 26rpx;
-		color: #2563EB;
-		font-weight: 600;
-	}
-	.copy-pill {
-		margin-left: 16rpx;
-		height: 40rpx;
-		padding: 0 16rpx;
-		background: #F3F4F6;
-		border-radius: 8rpx;
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-		line-height: 1;
-	}
-	.copy-txt {
-		font-size: 22rpx;
-		color: #374151;
-		line-height: 1;
-	}
-
-	/* 底部固定栏 */
-	.bottom-placeholder {
-		height: 120rpx;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-		box-sizing: content-box;
-	}
-	.bottom-bar {
-		position: fixed;
-		bottom: 0; left: 0; right: 0;
-		background: #FFFFFF;
-		border-top: 1rpx solid #E5E7EB;
-		height: 110rpx;
-		padding: 0 24rpx;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-		box-sizing: content-box;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.05);
-		z-index: 99;
-	}
-	.bar-left {
-		display: flex;
-		align-items: center;
-	}
-	.icon-btn {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		margin-right: 32rpx;
-	}
-	.share-btn-reset {
-		background: transparent;
-		border: none;
-		padding: 0;
-		line-height: 1.2;
-		margin-left: 0;
-	}
-	.share-btn-reset::after {
-		border: none;
-	}
-	.ib-ico {
-		width: 40rpx;
-		height: 40rpx;
-	}
-	.ib-txt {
-		font-size: 22rpx;
-		color: #6B7280;
-		margin-top: 4rpx;
-		line-height: 1;
-	}
-
-	.bar-right {
-		flex: 1;
-		display: flex;
-		justify-content: flex-end;
-	}
-	.primary-action-btn {
-		height: 84rpx;
-		padding: 0 36rpx;
-		border-radius: 42rpx;
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-		box-shadow: 0 6rpx 20rpx rgba(237, 111, 14, 0.35);
-	}
-	.primary-action-btn.custom {
-		background: linear-gradient(135deg, #10B981 0%, #059669 100%);
-		box-shadow: 0 6rpx 20rpx rgba(16, 185, 129, 0.35);
-	}
-	.primary-action-btn.quote {
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
-	}
-	.pab-title {
-		font-size: 30rpx;
-		font-weight: 700;
-		color: #FFFFFF;
-		line-height: 1;
-	}
-	.pab-sub {
-		font-size: 22rpx;
-		color: rgba(255, 255, 255, 0.9);
-		margin-left: 8rpx;
-		line-height: 1;
-	}
-
-	.state-action-btn {
-		height: 84rpx;
-		padding: 0 36rpx;
-		border-radius: 42rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.state-action-btn.disabled {
-		background: #E5E7EB;
-	}
-	.state-action-btn.disabled .sab-txt {
-		color: #9CA3AF;
-		font-size: 28rpx;
-		font-weight: 600;
-	}
-	.state-action-btn.success {
-		background: #F0FDF4;
-		border: 1rpx solid #BBF7D0;
-	}
-	.state-action-btn.success .sab-txt {
-		color: #16A34A;
-		font-size: 28rpx;
-		font-weight: 600;
-	}
-
-	/* 抢单防误点二次确认弹窗（100% 对标工奇兵实机图3） */
-	.confirm-mask {
-		position: fixed;
-		top: 0; left: 0; right: 0; bottom: 0;
-		background: rgba(0, 0, 0, 0.5);
-		z-index: 999;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		padding: 0 60rpx;
-		box-sizing: border-box;
-	}
-	.confirm-dialog {
-		width: 100%;
-		background: #FFFFFF;
-		border-radius: 28rpx;
-		padding: 40rpx 36rpx 32rpx;
-		box-sizing: border-box;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		box-shadow: 0 16rpx 48rpx rgba(0, 0, 0, 0.2);
-	}
-	.cd-title {
-		font-size: 34rpx;
-		font-weight: 700;
-		color: #1F1F1F;
-	}
-	.cd-content {
-		margin-top: 24rpx;
-		font-size: 28rpx;
-		line-height: 44rpx;
-		color: #4B5563;
-		text-align: justify;
-	}
-	.cd-actions {
-		width: 100%;
+	.dp-submit {
 		margin-top: 36rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		border-top: 1rpx solid #F3F4F6;
-		padding-top: 24rpx;
-	}
-	.cd-btn {
-		flex: 1;
-		height: 80rpx;
+		height: 88rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-md;
+		font-weight: 700;
+		box-shadow: $yjyf-shadow-button;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-	}
-	.cd-btn.cancel {
-		border-right: 1rpx solid #F3F4F6;
-	}
-	.cd-btn-txt.cancel {
-		font-size: 30rpx;
-		color: #6B7280;
-	}
-	.cd-btn-txt.ok {
-		font-size: 30rpx;
-		font-weight: 700;
-		color: #EA580C;
-	}
-	.cd-btn.disabled {
-		opacity: 0.6;
+
+		&.disabled {
+			opacity: 0.6;
+		}
 	}
 
-	/* 报价抽屉 */
-	.quote-mask {
-		position: fixed;
-		top: 0; left: 0; right: 0; bottom: 0;
-		background: rgba(0, 0, 0, 0.55);
-		z-index: 999;
-		display: flex;
-		align-items: flex-end;
-	}
-	.quote-drawer {
-		width: 100%;
-		background: #FFFFFF;
-		border-radius: 32rpx 32rpx 0 0;
-		padding: 36rpx 36rpx constant(safe-area-inset-bottom);
-		padding: 36rpx 36rpx env(safe-area-inset-bottom);
-		box-sizing: border-box;
-		animation: slideUp 0.25s ease-out;
-	}
-	.qd-head {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding-bottom: 24rpx;
-		border-bottom: 1rpx solid #F3F4F6;
-	}
-	.qd-title {
-		font-size: 32rpx;
-		font-weight: 700;
-		color: #1F1F1F;
-	}
-	.qd-close {
-		width: 36rpx;
-		height: 36rpx;
-	}
-	.qd-body {
-		padding: 24rpx 0;
-	}
-	.qd-field {
-		margin-bottom: 24rpx;
-	}
-	.qd-label {
-		display: block;
-		font-size: 26rpx;
-		font-weight: 600;
-		color: #374151;
-		margin-bottom: 12rpx;
-	}
-	.price-input-wrap {
-		display: flex;
-		align-items: center;
-		background: #F9FAFB;
-		border: 1rpx solid #E5E7EB;
-		border-radius: 14rpx;
-		height: 88rpx;
-		padding: 0 24rpx;
-	}
-	.cny-sym {
-		font-size: 36rpx;
-		font-weight: 700;
-		color: #EA580C;
-		margin-right: 12rpx;
-	}
-	.price-input {
-		flex: 1;
-		font-size: 32rpx;
-		color: #1F1F1F;
-		font-weight: 600;
-	}
-	.hour-picker-val {
-		height: 80rpx;
-		background: #F9FAFB;
-		border: 1rpx solid #E5E7EB;
+	.master-video-box {
+		height: 188rpx;
 		border-radius: 14rpx;
+		background: #2C2C2E;
 		display: flex;
-		align-items: center;
-		padding: 0 24rpx;
-		font-size: 28rpx;
-		color: #1F1F1F;
-	}
-	.desc-textarea {
-		width: 100%;
-		height: 140rpx;
-		background: #F9FAFB;
-		border: 1rpx solid #E5E7EB;
-		border-radius: 14rpx;
-		padding: 16rpx 20rpx;
-		box-sizing: border-box;
-		font-size: 26rpx;
-		color: #1F1F1F;
-	}
-	.qd-foot {
-		padding-top: 12rpx;
-	}
-	.qd-submit-btn {
-		height: 88rpx;
-		border-radius: 44rpx;
-		background: linear-gradient(135deg, #F98D25 0%, #ED6F0E 100%);
-		display: flex;
+		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		box-shadow: 0 8rpx 24rpx rgba(237, 111, 14, 0.35);
+		gap: 10rpx;
 	}
-	.qsb-txt {
-		font-size: 30rpx;
-		font-weight: 700;
-		color: #FFFFFF;
+
+	.mv-play-ico {
+		width: 48rpx;
+		height: 48rpx;
 	}
-	.qd-submit-btn.disabled {
-		opacity: 0.6;
+
+	.mv-play-txt {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-inverse;
+	}
+
+	.master-video-player {
+		width: 100%;
+		height: 440rpx;
+		border-radius: $yjyf-radius-md;
+		background: #000000;
 	}
 </style>
diff --git a/yjyf-app/pages/master/hall.vue b/yjyf-app/pages/master/hall.vue
index 4a74cfd..36f630e 100644
--- a/yjyf-app/pages/master/hall.vue
+++ b/yjyf-app/pages/master/hall.vue
@@ -10,9 +10,11 @@
 
 <script setup>
 	import { ref } from 'vue';
-	import { onLoad, onShow, onPullDownRefresh } from '@dcloudio/uni-app';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import MasterHallView from '@/components/master/MasterHallView.vue';
 	import YjyfMasterTabBar from '@/components/YjyfMasterTabBar.vue';
+	import { isLogin } from '@/utils/request.js';
+	import { setRole } from '@/utils/role.js';
 	import { useShare } from '@/utils/share.js';
 
 	const hallRef = ref(null);
@@ -32,7 +34,7 @@
 				return;
 			}
 			if (t === 2) {
-				uni.redirectTo({ url: '/pages/message/message' });
+				uni.redirectTo({ url: '/pages/message/message?role=master' });
 				return;
 			}
 			if (t === 3) {
@@ -43,26 +45,19 @@
 	});
 
 	onShow(() => {
+		if (isLogin()) {
+			setRole('master');
+		}
 		if (hallRef.value?.load) {
 			hallRef.value.load();
 		}
 	});
-
-	onPullDownRefresh(async () => {
-		try {
-			if (hallRef.value?.load) {
-				await hallRef.value.load();
-			}
-		} catch (e) {
-		} finally {
-			uni.stopPullDownRefresh();
-		}
-	});
 </script>
 
 <style scoped>
 	.master-hall-page {
-		min-height: 100vh;
+		height: 100vh;
+		overflow: hidden;
 		background: #F5F6F8;
 	}
 </style>
diff --git a/yjyf-app/pages/master/orders.vue b/yjyf-app/pages/master/orders.vue
index b1ed6b6..b57b3cf 100644
--- a/yjyf-app/pages/master/orders.vue
+++ b/yjyf-app/pages/master/orders.vue
@@ -7,33 +7,28 @@
 
 <script setup>
 	import { ref } from 'vue';
-	import { onShow, onPullDownRefresh } from '@dcloudio/uni-app';
+	import { onShow } from '@dcloudio/uni-app';
 	import MasterOrdersView from '@/components/master/MasterOrdersView.vue';
 	import YjyfMasterTabBar from '@/components/YjyfMasterTabBar.vue';
+	import { isLogin } from '@/utils/request.js';
+	import { setRole } from '@/utils/role.js';
 
 	const ordersRef = ref(null);
 
 	onShow(() => {
+		if (isLogin()) {
+			setRole('master');
+		}
 		if (ordersRef.value?.load) {
 			ordersRef.value.load();
 		}
 	});
-
-	onPullDownRefresh(async () => {
-		try {
-			if (ordersRef.value?.load) {
-				await ordersRef.value.load();
-			}
-		} catch (e) {
-		} finally {
-			uni.stopPullDownRefresh();
-		}
-	});
 </script>
 
 <style scoped>
 	.master-orders-page {
-		min-height: 100vh;
+		height: 100vh;
+		overflow: hidden;
 		background: #F5F6F8;
 	}
 </style>
diff --git a/yjyf-app/pages/master/quote.vue b/yjyf-app/pages/master/quote.vue
index e46c430..2586473 100644
--- a/yjyf-app/pages/master/quote.vue
+++ b/yjyf-app/pages/master/quote.vue
@@ -10,76 +10,133 @@
 			</view>
 			<view class="fi">
 				<text class="fk">报价金额</text>
-				<input class="fv" type="digit" v-model="amount" placeholder="请输入你的报价（元）" />
+				<input class="fv" type="digit" v-model="amount" placeholder="请输入您的全包报价（元）" />
 			</view>
 			<view class="fi">
 				<text class="fk">报价有效期</text>
 				<view class="seg">
-					<view v-for="h in [24, 48, 72]" :key="h" class="seg-i clickable-hover" :class="{ on: hours === h }" @tap="hours = h">{{ h }}h</view>
+					<view
+						v-for="h in [24, 48, 72]"
+						:key="h"
+						class="seg-i clickable-hover"
+						:class="{ on: hours === h }"
+						@tap="hours = h"
+					>{{ h }}小时</view>
 				</view>
 			</view>
-			<textarea class="ta" v-model="desc" maxlength="200" placeholder="服务说明：包含项目、材料、预计工期等" />
+			<textarea class="ta" v-model="desc" maxlength="200" placeholder="服务说明：包含施工内容、辅材配件、预计上门时间等" />
 			<view class="btn clickable-hover" :class="{ disabled: submitting }" @tap="submitQuote">
 				{{ submitting ? '提交中...' : '确认提交报价' }}
 			</view>
 		</view>
 
-		<!-- 历史报价记录卡片 -->
-		<view class="card">
-			<view class="card-head">
-				<text class="card-title">我的报价记录</text>
-				<text class="card-more" v-if="list.length">{{ list.length }} 条记录</text>
+		<!-- 状态筛选栏 -->
+		<view class="tabs-bar" v-if="list.length">
+			<view
+				class="tab-item clickable-hover"
+				:class="{ active: activeFilter === f.val }"
+				v-for="f in filters"
+				:key="f.val"
+				@tap="activeFilter = f.val"
+			>
+				<text class="tab-txt">{{ f.label }}</text>
+				<view class="tab-line" v-if="activeFilter === f.val"></view>
 			</view>
+		</view>
 
-			<view class="q-list" v-if="list.length">
-				<view class="q-item" v-for="q in list" :key="q.id">
-					<view class="q-top">
-						<text class="q-svc">{{ q.service_name || '服务工单' }}</text>
-						<view class="amt-box">
+		<!-- 独立报价卡片列表（点击直达工单详情） -->
+		<view class="q-list" v-if="filteredList.length">
+			<view
+				class="q-card clickable-hover"
+				v-for="q in filteredList"
+				:key="q.id"
+				@tap="goOrderDetail(q)"
+			>
+				<view class="q-top">
+					<text class="q-svc">{{ q.service_name || '服务工单' }}</text>
+					<text class="q-status" :class="'st-' + q.status">{{ q.status_text }}</text>
+				</view>
+
+				<view class="q-body">
+					<view class="q-info">
+						<text class="q-meta">工单号：{{ q.order_no }}</text>
+						<text class="q-meta">提交于 {{ q.time_text }} · 有效期至 {{ q.expire_text }}</text>
+						<text class="q-desc" v-if="q.description">报价说明：{{ q.description }}</text>
+					</view>
+					<view class="amt-box">
+						<text class="amt-label">我的出价</text>
+						<view class="amt-val-row">
 							<text class="amt-symbol">¥</text>
-							<text class="q-amt">{{ q.amount }}</text>
+							<text class="q-amt">{{ Number(q.amount || 0).toFixed(2) }}</text>
 						</view>
 					</view>
-					<text class="q-meta">工单号：{{ q.order_no }} · 提交于 {{ q.time_text }}</text>
-					<text class="q-meta">有效期至：{{ q.expire_text }}</text>
-					<view class="status-wrap">
-						<text class="q-status">{{ q.status_text }}</text>
+				</view>
+
+				<view class="q-foot">
+					<text class="foot-hint">{{ q.status === 'accept' ? '客户已选定您的报价，点击前往履约' : '点击查看原工单需求详情' }}</text>
+					<view class="foot-link">
+						<text class="foot-link-txt">{{ q.status === 'accept' ? '去履约' : '工单详情' }}</text>
+						<image class="arrow-ico" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
 					</view>
 				</view>
 			</view>
+		</view>
 
-			<!-- 报价为空引导 -->
-			<view class="empty-state" v-else>
-				<image class="empty-img" src="/static/icons/master/empty-orders.svg" mode="aspectFit" />
-				<text class="empty-title">暂无任何报价记录</text>
-				<text class="empty-sub">去订单大厅寻找支持师傅自主报价的工单吧</text>
-				<view class="go-hall-btn clickable-hover" @tap="goHall">前往订单大厅</view>
-			</view>
+		<!-- 空状态引导 -->
+		<view class="empty-state" v-else-if="!loading">
+			<image class="empty-img" src="/static/icons/master/empty-quote.svg" mode="aspectFit" />
+			<text class="empty-title">{{ list.length ? '该状态下暂无报价记录' : '暂无报价记录' }}</text>
+			<text class="empty-sub">前往抢单大厅查看支持师傅竞价的工单</text>
+			<view class="go-hall-btn clickable-hover" @tap="goHall">前往抢单大厅</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
-	import { ref } from 'vue';
+	import { ref, computed } from 'vue';
 	import { onShow, onLoad } from '@dcloudio/uni-app';
+	import YjyfNavBar from '@/components/YjyfNavBar.vue';
 	import api from '@/utils/api.js';
 
+	const filters = [
+		{ label: '全部', val: 'all' },
+		{ label: '待选标', val: 'wait' },
+		{ label: '已选中', val: 'accept' },
+		{ label: '未选中', val: 'reject' }
+	];
+
+	const activeFilter = ref('all');
 	const list = ref([]);
+	const loading = ref(false);
 	const amount = ref('');
 	const desc = ref('');
 	const hours = ref(24);
 	const submitting = ref(false);
 	const orderId = ref(0);
 
+	const filteredList = computed(() => {
+		if (activeFilter.value === 'all') return list.value;
+		return list.value.filter((q) => q.status === activeFilter.value);
+	});
+
 	async function load() {
+		loading.value = true;
 		try {
 			const res = await api.masterQuotes();
-			list.value = res.list || [];
-		} catch (e) {}
+			list.value = (res && res.list) ? res.list : [];
+		} catch (e) {
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	function goOrderDetail(q) {
+		if (!q || !q.order_id) return;
+		uni.navigateTo({ url: `/pages/master/detail?id=${q.order_id}` });
 	}
 
 	function goHall() {
-		uni.redirectTo({ url: '/pages/master/hall' });
+		uni.reLaunch({ url: '/pages/master/hall' });
 	}
 
 	async function submitQuote() {
@@ -92,8 +149,8 @@
 		try {
 			await api.masterQuote({
 				order_id: orderId.value,
-				amount: amount.value,
-				description: desc.value,
+				amount: Number(amount.value),
+				description: desc.value.trim(),
 				valid_hours: hours.value
 			});
 			uni.showToast({ title: '报价提交成功' });
@@ -116,42 +173,335 @@
 	onShow(() => load());
 </script>
 
-<style scoped>
-	.page { min-height: 100vh; background: #F5F6F8; padding: 0 0 60rpx; }
-	.card { margin: 20rpx 24rpx 0; padding: 24rpx; background: #fff; border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06); }
-	.card-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 12rpx; }
-	.card-title { font-size: 28rpx; font-weight: 700; color: #1F1F1F; }
-	.card-tip { font-size: 22rpx; color: #F0710D; font-weight: 600; }
-	.card-more { font-size: 22rpx; color: #9A9A9A; }
+<style lang="scss" scoped>
+	@import '@/uni.scss';
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(48rpx + env(safe-area-inset-bottom));
+	}
 
-	.fi { display: flex; align-items: center; min-height: 88rpx; border-bottom: 1rpx solid #F4F4F4; }
-	.fk { width: 170rpx; font-size: 26rpx; color: #666; }
-	.fv { flex: 1; height: 88rpx; font-size: 28rpx; color: #222; }
-	.seg { display: flex; }
-	.seg-i { padding: 0 24rpx; height: 54rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; margin-right: 12rpx; border-radius: 27rpx; background: #F5F5F5; font-size: 24rpx; color: #666; }
-	.seg-i.on { background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); color: #fff; font-weight: 600; }
-	.ta { width: 100%; height: 150rpx; margin-top: 16rpx; padding: 14rpx; box-sizing: border-box; background: #FAFAFA; border-radius: 12rpx; font-size: 26rpx; color: #333; line-height: 38rpx; }
-	.btn { height: 84rpx; margin-top: 20rpx; display: flex; align-items: center; justify-content: center; line-height: 1; border-radius: 42rpx; color: #fff; font-size: 28rpx; font-weight: 600; background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); box-shadow: 0 6rpx 16rpx rgba(240,113,13,0.25); }
-	.btn.disabled { opacity: .7; }
+	.card {
+		margin: 24rpx;
+		padding: 28rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		box-shadow: $yjyf-shadow-card;
+	}
 
-	.q-item { padding: 20rpx 0; border-bottom: 1rpx solid #F4F4F4; display: flex; flex-direction: column; }
-	.q-item:last-child { border-bottom: none; }
-	.q-top { display: flex; align-items: baseline; justify-content: space-between; }
-	.q-svc { font-size: 28rpx; font-weight: 700; color: #1F1F1F; }
-	.amt-box { display: flex; align-items: baseline; }
-	.amt-symbol { font-size: 24rpx; font-weight: 700; color: #F0710D; }
-	.q-amt { font-size: 34rpx; font-weight: 700; color: #F0710D; }
-	.q-meta { margin-top: 6rpx; font-size: 22rpx; color: #8A8A8E; }
-	.status-wrap { margin-top: 10rpx; }
-	.q-status { display: inline-flex; align-items: center; justify-content: center; height: 42rpx; line-height: 42rpx; text-align: center; padding: 0 16rpx; border-radius: 21rpx; background: #EAF2FF; color: #4A7CFF; font-size: 22rpx; font-weight: 500; }
+	.card-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 16rpx;
+	}
+
+	.card-title {
+		font-size: $yjyf-font-md;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.card-tip {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	.fi {
+		display: flex;
+		align-items: center;
+		min-height: 88rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.fk {
+		width: 176rpx;
+		font-size: $yjyf-font-base;
+		color: $yjyf-text-regular;
+	}
+
+	.fv {
+		flex: 1;
+		height: 88rpx;
+		font-size: $yjyf-font-base;
+		color: $yjyf-text-main;
+	}
+
+	.seg {
+		display: flex;
+		gap: 12rpx;
+	}
+
+	.seg-i {
+		padding: 0 24rpx;
+		height: 56rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-regular;
+
+		&.on {
+			background: $yjyf-gradient-primary;
+			color: $yjyf-text-inverse;
+			font-weight: 600;
+		}
+	}
+
+	.ta {
+		width: 100%;
+		height: 156rpx;
+		margin-top: 20rpx;
+		padding: 18rpx;
+		box-sizing: border-box;
+		background: $yjyf-bg-page;
+		border-radius: $yjyf-radius-md;
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-main;
+		line-height: 1.5;
+	}
+
+	.btn {
+		height: 84rpx;
+		margin-top: 24rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: $yjyf-radius-pill;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-base;
+		font-weight: 700;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-button;
+
+		&.disabled {
+			opacity: 0.6;
+		}
+	}
+
+	.tabs-bar {
+		background: $yjyf-bg-card;
+		border-bottom: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+	}
+
+	.tab-item {
+		position: relative;
+		height: 84rpx;
+		padding: 0 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tab-txt {
+		font-size: $yjyf-font-base;
+		color: $yjyf-text-secondary;
+	}
+
+	.tab-item.active .tab-txt {
+		color: $yjyf-primary;
+		font-weight: 700;
+	}
+
+	.tab-line {
+		position: absolute;
+		bottom: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		width: 40rpx;
+		height: 6rpx;
+		border-radius: 3rpx;
+		background: $yjyf-primary;
+	}
+
+	.q-list {
+		padding: 24rpx;
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+	}
+
+	.q-card {
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		padding: 28rpx;
+		box-shadow: $yjyf-shadow-card;
+	}
+
+	.q-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 16rpx;
+		padding-bottom: 18rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.q-svc {
+		flex: 1;
+		min-width: 0;
+		font-size: $yjyf-font-md;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.q-status {
+		padding: 6rpx 18rpx;
+		border-radius: $yjyf-radius-pill;
+		background: rgba(74, 124, 255, 0.1);
+		color: $yjyf-info;
+		font-size: $yjyf-font-xs;
+		font-weight: 600;
+		flex-shrink: 0;
+
+		&.st-accept {
+			background: rgba(47, 168, 79, 0.1);
+			color: $yjyf-success;
+		}
+
+		&.st-reject,
+		&.st-expired {
+			background: $yjyf-bg-page;
+			color: $yjyf-text-muted;
+		}
+	}
+
+	.q-body {
+		padding: 20rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 20rpx;
+	}
+
+	.q-info {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+		gap: 8rpx;
+	}
+
+	.q-meta {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-secondary;
+	}
+
+	.q-desc {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-regular;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.amt-box {
+		text-align: right;
+		flex-shrink: 0;
+		display: flex;
+		flex-direction: column;
+		align-items: flex-end;
+		gap: 4rpx;
+	}
+
+	.amt-label {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-muted;
+	}
+
+	.amt-val-row {
+		display: flex;
+		align-items: baseline;
+	}
+
+	.amt-symbol {
+		font-size: $yjyf-font-sm;
+		font-weight: 700;
+		color: $yjyf-primary;
+	}
+
+	.q-amt {
+		font-size: 36rpx;
+		font-weight: 800;
+		color: $yjyf-primary;
+	}
+
+	.q-foot {
+		padding-top: 18rpx;
+		border-top: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.foot-hint {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-muted;
+	}
+
+	.foot-link {
+		display: flex;
+		align-items: center;
+		gap: 6rpx;
+	}
+
+	.foot-link-txt {
+		font-size: $yjyf-font-sm;
+		font-weight: 600;
+		color: $yjyf-primary;
+	}
+
+	.arrow-ico {
+		width: 24rpx;
+		height: 24rpx;
+	}
+
+	.empty-state {
+		padding: 160rpx 48rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 16rpx;
+	}
+
+	.empty-img {
+		width: 180rpx;
+		height: 180rpx;
+	}
+
+	.empty-title {
+		font-size: $yjyf-font-md;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.empty-sub {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-secondary;
+		text-align: center;
+	}
 
-	/* 空状态 */
-	.empty-state { display: flex; flex-direction: column; align-items: center; padding: 80rpx 20rpx 30rpx; }
-	.empty-img { width: 150rpx; height: 150rpx; margin-bottom: 20rpx; }
-	.empty-title { font-size: 28rpx; font-weight: 600; color: #333; margin-bottom: 8rpx; }
-	.empty-sub { font-size: 22rpx; color: #9A9A9A; text-align: center; margin-bottom: 28rpx; }
 	.go-hall-btn {
-		padding: 0 44rpx; height: 68rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 34rpx;
-		background: #FFF3E6; color: #F0710D; font-size: 26rpx; font-weight: 600;
+		margin-top: 20rpx;
+		height: 76rpx;
+		padding: 0 48rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-base;
+		font-weight: 700;
+		box-shadow: $yjyf-shadow-button;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 </style>
diff --git a/yjyf-app/pages/master/reviews.vue b/yjyf-app/pages/master/reviews.vue
new file mode 100644
index 0000000..a0c5dff
--- /dev/null
+++ b/yjyf-app/pages/master/reviews.vue
@@ -0,0 +1,377 @@
+<template>
+	<view class="page">
+		<YjyfNavBar theme="orange" :title="pageTitle" />
+
+		<!-- 综合评分摘要卡 -->
+		<view class="summary-card" v-if="!loading || list.length">
+			<view class="score-left">
+				<text class="score-num">{{ avgScoreText }}</text>
+				<text class="score-unit">分</text>
+			</view>
+			<view class="score-right">
+				<view class="stars-row">
+					<image
+						v-for="n in 5"
+						:key="n"
+						class="star-ico"
+						:src="n <= Math.round(avgScore || 5) ? '/static/icons/star-orange.svg' : '/static/icons/star-gray.svg'"
+						mode="aspectFit"
+					/>
+				</view>
+				<text class="total-txt">累计 {{ total }} 条服务评价</text>
+			</view>
+		</view>
+
+		<!-- 加载态 -->
+		<view class="state-box" v-if="loading && !list.length">
+			<text class="state-txt">正在加载评价记录...</text>
+		</view>
+
+		<!-- 错误态 -->
+		<view class="state-box" v-else-if="loadError && !list.length">
+			<image class="empty-ico" src="/static/icons/empty-review.svg" mode="aspectFit" />
+			<text class="state-txt">{{ loadError }}</text>
+			<view class="retry-btn clickable-hover" @tap="load">重新加载</view>
+		</view>
+
+		<!-- 空状态 -->
+		<view class="state-box" v-else-if="!list.length">
+			<image class="empty-ico" src="/static/icons/empty-review.svg" mode="aspectFit" />
+			<text class="state-txt">暂无客户评价记录</text>
+		</view>
+
+		<!-- 评价列表 -->
+		<view class="review-list" v-else>
+			<view class="rev-card" v-for="item in list" :key="item.id">
+				<view class="rev-head">
+					<image
+						class="rev-avatar"
+						:src="item.avatar || '/static/icons/avatar-member.svg'"
+						mode="aspectFill"
+					/>
+					<view class="rev-user">
+						<text class="rev-name">{{ item.nickname || '业主客户' }}</text>
+						<view class="rev-stars">
+							<image
+								v-for="n in 5"
+								:key="n"
+								class="star-sm"
+								:src="n <= Number(item.score || 5) ? '/static/icons/star-orange.svg' : '/static/icons/star-gray.svg'"
+								mode="aspectFit"
+							/>
+						</view>
+					</view>
+					<text class="rev-time">{{ item.time_text }}</text>
+				</view>
+
+				<view class="rev-tags" v-if="item.parsedTags && item.parsedTags.length">
+					<text class="rev-tag" v-for="(tg, ti) in item.parsedTags" :key="ti">{{ tg }}</text>
+				</view>
+
+				<text class="rev-content">{{ item.content || '客户给予了好评，未填写文字评价' }}</text>
+
+				<view class="rev-imgs" v-if="item.parsedImages && item.parsedImages.length">
+					<image
+						v-for="(im, ii) in item.parsedImages"
+						:key="ii"
+						class="rev-img"
+						:src="im"
+						mode="aspectFill"
+						@tap="preview(item.parsedImages, ii)"
+					/>
+				</view>
+
+				<view class="rev-reply" v-if="item.reply">
+					<text class="reply-label">回复：</text>
+					<text class="reply-txt">{{ item.reply }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app';
+	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import api from '@/utils/api.js';
+
+	const masterId = ref(0);
+	const masterName = ref('');
+	const list = ref([]);
+	const total = ref(0);
+	const avgScore = ref(5);
+	const loading = ref(false);
+	const loadError = ref('');
+
+	const pageTitle = computed(() => {
+		return masterName.value ? `${masterName.value}的服务评价` : '客户评价记录';
+	});
+
+	const avgScoreText = computed(() => {
+		const val = Number(avgScore.value || 0);
+		return val > 0 ? val.toFixed(1) : '5.0';
+	});
+
+	function parseArrayField(raw) {
+		if (!raw) return [];
+		if (Array.isArray(raw)) return raw.filter(Boolean);
+		const str = String(raw).trim();
+		if (!str) return [];
+		try {
+			const dec = JSON.parse(str);
+			if (Array.isArray(dec)) return dec.filter(Boolean);
+		} catch (e) {}
+		return str.split(',').map((s) => s.trim()).filter(Boolean);
+	}
+
+	async function load() {
+		loading.value = true;
+		loadError.value = '';
+		try {
+			const res = await api.reviewList(masterId.value || undefined);
+			const rows = (res && res.list) ? res.list : [];
+			list.value = rows.map((r) => ({
+				...r,
+				parsedTags: parseArrayField(r.tags),
+				parsedImages: parseArrayField(r.images)
+			}));
+			total.value = Number(res && res.total ? res.total : rows.length);
+			avgScore.value = Number(res && res.avg_score ? res.avg_score : 5);
+		} catch (e) {
+			loadError.value = (e && e.msg) ? e.msg : '获取评价记录失败';
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	function preview(urls, idx) {
+		uni.previewImage({ urls, current: urls[idx] });
+	}
+
+	onLoad((opts) => {
+		if (opts && opts.master_id) {
+			masterId.value = Number(opts.master_id) || 0;
+		}
+		if (opts && opts.name) {
+			try {
+				masterName.value = decodeURIComponent(opts.name);
+			} catch (e) {
+				masterName.value = opts.name;
+			}
+		}
+		load();
+	});
+</script>
+
+<style lang="scss" scoped>
+	@import '@/uni.scss';
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: calc(40rpx + env(safe-area-inset-bottom));
+	}
+
+	.summary-card {
+		margin: 24rpx;
+		padding: 32rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		box-shadow: $yjyf-shadow-card;
+		display: flex;
+		align-items: center;
+		gap: 28rpx;
+	}
+
+	.score-left {
+		display: flex;
+		align-items: baseline;
+		padding-right: 28rpx;
+		border-right: 1rpx solid $yjyf-border-color;
+	}
+
+	.score-num {
+		font-size: 56rpx;
+		font-weight: 800;
+		color: $yjyf-primary;
+		line-height: 1;
+	}
+
+	.score-unit {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-primary;
+		margin-left: 6rpx;
+		font-weight: 600;
+	}
+
+	.score-right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		gap: 10rpx;
+	}
+
+	.stars-row {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+	}
+
+	.star-ico {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.total-txt {
+		font-size: $yjyf-font-sm;
+		color: $yjyf-text-secondary;
+	}
+
+	.state-box {
+		padding: 140rpx 48rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 20rpx;
+	}
+
+	.empty-ico {
+		width: 180rpx;
+		height: 180rpx;
+	}
+
+	.state-txt {
+		font-size: $yjyf-font-base;
+		color: $yjyf-text-secondary;
+	}
+
+	.retry-btn {
+		margin-top: 12rpx;
+		height: 68rpx;
+		padding: 0 36rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-sm;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.review-list {
+		padding: 0 24rpx;
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+	}
+
+	.rev-card {
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		padding: 28rpx;
+		box-shadow: $yjyf-shadow-card;
+	}
+
+	.rev-head {
+		display: flex;
+		align-items: center;
+		gap: 18rpx;
+	}
+
+	.rev-avatar {
+		width: 72rpx;
+		height: 72rpx;
+		border-radius: 50%;
+		background: $yjyf-primary-bg;
+		flex-shrink: 0;
+	}
+
+	.rev-user {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+		gap: 6rpx;
+	}
+
+	.rev-name {
+		font-size: $yjyf-font-base;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.rev-stars {
+		display: flex;
+		align-items: center;
+		gap: 4rpx;
+	}
+
+	.star-sm {
+		width: 24rpx;
+		height: 24rpx;
+	}
+
+	.rev-time {
+		font-size: $yjyf-font-xs;
+		color: $yjyf-text-muted;
+		flex-shrink: 0;
+	}
+
+	.rev-tags {
+		margin-top: 18rpx;
+		display: flex;
+		flex-wrap: wrap;
+		gap: 12rpx;
+	}
+
+	.rev-tag {
+		padding: 6rpx 16rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-xs;
+	}
+
+	.rev-content {
+		display: block;
+		margin-top: 18rpx;
+		font-size: $yjyf-font-base;
+		color: $yjyf-text-regular;
+		line-height: 1.6;
+	}
+
+	.rev-imgs {
+		margin-top: 18rpx;
+		display: grid;
+		grid-template-columns: repeat(3, 1fr);
+		gap: 14rpx;
+	}
+
+	.rev-img {
+		width: 100%;
+		height: 196rpx;
+		border-radius: 12rpx;
+		background: $yjyf-bg-page;
+	}
+
+	.rev-reply {
+		margin-top: 20rpx;
+		padding: 18rpx 20rpx;
+		border-radius: 12rpx;
+		background: $yjyf-bg-page;
+		font-size: $yjyf-font-sm;
+		line-height: 1.5;
+	}
+
+	.reply-label {
+		color: $yjyf-text-main;
+		font-weight: 600;
+	}
+
+	.reply-txt {
+		color: $yjyf-text-secondary;
+	}
+</style>
diff --git a/yjyf-app/pages/master/skills.vue b/yjyf-app/pages/master/skills.vue
index 9c89a2e..6d2466e 100644
--- a/yjyf-app/pages/master/skills.vue
+++ b/yjyf-app/pages/master/skills.vue
@@ -2,42 +2,42 @@
 	<view class="skills-page">
 		<YjyfNavBar theme="orange" title="服务技能" />
 
-		<!-- 1. 顶部导航与说明区 -->
 		<view class="header-section">
 			<view class="tip-banner">
 				<image class="tip-icon" src="/static/icons/info-orange.svg" mode="aspectFit" />
 				<view class="tip-content">
-					<text class="tip-title">请选择服务技能</text>
-					<text class="tip-sub">服务技能越准确，订单推送越匹配</text>
+					<text class="tip-title">选择认证服务技能</text>
+					<text class="tip-sub">勾选真实可承接的项目，抢单大厅将按技能精准匹配工单</text>
 				</view>
 			</view>
 		</view>
 
-		<!-- 2. 加载中骨架 -->
+		<!-- 加载骨架 -->
 		<view class="loading-state" v-if="loading">
 			<text class="loading-text">正在加载服务技能字典...</text>
 		</view>
 
-		<!-- 3. 技能大类手风琴列表 -->
+		<!-- 技能大类手风琴列表 -->
 		<view class="accordion-container" v-else>
-			<view class="cat-card" v-for="(group, gIdx) in tree" :key="group.category">
-				<!-- 手风琴标题栏 -->
+			<view class="cat-card" v-for="group in tree" :key="group.category">
 				<view class="cat-header clickable-hover" @tap="toggleExpand(group.category)">
-					<text class="cat-title">{{ group.category }}</text>
-					<image 
-						class="cat-arrow" 
+					<view class="cat-title-wrap">
+						<text class="cat-title">{{ group.category }}</text>
+						<text class="cat-count" v-if="groupSelectedCount(group) > 0">已选 {{ groupSelectedCount(group) }}</text>
+					</view>
+					<image
+						class="cat-arrow"
 						:class="{ collapsed: isCollapsed(group.category) }"
-						src="/static/icons/chevron-up-gray.svg" 
-						mode="aspectFit" 
+						src="/static/icons/chevron-up-gray.svg"
+						mode="aspectFit"
 					/>
 				</view>
 
-				<!-- 技能标签网格 -->
 				<view class="cat-body" v-if="!isCollapsed(group.category)">
 					<view class="skills-grid">
-						<view 
-							class="skill-chip clickable-hover" 
-							v-for="item in group.items" 
+						<view
+							class="skill-chip clickable-hover"
+							v-for="item in group.items"
 							:key="item.id"
 							:class="{ active: isSelected(item.name) }"
 							@tap="toggleSkill(item.name)"
@@ -48,34 +48,37 @@
 				</view>
 			</view>
 
-			<!-- 4. 其他技能自定义输入区 -->
+			<!-- 其他技能自定义输入区 -->
 			<view class="cat-card custom-card">
-				<view class="cat-header" style="border-bottom: none; padding-bottom: 10rpx;">
-					<text class="cat-title">其他技能</text>
+				<view class="custom-head">
+					<text class="cat-title">其他补充技能</text>
+					<text class="custom-sub">多项技能用空格或逗号分隔</text>
 				</view>
 				<view class="custom-body">
-					<textarea 
-						class="custom-textarea" 
-						v-model="customText" 
-						placeholder="输入各项技能时，请用空格或逗号隔开。如：修手机，修柴油，修汽油等"
+					<textarea
+						class="custom-textarea"
+						v-model="customText"
+						placeholder="例如：电动窗帘调试、商用净水器安装"
 						maxlength="200"
 					/>
 				</view>
 			</view>
 		</view>
 
-		<!-- 5. 底部固定保存栏 -->
+		<!-- 底部固定保存栏（content-box 防全面屏安全区挤压） -->
 		<view class="bottom-bar-placeholder"></view>
 		<view class="bottom-bar">
-			<button class="confirm-btn" :disabled="submitting" @tap="handleConfirm">
-				{{ submitting ? '保存中...' : '确定' }}
-			</button>
+			<view class="confirm-btn clickable-hover" :class="{ disabled: submitting }" @tap="handleConfirm">
+				<text class="confirm-txt">
+					{{ submitting ? '保存中...' : (selectedTotal > 0 ? `保存技能（已选 ${selectedTotal} 项）` : '保存技能') }}
+				</text>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
-	import { ref, reactive } from 'vue';
+	import { ref, reactive, computed } from 'vue';
 	import { onShow } from '@dcloudio/uni-app';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin } from '@/utils/request.js';
@@ -87,10 +90,17 @@
 	const customText = ref('');
 	const collapsedMap = reactive({});
 
+	const selectedTotal = computed(() => Object.keys(selectedMap).length);
+
 	function isSelected(name) {
 		return !!selectedMap[name];
 	}
 
+	function groupSelectedCount(group) {
+		if (!group || !group.items) return 0;
+		return group.items.reduce((acc, it) => acc + (selectedMap[it.name] ? 1 : 0), 0);
+	}
+
 	function toggleSkill(name) {
 		if (selectedMap[name]) {
 			delete selectedMap[name];
@@ -118,13 +128,20 @@
 			tree.value = res.tree || [];
 			customText.value = res.custom_text || '';
 
-			// 填充已选中字典
 			for (const k in selectedMap) {
 				delete selectedMap[k];
 			}
+			const validSet = new Set();
+			(tree.value || []).forEach(g => {
+				(g.items || []).forEach(it => {
+					if (it && it.name) validSet.add(it.name);
+				});
+			});
 			const selectedArr = res.selected_skills || [];
 			selectedArr.forEach(name => {
-				selectedMap[name] = true;
+				if (validSet.has(name)) {
+					selectedMap[name] = true;
+				}
 			});
 		} catch (e) {
 			uni.showToast({ title: e.msg || '加载技能字典失败', icon: 'none' });
@@ -152,12 +169,12 @@
 			});
 			uni.showToast({ title: '服务技能保存成功', icon: 'success' });
 			setTimeout(() => {
+				submitting.value = false;
 				uni.navigateBack();
-			}, 800);
+			}, 700);
 		} catch (e) {
-			uni.showToast({ title: e.msg || '保存失败，请稍后重试', icon: 'none' });
-		} finally {
 			submitting.value = false;
+			uni.showToast({ title: e.msg || '保存失败，请稍后重试', icon: 'none' });
 		}
 	}
 
@@ -166,31 +183,28 @@
 	});
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	.skills-page {
 		min-height: 100vh;
-		background-color: #F5F6F8;
-		padding: 0 0 40rpx;
+		background-color: $yjyf-bg-page;
 		box-sizing: border-box;
 	}
 
-	/* 顶部说明横幅 */
 	.header-section {
-		margin: 24rpx 24rpx 0;
+		margin: 20rpx $yjyf-space-md 0;
 	}
 	.tip-banner {
 		display: flex;
 		align-items: flex-start;
-		background: #FFF;
-		padding: 24rpx;
-		border-radius: 16rpx;
-		box-shadow: 0 4rpx 16rpx rgba(15, 23, 42, 0.04);
+		background: $yjyf-primary-bg;
+		padding: 22rpx 24rpx;
+		border-radius: $yjyf-radius-md;
 	}
 	.tip-icon {
-		width: 40rpx;
-		height: 40rpx;
+		width: 36rpx;
+		height: 36rpx;
 		margin-right: 16rpx;
-		margin-top: 4rpx;
+		margin-top: 2rpx;
 		flex-shrink: 0;
 	}
 	.tip-content {
@@ -198,55 +212,68 @@
 		flex-direction: column;
 	}
 	.tip-title {
-		font-size: 30rpx;
+		font-size: $yjyf-font-body;
 		font-weight: 700;
-		color: #1E293B;
-		margin-bottom: 6rpx;
+		color: $yjyf-text-main;
 	}
 	.tip-sub {
-		font-size: 24rpx;
-		color: #64748B;
+		margin-top: 6rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
 	}
 
-	/* 加载状态 */
 	.loading-state {
-		padding: 100rpx 0;
+		padding: 120rpx 0;
 		text-align: center;
 	}
 	.loading-text {
-		font-size: 26rpx;
-		color: #94A3B8;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
 	}
 
-	/* 卡片与手风琴 */
 	.accordion-container {
 		display: flex;
 		flex-direction: column;
 		gap: 20rpx;
-		padding: 20rpx 24rpx 0;
+		padding: 20rpx $yjyf-space-md 0;
 	}
 	.cat-card {
-		background: #FFFFFF;
-		border-radius: 16rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
 		overflow: hidden;
-		box-shadow: 0 2rpx 10rpx rgba(15, 23, 42, 0.03);
+		box-shadow: $yjyf-shadow-card;
 	}
 	.cat-header {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 26rpx 28rpx;
-		background: #FFFFFF;
+		padding: 26rpx 24rpx;
+	}
+	.cat-title-wrap {
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
 	}
 	.cat-title {
-		font-size: 28rpx;
+		font-size: $yjyf-font-body;
 		font-weight: 700;
-		color: #1E293B;
+		color: $yjyf-text-main;
+	}
+	.cat-count {
+		height: 36rpx;
+		padding: 0 14rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
 	}
 	.cat-arrow {
 		width: 28rpx;
 		height: 28rpx;
-		transition: transform 0.25s ease;
+		transition: transform 0.22s ease;
 	}
 	.cat-arrow.collapsed {
 		transform: rotate(180deg);
@@ -255,8 +282,6 @@
 	.cat-body {
 		padding: 0 24rpx 24rpx;
 	}
-
-	/* 技能标签网格：3列自适应 */
 	.skills-grid {
 		display: grid;
 		grid-template-columns: repeat(3, 1fr);
@@ -267,63 +292,72 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		background: #F8FAFC;
+		background: $yjyf-bg-page;
 		border: 2rpx solid transparent;
-		border-radius: 10rpx;
+		border-radius: $yjyf-radius-sm;
 		padding: 0 12rpx;
 		text-align: center;
-		transition: all 0.15s ease;
 	}
 	.chip-text {
-		font-size: 24rpx;
-		color: #334155;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
-		line-height: 1;
 	}
 	.skill-chip.active {
-		background: #FFF7ED;
-		border-color: #F97316;
+		background: $yjyf-primary-bg;
+		border-color: $yjyf-primary;
 	}
 	.skill-chip.active .chip-text {
-		color: #EA580C;
+		color: $yjyf-primary;
 		font-weight: 600;
 	}
 
-	/* 自定义其他技能输入 */
 	.custom-card {
 		padding: 24rpx;
 	}
+	.custom-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.custom-sub {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
 	.custom-body {
-		margin-top: 12rpx;
+		margin-top: 16rpx;
 	}
 	.custom-textarea {
 		width: 100%;
-		height: 160rpx;
-		background: #F8FAFC;
-		border: 1rpx solid #E2E8F0;
-		border-radius: 12rpx;
+		height: 168rpx;
+		background: $yjyf-bg-page;
+		border: 1rpx solid $yjyf-border-color;
+		border-radius: $yjyf-radius-sm;
 		padding: 18rpx 20rpx;
-		font-size: 26rpx;
-		color: #1E293B;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
 		box-sizing: border-box;
 		line-height: 1.5;
 	}
 
-	/* 底部固定操作栏 */
 	.bottom-bar-placeholder {
-		height: 140rpx;
+		height: calc(144rpx + env(safe-area-inset-bottom));
 	}
 	.bottom-bar {
 		position: fixed;
 		bottom: 0;
 		left: 0;
 		right: 0;
-		padding: 20rpx 32rpx calc(20rpx + env(safe-area-inset-bottom));
-		background: #FFFFFF;
-		box-shadow: 0 -4rpx 16rpx rgba(15, 23, 42, 0.05);
+		height: 88rpx;
+		padding: 20rpx $yjyf-space-lg calc(20rpx + env(safe-area-inset-bottom));
+		box-sizing: content-box;
+		background: $yjyf-bg-card;
+		box-shadow: $yjyf-shadow-bar;
 		z-index: 99;
+		display: flex;
+		align-items: center;
 	}
 	.confirm-btn {
 		width: 100%;
@@ -331,19 +365,16 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		line-height: 1;
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
-		color: #FFFFFF;
-		font-size: 30rpx;
+		background: $yjyf-gradient-primary;
+		border-radius: $yjyf-radius-pill;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.confirm-txt {
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-body;
 		font-weight: 700;
-		border-radius: 44rpx;
-		border: none;
-		box-shadow: 0 6rpx 18rpx rgba(234, 88, 12, 0.3);
 	}
-	.confirm-btn:active {
-		opacity: 0.9;
-	}
-	.confirm-btn[disabled] {
+	.confirm-btn.disabled {
 		opacity: 0.6;
 	}
 </style>
diff --git a/yjyf-app/pages/master/success.vue b/yjyf-app/pages/master/success.vue
index 5153ae3..7418111 100644
--- a/yjyf-app/pages/master/success.vue
+++ b/yjyf-app/pages/master/success.vue
@@ -1,64 +1,65 @@
 <template>
 	<view class="success-page">
-		<!-- 统一规范顶部白底导航栏 -->
-		<YjyfNavBar theme="orange" title="抢单结果" @back="goHall" />
+		<YjyfNavBar theme="orange" title="抢单结果" :customBack="true" @back="goHall" />
 
-		<view class="content-body">
-			<!-- 1. 成功插画 -->
+		<view class="result-card">
 			<view class="illustration-box">
 				<image class="success-img" src="/static/icons/master/grab-success.svg" mode="aspectFit" />
 			</view>
 
-			<!-- 2. 主标题 -->
 			<text class="main-title">抢单成功</text>
 
-			<!-- 3. 核心倒计时考核警示（对标工奇兵实机标语） -->
 			<view class="alert-box">
-				<text class="alert-txt">请尽快联系业主预约上门时间，并提交预约结果。超过2小时不预约，订单将自动取消。</text>
+				<text class="alert-txt">请在 2 小时内联系业主预约上门时间并登记预约结果，超时未联系将自动回流大厅。</text>
 			</view>
 
-			<!-- 4. 工钱结算规则提醒 -->
 			<view class="settle-box">
-				<text class="settle-txt">为不影响工钱结算，完工后请上传完工图片，并在施工现场让业主验收订单。预计72小时后，工钱将自动结算至您的到账账户。</text>
+				<text class="settle-txt">完工后请上传现场实拍照片，并输入业主 6 位短信核销码完成验收，核销后工钱即刻结算至您的钱包。</text>
 			</view>
 
-			<!-- 5. 主行动按钮（预约上门时间） -->
 			<view class="action-btn clickable-hover" @tap="openScheduleModal">
 				<text class="action-txt">预约上门时间</text>
 			</view>
 
-			<!-- 辅助入口 -->
 			<view class="sub-actions">
 				<view class="sub-btn clickable-hover" @tap="goDetail">
-					<text class="sub-txt">查看工单详情</text>
+					<text class="sub-txt primary">查看工单详情</text>
 				</view>
-				<text class="divider">|</text>
+				<view class="sub-divider"></view>
 				<view class="sub-btn clickable-hover" @tap="goHall">
-					<text class="sub-txt">继续抢单</text>
+					<text class="sub-txt">返回抢单大厅</text>
 				</view>
 			</view>
 		</view>
 
-		<!-- 预约上门时间弹窗 -->
+		<!-- 预约上门时间半屏抽屉 -->
 		<view class="modal-mask" v-if="showModal" @tap="showModal = false">
 			<view class="modal-card" @tap.stop>
 				<view class="modal-head">
 					<text class="modal-title">预约上门时间</text>
-					<image class="close-ico clickable-hover" src="/static/icons/close.svg" mode="aspectFit" @tap="showModal = false" />
+					<view class="close-hit" @tap="showModal = false">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
 				</view>
 
 				<view class="modal-body">
 					<view class="form-row">
 						<text class="form-label">预约日期</text>
 						<picker mode="date" :value="appointDate" :start="today" @change="onDateChange">
-							<view class="picker-val">{{ appointDate }} ›</view>
+							<view class="picker-val">
+								<text class="picker-txt">{{ appointDate }}</text>
+								<image class="picker-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+							</view>
 						</picker>
 					</view>
 
 					<view class="form-row">
 						<text class="form-label">预约时段</text>
 						<picker mode="selector" :range="timeSlots" @change="onSlotChange">
-							<view class="picker-val">{{ appointSlot }} ›</view>
+							<view class="picker-val">
+								<text class="picker-txt">{{ appointSlot }}</text>
+								<image class="picker-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+							</view>
 						</picker>
 					</view>
 
@@ -66,7 +67,7 @@
 						<text class="call-txt">业主电话：{{ userMobile }}</text>
 						<view class="call-btn clickable-hover" @tap="makeCall">
 							<image class="phone-ico" src="/static/icons/phone.svg" mode="aspectFit" />
-							<text class="call-btn-txt">直接拨打</text>
+							<text class="call-btn-txt">拨打电话</text>
 						</view>
 					</view>
 				</view>
@@ -91,7 +92,8 @@
 	const showModal = ref(false);
 	const submitting = ref(false);
 
-	const today = new Date().toISOString().slice(0, 10);
+	const _now = new Date();
+	const today = `${_now.getFullYear()}-${String(_now.getMonth() + 1).padStart(2, '0')}-${String(_now.getDate()).padStart(2, '0')}`;
 	const appointDate = ref(today);
 	const timeSlots = ['上午 (09:00 - 12:00)', '下午 (13:00 - 18:00)', '晚上 (18:00 - 21:00)', '全天随时上门'];
 	const appointSlot = ref(timeSlots[1]);
@@ -129,12 +131,19 @@
 		showModal.value = true;
 	}
 
+	const contactReported = ref(false);
+
 	function makeCall() {
 		if (!userMobile.value) {
 			uni.showToast({ title: '暂未获取到客户电话', icon: 'none' });
 			return;
 		}
-		api.masterContact({ order_id: orderId.value }).catch(() => {});
+		if (!contactReported.value) {
+			contactReported.value = true;
+			api.masterContact({ order_id: orderId.value }).catch(() => {
+				contactReported.value = false;
+			});
+		}
 		uni.makePhoneCall({
 			phoneNumber: String(userMobile.value),
 			fail: () => {}
@@ -158,17 +167,17 @@
 			showModal.value = false;
 			uni.showToast({ title: '预约成功，已通知业主', icon: 'success' });
 			setTimeout(() => {
-				uni.redirectTo({ url: '/pages/master/orders' });
-			}, 800);
+				submitting.value = false;
+				uni.redirectTo({ url: `/pages/master/detail?id=${orderId.value}` });
+			}, 700);
 		} catch (e) {
-		} finally {
 			submitting.value = false;
 		}
 	}
 
 	function goDetail() {
 		if (orderId.value > 0) {
-			uni.navigateTo({ url: `/pages/master/detail?id=${orderId.value}` });
+			uni.redirectTo({ url: `/pages/master/detail?id=${orderId.value}` });
 		} else {
 			uni.redirectTo({ url: '/pages/master/orders' });
 		}
@@ -179,245 +188,230 @@
 	}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+	@import '@/uni.scss';
 	.success-page {
 		min-height: 100vh;
-		background: #FFFFFF;
-		display: flex;
-		flex-direction: column;
+		background: $yjyf-bg-page;
+		padding-bottom: 48rpx;
 	}
 
-	.nav-bar {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 20rpx 28rpx;
-		height: 88rpx;
-		box-sizing: border-box;
-		border-bottom: 1rpx solid #F0F0F0;
-	}
-	.nav-btn {
-		width: 60rpx;
-		height: 60rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.nav-icon {
-		width: 36rpx;
-		height: 36rpx;
-	}
-	.nav-title {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #1F1F1F;
-	}
-	.nav-placeholder {
-		width: 60rpx;
-	}
-
-	.content-body {
-		flex: 1;
+	.result-card {
+		margin: 24rpx $yjyf-space-md 0;
+		padding: 56rpx 36rpx 44rpx;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		box-shadow: $yjyf-shadow-card;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		padding: 70rpx 48rpx 50rpx;
 	}
 
 	.illustration-box {
-		width: 220rpx;
-		height: 220rpx;
+		width: 200rpx;
+		height: 200rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
 	.success-img {
-		width: 200rpx;
-		height: 200rpx;
+		width: 184rpx;
+		height: 184rpx;
 	}
 
 	.main-title {
-		margin-top: 36rpx;
-		font-size: 44rpx;
+		margin-top: 28rpx;
+		font-size: $yjyf-font-hero;
 		font-weight: 700;
-		color: #1F1F1F;
-		letter-spacing: 1rpx;
+		color: $yjyf-text-main;
 	}
 
 	.alert-box {
-		margin-top: 36rpx;
+		margin-top: 32rpx;
 		width: 100%;
-		padding: 24rpx 28rpx;
-		border-radius: 16rpx;
-		background: #FFF5F0;
-		border: 1rpx solid #FFE2D4;
+		padding: 22rpx 24rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-primary-bg;
 		box-sizing: border-box;
 	}
 	.alert-txt {
-		font-size: 26rpx;
-		line-height: 40rpx;
-		color: #EB5D2A;
-		font-weight: 500;
+		font-size: $yjyf-font-sub;
+		line-height: 1.55;
+		color: $yjyf-primary;
+		font-weight: 600;
 	}
 
 	.settle-box {
-		margin-top: 24rpx;
+		margin-top: 20rpx;
 		width: 100%;
 		padding: 22rpx 24rpx;
-		border-radius: 14rpx;
-		background: #F9FAFB;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
 		box-sizing: border-box;
 	}
 	.settle-txt {
-		font-size: 24rpx;
-		line-height: 38rpx;
-		color: #6B7280;
+		font-size: $yjyf-font-sub;
+		line-height: 1.55;
+		color: $yjyf-text-secondary;
 	}
 
 	.action-btn {
-		margin-top: 64rpx;
+		margin-top: 48rpx;
 		width: 100%;
-		height: 92rpx;
-		border-radius: 46rpx;
-		background: linear-gradient(135deg, #F98D25 0%, #ED6F0E 100%);
-		box-shadow: 0 8rpx 24rpx rgba(237, 111, 14, 0.35);
+		height: 88rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-card;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
 	.action-txt {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #FFFFFF;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-bg-card;
 	}
 
 	.sub-actions {
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		margin-top: 36rpx;
+		margin-top: 32rpx;
 	}
 	.sub-btn {
-		padding: 10rpx 24rpx;
+		padding: 12rpx 24rpx;
 	}
 	.sub-txt {
-		font-size: 26rpx;
-		color: #8E8E93;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
 	}
-	.divider {
-		color: #D1D5DB;
-		font-size: 22rpx;
+	.sub-txt.primary {
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+	.sub-divider {
+		width: 1rpx;
+		height: 26rpx;
+		background: $yjyf-border-color;
 	}
 
 	/* 预约弹窗 */
 	.modal-mask {
 		position: fixed;
-		top: 0; left: 0; right: 0; bottom: 0;
-		background: rgba(0, 0, 0, 0.55);
+		inset: 0;
+		background: rgba(0, 0, 0, 0.48);
 		z-index: 999;
 		display: flex;
 		align-items: flex-end;
 	}
 	.modal-card {
 		width: 100%;
-		background: #FFFFFF;
-		border-radius: 32rpx 32rpx 0 0;
-		padding: 36rpx 36rpx constant(safe-area-inset-bottom);
-		padding: 36rpx 36rpx env(safe-area-inset-bottom);
+		background: $yjyf-bg-card;
+		border-radius: 28rpx 28rpx 0 0;
+		padding: 28rpx $yjyf-space-lg calc(32rpx + env(safe-area-inset-bottom));
 		box-sizing: border-box;
-		animation: slideUp 0.25s ease-out;
 	}
-	@keyframes slideUp {
-		from { transform: translateY(100%); }
-		to { transform: translateY(0); }
-	}
-
 	.modal-head {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding-bottom: 24rpx;
-		border-bottom: 1rpx solid #F0F0F0;
+		padding-bottom: 20rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
 	}
 	.modal-title {
-		font-size: 32rpx;
+		font-size: $yjyf-font-title;
 		font-weight: 700;
-		color: #1F1F1F;
+		color: $yjyf-text-main;
+	}
+	.close-hit {
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 	.close-ico {
-		width: 36rpx;
-		height: 36rpx;
+		width: 30rpx;
+		height: 30rpx;
 	}
 
 	.modal-body {
-		padding: 24rpx 0;
+		padding: 16rpx 0;
 	}
 	.form-row {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		height: 90rpx;
-		border-bottom: 1rpx solid #F5F5F5;
+		height: 92rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
 	}
 	.form-label {
-		font-size: 28rpx;
-		color: #374151;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-regular;
 	}
 	.picker-val {
-		font-size: 28rpx;
-		color: #F0710D;
-		font-weight: 500;
+		display: flex;
+		align-items: center;
+	}
+	.picker-txt {
+		font-size: $yjyf-font-body;
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+	.picker-arrow {
+		width: 24rpx;
+		height: 24rpx;
+		margin-left: 8rpx;
 	}
 
 	.call-hint {
 		margin-top: 24rpx;
 		padding: 20rpx 24rpx;
-		background: #F8F9FA;
-		border-radius: 14rpx;
+		background: $yjyf-bg-page;
+		border-radius: $yjyf-radius-sm;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
 	}
 	.call-txt {
-		font-size: 26rpx;
-		color: #4B5563;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
 	}
 	.call-btn {
 		display: inline-flex;
 		align-items: center;
 		justify-content: center;
-		height: 48rpx;
-		padding: 0 18rpx;
-		background: #E8F5E9;
-		border-radius: 24rpx;
-		line-height: 1;
+		height: 52rpx;
+		padding: 0 22rpx;
+		background: $yjyf-primary-bg;
+		border-radius: $yjyf-radius-pill;
 	}
 	.phone-ico {
 		width: 24rpx;
 		height: 24rpx;
-		margin-right: 6rpx;
+		margin-right: 8rpx;
 	}
 	.call-btn-txt {
-		font-size: 24rpx;
-		color: #2E7D32;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-primary;
 		font-weight: 600;
-		line-height: 1;
 	}
 
 	.modal-foot {
-		padding-top: 24rpx;
+		padding-top: 20rpx;
 	}
 	.confirm-btn {
 		height: 88rpx;
-		border-radius: 44rpx;
-		background: linear-gradient(135deg, #F98D25 0%, #ED6F0E 100%);
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
 		display: flex;
 		align-items: center;
 		justify-content: center;
+		box-shadow: $yjyf-shadow-card;
 	}
 	.confirm-txt {
-		color: #FFFFFF;
-		font-size: 30rpx;
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-body;
 		font-weight: 600;
 	}
 	.confirm-btn.disabled {
diff --git a/yjyf-app/pages/master/wallet.vue b/yjyf-app/pages/master/wallet.vue
index 6a03462..8d0aa24 100644
--- a/yjyf-app/pages/master/wallet.vue
+++ b/yjyf-app/pages/master/wallet.vue
@@ -1,101 +1,238 @@
 <template>
 	<view class="page">
-		<!-- 资产大卡（一体化沉浸大背景） -->
 		<YjyfNavBar theme="orange" title="我的钱包" :fixed="true" :placeholder="true" />
-		<view class="wallet-hero" :style="{ marginTop: (-navHeight) + 'px', paddingTop: navHeight + 'px' }">
-			<view class="wallet-body">
-				<view class="hero-top">
-				<text class="hero-lab">可提现余额（元）</text>
-				<view class="channel-tag">
-					<image class="wechat-ico" src="/static/icons/wechat.svg" mode="aspectFit" />
-					<text class="channel-txt">微信钱包快速到账</text>
-				</view>
-			</view>
-			<text class="hero-num">{{ income ? income.money : '0.00' }}</text>
-			<view class="hero-row">
-				<view class="income-badge">
-					<text class="badge-lab">今日收入</text>
-					<text class="badge-val">¥{{ income ? income.today_income : '0.00' }}</text>
-				</view>
-				<view class="income-badge">
-					<text class="badge-lab">累计入账</text>
-					<text class="badge-val">¥{{ income ? income.total_income : '0.00' }}</text>
-				</view>
-			</view>
-			<view class="withdraw-cta clickable-hover" @tap="openWithdraw">
-				申请提现
-			</view>
-			</view>
-		</view>
-
-		<!-- 结算须知 -->
-		<view class="tips">
-			提现通常 T+1 到账，手续费 0.6%；结算周期：客户验收核销后款项即刻入账。
-		</view>
-
-		<!-- 账单明细卡片 -->
-		<view class="card">
-			<view class="card-head">
-				<text class="card-title">收支账单明细</text>
-				<view class="filter-tabs">
-					<text class="ft-item" :class="{ on: filterType === 'all' }" @tap="filterType = 'all'">全部</text>
-					<text class="ft-item" :class="{ on: filterType === 'settle' }" @tap="filterType = 'settle'">结算</text>
-					<text class="ft-item" :class="{ on: filterType === 'withdraw' }" @tap="filterType = 'withdraw'">提现</text>
-				</view>
-			</view>
-
-			<view class="log-list" v-if="filteredLogs.length">
-				<view class="log" v-for="(l, i) in filteredLogs" :key="i">
-					<view class="log-l">
-						<text class="log-t">{{ logTypeText(l.type) }}</text>
-						<text class="log-r">{{ l.remark }}</text>
-						<text class="log-time">{{ timeText(l.createtime) }}</text>
+		<YjyfRefreshScroll
+			class="wallet-scroll"
+			theme="orange"
+			:nav-offset="navHeight"
+			:refresh-task="load"
+		>
+			<!-- 资产概览名片 -->
+			<view class="wallet-hero" :style="{ backgroundPosition: '0 -' + navHeight + 'px' }">
+				<view class="wallet-body">
+					<view class="hero-top">
+						<text class="hero-lab">可提现余额（元）</text>
+						<view class="channel-tag">
+							<image class="wechat-ico" src="/static/icons/wechat.svg" mode="aspectFit" />
+							<text class="channel-txt">微信零钱到账</text>
+						</view>
 					</view>
-					<view class="log-r2">
-						<text class="log-amt" :class="{ minus: Number(l.amount) < 0 }">{{ Number(l.amount) > 0 ? '+' : '' }}{{ l.amount }}</text>
-						<text class="log-bal">余额 {{ l.balance }}</text>
+					<text class="hero-num">{{ formatMoney(income ? income.money : 0) }}</text>
+					<view class="hero-metrics">
+						<view class="metric-item">
+							<text class="metric-lab">今日收入</text>
+							<text class="metric-val">¥{{ formatMoney(income ? income.today_income : 0) }}</text>
+						</view>
+						<view class="metric-divider"></view>
+						<view class="metric-item">
+							<text class="metric-lab">提现审核中</text>
+							<text class="metric-val">¥{{ formatMoney(income ? income.frozen_money : 0) }}</text>
+						</view>
+						<view class="metric-divider"></view>
+						<view class="metric-item">
+							<text class="metric-lab">累计入账</text>
+							<text class="metric-val">¥{{ formatMoney(income ? income.total_income : 0) }}</text>
+						</view>
+					</view>
+					<view class="withdraw-cta clickable-hover" @tap="openWithdraw">
+						<text class="withdraw-cta-txt">申请提现</text>
 					</view>
 				</view>
 			</view>
 
-			<!-- 空状态 -->
-			<view class="empty-box" v-else>
-				<image class="empty-img" src="/static/icons/master/empty-orders.svg" mode="aspectFit" />
-				<text class="empty-txt">暂无明细记录</text>
+			<!-- 结算规则提示 -->
+			<view class="tips-bar">
+				<image class="tips-ico" src="/static/icons/info-orange.svg" mode="aspectFit" />
+				<text class="tips-txt">客户核销后工费即刻入账；单笔满 10 元可提现，通道费率 0.6%。</text>
+			</view>
+
+			<!-- 收支账单明细 -->
+			<view class="bill-card">
+				<view class="card-head">
+					<text class="card-title">收支账单明细</text>
+					<view class="filter-tabs">
+						<view class="ft-item" :class="{ on: filterType === 'all' }" @tap="filterType = 'all'">全部</view>
+						<view class="ft-item" :class="{ on: filterType === 'settle' }" @tap="filterType = 'settle'">结算</view>
+						<view class="ft-item" :class="{ on: filterType === 'withdraw' }" @tap="filterType = 'withdraw'">提现</view>
+					</view>
+				</view>
+
+				<view class="log-list" v-if="filteredLogs.length">
+					<view
+						class="log-row clickable-hover"
+						v-for="l in filteredLogs"
+						:key="l.id || l.createtime"
+						@tap="openLogDetail(l)"
+					>
+						<view class="log-main">
+							<view class="log-title-line">
+								<text class="log-type">{{ logTypeText(l.type) }}</text>
+								<text class="log-order-tag" v-if="Number(l.order_id) > 0">关联工单</text>
+							</view>
+							<text class="log-remark">{{ l.remark || '账单收支变动' }}</text>
+							<text class="log-time">{{ fullTimeText(l.createtime) }}</text>
+						</view>
+						<view class="log-right">
+							<view class="log-amt-wrap">
+								<text class="log-amt" :class="{ minus: Number(l.amount) < 0 }">
+									{{ Number(l.amount) > 0 ? '+' : '' }}{{ formatMoney(l.amount) }}
+								</text>
+								<text class="log-bal">余额 ¥{{ formatMoney(l.balance) }}</text>
+							</view>
+							<image class="row-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+						</view>
+					</view>
+				</view>
+
+				<view class="empty-box" v-else>
+					<image class="empty-img" src="/static/icons/empty-orders.svg" mode="aspectFit" />
+					<text class="empty-txt">暂无对应账单明细</text>
+				</view>
+			</view>
+		</YjyfRefreshScroll>
+
+		<!-- 申请提现半屏抽屉 -->
+		<view class="drawer-mask" v-if="showWithdrawDrawer" @tap="showWithdrawDrawer = false">
+			<view class="drawer-panel" @tap.stop>
+				<view class="drawer-head">
+					<text class="drawer-title">申请提现</text>
+					<view class="drawer-close" @tap="showWithdrawDrawer = false">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<view class="channel-row">
+					<text class="channel-label">到账方式</text>
+					<view class="channel-val">
+						<image class="ch-ico" src="/static/icons/wechat.svg" mode="aspectFit" />
+						<text class="ch-name">微信零钱（T+1 审核打款）</text>
+					</view>
+				</view>
+
+				<view class="amt-box">
+					<view class="amt-box-top">
+						<text class="amt-label">提现金额（单笔最低 ¥10.00）</text>
+						<text class="amt-all" @tap="fillAllBalance">全部提现</text>
+					</view>
+					<view class="amt-input-line">
+						<text class="amt-symbol">¥</text>
+						<input
+							class="amt-input"
+							type="digit"
+							v-model="withdrawAmount"
+							placeholder="请输入提现金额"
+						/>
+					</view>
+					<view class="amt-meta">
+						<text class="meta-item">可提余额 ¥{{ formatMoney(availMoney) }}</text>
+						<text class="meta-item" v-if="parsedWithdraw >= 10">
+							通道手续费 ¥{{ withdrawFee }} · 预计到账 ¥{{ withdrawArrive }}
+						</text>
+					</view>
+				</view>
+
+				<view
+					class="drawer-submit clickable-hover"
+					:class="{ disabled: withdrawing || parsedWithdraw < 10 || parsedWithdraw > availMoney }"
+					@tap="submitWithdraw"
+				>
+					{{ withdrawing ? '提交处理中...' : '确认提现' }}
+				</view>
 			</view>
 		</view>
 
-		<!-- 师傅端专属底部导航 -->
-		<YjyfMasterTabBar :current="3" />
+		<!-- 账单流水详情半屏抽屉 -->
+		<view class="drawer-mask" v-if="activeLog" @tap="activeLog = null">
+			<view class="drawer-panel" @tap.stop>
+				<view class="drawer-head">
+					<text class="drawer-title">账单流水详情</text>
+					<view class="drawer-close" @tap="activeLog = null">
+						<image class="close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<view class="detail-hero">
+					<text class="dh-type">{{ logTypeText(activeLog.type) }}</text>
+					<text class="dh-amt" :class="{ minus: Number(activeLog.amount) < 0 }">
+						{{ Number(activeLog.amount) > 0 ? '+' : '' }}{{ formatMoney(activeLog.amount) }}
+					</text>
+				</view>
+
+				<view class="detail-cells">
+					<view class="d-cell">
+						<text class="d-lab">变动后余额</text>
+						<text class="d-val">¥{{ formatMoney(activeLog.balance) }}</text>
+					</view>
+					<view class="d-cell">
+						<text class="d-lab">发生时间</text>
+						<text class="d-val">{{ fullTimeText(activeLog.createtime) }}</text>
+					</view>
+					<view class="d-cell" v-if="activeLog.id">
+						<text class="d-lab">流水编号</text>
+						<text class="d-val">#{{ activeLog.id }}</text>
+					</view>
+					<view class="d-cell">
+						<text class="d-lab">明细说明</text>
+						<text class="d-val multi">{{ activeLog.remark || '-' }}</text>
+					</view>
+				</view>
+
+				<view
+					v-if="Number(activeLog.order_id) > 0"
+					class="drawer-submit clickable-hover"
+					@tap="goOrderDetail(activeLog.order_id)"
+				>
+					查看关联工单详情
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script setup>
 	import { ref, computed } from 'vue';
-	import { onShow, onPullDownRefresh } from '@dcloudio/uni-app';
+	import { onShow } from '@dcloudio/uni-app';
 	import api from '@/utils/api.js';
 	import { getNavBarMetrics } from '@/utils/system.js';
-	import YjyfMasterTabBar from '@/components/YjyfMasterTabBar.vue';
+	import YjyfRefreshScroll from '@/components/YjyfRefreshScroll.vue';
 
 	const navHeight = ref(getNavBarMetrics().totalNavHeight);
 	const income = ref(null);
 	const logs = ref([]);
 	const filterType = ref('all');
 
+	const showWithdrawDrawer = ref(false);
+	const withdrawAmount = ref('');
+	const withdrawing = ref(false);
+	const activeLog = ref(null);
+
+	const availMoney = computed(() => Number(income.value?.money || 0));
+	const parsedWithdraw = computed(() => {
+		const n = Number(withdrawAmount.value);
+		return Number.isFinite(n) && n > 0 ? Math.round(n * 100) / 100 : 0;
+	});
+	const withdrawFee = computed(() => (Math.round(parsedWithdraw.value * 0.6) / 100).toFixed(2));
+	const withdrawArrive = computed(() => (parsedWithdraw.value - Number(withdrawFee.value)).toFixed(2));
+
 	const filteredLogs = computed(() => {
 		if (filterType.value === 'all') return logs.value;
 		return logs.value.filter(l => l.type === filterType.value);
 	});
 
-	function logTypeText(t) {
-		return { settle: '工单结算', withdraw: '提现出账', income: '其他收入', refund: '退款扣减' }[t] || '账单明细';
+	function formatMoney(v) {
+		const num = Number(v || 0);
+		return Number.isFinite(num) ? num.toFixed(2) : '0.00';
 	}
 
-	function timeText(ts) {
+	function logTypeText(t) {
+		return { settle: '工单结算入账', withdraw: '提现申请出账', income: '奖励补贴入账', refund: '退款扣减' }[t] || '收支变动';
+	}
+
+	function fullTimeText(ts) {
 		if (!ts) return '';
 		const d = new Date(Number(ts) * 1000);
 		const p = (n) => (n < 10 ? '0' + n : n);
-		return `${d.getMonth() + 1}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
+		return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
 	}
 
 	async function load() {
@@ -107,108 +244,511 @@
 	}
 
 	function openWithdraw() {
-		uni.showModal({
-			title: '申请提现到微信钱包',
-			editable: true,
-			placeholderText: '请输入提现金额（≥10 元）',
-			confirmText: '立即提现',
-			confirmColor: '#F0710D',
-			success: async (r) => {
-				if (!r.confirm) return;
-				const amount = Number(r.content);
-				if (!amount || amount < 10) {
-					uni.showToast({ title: '单次提现不少于 10 元', icon: 'none' });
-					return;
-				}
-				try {
-					const res = await api.masterWithdraw({ amount: amount, channel: 'wechat' });
-					uni.showToast({ title: '已提交，预计到账 ¥' + res.arrive_amount, icon: 'none' });
-					load();
-				} catch (e) {}
-			}
-		});
+		if (availMoney.value < 10) {
+			uni.showToast({ title: '可提现余额满 10 元方可发起提现', icon: 'none' });
+			return;
+		}
+		withdrawAmount.value = '';
+		showWithdrawDrawer.value = true;
 	}
 
-	onShow(() => load());
-	onPullDownRefresh(async () => {
-		await load();
-		uni.stopPullDownRefresh();
+	function fillAllBalance() {
+		if (availMoney.value <= 0) return;
+		withdrawAmount.value = availMoney.value.toFixed(2);
+	}
+
+	async function submitWithdraw() {
+		if (withdrawing.value) return;
+		const amt = parsedWithdraw.value;
+		if (amt < 10) {
+			uni.showToast({ title: '单次提现金额不少于 10 元', icon: 'none' });
+			return;
+		}
+		if (amt > availMoney.value) {
+			uni.showToast({ title: '输入金额超出可提现余额', icon: 'none' });
+			return;
+		}
+		withdrawing.value = true;
+		try {
+			const res = await api.masterWithdraw({ amount: amt, channel: 'wechat' });
+			const arriveVal = res?.arrive_amount ?? res?.arrive ?? withdrawArrive.value;
+			showWithdrawDrawer.value = false;
+			uni.showToast({ title: `提现已提交，预计到账 ¥${arriveVal}`, icon: 'none' });
+			load();
+		} catch (e) {
+		} finally {
+			withdrawing.value = false;
+		}
+	}
+
+	function openLogDetail(item) {
+		activeLog.value = item;
+	}
+
+	function goOrderDetail(orderId) {
+		activeLog.value = null;
+		uni.navigateTo({ url: `/pages/master/detail?id=${orderId}` });
+	}
+
+	onShow(() => {
+		navHeight.value = getNavBarMetrics().totalNavHeight;
+		load();
 	});
 </script>
 
-<style scoped>
-	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 30rpx; }
+<style lang="scss" scoped>
+	.page {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		background: $yjyf-bg-page;
+	}
+	.wallet-scroll {
+		flex: 1;
+		height: 0;
+		width: 100%;
+	}
 
-	/* 资产卡片 */
+	/* 顶部沉浸式资产卡片 */
 	.wallet-hero {
-		padding-bottom: 32rpx; position: relative;
-		background-color: #F0710D;
-		background-image: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
-		background-size: 100% 600rpx;
-		background-position: 0 0;
+		padding-bottom: 36rpx;
+		background-color: $yjyf-primary;
+		background-image: $yjyf-gradient-primary;
+		background-size: 100% 620rpx;
 		background-repeat: no-repeat;
-		display: flex; flex-direction: column;
+		display: flex;
+		flex-direction: column;
+	}
+	.wallet-body {
+		padding: 20rpx $yjyf-space-lg 0;
+	}
+	.hero-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.hero-lab {
+		font-size: $yjyf-font-sub;
+		color: rgba(255, 255, 255, 0.92);
 	}
-	.wallet-body { padding: 20rpx 30rpx 0; }
-	.hero-top { display: flex; align-items: center; justify-content: space-between; }
-	.hero-lab { font-size: 24rpx; color: rgba(255,255,255,.92); }
 	.channel-tag {
-		display: inline-flex; align-items: center; justify-content: center; height: 42rpx; padding: 0 16rpx; border-radius: 21rpx;
-		background: rgba(255,255,255,0.22); line-height: 1;
+		display: inline-flex;
+		align-items: center;
+		height: 44rpx;
+		padding: 0 18rpx;
+		border-radius: $yjyf-radius-pill;
+		background: rgba(255, 255, 255, 0.2);
 	}
-	.wechat-ico { width: 24rpx; height: 24rpx; margin-right: 8rpx; }
-	.channel-txt { font-size: 22rpx; color: #fff; font-weight: 500; line-height: 1; }
-	.hero-num { margin-top: 14rpx; font-size: 68rpx; font-weight: 700; color: #fff; letter-spacing: 1.5rpx; line-height: 1.1; }
-	.hero-row { display: flex; align-items: center; margin-top: 18rpx; }
-	.income-badge {
-		height: 48rpx; padding: 0 18rpx; border-radius: 12rpx; background: rgba(255,255,255,0.18);
-		display: inline-flex; align-items: center; justify-content: center; margin-right: 16rpx; line-height: 1;
+	.wechat-ico {
+		width: 26rpx;
+		height: 26rpx;
+		margin-right: 8rpx;
+	}
+	.channel-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-bg-card;
+		font-weight: 500;
+	}
+	.hero-num {
+		display: block;
+		margin-top: 14rpx;
+		font-size: 68rpx;
+		font-weight: 700;
+		color: $yjyf-bg-card;
+		line-height: 1.15;
+		font-variant-numeric: tabular-nums;
+	}
+	.hero-metrics {
+		margin-top: 24rpx;
+		padding: 20rpx 24rpx;
+		border-radius: $yjyf-radius-md;
+		background: rgba(255, 255, 255, 0.16);
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.metric-item {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+	.metric-divider {
+		width: 1rpx;
+		height: 44rpx;
+		background: rgba(255, 255, 255, 0.24);
+		margin: 0 20rpx;
+	}
+	.metric-lab {
+		font-size: $yjyf-font-micro;
+		color: rgba(255, 255, 255, 0.85);
+	}
+	.metric-val {
+		margin-top: 6rpx;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-bg-card;
+		font-variant-numeric: tabular-nums;
 	}
-	.badge-lab { font-size: 22rpx; color: rgba(255,255,255,0.85); margin-right: 8rpx; line-height: 1; }
-	.badge-val { font-size: 24rpx; font-weight: 700; color: #fff; line-height: 1; }
 	.withdraw-cta {
-		margin-top: 24rpx; align-self: flex-start; height: 68rpx; padding: 0 44rpx;
-		display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 34rpx; background: #fff;
-		color: #E36B0C; font-size: 26rpx; font-weight: 700;
-		box-shadow: 0 6rpx 16rpx rgba(0,0,0,0.1);
+		margin-top: 28rpx;
+		height: 80rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-card;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: 0 8rpx 20rpx rgba(0, 0, 0, 0.1);
+	}
+	.withdraw-cta-txt {
+		color: $yjyf-primary;
+		font-size: $yjyf-font-body;
+		font-weight: 700;
 	}
 
-	.tips {
-		margin: 20rpx 24rpx 0; padding: 16rpx 20rpx; background: #FFF7F0;
-		border-radius: 14rpx; font-size: 22rpx; color: #C4580A; line-height: 32rpx;
+	/* 规则提示条 */
+	.tips-bar {
+		margin: 20rpx $yjyf-space-md 0;
+		padding: 18rpx 22rpx;
+		background: $yjyf-primary-bg;
+		border-radius: $yjyf-radius-sm;
+		display: flex;
+		align-items: center;
+	}
+	.tips-ico {
+		width: 28rpx;
+		height: 28rpx;
+		margin-right: 12rpx;
+		flex-shrink: 0;
+	}
+	.tips-txt {
+		flex: 1;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-primary;
+		line-height: 1.45;
 	}
 
 	/* 账单卡片 */
-	.card {
-		margin: 20rpx 24rpx 0; padding: 24rpx; background: #fff; border-radius: 20rpx;
-		box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06);
+	.bill-card {
+		margin: 20rpx $yjyf-space-md 48rpx;
+		padding: $yjyf-space-md;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.card-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 16rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.card-title {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.filter-tabs {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
 	}
-	.card-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 8rpx; }
-	.card-title { font-size: 28rpx; font-weight: 700; color: #1F1F1F; }
-	.filter-tabs { display: flex; align-items: center; }
 	.ft-item {
-		height: 44rpx; line-height: 44rpx; text-align: center; padding: 0 16rpx; margin-left: 8rpx; border-radius: 22rpx;
-		display: inline-flex; align-items: center; justify-content: center;
-		font-size: 22rpx; color: #9A9A9A;
+		height: 52rpx;
+		padding: 0 22rpx;
+		border-radius: $yjyf-radius-pill;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		background: $yjyf-bg-page;
 	}
-	.ft-item.on { background: #FFF3E6; color: #E36B0C; font-weight: 600; }
-
-	.log-list { display: flex; flex-direction: column; }
-	.log {
-		display: flex; align-items: center; justify-content: space-between;
-		padding: 20rpx 0; border-bottom: 1rpx solid #F4F4F4;
+	.ft-item.on {
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-weight: 600;
 	}
-	.log:last-of-type { border-bottom: none; }
-	.log-l { flex: 1; min-width: 0; display: flex; flex-direction: column; }
-	.log-t { font-size: 26rpx; font-weight: 600; color: #2C2C2E; }
-	.log-r { margin-top: 4rpx; font-size: 22rpx; color: #8A8A8E; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }
-	.log-time { margin-top: 6rpx; font-size: 22rpx; color: #B0B0B0; }
-	.log-r2 { display: flex; flex-direction: column; align-items: flex-end; }
-	.log-amt { font-size: 32rpx; font-weight: 700; color: #2FA84F; }
-	.log-amt.minus { color: #E8331B; }
-	.log-bal { margin-top: 4rpx; font-size: 22rpx; color: #B0B0B0; }
 
-	.empty-box { display: flex; flex-direction: column; align-items: center; padding: 70rpx 0; }
-	.empty-img { width: 140rpx; height: 140rpx; margin-bottom: 16rpx; }
-	.empty-txt { font-size: 24rpx; color: #9A9A9A; }
+	.log-list {
+		display: flex;
+		flex-direction: column;
+	}
+	.log-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 24rpx 0;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.log-row:last-child {
+		border-bottom: none;
+	}
+	.log-main {
+		flex: 1;
+		min-width: 0;
+		margin-right: 20rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	.log-title-line {
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+	}
+	.log-type {
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+	.log-order-tag {
+		height: 36rpx;
+		padding: 0 12rpx;
+		border-radius: 8rpx;
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-micro;
+		display: inline-flex;
+		align-items: center;
+	}
+	.log-remark {
+		margin-top: 8rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.log-time {
+		margin-top: 6rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
+	.log-right {
+		display: flex;
+		align-items: center;
+		flex-shrink: 0;
+	}
+	.log-amt-wrap {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-end;
+	}
+	.log-amt {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-success;
+		font-variant-numeric: tabular-nums;
+	}
+	.log-amt.minus {
+		color: $yjyf-danger;
+	}
+	.log-bal {
+		margin-top: 6rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
+	.row-arrow {
+		width: 24rpx;
+		height: 24rpx;
+		margin-left: 12rpx;
+		opacity: 0.45;
+	}
+
+	.empty-box {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 72rpx 0 48rpx;
+	}
+	.empty-img {
+		width: 160rpx;
+		height: 160rpx;
+		margin-bottom: 16rpx;
+	}
+	.empty-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+
+	/* 半屏抽屉通用 */
+	.drawer-mask {
+		position: fixed;
+		inset: 0;
+		z-index: 900;
+		background: rgba(0, 0, 0, 0.48);
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+	.drawer-panel {
+		background: $yjyf-bg-card;
+		border-radius: 28rpx 28rpx 0 0;
+		padding: 28rpx $yjyf-space-lg calc(32rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+	.drawer-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 24rpx;
+	}
+	.drawer-title {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.drawer-close {
+		width: 56rpx;
+		height: 56rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.close-ico {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.channel-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx 24rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-bg-page;
+	}
+	.channel-label {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+	}
+	.channel-val {
+		display: flex;
+		align-items: center;
+	}
+	.ch-ico {
+		width: 30rpx;
+		height: 30rpx;
+		margin-right: 10rpx;
+	}
+	.ch-name {
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.amt-box {
+		margin-top: 24rpx;
+		padding: 24rpx;
+		border-radius: $yjyf-radius-md;
+		border: 1rpx solid $yjyf-border-color;
+	}
+	.amt-box-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.amt-label {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+	.amt-all {
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		color: $yjyf-primary;
+		padding: 4rpx 8rpx;
+	}
+	.amt-input-line {
+		margin-top: 20rpx;
+		padding-bottom: 16rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+		display: flex;
+		align-items: baseline;
+	}
+	.amt-symbol {
+		font-size: $yjyf-font-hero;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		margin-right: 12rpx;
+	}
+	.amt-input {
+		flex: 1;
+		height: 68rpx;
+		font-size: $yjyf-font-hero;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.amt-meta {
+		margin-top: 16rpx;
+		display: flex;
+		flex-direction: column;
+		gap: 6rpx;
+	}
+	.meta-item {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+	}
+
+	.detail-hero {
+		padding: 24rpx 0 28rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.dh-type {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+	.dh-amt {
+		margin-top: 12rpx;
+		font-size: 56rpx;
+		font-weight: 700;
+		color: $yjyf-success;
+		font-variant-numeric: tabular-nums;
+	}
+	.dh-amt.minus {
+		color: $yjyf-danger;
+	}
+	.detail-cells {
+		padding: 16rpx 0;
+	}
+	.d-cell {
+		display: flex;
+		align-items: flex-start;
+		justify-content: space-between;
+		padding: 16rpx 0;
+	}
+	.d-lab {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		flex-shrink: 0;
+		margin-right: 24rpx;
+	}
+	.d-val {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-main;
+		font-weight: 500;
+		text-align: right;
+	}
+	.d-val.multi {
+		line-height: 1.5;
+	}
+
+	.drawer-submit {
+		margin-top: 28rpx;
+		height: 88rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		color: $yjyf-bg-card;
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.drawer-submit.disabled {
+		opacity: 0.55;
+	}
 </style>
diff --git a/yjyf-app/pages/master/workbench.vue b/yjyf-app/pages/master/workbench.vue
index e9e150f..c006f19 100644
--- a/yjyf-app/pages/master/workbench.vue
+++ b/yjyf-app/pages/master/workbench.vue
@@ -7,33 +7,28 @@
 
 <script setup>
 	import { ref } from 'vue';
-	import { onShow, onPullDownRefresh } from '@dcloudio/uni-app';
+	import { onShow } from '@dcloudio/uni-app';
 	import MasterWorkbenchView from '@/components/master/MasterWorkbenchView.vue';
 	import YjyfMasterTabBar from '@/components/YjyfMasterTabBar.vue';
+	import { isLogin } from '@/utils/request.js';
+	import { setRole } from '@/utils/role.js';
 
 	const workbenchRef = ref(null);
 
 	onShow(() => {
+		if (isLogin()) {
+			setRole('master');
+		}
 		if (workbenchRef.value?.load) {
 			workbenchRef.value.load();
 		}
 	});
-
-	onPullDownRefresh(async () => {
-		try {
-			if (workbenchRef.value?.load) {
-				await workbenchRef.value.load();
-			}
-		} catch (e) {
-		} finally {
-			uni.stopPullDownRefresh();
-		}
-	});
 </script>
 
 <style scoped>
 	.master-workbench-page {
-		min-height: 100vh;
+		height: 100vh;
+		overflow: hidden;
 		background: #F5F6F8;
 	}
 </style>
diff --git a/yjyf-app/pages/merchant/apply.vue b/yjyf-app/pages/merchant/apply.vue
deleted file mode 100644
index 74ade35..0000000
--- a/yjyf-app/pages/merchant/apply.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-	<view class="page">
-		<!-- 头部一体化沉浸大卡（单一大背景贯穿，彻底消除分层断层） -->
-		<YjyfNavBar theme="orange" title="商家入驻" :fixed="true" :placeholder="true" />
-		<view class="hero" :style="{ marginTop: (-navHeight) + 'px', paddingTop: navHeight + 'px' }">
-			<view class="hero-body">
-				<text class="hero-t">企业专属工作台 · 批量派单与月结开票</text>
-				<text class="hero-s">企业账号可批量下单、按月对账、开具发票</text>
-			</view>
-		</view>
-
-		<view class="status" v-if="info">
-			<text class="st-t">{{ info.merchant.is_owner === false ? '关联账号' : '主账号' }} · 当前状态：{{ statusText }}</text>
-			<text class="st-m" v-if="info.merchant.audit_msg">审核意见：{{ info.merchant.audit_msg }}</text>
-		</view>
-
-		<view class="card" v-if="canEdit">
-			<view class="block-title">企业信息</view>
-			<view class="fi"><text class="fk">企业名称</text><input class="fv" v-model="form.name" placeholder="与营业执照一致" /></view>
-			<view class="fi"><text class="fk">信用代码</text><input class="fv" v-model="form.license_no" maxlength="18" placeholder="统一社会信用代码" /></view>
-			<view class="fi"><text class="fk">法人代表</text><input class="fv" v-model="form.legal_person" placeholder="法人姓名" /></view>
-
-			<view class="block-title">联系方式</view>
-			<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="block-title">开票与结算</view>
-			<view class="fi"><text class="fk">发票抬头</text><input class="fv" v-model="form.invoice_title" placeholder="不填默认同企业名称" /></view>
-			<view class="fi"><text class="fk">税号</text><input class="fv" v-model="form.invoice_tax_no" placeholder="纳税人识别号" /></view>
-			<view class="fi"><text class="fk">结算方式</text>
-				<view class="seg">
-					<view class="seg-i" :class="{ on: form.settle_type === 'prepay' }" @tap="form.settle_type = 'prepay'">预付</view>
-					<view class="seg-i" :class="{ on: form.settle_type === 'monthly' }" @tap="form.settle_type = 'monthly'">月结</view>
-				</view>
-			</view>
-
-			<view class="block-title">营业执照照片</view>
-			<view class="license-box clickable-hover" @tap="uploadLicense">
-				<image v-if="form.license_image" class="license-img" :src="form.license_image" mode="aspectFit" />
-				<view v-else class="license-ph">
-					<text class="license-ph-t">点击上传营业执照照片</text>
-					<text class="license-ph-s">支持 JPG / PNG 格式</text>
-				</view>
-			</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.merchant.name }}</text></view>
-			<view class="li"><text class="k">信用代码</text><text class="v">{{ info.merchant.license_no }}</text></view>
-			<view class="li"><text class="k">联系人</text><text class="v">{{ info.merchant.contact }} {{ info.merchant.mobile }}</text></view>
-			<view class="li"><text class="k">经营地址</text><text class="v">{{ info.merchant.address }}</text></view>
-			<view class="li"><text class="k">累计订单</text><text class="v">{{ info.merchant.order_count }} 单</text></view>
-			<view class="li"><text class="k">累计金额</text><text class="v">¥{{ info.merchant.total_amount }}</text></view>
-			<view class="li"><text class="k">关联账号</text><text class="v">{{ info.merchant.member_count || 0 }} 个 · 工作台管理</text></view>
-			<view class="hint" v-if="info.merchant.is_owner === false">当前账号为关联账号，企业资料由主账号维护；订单、账单、开票数据与主账号实时同步。</view>
-			<view class="go" @tap="goWorkbench">进入商家工作台 ›</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';
-	import { useShare } from '@/utils/share.js';
-
-	import { getNavBarMetrics } from '@/utils/system.js';
-	const navHeight = ref(getNavBarMetrics().totalNavHeight);
-	const info = ref(null);
-	const submitting = ref(false);
-
-	useShare(() => ({
-		title: '优匠优服企业商家入驻 · 批量派单、统一对账与合规开票',
-		path: '/pages/merchant/apply',
-		query: ''
-	}));
-	const form = reactive({
-		name: '', license_no: '', legal_person: '', contact: '', mobile: '',
-		province: '贵州省', city: '遵义市', district: '', address: '',
-		invoice_title: '', invoice_tax_no: '', settle_type: 'prepay',
-		license_image: ''
-	});
-
-	const statusText = computed(() => {
-		if (!info.value || !info.value.merchant) return '未入驻';
-		const s = info.value.merchant.verify_status;
-		return { pending: '待审核', pass: '已通过', reject: '未通过' }[s] || s;
-	});
-	const canEdit = computed(() => !info.value || !info.value.applied || info.value.merchant.verify_status === 'reject');
-
-	function goWorkbench() { uni.redirectTo({ url: '/pages/merchant/workbench' }); }
-
-	function uploadLicense() {
-		if (!isLogin()) { toLogin(); return; }
-		uni.chooseImage({
-			count: 1,
-			success: async (res) => {
-				const temp = res.tempFilePaths[0];
-				uni.showLoading({ title: '执照上传中...' });
-				try {
-					const up = await api.upload(temp, 'cert');
-					const imgUrl = up.fullurl || up.url;
-					if (imgUrl) form.license_image = imgUrl;
-				} catch (e) {
-				} finally {
-					uni.hideLoading();
-				}
-			}
-		});
-	}
-
-	async function load() {
-		if (!isLogin()) { return; }
-		const res = await api.merchantInfo();
-		info.value = res.applied ? res : null;
-		if (res.applied) {
-			const m = res.merchant;
-			form.name = m.name;
-			form.license_no = m.license_no;
-			form.legal_person = m.legal_person;
-			form.contact = m.contact;
-			form.mobile = m.mobile;
-			form.address = m.address;
-			form.invoice_title = m.invoice_title;
-			form.invoice_tax_no = m.invoice_tax_no;
-			form.settle_type = m.settle_type;
-			form.license_image = m.license_image || '';
-		} else {
-			const u = getUser();
-			if (u) form.mobile = u.mobile || '';
-		}
-	}
-
-	async function submit() {
-		if (!isLogin()) { toLogin(); return; }
-		if (submitting.value) return;
-		if (!form.name || !form.license_no || !form.contact || !form.mobile) {
-			uni.showToast({ title: '请填写企业名称/信用代码/联系人/电话', icon: 'none' });
-			return;
-		}
-		submitting.value = true;
-		try {
-			await api.merchantApply(form);
-			uni.showToast({ title: '已提交，等待审核' });
-			load();
-		} catch (e) {
-		} finally {
-			submitting.value = false;
-		}
-	}
-
-	onShow(() => load());
-</script>
-
-<style scoped>
-	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 60rpx; }
-	.hero { padding-bottom: 36rpx; background-color: #F0710D; background-image: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%); background-size: 100% 600rpx; background-position: 0 0; background-repeat: no-repeat; }
-	.hero-body { padding: 20rpx 36rpx 0; }
-	.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,.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,.06); }
-	.block-title { margin: 18rpx 0 4rpx; font-size: 26rpx; font-weight: 700; color: #1F1F1F; }
-	.block-title:first-child { margin-top: 0; }
-	.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; }
-	.seg { display: flex; }
-	.seg-i { padding: 0 28rpx; height: 56rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; margin-right: 12rpx; border-radius: 28rpx; background: #F5F5F5; font-size: 24rpx; color: #666; }
-	.seg-i.on { background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); color: #fff; }
-	.license-box { height: 180rpx; border: 2rpx dashed #E0E0E0; border-radius: 16rpx; display: flex; align-items: center; justify-content: center; background: #FAFAFA; overflow: hidden; margin-top: 14rpx; }
-	.license-img { width: 100%; height: 100%; }
-	.license-ph { display: flex; flex-direction: column; align-items: center; }
-	.license-ph-t { font-size: 24rpx; font-weight: 600; color: #666; }
-	.license-ph-s { font-size: 22rpx; color: #999; margin-top: 4rpx; }
-	.submit { height: 92rpx; margin-top: 24rpx; 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: .7; }
-	.li { display: flex; justify-content: space-between; padding: 14rpx 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; }
-	.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/yjyf-app/pages/merchant/batch.vue b/yjyf-app/pages/merchant/batch.vue
deleted file mode 100644
index b569d6a..0000000
--- a/yjyf-app/pages/merchant/batch.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-<template>
-	<view class="page">
-		<YjyfNavBar theme="orange" title="批量下单" />
-
-		<view class="card">
-			<view class="card-title">选择服务</view>
-			<view class="fi">
-				<text class="fk">服务类目</text>
-				<picker :range="catNames" @change="onCat">
-					<view class="picker">{{ catNames[catIdx] || '请选择' }} ›</view>
-				</picker>
-			</view>
-			<view class="fi">
-				<text class="fk">服务项目</text>
-				<picker :range="svcNames" @change="onSvc">
-					<view class="picker">{{ svcNames[svcIdx] || '请选择' }} ›</view>
-				</picker>
-			</view>
-			<view class="hint" v-if="svc">单价 {{ svc.price_text }} · {{ svc.price_type_text }}</view>
-		</view>
-
-		<!-- 批量文本智能解析区 -->
-		<view class="card">
-			<view class="card-head">
-				<text class="card-title">快速智能粘贴导单</text>
-				<text class="card-toggle" @tap="showParser = !showParser">{{ showParser ? '收起' : '展开' }}</text>
-			</view>
-			<view v-if="showParser" class="parser-box">
-				<textarea class="parser-input" v-model="batchText" placeholder="支持多行粘贴（从Excel/电商复制）：&#10;格式：姓名 电话 详细地址&#10;例：张三 13800138000 贵州省遵义市汇川区南京路12号" />
-				<view class="parser-bar">
-					<view class="parser-tip">每行识别一个订单地址</view>
-					<button class="parser-btn" @tap="parseBatchText">智能解析并添加</button>
-				</view>
-			</view>
-		</view>
-
-		<view class="card">
-			<view class="card-head">
-				<text class="card-title">订单列表（{{ rows.length }} 个）</text>
-				<text class="card-more" @tap="addRow">＋ 手动添加</text>
-			</view>
-			<view class="row" v-for="(r, i) in rows" :key="i">
-				<view class="row-head">
-					<text class="row-no">工单 #{{ i + 1 }}</text>
-					<text class="row-del" @tap="delRow(i)">删除</text>
-				</view>
-				<view class="row-grid">
-					<input class="input input-sm" v-model="r.contact" placeholder="联系人" />
-					<input class="input input-sm" v-model="r.mobile" type="number" maxlength="11" placeholder="联系电话" />
-				</view>
-				<input class="input" v-model="r.address" placeholder="详细服务地址（含省市区/小区/门牌）" />
-				<view class="row-foot">
-					<view class="mini">
-						<text class="mini-k">楼层</text>
-						<view class="st"><view class="st-btn" @tap="step(r, 'floor', -1)">－</view><text class="st-v">{{ r.floor }}</text><view class="st-btn" @tap="step(r, 'floor', 1)">＋</view></view>
-					</view>
-					<view class="mini">
-						<text class="mini-k">数量</text>
-						<view class="st"><view class="st-btn" @tap="step(r, 'num', -1)">－</view><text class="st-v">{{ r.num }}</text><view class="st-btn" @tap="step(r, 'num', 1)">＋</view></view>
-					</view>
-					<view class="mini">
-						<text class="mini-k">电梯</text>
-						<view class="seg">
-							<view class="seg-i" :class="{ on: r.elevator === 1 }" @tap="r.elevator = 1">有</view>
-							<view class="seg-i" :class="{ on: r.elevator === 0 }" @tap="r.elevator = 0">无</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="bar">
-			<view class="bar-l">
-				<text class="bar-k">共 {{ rows.length }} 单</text>
-				<text class="bar-p">¥{{ estimate }}</text>
-			</view>
-			<view class="bar-btn" :class="{ disabled: submitting }" @tap="submit">{{ submitting ? '提交中...' : '一键批量创单' }}</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import { ref, computed } from 'vue';
-	import { onLoad } from '@dcloudio/uni-app';
-	import api from '@/utils/api.js';
-
-	const cats = ref([]);
-	const catIdx = ref(0);
-	const svcs = ref([]);
-	const svcIdx = ref(0);
-	const submitting = ref(false);
-	const showParser = ref(true);
-	const batchText = ref('');
-	const rows = ref([]);
-
-	const catNames = computed(() => cats.value.map(c => c.name));
-	const svcNames = computed(() => svcs.value.map(s => s.name + ' ' + s.price_text));
-	const svc = computed(() => svcs.value[svcIdx.value] || null);
-	const estimate = computed(() => {
-		if (!svc.value) return '0.00';
-		const base = Number(svc.value.base_price) || 0;
-		return rows.value.reduce((sum, r) => sum + base * r.num, 0).toFixed(2);
-	});
-
-	function newRow(data = {}) {
-		return {
-			contact: data.contact || '',
-			mobile: data.mobile || '',
-			address: data.address || '',
-			floor: data.floor || 1,
-			elevator: data.elevator !== undefined ? data.elevator : 1,
-			num: data.num || 1
-		};
-	}
-	function addRow() { rows.value.push(newRow()); }
-	function delRow(i) {
-		if (rows.value.length > 1) {
-			rows.value.splice(i, 1);
-		} else {
-			rows.value = [newRow()];
-		}
-	}
-	function step(r, key, d) { r[key] = Math.max(1, r[key] + d); }
-
-	function parseBatchText() {
-		if (!batchText.value.trim()) {
-			uni.showToast({ title: '请先粘贴待解析文本', icon: 'none' });
-			return;
-		}
-		const lines = batchText.value.split(/\r?\n/).map(l => l.trim()).filter(Boolean);
-		let parsedCount = 0;
-		for (const line of lines) {
-			// 匹配手机号 1[3-9]\d{9}
-			const phoneMatch = line.match(/(1[3-9]\d{9})/);
-			let mobile = '';
-			let contact = '';
-			let address = '';
-			if (phoneMatch) {
-				mobile = phoneMatch[1];
-				const parts = line.split(mobile);
-				contact = parts[0].trim().replace(/[,，:：]/g, '');
-				address = (parts[1] || '').trim().replace(/[,，:：]/g, '');
-			} else {
-				const segs = line.split(/[\s,，\t]+/);
-				contact = segs[0] || '买家';
-				address = segs.slice(1).join(' ') || '';
-			}
-			if (mobile || address) {
-				if (rows.value.length === 1 && !rows.value[0].contact && !rows.value[0].mobile && !rows.value[0].address) {
-					rows.value = [];
-				}
-				rows.value.push(newRow({ contact, mobile, address }));
-				parsedCount++;
-			}
-		}
-		if (parsedCount > 0) {
-			batchText.value = '';
-			showParser.value = false;
-			uni.showToast({ title: `成功解析并添加 ${parsedCount} 条`, icon: 'success' });
-		} else {
-			uni.showToast({ title: '未识别到有效信息，请检查格式', icon: 'none' });
-		}
-	}
-
-	async function onCat(e) {
-		catIdx.value = Number(e.detail.value);
-		svcIdx.value = 0;
-		const res = await api.services({ cat_id: cats.value[catIdx.value].id });
-		svcs.value = res.list || [];
-	}
-	function onSvc(e) { svcIdx.value = Number(e.detail.value); }
-
-	async function loadCats() {
-		try {
-			const res = await api.cats();
-			cats.value = res.list || [];
-			if (cats.value.length) {
-				const r2 = await api.services({ cat_id: cats.value[0].id });
-				svcs.value = r2.list || [];
-			}
-		} catch (e) {}
-	}
-
-	async function submit() {
-		if (submitting.value) return;
-		if (!svc.value) { uni.showToast({ title: '请选择服务项目', icon: 'none' }); return; }
-		const valid = rows.value.filter(r => r.contact && r.mobile && r.address);
-		if (!valid.length) { uni.showToast({ title: '请至少填写一个完整订单地址', icon: 'none' }); return; }
-
-		submitting.value = true;
-		try {
-			const res = await api.merchantImportBatch({
-				service_id: svc.value.id,
-				orders: valid
-			});
-			submitting.value = false;
-			uni.showModal({
-				title: '批量导入创单成功',
-				content: `共创建 ${res.count || valid.length} 单\n批次号：${res.batch_no || '已生成'}\n合计金额：¥${res.total_amount || estimate.value}`,
-				showCancel: false,
-				success: () => {
-					uni.redirectTo({ url: '/pages/merchant/workbench' });
-				}
-			});
-		} catch (e) {
-			submitting.value = false;
-			uni.showToast({ title: e.msg || e.message || '批量创单失败', icon: 'none' });
-		}
-	}
-
-	onLoad(() => {
-		rows.value = [newRow()];
-		loadCats();
-	});
-</script>
-
-<style scoped>
-	.page { min-height: 100vh; background: #F5F6F8; padding: 0 0 180rpx; }
-	.card { margin: 20rpx 24rpx 0; padding: 24rpx; background: #fff; border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06); }
-	.card-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 12rpx; }
-	.card-title { font-size: 28rpx; font-weight: 700; color: #1F1F1F; }
-	.card-more { font-size: 24rpx; color: #F0710D; font-weight: 600; }
-	.card-toggle { font-size: 24rpx; color: #999; }
-	.fi { display: flex; align-items: center; min-height: 88rpx; border-bottom: 1rpx solid #F4F4F4; }
-	.fk { width: 170rpx; font-size: 26rpx; color: #666; }
-	.picker { font-size: 28rpx; color: #222; }
-	.hint { margin-top: 12rpx; font-size: 22rpx; color: #9A9A9A; }
-
-	.parser-box { background: #FAFAFA; border: 1rpx solid #EBEBEB; border-radius: 12rpx; padding: 16rpx; margin-top: 10rpx; }
-	.parser-input { width: 100%; height: 160rpx; font-size: 24rpx; color: #333; line-height: 1.5; }
-	.parser-bar { display: flex; align-items: center; justify-content: space-between; margin-top: 12rpx; border-top: 1rpx solid #EEEEEE; padding-top: 12rpx; }
-	.parser-tip { font-size: 22rpx; color: #999; }
-	.parser-btn { margin: 0; padding: 0 24rpx; height: 56rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; background: #F0710D; color: #fff; font-size: 24rpx; border-radius: 28rpx; border: none; }
-
-	.row { padding: 18rpx 0; border-bottom: 1rpx dashed #EDEDED; }
-	.row:last-child { border-bottom: none; }
-	.row-head { display: flex; justify-content: space-between; margin-bottom: 10rpx; }
-	.row-no { font-size: 24rpx; font-weight: 700; color: #F0710D; }
-	.row-del { font-size: 22rpx; color: #FF4D4F; }
-	.row-grid { display: flex; gap: 16rpx; }
-	.input { height: 76rpx; margin-bottom: 12rpx; padding: 0 20rpx; background: #F7F7F7; border-radius: 10rpx; font-size: 26rpx; color: #222; }
-	.input-sm { flex: 1; }
-	.row-foot { display: flex; align-items: center; justify-content: space-between; margin-top: 8rpx; }
-	.mini { display: flex; align-items: center; }
-	.mini-k { font-size: 22rpx; color: #9A9A9A; margin-right: 8rpx; }
-	.st { display: flex; align-items: center; }
-	.st-btn { width: 44rpx; height: 44rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 22rpx; background: #F0F0F0; color: #666; font-size: 24rpx; }
-	.st-v { min-width: 44rpx; text-align: center; font-size: 26rpx; color: #222; }
-	.seg { display: flex; }
-	.seg-i { padding: 0 18rpx; height: 48rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; margin-right: 8rpx; border-radius: 24rpx; background: #F0F0F0; font-size: 22rpx; color: #666; }
-	.seg-i.on { background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); color: #fff; }
-	.bar { position: fixed; left: 0; right: 0; bottom: 0; height: 120rpx; padding: 0 24rpx; 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,.07); z-index: 100; }
-	.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 44rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 42rpx; color: #fff; font-size: 28rpx; font-weight: 600; background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); box-shadow: 0 8rpx 20rpx rgba(240,113,13,.3); }
-	.bar-btn.disabled { opacity: .7; }
-</style>
diff --git a/yjyf-app/pages/merchant/invoice.vue b/yjyf-app/pages/merchant/invoice.vue
index 4e7c84e..455e9b3 100644
--- a/yjyf-app/pages/merchant/invoice.vue
+++ b/yjyf-app/pages/merchant/invoice.vue
@@ -1,477 +1,711 @@
 <template>
 	<view class="page">
-		<!-- 统一标准白底导航栏（模式 B） -->
-		<YjyfNavBar theme="white" title="开具发票" :border="true" />
+		<!-- 模式 A：沉浸式橙金一体化导航栏 -->
+		<YjyfNavBar theme="orange" title="发票服务" :fixed="true" :placeholder="true" />
 
-		<!-- 顶部可开票额度概览卡片 -->
-		<view class="quota-card">
-			<view class="quota-main">
-				<text class="quota-label">可开票金额（元）</text>
-				<view class="quota-num-row">
-					<text class="quota-val">¥{{ Number(available).toFixed(2) }}</text>
-					<view class="fill-all-btn" v-if="available > 0" @tap="fillAllAmount">全部填入</view>
-				</view>
-			</view>
-			<view class="quota-sub-row">
-				<view class="quota-sub-item">
-					<text class="sub-k">累计已付订单</text>
-					<text class="sub-v">¥{{ Number(paidAmount).toFixed(2) }}</text>
-				</view>
-				<view class="quota-divider"></view>
-				<view class="quota-sub-item">
-					<text class="sub-k">已开/开票中</text>
-					<text class="sub-v">¥{{ Number(usedAmount).toFixed(2) }}</text>
-				</view>
-			</view>
-		</view>
+		<YjyfRefreshScroll
+			class="inv-scroll"
+			theme="orange"
+			:nav-offset="navHeight"
+			:refresh-task="loadAll"
+		>
+			<!-- 1. 紧凑型资产总览 Hero（与 YjyfNavBar 100% 600rpx 渐变严格对齐） -->
+			<view class="inv-hero" :style="{ backgroundPosition: '0 -' + navHeight + 'px' }">
+				<view class="hero-inner">
+					<view class="hero-main">
+						<view class="hero-left">
+							<text class="hero-label">可开票金额（元）</text>
+							<view class="hero-amount-row">
+								<text class="hero-currency">¥</text>
+								<text class="hero-num-int">{{ moneyParts(available).int }}</text>
+								<text class="hero-num-dec">.{{ moneyParts(available).dec }}</text>
+							</view>
+						</view>
 
-		<!-- 申请开票表单卡片 -->
-		<view class="card">
-			<view class="card-head">
-				<text class="card-title">填写开票信息</text>
-				<view class="card-link" v-if="isMerchant" @tap="go('/pages/merchant/apply')">
-					<text class="card-link-txt">维护企业默认资质</text>
-					<image class="card-link-ico" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
-				</view>
-			</view>
-
-			<view class="fi">
-				<text class="fk">抬头类型</text>
-				<view class="seg">
-					<view class="seg-i" :class="{ on: titleType === 'personal' }" @tap="switchTitleType('personal')">个人/非企业</view>
-					<view class="seg-i" :class="{ on: titleType === 'enterprise' }" @tap="switchTitleType('enterprise')">企业单位</view>
-				</view>
-			</view>
-
-			<view class="fi">
-				<text class="fk">发票类型</text>
-				<view class="seg">
-					<view class="seg-i" :class="{ on: type === 'normal' }" @tap="type = 'normal'">普通发票</view>
-					<view class="seg-i" :class="{ on: type === 'special', disabled: titleType === 'personal' }" @tap="selectSpecial">专用发票</view>
-				</view>
-			</view>
-
-			<view class="fi">
-				<text class="fk">发票抬头</text>
-				<input class="fv" v-model="title" :placeholder="titleType === 'personal' ? '请输入个人姓名或抬头（默认个人）' : '请输入企业完整名称'" />
-			</view>
-
-			<view class="fi" v-if="titleType === 'enterprise'">
-				<text class="fk">纳税人识别号</text>
-				<input class="fv" v-model="taxNo" placeholder="请输入15-20位统一社会信用代码" />
-			</view>
-
-			<view class="fi">
-				<text class="fk">开票金额</text>
-				<input class="fv" type="digit" v-model="amount" :placeholder="'本次最多可开 ¥' + Number(available).toFixed(2)" />
-			</view>
-
-			<view class="fi">
-				<text class="fk">接收邮箱</text>
-				<input class="fv" v-model="email" placeholder="用于接收电子发票（选填）" />
-			</view>
-
-			<view class="fi no-border">
-				<text class="fk">发票备注</text>
-				<input class="fv" v-model="remark" placeholder="选填，如订单号或特殊说明" />
-			</view>
-
-			<view class="btn" :class="{ disabled: submitting || available <= 0 }" @tap="submit">
-				{{ submitting ? '提交中...' : (available > 0 ? '提交开票申请' : '暂无可开票金额') }}
-			</view>
-		</view>
-
-		<!-- 开票记录卡片 -->
-		<view class="card">
-			<view class="card-head">
-				<text class="card-title">开票记录</text>
-				<text class="card-more">共 {{ list.length }} 条</text>
-			</view>
-			<view class="iv" v-for="i in list" :key="i.id">
-				<view class="iv-top">
-					<view class="iv-tags">
-						<text class="iv-type">{{ i.type_text }}</text>
-						<text class="iv-head-tag">{{ i.title_type_text || (i.tax_no ? '企业单位' : '个人/非企业') }}</text>
+						<!-- 全屏唯一主行动按钮 -->
+						<view class="hero-cta clickable-hover" @tap="go('/pages/invoice/orders')">
+							<text class="cta-txt">去开票</text>
+							<image class="cta-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+						</view>
+					</view>
+
+					<!-- 磨砂玻璃三栏核心数据 -->
+					<view class="hero-metrics">
+						<view class="metric-col clickable-hover" @tap="go('/pages/invoice/orders')">
+							<text class="m-lab">待开订单</text>
+							<text class="m-val">{{ unbilledOrderCount }}</text>
+						</view>
+						<view class="m-div"></view>
+						<view class="metric-col clickable-hover" @tap="go('/pages/invoice/records?status=wait')">
+							<text class="m-lab">开票中</text>
+							<text class="m-val">{{ waitCount }}</text>
+						</view>
+						<view class="m-div"></view>
+						<view class="metric-col clickable-hover" @tap="go('/pages/invoice/records?status=issued')">
+							<text class="m-lab">累计已开</text>
+							<text class="m-val">¥{{ formatMoney(issuedAmount) }}</text>
+						</view>
 					</view>
-					<text class="iv-amt">¥{{ Number(i.amount).toFixed(2) }}</text>
-				</view>
-				<text class="iv-meta">{{ i.title }}{{ i.tax_no ? ' · ' + i.tax_no : '' }}</text>
-				<view class="iv-foot">
-					<text class="iv-time">{{ i.time_text }}</text>
-					<text class="iv-status" :class="'st-' + i.status">
-						{{ i.status_text }}{{ i.invoice_no ? '（票号：' + i.invoice_no + '）' : '' }}
-					</text>
 				</view>
 			</view>
-			<view class="empty-box" v-if="!list.length">
-				<image class="empty-ico" src="/static/icons/empty.svg" mode="aspectFit" />
-				<text class="empty-txt">暂无开票记录</text>
+
+			<!-- 圆弧承接主内容区 -->
+			<view class="content-sheet">
+				<!-- 2. 极简紧凑双宫格（去除冗余解释文字） -->
+				<view class="bento-grid">
+					<view class="bento-card clickable-hover" @tap="go('/pages/invoice/titles')">
+						<image class="bento-ico" src="/static/icons/invoice-portal-title.svg" mode="aspectFit" />
+						<view class="bento-info">
+							<text class="bento-title">发票抬头</text>
+							<text class="bento-meta">{{ titleCount > 0 ? titleCount + ' 个常用' : '去添加' }}</text>
+						</view>
+						<image class="bento-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+					</view>
+
+					<view class="bento-card clickable-hover" @tap="go('/pages/invoice/records')">
+						<image class="bento-ico" src="/static/icons/invoice-portal-record.svg" mode="aspectFit" />
+						<view class="bento-info">
+							<text class="bento-title">开票记录</text>
+							<text class="bento-meta" :class="{ highlight: waitCount > 0 }">
+								{{ waitCount > 0 ? waitCount + ' 笔开票中' : (recordCount > 0 ? recordCount + ' 条记录' : '暂无记录') }}
+							</text>
+						</view>
+						<image class="bento-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<!-- 3. 默认发票抬头精简名片 -->
+				<view class="pass-card clickable-hover" v-if="defaultTitle" @tap="go('/pages/invoice/titles')">
+					<view class="pass-accent"></view>
+					<view class="pass-body">
+						<view class="pass-title-row">
+							<text class="pass-tag">默认</text>
+							<text class="pass-name">{{ defaultTitle.title }}</text>
+						</view>
+						<text class="pass-tax" v-if="defaultTitle.tax_no">{{ defaultTitle.tax_no }}</text>
+					</view>
+					<image class="row-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+				</view>
+
+				<view class="pass-empty clickable-hover" v-else @tap="go('/pages/invoice/title-edit')">
+					<view class="pe-left">
+						<image class="pe-ico" src="/static/icons/invoice-title-orange.svg" mode="aspectFit" />
+						<text class="pe-title">添加常用发票抬头</text>
+					</view>
+					<view class="pe-right">
+						<text class="pe-link">去添加</text>
+						<image class="pe-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<!-- 4. 近期开票列表 -->
+				<view class="recent-card">
+					<view class="card-head">
+						<text class="card-title">近期开票</text>
+						<view class="head-more clickable-hover" v-if="recordCount > 0" @tap="go('/pages/invoice/records')">
+							<text class="more-txt">全部</text>
+							<image class="row-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+						</view>
+					</view>
+
+					<view class="rec-list" v-if="recentRecords.length > 0">
+						<view
+							class="rec-row clickable-hover"
+							v-for="item in recentRecords"
+							:key="item.id"
+							@tap="go('/pages/invoice/detail?id=' + item.id)"
+						>
+							<view class="rec-type-box" :class="{ special: item.type === 'special' }">
+								<text class="rt-txt">{{ item.type === 'special' ? '专票' : '普票' }}</text>
+							</view>
+
+							<view class="rec-main">
+								<text class="rec-name">{{ item.title }}</text>
+								<text class="rec-meta">{{ item.time_text }}</text>
+							</view>
+
+							<view class="rec-right">
+								<view class="rec-amt-col">
+									<text class="rec-amt">¥{{ formatMoney(item.amount) }}</text>
+									<text class="rec-st" :class="'st-' + item.status">{{ item.status_text }}</text>
+								</view>
+								<image class="row-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+							</view>
+						</view>
+					</view>
+
+					<view class="empty-box" v-else>
+						<image class="empty-ico" src="/static/icons/empty-invoice-records.svg" mode="aspectFit" />
+						<text class="empty-title">{{ loading ? '加载中...' : '暂无开票记录' }}</text>
+					</view>
+				</view>
 			</view>
-		</view>
+		</YjyfRefreshScroll>
 	</view>
 </template>
 
 <script setup>
 	import { ref } from 'vue';
-	import { onShow } from '@dcloudio/uni-app';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import YjyfNavBar from '@/components/YjyfNavBar.vue';
+	import YjyfRefreshScroll from '@/components/YjyfRefreshScroll.vue';
 	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+	import { getNavBarMetrics } from '@/utils/system.js';
 
-	const isMerchant = ref(false);
-	const titleType = ref('personal');
-	const title = ref('');
-	const taxNo = ref('');
-	const enterpriseTitle = ref('');
-	const enterpriseTaxNo = ref('');
-	const personalTitle = ref('个人');
+	const navHeight = ref(getNavBarMetrics().totalNavHeight);
 	const available = ref(0);
-	const paidAmount = ref(0);
-	const usedAmount = ref(0);
-	const amount = ref('');
-	const email = ref('');
-	const remark = ref('');
-	const type = ref('normal');
-	const list = ref([]);
-	const submitting = ref(false);
-	const initialized = ref(false);
+	const issuedAmount = ref(0);
+	const unbilledOrderCount = ref(0);
+	const waitCount = ref(0);
+	const recordCount = ref(0);
+	const titleCount = ref(0);
+	const defaultTitle = ref(null);
+	const recentRecords = ref([]);
+	const loading = ref(false);
+	const redirected = ref(false);
+
+	function formatMoney(v) {
+		const n = Number(v || 0);
+		return Number.isFinite(n) ? n.toFixed(2) : '0.00';
+	}
+
+	function moneyParts(v) {
+		const str = formatMoney(v);
+		const parts = str.split('.');
+		return { int: parts[0] || '0', dec: parts[1] || '00' };
+	}
+
+	onLoad((q) => {
+		const oid = (q && (q.order_ids || q.order_id)) ? String(q.order_ids || q.order_id).trim() : '';
+		if (oid) {
+			redirected.value = true;
+			uni.redirectTo({ url: `/pages/invoice/apply?order_ids=${encodeURIComponent(oid)}` });
+		}
+	});
+
+	onShow(() => {
+		if (redirected.value) return;
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		navHeight.value = getNavBarMetrics().totalNavHeight;
+		loadAll();
+	});
+
+	async function loadAll() {
+		loading.value = true;
+		try {
+			const [sumRes, recRes] = await Promise.all([
+				api.invoiceSummary(),
+				api.invoiceRecords({ status: 'all', page: 1, limit: 5 })
+			]);
+			const q = (sumRes && sumRes.quota) || {};
+			const tList = (sumRes && sumRes.titles) || [];
+			available.value = Number(q.available || 0);
+			issuedAmount.value = Number(q.issued_amount || 0);
+			unbilledOrderCount.value = Number(q.unbilled_order_count || 0);
+			waitCount.value = Number(q.wait_count || 0);
+			recordCount.value = Number(q.record_count || 0);
+			titleCount.value = Number(q.title_count || tList.length);
+			defaultTitle.value = q.default_title_obj || (tList.length > 0 ? tList[0] : null);
+			recentRecords.value = (recRes && recRes.list) || [];
+		} catch (e) {
+			// request.js 已统一提示错误
+		} finally {
+			loading.value = false;
+		}
+	}
 
 	function go(url) {
 		uni.navigateTo({ url });
 	}
-
-	function switchTitleType(target) {
-		titleType.value = target;
-		if (target === 'personal') {
-			if (type.value === 'special') {
-				type.value = 'normal';
-			}
-			title.value = personalTitle.value || '个人';
-		} else {
-			title.value = enterpriseTitle.value || '';
-			taxNo.value = enterpriseTaxNo.value || '';
-		}
-	}
-
-	function selectSpecial() {
-		if (titleType.value === 'personal') {
-			uni.showToast({ title: '个人抬头仅支持开具普通发票', icon: 'none' });
-			return;
-		}
-		type.value = 'special';
-	}
-
-	function fillAllAmount() {
-		if (available.value > 0) {
-			amount.value = String(Number(available.value).toFixed(2));
-		}
-	}
-
-	async function load() {
-		try {
-			const res = await api.merchantInvoices();
-			list.value = res.list || [];
-			if (res.quota) {
-				available.value = Number(res.quota.available || 0);
-				paidAmount.value = Number(res.quota.paid_amount || 0);
-				usedAmount.value = Number(res.quota.used_amount || 0);
-				isMerchant.value = !!res.quota.is_merchant;
-				enterpriseTitle.value = res.quota.enterprise_title || '';
-				enterpriseTaxNo.value = res.quota.enterprise_tax_no || '';
-				personalTitle.value = res.quota.personal_title || '个人';
-
-				if (!initialized.value) {
-					titleType.value = res.quota.default_title_type || 'personal';
-					title.value = res.quota.default_title || '';
-					taxNo.value = res.quota.default_tax_no || '';
-					initialized.value = true;
-				}
-			}
-		} catch (e) {}
-	}
-
-	async function submit() {
-		if (submitting.value || available.value <= 0) return;
-		const amt = Number(amount.value);
-		if (!amt || amt <= 0) {
-			uni.showToast({ title: '请填写有效开票金额', icon: 'none' });
-			return;
-		}
-		if (amt > available.value) {
-			uni.showToast({ title: '超出当前可开票金额', icon: 'none' });
-			return;
-		}
-		if (titleType.value === 'enterprise') {
-			if (!title.value.trim()) {
-				uni.showToast({ title: '请填写企业发票抬头', icon: 'none' });
-				return;
-			}
-			if (!taxNo.value.trim()) {
-				uni.showToast({ title: '请填写纳税人识别号', icon: 'none' });
-				return;
-			}
-		}
-		submitting.value = true;
-		try {
-			await api.merchantInvoice({
-				amount: amt,
-				type: type.value,
-				title_type: titleType.value,
-				title: title.value.trim(),
-				tax_no: titleType.value === 'enterprise' ? taxNo.value.trim() : '',
-				email: email.value.trim(),
-				remark: remark.value.trim()
-			});
-			uni.showToast({ title: '已提交开票申请' });
-			amount.value = '';
-			remark.value = '';
-			load();
-		} catch (e) {
-		} finally {
-			submitting.value = false;
-		}
-	}
-
-	onShow(() => load());
 </script>
 
 <style lang="scss" scoped>
 	.page {
-		min-height: 100vh;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
 		background: $yjyf-bg-page;
-		padding: 0 0 60rpx;
+		overflow: hidden;
 	}
-	.quota-card {
-		margin: 24rpx 24rpx 0;
-		padding: 32rpx 28rpx;
-		border-radius: 20rpx;
-		background: $yjyf-gradient-primary;
-		color: #FFFFFF;
+
+	.inv-scroll {
+		flex: 1;
+		height: 0;
+		width: 100%;
 	}
-	.quota-main {
+
+	/* 1. 顶部沉浸式资产 Hero（与 YjyfNavBar 100% 600rpx 严格一致，零色阶断层） */
+	.inv-hero {
+		padding-bottom: 56rpx;
+		background-color: $yjyf-primary;
+		background-image: $yjyf-gradient-primary;
+		background-size: 100% 600rpx;
+		background-repeat: no-repeat;
+	}
+
+	.hero-inner {
+		padding: $yjyf-space-sm $yjyf-space-lg 0;
+	}
+
+	.hero-main {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.hero-left {
+		flex: 1;
+		min-width: 0;
+		margin-right: $yjyf-space-md;
+	}
+
+	.hero-label {
+		font-size: $yjyf-font-sub;
+		color: rgba(255, 255, 255, 0.9);
+	}
+
+	.hero-amount-row {
+		margin-top: 8rpx;
+		display: flex;
+		align-items: baseline;
+	}
+
+	.hero-currency {
+		font-size: $yjyf-font-lg;
+		font-weight: 700;
+		color: $yjyf-text-inverse;
+		margin-right: 6rpx;
+	}
+
+	.hero-num-int {
+		font-size: 68rpx;
+		font-weight: 700;
+		color: $yjyf-text-inverse;
+		line-height: 1.1;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.hero-num-dec {
+		font-size: 38rpx;
+		font-weight: 700;
+		color: rgba(255, 255, 255, 0.92);
+		line-height: 1.1;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.hero-cta {
+		height: 76rpx;
+		padding: 0 32rpx 0 36rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-card;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+		box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.12);
+	}
+
+	.cta-txt {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-primary;
+	}
+
+	.cta-arrow {
+		width: 26rpx;
+		height: 26rpx;
+		margin-left: 6rpx;
+	}
+
+	.hero-metrics {
+		margin-top: 28rpx;
+		padding: 20rpx $yjyf-space-md;
+		border-radius: $yjyf-radius-md;
+		background: rgba(255, 255, 255, 0.16);
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.metric-col {
+		flex: 1;
+		min-width: 0;
 		display: flex;
 		flex-direction: column;
 	}
-	.quota-label {
-		font-size: 24rpx;
-		opacity: 0.9;
-	}
-	.quota-num-row {
-		margin-top: 10rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.quota-val {
-		font-size: 48rpx;
-		font-weight: 700;
-		line-height: 1.1;
-	}
-	.fill-all-btn {
-		padding: 10rpx 24rpx;
-		border-radius: 30rpx;
-		background: rgba(255, 255, 255, 0.22);
-		font-size: 24rpx;
-		font-weight: 500;
-		color: #FFFFFF;
-	}
-	.quota-sub-row {
-		margin-top: 28rpx;
-		padding-top: 22rpx;
-		border-top: 1rpx solid rgba(255, 255, 255, 0.2);
-		display: flex;
-		align-items: center;
-	}
-	.quota-sub-item {
-		flex: 1;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.quota-divider {
+
+	.m-div {
 		width: 1rpx;
-		height: 28rpx;
-		background: rgba(255, 255, 255, 0.25);
-		margin: 0 24rpx;
+		height: 40rpx;
+		background: rgba(255, 255, 255, 0.24);
+		margin: 0 20rpx;
 	}
-	.sub-k {
-		font-size: 22rpx;
-		opacity: 0.85;
+
+	.m-lab {
+		font-size: $yjyf-font-micro;
+		color: rgba(255, 255, 255, 0.85);
 	}
-	.sub-v {
-		font-size: 26rpx;
-		font-weight: 600;
+
+	.m-val {
+		margin-top: 6rpx;
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-inverse;
+		font-variant-numeric: tabular-nums;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 	}
-	.card {
-		margin: 20rpx 24rpx 0;
-		padding: 28rpx 24rpx;
+
+	/* 圆弧承接面板 */
+	.content-sheet {
+		position: relative;
+		z-index: 2;
+		margin-top: -28rpx;
+		border-radius: $yjyf-radius-lg $yjyf-radius-lg 0 0;
+		background: $yjyf-bg-page;
+		padding: $yjyf-space-lg $yjyf-space-lg calc(#{$yjyf-space-xl} + env(safe-area-inset-bottom));
+	}
+
+	/* 2. 极简紧凑双宫格卡片 */
+	.bento-grid {
+		display: flex;
+		gap: 20rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.bento-card {
+		flex: 1;
+		min-width: 0;
 		background: $yjyf-bg-card;
-		border-radius: 20rpx;
+		border-radius: $yjyf-radius-card;
+		padding: $yjyf-space-md;
+		display: flex;
+		align-items: center;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
 	}
+
+	.bento-ico {
+		width: 72rpx;
+		height: 72rpx;
+		flex-shrink: 0;
+		margin-right: 18rpx;
+	}
+
+	.bento-info {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.bento-title {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+
+	.bento-meta {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+		margin-top: 4rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+
+		&.highlight {
+			color: $yjyf-primary;
+			font-weight: 600;
+		}
+	}
+
+	.bento-arrow {
+		width: 24rpx;
+		height: 24rpx;
+		flex-shrink: 0;
+		margin-left: 6rpx;
+	}
+
+	/* 3. 默认抬头精简名片 */
+	.pass-card {
+		position: relative;
+		overflow: hidden;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		padding: $yjyf-space-md $yjyf-space-md $yjyf-space-md 30rpx;
+		margin-bottom: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+	}
+
+	.pass-accent {
+		position: absolute;
+		left: 0;
+		top: 24rpx;
+		bottom: 24rpx;
+		width: 6rpx;
+		border-radius: 0 6rpx 6rpx 0;
+		background: $yjyf-gradient-primary;
+	}
+
+	.pass-body {
+		flex: 1;
+		min-width: 0;
+		margin-right: $yjyf-space-sm;
+	}
+
+	.pass-title-row {
+		display: flex;
+		align-items: center;
+		min-width: 0;
+	}
+
+	.pass-tag {
+		height: 36rpx;
+		padding: 0 12rpx;
+		border-radius: 8rpx;
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-size: $yjyf-font-micro;
+		font-weight: 600;
+		display: inline-flex;
+		align-items: center;
+		margin-right: 12rpx;
+		flex-shrink: 0;
+	}
+
+	.pass-name {
+		flex: 1;
+		min-width: 0;
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.pass-tax {
+		display: block;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+		margin-top: 6rpx;
+		font-variant-numeric: tabular-nums;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.pass-empty {
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		padding: $yjyf-space-md;
+		margin-bottom: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+	}
+
+	.pe-left {
+		display: flex;
+		align-items: center;
+	}
+
+	.pe-ico {
+		width: 36rpx;
+		height: 36rpx;
+		margin-right: 12rpx;
+	}
+
+	.pe-title {
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+
+	.pe-right {
+		display: flex;
+		align-items: center;
+	}
+
+	.pe-link {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-primary;
+		font-weight: 600;
+		margin-right: 4rpx;
+	}
+
+	.pe-arrow {
+		width: 24rpx;
+		height: 24rpx;
+	}
+
+	/* 4. 近期开票卡片 */
+	.recent-card {
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-card;
+		padding: $yjyf-space-md;
+		box-shadow: 0 6rpx 20rpx rgba(31, 31, 31, 0.04);
+	}
+
 	.card-head {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		margin-bottom: 12rpx;
+		padding-bottom: 18rpx;
+		border-bottom: 1rpx solid $yjyf-border-color;
 	}
+
 	.card-title {
-		font-size: 30rpx;
+		font-size: $yjyf-font-title;
 		font-weight: 700;
 		color: $yjyf-text-main;
 	}
-	.card-more {
-		font-size: 24rpx;
-		color: $yjyf-text-secondary;
-	}
-	.card-link {
-		display: flex;
-		align-items: center;
-	}
-	.card-link-txt {
-		font-size: 24rpx;
-		color: $yjyf-primary;
-	}
-	.card-link-ico {
-		width: 24rpx;
-		height: 24rpx;
-		margin-left: 4rpx;
-	}
-	.fi {
-		display: flex;
-		align-items: center;
-		min-height: 92rpx;
-		border-bottom: 1rpx solid $yjyf-border-color;
-	}
-	.fi.no-border {
-		border-bottom: none;
-	}
-	.fk {
-		width: 180rpx;
-		flex-shrink: 0;
-		font-size: 26rpx;
-		color: $yjyf-text-regular;
-	}
-	.fv {
-		flex: 1;
-		height: 92rpx;
-		font-size: 28rpx;
-		color: $yjyf-text-main;
-	}
-	.seg {
-		display: flex;
-		align-items: center;
-	}
-	.seg-i {
-		padding: 0 26rpx;
-		height: 58rpx;
+
+	.head-more {
 		display: inline-flex;
 		align-items: center;
-		justify-content: center;
-		line-height: 1;
-		margin-right: 16rpx;
-		border-radius: 30rpx;
-		background: $yjyf-bg-page;
-		font-size: 24rpx;
-		color: $yjyf-text-regular;
 	}
-	.seg-i.on {
-		background: $yjyf-gradient-primary;
-		color: #FFFFFF;
-		font-weight: 600;
+
+	.more-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		margin-right: 4rpx;
 	}
-	.seg-i.disabled {
-		opacity: 0.45;
+
+	.row-arrow {
+		width: 24rpx;
+		height: 24rpx;
+		flex-shrink: 0;
 	}
-	.btn {
-		height: 88rpx;
-		margin-top: 24rpx;
+
+	.rec-row {
 		display: flex;
 		align-items: center;
-		justify-content: center;
-		border-radius: 44rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		font-weight: 600;
-		background: $yjyf-gradient-primary;
-	}
-	.btn.disabled {
-		opacity: 0.5;
-	}
-	.iv {
-		padding: 22rpx 0;
+		padding: $yjyf-space-md 0;
 		border-bottom: 1rpx solid $yjyf-border-color;
-		display: flex;
-		flex-direction: column;
+
+		&:last-child {
+			border-bottom: none;
+			padding-bottom: 4rpx;
+		}
 	}
-	.iv:last-of-type {
-		border-bottom: none;
-	}
-	.iv-top {
+
+	.rec-type-box {
+		width: 64rpx;
+		height: 64rpx;
+		border-radius: 14rpx;
+		background: rgba(74, 124, 255, 0.1);
 		display: flex;
 		align-items: center;
-		justify-content: space-between;
+		justify-content: center;
+		margin-right: 18rpx;
+		flex-shrink: 0;
+
+		.rt-txt {
+			font-size: $yjyf-font-micro;
+			font-weight: 600;
+			color: $yjyf-info;
+		}
+
+		&.special {
+			background: $yjyf-primary-bg;
+
+			.rt-txt {
+				color: $yjyf-primary;
+			}
+		}
 	}
-	.iv-tags {
-		display: flex;
-		align-items: center;
+
+	.rec-main {
+		flex: 1;
+		min-width: 0;
+		margin-right: $yjyf-space-sm;
 	}
-	.iv-type {
-		font-size: 28rpx;
+
+	.rec-name {
+		display: block;
+		font-size: $yjyf-font-body;
 		font-weight: 600;
 		color: $yjyf-text-main;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
 	}
-	.iv-head-tag {
-		margin-left: 12rpx;
-		padding: 4rpx 14rpx;
-		border-radius: 8rpx;
-		background: $yjyf-primary-bg;
-		color: $yjyf-primary;
-		font-size: 20rpx;
+
+	.rec-meta {
+		display: block;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+		margin-top: 6rpx;
+		font-variant-numeric: tabular-nums;
 	}
-	.iv-amt {
-		font-size: 32rpx;
-		font-weight: 700;
-		color: $yjyf-primary;
-	}
-	.iv-meta {
-		margin-top: 10rpx;
-		font-size: 24rpx;
-		color: $yjyf-text-regular;
-	}
-	.iv-foot {
-		margin-top: 8rpx;
+
+	.rec-right {
 		display: flex;
 		align-items: center;
-		justify-content: space-between;
+		flex-shrink: 0;
 	}
-	.iv-time {
-		font-size: 22rpx;
-		color: $yjyf-text-muted;
+
+	.rec-amt-col {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-end;
+		margin-right: 8rpx;
 	}
-	.iv-status {
-		font-size: 24rpx;
+
+	.rec-amt {
+		font-size: $yjyf-font-body;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		font-variant-numeric: tabular-nums;
+	}
+
+	.rec-st {
+		margin-top: 4rpx;
+		font-size: $yjyf-font-micro;
 		font-weight: 500;
-		color: $yjyf-warning;
-	}
-	.iv-status.st-issued {
-		color: $yjyf-success;
-	}
-	.iv-status.st-reject {
-		color: $yjyf-danger;
+
+		&.st-wait {
+			color: $yjyf-warning;
+		}
+
+		&.st-issued,
+		&.st-done {
+			color: $yjyf-success;
+		}
+
+		&.st-reject {
+			color: $yjyf-danger;
+		}
+
+		&.st-cancel {
+			color: $yjyf-text-muted;
+		}
 	}
+
 	.empty-box {
-		padding: 48rpx 0 24rpx;
+		padding: $yjyf-space-xl 0 $yjyf-space-md;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 	}
+
 	.empty-ico {
-		width: 120rpx;
-		height: 120rpx;
-		opacity: 0.7;
+		width: 148rpx;
+		height: 148rpx;
+		margin-bottom: 12rpx;
 	}
-	.empty-txt {
-		margin-top: 12rpx;
-		font-size: 24rpx;
-		color: $yjyf-text-secondary;
+
+	.empty-title {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-muted;
 	}
 </style>
diff --git a/yjyf-app/pages/merchant/orders.vue b/yjyf-app/pages/merchant/orders.vue
deleted file mode 100644
index e2008de..0000000
--- a/yjyf-app/pages/merchant/orders.vue
+++ /dev/null
@@ -1,526 +0,0 @@
-<template>
-	<view class="page">
-		<!-- 统一规范顶部橙色导航栏 -->
-		<YjyfNavBar theme="orange" title="企业订单" />
-
-		<!-- 搜索栏 -->
-		<view class="search-wrap">
-			<view class="search-input-box">
-				<image class="search-ico" src="/static/icons/search-gray.svg" mode="aspectFit" />
-				<input
-					class="search-input"
-					type="text"
-					v-model="keyword"
-					placeholder="搜索客户名/手机号/订单号/服务"
-					placeholder-class="search-placeholder"
-					confirm-type="search"
-					@confirm="load"
-				/>
-				<view class="clear-btn clickable-hover" v-if="keyword" @tap="clearSearch">
-					<image class="clear-ico" src="/static/icons/input-clear.svg" mode="aspectFit" />
-				</view>
-			</view>
-			<view class="search-action clickable-hover" @tap="load">搜索</view>
-		</view>
-
-		<!-- 状态切换 Tabs -->
-		<view class="tabs">
-			<view v-for="t in tabs" :key="t.key" class="tab clickable-hover" :class="{ on: cur === t.key }" @tap="switchTab(t.key)">
-				<text class="tab-txt">{{ t.name }}</text>
-				<view class="tab-line" v-if="cur === t.key"></view>
-			</view>
-		</view>
-
-		<!-- 列表主体 -->
-		<view class="list">
-			<view class="order-card" v-for="o in list" :key="o.id" @tap="goDetail(o.id)">
-				<!-- 头部：订单状态 + 标签 -->
-				<view class="card-hd">
-					<text class="status-title" :class="'s-' + o.status">{{ o.status_text }}</text>
-					<view class="hd-tags">
-						<text class="tag quote-tag" v-if="o.price_type === 'quote' || o.price_type_tag === '报价'">报价</text>
-						<text class="tag urgent-tag" v-if="Number(o.urgent)">加急</text>
-						<text class="acc-tag" :class="{ owner: o.account_role === 'owner' }">{{ o.account_role_text }} · {{ o.account_name }}</text>
-					</view>
-				</view>
-
-				<!-- 客户信息 -->
-				<view class="cust-row">
-					<image class="loc-ico" src="/static/icons/location-pin.svg" mode="aspectFit" />
-					<view class="cust-info">
-						<view class="cust-title">
-							<text class="cust-name">{{ o.contact }}，{{ o.showRealMobile ? o.mobile : (o.mobile_mask || o.mobile) }}</text>
-							<view class="eye-btn clickable-hover" @tap.stop="toggleMobile(o)">
-								<image class="eye-ico" :src="o.showRealMobile ? '/static/icons/login-eye-open.svg' : '/static/icons/login-eye-close.svg'" mode="aspectFit" />
-							</view>
-						</view>
-						<text class="cust-addr">{{ o.full_address || o.address_text || o.address }}</text>
-					</view>
-				</view>
-
-				<!-- 商品与服务 -->
-				<view class="goods-row">
-					<image class="goods-pic" :src="o.goods_image_url || o.service_image || '/static/icons/appliance.png'" mode="aspectFill" />
-					<view class="goods-detail">
-						<text class="goods-name">{{ o.goods_title || (o.service_name + ' x ' + (o.goods_num || 1) + '套') }}</text>
-						<text class="goods-service">{{ o.service_items_text || ('服务项目： ' + o.service_name + ';') }}</text>
-					</view>
-				</view>
-
-				<!-- 状态时钟条 -->
-				<view class="status-bar clickable-hover" @tap.stop="goDetail(o.id)">
-					<image class="clock-ico" src="/static/icons/clock-orange.svg" mode="aspectFit" />
-					<view class="status-texts">
-						<text class="status-desc">{{ o.status_timeline_text || o.status_tip || o.status_text }}</text>
-						<text class="status-time">{{ o.status_time_text || o.create_text }}</text>
-					</view>
-					<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
-				</view>
-
-				<!-- 底部操作栏 -->
-				<view class="card-ft">
-					<text class="price-txt">实付: <text class="price-num">¥{{ o.pay_amount }}</text></text>
-					<view class="ft-btns">
-						<view class="btn outline clickable-hover" @tap.stop="goDetail(o.id)">查看详情</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="empty-wrap" v-if="!loading && !list.length">
-			<image class="empty-ico" src="/static/icons/scan-paste.svg" mode="aspectFit" />
-			<text class="empty-txt">暂无企业订单记录</text>
-		</view>
-		<view class="load-finish" v-if="list.length">
-			<text class="finish-txt">加载完成 · 共 {{ total }} 单</text>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import { ref } from 'vue';
-	import { onShow } from '@dcloudio/uni-app';
-	import YjyfNavBar from '@/components/YjyfNavBar.vue';
-	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 keyword = ref('');
-	const list = ref([]);
-	const total = ref(0);
-	const loading = ref(false);
-
-	async function load() {
-		if (!isLogin()) { toLogin(); return; }
-		loading.value = true;
-		try {
-			const res = await api.merchantOrders({
-				status: cur.value,
-				keyword: keyword.value.trim(),
-				limit: 50
-			});
-			const rawList = res.list || [];
-			list.value = rawList.map(item => ({
-				...item,
-				showRealMobile: false
-			}));
-			total.value = res.total || list.value.length;
-		} catch (e) {
-		} finally {
-			loading.value = false;
-		}
-	}
-
-	function switchTab(k) {
-		cur.value = k;
-		load();
-	}
-
-	function clearSearch() {
-		keyword.value = '';
-		load();
-	}
-
-	function toggleMobile(item) {
-		item.showRealMobile = !item.showRealMobile;
-	}
-
-	function goDetail(id) {
-		uni.navigateTo({ url: '/pages/order/detail?id=' + id });
-	}
-
-	onShow(() => load());
-</script>
-
-<style lang="scss" scoped>
-.page {
-	min-height: 100vh;
-	background: #F5F6F8;
-	padding-bottom: 40rpx;
-}
-
-.search-wrap {
-	background: #FFFFFF;
-	padding: 16rpx 28rpx;
-	display: flex;
-	align-items: center;
-	border-bottom: 1rpx solid #F0F0F2;
-}
-
-.search-input-box {
-	flex: 1;
-	height: 68rpx;
-	background: #F5F6F8;
-	border-radius: 34rpx;
-	display: flex;
-	align-items: center;
-	padding: 0 20rpx;
-}
-
-.search-ico {
-	width: 28rpx;
-	height: 28rpx;
-	margin-right: 12rpx;
-}
-
-.search-input {
-	flex: 1;
-	font-size: 26rpx;
-	color: #1F1F1F;
-}
-
-.search-placeholder {
-	font-size: 24rpx;
-	color: #AAAAAA;
-}
-
-.clear-btn {
-	padding: 6rpx;
-}
-
-.clear-ico {
-	width: 26rpx;
-	height: 26rpx;
-}
-
-.search-action {
-	padding-left: 20rpx;
-	font-size: 28rpx;
-	font-weight: 600;
-	color: #F0710D;
-}
-
-.tabs {
-	display: flex;
-	background: #FFFFFF;
-	border-bottom: 1rpx solid #F0F0F2;
-}
-
-.tab {
-	flex: 1;
-	text-align: center;
-	padding: 24rpx 0 18rpx 0;
-	position: relative;
-}
-
-.tab-txt {
-	font-size: 28rpx;
-	color: #666666;
-}
-
-.tab.on .tab-txt {
-	color: #F0710D;
-	font-weight: 700;
-}
-
-.tab-line {
-	position: absolute;
-	bottom: 4rpx;
-	left: 50%;
-	transform: translateX(-50%);
-	width: 36rpx;
-	height: 4rpx;
-	background: #F0710D;
-	border-radius: 2rpx;
-}
-
-.list {
-	padding: 20rpx 24rpx;
-}
-
-.order-card {
-	background: #FFFFFF;
-	border-radius: 20rpx;
-	margin-bottom: 20rpx;
-	padding: 24rpx;
-	box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.03);
-}
-
-.card-hd {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding-bottom: 16rpx;
-}
-
-.status-title {
-	font-size: 32rpx;
-	font-weight: 700;
-	color: #1F1F1F;
-}
-
-.status-title.s-0 { color: #F0710D; }
-.status-title.s-8 { color: #2FA84F; }
-.status-title.s-9 { color: #888888; }
-
-.hd-tags {
-	display: flex;
-	align-items: center;
-	gap: 10rpx;
-}
-
-.tag {
-	font-size: 22rpx;
-	height: 38rpx;
-	line-height: 38rpx;
-	text-align: center;
-	padding: 0 12rpx;
-	border-radius: 6rpx;
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.quote-tag {
-	background: #FFF2E8;
-	color: #F0710D;
-}
-
-.urgent-tag {
-	background: #FFF1F0;
-	color: #F5222D;
-}
-
-.acc-tag {
-	font-size: 22rpx;
-	color: #888888;
-	background: #F5F6F8;
-	height: 38rpx;
-	line-height: 38rpx;
-	text-align: center;
-	padding: 0 12rpx;
-	border-radius: 6rpx;
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.acc-tag.owner {
-	background: #FFF7F0;
-	color: #F0710D;
-}
-
-/* 客户信息 */
-.cust-row {
-	display: flex;
-	align-items: flex-start;
-	padding-bottom: 16rpx;
-}
-
-.loc-ico {
-	width: 28rpx;
-	height: 28rpx;
-	margin-top: 6rpx;
-	margin-right: 12rpx;
-	flex-shrink: 0;
-}
-
-.cust-info {
-	flex: 1;
-	min-width: 0;
-}
-
-.cust-title {
-	display: flex;
-	align-items: center;
-}
-
-.cust-name {
-	font-size: 28rpx;
-	font-weight: 700;
-	color: #1F1F1F;
-}
-
-.eye-btn {
-	padding: 4rpx 10rpx;
-	display: flex;
-	align-items: center;
-}
-
-.eye-ico {
-	width: 30rpx;
-	height: 30rpx;
-}
-
-.cust-addr {
-	display: block;
-	margin-top: 6rpx;
-	font-size: 24rpx;
-	color: #666666;
-	line-height: 1.4;
-}
-
-/* 商品区 */
-.goods-row {
-	display: flex;
-	align-items: flex-start;
-	padding: 16rpx 0;
-}
-
-.goods-pic {
-	width: 130rpx;
-	height: 130rpx;
-	border-radius: 12rpx;
-	background: #F8F9FA;
-	margin-right: 20rpx;
-	flex-shrink: 0;
-}
-
-.goods-detail {
-	flex: 1;
-	min-width: 0;
-}
-
-.goods-name {
-	font-size: 28rpx;
-	font-weight: 700;
-	color: #1F1F1F;
-	line-height: 1.4;
-}
-
-.goods-service {
-	display: block;
-	margin-top: 10rpx;
-	font-size: 24rpx;
-	color: #888888;
-}
-
-/* 状态条 */
-.status-bar {
-	background: #F7F8FA;
-	border-radius: 12rpx;
-	padding: 16rpx 20rpx;
-	display: flex;
-	align-items: center;
-	margin-top: 10rpx;
-}
-
-.clock-ico {
-	width: 32rpx;
-	height: 32rpx;
-	flex-shrink: 0;
-	margin-right: 14rpx;
-}
-
-.status-texts {
-	flex: 1;
-	min-width: 0;
-}
-
-.status-desc {
-	font-size: 24rpx;
-	color: #444444;
-	font-weight: 500;
-	display: block;
-}
-
-.status-time {
-	font-size: 22rpx;
-	color: #999999;
-	margin-top: 4rpx;
-	display: block;
-}
-
-.arrow-ico {
-	width: 22rpx;
-	height: 22rpx;
-	opacity: 0.5;
-}
-
-/* 卡片底 */
-.card-ft {
-	margin-top: 20rpx;
-	padding-top: 18rpx;
-	border-top: 1rpx solid #F0F0F2;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-}
-
-.price-txt {
-	font-size: 24rpx;
-	color: #666666;
-}
-
-.price-num {
-	font-size: 32rpx;
-	font-weight: 700;
-	color: #F0710D;
-}
-
-.ft-btns {
-	display: flex;
-	gap: 16rpx;
-}
-
-.btn {
-	height: 56rpx;
-	padding: 0 24rpx;
-	border-radius: 28rpx;
-	font-size: 24rpx;
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	line-height: 1;
-}
-
-.btn.outline {
-	background: #FFFFFF;
-	border: 1rpx solid #DCDFE6;
-	color: #333333;
-}
-
-.empty-wrap {
-	padding: 120rpx 40rpx;
-	text-align: center;
-}
-
-.empty-ico {
-	width: 100rpx;
-	height: 100rpx;
-	opacity: 0.6;
-}
-
-.empty-txt {
-	display: block;
-	margin-top: 20rpx;
-	font-size: 26rpx;
-	color: #999999;
-}
-
-.load-finish {
-	text-align: center;
-	padding: 24rpx 0;
-}
-
-.finish-txt {
-	font-size: 24rpx;
-	color: #AAAAAA;
-}
-</style>
diff --git a/yjyf-app/pages/merchant/workbench.vue b/yjyf-app/pages/merchant/workbench.vue
deleted file mode 100644
index d41c1f1..0000000
--- a/yjyf-app/pages/merchant/workbench.vue
+++ /dev/null
@@ -1,255 +0,0 @@
-<template>
-	<view class="page">
-		<!-- 统一固定吸顶导航栏 -->
-		<YjyfNavBar theme="orange" title="商家工作台" :fixed="true" :placeholder="true" />
-		<view class="header" :style="{ marginTop: (-navHeight) + 'px', paddingTop: navHeight + 'px' }">
-			<view class="h-content">
-				<view class="h-top">
-					<view class="h-l">
-						<text class="h-name">{{ info ? info.name : '商家' }}</text>
-						<text class="h-meta">{{ info ? ('结算方式：' + (info.settle_type === 'monthly' ? '月结' : '预付')) : '加载中...' }}</text>
-					</view>
-					<view class="h-badge">{{ verifyText }}</view>
-				</view>
-				<view class="stats">
-					<view class="stat"><text class="stat-n">{{ info ? info.order_count : 0 }}</text><text class="stat-l">累计订单</text></view>
-					<view class="stat"><text class="stat-n">{{ info ? info.total_amount : 0 }}</text><text class="stat-l">累计金额</text></view>
-					<view class="stat"><text class="stat-n">{{ info ? info.invoiceable : 0 }}</text><text class="stat-l">可开票</text></view>
-				</view>
-			</view>
-		</view>
-
-		<view class="grid">
-			<view class="gi clickable-hover" v-for="g in entries" :key="g.key" @tap="g.action">
-				<view class="gi-icon" :style="{ background: g.bg }"><image class="gi-svg" :src="g.svg" mode="aspectFit"></image></view>
-				<text class="gi-name">{{ g.name }}</text>
-			</view>
-		</view>
-
-		<view class="card">
-			<view class="card-head">
-				<text class="card-title">关联账号</text>
-				<text class="card-more" v-if="info && info.is_owner" @tap="openBind">＋ 绑定账号</text>
-			</view>
-			<view class="member" v-for="m in members" :key="m.user_id">
-				<view class="member-avatar"><text class="member-avatar-t">{{ (m.nickname || '用').slice(0, 1) }}</text></view>
-				<view class="member-main">
-					<view class="member-head">
-						<text class="member-name">{{ m.nickname }}</text>
-						<text class="member-role" :class="{ owner: m.is_owner }">{{ m.role_text }}</text>
-					</view>
-					<text class="member-meta">{{ m.mobile }} · {{ m.order_count }} 单 · ¥{{ m.total_amount }}</text>
-				</view>
-				<text class="member-unbind" v-if="info && info.is_owner && !m.is_owner" @tap.stop="unbindMember(m)">解除</text>
-			</view>
-			<view class="empty" v-if="!members.length">暂无关联账号</view>
-			<text class="member-tip">关联账号的下单、账单、开票数据与主账号实时同步</text>
-		</view>
-
-		<view class="card">
-			<view class="card-head"><text class="card-title">按月账单</text><text class="card-more" @tap="load">刷新</text></view>
-			<view class="m-row" v-for="(m, i) in months" :key="i">
-				<text class="m-month">{{ m.month }}</text>
-				<text class="m-cnt">{{ m.cnt }} 单</text>
-				<text class="m-amt">¥{{ m.amount }}</text>
-			</view>
-			<view class="empty" v-if="!months.length">暂无账单</view>
-		</view>
-
-		<view class="card">
-			<view class="card-head"><text class="card-title">近期订单</text><text class="card-more" @tap="go('/pages/order/list')">全部 ›</text></view>
-			<view class="o-row" v-for="o in orders" :key="o.id" @tap="goOrder(o.id)">
-				<view class="o-l">
-					<text class="o-name">{{ o.service_name }}</text>
-					<text class="o-no">{{ o.order_no }} · {{ o.time_text }}</text>
-				</view>
-				<view class="o-r">
-					<text class="o-amt">¥{{ o.pay_amount }}</text>
-					<text class="o-status">{{ o.status_text }}</text>
-				</view>
-			</view>
-			<view class="empty" v-if="!orders.length">暂无订单</view>
-		</view>
-
-		<view class="back" @tap="backToUser">切换到业主身份</view>
-
-		<view class="mask" v-if="showBind" @tap="showBind = false">
-			<view class="sheet" @tap.stop>
-				<view class="sheet-head">
-					<text class="sheet-title">绑定关联账号</text>
-					<text class="sheet-close" @tap="showBind = false">关闭</text>
-				</view>
-				<text class="sheet-tip">输入对方已注册手机号。绑定后，对方可进入商家工作台，下单、账单、开票数据与主账号实时同步。</text>
-				<input class="sheet-input" v-model="bindMobile" type="number" maxlength="11" placeholder="请输入关联账号手机号" />
-				<view class="sheet-btn" :class="{ disabled: binding }" @tap="doBind">{{ binding ? '绑定中...' : '确认绑定' }}</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import { ref, computed } from 'vue';
-	import { onShow } from '@dcloudio/uni-app';
-	import api from '@/utils/api.js';
-	import { isLogin, toLogin } from '@/utils/request.js';
-	import { setRole } from '@/utils/role.js';
-	import { getNavBarMetrics } from '@/utils/system.js';
-
-	const navHeight = ref(getNavBarMetrics().totalNavHeight);
-	const info = ref(null);
-	const months = ref([]);
-	const orders = ref([]);
-	const members = ref([]);
-	const showBind = ref(false);
-	const bindMobile = ref('');
-	const binding = ref(false);
-
-	const verifyText = computed(() => {
-		if (!info.value) return '';
-		return { pending: '审核中', pass: '已认证', reject: '未通过' }[info.value.verify_status] || '';
-	});
-
-	const entries = [
-		{ key: 'orders', name: '企业订单', svg: "data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%234A7CFF'><path d='M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-7 14l-5-5 1.41-1.41L12 14.17l7.59-7.59L21 8l-9 9z'/></svg>", bg: '#EAF2FF', action: () => go('/pages/merchant/orders') },
-		{ key: 'batch', name: '批量下单', svg: "data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%23F0710D'><path d='M4 6H2v14c0 1.1.9 2 2 2h14v-2H4V6zm16-4H8c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-1 9h-4v4h-2v-4H9V9h4V5h2v4h4v2z'/></svg>", bg: '#FFF1E0', action: () => go('/pages/merchant/batch') },
-		{ key: 'invoice', name: '开具发票', svg: "data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%23E07A2E'><path d='M19 3H5c-1.1 0-2 .9-2 2v14l3-2 3 2 3-2 3 2 3-2 3 2V5c0-1.1-.9-2-2-2zm-2 10H7v-2h10v2zm0-4H7V7h10v2z'/></svg>", bg: '#F0EBFF', action: () => go('/pages/merchant/invoice') },
-		{ key: 'service', name: '专属客服', svg: "data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%232A8FD8'><path d='M20 15.5c-.7 0-1.4-.1-2-.3-.6-.2-1.2.1-1.6.5l-2.2 2.2c-2.8-1.5-5.2-3.8-6.6-6.6l2.2-2.2c.4-.4.6-1 .4-1.6-.2-.6-.3-1.3-.3-2 0-.8-.7-1.5-1.5-1.5H5c-.8 0-1.5.7-1.5 1.5 0 9.4 7.6 17 17 17 .8 0 1.5-.7 1.5-1.5v-3.5c0-.8-.7-1.5-1.5-1.5z'/></svg>", bg: '#E8F7EE', action: callService }
-	];
-
-	function callService() { uni.makePhoneCall({ phoneNumber: '4000000000' }); }
-	function go(url) { uni.navigateTo({ url: url }); }
-	function goOrder(id) { uni.navigateTo({ url: '/pages/order/detail?id=' + id }); }
-
-	async function load() {
-		if (!isLogin()) { toLogin(); return; }
-		try {
-			const res = await api.merchantInfo();
-			if (!res.applied || res.merchant.verify_status !== 'pass') {
-				uni.redirectTo({ url: '/pages/merchant/apply' });
-				return;
-			}
-			info.value = res.merchant;
-		} catch (e) { return; }
-		try {
-			const b = await api.merchantBills();
-			months.value = b.months || [];
-			orders.value = b.orders || [];
-		} catch (e) {}
-		await loadMembers();
-	}
-
-	async function loadMembers() {
-		try {
-			const res = await api.merchantMembers();
-			members.value = res.list || [];
-		} catch (e) {}
-	}
-
-	function openBind() {
-		showBind.value = true;
-		bindMobile.value = '';
-	}
-
-	async function doBind() {
-		if (binding.value) return;
-		const mobile = (bindMobile.value || '').trim();
-		if (!/^1\d{10}$/.test(mobile)) {
-			uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
-			return;
-		}
-		binding.value = true;
-		try {
-			await api.merchantBindMember({ mobile: mobile });
-			showBind.value = false;
-			uni.showToast({ title: '绑定成功' });
-			await load();
-		} catch (e) {
-		} finally {
-			binding.value = false;
-		}
-	}
-
-	function unbindMember(m) {
-		uni.showModal({
-			title: '解除关联',
-			content: `确认解除 ${m.nickname}（${m.mobile}）？解除后对方将无法查看商家数据`,
-			success: async (r) => {
-				if (!r.confirm) return;
-				try {
-					await api.merchantUnbindMember({ member_id: m.id });
-					uni.showToast({ title: '已解除关联' });
-					await load();
-				} catch (e) {}
-			}
-		});
-	}
-
-	function backToUser() {
-		api.switchRole({ role: 'user' }).then((res) => {
-			setRole('user');
-			uni.reLaunch({ url: res.redirect || '/pages/index/index' });
-		}).catch(() => {});
-	}
-
-	onShow(() => load());
-</script>
-
-<style scoped>
-	.page { min-height: 100vh; width: 100%; overflow-x: hidden; box-sizing: border-box; background: #F5F6F8; padding-bottom: 60rpx; }
-	.header { position: relative; padding-bottom: 26rpx; overflow: hidden; background-color: #F0710D; background-image: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%); background-size: 100% 600rpx; background-position: 0 0; background-repeat: no-repeat; }
-	.h-content { position: relative; z-index: 2; padding: 20rpx 30rpx 0; }
-	.h-top { position: relative; display: flex; align-items: center; justify-content: space-between; }
-	.h-l { flex: 1; min-width: 0; display: flex; flex-direction: column; }
-	.h-name { font-size: 36rpx; font-weight: 700; color: #fff; }
-	.h-meta { margin-top: 8rpx; font-size: 22rpx; color: rgba(255,255,255,.9); }
-	.h-badge { flex-shrink: 0; padding: 0 22rpx; height: 52rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 26rpx; background: #fff; color: #E36B0C; font-size: 22rpx; font-weight: 700; }
-	.stats { position: relative; display: flex; margin-top: 26rpx; padding-top: 22rpx; border-top: 1rpx solid rgba(255,255,255,.25); }
-	.stat { flex: 1; display: flex; flex-direction: column; align-items: center; }
-	.stat-n { font-size: 34rpx; font-weight: 700; color: #fff; }
-	.stat-l { margin-top: 4rpx; font-size: 22rpx; color: rgba(255,255,255,.88); }
-	.grid { display: flex; flex-wrap: wrap; margin: 20rpx 24rpx 0; padding: 16rpx 0; background: #fff; border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06); }
-	.gi { width: 25%; display: flex; flex-direction: column; align-items: center; padding: 18rpx 0; }
-	.gi-icon { width: 84rpx; height: 84rpx; border-radius: 24rpx; display: flex; align-items: center; justify-content: center; }
-	.gi-svg { width: 44rpx; height: 44rpx; }
-	.gi-t { font-size: 30rpx; font-weight: 700; }
-	.gi-name { margin-top: 12rpx; font-size: 24rpx; color: #333; line-height: 1; }
-	.card { margin: 20rpx 24rpx 0; padding: 24rpx; background: #fff; border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06); }
-	.card-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 8rpx; }
-	.card-title { font-size: 28rpx; font-weight: 700; color: #1F1F1F; }
-	.card-more { font-size: 22rpx; color: #9A9A9A; }
-	.m-row { display: flex; align-items: center; padding: 16rpx 0; border-bottom: 1rpx solid #F4F4F4; }
-	.m-month { flex: 1; font-size: 26rpx; color: #333; }
-	.m-cnt { width: 120rpx; text-align: right; font-size: 22rpx; color: #9A9A9A; }
-	.m-amt { width: 160rpx; text-align: right; font-size: 28rpx; font-weight: 700; color: #F0710D; }
-	.o-row { display: flex; align-items: center; justify-content: space-between; padding: 16rpx 0; border-bottom: 1rpx solid #F4F4F4; }
-	.o-l { flex: 1; min-width: 0; display: flex; flex-direction: column; }
-	.o-name { font-size: 26rpx; color: #333; }
-	.o-no { margin-top: 4rpx; font-size: 22rpx; color: #B5B5B5; }
-	.o-r { display: flex; flex-direction: column; align-items: flex-end; }
-	.o-amt { font-size: 28rpx; font-weight: 700; color: #F0710D; }
-	.o-status { margin-top: 4rpx; font-size: 22rpx; color: #9A9A9A; }
-	.empty { padding: 40rpx 0; text-align: center; font-size: 24rpx; color: #9A9A9A; }
-	.member { display: flex; align-items: center; padding: 16rpx 0; border-bottom: 1rpx solid #F4F4F4; }
-	.member:last-of-type { border-bottom: none; }
-	.member-avatar { width: 64rpx; height: 64rpx; border-radius: 50%; flex-shrink: 0; background: #FFF1E3; display: flex; align-items: center; justify-content: center; }
-	.member-avatar-t { font-size: 26rpx; font-weight: 700; color: #E88A2C; line-height: 1; }
-	.member-main { flex: 1; min-width: 0; margin-left: 14rpx; display: flex; flex-direction: column; }
-	.member-head { display: flex; align-items: center; }
-	.member-name { font-size: 28rpx; font-weight: 600; color: #222; }
-	.member-role { margin-left: 10rpx; padding: 0 12rpx; height: 34rpx; line-height: 34rpx; text-align: center; display: inline-flex; align-items: center; justify-content: center; border-radius: 8rpx; background: #F0F0F0; color: #888; font-size: 22rpx; }
-	.member-role.owner { background: #FFF1E0; color: #E07A2E; }
-	.member-meta { margin-top: 4rpx; font-size: 22rpx; color: #9A9A9A; }
-	.member-unbind { flex-shrink: 0; margin-left: 12rpx; padding: 0 18rpx; height: 48rpx; line-height: 48rpx; text-align: center; display: inline-flex; align-items: center; justify-content: center; border-radius: 24rpx; background: #FFF0F0; color: #E8331B; font-size: 22rpx; }
-	.member-tip { display: block; margin-top: 12rpx; font-size: 22rpx; color: #B5B5B5; line-height: 32rpx; }
-	.mask { position: fixed; left: 0; right: 0; top: 0; bottom: 0; background: rgba(0,0,0,.45); display: flex; align-items: flex-end; z-index: 50; }
-	.sheet { width: 100%; background: #fff; border-radius: 28rpx 28rpx 0 0; padding: 26rpx 28rpx; padding-bottom: calc(26rpx + env(safe-area-inset-bottom)); }
-	.sheet-head { display: flex; align-items: center; justify-content: space-between; }
-	.sheet-title { font-size: 32rpx; font-weight: 700; color: #1F1F1F; }
-	.sheet-close { font-size: 24rpx; color: #9A9A9A; }
-	.sheet-tip { display: block; margin: 14rpx 0 18rpx; font-size: 22rpx; color: #9A9A9A; line-height: 34rpx; }
-	.sheet-input { height: 84rpx; padding: 0 22rpx; background: #F7F7F7; border-radius: 14rpx; font-size: 28rpx; color: #222; }
-	.sheet-btn { height: 88rpx; margin-top: 20rpx; display: flex; align-items: center; justify-content: center; border-radius: 44rpx; color: #fff; font-size: 30rpx; font-weight: 600; background: linear-gradient(135deg,#FFA93F 0%,#F0710D 100%); }
-	.sheet-btn.disabled { opacity: .7; }
-	.back { margin: 26rpx 28rpx 0; height: 92rpx; display: flex; align-items: center; justify-content: center; background: #fff; border-radius: 46rpx; font-size: 28rpx; color: #F0710D; font-weight: 600; }
-</style>
-
diff --git a/yjyf-app/pages/message/message.vue b/yjyf-app/pages/message/message.vue
index b288e9b..178f8a6 100644
--- a/yjyf-app/pages/message/message.vue
+++ b/yjyf-app/pages/message/message.vue
@@ -1,28 +1,7 @@
 <template>
-	<view class="page">
-		<!-- 统一顶部导航栏（安全距离自适应） -->
-		<YjyfNavBar theme="orange" title="消息中心" />
-		<view class="head">
-			<view class="cats">
-				<view v-for="c in cats" :key="c.key" class="cat clickable-hover" :class="{ on: category === c.key }" @tap="switchCat(c.key)">{{ c.name }}</view>
-			</view>
-			<text class="read-all clickable-hover" @tap="readAll">全部已读</text>
-		</view>
+	<view class="page" v-if="ready">
+		<UserMessageView ref="msgRef" :role-type="isMasterRole ? 'master' : 'user'" />
 
-		<view class="list">
-			<view class="msg" :class="{ unread: !m.is_read }" v-for="m in list" :key="m.id" @tap="open(m)">
-				<view class="msg-top">
-					<view class="dot" v-if="!m.is_read"></view>
-					<text class="title">{{ m.title }}</text>
-					<text class="time">{{ m.time_text }}</text>
-				</view>
-				<text class="content">{{ m.content }}</text>
-				<text class="go" v-if="m.order_id">查看订单 ›</text>
-			</view>
-			<view class="empty" v-if="!loading && !list.length">暂无消息</view>
-		</view>
-
-		<!-- 角色自适应 TabBar：师傅端显示 MasterTabBar，业主端显示 YjyfTabBar -->
 		<YjyfMasterTabBar :current="2" v-if="isMasterRole" />
 		<YjyfTabBar :current="2" @change="onUserTabChange" v-else />
 	</view>
@@ -30,84 +9,64 @@
 
 <script setup>
 	import { ref } from 'vue';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
+	import UserMessageView from '@/components/user/UserMessageView.vue';
 	import YjyfTabBar from '@/components/YjyfTabBar.vue';
 	import YjyfMasterTabBar from '@/components/YjyfMasterTabBar.vue';
-	import { onShow, onPullDownRefresh } from '@dcloudio/uni-app';
-	import api from '@/utils/api.js';
-	import { isLogin, toLogin } from '@/utils/request.js';
-	import { getRole } from '@/utils/role.js';
+	import { getRole, setRole } from '@/utils/role.js';
 
-	const list = ref([]);
-	const loading = ref(false);
-	const category = ref('all');
 	const isMasterRole = ref(false);
+	const ready = ref(false);
+	const msgRef = ref(null);
+	let initialShown = false;
 
 	function onUserTabChange(idx) {
-		uni.redirectTo({ url: `/pages/index/index?tab=${idx}` });
+		setRole('user');
+		uni.reLaunch({ url: `/pages/index/index?tab=${idx}` });
 	}
 
-	const cats = [
-		{ key: 'all', name: '全部' },
-		{ key: 'order', name: '订单' },
-		{ key: 'system', name: '系统' },
-		{ key: 'remind', name: '提醒' }
-	];
-
-	async function load() {
-		if (!isLogin()) { toLogin(); return; }
-		loading.value = true;
+	onLoad((query) => {
+		const roleParam = query && query.role ? String(query.role) : '';
+		let fromMasterPage = false;
 		try {
-			const res = await api.messageList({ category: category.value, limit: 30 });
-			list.value = res.list || [];
-		} catch (e) {
-		} finally {
-			loading.value = false;
-		}
-	}
-
-	function switchCat(k) { category.value = k; load(); }
-
-	async function open(m) {
-		if (!m.is_read) {
-			try { await api.messageRead({ id: m.id }); m.is_read = 1; } catch (e) {}
-		}
-		if (m.order_id) {
-			const targetUrl = isMasterRole.value ? '/pages/master/orders' : ('/pages/order/detail?id=' + m.order_id);
-			uni.navigateTo({ url: targetUrl });
-		}
-	}
-
-	async function readAll() {
-		try {
-			const res = await api.messageReadAll({});
-			uni.showToast({ title: '已全部标记已读（' + res.count + ' 条）', icon: 'none' });
-			load();
+			const pages = getCurrentPages() || [];
+			if (pages.length > 1) {
+				const prevRoute = pages[pages.length - 2]?.route || '';
+				fromMasterPage = prevRoute.startsWith('pages/master/') && !prevRoute.startsWith('pages/master/apply');
+			}
 		} catch (e) {}
-	}
 
-	onShow(() => {
-		isMasterRole.value = getRole() === 'master';
-		load();
+		const shouldUseMaster = roleParam === 'master' || (!roleParam && fromMasterPage && getRole() === 'master');
+		if (!shouldUseMaster) {
+			// 非师傅端明确入口一律收敛至业主端单母页消息 Tab，杜绝误入师傅端
+			setRole('user');
+			uni.reLaunch({ url: '/pages/index/index?tab=2' });
+			return;
+		}
+
+		setRole('master');
+		isMasterRole.value = true;
+		ready.value = true;
 	});
 
-	onPullDownRefresh(() => { load().then(() => uni.stopPullDownRefresh()); });
+	onShow(() => {
+		if (!ready.value) return;
+		if (!initialShown) {
+			initialShown = true;
+			return;
+		}
+		if (msgRef.value?.load) {
+			msgRef.value.load();
+		}
+	});
 </script>
 
-<style scoped>
-	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 40rpx; }
-	.head { display: flex; align-items: center; background: #fff; padding: 20rpx 24rpx; box-shadow: 0 4rpx 12rpx rgba(0,0,0,.03); }
-	.cats { flex: 1; display: flex; align-items: center; gap: 16rpx; }
-	.cat { height: 56rpx; padding: 0 26rpx; display: inline-flex; align-items: center; justify-content: center; border-radius: 28rpx; background: #F5F6F8; font-size: 24rpx; color: #444444; line-height: 1; }
-	.cat.on { background: #FFF7F0; color: #F0710D; font-weight: 600; }
-	.read-all { display: inline-flex; align-items: center; height: 56rpx; line-height: 56rpx; font-size: 24rpx; color: #F0710D; font-weight: 500; }
-	.list { padding: 24rpx; }
-	.msg { background: #fff; border-radius: 20rpx; padding: 22rpx 24rpx; margin-bottom: 18rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,.06); }
-	.msg.unread { border-left: 6rpx solid #F0710D; }
-	.msg-top { display: flex; align-items: center; }
-	.dot { width: 12rpx; height: 12rpx; border-radius: 50%; background: #F0710D; margin-right: 10rpx; }
-	.title { flex: 1; min-width: 0; font-size: 28rpx; font-weight: 600; color: #1F1F1F; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }
-	.time { flex-shrink: 0; margin-left: 12rpx; font-size: 22rpx; color: #AAAAAA; }
-	.content { display: block; margin-top: 10rpx; font-size: 24rpx; color: #666; line-height: 34rpx; }
-	.go { display: block; margin-top: 10rpx; font-size: 22rpx; color: #4A7CFF; }
-	.empty { padding: 110rpx 0; text-align: center; font-size: 24rpx; color: #9A9A9A; }
+<style lang="scss" scoped>
+	.page {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		background: $yjyf-bg-page;
+	}
 </style>
diff --git a/yjyf-app/pages/mine/account.vue b/yjyf-app/pages/mine/account.vue
index 2e61d29..eb10c7b 100644
--- a/yjyf-app/pages/mine/account.vue
+++ b/yjyf-app/pages/mine/account.vue
@@ -1,6 +1,5 @@
 <template>
 	<view class="page">
-		<!-- 统一顶部橙色导航栏（对标图三、图四「账号信息」） -->
 		<YjyfNavBar theme="orange" title="账号信息" :fixed="true" :placeholder="true" />
 
 		<view class="card">
@@ -31,6 +30,7 @@
 					<input
 						class="input"
 						v-model="form.company_name"
+						:disabled="isLinkedMember"
 						placeholder="请输入公司名称"
 						placeholder-style="color: #999999;"
 					/>
@@ -41,6 +41,7 @@
 					<input
 						class="input"
 						v-model="form.legal_person"
+						:disabled="isLinkedMember"
 						placeholder="请输入法人姓名，不支持数字输入"
 						placeholder-style="color: #999999;"
 					/>
@@ -53,6 +54,7 @@
 						type="number"
 						maxlength="11"
 						v-model="form.legal_mobile"
+						:disabled="isLinkedMember"
 						placeholder="请输入法人手机号"
 						placeholder-style="color: #999999;"
 					/>
@@ -65,6 +67,7 @@
 						type="number"
 						maxlength="11"
 						v-model="form.tech_mobile"
+						:disabled="isLinkedMember"
 						placeholder="请输入技术手机号"
 						placeholder-style="color: #999999;"
 					/>
@@ -103,21 +106,68 @@
 			</view>
 		</view>
 
+		<!-- 商家关联账号管理（当用户类型为商家时展示） -->
+		<view class="card member-card" v-if="form.user_type === 'merchant'">
+			<view class="member-card-head">
+				<text class="member-card-title">关联子账号</text>
+				<view class="bind-action clickable-hover" v-if="!isLinkedMember" @tap="openBind">
+					<image class="bind-plus-ico" src="/static/icons/plus-orange.svg" mode="aspectFit" />
+					<text class="bind-action-txt">绑定账号</text>
+				</view>
+			</view>
+			<view class="member-row" v-for="m in members" :key="m.user_id">
+				<view class="member-avatar"><image class="member-avatar-img" src="/static/icons/avatar-member.svg" mode="aspectFit" /></view>
+				<view class="member-main">
+					<view class="member-head">
+						<text class="member-name">{{ m.nickname }}</text>
+						<text class="member-role" :class="{ owner: m.is_owner }">{{ m.role_text }}</text>
+					</view>
+					<text class="member-meta">{{ m.mobile }} · {{ m.order_count }} 单 · ¥{{ m.total_amount }}</text>
+				</view>
+				<view class="member-unbind clickable-hover" v-if="!isLinkedMember && !m.is_owner" @tap.stop="unbindMember(m)">解除</view>
+			</view>
+			<view class="member-empty" v-if="!members.length">
+				<text class="member-empty-txt">暂无关联账号</text>
+			</view>
+			<text class="member-tip">关联账号的订单、账单与开票额度与主账号实时同步</text>
+		</view>
+
 		<view class="save-btn clickable-hover" :class="{ disabled: saving }" @tap="save">
 			{{ saving ? '保存中...' : '保存' }}
 		</view>
+
+		<!-- 绑定关联账号抽屉弹窗 -->
+		<view class="mask" v-if="showBind" @tap="showBind = false">
+			<view class="sheet" @tap.stop>
+				<view class="sheet-head">
+					<text class="sheet-title">绑定关联账号</text>
+					<view class="sheet-close-btn clickable-hover" @tap="showBind = false">
+						<image class="sheet-close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<text class="sheet-tip">输入对方已注册手机号。绑定后，对方的订单与开票额度将与当前商家主账号实时同步。</text>
+				<input class="sheet-input" v-model="bindMobile" type="number" maxlength="11" placeholder="请输入关联账号手机号" />
+				<view class="sheet-btn clickable-hover" :class="{ disabled: binding }" @tap="doBind">{{ binding ? '绑定中...' : '确认绑定' }}</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script setup>
 	import { ref, reactive, computed } from 'vue';
-	import { onShow } from '@dcloudio/uni-app';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import YjyfNavBar from '@/components/YjyfNavBar.vue';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin, setUser } from '@/utils/request.js';
 
 	const saving = ref(false);
 	const rawMobile = ref('');
+	const hasMerchantRecord = ref(false);
+	const isLinkedMember = ref(false);
+	const members = ref([]);
+	const showBind = ref(false);
+	const bindMobile = ref('');
+	const binding = ref(false);
 
 	const form = reactive({
 		user_type: 'personal',
@@ -139,6 +189,10 @@
 	});
 
 	function chooseUserType() {
+		if (isLinkedMember.value) {
+			uni.showToast({ title: '当前账号已关联企业主账号，解绑后可切换为个人', icon: 'none' });
+			return;
+		}
 		uni.showActionSheet({
 			itemList: ['家庭/个人', '商家'],
 			success: (res) => {
@@ -147,6 +201,15 @@
 		});
 	}
 
+	async function loadMembers() {
+		try {
+			const res = await api.merchantMembers();
+			members.value = (res && res.list) ? res.list : [];
+		} catch (e) {
+			members.value = [];
+		}
+	}
+
 	async function load() {
 		if (!isLogin()) {
 			toLogin();
@@ -163,9 +226,29 @@
 			form.tech_mobile = data.tech_mobile || '';
 			form.contact_address = data.contact_address || '';
 			form.email = data.email || '';
+			hasMerchantRecord.value = !!(data.merchant && data.merchant.verify_status === 'pass');
+			isLinkedMember.value = !!(data.merchant && data.merchant.is_owner === false);
+			if (hasMerchantRecord.value) {
+				await loadMembers();
+			} else {
+				members.value = [];
+			}
 		} catch (e) {}
 	}
 
+	function buildAccountPayload() {
+		return {
+			user_type: form.user_type,
+			nickname: form.nickname.trim(),
+			company_name: form.company_name.trim(),
+			legal_person: form.legal_person.trim(),
+			legal_mobile: form.legal_mobile.trim(),
+			tech_mobile: form.tech_mobile.trim(),
+			contact_address: form.contact_address.trim(),
+			email: form.email.trim()
+		};
+	}
+
 	async function save() {
 		if (saving.value) return;
 		if (!form.nickname.trim()) {
@@ -178,33 +261,99 @@
 		}
 		saving.value = true;
 		try {
-			const res = await api.saveAccount({
-				user_type: form.user_type,
-				nickname: form.nickname.trim(),
-				company_name: form.company_name.trim(),
-				legal_person: form.legal_person.trim(),
-				legal_mobile: form.legal_mobile.trim(),
-				tech_mobile: form.tech_mobile.trim(),
-				contact_address: form.contact_address.trim(),
-				email: form.email.trim()
-			});
+			const res = await api.saveAccount(buildAccountPayload());
 			if (res && res.userinfo) {
 				setUser(res.userinfo);
 			}
 			uni.showToast({ title: '保存成功' });
 			setTimeout(() => {
+				saving.value = false;
 				uni.navigateBack();
 			}, 500);
 		} catch (e) {
-		} finally {
 			saving.value = false;
 		}
 	}
 
-	onShow(() => load());
+	function openBind() {
+		showBind.value = true;
+		bindMobile.value = '';
+	}
+
+	async function doBind() {
+		if (binding.value) return;
+		const mobile = (bindMobile.value || '').trim();
+		if (!/^1\d{10}$/.test(mobile)) {
+			uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
+			return;
+		}
+		if (!form.nickname.trim()) {
+			uni.showToast({ title: '请先填写用户昵称', icon: 'none' });
+			return;
+		}
+		binding.value = true;
+		try {
+			if (!hasMerchantRecord.value) {
+				const saved = await api.saveAccount(buildAccountPayload());
+				if (saved && saved.userinfo) {
+					setUser(saved.userinfo);
+					hasMerchantRecord.value = true;
+				}
+			}
+			await api.merchantBindMember({ mobile });
+			showBind.value = false;
+			uni.showToast({ title: '绑定成功' });
+			await load();
+		} catch (e) {
+		} finally {
+			binding.value = false;
+		}
+	}
+
+	const unbindingId = ref(0);
+
+	function unbindMember(m) {
+		if (!m || unbindingId.value) return;
+		uni.showModal({
+			title: '解除关联',
+			content: `确认解除 ${m.nickname}（${m.mobile}）？解除后对方将无法共享商家数据`,
+			confirmColor: '#F0710D',
+			success: async (r) => {
+				if (!r.confirm || unbindingId.value) return;
+				unbindingId.value = m.id;
+				try {
+					await api.merchantUnbindMember({ member_id: m.id });
+					uni.showToast({ title: '已解除关联' });
+					await load();
+				} catch (e) {
+				} finally {
+					unbindingId.value = 0;
+				}
+			}
+		});
+	}
+
+	const focusSection = ref('');
+
+	onLoad((options) => {
+		if (options && options.focus === 'members') {
+			focusSection.value = 'members';
+		}
+	});
+
+	onShow(async () => {
+		await load();
+		if (focusSection.value === 'members' && form.user_type === 'merchant') {
+			focusSection.value = '';
+			setTimeout(() => {
+				uni.pageScrollTo({ selector: '.member-card', duration: 250 });
+			}, 120);
+		}
+	});
 </script>
 
 <style lang="scss" scoped>
+	@import '@/uni.scss';
 	.page {
 		min-height: 100vh;
 		background: $yjyf-bg-page;
@@ -266,6 +415,125 @@
 		color: $yjyf-text-secondary;
 		line-height: 1.5;
 	}
+	.member-card {
+		padding: 24rpx 28rpx;
+	}
+	.member-card-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 8rpx;
+	}
+	.member-card-title {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.bind-action {
+		padding: 8rpx 20rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-primary-bg;
+		display: inline-flex;
+		align-items: center;
+		gap: 8rpx;
+	}
+	.bind-plus-ico {
+		width: 24rpx;
+		height: 24rpx;
+	}
+	.bind-action-txt {
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		color: $yjyf-primary;
+	}
+	.member-row {
+		display: flex;
+		align-items: center;
+		padding: 18rpx 0;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.member-row:last-of-type {
+		border-bottom: none;
+	}
+	.member-avatar {
+		width: 64rpx;
+		height: 64rpx;
+		border-radius: 50%;
+		flex-shrink: 0;
+		background: $yjyf-primary-bg;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		overflow: hidden;
+	}
+	.member-avatar-img {
+		width: 44rpx;
+		height: 44rpx;
+	}
+	.member-main {
+		flex: 1;
+		min-width: 0;
+		margin-left: 16rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	.member-head {
+		display: flex;
+		align-items: center;
+	}
+	.member-name {
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-text-main;
+	}
+	.member-role {
+		margin-left: 12rpx;
+		padding: 0 14rpx;
+		height: 36rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 8rpx;
+		background: $yjyf-bg-page;
+		color: $yjyf-text-secondary;
+		font-size: $yjyf-font-micro;
+	}
+	.member-role.owner {
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+	}
+	.member-meta {
+		margin-top: 6rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
+	}
+	.member-unbind {
+		flex-shrink: 0;
+		margin-left: 12rpx;
+		padding: 0 20rpx;
+		height: 48rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 24rpx;
+		background: rgba(232, 51, 27, 0.08);
+		color: $yjyf-danger;
+		font-size: $yjyf-font-micro;
+	}
+	.member-empty {
+		padding: 24rpx 0 12rpx;
+		text-align: center;
+	}
+	.member-empty-txt {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+	.member-tip {
+		display: block;
+		margin-top: 12rpx;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-muted;
+	}
 	.save-btn {
 		margin: 40rpx 24rpx 0;
 		height: 92rpx;
@@ -281,4 +549,74 @@
 	.save-btn.disabled {
 		opacity: 0.6;
 	}
+	.mask {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.45);
+		display: flex;
+		align-items: flex-end;
+		z-index: 150;
+	}
+	.sheet {
+		width: 100%;
+		background: $yjyf-bg-card;
+		border-radius: 28rpx 28rpx 0 0;
+		padding: 28rpx 32rpx;
+		padding-bottom: calc(28rpx + env(safe-area-inset-bottom));
+		box-sizing: border-box;
+	}
+	.sheet-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.sheet-title {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.sheet-close-btn {
+		padding: 8rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.sheet-close-ico {
+		width: 32rpx;
+		height: 32rpx;
+		opacity: 0.6;
+	}
+	.sheet-tip {
+		display: block;
+		margin: 16rpx 0 20rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		line-height: 1.5;
+	}
+	.sheet-input {
+		height: 88rpx;
+		padding: 0 24rpx;
+		background: $yjyf-bg-page;
+		border-radius: 16rpx;
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+	}
+	.sheet-btn {
+		height: 88rpx;
+		margin-top: 24rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 44rpx;
+		color: $yjyf-bg-card;
+		font-size: 30rpx;
+		font-weight: 600;
+		background: $yjyf-gradient-primary;
+	}
+	.sheet-btn.disabled {
+		opacity: 0.6;
+	}
 </style>
diff --git a/yjyf-app/pages/mine/mine.vue b/yjyf-app/pages/mine/mine.vue
index 8b05d47..567afa3 100644
--- a/yjyf-app/pages/mine/mine.vue
+++ b/yjyf-app/pages/mine/mine.vue
@@ -9,16 +9,19 @@
 	import { onLoad } from '@dcloudio/uni-app';
 	import UserMineView from '@/components/user/UserMineView.vue';
 	import YjyfTabBar from '@/components/YjyfTabBar.vue';
+	import { setRole } from '@/utils/role.js';
 
 	onLoad(() => {
+		setRole('user');
 		// 自动平滑收敛到单母页 Tab 3
-		uni.redirectTo({
+		uni.reLaunch({
 			url: '/pages/index/index?tab=3'
 		});
 	});
 
 	function onSwitchTab(index) {
-		uni.redirectTo({
+		setRole('user');
+		uni.reLaunch({
 			url: `/pages/index/index?tab=${index}`
 		});
 	}
diff --git a/yjyf-app/pages/order/case.vue b/yjyf-app/pages/order/case.vue
index 7dffb1f..243c2bc 100644
--- a/yjyf-app/pages/order/case.vue
+++ b/yjyf-app/pages/order/case.vue
@@ -1,6 +1,5 @@
 <template>
 	<view class="case-page">
-		<!-- 统一顶部导航栏 -->
 		<YjyfNavBar theme="orange" title="业主晒单实况" />
 
 		<!-- 骨架屏占位 -->
@@ -73,7 +72,7 @@
 				</view>
 				<view class="master-row">
 					<view class="master-avatar-wrap">
-						<view class="master-avatar-txt">{{ master.realname.slice(0, 1) }}</view>
+						<image class="master-avatar-img" :src="master.avatar || '/static/icons/avatar-master.svg'" mode="aspectFill" />
 					</view>
 					<view class="master-detail">
 						<view class="master-name-line">
@@ -99,8 +98,7 @@
 				<block v-if="review">
 					<view class="review-author-row">
 						<view class="review-user-wrap">
-							<image v-if="review.user_avatar" class="review-user-avatar" :src="review.user_avatar" mode="aspectFill" />
-							<view v-else class="review-user-avatar-default">客</view>
+							<image class="review-user-avatar" :src="review.user_avatar || '/static/icons/user-avatar.svg'" mode="aspectFill" />
 							<view class="review-user-meta">
 								<text class="review-user-name">{{ review.user_name }}</text>
 								<text class="review-date">{{ review.time_text }}</text>
@@ -193,7 +191,7 @@
 
 				<view class="order-same-btn clickable-hover" @tap="onOrderSame">
 					<text class="order-same-txt">约同款</text>
-					<image class="order-same-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+					<image class="order-same-arrow" src="/static/icons/arrow-right-white.svg" mode="aspectFit" />
 				</view>
 			</view>
 		</view>
@@ -422,11 +420,10 @@
 	/* 通用卡片容器 */
 	.card {
 		background: #FFFFFF;
-		border-radius: 24rpx;
+		border-radius: 20rpx;
 		padding: 24rpx;
 		margin-bottom: 24rpx;
-		box-shadow: 0 4rpx 18rpx rgba(0, 0, 0, 0.035);
-		border: 1rpx solid #EDF2F7;
+		box-shadow: 0 6rpx 20rpx rgba(240, 113, 13, 0.06);
 		box-sizing: border-box;
 	}
 	.card-head {
@@ -571,8 +568,8 @@
 		bottom: 8rpx;
 		background: rgba(0, 0, 0, 0.65);
 		color: #FFFFFF;
-		font-size: 18rpx;
-		padding: 2rpx 8rpx;
+		font-size: 22rpx;
+		padding: 2rpx 10rpx;
 		border-radius: 6rpx;
 	}
 
@@ -685,8 +682,8 @@
 		color: #1F1F1F;
 	}
 	.review-date {
-		font-size: 20rpx;
-		color: #9CA3AF;
+		font-size: 22rpx;
+		color: #888888;
 	}
 	.review-stars-box {
 		display: flex;
@@ -712,8 +709,8 @@
 		border: 1rpx solid #FFEDD5;
 	}
 	.review-tag-txt {
-		font-size: 20rpx;
-		color: #EA580C;
+		font-size: 22rpx;
+		color: #F0710D;
 		font-weight: 600;
 	}
 
@@ -797,11 +794,11 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 0 24rpx calc(0rpx + constant(safe-area-inset-bottom)) 24rpx;
-		padding: 0 24rpx calc(0rpx + env(safe-area-inset-bottom)) 24rpx;
-		box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.04);
+		padding: 0 24rpx;
+		padding-bottom: env(safe-area-inset-bottom);
+		box-shadow: 0 -6rpx 24rpx rgba(0, 0, 0, 0.06);
 		z-index: 99;
-		box-sizing: border-box;
+		box-sizing: content-box;
 	}
 	.bar-info-area {
 		display: flex;
@@ -908,10 +905,9 @@
 		line-height: 1;
 	}
 	.order-same-arrow {
-		width: 20rpx;
-		height: 20rpx;
+		width: 22rpx;
+		height: 22rpx;
 		margin-left: 6rpx;
-		filter: brightness(0) invert(1);
 	}
 
 	.clickable-hover:active {
diff --git a/yjyf-app/pages/order/create.vue b/yjyf-app/pages/order/create.vue
index 4a6ffd3..e8841e7 100644
--- a/yjyf-app/pages/order/create.vue
+++ b/yjyf-app/pages/order/create.vue
@@ -3,7 +3,9 @@
 		<YjyfNavBar theme="orange" title="确认订单" />
 
 		<view class="svc">
-			<view class="svc-thumb"><text class="svc-txt">{{ svc ? svc.name.slice(0, 2) : '' }}</text></view>
+			<view class="svc-thumb">
+				<image class="svc-img" :src="(svc && svc.image_url) ? svc.image_url : '/static/icons/service-default.svg'" :mode="(svc && svc.image_url && !svc.image_url.endsWith('.svg')) ? 'aspectFill' : 'aspectFit'" />
+			</view>
 			<view class="svc-info">
 				<text class="svc-name">{{ svc ? svc.name : '' }}</text>
 				<text class="svc-price">{{ svc ? svc.price_text : '' }}</text>
@@ -65,9 +67,13 @@
 			<view class="fi">
 				<text class="fk">商品数量</text>
 				<view class="stepper">
-					<view class="st-btn" @tap="stepGroupNum(idx, -1)">－</view>
+					<view class="st-btn" @tap="stepGroupNum(idx, -1)">
+						<image class="st-ico" src="/static/icons/step-minus.svg" mode="aspectFit" />
+					</view>
 					<text class="st-val">{{ item.goods_num }}</text>
-					<view class="st-btn" @tap="stepGroupNum(idx, 1)">＋</view>
+					<view class="st-btn" @tap="stepGroupNum(idx, 1)">
+						<image class="st-ico" src="/static/icons/step-plus.svg" mode="aspectFit" />
+					</view>
 				</view>
 			</view>
 			<view class="fi">
@@ -92,7 +98,7 @@
 		</view>
 
 		<view class="add-group-btn clickable-hover" @tap="addGroup">
-			<text class="add-plus">＋</text>
+			<image class="add-plus-ico" src="/static/icons/plus-orange.svg" mode="aspectFit" />
 			<text class="add-txt">继续添加商品组合 (如: 浴缸/马桶同时装)</text>
 		</view>
 
@@ -110,13 +116,31 @@
 			<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>
+					<!-- #ifdef MP-WEIXIN -->
+					<picker class="fv-picker" mode="region" :value="[form.province, form.city, form.district]" @change="onCreateRegionChange">
+						<view class="fv2-row"><text class="fv2" :class="{ 'ph-txt': !form.province }">{{ form.province ? (form.province + ' ' + form.city + ' ' + form.district) : '点击选择省 / 市 / 区' }}</text><image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" /></view>
+					</picker>
+					<!-- #endif -->
+					<!-- #ifndef MP-WEIXIN -->
+					<view class="fv2-row clickable-hover" @tap="showCreateRegion = true">
+						<text class="fv2" :class="{ 'ph-txt': !form.province }">{{ form.province ? (form.province + ' ' + form.city + ' ' + form.district) : '点击选择省 / 市 / 区' }}</text>
+						<image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+					</view>
+					<!-- #endif -->
+				</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>
+						<view class="st-btn" @tap="stepFloor(-1)">
+							<image class="st-ico" src="/static/icons/step-minus.svg" mode="aspectFit" />
+						</view>
 						<text class="st-val">{{ form.floor }}</text>
-						<view class="st-btn" @tap="stepFloor(1)">＋</view>
+						<view class="st-btn" @tap="stepFloor(1)">
+							<image class="st-ico" src="/static/icons/step-plus.svg" mode="aspectFit" />
+						</view>
 					</view>
 				</view>
 				<view class="fi">
@@ -133,10 +157,10 @@
 		<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>
+				<view class="fi"><text class="fk">预约日期</text><text class="fv2">{{ date }}</text><image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" /></view>
 			</picker>
 			<picker mode="selector" :range="timeSlots" @change="onTimeSlot">
-				<view class="fi"><text class="fk">预约时段</text><text class="fv2">{{ time }}</text><text class="arrow">›</text></view>
+				<view class="fi"><text class="fk">预约时段</text><text class="fv2">{{ time }}</text><image class="arrow-ico" src="/static/icons/arrow-right.svg" mode="aspectFit" /></view>
 			</picker>
 			<view class="fi"><text class="fk">施工备注</text><input class="fv" v-model="form.remark" placeholder="门禁密码 / 施工特殊要求 / 宠物等" /></view>
 		</view>
@@ -193,14 +217,24 @@
 				{{ submitting ? '提交中...' : (priceType === 'quote' ? '发布需求' : '发布订单') }}
 			</view>
 		</view>
+
+		<RegionPickerDrawer
+			:visible="showCreateRegion"
+			:province="form.province"
+			:city="form.city"
+			:district="form.district"
+			@update:visible="showCreateRegion = $event"
+			@confirm="onCreateRegionDrawerConfirm"
+		/>
 	</view>
 </template>
 
 <script setup>
 	import { ref, reactive, watch, computed } from 'vue';
-	import { onLoad } from '@dcloudio/uni-app';
+	import { onLoad, onShow, onUnload } from '@dcloudio/uni-app';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin } from '@/utils/request.js';
+	import RegionPickerDrawer from '@/components/RegionPickerDrawer.vue';
 
 	const svc = ref(null);
 	const address = ref(null);
@@ -209,6 +243,7 @@
 	const urgent = ref(false);
 	const submitting = ref(false);
 	const autoQuote = ref(true);
+	const showCreateRegion = ref(false);
 
 	// 真实增值服务列表：从当前所选商品的真实 addons 动态派生（无 mock，按商品品类精准区分）
 	const availableAddons = computed(() => {
@@ -256,7 +291,7 @@
 	}
 
 	function calcGroupPrice(item) {
-		const unitBase = svc.value && Number(svc.value.base_price) > 0 ? Number(svc.value.base_price) : 80;
+		const unitBase = svc.value && Number(svc.value.base_price) > 0 ? Number(svc.value.base_price) : 0;
 		let addonSum = 0;
 		for (const adName of item.addons) {
 			const hit = availableAddons.value.find(a => a.name === adName);
@@ -314,12 +349,28 @@
 	function onTimeSlot(e) { time.value = timeSlots[e.detail.value]; }
 
 	const form = reactive({
-		contact: '', mobile: '', address: '', floor: 1, has_elevator: 1,
+		contact: '', mobile: '', province: '', city: '', district: '', address: '', floor: 1, has_elevator: 1,
 		goods_model: '', goods_num: 1, remark: ''
 	});
 
 	function stepFloor(delta) { form.floor = Math.max(1, form.floor + delta); }
 
+	function onCreateRegionChange(e) {
+		const val = e.detail.value || [];
+		if (val.length >= 3) {
+			form.province = val[0];
+			form.city = val[1];
+			form.district = val[2];
+		}
+	}
+
+	function onCreateRegionDrawerConfirm(reg) {
+		if (!reg) return;
+		form.province = reg.province;
+		form.city = reg.city;
+		form.district = reg.district;
+	}
+
 	async function loadAddress() {
 		try {
 			const res = await api.addressList();
@@ -331,30 +382,37 @@
 		} catch (e) {}
 	}
 
+	function onAddressSelectedEvent(addr) {
+		if (!addr) return;
+		address.value = addr;
+		calc();
+	}
+
 	function pickAddress() {
 		uni.navigateTo({
 			url: '/pages/address/list?select=1',
 			events: {
-				selectAddress: (addr) => {
-					address.value = addr;
-					calc();
-				}
+				selectAddress: onAddressSelectedEvent
 			}
 		});
 	}
 
+	const savingAddr = ref(false);
+
 	async function saveAddress() {
-		if (!form.contact || !form.mobile || !form.address) {
-			uni.showToast({ title: '请完整填写地址信息', icon: 'none' });
+		if (savingAddr.value) return;
+		if (!form.contact || !form.mobile || !form.province || !form.address) {
+			uni.showToast({ title: '请完整填写联系人、电话、所在地区与详细地址', icon: 'none' });
 			return;
 		}
+		savingAddr.value = true;
 		try {
 			const res = await api.addressSave({
 				contact: form.contact,
 				mobile: form.mobile,
-				province: '贵州省',
-				city: '贵阳市',
-				district: '南明区',
+				province: form.province,
+				city: form.city,
+				district: form.district,
 				address: form.address,
 				floor: form.floor,
 				has_elevator: form.has_elevator,
@@ -364,13 +422,16 @@
 				id: res.id,
 				contact: form.contact,
 				mobile: form.mobile,
-				province: '贵州省', city: '贵阳市', district: '南明区',
+				province: form.province, city: form.city, district: form.district,
 				address: form.address,
 				floor: form.floor,
 				has_elevator: form.has_elevator
 			};
 			calc();
-		} catch (e) {}
+		} catch (e) {
+		} finally {
+			savingAddr.value = false;
+		}
 	}
 
 	async function calc() {
@@ -385,7 +446,7 @@
 				price_type: priceType.value,
 				user_price: userPrice.value
 			});
-			amount.value = res.amount;
+			amount.value = (res && res.amount) ? res.amount : res;
 		} catch (e) {}
 	}
 
@@ -413,6 +474,7 @@
 		}
 
 		submitting.value = true;
+		let createdOrderId = 0;
 		try {
 			// 封装多商品组合明细
 			const itemsPayload = goodsGroups.value.map(g => ({
@@ -425,10 +487,22 @@
 				base_price: calcGroupPrice(g)
 			}));
 
+			let appointHourStr = '14:30:00';
+			if (time.value && time.value.indexOf('上午') > -1) appointHourStr = '10:00:00';
+			else if (time.value && time.value.indexOf('中午') > -1) appointHourStr = '12:00:00';
+			else if (time.value && time.value.indexOf('下午') > -1) appointHourStr = '14:30:00';
+			else if (time.value && time.value.indexOf('晚上') > -1) appointHourStr = '19:00:00';
+			const safeDateStr = String(date.value || today).replace(/-/g, '/');
+			let targetTime = Math.floor(new Date(`${safeDateStr} ${appointHourStr}`).getTime() / 1000);
+			const nowSec = Math.floor(Date.now() / 1000);
+			if (isNaN(targetTime) || targetTime <= nowSec) {
+				targetTime = nowSec + 3600;
+			}
+
 			const res = await api.orderCreate({
 				service_id: serviceId,
 				address_id: address.value.id,
-				appoint_time: Math.floor(new Date(`${date.value} 14:00:00`).getTime() / 1000),
+				appoint_time: targetTime,
 				urgent: urgent.value ? 1 : 0,
 				goods_model: goodsGroups.value[0].goods_model,
 				goods_num: goodsGroups.value[0].goods_num,
@@ -437,29 +511,39 @@
 				user_price: userPrice.value,
 				auto_quote_timeout: autoQuote.value ? 1200 : 0,
 				items: itemsPayload,
-				goods_list: itemsPayload
+				goods_list: JSON.stringify(itemsPayload)
 			});
 
-			const orderId = res.order_id;
+			createdOrderId = res.order_id;
 			if (priceType.value === 'quote') {
-				uni.redirectTo({ url: `/pages/order/detail?id=${orderId}` });
+				submitting.value = false;
+				uni.redirectTo({ url: `/pages/order/detail?id=${createdOrderId}` });
 				return;
 			}
 			// 一口价或自主定价调起支付
-			await api.orderPay({ order_id: orderId, pay_type: 'mock' });
+			await api.orderPay({ order_id: createdOrderId, pay_type: 'wxpay' });
 			uni.showToast({ title: '下单并支付成功' });
 			setTimeout(() => {
-				uni.redirectTo({ url: `/pages/order/detail?id=${orderId}` });
+				submitting.value = false;
+				uni.redirectTo({ url: `/pages/order/detail?id=${createdOrderId}` });
 			}, 600);
 		} catch (e) {
-			uni.showToast({ title: e.message || '下单失败', icon: 'none' });
-		} finally {
-			submitting.value = false;
+			if (createdOrderId) {
+				uni.showToast({ title: '订单已创建，请在详情页完成支付', icon: 'none' });
+				setTimeout(() => {
+					submitting.value = false;
+					uni.redirectTo({ url: `/pages/order/detail?id=${createdOrderId}` });
+				}, 600);
+			} else {
+				submitting.value = false;
+				uni.showToast({ title: e.message || '下单失败', icon: 'none' });
+			}
 		}
 	}
 
 	onLoad(async (options) => {
 		if (!isLogin()) { toLogin(); return; }
+		uni.$on('selectAddress', onAddressSelectedEvent);
 		serviceId = Number(options.service_id || 0);
 		const res = await api.serviceDetail(serviceId);
 		svc.value = res.detail;
@@ -471,28 +555,41 @@
 		await loadAddress();
 		calc();
 	});
+
+	onUnload(() => {
+		uni.$off('selectAddress', onAddressSelectedEvent);
+	});
+
+	onShow(() => {
+		const picked = uni.getStorageSync('yjyf_selected_address');
+		if (picked) {
+			uni.removeStorageSync('yjyf_selected_address');
+			address.value = picked;
+			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(135deg, #FFA93F 0%, #F0710D 100%);
+		display: flex; align-items: center; margin: 24rpx 24rpx 0; padding: 24rpx;
+		background: #FFFFFF; border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240, 113, 13, 0.06);
 	}
 	.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;
+		width: 108rpx; height: 108rpx; border-radius: 16rpx; flex-shrink: 0; overflow: hidden;
+		background: #FFF7F0; 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); }
+	.svc-img { width: 100%; height: 100%; }
+	.svc-info { flex: 1; margin-left: 20rpx; display: flex; flex-direction: column; }
+	.svc-name { font-size: 32rpx; font-weight: 700; color: #1F1F1F; }
+	.svc-price { margin-top: 8rpx; font-size: 28rpx; font-weight: 700; color: #F0710D; }
 	.urgent {
 		flex-shrink: 0; height: 56rpx; padding: 0 24rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 28rpx;
-		background: rgba(255,255,255,0.2); border: 2rpx solid rgba(255,255,255,0.5);
+		background: #F5F6F8; border: 2rpx solid #F0F0F2;
 	}
-	.urgent.on { background: #fff; border-color: #fff; }
-	.urgent-txt { font-size: 22rpx; color: #fff; line-height: 1; }
+	.urgent.on { background: #FFF7F0; border-color: #F0710D; }
+	.urgent-txt { font-size: 22rpx; color: #444444; line-height: 1; }
 	.urgent.on .urgent-txt { color: #F0710D; font-weight: 600; }
 	.sec { margin: 24rpx 24rpx 0; padding: 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: 12rpx; }
@@ -535,7 +632,7 @@
 		margin: 24rpx 24rpx 0; height: 84rpx; display: flex; align-items: center; justify-content: center;
 		background: #fff; border: 2rpx dashed #F0710D; border-radius: 20rpx;
 	}
-	.add-plus { font-size: 32rpx; color: #F0710D; font-weight: 700; margin-right: 8rpx; line-height: 1; }
+	.add-plus-ico { width: 28rpx; height: 28rpx; margin-right: 8rpx; }
 	.add-txt { font-size: 26rpx; color: #F0710D; font-weight: 600; line-height: 1; }
 	.addr { display: flex; align-items: center; }
 	.addr-main { flex: 1; min-width: 0; display: flex; flex-direction: column; }
@@ -546,10 +643,14 @@
 	.fi { display: flex; align-items: center; min-height: 88rpx; border-bottom: 1rpx solid #F0F0F2; }
 	.fk { width: 150rpx; flex-shrink: 0; font-size: 28rpx; color: #444444; }
 	.fv { flex: 1; min-width: 0; height: 88rpx; font-size: 28rpx; color: #1F1F1F; }
+	.fv-picker { flex: 1; }
+	.fv2-row { flex: 1; display: flex; align-items: center; justify-content: space-between; min-height: 88rpx; }
 	.fv2 { flex: 1; min-width: 0; font-size: 28rpx; color: #1F1F1F; }
-	.arrow { font-size: 30rpx; color: #C4C4C4; }
+	.fv2.ph-txt { color: #C8C7CC; }
+	.arrow-ico { width: 26rpx; height: 26rpx; opacity: 0.5; flex-shrink: 0; }
 	.stepper { display: flex; align-items: center; }
-	.st-btn { width: 52rpx; height: 52rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 26rpx; background: #F5F6F8; color: #444444; font-size: 28rpx; }
+	.st-btn { width: 52rpx; height: 52rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 26rpx; background: #F5F6F8; }
+	.st-ico { width: 24rpx; height: 24rpx; }
 	.st-val { min-width: 60rpx; text-align: center; font-size: 28rpx; color: #1F1F1F; }
 	.seg { display: flex; align-items: center; gap: 12rpx; }
 	.seg-i { height: 52rpx; padding: 0 26rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1; border-radius: 26rpx; background: #F5F6F8; font-size: 24rpx; color: #444444; }
@@ -586,8 +687,10 @@
 	.bar {
 		position: fixed; left: 0; right: 0; bottom: 0; height: 120rpx;
 		padding: 0 24rpx; padding-bottom: env(safe-area-inset-bottom);
+		box-sizing: content-box;
 		display: flex; align-items: center; justify-content: space-between;
-		background: #fff; box-shadow: 0 -6rpx 24rpx rgba(0,0,0,0.07);
+		background: #fff; box-shadow: 0 -6rpx 24rpx rgba(0,0,0,0.06);
+		z-index: 20;
 	}
 	.bar-l { display: flex; align-items: baseline; }
 	.bar-k { font-size: 24rpx; color: #666; }
diff --git a/yjyf-app/pages/order/detail.vue b/yjyf-app/pages/order/detail.vue
index df83804..ae94b0a 100644
--- a/yjyf-app/pages/order/detail.vue
+++ b/yjyf-app/pages/order/detail.vue
@@ -1,6 +1,5 @@
 <template>
 	<view class="page">
-		<!-- 统一规范顶部橙色导航栏 -->
 		<YjyfNavBar theme="orange" title="订单详情" />
 
 		<!-- 骨架屏加载占位 -->
@@ -68,16 +67,61 @@
 			<view class="card card-section">
 				<text class="block-title">商品信息</text>
 				<view class="goods-item-row" v-for="(g, idx) in displayGoodsList" :key="idx">
-					<image class="goods-pic" :src="g.goods_image || order.goods_image_url || '/static/icons/appliance.png'" mode="aspectFill" />
+					<image
+						class="goods-pic clickable-hover"
+						:src="g.goods_image || order.goods_image_url || '/static/icons/service-default.svg'"
+						mode="aspectFill"
+						@tap="previewUrls((g.images && g.images.length) ? g.images : (order.all_goods_images || []), 0)"
+					/>
 					<view class="goods-texts">
-						<text class="goods-name">{{ g.goods_name }}{{ g.goods_model ? `（${g.goods_model}）` : '' }} x {{ g.goods_num }}套</text>
-						<text class="goods-sub">服务项目： {{ g.addon_services || order.service_name + 'x' + (g.goods_num || 1) + ';' }}</text>
+						<text class="goods-name">{{ g.goods_name }}{{ g.goods_model ? `（${g.goods_model}）` : '' }} x {{ g.goods_num }}{{ g.unit || '套' }}</text>
+						<text class="goods-sub">服务项目： {{ formatGoodsServiceText(g) }}</text>
+						<text class="goods-sub" v-if="g.goods_remark">商品备注： {{ g.goods_remark }}</text>
 					</view>
 				</view>
 
-				<!-- 商品备注框 (浅灰底条) -->
+				<!-- 客户上传的商品图 / 安装环境图 / 安装视频展示区 -->
+				<view
+					class="order-attach-sec"
+					v-if="(order.all_goods_images && order.all_goods_images.length > 0) || (order.env_images && order.env_images.length > 0) || (order.goods_videos && order.goods_videos.length > 0)"
+				>
+					<text class="attach-sec-title">商品与安装现场附件</text>
+					<view class="media-grid">
+						<view
+							class="media-card clickable-hover"
+							v-for="(im, idx) in (order.all_goods_images || [])"
+							:key="'og_' + idx"
+							@tap="previewUrls(order.all_goods_images, idx)"
+						>
+							<image class="media-img" :src="im" mode="aspectFill" />
+							<text class="media-tag">商品图 {{ idx + 1 }}</text>
+						</view>
+						<view
+							class="media-card clickable-hover"
+							v-for="(eim, eidx) in (order.env_images || [])"
+							:key="'oe_' + eidx"
+							@tap="previewUrls(order.env_images, eidx)"
+						>
+							<image class="media-img" :src="eim" mode="aspectFill" />
+							<text class="media-tag">环境图 {{ eidx + 1 }}</text>
+						</view>
+						<view
+							class="media-card video-attach-card clickable-hover"
+							v-for="(vid, vidx) in (order.goods_videos || [])"
+							:key="'ov_' + vidx"
+							@tap="activeVideoUrl = vid"
+						>
+							<view class="video-attach-cover">
+								<image class="va-play-ico" src="/static/icons/play-white.svg" mode="aspectFit" />
+							</view>
+							<text class="media-tag">安装视频</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 服务备注框 (浅灰底条) -->
 				<view class="goods-remark-box">
-					<text class="remark-lbl">商品备注</text>
+					<text class="remark-lbl">服务备注</text>
 					<text class="remark-val">{{ order.remark_display || (order.remark ? order.remark : '无备注') }}</text>
 				</view>
 			</view>
@@ -117,14 +161,23 @@
 
 			<!-- ==================== 业务联动：服务师傅名片 (已接单) ==================== -->
 			<view class="card card-section" v-if="master">
-				<text class="block-title">服务师傅</text>
-				<view class="master-row">
-					<view class="master-avatar">
-						<text class="avatar-txt">{{ (master.realname || '师').slice(0, 1) }}</text>
+				<view class="card-head">
+					<text class="block-title">服务师傅</text>
+					<view class="master-rev-link clickable-hover" @tap="goMasterReviews(master.id || order.master_id)">
+						<text class="rev-link-txt">客户评价</text>
+						<image class="inv-arrow-ico" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
 					</view>
-					<view class="master-meta">
+				</view>
+				<view class="master-row">
+					<view class="master-avatar clickable-hover" @tap="goMasterReviews(master.id || order.master_id)">
+						<image class="master-avatar-img" :src="master.avatar || '/static/icons/avatar-master.svg'" mode="aspectFill" />
+					</view>
+					<view class="master-meta clickable-hover" @tap="goMasterReviews(master.id || order.master_id)">
 						<text class="m-name">{{ master.realname }}</text>
-						<text class="m-sub">评分 {{ master.score }} ★ · 累计完工 {{ master.order_count }} 单</text>
+						<view class="m-sub-row">
+							<image class="inline-star-ico" src="/static/icons/star-orange.svg" mode="aspectFit" />
+							<text class="m-sub">{{ master.score }} 分 · 累计完工 {{ master.order_count }} 单</text>
+						</view>
 					</view>
 					<view class="call-btn clickable-hover" @tap="callPhone(master.mobile)">
 						<text class="call-txt">拨打电话</text>
@@ -151,9 +204,12 @@
 				<view class="quote-empty" v-if="!quotes.length">暂无师傅报价，平台正全力派发…</view>
 				<view class="quote-item" v-for="q in quotes" :key="q.id" :class="{ chosen: q.status === 'accept' }">
 					<view class="q-top">
-						<view class="q-master">
+						<view class="q-master clickable-hover" @tap="goMasterReviews(q.master_id)">
 							<text class="q-name">{{ q.realname }}</text>
-							<text class="q-meta">评分 {{ q.score }} ★ · 已完成 {{ q.order_count }} 单</text>
+							<view class="q-meta-row">
+								<image class="inline-star-ico" src="/static/icons/star-orange.svg" mode="aspectFit" />
+								<text class="q-meta">{{ q.score }} 分 · 已完成 {{ q.order_count }} 单</text>
+							</view>
 						</view>
 						<text class="q-amt">¥{{ q.amount }}</text>
 					</view>
@@ -176,6 +232,19 @@
 				<view class="info-item" v-if="Number(order.discount_amount) > 0"><text class="label">优惠券抵扣</text><text class="value green">-¥{{ order.discount_amount }}</text></view>
 				<view class="info-item" v-if="Number(order.diff_amount) > 0"><text class="label">现场补差价</text><text class="value">¥{{ order.diff_amount }}</text></view>
 				<view class="info-item"><text class="label">实付总额</text><text class="value total-price">¥{{ order.pay_amount }}</text></view>
+				<view
+					class="info-item invoice-entry-item clickable-hover"
+					v-if="Number(order.pay_status) === 1 && (order.status === 8 || order.invoice_status === 'wait' || order.invoice_status === 'issued')"
+					@tap="handleOrderInvoice"
+				>
+					<text class="label">发票服务</text>
+					<view class="invoice-entry-val">
+						<text class="inv-st-txt" :class="'inv-st-' + (order.invoice_status || 'none')">
+							{{ order.invoice_status === 'issued' ? '已开具发票 · 查看电子票' : (order.invoice_status === 'wait' ? '开票处理中 · 查看进度' : '申请开具发票') }}
+						</text>
+						<image class="inv-arrow-ico" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+					</view>
+				</view>
 			</view>
 
 			<!-- ==================== 业务联动：现场施工与验收取证照片 ==================== -->
@@ -268,26 +337,45 @@
 
 				<!-- 待验收订单 -->
 				<template v-else-if="order.status === 7 || order.can_verify">
+					<view class="btn outline clickable-hover" v-if="order.status !== 10" @tap="openComplaintModal">申请售后</view>
 					<view class="btn primary clickable-hover" @tap="verify">确认验收</view>
 				</template>
 
 				<!-- 已完成订单 -->
 				<template v-else-if="order.status === 8">
+					<view class="btn outline clickable-hover" @tap="openComplaintModal">申请售后</view>
 					<view class="btn outline clickable-hover" v-if="order.can_review" @tap="review">去评价</view>
-					<view class="btn outline clickable-hover" v-if="order.is_showcase" @tap="toggleShowcase(0)">取消晒单</view>
-					<view class="btn primary clickable-hover" v-else @tap="toggleShowcase(1)">一键晒单</view>
-					<view class="btn outline clickable-hover" v-if="order.is_showcase" @tap="viewShowcase">查看晒单</view>
-					<view class="btn primary clickable-hover" v-if="order.is_showcase" @tap="orderAgain">再次下单</view>
+					<view class="btn primary clickable-hover" v-if="!order.is_showcase" @tap="toggleShowcase(1)">一键晒单</view>
+					<view class="btn primary clickable-hover" v-else @tap="orderAgain">再次下单</view>
 				</template>
 
 				<!-- 其它服务进行中状态 -->
 				<template v-else>
+					<view class="btn outline clickable-hover" v-if="order.status >= 3 && order.status < 8" @tap="openComplaintModal">售后反馈</view>
 					<view class="btn outline clickable-hover" v-if="order.can_cancel" @tap="cancel">取消订单</view>
-					<view class="btn outline clickable-hover" @tap="orderAgain">再次下单</view>
+					<view class="btn primary clickable-hover" @tap="orderAgain">再次下单</view>
 				</template>
 			</view>
 		</view>
 
+		<!-- 售后投诉弹窗 -->
+		<view class="modal-mask" v-if="showComplaintModal" @tap="showComplaintModal = false">
+			<view class="modal-box" @tap.stop>
+				<text class="modal-title">申请售后 / 投诉反馈</text>
+				<text class="modal-sub">订单号：{{ order ? order.order_no : '' }}</text>
+				<textarea
+					class="tag-input"
+					v-model="complaintReason"
+					placeholder="请详细描述施工质量、迟到或收费异常问题，平台客服将介入处理"
+					maxlength="200"
+				/>
+				<view class="modal-btns">
+					<view class="m-btn cancel clickable-hover" @tap="showComplaintModal = false">取消</view>
+					<view class="m-btn confirm clickable-hover" @tap="submitComplaint">提交申请</view>
+				</view>
+			</view>
+		</view>
+
 		<!-- 订单标记备注弹窗 -->
 		<view class="modal-mask" v-if="showTagModal" @tap="showTagModal = false">
 			<view class="modal-box" @tap.stop>
@@ -305,6 +393,19 @@
 				</view>
 			</view>
 		</view>
+
+		<!-- 安装视频播放弹窗 -->
+		<view class="modal-mask" v-if="activeVideoUrl" @tap="activeVideoUrl = ''">
+			<view class="modal-box video-play-modal" @tap.stop>
+				<view class="vp-head">
+					<text class="modal-title no-mb">安装视频预览</text>
+					<view class="vp-close clickable-hover" @tap="activeVideoUrl = ''">
+						<image class="vp-close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<video class="vp-player" :src="activeVideoUrl" controls autoplay />
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -324,12 +425,29 @@
 	const reviewData = ref(null);
 	const showRealMobile = ref(false);
 
-	// 标记弹窗
+	// 标记弹窗 & 售后弹窗
 	const showTagModal = ref(false);
 	const orderTagNote = ref('');
+	const savingTag = ref(false);
+	const showComplaintModal = ref(false);
+	const complaintReason = ref('');
+	const submittingComplaint = ref(false);
+	const actionBusy = ref(false);
+	const activeVideoUrl = ref('');
 
 	let orderId = 0;
 
+	function formatGoodsServiceText(g) {
+		if (g && g.addon_services) {
+			return String(g.addon_services).replace(/(x\d+)\1+/gi, '$1');
+		}
+		const base = (order.value && order.value.service_name) ? String(order.value.service_name).trim() : '安装';
+		if (/x\d+;?$/i.test(base)) {
+			return base.endsWith(';') ? base : (base + ';');
+		}
+		return `${base}x${(g && g.goods_num) || 1};`;
+	}
+
 	const displayGoodsList = computed(() => {
 		if (goodsList.value && goodsList.value.length) {
 			return goodsList.value;
@@ -386,16 +504,12 @@
 	}
 
 	function contactService() {
-		uni.makePhoneCall({
-			phoneNumber: '4008006868',
-			fail: () => {
-				uni.showModal({
-					title: '客服热线',
-					content: '优匠官方客服：400-800-6868\n服务时间：08:30 - 21:00',
-					showCancel: false
-				});
-			}
-		});
+		api.contactService();
+	}
+
+	function goMasterReviews(mid) {
+		if (!mid) return;
+		uni.navigateTo({ url: '/pages/master/reviews?master_id=' + mid });
 	}
 
 	function callPhone(phone) {
@@ -408,13 +522,48 @@
 		showTagModal.value = true;
 	}
 
-	function saveOrderTag() {
-		if (order.value) {
-			order.value.remark = orderTagNote.value;
-			order.value.remark_display = orderTagNote.value || '无备注';
+	async function saveOrderTag() {
+		if (!order.value || savingTag.value) return;
+		savingTag.value = true;
+		try {
+			await api.orderUpdateNote({
+				order_id: orderId,
+				remark: orderTagNote.value.trim()
+			});
+			order.value.remark = orderTagNote.value.trim();
+			order.value.remark_display = orderTagNote.value.trim() || '无备注';
+			showTagModal.value = false;
+			uni.showToast({ title: '标记已保存', icon: 'success' });
+		} catch (e) {
+		} finally {
+			savingTag.value = false;
+		}
+	}
+
+	function openComplaintModal() {
+		complaintReason.value = '';
+		showComplaintModal.value = true;
+	}
+
+	async function submitComplaint() {
+		if (submittingComplaint.value) return;
+		if (!complaintReason.value.trim()) {
+			uni.showToast({ title: '请填写售后问题说明', icon: 'none' });
+			return;
+		}
+		submittingComplaint.value = true;
+		try {
+			await api.orderComplaint({
+				order_id: orderId,
+				reason: complaintReason.value.trim()
+			});
+			showComplaintModal.value = false;
+			uni.showToast({ title: '售后申请已提交', icon: 'success' });
+			load();
+		} catch (e) {
+		} finally {
+			submittingComplaint.value = false;
 		}
-		showTagModal.value = false;
-		uni.showToast({ title: '标记已保存', icon: 'success' });
 	}
 
 	function chooseQuote(q) {
@@ -428,71 +577,95 @@
 			title: '选择服务师傅',
 			content: msg,
 			confirmColor: '#F0710D',
-			success: async (r) => {
-				if (!r.confirm) return;
-				try {
-					await api.orderChooseQuote({ order_id: orderId, quote_id: q.id, pay_type: 'mock' });
-					uni.showToast({ title: '已选定师傅' });
-					load();
-				} catch (e) {}
-			}
-		});
-	}
+				success: async (r) => {
+					if (!r.confirm || actionBusy.value) return;
+					actionBusy.value = true;
+					try {
+						await api.orderChooseQuote({ order_id: orderId, quote_id: q.id, pay_type: 'mock' });
+						uni.showToast({ title: '已选定师傅' });
+						await load();
+					} catch (e) {
+					} finally {
+						actionBusy.value = false;
+					}
+				}
+			});
+		}
 
-	function payDiff() {
-		uni.showModal({
-			title: '支付增项补差价',
-			content: `确认支付现场增项补差价 ¥${order.value.diff_amount}？`,
-			confirmColor: '#F0710D',
-			success: async (r) => {
-				if (!r.confirm) return;
-				try {
-					await api.orderPayDiff({ order_id: orderId });
-					uni.showToast({ title: '支付成功' });
-					load();
-				} catch (e) {}
-			}
-		});
-	}
+		function payDiff() {
+			if (actionBusy.value) return;
+			uni.showModal({
+				title: '支付增项补差价',
+				content: `确认支付现场增项补差价 ¥${order.value.diff_amount}？`,
+				confirmColor: '#F0710D',
+				success: async (r) => {
+					if (!r.confirm || actionBusy.value) return;
+					actionBusy.value = true;
+					try {
+						await api.orderPayDiff({ order_id: orderId });
+						uni.showToast({ title: '支付成功' });
+						await load();
+					} catch (e) {
+					} finally {
+						actionBusy.value = false;
+					}
+				}
+			});
+		}
 
-	function cancel() {
-		uni.showModal({
-			title: '取消订单',
-			content: '确认取消该订单？取消后款项将原路退回。',
-			success: async (r) => {
-				if (!r.confirm) return;
-				try {
-					await api.orderCancel({ order_id: orderId, reason: '用户取消' });
-					uni.showToast({ title: '已取消', icon: 'none' });
-					load();
-				} catch (e) {}
-			}
-		});
-	}
+		function cancel() {
+			if (actionBusy.value) return;
+			uni.showModal({
+				title: '取消订单',
+				content: '确认取消该订单？取消后款项将原路退回。',
+				success: async (r) => {
+					if (!r.confirm || actionBusy.value) return;
+					actionBusy.value = true;
+					try {
+						await api.orderCancel({ order_id: orderId, reason: '用户取消' });
+						uni.showToast({ title: '已取消', icon: 'none' });
+						await load();
+					} catch (e) {
+					} finally {
+						actionBusy.value = false;
+					}
+				}
+			});
+		}
 
-	async function pay() {
-		try {
-			await api.orderPay({ order_id: orderId, pay_type: 'mock' });
-			uni.showToast({ title: '支付成功', icon: 'success' });
-			load();
-		} catch (e) {}
-	}
-
-	function verify() {
-		uni.showModal({
-			title: '确认验收',
-			content: '请确认师傅施工质量无误，验收后将向师傅结算。',
-			confirmColor: '#F0710D',
-			success: async (r) => {
-				if (!r.confirm) return;
-				try {
-					await api.orderVerify({ order_id: orderId });
-					uni.showToast({ title: '验收成功', icon: 'success' });
-					load();
-				} catch (e) {}
+		async function pay() {
+			if (actionBusy.value) return;
+			actionBusy.value = true;
+			try {
+				await api.orderPay({ order_id: orderId, pay_type: 'mock' });
+				uni.showToast({ title: '支付成功', icon: 'success' });
+				await load();
+			} catch (e) {
+			} finally {
+				actionBusy.value = false;
 			}
-		});
-	}
+		}
+
+		function verify() {
+			if (actionBusy.value) return;
+			uni.showModal({
+				title: '确认验收',
+				content: '请确认师傅施工质量无误，验收后将向师傅结算。',
+				confirmColor: '#F0710D',
+				success: async (r) => {
+					if (!r.confirm || actionBusy.value) return;
+					actionBusy.value = true;
+					try {
+						await api.orderVerify({ order_id: orderId });
+						uni.showToast({ title: '验收成功', icon: 'success' });
+						await load();
+					} catch (e) {
+					} finally {
+						actionBusy.value = false;
+					}
+				}
+			});
+		}
 
 	function reOrder() {
 		if (!order.value) return;
@@ -513,7 +686,17 @@
 		});
 	}
 
+	function handleOrderInvoice() {
+		if (!order.value) return;
+		if ((order.value.invoice_status === 'wait' || order.value.invoice_status === 'issued') && Number(order.value.invoice_id) > 0) {
+			uni.navigateTo({ url: '/pages/invoice/detail?id=' + order.value.invoice_id });
+			return;
+		}
+		uni.navigateTo({ url: '/pages/invoice/apply?order_ids=' + order.value.id });
+	}
+
 	async function toggleShowcase(targetVal) {
+		if (actionBusy.value) return;
 		const isShow = Number(targetVal) ? 1 : 0;
 		if (isShow === 0) {
 			uni.showModal({
@@ -525,23 +708,30 @@
 						load();
 						return;
 					}
+					if (actionBusy.value) return;
+					actionBusy.value = true;
 					try {
 						await api.orderShowcase({ order_id: orderId, is_showcase: 0 });
 						uni.showToast({ title: '已取消晒单', icon: 'none' });
-						load();
+						await load();
 					} catch (e) {
-						load();
+						await load();
+					} finally {
+						actionBusy.value = false;
 					}
 				}
 			});
 			return;
 		}
+		actionBusy.value = true;
 		try {
 			await api.orderShowcase({ order_id: orderId, is_showcase: 1 });
 			uni.showToast({ title: '已公开晒单', icon: 'success' });
-			load();
+			await load();
 		} catch (e) {
-			load();
+			await load();
+		} finally {
+			actionBusy.value = false;
 		}
 	}
 
@@ -563,6 +753,12 @@
 		}
 	}
 
+	function previewUrls(list, idx = 0) {
+		const valid = (list || []).filter(Boolean);
+		if (!valid.length) return;
+		uni.previewImage({ current: valid[idx] || valid[0], urls: valid });
+	}
+
 	onLoad((options) => {
 		orderId = Number(options.id || 0);
 	});
@@ -599,7 +795,7 @@
 	border-radius: 20rpx;
 	padding: 24rpx;
 	margin-bottom: 20rpx;
-	box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.03);
+	box-shadow: 0 6rpx 20rpx rgba(240, 113, 13, 0.06);
 }
 
 /* ==================== 卡片 1 样式 ==================== */
@@ -926,19 +1122,50 @@
 }
 
 .master-avatar {
-	width: 84rpx;
-	height: 84rpx;
+	width: 88rpx;
+	height: 88rpx;
 	border-radius: 50%;
-	background: #FFF1E3;
+	background: #FFF7F0;
+	overflow: hidden;
 	display: flex;
 	align-items: center;
 	justify-content: center;
+	flex-shrink: 0;
 }
 
-.avatar-txt {
-	font-size: 32rpx;
-	font-weight: 700;
+.master-avatar-img {
+	width: 100%;
+	height: 100%;
+}
+
+.master-rev-link {
+	display: inline-flex;
+	align-items: center;
+	margin-bottom: 20rpx;
+}
+
+.rev-link-txt {
+	font-size: 24rpx;
 	color: #F0710D;
+	font-weight: 600;
+}
+
+.m-sub-row, .q-meta-row {
+	display: inline-flex;
+	align-items: center;
+	margin-top: 6rpx;
+}
+
+.q-meta-row {
+	margin-top: 0;
+	margin-left: 14rpx;
+}
+
+.inline-star-ico {
+	width: 24rpx;
+	height: 24rpx;
+	margin-right: 6rpx;
+	flex-shrink: 0;
 }
 
 .master-meta {
@@ -954,10 +1181,8 @@
 }
 
 .m-sub {
-	display: block;
 	font-size: 22rpx;
 	color: #888888;
-	margin-top: 6rpx;
 }
 
 .call-btn {
@@ -1068,7 +1293,6 @@
 .q-meta {
 	font-size: 22rpx;
 	color: #888888;
-	margin-left: 14rpx;
 }
 
 .q-amt {
@@ -1144,7 +1368,7 @@
 	right: 0;
 	background: rgba(0, 0, 0, 0.55);
 	color: #FFFFFF;
-	font-size: 20rpx;
+	font-size: 22rpx;
 	text-align: center;
 	padding: 4rpx 0;
 }
@@ -1438,7 +1662,7 @@
 }
 
 .rev-tag-pill {
-	font-size: 20rpx;
+	font-size: 22rpx;
 	color: #F0710D;
 	background: #FFF7F0;
 	padding: 4rpx 14rpx;
@@ -1446,7 +1670,7 @@
 }
 
 .rev-content-txt {
-	font-size: 25rpx;
+	font-size: 26rpx;
 	color: #444444;
 	line-height: 1.5;
 	display: block;
@@ -1484,4 +1708,95 @@
 	color: #F0710D;
 	font-weight: 600;
 }
+
+.invoice-entry-item {
+	margin-top: 12rpx;
+	padding-top: 16rpx;
+	border-top: 1rpx dashed #F0F0F2;
+}
+
+.invoice-entry-val {
+	display: flex;
+	align-items: center;
+}
+
+.inv-st-txt {
+	font-size: 24rpx;
+	font-weight: 600;
+	color: #F0710D;
+}
+
+.inv-st-issued {
+	color: #2FA84F;
+}
+
+.inv-arrow-ico {
+	width: 24rpx;
+	height: 24rpx;
+	margin-left: 4rpx;
+}
+
+.order-attach-sec {
+	margin: 20rpx 0 18rpx;
+	padding-top: 20rpx;
+	border-top: 1rpx solid #F0F0F2;
+}
+
+.attach-sec-title {
+	display: block;
+	font-size: 26rpx;
+	font-weight: 600;
+	color: #444444;
+	margin-bottom: 16rpx;
+}
+
+.video-attach-card {
+	background: #1F1F1F;
+}
+
+.video-attach-cover {
+	width: 100%;
+	height: 160rpx;
+	background: #2C2C2E;
+	border-radius: 12rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.va-play-ico {
+	width: 52rpx;
+	height: 52rpx;
+}
+
+.video-play-modal {
+	padding: 28rpx;
+}
+
+.vp-head {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 20rpx;
+}
+
+.vp-close {
+	width: 48rpx;
+	height: 48rpx;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+}
+
+.vp-close-ico {
+	width: 28rpx;
+	height: 28rpx;
+}
+
+.vp-player {
+	width: 100%;
+	height: 420rpx;
+	border-radius: 12rpx;
+	background: #000000;
+}
 </style>
diff --git a/yjyf-app/pages/order/goods-gallery.vue b/yjyf-app/pages/order/goods-gallery.vue
new file mode 100644
index 0000000..1ca779f
--- /dev/null
+++ b/yjyf-app/pages/order/goods-gallery.vue
@@ -0,0 +1,778 @@
+<template>
+	<view class="page">
+		<YjyfNavBar theme="orange" title="商品图库" />
+
+		<!-- 顶部搜索与管理切换栏 -->
+		<view class="top-toolbar">
+			<view class="search-box">
+				<image class="search-ico" src="/static/icons/search-gray.svg" mode="aspectFit" />
+				<input
+					class="search-input"
+					v-model="keyword"
+					placeholder="搜索我的商品图片名称"
+					confirm-type="search"
+					@confirm="fetchList"
+				/>
+				<view class="clear-btn clickable-hover" v-if="keyword" @tap="clearSearch">
+					<image class="clear-ico" src="/static/icons/close.svg" mode="aspectFit" />
+				</view>
+			</view>
+			<view
+				class="manage-btn clickable-hover"
+				v-if="hasDeletableItems"
+				:class="{ active: isManageMode }"
+				@tap="toggleManageMode"
+			>
+				<text class="manage-txt">{{ isManageMode ? '完成' : '管理' }}</text>
+			</view>
+		</view>
+
+		<!-- 类目筛选胶囊 -->
+		<view class="cat-filter-wrap" v-if="cats.length > 0">
+			<scroll-view class="cat-scroll" scroll-x="true" :show-scrollbar="false">
+				<view class="cat-inner">
+					<view
+						class="cat-chip clickable-hover"
+						:class="{ active: activeCatId === 0 }"
+						@tap="switchCat(0)"
+					>
+						<text class="cat-chip-txt">全部</text>
+					</view>
+					<view
+						class="cat-chip clickable-hover"
+						v-for="c in cats"
+						:key="c.id"
+						:class="{ active: Number(c.id) === Number(activeCatId) }"
+						@tap="switchCat(c.id)"
+					>
+						<text class="cat-chip-txt">{{ c.name }}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<!-- 主体内容区 -->
+		<scroll-view class="body-scroll" scroll-y="true">
+			<view class="state-box" v-if="loading && list.length === 0">
+				<text class="state-txt">正在加载商品图库...</text>
+			</view>
+
+			<view class="state-box" v-else-if="loadError && list.length === 0">
+				<image class="empty-img" src="/static/icons/empty-gallery.svg" mode="aspectFit" />
+				<text class="state-txt">{{ loadError }}</text>
+				<view class="retry-btn clickable-hover" @tap="fetchList">
+					<text class="retry-txt">重新加载</text>
+				</view>
+			</view>
+
+			<view class="state-box" v-else-if="filteredList.length === 0">
+				<image class="empty-img" src="/static/icons/empty-gallery.svg" mode="aspectFit" />
+				<text class="empty-title">暂无个人商品图库记录</text>
+				<text class="empty-sub">点击下方“上传新图”可将常用商品实拍图存入图库复用</text>
+			</view>
+
+			<view class="photo-grid" v-else>
+				<view
+					class="photo-card clickable-hover"
+					v-for="item in filteredList"
+					:key="item.id + '_' + item.image_url"
+					@tap="onCardTap(item)"
+				>
+					<view
+						class="photo-square"
+						:class="{
+							checked: isManageMode ? deleteIds.includes(item.id) : selectedUrls.includes(item.image_url),
+							readonly: isManageMode && !item.can_delete
+						}"
+					>
+						<image class="photo-img" :src="item.image_url" mode="aspectFill" lazy-load />
+
+						<!-- 来源角标（历史订单沉淀实拍图） -->
+						<view class="source-tag" v-if="item.source === 'order'">
+							<text class="source-txt">历史实拍</text>
+						</view>
+
+						<!-- 选择模式勾选框 -->
+						<view
+							class="check-corner"
+							v-if="!isManageMode && !isBrowseScene"
+							:class="{ on: selectedUrls.includes(item.image_url) }"
+						>
+							<image
+								class="check-ico"
+								:src="selectedUrls.includes(item.image_url) ? '/static/icons/check-white.svg' : '/static/icons/check-gray.svg'"
+								mode="aspectFit"
+							/>
+						</view>
+
+						<!-- 管理模式删除勾选框（仅个人上传图库可删） -->
+						<view
+							class="check-corner danger"
+							v-else-if="isManageMode && item.can_delete"
+							:class="{ on: deleteIds.includes(item.id) }"
+						>
+							<image
+								class="check-ico"
+								:src="deleteIds.includes(item.id) ? '/static/icons/check-white.svg' : '/static/icons/check-gray.svg'"
+								mode="aspectFit"
+							/>
+						</view>
+
+						<!-- 左下角高清预览 -->
+						<view class="zoom-badge" @tap.stop="previewPhoto(item.image_url)">
+							<image class="zoom-ico" src="/static/icons/zoom-white.svg" mode="aspectFit" />
+						</view>
+					</view>
+					<text class="photo-title">{{ item.title || '常用商品图' }}</text>
+				</view>
+			</view>
+		</scroll-view>
+
+		<!-- 底部固定操作栏 -->
+		<view class="bottom-bar" v-if="isManageMode">
+			<view
+				class="delete-batch-btn clickable-hover"
+				:class="{ disabled: deleting || deleteIds.length === 0 }"
+				@tap="handleBatchDelete"
+			>
+				<image class="del-ico" src="/static/icons/trash.svg" mode="aspectFit" />
+				<text class="del-txt">
+					{{ deleting ? '删除中...' : (deleteIds.length > 0 ? `删除选中图片（${deleteIds.length}）` : '请勾选要删除的图库图片') }}
+				</text>
+			</view>
+		</view>
+		<view class="bottom-bar" v-else-if="isBrowseScene">
+			<view
+				class="confirm-btn clickable-hover"
+				:class="{ disabled: uploading }"
+				@tap="handleUploadNew"
+			>
+				<text class="confirm-txt">{{ uploading ? '上传中...' : '上传新商品图' }}</text>
+			</view>
+		</view>
+		<view class="bottom-bar dual" v-else>
+			<view
+				class="upload-btn clickable-hover"
+				:class="{ disabled: uploading }"
+				@tap="handleUploadNew"
+			>
+				<image class="up-ico" src="/static/icons/upload-orange.svg" mode="aspectFit" />
+				<text class="up-txt">{{ uploading ? '上传中...' : '上传新图' }}</text>
+			</view>
+			<view
+				class="confirm-btn clickable-hover"
+				:class="{ disabled: confirming }"
+				@tap="handleConfirm"
+			>
+				<text class="confirm-txt">
+					{{ selectedUrls.length > 0 ? `确定（已选 ${selectedUrls.length} 张）` : '确定' }}
+				</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+	import { isLogin, toLogin } from '@/utils/request.js';
+
+	const list = ref([]);
+	const cats = ref([]);
+	const activeCatId = ref(0);
+	const initOrderCatId = ref(0);
+	const keyword = ref('');
+	const maxCount = ref(9);
+
+	const selectedUrls = ref([]);
+	const isBrowseScene = ref(false);
+	const isManageMode = ref(false);
+	const deleteIds = ref([]);
+
+	const loading = ref(false);
+	const loadError = ref('');
+	const uploading = ref(false);
+	const deleting = ref(false);
+	const confirming = ref(false);
+
+	const hasDeletableItems = computed(() => {
+		return list.value.some(x => Number(x.can_delete) === 1);
+	});
+
+	const filteredList = computed(() => {
+		const kw = keyword.value.trim().toLowerCase();
+		if (!kw) return list.value;
+		return list.value.filter(x => String(x.title || '').toLowerCase().includes(kw));
+	});
+
+	async function fetchList() {
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		if (loading.value) return;
+		loading.value = true;
+		loadError.value = '';
+		try {
+			const res = await api.goodsGallery({
+				cat_id: activeCatId.value || 0,
+				keyword: keyword.value.trim()
+			});
+			list.value = (res && Array.isArray(res.list)) ? res.list : [];
+			if (res && Array.isArray(res.cats) && res.cats.length > 0) {
+				cats.value = res.cats;
+			}
+		} catch (e) {
+			loadError.value = (e && e.msg) ? e.msg : '获取商品图库失败';
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	function switchCat(cid) {
+		if (Number(cid) === Number(activeCatId.value)) return;
+		activeCatId.value = Number(cid);
+		deleteIds.value = [];
+		fetchList();
+	}
+
+	function clearSearch() {
+		keyword.value = '';
+		fetchList();
+	}
+
+	function toggleManageMode() {
+		isManageMode.value = !isManageMode.value;
+		deleteIds.value = [];
+	}
+
+	function onCardTap(item) {
+		if (!item || !item.image_url) return;
+		if (isManageMode.value) {
+			if (!item.can_delete) {
+				uni.showToast({ title: '历史订单实拍图无需删除', icon: 'none' });
+				return;
+			}
+			const pos = deleteIds.value.indexOf(item.id);
+			if (pos > -1) {
+				deleteIds.value.splice(pos, 1);
+			} else {
+				deleteIds.value.push(item.id);
+			}
+			return;
+		}
+		if (isBrowseScene.value) {
+			previewPhoto(item.image_url);
+			return;
+		}
+		const idx = selectedUrls.value.indexOf(item.image_url);
+		if (idx > -1) {
+			selectedUrls.value.splice(idx, 1);
+			return;
+		}
+		if (selectedUrls.value.length >= maxCount.value) {
+			uni.showToast({ title: `最多可选择 ${maxCount.value} 张商品图片`, icon: 'none' });
+			return;
+		}
+		selectedUrls.value.push(item.image_url);
+	}
+
+	function previewPhoto(url) {
+		const urls = filteredList.value.map(x => x.image_url).filter(Boolean);
+		uni.previewImage({
+			current: url,
+			urls: urls.length ? urls : [url]
+		});
+	}
+
+	function handleUploadNew() {
+		if (uploading.value) return;
+		uni.chooseImage({
+			count: Math.min(9, maxCount.value),
+			sourceType: ['album', 'camera'],
+			success: async (res) => {
+				if (!res.tempFilePaths || !res.tempFilePaths.length) return;
+				uploading.value = true;
+				uni.showLoading({ title: '上传入库中...', mask: true });
+				try {
+					const uploadedUrls = [];
+					for (const tempPath of res.tempFilePaths) {
+						const up = await api.upload(tempPath, 'order');
+						const u = up && (up.fullurl || up.url);
+						if (u) uploadedUrls.push(u);
+					}
+					if (uploadedUrls.length > 0) {
+						const saveRes = await api.saveGoodsGallery({
+							cat_id: activeCatId.value || initOrderCatId.value || 0,
+							images: JSON.stringify(uploadedUrls)
+						});
+						const savedList = (saveRes && Array.isArray(saveRes.list)) ? saveRes.list : [];
+						savedList.forEach(s => {
+							if (s.image_url && !selectedUrls.value.includes(s.image_url) && selectedUrls.value.length < maxCount.value) {
+								selectedUrls.value.push(s.image_url);
+							}
+						});
+						uni.showToast({ title: '已存入商品图库', icon: 'success' });
+						await fetchList();
+					}
+				} catch (e) {
+					uni.showToast({ title: (e && e.msg) ? e.msg : '上传入库失败', icon: 'none' });
+				} finally {
+					uploading.value = false;
+					uni.hideLoading();
+				}
+			}
+		});
+	}
+
+	function handleBatchDelete() {
+		if (deleting.value || deleteIds.value.length === 0) return;
+		uni.showModal({
+			title: '移除图库图片',
+			content: `确认从个人商品图库移除选中的 ${deleteIds.value.length} 张图片？`,
+			confirmColor: '#E8331B',
+			success: async (r) => {
+				if (!r.confirm || deleting.value) return;
+				deleting.value = true;
+				try {
+					const deletingUrls = list.value
+						.filter(x => deleteIds.value.includes(x.id))
+						.map(x => x.image_url);
+					await api.deleteGoodsGallery({ ids: deleteIds.value.join(',') });
+					selectedUrls.value = selectedUrls.value.filter(u => !deletingUrls.includes(u));
+					deleteIds.value = [];
+					isManageMode.value = false;
+					uni.showToast({ title: '已移除', icon: 'none' });
+					await fetchList();
+				} catch (e) {
+					uni.showToast({ title: (e && e.msg) ? e.msg : '移除失败', icon: 'none' });
+				} finally {
+					deleting.value = false;
+				}
+			}
+		});
+	}
+
+	function handleConfirm() {
+		if (confirming.value) return;
+		if (selectedUrls.value.length === 0) {
+			uni.showToast({ title: '请先勾选或上传商品图片', icon: 'none' });
+			return;
+		}
+		confirming.value = true;
+		const picked = [...selectedUrls.value];
+		uni.setStorageSync('yjyf_picked_gallery_images', picked);
+		uni.$emit('yjyf:selectGalleryImages', picked);
+		uni.navigateBack({
+			fail: () => {
+				confirming.value = false;
+				uni.redirectTo({ url: '/pages/order/quick' });
+			}
+		});
+	}
+
+	onLoad((options) => {
+		isBrowseScene.value = !!(options && options.scene === 'mine');
+		const cid = options && options.cat_id ? Number(options.cat_id) : 0;
+		const remainMax = options && options.max ? Number(options.max) : 9;
+		initOrderCatId.value = cid;
+		maxCount.value = Math.max(1, Math.min(9, remainMax || 9));
+		fetchList();
+	});
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		background-color: $yjyf-bg-page;
+	}
+
+	.top-toolbar {
+		flex-shrink: 0;
+		display: flex;
+		align-items: center;
+		gap: 20rpx;
+		padding: 18rpx 24rpx;
+		background-color: $yjyf-bg-card;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.search-box {
+		flex: 1;
+		height: 68rpx;
+		border-radius: $yjyf-radius-pill;
+		background-color: $yjyf-bg-page;
+		padding: 0 24rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.search-ico {
+		width: 30rpx;
+		height: 30rpx;
+		margin-right: 12rpx;
+		flex-shrink: 0;
+	}
+
+	.search-input {
+		flex: 1;
+		font-size: 26rpx;
+		color: $yjyf-text-main;
+	}
+
+	.clear-btn {
+		width: 44rpx;
+		height: 44rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.clear-ico {
+		width: 24rpx;
+		height: 24rpx;
+		opacity: 0.6;
+	}
+
+	.manage-btn {
+		height: 60rpx;
+		padding: 0 24rpx;
+		border-radius: $yjyf-radius-pill;
+		border: 1rpx solid $yjyf-border-color;
+		background-color: $yjyf-bg-card;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+	}
+
+	.manage-btn.active {
+		border-color: $yjyf-primary;
+		background-color: $yjyf-primary-bg;
+	}
+
+	.manage-txt {
+		font-size: 26rpx;
+		color: $yjyf-text-regular;
+	}
+
+	.manage-btn.active .manage-txt {
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	/* 类目筛选条 */
+	.cat-filter-wrap {
+		flex-shrink: 0;
+		background-color: $yjyf-bg-card;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.cat-scroll {
+		width: 100%;
+		white-space: nowrap;
+	}
+
+	.cat-inner {
+		display: inline-flex;
+		align-items: center;
+		flex-wrap: nowrap;
+		padding: 14rpx 24rpx;
+		gap: 16rpx;
+	}
+
+	.cat-chip {
+		height: 54rpx;
+		padding: 0 24rpx;
+		border-radius: $yjyf-radius-pill;
+		background-color: $yjyf-bg-page;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+		white-space: nowrap;
+	}
+
+	.cat-chip.active {
+		background-color: $yjyf-primary-bg;
+		border: 1rpx solid $yjyf-primary-border;
+	}
+
+	.cat-chip-txt {
+		font-size: 24rpx;
+		color: $yjyf-text-regular;
+		line-height: 1;
+		white-space: nowrap;
+	}
+
+	.cat-chip.active .cat-chip-txt {
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	/* 主体网格 */
+	.body-scroll {
+		flex: 1;
+		min-height: 0;
+	}
+
+	.state-box {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 160rpx 48rpx;
+		text-align: center;
+	}
+
+	.empty-img {
+		width: 240rpx;
+		height: 192rpx;
+		margin-bottom: 24rpx;
+	}
+
+	.empty-title {
+		font-size: 30rpx;
+		font-weight: 600;
+		color: $yjyf-text-main;
+		margin-bottom: 12rpx;
+	}
+
+	.empty-sub {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		line-height: 1.5;
+	}
+
+	.state-txt {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-secondary;
+	}
+
+	.retry-btn {
+		margin-top: 28rpx;
+		height: 68rpx;
+		padding: 0 40rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.retry-txt {
+		font-size: 26rpx;
+		color: $yjyf-text-inverse;
+	}
+
+	.photo-grid {
+		display: grid;
+		grid-template-columns: repeat(3, 1fr);
+		gap: 24rpx 18rpx;
+		padding: 24rpx;
+		box-sizing: border-box;
+	}
+
+	.photo-card {
+		display: flex;
+		flex-direction: column;
+		min-width: 0;
+	}
+
+	.photo-square {
+		position: relative;
+		width: 100%;
+		padding-top: 100%;
+		border-radius: $yjyf-radius-sm;
+		overflow: hidden;
+		background-color: $yjyf-bg-card;
+		border: 2rpx solid $yjyf-border-color;
+		box-sizing: border-box;
+	}
+
+	.photo-square.checked {
+		border-color: $yjyf-primary;
+	}
+
+	.photo-square.readonly {
+		opacity: 0.65;
+	}
+
+	.photo-img {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+	}
+
+	.source-tag {
+		position: absolute;
+		top: 8rpx;
+		left: 8rpx;
+		height: 36rpx;
+		padding: 0 12rpx;
+		border-radius: 6rpx;
+		background: rgba(0, 0, 0, 0.55);
+		display: flex;
+		align-items: center;
+		z-index: 2;
+	}
+
+	.source-txt {
+		font-size: 22rpx;
+		color: $yjyf-text-inverse;
+		line-height: 1;
+	}
+
+	.check-corner {
+		position: absolute;
+		top: 0;
+		right: 0;
+		width: 44rpx;
+		height: 44rpx;
+		background-color: $yjyf-bg-card;
+		border-left: 1rpx solid $yjyf-border-color;
+		border-bottom: 1rpx solid $yjyf-border-color;
+		border-bottom-left-radius: 10rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 2;
+	}
+
+	.check-corner.on {
+		background-color: $yjyf-primary;
+		border-color: $yjyf-primary;
+	}
+
+	.check-corner.danger.on {
+		background-color: $yjyf-danger;
+		border-color: $yjyf-danger;
+	}
+
+	.check-ico {
+		width: 26rpx;
+		height: 26rpx;
+	}
+
+	.zoom-badge {
+		position: absolute;
+		left: 8rpx;
+		bottom: 8rpx;
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 8rpx;
+		background: rgba(0, 0, 0, 0.38);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 2;
+	}
+
+	.zoom-ico {
+		width: 22rpx;
+		height: 22rpx;
+	}
+
+	.photo-title {
+		margin-top: 10rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		text-align: center;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	/* 底部按钮栏 */
+	.bottom-bar {
+		flex-shrink: 0;
+		background-color: $yjyf-bg-card;
+		border-top: 1rpx solid $yjyf-border-color;
+		padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom));
+		box-shadow: $yjyf-shadow-bar;
+	}
+
+	.bottom-bar.dual {
+		display: flex;
+		align-items: center;
+		gap: 20rpx;
+	}
+
+	.upload-btn {
+		width: 248rpx;
+		height: 88rpx;
+		border-radius: $yjyf-radius-sm;
+		border: 2rpx solid $yjyf-primary;
+		background-color: $yjyf-primary-bg;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 10rpx;
+		flex-shrink: 0;
+		box-sizing: border-box;
+	}
+
+	.up-ico {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.up-txt {
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-primary;
+	}
+
+	.confirm-btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-gradient-primary;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: $yjyf-shadow-button;
+	}
+
+	.confirm-txt {
+		font-size: 30rpx;
+		font-weight: 600;
+		color: $yjyf-text-inverse;
+	}
+
+	.delete-batch-btn {
+		height: 88rpx;
+		border-radius: $yjyf-radius-sm;
+		border: 2rpx solid $yjyf-danger;
+		background-color: $yjyf-bg-card;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 12rpx;
+	}
+
+	.del-ico {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.del-txt {
+		font-size: $yjyf-font-body;
+		font-weight: 600;
+		color: $yjyf-danger;
+	}
+
+	.disabled {
+		opacity: 0.55;
+	}
+
+	.clickable-hover:active {
+		opacity: 0.82;
+	}
+</style>
diff --git a/yjyf-app/pages/order/list.vue b/yjyf-app/pages/order/list.vue
index 0d26a02..b70fe82 100644
--- a/yjyf-app/pages/order/list.vue
+++ b/yjyf-app/pages/order/list.vue
@@ -9,16 +9,19 @@
 	import { onLoad } from '@dcloudio/uni-app';
 	import UserOrdersView from '@/components/user/UserOrdersView.vue';
 	import YjyfTabBar from '@/components/YjyfTabBar.vue';
+	import { setRole } from '@/utils/role.js';
 
 	onLoad(() => {
+		setRole('user');
 		// 自动平滑收敛到单母页 Tab 1
-		uni.redirectTo({
+		uni.reLaunch({
 			url: '/pages/index/index?tab=1'
 		});
 	});
 
 	function onSwitchTab(index) {
-		uni.redirectTo({
+		setRole('user');
+		uni.reLaunch({
 			url: `/pages/index/index?tab=${index}`
 		});
 	}
diff --git a/yjyf-app/pages/order/quick.vue b/yjyf-app/pages/order/quick.vue
index dff9f8a..3c2f906 100644
--- a/yjyf-app/pages/order/quick.vue
+++ b/yjyf-app/pages/order/quick.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<!-- 统一规范顶部固定橙色导航栏（对标图一及 frame_004/015/025 纯净单层导航，无多余步骤条与白线） -->
+		<!-- 统一规范顶部固定橙色导航栏 -->
 		<YjyfNavBar
 			theme="orange"
 			:title="currentStepTitle"
@@ -10,7 +10,7 @@
 			@back="handleNavBack"
 		/>
 
-		<!-- ==================== 步骤 1：添加商品 (1:1 对标图一 & frame_004, frame_007, frame_009) ==================== -->
+		<!-- ==================== 步骤 1：添加商品 ==================== -->
 		<view class="main-body" v-if="currentStep === 1">
 			<!-- 顶部常驻双行卡片：品类与下单模式 -->
 			<view class="top-service-card">
@@ -18,16 +18,16 @@
 				<view class="tsc-row">
 					<view class="tsc-left">
 						<view class="tsc-icon-wrap">
-							<image class="tsc-img" :src="currentCatIconUrl || '/static/icons/appliance.png'" mode="aspectFit" />
+							<image class="tsc-img" :src="currentCatIconUrl || '/static/icons/service-default.svg'" mode="aspectFit" />
 						</view>
-						<text class="tsc-title">{{ drawerCatName || '家电' }}</text>
+						<text class="tsc-title">{{ drawerCatName || '选择服务类目' }}</text>
 					</view>
 					<view class="tsc-btn clickable-hover" @tap="goToSelectCategory">
 						<text class="tsc-btn-txt">重新选择类目</text>
 					</view>
 				</view>
 
-				<!-- 第 2 行：当前下单模式（右上角贴边悬浮渐变角标“下单送券·慢必赔”） -->
+				<!-- 第 2 行：当前下单模式 -->
 				<view class="tsc-row no-border tsc-mode-row">
 					<view class="tsc-left">
 						<view class="tsc-icon-wrap">
@@ -39,13 +39,8 @@
 						</view>
 						<text class="tsc-title">{{ currentModeName }}</text>
 					</view>
-					<view class="tsc-mode-btn-group clickable-hover" @tap="showModeDrawer = true">
-						<view class="tsc-float-badge">
-							<text class="tsc-float-badge-txt">下单送券·慢必赔</text>
-						</view>
-						<view class="tsc-btn">
-							<text class="tsc-btn-txt">重新选择下单模式</text>
-						</view>
+					<view class="tsc-btn clickable-hover" @tap="showModeDrawer = true">
+						<text class="tsc-btn-txt">切换下单模式</text>
 					</view>
 				</view>
 
@@ -70,9 +65,6 @@
 								<view class="gc-tpl-btn">
 									<text class="gc-tpl-txt">商品模板</text>
 								</view>
-								<view class="gc-tpl-FloatTag" v-if="!g.item_name">
-									<text class="gc-tpl-tag-txt">支持多商品组合</text>
-								</view>
 							</view>
 						</view>
 						<view class="gc-meta">
@@ -85,7 +77,7 @@
 
 					<!-- 并排 3 个正方形虚线框（图片、视频、环境图）+ 右侧橙色问号 -->
 					<view class="media-upload-row">
-						<!-- 1. 添加图片（若已上传则直接内嵌展示首图与张数角标，对标 frame_007/014） -->
+						<!-- 1. 添加图片（最多 9 张，点击继续添加或打开媒体抽屉） -->
 						<view class="dash-card pic-dash clickable-hover" v-if="!(g.images && g.images.length)" @tap="openMediaDrawer(idx, 'image')">
 							<image class="dc-icon" src="/static/icons/add-img.svg" mode="aspectFit" />
 							<view class="dc-req-line">
@@ -93,40 +85,49 @@
 								<text class="dc-txt orange">添加图片</text>
 							</view>
 						</view>
-						<view class="dash-card filled-dash clickable-hover" v-else @tap="openMediaDrawer(idx, 'image')">
-							<image class="fd-img" :src="g.images[0]" mode="aspectFill" @tap.stop="previewImg(g.images, 0)" />
-							<view class="fd-del" @tap.stop="removeGroupImg(idx, 0)">×</view>
+						<view class="dash-card filled-dash clickable-hover" v-else @tap="onMainImageBoxTap(idx)">
+							<image class="fd-img" :src="g.images[0]" mode="aspectFill" />
+							<view class="fd-del" @tap.stop="removeGroupImg(idx, 0)">
+								<image class="fd-del-ico" src="/static/icons/media-del-white.svg" mode="aspectFit" />
+							</view>
 							<view class="fd-count-bar">
-								<text class="fd-count-txt">共{{ g.images.length }}张</text>
+								<text class="fd-count-txt">{{ g.images.length < 9 ? `共${g.images.length}/9张 · 添加` : '已满9张' }}</text>
 							</view>
 						</view>
 
-						<!-- 2. 安装视频（一口价模式下展示，报价模式下隐藏，1:1 对标视频 00:00 vs 00:14） -->
+						<!-- 2. 安装视频（一口价模式下展示，已上传支持点击播放预览） -->
 						<template v-if="priceType === 'fixed'">
 							<view class="dash-card video-dash clickable-hover" v-if="!(g.videos && g.videos.length)" @tap="pickVideo(idx)">
 								<image class="dc-icon" src="/static/icons/add-video.svg" mode="aspectFit" />
 								<text class="dc-txt gray">安装视频</text>
 								<text class="dc-sub gray">(非必填)</text>
 							</view>
-							<view class="dash-card filled-dash clickable-hover" v-else @tap="pickVideo(idx)">
+							<view class="dash-card filled-dash clickable-hover" v-else @tap="playVideo(g.videos[0].tempFilePath)">
 								<image class="fd-img" :src="g.videos[0].thumbTempFilePath || '/static/icons/add-video.svg'" mode="aspectFill" />
 								<view class="mp-play-badge">
 									<image class="mp-play-icon" src="/static/icons/play-white.svg" mode="aspectFit" />
 								</view>
-								<view class="fd-del" @tap.stop="removeGroupVideo(idx, 0)">×</view>
+								<view class="fd-del" @tap.stop="removeGroupVideo(idx, 0)">
+									<image class="fd-del-ico" src="/static/icons/media-del-white.svg" mode="aspectFit" />
+								</view>
+								<view class="fd-count-bar">
+									<text class="fd-count-txt">点击播放</text>
+								</view>
 							</view>
 
-							<!-- 3. 安装环境图 -->
+							<!-- 3. 安装环境图（最多 6 张） -->
 							<view class="dash-card env-dash clickable-hover" v-if="!(g.envImages && g.envImages.length)" @tap="openMediaDrawer(idx, 'env')">
 								<image class="dc-icon" src="/static/icons/add-env.svg" mode="aspectFit" />
 								<text class="dc-txt gray">安装环境图</text>
 								<text class="dc-sub gray">(非必填)</text>
 							</view>
-							<view class="dash-card filled-dash clickable-hover" v-else @tap="openMediaDrawer(idx, 'env')">
-								<image class="fd-img" :src="g.envImages[0]" mode="aspectFill" @tap.stop="previewImg(g.envImages, 0)" />
-								<view class="fd-del" @tap.stop="removeGroupEnvImg(idx, 0)">×</view>
+							<view class="dash-card filled-dash clickable-hover" v-else @tap="onEnvImageBoxTap(idx)">
+								<image class="fd-img" :src="g.envImages[0]" mode="aspectFill" />
+								<view class="fd-del" @tap.stop="removeGroupEnvImg(idx, 0)">
+									<image class="fd-del-ico" src="/static/icons/media-del-white.svg" mode="aspectFit" />
+								</view>
 								<view class="fd-count-bar">
-									<text class="fd-count-txt">共{{ g.envImages.length }}张</text>
+									<text class="fd-count-txt">{{ g.envImages.length < 6 ? `共${g.envImages.length}/6张` : '已满6张' }}</text>
 								</view>
 							</view>
 						</template>
@@ -137,6 +138,50 @@
 						</view>
 					</view>
 
+					<!-- 已选多张商品图与环境图横向预览管理条（支持任意单张预览与删除） -->
+					<view class="picked-thumbs-panel" v-if="(g.images && g.images.length > 0) || (priceType === 'fixed' && g.envImages && g.envImages.length > 0)">
+						<scroll-view class="thumbs-scroll" scroll-x="true" :show-scrollbar="false">
+							<view class="thumbs-track">
+								<view
+									class="thumb-chip"
+									v-for="(imgUrl, imgIdx) in (g.images || [])"
+									:key="'gimg_' + imgIdx + '_' + imgUrl"
+									@tap="previewImg(g.images, imgIdx)"
+								>
+									<image class="tc-img" :src="imgUrl" mode="aspectFill" />
+									<view class="tc-del" @tap.stop="removeGroupImg(idx, imgIdx)">
+										<image class="tc-del-ico" src="/static/icons/media-del-white.svg" mode="aspectFit" />
+									</view>
+									<view class="tc-tag">
+										<text class="tc-tag-txt">商品{{ imgIdx + 1 }}</text>
+									</view>
+								</view>
+								<view
+									class="thumb-chip env-chip"
+									v-for="(envUrl, envIdx) in (priceType === 'fixed' ? (g.envImages || []) : [])"
+									:key="'eimg_' + envIdx + '_' + envUrl"
+									@tap="previewImg(g.envImages, envIdx)"
+								>
+									<image class="tc-img" :src="envUrl" mode="aspectFill" />
+									<view class="tc-del" @tap.stop="removeGroupEnvImg(idx, envIdx)">
+										<image class="tc-del-ico" src="/static/icons/media-del-white.svg" mode="aspectFit" />
+									</view>
+									<view class="tc-tag env">
+										<text class="tc-tag-txt">环境{{ envIdx + 1 }}</text>
+									</view>
+								</view>
+								<view
+									class="thumb-add-btn clickable-hover"
+									v-if="(g.images || []).length < 9"
+									@tap="openMediaDrawer(idx, 'image')"
+								>
+									<image class="tab-plus-ico" src="/static/icons/plus-orange.svg" mode="aspectFit" />
+									<text class="tab-plus-txt">{{ (g.images || []).length }}/9</text>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+
 					<!-- 表单项列表：全部采用抽屉选择 -->
 					<view class="form-item-list">
 						<!-- ① 商品行：自填模式（其它类目或未检索到商品）下直接输入，常规品类下弹窗选择 -->
@@ -175,9 +220,13 @@
 							</view>
 							<view class="fr-stepper-group">
 								<view class="fr-stepper">
-									<view class="step-btn step-minus clickable-hover" :class="{ disabled: g.num <= 1 }" @tap="stepGroupNum(idx, -1)">-</view>
+									<view class="step-btn step-minus clickable-hover" :class="{ disabled: g.num <= 1 }" @tap="stepGroupNum(idx, -1)">
+										<image class="step-ico" src="/static/icons/step-minus.svg" mode="aspectFit" />
+									</view>
 									<view class="step-num-box">{{ g.num }}</view>
-									<view class="step-btn step-plus clickable-hover" @tap="stepGroupNum(idx, 1)">+</view>
+									<view class="step-btn step-plus clickable-hover" @tap="stepGroupNum(idx, 1)">
+										<image class="step-ico" src="/static/icons/step-plus.svg" mode="aspectFit" />
+									</view>
 								</view>
 								<text class="step-unit-txt">{{ g.unit || '个' }}</text>
 							</view>
@@ -245,7 +294,7 @@
 						<!-- 首次引导提示气泡（对标 frame_015） -->
 						<view class="ppc-guide-bubble" v-if="showStep2Tip" @tap.stop="showStep2Tip = false">
 							<text class="pgb-txt">请填写客户的姓名、手机号和地址，然后点击下一步</text>
-							<text class="pgb-close">×</text>
+							<image class="pgb-close-ico" src="/static/icons/close-orange.svg" mode="aspectFit" />
 						</view>
 						<view class="ppc-right-btns">
 							<view class="ppc-history-btn clickable-hover" @tap="openAddressBook">
@@ -295,24 +344,36 @@
 					<text class="sub-hint-txt">隐藏真实号码，防骚扰泄露</text>
 				</view>
 
-				<!-- 客户地址（省市区选择 + 师傅运力提示，对标 frame_015/018） -->
+				<!-- 客户地址（省市区选择 + 师傅运力提示） -->
 				<view class="form-row addr-col-row">
 					<view class="addr-top-line">
 						<view class="fr-label">
 							<text class="req-star">*</text>
 							<text class="label-txt">客户地址</text>
 						</view>
+						<!-- #ifdef MP-WEIXIN -->
 						<picker mode="region" :value="[form.province, form.city, form.district]" @change="onRegionChange">
 							<view class="region-picker-btn clickable-hover">
-								<text class="val-txt region-txt">{{ form.province }}-{{ form.city }}-{{ form.district }}</text>
+								<text class="val-txt region-txt" :class="{ placeholder: !form.province }">
+									{{ form.province ? `${form.province}-${form.city}-${form.district}` : '请选择省市区' }}
+								</text>
 								<image class="fr-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 							</view>
 						</picker>
+						<!-- #endif -->
+						<!-- #ifndef MP-WEIXIN -->
+						<view class="region-picker-btn clickable-hover" @tap="showRegionDrawer = true">
+							<text class="val-txt region-txt" :class="{ placeholder: !form.province }">
+								{{ form.province ? `${form.province}-${form.city}-${form.district}` : '请选择省市区' }}
+							</text>
+							<image class="fr-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
+						</view>
+						<!-- #endif -->
 					</view>
-					<!-- 师傅运力提示（1:1 复刻 frame_015） -->
-					<view class="master-capacity-hint">
+					<!-- 师傅运力提示（真实接口驱动，选定地区后展示） -->
+					<view class="master-capacity-hint" v-if="form.province && form.city">
 						<text class="mch-txt">该地区可提供{{ drawerCatName || '安装' }}服务的师傅共 </text>
-						<text class="mch-num">{{ currentDistrictMasterCount || 303 }}位</text>
+						<text class="mch-num">{{ currentDistrictMasterCount }}位</text>
 					</view>
 				</view>
 
@@ -330,7 +391,7 @@
 				<!-- 楼层与电梯 -->
 				<view class="form-row">
 					<view class="fr-label">
-						<text class="label-txt no-star">楼层</text>
+						<text class="label-txt no-star">楼层电梯</text>
 					</view>
 					<view class="elevator-radios">
 						<view class="el-radio clickable-hover" :class="{ on: form.has_elevator === 1 }" @tap="setElevator(1)">
@@ -344,6 +405,26 @@
 					</view>
 				</view>
 
+				<!-- 无电梯步梯层数步进器（实时联动计算步梯搬运费） -->
+				<view class="form-row" v-if="form.has_elevator === 0">
+					<view class="fr-label">
+						<text class="req-star">*</text>
+						<text class="label-txt">步梯楼层</text>
+					</view>
+					<view class="fr-stepper-group">
+						<view class="fr-stepper">
+							<view class="step-btn step-minus clickable-hover" :class="{ disabled: form.floor <= 2 }" @tap="stepFloor(-1)">
+								<image class="step-ico" src="/static/icons/step-minus.svg" mode="aspectFit" />
+							</view>
+							<view class="step-num-box">{{ form.floor }}</view>
+							<view class="step-btn step-plus clickable-hover" :class="{ disabled: form.floor >= 30 }" @tap="stepFloor(1)">
+								<image class="step-ico" src="/static/icons/step-plus.svg" mode="aspectFit" />
+							</view>
+						</view>
+						<text class="step-unit-txt">层</text>
+					</view>
+				</view>
+
 				<!-- 服务备注与常用模板抽屉入口 (对标 frame_018) -->
 				<view class="form-row no-border flex-col-start">
 					<view class="remark-head-row">
@@ -511,16 +592,16 @@
 				</view>
 			</view>
 
-			<!-- 商品列表清单卡片 (对标 frame_025) -->
+			<!-- 商品列表清单卡片 -->
 			<view class="confirm-goods-card">
 				<view class="cgc-item" v-for="(g, idx) in goodsList" :key="idx">
-					<view class="cgc-thumb-wrap" @tap="previewImg(g.images && g.images.length ? g.images : ['/static/icons/appliance.png'], 0)">
+					<view class="cgc-thumb-wrap" @tap="g.images && g.images.length ? previewImg(g.images, 0) : null">
 						<image
 							class="cgc-thumb"
-							:src="(g.images && g.images.length) ? g.images[0] : '/static/icons/appliance.png'"
-							mode="aspectFill"
+							:src="(g.images && g.images.length) ? g.images[0] : (currentCatIconUrl || '/static/icons/service-default.svg')"
+							:mode="(g.images && g.images.length) ? 'aspectFill' : 'aspectFit'"
 						/>
-						<view class="cgc-view-big">
+						<view class="cgc-view-big" v-if="g.images && g.images.length">
 							<text class="cvb-txt">查看大图</text>
 						</view>
 					</view>
@@ -588,13 +669,14 @@
 						<text class="cfc-label">加急服务费</text>
 						<text class="cfc-val">¥{{ amount.urgent_amount }}</text>
 					</view>
-					<view class="cfc-row clickable-hover" @tap="showFeeDrawer = true">
+					<view class="cfc-row clickable-hover" @tap="openCouponDrawer">
 						<view class="cfc-coupon-left">
 							<view class="cfc-quan-badge">券</view>
 							<text class="cfc-label">优惠券</text>
 						</view>
 						<view class="cfc-coupon-right">
-							<text class="cfc-discount-val">-¥{{ (amount && amount.discount_amount) || '0.00' }}</text>
+							<text class="cfc-discount-val" v-if="amount && Number(amount.discount_amount) > 0">-¥{{ amount.discount_amount }}</text>
+							<text class="cfc-coupon-placeholder" v-else>{{ selectedCoupon ? selectedCoupon.name : '选择可用优惠券' }}</text>
 							<image class="cfc-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 						</view>
 					</view>
@@ -620,7 +702,10 @@
 						<text class="cgc-check-label">如超过</text>
 						<text class="cgc-orange-txt" @tap.stop="pickAutoQuoteHours">{{ autoQuoteHours }}小时</text>
 						<text class="cgc-check-label">无法匹配合适师傅，自动换成报价订单</text>
-						<text class="cgc-set-link" @tap.stop="pickAutoQuoteHours">设置时长></text>
+						<view class="cgc-set-link-wrap" @tap.stop="pickAutoQuoteHours">
+							<text class="cgc-set-link">设置时长</text>
+							<image class="inline-link-arrow" src="/static/icons/arrow-right-orange.svg" mode="aspectFit" />
+						</view>
 					</view>
 				</view>
 				<view class="cgc-sub-hint">
@@ -628,23 +713,24 @@
 				</view>
 			</view>
 
-			<!-- 底部右侧“发布订单须知>”（对标 frame_028） -->
+			<!-- 底部右侧“发布订单须知”（对标 frame_028） -->
 			<view class="publish-notice-row" @tap="showPublishNotice">
-				<text class="pnr-txt">发布订单须知></text>
+				<text class="pnr-txt">发布订单须知</text>
+				<image class="pnr-arrow" src="/static/icons/arrow-right.svg" mode="aspectFit" />
 			</view>
 		</view>
 
 		<!-- ==================== 吸底操作栏（分步对应） ==================== -->
 		<!-- 步骤 1 吸底栏（1:1 复刻 frame_004 & frame_007） -->
 		<view class="step1-bottom-bar" v-if="currentStep === 1">
-			<!-- 顶部通栏橙红渐变优惠提示条（一口价且有优惠时展示，对标 frame_007） -->
+			<!-- 顶部通栏橙色渐变优惠提示条（一口价且有优惠时展示，对标 frame_007） -->
 			<view
 				class="step1-promo-banner clickable-hover"
 				v-if="priceType === 'fixed' && amount && Number(amount.discount_amount) > 0"
 				@tap="showFeeDrawer = true"
 			>
 				<text class="spb-txt">已使用优惠券，共减 ¥{{ amount.discount_amount }}（原价¥{{ amount.total_amount }}）</text>
-				<text class="spb-arrow">^</text>
+				<image class="spb-arrow-ico" src="/static/icons/chevron-up-white.svg" mode="aspectFit" />
 			</view>
 
 			<!-- 右对齐汇总区（1:1 复刻视频 00:00 报价模式显示“共1组商品”，一口价模式显示“共1组商品合计 ¥55.00”） -->
@@ -666,7 +752,8 @@
 
 			<view class="step1-action-row">
 				<view class="btn-add-more clickable-hover" @tap="handleAddMoreGoods">
-					<text class="bam-txt">+ 继续添加商品</text>
+					<image class="bam-plus-ico" src="/static/icons/plus-orange.svg" mode="aspectFit" />
+					<text class="bam-txt">继续添加商品</text>
 				</view>
 				<view class="btn-step-next clickable-hover" @tap="goStep2">
 					<text class="bsn-txt">下一步</text>
@@ -804,14 +891,52 @@
 			@select="handleModeSelect"
 		/>
 
-		<!-- 10. 图片/媒体操作选择抽屉 (1:1 对标 frame_012) -->
+		<!-- 10. 图片/媒体操作选择抽屉 -->
 		<MediaActionDrawer
 			:visible="showMediaDrawer"
+			:media-type="mediaTargetType"
 			@update:visible="showMediaDrawer = $event"
 			@select="handleMediaActionSelect"
 		/>
 
-		<!-- 11. 切换一口价下单模式冲突确认弹窗（1:1 复刻视频 01:08 - 01:20） -->
+		<!-- 10b. 常用商品模板抽屉 -->
+		<GoodsTemplateDrawer
+			:visible="showGoodsTplDrawer"
+			:cat-id="drawerCatId"
+			:cat-name="drawerCatName"
+			:group-index="editingGroupIndex"
+			:current-group="goodsList[editingGroupIndex] || null"
+			@update:visible="showGoodsTplDrawer = $event"
+			@apply="handleApplyGoodsTemplate"
+		/>
+
+		<!-- 11. 优惠券选择抽屉 -->
+		<CouponPickerDrawer
+			:visible="showCouponDrawer"
+			:current-id="selectedCoupon ? selectedCoupon.id : 0"
+			:order-total="amount ? amount.total_amount : 0"
+			@update:visible="showCouponDrawer = $event"
+			@select="handleCouponSelect"
+		/>
+
+		<!-- 12. 服务地址选择抽屉 -->
+		<AddressPickerDrawer
+			:visible="showAddressDrawer"
+			@update:visible="showAddressDrawer = $event"
+			@select="applySelectedAddress"
+		/>
+
+		<!-- 13. 省市区级联选择抽屉（H5端通用支持） -->
+		<RegionPickerDrawer
+			:visible="showRegionDrawer"
+			:province="form.province"
+			:city="form.city"
+			:district="form.district"
+			@update:visible="showRegionDrawer = $event"
+			@confirm="handleRegionDrawerConfirm"
+		/>
+
+		<!-- 14. 切换一口价下单模式冲突确认弹窗（1:1 复刻视频 01:08 - 01:20） -->
 		<view class="mode-conflict-mask" v-if="showModeConflictModal" @tap="showModeConflictModal = false">
 			<view class="mode-conflict-dialog" @tap.stop>
 				<view class="mcd-body">
@@ -828,17 +953,31 @@
 				</view>
 			</view>
 		</view>
+
+		<!-- 15. 安装视频全屏播放预览弹窗 -->
+		<view class="video-modal-mask" v-if="previewVideoUrl" @tap="previewVideoUrl = ''">
+			<view class="video-modal-box" @tap.stop>
+				<view class="vm-head">
+					<text class="vm-title">安装视频预览</text>
+					<view class="vm-close clickable-hover" @tap="previewVideoUrl = ''">
+						<image class="vm-close-ico" src="/static/icons/close.svg" mode="aspectFit" />
+					</view>
+				</view>
+				<video class="vm-player" :src="previewVideoUrl" controls autoplay />
+			</view>
+		</view>
 	</view>
 </template>
 
 <script setup>
 	import { ref, reactive, computed } from 'vue';
-	import { onLoad, onShow } from '@dcloudio/uni-app';
+	import { onLoad, onShow, onUnload } from '@dcloudio/uni-app';
 	import api from '@/utils/api.js';
 	import { isLogin, toLogin } from '@/utils/request.js';
 
 	// 引入所有抽屉组件
 	import GoodsPickerDrawer from '@/components/GoodsPickerDrawer.vue';
+	import GoodsTemplateDrawer from '@/components/GoodsTemplateDrawer.vue';
 	import ServiceTypeDrawer from '@/components/ServiceTypeDrawer.vue';
 	import AddonServiceDrawer from '@/components/AddonServiceDrawer.vue';
 	import AppointTimeDrawer from '@/components/AppointTimeDrawer.vue';
@@ -848,6 +987,9 @@
 	import FeeDetailDrawer from '@/components/FeeDetailDrawer.vue';
 	import ModePickerDrawer from '@/components/ModePickerDrawer.vue';
 	import MediaActionDrawer from '@/components/MediaActionDrawer.vue';
+	import CouponPickerDrawer from '@/components/CouponPickerDrawer.vue';
+	import AddressPickerDrawer from '@/components/AddressPickerDrawer.vue';
+	import RegionPickerDrawer from '@/components/RegionPickerDrawer.vue';
 
 	// 流程步骤控制：1: 添加商品, 2: 客户信息, 3: 确认订单
 	const currentStep = ref(1);
@@ -902,7 +1044,7 @@
 		if (mode === 'fixed' && priceType.value !== 'fixed') {
 			const unsupported = goodsList.value.filter(g => {
 				if (!g.item_name && !g.custom_name) return false;
-				if (g.is_custom || isOtherCategory.value) return true;
+				if (g.is_custom || isOtherCategory.value || g.service_price_type === 'quote') return true;
 				const curType = (g.service_types || []).find(st => st.code === g.service_type);
 				const price = curType ? curType.price : g.base_price;
 				const flag = curType ? curType.support_fixed : undefined;
@@ -923,7 +1065,7 @@
 		priceType.value = 'fixed';
 		// 移除不支持一口价的商品，若全部不支持则保留1组空待选状态（1:1 复刻视频 01:19 - 01:20）
 		const supported = goodsList.value.filter(g => {
-			if (g.is_custom || isOtherCategory.value) return false;
+			if (g.is_custom || isOtherCategory.value || g.service_price_type === 'quote') return false;
 			const curType = (g.service_types || []).find(st => st.code === g.service_type);
 			const price = curType ? curType.price : g.base_price;
 			const flag = curType ? curType.support_fixed : undefined;
@@ -1019,10 +1161,62 @@
 		}
 	}
 
+	const showGoodsTplDrawer = ref(false);
+
 	function openGoodsTemplate(idx) {
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
 		editingGroupIndex.value = idx;
-		isEditingGroup.value = true;
-		showGoodsDrawer.value = true;
+		showGoodsTplDrawer.value = true;
+	}
+
+	function handleApplyGoodsTemplate(tpl) {
+		if (!tpl) return;
+		const targetIdx = editingGroupIndex.value;
+		const prev = goodsList.value[targetIdx] || {};
+		const copiedExtras = Array.isArray(tpl.extras)
+			? tpl.extras.map(ex => ({ ...ex }))
+			: [];
+		const tplImages = Array.isArray(tpl.images) ? [...tpl.images] : [];
+		const mergedImages = tplImages.length > 0 ? tplImages.slice(0, 9) : (prev.images || []);
+
+		const nextGroup = {
+			service_id: tpl.service_id || 0,
+			item_name: tpl.item_name || '',
+			spec_id: tpl.spec_id || 0,
+			spec_name: tpl.spec_name || tpl.item_name || '',
+			cat_id: tpl.cat_id || drawerCatId.value,
+			cat_name: tpl.cat_name || drawerCatName.value,
+			unit: tpl.unit || '个',
+			service_price_type: tpl.price_type || 'fixed',
+			base_price: Number(tpl.base_price) || 0,
+			num: Math.max(1, Number(tpl.num) || 1),
+			service_type: tpl.service_type || 'install',
+			service_type_name: tpl.service_type_name || '安装',
+			service_types: Array.isArray(tpl.service_types) && tpl.service_types.length ? tpl.service_types : (prev.service_types || []),
+			is_custom: !!tpl.is_custom,
+			custom_name: tpl.custom_name || (tpl.is_custom ? tpl.item_name : ''),
+			remark: tpl.remark || '',
+			images: mergedImages,
+			videos: prev.videos || [],
+			envImages: prev.envImages || [],
+			extras: copiedExtras
+		};
+
+		if (tpl.cat_id) drawerCatId.value = Number(tpl.cat_id);
+		if (tpl.cat_name) drawerCatName.value = tpl.cat_name;
+		if (tpl.cat_icon_url) currentCatIconUrl.value = tpl.cat_icon_url;
+
+		if ((tpl.is_custom || tpl.price_type === 'quote' || Number(tpl.base_price) <= 0) && priceType.value === 'fixed') {
+			priceType.value = 'quote';
+		}
+
+		goodsList.value[targetIdx] = nextGroup;
+		scheduleCalc();
+		fetchMasterCount();
+		uni.showToast({ title: '已套用商品模板', icon: 'success' });
 	}
 
 	function canShowAddonRow(g) {
@@ -1136,6 +1330,7 @@
 			cat_id: spec.cat_id || drawerCatId.value,
 			cat_name: spec.cat_name || drawerCatName.value,
 			unit: spec.unit || '个',
+			service_price_type: spec.price_type || 'fixed',
 			base_price: Number(spec.base_price) || Number(defType.price) || 0,
 			num: 1,
 			service_type: defType.code,
@@ -1148,6 +1343,11 @@
 			extras: extras
 		};
 
+		if (spec.price_type === 'quote' && priceType.value === 'fixed') {
+			priceType.value = 'quote';
+			uni.showToast({ title: '该商品为师傅报价项目，已切换为报价模式', icon: 'none' });
+		}
+
 		if (isEditingGroup.value) {
 			goodsList.value[editingGroupIndex.value] = { ...goodsList.value[editingGroupIndex.value], ...newGroup };
 		} else {
@@ -1247,7 +1447,9 @@
 
 	// 4. 期望上门时间抽屉
 	const showAppointDrawer = ref(false);
-	const today = new Date().toISOString().slice(0, 10);
+	const _nowDate = new Date();
+	const _pad2 = (n) => (n < 10 ? '0' + n : '' + n);
+	const today = `${_nowDate.getFullYear()}-${_pad2(_nowDate.getMonth() + 1)}-${_pad2(_nowDate.getDate())}`;
 	const appointDate = ref(today);
 	const appointSlot = ref('晚上');
 	const appointDisplay = computed(() => {
@@ -1306,9 +1508,10 @@
 		return total.toFixed(2);
 	});
 
-	// 9. 媒体选择抽屉（支持相册、拍照、从商品图库/系统图库中选择默认图，对标 frame_012）
+	// 9. 媒体选择抽屉（支持相册、拍照、从商品图库中选择、从系统图库中选择真实商品图）
 	const showMediaDrawer = ref(false);
 	const mediaTargetType = ref('image'); // 'image' or 'env'
+	const previewVideoUrl = ref('');
 
 	function openMediaDrawer(idx, type) {
 		editingGroupIndex.value = idx;
@@ -1316,18 +1519,74 @@
 		showMediaDrawer.value = true;
 	}
 
+	function onMainImageBoxTap(idx) {
+		const g = goodsList.value[idx];
+		if (g && Array.isArray(g.images) && g.images.length >= 9) {
+			previewImg(g.images, 0);
+			return;
+		}
+		openMediaDrawer(idx, 'image');
+	}
+
+	function onEnvImageBoxTap(idx) {
+		const g = goodsList.value[idx];
+		if (g && Array.isArray(g.envImages) && g.envImages.length >= 6) {
+			previewImg(g.envImages, 0);
+			return;
+		}
+		openMediaDrawer(idx, 'env');
+	}
+
+	function playVideo(url) {
+		if (!url) return;
+		previewVideoUrl.value = url;
+	}
+
+	function applyPickedGalleryImages(urls) {
+		if (!Array.isArray(urls) || urls.length === 0) return;
+		const idx = editingGroupIndex.value;
+		const g = goodsList.value[idx];
+		if (!g) return;
+		if (!Array.isArray(g.images)) g.images = [];
+		urls.forEach((u) => {
+			if (typeof u === 'string' && u.trim() && !g.images.includes(u.trim()) && g.images.length < 9) {
+				g.images.push(u.trim());
+			}
+		});
+	}
+
 	function handleMediaActionSelect(sourceType) {
 		const idx = editingGroupIndex.value;
 		const g = goodsList.value[idx];
-		if (sourceType === 'goods_default' || sourceType === 'system_default') {
-			const defaultImg = currentCatIconUrl.value || '/static/icons/appliance.png';
-			if (mediaTargetType.value === 'image') {
-				if (!g.images) g.images = [];
-				g.images.push(defaultImg);
-			} else {
-				if (!g.envImages) g.envImages = [];
-				g.envImages.push(defaultImg);
+		if (!g) return;
+		const curLen = Array.isArray(g.images) ? g.images.length : 0;
+		const remain = 9 - curLen;
+
+		if (sourceType === 'system_default') {
+			if (remain <= 0) {
+				uni.showToast({ title: '最多可添加9张商品图片', icon: 'none' });
+				return;
 			}
+			const cid = g.cat_id || drawerCatId.value || 0;
+			const sid = g.service_id || 0;
+			uni.navigateTo({
+				url: `/pages/order/system-gallery?cat_id=${cid}&service_id=${sid}&max=${remain}`
+			});
+			return;
+		}
+		if (sourceType === 'goods_default') {
+			if (!isLogin()) {
+				toLogin();
+				return;
+			}
+			if (remain <= 0) {
+				uni.showToast({ title: '最多可添加9张商品图片', icon: 'none' });
+				return;
+			}
+			const cid = g.cat_id || drawerCatId.value || 0;
+			uni.navigateTo({
+				url: `/pages/order/goods-gallery?cat_id=${cid}&max=${remain}`
+			});
 			return;
 		}
 		if (mediaTargetType.value === 'image') {
@@ -1337,10 +1596,13 @@
 		}
 	}
 
+	const uploadingMediaCount = ref(0);
+
 	function uploadGroupMedia(idx, kind, sourceType) {
+		if (uploadingMediaCount.value > 0) return;
 		const g = goodsList.value[idx];
 		const currentCount = kind === 'image' ? (g.images?.length || 0) : (g.envImages?.length || 0);
-		const maxCount = kind === 'image' ? 4 : 3;
+		const maxCount = kind === 'image' ? 9 : 6;
 		if (currentCount >= maxCount) {
 			uni.showToast({ title: `最多上传${maxCount}张`, icon: 'none' });
 			return;
@@ -1349,36 +1611,58 @@
 			count: maxCount - currentCount,
 			sourceType: [sourceType],
 			success: async (res) => {
-				for (const tempPath of res.tempFilePaths) {
-					uni.showLoading({ title: '上传中...' });
-					try {
+				uploadingMediaCount.value++;
+				uni.showLoading({ title: '上传中...', mask: true });
+				const uploadedGoodsUrls = [];
+				try {
+					for (const tempPath of res.tempFilePaths) {
 						const up = await api.upload(tempPath, 'order');
 						const imgUrl = up.fullurl || up.url;
 						if (imgUrl) {
 							if (kind === 'image') {
 								if (!g.images) g.images = [];
-								g.images.push(imgUrl);
+								if (g.images.length < maxCount && !g.images.includes(imgUrl)) {
+									g.images.push(imgUrl);
+									uploadedGoodsUrls.push(imgUrl);
+								}
 							} else {
 								if (!g.envImages) g.envImages = [];
-								g.envImages.push(imgUrl);
+								if (g.envImages.length < maxCount && !g.envImages.includes(imgUrl)) {
+									g.envImages.push(imgUrl);
+								}
 							}
 						}
-					} catch (e) {
-					} finally {
-						uni.hideLoading();
 					}
+					if (kind === 'image' && uploadedGoodsUrls.length > 0 && isLogin()) {
+						try {
+							await api.saveGoodsGallery({
+								cat_id: g.cat_id || drawerCatId.value || 0,
+								title: g.item_name || g.custom_name || drawerCatName.value || '商品实拍',
+								images: JSON.stringify(uploadedGoodsUrls)
+							});
+						} catch (syncErr) {
+							console.warn('sync goods gallery skipped:', syncErr);
+						}
+					}
+				} catch (e) {
+					uni.showToast({ title: (e && e.msg) ? e.msg : '图片上传失败', icon: 'none' });
+				} finally {
+					uploadingMediaCount.value = Math.max(0, uploadingMediaCount.value - 1);
+					uni.hideLoading();
 				}
 			}
 		});
 	}
 
 	function pickVideo(idx) {
+		if (uploadingMediaCount.value > 0) return;
 		uni.chooseVideo({
 			sourceType: ['album', 'camera'],
 			maxDuration: 60,
 			camera: 'back',
 			success: async (res) => {
-				uni.showLoading({ title: '视频上传中...' });
+				uploadingMediaCount.value++;
+				uni.showLoading({ title: '视频上传中...', mask: true });
 				try {
 					const up = await api.upload(res.tempFilePath, 'order');
 					const videoUrl = up.fullurl || up.url;
@@ -1390,7 +1674,9 @@
 						});
 					}
 				} catch (e) {
+					uni.showToast({ title: (e && e.msg) ? e.msg : '视频上传失败', icon: 'none' });
 				} finally {
+					uploadingMediaCount.value = Math.max(0, uploadingMediaCount.value - 1);
 					uni.hideLoading();
 				}
 			}
@@ -1411,14 +1697,14 @@
 		});
 	}
 
-	// 客户信息表单
+	// 客户信息表单（严禁硬编码默认省市区，优先回填用户真实默认收货地址）
 	const form = reactive({
 		contact: '',
 		mobile: '',
 		use_virtual: true,
-		province: '贵州省',
-		city: '贵阳市',
-		district: '南明区',
+		province: '',
+		city: '',
+		district: '',
 		address: '',
 		has_elevator: 1,
 		floor: 1,
@@ -1528,9 +1814,29 @@
 		} catch (e) {}
 	}
 
-	const currentDistrictMasterCount = ref(303);
+	const currentDistrictMasterCount = ref(0);
+	const showRegionDrawer = ref(false);
+	const showAddressDrawer = ref(false);
+	const showCouponDrawer = ref(false);
+	const selectedCoupon = ref(null);
+
+	async function initDefaultCustomerAddress() {
+		if (!isLogin()) return;
+		try {
+			const res = await api.addressList();
+			const list = (res && res.list) ? res.list : [];
+			if (list.length > 0 && !form.contact && !form.address) {
+				const defAddr = list.find(a => Number(a.is_default) === 1) || list[0];
+				applySelectedAddress(defAddr);
+			}
+		} catch (e) {}
+	}
 
 	async function fetchMasterCount() {
+		if (!form.province || !form.city) {
+			currentDistrictMasterCount.value = 0;
+			return;
+		}
 		try {
 			const res = await api.masterCount({
 				province: form.province,
@@ -1538,8 +1844,8 @@
 				district: form.district,
 				cat_id: drawerCatId.value
 			});
-			if (res && res.count) {
-				currentDistrictMasterCount.value = res.count;
+			if (res && res.count !== undefined) {
+				currentDistrictMasterCount.value = Number(res.count) || 0;
 			}
 		} catch (e) {}
 	}
@@ -1555,8 +1861,27 @@
 		}
 	}
 
+	function handleRegionDrawerConfirm(reg) {
+		if (!reg) return;
+		form.province = reg.province;
+		form.city = reg.city;
+		form.district = reg.district;
+		fetchMasterCount();
+		scheduleCalc();
+	}
+
 	function setElevator(val) {
 		form.has_elevator = val;
+		if (val === 0 && Number(form.floor) < 2) {
+			form.floor = 3;
+		}
+		scheduleCalc();
+	}
+
+	function stepFloor(delta) {
+		const next = Math.min(30, Math.max(2, (Number(form.floor) || 2) + delta));
+		if (next === form.floor) return;
+		form.floor = next;
 		scheduleCalc();
 	}
 
@@ -1608,33 +1933,40 @@
 		uni.showToast({ title: '地址识别完成' });
 	}
 
-	async function openAddressBook() {
-		try {
-			const res = await api.addressList();
-			const list = res.list || [];
-			if (!list.length) {
-				uni.showToast({ title: '暂无保存的地址', icon: 'none' });
-				return;
-			}
-			uni.showActionSheet({
-				itemList: list.map(a => `${a.contact} (${a.city}${a.district}${a.address})`.slice(0, 20)),
-				success: (r) => {
-					const hit = list[r.tapIndex];
-					if (hit) {
-						form.contact = hit.contact;
-						form.mobile = hit.mobile;
-						form.province = hit.province;
-						form.city = hit.city;
-						form.district = hit.district;
-						form.address = hit.address;
-						form.floor = Number(hit.floor) || 1;
-						form.has_elevator = Number(hit.has_elevator) || 1;
-						fetchMasterCount();
-						scheduleCalc();
-					}
-				}
-			});
-		} catch (e) {}
+	function applySelectedAddress(hit) {
+		if (!hit) return;
+		form.contact = hit.contact || '';
+		form.mobile = hit.mobile || '';
+		if (hit.province) form.province = hit.province;
+		if (hit.city) form.city = hit.city;
+		if (hit.district) form.district = hit.district;
+		form.address = hit.address || '';
+		form.floor = Number(hit.floor) || 1;
+		form.has_elevator = (hit.has_elevator !== undefined && hit.has_elevator !== null && hit.has_elevator !== '') ? Number(hit.has_elevator) : 1;
+		showStep2Tip.value = false;
+		fetchMasterCount();
+		scheduleCalc();
+	}
+
+	function openAddressBook() {
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		showAddressDrawer.value = true;
+	}
+
+	function openCouponDrawer() {
+		if (!isLogin()) {
+			toLogin();
+			return;
+		}
+		showCouponDrawer.value = true;
+	}
+
+	function handleCouponSelect(coupon) {
+		selectedCoupon.value = coupon || null;
+		calc();
 	}
 
 	// 附加服务与加急
@@ -1690,9 +2022,13 @@
 				floor: form.floor,
 				has_elevator: form.has_elevator,
 				urgent: isUrgent.value ? 1 : 0,
+				coupon_id: (priceType.value === 'fixed' && selectedCoupon.value) ? selectedCoupon.value.id : 0,
 				goods_list: JSON.stringify(goodsList.value)
 			});
 			amount.value = res;
+			if (selectedCoupon.value && priceType.value === 'fixed' && (!res || !res.coupon)) {
+				selectedCoupon.value = null;
+			}
 		} catch (e) {}
 	}
 
@@ -1722,6 +2058,10 @@
 				uni.showToast({ title: `第 ${i + 1} 组尚未选择商品`, icon: 'none' });
 				return;
 			}
+			if (!g.images || g.images.length === 0) {
+				uni.showToast({ title: `请为第 ${i + 1} 组添加商品图片`, icon: 'none' });
+				return;
+			}
 		}
 		currentStep.value = 2;
 		fetchMasterCount();
@@ -1736,6 +2076,10 @@
 			uni.showToast({ title: '请填写正确的11位客户手机号', icon: 'none' });
 			return;
 		}
+		if (!form.province || !form.city || !form.district) {
+			uni.showToast({ title: '请选择客户所在省市区', icon: 'none' });
+			return;
+		}
 		if (!form.address) {
 			uni.showToast({ title: '请填写详细地址', icon: 'none' });
 			return;
@@ -1750,7 +2094,12 @@
 	async function confirmSubmitAndPay() {
 		if (!isLogin()) { toLogin(); return; }
 		if (submitting.value) return;
+		if (uploadingMediaCount.value > 0) {
+			uni.showToast({ title: '图片或视频正在上传中，请稍候', icon: 'none' });
+			return;
+		}
 		submitting.value = true;
+		let createdOrderId = 0;
 		try {
 			let appointTimeStr = '14:30:00';
 			if (appointSlot.value && appointSlot.value.indexOf('上午') > -1) appointTimeStr = '10:00:00';
@@ -1758,9 +2107,10 @@
 			else if (appointSlot.value && appointSlot.value.indexOf('晚上') > -1) appointTimeStr = '19:00:00';
 			else appointTimeStr = '10:00:00';
 
-			let targetTime = Math.floor(new Date(`${appointDate.value} ${appointTimeStr}`).getTime() / 1000);
+			const safeDateStr = String(appointDate.value || today).replace(/-/g, '/');
+			let targetTime = Math.floor(new Date(`${safeDateStr} ${appointTimeStr}`).getTime() / 1000);
 			const now = Math.floor(Date.now() / 1000);
-			if (targetTime <= now) {
+			if (isNaN(targetTime) || targetTime <= now) {
 				targetTime = now + 3600;
 			}
 
@@ -1768,6 +2118,7 @@
 				service_id: goodsList.value[0]?.service_id || 1,
 				price_type: priceType.value,
 				user_price: priceType.value === 'custom' ? Number(userPrice.value) : 0,
+				coupon_id: (priceType.value === 'fixed' && selectedCoupon.value) ? selectedCoupon.value.id : 0,
 				contact: form.contact,
 				mobile: form.mobile,
 				province: form.province,
@@ -1777,6 +2128,8 @@
 				floor: form.floor,
 				has_elevator: form.has_elevator,
 				urgent: isUrgent.value ? 1 : 0,
+				use_virtual: form.use_virtual ? 1 : 0,
+				auto_quote_timeout: (priceType.value === 'fixed' && autoQuote.value) ? (Number(autoQuoteHours.value) || 24) * 3600 : 0,
 				appoint_time: targetTime,
 				remark: form.remark,
 				order_contact: `${form.order_contact_name} ${form.order_contact_mobile}`.trim(),
@@ -1790,21 +2143,30 @@
 				goods_list: JSON.stringify(goodsList.value)
 			});
 
+			createdOrderId = createRes.order_id;
 			if (priceType.value === 'quote') {
 				uni.showToast({ title: '报价单发布成功，等待师傅报价' });
 			} else {
 				await api.orderPay({
-					order_id: createRes.order_id,
+					order_id: createdOrderId,
 					pay_type: 'wxpay'
 				});
 				uni.showToast({ title: '下单成功，正在匹配师傅' });
 			}
 			setTimeout(() => {
-				uni.redirectTo({ url: `/pages/order/detail?id=${createRes.order_id}` });
+				submitting.value = false;
+				uni.redirectTo({ url: `/pages/order/detail?id=${createdOrderId}` });
 			}, 600);
 		} catch (e) {
-		} finally {
-			submitting.value = false;
+			if (createdOrderId) {
+				uni.showToast({ title: '订单已创建，请在详情页完成支付', icon: 'none' });
+				setTimeout(() => {
+					submitting.value = false;
+					uni.redirectTo({ url: `/pages/order/detail?id=${createdOrderId}` });
+				}, 600);
+			} else {
+				submitting.value = false;
+			}
 		}
 	}
 
@@ -1823,16 +2185,28 @@
 
 		let targetCatId = options && options.cat_id ? Number(options.cat_id) : 0;
 		let targetCatName = options && options.cat_name ? decodeURIComponent(options.cat_name) : '';
+		const targetServiceId = options && options.service_id ? Number(options.service_id) : 0;
+		const targetGoodsNum = options && options.goods_num ? Math.max(1, Number(options.goods_num) || 1) : 1;
+		const hasExplicitMode = !!(options && (options.mode || options.custom == 1));
 		if (options && options.mode === 'custom') priceType.value = 'custom';
 		if (options && (options.mode === 'quote' || options.custom == 1)) priceType.value = 'quote';
 
 		try {
+			if (targetServiceId > 0 && !targetCatId) {
+				try {
+					const detailRes = await api.serviceDetail(targetServiceId);
+					if (detailRes && detailRes.detail && detailRes.detail.cat_id) {
+						targetCatId = Number(detailRes.detail.cat_id);
+					}
+				} catch (e) {}
+			}
+
 			const resCats = await api.cats();
 			const cats = resCats && resCats.list ? resCats.list : [];
 			if (cats.length > 0) {
 				let matchedCat = null;
 				if (targetCatId) {
-					matchedCat = cats.find(c => c.id === targetCatId);
+					matchedCat = cats.find(c => Number(c.id) === targetCatId);
 				}
 				if (!matchedCat && targetCatName) {
 					matchedCat = cats.find(c => c.name === targetCatName || targetCatName.includes(c.name));
@@ -1848,7 +2222,9 @@
 					currentCatIconUrl.value = matchedCat.icon_url || '/uploads/icons/cat-more.svg';
 					priceType.value = 'quote';
 
-					goodsList.value = [buildOtherCategoryGroup()];
+					const otherGroup = buildOtherCategoryGroup();
+					otherGroup.num = targetGoodsNum;
+					goodsList.value = [otherGroup];
 					scheduleCalc();
 					fetchMasterCount();
 					return;
@@ -1861,7 +2237,7 @@
 				const sRes = await api.services({ cat_id: matchedCat.id });
 				const services = sRes && sRes.list ? sRes.list : [];
 				if (services.length > 0) {
-					const firstS = services[0];
+					const firstS = (targetServiceId > 0 ? services.find(s => Number(s.id) === targetServiceId) : null) || services[0];
 					const rawAddons = firstS.addons && firstS.addons.length ? firstS.addons : [];
 					const extras = rawAddons.map((ad, idx) => ({
 						id: ad.id || (idx + 1),
@@ -1885,6 +2261,10 @@
 						};
 					});
 
+					if (!hasExplicitMode && (firstS.price_type === 'quote' || effectivePrice <= 0)) {
+						priceType.value = 'quote';
+					}
+
 					goodsList.value = [
 						{
 							service_id: firstS.id,
@@ -1894,8 +2274,9 @@
 							cat_id: matchedCat.id,
 							cat_name: matchedCat.name,
 							unit: firstS.unit || '个',
+							service_price_type: firstS.price_type || 'fixed',
 							base_price: effectivePrice,
-							num: 1,
+							num: targetGoodsNum,
 							service_type: defType.code,
 							service_type_name: defType.name,
 							service_types: resolvedServiceTypes,
@@ -1914,11 +2295,24 @@
 	}
 
 	onLoad((options) => {
+		uni.$on('selectAddress', applySelectedAddress);
+		uni.$on('yjyf:selectGalleryImages', applyPickedGalleryImages);
 		loadRealCategoryAndServices(options);
 		initOrderContactFromProfile();
+		initDefaultCustomerAddress();
+	});
+
+	onUnload(() => {
+		uni.$off('selectAddress', applySelectedAddress);
+		uni.$off('yjyf:selectGalleryImages', applyPickedGalleryImages);
 	});
 
 	onShow(() => {
+		const pickedImgs = uni.getStorageSync('yjyf_picked_gallery_images');
+		if (pickedImgs && Array.isArray(pickedImgs) && pickedImgs.length > 0) {
+			uni.removeStorageSync('yjyf_picked_gallery_images');
+			applyPickedGalleryImages(pickedImgs);
+		}
 		const firstGoods = uni.getStorageSync('yjyf_first_goods');
 		if (firstGoods) {
 			goodsList.value = [firstGoods];
@@ -1929,6 +2323,11 @@
 			calc();
 			fetchMasterCount();
 		}
+		const pickedAddr = uni.getStorageSync('yjyf_selected_address');
+		if (pickedAddr) {
+			uni.removeStorageSync('yjyf_selected_address');
+			applySelectedAddress(pickedAddr);
+		}
 	});
 </script>
 
@@ -1936,7 +2335,7 @@
 	.page {
 		min-height: 100vh;
 		background: #F5F6F8;
-		padding-bottom: 280rpx;
+		padding-bottom: calc(360rpx + env(safe-area-inset-bottom));
 		box-sizing: border-box;
 	}
 
@@ -1945,12 +2344,13 @@
 		padding: 20rpx 20rpx;
 	}
 
-	/* ---------- 顶部品类与模式双行卡片（1:1 复刻图一 & frame_004） ---------- */
+	/* ---------- 顶部品类与模式双行卡片 ---------- */
 	.top-service-card {
 		background: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		padding: 0 24rpx;
 		margin-bottom: 20rpx;
+		box-shadow: 0 4rpx 20rpx rgba(31, 31, 31, 0.04);
 	}
 
 	.tsc-row {
@@ -1962,8 +2362,7 @@
 	}
 
 	.tsc-row.tsc-mode-row {
-		height: 132rpx;
-		padding-top: 8rpx;
+		height: 120rpx;
 	}
 
 	.tsc-row.no-border {
@@ -1998,32 +2397,6 @@
 		color: #1F1F1F;
 	}
 
-	.tsc-mode-btn-group {
-		position: relative;
-		display: inline-flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.tsc-float-badge {
-		background: linear-gradient(90deg, #FF9A3E 0%, #F0710D 100%);
-		height: 36rpx;
-		padding: 0 18rpx;
-		border-radius: 18rpx 18rpx 0 0;
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-		margin-bottom: -2rpx;
-		z-index: 1;
-	}
-
-	.tsc-float-badge-txt {
-		font-size: 20rpx;
-		color: #FFFFFF;
-		font-weight: 500;
-		line-height: 1;
-	}
-
 	.tsc-btn {
 		display: inline-flex;
 		align-items: center;
@@ -2031,8 +2404,8 @@
 		height: 58rpx;
 		padding: 0 22rpx;
 		background: #FFFFFF;
-		border: 1rpx solid #CCCCCC;
-		border-radius: 8rpx;
+		border: 1rpx solid #DCDCDC;
+		border-radius: 29rpx;
 		line-height: 1;
 	}
 
@@ -2086,8 +2459,9 @@
 
 	.group-card {
 		background: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		padding: 28rpx 24rpx 24rpx;
+		box-shadow: 0 4rpx 20rpx rgba(31, 31, 31, 0.04);
 	}
 
 	.gc-head {
@@ -2132,22 +2506,6 @@
 		line-height: 1;
 	}
 
-	.gc-tpl-FloatTag {
-		position: absolute;
-		top: -26rpx;
-		left: 88rpx;
-		background: #FFEAE5;
-		border-radius: 16rpx 16rpx 16rpx 4rpx;
-		padding: 4rpx 12rpx;
-		white-space: nowrap;
-	}
-
-	.gc-tpl-tag-txt {
-		font-size: 18rpx;
-		color: #E8331B;
-		line-height: 1;
-	}
-
 	.gc-meta {
 		display: flex;
 		align-items: center;
@@ -2218,13 +2576,15 @@
 		width: 36rpx;
 		height: 36rpx;
 		background: rgba(0, 0, 0, 0.55);
-		color: #FFFFFF;
-		font-size: 26rpx;
 		border-bottom-left-radius: 10rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		line-height: 1;
+	}
+
+	.fd-del-ico {
+		width: 22rpx;
+		height: 22rpx;
 	}
 
 	.fd-count-bar {
@@ -2240,7 +2600,7 @@
 	}
 
 	.fd-count-txt {
-		font-size: 20rpx;
+		font-size: 22rpx;
 		color: #FFFFFF;
 	}
 
@@ -2278,7 +2638,7 @@
 	}
 
 	.dc-sub {
-		font-size: 20rpx;
+		font-size: 22rpx;
 		color: #999999;
 		line-height: 1.1;
 	}
@@ -2456,13 +2816,16 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		font-size: 32rpx;
 		background: #FFFFFF;
-		color: #333333;
 	}
 
 	.step-btn.disabled {
-		color: #CCCCCC;
+		opacity: 0.4;
+	}
+
+	.step-ico {
+		width: 26rpx;
+		height: 26rpx;
 	}
 
 	.step-num-box {
@@ -2515,16 +2878,17 @@
 		text-align: right;
 	}
 
-	/* ---------- 步骤 2：客户信息卡片（1:1 复刻 frame_015, 018, 021） ---------- */
+	/* ---------- 步骤 2：客户信息卡片 ---------- */
 	.paste-parse-card {
 		background: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		padding: 20rpx;
 		margin-bottom: 20rpx;
+		box-shadow: 0 4rpx 20rpx rgba(31, 31, 31, 0.04);
 	}
 
 	.ppc-box {
-		background: #F5F5F5;
+		background: #F5F6F8;
 		border-radius: 12rpx;
 		padding: 20rpx;
 		position: relative;
@@ -2549,7 +2913,7 @@
 		display: inline-flex;
 		align-items: center;
 		gap: 10rpx;
-		background: #FFF3E8;
+		background: #FFF7F0;
 		border: 1rpx solid #FFD1A8;
 		border-radius: 8rpx;
 		padding: 8rpx 14rpx;
@@ -2557,15 +2921,15 @@
 	}
 
 	.pgb-txt {
-		font-size: 20rpx;
+		font-size: 22rpx;
 		color: #F0710D;
 		line-height: 1.3;
 	}
 
-	.pgb-close {
-		font-size: 24rpx;
-		color: #F0710D;
-		padding-left: 4rpx;
+	.pgb-close-ico {
+		width: 22rpx;
+		height: 22rpx;
+		flex-shrink: 0;
 	}
 
 	.ppc-right-btns {
@@ -2597,7 +2961,7 @@
 		justify-content: center;
 		height: 54rpx;
 		padding: 0 24rpx;
-		background: #2378FF;
+		background: #4A7CFF;
 		border-radius: 8rpx;
 	}
 
@@ -2631,7 +2995,7 @@
 		justify-content: center;
 		height: 54rpx;
 		padding: 0 26rpx;
-		background: #F0710D;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
 		border-radius: 8rpx;
 	}
 
@@ -2643,9 +3007,10 @@
 
 	.customer-card {
 		background: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		padding: 0 24rpx;
 		margin-bottom: 20rpx;
+		box-shadow: 0 4rpx 20rpx rgba(31, 31, 31, 0.04);
 	}
 
 	.sub-row {
@@ -2858,15 +3223,16 @@
 		transform: rotate(180deg);
 	}
 
-	/* ---------- 步骤 3：确认订单卡片（1:1 复刻 frame_025, 027, 028） ---------- */
+	/* ---------- 步骤 3：确认订单卡片 ---------- */
 	.confirm-addr-card {
 		background: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		padding: 28rpx 24rpx;
 		margin-bottom: 20rpx;
 		display: flex;
 		align-items: center;
 		gap: 20rpx;
+		box-shadow: 0 4rpx 20rpx rgba(31, 31, 31, 0.04);
 	}
 
 	.cac-icon-wrap {
@@ -2922,9 +3288,10 @@
 
 	.confirm-goods-card {
 		background: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		padding: 8rpx 24rpx;
 		margin-bottom: 20rpx;
+		box-shadow: 0 4rpx 20rpx rgba(31, 31, 31, 0.04);
 	}
 
 	.cgc-item {
@@ -2942,7 +3309,8 @@
 	.cgc-thumb-wrap {
 		width: 140rpx;
 		height: 140rpx;
-		border-radius: 10rpx;
+		border-radius: 12rpx;
+		background: #FFF7F0;
 		position: relative;
 		overflow: hidden;
 		flex-shrink: 0;
@@ -2964,7 +3332,7 @@
 	}
 
 	.cvb-txt {
-		font-size: 20rpx;
+		font-size: 22rpx;
 		color: #FFFFFF;
 	}
 
@@ -3009,9 +3377,10 @@
 
 	.confirm-extra-card {
 		background: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		padding: 24rpx;
 		margin-bottom: 20rpx;
+		box-shadow: 0 4rpx 20rpx rgba(31, 31, 31, 0.04);
 	}
 
 	.cec-head {
@@ -3066,9 +3435,10 @@
 
 	.confirm-fee-card {
 		background: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		padding: 24rpx;
 		margin-bottom: 20rpx;
+		box-shadow: 0 4rpx 20rpx rgba(31, 31, 31, 0.04);
 	}
 
 	.cfc-row {
@@ -3117,6 +3487,11 @@
 		color: #E8331B;
 	}
 
+	.cfc-coupon-placeholder {
+		font-size: 26rpx;
+		color: #888888;
+	}
+
 	.cfc-arrow {
 		width: 26rpx;
 		height: 26rpx;
@@ -3159,9 +3534,10 @@
 
 	.confirm-guarantee-card {
 		background: #FFFFFF;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 		padding: 24rpx;
 		margin-bottom: 16rpx;
+		box-shadow: 0 4rpx 20rpx rgba(31, 31, 31, 0.04);
 	}
 
 	.cgc-check-row {
@@ -3210,10 +3586,22 @@
 		margin: 0 4rpx;
 	}
 
+	.cgc-set-link-wrap {
+		display: inline-flex;
+		align-items: center;
+		gap: 4rpx;
+		margin-left: 16rpx;
+		vertical-align: middle;
+	}
+
 	.cgc-set-link {
 		color: #F0710D;
 		font-size: 26rpx;
-		margin-left: 16rpx;
+	}
+
+	.inline-link-arrow {
+		width: 22rpx;
+		height: 22rpx;
 	}
 
 	.cgc-sub-hint {
@@ -3224,7 +3612,9 @@
 
 	.publish-notice-row {
 		display: flex;
+		align-items: center;
 		justify-content: flex-end;
+		gap: 4rpx;
 		padding: 8rpx 8rpx 20rpx;
 	}
 
@@ -3233,6 +3623,12 @@
 		color: #666666;
 	}
 
+	.pnr-arrow {
+		width: 22rpx;
+		height: 22rpx;
+		opacity: 0.55;
+	}
+
 	/* ---------- 吸底栏统一样式 ---------- */
 	/* 步骤 1 吸底栏（1:1 复刻 frame_004 & frame_007） */
 	.step1-bottom-bar {
@@ -3248,7 +3644,7 @@
 
 	.step1-promo-banner {
 		height: 58rpx;
-		background: linear-gradient(90deg, #F0710D 0%, #E8331B 100%);
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
 		padding: 0 24rpx;
 		display: flex;
 		align-items: center;
@@ -3260,10 +3656,9 @@
 		color: #FFFFFF;
 	}
 
-	.spb-arrow {
-		font-size: 26rpx;
-		color: #FFFFFF;
-		font-weight: 700;
+	.spb-arrow-ico {
+		width: 26rpx;
+		height: 26rpx;
 	}
 
 	.step1-summary-area {
@@ -3285,12 +3680,12 @@
 	}
 
 	.s1-quan-badge {
-		width: 32rpx;
-		height: 32rpx;
+		width: 36rpx;
+		height: 36rpx;
 		border-radius: 6rpx;
 		background: #E8331B;
 		color: #FFFFFF;
-		font-size: 20rpx;
+		font-size: 22rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -3323,23 +3718,29 @@
 		height: 84rpx;
 		border: 2rpx solid #F0710D;
 		background: #FFFFFF;
-		border-radius: 12rpx;
+		border-radius: 42rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
+		gap: 8rpx;
+	}
+
+	.bam-plus-ico {
+		width: 28rpx;
+		height: 28rpx;
 	}
 
 	.bam-txt {
 		font-size: 30rpx;
-		font-weight: 500;
+		font-weight: 600;
 		color: #F0710D;
 	}
 
 	.btn-step-next {
 		flex: 1;
 		height: 84rpx;
-		background: #F0710D;
-		border-radius: 12rpx;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		border-radius: 42rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -3347,7 +3748,7 @@
 
 	.bsn-txt {
 		font-size: 30rpx;
-		font-weight: 500;
+		font-weight: 600;
 		color: #FFFFFF;
 	}
 
@@ -3369,9 +3770,9 @@
 	.btn-step-back {
 		flex: 1;
 		height: 84rpx;
-		border: 2rpx solid #CCCCCC;
+		border: 2rpx solid #DCDCDC;
 		background: #FFFFFF;
-		border-radius: 12rpx;
+		border-radius: 42rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -3379,15 +3780,15 @@
 
 	.bsb-txt {
 		font-size: 30rpx;
-		color: #333333;
+		color: #444444;
 		font-weight: 500;
 	}
 
 	.btn-step-next-large {
 		flex: 1;
 		height: 84rpx;
-		background: #F0710D;
-		border-radius: 12rpx;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		border-radius: 42rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -3395,7 +3796,7 @@
 
 	.bsnl-txt {
 		font-size: 30rpx;
-		font-weight: 500;
+		font-weight: 600;
 		color: #FFFFFF;
 	}
 
@@ -3456,8 +3857,8 @@
 	.btn-publish-order {
 		height: 84rpx;
 		padding: 0 64rpx;
-		background: #F0710D;
-		border-radius: 12rpx;
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		border-radius: 42rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -3551,24 +3952,23 @@
 		flex-direction: column;
 		align-items: center;
 		text-align: center;
+		gap: 16rpx;
 		margin-bottom: 44rpx;
 	}
 
-	.mcd-title {
-		font-size: 32rpx;
-		font-weight: 700;
-		color: #1F1F1F;
-		line-height: 1.5;
-		margin-bottom: 20rpx;
-	}
-
-	.mcd-sub {
+	.mcd-line {
 		font-size: 28rpx;
 		color: #444444;
 		line-height: 1.6;
 	}
 
-	.mcd-footer {
+	.mcd-line:first-child {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: #1F1F1F;
+	}
+
+	.mcd-foot {
 		display: flex;
 		align-items: center;
 		gap: 24rpx;
@@ -3577,31 +3977,187 @@
 	.mcd-btn {
 		flex: 1;
 		height: 84rpx;
-		border-radius: 12rpx;
+		border-radius: 42rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		box-sizing: border-box;
 	}
 
-	.mcd-btn-outline {
+	.mcd-btn-confirm {
 		background: #FFFFFF;
-		border: 2rpx solid #CCCCCC;
+		border: 2rpx solid #DCDCDC;
 	}
 
-	.mcd-btn-outline-txt {
+	.mcd-btn-cancel {
+		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+	}
+
+	.mcd-btn-txt {
 		font-size: 30rpx;
-		color: #444444;
-		font-weight: 500;
-	}
-
-	.mcd-btn-primary {
-		background: #F0710D;
-	}
-
-	.mcd-btn-primary-txt {
-		font-size: 30rpx;
-		color: #FFFFFF;
 		font-weight: 600;
 	}
+
+	.mcd-btn-txt.gray {
+		color: #444444;
+	}
+
+	.mcd-btn-txt.dark {
+		color: #FFFFFF;
+	}
+
+	/* ---------- 已选商品图与环境图横向管理条 ---------- */
+	.picked-thumbs-panel {
+		margin-bottom: 18rpx;
+		padding: 16rpx 16rpx 12rpx;
+		border-radius: 12rpx;
+		background: #FAFAFC;
+		border: 1rpx solid #F0F0F2;
+	}
+
+	.thumbs-scroll {
+		width: 100%;
+		white-space: nowrap;
+	}
+
+	.thumbs-track {
+		display: inline-flex;
+		align-items: center;
+		gap: 16rpx;
+	}
+
+	.thumb-chip {
+		position: relative;
+		width: 124rpx;
+		height: 124rpx;
+		border-radius: 10rpx;
+		overflow: hidden;
+		border: 1rpx solid #E5E7EB;
+		background: #FFFFFF;
+		flex-shrink: 0;
+	}
+
+	.tc-img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.tc-del {
+		position: absolute;
+		top: 0;
+		right: 0;
+		width: 34rpx;
+		height: 34rpx;
+		background: rgba(0, 0, 0, 0.58);
+		border-bottom-left-radius: 8rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tc-del-ico {
+		width: 22rpx;
+		height: 22rpx;
+	}
+
+	.tc-tag {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 34rpx;
+		background: rgba(240, 113, 13, 0.85);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tc-tag.env {
+		background: rgba(74, 124, 255, 0.85);
+	}
+
+	.tc-tag-txt {
+		font-size: 22rpx;
+		color: #FFFFFF;
+		line-height: 1;
+	}
+
+	.thumb-add-btn {
+		width: 124rpx;
+		height: 124rpx;
+		border-radius: 10rpx;
+		border: 2rpx dashed #F0710D;
+		background: #FFF7F0;
+		display: inline-flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		gap: 8rpx;
+		flex-shrink: 0;
+		box-sizing: border-box;
+	}
+
+	.tab-plus-ico {
+		width: 34rpx;
+		height: 34rpx;
+	}
+
+	.tab-plus-txt {
+		font-size: 22rpx;
+		color: #F0710D;
+		line-height: 1;
+	}
+
+	/* ---------- 安装视频预览弹窗 ---------- */
+	.video-modal-mask {
+		position: fixed;
+		inset: 0;
+		background: rgba(0, 0, 0, 0.75);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 1250;
+		padding: 0 36rpx;
+	}
+
+	.video-modal-box {
+		width: 100%;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		overflow: hidden;
+		padding-bottom: 20rpx;
+	}
+
+	.vm-head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 24rpx 28rpx;
+		border-bottom: 1rpx solid #F0F0F2;
+	}
+
+	.vm-title {
+		font-size: 30rpx;
+		font-weight: 600;
+		color: #1F1F1F;
+	}
+
+	.vm-close {
+		width: 52rpx;
+		height: 52rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.vm-close-ico {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.vm-player {
+		width: 100%;
+		height: 440rpx;
+		background: #000000;
+	}
 </style>
diff --git a/yjyf-app/pages/order/review.vue b/yjyf-app/pages/order/review.vue
index 655adbf..73e31b9 100644
--- a/yjyf-app/pages/order/review.vue
+++ b/yjyf-app/pages/order/review.vue
@@ -1,6 +1,5 @@
 <template>
 	<view class="page">
-		<!-- 统一顶部导航栏（安全距离自适应） -->
 		<YjyfNavBar theme="orange" title="服务评价与晒单" />
 		<view class="card">
 			<view class="title">给本次服务打分</view>
@@ -28,7 +27,7 @@
 				<view class="img-item" v-for="(img, idx) in images" :key="idx">
 					<image class="img-preview" :src="img" mode="aspectFill" @tap="previewImage(idx)" />
 					<view class="img-remove" @tap.stop="removeImage(idx)">
-						<image class="remove-ico" src="/static/icons/close.svg" mode="aspectFit" />
+						<image class="remove-ico" src="/static/icons/media-del-white.svg" mode="aspectFit" />
 					</view>
 				</view>
 				<view class="img-add clickable-hover" v-if="images.length < 6" @tap="chooseImages">
@@ -87,7 +86,10 @@
 		else tags.value.push(t);
 	}
 
+	const uploading = ref(false);
+
 	function chooseImages() {
+		if (uploading.value || submitting.value) return;
 		const remain = 6 - images.value.length;
 		if (remain <= 0) return;
 		uni.chooseImage({
@@ -97,7 +99,8 @@
 			success: async (res) => {
 				const paths = res.tempFilePaths || [];
 				if (!paths.length) return;
-				uni.showLoading({ title: '上传中...' });
+				uploading.value = true;
+				uni.showLoading({ title: '上传中...', mask: true });
 				try {
 					for (const p of paths) {
 						const uploaded = await api.upload(p, 'review');
@@ -107,6 +110,7 @@
 				} catch (e) {
 					uni.showToast({ title: '图片上传失败', icon: 'none' });
 				} finally {
+					uploading.value = false;
 					uni.hideLoading();
 				}
 			}
@@ -114,6 +118,7 @@
 	}
 
 	function removeImage(idx) {
+		if (submitting.value) return;
 		images.value.splice(idx, 1);
 	}
 
@@ -125,7 +130,10 @@
 	}
 
 	async function submit() {
-		if (submitting.value) return;
+		if (submitting.value || uploading.value) {
+			if (uploading.value) uni.showToast({ title: '图片正在上传中，请稍候', icon: 'none' });
+			return;
+		}
 		submitting.value = true;
 		try {
 			await api.reviewCreate({
@@ -138,9 +146,11 @@
 				is_showcase: isShowcase.value ? 1 : 0
 			});
 			uni.showToast({ title: isShowcase.value ? '评价并晒单成功' : '评价成功' });
-			setTimeout(() => uni.navigateBack(), 600);
+			setTimeout(() => {
+				submitting.value = false;
+				uni.navigateBack();
+			}, 600);
 		} catch (e) {
-		} finally {
 			submitting.value = false;
 		}
 	}
@@ -165,7 +175,7 @@
 	.img-item { position: relative; width: 148rpx; height: 148rpx; border-radius: 12rpx; overflow: hidden; background: #F5F6F8; }
 	.img-preview { width: 100%; height: 100%; }
 	.img-remove { position: absolute; top: 6rpx; right: 6rpx; width: 36rpx; height: 36rpx; border-radius: 18rpx; background: rgba(0,0,0,0.55); display: flex; align-items: center; justify-content: center; }
-	.remove-ico { width: 20rpx; height: 20rpx; filter: brightness(10); }
+	.remove-ico { width: 22rpx; height: 22rpx; }
 	.img-add { width: 148rpx; height: 148rpx; border-radius: 12rpx; border: 2rpx dashed #D8D8DC; background: #FAFAFC; display: flex; flex-direction: column; align-items: center; justify-content: center; }
 	.add-ico { width: 44rpx; height: 44rpx; margin-bottom: 8rpx; }
 	.add-txt { font-size: 22rpx; color: #888888; }
diff --git a/yjyf-app/pages/order/system-gallery.vue b/yjyf-app/pages/order/system-gallery.vue
new file mode 100644
index 0000000..4112673
--- /dev/null
+++ b/yjyf-app/pages/order/system-gallery.vue
@@ -0,0 +1,593 @@
+<template>
+	<view class="page">
+		<YjyfNavBar theme="orange" title="系统图库" />
+
+		<!-- 顶部一级服务大类切换条 -->
+		<view class="cat-tabs-wrap" v-if="cats.length > 0">
+			<scroll-view
+				class="cat-tabs-scroll"
+				scroll-x="true"
+				:show-scrollbar="false"
+				:scroll-into-view="catScrollInto"
+			>
+				<view class="cat-tabs-inner">
+					<view
+						class="cat-pill clickable-hover"
+						v-for="c in cats"
+						:key="c.id"
+						:id="'cat-pill-' + c.id"
+						:class="{ active: Number(c.id) === Number(activeCatId) }"
+						@tap="switchCategory(c.id)"
+					>
+						<text class="cat-pill-txt">{{ c.name }}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<!-- 加载态 -->
+		<view class="state-box" v-if="loading && services.length === 0">
+			<text class="state-txt">正在加载系统图库...</text>
+		</view>
+
+		<!-- 异常重试态 -->
+		<view class="state-box" v-else-if="loadError && services.length === 0">
+			<image class="empty-img" src="/static/icons/empty-gallery.svg" mode="aspectFit" />
+			<text class="state-txt">{{ loadError }}</text>
+			<view class="retry-btn clickable-hover" @tap="fetchGallery(activeCatId, activeServiceId)">
+				<text class="retry-txt">重新加载</text>
+			</view>
+		</view>
+
+		<!-- 左右联动主体 -->
+		<view class="gallery-body" v-else>
+			<!-- 左侧二级商品导航栏 -->
+			<scroll-view
+				class="side-nav"
+				scroll-y="true"
+				:show-scrollbar="false"
+				:scroll-into-view="sideScrollInto"
+			>
+				<view
+					class="side-item clickable-hover"
+					v-for="svc in services"
+					:key="svc.id"
+					:id="'svc-nav-' + svc.id"
+					:class="{ active: Number(svc.id) === Number(activeServiceId) }"
+					@tap="selectService(svc.id)"
+				>
+					<view class="side-bar" v-if="Number(svc.id) === Number(activeServiceId)"></view>
+					<text class="side-txt">{{ formatShortName(svc.name) }}</text>
+				</view>
+			</scroll-view>
+
+			<!-- 右侧温馨提示 + 双列正方形图库网格 -->
+			<view class="content-pane">
+				<view class="warm-tip-bar" v-if="showTip">
+					<text class="wt-txt">系统已为您准备了部分商品图片，（图片仅供参考）但为了师傅接单时更好的了解商品信息，建议您上传真实的商品图片（最多9张）。</text>
+					<view class="wt-close clickable-hover" @tap="showTip = false">
+						<image class="wt-close-ico" src="/static/icons/close-orange.svg" mode="aspectFit" />
+					</view>
+				</view>
+
+				<scroll-view class="grid-scroll" scroll-y="true" :scroll-top="rightScrollTop">
+					<view class="empty-box" v-if="currentItems.length === 0 && !loading">
+						<image class="empty-img" src="/static/icons/empty-gallery.svg" mode="aspectFit" />
+						<text class="state-txt">该商品暂无系统参考图</text>
+					</view>
+
+					<view class="img-grid" v-else>
+						<view
+							class="grid-cell clickable-hover"
+							v-for="item in currentItems"
+							:key="item.id + '_' + item.image_url"
+							@tap="toggleSelect(item.image_url)"
+						>
+							<view class="img-square" :class="{ checked: isSelected(item.image_url) }">
+								<image class="goods-pic" :src="item.image_url" mode="aspectFill" lazy-load />
+								<!-- 右上角方形勾选框 -->
+								<view class="check-corner" :class="{ on: isSelected(item.image_url) }">
+									<image
+										class="check-ico"
+										:src="isSelected(item.image_url) ? '/static/icons/check-white.svg' : '/static/icons/check-gray.svg'"
+										mode="aspectFit"
+									/>
+								</view>
+								<!-- 左下角高清大图预览 -->
+								<view class="zoom-badge" @tap.stop="previewSingle(item.image_url)">
+									<image class="zoom-ico" src="/static/icons/zoom-white.svg" mode="aspectFit" />
+								</view>
+							</view>
+							<text class="cell-name">{{ item.title }}</text>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+
+		<!-- 底部固定确认栏 -->
+		<view class="bottom-bar">
+			<view
+				class="confirm-btn clickable-hover"
+				:class="{ disabled: confirming }"
+				@tap="handleConfirm"
+			>
+				<text class="confirm-txt">
+					{{ selectedUrls.length > 0 ? `确定（已选 ${selectedUrls.length} 张）` : '确定' }}
+				</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, computed, nextTick } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app';
+	import api from '@/utils/api.js';
+
+	const cats = ref([]);
+	const services = ref([]);
+	const activeCatId = ref(0);
+	const activeServiceId = ref(0);
+	const maxCount = ref(9);
+	const selectedUrls = ref([]);
+	const showTip = ref(true);
+	const loading = ref(false);
+	const loadError = ref('');
+	const confirming = ref(false);
+
+	const catScrollInto = ref('');
+	const sideScrollInto = ref('');
+	const rightScrollTop = ref(0);
+
+	const currentItems = computed(() => {
+		const hit = services.value.find(s => Number(s.id) === Number(activeServiceId.value));
+		return (hit && Array.isArray(hit.items)) ? hit.items : [];
+	});
+
+	function formatShortName(name) {
+		if (!name) return '';
+		if (name === '床/床垫') return '床';
+		return name;
+	}
+
+	function isSelected(url) {
+		return selectedUrls.value.includes(url);
+	}
+
+	function toggleSelect(url) {
+		if (!url) return;
+		const idx = selectedUrls.value.indexOf(url);
+		if (idx > -1) {
+			selectedUrls.value.splice(idx, 1);
+			return;
+		}
+		if (selectedUrls.value.length >= maxCount.value) {
+			uni.showToast({
+				title: `最多可选择 ${maxCount.value} 张商品图片`,
+				icon: 'none'
+			});
+			return;
+		}
+		selectedUrls.value.push(url);
+	}
+
+	function previewSingle(url) {
+		const list = currentItems.value.map(x => x.image_url).filter(Boolean);
+		uni.previewImage({
+			current: url,
+			urls: list.length ? list : [url]
+		});
+	}
+
+	async function fetchGallery(catId, preferServiceId = 0) {
+		if (loading.value) return;
+		loading.value = true;
+		loadError.value = '';
+		try {
+			const res = await api.systemGallery({
+				cat_id: catId || 0,
+				service_id: preferServiceId || 0
+			});
+			cats.value = (res && Array.isArray(res.cats)) ? res.cats : [];
+			services.value = (res && Array.isArray(res.services)) ? res.services : [];
+			if (res && res.current_cat_id) {
+				activeCatId.value = Number(res.current_cat_id);
+			}
+			if (services.value.length > 0) {
+				const matched = preferServiceId
+					? services.value.find(s => Number(s.id) === Number(preferServiceId))
+					: null;
+				activeServiceId.value = matched ? Number(matched.id) : Number(services.value[0].id);
+			} else {
+				activeServiceId.value = 0;
+			}
+			nextTick(() => {
+				if (activeCatId.value) {
+					catScrollInto.value = 'cat-pill-' + activeCatId.value;
+				}
+				if (activeServiceId.value) {
+					sideScrollInto.value = 'svc-nav-' + activeServiceId.value;
+				}
+			});
+		} catch (e) {
+			loadError.value = (e && e.msg) ? e.msg : '系统图库加载失败，请重试';
+		} finally {
+			loading.value = false;
+		}
+	}
+
+	function switchCategory(catId) {
+		if (Number(catId) === Number(activeCatId.value) && services.value.length > 0) return;
+		activeCatId.value = Number(catId);
+		rightScrollTop.value = rightScrollTop.value === 0 ? 0.01 : 0;
+		fetchGallery(activeCatId.value, 0);
+	}
+
+	function selectService(serviceId) {
+		if (Number(serviceId) === Number(activeServiceId.value)) return;
+		activeServiceId.value = Number(serviceId);
+		rightScrollTop.value = rightScrollTop.value === 0 ? 0.01 : 0;
+	}
+
+	function handleConfirm() {
+		if (confirming.value) return;
+		if (selectedUrls.value.length === 0) {
+			uni.showToast({ title: '请先勾选需要的商品图片', icon: 'none' });
+			return;
+		}
+		confirming.value = true;
+		const picked = [...selectedUrls.value];
+		uni.setStorageSync('yjyf_picked_gallery_images', picked);
+		uni.$emit('yjyf:selectGalleryImages', picked);
+		uni.navigateBack({
+			fail: () => {
+				confirming.value = false;
+				uni.redirectTo({ url: '/pages/order/quick' });
+			}
+		});
+	}
+
+	onLoad((options) => {
+		const initCatId = options && options.cat_id ? Number(options.cat_id) : 0;
+		const initServiceId = options && options.service_id ? Number(options.service_id) : 0;
+		const remainMax = options && options.max ? Number(options.max) : 9;
+		maxCount.value = Math.max(1, Math.min(9, remainMax || 9));
+		activeCatId.value = initCatId;
+		activeServiceId.value = initServiceId;
+		fetchGallery(initCatId, initServiceId);
+	});
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		background-color: $yjyf-bg-page;
+	}
+
+	/* 顶部一级类目胶囊条 */
+	.cat-tabs-wrap {
+		flex-shrink: 0;
+		background-color: $yjyf-bg-card;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.cat-tabs-scroll {
+		width: 100%;
+		white-space: nowrap;
+	}
+
+	.cat-tabs-inner {
+		display: inline-flex;
+		align-items: center;
+		padding: 14rpx 20rpx;
+		gap: 16rpx;
+	}
+
+	.cat-pill {
+		height: 56rpx;
+		padding: 0 24rpx;
+		border-radius: $yjyf-radius-pill;
+		background-color: $yjyf-bg-page;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+		transition: all 0.18s ease;
+	}
+
+	.cat-pill.active {
+		background-color: $yjyf-primary-bg;
+		border: 1rpx solid $yjyf-primary-border;
+	}
+
+	.cat-pill-txt {
+		font-size: 26rpx;
+		color: $yjyf-text-regular;
+		line-height: 1;
+	}
+
+	.cat-pill.active .cat-pill-txt {
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	/* 加载与错误占位 */
+	.state-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 48rpx;
+	}
+
+	.empty-box {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 120rpx 32rpx;
+	}
+
+	.empty-img {
+		width: 220rpx;
+		height: 176rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.state-txt {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-secondary;
+	}
+
+	.retry-btn {
+		margin-top: 28rpx;
+		height: 68rpx;
+		padding: 0 40rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-gradient-primary;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.retry-txt {
+		font-size: 26rpx;
+		color: $yjyf-text-inverse;
+		font-weight: 500;
+	}
+
+	/* 左右联动主体 */
+	.gallery-body {
+		flex: 1;
+		min-height: 0;
+		display: flex;
+		overflow: hidden;
+	}
+
+	.side-nav {
+		width: 204rpx;
+		height: 100%;
+		background-color: $yjyf-bg-page;
+		flex-shrink: 0;
+	}
+
+	.side-item {
+		position: relative;
+		min-height: 100rpx;
+		padding: 16rpx 16rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		text-align: center;
+	}
+
+	.side-item.active {
+		background-color: $yjyf-bg-card;
+	}
+
+	.side-bar {
+		position: absolute;
+		left: 0;
+		top: 20rpx;
+		bottom: 20rpx;
+		width: 6rpx;
+		border-radius: 0 4rpx 4rpx 0;
+		background-color: $yjyf-primary;
+	}
+
+	.side-txt {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+		line-height: 1.35;
+		word-break: break-all;
+	}
+
+	.side-item.active .side-txt {
+		color: $yjyf-primary;
+		font-weight: 600;
+	}
+
+	/* 右侧商品图片面板 */
+	.content-pane {
+		flex: 1;
+		min-width: 0;
+		height: 100%;
+		background-color: $yjyf-bg-card;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.warm-tip-bar {
+		flex-shrink: 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx 24rpx;
+		background-color: $yjyf-primary-bg;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+
+	.wt-txt {
+		flex: 1;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		line-height: 1.55;
+		padding-right: 16rpx;
+	}
+
+	.wt-close {
+		width: 48rpx;
+		height: 48rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+	}
+
+	.wt-close-ico {
+		width: 28rpx;
+		height: 28rpx;
+	}
+
+	.grid-scroll {
+		flex: 1;
+		min-height: 0;
+	}
+
+	.img-grid {
+		display: grid;
+		grid-template-columns: repeat(2, 1fr);
+		gap: 28rpx 22rpx;
+		padding: 24rpx;
+		box-sizing: border-box;
+	}
+
+	.grid-cell {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		min-width: 0;
+	}
+
+	.img-square {
+		position: relative;
+		width: 100%;
+		padding-top: 100%;
+		border-radius: $yjyf-radius-sm;
+		overflow: hidden;
+		background-color: $yjyf-bg-page;
+		border: 2rpx solid $yjyf-border-color;
+		box-sizing: border-box;
+		transition: border-color 0.16s ease;
+	}
+
+	.img-square.checked {
+		border-color: $yjyf-primary;
+	}
+
+	.goods-pic {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+	}
+
+	.check-corner {
+		position: absolute;
+		top: 0;
+		right: 0;
+		width: 48rpx;
+		height: 48rpx;
+		background-color: $yjyf-bg-card;
+		border-left: 1rpx solid $yjyf-border-color;
+		border-bottom: 1rpx solid $yjyf-border-color;
+		border-bottom-left-radius: 10rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 2;
+	}
+
+	.check-corner.on {
+		background-color: $yjyf-primary;
+		border-color: $yjyf-primary;
+	}
+
+	.check-ico {
+		width: 28rpx;
+		height: 28rpx;
+	}
+
+	.zoom-badge {
+		position: absolute;
+		left: 10rpx;
+		bottom: 10rpx;
+		width: 42rpx;
+		height: 42rpx;
+		border-radius: 8rpx;
+		background: rgba(0, 0, 0, 0.38);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 2;
+	}
+
+	.zoom-ico {
+		width: 24rpx;
+		height: 24rpx;
+	}
+
+	.cell-name {
+		margin-top: 14rpx;
+		width: 100%;
+		font-size: 26rpx;
+		color: $yjyf-text-main;
+		text-align: center;
+		line-height: 1.4;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+	}
+
+	/* 底部通栏确认条 */
+	.bottom-bar {
+		flex-shrink: 0;
+		background-color: $yjyf-bg-card;
+		border-top: 1rpx solid $yjyf-border-color;
+		padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom));
+		box-shadow: $yjyf-shadow-bar;
+	}
+
+	.confirm-btn {
+		height: 88rpx;
+		border-radius: $yjyf-radius-sm;
+		background: $yjyf-gradient-primary;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: $yjyf-shadow-button;
+	}
+
+	.confirm-btn.disabled {
+		opacity: 0.65;
+	}
+
+	.confirm-txt {
+		font-size: $yjyf-font-title;
+		font-weight: 600;
+		color: $yjyf-text-inverse;
+		letter-spacing: 2rpx;
+	}
+
+	.clickable-hover:active {
+		opacity: 0.82;
+	}
+</style>
diff --git a/yjyf-app/pages/service/detail.vue b/yjyf-app/pages/service/detail.vue
index db89e36..54d4e86 100644
--- a/yjyf-app/pages/service/detail.vue
+++ b/yjyf-app/pages/service/detail.vue
@@ -2,7 +2,6 @@
 	<view class="page">
 		<YjyfNavBar theme="orange" :title="detail ? detail.name : '服务详情'" />
 
-		<!-- 骨架屏呼吸占位 (彻底解决白屏) -->
 		<view class="skeleton-box" v-if="loading && !detail">
 			<view class="sk-hero yjyf-shimmer"></view>
 			<view class="sk-card yjyf-shimmer"></view>
@@ -10,64 +9,94 @@
 		</view>
 
 		<view class="main-body" v-else-if="detail">
-			<view class="hero" :style="{ marginTop: (-navHeight) + 'px', paddingTop: (navHeight + 16) + 'px' }">
+			<view class="card hero-card">
 				<view class="hero-thumb">
 					<image
-						v-if="detail.image_url && !detail.image_url.endsWith('.svg')"
 						class="hero-img"
-						:src="detail.image_url"
+						:src="detail.image_url || '/static/icons/service-default.svg'"
 						mode="aspectFill"
 					/>
-					<text v-else 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>
+						<text class="tag primary" v-if="detail.price_type_text">{{ detail.price_type_text }}</text>
+						<text class="tag" v-if="detail.cat_name">{{ detail.cat_name }}</text>
+						<text class="tag">已售 {{ detail.sales || 0 }}</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 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 no-border">
+					<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>
+				<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" :class="{ 'no-border': !detail.description }">
+					<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-actions">
+				<view class="bar-icons">
+					<view class="bar-ico-btn clickable-hover" @tap="onContactService">
+						<image class="action-ico" src="/static/icons/customer-service-gray.svg" mode="aspectFit" />
+						<text class="action-txt">客服</text>
+					</view>
 					<!-- #ifdef MP-WEIXIN -->
-					<button class="bar-share-btn clickable-hover" open-type="share">
-						<image class="share-ico" src="/static/icons/share-service.svg" mode="aspectFit" />
-						<text class="share-txt">分享</text>
+					<button class="bar-ico-btn clickable-hover" open-type="share">
+						<image class="action-ico" src="/static/icons/share-service.svg" mode="aspectFit" />
+						<text class="action-txt">分享</text>
 					</button>
 					<!-- #endif -->
 					<!-- #ifndef MP-WEIXIN -->
-					<view class="bar-share-btn clickable-hover" @tap="onShareService">
-						<image class="share-ico" src="/static/icons/share-service.svg" mode="aspectFit" />
-						<text class="share-txt">分享</text>
+					<view class="bar-ico-btn clickable-hover" @tap="onShareService">
+						<image class="action-ico" src="/static/icons/share-service.svg" mode="aspectFit" />
+						<text class="action-txt">分享</text>
 					</view>
 					<!-- #endif -->
-					<view class="bar-btn clickable-hover" @tap="goCreate">立即下单</view>
+				</view>
+				<view class="bar-right">
+					<view class="bar-price-box">
+						<text class="bar-price">{{ detail.price_text }}</text>
+					</view>
+					<view class="bar-btn clickable-hover" @tap="goCreate">立即预约</view>
 				</view>
 			</view>
 		</view>
+
+		<view class="empty-box" v-else>
+			<image class="empty-ico" src="/static/icons/empty-service.svg" mode="aspectFit" />
+			<text class="empty-title">未找到该服务项目</text>
+		</view>
 	</view>
 </template>
 
@@ -76,9 +105,7 @@
 	import { onLoad } from '@dcloudio/uni-app';
 	import api from '@/utils/api.js';
 	import { useShare, triggerCustomShare } from '@/utils/share.js';
-	import { getNavBarMetrics } from '@/utils/system.js';
 
-	const navHeight = ref(getNavBarMetrics().totalNavHeight);
 	const detail = ref(null);
 	const loading = ref(true);
 	let serviceId = 0;
@@ -87,13 +114,13 @@
 		const d = detail.value;
 		if (!d) {
 			return {
-				title: '优匠优服 · 标准化上门安装维修',
+				title: '优匠优服 · 服务详情',
 				path: `/pages/service/detail?id=${serviceId}`,
 				query: { id: serviceId }
 			};
 		}
 		return {
-			title: `${d.name}（${d.price_text}）· 优匠优服专业上门`,
+			title: `${d.name}（${d.price_text}）`,
 			path: `/pages/service/detail?id=${serviceId}`,
 			query: { id: serviceId },
 			imageUrl: d.image_url && !d.image_url.endsWith('.svg') ? d.image_url : ''
@@ -106,8 +133,13 @@
 		triggerCustomShare(getSharePayload());
 	}
 
+	function onContactService() {
+		api.contactService();
+	}
+
 	function goCreate() {
-		uni.navigateTo({ url: '/pages/order/create?service_id=' + serviceId });
+		const catId = detail.value && detail.value.cat_id ? detail.value.cat_id : '';
+		uni.navigateTo({ url: `/pages/order/quick?cat_id=${catId}&service_id=${serviceId}` });
 	}
 
 	onLoad(async (options) => {
@@ -115,7 +147,7 @@
 		loading.value = true;
 		try {
 			const res = await api.serviceDetail(serviceId);
-			detail.value = res.detail;
+			detail.value = res.detail || null;
 		} catch (e) {
 		} finally {
 			loading.value = false;
@@ -123,66 +155,218 @@
 	});
 </script>
 
-<style scoped>
-	.page { min-height: 100vh; background: #F5F6F8; padding-bottom: 160rpx; }
-	.hero {
-		display: flex; align-items: center; padding: 34rpx 28rpx;
-		background-color: #F0710D;
-		background-image: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
-		background-size: 100% 600rpx;
-		background-position: 0 0;
-		background-repeat: no-repeat;
+<style lang="scss" scoped>
+	@import '@/uni.scss';
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: 180rpx;
+	}
+	.card {
+		margin: $yjyf-space-md $yjyf-space-md 0;
+		padding: $yjyf-space-md;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		box-shadow: $yjyf-shadow-card;
+	}
+	.hero-card {
+		display: flex;
+		align-items: center;
 	}
 	.hero-thumb {
-		width: 130rpx; height: 130rpx; border-radius: 22rpx; flex-shrink: 0; overflow: hidden;
-		background: rgba(255,255,255,0.92); display: flex; align-items: center; justify-content: center;
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: $yjyf-radius-sm;
+		flex-shrink: 0;
+		overflow: hidden;
+		background: $yjyf-primary-bg;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.hero-img {
+		width: 100%;
+		height: 100%;
+	}
+	.hero-info {
+		flex: 1;
+		min-width: 0;
+		margin-left: $yjyf-space-md;
+		display: flex;
+		flex-direction: column;
+	}
+	.name {
+		font-size: 34rpx;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.tags {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+		gap: 12rpx;
+		margin-top: 12rpx;
 	}
-	.hero-img { width: 100%; height: 100%; }
-	.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; align-items: center; flex-wrap: wrap; gap: 12rpx; margin-top: 12rpx; }
 	.tag {
-		display: inline-flex; align-items: center; justify-content: center;
-		padding: 0 16rpx; height: 40rpx; line-height: 40rpx; text-align: center; border-radius: 20rpx;
-		background: rgba(255,255,255,0.22); color: #fff; font-size: 22rpx; font-weight: 500;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0 16rpx;
+		height: 40rpx;
+		border-radius: $yjyf-radius-pill;
+		background: $yjyf-bg-page;
+		color: $yjyf-text-secondary;
+		font-size: $yjyf-font-micro;
 	}
-	.price { margin-top: 14rpx; font-size: 34rpx; font-weight: 700; color: #FFF3DF; }
-	.card {
-		margin: 24rpx 24rpx 0; padding: 24rpx; background: #fff;
-		border-radius: 20rpx; box-shadow: 0 6rpx 20rpx rgba(240,129,31,0.06);
+	.tag.primary {
+		background: $yjyf-primary-bg;
+		color: $yjyf-primary;
+		font-weight: 600;
 	}
-	.card-title { font-size: 30rpx; font-weight: 700; color: #1F1F1F; margin-bottom: 14rpx; }
-	.li { display: flex; justify-content: space-between; align-items: center; padding: 12rpx 0; border-bottom: 1rpx solid #F0F0F2; }
-	.k { font-size: 26rpx; color: #666; }
-	.v { font-size: 26rpx; color: #333; }
-	.desc { display: block; margin-top: 16rpx; font-size: 24rpx; color: #888888; line-height: 36rpx; }
-	.bar {
-		position: fixed; left: 0; right: 0; bottom: 0; height: 120rpx;
-		padding: 0 24rpx; 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: 22rpx; color: #888888; margin-top: 4rpx; }
-	.bar-actions { display: flex; align-items: center; gap: 20rpx; }
-	.bar-share-btn {
-		display: flex; flex-direction: column; align-items: center; justify-content: center;
-		padding: 0 16rpx; height: 84rpx; background: transparent; border: none; line-height: 1.2;
-		margin: 0;
-	}
-	.bar-share-btn::after { border: none; }
-	.share-ico { width: 38rpx; height: 38rpx; margin-bottom: 4rpx; }
-	.share-txt { font-size: 22rpx; color: #444444; font-weight: 500; line-height: 1; }
-	.bar-btn {
-		height: 84rpx; padding: 0 56rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1;
-		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);
+	.price {
+		margin-top: 14rpx;
+		font-size: $yjyf-font-lg;
+		font-weight: 800;
+		color: $yjyf-primary;
 	}
 
-	.skeleton-box { padding: 30rpx 28rpx; }
-	.sk-hero { height: 180rpx; border-radius: 20rpx; margin-bottom: 24rpx; }
-	.sk-card { height: 260rpx; border-radius: 20rpx; margin-bottom: 24rpx; }
+	.card-title {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: $yjyf-text-main;
+		margin-bottom: 12rpx;
+	}
+	.li {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 16rpx 0;
+		border-bottom: 1rpx solid $yjyf-border-color;
+	}
+	.li.no-border {
+		border-bottom: none;
+	}
+	.k {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-secondary;
+	}
+	.v {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-main;
+		font-weight: 500;
+	}
+	.desc {
+		display: block;
+		margin-top: $yjyf-space-sm;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-regular;
+		line-height: 40rpx;
+	}
+
+	.bar {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 120rpx;
+		padding: 0 $yjyf-space-md;
+		padding-bottom: env(safe-area-inset-bottom);
+		box-sizing: content-box;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		background: $yjyf-bg-card;
+		box-shadow: $yjyf-shadow-bar;
+		z-index: 20;
+	}
+	.bar-icons {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+	}
+	.bar-ico-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		width: 84rpx;
+		height: 84rpx;
+		padding: 0;
+		margin: 0;
+		background: transparent;
+		border: none;
+		line-height: 1.2;
+	}
+	.bar-ico-btn::after {
+		border: none;
+	}
+	.action-ico {
+		width: 38rpx;
+		height: 38rpx;
+		margin-bottom: 6rpx;
+	}
+	.action-txt {
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-regular;
+		line-height: 1;
+	}
+	.bar-right {
+		display: flex;
+		align-items: center;
+		gap: $yjyf-space-sm;
+	}
+	.bar-price-box {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-end;
+	}
+	.bar-price {
+		font-size: 34rpx;
+		font-weight: 800;
+		color: $yjyf-primary;
+	}
+	.bar-btn {
+		height: 84rpx;
+		padding: 0 52rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 1;
+		border-radius: $yjyf-radius-pill;
+		color: $yjyf-text-inverse;
+		font-size: 30rpx;
+		font-weight: 700;
+		background: $yjyf-gradient-primary;
+		box-shadow: $yjyf-shadow-button;
+	}
+
+	.skeleton-box {
+		padding: $yjyf-space-md;
+	}
+	.sk-hero {
+		height: 188rpx;
+		border-radius: $yjyf-radius-md;
+		margin-bottom: $yjyf-space-md;
+	}
+	.sk-card {
+		height: 260rpx;
+		border-radius: $yjyf-radius-md;
+		margin-bottom: $yjyf-space-md;
+	}
+
+	.empty-box {
+		padding: 160rpx 40rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.empty-ico {
+		width: 160rpx;
+		height: 160rpx;
+		margin-bottom: $yjyf-space-md;
+	}
+	.empty-title {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-secondary;
+	}
 </style>
diff --git a/yjyf-app/pages/service/list.vue b/yjyf-app/pages/service/list.vue
index 4cc0eed..ed76320 100644
--- a/yjyf-app/pages/service/list.vue
+++ b/yjyf-app/pages/service/list.vue
@@ -1,32 +1,37 @@
 <template>
 	<view class="page">
-		<!-- 统一规范顶部白底导航栏 -->
 		<YjyfNavBar theme="orange" :title="catName || '服务列表'" />
 
-		<view class="head">
+		<view class="head" v-if="!loading && list.length">
 			<text class="cat">{{ catName || '全部服务' }}</text>
-			<text class="count">{{ list.length }} 项可预约</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="list" v-if="list.length">
+			<view class="item clickable-hover" v-for="s in list" :key="s.id" @tap="goDetail(s)">
+				<view class="thumb">
+					<image class="thumb-img" :src="s.image_url || '/static/icons/service-default.svg'" mode="aspectFill" />
+				</view>
 				<view class="info">
 					<text class="name">{{ s.name }}</text>
-					<text class="desc">{{ s.description || '专业师傅上门服务，验收满意再付款' }}</text>
+					<text class="desc" v-if="s.description || s.price_type_text">{{ s.description || s.price_type_text }}</text>
 					<view class="row">
 						<text class="price">{{ s.price_text }}</text>
-						<text class="sales">已售 {{ s.sales }}</text>
+						<text class="sales">已售 {{ s.sales || 0 }}</text>
 					</view>
 				</view>
-				<view class="btn">下单</view>
+				<view class="btn">预约</view>
 			</view>
 		</view>
 
-		<view class="empty" v-if="!loading && !list.length">
-			<text>该类目暂无服务</text>
+		<view class="empty-box" v-else-if="!loading">
+			<image class="empty-ico" src="/static/icons/empty-service.svg" mode="aspectFit" />
+			<text class="empty-title">暂无相关服务项目</text>
+		</view>
+
+		<view class="loading-box" v-if="loading">
+			<text>加载中...</text>
 		</view>
-		<view class="loading" v-if="loading"><text>加载中...</text></view>
 	</view>
 </template>
 
@@ -52,7 +57,7 @@
 		if (keyword) queryObj.keyword = keyword;
 		const queryStr = Object.keys(queryObj).map(k => `${k}=${encodeURIComponent(queryObj[k])}`).join('&');
 		return {
-			title: catName.value ? `优匠优服 · ${catName.value}上门安装维修` : '优匠优服 · 标准化上门安装维修服务',
+			title: catName.value ? `优匠优服 · ${catName.value}` : '优匠优服 · 服务列表',
 			path: queryStr ? `/pages/service/list?${queryStr}` : '/pages/service/list',
 			query: queryObj,
 			imageUrl: firstImg
@@ -70,51 +75,141 @@
 			if (keyword) params.keyword = keyword;
 			const res = await api.services(params);
 			list.value = res.list || [];
+		} catch (e) {
 		} finally {
 			loading.value = false;
 		}
 	}
 
 	onLoad((options) => {
-		catId = Number(options.cat_id || 0);
-		keyword = options.keyword ? decodeURIComponent(options.keyword) : '';
-		catName.value = options.cat_name
+		catId = Number((options && options.cat_id) || 0);
+		keyword = options && options.keyword ? decodeURIComponent(options.keyword) : '';
+		catName.value = options && 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: center; justify-content: space-between;
-		padding: 26rpx 28rpx 18rpx;
+<style lang="scss" scoped>
+	@import '@/uni.scss';
+	.page {
+		min-height: 100vh;
+		background: $yjyf-bg-page;
+		padding-bottom: 48rpx;
+	}
+	.head {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: $yjyf-space-md $yjyf-space-md $yjyf-space-sm;
+	}
+	.cat {
+		font-size: $yjyf-font-title;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.count {
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+	}
+	.list {
+		padding: 0 $yjyf-space-md;
 	}
-	.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);
+		display: flex;
+		align-items: center;
+		padding: $yjyf-space-md;
+		background: $yjyf-bg-card;
+		border-radius: $yjyf-radius-md;
+		margin-bottom: $yjyf-space-sm;
+		box-shadow: $yjyf-shadow-card;
 	}
 	.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;
+		width: 112rpx;
+		height: 112rpx;
+		border-radius: $yjyf-radius-sm;
+		flex-shrink: 0;
+		background: $yjyf-primary-bg;
+		overflow: hidden;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.thumb-img {
+		width: 100%;
+		height: 100%;
+	}
+	.info {
+		flex: 1;
+		min-width: 0;
+		margin-left: 20rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	.name {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: $yjyf-text-main;
+	}
+	.desc {
+		margin-top: 8rpx;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.row {
+		display: flex;
+		align-items: baseline;
+		margin-top: 12rpx;
+	}
+	.price {
+		font-size: 30rpx;
+		font-weight: 700;
+		color: $yjyf-primary;
+	}
+	.sales {
+		margin-left: $yjyf-space-sm;
+		font-size: $yjyf-font-micro;
+		color: $yjyf-text-secondary;
 	}
-	.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: 22rpx; color: #888888; }
 	.btn {
-		flex-shrink: 0; margin-left: 12rpx; padding: 0 28rpx; height: 60rpx; display: inline-flex; align-items: center; justify-content: center; line-height: 1;
-		border-radius: 28rpx; color: #fff; font-size: 24rpx;
-		background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%);
+		flex-shrink: 0;
+		margin-left: 12rpx;
+		padding: 0 28rpx;
+		height: 60rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		line-height: 1;
+		border-radius: $yjyf-radius-pill;
+		color: $yjyf-text-inverse;
+		font-size: $yjyf-font-sub;
+		font-weight: 600;
+		background: $yjyf-gradient-primary;
+	}
+
+	.empty-box {
+		padding: 160rpx 40rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.empty-ico {
+		width: 160rpx;
+		height: 160rpx;
+		margin-bottom: $yjyf-space-md;
+	}
+	.empty-title {
+		font-size: $yjyf-font-body;
+		color: $yjyf-text-secondary;
+	}
+	.loading-box {
+		padding: 100rpx 0;
+		text-align: center;
+		font-size: $yjyf-font-sub;
+		color: $yjyf-text-secondary;
 	}
-	.empty, .loading { padding: 80rpx 0; text-align: center; font-size: 24rpx; color: #9A9A9A; }
 </style>
diff --git a/yjyf-app/static/favicon.svg b/yjyf-app/static/favicon.svg
new file mode 100644
index 0000000..66cbcaa
--- /dev/null
+++ b/yjyf-app/static/favicon.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" width="64" height="64">
+  <defs>
+    <linearGradient id="yjyfFavGrad" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#FFA93F" />
+      <stop offset="100%" stop-color="#F0710D" />
+    </linearGradient>
+  </defs>
+  <rect x="4" y="4" width="56" height="56" rx="16" fill="url(#yjyfFavGrad)" />
+  <path d="M32 14L48 25V46C48 48.2 46.2 50 44 50H36V36H28V50H20C17.8 50 16 48.2 16 46V25L32 14Z" fill="#FFFFFF" />
+  <circle cx="32" cy="27" r="3.5" fill="#F0710D" />
+</svg>
diff --git a/yjyf-app/static/icons/arrow-right-blue.svg b/yjyf-app/static/icons/arrow-right-blue.svg
new file mode 100644
index 0000000..7bfe58d
--- /dev/null
+++ b/yjyf-app/static/icons/arrow-right-blue.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M9 6L15 12L9 18" stroke="#4A7CFF" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/avatar-master.svg b/yjyf-app/static/icons/avatar-master.svg
new file mode 100644
index 0000000..9b99fec
--- /dev/null
+++ b/yjyf-app/static/icons/avatar-master.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" fill="none">
+  <circle cx="32" cy="32" r="32" fill="#FFF7F0"/>
+  <path d="M20 26C20 19.3726 25.3726 14 32 14C38.6274 14 44 19.3726 44 26H20Z" fill="#F0710D"/>
+  <rect x="17" y="25" width="30" height="4" rx="2" fill="#FFA93F"/>
+  <circle cx="32" cy="33" r="8" fill="#F9B872"/>
+  <path d="M16 54C16 45.7157 23.1634 40 32 40C40.8366 40 48 45.7157 48 54" fill="#F0710D"/>
+  <path d="M27 40L32 47L37 40" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/avatar-member.svg b/yjyf-app/static/icons/avatar-member.svg
new file mode 100644
index 0000000..0e5f007
--- /dev/null
+++ b/yjyf-app/static/icons/avatar-member.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" fill="none">
+  <circle cx="32" cy="32" r="32" fill="#FFF7F0"/>
+  <circle cx="32" cy="25" r="10" fill="#FFA93F"/>
+  <path d="M16 53C16 44.1634 23.1634 38 32 38C40.8366 38 48 44.1634 48 53" fill="#F0710D"/>
+</svg>
diff --git a/yjyf-app/static/icons/banner-deco-brand.svg b/yjyf-app/static/icons/banner-deco-brand.svg
new file mode 100644
index 0000000..b865266
--- /dev/null
+++ b/yjyf-app/static/icons/banner-deco-brand.svg
@@ -0,0 +1,11 @@
+<svg width="180" height="120" viewBox="0 0 180 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="brdGlow" x1="40" y1="0" x2="180" y2="110" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#FFA93F" stop-opacity="0.18"/>
+      <stop offset="100%" stop-color="#F0710D" stop-opacity="0.02"/>
+    </linearGradient>
+  </defs>
+  <circle cx="152" cy="24" r="64" fill="url(#brdGlow)"/>
+  <circle cx="152" cy="24" r="38" stroke="#F0710D" stroke-opacity="0.1" stroke-width="1.5" stroke-dasharray="4 4"/>
+  <path d="M144 16L152 12L160 16V24.5C160 29.8 156.5 34.6 152 36.5C147.5 34.6 144 29.8 144 24.5V16Z" stroke="#F0710D" stroke-opacity="0.16" stroke-width="1.8" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/banner-deco-service.svg b/yjyf-app/static/icons/banner-deco-service.svg
new file mode 100644
index 0000000..4c3b74d
--- /dev/null
+++ b/yjyf-app/static/icons/banner-deco-service.svg
@@ -0,0 +1,16 @@
+<svg width="180" height="120" viewBox="0 0 180 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="srvGlow1" x1="20" y1="0" x2="170" y2="120" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#FFA93F" stop-opacity="0.22"/>
+      <stop offset="100%" stop-color="#F0710D" stop-opacity="0.06"/>
+    </linearGradient>
+    <linearGradient id="srvGlow2" x1="70" y1="10" x2="165" y2="105" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#F0710D" stop-opacity="0.16"/>
+      <stop offset="100%" stop-color="#FFA93F" stop-opacity="0.03"/>
+    </linearGradient>
+  </defs>
+  <circle cx="142" cy="60" r="68" fill="url(#srvGlow1)"/>
+  <circle cx="146" cy="62" r="44" fill="url(#srvGlow2)"/>
+  <path d="M126 38C126 33.5817 129.582 30 134 30H150C154.418 30 158 33.5817 158 38V54C158 67.2548 147.255 78 134 78V78C129.582 78 126 74.4183 126 70V38Z" stroke="#F0710D" stroke-opacity="0.14" stroke-width="2"/>
+  <path d="M136 52L141 57L151 46" stroke="#F0710D" stroke-opacity="0.2" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/check-gray.svg b/yjyf-app/static/icons/check-gray.svg
new file mode 100644
index 0000000..42791b5
--- /dev/null
+++ b/yjyf-app/static/icons/check-gray.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M5 12.5L9.8 17.3L19 7.8" stroke="#C8C7CC" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/chevron-up-orange.svg b/yjyf-app/static/icons/chevron-up-orange.svg
new file mode 100644
index 0000000..4ac6351
--- /dev/null
+++ b/yjyf-app/static/icons/chevron-up-orange.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M6 15L12 9L18 15" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/chevron-up-white.svg b/yjyf-app/static/icons/chevron-up-white.svg
new file mode 100644
index 0000000..28e221a
--- /dev/null
+++ b/yjyf-app/static/icons/chevron-up-white.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M6 15L12 9L18 15" stroke="#FFFFFF" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/close-orange.svg b/yjyf-app/static/icons/close-orange.svg
new file mode 100644
index 0000000..0122ede
--- /dev/null
+++ b/yjyf-app/static/icons/close-orange.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M17 7L7 17M7 7L17 17" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/empty-address.svg b/yjyf-app/static/icons/empty-address.svg
new file mode 100644
index 0000000..ed98573
--- /dev/null
+++ b/yjyf-app/static/icons/empty-address.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" fill="none">
+  <circle cx="60" cy="60" r="48" fill="#FFF7F0"/>
+  <path d="M60 28C46.7452 28 36 38.7452 36 52C36 69.5 60 88 60 88C60 88 84 69.5 84 52C84 38.7452 73.2548 28 60 28Z" fill="#FFFFFF" stroke="#F0710D" stroke-width="2.5" stroke-linejoin="round"/>
+  <circle cx="60" cy="52" r="9" fill="#FFA93F"/>
+  <ellipse cx="60" cy="92" rx="18" ry="4" fill="#FDE3CE"/>
+</svg>
diff --git a/yjyf-app/static/icons/empty-coupon.svg b/yjyf-app/static/icons/empty-coupon.svg
new file mode 100644
index 0000000..e604a02
--- /dev/null
+++ b/yjyf-app/static/icons/empty-coupon.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" fill="none">
+  <circle cx="60" cy="60" r="48" fill="#FFF7F0"/>
+  <path d="M26 44C26 40.6863 28.6863 38 32 38H88C91.3137 38 94 40.6863 94 44V53C89.5817 53 86 56.5817 86 61C86 65.4183 89.5817 69 94 69V76C94 79.3137 91.3137 82 88 82H32C28.6863 82 26 79.3137 26 76V69C30.4183 69 34 65.4183 34 61C34 56.5817 30.4183 53 26 53V44Z" fill="#FFFFFF" stroke="#F0710D" stroke-width="2.5"/>
+  <path d="M52 44V76" stroke="#FFA93F" stroke-width="2" stroke-dasharray="4 4"/>
+  <path d="M64 55H80M64 65H74" stroke="#F5CBA7" stroke-width="3" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/empty-gallery.svg b/yjyf-app/static/icons/empty-gallery.svg
new file mode 100644
index 0000000..e44b422
--- /dev/null
+++ b/yjyf-app/static/icons/empty-gallery.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="160" height="128" viewBox="0 0 160 128" fill="none">
+  <ellipse cx="80" cy="110" rx="52" ry="8" fill="#F0F0F2"/>
+  <rect x="34" y="24" width="92" height="72" rx="12" fill="#FFF7F0" stroke="#FFA93F" stroke-width="2"/>
+  <circle cx="60" cy="48" r="8" fill="#FFA93F" fill-opacity="0.35"/>
+  <path d="M42 84L65 61C67.2 58.8 70.8 58.8 73 61L91 79L103 67C105.2 64.8 108.8 64.8 111 67L118 74V84C118 87.3 115.3 90 112 90H48C44.7 90 42 87.3 42 84Z" fill="#FFA93F" fill-opacity="0.28"/>
+  <circle cx="116" cy="84" r="16" fill="#FFFFFF" stroke="#F0710D" stroke-width="2"/>
+  <path d="M116 77V91M109 84H123" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/empty-invoice-records.svg b/yjyf-app/static/icons/empty-invoice-records.svg
new file mode 100644
index 0000000..419d5da
--- /dev/null
+++ b/yjyf-app/static/icons/empty-invoice-records.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="160" height="160" viewBox="0 0 160 160" fill="none">
+  <defs>
+    <linearGradient id="bgRec" x1="24" y1="20" x2="136" y2="140" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#FFF7F0"/>
+      <stop offset="100%" stop-color="#FFEAD6"/>
+    </linearGradient>
+    <linearGradient id="accentRec" x1="50" y1="36" x2="110" y2="118" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#FFA93F"/>
+      <stop offset="100%" stop-color="#F0710D"/>
+    </linearGradient>
+  </defs>
+  <circle cx="80" cy="84" r="54" fill="url(#bgRec)"/>
+  <path d="M48 40C48 35.5817 51.5817 32 56 32H104C108.418 32 112 35.5817 112 40V122L103 116L94 122L85 116L76 122L67 116L58 122L48 116V40Z" fill="#FFFFFF" stroke="#F5CBA7" stroke-width="2.5" stroke-linejoin="round"/>
+  <rect x="60" y="48" width="26" height="8" rx="4" fill="url(#accentRec)" opacity="0.9"/>
+  <rect x="60" y="66" width="40" height="6" rx="3" fill="#EDEFF2"/>
+  <rect x="60" y="80" width="32" height="6" rx="3" fill="#EDEFF2"/>
+  <path d="M56 98H104" stroke="#F0F0F2" stroke-width="2" stroke-dasharray="4 4"/>
+  <circle cx="108" cy="108" r="18" fill="url(#accentRec)"/>
+  <path d="M101 108H115M108 101V115" stroke="#FFFFFF" stroke-width="2.8" stroke-linecap="round" opacity="0.95"/>
+</svg>
diff --git a/yjyf-app/static/icons/empty-invoice-titles.svg b/yjyf-app/static/icons/empty-invoice-titles.svg
new file mode 100644
index 0000000..a963a55
--- /dev/null
+++ b/yjyf-app/static/icons/empty-invoice-titles.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="160" height="160" viewBox="0 0 160 160" fill="none">
+  <defs>
+    <linearGradient id="bgTit" x1="24" y1="24" x2="136" y2="136" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#FFF7F0"/>
+      <stop offset="100%" stop-color="#FFEAD6"/>
+    </linearGradient>
+    <linearGradient id="accentTit" x1="40" y1="48" x2="120" y2="112" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#FFA93F"/>
+      <stop offset="100%" stop-color="#F0710D"/>
+    </linearGradient>
+  </defs>
+  <circle cx="80" cy="84" r="54" fill="url(#bgTit)"/>
+  <rect x="34" y="48" width="92" height="66" rx="12" fill="#FFFFFF" stroke="#F5CBA7" stroke-width="2.5"/>
+  <path d="M34 64H126" stroke="#FFF0E3" stroke-width="3"/>
+  <circle cx="56" cy="84" r="10" fill="#FFF7F0" stroke="url(#accentTit)" stroke-width="2.4"/>
+  <circle cx="56" cy="81" r="3.2" fill="#F0710D"/>
+  <path d="M50.5 90C51.8 87.6 53.7 86.5 56 86.5C58.3 86.5 60.2 87.6 61.5 90" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round"/>
+  <rect x="74" y="76" width="38" height="6" rx="3" fill="url(#accentTit)" opacity="0.85"/>
+  <rect x="74" y="88" width="28" height="6" rx="3" fill="#EDEFF2"/>
+</svg>
diff --git a/yjyf-app/static/icons/empty-message.svg b/yjyf-app/static/icons/empty-message.svg
new file mode 100644
index 0000000..abcc86e
--- /dev/null
+++ b/yjyf-app/static/icons/empty-message.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" fill="none">
+  <circle cx="60" cy="60" r="48" fill="#FFF7F0"/>
+  <path d="M32 42C32 37.5817 35.5817 34 40 34H80C84.4183 34 88 37.5817 88 42V68C88 72.4183 84.4183 76 80 76H54L40 86V76C35.5817 76 32 72.4183 32 68V42Z" fill="#FFFFFF" stroke="#F0710D" stroke-width="2.5" stroke-linejoin="round"/>
+  <circle cx="48" cy="55" r="3.5" fill="#FFA93F"/>
+  <circle cx="60" cy="55" r="3.5" fill="#FFA93F"/>
+  <circle cx="72" cy="55" r="3.5" fill="#FFA93F"/>
+</svg>
diff --git a/yjyf-app/static/icons/empty-orders.svg b/yjyf-app/static/icons/empty-orders.svg
new file mode 100644
index 0000000..d071d81
--- /dev/null
+++ b/yjyf-app/static/icons/empty-orders.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" fill="none">
+  <circle cx="60" cy="60" r="48" fill="#FFF7F0"/>
+  <rect x="36" y="28" width="48" height="62" rx="8" fill="#FFFFFF" stroke="#F0710D" stroke-width="2.5"/>
+  <rect x="48" y="22" width="24" height="10" rx="5" fill="#FFA93F"/>
+  <path d="M46 48H74M46 60H74M46 72H62" stroke="#F5CBA7" stroke-width="3" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/empty-review.svg b/yjyf-app/static/icons/empty-review.svg
new file mode 100644
index 0000000..024b866
--- /dev/null
+++ b/yjyf-app/static/icons/empty-review.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" fill="none">
+  <circle cx="60" cy="60" r="48" fill="#FFF7F0"/>
+  <path d="M60 30L67.6 45.4L84.6 47.9L72.3 59.9L75.2 76.8L60 68.8L44.8 76.8L47.7 59.9L35.4 47.9L52.4 45.4L60 30Z" fill="#FFFFFF" stroke="#F0710D" stroke-width="2.5" stroke-linejoin="round"/>
+  <circle cx="60" cy="56" r="6" fill="#FFA93F"/>
+</svg>
diff --git a/yjyf-app/static/icons/empty-service.svg b/yjyf-app/static/icons/empty-service.svg
new file mode 100644
index 0000000..2387d73
--- /dev/null
+++ b/yjyf-app/static/icons/empty-service.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" fill="none">
+  <circle cx="60" cy="60" r="48" fill="#FFF7F0"/>
+  <circle cx="56" cy="56" r="20" fill="#FFFFFF" stroke="#F0710D" stroke-width="2.5"/>
+  <path d="M71 71L85 85" stroke="#FFA93F" stroke-width="4" stroke-linecap="round"/>
+  <path d="M49 56H63" stroke="#F5CBA7" stroke-width="3" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-addr-card.svg b/yjyf-app/static/icons/invoice-addr-card.svg
new file mode 100644
index 0000000..04b8ab7
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-addr-card.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40" fill="none">
+  <defs>
+    <linearGradient id="g" x1="0" y1="0" x2="40" y2="40" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#FFA93F"/>
+      <stop offset="100%" stop-color="#F0710D"/>
+    </linearGradient>
+  </defs>
+  <rect width="40" height="40" rx="20" fill="url(#g)"/>
+  <path d="M13 13.5C13 12.6716 13.6716 12 14.5 12H25.5C26.3284 12 27 12.6716 27 13.5V28L24.2 26.4L21.4 28L18.6 26.4L15.8 28L13 26.4V13.5Z" stroke="#FFFFFF" stroke-width="2" stroke-linejoin="round"/>
+  <path d="M16.8 17.5H23.2M16.8 21.5H21.2" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-check-off.svg b/yjyf-app/static/icons/invoice-check-off.svg
new file mode 100644
index 0000000..0d5edf1
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-check-off.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="44" height="44" viewBox="0 0 24 24" fill="none">
+  <circle cx="12" cy="12" r="9.5" stroke="#C8C7CC" stroke-width="1.8" fill="#FFFFFF"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-check-on.svg b/yjyf-app/static/icons/invoice-check-on.svg
new file mode 100644
index 0000000..9493304
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-check-on.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="44" height="44" viewBox="0 0 24 24" fill="none">
+  <circle cx="12" cy="12" r="10" fill="#F0710D"/>
+  <path d="M7.5 12.2l3 3 6-6.2" stroke="#FFFFFF" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-copy.svg b/yjyf-app/static/icons/invoice-copy.svg
new file mode 100644
index 0000000..27ab2cb
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-copy.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="#888888" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <rect x="9" y="9" width="11" height="11" rx="2"/>
+  <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-cta-orange.svg b/yjyf-app/static/icons/invoice-cta-orange.svg
new file mode 100644
index 0000000..85e2b5d
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-cta-orange.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
+  <path d="M8 7.5C8 6.67157 8.67157 6 9.5 6H22.5C23.3284 6 24 6.67157 24 7.5V26L21 24.2L18 26L15 24.2L12 26L8 24.2V7.5Z" stroke="#F0710D" stroke-width="2.2" stroke-linejoin="round"/>
+  <path d="M12.5 13H19.5" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round"/>
+  <path d="M12.5 18.2L14.8 20.5L19.8 15.8" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-edit.svg b/yjyf-app/static/icons/invoice-edit.svg
new file mode 100644
index 0000000..d96c78d
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-edit.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="#444444" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M12 20h9"/>
+  <path d="M16.5 3.5a2.121 2.121 0 0 1 3 3L7 19l-4 1 1-4L16.5 3.5z"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-enterprise.svg b/yjyf-app/static/icons/invoice-enterprise.svg
new file mode 100644
index 0000000..3ebcb82
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-enterprise.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48" fill="none">
+  <rect width="48" height="48" rx="14" fill="#F0F5FF"/>
+  <rect x="13" y="12" width="14" height="24" rx="2.5" stroke="#4A7CFF" stroke-width="2.2"/>
+  <path d="M27 20H33C34.1046 20 35 20.8954 35 22V36H27" stroke="#4A7CFF" stroke-width="2.2" stroke-linejoin="round"/>
+  <path d="M17.5 17.5H22.5M17.5 22.5H22.5M17.5 27.5H22.5" stroke="#4A7CFF" stroke-width="2.2" stroke-linecap="round"/>
+  <path d="M10.5 36H37.5" stroke="#4A7CFF" stroke-width="2.2" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-file.svg b/yjyf-app/static/icons/invoice-file.svg
new file mode 100644
index 0000000..a75bd23
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-file.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="#F0710D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/>
+  <polyline points="14 2 14 8 20 8"/>
+  <line x1="8" y1="13" x2="16" y2="13"/>
+  <line x1="8" y1="17" x2="13" y2="17"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-hero-watermark.svg b/yjyf-app/static/icons/invoice-hero-watermark.svg
new file mode 100644
index 0000000..6ada89d
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-hero-watermark.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="160" height="160" viewBox="0 0 160 160" fill="none">
+  <g opacity="0.16">
+    <path d="M38 26C38 20.4772 42.4772 16 48 16H112C117.523 16 122 20.4772 122 26V138L110 130L98 138L86 130L74 138L62 130L50 138L38 130V26Z" stroke="#FFFFFF" stroke-width="5" stroke-linejoin="round"/>
+    <path d="M56 46H104M56 66H92M56 86H80" stroke="#FFFFFF" stroke-width="5" stroke-linecap="round"/>
+    <circle cx="104" cy="96" r="22" stroke="#FFFFFF" stroke-width="4.5" stroke-dasharray="6 5"/>
+    <circle cx="104" cy="96" r="14" stroke="#FFFFFF" stroke-width="3.5"/>
+    <path d="M98 96L102.5 100.5L111 92" stroke="#FFFFFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+  </g>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-mail-orange.svg b/yjyf-app/static/icons/invoice-mail-orange.svg
new file mode 100644
index 0000000..c1db8c7
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-mail-orange.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
+  <rect width="32" height="32" rx="8" fill="#FFF7F0"/>
+  <rect x="7" y="9" width="18" height="14" rx="3" stroke="#F0710D" stroke-width="1.9"/>
+  <path d="M8.5 11L16 16.2L23.5 11" stroke="#F0710D" stroke-width="1.9" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-pass-watermark.svg b/yjyf-app/static/icons/invoice-pass-watermark.svg
new file mode 100644
index 0000000..77f95c7
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-pass-watermark.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="120" height="120" viewBox="0 0 120 120" fill="none">
+  <g opacity="0.07">
+    <rect x="18" y="24" width="84" height="68" rx="12" stroke="#F0710D" stroke-width="4"/>
+    <path d="M18 44H102" stroke="#F0710D" stroke-width="4"/>
+    <circle cx="40" cy="66" r="9" stroke="#F0710D" stroke-width="3.5"/>
+    <path d="M60 60H88M60 73H80" stroke="#F0710D" stroke-width="4" stroke-linecap="round"/>
+  </g>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-personal.svg b/yjyf-app/static/icons/invoice-personal.svg
new file mode 100644
index 0000000..59b7d22
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-personal.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48" fill="none">
+  <rect width="48" height="48" rx="14" fill="#FFF7F0"/>
+  <circle cx="24" cy="18.5" r="5.5" stroke="#F0710D" stroke-width="2.2"/>
+  <path d="M14 34.5C14 29.8056 18.4772 26.5 24 26.5C29.5228 26.5 34 29.8056 34 34.5" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-plus-white.svg b/yjyf-app/static/icons/invoice-plus-white.svg
new file mode 100644
index 0000000..01a2452
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-plus-white.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 24 24" fill="none" stroke="#FFFFFF" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round">
+  <line x1="12" y1="5" x2="12" y2="19"/>
+  <line x1="5" y1="12" x2="19" y2="12"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-portal-order.svg b/yjyf-app/static/icons/invoice-portal-order.svg
new file mode 100644
index 0000000..c9dd7b8
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-portal-order.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48" fill="none">
+  <rect width="48" height="48" rx="14" fill="#FFF7F0"/>
+  <path d="M15 13C15 11.8954 15.8954 11 17 11H31C32.1046 11 33 11.8954 33 13V35L29.5 33L26 35L22.5 33L19 35L15 33V13Z" stroke="#F0710D" stroke-width="2.2" stroke-linejoin="round"/>
+  <path d="M20 18.5H28" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round"/>
+  <path d="M20 25L22.6 27.5L28.5 22" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-portal-record.svg b/yjyf-app/static/icons/invoice-portal-record.svg
new file mode 100644
index 0000000..189497e
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-portal-record.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48" fill="none">
+  <rect width="48" height="48" rx="14" fill="#F0F5FF"/>
+  <path d="M29 12H16C14.8954 12 14 12.8954 14 14V34C14 35.1046 14.8954 36 16 36H25" stroke="#4A7CFF" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M18.5 18.5H26.5M18.5 24H23.5" stroke="#4A7CFF" stroke-width="2.2" stroke-linecap="round"/>
+  <circle cx="31" cy="30" r="6" stroke="#4A7CFF" stroke-width="2.2"/>
+  <path d="M31 27.5V30.3L32.8 31.5" stroke="#4A7CFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-portal-title.svg b/yjyf-app/static/icons/invoice-portal-title.svg
new file mode 100644
index 0000000..efae347
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-portal-title.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48" fill="none">
+  <rect width="48" height="48" rx="14" fill="#EEFBF2"/>
+  <rect x="12" y="14" width="24" height="20" rx="4" stroke="#2FA84F" stroke-width="2.2"/>
+  <circle cx="19.5" cy="22.5" r="2.8" stroke="#2FA84F" stroke-width="2"/>
+  <path d="M15.5 29.5C16.3 27.6 17.8 26.8 19.5 26.8C21.2 26.8 22.7 27.6 23.5 29.5" stroke="#2FA84F" stroke-width="2" stroke-linecap="round"/>
+  <path d="M26.5 20.5H32M26.5 25.5H31" stroke="#2FA84F" stroke-width="2.2" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-record-white.svg b/yjyf-app/static/icons/invoice-record-white.svg
new file mode 100644
index 0000000..4e53d93
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-record-white.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M6 3h12a2 2 0 0 1 2 2v16l-3-2-3 2-3-2-3 2-3-2V5a2 2 0 0 1 2-2z"/>
+  <line x1="8.5" y1="8.5" x2="15.5" y2="8.5"/>
+  <line x1="8.5" y1="12.5" x2="15.5" y2="12.5"/>
+  <line x1="8.5" y1="16" x2="12.5" y2="16"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-seal-special.svg b/yjyf-app/static/icons/invoice-seal-special.svg
new file mode 100644
index 0000000..8c0da4e
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-seal-special.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28" fill="none">
+  <path d="M14 3L23 6.8V13.5C23 19.1 19.2 23.8 14 25.5C8.8 23.8 5 19.1 5 13.5V6.8L14 3Z" fill="#EEFBF2" stroke="#2FA84F" stroke-width="1.8" stroke-linejoin="round"/>
+  <path d="M10.2 14.2L12.8 16.8L18 11.4" stroke="#2FA84F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-section-doc.svg b/yjyf-app/static/icons/invoice-section-doc.svg
new file mode 100644
index 0000000..c50720f
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-section-doc.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
+  <rect width="32" height="32" rx="8" fill="#FFF7F0"/>
+  <path d="M9.5 8.5C9.5 7.67157 10.1716 7 11 7H21C21.8284 7 22.5 7.67157 22.5 8.5V24.5L19.9 22.9L17.3 24.5L14.7 22.9L12.1 24.5L9.5 22.9V8.5Z" stroke="#F0710D" stroke-width="1.9" stroke-linejoin="round"/>
+  <path d="M13 12.5H19M13 16.5H17" stroke="#F0710D" stroke-width="1.9" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-status-err.svg b/yjyf-app/static/icons/invoice-status-err.svg
new file mode 100644
index 0000000..67af7ed
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-status-err.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="56" height="56" viewBox="0 0 24 24" fill="none">
+  <circle cx="12" cy="12" r="10" fill="#FFFFFF" fill-opacity="0.22"/>
+  <circle cx="12" cy="12" r="8" stroke="#FFFFFF" stroke-width="2"/>
+  <line x1="12" y1="8" x2="12" y2="12.5" stroke="#FFFFFF" stroke-width="2.2" stroke-linecap="round"/>
+  <circle cx="12" cy="15.8" r="1.1" fill="#FFFFFF"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-status-ok.svg b/yjyf-app/static/icons/invoice-status-ok.svg
new file mode 100644
index 0000000..f3b2dd3
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-status-ok.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="56" height="56" viewBox="0 0 24 24" fill="none">
+  <circle cx="12" cy="12" r="10" fill="#FFFFFF" fill-opacity="0.22"/>
+  <circle cx="12" cy="12" r="8" stroke="#FFFFFF" stroke-width="2"/>
+  <path d="M8.5 12.2l2.4 2.5 4.8-5" stroke="#FFFFFF" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-status-wait.svg b/yjyf-app/static/icons/invoice-status-wait.svg
new file mode 100644
index 0000000..1d56b45
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-status-wait.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="56" height="56" viewBox="0 0 24 24" fill="none">
+  <circle cx="12" cy="12" r="10" fill="#FFFFFF" fill-opacity="0.22"/>
+  <circle cx="12" cy="12" r="8" stroke="#FFFFFF" stroke-width="2"/>
+  <path d="M12 8v4.5l3 1.8" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-step-check.svg b/yjyf-app/static/icons/invoice-step-check.svg
new file mode 100644
index 0000000..b1700ca
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-step-check.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48" fill="none">
+  <defs>
+    <linearGradient id="chkGrad" x1="6" y1="6" x2="42" y2="42" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#FFA93F"/>
+      <stop offset="100%" stop-color="#F0710D"/>
+    </linearGradient>
+  </defs>
+  <circle cx="24" cy="24" r="20" fill="url(#chkGrad)" opacity="0.14"/>
+  <circle cx="24" cy="24" r="14" fill="url(#chkGrad)"/>
+  <path d="M18.2 24.2L22.1 28.1L29.8 20.2" stroke="#FFFFFF" stroke-width="2.6" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-title-orange.svg b/yjyf-app/static/icons/invoice-title-orange.svg
new file mode 100644
index 0000000..e614394
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-title-orange.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="#F0710D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <rect x="3" y="4" width="18" height="16" rx="2.5"/>
+  <circle cx="8.5" cy="10.5" r="2"/>
+  <path d="M5.5 16c.6-1.6 1.7-2.5 3-2.5s2.4.9 3 2.5"/>
+  <line x1="14" y1="9.5" x2="18" y2="9.5"/>
+  <line x1="14" y1="13.5" x2="17" y2="13.5"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-title-white.svg b/yjyf-app/static/icons/invoice-title-white.svg
new file mode 100644
index 0000000..2280b7b
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-title-white.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <rect x="3" y="4" width="18" height="16" rx="2.5"/>
+  <circle cx="8.5" cy="10.5" r="2"/>
+  <path d="M5.5 16c.6-1.6 1.7-2.5 3-2.5s2.4.9 3 2.5"/>
+  <line x1="14" y1="9.5" x2="18" y2="9.5"/>
+  <line x1="14" y1="13.5" x2="17" y2="13.5"/>
+</svg>
diff --git a/yjyf-app/static/icons/invoice-wx.svg b/yjyf-app/static/icons/invoice-wx.svg
new file mode 100644
index 0000000..0c5ccc6
--- /dev/null
+++ b/yjyf-app/static/icons/invoice-wx.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="44" height="44" viewBox="0 0 24 24" fill="none">
+  <circle cx="12" cy="12" r="10" fill="#2FA84F"/>
+  <path d="M8.5 10.5c0-1.9 1.8-3.5 4-3.5s4 1.6 4 3.5-1.8 3.5-4 3.5c-.5 0-1-.1-1.5-.2L9 14.8l.4-1.6c-.6-.7-.9-1.6-.9-2.7z" fill="#FFFFFF"/>
+</svg>
diff --git a/yjyf-app/static/icons/master/empty-appeal.svg b/yjyf-app/static/icons/master/empty-appeal.svg
new file mode 100644
index 0000000..a2c56d2
--- /dev/null
+++ b/yjyf-app/static/icons/master/empty-appeal.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" fill="none">
+  <circle cx="60" cy="60" r="48" fill="#FFF7F0"/>
+  <path d="M60 28L86 38V58C86 73.5 74.8 86.2 60 91C45.2 86.2 34 73.5 34 58V38L60 28Z" fill="#FFFFFF" stroke="#F0710D" stroke-width="2.5" stroke-linejoin="round"/>
+  <path d="M51 58L57 64L70 51" stroke="#FFA93F" stroke-width="3.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/master/empty-quote.svg b/yjyf-app/static/icons/master/empty-quote.svg
new file mode 100644
index 0000000..cfec600
--- /dev/null
+++ b/yjyf-app/static/icons/master/empty-quote.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" fill="none">
+  <circle cx="60" cy="60" r="48" fill="#FFF7F0"/>
+  <rect x="34" y="30" width="52" height="60" rx="8" fill="#FFFFFF" stroke="#F0710D" stroke-width="2.5"/>
+  <circle cx="60" cy="52" r="11" fill="#FFF7F0" stroke="#FFA93F" stroke-width="2.2"/>
+  <path d="M56 49L60 53L64 49M60 49V58M56 54H64" stroke="#F0710D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M46 73H74" stroke="#F5CBA7" stroke-width="3" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/master/menu-review.svg b/yjyf-app/static/icons/master/menu-review.svg
new file mode 100644
index 0000000..c2102ae
--- /dev/null
+++ b/yjyf-app/static/icons/master/menu-review.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M12 3.5L14.6 8.8L20.4 9.6L16.2 13.7L17.2 19.5L12 16.8L6.8 19.5L7.8 13.7L3.6 9.6L9.4 8.8L12 3.5Z" stroke="#F0710D" stroke-width="1.9" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/media-del-white.svg b/yjyf-app/static/icons/media-del-white.svg
new file mode 100644
index 0000000..ff28e41
--- /dev/null
+++ b/yjyf-app/static/icons/media-del-white.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M7 7L17 17M17 7L7 17" stroke="#FFFFFF" stroke-width="2.2" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/menu-agreement.svg b/yjyf-app/static/icons/menu-agreement.svg
new file mode 100644
index 0000000..7879e11
--- /dev/null
+++ b/yjyf-app/static/icons/menu-agreement.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48" fill="none">
+  <rect x="9" y="6" width="30" height="36" rx="5" fill="#FFF7ED" stroke="#F0710D" stroke-width="3"/>
+  <path d="M16 16H32" stroke="#F0710D" stroke-width="3" stroke-linecap="round"/>
+  <path d="M16 24H32" stroke="#F0710D" stroke-width="3" stroke-linecap="round"/>
+  <path d="M16 32H24" stroke="#F98D25" stroke-width="3" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/menu-gallery.svg b/yjyf-app/static/icons/menu-gallery.svg
new file mode 100644
index 0000000..88692a8
--- /dev/null
+++ b/yjyf-app/static/icons/menu-gallery.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48" fill="none">
+  <rect x="6" y="9" width="36" height="30" rx="5" fill="#FFF7ED" stroke="#F0710D" stroke-width="3"/>
+  <circle cx="16.5" cy="18.5" r="3.5" fill="#F0710D"/>
+  <path d="M9 35L19 25L26 32L32 26L40 35" stroke="#F0710D" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/menu-subaccount.svg b/yjyf-app/static/icons/menu-subaccount.svg
new file mode 100644
index 0000000..b96e368
--- /dev/null
+++ b/yjyf-app/static/icons/menu-subaccount.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48" fill="none">
+  <circle cx="19" cy="17" r="7" fill="#FFF7ED" stroke="#F0710D" stroke-width="3"/>
+  <path d="M7 38C7 31.9249 11.9249 27 18 27H20C26.0751 27 31 31.9249 31 38" fill="#FFF7ED" stroke="#F0710D" stroke-width="3" stroke-linecap="round"/>
+  <circle cx="33" cy="18" r="5" fill="#FFF7ED" stroke="#F98D25" stroke-width="2.8"/>
+  <path d="M34 27.5C38.5 28.2 42 32.1 42 37" stroke="#F98D25" stroke-width="2.8" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/merchant-edit.svg b/yjyf-app/static/icons/merchant-edit.svg
new file mode 100644
index 0000000..92772cc
--- /dev/null
+++ b/yjyf-app/static/icons/merchant-edit.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" fill="none">
+  <rect width="48" height="48" rx="14" fill="#FFF7F0"/>
+  <path d="M28.5 14.5L33.5 19.5L21 32H16V27L28.5 14.5Z" stroke="#F0710D" stroke-width="2.4" stroke-linejoin="round"/>
+  <path d="M15 35H33" stroke="#FFA93F" stroke-width="2.4" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/merchant-orders.svg b/yjyf-app/static/icons/merchant-orders.svg
new file mode 100644
index 0000000..17729b8
--- /dev/null
+++ b/yjyf-app/static/icons/merchant-orders.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" fill="none">
+  <rect width="48" height="48" rx="14" fill="#FFF7F0"/>
+  <rect x="14" y="12" width="20" height="24" rx="4" stroke="#F0710D" stroke-width="2.4"/>
+  <path d="M19 20H29M19 25H29M19 30H25" stroke="#FFA93F" stroke-width="2.4" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/order-verify.svg b/yjyf-app/static/icons/order-verify.svg
new file mode 100644
index 0000000..4389093
--- /dev/null
+++ b/yjyf-app/static/icons/order-verify.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48" fill="none">
+  <path d="M24 6L39 12V23C39 32.8 32.6 40.6 24 43C15.4 40.6 9 32.8 9 23V12L24 6Z" fill="#FFF7ED" stroke="#F0710D" stroke-width="3" stroke-linejoin="round"/>
+  <path d="M17.5 24.5L22 29L31 19.5" stroke="#F0710D" stroke-width="3.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/order-wait.svg b/yjyf-app/static/icons/order-wait.svg
new file mode 100644
index 0000000..107b508
--- /dev/null
+++ b/yjyf-app/static/icons/order-wait.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48" fill="none">
+  <rect x="9" y="8" width="30" height="34" rx="5" fill="#FFF7ED" stroke="#F0710D" stroke-width="3"/>
+  <path d="M18 8V6C18 4.89543 18.8954 4 20 4H28C29.1046 4 30 4.89543 30 6V8" stroke="#F0710D" stroke-width="3" stroke-linecap="round"/>
+  <path d="M16 19H32" stroke="#F0710D" stroke-width="3" stroke-linecap="round"/>
+  <path d="M16 27H26" stroke="#F98D25" stroke-width="3" stroke-linecap="round"/>
+  <circle cx="32" cy="31" r="4" fill="#F0710D"/>
+</svg>
diff --git a/yjyf-app/static/icons/plus-orange.svg b/yjyf-app/static/icons/plus-orange.svg
new file mode 100644
index 0000000..ecd9894
--- /dev/null
+++ b/yjyf-app/static/icons/plus-orange.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M12 5V19M5 12H19" stroke="#F0710D" stroke-width="2.4" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/plus-white.svg b/yjyf-app/static/icons/plus-white.svg
new file mode 100644
index 0000000..837642b
--- /dev/null
+++ b/yjyf-app/static/icons/plus-white.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M12 5V19M5 12H19" stroke="#FFFFFF" stroke-width="2.4" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/refresh/check-orange.svg b/yjyf-app/static/icons/refresh/check-orange.svg
new file mode 100644
index 0000000..ac90322
--- /dev/null
+++ b/yjyf-app/static/icons/refresh/check-orange.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <circle cx="12" cy="12" r="9" fill="#2FA84F" fill-opacity="0.12" stroke="#2FA84F" stroke-width="1.8"/>
+  <path d="M8.2 12.3l2.5 2.5 5.2-5.4" stroke="#2FA84F" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/refresh/check-white.svg b/yjyf-app/static/icons/refresh/check-white.svg
new file mode 100644
index 0000000..e015eaa
--- /dev/null
+++ b/yjyf-app/static/icons/refresh/check-white.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <circle cx="12" cy="12" r="9" fill="#FFFFFF" fill-opacity="0.2" stroke="#FFFFFF" stroke-opacity="0.85" stroke-width="1.8"/>
+  <path d="M8.2 12.3l2.5 2.5 5.2-5.4" stroke="#FFFFFF" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/refresh/pull-arrow-orange.svg b/yjyf-app/static/icons/refresh/pull-arrow-orange.svg
new file mode 100644
index 0000000..9680d41
--- /dev/null
+++ b/yjyf-app/static/icons/refresh/pull-arrow-orange.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M4.93 9.5A8 8 0 0 1 19.07 9.5" stroke="#FFA93F" stroke-opacity="0.65" stroke-width="1.8" stroke-linecap="round"/>
+  <path d="M12 5.5v12" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M7.5 13.2L12 17.8l4.5-4.6" stroke="#F0710D" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/refresh/pull-arrow-white.svg b/yjyf-app/static/icons/refresh/pull-arrow-white.svg
new file mode 100644
index 0000000..236f218
--- /dev/null
+++ b/yjyf-app/static/icons/refresh/pull-arrow-white.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M4.93 9.5A8 8 0 0 1 19.07 9.5" stroke="#FFFFFF" stroke-opacity="0.42" stroke-width="1.8" stroke-linecap="round"/>
+  <path d="M12 5.5v12" stroke="#FFFFFF" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M7.5 13.2L12 17.8l4.5-4.6" stroke="#FFFFFF" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/refresh/spinner-orange.svg b/yjyf-app/static/icons/refresh/spinner-orange.svg
new file mode 100644
index 0000000..7e6070b
--- /dev/null
+++ b/yjyf-app/static/icons/refresh/spinner-orange.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <defs>
+    <linearGradient id="yjyfSpinGrad" x1="3" y1="3" x2="21" y2="21" gradientUnits="userSpaceOnUse">
+      <stop offset="0%" stop-color="#FFA93F"/>
+      <stop offset="100%" stop-color="#F0710D"/>
+    </linearGradient>
+  </defs>
+  <circle cx="12" cy="12" r="8.5" stroke="#F0710D" stroke-opacity="0.16" stroke-width="2.4"/>
+  <path d="M12 3.5a8.5 8.5 0 1 1-7.36 12.75" stroke="url(#yjyfSpinGrad)" stroke-width="2.4" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/refresh/spinner-white.svg b/yjyf-app/static/icons/refresh/spinner-white.svg
new file mode 100644
index 0000000..53b21d9
--- /dev/null
+++ b/yjyf-app/static/icons/refresh/spinner-white.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <circle cx="12" cy="12" r="8.5" stroke="#FFFFFF" stroke-opacity="0.24" stroke-width="2.4"/>
+  <path d="M12 3.5a8.5 8.5 0 0 1 8.12 5.98" stroke="#FFFFFF" stroke-width="2.4" stroke-linecap="round"/>
+  <path d="M20.12 14.52A8.5 8.5 0 0 1 6.2 18.2" stroke="#FFFFFF" stroke-opacity="0.72" stroke-width="2.4" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/service-default.svg b/yjyf-app/static/icons/service-default.svg
new file mode 100644
index 0000000..5b5bcb2
--- /dev/null
+++ b/yjyf-app/static/icons/service-default.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" fill="none">
+  <rect width="64" height="64" rx="16" fill="#FFF7F0"/>
+  <path d="M32 16L48 28V46C48 47.1046 47.1046 48 46 48H18C16.8954 48 16 47.1046 16 46V28L32 16Z" stroke="#F0710D" stroke-width="3" stroke-linejoin="round"/>
+  <path d="M27 36L31 40L38 32" stroke="#FFA93F" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/step-minus.svg b/yjyf-app/static/icons/step-minus.svg
new file mode 100644
index 0000000..c557279
--- /dev/null
+++ b/yjyf-app/static/icons/step-minus.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M6 12H18" stroke="#444444" stroke-width="2.2" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/step-plus.svg b/yjyf-app/static/icons/step-plus.svg
new file mode 100644
index 0000000..38672cb
--- /dev/null
+++ b/yjyf-app/static/icons/step-plus.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M12 6V18M6 12H18" stroke="#444444" stroke-width="2.2" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/template-save.svg b/yjyf-app/static/icons/template-save.svg
new file mode 100644
index 0000000..35929d8
--- /dev/null
+++ b/yjyf-app/static/icons/template-save.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <rect x="3.5" y="3.5" width="17" height="17" rx="3.5" fill="#FFF7F0" stroke="#F0710D" stroke-width="1.8"/>
+  <path d="M8 3.5V9H15V3.5" stroke="#F0710D" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M8.5 15H15.5" stroke="#F0710D" stroke-width="1.8" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/upload-orange.svg b/yjyf-app/static/icons/upload-orange.svg
new file mode 100644
index 0000000..eaae8f5
--- /dev/null
+++ b/yjyf-app/static/icons/upload-orange.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M4 16.5V18C4 19.1046 4.89543 20 6 20H18C19.1046 20 20 19.1046 20 18V16.5" stroke="#F0710D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M12 15V4M12 4L7.5 8.5M12 4L16.5 8.5" stroke="#F0710D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/yjyf-app/static/icons/zoom-white.svg b/yjyf-app/static/icons/zoom-white.svg
new file mode 100644
index 0000000..86f8939
--- /dev/null
+++ b/yjyf-app/static/icons/zoom-white.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <circle cx="11" cy="11" r="6.5" stroke="#FFFFFF" stroke-width="2"/>
+  <path d="M16 16L20 20" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round"/>
+  <path d="M11 8.5V13.5M8.5 11H13.5" stroke="#FFFFFF" stroke-width="1.8" stroke-linecap="round"/>
+</svg>
diff --git a/yjyf-app/uni.scss b/yjyf-app/uni.scss
index 5131fab..5201042 100644
--- a/yjyf-app/uni.scss
+++ b/yjyf-app/uni.scss
@@ -46,8 +46,19 @@ $yjyf-radius-sm: 12rpx;
 $yjyf-radius-md: 20rpx;
 $yjyf-radius-lg: 32rpx;
 $yjyf-radius-pill: 999rpx;
+$yjyf-radius-card: $yjyf-radius-md;
 $yjyf-shadow-card: 0 6rpx 20rpx rgba(240, 113, 13, 0.06);
 $yjyf-shadow-bar: 0 -6rpx 24rpx rgba(0, 0, 0, 0.06);
+$yjyf-shadow-button: 0 8rpx 20rpx rgba(240, 113, 13, 0.28);
+
+/* ==================== 8. 语义扩展令牌别名 ==================== */
+$yjyf-primary-border: rgba(240, 113, 13, 0.24);
+$yjyf-text-inverse: #FFFFFF;
+$yjyf-font-lg: 36rpx;
+$yjyf-font-md: $yjyf-font-title;
+$yjyf-font-base: $yjyf-font-body;
+$yjyf-font-sm: $yjyf-font-sub;
+$yjyf-font-xs: $yjyf-font-micro;
 
 /* ==================== 兼容旧版 uni-app 默认变量映射 ==================== */
 $uni-color-primary: $yjyf-primary;
diff --git a/yjyf-app/utils/api.js b/yjyf-app/utils/api.js
index d677d33..85f837e 100644
--- a/yjyf-app/utils/api.js
+++ b/yjyf-app/utils/api.js
@@ -20,12 +20,14 @@ export default {
 	home: () => get('/home/index', {}, { silent: true }),
 	homeFeed: (data) => get('/home/feed', data, { silent: true }),
 	cats: () => get('/home/cats'),
-	services: (data) => get('/home/services', data),
+	services: (data, opt) => get('/home/services', data, opt),
 	specs: (data) => get('/home/specs', data),
+	systemGallery: (data) => get('/home/systemGallery', data),
 	serviceDetail: (id) => get('/home/detail', { id: id }),
-	calc: (data) => get('/home/calc', data),
+	calc: (data, opt) => post('/home/calc', data, Object.assign({ silent: true, allowConcurrent: true }, opt || {})),
 	masterCount: (data) => get('/home/masterCount', data),
 	orderCase: (id) => get('/home/orderCase', { id: id }, { silent: true }),
+	agreement: (type, opt) => get('/home/agreement', { type: type }, opt || { silent: true }),
 
 	/* ---------- 地址 ---------- */
 	addressList: () => get('/address/index'),
@@ -47,6 +49,17 @@ export default {
 	orderChooseQuote: (data) => post('/order/chooseQuote', data),
 	orderPayDiff: (data) => post('/order/payDiff', data),
 	orderShowcase: (data) => post('/order/showcase', data),
+	orderUpdateNote: (data) => post('/order/updateNote', data),
+	orderComplaint: (data) => post('/order/complaint', data),
+	goodsGallery: (data) => get('/order/goodsGallery', data),
+	saveGoodsGallery: (data) => post('/order/saveGoodsGallery', data),
+	deleteGoodsGallery: (data) => post('/order/deleteGoodsGallery', data),
+	goodsTemplates: (data) => get('/order/goodsTemplates', data),
+	saveGoodsTemplate: (data) => post('/order/saveGoodsTemplate', data),
+	deleteGoodsTemplate: (data) => post('/order/deleteGoodsTemplate', data),
+	remarkTemplates: () => get('/order/remarkTemplates'),
+	saveRemarkTemplate: (data) => post('/order/saveRemarkTemplate', data),
+	deleteRemarkTemplate: (data) => post('/order/deleteRemarkTemplate', data),
 
 	/* ---------- 师傅端 ---------- */
 	masterApply: (data) => post('/master/apply', data),
@@ -75,18 +88,31 @@ export default {
 
 	/* ---------- 评价 ---------- */
 	reviewCreate: (data) => post('/review/create', data),
-	reviewList: (masterId) => get('/review/masterList', { master_id: masterId }),
+	reviewList: (masterId) => get('/review/masterList', masterId ? { master_id: masterId } : {}),
 
 	/* ---------- 优惠券 ---------- */
 	couponCenter: () => get('/coupon/center'),
-	couponMy: (data) => get('/coupon/my', data),
+	couponMy: (data, opt) => get('/coupon/my', data, opt),
 	couponReceive: (data) => post('/coupon/receive', data),
 
 	/* ---------- 消息中心 ---------- */
 	messageList: (data) => get('/message/index', data),
 	messageRead: (data) => post('/message/read', data),
 	messageReadAll: (data) => post('/message/readAll', data),
-	messageUnread: (data) => get('/message/unread', data),
+	messageUnread: (data) => get('/message/unread', data, { silent: true }),
+
+	/* ---------- 发票与抬头中心（个人与商家通用） ---------- */
+	invoiceSummary: () => get('/invoice/summary'),
+	invoiceOrders: (data) => get('/invoice/orders', data),
+	invoiceApply: (data) => post('/invoice/apply', data),
+	invoiceRecords: (data) => get('/invoice/records', data),
+	invoiceDetail: (id) => get('/invoice/detail', { id: id }),
+	invoiceCancel: (id) => post('/invoice/cancel', { id: id }),
+	invoiceTitles: () => get('/invoice/titles'),
+	invoiceTitleDetail: (id) => get('/invoice/titleDetail', { id: id }),
+	invoiceTitleSave: (data) => post('/invoice/titleSave', data),
+	invoiceTitleDefault: (id) => post('/invoice/titleDefault', { id: id }),
+	invoiceTitleDelete: (id) => post('/invoice/titleDelete', { id: id }),
 
 	/* ---------- 商家端 ---------- */
 	merchantApply: (data) => post('/merchant/apply', data),
@@ -99,6 +125,34 @@ export default {
 	merchantMembers: () => get('/merchant/members'),
 	merchantBindMember: (data) => post('/merchant/bindMember', data),
 	merchantUnbindMember: (data) => post('/merchant/unbindMember', data),
-	merchantBindBatch: (data) => post('/merchant/bindBatch', data),
-	merchantImportBatch: (data) => post('/merchant/importBatch', data)
+
+	/* ---------- 平台客服统一助手（仅读取后端真实配置，杜绝假号码与并发连击） ---------- */
+	_contactingService: false,
+	contactService: async function () {
+		if (this._contactingService) return;
+		this._contactingService = true;
+		let phone = '';
+		try {
+			phone = uni.getStorageSync('yjyf_service_phone') || '';
+			if (!phone) {
+				const res = await get('/home/index', {}, { silent: true });
+				if (res && res.service_phone) {
+					phone = String(res.service_phone).trim();
+					uni.setStorageSync('yjyf_service_phone', phone);
+				}
+			}
+		} catch (e) {}
+		setTimeout(() => { this._contactingService = false; }, 500);
+		if (phone) {
+			uni.makePhoneCall({ phoneNumber: phone, fail: () => {} });
+		} else {
+			uni.showModal({
+				title: '平台在线客服',
+				content: '请在微信小程序客服会话中直接留言，或在工单详情中提交售后反馈，客服专员将第一时间跟进处理。',
+				showCancel: false,
+				confirmText: '知道了',
+				confirmColor: '#F0710D'
+			});
+		}
+	}
 };
diff --git a/yjyf-app/utils/request.js b/yjyf-app/utils/request.js
index 043fd89..a0b0558 100644
--- a/yjyf-app/utils/request.js
+++ b/yjyf-app/utils/request.js
@@ -12,8 +12,9 @@ const BASE_URL = (config.baseUrl || config.dev).replace(/\/+$/, '') + '/api';
 const TOKEN_KEY = 'yjyf_token';
 const USER_KEY = 'yjyf_user';
 
-// 活跃中的 POST 请求锁缓存
+// 活跃中的写入请求互斥锁（覆盖在途全生命周期 + 完成后冷却防连击）
 const pendingPostMap = new Map();
+let lastDupToastAt = 0;
 
 export function getToken() {
 	try {
@@ -42,15 +43,46 @@ export function setUser(user) {
 export function clearAuth() {
 	uni.removeStorageSync(TOKEN_KEY);
 	uni.removeStorageSync(USER_KEY);
+	uni.removeStorageSync('yjyf_role');
 }
 
 export function isLogin() {
 	return !!getToken();
 }
 
-export function toLogin() {
+let loginRedirectLock = false;
+
+export function toLogin(redirect) {
 	clearAuth();
-	uni.navigateTo({ url: '/pages/login/login' });
+	if (loginRedirectLock) return;
+	loginRedirectLock = true;
+	setTimeout(() => {
+		loginRedirectLock = false;
+	}, 800);
+	let targetRedirect = redirect || '';
+	if (!targetRedirect) {
+		try {
+			const pages = getCurrentPages() || [];
+			const cur = pages[pages.length - 1];
+			if (cur && cur.route && cur.route !== 'pages/login/login') {
+				const opts = cur.options || {};
+				const qs = Object.keys(opts)
+					.filter((k) => opts[k] !== undefined && opts[k] !== '')
+					.map((k) => `${encodeURIComponent(k)}=${encodeURIComponent(opts[k])}`)
+					.join('&');
+				targetRedirect = '/' + cur.route + (qs ? `?${qs}` : '');
+			}
+		} catch (e) {}
+	}
+	const url = targetRedirect
+		? `/pages/login/login?redirect=${encodeURIComponent(targetRedirect)}`
+		: '/pages/login/login';
+	uni.navigateTo({
+		url,
+		fail: () => {
+			uni.reLaunch({ url });
+		}
+	});
 }
 
 /**
@@ -63,18 +95,34 @@ export function request(path, options) {
 	const data = opts.data || {};
 	const silent = !!opts.silent;
 
-	// 针对写入类请求 (POST) 做 500ms 防抖/去重锁
-	if (method === 'POST') {
-		const requestKey = path + '_' + JSON.stringify(data);
-		const lastTime = pendingPostMap.get(requestKey);
+	// 针对写入类请求 (POST) 做在途全生命周期互斥锁 + 完成后冷却防连击锁
+	const needPostLock = method === 'POST' && !opts.allowConcurrent;
+	const requestKey = needPostLock ? (path + '_' + JSON.stringify(data)) : '';
+	if (needPostLock) {
+		const lockState = pendingPostMap.get(requestKey);
 		const now = Date.now();
-		if (lastTime && now - lastTime < 500) {
-			return Promise.reject(new Error('请勿频繁重复提交'));
+		if (lockState && (lockState.inflight || now < lockState.expireAt)) {
+			if (!silent && now - lastDupToastAt > 800) {
+				lastDupToastAt = now;
+				uni.showToast({ title: '正在处理中，请勿重复操作', icon: 'none' });
+			}
+			return Promise.reject(Object.assign(new Error('正在处理中，请勿重复操作'), { isDuplicate: true }));
 		}
-		pendingPostMap.set(requestKey, now);
-		setTimeout(() => pendingPostMap.delete(requestKey), 600);
+		pendingPostMap.set(requestKey, { inflight: true, expireAt: now + 16000 });
 	}
 
+	const releasePostLock = (cooldownMs) => {
+		if (!needPostLock) return;
+		const until = Date.now() + cooldownMs;
+		pendingPostMap.set(requestKey, { inflight: false, expireAt: until });
+		setTimeout(() => {
+			const cur = pendingPostMap.get(requestKey);
+			if (cur && !cur.inflight && Date.now() >= cur.expireAt) {
+				pendingPostMap.delete(requestKey);
+			}
+		}, cooldownMs + 50);
+	};
+
 	return new Promise((resolve, reject) => {
 		const header = { 'content-type': 'application/x-www-form-urlencoded' };
 		const token = getToken();
@@ -91,9 +139,11 @@ export function request(path, options) {
 			success: (res) => {
 				const body = res.data || {};
 				if (body.code === 1) {
+					releasePostLock(500);
 					resolve(body.data === undefined || body.data === null ? {} : body.data);
 					return;
 				}
+				releasePostLock(300);
 				const msg = body.msg || ('请求失败(' + res.statusCode + ')');
 				if (body.code === 401) {
 					clearAuth();
@@ -107,6 +157,7 @@ export function request(path, options) {
 				reject(Object.assign(new Error(msg), { code: body.code, data: body.data }));
 			},
 			fail: () => {
+				releasePostLock(300);
 				if (!silent) {
 					uni.showToast({ title: '网络异常，请稍后重试', icon: 'none' });
 				}
diff --git a/yjyf-app/utils/role.js b/yjyf-app/utils/role.js
index 41a5e3b..db966dd 100644
--- a/yjyf-app/utils/role.js
+++ b/yjyf-app/utils/role.js
@@ -5,14 +5,15 @@ const ROLE_KEY = 'yjyf_role';
 
 export function getRole() {
 	try {
-		return uni.getStorageSync(ROLE_KEY) || 'user';
+		const role = uni.getStorageSync(ROLE_KEY) || 'user';
+		return role === 'master' ? 'master' : 'user';
 	} catch (e) {
 		return 'user';
 	}
 }
 
 export function setRole(role) {
-	const valid = ['user', 'master', 'merchant'];
+	const valid = ['user', 'master'];
 	uni.setStorageSync(ROLE_KEY, valid.indexOf(role) > -1 ? role : 'user');
 }
 
diff --git a/yjyf-app/utils/share.js b/yjyf-app/utils/share.js
index 3a810b0..73c7820 100644
--- a/yjyf-app/utils/share.js
+++ b/yjyf-app/utils/share.js
@@ -19,7 +19,6 @@ const PUBLIC_SHARE_ROUTES = [
 	'pages/master/detail',
 	'pages/master/hall',
 	'pages/master/apply',
-	'pages/merchant/apply',
 	'pages/coupon/coupon'
 ];
 
@@ -33,7 +32,6 @@ const ROUTE_SHARE_TITLES = {
 	'pages/master/detail': '【同城工单派发】优匠优服新工单，认证师傅快来接单',
 	'pages/master/hall': '优匠优服 · 师傅接单大厅，海量同城好单实时派发',
 	'pages/master/apply': '优匠优服师傅招募 · 实名技能认证，海量同城工单随时接',
-	'pages/merchant/apply': '优匠优服企业商家入驻 · 批量派单、统一对账与合规开票',
 	'pages/coupon/coupon': '优匠优服 · 领券中心，预约安装维修立享优惠'
 };