From 296e41a8a78f5e6f76a5e68738dca1aa3214d7a0 Mon Sep 17 00:00:00 2001
From: TermiNexus <wyt18222152539wyt@163.com>
Date: Sat, 13 Jun 2026 10:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=20pages=20=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BA=E6=8B=BC=E9=9F=B3=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  827 +++---
 app.json                                      |  212 +-
 app.wxss                                      |  889 +++++-
 .../global-notification.js                    |  729 +++--
 components/popup-notice/popup-notice.js       |    8 +-
 components/popup-notice/popup-notice.wxml     |    3 +-
 components/popup-notice/popup-notice.wxss     |    2 +-
 custom-tab-bar/index.js                       |  218 +-
 custom-tab-bar/index.wxml                     |   48 +-
 .../accept-order.js}                          | 1152 ++++----
 .../accept-order.json}                        |    0
 .../accept-order.wxml}                        |    0
 .../accept-order.wxss}                        |    0
 .../assess-center.js}                         |  478 ++--
 .../assess-center.json}                       |    0
 .../assess-center.wxml}                       |    0
 .../assess-center.wxss}                       |    3 +-
 .../assess-gold.js}                           |  920 +++----
 .../assess-gold.json}                         |    0
 .../assess-gold.wxml}                         |  268 +-
 .../assess-gold.wxss}                         |  768 +++---
 .../assess-log.js}                            |  296 +-
 .../assess-log.json}                          |    0
 .../assess-log.wxml}                          |  258 +-
 .../assess-log.wxss}                          |  525 ++--
 .../assess-score.js}                          |  414 +--
 .../assess-score.json}                        |    0
 .../assess-score.wxml}                        |  234 +-
 .../assess-score.wxss}                        |    0
 .../kaoheguan.js => assessor/assessor.js}     |  434 +--
 .../kaoheguan.json => assessor/assessor.json} |    0
 .../kaoheguan.wxml => assessor/assessor.wxml} |  254 +-
 .../kaoheguan.wxss => assessor/assessor.wxss} | 1022 +++----
 .../fenlei.js => category/category.js}        |  783 +++---
 .../fenlei.json => category/category.json}    |    0
 .../fenlei.wxml => category/category.wxml}    |  432 +--
 .../fenlei.wxss => category/category.wxss}    | 2388 ++++++++---------
 .../components/fakuan-list/fakuan-list.json   |    6 -
 pages/{liaotian/liaotian.js => chat/chat.js}  |    0
 .../kefuliaotian.json => chat/chat.json}      |    0
 .../liaotian.wxml => chat/chat.wxml}          |    0
 .../liaotian.wxss => chat/chat.wxss}          |    0
 .../kefuliaotian.js => cs-chat/cs-chat.js}    |   16 +-
 .../liaotian.json => cs-chat/cs-chat.json}    |    0
 .../cs-chat.wxml}                             |    0
 .../cs-chat.wxss}                             |    0
 pages/{xiugai/xiugai.js => edit/edit.js}      |  453 ++--
 pages/{xiugai/xiugai.json => edit/edit.json}  |    0
 pages/{xiugai/xiugai.wxml => edit/edit.wxml}  |  136 +-
 pages/{xiugai/xiugai.wxss => edit/edit.wxss}  |  779 +++---
 .../escort-orders.js}                         |  130 +-
 .../escort-orders.json}                       |    0
 pages/escort-orders/escort-orders.wxml        |    2 +
 pages/escort-orders/escort-orders.wxss        |    1 +
 .../express-order.js}                         | 1234 ++++-----
 .../express-order.json}                       |    0
 .../express-order.wxml}                       |  458 ++--
 .../express-order.wxss}                       |  442 +--
 .../fighter-edit.js}                          |    0
 .../fighter-edit.json}                        |    0
 .../fighter-edit.wxml}                        |    0
 .../fighter-edit.wxss}                        |    0
 .../fighter-msg.js}                           | 1366 +++++-----
 .../fighter-msg.json}                         |    0
 .../fighter-msg.wxml}                         |  630 ++---
 .../fighter-msg.wxss}                         | 1924 ++++++-------
 .../fighter-order-detail.js}                  | 1480 +++++-----
 .../fighter-order-detail.json}                |    0
 .../fighter-order-detail.wxml}                |    0
 .../fighter-order-detail.wxss}                | 1176 ++++----
 .../fighter-orders.js}                        |  612 ++---
 .../fighter-orders.json}                      |    0
 .../fighter-orders.wxml}                      |    0
 .../fighter-orders.wxss}                      |    4 +-
 .../fighter-rank.js}                          |    0
 .../fighter-rank.json}                        |    0
 .../fighter-rank.wxml}                        |    0
 .../fighter-rank.wxss}                        |    2 -
 .../fighter-recharge.js}                      | 1948 +++++++-------
 .../fighter-recharge.json}                    |    0
 .../fighter-recharge.wxml}                    |    0
 .../fighter-recharge.wxss}                    |    0
 .../fighter-rules.js}                         |    0
 .../fighter-rules.json}                       |    0
 .../fighter-rules.wxml}                       |    0
 .../fighter-rules.wxss}                       |    0
 .../dashouduan.js => fighter/fighter.js}      | 2372 ++++++++--------
 .../dashouduan.json => fighter/fighter.json}  |    0
 .../dashouduan.wxml => fighter/fighter.wxml}  |    0
 .../dashouduan.wxss => fighter/fighter.wxss}  |   97 +-
 .../gold-fighter.js}                          |  624 ++---
 .../gold-fighter.json}                        |    0
 .../gold-fighter.wxml}                        |    0
 .../gold-fighter.wxss}                        | 1218 ++++-----
 .../group-chat.js}                            |   23 +-
 .../group-chat.json}                          |    0
 .../group-chat.wxml}                          |    0
 .../group-chat.wxss}                          |    0
 pages/index/index.js                          |  789 +++---
 pages/index/index.wxml                        |    1 -
 pages/index/index.wxss                        |  958 +++----
 .../invite-fighter.js}                        |    0
 .../invite-fighter.json}                      |    0
 .../invite-fighter.wxml}                      |    0
 .../invite-fighter.wxss}                      |    0
 .../invite-manager.js}                        |    0
 .../invite-manager.json}                      |    0
 .../invite-manager.wxml}                      |    0
 .../invite-manager.wxss}                      |    0
 pages/jiedanchi2/jiedanchi2.wxml              |    2 -
 pages/jiedanchi2/jiedanchi2.wxss              |    1 -
 .../leader-bonus-log.js}                      |    0
 .../leader-bonus-log.json}                    |    0
 .../leader-bonus-log.wxml}                    |    0
 .../leader-bonus-log.wxss}                    |    0
 .../zuzhangduan.js => leader/leader.js}       |  448 ++--
 .../zuzhangduan.json => leader/leader.json}   |    0
 .../zuzhangduan.wxml => leader/leader.wxml}   |  214 +-
 .../zuzhangduan.wxss => leader/leader.wxss}   | 1122 ++++----
 .../manager-assign.js}                        |  178 +-
 .../manager-assign.json}                      |    0
 .../manager-assign.wxml}                      |    0
 .../manager-assign.wxss}                      |  188 +-
 .../manager-rank.js}                          |    0
 .../manager-rank.json}                        |    0
 .../manager-rank.wxml}                        |    0
 .../manager-rank.wxss}                        |    0
 .../guanshiduan.js => manager/manager.js}     | 1355 +++++-----
 .../guanshiduan.json => manager/manager.json} |    0
 .../guanshiduan.wxml => manager/manager.wxml} |    0
 .../guanshiduan.wxss => manager/manager.wxss} |   15 +-
 .../merchant-dispatch.js}                     |  834 +++---
 .../merchant-dispatch.json}                   |    0
 .../merchant-dispatch.wxml}                   |  316 +--
 .../merchant-dispatch.wxss}                   |  746 ++---
 .../merchant-msg.js}                          |    0
 .../merchant-msg.json}                        |    0
 .../merchant-msg.wxml}                        |    0
 .../merchant-msg.wxss}                        |    0
 .../merchant-order-detail.js}                 | 1668 ++++++------
 .../merchant-order-detail.json}               |    0
 .../merchant-order-detail.wxml}               |  706 ++---
 .../merchant-order-detail.wxss}               |  368 +--
 .../merchant-orders.js}                       |  652 ++---
 .../merchant-orders.json}                     |    0
 .../merchant-orders.wxml}                     |  268 +-
 .../merchant-orders.wxss}                     |  856 +++---
 .../merchant-rank.js}                         |    0
 .../merchant-rank.json}                       |    0
 .../merchant-rank.wxml}                       |    0
 .../merchant-rank.wxss}                       |    0
 .../merchant-recharge.js}                     |    0
 .../merchant-recharge.json}                   |    0
 .../merchant-recharge.wxml}                   |    0
 .../merchant-recharge.wxss}                   |    0
 .../shangjiaduan.js => merchant/merchant.js}  |  724 +++--
 .../merchant.json}                            |    0
 .../merchant.wxml}                            |    0
 .../merchant.wxss}                            |  891 +++---
 .../xiaoxi.js => messages/messages.js}        |  808 +++---
 .../xiaoxi.json => messages/messages.json}    |    0
 .../xiaoxi.wxml => messages/messages.wxml}    |    0
 .../xiaoxi.wxss => messages/messages.wxss}    |   14 +-
 pages/{wode/wode.js => mine/mine.js}          |  336 +--
 pages/{wode/wode.json => mine/mine.json}      |    0
 pages/{wode/wode.wxml => mine/mine.wxml}      |    0
 pages/{wode/wode.wxss => mine/mine.wxss}      |    7 +-
 .../my-fighter.js}                            |  350 +--
 .../my-fighter.json}                          |    0
 .../my-fighter.wxml}                          |    0
 .../my-fighter.wxss}                          |    0
 .../order-detail.js}                          |    0
 .../order-detail.json}                        |    0
 .../order-detail.wxml}                        |  404 +--
 .../order-detail.wxss}                        |    2 +-
 .../jiedanchi.js => order-pool/order-pool.js} |  922 ++++---
 .../order-pool.json}                          |    0
 .../order-pool.wxml}                          |    0
 .../order-pool.wxss}                          |    4 +-
 pages/order-pool2/order-pool2.js              |   39 +
 .../order-pool2.json}                         |    0
 pages/order-pool2/order-pool2.wxml            |    2 +
 pages/order-pool2/order-pool2.wxss            |    1 +
 .../{dingdan/dingdan.js => orders/orders.js}  |  558 ++--
 .../sjddxq.json => orders/orders.json}        |    0
 .../dingdan.wxml => orders/orders.wxml}       |  222 +-
 .../dingdan.wxss => orders/orders.wxss}       |  450 ++--
 pages/peihuDingdan/peihuDingdan.wxml          |    2 -
 pages/peihuDingdan/peihuDingdan.wxss          |    1 -
 .../components/fakuan-list/fakuan-list.js     |    0
 .../components/fakuan-list/fakuan-list.json   |    6 +
 .../components/fakuan-list/fakuan-list.wxml   |    0
 .../components/fakuan-list/fakuan-list.wxss   |    0
 .../components/fakuan-pay/fakuan-pay.js       |    0
 .../components/fakuan-pay/fakuan-pay.json     |    0
 .../components/fakuan-pay/fakuan-pay.wxml     |    0
 .../components/fakuan-pay/fakuan-pay.wxss     |    0
 .../components/jifen-list/jifen-list.js       |    0
 .../components/jifen-list/jifen-list.json     |    0
 .../components/jifen-list/jifen-list.wxml     |    0
 .../components/jifen-list/jifen-list.wxss     |    0
 .../cfss.js => penalty/penalty/penalty.js}    |  198 +-
 .../penalty/penalty.json}                     |   18 +-
 .../penalty/penalty.wxml}                     |  134 +-
 .../penalty/penalty.wxss}                     |  240 +-
 .../jiedanchi2.js => pick-user/pick-user.js}  |  130 +-
 .../xuanren.json => pick-user/pick-user.json} |    0
 .../xuanren.wxml => pick-user/pick-user.wxml} |    0
 pages/pick-user/pick-user.wxss                |    1 +
 pages/{haibao/haibao.js => poster/poster.js}  |  560 ++--
 .../haibao.json => poster/poster.json}        |    0
 .../haibao.wxml => poster/poster.wxml}        |    0
 .../haibao.wxss => poster/poster.wxss}        |    0
 .../product-detail.js}                        |  542 ++--
 .../product-detail.json}                      |    0
 .../product-detail.wxml}                      |  222 +-
 .../product-detail.wxss}                      |  733 +++--
 .../recharge-log.js}                          |    0
 .../recharge-log.json}                        |    0
 .../recharge-log.wxml}                        |    0
 .../recharge-log.wxss}                        |    0
 pages/{tijiao/tijiao.js => submit/submit.js}  | 1092 ++++----
 .../wodedashou.json => submit/submit.json}    |    0
 .../tijiao.wxml => submit/submit.wxml}        |  246 +-
 .../tijiao.wxss => submit/submit.wxss}        |  558 ++--
 .../renzheng.js => verify/verify.js}          |  336 +--
 .../renzheng.json => verify/verify.json}      |    0
 .../renzheng.wxml => verify/verify.wxml}      |   56 +-
 .../renzheng.wxss => verify/verify.wxss}      |    3 -
 .../components/mode1/mode1.js                 |  966 +++----
 .../components/mode1/mode1.json               |    0
 .../components/mode1/mode1.wxml               |  264 +-
 .../components/mode1/mode1.wxss               |  846 +++---
 .../components/mode2/mode2.js                 | 1284 ++++-----
 .../components/mode2/mode2.json               |    0
 .../components/mode2/mode2.wxml               |    0
 .../components/mode2/mode2.wxss               |    0
 .../tixian.js => withdraw/withdraw.js}        |  145 +-
 .../tixian.json => withdraw/withdraw.json}    |    0
 .../tixian.wxml => withdraw/withdraw.wxml}    |   64 +-
 .../tixian.wxss => withdraw/withdraw.wxss}    |   84 +-
 pages/xuanren/xuanren.js                      |   66 -
 pages/xuanren/xuanren.wxss                    |    1 -
 utils/chat-core.js                            |  800 +++---
 utils/im-user.js                              |  156 +-
 utils/primary-role.js                         |  210 +-
 utils/request.js                              |  146 +-
 utils/role-tab-bar.js                         |  510 ++--
 utils/xiaoxilj.js                             |  428 +--
 249 files changed, 29660 insertions(+), 29505 deletions(-)
 rename pages/{jiedan/jiedan.js => accept-order/accept-order.js} (96%)
 rename pages/{jiedan/jiedan.json => accept-order/accept-order.json} (100%)
 rename pages/{jiedan/jiedan.wxml => accept-order/accept-order.wxml} (100%)
 rename pages/{jiedan/jiedan.wxss => accept-order/accept-order.wxss} (100%)
 rename pages/{kaohe_zhongxin/kaohe_zhongxin.js => assess-center/assess-center.js} (95%)
 rename pages/{kaohe_zhongxin/kaohe_zhongxin.json => assess-center/assess-center.json} (100%)
 rename pages/{kaohe_zhongxin/kaohe_zhongxin.wxml => assess-center/assess-center.wxml} (100%)
 rename pages/{kaohe_zhongxin/kaohe_zhongxin.wxss => assess-center/assess-center.wxss} (99%)
 rename pages/{kaohe_jinpai/kaohe_jinpai.js => assess-gold/assess-gold.js} (96%)
 rename pages/{kaohe_jinpai/kaohe_jinpai.json => assess-gold/assess-gold.json} (100%)
 rename pages/{kaohe_jinpai/kaohe_jinpai.wxml => assess-gold/assess-gold.wxml} (97%)
 rename pages/{kaohe_jinpai/kaohe_jinpai.wxss => assess-gold/assess-gold.wxss} (94%)
 rename pages/{kaohe_jilu/kaohe_jilu.js => assess-log/assess-log.js} (93%)
 rename pages/{kaohe_jilu/kaohe_jilu.json => assess-log/assess-log.json} (100%)
 rename pages/{kaohe_jilu/kaohe_jilu.wxml => assess-log/assess-log.wxml} (97%)
 rename pages/{kaohe_jilu/kaohe_jilu.wxss => assess-log/assess-log.wxss} (94%)
 rename pages/{kaohe_dafen/kaohe_dafen.js => assess-score/assess-score.js} (96%)
 rename pages/{kaohe_dafen/kaohe_dafen.json => assess-score/assess-score.json} (100%)
 rename pages/{kaohe_dafen/kaohe_dafen.wxml => assess-score/assess-score.wxml} (97%)
 rename pages/{kaohe_dafen/kaohe_dafen.wxss => assess-score/assess-score.wxss} (100%)
 rename pages/{kaoheguan/kaoheguan.js => assessor/assessor.js} (91%)
 rename pages/{kaoheguan/kaoheguan.json => assessor/assessor.json} (100%)
 rename pages/{kaoheguan/kaoheguan.wxml => assessor/assessor.wxml} (97%)
 rename pages/{kaoheguan/kaoheguan.wxss => assessor/assessor.wxss} (95%)
 rename pages/{fenlei/fenlei.js => category/category.js} (77%)
 rename pages/{fenlei/fenlei.json => category/category.json} (100%)
 rename pages/{fenlei/fenlei.wxml => category/category.wxml} (94%)
 rename pages/{fenlei/fenlei.wxss => category/category.wxss} (93%)
 delete mode 100644 pages/cfss/components/fakuan-list/fakuan-list.json
 rename pages/{liaotian/liaotian.js => chat/chat.js} (100%)
 rename pages/{kefuliaotian/kefuliaotian.json => chat/chat.json} (100%)
 rename pages/{liaotian/liaotian.wxml => chat/chat.wxml} (100%)
 rename pages/{liaotian/liaotian.wxss => chat/chat.wxss} (100%)
 rename pages/{kefuliaotian/kefuliaotian.js => cs-chat/cs-chat.js} (97%)
 rename pages/{liaotian/liaotian.json => cs-chat/cs-chat.json} (100%)
 rename pages/{kefuliaotian/kefuliaotian.wxml => cs-chat/cs-chat.wxml} (100%)
 rename pages/{kefuliaotian/kefuliaotian.wxss => cs-chat/cs-chat.wxss} (100%)
 rename pages/{xiugai/xiugai.js => edit/edit.js} (91%)
 rename pages/{xiugai/xiugai.json => edit/edit.json} (100%)
 rename pages/{xiugai/xiugai.wxml => edit/edit.wxml} (95%)
 rename pages/{xiugai/xiugai.wxss => edit/edit.wxss} (86%)
 rename pages/{peihuDingdan/peihuDingdan.js => escort-orders/escort-orders.js} (88%)
 rename pages/{jiedanchi2/jiedanchi2.json => escort-orders/escort-orders.json} (100%)
 create mode 100644 pages/escort-orders/escort-orders.wxml
 create mode 100644 pages/escort-orders/escort-orders.wxss
 rename pages/{jisufd/jisufd.js => express-order/express-order.js} (96%)
 rename pages/{jisufd/jisufd.json => express-order/express-order.json} (100%)
 rename pages/{jisufd/jisufd.wxml => express-order/express-order.wxml} (97%)
 rename pages/{jisufd/jisufd.wxss => express-order/express-order.wxss} (98%)
 rename pages/{dashouxiugai/dashouxiugai.js => fighter-edit/fighter-edit.js} (100%)
 rename pages/{dashouxiugai/dashouxiugai.json => fighter-edit/fighter-edit.json} (100%)
 rename pages/{dashouxiugai/dashouxiugai.wxml => fighter-edit/fighter-edit.wxml} (100%)
 rename pages/{dashouxiugai/dashouxiugai.wxss => fighter-edit/fighter-edit.wxss} (100%)
 rename pages/{dashouxiaoxi/dashouxiaoxi.js => fighter-msg/fighter-msg.js} (96%)
 rename pages/{dashouxiaoxi/dashouxiaoxi.json => fighter-msg/fighter-msg.json} (100%)
 rename pages/{dashouxiaoxi/dashouxiaoxi.wxml => fighter-msg/fighter-msg.wxml} (97%)
 rename pages/{dashouxiaoxi/dashouxiaoxi.wxss => fighter-msg/fighter-msg.wxss} (94%)
 rename pages/{dsddxq/dsddxq.js => fighter-order-detail/fighter-order-detail.js} (96%)
 rename pages/{dingdan/dingdan.json => fighter-order-detail/fighter-order-detail.json} (100%)
 rename pages/{dsddxq/dsddxq.wxml => fighter-order-detail/fighter-order-detail.wxml} (100%)
 rename pages/{dsddxq/dsddxq.wxss => fighter-order-detail/fighter-order-detail.wxss} (94%)
 rename pages/{dashoudingdan/dashoudingdan.js => fighter-orders/fighter-orders.js} (95%)
 rename pages/{dashoudingdan/dashoudingdan.json => fighter-orders/fighter-orders.json} (100%)
 rename pages/{dashoudingdan/dashoudingdan.wxml => fighter-orders/fighter-orders.wxml} (100%)
 rename pages/{dashoudingdan/dashoudingdan.wxss => fighter-orders/fighter-orders.wxss} (99%)
 rename pages/{dashoupaihang/dashoupaihang.js => fighter-rank/fighter-rank.js} (100%)
 rename pages/{dashoupaihang/dashoupaihang.json => fighter-rank/fighter-rank.json} (100%)
 rename pages/{dashoupaihang/dashoupaihang.wxml => fighter-rank/fighter-rank.wxml} (100%)
 rename pages/{dashoupaihang/dashoupaihang.wxss => fighter-rank/fighter-rank.wxss} (99%)
 rename pages/{dashouchongzhi/dashouchongzhi.js => fighter-recharge/fighter-recharge.js} (96%)
 rename pages/{dashouchongzhi/dashouchongzhi.json => fighter-recharge/fighter-recharge.json} (100%)
 rename pages/{dashouchongzhi/dashouchongzhi.wxml => fighter-recharge/fighter-recharge.wxml} (100%)
 rename pages/{dashouchongzhi/dashouchongzhi.wxss => fighter-recharge/fighter-recharge.wxss} (100%)
 rename pages/{dashouguize/dashouguize.js => fighter-rules/fighter-rules.js} (100%)
 rename pages/{dashouguize/dashouguize.json => fighter-rules/fighter-rules.json} (100%)
 rename pages/{dashouguize/dashouguize.wxml => fighter-rules/fighter-rules.wxml} (100%)
 rename pages/{dashouguize/dashouguize.wxss => fighter-rules/fighter-rules.wxss} (100%)
 rename pages/{dashouduan/dashouduan.js => fighter/fighter.js} (91%)
 rename pages/{dashouduan/dashouduan.json => fighter/fighter.json} (100%)
 rename pages/{dashouduan/dashouduan.wxml => fighter/fighter.wxml} (100%)
 rename pages/{dashouduan/dashouduan.wxss => fighter/fighter.wxss} (90%)
 rename pages/{jinpaids/jinpaids.js => gold-fighter/gold-fighter.js} (87%)
 rename pages/{jinpaids/jinpaids.json => gold-fighter/gold-fighter.json} (100%)
 rename pages/{jinpaids/jinpaids.wxml => gold-fighter/gold-fighter.wxml} (100%)
 rename pages/{jinpaids/jinpaids.wxss => gold-fighter/gold-fighter.wxss} (95%)
 rename pages/{qunliaotian/qunliaotian.js => group-chat/group-chat.js} (96%)
 rename pages/{qunliaotian/qunliaotian.json => group-chat/group-chat.json} (100%)
 rename pages/{qunliaotian/qunliaotian.wxml => group-chat/group-chat.wxml} (100%)
 rename pages/{qunliaotian/qunliaotian.wxss => group-chat/group-chat.wxss} (100%)
 rename pages/{yaoqingdashou/yaoqingdashou.js => invite-fighter/invite-fighter.js} (100%)
 rename pages/{yaoqingdashou/yaoqingdashou.json => invite-fighter/invite-fighter.json} (100%)
 rename pages/{yaoqingdashou/yaoqingdashou.wxml => invite-fighter/invite-fighter.wxml} (100%)
 rename pages/{yaoqingdashou/yaoqingdashou.wxss => invite-fighter/invite-fighter.wxss} (100%)
 rename pages/{yqguanshi/yqguanshi.js => invite-manager/invite-manager.js} (100%)
 rename pages/{yqguanshi/yqguanshi.json => invite-manager/invite-manager.json} (100%)
 rename pages/{yqguanshi/yqguanshi.wxml => invite-manager/invite-manager.wxml} (100%)
 rename pages/{yqguanshi/yqguanshi.wxss => invite-manager/invite-manager.wxss} (100%)
 delete mode 100644 pages/jiedanchi2/jiedanchi2.wxml
 delete mode 100644 pages/jiedanchi2/jiedanchi2.wxss
 rename pages/{zzfhjilu/zzfhjilu.js => leader-bonus-log/leader-bonus-log.js} (100%)
 rename pages/{zzfhjilu/zzfhjilu.json => leader-bonus-log/leader-bonus-log.json} (100%)
 rename pages/{zzfhjilu/zzfhjilu.wxml => leader-bonus-log/leader-bonus-log.wxml} (100%)
 rename pages/{zzfhjilu/zzfhjilu.wxss => leader-bonus-log/leader-bonus-log.wxss} (100%)
 rename pages/{zuzhangduan/zuzhangduan.js => leader/leader.js} (88%)
 rename pages/{zuzhangduan/zuzhangduan.json => leader/leader.json} (100%)
 rename pages/{zuzhangduan/zuzhangduan.wxml => leader/leader.wxml} (95%)
 rename pages/{zuzhangduan/zuzhangduan.wxss => leader/leader.wxss} (93%)
 rename pages/{guanzhual/guanzhual.js => manager-assign/manager-assign.js} (94%)
 rename pages/{guanzhual/guanzhual.json => manager-assign/manager-assign.json} (100%)
 rename pages/{guanzhual/guanzhual.wxml => manager-assign/manager-assign.wxml} (100%)
 rename pages/{guanzhual/guanzhual.wxss => manager-assign/manager-assign.wxss} (92%)
 rename pages/{guanshipaihang/guanshipaihang.js => manager-rank/manager-rank.js} (100%)
 rename pages/{guanshipaihang/guanshipaihang.json => manager-rank/manager-rank.json} (100%)
 rename pages/{guanshipaihang/guanshipaihang.wxml => manager-rank/manager-rank.wxml} (100%)
 rename pages/{guanshipaihang/guanshipaihang.wxss => manager-rank/manager-rank.wxss} (100%)
 rename pages/{guanshiduan/guanshiduan.js => manager/manager.js} (91%)
 rename pages/{guanshiduan/guanshiduan.json => manager/manager.json} (100%)
 rename pages/{guanshiduan/guanshiduan.wxml => manager/manager.wxml} (100%)
 rename pages/{guanshiduan/guanshiduan.wxss => manager/manager.wxss} (95%)
 rename pages/{sjpaidan/sjpaidan.js => merchant-dispatch/merchant-dispatch.js} (96%)
 rename pages/{sjpaidan/sjpaidan.json => merchant-dispatch/merchant-dispatch.json} (100%)
 rename pages/{sjpaidan/sjpaidan.wxml => merchant-dispatch/merchant-dispatch.wxml} (95%)
 rename pages/{sjpaidan/sjpaidan.wxss => merchant-dispatch/merchant-dispatch.wxss} (95%)
 rename pages/{sjxiaoxi/sjxiaoxi.js => merchant-msg/merchant-msg.js} (100%)
 rename pages/{sjxiaoxi/sjxiaoxi.json => merchant-msg/merchant-msg.json} (100%)
 rename pages/{sjxiaoxi/sjxiaoxi.wxml => merchant-msg/merchant-msg.wxml} (100%)
 rename pages/{sjxiaoxi/sjxiaoxi.wxss => merchant-msg/merchant-msg.wxss} (100%)
 rename pages/{sjddxq/sjddxq.js => merchant-order-detail/merchant-order-detail.js} (96%)
 rename pages/{dingdanxiangqing/dingdanxiangqing.json => merchant-order-detail/merchant-order-detail.json} (100%)
 rename pages/{sjddxq/sjddxq.wxml => merchant-order-detail/merchant-order-detail.wxml} (97%)
 rename pages/{sjddxq/sjddxq.wxss => merchant-order-detail/merchant-order-detail.wxss} (96%)
 rename pages/{sjdingdan/sjdingdan.js => merchant-orders/merchant-orders.js} (95%)
 rename pages/{sjdingdan/sjdingdan.json => merchant-orders/merchant-orders.json} (100%)
 rename pages/{sjdingdan/sjdingdan.wxml => merchant-orders/merchant-orders.wxml} (97%)
 rename pages/{sjdingdan/sjdingdan.wxss => merchant-orders/merchant-orders.wxss} (94%)
 rename pages/{sjpaihang/sjpaihang.js => merchant-rank/merchant-rank.js} (100%)
 rename pages/{sjpaihang/sjpaihang.json => merchant-rank/merchant-rank.json} (100%)
 rename pages/{sjpaihang/sjpaihang.wxml => merchant-rank/merchant-rank.wxml} (100%)
 rename pages/{sjpaihang/sjpaihang.wxss => merchant-rank/merchant-rank.wxss} (100%)
 rename pages/{sjchongzhi/sjchongzhi.js => merchant-recharge/merchant-recharge.js} (100%)
 rename pages/{sjchongzhi/sjchongzhi.json => merchant-recharge/merchant-recharge.json} (100%)
 rename pages/{sjchongzhi/sjchongzhi.wxml => merchant-recharge/merchant-recharge.wxml} (100%)
 rename pages/{sjchongzhi/sjchongzhi.wxss => merchant-recharge/merchant-recharge.wxss} (100%)
 rename pages/{shangjiaduan/shangjiaduan.js => merchant/merchant.js} (81%)
 rename pages/{shangjiaduan/shangjiaduan.json => merchant/merchant.json} (100%)
 rename pages/{shangjiaduan/shangjiaduan.wxml => merchant/merchant.wxml} (100%)
 rename pages/{shangjiaduan/shangjiaduan.wxss => merchant/merchant.wxss} (75%)
 rename pages/{xiaoxi/xiaoxi.js => messages/messages.js} (92%)
 rename pages/{xiaoxi/xiaoxi.json => messages/messages.json} (100%)
 rename pages/{xiaoxi/xiaoxi.wxml => messages/messages.wxml} (100%)
 rename pages/{xiaoxi/xiaoxi.wxss => messages/messages.wxss} (73%)
 rename pages/{wode/wode.js => mine/mine.js} (89%)
 rename pages/{wode/wode.json => mine/mine.json} (100%)
 rename pages/{wode/wode.wxml => mine/mine.wxml} (100%)
 rename pages/{wode/wode.wxss => mine/mine.wxss} (96%)
 rename pages/{wodedashou/wodedashou.js => my-fighter/my-fighter.js} (95%)
 rename pages/{dsddxq/dsddxq.json => my-fighter/my-fighter.json} (100%)
 rename pages/{wodedashou/wodedashou.wxml => my-fighter/my-fighter.wxml} (100%)
 rename pages/{wodedashou/wodedashou.wxss => my-fighter/my-fighter.wxss} (100%)
 rename pages/{dingdanxiangqing/dingdanxiangqing.js => order-detail/order-detail.js} (100%)
 rename pages/{shangpinxiangqing/shangpinxiangqing.json => order-detail/order-detail.json} (100%)
 rename pages/{dingdanxiangqing/dingdanxiangqing.wxml => order-detail/order-detail.wxml} (97%)
 rename pages/{dingdanxiangqing/dingdanxiangqing.wxss => order-detail/order-detail.wxss} (99%)
 rename pages/{jiedanchi/jiedanchi.js => order-pool/order-pool.js} (92%)
 rename pages/{jiedanchi/jiedanchi.json => order-pool/order-pool.json} (100%)
 rename pages/{jiedanchi/jiedanchi.wxml => order-pool/order-pool.wxml} (100%)
 rename pages/{jiedanchi/jiedanchi.wxss => order-pool/order-pool.wxss} (98%)
 create mode 100644 pages/order-pool2/order-pool2.js
 rename pages/{peihuDingdan/peihuDingdan.json => order-pool2/order-pool2.json} (100%)
 create mode 100644 pages/order-pool2/order-pool2.wxml
 create mode 100644 pages/order-pool2/order-pool2.wxss
 rename pages/{dingdan/dingdan.js => orders/orders.js} (90%)
 rename pages/{sjddxq/sjddxq.json => orders/orders.json} (100%)
 rename pages/{dingdan/dingdan.wxml => orders/orders.wxml} (95%)
 rename pages/{dingdan/dingdan.wxss => orders/orders.wxss} (66%)
 delete mode 100644 pages/peihuDingdan/peihuDingdan.wxml
 delete mode 100644 pages/peihuDingdan/peihuDingdan.wxss
 rename pages/{cfss => penalty}/components/fakuan-list/fakuan-list.js (100%)
 create mode 100644 pages/penalty/components/fakuan-list/fakuan-list.json
 rename pages/{cfss => penalty}/components/fakuan-list/fakuan-list.wxml (100%)
 rename pages/{cfss => penalty}/components/fakuan-list/fakuan-list.wxss (100%)
 rename pages/{cfss => penalty}/components/fakuan-pay/fakuan-pay.js (100%)
 rename pages/{cfss => penalty}/components/fakuan-pay/fakuan-pay.json (100%)
 rename pages/{cfss => penalty}/components/fakuan-pay/fakuan-pay.wxml (100%)
 rename pages/{cfss => penalty}/components/fakuan-pay/fakuan-pay.wxss (100%)
 rename pages/{cfss => penalty}/components/jifen-list/jifen-list.js (100%)
 rename pages/{cfss => penalty}/components/jifen-list/jifen-list.json (100%)
 rename pages/{cfss => penalty}/components/jifen-list/jifen-list.wxml (100%)
 rename pages/{cfss => penalty}/components/jifen-list/jifen-list.wxss (100%)
 rename pages/{cfss/cfss/cfss.js => penalty/penalty/penalty.js} (95%)
 rename pages/{cfss/cfss/cfss.json => penalty/penalty/penalty.json} (56%)
 rename pages/{cfss/cfss/cfss.wxml => penalty/penalty/penalty.wxml} (96%)
 rename pages/{cfss/cfss/cfss.wxss => penalty/penalty/penalty.wxss} (93%)
 rename pages/{jiedanchi2/jiedanchi2.js => pick-user/pick-user.js} (89%)
 rename pages/{xuanren/xuanren.json => pick-user/pick-user.json} (100%)
 rename pages/{xuanren/xuanren.wxml => pick-user/pick-user.wxml} (100%)
 create mode 100644 pages/pick-user/pick-user.wxss
 rename pages/{haibao/haibao.js => poster/poster.js} (96%)
 rename pages/{haibao/haibao.json => poster/poster.json} (100%)
 rename pages/{haibao/haibao.wxml => poster/poster.wxml} (100%)
 rename pages/{haibao/haibao.wxss => poster/poster.wxss} (100%)
 rename pages/{shangpinxiangqing/shangpinxiangqing.js => product-detail/product-detail.js} (64%)
 rename pages/{tijiao/tijiao.json => product-detail/product-detail.json} (100%)
 rename pages/{shangpinxiangqing/shangpinxiangqing.wxml => product-detail/product-detail.wxml} (84%)
 rename pages/{shangpinxiangqing/shangpinxiangqing.wxss => product-detail/product-detail.wxss} (87%)
 rename pages/{czjilu/czjilu.js => recharge-log/recharge-log.js} (100%)
 rename pages/{czjilu/czjilu.json => recharge-log/recharge-log.json} (100%)
 rename pages/{czjilu/czjilu.wxml => recharge-log/recharge-log.wxml} (100%)
 rename pages/{czjilu/czjilu.wxss => recharge-log/recharge-log.wxss} (100%)
 rename pages/{tijiao/tijiao.js => submit/submit.js} (95%)
 rename pages/{wodedashou/wodedashou.json => submit/submit.json} (100%)
 rename pages/{tijiao/tijiao.wxml => submit/submit.wxml} (96%)
 rename pages/{tijiao/tijiao.wxss => submit/submit.wxss} (94%)
 rename pages/{renzheng/renzheng.js => verify/verify.js} (89%)
 rename pages/{renzheng/renzheng.json => verify/verify.json} (100%)
 rename pages/{renzheng/renzheng.wxml => verify/verify.wxml} (95%)
 rename pages/{renzheng/renzheng.wxss => verify/verify.wxss} (95%)
 rename pages/{tixian => withdraw}/components/mode1/mode1.js (97%)
 rename pages/{tixian => withdraw}/components/mode1/mode1.json (100%)
 rename pages/{tixian => withdraw}/components/mode1/mode1.wxml (98%)
 rename pages/{tixian => withdraw}/components/mode1/mode1.wxss (95%)
 rename pages/{tixian => withdraw}/components/mode2/mode2.js (97%)
 rename pages/{tixian => withdraw}/components/mode2/mode2.json (100%)
 rename pages/{tixian => withdraw}/components/mode2/mode2.wxml (100%)
 rename pages/{tixian => withdraw}/components/mode2/mode2.wxss (100%)
 rename pages/{tixian/tixian.js => withdraw/withdraw.js} (80%)
 rename pages/{tixian/tixian.json => withdraw/withdraw.json} (100%)
 rename pages/{tixian/tixian.wxml => withdraw/withdraw.wxml} (92%)
 rename pages/{tixian/tixian.wxss => withdraw/withdraw.wxss} (53%)
 delete mode 100644 pages/xuanren/xuanren.js
 delete mode 100644 pages/xuanren/xuanren.wxss

diff --git a/app.js b/app.js
index 96aded3..811ef86 100644
--- a/app.js
+++ b/app.js
@@ -1,415 +1,414 @@
-// app.js - 稳健生产版本（修复 GoEasy 初始化错误 + 配置100%加载）
-import GoEasy from './static/lib/goeasy-2.13.24.esm.min';
-const ChatCore = require('./utils/chat-core');
-import { check } from './utils/phone-auth';
-import { getPrimaryRole, lockPrimaryRole, migrateLegacyCenterRole, PRIMARY_DEFAULT_PAGES } from './utils/primary-role';
-
-
-// ===== 三端固定首页（与 custom-tab-bar 一致） =====
-const roleDefaultPage = PRIMARY_DEFAULT_PAGES;
-
-App({
-    globalData: {
-
-        hasShownPopupOnColdStart: false,
-
-        apiBaseUrl: 'https://www.abas.asia/hqhd',
-        ossImageUrl: '',
-        morentouxiang: '',
-        dashouguize: '',
-
-        shangpinliebiao: [],
-        shangpinzhuanqu: [],
-        shangpinleixing: [],
-        shangpinlunbo: [],
-        shangpingonggao: '',
-        lunbozhanwei: '/images/lunbozhanwei.jpg',
-        
-        dingdanTiaoshu: {
-            daifuwu: 0,
-            fuwuzhong: 0,
-            yiwancheng: 0,
-            yituikuan: 0
-        },
-        
-        dashouqun: '',
-        dashouqunid: '',
-        guanshiqun: '',
-        guanshiqunid: '',
-            
-        appId:'wx0e4be86faac4a8d1',
-        
-        shangjiastatus: 0,
-        dashoustatus: 0,
-        guanshistatus: 0,
-        dashouNicheng: '',
-        zhanghaoStatus: null,
-        dashouzhuangtai: null,
-        yongjin: null,
-        zonge: null,
-        yajin: null,
-        chenghao: '',
-        jinfen: null,
-        clumber: [{
-            huiyuanid: '',
-            huiyuanming: '',
-            daoqi: ''
-        }],
-        chengjiaoliang: null,
-        zaixianZhuangtai: null,
-        
-        guanshi: {
-            nicheng: '',
-            uid: '',
-            touxiang: '',
-            gszhstatus: '',
-            yaoqingzongshu: 0,
-            fenyongzonge: '0.00',
-            fenyongtixian: '0.00'
-        },
-        
-        shangjia: {
-            sjzhzhuangtai: '',
-            sjyue: '',
-            fadanzong: null,
-            tuikuanzong: null,
-            riliushui: '',
-            yueliushui: ''
-        },
-        
-        liaotian_liebiao: [],
-        xshenfen: 1,
-        
-        goEasyConfig: null,
-        kefuConfig: {
-            link: '',
-            enterpriseId: ''
-        },
-        
-        cosConfig: {
-            bucket: '',
-            region: 'ap-shanghai',
-            uploadPathPrefix: 'order/'
-        },
-        
-        goEasyConnection: {
-            status: 'disconnected',
-            userId: '',
-            identityType: '',
-            lastConnectTime: 0,
-            autoReconnect: true,
-            reconnectAttempts: 0,
-            maxReconnectAttempts: 5,
-            heartbeatInterval: null,
-            cacheKeys: {
-                savedConnection: 'savedGoEasyConnection',
-                userId: 'goEasyUserId',
-                identityType: 'currentGoEasyIdentity',
-                connectTime: 'goEasyConnectTime'
-            },
-            config: {
-                heartbeatInterval: 20000,
-                reconnectDelay: 3000,
-                offlineTimeout: 30000,
-                cacheValidityHours: 12
-            }
-        },
-        
-        messageManager: {
-            unreadTotal: 0,
-            unreadMap: {},
-            latestMessages: [],
-            notificationQueue: [],
-            notificationVisible: false,
-            lastNotificationTime: 0,
-            notificationCooldown: 3000,
-            tabBarIndex: 2,
-            showTabBarBadge: true,
-            customTabBar: true,
-            tabBarBadgeText: 0,
-            soundEnabled: true,
-            vibrationEnabled: true,
-            doNotDisturb: false,
-            doNotDisturbStart: '22:00',
-            doNotDisturbEnd: '08:00',
-            notificationStyle: {
-                position: 'top',
-                duration: 3000,
-                backgroundColor: '#00f7ff',
-                textColor: '#ffffff',
-                borderRadius: '16rpx',
-                boxShadow: '0 10rpx 30rpx rgba(0, 247, 255, 0.3)'
-            },
-            currentNotification: null,
-            cacheKeys: {
-                messageSettings: 'messageSettings',
-                unreadTotal: 'messageUnreadTotal',
-                latestMessages: 'latestMessages',
-                notificationMuted: 'notificationMuted'
-            }
-        },
-        
-        pageState: {
-            currentPage: '',
-            isInChatPage: false,
-            currentChatId: '',
-            lastPageUpdate: 0
-        },
-        
-        eventListeners: {},
-        debugMode: false,
-        currentUser: null,
-        currentRole: 'normal',
-        primaryRole: 'normal'
-    },
-    
-    // ========== 核心启动流程 ==========
-    async onLaunch() {
-        // ---------- ① 立即隐藏“返回首页”按钮 ----------
-        wx.hideHomeButton();
-        wx.onAppRoute((res) => {
-            wx.hideHomeButton();
-            const path = (res && res.path) || '';
-            if (path === 'pages/guanshiduan/guanshiduan' || path === 'pages/zuzhangduan/zuzhangduan') {
-                migrateLegacyCenterRole(this);
-                lockPrimaryRole('dashou', this);
-            }
-        });
-
-        // ---------- ② 恢复主端并跳转（旧管事/组长标识自动归打手端） ----------
-        migrateLegacyCenterRole(this);
-        const savedRole = getPrimaryRole(this);
-        lockPrimaryRole(savedRole, this);
-
-        const targetPage = roleDefaultPage[savedRole] || '/pages/index/index';
-        if (savedRole !== 'normal') {
-            setTimeout(() => {
-                wx.reLaunch({ url: targetPage });
-            }, 0);
-        }
-
-        // ---------- ③ 立刻应用本地缓存配置 ----------
-        const cachedConfig = this.readConfigFromStorage();
-        if (cachedConfig) {
-            this.applyDynamicConfig(cachedConfig);
-        }
-
-        // ---------- ④ 初始化基础设施 ----------
-        this.initGoEasyWithConfig();      // 只有appkey有效时才真正初始化
-        ChatCore.initGlobalMessageSystem(this);
-        this.initCurrentUser();
-
-        // ---------- ⑤ 建立连接 ----------
-        const saved = this.getSavedConnection();
-        console.log('【启动】缓存身份:', saved ? saved.identityType : '无',
-                    'userId:', saved ? saved.userId : '无');
-        setTimeout(() => {
-            if (this.startImWhenReady) this.startImWhenReady();
-            else if (this.ensureConnection) this.ensureConnection();
-        }, 300);
-
-        // ---------- ⑥ 后台静默获取最新配置 ----------
-        this.fetchConfigSafely()
-            .then(latestConfig => {
-                this.saveConfigToStorage(latestConfig);
-                this.applyDynamicConfig(latestConfig);
-                this.initGoEasyWithConfig();
-                this.initCurrentUser();
-                if (this.startImWhenReady) this.startImWhenReady();
-                else if (this.connectForCurrentRole) this.connectForCurrentRole();
-                console.log('远程配置更新完成');
-            })
-            .catch(err => {
-                console.warn('远程配置获取失败，继续使用本地缓存', err);
-            });
-
-        // ---------- ⑦ 手机号认证检查 ----------
-        try {
-            const needAuth = await check();
-            if (needAuth) {
-                wx.reLaunch({ url: '/pages/phone-auth/phone-auth' });
-                return;
-            }
-        } catch (e) {}
-    },
-
-    // ========== 连接管理方法 ==========
-    getSavedConnection() {
-        try {
-            const saved = wx.getStorageSync(
-                this.globalData.goEasyConnection.cacheKeys.savedConnection
-            );
-            return saved || null;
-        } catch (e) {
-            return null;
-        }
-    },
-
-    // ========== 配置缓存读写 ==========
-    CONFIG_CACHE_KEY: 'app_dynamic_config',
-
-    readConfigFromStorage() {
-        try {
-            const data = wx.getStorageSync(this.CONFIG_CACHE_KEY);
-            if (data && typeof data === 'object') {
-                return data;
-            }
-        } catch (e) {}
-        return null;
-    },
-
-    saveConfigToStorage(config) {
-        try {
-            if (config && typeof config === 'object') {
-                wx.setStorageSync(this.CONFIG_CACHE_KEY, config);
-            }
-        } catch (e) {}
-    },
-
-    // ========== 安全获取远程配置（永不报错） ==========
-    fetchConfigSafely() {
-        return new Promise((resolve) => {
-            wx.request({
-                url: this.globalData.apiBaseUrl + '/peizhi/qdpzhq',
-                method: 'POST',
-                header: { 'content-type': 'application/json' },
-                success: (res) => {
-                    if (res.statusCode === 200 && res.data && res.data.code === 0 && res.data.data) {
-                        resolve(res.data.data);
-                    } else {
-                        console.warn('远程配置接口返回异常，使用已有配置');
-                        resolve(this.readConfigFromStorage() || {});
-                    }
-                },
-                fail: (err) => {
-                    console.warn('远程配置网络请求失败，使用已有配置', err);
-                    resolve(this.readConfigFromStorage() || {});
-                }
-            });
-        });
-    },
-    
-    // ========== 原有方法（保留，仅增强） ==========
-    fetchDynamicConfig() {
-        return new Promise((resolve, reject) => {
-            wx.request({
-                url: this.globalData.apiBaseUrl + '/peizhi/qdpzhq',
-                method: 'POST',
-                header: { 'content-type': 'application/json' },
-                success: (res) => {
-                    if (res.statusCode === 200 && res.data && res.data.code === 0) {
-                        resolve(res.data.data);
-                    } else {
-                        reject(new Error(res.data?.msg || '接口返回错误'));
-                    }
-                },
-                fail: reject
-            });
-        });
-    },
-    
-    applyDynamicConfig(config) {
-        if (!config || typeof config !== 'object') return;
-
-        if (config.cos) {
-            this.globalData.ossImageUrl = config.cos.ossImageUrl || '';
-            this.globalData.cosConfig = {
-                bucket: config.cos.bucket || '',
-                region: config.cos.region || 'ap-shanghai',
-                uploadPathPrefix: config.cos.uploadPathPrefix || 'order/'
-            };
-        }
-
-        if (config.goEasy) {
-            this.globalData.goEasyConfig = {
-                host: config.goEasy.host || 'hangzhou.goeasy.io',
-                appkey: config.goEasy.appkey || ''
-            };
-        }
-
-        if (config.otherConfig) {
-            this.globalData.morentouxiang = config.otherConfig.morentouxiang || '';
-            this.globalData.dashouguize = config.otherConfig.dashouguize || '';
-        }
-
-        if (config.kefu) {
-            this.globalData.kefuConfig = {
-                link: config.kefu.link || '',
-                enterpriseId: config.kefu.enterpriseId || ''
-            };
-        }
-    },
-    
-    // 🔥 关键修复：只在有效 appkey 时初始化，且避免重复初始化
-    initGoEasyWithConfig() {
-        const cfg = this.globalData.goEasyConfig;
-        if (!cfg || !cfg.appkey) {
-            console.warn('GoEasy appkey 未配置，聊天功能将在配置就绪后自动恢复');
-            return;
-        }
-
-        // 如果已经初始化过，就不再重复创建实例
-        if (wx.goEasy && wx.GoEasy) {
-            console.log('GoEasy 已初始化，跳过');
-            return;
-        }
-
-        try {
-            wx.goEasy = GoEasy.getInstance({
-                host: cfg.host || 'hangzhou.goeasy.io',
-                appkey: cfg.appkey,
-                modules: ['im', 'pubsub']
-            });
-            wx.GoEasy = GoEasy;
-            console.log('GoEasy 初始化成功');
-            if (this.startImWhenReady && wx.getStorageSync('uid')) {
-                setTimeout(() => this.startImWhenReady(), 100);
-            }
-        } catch (error) {
-            console.error('GoEasy 初始化失败:', error);
-        }
-    },
-    
-    initCurrentUser() {
-        const uid = wx.getStorageSync('uid');
-        if (uid) {
-            this.globalData.currentUser = {
-                id: uid,
-                name: '用户' + uid.substring(0, 6),
-                avatar: this.globalData.ossImageUrl + this.globalData.morentouxiang
-            };
-        }
-    },
-    
-    emitEvent(eventName, data) {
-        if (this.globalData.eventListeners[eventName]) {
-            this.globalData.eventListeners[eventName].forEach(callback => {
-                try { callback(data); } catch (error) { console.error(error); }
-            });
-        }
-    },
-
-    /** 切换当前角色并通知 custom-tab-bar 立即刷新（Storage + globalData + 事件） */
-    setCurrentRole(role) {
-        if (!role) return;
-        this.globalData.currentRole = role;
-        wx.setStorageSync('currentRole', role);
-        this.emitEvent('currentRoleChanged', { role });
-    },
-    
-    on(eventName, callback) {
-        if (!this.globalData.eventListeners[eventName]) {
-            this.globalData.eventListeners[eventName] = [];
-        }
-        this.globalData.eventListeners[eventName].push(callback);
-    },
-    
-    off(eventName, callback) {
-        if (this.globalData.eventListeners[eventName]) {
-            const index = this.globalData.eventListeners[eventName].indexOf(callback);
-            if (index > -1) {
-                this.globalData.eventListeners[eventName].splice(index, 1);
-            }
-        }
-    }
+// app.js
+import GoEasy from './static/lib/goeasy-2.13.24.esm.min';
+const ChatCore = require('./utils/chat-core');
+import { check } from './utils/phone-auth';
+import { getPrimaryRole, lockPrimaryRole, migrateLegacyCenterRole, PRIMARY_DEFAULT_PAGES } from './utils/primary-role';
+
+// 三端固定首页
+const roleDefaultPage = PRIMARY_DEFAULT_PAGES;
+
+App({
+    globalData: {
+
+        hasShownPopupOnColdStart: false,
+
+        apiBaseUrl: 'https://www.abas.asia/hqhd',
+        ossImageUrl: '',
+        morentouxiang: '',
+        dashouguize: '',
+
+        shangpinliebiao: [],
+        shangpinzhuanqu: [],
+        shangpinleixing: [],
+        shangpinlunbo: [],
+        shangpingonggao: '',
+        lunbozhanwei: '/images/lunbozhanwei.jpg',
+        
+        dingdanTiaoshu: {
+            daifuwu: 0,
+            fuwuzhong: 0,
+            yiwancheng: 0,
+            yituikuan: 0
+        },
+        
+        dashouqun: '',
+        dashouqunid: '',
+        guanshiqun: '',
+        guanshiqunid: '',
+            
+        appId:'wx0e4be86faac4a8d1',
+        
+        shangjiastatus: 0,
+        dashoustatus: 0,
+        guanshistatus: 0,
+        dashouNicheng: '',
+        zhanghaoStatus: null,
+        dashouzhuangtai: null,
+        yongjin: null,
+        zonge: null,
+        yajin: null,
+        chenghao: '',
+        jinfen: null,
+        clumber: [{
+            huiyuanid: '',
+            huiyuanming: '',
+            daoqi: ''
+        }],
+        chengjiaoliang: null,
+        zaixianZhuangtai: null,
+        
+        guanshi: {
+            nicheng: '',
+            uid: '',
+            touxiang: '',
+            gszhstatus: '',
+            yaoqingzongshu: 0,
+            fenyongzonge: '0.00',
+            fenyongtixian: '0.00'
+        },
+        
+        shangjia: {
+            sjzhzhuangtai: '',
+            sjyue: '',
+            fadanzong: null,
+            tuikuanzong: null,
+            riliushui: '',
+            yueliushui: ''
+        },
+        
+        liaotian_liebiao: [],
+        xshenfen: 1,
+        
+        goEasyConfig: null,
+        kefuConfig: {
+            link: '',
+            enterpriseId: ''
+        },
+        
+        cosConfig: {
+            bucket: '',
+            region: 'ap-shanghai',
+            uploadPathPrefix: 'order/'
+        },
+        
+        goEasyConnection: {
+            status: 'disconnected',
+            userId: '',
+            identityType: '',
+            lastConnectTime: 0,
+            autoReconnect: true,
+            reconnectAttempts: 0,
+            maxReconnectAttempts: 5,
+            heartbeatInterval: null,
+            cacheKeys: {
+                savedConnection: 'savedGoEasyConnection',
+                userId: 'goEasyUserId',
+                identityType: 'currentGoEasyIdentity',
+                connectTime: 'goEasyConnectTime'
+            },
+            config: {
+                heartbeatInterval: 20000,
+                reconnectDelay: 3000,
+                offlineTimeout: 30000,
+                cacheValidityHours: 12
+            }
+        },
+        
+        messageManager: {
+            unreadTotal: 0,
+            unreadMap: {},
+            latestMessages: [],
+            notificationQueue: [],
+            notificationVisible: false,
+            lastNotificationTime: 0,
+            notificationCooldown: 3000,
+            tabBarIndex: 2,
+            showTabBarBadge: true,
+            customTabBar: true,
+            tabBarBadgeText: 0,
+            soundEnabled: true,
+            vibrationEnabled: true,
+            doNotDisturb: false,
+            doNotDisturbStart: '22:00',
+            doNotDisturbEnd: '08:00',
+            notificationStyle: {
+                position: 'top',
+                duration: 3000,
+                backgroundColor: '#00f7ff',
+                textColor: '#ffffff',
+                borderRadius: '16rpx',
+                boxShadow: '0 10rpx 30rpx rgba(0, 247, 255, 0.3)'
+            },
+            currentNotification: null,
+            cacheKeys: {
+                messageSettings: 'messageSettings',
+                unreadTotal: 'messageUnreadTotal',
+                latestMessages: 'latestMessages',
+                notificationMuted: 'notificationMuted'
+            }
+        },
+        
+        pageState: {
+            currentPage: '',
+            isInChatPage: false,
+            currentChatId: '',
+            lastPageUpdate: 0
+        },
+        
+        eventListeners: {},
+        debugMode: false,
+        currentUser: null,
+        currentRole: 'normal',
+        primaryRole: 'normal'
+    },
+    
+    // 核心启动流程
+    async onLaunch() {
+        // ① 隐藏返回首页按钮
+        wx.hideHomeButton();
+        wx.onAppRoute((res) => {
+            wx.hideHomeButton();
+            const path = (res && res.path) || '';
+            if (path === 'pages/manager/manager' || path === 'pages/leader/leader') {
+                migrateLegacyCenterRole(this);
+                lockPrimaryRole('dashou', this);
+            }
+        });
+
+        // ② 恢复主端并跳转
+        migrateLegacyCenterRole(this);
+        const savedRole = getPrimaryRole(this);
+        lockPrimaryRole(savedRole, this);
+
+        const targetPage = roleDefaultPage[savedRole] || '/pages/index/index';
+        if (savedRole !== 'normal') {
+            setTimeout(() => {
+                wx.reLaunch({ url: targetPage });
+            }, 0);
+        }
+
+        // ③ 应用本地缓存配置
+        const cachedConfig = this.readConfigFromStorage();
+        if (cachedConfig) {
+            this.applyDynamicConfig(cachedConfig);
+        }
+
+        // ④ 初始化
+        this.initGoEasyWithConfig();      // 只有appkey有效时才真正初始化
+        ChatCore.initGlobalMessageSystem(this);
+        this.initCurrentUser();
+
+        // ⑤ 建立连接
+        const saved = this.getSavedConnection();
+        console.log('【启动】缓存身份:', saved ? saved.identityType : '无',
+                    'userId:', saved ? saved.userId : '无');
+        setTimeout(() => {
+            if (this.startImWhenReady) this.startImWhenReady();
+            else if (this.ensureConnection) this.ensureConnection();
+        }, 300);
+
+        // ⑥ 获取远程配置
+        this.fetchConfigSafely()
+            .then(latestConfig => {
+                this.saveConfigToStorage(latestConfig);
+                this.applyDynamicConfig(latestConfig);
+                this.initGoEasyWithConfig();
+                this.initCurrentUser();
+                if (this.startImWhenReady) this.startImWhenReady();
+                else if (this.connectForCurrentRole) this.connectForCurrentRole();
+                console.log('远程配置更新完成');
+            })
+            .catch(err => {
+                console.warn('远程配置获取失败，继续使用本地缓存', err);
+            });
+
+        // ⑦ 手机号认证检查
+        try {
+            const needAuth = await check();
+            if (needAuth) {
+                wx.reLaunch({ url: '/pages/phone-auth/phone-auth' });
+                return;
+            }
+        } catch (e) {}
+    },
+
+    // 连接管理方法
+    getSavedConnection() {
+        try {
+            const saved = wx.getStorageSync(
+                this.globalData.goEasyConnection.cacheKeys.savedConnection
+            );
+            return saved || null;
+        } catch (e) {
+            return null;
+        }
+    },
+
+    // 配置缓存读写
+    CONFIG_CACHE_KEY: 'app_dynamic_config',
+
+    readConfigFromStorage() {
+        try {
+            const data = wx.getStorageSync(this.CONFIG_CACHE_KEY);
+            if (data && typeof data === 'object') {
+                return data;
+            }
+        } catch (e) {}
+        return null;
+    },
+
+    saveConfigToStorage(config) {
+        try {
+            if (config && typeof config === 'object') {
+                wx.setStorageSync(this.CONFIG_CACHE_KEY, config);
+            }
+        } catch (e) {}
+    },
+
+    // 获取远程配置
+    fetchConfigSafely() {
+        return new Promise((resolve) => {
+            wx.request({
+                url: this.globalData.apiBaseUrl + '/peizhi/qdpzhq',
+                method: 'POST',
+                header: { 'content-type': 'application/json' },
+                success: (res) => {
+                    if (res.statusCode === 200 && res.data && res.data.code === 0 && res.data.data) {
+                        resolve(res.data.data);
+                    } else {
+                        console.warn('远程配置接口返回异常，使用已有配置');
+                        resolve(this.readConfigFromStorage() || {});
+                    }
+                },
+                fail: (err) => {
+                    console.warn('远程配置网络请求失败，使用已有配置', err);
+                    resolve(this.readConfigFromStorage() || {});
+                }
+            });
+        });
+    },
+    
+    // 获取远程配置
+    fetchDynamicConfig() {
+        return new Promise((resolve, reject) => {
+            wx.request({
+                url: this.globalData.apiBaseUrl + '/peizhi/qdpzhq',
+                method: 'POST',
+                header: { 'content-type': 'application/json' },
+                success: (res) => {
+                    if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                        resolve(res.data.data);
+                    } else {
+                        reject(new Error(res.data?.msg || '接口返回错误'));
+                    }
+                },
+                fail: reject
+            });
+        });
+    },
+    
+    applyDynamicConfig(config) {
+        if (!config || typeof config !== 'object') return;
+
+        if (config.cos) {
+            this.globalData.ossImageUrl = config.cos.ossImageUrl || '';
+            this.globalData.cosConfig = {
+                bucket: config.cos.bucket || '',
+                region: config.cos.region || 'ap-shanghai',
+                uploadPathPrefix: config.cos.uploadPathPrefix || 'order/'
+            };
+        }
+
+        if (config.goEasy) {
+            this.globalData.goEasyConfig = {
+                host: config.goEasy.host || 'hangzhou.goeasy.io',
+                appkey: config.goEasy.appkey || ''
+            };
+        }
+
+        if (config.otherConfig) {
+            this.globalData.morentouxiang = config.otherConfig.morentouxiang || '';
+            this.globalData.dashouguize = config.otherConfig.dashouguize || '';
+        }
+
+        if (config.kefu) {
+            this.globalData.kefuConfig = {
+                link: config.kefu.link || '',
+                enterpriseId: config.kefu.enterpriseId || ''
+            };
+        }
+    },
+    
+    // 仅在有效 appkey 时初始化
+    initGoEasyWithConfig() {
+        const cfg = this.globalData.goEasyConfig;
+        if (!cfg || !cfg.appkey) {
+            console.warn('GoEasy appkey 未配置，聊天功能将在配置就绪后自动恢复');
+            return;
+        }
+
+        // 避免重复初始化
+        if (wx.goEasy && wx.GoEasy) {
+            console.log('GoEasy 已初始化，跳过');
+            return;
+        }
+
+        try {
+            wx.goEasy = GoEasy.getInstance({
+                host: cfg.host || 'hangzhou.goeasy.io',
+                appkey: cfg.appkey,
+                modules: ['im', 'pubsub']
+            });
+            wx.GoEasy = GoEasy;
+            console.log('GoEasy 初始化成功');
+            if (this.startImWhenReady && wx.getStorageSync('uid')) {
+                setTimeout(() => this.startImWhenReady(), 100);
+            }
+        } catch (error) {
+            console.error('GoEasy 初始化失败:', error);
+        }
+    },
+    
+    initCurrentUser() {
+        const uid = wx.getStorageSync('uid');
+        if (uid) {
+            this.globalData.currentUser = {
+                id: uid,
+                name: '用户' + uid.substring(0, 6),
+                avatar: this.globalData.ossImageUrl + this.globalData.morentouxiang
+            };
+        }
+    },
+    
+    emitEvent(eventName, data) {
+        if (this.globalData.eventListeners[eventName]) {
+            this.globalData.eventListeners[eventName].forEach(callback => {
+                try { callback(data); } catch (error) { console.error(error); }
+            });
+        }
+    },
+
+    /** 切换角色并通知刷新 */
+    setCurrentRole(role) {
+        if (!role) return;
+        this.globalData.currentRole = role;
+        wx.setStorageSync('currentRole', role);
+        this.emitEvent('currentRoleChanged', { role });
+    },
+    
+    on(eventName, callback) {
+        if (!this.globalData.eventListeners[eventName]) {
+            this.globalData.eventListeners[eventName] = [];
+        }
+        this.globalData.eventListeners[eventName].push(callback);
+    },
+    
+    off(eventName, callback) {
+        if (this.globalData.eventListeners[eventName]) {
+            const index = this.globalData.eventListeners[eventName].indexOf(callback);
+            if (index > -1) {
+                this.globalData.eventListeners[eventName].splice(index, 1);
+            }
+        }
+    }
 });
\ No newline at end of file
diff --git a/app.json b/app.json
index ee7781d..3c5f34c 100644
--- a/app.json
+++ b/app.json
@@ -1,107 +1,107 @@
-{
-    "pages": [
-        "pages/index/index",
-        "pages/fenlei/fenlei",
-        "pages/xuanren/xuanren",
-        "pages/xiaoxi/xiaoxi",
-        "pages/wode/wode",
-        "pages/shangpinxiangqing/shangpinxiangqing",
-        "pages/tijiao/tijiao",
-        "pages/xiugai/xiugai",
-        "pages/dashouduan/dashouduan",
-        "pages/shangjiaduan/shangjiaduan",
-        "pages/guanshiduan/guanshiduan",
-        "pages/dingdan/dingdan",
-        "pages/dingdanxiangqing/dingdanxiangqing",
-        "pages/dashouguize/dashouguize",
-        "pages/dashouxiugai/dashouxiugai",
-        "pages/dashoupaihang/dashoupaihang",
-        "pages/dashouchongzhi/dashouchongzhi",
-        "pages/dashouxiaoxi/dashouxiaoxi",
-        "pages/dashoudingdan/dashoudingdan",
-        "pages/jiedan/jiedan",
-        "pages/tixian/tixian",
-        "pages/yaoqingdashou/yaoqingdashou",
-        "pages/wodedashou/wodedashou",
-        "pages/czjilu/czjilu",
-        "pages/guanshipaihang/guanshipaihang",
-        "pages/sjpaidan/sjpaidan",
-        "pages/sjdingdan/sjdingdan",
-        "pages/sjxiaoxi/sjxiaoxi",
-        "pages/sjpaihang/sjpaihang",
-        "pages/sjchongzhi/sjchongzhi",
-        "pages/sjddxq/sjddxq",
-        "pages/dsddxq/dsddxq",
-        "pages/liaotian/liaotian",
-        "pages/jisufd/jisufd",
-        "pages/jiedanchi/jiedanchi",
-        "pages/haibao/haibao",
-        "pages/jinpaids/jinpaids",
-        "pages/zuzhangduan/zuzhangduan",
-        "pages/guanzhual/guanzhual",
-        "pages/zzfhjilu/zzfhjilu",
-        "pages/yqguanshi/yqguanshi",
-        "pages/jiedanchi2/jiedanchi2",
-        "pages/qunliaotian/qunliaotian",
-        "pages/kefuliaotian/kefuliaotian",
-        "pages/renzheng/renzheng",
-        "components/global-notification/global-notification",
-        "components/popup-notice/popup-notice",
-        "components/order-card/order-card",
-        "components/order-sender/order-sender",
-        "pages/cfss/cfss/cfss",
-        "pages/cfss/components/fakuan-list/fakuan-list",
-        "pages/cfss/components/jifen-list/jifen-list",
-        "pages/cfss/components/fakuan-pay/fakuan-pay",
-        "pages/phone-auth/phone-auth",
-        "components/chenghao-tag/chenghao-tag",
-        "pages/kaoheguan/kaoheguan",
-        "pages/kaohe_dafen/kaohe_dafen",
-        "pages/kaohe_jilu/kaohe_jilu",
-        "pages/kaohe_zhongxin/kaohe_zhongxin",
-        "pages/kaohe_jinpai/kaohe_jinpai",
-        "pages/peihuDingdan/peihuDingdan",
-        "pages/tixian/components/mode1/mode1",
-        "pages/tixian/components/mode2/mode2"
-        
-        
-    ],
-    
-    "usingComponents": {
-        "popup-notice": "/components/popup-notice/popup-notice",
-        "custom-tab-bar": "/custom-tab-bar/index"
-    },
-      
-    "window": {
-        "navigationBarTextStyle": "black",
-        "navigationStyle": "default",
-        "backgroundTextStyle": "light",
-        "navigationBarBackgroundColor": "#fff",
-        "navigationBarTitleText": "星阙网络"
-    },
-    "tabBar": {
-        "custom": true,
-        "list": [
-            
-            
-            {
-                "pagePath": "pages/jiedanchi/jiedanchi",
-                "text": "接单池",
-                "iconPath": "/images/jiedanchi.png",
-                "selectedIconPath": "/images/jiedanchi.png"
-            },
-            {
-                "pagePath": "pages/jiedanchi2/jiedanchi2",
-                "text": "接单池",
-                "iconPath": "/images/jiedanchi.png",
-                "selectedIconPath": "/images/jiedanchi.png"
-            }
-            
-        ]
-    },
-   
-    
-    "style": "v2",
-    "sitemapLocation": "sitemap.json",
-    "lazyCodeLoading": "requiredComponents"
+{
+    "pages": [
+        "pages/index/index",
+        "pages/category/category",
+        "pages/pick-user/pick-user",
+        "pages/messages/messages",
+        "pages/mine/mine",
+        "pages/product-detail/product-detail",
+        "pages/submit/submit",
+        "pages/edit/edit",
+        "pages/fighter/fighter",
+        "pages/merchant/merchant",
+        "pages/manager/manager",
+        "pages/orders/orders",
+        "pages/order-detail/order-detail",
+        "pages/fighter-rules/fighter-rules",
+        "pages/fighter-edit/fighter-edit",
+        "pages/fighter-rank/fighter-rank",
+        "pages/fighter-recharge/fighter-recharge",
+        "pages/fighter-msg/fighter-msg",
+        "pages/fighter-orders/fighter-orders",
+        "pages/accept-order/accept-order",
+        "pages/withdraw/withdraw",
+        "pages/invite-fighter/invite-fighter",
+        "pages/my-fighter/my-fighter",
+        "pages/recharge-log/recharge-log",
+        "pages/manager-rank/manager-rank",
+        "pages/merchant-dispatch/merchant-dispatch",
+        "pages/merchant-orders/merchant-orders",
+        "pages/merchant-msg/merchant-msg",
+        "pages/merchant-rank/merchant-rank",
+        "pages/merchant-recharge/merchant-recharge",
+        "pages/merchant-order-detail/merchant-order-detail",
+        "pages/fighter-order-detail/fighter-order-detail",
+        "pages/chat/chat",
+        "pages/express-order/express-order",
+        "pages/order-pool/order-pool",
+        "pages/poster/poster",
+        "pages/gold-fighter/gold-fighter",
+        "pages/leader/leader",
+        "pages/manager-assign/manager-assign",
+        "pages/leader-bonus-log/leader-bonus-log",
+        "pages/invite-manager/invite-manager",
+        "pages/order-pool2/order-pool2",
+        "pages/group-chat/group-chat",
+        "pages/cs-chat/cs-chat",
+        "pages/verify/verify",
+        "components/global-notification/global-notification",
+        "components/popup-notice/popup-notice",
+        "components/order-card/order-card",
+        "components/order-sender/order-sender",
+        "pages/penalty/penalty/penalty",
+        "pages/penalty/components/fakuan-list/fakuan-list",
+        "pages/penalty/components/jifen-list/jifen-list",
+        "pages/penalty/components/fakuan-pay/fakuan-pay",
+        "pages/phone-auth/phone-auth",
+        "components/chenghao-tag/chenghao-tag",
+        "pages/assessor/assessor",
+        "pages/assess-score/assess-score",
+        "pages/assess-log/assess-log",
+        "pages/assess-center/assess-center",
+        "pages/assess-gold/assess-gold",
+        "pages/escort-orders/escort-orders",
+        "pages/withdraw/components/mode1/mode1",
+        "pages/withdraw/components/mode2/mode2"
+        
+        
+    ],
+    
+    "usingComponents": {
+        "popup-notice": "/components/popup-notice/popup-notice",
+        "custom-tab-bar": "/custom-tab-bar/index"
+    },
+      
+    "window": {
+        "navigationBarTextStyle": "black",
+        "navigationStyle": "default",
+        "backgroundTextStyle": "light",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTitleText": "星阙网络"
+    },
+    "tabBar": {
+        "custom": true,
+        "list": [
+            
+            
+            {
+                "pagePath": "pages/order-pool/order-pool",
+                "text": "接单池",
+                "iconPath": "/images/jiedanchi.png",
+                "selectedIconPath": "/images/jiedanchi.png"
+            },
+            {
+                "pagePath": "pages/order-pool2/order-pool2",
+                "text": "接单池",
+                "iconPath": "/images/jiedanchi.png",
+                "selectedIconPath": "/images/jiedanchi.png"
+            }
+            
+        ]
+    },
+   
+    
+    "style": "v2",
+    "sitemapLocation": "sitemap.json",
+    "lazyCodeLoading": "requiredComponents"
 }
\ No newline at end of file
diff --git a/app.wxss b/app.wxss
index 06c6fc9..958f5ce 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1,10 +1,889 @@
-/**app.wxss**/
-.container {
-  height: 100%;
+/* app.wxss — 全局共享样式 */
+
+/* ========== CSS 变量 ========== */
+page {
+  --color-price: #ff4444;
+  --color-text-main: #333;
+  --color-text-gray: #999;
+  --color-border-light: #f0f0f0;
+  --bg-white: #ffffff;
+  --bg-gray-hover: #f5f5f5;
+
+  --radius-lg: 30rpx;
+  --radius-normal: 25rpx;
+  --radius-full: 50%;
+
+  --padding-base: 40rpx;
+  --shadow-modal: 0 20rpx 60rpx rgba(0, 0, 0, 0.2);
+
+  box-sizing: border-box;
+}
+
+/* ========== 动画 ========== */
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+@keyframes pulse {
+  0%, 100% { opacity: 0.8; transform: scale(1); }
+  50% { opacity: 1; transform: scale(1.2); }
+}
+
+@keyframes modalShow {
+  from { opacity: 0; transform: scale(0.9); }
+  to { opacity: 1; transform: scale(1); }
+}
+
+@keyframes marquee {
+  0% { transform: translateX(100%); }
+  100% { transform: translateX(-100%); }
+}
+
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+
+@keyframes fadeOut {
+  from { opacity: 1; }
+  to { opacity: 0; }
+}
+
+@keyframes slideUp {
+  from { transform: translateY(100%); }
+  to { transform: translateY(0); }
+}
+
+@keyframes slideDown {
+  from { transform: translateY(0); }
+  to { transform: translateY(100%); }
+}
+
+/* ========== 加载提示 ========== */
+.loading-toast {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  background: rgba(0, 0, 0, 0.7);
+  backdrop-filter: blur(10px);
+  padding: 30rpx 50rpx;
+  border-radius: var(--radius-normal);
   display: flex;
   flex-direction: column;
   align-items: center;
+  z-index: 999;
+}
+
+.loading-spinner {
+  width: 60rpx;
+  height: 60rpx;
+  border: 6rpx solid rgba(255, 255, 255, 0.3);
+  border-top-color: #fff;
+  border-radius: var(--radius-full);
+  animation: spin 1s linear infinite;
+  margin-bottom: 20rpx;
+}
+
+.loading-text {
+  font-size: 26rpx;
+  color: #fff;
+}
+
+/* ========== 价格组件 ========== */
+.price-wrap {
+  color: var(--color-price);
+  font-weight: bold;
+}
+.price-icon {
+  font-size: 24rpx;
+  margin-right: 2rpx;
+}
+.price-integer {
+  font-size: 32rpx;
+}
+.price-decimal {
+  font-size: 24rpx;
+}
+
+/* ========== 弹窗基础 ========== */
+.modal-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  backdrop-filter: blur(5px);
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.modal-content {
+  width: 600rpx;
+  background: var(--bg-white);
+  border-radius: var(--radius-lg);
+  overflow: hidden;
+  box-shadow: var(--shadow-modal);
+  z-index: 1001;
+  animation: modalShow 0.3s ease-out;
+}
+
+.modal-header {
+  padding: var(--padding-base);
+  border-bottom: 2rpx solid var(--color-border-light);
+  display: flex;
   justify-content: space-between;
-  padding: 200rpx 0;
+  align-items: center;
+}
+
+.modal-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: var(--color-text-main);
+}
+
+.modal-close {
+  font-size: 40rpx;
+  color: var(--color-text-gray);
+  width: 60rpx;
+  height: 60rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: var(--radius-full);
+  flex-shrink: 0;
+}
+.modal-close:active {
+  background: var(--bg-gray-hover);
+}
+
+.modal-body {
+  max-height: 600rpx;
+  padding: var(--padding-base);
+  overflow-y: auto;
+}
+
+.modal-text {
+  font-size: 28rpx;
+  color: var(--color-text-main);
+  line-height: 1.6;
+  white-space: normal;
+  word-break: break-word;
+}
+
+/* ========== Flex 工具类 ========== */
+.flex-center {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.flex-between {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flex-column {
+  display: flex;
+  flex-direction: column;
+}
+
+.flex-column-center {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.flex-1 {
+  flex: 1;
+  min-width: 0;
+}
+
+.flex-shrink-0 {
+  flex-shrink: 0;
+}
+
+.flex-wrap {
+  flex-wrap: wrap;
+}
+
+/* ========== 文本工具类 ========== */
+.text-ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.text-ellipsis-2 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.text-ellipsis-3 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.text-center {
+  text-align: center;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-bold {
+  font-weight: bold;
+}
+
+.text-gray {
+  color: var(--color-text-gray);
+}
+
+.text-main {
+  color: var(--color-text-main);
+}
+
+/* ========== 安全区域 ========== */
+.safe-bottom {
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+.safe-bottom-fixed {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+/* ========== 通用卡片 ========== */
+.card {
+  background: var(--bg-white);
+  border-radius: var(--radius-lg);
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+  overflow: hidden;
+}
+
+.card-padding {
+  padding: var(--padding-base);
+}
+
+/* ========== 毛玻璃 ========== */
+.glass {
+  background: rgba(255, 255, 255, 0.72);
+  backdrop-filter: blur(20px);
+  -webkit-backdrop-filter: blur(20px);
+}
+
+.glass-dark {
+  background: rgba(0, 0, 0, 0.55);
+  backdrop-filter: blur(20px);
+  -webkit-backdrop-filter: blur(20px);
+}
+
+/* ========== 圆形头像 ========== */
+.avatar-circle {
+  border-radius: var(--radius-full);
+  border: 2rpx solid #fff;
+  object-fit: cover;
+  flex-shrink: 0;
+}
+
+.avatar-sm {
+  width: 64rpx;
+  height: 64rpx;
+}
+
+.avatar-md {
+  width: 88rpx;
+  height: 88rpx;
+}
+
+.avatar-lg {
+  width: 120rpx;
+  height: 120rpx;
+}
+
+/* ========== 红点/角标 ========== */
+.badge-dot {
+  position: absolute;
+  top: -6rpx;
+  right: -6rpx;
+  width: 16rpx;
+  height: 16rpx;
+  background: #fa5151;
+  border-radius: var(--radius-full);
+  border: 2rpx solid #fff;
+}
+
+.badge-num {
+  position: absolute;
+  top: -10rpx;
+  right: -10rpx;
+  min-width: 32rpx;
+  height: 32rpx;
+  line-height: 32rpx;
+  padding: 0 8rpx;
+  background: #fa5151;
+  color: #fff;
+  font-size: 20rpx;
+  font-weight: 600;
+  border-radius: 16rpx;
+  text-align: center;
+  border: 2rpx solid #fff;
+}
+
+/* ========== 空状态 ========== */
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 120rpx 40rpx;
+}
+
+.empty-icon {
+  width: 200rpx;
+  height: 200rpx;
+  margin-bottom: 30rpx;
+  opacity: 0.5;
+}
+
+.empty-text {
+  font-size: 30rpx;
+  color: var(--color-text-gray);
+  margin-bottom: 10rpx;
+}
+
+.empty-subtext {
+  font-size: 26rpx;
+  color: #ccc;
+}
+
+/* ========== 分割线 ========== */
+.divider {
+  height: 2rpx;
+  background: var(--color-border-light);
+  margin: 20rpx 0;
+}
+
+.divider-light {
+  height: 1rpx;
+  background: rgba(0, 0, 0, 0.04);
+  margin: 16rpx 0;
+}
+
+.divider-gradient {
+  height: 2rpx;
+  background: linear-gradient(90deg, transparent, rgba(0, 0, 0, 0.1), transparent);
+  margin: 20rpx 0;
+}
+
+/* ========== 固定底部按钮区 ========== */
+.fixed-bottom {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 20rpx 30rpx;
+  padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+  background: linear-gradient(transparent, rgba(255, 255, 255, 0.95) 30%);
+  z-index: 100;
+}
+
+/* ========== 列表项 ========== */
+.list-item {
+  display: flex;
+  align-items: center;
+  padding: 24rpx 28rpx;
+  border-bottom: 1rpx solid rgba(0, 0, 0, 0.04);
+}
+
+.list-item:last-child {
+  border-bottom: none;
+}
+
+.list-icon {
+  width: 36rpx;
+  height: 36rpx;
+  margin-right: 16rpx;
+  flex-shrink: 0;
+}
+
+.list-text {
+  flex: 1;
+  font-size: 28rpx;
+  color: var(--color-text-main);
+}
+
+.list-arrow {
+  width: 20rpx;
+  height: 20rpx;
+  opacity: 0.4;
+  flex-shrink: 0;
+}
+
+/* ========== 标签 ========== */
+.tag {
+  display: inline-flex;
+  align-items: center;
+  padding: 4rpx 14rpx;
+  border-radius: 999rpx;
+  font-size: 20rpx;
+  font-weight: 600;
+  line-height: 1.4;
+}
+
+.tag-primary {
+  background: rgba(64, 156, 255, 0.1);
+  color: #409cff;
+}
+
+.tag-success {
+  background: rgba(82, 196, 26, 0.1);
+  color: #52c41a;
+}
+
+.tag-warning {
+  background: rgba(250, 173, 20, 0.1);
+  color: #faad14;
+}
+
+.tag-danger {
+  background: rgba(255, 77, 79, 0.1);
+  color: #ff4d4f;
+}
+
+.tag-gold {
+  background: rgba(201, 169, 98, 0.1);
+  color: #C9A962;
+}
+
+/* ========== 页面容器 ========== */
+.page-container {
+  min-height: 100vh;
+  position: relative;
+}
+
+.page-bg {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 0;
+  pointer-events: none;
+}
+
+/* ========== 按钮 ========== */
+.btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 48rpx;
+  font-weight: 600;
+  text-align: center;
+  border: none;
+  position: relative;
+  overflow: hidden;
+  transition: all 0.2s ease;
+}
+
+.btn:active {
+  transform: scale(0.98);
+}
+
+/* 主按钮（全宽） */
+.btn-primary {
+  width: 100%;
+  height: 96rpx;
+  line-height: 96rpx;
+  font-size: 34rpx;
+  color: #fff;
+}
+
+.btn-primary--gold {
+  background: linear-gradient(135deg, #C9A962, #D4B56A);
+  box-shadow: 0 8rpx 20rpx rgba(201, 169, 98, 0.3);
+}
+
+.btn-primary--green {
+  background: linear-gradient(135deg, #52c41a, #389e0d);
+  box-shadow: 0 8rpx 20rpx rgba(82, 196, 26, 0.3);
+}
+
+.btn-primary--blue {
+  background: linear-gradient(135deg, #409cff, #3080e0);
+  box-shadow: 0 8rpx 20rpx rgba(64, 156, 255, 0.3);
+}
+
+.btn-primary--orange {
+  background: linear-gradient(135deg, #ffb347, #ff8c1a);
+  box-shadow: 0 8rpx 20rpx rgba(255, 140, 26, 0.3);
+}
+
+.btn-primary--purple {
+  background: linear-gradient(135deg, #6a11cb, #2575fc);
+  box-shadow: 0 8rpx 20rpx rgba(106, 17, 203, 0.3);
+}
+
+.btn-primary--red {
+  background: linear-gradient(135deg, #ff4d4f, #cf1322);
+  box-shadow: 0 8rpx 20rpx rgba(255, 77, 79, 0.3);
+}
+
+/* 次要按钮 */
+.btn-secondary {
+  background: rgba(0, 0, 0, 0.04);
+  color: var(--color-text-main);
+  font-size: 28rpx;
+  padding: 16rpx 32rpx;
+}
+
+.btn-secondary:active {
+  background: rgba(0, 0, 0, 0.08);
+}
+
+/* 小型按钮 */
+.btn-sm {
+  padding: 14rpx 32rpx;
+  font-size: 26rpx;
+  color: #fff;
+  border-radius: 40rpx;
+}
+
+.btn-sm--gold {
+  background: linear-gradient(135deg, #ffcc00, #ffaa00);
+  box-shadow: 0 6rpx 16rpx rgba(255, 170, 0, 0.3);
+}
+
+.btn-sm--green {
+  background: linear-gradient(135deg, #52c41a, #389e0d);
+  box-shadow: 0 6rpx 16rpx rgba(82, 196, 26, 0.3);
+}
+
+.btn-sm--blue {
+  background: linear-gradient(135deg, #409cff, #3080e0);
+  box-shadow: 0 6rpx 16rpx rgba(64, 156, 255, 0.3);
+}
+
+.btn-sm--red {
+  background: linear-gradient(135deg, #ff4d4f, #cf1322);
+  box-shadow: 0 6rpx 16rpx rgba(255, 77, 79, 0.3);
+}
+
+.btn-sm--dark {
+  background: linear-gradient(135deg, #3d4f66, #2c3e50);
+  box-shadow: 0 6rpx 16rpx rgba(44, 62, 80, 0.3);
+}
+
+/* 幽灵按钮（描边） */
+.btn-ghost {
+  background: transparent;
+  border: 2rpx solid currentColor;
+  padding: 14rpx 32rpx;
+  font-size: 26rpx;
+  font-weight: 600;
+}
+
+.btn-ghost--primary {
+  color: #409cff;
+  border-color: #409cff;
+}
+
+.btn-ghost--gold {
+  color: #C9A962;
+  border-color: #C9A962;
+}
+
+/* 禁用状态 */
+.btn[disabled],
+.btn-disabled {
+  opacity: 0.5;
+  pointer-events: none;
+}
+
+/* ========== 输入框 ========== */
+.input-rounded {
+  width: 100%;
+  height: 88rpx;
+  background: #fff;
+  border-radius: 44rpx;
+  padding: 0 32rpx;
+  font-size: 28rpx;
+  color: var(--color-text-main);
   box-sizing: border-box;
-} 
+  border: none;
+}
+
+.input-rounded--dark {
+  background: rgba(255, 255, 255, 0.15);
+  color: #fff;
+  border: 1rpx solid rgba(255, 255, 255, 0.3);
+}
+
+.input-rounded--dark::placeholder {
+  color: rgba(255, 255, 255, 0.5);
+}
+
+.input-inline {
+  flex: 1;
+  font-size: 32rpx;
+  color: var(--color-text-main);
+  height: 50rpx;
+  line-height: 50rpx;
+  border: none;
+  background: transparent;
+}
+
+.input-box {
+  background: #F7F3ED;
+  border-radius: 24rpx;
+  padding: 0 24rpx;
+}
+
+/* ========== 搜索框 ========== */
+.search-box {
+  display: flex;
+  align-items: center;
+  background: #f0f0f0;
+  border-radius: 40rpx;
+  padding: 0 20rpx;
+  height: 68rpx;
+}
+
+.search-box--glass {
+  background: rgba(255, 255, 255, 0.85);
+  backdrop-filter: blur(20px);
+  border: 1rpx solid rgba(255, 255, 255, 0.3);
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
+  height: 84rpx;
+  border-radius: 50rpx;
+  padding: 0 28rpx;
+}
+
+.search-input {
+  flex: 1;
+  height: 100%;
+  font-size: 28rpx;
+  margin-left: 10rpx;
+}
+
+.search-icon {
+  width: 32rpx;
+  height: 32rpx;
+  opacity: 0.5;
+  flex-shrink: 0;
+}
+
+/* ========== Tab 标签栏 ========== */
+.tab-bar {
+  display: flex;
+  background: #fff;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+.tab-item {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 24rpx 0;
+  position: relative;
+  color: #666;
+  font-size: 28rpx;
+  transition: color 0.3s;
+}
+
+.tab-item--active {
+  color: var(--color-price);
+  font-weight: 600;
+}
+
+.tab-indicator {
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 60rpx;
+  height: 6rpx;
+  background: var(--color-price);
+  border-radius: 3rpx;
+}
+
+/* 胶囊式 Tab */
+.tab-capsule {
+  display: inline-flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 60rpx;
+  padding: 0 30rpx;
+  margin-right: 20rpx;
+  border-radius: 30rpx;
+  background: #f5f5f5;
+  color: #666;
+  font-size: 28rpx;
+  flex-shrink: 0;
+  transition: all 0.3s ease;
+}
+
+.tab-capsule--active {
+  background: #e8f5e9;
+  color: #2e7d32;
+  font-weight: 500;
+  box-shadow: 0 4rpx 12rpx rgba(46, 125, 50, 0.1);
+}
+
+/* ========== 加载遮罩 ========== */
+.loading-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+}
+
+.loading-mask--dark {
+  background: rgba(0, 0, 0, 0.7);
+  backdrop-filter: blur(10px);
+}
+
+.loading-mask--light {
+  background: rgba(255, 255, 255, 0.85);
+}
+
+/* 旋转器尺寸变体 */
+.spinner {
+  border-radius: var(--radius-full);
+  animation: spin 0.8s linear infinite;
+}
+
+.spinner--sm {
+  width: 40rpx;
+  height: 40rpx;
+  border: 3rpx solid rgba(0, 0, 0, 0.08);
+  border-top-color: var(--color-text-main);
+}
+
+.spinner--md {
+  width: 60rpx;
+  height: 60rpx;
+  border: 5rpx solid rgba(0, 0, 0, 0.08);
+  border-top-color: var(--color-text-main);
+}
+
+.spinner--lg {
+  width: 80rpx;
+  height: 80rpx;
+  border: 6rpx solid rgba(0, 0, 0, 0.08);
+  border-top-color: var(--color-text-main);
+}
+
+.spinner--white {
+  border-color: rgba(255, 255, 255, 0.3);
+  border-top-color: #fff;
+}
+
+/* ========== 刷新按钮 ========== */
+.refresh-btn {
+  position: fixed;
+  top: 36rpx;
+  right: 32rpx;
+  width: 56rpx;
+  height: 56rpx;
+  border-radius: var(--radius-full);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 20;
+}
+
+.refresh-btn--light {
+  background: rgba(255, 255, 255, 0.8);
+  backdrop-filter: blur(12rpx);
+  border: 1rpx solid rgba(255, 255, 255, 0.6);
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.05);
+}
+
+.refresh-btn--dark {
+  background: rgba(0, 0, 0, 0.5);
+  backdrop-filter: blur(10rpx);
+}
+
+.refresh-icon {
+  width: 28rpx;
+  height: 28rpx;
+}
+
+/* ========== 状态标签 ========== */
+.status-tag {
+  display: inline-flex;
+  align-items: center;
+  padding: 6rpx 16rpx;
+  border-radius: 20rpx;
+  font-size: 24rpx;
+  font-weight: 500;
+  white-space: nowrap;
+}
+
+.status-tag--danger {
+  background: #fff5f5;
+  color: #ff6b6b;
+}
+
+.status-tag--success {
+  background: #f0fff0;
+  color: #52c41a;
+}
+
+.status-tag--warning {
+  background: #fffbe6;
+  color: #faad14;
+}
+
+.status-tag--info {
+  background: #e6f7ff;
+  color: #1890ff;
+}
+
+.status-tag--default {
+  background: #f5f5f5;
+  color: #999;
+}
+
+/* ========== 加载更多 ========== */
+.load-more {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 40rpx 0;
+}
+
+.load-more-text {
+  font-size: 26rpx;
+  color: var(--color-text-gray);
+}
+
+.no-more {
+  text-align: center;
+  padding: 40rpx 0;
+  font-size: 26rpx;
+  color: #ccc;
+}
diff --git a/components/global-notification/global-notification.js b/components/global-notification/global-notification.js
index f6a2b5a..29820d6 100644
--- a/components/global-notification/global-notification.js
+++ b/components/global-notification/global-notification.js
@@ -1,368 +1,363 @@
-const { resolveAvatarUrl } = require('../../utils/avatar.js');
-
-Component({
-    properties: {
-      position: {
-        type: String,
-        value: 'top'
-      },
-      duration: {
-        type: Number,
-        value: 3000
-      },
-      showProgress: {
-        type: Boolean,
-        value: true
-      },
-      showMuteButton: {
-        type: Boolean,
-        value: true
-      },
-      showTime: {
-        type: Boolean,
-        value: true
-      },
-      swipeToClose: {
-        type: Boolean,
-        value: true
-      },
-      swipeThreshold: {
-        type: Number,
-        value: 50
-      }
-    },
-  
-    data: {
-      show: false,
-      title: '',
-      message: '',
-      avatar: '',
-      notificationData: null,
-      progress: 100,
-      progressInterval: null,
-      positionClass: 'top',
-  
-      // 滑动相关
-      touchStartY: 0,
-      touchStartX: 0,
-      currentY: 0,
-      currentX: 0,
-      isSwiping: false,
-      swipingClass: '',
-      swipeStyle: '',
-      swipeDistance: 0,
-  
-      // 静音状态
-      isMuted: false,
-  
-      // 自动隐藏计时器
-      autoHideTimeout: null
-    },
-  
-    lifetimes: {
-      attached() {
-        this.loadMuteSetting();
-        this.setData({
-          positionClass: this.properties.position
-        });
-        this.setupDirectEventListeners();
-      },
-  
-      detached() {
-        this.clearTimers();
-      }
-    },
-  
-    methods: {
-      setupDirectEventListeners() {
-        const app = getApp();
-        if (app) {
-          const self = this;
-          const globalNotification = {
-            show: (data) => {
-              if (self && self.showNotification) {
-                self.showNotification(data);
-              }
-            },
-            hide: () => {
-              if (self && self.hideNotification) {
-                self.hideNotification();
-              }
-            },
-            isMuted: () => {
-              return self.data.isMuted;
-            }
-          };
-          app.globalData.globalNotification = globalNotification;
-        }
-      },
-  
-      loadMuteSetting() {
-        try {
-          const isMuted = wx.getStorageSync('notificationMuted') || false;
-          this.setData({ isMuted });
-        } catch (error) {
-          console.warn('加载静音设置失败:', error);
-        }
-      },
-  
-      saveMuteSetting(isMuted) {
-        try {
-          wx.setStorageSync('notificationMuted', isMuted);
-        } catch (error) {
-          console.warn('保存静音设置失败:', error);
-        }
-      },
-  
-      showNotification(data) {
-        if (!data) return;
-        if (this.data.isMuted) return;
-  
-        this.clearTimers();
-  
-        const app = getApp();
-        let avatar = resolveAvatarUrl(
-          data.avatar || data.message?.senderData?.avatar,
-          app
-        );
-  
-        this.setData({
-          show: true,
-          title: data.senderName || '新消息',
-          message: data.content || '[消息内容]',
-          avatar: avatar,
-          notificationData: data,
-          progress: 100,
-          swipingClass: '',
-          swipeStyle: ''
-        });
-  
-        if (this.properties.showProgress) {
-          this.startProgressBar(this.properties.duration);
-        }
-  
-        this.data.autoHideTimeout = setTimeout(() => {
-          this.hideNotification();
-        }, this.properties.duration);
-      },
-  
-      hideNotification() {
-        this.clearTimers();
-        this.setData({
-          show: false,
-          progress: 100,
-          swipingClass: '',
-          swipeStyle: ''
-        });
-        this.triggerEvent('hide');
-      },
-  
-      startProgressBar(duration) {
-        const interval = 100;
-        const steps = duration / interval;
-        const stepValue = 100 / steps;
-  
-        let currentProgress = 100;
-        this.data.progressInterval = setInterval(() => {
-          currentProgress -= stepValue;
-          if (currentProgress <= 0) {
-            currentProgress = 0;
-            this.setData({ progress: currentProgress });
-            clearInterval(this.data.progressInterval);
-          } else {
-            this.setData({ progress: currentProgress });
-          }
-        }, interval);
-      },
-  
-      clearTimers() {
-        if (this.data.autoHideTimeout) {
-          clearTimeout(this.data.autoHideTimeout);
-          this.data.autoHideTimeout = null;
-        }
-        if (this.data.progressInterval) {
-          clearInterval(this.data.progressInterval);
-          this.data.progressInterval = null;
-        }
-      },
-  
-      onTouchStart(e) {
-        if (!this.properties.swipeToClose) return;
-        const touch = e.touches[0];
-        this.setData({
-          touchStartY: touch.clientY,
-          touchStartX: touch.clientX,
-          currentY: touch.clientY,
-          currentX: touch.clientX,
-          isSwiping: false
-        });
-        this.clearTimers();
-      },
-  
-      onTouchMove(e) {
-        if (!this.properties.swipeToClose) return;
-        const touch = e.touches[0];
-        const deltaY = touch.clientY - this.data.touchStartY;
-        const deltaX = touch.clientX - this.data.touchStartX;
-        const absDeltaY = Math.abs(deltaY);
-        const absDeltaX = Math.abs(deltaX);
-  
-        if (absDeltaY > 10 && absDeltaY > absDeltaX) {
-          this.setData({
-            isSwiping: true,
-            currentY: touch.clientY,
-            swipingClass: deltaY < 0 ? 'swiping-up' : 'swiping',
-            swipeDistance: Math.abs(deltaY),
-            swipeStyle: `--swipe-distance: ${Math.abs(deltaY)}rpx;`
-          });
-          e.stopPropagation();
-        }
-      },
-  
-      onTouchEnd(e) {
-        if (!this.properties.swipeToClose || !this.data.isSwiping) {
-          this.restartAutoHide();
-          return;
-        }
-        const deltaY = this.data.currentY - this.data.touchStartY;
-        const absDeltaY = Math.abs(deltaY);
-        if (absDeltaY > this.properties.swipeThreshold) {
-          this.hideNotification();
-        } else {
-          this.setData({
-            swipingClass: '',
-            swipeStyle: 'transition: transform 0.3s ease; transform: translateY(0);'
-          });
-          setTimeout(() => {
-            this.setData({
-              swipingClass: '',
-              swipeStyle: ''
-            });
-          }, 300);
-          this.restartAutoHide();
-        }
-        this.setData({ isSwiping: false });
-      },
-  
-      restartAutoHide() {
-        const remainingTime = (this.data.progress / 100) * this.properties.duration;
-        if (remainingTime > 0) {
-          this.data.autoHideTimeout = setTimeout(() => {
-            this.hideNotification();
-          }, remainingTime);
-        }
-      },
-  
-      onTap() {
-        const { notificationData } = this.data;
-        if (!notificationData) return;
-        this.triggerEvent('tap', notificationData);
-        this.hideNotification();
-        this.navigateToChatPage(notificationData);
-      },
-  
-      onClose(e) {
-        e.stopPropagation();
-        this.triggerEvent('close');
-        this.hideNotification();
-      },
-  
-      onMute(e) {
-        e.stopPropagation();
-        const newMutedState = !this.data.isMuted;
-        this.setData({ isMuted: newMutedState });
-        this.saveMuteSetting(newMutedState);
-  
-        const app = getApp();
-        if (app && app.toggleDoNotDisturb) {
-          app.toggleDoNotDisturb(newMutedState);
-        }
-        this.triggerEvent('mute', { muted: newMutedState });
-        wx.showToast({
-          title: newMutedState ? '已开启免打扰' : '已关闭免打扰',
-          icon: 'success',
-          duration: 1500
-        });
-  
-        if (newMutedState) {
-          this.hideNotification();
-        }
-      },
-  
-      formatTime(timestamp) {
-        if (!timestamp) return '';
-        const date = new Date(timestamp);
-        const now = new Date();
-        const diff = now - date;
-        if (diff < 60 * 1000) return '刚刚';
-        if (diff < 60 * 60 * 1000) return Math.floor(diff / (60 * 1000)) + '分钟前';
-        if (date.toDateString() === now.toDateString()) {
-          return date.getHours().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0');
-        }
-        const yesterday = new Date(now);
-        yesterday.setDate(yesterday.getDate() - 1);
-        if (date.toDateString() === yesterday.toDateString()) {
-          return '昨天 ' + date.getHours().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0');
-        }
-        return (date.getMonth() + 1) + '月' + date.getDate() + '日';
-      },
-  
-      navigateToChatPage(data) {
-        if (!data || !data.message) {
-          console.warn('通知数据无效，无法跳转');
-          return;
-        }
-  
-        const msg = data.message;
-        let path = '';
-        let queryParam = null;
-  
-        // 根据 notificationType 或消息字段判断
-        if (data.notificationType === 'cs' || msg.teamId) {
-          // 客服消息
-          const teamId = data.teamId || msg.teamId;
-          path = '/pages/kefuliaotian/kefuliaotian';
-          queryParam = { teamId: teamId };
-        } else if (data.notificationType === 'group' || msg.groupId) {
-          // 群聊消息
-          const groupId = data.groupId || msg.groupId;
-          const orderId = data.orderId || msg.orderId || '';
-          const groupName = data.groupName || '订单群聊';
-          const groupAvatar = data.groupAvatar || '';
-          const isCross = data.isCross || msg.isCross || 0;
-          path = '/pages/qunliaotian/qunliaotian';
-          queryParam = {
-            groupId,
-            orderId,
-            groupName,
-            groupAvatar,
-            isCross
-          };
-        } else {
-          // 默认私聊
-          const toUserId = data.senderId || msg.senderId;
-          const toName = data.senderName || '用户';
-          const toAvatar = data.avatar || '';
-          path = '/pages/liaotian/liaotian';
-          queryParam = {
-            toUserId,
-            toName,
-            toAvatar
-          };
-        }
-  
-        if (path && queryParam) {
-          const encoded = encodeURIComponent(JSON.stringify(queryParam));
-          wx.navigateTo({
-            url: `${path}?data=${encoded}`,
-            fail: (err) => {
-              console.error('通知跳转失败:', err);
-              wx.switchTab({ url: '/pages/xiaoxi/xiaoxi' });
-            }
-          });
-        } else {
-          wx.switchTab({ url: '/pages/xiaoxi/xiaoxi' });
-        }
-      }
-    }
+const { resolveAvatarUrl } = require('../../utils/avatar.js');
+
+Component({
+    properties: {
+      position: {
+        type: String,
+        value: 'top'
+      },
+      duration: {
+        type: Number,
+        value: 3000
+      },
+      showProgress: {
+        type: Boolean,
+        value: true
+      },
+      showMuteButton: {
+        type: Boolean,
+        value: true
+      },
+      showTime: {
+        type: Boolean,
+        value: true
+      },
+      swipeToClose: {
+        type: Boolean,
+        value: true
+      },
+      swipeThreshold: {
+        type: Number,
+        value: 50
+      }
+    },
+  
+    data: {
+      show: false,
+      title: '',
+      message: '',
+      avatar: '',
+      notificationData: null,
+      progress: 100,
+      progressInterval: null,
+      positionClass: 'top',
+  
+      touchStartY: 0,
+      touchStartX: 0,
+      currentY: 0,
+      currentX: 0,
+      isSwiping: false,
+      swipingClass: '',
+      swipeStyle: '',
+      swipeDistance: 0,
+  
+      // 静音状态
+      isMuted: false,
+  
+      // 自动隐藏计时器
+      autoHideTimeout: null
+    },
+  
+    lifetimes: {
+      attached() {
+        this.loadMuteSetting();
+        this.setData({
+          positionClass: this.properties.position
+        });
+        this.setupDirectEventListeners();
+      },
+  
+      detached() {
+        this.clearTimers();
+      }
+    },
+  
+    methods: {
+      setupDirectEventListeners() {
+        const app = getApp();
+        if (app) {
+          const self = this;
+          const globalNotification = {
+            show: (data) => {
+              if (self && self.showNotification) {
+                self.showNotification(data);
+              }
+            },
+            hide: () => {
+              if (self && self.hideNotification) {
+                self.hideNotification();
+              }
+            },
+            isMuted: () => {
+              return self.data.isMuted;
+            }
+          };
+          app.globalData.globalNotification = globalNotification;
+        }
+      },
+  
+      loadMuteSetting() {
+        try {
+          const isMuted = wx.getStorageSync('notificationMuted') || false;
+          this.setData({ isMuted });
+        } catch (error) {
+          console.warn('加载静音设置失败:', error);
+        }
+      },
+  
+      saveMuteSetting(isMuted) {
+        try {
+          wx.setStorageSync('notificationMuted', isMuted);
+        } catch (error) {
+          console.warn('保存静音设置失败:', error);
+        }
+      },
+  
+      showNotification(data) {
+        if (!data) return;
+        if (this.data.isMuted) return;
+  
+        this.clearTimers();
+  
+        const app = getApp();
+        let avatar = resolveAvatarUrl(
+          data.avatar || data.message?.senderData?.avatar,
+          app
+        );
+  
+        this.setData({
+          show: true,
+          title: data.senderName || '新消息',
+          message: data.content || '[消息内容]',
+          avatar: avatar,
+          notificationData: data,
+          progress: 100,
+          swipingClass: '',
+          swipeStyle: ''
+        });
+  
+        if (this.properties.showProgress) {
+          this.startProgressBar(this.properties.duration);
+        }
+  
+        this.data.autoHideTimeout = setTimeout(() => {
+          this.hideNotification();
+        }, this.properties.duration);
+      },
+  
+      hideNotification() {
+        this.clearTimers();
+        this.setData({
+          show: false,
+          progress: 100,
+          swipingClass: '',
+          swipeStyle: ''
+        });
+        this.triggerEvent('hide');
+      },
+  
+      startProgressBar(duration) {
+        const interval = 100;
+        const steps = duration / interval;
+        const stepValue = 100 / steps;
+  
+        let currentProgress = 100;
+        this.data.progressInterval = setInterval(() => {
+          currentProgress -= stepValue;
+          if (currentProgress <= 0) {
+            currentProgress = 0;
+            this.setData({ progress: currentProgress });
+            clearInterval(this.data.progressInterval);
+          } else {
+            this.setData({ progress: currentProgress });
+          }
+        }, interval);
+      },
+  
+      clearTimers() {
+        if (this.data.autoHideTimeout) {
+          clearTimeout(this.data.autoHideTimeout);
+          this.data.autoHideTimeout = null;
+        }
+        if (this.data.progressInterval) {
+          clearInterval(this.data.progressInterval);
+          this.data.progressInterval = null;
+        }
+      },
+  
+      onTouchStart(e) {
+        if (!this.properties.swipeToClose) return;
+        const touch = e.touches[0];
+        this.setData({
+          touchStartY: touch.clientY,
+          touchStartX: touch.clientX,
+          currentY: touch.clientY,
+          currentX: touch.clientX,
+          isSwiping: false
+        });
+        this.clearTimers();
+      },
+  
+      onTouchMove(e) {
+        if (!this.properties.swipeToClose) return;
+        const touch = e.touches[0];
+        const deltaY = touch.clientY - this.data.touchStartY;
+        const deltaX = touch.clientX - this.data.touchStartX;
+        const absDeltaY = Math.abs(deltaY);
+        const absDeltaX = Math.abs(deltaX);
+  
+        if (absDeltaY > 10 && absDeltaY > absDeltaX) {
+          this.setData({
+            isSwiping: true,
+            currentY: touch.clientY,
+            swipingClass: deltaY < 0 ? 'swiping-up' : 'swiping',
+            swipeDistance: Math.abs(deltaY),
+            swipeStyle: `--swipe-distance: ${Math.abs(deltaY)}rpx;`
+          });
+          e.stopPropagation();
+        }
+      },
+  
+      onTouchEnd(e) {
+        if (!this.properties.swipeToClose || !this.data.isSwiping) {
+          this.restartAutoHide();
+          return;
+        }
+        const deltaY = this.data.currentY - this.data.touchStartY;
+        const absDeltaY = Math.abs(deltaY);
+        if (absDeltaY > this.properties.swipeThreshold) {
+          this.hideNotification();
+        } else {
+          this.setData({
+            swipingClass: '',
+            swipeStyle: 'transition: transform 0.3s ease; transform: translateY(0);'
+          });
+          setTimeout(() => {
+            this.setData({
+              swipingClass: '',
+              swipeStyle: ''
+            });
+          }, 300);
+          this.restartAutoHide();
+        }
+        this.setData({ isSwiping: false });
+      },
+  
+      restartAutoHide() {
+        const remainingTime = (this.data.progress / 100) * this.properties.duration;
+        if (remainingTime > 0) {
+          this.data.autoHideTimeout = setTimeout(() => {
+            this.hideNotification();
+          }, remainingTime);
+        }
+      },
+  
+      onTap() {
+        const { notificationData } = this.data;
+        if (!notificationData) return;
+        this.triggerEvent('tap', notificationData);
+        this.hideNotification();
+        this.navigateToChatPage(notificationData);
+      },
+  
+      onClose(e) {
+        e.stopPropagation();
+        this.triggerEvent('close');
+        this.hideNotification();
+      },
+  
+      onMute(e) {
+        e.stopPropagation();
+        const newMutedState = !this.data.isMuted;
+        this.setData({ isMuted: newMutedState });
+        this.saveMuteSetting(newMutedState);
+  
+        const app = getApp();
+        if (app && app.toggleDoNotDisturb) {
+          app.toggleDoNotDisturb(newMutedState);
+        }
+        this.triggerEvent('mute', { muted: newMutedState });
+        wx.showToast({
+          title: newMutedState ? '已开启免打扰' : '已关闭免打扰',
+          icon: 'success',
+          duration: 1500
+        });
+  
+        if (newMutedState) {
+          this.hideNotification();
+        }
+      },
+  
+      formatTime(timestamp) {
+        if (!timestamp) return '';
+        const date = new Date(timestamp);
+        const now = new Date();
+        const diff = now - date;
+        if (diff < 60 * 1000) return '刚刚';
+        if (diff < 60 * 60 * 1000) return Math.floor(diff / (60 * 1000)) + '分钟前';
+        if (date.toDateString() === now.toDateString()) {
+          return date.getHours().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0');
+        }
+        const yesterday = new Date(now);
+        yesterday.setDate(yesterday.getDate() - 1);
+        if (date.toDateString() === yesterday.toDateString()) {
+          return '昨天 ' + date.getHours().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0');
+        }
+        return (date.getMonth() + 1) + '月' + date.getDate() + '日';
+      },
+  
+      navigateToChatPage(data) {
+        if (!data || !data.message) {
+          console.warn('通知数据无效，无法跳转');
+          return;
+        }
+  
+        const msg = data.message;
+        let path = '';
+        let queryParam = null;
+  
+        if (data.notificationType === 'cs' || msg.teamId) {
+          const teamId = data.teamId || msg.teamId;
+          path = '/pages/cs-chat/cs-chat';
+          queryParam = { teamId: teamId };
+        } else if (data.notificationType === 'group' || msg.groupId) {
+          const groupId = data.groupId || msg.groupId;
+          const orderId = data.orderId || msg.orderId || '';
+          const groupName = data.groupName || '订单群聊';
+          const groupAvatar = data.groupAvatar || '';
+          const isCross = data.isCross || msg.isCross || 0;
+          path = '/pages/group-chat/group-chat';
+          queryParam = {
+            groupId,
+            orderId,
+            groupName,
+            groupAvatar,
+            isCross
+          };
+        } else {
+          const toUserId = data.senderId || msg.senderId;
+          const toName = data.senderName || '用户';
+          const toAvatar = data.avatar || '';
+          path = '/pages/chat/chat';
+          queryParam = {
+            toUserId,
+            toName,
+            toAvatar
+          };
+        }
+  
+        if (path && queryParam) {
+          const encoded = encodeURIComponent(JSON.stringify(queryParam));
+          wx.navigateTo({
+            url: `${path}?data=${encoded}`,
+            fail: (err) => {
+              console.error('通知跳转失败:', err);
+              wx.switchTab({ url: '/pages/messages/messages' });
+            }
+          });
+        } else {
+          wx.switchTab({ url: '/pages/messages/messages' });
+        }
+      }
+    }
   });
\ No newline at end of file
diff --git a/components/popup-notice/popup-notice.js b/components/popup-notice/popup-notice.js
index 5cfc83c..e2bba0f 100644
--- a/components/popup-notice/popup-notice.js
+++ b/components/popup-notice/popup-notice.js
@@ -18,7 +18,6 @@ Component({
       isFullscreen: false,
       timer: null,
   
-      // 悬浮窗相关数据
       isMinimized: false,
       floatX: 20,
       floatY: 200,
@@ -163,7 +162,7 @@ Component({
         this.setData({ muteChecked: e.detail.value.length > 0 });
       },
   
-      // 🆕 替换原有的 onPreviewImage，改用自定义预览（不触发 onShow）
+      // 自定义图片预览
       onCustomPreview(e) {
         const index = e.currentTarget.dataset.index;
         const urls = this.data.processedImages.map(img => img.url);
@@ -174,7 +173,6 @@ Component({
         });
       },
       
-      // 🆕 关闭自定义预览
       onCloseCustomPreview() {
         this.setData({
           showCustomPreview: false,
@@ -225,7 +223,7 @@ Component({
         if (app.globalData.morentouxiang) {
           avatarUrl = app.globalData.morentouxiang;
         } else {
-          // 使用内嵌的默认头像 base64（灰色圆形），确保绝对显示，不依赖外部图片
+          // 默认头像
           avatarUrl = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48Y2lyY2xlIGN4PSI1MCIgY3k9IjUwIiByPSI1MCIgZmlsbD0iI2NjY2NjYyIvPjxwYXRoIGQ9Ik01MCAyNWMtMTMuOCAwLTI1IDExLjItMjUgMjUgMCAzLjIgMS4yIDYuMSAzLjIgOC4zQzM0LjQgNzAuNyA0Mi4xIDc1IDUwIDc1czE1LjYtNC4zIDIxLjgtMTEuN0M3My44IDU2LjEgNzUgNTMuMiA3NSA1MGMwLTEzLjgtMTEuMi0yNS0yNS0yNXoiIGZpbGw9IiNmZmZmZmYiLz48L3N2Zz4=';
         }
         
@@ -319,7 +317,7 @@ Component({
         return false;
       },
       
-      // 🆕 阻止事件冒泡（用于预览遮罩内部点击不关闭）
+      // 阻止事件冒泡
       stopPropagation() {}
     }
   });
\ No newline at end of file
diff --git a/components/popup-notice/popup-notice.wxml b/components/popup-notice/popup-notice.wxml
index c95e3ba..5c20321 100644
--- a/components/popup-notice/popup-notice.wxml
+++ b/components/popup-notice/popup-notice.wxml
@@ -1,6 +1,5 @@
 <!-- components/popup-notice/popup-notice.wxml -->
 
-<!-- 全屏弹窗遮罩层（完全不变） -->
 <view class="popup-mask" wx:if="{{visible}}" catchtouchmove="preventMove">
   <view class="popup-container {{isFullscreen ? 'fullscreen' : ''}}">
     <!-- 右上角操作按钮组 -->
@@ -83,7 +82,7 @@
 </view>
 
 <!-- 🆕 自定义图片预览遮罩（全屏，不触发页面生命周期） -->
-<view 
+<view
   class="custom-preview-mask" 
   wx:if="{{showCustomPreview}}" 
   catchtouchmove="preventMove"
diff --git a/components/popup-notice/popup-notice.wxss b/components/popup-notice/popup-notice.wxss
index ee4873b..e19960f 100644
--- a/components/popup-notice/popup-notice.wxss
+++ b/components/popup-notice/popup-notice.wxss
@@ -229,7 +229,7 @@
     transform: translateZ(0);
 }
 
-/* 以下原有 movable-view 相关样式已弃用，但保留以维持代码完整（用户要求不删代码） */
+/* 弃用样式 */
 .floating-area {
     display: none;
 }
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index f0b7cd6..9903be0 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -1,109 +1,109 @@
-// custom-tab-bar/index.js — 三端固定，无身份切换
-const app = getApp();
-import { getTabRole } from '../utils/primary-role.js';
-
-const roleCfg = {
-  normal: {
-    name: '点单老板',
-    tabList: [
-      { pagePath: 'pages/index/index', text: '商城', iconPath: '/images/zhuye.png', selectedIconPath: '/images/zhuye.png' },
-      { pagePath: 'pages/fenlei/fenlei', text: '分类', iconPath: '/images/fenlei.png', selectedIconPath: '/images/fenlei.png' },
-      { pagePath: 'pages/xiaoxi/xiaoxi', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' },
-      { pagePath: 'pages/wode/wode', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' },
-    ],
-  },
-  dashou: {
-    name: '打手',
-    tabList: [
-      { pagePath: 'pages/jiedan/jiedan', text: '接单池', iconPath: '/images/jiedanchi.png', selectedIconPath: '/images/jiedanchi.png' },
-      { pagePath: 'pages/dashoudingdan/dashoudingdan', text: '订单', iconPath: '/images/dingdan.png', selectedIconPath: '/images/dingdan.png' },
-      { pagePath: 'pages/xiaoxi/xiaoxi', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' },
-      { pagePath: 'pages/dashouduan/dashouduan', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' },
-    ],
-  },
-  shangjia: {
-    name: '商家',
-    tabList: [
-      { pagePath: 'pages/sjdingdan/sjdingdan', text: '订单', iconPath: '/images/dingdan.png', selectedIconPath: '/images/dingdan.png' },
-      { pagePath: 'pages/xiaoxi/xiaoxi', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' },
-      { pagePath: 'pages/shangjiaduan/shangjiaduan', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' },
-    ],
-  },
-};
-
-Component({
-  data: {
-    selectedIndex: 0,
-    tabList: [],
-    currentRole: 'normal',
-    badgeText: '',
-  },
-
-  lifetimes: {
-    attached() {
-      this.refresh();
-      this._badgeListener = (data) => {
-        if (data.badgeText !== undefined) {
-          this.setData({ badgeText: data.badgeText });
-        }
-      };
-      this._roleListener = () => this.refresh();
-      app.on('tabBarBadgeChanged', this._badgeListener);
-      app.on('currentRoleChanged', this._roleListener);
-    },
-    detached() {
-      if (this._badgeListener) app.off('tabBarBadgeChanged', this._badgeListener);
-      if (this._roleListener) app.off('currentRoleChanged', this._roleListener);
-    },
-  },
-
-  pageLifetimes: {
-    show() {
-      this.refresh();
-      const globalBadge = app.globalData.messageManager?.tabBarBadgeText || '';
-      if (this.data.badgeText !== globalBadge) {
-        this.setData({ badgeText: globalBadge });
-      }
-      this._syncUnreadWithDebounce();
-    },
-  },
-
-  methods: {
-    _syncUnreadWithDebounce() {
-      if (this._syncTimer) clearTimeout(this._syncTimer);
-      this._syncTimer = setTimeout(() => {
-        if (app && app.loadConversations) app.loadConversations();
-      }, 300);
-    },
-
-    refresh() {
-      const token = wx.getStorageSync('token');
-      let role = getTabRole(app);
-      if (!token) {
-        role = 'normal';
-      }
-      app.globalData.currentRole = role;
-      wx.setStorageSync('currentRole', role);
-
-      let cfg = roleCfg[role];
-      if (!cfg) {
-        cfg = roleCfg.normal;
-        role = 'normal';
-      }
-
-      const list = cfg.tabList.map((v, i) => ({ ...v, index: i }));
-      const pages = getCurrentPages();
-      const curRoute = pages.length ? pages[pages.length - 1].route : '';
-      let idx = list.findIndex((t) => t.pagePath === curRoute);
-      if (idx === -1) idx = 0;
-      this.setData({ currentRole: role, tabList: list, selectedIndex: idx });
-    },
-
-    switchTab(e) {
-      const path = e.currentTarget.dataset.path;
-      const idx = e.currentTarget.dataset.index;
-      if (idx === this.data.selectedIndex) return;
-      wx.redirectTo({ url: '/' + path });
-    },
-  },
-});
+// custom-tab-bar/index.js — 三端固定，无身份切换
+const app = getApp();
+import { getTabRole } from '../utils/primary-role.js';
+
+const roleCfg = {
+  normal: {
+    name: '点单老板',
+    tabList: [
+      { pagePath: 'pages/index/index', text: '商城', iconPath: '/images/zhuye.png', selectedIconPath: '/images/zhuye.png' },
+      { pagePath: 'pages/category/category', text: '分类', iconPath: '/images/fenlei.png', selectedIconPath: '/images/fenlei.png' },
+      { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' },
+      { pagePath: 'pages/mine/mine', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' },
+    ],
+  },
+  dashou: {
+    name: '打手',
+    tabList: [
+      { pagePath: 'pages/accept-order/accept-order', text: '接单池', iconPath: '/images/jiedanchi.png', selectedIconPath: '/images/jiedanchi.png' },
+      { pagePath: 'pages/fighter-orders/fighter-orders', text: '订单', iconPath: '/images/dingdan.png', selectedIconPath: '/images/dingdan.png' },
+      { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' },
+      { pagePath: 'pages/fighter/fighter', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' },
+    ],
+  },
+  shangjia: {
+    name: '商家',
+    tabList: [
+      { pagePath: 'pages/merchant-orders/merchant-orders', text: '订单', iconPath: '/images/dingdan.png', selectedIconPath: '/images/dingdan.png' },
+      { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' },
+      { pagePath: 'pages/merchant/merchant', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' },
+    ],
+  },
+};
+
+Component({
+  data: {
+    selectedIndex: 0,
+    tabList: [],
+    currentRole: 'normal',
+    badgeText: '',
+  },
+
+  lifetimes: {
+    attached() {
+      this.refresh();
+      this._badgeListener = (data) => {
+        if (data.badgeText !== undefined) {
+          this.setData({ badgeText: data.badgeText });
+        }
+      };
+      this._roleListener = () => this.refresh();
+      app.on('tabBarBadgeChanged', this._badgeListener);
+      app.on('currentRoleChanged', this._roleListener);
+    },
+    detached() {
+      if (this._badgeListener) app.off('tabBarBadgeChanged', this._badgeListener);
+      if (this._roleListener) app.off('currentRoleChanged', this._roleListener);
+    },
+  },
+
+  pageLifetimes: {
+    show() {
+      this.refresh();
+      const globalBadge = app.globalData.messageManager?.tabBarBadgeText || '';
+      if (this.data.badgeText !== globalBadge) {
+        this.setData({ badgeText: globalBadge });
+      }
+      this._syncUnreadWithDebounce();
+    },
+  },
+
+  methods: {
+    _syncUnreadWithDebounce() {
+      if (this._syncTimer) clearTimeout(this._syncTimer);
+      this._syncTimer = setTimeout(() => {
+        if (app && app.loadConversations) app.loadConversations();
+      }, 300);
+    },
+
+    refresh() {
+      const token = wx.getStorageSync('token');
+      let role = getTabRole(app);
+      if (!token) {
+        role = 'normal';
+      }
+      app.globalData.currentRole = role;
+      wx.setStorageSync('currentRole', role);
+
+      let cfg = roleCfg[role];
+      if (!cfg) {
+        cfg = roleCfg.normal;
+        role = 'normal';
+      }
+
+      const list = cfg.tabList.map((v, i) => ({ ...v, index: i }));
+      const pages = getCurrentPages();
+      const curRoute = pages.length ? pages[pages.length - 1].route : '';
+      let idx = list.findIndex((t) => t.pagePath === curRoute);
+      if (idx === -1) idx = 0;
+      this.setData({ currentRole: role, tabList: list, selectedIndex: idx });
+    },
+
+    switchTab(e) {
+      const path = e.currentTarget.dataset.path;
+      const idx = e.currentTarget.dataset.index;
+      if (idx === this.data.selectedIndex) return;
+      wx.redirectTo({ url: '/' + path });
+    },
+  },
+});
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 523432e..cd9976f 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,24 +1,24 @@
-<view class="custom-tab-bar">
-  <view class="bar-row">
-    <view class="tab-capsule">
-      <block wx:for="{{tabList}}" wx:key="index">
-        <view
-          class="tab-item {{selectedIndex === index ? 'active' : ''}}"
-          data-path="{{item.pagePath}}"
-          data-index="{{index}}"
-          catchtap="switchTab"
-        >
-          <view class="badge-container" wx:if="{{item.pagePath === 'pages/xiaoxi/xiaoxi' && badgeText}}">
-            <view class="tab-badge">{{badgeText}}</view>
-          </view>
-          <image
-            class="tab-icon"
-            src="{{selectedIndex === index ? item.selectedIconPath : item.iconPath}}"
-            mode="aspectFit"
-          />
-          <text class="tab-text">{{item.text}}</text>
-        </view>
-      </block>
-    </view>
-  </view>
-</view>
+<view class="custom-tab-bar">
+  <view class="bar-row">
+    <view class="tab-capsule">
+      <block wx:for="{{tabList}}" wx:key="index">
+        <view
+          class="tab-item {{selectedIndex === index ? 'active' : ''}}"
+          data-path="{{item.pagePath}}"
+          data-index="{{index}}"
+          catchtap="switchTab"
+        >
+          <view class="badge-container" wx:if="{{item.pagePath === 'pages/messages/messages' && badgeText}}">
+            <view class="tab-badge">{{badgeText}}</view>
+          </view>
+          <image
+            class="tab-icon"
+            src="{{selectedIndex === index ? item.selectedIconPath : item.iconPath}}"
+            mode="aspectFit"
+          />
+          <text class="tab-text">{{item.text}}</text>
+        </view>
+      </block>
+    </view>
+  </view>
+</view>
diff --git a/pages/jiedan/jiedan.js b/pages/accept-order/accept-order.js
similarity index 96%
rename from pages/jiedan/jiedan.js
rename to pages/accept-order/accept-order.js
index 403bf0f..804d2a6 100644
--- a/pages/jiedan/jiedan.js
+++ b/pages/accept-order/accept-order.js
@@ -1,577 +1,577 @@
-// pages/qiangdan/qiangdan.js
-const app = getApp();
-import request from '../../utils/request.js';
-import PopupService from '../../services/popupService.js';
-import { reconnectForRole } from '../../utils/role-tab-bar.js';
-
-Page({
-  data: {
-    // 1. 商品类型相关
-    shangpinleixing: [],
-    xuanzhongLeixingId: null,
-
-    // 2. 订单列表与分页相关
-    dingdanList: [],
-    page: 1,
-    pageSize: 5,
-    hasMore: true,
-    isLoading: false,
-
-    // 3. 全局状态字段
-    dashoustatus: null,
-    zhuanghaoStatus: null,
-    dashouzhuangtai: null,
-    uid: null,
-    huiyuanList: [],
-    yajin: 0,
-    jifen: 0,
-
-    // 4. 刷新控制字段
-    scrollViewRefreshing: false,
-    lastRefreshTime: 0,
-    refreshCooldown: 2000,
-    isLoadingMore: false,
-
-    // 5. 切换类型冷却
-    lastSwitchTime: 0,
-    switchCooldown: 1500,
-    isSwitching: false,
-
-    // 6. OSS地址
-    ossImageUrl: app.globalData.ossImageUrl || '',
-
-    // 🆕 7. 标签筛选相关
-    bankuaiBiaoqian: [],           // 当前商品类型所属板块的全部标签
-    xuanzhongBiaoqianId: 0,        // 0=全部
-  },
-
-  async onLoad(options) {
-    this.loadGlobalStatus();
-    await this.loadShangpinLeixing();
-    PopupService.checkAndShow(this, 'jiedan');
-  },
-
-  onHide: function () {
-    const popupComp = this.selectComponent('#popupNotice');
-    if (popupComp && popupComp.cleanup) {
-      popupComp.cleanup();
-    }
-  },
-
-  onShow() {
-    this.registerNotificationComponent();
-    this.loadGlobalStatus();
-    if (wx.getStorageSync('uid')) {
-      reconnectForRole('dashou');
-      if (app.startImWhenReady) app.startImWhenReady();
-      this.refreshDashouProfileSilent();
-    }
-    if (this.data.xuanzhongLeixingId) {
-      this.loadDingdanList(true);
-    }
-  },
-
-  async refreshDashouProfileSilent() {
-    try {
-      const res = await request({ url: '/yonghu/dashouxinxi', method: 'POST' });
-      if (!res || res.data.code != 200) return;
-      const data = res.data.data || {};
-      const patch = {
-        dashouNicheng: data.dashounicheng || '',
-        zhanghaoStatus: data.zhanghaostatus || '',
-        dashouzhuangtai: data.dashouzhuangtai || '',
-        yajin: data.yajin || 0,
-        jifen: data.jifen || 0,
-        clumber: data.clumber || [],
-      };
-      Object.assign(app.globalData, {
-        dashouNicheng: patch.dashouNicheng,
-        zhanghaoStatus: patch.zhanghaoStatus,
-        dashouzhuangtai: patch.dashouzhuangtai,
-        yajin: patch.yajin,
-        jinfen: patch.jifen,
-        clumber: patch.clumber,
-      });
-      if (data.dashoustatus !== undefined) {
-        wx.setStorageSync('dashoustatus', data.dashoustatus);
-        app.globalData.dashoustatus = data.dashoustatus;
-      }
-      this.setData({
-        zhuanghaoStatus: patch.zhanghaoStatus,
-        dashouzhuangtai: patch.dashouzhuangtai,
-        huiyuanList: patch.clumber,
-        yajin: patch.yajin,
-        jifen: patch.jifen,
-      });
-    } catch (e) {}
-  },
-
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  loadGlobalStatus() {
-    const globalData = app.globalData;
-    this.setData({
-      dashoustatus: wx.getStorageSync('dashoustatus'),
-      zhuanghaoStatus: globalData.zhanghaoStatus,
-      dashouzhuangtai: globalData.dashouzhuangtai,
-      uid: wx.getStorageSync('uid'),
-      huiyuanList: globalData.clumber || [],
-      yajin: globalData.yajin || 0,
-      jifen: globalData.jinfen || 0
-    });
-  },
-
-  // 加载商品类型
-  async loadShangpinLeixing() {
-    wx.showLoading({ title: '加载商品类型...' });
-    try {
-      const res = await request({
-        url: '/dingdan/dsqdhqddlx',
-        method: 'POST',
-        header: { 'content-type': 'application/json' }
-      });
-      if (res.statusCode === 200 && res.data) {
-        const data = res.data;
-        let list = [];
-        if (data.code === 200 || data.code === 0) {
-          if (data.data && Array.isArray(data.data.list)) list = data.data.list;
-          else if (data.data && Array.isArray(data.data)) list = data.data;
-          else if (Array.isArray(data.list)) list = data.list;
-          else if (Array.isArray(data)) list = data;
-        }
-        const processedList = this.processTupianUrl(list);
-        this.setData({
-          shangpinleixing: processedList,
-          xuanzhongLeixingId: processedList[0]?.id || null
-        });
-        if (this.data.xuanzhongLeixingId) {
-          this.loadDingdanList(true);
-          // 🆕 加载板块标签
-          this.loadBankuaiBiaoqian();
-        }
-      } else {
-        wx.showToast({ title: res.data?.msg || '加载商品类型失败', icon: 'none' });
-      }
-    } catch (error) {
-      wx.showToast({ title: '网络错误，加载失败', icon: 'none' });
-    } finally {
-      wx.hideLoading();
-    }
-  },
-
-  // 处理图片URL
-  processTupianUrl(list) {
-    const ossUrl = app.globalData.ossImageUrl || '';
-    return list.map(item => ({
-      ...item,
-      full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http')
-        ? ossUrl + item.tupian_url
-        : (item.tupian_url || '/images/default-type.png')
-    }));
-  },
-
-  // 🆕 加载板块标签
-  async loadBankuaiBiaoqian() {
-    const leixingId = this.data.xuanzhongLeixingId;
-    if (!leixingId) return;
-    try {
-      const res = await request({
-        url: '/dengji/bkqhbq',
-        method: 'POST',
-        data: { leixing_id: leixingId }
-      });
-      if (res && res.data.code === 0) {
-        this.setData({
-          bankuaiBiaoqian: res.data.data.biaoqian_list || [],
-          xuanzhongBiaoqianId: 0
-        });
-      }
-    } catch (e) {
-      // 标签加载失败不影响主流程
-    }
-  },
-
-  // 选择商品类型
-  async selectLeixing(e) {
-    const now = Date.now();
-    const lastSwitchTime = this.data.lastSwitchTime;
-    const switchCooldown = this.data.switchCooldown;
-
-    if (now - lastSwitchTime < switchCooldown) {
-      wx.showToast({
-        title: `操作太快，请${Math.ceil((switchCooldown - (now - lastSwitchTime)) / 1000)}秒后再试`,
-        icon: 'none',
-        duration: 1500
-      });
-      return;
-    }
-    if (this.data.isSwitching) return;
-
-    const leixingId = e.currentTarget.dataset.id;
-    if (leixingId === this.data.xuanzhongLeixingId) return;
-
-    this.setData({ isSwitching: true, lastSwitchTime: now });
-    wx.showLoading({ title: '切换中...' });
-
-    try {
-      this.setData({
-        xuanzhongLeixingId: leixingId,
-        dingdanList: [],
-        page: 1,
-        hasMore: true,
-        xuanzhongBiaoqianId: 0 // 重置标签筛选
-      });
-      await this.loadDingdanList(true);
-      // 🆕 切换类型后加载新标签
-      await this.loadBankuaiBiaoqian();
-    } catch (error) {
-      console.error('切换类型失败:', error);
-    } finally {
-      this.setData({ isSwitching: false });
-      wx.hideLoading();
-    }
-  },
-
-  // 🆕 选择标签筛选
-  async selectBiaoqian(e) {
-    const id = e.currentTarget.dataset.id;
-    if (id === this.data.xuanzhongBiaoqianId) return;
-    this.setData({
-      xuanzhongBiaoqianId: id,
-      dingdanList: [],
-      page: 1,
-      hasMore: true
-    });
-    await this.loadDingdanList(true);
-  },
-
-  // 加载订单列表
-  async loadDingdanList(isRefresh = false) {
-    if (this.data.isLoading || !this.data.xuanzhongLeixingId) return;
-
-    const loadPage = isRefresh ? 1 : this.data.page;
-    if (!isRefresh && !this.data.hasMore) return;
-
-    this.setData({
-      isLoading: true,
-      isLoadingMore: !isRefresh
-    });
-
-    try {
-      const res = await request({
-        url: '/dingdan/ddhq',
-        method: 'POST',
-        data: {
-          leixing_id: this.data.xuanzhongLeixingId,
-          page: loadPage,
-          page_size: this.data.pageSize,
-          // 🆕 传递标签筛选参数（0时不传）
-          biaoqian_id: this.data.xuanzhongBiaoqianId || undefined
-        }
-      });
-
-      this.setData({
-        isLoading: false,
-        isLoadingMore: false,
-        scrollViewRefreshing: false
-      });
-
-      if (res.data.code === 200 || res.data.code === 0) {
-        const newList = res.data.data.list || [];
-        const hasMore = res.data.data.has_more || false;
-
-        // 🆕 处理每条订单，增加 hasRequiredMember 字段
-        const processedList = newList.map(item => this.processDingdanItem(item));
-        const updatedList = isRefresh ? processedList : [...this.data.dingdanList, ...processedList];
-        updatedList.sort((a, b) => (b.creat_time || '').localeCompare(a.creat_time || ''));
-
-        this.setData({
-          dingdanList: updatedList,
-          page: loadPage,
-          hasMore: hasMore
-        });
-
-        if (isRefresh) {
-          this.setData({ lastRefreshTime: Date.now() });
-        }
-      } else {
-        wx.showToast({ title: res.data.msg || '加载失败', icon: 'none' });
-      }
-    } catch (error) {
-      console.error('加载订单失败:', error);
-      this.setData({
-        isLoading: false,
-        isLoadingMore: false,
-        scrollViewRefreshing: false
-      });
-      wx.showToast({ title: '网络请求失败', icon: 'none' });
-    }
-  },
-
-  // 处理单条订单数据（包含标签、会员判断）
-  processDingdanItem(item) {
-    const ossUrl = app.globalData.ossImageUrl || '';
-    let fullTupianUrl = '';
-
-    if (item.tupian) {
-      fullTupianUrl = !item.tupian.startsWith('http') ? ossUrl + item.tupian : item.tupian;
-    } else {
-      const leixing = this.data.shangpinleixing.find(l => l.id === item.leixing_id);
-      fullTupianUrl = leixing ? leixing.full_tupian_url : '/images/default-order.png';
-    }
-
-    const isZhiding = item.zhuangtai === 7;
-
-    let zhidingAvatar = '';
-    if (item.zhiding_avatar) {
-      zhidingAvatar = !item.zhiding_avatar.startsWith('http')
-        ? ossUrl + item.zhiding_avatar
-        : item.zhiding_avatar;
-    }
-    const zhidingNicheng = item.zhiding_nicheng || '';
-
-    // 🆕 判断用户是否有订单所需的会员（仅当订单要求会员类型且存在huiyuan_id）
-    let hasRequiredMember = true;
-    if (item.yaoqiuleixing == 1 && item.huiyuan_id) {
-      const userHasIt = this.data.huiyuanList.some(h => h.huiyuanid == item.huiyuan_id);
-      hasRequiredMember = userHasIt;
-    }
-
-    return {
-      ...item,
-      full_tupian_url: fullTupianUrl,
-      isZhiding: isZhiding,
-      isPingtai: item.pingtai == 1,
-      isShangjia: item.pingtai == 2,
-      zhiding_avatar_full: zhidingAvatar,
-      zhiding_nicheng: zhidingNicheng,
-      // 🆕 三层标签（后端返回，直接保留）
-      xuqiu_biaoqian: item.xuqiu_biaoqian || [],
-      dashou_biaoqian: item.dashou_biaoqian || [],
-      shangjia_biaoqian: item.shangjia_biaoqian || [],
-      // 🆕 是否有查看价格的权限
-      hasRequiredMember: hasRequiredMember,
-    };
-  },
-
-  // 跳转到充值页面（原封不动）
-  goToChongzhiPage(failureType, huiyuanId = null, requiredYajin = 0) {
-    let url = '/pages/dashouchongzhi/dashouchongzhi';
-    let params = {};
-
-    switch (failureType) {
-      case 'huiyuan':
-        params = { needScroll: '0', scrollTo: 'member' };
-        break;
-      case 'yajin':
-        params = { needScroll: '1', scrollTo: 'bottom', requiredYajin: requiredYajin };
-        break;
-      case 'jifen':
-        params = { needScroll: '1', scrollTo: 'bottom' };
-        break;
-    }
-
-    if (huiyuanId) params.huiyuanId = huiyuanId;
-
-    const queryString = Object.keys(params)
-      .map(key => `${key}=${encodeURIComponent(params[key])}`)
-      .join('&');
-
-    wx.navigateTo({
-      url: `${url}?${queryString}`,
-      fail: (err) => {
-        console.error('跳转失败:', err);
-        wx.showToast({ title: '跳转失败，请稍后重试', icon: 'none' });
-      }
-    });
-  },
-
-  // 抢单按钮（原封不动）
-  async onQiangdanTap(e) {
-    const dingdanItem = e.currentTarget.dataset.item;
-    if (!dingdanItem) return;
-
-    // 校验1: 打手身份
-    if (!this.data.dashoustatus || this.data.dashoustatus != 1) {
-      wx.showToast({ title: '请先开启打手身份', icon: 'none' });
-      return;
-    }
-    // 校验2: 账号状态
-    if (this.data.zhuanghaoStatus != 1) {
-      wx.showToast({ title: '账号异常，无法接单', icon: 'none' });
-      return;
-    }
-    // 校验3: 打手接单状态
-    if (this.data.dashouzhuangtai != 1) {
-      wx.showToast({ title: '您有订单正在接待中', icon: 'none' });
-      return;
-    }
-    // 校验4: 指定订单
-    if (dingdanItem.isZhiding) {
-      if (!this.data.uid || this.data.uid != dingdanItem.zhiding_uid) {
-        wx.showToast({ title: '此订单为指定单', icon: 'none' });
-        return;
-      }
-    }
-    // 校验5: 会员要求
-    if (dingdanItem.yaoqiuleixing == 1) {
-      const hasHuiyuan = this.data.huiyuanList.some(h => h.huiyuanid == dingdanItem.huiyuan_id);
-      if (!hasHuiyuan) {
-        wx.showToast({
-          title: '未开通对应会员，无法抢单',
-          icon: 'none',
-          duration: 2000
-        });
-        setTimeout(() => {
-          this.goToChongzhiPage('huiyuan', dingdanItem.huiyuan_id);
-        }, 500);
-        return;
-      }
-    }
-    // 校验6: 押金要求
-    if (dingdanItem.yaoqiuleixing == 2) {
-      if (this.data.yajin < dingdanItem.yajin) {
-        wx.showToast({
-          title: `押金不足，需${dingdanItem.yajin}`,
-          icon: 'none',
-          duration: 2000
-        });
-        setTimeout(() => {
-          this.goToChongzhiPage('yajin', null, dingdanItem.yajin);
-        }, 500);
-        return;
-      }
-    }
-    // 校验7: 积分要求
-    if (this.data.jifen < 5) {
-      wx.showToast({
-        title: '积分不足，至少需要5积分',
-        icon: 'none',
-        duration: 2000
-      });
-      setTimeout(() => {
-        this.goToChongzhiPage('jifen');
-      }, 500);
-      return;
-    }
-
-    // 确认框
-    const that = this;
-    wx.showModal({
-      title: '确认抢单',
-      content: `确定要抢此订单吗？${dingdanItem.isZhiding ? '(指定订单)' : ''}`,
-      success: async function (res) {
-        if (res.confirm) {
-          wx.showLoading({ title: '抢单中...', mask: true });
-          try {
-            const qiangdanRes = await request({
-              url: '/dingdan/qiangdan',
-              method: 'POST',
-              data: { dingdan_id: dingdanItem.dingdan_id }
-            });
-            wx.hideLoading();
-
-            if (qiangdanRes.data.code === 200 || qiangdanRes.data.code === 0) {
-              that.showQiangdanSuccessEffect();
-              if (app.globalData) {
-                app.globalData.dashouzhuangtai = 0;
-                that.setData({ dashouzhuangtai: 0 });
-              }
-              const newList = that.data.dingdanList.filter(
-                item => item.dingdan_id !== dingdanItem.dingdan_id
-              );
-              that.setData({ dingdanList: newList });
-            } else {
-              wx.showToast({
-                title: qiangdanRes.data.msg || '抢单失败',
-                icon: 'none'
-              });
-            }
-          } catch (error) {
-            wx.hideLoading();
-            console.error('抢单请求失败:', error);
-            wx.showToast({ title: '网络错误，抢单失败', icon: 'none' });
-          }
-        }
-      }
-    });
-  },
-
-  showQiangdanSuccessEffect() {
-    wx.showToast({ title: '抢单成功！', icon: 'success', duration: 2000 });
-  },
-
-  onViewDetail(e) {
-    const { type, content } = e.currentTarget.dataset;
-    wx.showModal({
-      title: type === 'jieshao' ? '订单介绍' : '订单备注',
-      content: content,
-      showCancel: false,
-      confirmText: '知道了'
-    });
-  },
-
-  onReachBottom() {
-    const now = Date.now();
-    const lastTime = this.data.lastRefreshTime;
-    const cooldown = this.data.refreshCooldown;
-
-    if (now - lastTime < cooldown) {
-      wx.showToast({
-        title: `操作太快，请${Math.ceil((cooldown - (now - lastTime)) / 1000)}秒后再试`,
-        icon: 'none',
-        duration: 1500
-      });
-      return;
-    }
-
-    if (this.data.isLoading || this.data.isLoadingMore) return;
-
-    if (this.data.hasMore && !this.data.isLoading && this.data.xuanzhongLeixingId) {
-      this.setData({ page: this.data.page + 1 });
-      this.loadDingdanList(false);
-    }
-  },
-
-  onPullDownRefresh() {
-    const now = Date.now();
-    const lastTime = this.data.lastRefreshTime;
-    const cooldown = this.data.refreshCooldown;
-
-    if (now - lastTime < cooldown) {
-      this.setData({ scrollViewRefreshing: false });
-      wx.showToast({
-        title: `操作太快，请${Math.ceil((cooldown - (now - lastTime)) / 1000)}秒后再试`,
-        icon: 'none',
-        duration: 1500
-      });
-      return;
-    }
-
-    if (this.data.isLoading) {
-      this.setData({ scrollViewRefreshing: false });
-      return;
-    }
-
-    this.setData({
-      scrollViewRefreshing: true,
-      lastRefreshTime: now,
-      page: 1,
-      hasMore: true
-    });
-
-    if (this.data.xuanzhongLeixingId) {
-      this.loadDingdanList(true);
-    } else {
-      this.setData({ scrollViewRefreshing: false });
-    }
-  }
+// pages/qiangdan/qiangdan.js
+const app = getApp();
+import request from '../../utils/request.js';
+import PopupService from '../../services/popupService.js';
+import { reconnectForRole } from '../../utils/role-tab-bar.js';
+
+Page({
+  data: {
+    // 1. 商品类型相关
+    shangpinleixing: [],
+    xuanzhongLeixingId: null,
+
+    // 2. 订单列表与分页相关
+    dingdanList: [],
+    page: 1,
+    pageSize: 5,
+    hasMore: true,
+    isLoading: false,
+
+    // 3. 全局状态字段
+    dashoustatus: null,
+    zhuanghaoStatus: null,
+    dashouzhuangtai: null,
+    uid: null,
+    huiyuanList: [],
+    yajin: 0,
+    jifen: 0,
+
+    // 4. 刷新控制字段
+    scrollViewRefreshing: false,
+    lastRefreshTime: 0,
+    refreshCooldown: 2000,
+    isLoadingMore: false,
+
+    // 5. 切换类型冷却
+    lastSwitchTime: 0,
+    switchCooldown: 1500,
+    isSwitching: false,
+
+    // 6. OSS地址
+    ossImageUrl: app.globalData.ossImageUrl || '',
+
+    // 🆕 7. 标签筛选相关
+    bankuaiBiaoqian: [],           // 当前商品类型所属板块的全部标签
+    xuanzhongBiaoqianId: 0,        // 0=全部
+  },
+
+  async onLoad(options) {
+    this.loadGlobalStatus();
+    await this.loadShangpinLeixing();
+    PopupService.checkAndShow(this, 'jiedan');
+  },
+
+  onHide: function () {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+      popupComp.cleanup();
+    }
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+    this.loadGlobalStatus();
+    if (wx.getStorageSync('uid')) {
+      reconnectForRole('dashou');
+      if (app.startImWhenReady) app.startImWhenReady();
+      this.refreshDashouProfileSilent();
+    }
+    if (this.data.xuanzhongLeixingId) {
+      this.loadDingdanList(true);
+    }
+  },
+
+  async refreshDashouProfileSilent() {
+    try {
+      const res = await request({ url: '/yonghu/dashouxinxi', method: 'POST' });
+      if (!res || res.data.code != 200) return;
+      const data = res.data.data || {};
+      const patch = {
+        dashouNicheng: data.dashounicheng || '',
+        zhanghaoStatus: data.zhanghaostatus || '',
+        dashouzhuangtai: data.dashouzhuangtai || '',
+        yajin: data.yajin || 0,
+        jifen: data.jifen || 0,
+        clumber: data.clumber || [],
+      };
+      Object.assign(app.globalData, {
+        dashouNicheng: patch.dashouNicheng,
+        zhanghaoStatus: patch.zhanghaoStatus,
+        dashouzhuangtai: patch.dashouzhuangtai,
+        yajin: patch.yajin,
+        jinfen: patch.jifen,
+        clumber: patch.clumber,
+      });
+      if (data.dashoustatus !== undefined) {
+        wx.setStorageSync('dashoustatus', data.dashoustatus);
+        app.globalData.dashoustatus = data.dashoustatus;
+      }
+      this.setData({
+        zhuanghaoStatus: patch.zhanghaoStatus,
+        dashouzhuangtai: patch.dashouzhuangtai,
+        huiyuanList: patch.clumber,
+        yajin: patch.yajin,
+        jifen: patch.jifen,
+      });
+    } catch (e) {}
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  loadGlobalStatus() {
+    const globalData = app.globalData;
+    this.setData({
+      dashoustatus: wx.getStorageSync('dashoustatus'),
+      zhuanghaoStatus: globalData.zhanghaoStatus,
+      dashouzhuangtai: globalData.dashouzhuangtai,
+      uid: wx.getStorageSync('uid'),
+      huiyuanList: globalData.clumber || [],
+      yajin: globalData.yajin || 0,
+      jifen: globalData.jinfen || 0
+    });
+  },
+
+  // 加载商品类型
+  async loadShangpinLeixing() {
+    wx.showLoading({ title: '加载商品类型...' });
+    try {
+      const res = await request({
+        url: '/dingdan/dsqdhqddlx',
+        method: 'POST',
+        header: { 'content-type': 'application/json' }
+      });
+      if (res.statusCode === 200 && res.data) {
+        const data = res.data;
+        let list = [];
+        if (data.code === 200 || data.code === 0) {
+          if (data.data && Array.isArray(data.data.list)) list = data.data.list;
+          else if (data.data && Array.isArray(data.data)) list = data.data;
+          else if (Array.isArray(data.list)) list = data.list;
+          else if (Array.isArray(data)) list = data;
+        }
+        const processedList = this.processTupianUrl(list);
+        this.setData({
+          shangpinleixing: processedList,
+          xuanzhongLeixingId: processedList[0]?.id || null
+        });
+        if (this.data.xuanzhongLeixingId) {
+          this.loadDingdanList(true);
+          // 🆕 加载板块标签
+          this.loadBankuaiBiaoqian();
+        }
+      } else {
+        wx.showToast({ title: res.data?.msg || '加载商品类型失败', icon: 'none' });
+      }
+    } catch (error) {
+      wx.showToast({ title: '网络错误，加载失败', icon: 'none' });
+    } finally {
+      wx.hideLoading();
+    }
+  },
+
+  // 处理图片URL
+  processTupianUrl(list) {
+    const ossUrl = app.globalData.ossImageUrl || '';
+    return list.map(item => ({
+      ...item,
+      full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http')
+        ? ossUrl + item.tupian_url
+        : (item.tupian_url || '/images/default-type.png')
+    }));
+  },
+
+  // 🆕 加载板块标签
+  async loadBankuaiBiaoqian() {
+    const leixingId = this.data.xuanzhongLeixingId;
+    if (!leixingId) return;
+    try {
+      const res = await request({
+        url: '/dengji/bkqhbq',
+        method: 'POST',
+        data: { leixing_id: leixingId }
+      });
+      if (res && res.data.code === 0) {
+        this.setData({
+          bankuaiBiaoqian: res.data.data.biaoqian_list || [],
+          xuanzhongBiaoqianId: 0
+        });
+      }
+    } catch (e) {
+      // 标签加载失败不影响主流程
+    }
+  },
+
+  // 选择商品类型
+  async selectLeixing(e) {
+    const now = Date.now();
+    const lastSwitchTime = this.data.lastSwitchTime;
+    const switchCooldown = this.data.switchCooldown;
+
+    if (now - lastSwitchTime < switchCooldown) {
+      wx.showToast({
+        title: `操作太快，请${Math.ceil((switchCooldown - (now - lastSwitchTime)) / 1000)}秒后再试`,
+        icon: 'none',
+        duration: 1500
+      });
+      return;
+    }
+    if (this.data.isSwitching) return;
+
+    const leixingId = e.currentTarget.dataset.id;
+    if (leixingId === this.data.xuanzhongLeixingId) return;
+
+    this.setData({ isSwitching: true, lastSwitchTime: now });
+    wx.showLoading({ title: '切换中...' });
+
+    try {
+      this.setData({
+        xuanzhongLeixingId: leixingId,
+        dingdanList: [],
+        page: 1,
+        hasMore: true,
+        xuanzhongBiaoqianId: 0 // 重置标签筛选
+      });
+      await this.loadDingdanList(true);
+      // 🆕 切换类型后加载新标签
+      await this.loadBankuaiBiaoqian();
+    } catch (error) {
+      console.error('切换类型失败:', error);
+    } finally {
+      this.setData({ isSwitching: false });
+      wx.hideLoading();
+    }
+  },
+
+  // 🆕 选择标签筛选
+  async selectBiaoqian(e) {
+    const id = e.currentTarget.dataset.id;
+    if (id === this.data.xuanzhongBiaoqianId) return;
+    this.setData({
+      xuanzhongBiaoqianId: id,
+      dingdanList: [],
+      page: 1,
+      hasMore: true
+    });
+    await this.loadDingdanList(true);
+  },
+
+  // 加载订单列表
+  async loadDingdanList(isRefresh = false) {
+    if (this.data.isLoading || !this.data.xuanzhongLeixingId) return;
+
+    const loadPage = isRefresh ? 1 : this.data.page;
+    if (!isRefresh && !this.data.hasMore) return;
+
+    this.setData({
+      isLoading: true,
+      isLoadingMore: !isRefresh
+    });
+
+    try {
+      const res = await request({
+        url: '/dingdan/ddhq',
+        method: 'POST',
+        data: {
+          leixing_id: this.data.xuanzhongLeixingId,
+          page: loadPage,
+          page_size: this.data.pageSize,
+          // 🆕 传递标签筛选参数（0时不传）
+          biaoqian_id: this.data.xuanzhongBiaoqianId || undefined
+        }
+      });
+
+      this.setData({
+        isLoading: false,
+        isLoadingMore: false,
+        scrollViewRefreshing: false
+      });
+
+      if (res.data.code === 200 || res.data.code === 0) {
+        const newList = res.data.data.list || [];
+        const hasMore = res.data.data.has_more || false;
+
+        // 🆕 处理每条订单，增加 hasRequiredMember 字段
+        const processedList = newList.map(item => this.processDingdanItem(item));
+        const updatedList = isRefresh ? processedList : [...this.data.dingdanList, ...processedList];
+        updatedList.sort((a, b) => (b.creat_time || '').localeCompare(a.creat_time || ''));
+
+        this.setData({
+          dingdanList: updatedList,
+          page: loadPage,
+          hasMore: hasMore
+        });
+
+        if (isRefresh) {
+          this.setData({ lastRefreshTime: Date.now() });
+        }
+      } else {
+        wx.showToast({ title: res.data.msg || '加载失败', icon: 'none' });
+      }
+    } catch (error) {
+      console.error('加载订单失败:', error);
+      this.setData({
+        isLoading: false,
+        isLoadingMore: false,
+        scrollViewRefreshing: false
+      });
+      wx.showToast({ title: '网络请求失败', icon: 'none' });
+    }
+  },
+
+  // 处理单条订单数据（包含标签、会员判断）
+  processDingdanItem(item) {
+    const ossUrl = app.globalData.ossImageUrl || '';
+    let fullTupianUrl = '';
+
+    if (item.tupian) {
+      fullTupianUrl = !item.tupian.startsWith('http') ? ossUrl + item.tupian : item.tupian;
+    } else {
+      const leixing = this.data.shangpinleixing.find(l => l.id === item.leixing_id);
+      fullTupianUrl = leixing ? leixing.full_tupian_url : '/images/default-order.png';
+    }
+
+    const isZhiding = item.zhuangtai === 7;
+
+    let zhidingAvatar = '';
+    if (item.zhiding_avatar) {
+      zhidingAvatar = !item.zhiding_avatar.startsWith('http')
+        ? ossUrl + item.zhiding_avatar
+        : item.zhiding_avatar;
+    }
+    const zhidingNicheng = item.zhiding_nicheng || '';
+
+    // 🆕 判断用户是否有订单所需的会员（仅当订单要求会员类型且存在huiyuan_id）
+    let hasRequiredMember = true;
+    if (item.yaoqiuleixing == 1 && item.huiyuan_id) {
+      const userHasIt = this.data.huiyuanList.some(h => h.huiyuanid == item.huiyuan_id);
+      hasRequiredMember = userHasIt;
+    }
+
+    return {
+      ...item,
+      full_tupian_url: fullTupianUrl,
+      isZhiding: isZhiding,
+      isPingtai: item.pingtai == 1,
+      isShangjia: item.pingtai == 2,
+      zhiding_avatar_full: zhidingAvatar,
+      zhiding_nicheng: zhidingNicheng,
+      // 🆕 三层标签（后端返回，直接保留）
+      xuqiu_biaoqian: item.xuqiu_biaoqian || [],
+      dashou_biaoqian: item.dashou_biaoqian || [],
+      shangjia_biaoqian: item.shangjia_biaoqian || [],
+      // 🆕 是否有查看价格的权限
+      hasRequiredMember: hasRequiredMember,
+    };
+  },
+
+  // 跳转到充值页面（原封不动）
+  goToChongzhiPage(failureType, huiyuanId = null, requiredYajin = 0) {
+    let url = '/pages/fighter-recharge/fighter-recharge';
+    let params = {};
+
+    switch (failureType) {
+      case 'huiyuan':
+        params = { needScroll: '0', scrollTo: 'member' };
+        break;
+      case 'yajin':
+        params = { needScroll: '1', scrollTo: 'bottom', requiredYajin: requiredYajin };
+        break;
+      case 'jifen':
+        params = { needScroll: '1', scrollTo: 'bottom' };
+        break;
+    }
+
+    if (huiyuanId) params.huiyuanId = huiyuanId;
+
+    const queryString = Object.keys(params)
+      .map(key => `${key}=${encodeURIComponent(params[key])}`)
+      .join('&');
+
+    wx.navigateTo({
+      url: `${url}?${queryString}`,
+      fail: (err) => {
+        console.error('跳转失败:', err);
+        wx.showToast({ title: '跳转失败，请稍后重试', icon: 'none' });
+      }
+    });
+  },
+
+  // 抢单按钮（原封不动）
+  async onQiangdanTap(e) {
+    const dingdanItem = e.currentTarget.dataset.item;
+    if (!dingdanItem) return;
+
+    // 校验1: 打手身份
+    if (!this.data.dashoustatus || this.data.dashoustatus != 1) {
+      wx.showToast({ title: '请先开启打手身份', icon: 'none' });
+      return;
+    }
+    // 校验2: 账号状态
+    if (this.data.zhuanghaoStatus != 1) {
+      wx.showToast({ title: '账号异常，无法接单', icon: 'none' });
+      return;
+    }
+    // 校验3: 打手接单状态
+    if (this.data.dashouzhuangtai != 1) {
+      wx.showToast({ title: '您有订单正在接待中', icon: 'none' });
+      return;
+    }
+    // 校验4: 指定订单
+    if (dingdanItem.isZhiding) {
+      if (!this.data.uid || this.data.uid != dingdanItem.zhiding_uid) {
+        wx.showToast({ title: '此订单为指定单', icon: 'none' });
+        return;
+      }
+    }
+    // 校验5: 会员要求
+    if (dingdanItem.yaoqiuleixing == 1) {
+      const hasHuiyuan = this.data.huiyuanList.some(h => h.huiyuanid == dingdanItem.huiyuan_id);
+      if (!hasHuiyuan) {
+        wx.showToast({
+          title: '未开通对应会员，无法抢单',
+          icon: 'none',
+          duration: 2000
+        });
+        setTimeout(() => {
+          this.goToChongzhiPage('huiyuan', dingdanItem.huiyuan_id);
+        }, 500);
+        return;
+      }
+    }
+    // 校验6: 押金要求
+    if (dingdanItem.yaoqiuleixing == 2) {
+      if (this.data.yajin < dingdanItem.yajin) {
+        wx.showToast({
+          title: `押金不足，需${dingdanItem.yajin}`,
+          icon: 'none',
+          duration: 2000
+        });
+        setTimeout(() => {
+          this.goToChongzhiPage('yajin', null, dingdanItem.yajin);
+        }, 500);
+        return;
+      }
+    }
+    // 校验7: 积分要求
+    if (this.data.jifen < 5) {
+      wx.showToast({
+        title: '积分不足，至少需要5积分',
+        icon: 'none',
+        duration: 2000
+      });
+      setTimeout(() => {
+        this.goToChongzhiPage('jifen');
+      }, 500);
+      return;
+    }
+
+    // 确认框
+    const that = this;
+    wx.showModal({
+      title: '确认抢单',
+      content: `确定要抢此订单吗？${dingdanItem.isZhiding ? '(指定订单)' : ''}`,
+      success: async function (res) {
+        if (res.confirm) {
+          wx.showLoading({ title: '抢单中...', mask: true });
+          try {
+            const qiangdanRes = await request({
+              url: '/dingdan/qiangdan',
+              method: 'POST',
+              data: { dingdan_id: dingdanItem.dingdan_id }
+            });
+            wx.hideLoading();
+
+            if (qiangdanRes.data.code === 200 || qiangdanRes.data.code === 0) {
+              that.showQiangdanSuccessEffect();
+              if (app.globalData) {
+                app.globalData.dashouzhuangtai = 0;
+                that.setData({ dashouzhuangtai: 0 });
+              }
+              const newList = that.data.dingdanList.filter(
+                item => item.dingdan_id !== dingdanItem.dingdan_id
+              );
+              that.setData({ dingdanList: newList });
+            } else {
+              wx.showToast({
+                title: qiangdanRes.data.msg || '抢单失败',
+                icon: 'none'
+              });
+            }
+          } catch (error) {
+            wx.hideLoading();
+            console.error('抢单请求失败:', error);
+            wx.showToast({ title: '网络错误，抢单失败', icon: 'none' });
+          }
+        }
+      }
+    });
+  },
+
+  showQiangdanSuccessEffect() {
+    wx.showToast({ title: '抢单成功！', icon: 'success', duration: 2000 });
+  },
+
+  onViewDetail(e) {
+    const { type, content } = e.currentTarget.dataset;
+    wx.showModal({
+      title: type === 'jieshao' ? '订单介绍' : '订单备注',
+      content: content,
+      showCancel: false,
+      confirmText: '知道了'
+    });
+  },
+
+  onReachBottom() {
+    const now = Date.now();
+    const lastTime = this.data.lastRefreshTime;
+    const cooldown = this.data.refreshCooldown;
+
+    if (now - lastTime < cooldown) {
+      wx.showToast({
+        title: `操作太快，请${Math.ceil((cooldown - (now - lastTime)) / 1000)}秒后再试`,
+        icon: 'none',
+        duration: 1500
+      });
+      return;
+    }
+
+    if (this.data.isLoading || this.data.isLoadingMore) return;
+
+    if (this.data.hasMore && !this.data.isLoading && this.data.xuanzhongLeixingId) {
+      this.setData({ page: this.data.page + 1 });
+      this.loadDingdanList(false);
+    }
+  },
+
+  onPullDownRefresh() {
+    const now = Date.now();
+    const lastTime = this.data.lastRefreshTime;
+    const cooldown = this.data.refreshCooldown;
+
+    if (now - lastTime < cooldown) {
+      this.setData({ scrollViewRefreshing: false });
+      wx.showToast({
+        title: `操作太快，请${Math.ceil((cooldown - (now - lastTime)) / 1000)}秒后再试`,
+        icon: 'none',
+        duration: 1500
+      });
+      return;
+    }
+
+    if (this.data.isLoading) {
+      this.setData({ scrollViewRefreshing: false });
+      return;
+    }
+
+    this.setData({
+      scrollViewRefreshing: true,
+      lastRefreshTime: now,
+      page: 1,
+      hasMore: true
+    });
+
+    if (this.data.xuanzhongLeixingId) {
+      this.loadDingdanList(true);
+    } else {
+      this.setData({ scrollViewRefreshing: false });
+    }
+  }
 });
\ No newline at end of file
diff --git a/pages/jiedan/jiedan.json b/pages/accept-order/accept-order.json
similarity index 100%
rename from pages/jiedan/jiedan.json
rename to pages/accept-order/accept-order.json
diff --git a/pages/jiedan/jiedan.wxml b/pages/accept-order/accept-order.wxml
similarity index 100%
rename from pages/jiedan/jiedan.wxml
rename to pages/accept-order/accept-order.wxml
diff --git a/pages/jiedan/jiedan.wxss b/pages/accept-order/accept-order.wxss
similarity index 100%
rename from pages/jiedan/jiedan.wxss
rename to pages/accept-order/accept-order.wxss
diff --git a/pages/kaohe_zhongxin/kaohe_zhongxin.js b/pages/assess-center/assess-center.js
similarity index 95%
rename from pages/kaohe_zhongxin/kaohe_zhongxin.js
rename to pages/assess-center/assess-center.js
index 9f45455..c6a3fe5 100644
--- a/pages/kaohe_zhongxin/kaohe_zhongxin.js
+++ b/pages/assess-center/assess-center.js
@@ -1,240 +1,240 @@
-// pages/shenhedating/shenhedating.js
-const app = getApp();
-import request from '../../utils/request.js';
-
-Page({
-  data: {
-    // 模块列表 [{bankuai_id, mingcheng, count, is_related}]
-    moduleList: [],
-    xuanzhongBankuaiId: 0,        // 0代表全部
-    // 审核记录列表
-    recordList: [],
-    page: 1,
-    pageSize: 5,
-    hasMore: true,
-    isLoading: false,
-    isLoadingMore: false,
-    scrollViewRefreshing: false,
-    lastRefreshTime: 0,
-    refreshCooldown: 2000,
-    // 弹窗控制
-    showRuleModal: false,
-    currentRuleContent: '',
-    showBeizhuModal: false,
-    currentBeizhuContent: '',
-    // 加载状态
-    loadingModules: false
-  },
-
-  onLoad() {
-    this.loadModules();
-  },
-
-  onShow() {
-    this.registerNotificationComponent();
-  },
-
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  // 加载板块模块
-  async loadModules() {
-    this.setData({ loadingModules: true });
-    try {
-      const res = await request({ url: '/dengji/shdthqmk', method: 'POST' });
-      if (res && res.data.code === 0) {
-        const modules = res.data.data.modules || [];
-        this.setData({ moduleList: modules, xuanzhongBankuaiId: 0 });
-        this.loadRecords(true);
-      } else {
-        wx.showToast({ title: '加载模块失败', icon: 'none' });
-      }
-    } catch (e) {
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    } finally {
-      this.setData({ loadingModules: false });
-    }
-  },
-
-  // 选择模块（含全部）
-  selectModule(e) {
-    const bankuaiId = e.currentTarget.dataset.id;
-    if (bankuaiId === this.data.xuanzhongBankuaiId) return;
-    this.setData({
-      xuanzhongBankuaiId: bankuaiId,
-      recordList: [],
-      page: 1,
-      hasMore: true
-    });
-    this.loadRecords(true);
-  },
-
-  // 加载审核记录
-  async loadRecords(isRefresh = false) {
-    if (this.data.isLoading) return;
-    const page = isRefresh ? 1 : this.data.page;
-    if (!isRefresh && !this.data.hasMore) return;
-
-    this.setData({ isLoading: true, isLoadingMore: !isRefresh });
-
-    try {
-      const res = await request({
-        url: '/dengji/hqshsj',
-        method: 'POST',
-        data: {
-          bankuai_id: this.data.xuanzhongBankuaiId || undefined,
-          page: page,
-          page_size: this.data.pageSize
-        }
-      });
-
-      this.setData({ isLoading: false, isLoadingMore: false, scrollViewRefreshing: false });
-
-      if (res && res.data.code === 0) {
-        const list = res.data.data.list || [];
-        const hasMore = res.data.data.has_more;
-        const ossUrl = app.globalData.ossImageUrl || '';
-        const processedList = list.map(item => {
-          let avatar = item.shenqingren_avatar || '';
-          if (avatar && !avatar.startsWith('http')) {
-            avatar = ossUrl + avatar;
-          }
-          return { ...item, shenqingren_avatar: avatar };
-        });
-        const newList = isRefresh ? processedList : [...this.data.recordList, ...processedList];
-        this.setData({ recordList: newList, page: page + 1, hasMore: hasMore });
-        if (isRefresh) this.setData({ lastRefreshTime: Date.now() });
-      } else {
-        wx.showToast({ title: '加载记录失败', icon: 'none' });
-      }
-    } catch (e) {
-      this.setData({ isLoading: false, isLoadingMore: false, scrollViewRefreshing: false });
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }
-  },
-
-  // 上拉加载更多
-  onReachBottom() {
-    const now = Date.now();
-    if (now - this.data.lastRefreshTime < this.data.refreshCooldown ||
-        this.data.isLoading || this.data.isLoadingMore) return;
-    if (this.data.hasMore) {
-      this.loadRecords(false);
-    }
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    const now = Date.now();
-    if (now - this.data.lastRefreshTime < this.data.refreshCooldown || this.data.isLoading) {
-      this.setData({ scrollViewRefreshing: false });
-      return;
-    }
-    this.setData({ scrollViewRefreshing: true, lastRefreshTime: now, page: 1, hasMore: true });
-    this.loadRecords(true);
-  },
-
-  // 查看规则详情
-  showRuleDetail(e) {
-    const content = e.currentTarget.dataset.content;
-    this.setData({ showRuleModal: true, currentRuleContent: content });
-  },
-  hideRuleDetail() {
-    this.setData({ showRuleModal: false, currentRuleContent: '' });
-  },
-
-  // 查看备注详情
-  showBeizhuDetail(e) {
-    const content = e.currentTarget.dataset.content;
-    this.setData({ showBeizhuModal: true, currentBeizhuContent: content || '无' });
-  },
-  hideBeizhuDetail() {
-    this.setData({ showBeizhuModal: false, currentBeizhuContent: '' });
-  },
-
-  // 抢单
-  async onShouShen(e) {
-    const jiluId = e.currentTarget.dataset.jiluid;
-    const bankuaiId = e.currentTarget.dataset.bankuaiid;
-    if (!jiluId) {
-      wx.showToast({ title: '记录ID异常，无法接单', icon: 'none' });
-      return;
-    }
-
-    const that = this;
-    wx.showModal({
-      title: '确认审核',
-      content: '确定要审核此用户吗？审核后请前往游戏进行审核，并严格评分。',
-      confirmColor: '#c9a558',
-      success: async (res) => {
-        if (res.confirm) {
-          wx.showLoading({ title: '接单中...', mask: true });
-          try {
-            const qdRes = await request({
-              url: '/dengji/shqd',
-              method: 'POST',
-              data: { jilu_id: jiluId }
-            });
-            if (qdRes && qdRes.data.code === 0) {
-              // 抢单成功，弹出联系打手弹窗
-              wx.showModal({
-                title: '接待成功',
-                content: '请认真考核，点击联系他查看打手信息并打分。',
-                showCancel: false,
-                confirmText: '联系他',
-                confirmColor: '#c9a558',
-                success: (modalRes) => {
-                  if (modalRes.confirm) {
-                    wx.navigateTo({
-                      url: '/pages/kaohe_dafen/kaohe_dafen?jilu_id=' + jiluId
-                    });
-                  }
-                }
-              });
-              const newList = that.data.recordList.filter(r => r.jilu_id !== jiluId);
-              that.setData({ recordList: newList });
-              // 对应板块待审核数减1
-              const bkId = qdRes.data.data ? qdRes.data.data.bankuai_id : bankuaiId;
-              if (bkId) {
-                const newModules = that.data.moduleList.map(m => {
-                  if (m.bankuai_id === bkId && m.count > 0) {
-                    return { ...m, count: m.count - 1 };
-                  }
-                  return m;
-                });
-                that.setData({ moduleList: newModules });
-              }
-            } else {
-              const errMsg = qdRes?.data?.msg || '接单失败，请重试';
-              wx.showModal({
-                title: '接单失败',
-                content: errMsg,
-                showCancel: false,
-                confirmText: '知道了',
-                confirmColor: '#c9a558'
-              });
-            }
-          } catch (e) {
-            wx.showModal({
-              title: '提示',
-              content: '网络错误，请重试',
-              showCancel: false,
-              confirmText: '知道了'
-            });
-          } finally {
-            wx.hideLoading();
-          }
-        }
-      }
-    });
-  },
-
-  noop() {}
+// pages/shenhedating/shenhedating.js
+const app = getApp();
+import request from '../../utils/request.js';
+
+Page({
+  data: {
+    // 模块列表 [{bankuai_id, mingcheng, count, is_related}]
+    moduleList: [],
+    xuanzhongBankuaiId: 0,        // 0代表全部
+    // 审核记录列表
+    recordList: [],
+    page: 1,
+    pageSize: 5,
+    hasMore: true,
+    isLoading: false,
+    isLoadingMore: false,
+    scrollViewRefreshing: false,
+    lastRefreshTime: 0,
+    refreshCooldown: 2000,
+    // 弹窗控制
+    showRuleModal: false,
+    currentRuleContent: '',
+    showBeizhuModal: false,
+    currentBeizhuContent: '',
+    // 加载状态
+    loadingModules: false
+  },
+
+  onLoad() {
+    this.loadModules();
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  // 加载板块模块
+  async loadModules() {
+    this.setData({ loadingModules: true });
+    try {
+      const res = await request({ url: '/dengji/shdthqmk', method: 'POST' });
+      if (res && res.data.code === 0) {
+        const modules = res.data.data.modules || [];
+        this.setData({ moduleList: modules, xuanzhongBankuaiId: 0 });
+        this.loadRecords(true);
+      } else {
+        wx.showToast({ title: '加载模块失败', icon: 'none' });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+      this.setData({ loadingModules: false });
+    }
+  },
+
+  // 选择模块（含全部）
+  selectModule(e) {
+    const bankuaiId = e.currentTarget.dataset.id;
+    if (bankuaiId === this.data.xuanzhongBankuaiId) return;
+    this.setData({
+      xuanzhongBankuaiId: bankuaiId,
+      recordList: [],
+      page: 1,
+      hasMore: true
+    });
+    this.loadRecords(true);
+  },
+
+  // 加载审核记录
+  async loadRecords(isRefresh = false) {
+    if (this.data.isLoading) return;
+    const page = isRefresh ? 1 : this.data.page;
+    if (!isRefresh && !this.data.hasMore) return;
+
+    this.setData({ isLoading: true, isLoadingMore: !isRefresh });
+
+    try {
+      const res = await request({
+        url: '/dengji/hqshsj',
+        method: 'POST',
+        data: {
+          bankuai_id: this.data.xuanzhongBankuaiId || undefined,
+          page: page,
+          page_size: this.data.pageSize
+        }
+      });
+
+      this.setData({ isLoading: false, isLoadingMore: false, scrollViewRefreshing: false });
+
+      if (res && res.data.code === 0) {
+        const list = res.data.data.list || [];
+        const hasMore = res.data.data.has_more;
+        const ossUrl = app.globalData.ossImageUrl || '';
+        const processedList = list.map(item => {
+          let avatar = item.shenqingren_avatar || '';
+          if (avatar && !avatar.startsWith('http')) {
+            avatar = ossUrl + avatar;
+          }
+          return { ...item, shenqingren_avatar: avatar };
+        });
+        const newList = isRefresh ? processedList : [...this.data.recordList, ...processedList];
+        this.setData({ recordList: newList, page: page + 1, hasMore: hasMore });
+        if (isRefresh) this.setData({ lastRefreshTime: Date.now() });
+      } else {
+        wx.showToast({ title: '加载记录失败', icon: 'none' });
+      }
+    } catch (e) {
+      this.setData({ isLoading: false, isLoadingMore: false, scrollViewRefreshing: false });
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // 上拉加载更多
+  onReachBottom() {
+    const now = Date.now();
+    if (now - this.data.lastRefreshTime < this.data.refreshCooldown ||
+        this.data.isLoading || this.data.isLoadingMore) return;
+    if (this.data.hasMore) {
+      this.loadRecords(false);
+    }
+  },
+
+  // 下拉刷新
+  onPullDownRefresh() {
+    const now = Date.now();
+    if (now - this.data.lastRefreshTime < this.data.refreshCooldown || this.data.isLoading) {
+      this.setData({ scrollViewRefreshing: false });
+      return;
+    }
+    this.setData({ scrollViewRefreshing: true, lastRefreshTime: now, page: 1, hasMore: true });
+    this.loadRecords(true);
+  },
+
+  // 查看规则详情
+  showRuleDetail(e) {
+    const content = e.currentTarget.dataset.content;
+    this.setData({ showRuleModal: true, currentRuleContent: content });
+  },
+  hideRuleDetail() {
+    this.setData({ showRuleModal: false, currentRuleContent: '' });
+  },
+
+  // 查看备注详情
+  showBeizhuDetail(e) {
+    const content = e.currentTarget.dataset.content;
+    this.setData({ showBeizhuModal: true, currentBeizhuContent: content || '无' });
+  },
+  hideBeizhuDetail() {
+    this.setData({ showBeizhuModal: false, currentBeizhuContent: '' });
+  },
+
+  // 抢单
+  async onShouShen(e) {
+    const jiluId = e.currentTarget.dataset.jiluid;
+    const bankuaiId = e.currentTarget.dataset.bankuaiid;
+    if (!jiluId) {
+      wx.showToast({ title: '记录ID异常，无法接单', icon: 'none' });
+      return;
+    }
+
+    const that = this;
+    wx.showModal({
+      title: '确认审核',
+      content: '确定要审核此用户吗？审核后请前往游戏进行审核，并严格评分。',
+      confirmColor: '#c9a558',
+      success: async (res) => {
+        if (res.confirm) {
+          wx.showLoading({ title: '接单中...', mask: true });
+          try {
+            const qdRes = await request({
+              url: '/dengji/shqd',
+              method: 'POST',
+              data: { jilu_id: jiluId }
+            });
+            if (qdRes && qdRes.data.code === 0) {
+              // 抢单成功，弹出联系打手弹窗
+              wx.showModal({
+                title: '接待成功',
+                content: '请认真考核，点击联系他查看打手信息并打分。',
+                showCancel: false,
+                confirmText: '联系他',
+                confirmColor: '#c9a558',
+                success: (modalRes) => {
+                  if (modalRes.confirm) {
+                    wx.navigateTo({
+                      url: '/pages/assess-score/assess-score?jilu_id=' + jiluId
+                    });
+                  }
+                }
+              });
+              const newList = that.data.recordList.filter(r => r.jilu_id !== jiluId);
+              that.setData({ recordList: newList });
+              // 对应板块待审核数减1
+              const bkId = qdRes.data.data ? qdRes.data.data.bankuai_id : bankuaiId;
+              if (bkId) {
+                const newModules = that.data.moduleList.map(m => {
+                  if (m.bankuai_id === bkId && m.count > 0) {
+                    return { ...m, count: m.count - 1 };
+                  }
+                  return m;
+                });
+                that.setData({ moduleList: newModules });
+              }
+            } else {
+              const errMsg = qdRes?.data?.msg || '接单失败，请重试';
+              wx.showModal({
+                title: '接单失败',
+                content: errMsg,
+                showCancel: false,
+                confirmText: '知道了',
+                confirmColor: '#c9a558'
+              });
+            }
+          } catch (e) {
+            wx.showModal({
+              title: '提示',
+              content: '网络错误，请重试',
+              showCancel: false,
+              confirmText: '知道了'
+            });
+          } finally {
+            wx.hideLoading();
+          }
+        }
+      }
+    });
+  },
+
+  noop() {}
 });
\ No newline at end of file
diff --git a/pages/kaohe_zhongxin/kaohe_zhongxin.json b/pages/assess-center/assess-center.json
similarity index 100%
rename from pages/kaohe_zhongxin/kaohe_zhongxin.json
rename to pages/assess-center/assess-center.json
diff --git a/pages/kaohe_zhongxin/kaohe_zhongxin.wxml b/pages/assess-center/assess-center.wxml
similarity index 100%
rename from pages/kaohe_zhongxin/kaohe_zhongxin.wxml
rename to pages/assess-center/assess-center.wxml
diff --git a/pages/kaohe_zhongxin/kaohe_zhongxin.wxss b/pages/assess-center/assess-center.wxss
similarity index 99%
rename from pages/kaohe_zhongxin/kaohe_zhongxin.wxss
rename to pages/assess-center/assess-center.wxss
index 586c429..be8ff31 100644
--- a/pages/kaohe_zhongxin/kaohe_zhongxin.wxss
+++ b/pages/assess-center/assess-center.wxss
@@ -245,8 +245,7 @@
     animation: spin 0.8s linear infinite;
     margin-bottom: 20rpx;
   }
-  @keyframes spin { to { transform: rotate(360deg); } }
-  
+
   /* 弹窗 */
   .modal-mask {
     position: fixed;
diff --git a/pages/kaohe_jinpai/kaohe_jinpai.js b/pages/assess-gold/assess-gold.js
similarity index 96%
rename from pages/kaohe_jinpai/kaohe_jinpai.js
rename to pages/assess-gold/assess-gold.js
index ed6fcb4..5c0df6a 100644
--- a/pages/kaohe_jinpai/kaohe_jinpai.js
+++ b/pages/assess-gold/assess-gold.js
@@ -1,461 +1,461 @@
-// pages/kaohe_jinpai/kaohe_jinpai.js
-const app = getApp();
-import request from '../../utils/request.js';
-
-Page({
-  data: {
-    activeTab: 'all_tags',
-    plateList: [],            // 第一个接口返回的所有板块及标签（含 fee_list）
-    myTags: [],
-    recordList: [],
-    recordPage: 1,
-    recordHasMore: true,
-    recordLoading: false,
-    recordFilter: 'pending',
-    showApplyModal: false,
-    selectedTag: null,
-    applyGameNick: '',
-    applyRemark: '',
-    applyFee: 0,
-    applyJiluId: '',
-    isReapply: false,
-    payLoading: false,
-    ossImageUrl: app.globalData.ossImageUrl || '',
-
-    // 新增：考核官相关
-    kaoheguanList: [],           // 所有可选的考核官
-    showKaoheguanModal: false,   // 考核官选择弹窗
-    selectedKaoheguanId: '',     // 已选择的考核官ID
-    selectedKaoheguanInfo: null, // 已选择的考核官信息（用于展示）
-    searchKeyword: '',           // 搜索关键词
-    filteredKaoheguanList: [],   // 搜索过滤后的列表
-  },
-
-  onLoad() {
-    this.fetchAllTags();
-    this.fetchMyRecords(true);
-  },
-
-  switchTab(e) {
-    const tab = e.currentTarget.dataset.tab;
-    if (tab === this.data.activeTab) return;
-    this.setData({ activeTab: tab });
-    if (tab === 'my_records') this.fetchMyRecords(true);
-  },
-
-  // 获取所有板块及标签（含费用列表），缓存到 plateList，同时获取考核官列表
-  async fetchAllTags() {
-    try {
-      const res = await request({ url: '/dengji/dskhhq', method: 'POST' });
-      if (res.data.code === 0) {
-        const { plate_list, my_tags, kaoheguan_list } = res.data.data;
-        // 拼接考核官头像为完整URL
-        const ossUrl = this.data.ossImageUrl;
-        const processedKgList = (kaoheguan_list || []).map(kg => ({
-          ...kg,
-          avatar: kg.avatar && !kg.avatar.startsWith('http') ? ossUrl + kg.avatar : kg.avatar,
-        }));
-        this.setData({
-          plateList: plate_list || [],
-          myTags: my_tags || [],
-          kaoheguanList: processedKgList   // 使用拼接后的列表
-        });
-      }
-    } catch (e) {}
-  },
-
-  // 获取我的考核记录，并根据 plateList 计算本次/预计下次费用
-  async fetchMyRecords(isRefresh = false) {
-    if (this.data.recordLoading) return;
-    const page = isRefresh ? 1 : this.data.recordPage;
-    this.setData({ recordLoading: true });
-    try {
-      const res = await request({
-        url: '/dengji/dskhjl',
-        method: 'POST',
-        data: { status: this.data.recordFilter, page, page_size: 5 }
-      });
-      if (res.data.code === 0) {
-        const { list, has_more } = res.data.data;
-
-        // 从 plateList 构建标签ID -> 完整标签对象的映射（用于精确匹配费用）
-        const tagMap = {};
-        this.data.plateList.forEach(plate => {
-          (plate.tags || []).forEach(tag => {
-            tagMap[tag.id] = tag;   // tag 包含 fee_list
-          });
-        });
-
-        // 处理每条记录：优先使用 tag_obj.id 匹配，其次 chenghao_id
-        const processed = list.map(item => {
-          // 尝试多种方式获取标签ID
-          const tagId = (item.tag_obj && item.tag_obj.id) || item.chenghao_id;
-          const tag = tagMap[tagId] || item.tag_obj || {};
-          const feeList = tag.fee_list || [];
-          let currentFee = 0;
-          let nextFee = 0;
-          if (feeList.length > 0) {
-            const cishu = item.cishu;
-            const cur = feeList.find(f => f.cishu === cishu);
-            currentFee = cur ? cur.feiyong : feeList[feeList.length - 1].feiyong;
-            const nextCishu = cishu + 1;
-            const nxt = feeList.find(f => f.cishu === nextCishu);
-            nextFee = nxt ? nxt.feiyong : feeList[feeList.length - 1].feiyong;
-          }
-          return {
-            ...item,
-            current_fee: currentFee,
-            next_fee: nextFee,
-            tag_obj: tag   // 使用匹配到的完整标签对象，保证后续“再次考核”能拿到费用
-          };
-        });
-
-        const newList = isRefresh ? processed : [...this.data.recordList, ...processed];
-        this.setData({
-          recordList: newList,
-          recordPage: page + 1,
-          recordHasMore: has_more,
-          recordLoading: false
-        });
-      } else {
-        this.setData({ recordLoading: false });
-      }
-    } catch (e) {
-      this.setData({ recordLoading: false });
-    }
-  },
-
-  filterRecord(e) {
-    const filter = e.currentTarget.dataset.filter;
-    if (filter === this.data.recordFilter) return;
-    this.setData({ recordFilter: filter, recordList: [], recordPage: 1, recordHasMore: true });
-    this.fetchMyRecords(true);
-  },
-
-  onReachBottom() {
-    if (this.data.activeTab === 'my_records' && this.data.recordHasMore) {
-      this.fetchMyRecords(false);
-    }
-  },
-
-  // 打开申请考核弹窗，费用完全基于 plateList 中的标签数据
-  openApplyModal(e) {
-    const { tag, jiluid, reapply } = e.currentTarget.dataset;
-    // 查找完整标签对象，保证 fee_list 存在
-    let fullTag = tag;
-    if (fullTag && fullTag.fee_list === undefined) {
-      const found = this.findTagInPlateList(fullTag.id);
-      if (found) fullTag = found;
-    }
-    if (!fullTag) {
-      const found = this.findTagInPlateList(tag);
-      if (found) fullTag = found;
-    }
-
-    let fee = 0;
-    if (fullTag) {
-      let nextCishu = 0;
-      // 再次申请时，基于原记录次数计算下一次考核次数
-      if (reapply && jiluid) {
-        const record = this.data.recordList.find(r => r.jilu_id === jiluid);
-        if (record) {
-          nextCishu = record.cishu + 1;
-        } else {
-          nextCishu = (fullTag.my_cishu || 0) + 1;
-        }
-      } else {
-        nextCishu = (fullTag.my_cishu || 0) + 1;
-      }
-      const feeList = fullTag.fee_list || [];
-      const exact = feeList.find(f => f.cishu === nextCishu);
-      if (exact) {
-        fee = exact.feiyong;
-      } else if (feeList.length > 0) {
-        fee = feeList[feeList.length - 1].feiyong;
-      }
-    }
-    // 检查再次申请时原记录是否有考核官，若有则不允许指定
-    let canSpecify = true;
-    let originalShenheguanId = '';
-    if (reapply && jiluid) {
-      const record = this.data.recordList.find(r => r.jilu_id === jiluid);
-      if (record && record.shenheguan_id) {
-        canSpecify = false;   // 已有考核官，不能指定新的
-        originalShenheguanId = record.shenheguan_id;
-      }
-    }
-    this.setData({
-      showApplyModal: true,
-      selectedTag: fullTag || null,
-      applyGameNick: '',
-      applyRemark: '',
-      applyFee: fee,
-      applyJiluId: jiluid || '',
-      isReapply: reapply || false,
-      selectedKaoheguanId: '',          // 重置
-      selectedKaoheguanInfo: null,
-      canSpecify: canSpecify,           // 新增
-      originalShenheguanId: originalShenheguanId, // 新增
-    });
-  },
-
-  // 辅助方法：从 plateList 查找指定 id 的标签
-  findTagInPlateList(tagId) {
-    if (!tagId) return null;
-    for (const plate of this.data.plateList) {
-      for (const t of (plate.tags || [])) {
-        if (t.id === tagId) return t;
-      }
-    }
-    return null;
-  },
-
-  closeApplyModal() {
-    this.setData({ showApplyModal: false });
-  },
-
-  // 实时更新游戏昵称
-  onNickInput(e) {
-    this.setData({ applyGameNick: e.detail.value });
-  },
-
-  // 实时更新备注
-  onRemarkInput(e) {
-    this.setData({ applyRemark: e.detail.value });
-  },
-
-  // 新增：打开考核官选择弹窗
-  openKaoheguanModal() {
-    if (!this.data.canSpecify) {
-      wx.showToast({ title: '已有考核官，无法重新指定', icon: 'none' });
-      return;
-    }
-    // 根据费用筛选可选考核官
-    let all = [...this.data.kaoheguanList];
-    if (this.data.applyFee > 0) {
-      all = all.filter(kg => kg.is_renzheng);
-    }
-    this.setData({
-      showKaoheguanModal: true,
-      filteredKaoheguanList: all,
-      searchKeyword: '',
-    });
-  },
-
-  // 关闭考核官选择弹窗
-  closeKaoheguanModal() {
-    this.setData({ showKaoheguanModal: false });
-  },
-
-  // 搜索输入
-  onSearchInput(e) {
-    const value = e.detail.value.trim();
-    this.setData({ searchKeyword: value });
-    this.filterKaoheguanList(value);
-  },
-
-  // 过滤考核官列表
-  filterKaoheguanList(keyword) {
-    let all = [...this.data.kaoheguanList];
-    if (this.data.applyFee > 0) {
-      all = all.filter(kg => kg.is_renzheng);
-    }
-    if (keyword) {
-      all = all.filter(kg =>
-        kg.yonghuid.includes(keyword) ||
-        (kg.dashou_nick && kg.dashou_nick.includes(keyword))
-      );
-    }
-    this.setData({ filteredKaoheguanList: all });
-  },
-
-  // 选择一个考核官
-  selectKaoheguan(e) {
-    const kg = e.currentTarget.dataset.kg;
-    if (kg.shenhe_zhuangtai !== 0) {
-      wx.showToast({ title: '该考核官正忙，无法指定', icon: 'none' });
-      return;
-    }
-    this.setData({
-      selectedKaoheguanId: kg.yonghuid,
-      selectedKaoheguanInfo: kg,
-      showKaoheguanModal: false,
-    });
-  },
-
-  // 取消已选择的考核官
-  clearSelectedKaoheguan() {
-    this.setData({
-      selectedKaoheguanId: '',
-      selectedKaoheguanInfo: null,
-    });
-  },
-
-  // 提交申请
-  async submitApply() {
-    const { applyGameNick, applyRemark, applyFee, selectedTag, isReapply, applyJiluId, selectedKaoheguanId } = this.data;
-    if (!applyGameNick || !applyGameNick.trim()) {
-      wx.showToast({ title: '请输入游戏昵称', icon: 'none' });
-      return;
-    }
-    if (!applyRemark || !applyRemark.trim()) {
-      wx.showToast({ title: '请填写备注', icon: 'none' });
-      return;
-    }
-    if (applyFee > 0) {
-      await this.startPayProcess();
-    } else {
-      await this.doFreeApply();
-    }
-  },
-
-  // 支付流程
-  async startPayProcess() {
-    this.setData({ payLoading: true });
-    try {
-      const res = await request({
-        url: '/yonghu/khzf',
-        method: 'POST',
-        data: {
-          tag_id: this.data.selectedTag.id,
-          game_nick: this.data.applyGameNick,
-          remark: this.data.applyRemark,
-          reapply: this.data.isReapply,
-          jilu_id: this.data.applyJiluId,
-          shenheguan_id: this.data.selectedKaoheguanId,  // 新增
-        }
-      });
-      if (res.data.code !== 200) throw new Error(res.data.message || '下单失败');
-      const payParams = res.data.payParams;
-      const dingdanid = res.data.dingdanid;
-      wx.requestPayment({
-        timeStamp: payParams.timeStamp,
-        nonceStr: payParams.nonceStr,
-        package: payParams.package,
-        signType: payParams.signType || 'MD5',
-        paySign: payParams.paySign,
-        success: async () => {
-          await this.pollPayStatus(dingdanid);
-        },
-        fail: () => {
-          wx.showToast({ title: '支付取消或失败', icon: 'none' });
-          request({ url: '/yonghu/khzfsb', method: 'POST', data: { dingdanid } }).catch(()=>{});
-        }
-      });
-    } catch (e) {
-      wx.showToast({ title: e.message || '支付异常', icon: 'none' });
-    } finally {
-      this.setData({ payLoading: false });
-    }
-  },
-
-  // 轮询支付结果
-  async pollPayStatus(dingdanid) {
-    for (let i = 0; i < 10; i++) {
-      try {
-        const res = await request({ url: '/yonghu/khzffc', method: 'POST', data: { dingdanid } });
-        if (res.data.code === 200) {
-          wx.showToast({ title: '申请成功', icon: 'success' });
-          this.closeApplyModal();
-          this.fetchAllTags();
-          this.setData({ recordList: [], recordPage: 1 });
-          this.fetchMyRecords(true);
-          return;
-        }
-      } catch (e) {}
-      await new Promise(r => setTimeout(r, 2000));
-    }
-    wx.showToast({ title: '支付确认超时', icon: 'none' });
-  },
-
-  // 免费申请
-  async doFreeApply() {
-    try {
-      const res = await request({
-        url: '/dengji/dssqkh',
-        method: 'POST',
-        data: {
-          tag_id: this.data.selectedTag.id,
-          game_nick: this.data.applyGameNick,
-          remark: this.data.applyRemark,
-          reapply: this.data.isReapply,
-          jilu_id: this.data.applyJiluId,
-          shenheguan_id: this.data.selectedKaoheguanId,   // 新增
-        }
-      });
-      if (res.data.code === 0) {
-        wx.showToast({ title: '申请成功', icon: 'success' });
-        this.closeApplyModal();
-        this.fetchAllTags();
-        this.setData({ recordList: [], recordPage: 1 });
-        this.fetchMyRecords(true);
-      } else {
-        wx.showToast({ title: res.data.msg || '申请失败', icon: 'none' });
-      }
-    } catch (e) {
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }
-  },
-
-  // 联系考核官（私聊）
-  contactKaoheguan(e) {
-    const item = e.currentTarget.dataset.item;
-    if (!item) return;
-    if (!item.shenheguan_id) {
-      wx.showToast({ title: '暂无考核官信息', icon: 'none' });
-      return;
-    }
-    const uid = wx.getStorageSync('uid');
-    if (!uid) {
-      wx.showToast({ title: '用户信息缺失', icon: 'none' });
-      return;
-    }
-    if (app.globalData.currentRole !== 'dashou') {
-      app.globalData.currentRole = 'dashou';
-      wx.setStorageSync('currentRole', 'dashou');
-    }
-    if (app.connectForCurrentRole) {
-      app.connectForCurrentRole();
-    } else if (app.ensureConnection) {
-      app.ensureConnection();
-    }
-    const ossImageUrl = this.data.ossImageUrl || app.globalData.ossImageUrl || '';
-    let fullAvatar = item.shenheguan_avatar || '';
-    if (fullAvatar && !fullAvatar.startsWith('http')) {
-      fullAvatar = ossImageUrl + fullAvatar;
-    }
-    if (!fullAvatar) {
-      fullAvatar = ossImageUrl + (app.globalData.morentouxiang || 'avatar/default.jpg');
-    }
-    const param = {
-      toUserId: 'Kh' + item.shenheguan_id,
-      toName: '考核官' + item.shenheguan_id,
-      toAvatar: fullAvatar
-    };
-    wx.navigateTo({
-      url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param)),
-      fail: (err) => {
-        wx.showToast({ title: '打开聊天失败', icon: 'none' });
-      }
-    });
-  },
-
-  showTagDetail(e) {
-    const tag = e.currentTarget.dataset.tag;
-    const feeStr = this.formatFeeList(tag.fee_list);
-    wx.showModal({
-      title: tag.name,
-      content: `规则：${tag.rule || '暂无'}\n${tag.jinpai ? '【可同时开启金牌】' : ''}\n费用：${feeStr}`,
-      showCancel: false,
-      confirmText: '知道了'
-    });
-  },
-
-  formatFeeList(feeList) {
-    if (!feeList || feeList.length === 0) return '暂无';
-    let str = feeList.map(f => `第${f.cishu}次：¥${f.feiyong}`).join('；');
-    const last = feeList[feeList.length - 1];
-    str += `；第${last.cishu}次及以上：¥${last.feiyong}`;
-    return str;
-  },
+// pages/assess-gold/assess-gold.js
+const app = getApp();
+import request from '../../utils/request.js';
+
+Page({
+  data: {
+    activeTab: 'all_tags',
+    plateList: [],            // 第一个接口返回的所有板块及标签（含 fee_list）
+    myTags: [],
+    recordList: [],
+    recordPage: 1,
+    recordHasMore: true,
+    recordLoading: false,
+    recordFilter: 'pending',
+    showApplyModal: false,
+    selectedTag: null,
+    applyGameNick: '',
+    applyRemark: '',
+    applyFee: 0,
+    applyJiluId: '',
+    isReapply: false,
+    payLoading: false,
+    ossImageUrl: app.globalData.ossImageUrl || '',
+
+    // 新增：考核官相关
+    kaoheguanList: [],           // 所有可选的考核官
+    showKaoheguanModal: false,   // 考核官选择弹窗
+    selectedKaoheguanId: '',     // 已选择的考核官ID
+    selectedKaoheguanInfo: null, // 已选择的考核官信息（用于展示）
+    searchKeyword: '',           // 搜索关键词
+    filteredKaoheguanList: [],   // 搜索过滤后的列表
+  },
+
+  onLoad() {
+    this.fetchAllTags();
+    this.fetchMyRecords(true);
+  },
+
+  switchTab(e) {
+    const tab = e.currentTarget.dataset.tab;
+    if (tab === this.data.activeTab) return;
+    this.setData({ activeTab: tab });
+    if (tab === 'my_records') this.fetchMyRecords(true);
+  },
+
+  // 获取所有板块及标签（含费用列表），缓存到 plateList，同时获取考核官列表
+  async fetchAllTags() {
+    try {
+      const res = await request({ url: '/dengji/dskhhq', method: 'POST' });
+      if (res.data.code === 0) {
+        const { plate_list, my_tags, kaoheguan_list } = res.data.data;
+        // 拼接考核官头像为完整URL
+        const ossUrl = this.data.ossImageUrl;
+        const processedKgList = (kaoheguan_list || []).map(kg => ({
+          ...kg,
+          avatar: kg.avatar && !kg.avatar.startsWith('http') ? ossUrl + kg.avatar : kg.avatar,
+        }));
+        this.setData({
+          plateList: plate_list || [],
+          myTags: my_tags || [],
+          kaoheguanList: processedKgList   // 使用拼接后的列表
+        });
+      }
+    } catch (e) {}
+  },
+
+  // 获取我的考核记录，并根据 plateList 计算本次/预计下次费用
+  async fetchMyRecords(isRefresh = false) {
+    if (this.data.recordLoading) return;
+    const page = isRefresh ? 1 : this.data.recordPage;
+    this.setData({ recordLoading: true });
+    try {
+      const res = await request({
+        url: '/dengji/dskhjl',
+        method: 'POST',
+        data: { status: this.data.recordFilter, page, page_size: 5 }
+      });
+      if (res.data.code === 0) {
+        const { list, has_more } = res.data.data;
+
+        // 从 plateList 构建标签ID -> 完整标签对象的映射（用于精确匹配费用）
+        const tagMap = {};
+        this.data.plateList.forEach(plate => {
+          (plate.tags || []).forEach(tag => {
+            tagMap[tag.id] = tag;   // tag 包含 fee_list
+          });
+        });
+
+        // 处理每条记录：优先使用 tag_obj.id 匹配，其次 chenghao_id
+        const processed = list.map(item => {
+          // 尝试多种方式获取标签ID
+          const tagId = (item.tag_obj && item.tag_obj.id) || item.chenghao_id;
+          const tag = tagMap[tagId] || item.tag_obj || {};
+          const feeList = tag.fee_list || [];
+          let currentFee = 0;
+          let nextFee = 0;
+          if (feeList.length > 0) {
+            const cishu = item.cishu;
+            const cur = feeList.find(f => f.cishu === cishu);
+            currentFee = cur ? cur.feiyong : feeList[feeList.length - 1].feiyong;
+            const nextCishu = cishu + 1;
+            const nxt = feeList.find(f => f.cishu === nextCishu);
+            nextFee = nxt ? nxt.feiyong : feeList[feeList.length - 1].feiyong;
+          }
+          return {
+            ...item,
+            current_fee: currentFee,
+            next_fee: nextFee,
+            tag_obj: tag   // 使用匹配到的完整标签对象，保证后续“再次考核”能拿到费用
+          };
+        });
+
+        const newList = isRefresh ? processed : [...this.data.recordList, ...processed];
+        this.setData({
+          recordList: newList,
+          recordPage: page + 1,
+          recordHasMore: has_more,
+          recordLoading: false
+        });
+      } else {
+        this.setData({ recordLoading: false });
+      }
+    } catch (e) {
+      this.setData({ recordLoading: false });
+    }
+  },
+
+  filterRecord(e) {
+    const filter = e.currentTarget.dataset.filter;
+    if (filter === this.data.recordFilter) return;
+    this.setData({ recordFilter: filter, recordList: [], recordPage: 1, recordHasMore: true });
+    this.fetchMyRecords(true);
+  },
+
+  onReachBottom() {
+    if (this.data.activeTab === 'my_records' && this.data.recordHasMore) {
+      this.fetchMyRecords(false);
+    }
+  },
+
+  // 打开申请考核弹窗，费用完全基于 plateList 中的标签数据
+  openApplyModal(e) {
+    const { tag, jiluid, reapply } = e.currentTarget.dataset;
+    // 查找完整标签对象，保证 fee_list 存在
+    let fullTag = tag;
+    if (fullTag && fullTag.fee_list === undefined) {
+      const found = this.findTagInPlateList(fullTag.id);
+      if (found) fullTag = found;
+    }
+    if (!fullTag) {
+      const found = this.findTagInPlateList(tag);
+      if (found) fullTag = found;
+    }
+
+    let fee = 0;
+    if (fullTag) {
+      let nextCishu = 0;
+      // 再次申请时，基于原记录次数计算下一次考核次数
+      if (reapply && jiluid) {
+        const record = this.data.recordList.find(r => r.jilu_id === jiluid);
+        if (record) {
+          nextCishu = record.cishu + 1;
+        } else {
+          nextCishu = (fullTag.my_cishu || 0) + 1;
+        }
+      } else {
+        nextCishu = (fullTag.my_cishu || 0) + 1;
+      }
+      const feeList = fullTag.fee_list || [];
+      const exact = feeList.find(f => f.cishu === nextCishu);
+      if (exact) {
+        fee = exact.feiyong;
+      } else if (feeList.length > 0) {
+        fee = feeList[feeList.length - 1].feiyong;
+      }
+    }
+    // 检查再次申请时原记录是否有考核官，若有则不允许指定
+    let canSpecify = true;
+    let originalShenheguanId = '';
+    if (reapply && jiluid) {
+      const record = this.data.recordList.find(r => r.jilu_id === jiluid);
+      if (record && record.shenheguan_id) {
+        canSpecify = false;   // 已有考核官，不能指定新的
+        originalShenheguanId = record.shenheguan_id;
+      }
+    }
+    this.setData({
+      showApplyModal: true,
+      selectedTag: fullTag || null,
+      applyGameNick: '',
+      applyRemark: '',
+      applyFee: fee,
+      applyJiluId: jiluid || '',
+      isReapply: reapply || false,
+      selectedKaoheguanId: '',          // 重置
+      selectedKaoheguanInfo: null,
+      canSpecify: canSpecify,           // 新增
+      originalShenheguanId: originalShenheguanId, // 新增
+    });
+  },
+
+  // 辅助方法：从 plateList 查找指定 id 的标签
+  findTagInPlateList(tagId) {
+    if (!tagId) return null;
+    for (const plate of this.data.plateList) {
+      for (const t of (plate.tags || [])) {
+        if (t.id === tagId) return t;
+      }
+    }
+    return null;
+  },
+
+  closeApplyModal() {
+    this.setData({ showApplyModal: false });
+  },
+
+  // 实时更新游戏昵称
+  onNickInput(e) {
+    this.setData({ applyGameNick: e.detail.value });
+  },
+
+  // 实时更新备注
+  onRemarkInput(e) {
+    this.setData({ applyRemark: e.detail.value });
+  },
+
+  // 新增：打开考核官选择弹窗
+  openKaoheguanModal() {
+    if (!this.data.canSpecify) {
+      wx.showToast({ title: '已有考核官，无法重新指定', icon: 'none' });
+      return;
+    }
+    // 根据费用筛选可选考核官
+    let all = [...this.data.kaoheguanList];
+    if (this.data.applyFee > 0) {
+      all = all.filter(kg => kg.is_renzheng);
+    }
+    this.setData({
+      showKaoheguanModal: true,
+      filteredKaoheguanList: all,
+      searchKeyword: '',
+    });
+  },
+
+  // 关闭考核官选择弹窗
+  closeKaoheguanModal() {
+    this.setData({ showKaoheguanModal: false });
+  },
+
+  // 搜索输入
+  onSearchInput(e) {
+    const value = e.detail.value.trim();
+    this.setData({ searchKeyword: value });
+    this.filterKaoheguanList(value);
+  },
+
+  // 过滤考核官列表
+  filterKaoheguanList(keyword) {
+    let all = [...this.data.kaoheguanList];
+    if (this.data.applyFee > 0) {
+      all = all.filter(kg => kg.is_renzheng);
+    }
+    if (keyword) {
+      all = all.filter(kg =>
+        kg.yonghuid.includes(keyword) ||
+        (kg.dashou_nick && kg.dashou_nick.includes(keyword))
+      );
+    }
+    this.setData({ filteredKaoheguanList: all });
+  },
+
+  // 选择一个考核官
+  selectKaoheguan(e) {
+    const kg = e.currentTarget.dataset.kg;
+    if (kg.shenhe_zhuangtai !== 0) {
+      wx.showToast({ title: '该考核官正忙，无法指定', icon: 'none' });
+      return;
+    }
+    this.setData({
+      selectedKaoheguanId: kg.yonghuid,
+      selectedKaoheguanInfo: kg,
+      showKaoheguanModal: false,
+    });
+  },
+
+  // 取消已选择的考核官
+  clearSelectedKaoheguan() {
+    this.setData({
+      selectedKaoheguanId: '',
+      selectedKaoheguanInfo: null,
+    });
+  },
+
+  // 提交申请
+  async submitApply() {
+    const { applyGameNick, applyRemark, applyFee, selectedTag, isReapply, applyJiluId, selectedKaoheguanId } = this.data;
+    if (!applyGameNick || !applyGameNick.trim()) {
+      wx.showToast({ title: '请输入游戏昵称', icon: 'none' });
+      return;
+    }
+    if (!applyRemark || !applyRemark.trim()) {
+      wx.showToast({ title: '请填写备注', icon: 'none' });
+      return;
+    }
+    if (applyFee > 0) {
+      await this.startPayProcess();
+    } else {
+      await this.doFreeApply();
+    }
+  },
+
+  // 支付流程
+  async startPayProcess() {
+    this.setData({ payLoading: true });
+    try {
+      const res = await request({
+        url: '/yonghu/khzf',
+        method: 'POST',
+        data: {
+          tag_id: this.data.selectedTag.id,
+          game_nick: this.data.applyGameNick,
+          remark: this.data.applyRemark,
+          reapply: this.data.isReapply,
+          jilu_id: this.data.applyJiluId,
+          shenheguan_id: this.data.selectedKaoheguanId,  // 新增
+        }
+      });
+      if (res.data.code !== 200) throw new Error(res.data.message || '下单失败');
+      const payParams = res.data.payParams;
+      const dingdanid = res.data.dingdanid;
+      wx.requestPayment({
+        timeStamp: payParams.timeStamp,
+        nonceStr: payParams.nonceStr,
+        package: payParams.package,
+        signType: payParams.signType || 'MD5',
+        paySign: payParams.paySign,
+        success: async () => {
+          await this.pollPayStatus(dingdanid);
+        },
+        fail: () => {
+          wx.showToast({ title: '支付取消或失败', icon: 'none' });
+          request({ url: '/yonghu/khzfsb', method: 'POST', data: { dingdanid } }).catch(()=>{});
+        }
+      });
+    } catch (e) {
+      wx.showToast({ title: e.message || '支付异常', icon: 'none' });
+    } finally {
+      this.setData({ payLoading: false });
+    }
+  },
+
+  // 轮询支付结果
+  async pollPayStatus(dingdanid) {
+    for (let i = 0; i < 10; i++) {
+      try {
+        const res = await request({ url: '/yonghu/khzffc', method: 'POST', data: { dingdanid } });
+        if (res.data.code === 200) {
+          wx.showToast({ title: '申请成功', icon: 'success' });
+          this.closeApplyModal();
+          this.fetchAllTags();
+          this.setData({ recordList: [], recordPage: 1 });
+          this.fetchMyRecords(true);
+          return;
+        }
+      } catch (e) {}
+      await new Promise(r => setTimeout(r, 2000));
+    }
+    wx.showToast({ title: '支付确认超时', icon: 'none' });
+  },
+
+  // 免费申请
+  async doFreeApply() {
+    try {
+      const res = await request({
+        url: '/dengji/dssqkh',
+        method: 'POST',
+        data: {
+          tag_id: this.data.selectedTag.id,
+          game_nick: this.data.applyGameNick,
+          remark: this.data.applyRemark,
+          reapply: this.data.isReapply,
+          jilu_id: this.data.applyJiluId,
+          shenheguan_id: this.data.selectedKaoheguanId,   // 新增
+        }
+      });
+      if (res.data.code === 0) {
+        wx.showToast({ title: '申请成功', icon: 'success' });
+        this.closeApplyModal();
+        this.fetchAllTags();
+        this.setData({ recordList: [], recordPage: 1 });
+        this.fetchMyRecords(true);
+      } else {
+        wx.showToast({ title: res.data.msg || '申请失败', icon: 'none' });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // 联系考核官（私聊）
+  contactKaoheguan(e) {
+    const item = e.currentTarget.dataset.item;
+    if (!item) return;
+    if (!item.shenheguan_id) {
+      wx.showToast({ title: '暂无考核官信息', icon: 'none' });
+      return;
+    }
+    const uid = wx.getStorageSync('uid');
+    if (!uid) {
+      wx.showToast({ title: '用户信息缺失', icon: 'none' });
+      return;
+    }
+    if (app.globalData.currentRole !== 'dashou') {
+      app.globalData.currentRole = 'dashou';
+      wx.setStorageSync('currentRole', 'dashou');
+    }
+    if (app.connectForCurrentRole) {
+      app.connectForCurrentRole();
+    } else if (app.ensureConnection) {
+      app.ensureConnection();
+    }
+    const ossImageUrl = this.data.ossImageUrl || app.globalData.ossImageUrl || '';
+    let fullAvatar = item.shenheguan_avatar || '';
+    if (fullAvatar && !fullAvatar.startsWith('http')) {
+      fullAvatar = ossImageUrl + fullAvatar;
+    }
+    if (!fullAvatar) {
+      fullAvatar = ossImageUrl + (app.globalData.morentouxiang || 'avatar/default.jpg');
+    }
+    const param = {
+      toUserId: 'Kh' + item.shenheguan_id,
+      toName: '考核官' + item.shenheguan_id,
+      toAvatar: fullAvatar
+    };
+    wx.navigateTo({
+      url: '/pages/chat/chat?data=' + encodeURIComponent(JSON.stringify(param)),
+      fail: (err) => {
+        wx.showToast({ title: '打开聊天失败', icon: 'none' });
+      }
+    });
+  },
+
+  showTagDetail(e) {
+    const tag = e.currentTarget.dataset.tag;
+    const feeStr = this.formatFeeList(tag.fee_list);
+    wx.showModal({
+      title: tag.name,
+      content: `规则：${tag.rule || '暂无'}\n${tag.jinpai ? '【可同时开启金牌】' : ''}\n费用：${feeStr}`,
+      showCancel: false,
+      confirmText: '知道了'
+    });
+  },
+
+  formatFeeList(feeList) {
+    if (!feeList || feeList.length === 0) return '暂无';
+    let str = feeList.map(f => `第${f.cishu}次：¥${f.feiyong}`).join('；');
+    const last = feeList[feeList.length - 1];
+    str += `；第${last.cishu}次及以上：¥${last.feiyong}`;
+    return str;
+  },
 });
\ No newline at end of file
diff --git a/pages/kaohe_jinpai/kaohe_jinpai.json b/pages/assess-gold/assess-gold.json
similarity index 100%
rename from pages/kaohe_jinpai/kaohe_jinpai.json
rename to pages/assess-gold/assess-gold.json
diff --git a/pages/kaohe_jinpai/kaohe_jinpai.wxml b/pages/assess-gold/assess-gold.wxml
similarity index 97%
rename from pages/kaohe_jinpai/kaohe_jinpai.wxml
rename to pages/assess-gold/assess-gold.wxml
index 6d89494..626ebe9 100644
--- a/pages/kaohe_jinpai/kaohe_jinpai.wxml
+++ b/pages/assess-gold/assess-gold.wxml
@@ -1,135 +1,135 @@
-<!-- pages/kaohe_jinpai/kaohe_jinpai.wxml -->
-<view class="page-root">
-  <!-- 顶部Tab切换 -->
-  <view class="tab-bar">
-    <view class="tab-item {{activeTab === 'all_tags' ? 'active' : ''}}" data-tab="all_tags" bindtap="switchTab">考核标签</view>
-    <view class="tab-item {{activeTab === 'my_records' ? 'active' : ''}}" data-tab="my_records" bindtap="switchTab">我的考核</view>
-  </view>
-
-  <!-- 考核标签面板 -->
-  <view class="content-area" wx:if="{{activeTab === 'all_tags'}}">
-    <scroll-view scroll-y="true" class="scroll-view">
-      <view wx:for="{{plateList}}" wx:key="bankuai_id" class="plate-group">
-        <view class="plate-title">{{item.mingcheng}}</view>
-        <view wx:for="{{item.tags}}" wx:key="id" class="tag-card" bindtap="showTagDetail" data-tag="{{item}}">
-          <view class="tag-header">
-            <chenghao-tag mingcheng="{{item.name}}" texiaoJson="{{item.texiao_json}}" />
-            <text wx:if="{{item.jinpai}}" class="jinpai-badge">金牌</text>
-          </view>
-          <view class="fee-line">
-            <text wx:for="{{item.fee_list}}" wx:key="cishu" class="fee-item">{{item.cishu}}次 ¥{{item.feiyong}}</text>
-            <text wx:if="{{item.fee_list.length > 0}}" class="fee-item">≥{{item.fee_list.length}}次 ¥{{item.fee_list[item.fee_list.length-1].feiyong}}</text>
-          </view>
-          <view wx:if="{{!myTags.includes(item.name)}}" class="apply-btn" data-tag="{{item}}" bindtap="openApplyModal">申请考核</view>
-          <view wx:else class="owned-tip">已拥有</view>
-        </view>
-      </view>
-    </scroll-view>
-  </view>
-
-  <!-- 我的考核面板 -->
-  <view class="content-area" wx:if="{{activeTab === 'my_records'}}">
-    <view class="filter-row">
-      <view class="filter-tag {{recordFilter === 'pending' ? 'active' : ''}}" data-filter="pending" bindtap="filterRecord">进行中/未通过</view>
-      <view class="filter-tag {{recordFilter === 'passed' ? 'active' : ''}}" data-filter="passed" bindtap="filterRecord">已通过</view>
-    </view>
-    <scroll-view scroll-y="true" class="scroll-view" bindscrolltolower="onReachBottom">
-      <view wx:for="{{recordList}}" wx:key="jilu_id" class="record-card">
-        <view class="card-top">
-          <text class="tag-name">{{item.chenghao_name}}</text>
-          <text class="status-text" style="color: {{item.statusColor}}">{{item.statusText}}</text>
-        </view>
-        <view class="card-info">
-          <text>板块：{{item.bankuai_name}}</text>
-          <text>考核官：{{item.shenheguan_id || '待分配'}}</text>
-          <!-- 联系考核官：纯文字蓝色下划线 -->
-          <view wx:if="{{item.shenheguan_id}}" class="contact-text-link" data-item="{{item}}" bindtap="contactKaoheguan">联系考核官</view>
-
-          <text>游戏ID：{{item.dashou_youxi_id}}</text>
-          <text>备注：{{item.dashou_beizhu}}</text>
-          <text>第{{item.cishu}}次考核 · 共缴 ¥{{item.total_fee}}</text>
-
-          <!-- 进行中/未通过时显示本次及预计下次费用 -->
-          <view wx:if="{{item.zhuangtai !== 1}}" class="fee-predict">
-            <text>本次考核费用：¥{{item.current_fee}}</text>
-            <text>预计下次费用：¥{{item.next_fee}}</text>
-          </view>
-
-          <text wx:if="{{item.last_fail_reason}}">上次拒绝原因：{{item.last_fail_reason}}</text>
-        </view>
-        <!-- 未通过时显示“再次考核”按钮，传递 tag_obj 以便计算费用 -->
-        <view wx:if="{{item.zhuangtai === 2}}" class="reapply-btn" data-tag="{{item.tag_obj}}" data-jiluid="{{item.jilu_id}}" data-reapply="{{true}}" bindtap="openApplyModal">再次考核</view>
-      </view>
-      <view wx:if="{{recordLoading}}" class="loading-more">加载中...</view>
-      <view wx:if="{{!recordHasMore && recordList.length > 0}}" class="no-more">—— 没有更多了 ——</view>
-    </scroll-view>
-  </view>
-
-  <!-- 申请考核弹窗 -->
-  <view wx:if="{{showApplyModal}}" class="modal-mask" bindtap="closeApplyModal">
-    <view class="modal-dialog" catchtap="noop">
-      <view class="modal-header">申请考核 - {{selectedTag.name}}</view>
-      <view class="form-group">
-        <text class="form-label">游戏昵称</text>
-        <input class="form-input" value="{{applyGameNick}}" bindinput="onNickInput" placeholder="请输入游戏昵称" />
-      </view>
-      <view class="form-group">
-        <text class="form-label">备注</text>
-        <textarea class="form-textarea" value="{{applyRemark}}" bindinput="onRemarkInput" placeholder="区服、时间段等（请勿填写无关内容，违者封号）" maxlength="100" />
-      </view>
-
-      <!-- 指定考核官区域 -->
-      <view class="form-group">
-        <text class="form-label">指定考核官（可选）</text>
-        <view wx:if="{{!canSpecify}}" class="kg-disabled-tip">
-          <text>已有考核官：{{originalShenheguanId}}，不可重新指定</text>
-        </view>
-        <view wx:else>
-          <view wx:if="{{!selectedKaoheguanInfo}}" class="select-kg-btn" bindtap="openKaoheguanModal">选择考核官</view>
-          <view wx:else class="selected-kg-card">
-            <image class="kg-avatar" src="{{selectedKaoheguanInfo.avatar}}" mode="aspectFill" />
-            <view class="kg-info">
-              <text class="kg-uid">UID {{selectedKaoheguanInfo.yonghuid}}</text>
-              <text class="kg-nick" wx:if="{{selectedKaoheguanInfo.dashou_nick}}">{{selectedKaoheguanInfo.dashou_nick}}</text>
-              <text class="kg-status {{selectedKaoheguanInfo.is_renzheng ? 'renzheng' : 'not-renzheng'}}">{{selectedKaoheguanInfo.is_renzheng ? '已认证' : '未认证'}}</text>
-            </view>
-            <view class="clear-kg-btn" bindtap="clearSelectedKaoheguan">取消</view>
-          </view>
-        </view>
-      </view>
-
-      <view wx:if="{{applyFee > 0}}" class="fee-info">本次需缴纳：<text class="fee-amount">¥{{applyFee}}</text></view>
-      <view class="modal-actions">
-        <view class="btn-cancel" bindtap="closeApplyModal">取消</view>
-        <view class="btn-confirm" bindtap="submitApply">确认申请{{applyFee > 0 ? '并支付' : ''}}</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 考核官选择弹窗 -->
-  <view wx:if="{{showKaoheguanModal}}" class="modal-mask" bindtap="closeKaoheguanModal">
-    <view class="modal-dialog" catchtap="noop">
-      <view class="modal-header">选择考核官</view>
-      <view class="search-box">
-        <input class="search-input" value="{{searchKeyword}}" bindinput="onSearchInput" placeholder="搜索用户ID或昵称" />
-      </view>
-      <scroll-view scroll-y="true" class="kg-scroll">
-        <view wx:for="{{filteredKaoheguanList}}" wx:key="yonghuid" class="kg-item" data-kg="{{item}}" bindtap="selectKaoheguan">
-          <image class="kg-avatar" src="{{item.avatar}}" mode="aspectFill" />
-          <view class="kg-info">
-            <text class="kg-uid">UID {{item.yonghuid}}</text>
-            <text wx:if="{{item.dashou_nick}}" class="kg-nick">{{item.dashou_nick}}</text>
-            <text class="kg-status {{item.is_renzheng ? 'renzheng' : 'not-renzheng'}}">{{item.is_renzheng ? '已认证' : '未认证'}}</text>
-            <text class="kg-state {{item.shenhe_zhuangtai === 0 ? 'free' : 'busy'}}">{{item.shenhe_zhuangtai === 0 ? '空闲' : '忙碌'}}</text>
-          </view>
-        </view>
-        <view wx:if="{{filteredKaoheguanList.length === 0}}" class="empty-tip">暂无符合条件的考核官</view>
-      </scroll-view>
-      <view class="modal-actions">
-        <view class="btn-cancel" bindtap="closeKaoheguanModal">取消</view>
-      </view>
-    </view>
-  </view>
-
-  <global-notification id="global-notification" />
+<!-- pages/assess-gold/assess-gold.wxml -->
+<view class="page-root">
+  <!-- 顶部Tab切换 -->
+  <view class="tab-bar">
+    <view class="tab-item {{activeTab === 'all_tags' ? 'active' : ''}}" data-tab="all_tags" bindtap="switchTab">考核标签</view>
+    <view class="tab-item {{activeTab === 'my_records' ? 'active' : ''}}" data-tab="my_records" bindtap="switchTab">我的考核</view>
+  </view>
+
+  <!-- 考核标签面板 -->
+  <view class="content-area" wx:if="{{activeTab === 'all_tags'}}">
+    <scroll-view scroll-y="true" class="scroll-view">
+      <view wx:for="{{plateList}}" wx:key="bankuai_id" class="plate-group">
+        <view class="plate-title">{{item.mingcheng}}</view>
+        <view wx:for="{{item.tags}}" wx:key="id" class="tag-card" bindtap="showTagDetail" data-tag="{{item}}">
+          <view class="tag-header">
+            <chenghao-tag mingcheng="{{item.name}}" texiaoJson="{{item.texiao_json}}" />
+            <text wx:if="{{item.jinpai}}" class="jinpai-badge">金牌</text>
+          </view>
+          <view class="fee-line">
+            <text wx:for="{{item.fee_list}}" wx:key="cishu" class="fee-item">{{item.cishu}}次 ¥{{item.feiyong}}</text>
+            <text wx:if="{{item.fee_list.length > 0}}" class="fee-item">≥{{item.fee_list.length}}次 ¥{{item.fee_list[item.fee_list.length-1].feiyong}}</text>
+          </view>
+          <view wx:if="{{!myTags.includes(item.name)}}" class="apply-btn" data-tag="{{item}}" bindtap="openApplyModal">申请考核</view>
+          <view wx:else class="owned-tip">已拥有</view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+
+  <!-- 我的考核面板 -->
+  <view class="content-area" wx:if="{{activeTab === 'my_records'}}">
+    <view class="filter-row">
+      <view class="filter-tag {{recordFilter === 'pending' ? 'active' : ''}}" data-filter="pending" bindtap="filterRecord">进行中/未通过</view>
+      <view class="filter-tag {{recordFilter === 'passed' ? 'active' : ''}}" data-filter="passed" bindtap="filterRecord">已通过</view>
+    </view>
+    <scroll-view scroll-y="true" class="scroll-view" bindscrolltolower="onReachBottom">
+      <view wx:for="{{recordList}}" wx:key="jilu_id" class="record-card">
+        <view class="card-top">
+          <text class="tag-name">{{item.chenghao_name}}</text>
+          <text class="status-text" style="color: {{item.statusColor}}">{{item.statusText}}</text>
+        </view>
+        <view class="card-info">
+          <text>板块：{{item.bankuai_name}}</text>
+          <text>考核官：{{item.shenheguan_id || '待分配'}}</text>
+          <!-- 联系考核官：纯文字蓝色下划线 -->
+          <view wx:if="{{item.shenheguan_id}}" class="contact-text-link" data-item="{{item}}" bindtap="contactKaoheguan">联系考核官</view>
+
+          <text>游戏ID：{{item.dashou_youxi_id}}</text>
+          <text>备注：{{item.dashou_beizhu}}</text>
+          <text>第{{item.cishu}}次考核 · 共缴 ¥{{item.total_fee}}</text>
+
+          <!-- 进行中/未通过时显示本次及预计下次费用 -->
+          <view wx:if="{{item.zhuangtai !== 1}}" class="fee-predict">
+            <text>本次考核费用：¥{{item.current_fee}}</text>
+            <text>预计下次费用：¥{{item.next_fee}}</text>
+          </view>
+
+          <text wx:if="{{item.last_fail_reason}}">上次拒绝原因：{{item.last_fail_reason}}</text>
+        </view>
+        <!-- 未通过时显示“再次考核”按钮，传递 tag_obj 以便计算费用 -->
+        <view wx:if="{{item.zhuangtai === 2}}" class="reapply-btn" data-tag="{{item.tag_obj}}" data-jiluid="{{item.jilu_id}}" data-reapply="{{true}}" bindtap="openApplyModal">再次考核</view>
+      </view>
+      <view wx:if="{{recordLoading}}" class="loading-more">加载中...</view>
+      <view wx:if="{{!recordHasMore && recordList.length > 0}}" class="no-more">—— 没有更多了 ——</view>
+    </scroll-view>
+  </view>
+
+  <!-- 申请考核弹窗 -->
+  <view wx:if="{{showApplyModal}}" class="modal-mask" bindtap="closeApplyModal">
+    <view class="modal-dialog" catchtap="noop">
+      <view class="modal-header">申请考核 - {{selectedTag.name}}</view>
+      <view class="form-group">
+        <text class="form-label">游戏昵称</text>
+        <input class="form-input" value="{{applyGameNick}}" bindinput="onNickInput" placeholder="请输入游戏昵称" />
+      </view>
+      <view class="form-group">
+        <text class="form-label">备注</text>
+        <textarea class="form-textarea" value="{{applyRemark}}" bindinput="onRemarkInput" placeholder="区服、时间段等（请勿填写无关内容，违者封号）" maxlength="100" />
+      </view>
+
+      <!-- 指定考核官区域 -->
+      <view class="form-group">
+        <text class="form-label">指定考核官（可选）</text>
+        <view wx:if="{{!canSpecify}}" class="kg-disabled-tip">
+          <text>已有考核官：{{originalShenheguanId}}，不可重新指定</text>
+        </view>
+        <view wx:else>
+          <view wx:if="{{!selectedKaoheguanInfo}}" class="select-kg-btn" bindtap="openKaoheguanModal">选择考核官</view>
+          <view wx:else class="selected-kg-card">
+            <image class="kg-avatar" src="{{selectedKaoheguanInfo.avatar}}" mode="aspectFill" />
+            <view class="kg-info">
+              <text class="kg-uid">UID {{selectedKaoheguanInfo.yonghuid}}</text>
+              <text class="kg-nick" wx:if="{{selectedKaoheguanInfo.dashou_nick}}">{{selectedKaoheguanInfo.dashou_nick}}</text>
+              <text class="kg-status {{selectedKaoheguanInfo.is_renzheng ? 'renzheng' : 'not-renzheng'}}">{{selectedKaoheguanInfo.is_renzheng ? '已认证' : '未认证'}}</text>
+            </view>
+            <view class="clear-kg-btn" bindtap="clearSelectedKaoheguan">取消</view>
+          </view>
+        </view>
+      </view>
+
+      <view wx:if="{{applyFee > 0}}" class="fee-info">本次需缴纳：<text class="fee-amount">¥{{applyFee}}</text></view>
+      <view class="modal-actions">
+        <view class="btn-cancel" bindtap="closeApplyModal">取消</view>
+        <view class="btn-confirm" bindtap="submitApply">确认申请{{applyFee > 0 ? '并支付' : ''}}</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 考核官选择弹窗 -->
+  <view wx:if="{{showKaoheguanModal}}" class="modal-mask" bindtap="closeKaoheguanModal">
+    <view class="modal-dialog" catchtap="noop">
+      <view class="modal-header">选择考核官</view>
+      <view class="search-box">
+        <input class="search-input" value="{{searchKeyword}}" bindinput="onSearchInput" placeholder="搜索用户ID或昵称" />
+      </view>
+      <scroll-view scroll-y="true" class="kg-scroll">
+        <view wx:for="{{filteredKaoheguanList}}" wx:key="yonghuid" class="kg-item" data-kg="{{item}}" bindtap="selectKaoheguan">
+          <image class="kg-avatar" src="{{item.avatar}}" mode="aspectFill" />
+          <view class="kg-info">
+            <text class="kg-uid">UID {{item.yonghuid}}</text>
+            <text wx:if="{{item.dashou_nick}}" class="kg-nick">{{item.dashou_nick}}</text>
+            <text class="kg-status {{item.is_renzheng ? 'renzheng' : 'not-renzheng'}}">{{item.is_renzheng ? '已认证' : '未认证'}}</text>
+            <text class="kg-state {{item.shenhe_zhuangtai === 0 ? 'free' : 'busy'}}">{{item.shenhe_zhuangtai === 0 ? '空闲' : '忙碌'}}</text>
+          </view>
+        </view>
+        <view wx:if="{{filteredKaoheguanList.length === 0}}" class="empty-tip">暂无符合条件的考核官</view>
+      </scroll-view>
+      <view class="modal-actions">
+        <view class="btn-cancel" bindtap="closeKaoheguanModal">取消</view>
+      </view>
+    </view>
+  </view>
+
+  <global-notification id="global-notification" />
 </view>
\ No newline at end of file
diff --git a/pages/kaohe_jinpai/kaohe_jinpai.wxss b/pages/assess-gold/assess-gold.wxss
similarity index 94%
rename from pages/kaohe_jinpai/kaohe_jinpai.wxss
rename to pages/assess-gold/assess-gold.wxss
index 854c33b..c07873f 100644
--- a/pages/kaohe_jinpai/kaohe_jinpai.wxss
+++ b/pages/assess-gold/assess-gold.wxss
@@ -1,385 +1,385 @@
-/* pages/kaohe_jinpai/kaohe_jinpai.wxss - 晨雾微光风格 */
-.page-root {
-    min-height: 100vh;
-    background: linear-gradient(135deg, #F5F7FA 0%, #E4E8F0 100%);
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-  }
-  
-  .tab-bar {
-    display: flex;
-    padding: 30rpx 50rpx;
-    gap: 60rpx;
-    background: rgba(255, 255, 255, 0.65);
-    backdrop-filter: blur(15px);
-    border-bottom: 1rpx solid rgba(0, 0, 0, 0.04);
-  }
-  .tab-item {
-    font-size: 32rpx;
-    color: #6B7280;
-    padding-bottom: 10rpx;
-    border-bottom: 4rpx solid transparent;
-    transition: all 0.3s;
-  }
-  .tab-item.active {
-    color: #4C5BF0;
-    border-bottom-color: #4C5BF0;
-    font-weight: 600;
-  }
-  
-  .content-area {
-    flex: 1;
-    overflow: hidden;
-  }
-  .scroll-view {
-    height: 100%;
-    padding: 30rpx 0;
-  }
-  
-  .plate-group {
-    margin-bottom: 50rpx;
-  }
-  .plate-title {
-    font-size: 34rpx;
-    font-weight: 700;
-    color: #1F2937;
-    margin-bottom: 20rpx;
-    padding-left: 30rpx;
-    border-left: 6rpx solid #4C5BF0;
-    margin-left: 30rpx;
-    margin-right: 30rpx;
-  }
-  
-  .tag-card {
-    background: #FFFFFF;
-    border-radius: 28rpx;
-    padding: 30rpx;
-    margin: 0 30rpx 20rpx 30rpx;
-    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.03);
-    border: 1rpx solid rgba(0, 0, 0, 0.04);
-  }
-  .tag-header {
-    display: flex;
-    align-items: center;
-    gap: 16rpx;
-    margin-bottom: 18rpx;
-  }
-  .jinpai-badge {
-    font-size: 22rpx;
-    color: #F59E0B;
-    background: rgba(245, 158, 11, 0.1);
-    padding: 4rpx 14rpx;
-    border-radius: 20rpx;
-    font-weight: 600;
-  }
-  .fee-line {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 16rpx;
-    margin-bottom: 20rpx;
-  }
-  .fee-item {
-    font-size: 24rpx;
-    color: #4B5563;
-    background: #F3F4F6;
-    padding: 6rpx 16rpx;
-    border-radius: 20rpx;
-  }
-  
-  .apply-btn {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 80rpx;
-    background: linear-gradient(135deg, #4C5BF0, #6D7AF5);
-    color: #FFFFFF;
-    border-radius: 34rpx;
-    font-size: 28rpx;
-    font-weight: 600;
-    letter-spacing: 2rpx;
-    transition: all 0.2s;
-  }
-  .apply-btn:active {
-    opacity: 0.85;
-    transform: scale(0.98);
-  }
-  .owned-tip {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 80rpx;
-    color: #10B981;
-    font-size: 28rpx;
-    font-weight: 600;
-  }
-  
-  /* 记录卡片 */
-  .record-card {
-    background: #FFFFFF;
-    border-radius: 28rpx;
-    padding: 30rpx;
-    margin: 0 30rpx 20rpx 30rpx;
-    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.03);
-    border: 1rpx solid rgba(0, 0, 0, 0.04);
-  }
-  .card-top {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 16rpx;
-  }
-  .tag-name { font-size: 32rpx; font-weight: 600; color: #1F2937; }
-  .status-text { font-size: 26rpx; }
-  .card-info {
-    display: flex;
-    flex-direction: column;
-    gap: 10rpx;
-    font-size: 26rpx;
-    color: #4B5563;
-  }
-  
-  /* 联系考核官：蓝色下划线 */
-  .contact-text-link {
-    color: #4C5BF0;
-    text-decoration: underline;
-    font-size: 26rpx;
-  }
-  
-  .fee-predict {
-    background: #F3F4F6;
-    padding: 12rpx 16rpx;
-    border-radius: 12rpx;
-    margin-top: 10rpx;
-    display: flex;
-    flex-direction: column;
-    gap: 6rpx;
-    font-size: 24rpx;
-    color: #4B5563;
-  }
-  
-  .reapply-btn {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 80rpx;
-    margin-top: 20rpx;
-    background: #F59E0B;
-    color: #FFFFFF;
-    border-radius: 34rpx;
-    font-size: 28rpx;
-    font-weight: 600;
-  }
-  .reapply-btn:active {
-    opacity: 0.85;
-    transform: scale(0.98);
-  }
-  
-  .filter-row {
-    display: flex;
-    padding: 20rpx 30rpx;
-    gap: 40rpx;
-  }
-  .filter-tag {
-    font-size: 28rpx;
-    color: #6B7280;
-    padding-bottom: 8rpx;
-    border-bottom: 3rpx solid transparent;
-  }
-  .filter-tag.active {
-    color: #4C5BF0;
-    border-bottom-color: #4C5BF0;
-  }
-  
-  /* 弹窗 */
-  .modal-mask {
-    position: fixed; top:0; left:0; width:100%; height:100%;
-    background: rgba(0, 0, 0, 0.4);
-    display: flex; align-items: center; justify-content: center;
-    z-index: 1000;
-  }
-  .modal-dialog {
-    width: 85%;
-    background: #FFFFFF;
-    border-radius: 36rpx;
-    padding: 40rpx;
-    box-shadow: 0 20rpx 40rpx rgba(0, 0, 0, 0.15);
-  }
-  .modal-header { font-size: 34rpx; font-weight: 700; color: #1F2937; margin-bottom: 30rpx; }
-  .form-group { margin-bottom: 25rpx; }
-  .form-label { font-size: 28rpx; color: #4B5563; margin-bottom: 10rpx; display: block; }
-  .form-input, .form-textarea {
-    width: 100%;
-    background: #F9FAFB;
-    border-radius: 14rpx;
-    padding: 16rpx;
-    font-size: 28rpx;
-    color: #1F2937;
-    border: 1rpx solid #E5E7EB;
-  }
-  .form-textarea { height: 150rpx; }
-  .fee-info { text-align: center; font-size: 30rpx; margin: 20rpx 0; color: #F59E0B; }
-  .fee-amount { font-weight: 700; }
-  .modal-actions { display: flex; gap: 20rpx; margin-top: 30rpx; }
-  .btn-cancel, .btn-confirm {
-    flex: 1;
-    height: 80rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 40rpx;
-    font-size: 30rpx;
-    font-weight: 600;
-    transition: all 0.2s;
-  }
-  .btn-cancel { background: #F3F4F6; color: #4B5563; }
-  .btn-cancel:active { background: #E5E7EB; }
-  .btn-confirm { background: linear-gradient(135deg, #4C5BF0, #6D7AF5); color: #FFFFFF; }
-  .btn-confirm:active { opacity: 0.85; transform: scale(0.98); }
-  
-  .loading-more, .no-more { text-align: center; padding: 30rpx; color: #9CA3AF; font-size: 26rpx; }
-  
-  .kg-avatar {
-    width: 40rpx;
-    height: 40rpx;
-    border-radius: 50%;
-    margin-right: 8rpx;
-    vertical-align: middle;
-  }
-
-
-
-
-
-  /* 原有样式保留，以下是新增样式 */
-
-/* 指定考核官选择按钮 */
-.select-kg-btn {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 80rpx;
-    background: #F3F4F6;
-    color: #4B5563;
-    border-radius: 34rpx;
-    font-size: 28rpx;
-    margin-top: 10rpx;
-  }
-  .select-kg-btn:active {
-    background: #E5E7EB;
-  }
-  
-  /* 已选择的考核官卡片 */
-  .selected-kg-card {
-    display: flex;
-    align-items: center;
-    background: #F9FAFB;
-    border-radius: 20rpx;
-    padding: 20rpx;
-    margin-top: 10rpx;
-    border: 1rpx solid #E5E7EB;
-  }
-  .kg-avatar {
-    width: 64rpx;
-    height: 64rpx;
-    border-radius: 50%;
-    margin-right: 16rpx;
-  }
-  .kg-info {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    gap: 4rpx;
-  }
-  .kg-uid {
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #1F2937;
-  }
-  .kg-nick {
-    font-size: 24rpx;
-    color: #6B7280;
-  }
-  .kg-status {
-    font-size: 22rpx;
-    padding: 2rpx 12rpx;
-    border-radius: 20rpx;
-    display: inline-block;
-    width: fit-content;
-  }
-  .kg-status.renzheng {
-    background: rgba(16, 185, 129, 0.1);
-    color: #10B981;
-  }
-  .kg-status.not-renzheng {
-    background: rgba(245, 158, 11, 0.1);
-    color: #F59E0B;
-  }
-  .clear-kg-btn {
-    color: #EF4444;
-    font-size: 26rpx;
-    padding: 0 10rpx;
-  }
-  .clear-kg-btn:active {
-    opacity: 0.7;
-  }
-  
-  /* 禁用指定提示 */
-  .kg-disabled-tip {
-    background: #FEF3C7;
-    padding: 16rpx;
-    border-radius: 12rpx;
-    font-size: 24rpx;
-    color: #92400E;
-    margin-top: 10rpx;
-  }
-  
-  /* 考核官选择弹窗内搜索 */
-  .search-box {
-    margin-bottom: 20rpx;
-  }
-  .search-input {
-    width: 100%;
-    background: #F9FAFB;
-    border-radius: 14rpx;
-    padding: 16rpx;
-    font-size: 28rpx;
-    border: 1rpx solid #E5E7EB;
-  }
-  
-  /* 考核官滚动列表 */
-  .kg-scroll {
-    max-height: 500rpx;
-    margin-bottom: 20rpx;
-  }
-  
-  /* 单个考核官项 */
-  .kg-item {
-    display: flex;
-    align-items: center;
-    padding: 20rpx;
-    background: #FFFFFF;
-    border-radius: 16rpx;
-    margin-bottom: 12rpx;
-    border: 1rpx solid #F3F4F6;
-  }
-  .kg-item:active {
-    background: #F9FAFB;
-  }
-  .kg-item .kg-state {
-    font-size: 22rpx;
-    margin-top: 4rpx;
-  }
-  .kg-state.free {
-    color: #10B981;
-  }
-  .kg-state.busy {
-    color: #EF4444;
-  }
-  
-  .empty-tip {
-    text-align: center;
-    padding: 30rpx;
-    color: #9CA3AF;
-    font-size: 26rpx;
+/* pages/assess-gold/assess-gold.wxss - 晨雾微光风格 */
+.page-root {
+    min-height: 100vh;
+    background: linear-gradient(135deg, #F5F7FA 0%, #E4E8F0 100%);
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+  
+  .tab-bar {
+    display: flex;
+    padding: 30rpx 50rpx;
+    gap: 60rpx;
+    background: rgba(255, 255, 255, 0.65);
+    backdrop-filter: blur(15px);
+    border-bottom: 1rpx solid rgba(0, 0, 0, 0.04);
+  }
+  .tab-item {
+    font-size: 32rpx;
+    color: #6B7280;
+    padding-bottom: 10rpx;
+    border-bottom: 4rpx solid transparent;
+    transition: all 0.3s;
+  }
+  .tab-item.active {
+    color: #4C5BF0;
+    border-bottom-color: #4C5BF0;
+    font-weight: 600;
+  }
+  
+  .content-area {
+    flex: 1;
+    overflow: hidden;
+  }
+  .scroll-view {
+    height: 100%;
+    padding: 30rpx 0;
+  }
+  
+  .plate-group {
+    margin-bottom: 50rpx;
+  }
+  .plate-title {
+    font-size: 34rpx;
+    font-weight: 700;
+    color: #1F2937;
+    margin-bottom: 20rpx;
+    padding-left: 30rpx;
+    border-left: 6rpx solid #4C5BF0;
+    margin-left: 30rpx;
+    margin-right: 30rpx;
+  }
+  
+  .tag-card {
+    background: #FFFFFF;
+    border-radius: 28rpx;
+    padding: 30rpx;
+    margin: 0 30rpx 20rpx 30rpx;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.03);
+    border: 1rpx solid rgba(0, 0, 0, 0.04);
+  }
+  .tag-header {
+    display: flex;
+    align-items: center;
+    gap: 16rpx;
+    margin-bottom: 18rpx;
+  }
+  .jinpai-badge {
+    font-size: 22rpx;
+    color: #F59E0B;
+    background: rgba(245, 158, 11, 0.1);
+    padding: 4rpx 14rpx;
+    border-radius: 20rpx;
+    font-weight: 600;
+  }
+  .fee-line {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+    margin-bottom: 20rpx;
+  }
+  .fee-item {
+    font-size: 24rpx;
+    color: #4B5563;
+    background: #F3F4F6;
+    padding: 6rpx 16rpx;
+    border-radius: 20rpx;
+  }
+  
+  .apply-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 80rpx;
+    background: linear-gradient(135deg, #4C5BF0, #6D7AF5);
+    color: #FFFFFF;
+    border-radius: 34rpx;
+    font-size: 28rpx;
+    font-weight: 600;
+    letter-spacing: 2rpx;
+    transition: all 0.2s;
+  }
+  .apply-btn:active {
+    opacity: 0.85;
+    transform: scale(0.98);
+  }
+  .owned-tip {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 80rpx;
+    color: #10B981;
+    font-size: 28rpx;
+    font-weight: 600;
+  }
+  
+  /* 记录卡片 */
+  .record-card {
+    background: #FFFFFF;
+    border-radius: 28rpx;
+    padding: 30rpx;
+    margin: 0 30rpx 20rpx 30rpx;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.03);
+    border: 1rpx solid rgba(0, 0, 0, 0.04);
+  }
+  .card-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 16rpx;
+  }
+  .tag-name { font-size: 32rpx; font-weight: 600; color: #1F2937; }
+  .status-text { font-size: 26rpx; }
+  .card-info {
+    display: flex;
+    flex-direction: column;
+    gap: 10rpx;
+    font-size: 26rpx;
+    color: #4B5563;
+  }
+  
+  /* 联系考核官：蓝色下划线 */
+  .contact-text-link {
+    color: #4C5BF0;
+    text-decoration: underline;
+    font-size: 26rpx;
+  }
+  
+  .fee-predict {
+    background: #F3F4F6;
+    padding: 12rpx 16rpx;
+    border-radius: 12rpx;
+    margin-top: 10rpx;
+    display: flex;
+    flex-direction: column;
+    gap: 6rpx;
+    font-size: 24rpx;
+    color: #4B5563;
+  }
+  
+  .reapply-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 80rpx;
+    margin-top: 20rpx;
+    background: #F59E0B;
+    color: #FFFFFF;
+    border-radius: 34rpx;
+    font-size: 28rpx;
+    font-weight: 600;
+  }
+  .reapply-btn:active {
+    opacity: 0.85;
+    transform: scale(0.98);
+  }
+  
+  .filter-row {
+    display: flex;
+    padding: 20rpx 30rpx;
+    gap: 40rpx;
+  }
+  .filter-tag {
+    font-size: 28rpx;
+    color: #6B7280;
+    padding-bottom: 8rpx;
+    border-bottom: 3rpx solid transparent;
+  }
+  .filter-tag.active {
+    color: #4C5BF0;
+    border-bottom-color: #4C5BF0;
+  }
+  
+  /* 弹窗 */
+  .modal-mask {
+    position: fixed; top:0; left:0; width:100%; height:100%;
+    background: rgba(0, 0, 0, 0.4);
+    display: flex; align-items: center; justify-content: center;
+    z-index: 1000;
+  }
+  .modal-dialog {
+    width: 85%;
+    background: #FFFFFF;
+    border-radius: 36rpx;
+    padding: 40rpx;
+    box-shadow: 0 20rpx 40rpx rgba(0, 0, 0, 0.15);
+  }
+  .modal-header { font-size: 34rpx; font-weight: 700; color: #1F2937; margin-bottom: 30rpx; }
+  .form-group { margin-bottom: 25rpx; }
+  .form-label { font-size: 28rpx; color: #4B5563; margin-bottom: 10rpx; display: block; }
+  .form-input, .form-textarea {
+    width: 100%;
+    background: #F9FAFB;
+    border-radius: 14rpx;
+    padding: 16rpx;
+    font-size: 28rpx;
+    color: #1F2937;
+    border: 1rpx solid #E5E7EB;
+  }
+  .form-textarea { height: 150rpx; }
+  .fee-info { text-align: center; font-size: 30rpx; margin: 20rpx 0; color: #F59E0B; }
+  .fee-amount { font-weight: 700; }
+  .modal-actions { display: flex; gap: 20rpx; margin-top: 30rpx; }
+  .btn-cancel, .btn-confirm {
+    flex: 1;
+    height: 80rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 40rpx;
+    font-size: 30rpx;
+    font-weight: 600;
+    transition: all 0.2s;
+  }
+  .btn-cancel { background: #F3F4F6; color: #4B5563; }
+  .btn-cancel:active { background: #E5E7EB; }
+  .btn-confirm { background: linear-gradient(135deg, #4C5BF0, #6D7AF5); color: #FFFFFF; }
+  .btn-confirm:active { opacity: 0.85; transform: scale(0.98); }
+  
+  .loading-more, .no-more { text-align: center; padding: 30rpx; color: #9CA3AF; font-size: 26rpx; }
+  
+  .kg-avatar {
+    width: 40rpx;
+    height: 40rpx;
+    border-radius: 50%;
+    margin-right: 8rpx;
+    vertical-align: middle;
+  }
+
+
+
+
+
+  /* 原有样式保留，以下是新增样式 */
+
+/* 指定考核官选择按钮 */
+.select-kg-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 80rpx;
+    background: #F3F4F6;
+    color: #4B5563;
+    border-radius: 34rpx;
+    font-size: 28rpx;
+    margin-top: 10rpx;
+  }
+  .select-kg-btn:active {
+    background: #E5E7EB;
+  }
+  
+  /* 已选择的考核官卡片 */
+  .selected-kg-card {
+    display: flex;
+    align-items: center;
+    background: #F9FAFB;
+    border-radius: 20rpx;
+    padding: 20rpx;
+    margin-top: 10rpx;
+    border: 1rpx solid #E5E7EB;
+  }
+  .kg-avatar {
+    width: 64rpx;
+    height: 64rpx;
+    border-radius: 50%;
+    margin-right: 16rpx;
+  }
+  .kg-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 4rpx;
+  }
+  .kg-uid {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #1F2937;
+  }
+  .kg-nick {
+    font-size: 24rpx;
+    color: #6B7280;
+  }
+  .kg-status {
+    font-size: 22rpx;
+    padding: 2rpx 12rpx;
+    border-radius: 20rpx;
+    display: inline-block;
+    width: fit-content;
+  }
+  .kg-status.renzheng {
+    background: rgba(16, 185, 129, 0.1);
+    color: #10B981;
+  }
+  .kg-status.not-renzheng {
+    background: rgba(245, 158, 11, 0.1);
+    color: #F59E0B;
+  }
+  .clear-kg-btn {
+    color: #EF4444;
+    font-size: 26rpx;
+    padding: 0 10rpx;
+  }
+  .clear-kg-btn:active {
+    opacity: 0.7;
+  }
+  
+  /* 禁用指定提示 */
+  .kg-disabled-tip {
+    background: #FEF3C7;
+    padding: 16rpx;
+    border-radius: 12rpx;
+    font-size: 24rpx;
+    color: #92400E;
+    margin-top: 10rpx;
+  }
+  
+  /* 考核官选择弹窗内搜索 */
+  .search-box {
+    margin-bottom: 20rpx;
+  }
+  .search-input {
+    width: 100%;
+    background: #F9FAFB;
+    border-radius: 14rpx;
+    padding: 16rpx;
+    font-size: 28rpx;
+    border: 1rpx solid #E5E7EB;
+  }
+  
+  /* 考核官滚动列表 */
+  .kg-scroll {
+    max-height: 500rpx;
+    margin-bottom: 20rpx;
+  }
+  
+  /* 单个考核官项 */
+  .kg-item {
+    display: flex;
+    align-items: center;
+    padding: 20rpx;
+    background: #FFFFFF;
+    border-radius: 16rpx;
+    margin-bottom: 12rpx;
+    border: 1rpx solid #F3F4F6;
+  }
+  .kg-item:active {
+    background: #F9FAFB;
+  }
+  .kg-item .kg-state {
+    font-size: 22rpx;
+    margin-top: 4rpx;
+  }
+  .kg-state.free {
+    color: #10B981;
+  }
+  .kg-state.busy {
+    color: #EF4444;
+  }
+  
+  .empty-tip {
+    text-align: center;
+    padding: 30rpx;
+    color: #9CA3AF;
+    font-size: 26rpx;
   }
\ No newline at end of file
diff --git a/pages/kaohe_jilu/kaohe_jilu.js b/pages/assess-log/assess-log.js
similarity index 93%
rename from pages/kaohe_jilu/kaohe_jilu.js
rename to pages/assess-log/assess-log.js
index 545e567..719fc03 100644
--- a/pages/kaohe_jilu/kaohe_jilu.js
+++ b/pages/assess-log/assess-log.js
@@ -1,149 +1,149 @@
-// pages/kaohe_jilu/kaohe_jilu.js
-const app = getApp();
-import request from '../../utils/request.js';
-
-Page({
-  data: {
-    // 板块筛选
-    moduleList: [],
-    xuanzhongBankuaiId: 0,        // 0代表全部
-    // 状态筛选：0-全部 1-审核中 2-已通过 3-未通过
-    statusFilter: 0,
-    // 记录列表
-    recordList: [],
-    page: 1,
-    pageSize: 5,
-    hasMore: true,
-    isLoading: false,
-    isLoadingMore: false,
-    // 展开的记录ID集合（字符串数组）
-    expandedIds: [],
-    // OSS地址
-    ossImageUrl: app.globalData.ossImageUrl || '',
-  },
-
-  onLoad() {
-    this.loadModules();
-  },
-
-  // 加载板块（复用审核大厅接口）
-  async loadModules() {
-    try {
-      const res = await request({ url: '/dengji/shdthqmk', method: 'POST' });
-      if (res && res.data.code === 0) {
-        const modules = res.data.data.modules || [];
-        this.setData({ moduleList: modules, xuanzhongBankuaiId: 0 });
-        this.loadRecords(true);
-      } else {
-        wx.showToast({ title: '加载模块失败', icon: 'none' });
-      }
-    } catch (e) {
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }
-  },
-
-  // 选择板块
-  selectModule(e) {
-    const bankuaiId = e.currentTarget.dataset.id;
-    if (bankuaiId === this.data.xuanzhongBankuaiId) return;
-    this.setData({
-      xuanzhongBankuaiId: bankuaiId,
-      recordList: [],
-      page: 1,
-      hasMore: true,
-      expandedIds: []
-    });
-    this.loadRecords(true);
-  },
-
-  // 选择状态
-  selectStatus(e) {
-    const status = e.currentTarget.dataset.status;
-    if (status === this.data.statusFilter) return;
-    this.setData({
-      statusFilter: status,
-      recordList: [],
-      page: 1,
-      hasMore: true,
-      expandedIds: []
-    });
-    this.loadRecords(true);
-  },
-
-  // 加载历史记录
-  async loadRecords(isRefresh = false) {
-    if (this.data.isLoading) return;
-    const page = isRefresh ? 1 : this.data.page;
-    if (!isRefresh && !this.data.hasMore) return;
-
-    this.setData({ isLoading: true, isLoadingMore: !isRefresh });
-
-    try {
-      const res = await request({
-        url: '/dengji/khghqkhjl',
-        method: 'POST',
-        data: {
-          bankuai_id: this.data.xuanzhongBankuaiId || undefined,
-          status: this.data.statusFilter || undefined,
-          page: page,
-          page_size: this.data.pageSize
-        }
-      });
-
-      this.setData({ isLoading: false, isLoadingMore: false });
-
-      if (res && res.data.code === 0) {
-        const list = res.data.data.list || [];
-        const hasMore = res.data.data.has_more;
-        // 拼接头像
-        const oss = this.data.ossImageUrl;
-        const processedList = list.map(item => {
-          let avatar = item.shenqingren_avatar || '';
-          if (avatar && !avatar.startsWith('http')) {
-            avatar = oss + avatar;
-          }
-          return { ...item, shenqingren_avatar: avatar };
-        });
-        const newList = isRefresh ? processedList : [...this.data.recordList, ...processedList];
-        this.setData({ recordList: newList, page: page + 1, hasMore: hasMore });
-      } else {
-        wx.showToast({ title: '加载记录失败', icon: 'none' });
-      }
-    } catch (e) {
-      this.setData({ isLoading: false, isLoadingMore: false });
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }
-  },
-
-  // 上拉加载更多
-  onReachBottom() {
-    if (this.data.hasMore && !this.data.isLoading && !this.data.isLoadingMore) {
-      this.loadRecords(false);
-    }
-  },
-
-  // 展开/收起详情
-  toggleExpand(e) {
-    const jiluId = e.currentTarget.dataset.id;
-    // 确保 jiluId 是字符串
-    const id = String(jiluId);
-    const expandedIds = this.data.expandedIds.slice();  // 拷贝
-    const index = expandedIds.indexOf(id);
-    if (index > -1) {
-      expandedIds.splice(index, 1);
-    } else {
-      expandedIds.push(id);
-    }
-    this.setData({ expandedIds });
-  },
-
-  // 去评判（跳转考核打分页）
-  goJudge(e) {
-    const item = e.currentTarget.dataset.item;
-    if (!item) return;
-    wx.navigateTo({ url: '/pages/kaohe_dafen/kaohe_dafen?jilu_id=' + item.jilu_id });
-  },
-
-  // 阻止冒泡
-  noop() {}
+// pages/assess-log/assess-log.js
+const app = getApp();
+import request from '../../utils/request.js';
+
+Page({
+  data: {
+    // 板块筛选
+    moduleList: [],
+    xuanzhongBankuaiId: 0,        // 0代表全部
+    // 状态筛选：0-全部 1-审核中 2-已通过 3-未通过
+    statusFilter: 0,
+    // 记录列表
+    recordList: [],
+    page: 1,
+    pageSize: 5,
+    hasMore: true,
+    isLoading: false,
+    isLoadingMore: false,
+    // 展开的记录ID集合（字符串数组）
+    expandedIds: [],
+    // OSS地址
+    ossImageUrl: app.globalData.ossImageUrl || '',
+  },
+
+  onLoad() {
+    this.loadModules();
+  },
+
+  // 加载板块（复用审核大厅接口）
+  async loadModules() {
+    try {
+      const res = await request({ url: '/dengji/shdthqmk', method: 'POST' });
+      if (res && res.data.code === 0) {
+        const modules = res.data.data.modules || [];
+        this.setData({ moduleList: modules, xuanzhongBankuaiId: 0 });
+        this.loadRecords(true);
+      } else {
+        wx.showToast({ title: '加载模块失败', icon: 'none' });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // 选择板块
+  selectModule(e) {
+    const bankuaiId = e.currentTarget.dataset.id;
+    if (bankuaiId === this.data.xuanzhongBankuaiId) return;
+    this.setData({
+      xuanzhongBankuaiId: bankuaiId,
+      recordList: [],
+      page: 1,
+      hasMore: true,
+      expandedIds: []
+    });
+    this.loadRecords(true);
+  },
+
+  // 选择状态
+  selectStatus(e) {
+    const status = e.currentTarget.dataset.status;
+    if (status === this.data.statusFilter) return;
+    this.setData({
+      statusFilter: status,
+      recordList: [],
+      page: 1,
+      hasMore: true,
+      expandedIds: []
+    });
+    this.loadRecords(true);
+  },
+
+  // 加载历史记录
+  async loadRecords(isRefresh = false) {
+    if (this.data.isLoading) return;
+    const page = isRefresh ? 1 : this.data.page;
+    if (!isRefresh && !this.data.hasMore) return;
+
+    this.setData({ isLoading: true, isLoadingMore: !isRefresh });
+
+    try {
+      const res = await request({
+        url: '/dengji/khghqkhjl',
+        method: 'POST',
+        data: {
+          bankuai_id: this.data.xuanzhongBankuaiId || undefined,
+          status: this.data.statusFilter || undefined,
+          page: page,
+          page_size: this.data.pageSize
+        }
+      });
+
+      this.setData({ isLoading: false, isLoadingMore: false });
+
+      if (res && res.data.code === 0) {
+        const list = res.data.data.list || [];
+        const hasMore = res.data.data.has_more;
+        // 拼接头像
+        const oss = this.data.ossImageUrl;
+        const processedList = list.map(item => {
+          let avatar = item.shenqingren_avatar || '';
+          if (avatar && !avatar.startsWith('http')) {
+            avatar = oss + avatar;
+          }
+          return { ...item, shenqingren_avatar: avatar };
+        });
+        const newList = isRefresh ? processedList : [...this.data.recordList, ...processedList];
+        this.setData({ recordList: newList, page: page + 1, hasMore: hasMore });
+      } else {
+        wx.showToast({ title: '加载记录失败', icon: 'none' });
+      }
+    } catch (e) {
+      this.setData({ isLoading: false, isLoadingMore: false });
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // 上拉加载更多
+  onReachBottom() {
+    if (this.data.hasMore && !this.data.isLoading && !this.data.isLoadingMore) {
+      this.loadRecords(false);
+    }
+  },
+
+  // 展开/收起详情
+  toggleExpand(e) {
+    const jiluId = e.currentTarget.dataset.id;
+    // 确保 jiluId 是字符串
+    const id = String(jiluId);
+    const expandedIds = this.data.expandedIds.slice();  // 拷贝
+    const index = expandedIds.indexOf(id);
+    if (index > -1) {
+      expandedIds.splice(index, 1);
+    } else {
+      expandedIds.push(id);
+    }
+    this.setData({ expandedIds });
+  },
+
+  // 去评判（跳转考核打分页）
+  goJudge(e) {
+    const item = e.currentTarget.dataset.item;
+    if (!item) return;
+    wx.navigateTo({ url: '/pages/assess-score/assess-score?jilu_id=' + item.jilu_id });
+  },
+
+  // 阻止冒泡
+  noop() {}
 });
\ No newline at end of file
diff --git a/pages/kaohe_jilu/kaohe_jilu.json b/pages/assess-log/assess-log.json
similarity index 100%
rename from pages/kaohe_jilu/kaohe_jilu.json
rename to pages/assess-log/assess-log.json
diff --git a/pages/kaohe_jilu/kaohe_jilu.wxml b/pages/assess-log/assess-log.wxml
similarity index 97%
rename from pages/kaohe_jilu/kaohe_jilu.wxml
rename to pages/assess-log/assess-log.wxml
index b8ac9ff..29a3e34 100644
--- a/pages/kaohe_jilu/kaohe_jilu.wxml
+++ b/pages/assess-log/assess-log.wxml
@@ -1,130 +1,130 @@
-<!-- pages/kaohe_jilu/kaohe_jilu.wxml -->
-<view class="page-root">
-  <!-- 顶部筛选区 -->
-  <view class="filter-bar">
-    <!-- 板块筛选 -->
-    <scroll-view class="module-scroll" scroll-x enhanced show-scrollbar="{{false}}">
-      <view class="module-container">
-        <view class="filter-item {{xuanzhongBankuaiId === 0 ? 'active' : ''}}"
-              data-id="{{0}}" bindtap="selectModule">
-          <text>全部板块</text>
-        </view>
-        <block wx:for="{{moduleList}}" wx:key="bankuai_id">
-          <view class="filter-item {{xuanzhongBankuaiId === item.bankuai_id ? 'active' : ''}}"
-                data-id="{{item.bankuai_id}}" bindtap="selectModule">
-            <text>{{item.mingcheng}}</text>
-          </view>
-        </block>
-      </view>
-    </scroll-view>
-    <!-- 状态筛选 -->
-    <view class="status-row">
-      <view class="status-item {{statusFilter === 0 ? 'active' : ''}}" data-status="{{0}}" bindtap="selectStatus">全部</view>
-      <view class="status-item {{statusFilter === 1 ? 'active' : ''}}" data-status="{{1}}" bindtap="selectStatus">审核中</view>
-      <view class="status-item {{statusFilter === 2 ? 'active' : ''}}" data-status="{{2}}" bindtap="selectStatus">已通过</view>
-      <view class="status-item {{statusFilter === 3 ? 'active' : ''}}" data-status="{{3}}" bindtap="selectStatus">未通过</view>
-    </view>
-  </view>
-
-  <!-- 列表区域 -->
-  <view class="list-container">
-    <scroll-view class="list-scroll" scroll-y enhanced show-scrollbar="{{false}}"
-                 bindscrolltolower="onReachBottom">
-      <view class="record-list">
-        <view wx:if="{{!isLoading && recordList.length === 0}}" class="empty-tip">暂无考核记录</view>
-
-        <block wx:for="{{recordList}}" wx:key="jilu_id">
-          <view class="card">
-            <!-- 头部信息 -->
-            <view class="card-header">
-              <image class="avatar" src="{{item.shenqingren_avatar}}" mode="aspectFill" />
-              <view class="user-info">
-                <text class="nickname">{{item.shenqingren_nicheng || '用户'}}</text>
-                <text class="uid">UID {{item.shenqingren_id}}</text>
-              </view>
-              <view class="status-tag status-{{item.zhuangtai}}">
-                {{item.zhuangtai == 0 ? '审核中' : (item.zhuangtai == 1 ? '已通过' : (item.zhuangtai == 2 ? '未通过' : '待审核'))}}
-              </view>
-            </view>
-
-            <!-- 摘要信息 -->
-            <view class="card-summary">
-              <view class="summary-item">
-                <text class="label">板块</text>
-                <text class="value">{{item.bankuai_mingcheng}}</text>
-              </view>
-              <view class="summary-item">
-                <text class="label">标签</text>
-                <chenghao-tag mingcheng="{{item.chenghao_mingcheng}}" texiaoJson="{{item.chenghao_texiao_json}}" />
-              </view>
-              <view class="summary-item">
-                <text class="label">次数</text>
-                <text class="value">{{item.cishu}}次</text>
-              </view>
-              <view class="summary-item">
-                <text class="label">总费用</text>
-                <text class="value">¥{{item.total_fee}}</text>
-              </view>
-            </view>
-
-            <!-- 操作行 -->
-            <view class="card-actions">
-              <view class="expand-btn" data-id="{{item.jilu_id}}" bindtap="toggleExpand">
-                {{expandedIds.indexOf(item.jilu_id) > -1 ? '收起详情' : '展开详情'}}
-              </view>
-              <view wx:if="{{item.zhuangtai == 0}}" class="judge-btn" data-item="{{item}}" bindtap="goJudge">
-                去评判
-              </view>
-            </view>
-
-            <!-- 展开的详细内容 -->
-            <view class="card-detail" wx:if="{{expandedIds.indexOf(item.jilu_id) > -1}}">
-              <view class="detail-section" wx:if="{{item.guize_neirong}}">
-                <text class="detail-title">考核规则</text>
-                <text class="detail-text">{{item.guize_neirong}}</text>
-              </view>
-              <view class="detail-section">
-                <text class="detail-title">缴纳记录</text>
-                <view wx:for="{{item.fee_list}}" wx:key="cishu" class="fee-row">
-                  <text>第{{item.cishu}}次：¥{{item.jine}}</text>
-                </view>
-                <text wx:if="{{!item.fee_list || item.fee_list.length === 0}}" class="detail-empty">暂无缴纳记录</text>
-              </view>
-              <view class="detail-section">
-                <text class="detail-title">拒绝记录</text>
-                <view wx:for="{{item.reject_list}}" wx:key="cishu" class="reject-row">
-                  <view class="reject-item">
-                    <text class="reject-time">{{item.create_time}}</text>
-                    <text class="reject-reason">第{{item.cishu}}次拒绝：{{item.yuanyin}}</text>
-                  </view>
-                </view>
-                <text wx:if="{{!item.reject_list || item.reject_list.length === 0}}" class="detail-empty">暂无拒绝记录</text>
-              </view>
-              <view class="detail-section">
-                <text class="detail-title">其他信息</text>
-                <view class="info-grid">
-                  <text>打手游戏ID：{{item.dashou_youxi_id || '无'}}</text>
-                  <text>打手备注：{{item.dashou_beizhu || '无'}}</text>
-                  <text>审核官游戏ID：{{item.shenheguan_youxi_id || '无'}}</text>
-                  <text>创建时间：{{item.create_time}}</text>
-                  <text>更新时间：{{item.update_time}}</text>
-                </view>
-              </view>
-            </view>
-          </view>
-        </block>
-
-        <view wx:if="{{isLoadingMore}}" class="loading-more">加载更多...</view>
-        <view wx:if="{{!hasMore && recordList.length > 0}}" class="no-more">—— 没有更多了 ——</view>
-      </view>
-    </scroll-view>
-  </view>
-
-  <!-- 加载遮罩 -->
-  <view wx:if="{{isLoading && recordList.length === 0}}" class="loading-mask">
-    <view class="loading-spinner"></view>
-    <text>加载中...</text>
-  </view>
-</view>
-
+<!-- pages/assess-log/assess-log.wxml -->
+<view class="page-root">
+  <!-- 顶部筛选区 -->
+  <view class="filter-bar">
+    <!-- 板块筛选 -->
+    <scroll-view class="module-scroll" scroll-x enhanced show-scrollbar="{{false}}">
+      <view class="module-container">
+        <view class="filter-item {{xuanzhongBankuaiId === 0 ? 'active' : ''}}"
+              data-id="{{0}}" bindtap="selectModule">
+          <text>全部板块</text>
+        </view>
+        <block wx:for="{{moduleList}}" wx:key="bankuai_id">
+          <view class="filter-item {{xuanzhongBankuaiId === item.bankuai_id ? 'active' : ''}}"
+                data-id="{{item.bankuai_id}}" bindtap="selectModule">
+            <text>{{item.mingcheng}}</text>
+          </view>
+        </block>
+      </view>
+    </scroll-view>
+    <!-- 状态筛选 -->
+    <view class="status-row">
+      <view class="status-item {{statusFilter === 0 ? 'active' : ''}}" data-status="{{0}}" bindtap="selectStatus">全部</view>
+      <view class="status-item {{statusFilter === 1 ? 'active' : ''}}" data-status="{{1}}" bindtap="selectStatus">审核中</view>
+      <view class="status-item {{statusFilter === 2 ? 'active' : ''}}" data-status="{{2}}" bindtap="selectStatus">已通过</view>
+      <view class="status-item {{statusFilter === 3 ? 'active' : ''}}" data-status="{{3}}" bindtap="selectStatus">未通过</view>
+    </view>
+  </view>
+
+  <!-- 列表区域 -->
+  <view class="list-container">
+    <scroll-view class="list-scroll" scroll-y enhanced show-scrollbar="{{false}}"
+                 bindscrolltolower="onReachBottom">
+      <view class="record-list">
+        <view wx:if="{{!isLoading && recordList.length === 0}}" class="empty-tip">暂无考核记录</view>
+
+        <block wx:for="{{recordList}}" wx:key="jilu_id">
+          <view class="card">
+            <!-- 头部信息 -->
+            <view class="card-header">
+              <image class="avatar" src="{{item.shenqingren_avatar}}" mode="aspectFill" />
+              <view class="user-info">
+                <text class="nickname">{{item.shenqingren_nicheng || '用户'}}</text>
+                <text class="uid">UID {{item.shenqingren_id}}</text>
+              </view>
+              <view class="status-tag status-{{item.zhuangtai}}">
+                {{item.zhuangtai == 0 ? '审核中' : (item.zhuangtai == 1 ? '已通过' : (item.zhuangtai == 2 ? '未通过' : '待审核'))}}
+              </view>
+            </view>
+
+            <!-- 摘要信息 -->
+            <view class="card-summary">
+              <view class="summary-item">
+                <text class="label">板块</text>
+                <text class="value">{{item.bankuai_mingcheng}}</text>
+              </view>
+              <view class="summary-item">
+                <text class="label">标签</text>
+                <chenghao-tag mingcheng="{{item.chenghao_mingcheng}}" texiaoJson="{{item.chenghao_texiao_json}}" />
+              </view>
+              <view class="summary-item">
+                <text class="label">次数</text>
+                <text class="value">{{item.cishu}}次</text>
+              </view>
+              <view class="summary-item">
+                <text class="label">总费用</text>
+                <text class="value">¥{{item.total_fee}}</text>
+              </view>
+            </view>
+
+            <!-- 操作行 -->
+            <view class="card-actions">
+              <view class="expand-btn" data-id="{{item.jilu_id}}" bindtap="toggleExpand">
+                {{expandedIds.indexOf(item.jilu_id) > -1 ? '收起详情' : '展开详情'}}
+              </view>
+              <view wx:if="{{item.zhuangtai == 0}}" class="judge-btn" data-item="{{item}}" bindtap="goJudge">
+                去评判
+              </view>
+            </view>
+
+            <!-- 展开的详细内容 -->
+            <view class="card-detail" wx:if="{{expandedIds.indexOf(item.jilu_id) > -1}}">
+              <view class="detail-section" wx:if="{{item.guize_neirong}}">
+                <text class="detail-title">考核规则</text>
+                <text class="detail-text">{{item.guize_neirong}}</text>
+              </view>
+              <view class="detail-section">
+                <text class="detail-title">缴纳记录</text>
+                <view wx:for="{{item.fee_list}}" wx:key="cishu" class="fee-row">
+                  <text>第{{item.cishu}}次：¥{{item.jine}}</text>
+                </view>
+                <text wx:if="{{!item.fee_list || item.fee_list.length === 0}}" class="detail-empty">暂无缴纳记录</text>
+              </view>
+              <view class="detail-section">
+                <text class="detail-title">拒绝记录</text>
+                <view wx:for="{{item.reject_list}}" wx:key="cishu" class="reject-row">
+                  <view class="reject-item">
+                    <text class="reject-time">{{item.create_time}}</text>
+                    <text class="reject-reason">第{{item.cishu}}次拒绝：{{item.yuanyin}}</text>
+                  </view>
+                </view>
+                <text wx:if="{{!item.reject_list || item.reject_list.length === 0}}" class="detail-empty">暂无拒绝记录</text>
+              </view>
+              <view class="detail-section">
+                <text class="detail-title">其他信息</text>
+                <view class="info-grid">
+                  <text>打手游戏ID：{{item.dashou_youxi_id || '无'}}</text>
+                  <text>打手备注：{{item.dashou_beizhu || '无'}}</text>
+                  <text>审核官游戏ID：{{item.shenheguan_youxi_id || '无'}}</text>
+                  <text>创建时间：{{item.create_time}}</text>
+                  <text>更新时间：{{item.update_time}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </block>
+
+        <view wx:if="{{isLoadingMore}}" class="loading-more">加载更多...</view>
+        <view wx:if="{{!hasMore && recordList.length > 0}}" class="no-more">—— 没有更多了 ——</view>
+      </view>
+    </scroll-view>
+  </view>
+
+  <!-- 加载遮罩 -->
+  <view wx:if="{{isLoading && recordList.length === 0}}" class="loading-mask">
+    <view class="loading-spinner"></view>
+    <text>加载中...</text>
+  </view>
+</view>
+
 <global-notification id="global-notification" />
\ No newline at end of file
diff --git a/pages/kaohe_jilu/kaohe_jilu.wxss b/pages/assess-log/assess-log.wxss
similarity index 94%
rename from pages/kaohe_jilu/kaohe_jilu.wxss
rename to pages/assess-log/assess-log.wxss
index bf37003..1b986f6 100644
--- a/pages/kaohe_jilu/kaohe_jilu.wxss
+++ b/pages/assess-log/assess-log.wxss
@@ -1,263 +1,262 @@
-/* pages/kaohe_jilu/kaohe_jilu.wxss - 晨露微光风格（左右均等边距） */
-page {
-    background: linear-gradient(135deg, #FDFBF7 0%, #F2EFE9 100%);
-    color: #4A4A4A;
-    font-family: 'SF Pro Display', 'PingFang SC', system-ui;
-    height: 100vh;
-    overflow: hidden;
-  }
-  
-  .page-root {
-    height: 100vh;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-  }
-  
-  /* 筛选栏 */
-  .filter-bar {
-    background: rgba(255, 255, 255, 0.8);
-    backdrop-filter: blur(20px);
-    border-bottom: 1rpx solid rgba(0,0,0,0.04);
-    flex-shrink: 0;
-    padding: 20rpx 0 0;
-  }
-  
-  .module-scroll {
-    white-space: nowrap;
-    height: 70rpx;
-    padding: 0 30rpx;
-  }
-  .module-container {
-    display: inline-flex;
-    gap: 20rpx;
-    align-items: center;
-    height: 70rpx;
-  }
-  
-  .filter-item {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    padding: 0 30rpx;
-    height: 56rpx;
-    border-radius: 28rpx;
-    background: #F0EFEC;
-    font-size: 26rpx;
-    color: #6B6B6B;
-    transition: all 0.2s;
-  }
-  .filter-item.active {
-    background: #C8A27A;
-    color: #FFFFFF;
-    font-weight: 600;
-    box-shadow: 0 4rpx 12rpx rgba(200, 162, 122, 0.3);
-  }
-  
-  .status-row {
-    display: flex;
-    padding: 15rpx 30rpx 20rpx;
-    gap: 30rpx;
-  }
-  .status-item {
-    font-size: 26rpx;
-    color: #8B8B8B;
-    padding-bottom: 8rpx;
-    border-bottom: 4rpx solid transparent;
-    transition: all 0.2s;
-  }
-  .status-item.active {
-    color: #C8A27A;
-    border-bottom-color: #C8A27A;
-    font-weight: 600;
-  }
-  
-  /* 列表容器 */
-  .list-container {
-    flex: 1;
-    overflow: hidden;
-  }
-  .list-scroll {
-    height: 100%;
-    padding: 20rpx 0;   /* 上下内边距 */
-  }
-  
-  .empty-tip {
-    text-align: center;
-    color: #A0A0A0;
-    font-size: 28rpx;
-    padding-top: 200rpx;
-  }
-  
-  /* 卡片：统一左右边距 30rpx */
-  .card {
-    background: #FFFFFF;
-    border-radius: 28rpx;
-    padding: 30rpx;
-    margin: 0 30rpx 24rpx 30rpx;   /* 左右严格相等 */
-    box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.04);
-    transition: all 0.3s;
-  }
-  
-  .card-header {
-    display: flex;
-    align-items: center;
-    margin-bottom: 24rpx;
-  }
-  .avatar {
-    width: 72rpx;
-    height: 72rpx;
-    border-radius: 50%;
-    margin-right: 18rpx;
-    border: 2rpx solid #F0EDE8;
-    background: #F7F5F2;
-  }
-  .user-info {
-    flex: 1;
-  }
-  .nickname {
-    font-size: 30rpx;
-    font-weight: 600;
-    color: #3A3A3A;
-    display: block;
-  }
-  .uid {
-    font-size: 24rpx;
-    color: #9A9A9A;
-    margin-top: 4rpx;
-  }
-  .status-tag {
-    font-size: 24rpx;
-    padding: 6rpx 18rpx;
-    border-radius: 20rpx;
-    font-weight: 500;
-  }
-  .status-0 { background: #FFF3E0; color: #EF6C00; }
-  .status-1 { background: #E8F5E9; color: #2E7D32; }
-  .status-2 { background: #FFEBEE; color: #C62828; }
-  .status-3 { background: #E3F2FD; color: #1565C0; }
-  
-  .card-summary {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 16rpx 24rpx;
-    margin-bottom: 20rpx;
-  }
-  .summary-item {
-    display: flex;
-    align-items: center;
-    font-size: 26rpx;
-  }
-  .summary-item .label {
-    color: #8B8B8B;
-    margin-right: 12rpx;
-  }
-  .summary-item .value {
-    color: #3A3A3A;
-    font-weight: 500;
-  }
-  
-  .card-actions {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-top: 20rpx;
-    border-top: 1rpx solid #F5F2ED;
-  }
-  .expand-btn {
-    font-size: 26rpx;
-    color: #C8A27A;
-    font-weight: 500;
-  }
-  .judge-btn {
-    font-size: 26rpx;
-    background: #C8A27A;
-    color: #FFFFFF;
-    padding: 8rpx 24rpx;
-    border-radius: 24rpx;
-    font-weight: 500;
-  }
-  
-  /* 展开详情（左右边距继承卡片，无需额外设置） */
-  .card-detail {
-    margin-top: 20rpx;
-    padding-top: 20rpx;
-    border-top: 1rpx solid #F5F2ED;
-  }
-  .detail-section {
-    margin-bottom: 20rpx;
-  }
-  .detail-title {
-    font-size: 26rpx;
-    font-weight: 600;
-    color: #5A5A5A;
-    margin-bottom: 10rpx;
-    display: block;
-  }
-  .detail-text {
-    font-size: 24rpx;
-    color: #6B6B6B;
-    line-height: 1.6;
-  }
-  .fee-row, .reject-row {
-    font-size: 24rpx;
-    color: #6B6B6B;
-    padding: 6rpx 0;
-  }
-  .reject-item {
-    display: flex;
-    flex-direction: column;
-    background: #FFF9F5;
-    padding: 12rpx 16rpx;
-    border-radius: 12rpx;
-    margin-bottom: 12rpx;
-  }
-  .reject-time {
-    font-size: 22rpx;
-    color: #B0A090;
-    margin-bottom: 4rpx;
-  }
-  .reject-reason {
-    font-size: 24rpx;
-    color: #7A5A4A;
-  }
-  .detail-empty {
-    font-size: 24rpx;
-    color: #A0A0A0;
-    padding: 8rpx 0;
-  }
-  .info-grid {
-    display: flex;
-    flex-direction: column;
-    gap: 8rpx;
-    font-size: 24rpx;
-    color: #6B6B6B;
-  }
-  
-  /* 加载 */
-  .loading-more, .no-more {
-    text-align: center;
-    padding: 30rpx;
-    font-size: 24rpx;
-    color: #A0A0A0;
-  }
-  .loading-mask {
-    position: fixed;
-    top: 0; left: 0; right: 0; bottom: 0;
-    background: rgba(253, 251, 247, 0.8);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    z-index: 999;
-  }
-  .loading-spinner {
-    width: 60rpx;
-    height: 60rpx;
-    border: 4rpx solid #E0DDD5;
-    border-top-color: #C8A27A;
-    border-radius: 50%;
-    animation: spin 0.8s linear infinite;
-    margin-bottom: 20rpx;
-  }
-  @keyframes spin { to { transform: rotate(360deg); } }
\ No newline at end of file
+/* pages/assess-log/assess-log.wxss - 晨露微光风格（左右均等边距） */
+page {
+    background: linear-gradient(135deg, #FDFBF7 0%, #F2EFE9 100%);
+    color: #4A4A4A;
+    font-family: 'SF Pro Display', 'PingFang SC', system-ui;
+    height: 100vh;
+    overflow: hidden;
+  }
+  
+  .page-root {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+  
+  /* 筛选栏 */
+  .filter-bar {
+    background: rgba(255, 255, 255, 0.8);
+    backdrop-filter: blur(20px);
+    border-bottom: 1rpx solid rgba(0,0,0,0.04);
+    flex-shrink: 0;
+    padding: 20rpx 0 0;
+  }
+  
+  .module-scroll {
+    white-space: nowrap;
+    height: 70rpx;
+    padding: 0 30rpx;
+  }
+  .module-container {
+    display: inline-flex;
+    gap: 20rpx;
+    align-items: center;
+    height: 70rpx;
+  }
+  
+  .filter-item {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 30rpx;
+    height: 56rpx;
+    border-radius: 28rpx;
+    background: #F0EFEC;
+    font-size: 26rpx;
+    color: #6B6B6B;
+    transition: all 0.2s;
+  }
+  .filter-item.active {
+    background: #C8A27A;
+    color: #FFFFFF;
+    font-weight: 600;
+    box-shadow: 0 4rpx 12rpx rgba(200, 162, 122, 0.3);
+  }
+  
+  .status-row {
+    display: flex;
+    padding: 15rpx 30rpx 20rpx;
+    gap: 30rpx;
+  }
+  .status-item {
+    font-size: 26rpx;
+    color: #8B8B8B;
+    padding-bottom: 8rpx;
+    border-bottom: 4rpx solid transparent;
+    transition: all 0.2s;
+  }
+  .status-item.active {
+    color: #C8A27A;
+    border-bottom-color: #C8A27A;
+    font-weight: 600;
+  }
+  
+  /* 列表容器 */
+  .list-container {
+    flex: 1;
+    overflow: hidden;
+  }
+  .list-scroll {
+    height: 100%;
+    padding: 20rpx 0;   /* 上下内边距 */
+  }
+  
+  .empty-tip {
+    text-align: center;
+    color: #A0A0A0;
+    font-size: 28rpx;
+    padding-top: 200rpx;
+  }
+  
+  /* 卡片：统一左右边距 30rpx */
+  .card {
+    background: #FFFFFF;
+    border-radius: 28rpx;
+    padding: 30rpx;
+    margin: 0 30rpx 24rpx 30rpx;   /* 左右严格相等 */
+    box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.04);
+    transition: all 0.3s;
+  }
+  
+  .card-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 24rpx;
+  }
+  .avatar {
+    width: 72rpx;
+    height: 72rpx;
+    border-radius: 50%;
+    margin-right: 18rpx;
+    border: 2rpx solid #F0EDE8;
+    background: #F7F5F2;
+  }
+  .user-info {
+    flex: 1;
+  }
+  .nickname {
+    font-size: 30rpx;
+    font-weight: 600;
+    color: #3A3A3A;
+    display: block;
+  }
+  .uid {
+    font-size: 24rpx;
+    color: #9A9A9A;
+    margin-top: 4rpx;
+  }
+  .status-tag {
+    font-size: 24rpx;
+    padding: 6rpx 18rpx;
+    border-radius: 20rpx;
+    font-weight: 500;
+  }
+  .status-0 { background: #FFF3E0; color: #EF6C00; }
+  .status-1 { background: #E8F5E9; color: #2E7D32; }
+  .status-2 { background: #FFEBEE; color: #C62828; }
+  .status-3 { background: #E3F2FD; color: #1565C0; }
+  
+  .card-summary {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx 24rpx;
+    margin-bottom: 20rpx;
+  }
+  .summary-item {
+    display: flex;
+    align-items: center;
+    font-size: 26rpx;
+  }
+  .summary-item .label {
+    color: #8B8B8B;
+    margin-right: 12rpx;
+  }
+  .summary-item .value {
+    color: #3A3A3A;
+    font-weight: 500;
+  }
+  
+  .card-actions {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-top: 20rpx;
+    border-top: 1rpx solid #F5F2ED;
+  }
+  .expand-btn {
+    font-size: 26rpx;
+    color: #C8A27A;
+    font-weight: 500;
+  }
+  .judge-btn {
+    font-size: 26rpx;
+    background: #C8A27A;
+    color: #FFFFFF;
+    padding: 8rpx 24rpx;
+    border-radius: 24rpx;
+    font-weight: 500;
+  }
+  
+  /* 展开详情（左右边距继承卡片，无需额外设置） */
+  .card-detail {
+    margin-top: 20rpx;
+    padding-top: 20rpx;
+    border-top: 1rpx solid #F5F2ED;
+  }
+  .detail-section {
+    margin-bottom: 20rpx;
+  }
+  .detail-title {
+    font-size: 26rpx;
+    font-weight: 600;
+    color: #5A5A5A;
+    margin-bottom: 10rpx;
+    display: block;
+  }
+  .detail-text {
+    font-size: 24rpx;
+    color: #6B6B6B;
+    line-height: 1.6;
+  }
+  .fee-row, .reject-row {
+    font-size: 24rpx;
+    color: #6B6B6B;
+    padding: 6rpx 0;
+  }
+  .reject-item {
+    display: flex;
+    flex-direction: column;
+    background: #FFF9F5;
+    padding: 12rpx 16rpx;
+    border-radius: 12rpx;
+    margin-bottom: 12rpx;
+  }
+  .reject-time {
+    font-size: 22rpx;
+    color: #B0A090;
+    margin-bottom: 4rpx;
+  }
+  .reject-reason {
+    font-size: 24rpx;
+    color: #7A5A4A;
+  }
+  .detail-empty {
+    font-size: 24rpx;
+    color: #A0A0A0;
+    padding: 8rpx 0;
+  }
+  .info-grid {
+    display: flex;
+    flex-direction: column;
+    gap: 8rpx;
+    font-size: 24rpx;
+    color: #6B6B6B;
+  }
+  
+  /* 加载 */
+  .loading-more, .no-more {
+    text-align: center;
+    padding: 30rpx;
+    font-size: 24rpx;
+    color: #A0A0A0;
+  }
+  .loading-mask {
+    position: fixed;
+    top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(253, 251, 247, 0.8);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    z-index: 999;
+  }
+  .loading-spinner {
+    width: 60rpx;
+    height: 60rpx;
+    border: 4rpx solid #E0DDD5;
+    border-top-color: #C8A27A;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+    margin-bottom: 20rpx;
+  }
diff --git a/pages/kaohe_dafen/kaohe_dafen.js b/pages/assess-score/assess-score.js
similarity index 96%
rename from pages/kaohe_dafen/kaohe_dafen.js
rename to pages/assess-score/assess-score.js
index c69093e..b227446 100644
--- a/pages/kaohe_dafen/kaohe_dafen.js
+++ b/pages/assess-score/assess-score.js
@@ -1,208 +1,208 @@
-// pages/kaohe_dafen/kaohe_dafen.js
-const app = getApp();
-import request from '../../utils/request.js';
-import { openPrivateChat, buildDashouPeerId } from '../../utils/im-user.js';
-import { resolveAvatarUrl } from '../../utils/avatar.js';
-
-Page({
-  data: {
-    recordList: [],
-    page: 1,
-    pageSize: 10,
-    hasMore: false,
-    isLoading: false,
-    ossImageUrl: app.globalData.ossImageUrl || '',
-
-    // 操作弹窗
-    showAgreeModal: false,
-    showRejectModal: false,
-    showTransferModal: false,
-    currentItem: null,
-    rejectReason: '',
-
-    // 倒计时
-    countdown: 2,
-    counting: false,
-    countdownTimer: null,
-  },
-
-  onLoad() {
-    this.loadRecords(true);
-  },
-
-  // 加载考核记录
-  async loadRecords(isRefresh = false) {
-    if (this.data.isLoading) return;
-    const page = isRefresh ? 1 : this.data.page;
-    this.setData({ isLoading: true });
-    try {
-      const res = await request({
-        url: '/dengji/hqkhxq',
-        method: 'POST',
-        data: { page, page_size: this.data.pageSize }
-      });
-      if (res && res.data.code === 0) {
-        const list = res.data.data.list || [];
-        const hasMore = res.data.data.has_more;
-        const oss = this.data.ossImageUrl;
-        const processed = list.map(item => ({
-          ...item,
-          shenqingren_avatar: item.shenqingren_avatar && !item.shenqingren_avatar.startsWith('http')
-            ? oss + item.shenqingren_avatar
-            : item.shenqingren_avatar || '/images/default-avatar.png'
-        }));
-        const newList = isRefresh ? processed : [...this.data.recordList, ...processed];
-        this.setData({ recordList: newList, page: page + 1, hasMore, isLoading: false });
-      } else {
-        wx.showToast({ title: '加载失败', icon: 'none' });
-        this.setData({ isLoading: false });
-      }
-    } catch (e) {
-      wx.showToast({ title: '网络错误', icon: 'none' });
-      this.setData({ isLoading: false });
-    }
-  },
-
-  onReachBottom() {
-    if (this.data.hasMore && !this.data.isLoading) {
-      this.loadRecords(false);
-    }
-  },
-
-  // 联系打手（私聊）—— 照搬金牌页面逻辑
-  contactDashou(e) {
-    const item = e.currentTarget.dataset.item;
-    if (!item || !item.shenqingren_id) {
-      wx.showToast({ title: '无法获取打手ID', icon: 'none' });
-      return;
-    }
-    openPrivateChat(this, {
-      toUserId: buildDashouPeerId(item.shenqingren_id),
-      toName: '打手' + item.shenqingren_id,
-      toAvatar: resolveAvatarUrl(item.shenqingren_avatar),
-    });
-  },
-
-  // 修改游戏昵称
-  async modifyNick(e) {
-    const { id } = e.currentTarget.dataset;
-    const item = this.data.recordList.find(r => r.jilu_id === id);
-    if (!item) return;
-    const newNick = item.shenheguan_youxi_id || '';
-    try {
-      const res = await request({
-        url: '/dengji/khgxgkh',
-        method: 'POST',
-        data: { jilu_id: id, caozuo: 'modify_nick', youxi_id: newNick }
-      });
-      if (res && res.data.code === 0) {
-        wx.showToast({ title: '修改成功', icon: 'success' });
-      } else {
-        wx.showToast({ title: res.data?.msg || '修改失败', icon: 'none' });
-      }
-    } catch (e) {
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }
-  },
-
-  onNickInput(e) {
-    const id = e.currentTarget.dataset.id;
-    const value = e.detail.value;
-    const list = this.data.recordList.map(item => {
-      if (item.jilu_id === id) {
-        return { ...item, shenheguan_youxi_id: value };
-      }
-      return item;
-    });
-    this.setData({ recordList: list });
-  },
-
-  // 🆕 实时更新拒绝原因
-  onRejectInput(e) {
-    this.setData({ rejectReason: e.detail.value });
-  },
-
-  openAgreeModal(e) {
-    const item = e.currentTarget.dataset.item;
-    this.setData({ showAgreeModal: true, currentItem: item });
-    this.startCountdown();
-  },
-  openRejectModal(e) {
-    const item = e.currentTarget.dataset.item;
-    this.setData({ showRejectModal: true, currentItem: item, rejectReason: '' });
-    this.startCountdown();
-  },
-  openTransferModal(e) {
-    const item = e.currentTarget.dataset.item;
-    this.setData({ showTransferModal: true, currentItem: item });
-    this.startCountdown();
-  },
-
-  closeAllModals() {
-    this.stopCountdown();
-    this.setData({
-      showAgreeModal: false,
-      showRejectModal: false,
-      showTransferModal: false,
-      currentItem: null,
-      rejectReason: ''
-    });
-  },
-
-  startCountdown() {
-    this.stopCountdown();
-    this.setData({ counting: true, countdown: 2 });
-    this.data.countdownTimer = setInterval(() => {
-      if (this.data.countdown > 1) {
-        this.setData({ countdown: this.data.countdown - 1 });
-      } else {
-        this.stopCountdown();
-        this.setData({ counting: false, countdown: 0 });
-      }
-    }, 1000);
-  },
-  stopCountdown() {
-    if (this.data.countdownTimer) {
-      clearInterval(this.data.countdownTimer);
-      this.data.countdownTimer = null;
-    }
-  },
-
-  // 执行操作（从事件对象中获取操作类型）
-  async executeAction(e) {
-    const actionType = e.currentTarget.dataset.action;
-    if (!actionType) {
-      wx.showToast({ title: '操作类型异常', icon: 'none' });
-      return;
-    }
-
-    const item = this.data.currentItem;
-    if (!item) return;
-
-    const params = { jilu_id: item.jilu_id, caozuo: actionType };
-
-    if (actionType === 'reject') {
-      if (!this.data.rejectReason.trim()) {
-        wx.showToast({ title: '请填写拒绝原因', icon: 'none' });
-        return;
-      }
-      params.yuanyin = this.data.rejectReason;
-    }
-
-    try {
-      const res = await request({ url: '/dengji/khgxgkh', method: 'POST', data: params });
-      if (res && res.data.code === 0) {
-        wx.showToast({ title: '操作成功', icon: 'success' });
-        this.closeAllModals();
-        const newList = this.data.recordList.filter(r => r.jilu_id !== item.jilu_id);
-        this.setData({ recordList: newList });
-      } else {
-        wx.showToast({ title: res.data?.msg || '操作失败', icon: 'none' });
-        this.closeAllModals();
-      }
-    } catch (e) {
-      wx.showToast({ title: '网络错误', icon: 'none' });
-      this.closeAllModals();
-    }
-  },
+// pages/assess-score/assess-score.js
+const app = getApp();
+import request from '../../utils/request.js';
+import { openPrivateChat, buildDashouPeerId } from '../../utils/im-user.js';
+import { resolveAvatarUrl } from '../../utils/avatar.js';
+
+Page({
+  data: {
+    recordList: [],
+    page: 1,
+    pageSize: 10,
+    hasMore: false,
+    isLoading: false,
+    ossImageUrl: app.globalData.ossImageUrl || '',
+
+    // 操作弹窗
+    showAgreeModal: false,
+    showRejectModal: false,
+    showTransferModal: false,
+    currentItem: null,
+    rejectReason: '',
+
+    // 倒计时
+    countdown: 2,
+    counting: false,
+    countdownTimer: null,
+  },
+
+  onLoad() {
+    this.loadRecords(true);
+  },
+
+  // 加载考核记录
+  async loadRecords(isRefresh = false) {
+    if (this.data.isLoading) return;
+    const page = isRefresh ? 1 : this.data.page;
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({
+        url: '/dengji/hqkhxq',
+        method: 'POST',
+        data: { page, page_size: this.data.pageSize }
+      });
+      if (res && res.data.code === 0) {
+        const list = res.data.data.list || [];
+        const hasMore = res.data.data.has_more;
+        const oss = this.data.ossImageUrl;
+        const processed = list.map(item => ({
+          ...item,
+          shenqingren_avatar: item.shenqingren_avatar && !item.shenqingren_avatar.startsWith('http')
+            ? oss + item.shenqingren_avatar
+            : item.shenqingren_avatar || '/images/default-avatar.png'
+        }));
+        const newList = isRefresh ? processed : [...this.data.recordList, ...processed];
+        this.setData({ recordList: newList, page: page + 1, hasMore, isLoading: false });
+      } else {
+        wx.showToast({ title: '加载失败', icon: 'none' });
+        this.setData({ isLoading: false });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+      this.setData({ isLoading: false });
+    }
+  },
+
+  onReachBottom() {
+    if (this.data.hasMore && !this.data.isLoading) {
+      this.loadRecords(false);
+    }
+  },
+
+  // 联系打手（私聊）—— 照搬金牌页面逻辑
+  contactDashou(e) {
+    const item = e.currentTarget.dataset.item;
+    if (!item || !item.shenqingren_id) {
+      wx.showToast({ title: '无法获取打手ID', icon: 'none' });
+      return;
+    }
+    openPrivateChat(this, {
+      toUserId: buildDashouPeerId(item.shenqingren_id),
+      toName: '打手' + item.shenqingren_id,
+      toAvatar: resolveAvatarUrl(item.shenqingren_avatar),
+    });
+  },
+
+  // 修改游戏昵称
+  async modifyNick(e) {
+    const { id } = e.currentTarget.dataset;
+    const item = this.data.recordList.find(r => r.jilu_id === id);
+    if (!item) return;
+    const newNick = item.shenheguan_youxi_id || '';
+    try {
+      const res = await request({
+        url: '/dengji/khgxgkh',
+        method: 'POST',
+        data: { jilu_id: id, caozuo: 'modify_nick', youxi_id: newNick }
+      });
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '修改成功', icon: 'success' });
+      } else {
+        wx.showToast({ title: res.data?.msg || '修改失败', icon: 'none' });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  onNickInput(e) {
+    const id = e.currentTarget.dataset.id;
+    const value = e.detail.value;
+    const list = this.data.recordList.map(item => {
+      if (item.jilu_id === id) {
+        return { ...item, shenheguan_youxi_id: value };
+      }
+      return item;
+    });
+    this.setData({ recordList: list });
+  },
+
+  // 🆕 实时更新拒绝原因
+  onRejectInput(e) {
+    this.setData({ rejectReason: e.detail.value });
+  },
+
+  openAgreeModal(e) {
+    const item = e.currentTarget.dataset.item;
+    this.setData({ showAgreeModal: true, currentItem: item });
+    this.startCountdown();
+  },
+  openRejectModal(e) {
+    const item = e.currentTarget.dataset.item;
+    this.setData({ showRejectModal: true, currentItem: item, rejectReason: '' });
+    this.startCountdown();
+  },
+  openTransferModal(e) {
+    const item = e.currentTarget.dataset.item;
+    this.setData({ showTransferModal: true, currentItem: item });
+    this.startCountdown();
+  },
+
+  closeAllModals() {
+    this.stopCountdown();
+    this.setData({
+      showAgreeModal: false,
+      showRejectModal: false,
+      showTransferModal: false,
+      currentItem: null,
+      rejectReason: ''
+    });
+  },
+
+  startCountdown() {
+    this.stopCountdown();
+    this.setData({ counting: true, countdown: 2 });
+    this.data.countdownTimer = setInterval(() => {
+      if (this.data.countdown > 1) {
+        this.setData({ countdown: this.data.countdown - 1 });
+      } else {
+        this.stopCountdown();
+        this.setData({ counting: false, countdown: 0 });
+      }
+    }, 1000);
+  },
+  stopCountdown() {
+    if (this.data.countdownTimer) {
+      clearInterval(this.data.countdownTimer);
+      this.data.countdownTimer = null;
+    }
+  },
+
+  // 执行操作（从事件对象中获取操作类型）
+  async executeAction(e) {
+    const actionType = e.currentTarget.dataset.action;
+    if (!actionType) {
+      wx.showToast({ title: '操作类型异常', icon: 'none' });
+      return;
+    }
+
+    const item = this.data.currentItem;
+    if (!item) return;
+
+    const params = { jilu_id: item.jilu_id, caozuo: actionType };
+
+    if (actionType === 'reject') {
+      if (!this.data.rejectReason.trim()) {
+        wx.showToast({ title: '请填写拒绝原因', icon: 'none' });
+        return;
+      }
+      params.yuanyin = this.data.rejectReason;
+    }
+
+    try {
+      const res = await request({ url: '/dengji/khgxgkh', method: 'POST', data: params });
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '操作成功', icon: 'success' });
+        this.closeAllModals();
+        const newList = this.data.recordList.filter(r => r.jilu_id !== item.jilu_id);
+        this.setData({ recordList: newList });
+      } else {
+        wx.showToast({ title: res.data?.msg || '操作失败', icon: 'none' });
+        this.closeAllModals();
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+      this.closeAllModals();
+    }
+  },
 });
\ No newline at end of file
diff --git a/pages/kaohe_dafen/kaohe_dafen.json b/pages/assess-score/assess-score.json
similarity index 100%
rename from pages/kaohe_dafen/kaohe_dafen.json
rename to pages/assess-score/assess-score.json
diff --git a/pages/kaohe_dafen/kaohe_dafen.wxml b/pages/assess-score/assess-score.wxml
similarity index 97%
rename from pages/kaohe_dafen/kaohe_dafen.wxml
rename to pages/assess-score/assess-score.wxml
index 3094b15..db5c6ab 100644
--- a/pages/kaohe_dafen/kaohe_dafen.wxml
+++ b/pages/assess-score/assess-score.wxml
@@ -1,118 +1,118 @@
-<!-- pages/kaohe_dafen/kaohe_dafen.wxml -->
-<view class="root-page">
-  <view class="scroll-container" scroll-y="true" bindscrolltolower="onReachBottom">
-    <view class="list">
-      <block wx:for="{{recordList}}" wx:key="jilu_id">
-        <view class="card">
-          <!-- 用户信息行 -->
-          <view class="user-row">
-            <image class="avatar" src="{{item.shenqingren_avatar}}" mode="aspectFill" />
-            <view class="info">
-              <text class="uid">UID {{item.shenqingren_id}}</text>
-              <text class="time">{{item.create_time}}</text>
-            </view>
-            <view class="contact-btn" bindtap="contactDashou" data-item="{{item}}">联系</view>
-          </view>
-
-          <!-- 详情区 -->
-          <view class="detail-grid">
-            <view class="detail-item">
-              <text class="label">板块</text>
-              <text class="value">{{item.bankuai_mingcheng}}</text>
-            </view>
-            <view class="detail-item">
-              <text class="label">标签</text>
-              <chenghao-tag mingcheng="{{item.chenghao_mingcheng}}" texiaoJson="{{item.chenghao_texiao_json}}" />
-              <text wx:if="{{item.is_jinpai}}" class="jinpai-note">(开启金牌)</text>
-            </view>
-            <view class="detail-item">
-              <text class="label">规则</text>
-              <text class="value rule-content">{{item.guize_neirong}}</text>
-            </view>
-             <!-- 🆕 添加被考核人游戏昵称 -->
-            <view class="detail-item" wx:if="{{item.dashou_youxi_id}}">
-                <text class="label">打手游戏昵称</text>
-                <text class="value">{{item.dashou_youxi_id}}</text>
-            </view>
-            <view class="detail-item" wx:if="{{item.dashou_beizhu}}">
-              <text class="label">备注</text>
-              <text class="value">{{item.dashou_beizhu}}</text>
-            </view>
-            <view class="detail-item">
-              <text class="label">次数</text>
-              <text class="value">{{item.cishu}}</text>
-            </view>
-            <view class="detail-item">
-              <text class="label">待收考核费</text>
-              <text class="value amount">¥{{item.daishou_fei}}</text>
-            </view>
-          </view>
-
-          <!-- 上次失败原因 -->
-          <view wx:if="{{item.last_fail_reason}}" class="fail-box">
-            <text class="fail-label">上次拒绝原因：</text>
-            <text class="fail-text">{{item.last_fail_reason}}</text>
-          </view>
-
-          <!-- 游戏昵称修改 -->
-          <view class="nick-row">
-            <text class="label">我的游戏昵称</text>
-            <input class="nick-input" data-id="{{item.jilu_id}}" value="{{item.shenheguan_youxi_id}}" bindinput="onNickInput" placeholder="输入昵称" />
-            <view class="save-nick-btn" data-id="{{item.jilu_id}}" bindtap="modifyNick">保存</view>
-          </view>
-
-          <!-- 操作按钮 -->
-          <view class="action-row">
-            <view class="action-btn agree" data-item="{{item}}" bindtap="openAgreeModal">合格</view>
-            <view class="action-btn reject" data-item="{{item}}" bindtap="openRejectModal">不合格</view>
-            <view class="action-btn transfer" data-item="{{item}}" bindtap="openTransferModal">转移</view>
-          </view>
-        </view>
-      </block>
-      <view wx:if="{{isLoading}}" class="loading">加载中...</view>
-      <view wx:if="{{!hasMore && recordList.length > 0}}" class="no-more">—— 已加载全部 ——</view>
-      <view wx:if="{{!isLoading && recordList.length === 0}}" class="empty">暂无待考核记录</view>
-    </view>
-  </view>
-</view>
-
-<!-- 通过确认弹窗 -->
-<view wx:if="{{showAgreeModal}}" class="modal-mask" bindtap="closeAllModals">
-  <view class="modal-box" catchtap="noop">
-    <view class="modal-header">确认通过考核</view>
-    <view class="modal-body">通过后，该用户将获得对应标签，请认真审核后操作。</view>
-    <view class="countdown-text" wx:if="{{counting}}">{{countdown}}秒后可确认</view>
-    <view class="modal-footer">
-      <view class="btn cancel" bindtap="closeAllModals">取消</view>
-      <view class="btn confirm {{counting ? 'disabled' : ''}}" bindtap="{{counting ? '' : 'executeAction'}}" data-action="agree">确认通过</view>
-    </view>
-  </view>
-</view>
-
-<!-- 拒绝弹窗 -->
-<view wx:if="{{showRejectModal}}" class="modal-mask" bindtap="closeAllModals">
-  <view class="modal-box" catchtap="noop">
-    <view class="modal-header">拒绝通过</view>
-    <textarea class="reason-input" value="{{rejectReason}}" bindinput="onRejectInput" placeholder="请填写拒绝原因" maxlength="200"></textarea>
-    <view class="countdown-text" wx:if="{{counting}}">{{countdown}}秒后可确认</view>
-    <view class="modal-footer">
-      <view class="btn cancel" bindtap="closeAllModals">取消</view>
-      <view class="btn confirm {{counting ? 'disabled' : ''}}" bindtap="{{counting ? '' : 'executeAction'}}" data-action="reject">确认拒绝</view>
-    </view>
-  </view>
-</view>
-
-<!-- 转移弹窗 -->
-<view wx:if="{{showTransferModal}}" class="modal-mask" bindtap="closeAllModals">
-  <view class="modal-box" catchtap="noop">
-    <view class="modal-header">确认转移考核</view>
-    <view class="modal-body">转移后，您将无法继续考核此订单，可在考核中心重新接待。</view>
-    <view class="countdown-text" wx:if="{{counting}}">{{countdown}}秒后可确认</view>
-    <view class="modal-footer">
-      <view class="btn cancel" bindtap="closeAllModals">取消</view>
-      <view class="btn confirm {{counting ? 'disabled' : ''}}" bindtap="{{counting ? '' : 'executeAction'}}" data-action="transfer">确认转移</view>
-    </view>
-  </view>
-</view>
-
+<!-- pages/assess-score/assess-score.wxml -->
+<view class="root-page">
+  <view class="scroll-container" scroll-y="true" bindscrolltolower="onReachBottom">
+    <view class="list">
+      <block wx:for="{{recordList}}" wx:key="jilu_id">
+        <view class="card">
+          <!-- 用户信息行 -->
+          <view class="user-row">
+            <image class="avatar" src="{{item.shenqingren_avatar}}" mode="aspectFill" />
+            <view class="info">
+              <text class="uid">UID {{item.shenqingren_id}}</text>
+              <text class="time">{{item.create_time}}</text>
+            </view>
+            <view class="contact-btn" bindtap="contactDashou" data-item="{{item}}">联系</view>
+          </view>
+
+          <!-- 详情区 -->
+          <view class="detail-grid">
+            <view class="detail-item">
+              <text class="label">板块</text>
+              <text class="value">{{item.bankuai_mingcheng}}</text>
+            </view>
+            <view class="detail-item">
+              <text class="label">标签</text>
+              <chenghao-tag mingcheng="{{item.chenghao_mingcheng}}" texiaoJson="{{item.chenghao_texiao_json}}" />
+              <text wx:if="{{item.is_jinpai}}" class="jinpai-note">(开启金牌)</text>
+            </view>
+            <view class="detail-item">
+              <text class="label">规则</text>
+              <text class="value rule-content">{{item.guize_neirong}}</text>
+            </view>
+             <!-- 🆕 添加被考核人游戏昵称 -->
+            <view class="detail-item" wx:if="{{item.dashou_youxi_id}}">
+                <text class="label">打手游戏昵称</text>
+                <text class="value">{{item.dashou_youxi_id}}</text>
+            </view>
+            <view class="detail-item" wx:if="{{item.dashou_beizhu}}">
+              <text class="label">备注</text>
+              <text class="value">{{item.dashou_beizhu}}</text>
+            </view>
+            <view class="detail-item">
+              <text class="label">次数</text>
+              <text class="value">{{item.cishu}}</text>
+            </view>
+            <view class="detail-item">
+              <text class="label">待收考核费</text>
+              <text class="value amount">¥{{item.daishou_fei}}</text>
+            </view>
+          </view>
+
+          <!-- 上次失败原因 -->
+          <view wx:if="{{item.last_fail_reason}}" class="fail-box">
+            <text class="fail-label">上次拒绝原因：</text>
+            <text class="fail-text">{{item.last_fail_reason}}</text>
+          </view>
+
+          <!-- 游戏昵称修改 -->
+          <view class="nick-row">
+            <text class="label">我的游戏昵称</text>
+            <input class="nick-input" data-id="{{item.jilu_id}}" value="{{item.shenheguan_youxi_id}}" bindinput="onNickInput" placeholder="输入昵称" />
+            <view class="save-nick-btn" data-id="{{item.jilu_id}}" bindtap="modifyNick">保存</view>
+          </view>
+
+          <!-- 操作按钮 -->
+          <view class="action-row">
+            <view class="action-btn agree" data-item="{{item}}" bindtap="openAgreeModal">合格</view>
+            <view class="action-btn reject" data-item="{{item}}" bindtap="openRejectModal">不合格</view>
+            <view class="action-btn transfer" data-item="{{item}}" bindtap="openTransferModal">转移</view>
+          </view>
+        </view>
+      </block>
+      <view wx:if="{{isLoading}}" class="loading">加载中...</view>
+      <view wx:if="{{!hasMore && recordList.length > 0}}" class="no-more">—— 已加载全部 ——</view>
+      <view wx:if="{{!isLoading && recordList.length === 0}}" class="empty">暂无待考核记录</view>
+    </view>
+  </view>
+</view>
+
+<!-- 通过确认弹窗 -->
+<view wx:if="{{showAgreeModal}}" class="modal-mask" bindtap="closeAllModals">
+  <view class="modal-box" catchtap="noop">
+    <view class="modal-header">确认通过考核</view>
+    <view class="modal-body">通过后，该用户将获得对应标签，请认真审核后操作。</view>
+    <view class="countdown-text" wx:if="{{counting}}">{{countdown}}秒后可确认</view>
+    <view class="modal-footer">
+      <view class="btn cancel" bindtap="closeAllModals">取消</view>
+      <view class="btn confirm {{counting ? 'disabled' : ''}}" bindtap="{{counting ? '' : 'executeAction'}}" data-action="agree">确认通过</view>
+    </view>
+  </view>
+</view>
+
+<!-- 拒绝弹窗 -->
+<view wx:if="{{showRejectModal}}" class="modal-mask" bindtap="closeAllModals">
+  <view class="modal-box" catchtap="noop">
+    <view class="modal-header">拒绝通过</view>
+    <textarea class="reason-input" value="{{rejectReason}}" bindinput="onRejectInput" placeholder="请填写拒绝原因" maxlength="200"></textarea>
+    <view class="countdown-text" wx:if="{{counting}}">{{countdown}}秒后可确认</view>
+    <view class="modal-footer">
+      <view class="btn cancel" bindtap="closeAllModals">取消</view>
+      <view class="btn confirm {{counting ? 'disabled' : ''}}" bindtap="{{counting ? '' : 'executeAction'}}" data-action="reject">确认拒绝</view>
+    </view>
+  </view>
+</view>
+
+<!-- 转移弹窗 -->
+<view wx:if="{{showTransferModal}}" class="modal-mask" bindtap="closeAllModals">
+  <view class="modal-box" catchtap="noop">
+    <view class="modal-header">确认转移考核</view>
+    <view class="modal-body">转移后，您将无法继续考核此订单，可在考核中心重新接待。</view>
+    <view class="countdown-text" wx:if="{{counting}}">{{countdown}}秒后可确认</view>
+    <view class="modal-footer">
+      <view class="btn cancel" bindtap="closeAllModals">取消</view>
+      <view class="btn confirm {{counting ? 'disabled' : ''}}" bindtap="{{counting ? '' : 'executeAction'}}" data-action="transfer">确认转移</view>
+    </view>
+  </view>
+</view>
+
 <global-notification id="global-notification" />
\ No newline at end of file
diff --git a/pages/kaohe_dafen/kaohe_dafen.wxss b/pages/assess-score/assess-score.wxss
similarity index 100%
rename from pages/kaohe_dafen/kaohe_dafen.wxss
rename to pages/assess-score/assess-score.wxss
diff --git a/pages/kaoheguan/kaoheguan.js b/pages/assessor/assessor.js
similarity index 91%
rename from pages/kaoheguan/kaoheguan.js
rename to pages/assessor/assessor.js
index 689ca22..a62d4ed 100644
--- a/pages/kaoheguan/kaoheguan.js
+++ b/pages/assessor/assessor.js
@@ -1,218 +1,218 @@
-// pages/kaoheguan/kaoheguan.js
-// 只新增了两个字段的接收，其余所有代码未变
-import request from '../../utils/request.js';
-import {
-  isRoleStatusActive,
-  isCenterPageActive,
-  syncRoleStatuses,
-  ensureRoleOnCenterPage,
-} from '../../utils/role-tab-bar.js';
-const app = getApp();
-
-Page({
-  data: {
-    isKaoheguan: false,
-    isLoading: false,
-    inviteCode: '',
-    statusText: '用户尚未注册或账号已被封禁',
-    uid: '',
-    avatarUrl: '',
-    icons: {
-      refresh: '',
-      tixian: '',
-      daofen: '',
-      jilu: '',
-      zhongxin: '',
-      bgImage: ''
-    },
-    kaoheData: {
-      shenheZongshu: 0,
-      tongguoZongshu: 0,
-      yue: '0.00',
-      zonge: '0.00',
-      shenheZhuangtai: 0,
-      bankuaiList: [],
-      isRenzheng: false,           // 🆕 是否认证
-      pendingShenheCount: 0        // 🆕 审核中数量
-    },
-    lastRefreshTime: 0,
-    canRefresh: true,
-    planetPaused: {
-      top: false,
-      bottom: false,
-      left: false,
-      right: false
-    }
-  },
-
-  _planetTimers: {},
-
-  onLoad() {
-    wx.redirectTo({ url: '/pages/dashouduan/dashouduan' });
-    return;
-    const ossUrl = app.globalData.ossImageUrl || '';
-    const iconBase = 'beijing/kaohe/';
-    this.setData({
-      'icons.refresh': ossUrl + iconBase + 'shuaxin.png',
-      'icons.tixian': ossUrl + iconBase + 'tixian.png',
-      'icons.daofen': ossUrl + iconBase + 'daofen.png',
-      'icons.jilu': ossUrl + iconBase + 'jilu.png',
-      'icons.zhongxin': ossUrl + iconBase + 'zhongxin.png',
-      'icons.bgImage': ossUrl + iconBase + 'top_bg.jpg'
-    });
-
-    const kaoheguanstatus = wx.getStorageSync('kaoheguanstatus');
-    if (isRoleStatusActive(kaoheguanstatus)) {
-      this.loadUserInfo();
-      this.setData({ isKaoheguan: true });
-      this.getKaoheguanInfo();
-      ensureRoleOnCenterPage(this, 'kaoheguan');
-    } else {
-      this.setData({ isKaoheguan: false });
-    }
-  },
-
-  onReady() {
-    if (isCenterPageActive(this, 'isKaoheguan', 'kaoheguanstatus')) {
-      ensureRoleOnCenterPage(this, 'kaoheguan');
-    }
-  },
-
-  onShow() {
-    if (isCenterPageActive(this, 'isKaoheguan', 'kaoheguanstatus')) {
-      if (!this.data.isKaoheguan) this.setData({ isKaoheguan: true });
-      ensureRoleOnCenterPage(this, 'kaoheguan');
-      this.refreshKaoheInfo();
-    }
-  },
-
-  loadUserInfo() {
-    const uid = wx.getStorageSync('uid') || '';
-    const touxiang = wx.getStorageSync('touxiang') || '';
-    const ossUrl = app.globalData.ossImageUrl || '';
-    const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg');
-    let avatarUrl = defaultAvatar;
-    if (touxiang) {
-      avatarUrl = ossUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang);
-    }
-    this.setData({ uid, avatarUrl });
-  },
-
-  async getKaoheguanInfo() {
-    this.setData({ isLoading: true });
-    try {
-      const res = await request({ url: '/dengji/khgsx', method: 'POST' });
-      if (res && res.data.code === 200) {
-        const data = res.data.data;
-        if (data.zhuangtai === 0 || data.zhuangtai === 2) {
-          wx.setStorageSync('kaoheguanstatus', 0);
-          this.setData({ isKaoheguan: false, isLoading: false, statusText: '用户尚未注册或账号已被封禁' });
-          return;
-        }
-        wx.setStorageSync('kaoheguanstatus', 1);
-        this.setData({
-          isKaoheguan: true,
-          isLoading: false,
-          kaoheData: {
-            shenheZongshu: data.shenhe_zongshu || 0,
-            tongguoZongshu: data.tongguo_zongshu || 0,
-            yue: data.yue || '0.00',
-            zonge: data.zonge || '0.00',
-            shenheZhuangtai: data.shenhe_zhuangtai || 0,
-            bankuaiList: data.bankuai_list || [],
-            isRenzheng: data.is_renzheng || false,              // 🆕
-            pendingShenheCount: data.pending_shenhe_count || 0  // 🆕
-          }
-        });
-        ensureRoleOnCenterPage(this, 'kaoheguan');
-      } else {
-        wx.showToast({ title: res?.data?.msg || '获取信息失败', icon: 'none' });
-        this.setData({ isLoading: false });
-      }
-    } catch (error) {
-      console.error('获取考核官信息失败:', error);
-      wx.showToast({ title: '网络错误', icon: 'none' });
-      this.setData({ isLoading: false });
-    }
-  },
-
-  onInviteCodeInput(e) {
-    this.setData({ inviteCode: e.detail.value.trim() });
-  },
-
-  async onRegister() {
-    const { inviteCode } = this.data;
-    if (!inviteCode) {
-      wx.showToast({ title: '请输入邀请码', icon: 'none', duration: 2000 });
-      return;
-    }
-    if (inviteCode.length > 100) {
-      wx.showToast({ title: '邀请码不能超过100位', icon: 'none', duration: 2000 });
-      return;
-    }
-    this.setData({ isLoading: true });
-    try {
-      const res = await request({
-        url: '/dengji/khgzc',
-        method: 'POST',
-        data: { inviteCode: inviteCode }
-      });
-      if (res && res.data.code === 200) {
-        const data = res.data.data || {};
-        syncRoleStatuses(data);
-        if (!Object.prototype.hasOwnProperty.call(data, 'kaoheguanstatus')) {
-          wx.setStorageSync('kaoheguanstatus', 1);
-        }
-        wx.showToast({ title: '注册成功', icon: 'success', duration: 2000 });
-        this.loadUserInfo();
-        await this.getKaoheguanInfo();
-        ensureRoleOnCenterPage(this, 'kaoheguan');
-      } else {
-        wx.showToast({ title: res?.data?.msg || '注册失败', icon: 'none', duration: 2000 });
-        this.setData({ isLoading: false });
-      }
-    } catch (error) {
-      console.error('注册失败:', error);
-      wx.showToast({ title: '网络错误', icon: 'none' });
-      this.setData({ isLoading: false });
-    }
-  },
-
-  refreshKaoheInfo() {
-    const now = Date.now();
-    const lastTime = this.data.lastRefreshTime;
-    const canRefresh = this.data.canRefresh;
-    if (!canRefresh || (now - lastTime < 3000)) return;
-    this.setData({ lastRefreshTime: now, canRefresh: false });
-    this.getKaoheguanInfo();
-    setTimeout(() => this.setData({ canRefresh: true }), 3000);
-  },
-
-  goToWithdraw() {
-    const yue = this.data.kaoheData.yue || 0;
-    wx.navigateTo({
-      url: `/pages/tixian/tixian?amount=${yue}&from=kaoheguan`
-    });
-  },
-  goToDafen() { wx.navigateTo({ url: '/pages/kaohe_dafen/kaohe_dafen' }); },
-  goToJilu() { wx.navigateTo({ url: '/pages/kaohe_jilu/kaohe_jilu' }); },
-  goToZhongxin() { wx.navigateTo({ url: '/pages/kaohe_zhongxin/kaohe_zhongxin' }); },
-
-  onPlanetTouch(e) {
-    const id = e.currentTarget.dataset.id;
-    if (this._planetTimers[id]) {
-      clearTimeout(this._planetTimers[id]);
-      this._planetTimers[id] = null;
-    }
-    const paused = `planetPaused.${id}`;
-    this.setData({ [paused]: true });
-  },
-
-  onPlanetLeave(e) {
-    const id = e.currentTarget.dataset.id;
-    this._planetTimers[id] = setTimeout(() => {
-      const paused = `planetPaused.${id}`;
-      this.setData({ [paused]: false });
-    }, 5000);
-  }
+// pages/assessor/assessor.js
+// 只新增了两个字段的接收，其余所有代码未变
+import request from '../../utils/request.js';
+import {
+  isRoleStatusActive,
+  isCenterPageActive,
+  syncRoleStatuses,
+  ensureRoleOnCenterPage,
+} from '../../utils/role-tab-bar.js';
+const app = getApp();
+
+Page({
+  data: {
+    isKaoheguan: false,
+    isLoading: false,
+    inviteCode: '',
+    statusText: '用户尚未注册或账号已被封禁',
+    uid: '',
+    avatarUrl: '',
+    icons: {
+      refresh: '',
+      tixian: '',
+      daofen: '',
+      jilu: '',
+      zhongxin: '',
+      bgImage: ''
+    },
+    kaoheData: {
+      shenheZongshu: 0,
+      tongguoZongshu: 0,
+      yue: '0.00',
+      zonge: '0.00',
+      shenheZhuangtai: 0,
+      bankuaiList: [],
+      isRenzheng: false,           // 🆕 是否认证
+      pendingShenheCount: 0        // 🆕 审核中数量
+    },
+    lastRefreshTime: 0,
+    canRefresh: true,
+    planetPaused: {
+      top: false,
+      bottom: false,
+      left: false,
+      right: false
+    }
+  },
+
+  _planetTimers: {},
+
+  onLoad() {
+    wx.redirectTo({ url: '/pages/fighter/fighter' });
+    return;
+    const ossUrl = app.globalData.ossImageUrl || '';
+    const iconBase = 'beijing/kaohe/';
+    this.setData({
+      'icons.refresh': ossUrl + iconBase + 'shuaxin.png',
+      'icons.tixian': ossUrl + iconBase + 'tixian.png',
+      'icons.daofen': ossUrl + iconBase + 'daofen.png',
+      'icons.jilu': ossUrl + iconBase + 'jilu.png',
+      'icons.zhongxin': ossUrl + iconBase + 'zhongxin.png',
+      'icons.bgImage': ossUrl + iconBase + 'top_bg.jpg'
+    });
+
+    const kaoheguanstatus = wx.getStorageSync('kaoheguanstatus');
+    if (isRoleStatusActive(kaoheguanstatus)) {
+      this.loadUserInfo();
+      this.setData({ isKaoheguan: true });
+      this.getKaoheguanInfo();
+      ensureRoleOnCenterPage(this, 'kaoheguan');
+    } else {
+      this.setData({ isKaoheguan: false });
+    }
+  },
+
+  onReady() {
+    if (isCenterPageActive(this, 'isKaoheguan', 'kaoheguanstatus')) {
+      ensureRoleOnCenterPage(this, 'kaoheguan');
+    }
+  },
+
+  onShow() {
+    if (isCenterPageActive(this, 'isKaoheguan', 'kaoheguanstatus')) {
+      if (!this.data.isKaoheguan) this.setData({ isKaoheguan: true });
+      ensureRoleOnCenterPage(this, 'kaoheguan');
+      this.refreshKaoheInfo();
+    }
+  },
+
+  loadUserInfo() {
+    const uid = wx.getStorageSync('uid') || '';
+    const touxiang = wx.getStorageSync('touxiang') || '';
+    const ossUrl = app.globalData.ossImageUrl || '';
+    const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg');
+    let avatarUrl = defaultAvatar;
+    if (touxiang) {
+      avatarUrl = ossUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang);
+    }
+    this.setData({ uid, avatarUrl });
+  },
+
+  async getKaoheguanInfo() {
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({ url: '/dengji/khgsx', method: 'POST' });
+      if (res && res.data.code === 200) {
+        const data = res.data.data;
+        if (data.zhuangtai === 0 || data.zhuangtai === 2) {
+          wx.setStorageSync('kaoheguanstatus', 0);
+          this.setData({ isKaoheguan: false, isLoading: false, statusText: '用户尚未注册或账号已被封禁' });
+          return;
+        }
+        wx.setStorageSync('kaoheguanstatus', 1);
+        this.setData({
+          isKaoheguan: true,
+          isLoading: false,
+          kaoheData: {
+            shenheZongshu: data.shenhe_zongshu || 0,
+            tongguoZongshu: data.tongguo_zongshu || 0,
+            yue: data.yue || '0.00',
+            zonge: data.zonge || '0.00',
+            shenheZhuangtai: data.shenhe_zhuangtai || 0,
+            bankuaiList: data.bankuai_list || [],
+            isRenzheng: data.is_renzheng || false,              // 🆕
+            pendingShenheCount: data.pending_shenhe_count || 0  // 🆕
+          }
+        });
+        ensureRoleOnCenterPage(this, 'kaoheguan');
+      } else {
+        wx.showToast({ title: res?.data?.msg || '获取信息失败', icon: 'none' });
+        this.setData({ isLoading: false });
+      }
+    } catch (error) {
+      console.error('获取考核官信息失败:', error);
+      wx.showToast({ title: '网络错误', icon: 'none' });
+      this.setData({ isLoading: false });
+    }
+  },
+
+  onInviteCodeInput(e) {
+    this.setData({ inviteCode: e.detail.value.trim() });
+  },
+
+  async onRegister() {
+    const { inviteCode } = this.data;
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none', duration: 2000 });
+      return;
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码不能超过100位', icon: 'none', duration: 2000 });
+      return;
+    }
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({
+        url: '/dengji/khgzc',
+        method: 'POST',
+        data: { inviteCode: inviteCode }
+      });
+      if (res && res.data.code === 200) {
+        const data = res.data.data || {};
+        syncRoleStatuses(data);
+        if (!Object.prototype.hasOwnProperty.call(data, 'kaoheguanstatus')) {
+          wx.setStorageSync('kaoheguanstatus', 1);
+        }
+        wx.showToast({ title: '注册成功', icon: 'success', duration: 2000 });
+        this.loadUserInfo();
+        await this.getKaoheguanInfo();
+        ensureRoleOnCenterPage(this, 'kaoheguan');
+      } else {
+        wx.showToast({ title: res?.data?.msg || '注册失败', icon: 'none', duration: 2000 });
+        this.setData({ isLoading: false });
+      }
+    } catch (error) {
+      console.error('注册失败:', error);
+      wx.showToast({ title: '网络错误', icon: 'none' });
+      this.setData({ isLoading: false });
+    }
+  },
+
+  refreshKaoheInfo() {
+    const now = Date.now();
+    const lastTime = this.data.lastRefreshTime;
+    const canRefresh = this.data.canRefresh;
+    if (!canRefresh || (now - lastTime < 3000)) return;
+    this.setData({ lastRefreshTime: now, canRefresh: false });
+    this.getKaoheguanInfo();
+    setTimeout(() => this.setData({ canRefresh: true }), 3000);
+  },
+
+  goToWithdraw() {
+    const yue = this.data.kaoheData.yue || 0;
+    wx.navigateTo({
+      url: `/pages/withdraw/withdraw?amount=${yue}&from=kaoheguan`
+    });
+  },
+  goToDafen() { wx.navigateTo({ url: '/pages/assess-score/assess-score' }); },
+  goToJilu() { wx.navigateTo({ url: '/pages/assess-log/assess-log' }); },
+  goToZhongxin() { wx.navigateTo({ url: '/pages/assess-center/assess-center' }); },
+
+  onPlanetTouch(e) {
+    const id = e.currentTarget.dataset.id;
+    if (this._planetTimers[id]) {
+      clearTimeout(this._planetTimers[id]);
+      this._planetTimers[id] = null;
+    }
+    const paused = `planetPaused.${id}`;
+    this.setData({ [paused]: true });
+  },
+
+  onPlanetLeave(e) {
+    const id = e.currentTarget.dataset.id;
+    this._planetTimers[id] = setTimeout(() => {
+      const paused = `planetPaused.${id}`;
+      this.setData({ [paused]: false });
+    }, 5000);
+  }
 });
\ No newline at end of file
diff --git a/pages/kaoheguan/kaoheguan.json b/pages/assessor/assessor.json
similarity index 100%
rename from pages/kaoheguan/kaoheguan.json
rename to pages/assessor/assessor.json
diff --git a/pages/kaoheguan/kaoheguan.wxml b/pages/assessor/assessor.wxml
similarity index 97%
rename from pages/kaoheguan/kaoheguan.wxml
rename to pages/assessor/assessor.wxml
index 0c1d239..0e6853e 100644
--- a/pages/kaoheguan/kaoheguan.wxml
+++ b/pages/assessor/assessor.wxml
@@ -1,128 +1,128 @@
-<!-- pages/kaoheguan/kaoheguan.wxml -->
-<view class="universe-root">
-  <!-- 全屏弱化背景图 -->
-  <image class="full-bg" src="{{icons.bgImage}}" mode="aspectFill" />
-
-  <!-- 动态星空与极光 -->
-  <canvas type="2d" id="starfield" class="starfield-canvas"></canvas>
-  <view class="aurora-ribbon"></view>
-
-  <!-- 未注册状态 -->
-  <view class="unreg-floating" wx:if="{{!isKaoheguan}}">
-    <view class="unreg-core">
-      <image class="unreg-icon" src="/images/kaoheguan.png" mode="aspectFit" />
-      <text class="unreg-title">考核官</text>
-      <text class="unreg-desc">{{statusText}}</text>
-      <input class="unreg-input" type="text" placeholder="输入邀请码" value="{{inviteCode}}" bindinput="onInviteCodeInput" placeholder-class="unreg-placeholder" maxlength="100" />
-      <view class="unreg-btn" bindtap="onRegister">
-        <text class="unreg-btn-text">即刻入驻</text>
-      </view>
-    </view>
-  </view>
-
-  <!-- 已注册状态 · 行星系统 -->
-  <view class="orbit-zone" wx:else>
-    <!-- 身份条 -->
-    <view class="top-identity">
-      <image class="identity-avatar" src="{{avatarUrl}}" mode="aspectFill" />
-      <view class="identity-info">
-        <text class="identity-name">考核官</text>
-        <view class="identity-uid">
-          <text class="uid-txt">{{uid}}</text>
-          <view class="status-indicator {{kaoheData.shenheZhuangtai == 1 ? 'active' : ''}}"></view>
-        </view>
-        <!-- 🆕 添加认证状态，这是唯一新增的行 -->
-        <text class="renzheng-tag {{kaoheData.isRenzheng ? 'authed' : 'unauth'}}">
-          {{kaoheData.isRenzheng ? '已认证' : '未认证'}}
-        </text>
-      </view>
-      <view class="refresh-touch" bindtap="refreshKaoheInfo">
-        <image class="refresh-icon" src="{{icons.refresh}}" mode="aspectFit" />
-      </view>
-    </view>
-
-    <!-- 板块标签云 -->
-    <view class="plate-cloud" wx:if="{{kaoheData.bankuaiList.length > 0}}">
-      <scroll-view class="plate-cloud-scroll" scroll-x="true" enhanced show-scrollbar="{{false}}">
-        <view class="plate-chip" wx:for="{{kaoheData.bankuaiList}}" wx:key="bankuai_id">{{item.mingcheng}}</view>
-      </scroll-view>
-    </view>
-
-    <!-- 中央余额星球 -->
-    <view class="balance-planet">
-      <view class="planet-ring"></view>
-      <view class="planet-body">
-        <text class="planet-num">{{kaoheData.yue}}元</text>
-        <text class="planet-label">可提现余额</text>
-      </view>
-      <view class="planet-glow"></view>
-    </view>
-
-    <!-- 流星数据条 -->
-    <view class="meteor-stats">
-      <view class="meteor-item">
-        <text class="meteor-num">{{kaoheData.shenheZongshu}}</text>
-        <text class="meteor-label">审核总数</text>
-      </view>
-      <view class="meteor-divider"></view>
-      <view class="meteor-item">
-        <text class="meteor-num">{{kaoheData.tongguoZongshu}}</text>
-        <text class="meteor-label">通过总数</text>
-      </view>
-      <view class="meteor-divider"></view>
-      <view class="meteor-item">
-        <text class="meteor-num">{{kaoheData.zonge}}元</text>
-        <text class="meteor-label">累计赚取</text>
-      </view>
-    </view>
-
-    <!-- 十字星阵功能区 -->
-    <view class="star-cross">
-      <!-- 上方：考核中心 -->
-      <view class="cross-item cross-top {{planetPaused.top ? 'pause-spin' : ''}}" 
-            bindtap="goToZhongxin" 
-            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="top">
-        <view class="orbit-ring"></view>
-        <image class="cross-icon" src="{{icons.zhongxin}}" mode="aspectFit" />
-        <text class="cross-text">考核中心</text>
-      </view>
-      <!-- 下方：考核打分 -->
-      <view class="cross-item cross-bottom {{planetPaused.bottom ? 'pause-spin' : ''}}" 
-            bindtap="goToDafen"
-            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="bottom">
-        <view class="orbit-ring"></view>
-        <image class="cross-icon" src="{{icons.daofen}}" mode="aspectFit" />
-        <text class="cross-text">考核打分</text>
-        <!-- 🆕 添加红色角标，这是唯一新增的行 -->
-        <view class="badge" wx:if="{{kaoheData.pendingShenheCount > 0}}">{{kaoheData.pendingShenheCount}}</view>
-      </view>
-      <!-- 左侧：考核记录 -->
-      <view class="cross-item cross-left {{planetPaused.left ? 'pause-spin' : ''}}" 
-            bindtap="goToJilu"
-            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="left">
-        <view class="orbit-ring"></view>
-        <image class="cross-icon" src="{{icons.jilu}}" mode="aspectFit" />
-        <text class="cross-text">考核记录</text>
-      </view>
-      <!-- 右侧：立即提现 -->
-      <view class="cross-item cross-right {{planetPaused.right ? 'pause-spin' : ''}}" 
-            bindtap="goToWithdraw"
-            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="right">
-        <view class="orbit-ring"></view>
-        <image class="cross-icon" src="{{icons.tixian}}" mode="aspectFit" />
-        <text class="cross-text">立即提现</text>
-      </view>
-      <!-- 中央五角星 -->
-      <view class="pentagram"></view>
-    </view>
-  </view>
-
-  <!-- 加载星门 -->
-  <view class="loading-portal" wx:if="{{isLoading}}">
-    <view class="portal-ring"></view>
-    <text class="portal-text">加载中...</text>
-  </view>
-</view>
-
-<global-notification id="global-notification" />
+<!-- pages/assessor/assessor.wxml -->
+<view class="universe-root">
+  <!-- 全屏弱化背景图 -->
+  <image class="full-bg" src="{{icons.bgImage}}" mode="aspectFill" />
+
+  <!-- 动态星空与极光 -->
+  <canvas type="2d" id="starfield" class="starfield-canvas"></canvas>
+  <view class="aurora-ribbon"></view>
+
+  <!-- 未注册状态 -->
+  <view class="unreg-floating" wx:if="{{!isKaoheguan}}">
+    <view class="unreg-core">
+      <image class="unreg-icon" src="/images/kaoheguan.png" mode="aspectFit" />
+      <text class="unreg-title">考核官</text>
+      <text class="unreg-desc">{{statusText}}</text>
+      <input class="unreg-input" type="text" placeholder="输入邀请码" value="{{inviteCode}}" bindinput="onInviteCodeInput" placeholder-class="unreg-placeholder" maxlength="100" />
+      <view class="unreg-btn" bindtap="onRegister">
+        <text class="unreg-btn-text">即刻入驻</text>
+      </view>
+    </view>
+  </view>
+
+  <!-- 已注册状态 · 行星系统 -->
+  <view class="orbit-zone" wx:else>
+    <!-- 身份条 -->
+    <view class="top-identity">
+      <image class="identity-avatar" src="{{avatarUrl}}" mode="aspectFill" />
+      <view class="identity-info">
+        <text class="identity-name">考核官</text>
+        <view class="identity-uid">
+          <text class="uid-txt">{{uid}}</text>
+          <view class="status-indicator {{kaoheData.shenheZhuangtai == 1 ? 'active' : ''}}"></view>
+        </view>
+        <!-- 🆕 添加认证状态，这是唯一新增的行 -->
+        <text class="renzheng-tag {{kaoheData.isRenzheng ? 'authed' : 'unauth'}}">
+          {{kaoheData.isRenzheng ? '已认证' : '未认证'}}
+        </text>
+      </view>
+      <view class="refresh-touch" bindtap="refreshKaoheInfo">
+        <image class="refresh-icon" src="{{icons.refresh}}" mode="aspectFit" />
+      </view>
+    </view>
+
+    <!-- 板块标签云 -->
+    <view class="plate-cloud" wx:if="{{kaoheData.bankuaiList.length > 0}}">
+      <scroll-view class="plate-cloud-scroll" scroll-x="true" enhanced show-scrollbar="{{false}}">
+        <view class="plate-chip" wx:for="{{kaoheData.bankuaiList}}" wx:key="bankuai_id">{{item.mingcheng}}</view>
+      </scroll-view>
+    </view>
+
+    <!-- 中央余额星球 -->
+    <view class="balance-planet">
+      <view class="planet-ring"></view>
+      <view class="planet-body">
+        <text class="planet-num">{{kaoheData.yue}}元</text>
+        <text class="planet-label">可提现余额</text>
+      </view>
+      <view class="planet-glow"></view>
+    </view>
+
+    <!-- 流星数据条 -->
+    <view class="meteor-stats">
+      <view class="meteor-item">
+        <text class="meteor-num">{{kaoheData.shenheZongshu}}</text>
+        <text class="meteor-label">审核总数</text>
+      </view>
+      <view class="meteor-divider"></view>
+      <view class="meteor-item">
+        <text class="meteor-num">{{kaoheData.tongguoZongshu}}</text>
+        <text class="meteor-label">通过总数</text>
+      </view>
+      <view class="meteor-divider"></view>
+      <view class="meteor-item">
+        <text class="meteor-num">{{kaoheData.zonge}}元</text>
+        <text class="meteor-label">累计赚取</text>
+      </view>
+    </view>
+
+    <!-- 十字星阵功能区 -->
+    <view class="star-cross">
+      <!-- 上方：考核中心 -->
+      <view class="cross-item cross-top {{planetPaused.top ? 'pause-spin' : ''}}" 
+            bindtap="goToZhongxin" 
+            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="top">
+        <view class="orbit-ring"></view>
+        <image class="cross-icon" src="{{icons.zhongxin}}" mode="aspectFit" />
+        <text class="cross-text">考核中心</text>
+      </view>
+      <!-- 下方：考核打分 -->
+      <view class="cross-item cross-bottom {{planetPaused.bottom ? 'pause-spin' : ''}}" 
+            bindtap="goToDafen"
+            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="bottom">
+        <view class="orbit-ring"></view>
+        <image class="cross-icon" src="{{icons.daofen}}" mode="aspectFit" />
+        <text class="cross-text">考核打分</text>
+        <!-- 🆕 添加红色角标，这是唯一新增的行 -->
+        <view class="badge" wx:if="{{kaoheData.pendingShenheCount > 0}}">{{kaoheData.pendingShenheCount}}</view>
+      </view>
+      <!-- 左侧：考核记录 -->
+      <view class="cross-item cross-left {{planetPaused.left ? 'pause-spin' : ''}}" 
+            bindtap="goToJilu"
+            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="left">
+        <view class="orbit-ring"></view>
+        <image class="cross-icon" src="{{icons.jilu}}" mode="aspectFit" />
+        <text class="cross-text">考核记录</text>
+      </view>
+      <!-- 右侧：立即提现 -->
+      <view class="cross-item cross-right {{planetPaused.right ? 'pause-spin' : ''}}" 
+            bindtap="goToWithdraw"
+            bindtouchstart="onPlanetTouch" bindtouchend="onPlanetLeave" data-id="right">
+        <view class="orbit-ring"></view>
+        <image class="cross-icon" src="{{icons.tixian}}" mode="aspectFit" />
+        <text class="cross-text">立即提现</text>
+      </view>
+      <!-- 中央五角星 -->
+      <view class="pentagram"></view>
+    </view>
+  </view>
+
+  <!-- 加载星门 -->
+  <view class="loading-portal" wx:if="{{isLoading}}">
+    <view class="portal-ring"></view>
+    <text class="portal-text">加载中...</text>
+  </view>
+</view>
+
+<global-notification id="global-notification" />
 <custom-tab-bar />
\ No newline at end of file
diff --git a/pages/kaoheguan/kaoheguan.wxss b/pages/assessor/assessor.wxss
similarity index 95%
rename from pages/kaoheguan/kaoheguan.wxss
rename to pages/assessor/assessor.wxss
index b1f152c..b2ccc62 100644
--- a/pages/kaoheguan/kaoheguan.wxss
+++ b/pages/assessor/assessor.wxss
@@ -1,512 +1,512 @@
-/* pages/kaoheguan/kaoheguan.wxss — 完整版：适度背景 + 整体下移 */
-
-page {
-    background: #0a0c14;
-    color: #e0e6f0;
-    font-family: 'SF Pro Display', 'PingFang SC', system-ui;
-    height: 100vh;
-    overflow: hidden;
-  }
-  
-  /* 根容器：让出自定义导航栏与底部 TabBar 空间 */
-  .universe-root {
-    position: relative;
-    width: 100%;
-    height: 100vh;
-    display: flex;
-    flex-direction: column;
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding-top: calc(88rpx + env(safe-area-inset-top));
-    padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
-    box-sizing: border-box;
-    z-index: 1;
-  }
-  
-  /* ========== 全屏背景图（适度弱化） ========== */
-  .full-bg {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100vw;
-    height: 100vh;
-    z-index: 0;
-    opacity: 1;          /* 从0.15调整到0.3，若隐若现但不抢夺内容 */
-    pointer-events: none;
-    object-fit: cover;
-    filter: blur(1px);      /* 轻微模糊，增加梦幻感 */
-  }
-  
-  /* ========== 动态星空（Canvas） ========== */
-  .starfield-canvas {
-    position: fixed;
-    top: 0; left: 0;
-    width: 100vw; height: 100vh;
-    pointer-events: none;
-    z-index: 0;
-    opacity: 0.35;
-  }
-  
-  /* ========== 极光飘带 ========== */
-  .aurora-ribbon {
-    position: fixed;
-    top: -10%;
-    left: -30%;
-    width: 160%;
-    height: 60%;
-    background: radial-gradient(ellipse at 50% 50%, rgba(100, 140, 255, 0.12) 0%, transparent 70%);
-    pointer-events: none;
-    z-index: 0;
-    animation: drift 20s ease-in-out infinite alternate;
-  }
-  
-  @keyframes drift {
-    0% { transform: translate(0, 0) rotate(0deg); }
-    100% { transform: translate(10%, 5%) rotate(3deg); }
-  }
-  
-  /* ========== 舒缓流星 ========== */
-  /* 流星1：右上 → 左下，缓慢，间隔10秒 */
-  .universe-root::before {
-    content: "";
-    position: fixed;
-    top: 5%;
-    right: -2%;
-    width: 2rpx;
-    height: 85rpx;
-    background: linear-gradient(to bottom, rgba(255, 255, 255, 0.6), transparent);
-    transform: rotate(-35deg);
-    animation: meteor1 10s 0s linear infinite;
-    pointer-events: none;
-    z-index: 1;
-    opacity: 0;
-  }
-  
-  /* 流星2：稍有不同的角度与延迟 */
-  .universe-root::after {
-    content: "";
-    position: fixed;
-    top: 10%;
-    right: -5%;
-    width: 2rpx;
-    height: 70rpx;
-    background: linear-gradient(to bottom, rgba(200, 210, 255, 0.55), transparent);
-    transform: rotate(-28deg);
-    animation: meteor2 11s 4s linear infinite;
-    pointer-events: none;
-    z-index: 1;
-    opacity: 0;
-  }
-  
-  @keyframes meteor1 {
-    0% {
-      opacity: 0;
-      transform: translate(0, 0) rotate(-35deg);
-    }
-    10% {
-      opacity: 0.5;
-    }
-    28% {
-      opacity: 0;
-      transform: translate(-500rpx, 450rpx) rotate(-35deg);
-    }
-    100% {
-      opacity: 0;
-      transform: translate(-500rpx, 450rpx) rotate(-35deg);
-    }
-  }
-  
-  @keyframes meteor2 {
-    0% {
-      opacity: 0;
-      transform: translate(0, 0) rotate(-28deg);
-    }
-    8% {
-      opacity: 0.45;
-    }
-    25% {
-      opacity: 0;
-      transform: translate(-480rpx, 420rpx) rotate(-28deg);
-    }
-    100% {
-      opacity: 0;
-      transform: translate(-480rpx, 420rpx) rotate(-28deg);
-    }
-  }
-  
-  /* ========== 未注册状态 ========== */
-  .unreg-floating {
-    position: relative;
-    z-index: 10;
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .unreg-core {
-    width: 80%;
-    max-width: 640rpx;
-    background: rgba(255,255,255,0.04);
-    backdrop-filter: blur(30px);
-    border-radius: 50rpx;
-    padding: 80rpx 50rpx 60rpx;
-    border: 1rpx solid rgba(255,255,255,0.1);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-  .unreg-icon { width: 100rpx; height: 100rpx; margin-bottom: 20rpx; }
-  .unreg-title { font-size: 42rpx; font-weight: 700; color: #fff; margin-bottom: 12rpx; }
-  .unreg-desc { font-size: 28rpx; color: #8590b0; margin-bottom: 50rpx; text-align: center; }
-  .unreg-input { width: 100%; height: 90rpx; background: rgba(255,255,255,0.08); border-radius: 30rpx; padding: 0 30rpx; color: #fff; font-size: 30rpx; box-sizing: border-box; margin-bottom: 30rpx; }
-  .unreg-placeholder { color: rgba(255,255,255,0.3); }
-  .unreg-btn { width: 100%; height: 90rpx; background: linear-gradient(135deg, #4f6ef6, #8b5cf6); border-radius: 45rpx; display: flex; align-items: center; justify-content: center; transition: transform 0.2s; }
-  .unreg-btn:active { transform: scale(0.98); }
-  .unreg-btn-text { font-size: 34rpx; font-weight: 600; color: #fff; }
-  
-  /* ========== 已注册状态（整体下移） ========== */
-  .orbit-zone {
-    position: relative;
-    z-index: 10;
-    flex: 1;
-    padding: 80rpx 30rpx 0;   /* 顶部从40rpx增加到60rpx，整体下移 */
-    display: flex;
-    flex-direction: column;
-  }
-  
-  /* 身份条 */
-  .top-identity {
-    display: flex;
-    align-items: center;
-    margin-bottom: 40rpx;
-    position: relative;
-    z-index: 2;
-  }
-  .identity-avatar {
-    width: 90rpx; height: 90rpx; border-radius: 50%;
-    border: 2rpx solid rgba(255,255,255,0.2);
-    margin-right: 20rpx;
-  }
-  .identity-info { flex: 1; }
-  .identity-name { font-size: 36rpx; font-weight: 700; color: #fff; }
-  .identity-uid {
-    display: flex; align-items: center; margin-top: 8rpx;
-  }
-  .uid-txt { font-size: 24rpx; color: #9098b0; font-family: monospace; }
-  .status-indicator {
-    width: 12rpx; height: 12rpx; border-radius: 50%;
-    background: #4ade80; margin-left: 12rpx;
-    transition: background 0.3s;
-  }
-  .status-indicator.active { background: #fbbf24; }
-  .refresh-touch {
-    width: 60rpx; height: 60rpx;
-    background: rgba(255,255,255,0.06);
-    border-radius: 20rpx;
-    display: flex; align-items: center; justify-content: center;
-    transition: background 0.2s;
-  }
-  .refresh-touch:active { background: rgba(255,255,255,0.15); }
-  .refresh-icon { width: 36rpx; height: 36rpx; }
-  
-  /* 板块标签云 */
-  .plate-cloud { margin-bottom: 30rpx; }
-  .plate-cloud-scroll { white-space: nowrap; }
-  .plate-chip {
-    display: inline-block;
-    padding: 8rpx 24rpx;
-    border-radius: 30rpx;
-    background: rgba(79,110,246,0.1);
-    color: #a5b4fc;
-    font-size: 26rpx;
-    margin-right: 16rpx;
-    border: 1rpx solid rgba(79,110,246,0.3);
-    box-shadow: 0 0 12rpx rgba(79,110,246,0.1);
-    transition: all 0.3s;
-  }
-  .plate-chip:active { transform: scale(0.95); background: rgba(79,110,246,0.2); }
-  
-  /* 中央余额星球 */
-  .balance-planet {
-    position: relative;
-    width: 280rpx;
-    height: 280rpx;
-    margin: 20rpx auto 30rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .planet-ring {
-    position: absolute;
-    width: 280rpx;
-    height: 280rpx;
-    border-radius: 50%;
-    border: 2rpx solid rgba(79,110,246,0.4);
-    animation: ringRotate 12s linear infinite;
-  }
-  @keyframes ringRotate { to { transform: rotate(360deg); } }
-  .planet-body {
-    width: 210rpx;
-    height: 210rpx;
-    border-radius: 50%;
-    background: radial-gradient(circle at 30% 30%, rgba(79,110,246,0.3), rgba(15,15,30,0.8));
-    backdrop-filter: blur(10px);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    border: 1rpx solid rgba(255,255,255,0.1);
-    transition: transform 0.3s;
-  }
-  .balance-planet:active .planet-body { transform: scale(0.95); }
-  .planet-num {
-    font-size: 52rpx;
-    font-weight: 900;
-    color: #fff;
-    text-shadow: 0 0 30rpx rgba(79,110,246,0.8);
-    animation: numGlow 2s ease-in-out infinite alternate;
-  }
-  @keyframes numGlow {
-    from { text-shadow: 0 0 20rpx rgba(79,110,246,0.6); }
-    to { text-shadow: 0 0 40rpx rgba(79,110,246,1); }
-  }
-  .planet-label {
-    font-size: 24rpx;
-    color: #a5b4fc;
-    margin-top: 8rpx;
-  }
-  .planet-glow {
-    position: absolute;
-    width: 300rpx;
-    height: 300rpx;
-    border-radius: 50%;
-    background: radial-gradient(circle, rgba(79,110,246,0.2), transparent 70%);
-    animation: planetPulse 4s ease-in-out infinite;
-    pointer-events: none;
-  }
-  @keyframes planetPulse {
-    0%, 100% { opacity: 0.3; transform: scale(1); }
-    50% { opacity: 0.8; transform: scale(1.08); }
-  }
-  
-  /* 流星数据条 */
-  .meteor-stats {
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    margin-bottom: 30rpx;
-    padding: 20rpx 0;
-    position: relative;
-  }
-  .meteor-item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    flex: 1;
-  }
-  .meteor-num {
-    font-size: 36rpx;
-    font-weight: 800;
-    background: linear-gradient(135deg, #a5b4fc, #4f6ef6);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    transition: all 0.3s;
-  }
-  .meteor-item:active .meteor-num { transform: scale(1.1); }
-  .meteor-label {
-    font-size: 22rpx;
-    color: #64748b;
-    margin-top: 10rpx;
-  }
-  .meteor-divider {
-    width: 2rpx;
-    height: 40rpx;
-    background: linear-gradient(to bottom, transparent, rgba(255,255,255,0.15), transparent);
-  }
-  
-  /* ========== 十字星阵功能区 ========== */
-  .star-cross {
-    position: relative;
-    width: 520rpx;
-    height: 520rpx;
-    margin: 40rpx auto 50rpx;
-  }
-  
-  /* 按钮公共样式 */
-  .cross-item {
-    position: absolute;
-    width: 150rpx;
-    height: 150rpx;
-    background: radial-gradient(circle at 30% 30%, rgba(79,110,246,0.25), rgba(0,0,0,0.25));
-    border-radius: 50%;
-    border: 1rpx solid rgba(255,255,255,0.12);
-    backdrop-filter: blur(10px);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    transition: transform 0.2s, box-shadow 0.2s;
-    z-index: 5;
-    overflow: visible;
-  }
-  
-  /* 行星光环 */
-  .orbit-ring {
-    position: absolute;
-    top: -8rpx;
-    left: -8rpx;
-    right: -8rpx;
-    bottom: -8rpx;
-    border-radius: 50%;
-    border: 2rpx solid rgba(79,110,246,0.5);
-    border-top-color: transparent;
-    border-bottom-color: transparent;
-    animation: spinRing 4s linear infinite;
-    pointer-events: none;
-  }
-  .pause-spin .orbit-ring {
-    animation-play-state: paused;
-  }
-  
-  @keyframes spinRing {
-    to { transform: rotate(360deg); }
-  }
-  
-  .cross-item:active {
-    transform: scale(0.95);
-    box-shadow: 0 0 30rpx rgba(79,110,246,0.6);
-  }
-  
-  /* 图标强化 */
-  .cross-icon {
-    width: 58rpx;
-    height: 58rpx;
-    margin-bottom: 8rpx;
-    filter: drop-shadow(0 0 14rpx rgba(79,110,246,0.9)) 
-            drop-shadow(0 0 28rpx rgba(99,102,241,0.7));
-    animation: iconFloat 3s ease-in-out infinite;
-    z-index: 2;
-  }
-  
-  @keyframes iconFloat {
-    0%, 100% { transform: translateY(0); }
-    50% { transform: translateY(-3rpx); }
-  }
-  
-  .cross-text {
-    font-size: 24rpx;
-    color: #e0e6f0;
-    font-weight: 600;
-    z-index: 2;
-  }
-  
-  /* 上 */
-  .cross-top { top: 0; left: 50%; transform: translateX(-50%); }
-  /* 下 */
-  .cross-bottom { bottom: 0; left: 50%; transform: translateX(-50%); }
-  /* 左 */
-  .cross-left { left: 0; top: 50%; transform: translateY(-50%); }
-  /* 右 */
-  .cross-right { right: 0; top: 50%; transform: translateY(-50%); }
-  
-  /* 中央五角星（固定，仅呼吸） */
-  .pentagram {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 0; height: 0;
-    transform: translate(-50%, -50%);
-    border-left: 36rpx solid transparent;
-    border-right: 36rpx solid transparent;
-    border-bottom: 84rpx solid rgba(79,110,246,0.85);
-    filter: drop-shadow(0 0 18rpx rgba(79,110,246,0.7));
-    animation: star-pulse 2s ease-in-out infinite;
-  }
-  .pentagram::before {
-    content: "";
-    position: absolute;
-    top: 36rpx;
-    left: -36rpx;
-    width: 0; height: 0;
-    border-left: 36rpx solid transparent;
-    border-right: 36rpx solid transparent;
-    border-bottom: 84rpx solid rgba(79,110,246,0.85);
-    transform: rotate(72deg);
-  }
-  .pentagram::after {
-    content: "";
-    position: absolute;
-    top: 36rpx;
-    left: -36rpx;
-    width: 0; height: 0;
-    border-left: 36rpx solid transparent;
-    border-right: 36rpx solid transparent;
-    border-bottom: 84rpx solid rgba(79,110,246,0.85);
-    transform: rotate(-72deg);
-  }
-  
-  @keyframes star-pulse {
-    0%, 100% { opacity: 0.8; }
-    50% { opacity: 1; }
-  }
-  
-  /* ========== 加载星门 ========== */
-  .loading-portal {
-    position: fixed; top: 0; left: 0; right: 0; bottom: 0;
-    background: rgba(10,12,20,0.95);
-    backdrop-filter: blur(15px);
-    display: flex; flex-direction: column;
-    align-items: center; justify-content: center;
-    z-index: 999;
-  }
-  .portal-ring {
-    width: 100rpx; height: 100rpx;
-    border-radius: 50%;
-    border: 3rpx solid rgba(79,110,246,0.2);
-    border-top-color: #4f6ef6;
-    animation: portalSpin 1s linear infinite;
-    margin-bottom: 30rpx;
-  }
-  @keyframes portalSpin { to { transform: rotate(360deg); } }
-  .portal-text { font-size: 28rpx; color: #64748b; }
-
-/* ========== 🆕 以下为新增样式，绝无任何修改 ========== */
-
-/* 认证状态标签 */
-.renzheng-tag {
-  font-size: 22rpx;
-  padding: 4rpx 12rpx;
-  border-radius: 20rpx;
-  margin-top: 8rpx;
-  display: inline-block;
-}
-.renzheng-tag.authed {
-  background: rgba(76, 175, 80, 0.15);
-  color: #4caf50;
-  border: 1rpx solid rgba(76, 175, 80, 0.4);
-}
-.renzheng-tag.unauth {
-  background: rgba(244, 67, 54, 0.1);
-  color: #f44336;
-  border: 1rpx solid rgba(244, 67, 54, 0.4);
-}
-
-/* 红色角标 */
-.badge {
-  position: absolute;
-  top: -4rpx;
-  right: -8rpx;
-  min-width: 36rpx;
-  height: 36rpx;
-  background: #f44336;
-  color: #fff;
-  font-size: 22rpx;
-  font-weight: 600;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0 8rpx;
-  box-shadow: 0 2rpx 8rpx rgba(244, 67, 54, 0.4);
-  z-index: 10;
+/* pages/assessor/assessor.wxss — 完整版：适度背景 + 整体下移 */
+
+page {
+    background: #0a0c14;
+    color: #e0e6f0;
+    font-family: 'SF Pro Display', 'PingFang SC', system-ui;
+    height: 100vh;
+    overflow: hidden;
+  }
+  
+  /* 根容器：让出自定义导航栏与底部 TabBar 空间 */
+  .universe-root {
+    position: relative;
+    width: 100%;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-top: calc(88rpx + env(safe-area-inset-top));
+    padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
+    box-sizing: border-box;
+    z-index: 1;
+  }
+  
+  /* ========== 全屏背景图（适度弱化） ========== */
+  .full-bg {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100vw;
+    height: 100vh;
+    z-index: 0;
+    opacity: 1;          /* 从0.15调整到0.3，若隐若现但不抢夺内容 */
+    pointer-events: none;
+    object-fit: cover;
+    filter: blur(1px);      /* 轻微模糊，增加梦幻感 */
+  }
+  
+  /* ========== 动态星空（Canvas） ========== */
+  .starfield-canvas {
+    position: fixed;
+    top: 0; left: 0;
+    width: 100vw; height: 100vh;
+    pointer-events: none;
+    z-index: 0;
+    opacity: 0.35;
+  }
+  
+  /* ========== 极光飘带 ========== */
+  .aurora-ribbon {
+    position: fixed;
+    top: -10%;
+    left: -30%;
+    width: 160%;
+    height: 60%;
+    background: radial-gradient(ellipse at 50% 50%, rgba(100, 140, 255, 0.12) 0%, transparent 70%);
+    pointer-events: none;
+    z-index: 0;
+    animation: drift 20s ease-in-out infinite alternate;
+  }
+  
+  @keyframes drift {
+    0% { transform: translate(0, 0) rotate(0deg); }
+    100% { transform: translate(10%, 5%) rotate(3deg); }
+  }
+  
+  /* ========== 舒缓流星 ========== */
+  /* 流星1：右上 → 左下，缓慢，间隔10秒 */
+  .universe-root::before {
+    content: "";
+    position: fixed;
+    top: 5%;
+    right: -2%;
+    width: 2rpx;
+    height: 85rpx;
+    background: linear-gradient(to bottom, rgba(255, 255, 255, 0.6), transparent);
+    transform: rotate(-35deg);
+    animation: meteor1 10s 0s linear infinite;
+    pointer-events: none;
+    z-index: 1;
+    opacity: 0;
+  }
+  
+  /* 流星2：稍有不同的角度与延迟 */
+  .universe-root::after {
+    content: "";
+    position: fixed;
+    top: 10%;
+    right: -5%;
+    width: 2rpx;
+    height: 70rpx;
+    background: linear-gradient(to bottom, rgba(200, 210, 255, 0.55), transparent);
+    transform: rotate(-28deg);
+    animation: meteor2 11s 4s linear infinite;
+    pointer-events: none;
+    z-index: 1;
+    opacity: 0;
+  }
+  
+  @keyframes meteor1 {
+    0% {
+      opacity: 0;
+      transform: translate(0, 0) rotate(-35deg);
+    }
+    10% {
+      opacity: 0.5;
+    }
+    28% {
+      opacity: 0;
+      transform: translate(-500rpx, 450rpx) rotate(-35deg);
+    }
+    100% {
+      opacity: 0;
+      transform: translate(-500rpx, 450rpx) rotate(-35deg);
+    }
+  }
+  
+  @keyframes meteor2 {
+    0% {
+      opacity: 0;
+      transform: translate(0, 0) rotate(-28deg);
+    }
+    8% {
+      opacity: 0.45;
+    }
+    25% {
+      opacity: 0;
+      transform: translate(-480rpx, 420rpx) rotate(-28deg);
+    }
+    100% {
+      opacity: 0;
+      transform: translate(-480rpx, 420rpx) rotate(-28deg);
+    }
+  }
+  
+  /* ========== 未注册状态 ========== */
+  .unreg-floating {
+    position: relative;
+    z-index: 10;
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .unreg-core {
+    width: 80%;
+    max-width: 640rpx;
+    background: rgba(255,255,255,0.04);
+    backdrop-filter: blur(30px);
+    border-radius: 50rpx;
+    padding: 80rpx 50rpx 60rpx;
+    border: 1rpx solid rgba(255,255,255,0.1);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  .unreg-icon { width: 100rpx; height: 100rpx; margin-bottom: 20rpx; }
+  .unreg-title { font-size: 42rpx; font-weight: 700; color: #fff; margin-bottom: 12rpx; }
+  .unreg-desc { font-size: 28rpx; color: #8590b0; margin-bottom: 50rpx; text-align: center; }
+  .unreg-input { width: 100%; height: 90rpx; background: rgba(255,255,255,0.08); border-radius: 30rpx; padding: 0 30rpx; color: #fff; font-size: 30rpx; box-sizing: border-box; margin-bottom: 30rpx; }
+  .unreg-placeholder { color: rgba(255,255,255,0.3); }
+  .unreg-btn { width: 100%; height: 90rpx; background: linear-gradient(135deg, #4f6ef6, #8b5cf6); border-radius: 45rpx; display: flex; align-items: center; justify-content: center; transition: transform 0.2s; }
+  .unreg-btn:active { transform: scale(0.98); }
+  .unreg-btn-text { font-size: 34rpx; font-weight: 600; color: #fff; }
+  
+  /* ========== 已注册状态（整体下移） ========== */
+  .orbit-zone {
+    position: relative;
+    z-index: 10;
+    flex: 1;
+    padding: 80rpx 30rpx 0;   /* 顶部从40rpx增加到60rpx，整体下移 */
+    display: flex;
+    flex-direction: column;
+  }
+  
+  /* 身份条 */
+  .top-identity {
+    display: flex;
+    align-items: center;
+    margin-bottom: 40rpx;
+    position: relative;
+    z-index: 2;
+  }
+  .identity-avatar {
+    width: 90rpx; height: 90rpx; border-radius: 50%;
+    border: 2rpx solid rgba(255,255,255,0.2);
+    margin-right: 20rpx;
+  }
+  .identity-info { flex: 1; }
+  .identity-name { font-size: 36rpx; font-weight: 700; color: #fff; }
+  .identity-uid {
+    display: flex; align-items: center; margin-top: 8rpx;
+  }
+  .uid-txt { font-size: 24rpx; color: #9098b0; font-family: monospace; }
+  .status-indicator {
+    width: 12rpx; height: 12rpx; border-radius: 50%;
+    background: #4ade80; margin-left: 12rpx;
+    transition: background 0.3s;
+  }
+  .status-indicator.active { background: #fbbf24; }
+  .refresh-touch {
+    width: 60rpx; height: 60rpx;
+    background: rgba(255,255,255,0.06);
+    border-radius: 20rpx;
+    display: flex; align-items: center; justify-content: center;
+    transition: background 0.2s;
+  }
+  .refresh-touch:active { background: rgba(255,255,255,0.15); }
+  .refresh-icon { width: 36rpx; height: 36rpx; }
+  
+  /* 板块标签云 */
+  .plate-cloud { margin-bottom: 30rpx; }
+  .plate-cloud-scroll { white-space: nowrap; }
+  .plate-chip {
+    display: inline-block;
+    padding: 8rpx 24rpx;
+    border-radius: 30rpx;
+    background: rgba(79,110,246,0.1);
+    color: #a5b4fc;
+    font-size: 26rpx;
+    margin-right: 16rpx;
+    border: 1rpx solid rgba(79,110,246,0.3);
+    box-shadow: 0 0 12rpx rgba(79,110,246,0.1);
+    transition: all 0.3s;
+  }
+  .plate-chip:active { transform: scale(0.95); background: rgba(79,110,246,0.2); }
+  
+  /* 中央余额星球 */
+  .balance-planet {
+    position: relative;
+    width: 280rpx;
+    height: 280rpx;
+    margin: 20rpx auto 30rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .planet-ring {
+    position: absolute;
+    width: 280rpx;
+    height: 280rpx;
+    border-radius: 50%;
+    border: 2rpx solid rgba(79,110,246,0.4);
+    animation: ringRotate 12s linear infinite;
+  }
+  @keyframes ringRotate { to { transform: rotate(360deg); } }
+  .planet-body {
+    width: 210rpx;
+    height: 210rpx;
+    border-radius: 50%;
+    background: radial-gradient(circle at 30% 30%, rgba(79,110,246,0.3), rgba(15,15,30,0.8));
+    backdrop-filter: blur(10px);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border: 1rpx solid rgba(255,255,255,0.1);
+    transition: transform 0.3s;
+  }
+  .balance-planet:active .planet-body { transform: scale(0.95); }
+  .planet-num {
+    font-size: 52rpx;
+    font-weight: 900;
+    color: #fff;
+    text-shadow: 0 0 30rpx rgba(79,110,246,0.8);
+    animation: numGlow 2s ease-in-out infinite alternate;
+  }
+  @keyframes numGlow {
+    from { text-shadow: 0 0 20rpx rgba(79,110,246,0.6); }
+    to { text-shadow: 0 0 40rpx rgba(79,110,246,1); }
+  }
+  .planet-label {
+    font-size: 24rpx;
+    color: #a5b4fc;
+    margin-top: 8rpx;
+  }
+  .planet-glow {
+    position: absolute;
+    width: 300rpx;
+    height: 300rpx;
+    border-radius: 50%;
+    background: radial-gradient(circle, rgba(79,110,246,0.2), transparent 70%);
+    animation: planetPulse 4s ease-in-out infinite;
+    pointer-events: none;
+  }
+  @keyframes planetPulse {
+    0%, 100% { opacity: 0.3; transform: scale(1); }
+    50% { opacity: 0.8; transform: scale(1.08); }
+  }
+  
+  /* 流星数据条 */
+  .meteor-stats {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    margin-bottom: 30rpx;
+    padding: 20rpx 0;
+    position: relative;
+  }
+  .meteor-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    flex: 1;
+  }
+  .meteor-num {
+    font-size: 36rpx;
+    font-weight: 800;
+    background: linear-gradient(135deg, #a5b4fc, #4f6ef6);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    transition: all 0.3s;
+  }
+  .meteor-item:active .meteor-num { transform: scale(1.1); }
+  .meteor-label {
+    font-size: 22rpx;
+    color: #64748b;
+    margin-top: 10rpx;
+  }
+  .meteor-divider {
+    width: 2rpx;
+    height: 40rpx;
+    background: linear-gradient(to bottom, transparent, rgba(255,255,255,0.15), transparent);
+  }
+  
+  /* ========== 十字星阵功能区 ========== */
+  .star-cross {
+    position: relative;
+    width: 520rpx;
+    height: 520rpx;
+    margin: 40rpx auto 50rpx;
+  }
+  
+  /* 按钮公共样式 */
+  .cross-item {
+    position: absolute;
+    width: 150rpx;
+    height: 150rpx;
+    background: radial-gradient(circle at 30% 30%, rgba(79,110,246,0.25), rgba(0,0,0,0.25));
+    border-radius: 50%;
+    border: 1rpx solid rgba(255,255,255,0.12);
+    backdrop-filter: blur(10px);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    transition: transform 0.2s, box-shadow 0.2s;
+    z-index: 5;
+    overflow: visible;
+  }
+  
+  /* 行星光环 */
+  .orbit-ring {
+    position: absolute;
+    top: -8rpx;
+    left: -8rpx;
+    right: -8rpx;
+    bottom: -8rpx;
+    border-radius: 50%;
+    border: 2rpx solid rgba(79,110,246,0.5);
+    border-top-color: transparent;
+    border-bottom-color: transparent;
+    animation: spinRing 4s linear infinite;
+    pointer-events: none;
+  }
+  .pause-spin .orbit-ring {
+    animation-play-state: paused;
+  }
+  
+  @keyframes spinRing {
+    to { transform: rotate(360deg); }
+  }
+  
+  .cross-item:active {
+    transform: scale(0.95);
+    box-shadow: 0 0 30rpx rgba(79,110,246,0.6);
+  }
+  
+  /* 图标强化 */
+  .cross-icon {
+    width: 58rpx;
+    height: 58rpx;
+    margin-bottom: 8rpx;
+    filter: drop-shadow(0 0 14rpx rgba(79,110,246,0.9)) 
+            drop-shadow(0 0 28rpx rgba(99,102,241,0.7));
+    animation: iconFloat 3s ease-in-out infinite;
+    z-index: 2;
+  }
+  
+  @keyframes iconFloat {
+    0%, 100% { transform: translateY(0); }
+    50% { transform: translateY(-3rpx); }
+  }
+  
+  .cross-text {
+    font-size: 24rpx;
+    color: #e0e6f0;
+    font-weight: 600;
+    z-index: 2;
+  }
+  
+  /* 上 */
+  .cross-top { top: 0; left: 50%; transform: translateX(-50%); }
+  /* 下 */
+  .cross-bottom { bottom: 0; left: 50%; transform: translateX(-50%); }
+  /* 左 */
+  .cross-left { left: 0; top: 50%; transform: translateY(-50%); }
+  /* 右 */
+  .cross-right { right: 0; top: 50%; transform: translateY(-50%); }
+  
+  /* 中央五角星（固定，仅呼吸） */
+  .pentagram {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 0; height: 0;
+    transform: translate(-50%, -50%);
+    border-left: 36rpx solid transparent;
+    border-right: 36rpx solid transparent;
+    border-bottom: 84rpx solid rgba(79,110,246,0.85);
+    filter: drop-shadow(0 0 18rpx rgba(79,110,246,0.7));
+    animation: star-pulse 2s ease-in-out infinite;
+  }
+  .pentagram::before {
+    content: "";
+    position: absolute;
+    top: 36rpx;
+    left: -36rpx;
+    width: 0; height: 0;
+    border-left: 36rpx solid transparent;
+    border-right: 36rpx solid transparent;
+    border-bottom: 84rpx solid rgba(79,110,246,0.85);
+    transform: rotate(72deg);
+  }
+  .pentagram::after {
+    content: "";
+    position: absolute;
+    top: 36rpx;
+    left: -36rpx;
+    width: 0; height: 0;
+    border-left: 36rpx solid transparent;
+    border-right: 36rpx solid transparent;
+    border-bottom: 84rpx solid rgba(79,110,246,0.85);
+    transform: rotate(-72deg);
+  }
+  
+  @keyframes star-pulse {
+    0%, 100% { opacity: 0.8; }
+    50% { opacity: 1; }
+  }
+  
+  /* ========== 加载星门 ========== */
+  .loading-portal {
+    position: fixed; top: 0; left: 0; right: 0; bottom: 0;
+    background: rgba(10,12,20,0.95);
+    backdrop-filter: blur(15px);
+    display: flex; flex-direction: column;
+    align-items: center; justify-content: center;
+    z-index: 999;
+  }
+  .portal-ring {
+    width: 100rpx; height: 100rpx;
+    border-radius: 50%;
+    border: 3rpx solid rgba(79,110,246,0.2);
+    border-top-color: #4f6ef6;
+    animation: portalSpin 1s linear infinite;
+    margin-bottom: 30rpx;
+  }
+  @keyframes portalSpin { to { transform: rotate(360deg); } }
+  .portal-text { font-size: 28rpx; color: #64748b; }
+
+/* ========== 🆕 以下为新增样式，绝无任何修改 ========== */
+
+/* 认证状态标签 */
+.renzheng-tag {
+  font-size: 22rpx;
+  padding: 4rpx 12rpx;
+  border-radius: 20rpx;
+  margin-top: 8rpx;
+  display: inline-block;
+}
+.renzheng-tag.authed {
+  background: rgba(76, 175, 80, 0.15);
+  color: #4caf50;
+  border: 1rpx solid rgba(76, 175, 80, 0.4);
+}
+.renzheng-tag.unauth {
+  background: rgba(244, 67, 54, 0.1);
+  color: #f44336;
+  border: 1rpx solid rgba(244, 67, 54, 0.4);
+}
+
+/* 红色角标 */
+.badge {
+  position: absolute;
+  top: -4rpx;
+  right: -8rpx;
+  min-width: 36rpx;
+  height: 36rpx;
+  background: #f44336;
+  color: #fff;
+  font-size: 22rpx;
+  font-weight: 600;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8rpx;
+  box-shadow: 0 2rpx 8rpx rgba(244, 67, 54, 0.4);
+  z-index: 10;
 }
\ No newline at end of file
diff --git a/pages/fenlei/fenlei.js b/pages/category/category.js
similarity index 77%
rename from pages/fenlei/fenlei.js
rename to pages/category/category.js
index 9cbf998..a95e8d7 100644
--- a/pages/fenlei/fenlei.js
+++ b/pages/category/category.js
@@ -1,452 +1,331 @@
-// pages/fenlei/fenlei.js
-const app = getApp()
-
-Page({
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    // 全局变量引用
-    ossImageUrl: '',
-    
-    // 搜索相关
-    searchText: '',
-    showSearchResult: false,
-    searchResults: [],
-    isSearching: false,
-    
-    // 页面数据
-    shangpinleixing: [],
-    shangpinzhuanqu: [],
-    shangpinliebiao: [],
-    
-    // 状态控制
-    selectedLeixingId: null,
-    selectedZhuanquId: null,
-    filteredZhuanquList: [],   // 当前类型下的专区列表
-    filteredShangpinList: [],  // 当前专区下的商品列表
-    zhuanquByLeixing: {},      // 类型->专区映射对象
-    shangpinByZhuanqu: {},     // 专区->商品映射对象
-    zhuanquGoodsCount: {},     // 专区商品数量统计
-    
-    // UI状态
-    isLoading: false,
-    hasInitialized: false
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    // 获取全局变量
-    this.setData({
-      ossImageUrl: app.globalData.ossImageUrl
-    })
-    
-    // 初始化数据
-    this.initPageData()
-  },
-  onShow() {
-    // 原有代码...
-    
-    // 🆕 注册通知组件
-    this.registerNotificationComponent();
-},
-
-// 🆕 新增：注册通知组件
-registerNotificationComponent() {
-    const app = getApp();
-    const notificationComp = this.selectComponent('#global-notification');
-    
-    if (notificationComp && notificationComp.showNotification) {
-        console.log('🏪 商城页面注册通知组件');
-        app.globalData.globalNotification = {
-            show: (data) => notificationComp.showNotification(data),
-            hide: () => notificationComp.hideNotification()
-        };
-    }
-},
-
-  /**
-   * 初始化页面数据
-   */
-  initPageData() {
-    const that = this
-    this.setData({ isLoading: true })
-    
-    // 检查全局变量是否已有数据
-    if (app.globalData.shangpinleixing && app.globalData.shangpinleixing.length > 0) {
-      this.initFromGlobalData()
-    } else {
-      this.loadAllShangpinData()
-    }
-  },
-
-  /**
-   * 从全局变量初始化数据
-   */
-  initFromGlobalData() {
-    const leixingList = app.globalData.shangpinleixing || []
-    const zhuanquList = app.globalData.shangpinzhuanqu || []
-    const shangpinList = app.globalData.shangpinliebiao || []
-    
-    // 构建映射关系对象
-    const zhuanquByLeixing = {}
-    const shangpinByZhuanqu = {}
-    const zhuanquGoodsCount = {}
-    
-    // 1. 构建专区映射 (按类型分组)
-    zhuanquList.forEach(zhuanqu => {
-      const leixingId = zhuanqu.leixing_id
-      if (!zhuanquByLeixing[leixingId]) {
-        zhuanquByLeixing[leixingId] = []
-      }
-      zhuanquByLeixing[leixingId].push(zhuanqu)
-    })
-    
-    // 2. 构建商品映射 (按专区分组)并统计数量
-    shangpinList.forEach(shangpin => {
-      const zhuanquId = shangpin.zhuanqu_id
-      if (zhuanquId) {
-        if (!shangpinByZhuanqu[zhuanquId]) {
-          shangpinByZhuanqu[zhuanquId] = []
-          zhuanquGoodsCount[zhuanquId] = 0
-        }
-        
-        // 处理价格显示
-        const jiage = parseFloat(shangpin.jiage) || 0
-        const priceInteger = Math.floor(jiage)
-        let priceDecimal = '00'
-        
-        const decimalPart = (jiage - priceInteger).toFixed(2)
-        if (decimalPart > 0) {
-          priceDecimal = decimalPart.toString().split('.')[1]
-        }
-        
-        shangpinByZhuanqu[zhuanquId].push({
-          id: shangpin.id,
-          biaoqian: shangpin.biaoqian,
-          jiage: jiage,
-          priceInteger: priceInteger,
-          priceDecimal: priceDecimal,
-          tupian_url: shangpin.tupian_url,
-          duiwai_xiaoliang: shangpin.duiwai_xiaoliang || 0
-        })
-        
-        zhuanquGoodsCount[zhuanquId] += 1
-      }
-    })
-    
-    // 设置初始选中状态（第一个类型和第一个专区）
-    const firstLeixing = leixingList[0]
-    let firstZhuanquId = null
-    
-    if (firstLeixing && zhuanquByLeixing[firstLeixing.id]) {
-      firstZhuanquId = zhuanquByLeixing[firstLeixing.id][0]?.id || null
-    }
-    
-    this.setData({
-      shangpinleixing: leixingList,
-      shangpinzhuanqu: zhuanquList,
-      shangpinliebiao: shangpinList,
-      zhuanquByLeixing: zhuanquByLeixing,
-      shangpinByZhuanqu: shangpinByZhuanqu,
-      zhuanquGoodsCount: zhuanquGoodsCount,
-      selectedLeixingId: firstLeixing?.id || null,
-      selectedZhuanquId: firstZhuanquId
-    }, () => {
-      // 筛选数据
-      this.filterData()
-      this.setData({ isLoading: false, hasInitialized: true })
-    })
-  },
-
-  /**
-   * 加载所有商品数据
-   */
-  loadAllShangpinData() {
-    const that = this
-    wx.request({
-      url: app.globalData.apiBaseUrl + '/shangpin/shangpinhuoqu/',
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },
-      success(res) {
-        if (res.statusCode === 200 && res.data) {
-          const data = res.data
-          
-          // 存储到全局变量
-          app.globalData.shangpinleixing = data.shangpinleixing || []
-          app.globalData.shangpinzhuanqu = data.shangpinzhuanqu || []
-          app.globalData.shangpinliebiao = data.shangpinliebiao || []
-          
-          // 从全局变量初始化
-          that.initFromGlobalData()
-        } else {
-          that.handleLoadError()
-        }
-      },
-      fail(error) {
-        console.error('加载商品数据失败:', error)
-        that.handleLoadError()
-      }
-    })
-  },
-
-  /**
-   * 处理加载错误
-   */
-  handleLoadError() {
-    wx.showToast({
-      title: '加载失败，请重试',
-      icon: 'none'
-    })
-    this.setData({ isLoading: false })
-  },
-
-  /**
-   * 筛选数据
-   */
-  filterData() {
-    const { selectedLeixingId, selectedZhuanquId, zhuanquByLeixing, shangpinByZhuanqu } = this.data
-    
-    // 1. 筛选专区列表
-    const filteredZhuanquList = zhuanquByLeixing[selectedLeixingId] || []
-    
-    // 2. 筛选商品列表
-    let filteredShangpinList = []
-    if (selectedZhuanquId) {
-      filteredShangpinList = shangpinByZhuanqu[selectedZhuanquId] || []
-    } else if (filteredZhuanquList.length > 0) {
-      // 如果没有选中的专区，默认显示第一个专区的商品
-      const firstZhuanquId = filteredZhuanquList[0].id
-      filteredShangpinList = shangpinByZhuanqu[firstZhuanquId] || []
-      this.setData({ selectedZhuanquId: firstZhuanquId })
-    }
-    
-    this.setData({
-      filteredZhuanquList: filteredZhuanquList,
-      filteredShangpinList: filteredShangpinList
-    })
-  },
-
-  /**
-   * 选择商品类型
-   */
-  selectLeixing(e) {
-    const leixingId = e.currentTarget.dataset.id
-    
-    if (this.data.selectedLeixingId === leixingId) {
-      return
-    }
-    
-    // 获取该类型下的第一个专区
-    const zhuanquList = this.data.zhuanquByLeixing[leixingId] || []
-    const firstZhuanquId = zhuanquList.length > 0 ? zhuanquList[0].id : null
-    
-    this.setData({
-      selectedLeixingId: leixingId,
-      selectedZhuanquId: firstZhuanquId
-    }, () => {
-      this.filterData()
-    })
-  },
-
-  /**
-   * 选择商品专区
-   */
-  selectZhuanqu(e) {
-    const zhuanquId = e.currentTarget.dataset.id
-    
-    if (this.data.selectedZhuanquId === zhuanquId) {
-      return
-    }
-    
-    this.setData({
-      selectedZhuanquId: zhuanquId
-    }, () => {
-      // 筛选商品列表
-      const filteredShangpinList = this.data.shangpinByZhuanqu[zhuanquId] || []
-      this.setData({
-        filteredShangpinList: filteredShangpinList
-      })
-    })
-  },
-
-  /**
-   * 搜索框输入事件
-   */
-  onSearchInput(e) {
-    this.setData({
-      searchText: e.detail.value
-    })
-  },
-
-  /**
-   * 点击搜索按钮
-   */
-  onSearchTap() {
-    const searchText = this.data.searchText.trim()
-    if (!searchText) {
-      wx.showToast({
-        title: '请输入搜索内容',
-        icon: 'none'
-      })
-      return
-    }
-    
-    // 开始搜索
-    this.startSearch(searchText)
-  },
-
-  /**
-   * 键盘搜索事件（回车键）
-   */
-  onSearchConfirm(e) {
-    const searchText = e.detail.value.trim()
-    if (!searchText) {
-      wx.showToast({
-        title: '请输入搜索内容',
-        icon: 'none'
-      })
-      return
-    }
-    
-    this.setData({
-      searchText: searchText
-    })
-    
-    // 开始搜索
-    this.startSearch(searchText)
-  },
-
-  /**
-   * 执行搜索
-   */
-  startSearch(searchText) {
-    this.setData({
-      isSearching: true,
-      showSearchResult: true
-    })
-    
-    // 本地搜索
-    const allShangpin = this.data.shangpinliebiao
-    const results = []
-    
-    for (const item of allShangpin) {
-      if (item.biaoqian && item.biaoqian.toLowerCase().includes(searchText.toLowerCase())) {
-        // 处理价格显示
-        const jiage = parseFloat(item.jiage) || 0
-        const priceInteger = Math.floor(jiage)
-        let priceDecimal = '00'
-        
-        const decimalPart = (jiage - priceInteger).toFixed(2)
-        if (decimalPart > 0) {
-          priceDecimal = decimalPart.toString().split('.')[1]
-        }
-        
-        results.push({
-          id: item.id,
-          biaoqian: item.biaoqian,
-          jiage: jiage,
-          priceInteger: priceInteger,
-          priceDecimal: priceDecimal,
-          tupian_url: item.tupian_url,
-          leixing_name: this.getLeixingName(item.leixing_id),
-          zhuanqu_name: this.getZhuanquName(item.zhuanqu_id)
-        })
-      }
-    }
-    
-    this.setData({ 
-      searchResults: results,
-      isSearching: false 
-    })
-  },
-
-  /**
-   * 清空搜索
-   */
-  onClearSearch() {
-    this.setData({
-      searchText: '',
-      showSearchResult: false,
-      searchResults: []
-    })
-  },
-
-  /**
-   * 根据类型ID获取类型名称
-   */
-  getLeixingName(leixingId) {
-    const leixingList = this.data.shangpinleixing
-    for (const item of leixingList) {
-      if (item.id === leixingId) {
-        return item.jieshao
-      }
-    }
-    return ''
-  },
-
-  /**
-   * 根据专区ID获取专区名称
-   */
-  getZhuanquName(zhuanquId) {
-    const zhuanquList = this.data.shangpinzhuanqu
-    for (const item of zhuanquList) {
-      if (item.id === zhuanquId) {
-        return item.mingzi
-      }
-    }
-    return ''
-  },
-
-  /**
-   * 跳转到商品详情页
-   */
-  goToDetail(e) {
-    const shangpinId = e.currentTarget.dataset.id
-    if (!shangpinId) return
-    
-    wx.navigateTo({
-      url: `/pages/shangpinxiangqing/shangpinxiangqing?id=${shangpinId}`
-    })
-  },
-
-  /**
-   * 刷新所有数据
-   */
-  onRefresh() {
-    wx.showLoading({
-      title: '刷新中...',
-      mask: true
-    })
-    
-    // 清空全局变量
-    app.globalData.shangpinleixing = []
-    app.globalData.shangpinzhuanqu = []
-    app.globalData.shangpinliebiao = []
-    
-    this.loadAllShangpinData()
-    
-    setTimeout(() => {
-      wx.hideLoading()
-      wx.showToast({
-        title: '刷新成功',
-        icon: 'success',
-        duration: 1500
-      })
-    }, 1000)
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-    return {
-      title: '阿龙电竞 - 商品分类',
-      path: '/pages/fenlei/fenlei'
-    }
-  }
-})
\ No newline at end of file
+// pages/category/category.js
+const app = getApp()
+
+Page({
+  data: {
+    ossImageUrl: '',
+    searchText: '',
+    showSearchResult: false,
+    searchResults: [],
+    isSearching: false,
+    shangpinleixing: [],
+    shangpinzhuanqu: [],
+    shangpinliebiao: [],
+    selectedLeixingId: null,
+    selectedZhuanquId: null,
+    filteredZhuanquList: [],
+    filteredShangpinList: [],
+    zhuanquByLeixing: {},
+    shangpinByZhuanqu: {},
+    zhuanquGoodsCount: {},
+    isLoading: false,
+    hasInitialized: false
+  },
+
+  onLoad(options) {
+    this.setData({
+      ossImageUrl: app.globalData.ossImageUrl
+    })
+    this.initPageData()
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+        app.globalData.globalNotification = {
+            show: (data) => notificationComp.showNotification(data),
+            hide: () => notificationComp.hideNotification()
+        };
+    }
+  },
+
+  initPageData() {
+    const that = this
+    this.setData({ isLoading: true })
+    if (app.globalData.shangpinleixing && app.globalData.shangpinleixing.length > 0) {
+      this.initFromGlobalData()
+    } else {
+      this.loadAllShangpinData()
+    }
+  },
+
+  initFromGlobalData() {
+    const leixingList = app.globalData.shangpinleixing || []
+    const zhuanquList = app.globalData.shangpinzhuanqu || []
+    const shangpinList = app.globalData.shangpinliebiao || []
+
+    const zhuanquByLeixing = {}
+    const shangpinByZhuanqu = {}
+    const zhuanquGoodsCount = {}
+
+    zhuanquList.forEach(zhuanqu => {
+      const leixingId = zhuanqu.leixing_id
+      if (!zhuanquByLeixing[leixingId]) {
+        zhuanquByLeixing[leixingId] = []
+      }
+      zhuanquByLeixing[leixingId].push(zhuanqu)
+    })
+
+    shangpinList.forEach(shangpin => {
+      const zhuanquId = shangpin.zhuanqu_id
+      if (zhuanquId) {
+        if (!shangpinByZhuanqu[zhuanquId]) {
+          shangpinByZhuanqu[zhuanquId] = []
+          zhuanquGoodsCount[zhuanquId] = 0
+        }
+        const jiage = parseFloat(shangpin.jiage) || 0
+        const priceInteger = Math.floor(jiage)
+        let priceDecimal = '00'
+        const decimalPart = (jiage - priceInteger).toFixed(2)
+        if (decimalPart > 0) {
+          priceDecimal = decimalPart.toString().split('.')[1]
+        }
+        shangpinByZhuanqu[zhuanquId].push({
+          id: shangpin.id,
+          biaoqian: shangpin.biaoqian,
+          jiage: jiage,
+          priceInteger: priceInteger,
+          priceDecimal: priceDecimal,
+          tupian_url: shangpin.tupian_url,
+          duiwai_xiaoliang: shangpin.duiwai_xiaoliang || 0
+        })
+        zhuanquGoodsCount[zhuanquId] += 1
+      }
+    })
+
+    const firstLeixing = leixingList[0]
+    let firstZhuanquId = null
+    if (firstLeixing && zhuanquByLeixing[firstLeixing.id]) {
+      firstZhuanquId = zhuanquByLeixing[firstLeixing.id][0]?.id || null
+    }
+
+    this.setData({
+      shangpinleixing: leixingList,
+      shangpinzhuanqu: zhuanquList,
+      shangpinliebiao: shangpinList,
+      zhuanquByLeixing: zhuanquByLeixing,
+      shangpinByZhuanqu: shangpinByZhuanqu,
+      zhuanquGoodsCount: zhuanquGoodsCount,
+      selectedLeixingId: firstLeixing?.id || null,
+      selectedZhuanquId: firstZhuanquId
+    }, () => {
+      this.filterData()
+      this.setData({ isLoading: false, hasInitialized: true })
+    })
+  },
+
+  loadAllShangpinData() {
+    const that = this
+    wx.request({
+      url: app.globalData.apiBaseUrl + '/shangpin/shangpinhuoqu/',
+      method: 'POST',
+      header: {
+        'content-type': 'application/json'
+      },
+      success(res) {
+        if (res.statusCode === 200 && res.data) {
+          const data = res.data
+          app.globalData.shangpinleixing = data.shangpinleixing || []
+          app.globalData.shangpinzhuanqu = data.shangpinzhuanqu || []
+          app.globalData.shangpinliebiao = data.shangpinliebiao || []
+          that.initFromGlobalData()
+        } else {
+          that.handleLoadError()
+        }
+      },
+      fail(error) {
+        console.error('加载商品数据失败:', error)
+        that.handleLoadError()
+      }
+    })
+  },
+
+  handleLoadError() {
+    wx.showToast({
+      title: '加载失败，请重试',
+      icon: 'none'
+    })
+    this.setData({ isLoading: false })
+  },
+
+  filterData() {
+    const { selectedLeixingId, selectedZhuanquId, zhuanquByLeixing, shangpinByZhuanqu } = this.data
+    const filteredZhuanquList = zhuanquByLeixing[selectedLeixingId] || []
+    let filteredShangpinList = []
+    if (selectedZhuanquId) {
+      filteredShangpinList = shangpinByZhuanqu[selectedZhuanquId] || []
+    } else if (filteredZhuanquList.length > 0) {
+      const firstZhuanquId = filteredZhuanquList[0].id
+      filteredShangpinList = shangpinByZhuanqu[firstZhuanquId] || []
+      this.setData({ selectedZhuanquId: firstZhuanquId })
+    }
+    this.setData({
+      filteredZhuanquList: filteredZhuanquList,
+      filteredShangpinList: filteredShangpinList
+    })
+  },
+
+  selectLeixing(e) {
+    const leixingId = e.currentTarget.dataset.id
+    if (this.data.selectedLeixingId === leixingId) {
+      return
+    }
+    const zhuanquList = this.data.zhuanquByLeixing[leixingId] || []
+    const firstZhuanquId = zhuanquList.length > 0 ? zhuanquList[0].id : null
+    this.setData({
+      selectedLeixingId: leixingId,
+      selectedZhuanquId: firstZhuanquId
+    }, () => {
+      this.filterData()
+    })
+  },
+
+  selectZhuanqu(e) {
+    const zhuanquId = e.currentTarget.dataset.id
+    if (this.data.selectedZhuanquId === zhuanquId) {
+      return
+    }
+    this.setData({
+      selectedZhuanquId: zhuanquId
+    }, () => {
+      const filteredShangpinList = this.data.shangpinByZhuanqu[zhuanquId] || []
+      this.setData({
+        filteredShangpinList: filteredShangpinList
+      })
+    })
+  },
+
+  onSearchInput(e) {
+    this.setData({
+      searchText: e.detail.value
+    })
+  },
+
+  onSearchTap() {
+    const searchText = this.data.searchText.trim()
+    if (!searchText) {
+      wx.showToast({
+        title: '请输入搜索内容',
+        icon: 'none'
+      })
+      return
+    }
+    this.startSearch(searchText)
+  },
+
+  onSearchConfirm(e) {
+    const searchText = e.detail.value.trim()
+    if (!searchText) {
+      wx.showToast({
+        title: '请输入搜索内容',
+        icon: 'none'
+      })
+      return
+    }
+    this.setData({
+      searchText: searchText
+    })
+    this.startSearch(searchText)
+  },
+
+  startSearch(searchText) {
+    this.setData({
+      isSearching: true,
+      showSearchResult: true
+    })
+    const allShangpin = this.data.shangpinliebiao
+    const results = []
+    for (const item of allShangpin) {
+      if (item.biaoqian && item.biaoqian.toLowerCase().includes(searchText.toLowerCase())) {
+        const jiage = parseFloat(item.jiage) || 0
+        const priceInteger = Math.floor(jiage)
+        let priceDecimal = '00'
+        const decimalPart = (jiage - priceInteger).toFixed(2)
+        if (decimalPart > 0) {
+          priceDecimal = decimalPart.toString().split('.')[1]
+        }
+        results.push({
+          id: item.id,
+          biaoqian: item.biaoqian,
+          jiage: jiage,
+          priceInteger: priceInteger,
+          priceDecimal: priceDecimal,
+          tupian_url: item.tupian_url,
+          leixing_name: this.getLeixingName(item.leixing_id),
+          zhuanqu_name: this.getZhuanquName(item.zhuanqu_id)
+        })
+      }
+    }
+    this.setData({
+      searchResults: results,
+      isSearching: false
+    })
+  },
+
+  onClearSearch() {
+    this.setData({
+      searchText: '',
+      showSearchResult: false,
+      searchResults: []
+    })
+  },
+
+  getLeixingName(leixingId) {
+    const leixingList = this.data.shangpinleixing
+    for (const item of leixingList) {
+      if (item.id === leixingId) {
+        return item.jieshao
+      }
+    }
+    return ''
+  },
+
+  getZhuanquName(zhuanquId) {
+    const zhuanquList = this.data.shangpinzhuanqu
+    for (const item of zhuanquList) {
+      if (item.id === zhuanquId) {
+        return item.mingzi
+      }
+    }
+    return ''
+  },
+
+  goToDetail(e) {
+    const shangpinId = e.currentTarget.dataset.id
+    if (!shangpinId) return
+    wx.navigateTo({
+      url: `/pages/product-detail/product-detail?id=${shangpinId}`
+    })
+  },
+
+  onRefresh() {
+    wx.showLoading({
+      title: '刷新中...',
+      mask: true
+    })
+    app.globalData.shangpinleixing = []
+    app.globalData.shangpinzhuanqu = []
+    app.globalData.shangpinliebiao = []
+    this.loadAllShangpinData()
+    setTimeout(() => {
+      wx.hideLoading()
+      wx.showToast({
+        title: '刷新成功',
+        icon: 'success',
+        duration: 1500
+      })
+    }, 1000)
+  },
+
+  onShareAppMessage() {
+    return {
+      title: '阿龙电竞 - 商品分类',
+      path: '/pages/category/category'
+    }
+  }
+})
diff --git a/pages/fenlei/fenlei.json b/pages/category/category.json
similarity index 100%
rename from pages/fenlei/fenlei.json
rename to pages/category/category.json
diff --git a/pages/fenlei/fenlei.wxml b/pages/category/category.wxml
similarity index 94%
rename from pages/fenlei/fenlei.wxml
rename to pages/category/category.wxml
index 6f015fa..208f034 100644
--- a/pages/fenlei/fenlei.wxml
+++ b/pages/category/category.wxml
@@ -1,217 +1,217 @@
-<!-- pages/fenlei/fenlei.wxml -->
-<view class="fenlei-page">
-  <!-- 1. 毛玻璃搜索框区域（固定） -->
-  <view class="search-container">
-    <view class="search-box">
-      <image src="/images/sousuo.png" class="search-icon" />
-      <input 
-        type="text" 
-        class="search-input" 
-        placeholder="输入商品名称搜索" 
-        placeholder-class="search-placeholder"
-        value="{{searchText}}"
-        bindinput="onSearchInput"
-        bindconfirm="onSearchConfirm"
-        confirm-type="search"
-      />
-      <!-- 清空按钮 -->
-      <view wx:if="{{searchText}}" class="search-clear" bindtap="onClearSearch">
-        <image src="/images/clear.png" class="clear-icon" />
-      </view>
-      <!-- 搜索按钮 -->
-      <view class="search-btn" bindtap="onSearchTap">
-        <text class="search-btn-text">搜索</text>
-      </view>
-    </view>
-  </view>
-  
-  <!-- 2. 商品类型选择区域 -->
-  <view class="leixing-container" wx:if="{{!showSearchResult}}">
-    <scroll-view 
-      class="leixing-scroll" 
-      scroll-x 
-      scroll-with-animation
-      show-scrollbar="{{false}}"
-    >
-      <view class="leixing-list">
-        <block wx:for="{{shangpinleixing}}" wx:key="id" wx:for-index="idx">
-          <view 
-            class="leixing-item {{selectedLeixingId === item.id ? 'leixing-active' : ''}}" 
-            bindtap="selectLeixing"
-            data-id="{{item.id}}"
-            data-index="{{idx}}"
-          >
-            <view class="leixing-image-box">
-              <image 
-                src="{{ossImageUrl}}{{item.tupian_url}}" 
-                mode="aspectFill" 
-                class="leixing-image"
-              />
-              <view class="leixing-glow {{selectedLeixingId === item.id ? 'leixing-glow-active' : ''}}"></view>
-            </view>
-            <text class="leixing-text">{{item.jieshao}}</text>
-            <view class="leixing-active-bar {{selectedLeixingId === item.id ? 'leixing-active-bar-show' : ''}}"></view>
-          </view>
-        </block>
-      </view>
-    </scroll-view>
-  </view>
-  
-  <!-- 3. 左右分栏布局 -->
-  <view class="main-container" wx:if="{{!showSearchResult}}">
-    <!-- 左边：商品专区列表 -->
-    <scroll-view 
-      class="zhuanqu-left" 
-      scroll-y 
-      enhanced="{{true}}"
-      show-scrollbar="{{false}}"
-      scroll-into-view="{{'zhuanqu-' + selectedZhuanquId}}"
-    >
-      <view class="zhuanqu-list">
-        <block wx:for="{{filteredZhuanquList}}" wx:key="id">
-          <view 
-            id="zhuanqu-{{item.id}}"
-            class="zhuanqu-item {{selectedZhuanquId === item.id ? 'zhuanqu-active' : ''}}" 
-            bindtap="selectZhuanqu"
-            data-id="{{item.id}}"
-          >
-            <view class="zhuanqu-item-content">
-              <text class="zhuanqu-name">{{item.mingzi}}</text>
-              <text class="zhuanqu-count">({{zhuanquGoodsCount[item.id] || 0}})</text>
-            </view>
-            <view class="zhuanqu-active-indicator {{selectedZhuanquId === item.id ? 'zhuanqu-indicator-glow' : ''}}"></view>
-          </view>
-        </block>
-        
-        <view wx:if="{{filteredZhuanquList.length === 0}}" class="zhuanqu-empty">
-          <image src="/images/empty-box.png" class="zhuanqu-empty-icon" />
-          <text class="zhuanqu-empty-text">暂无专区</text>
-        </view>
-      </view>
-    </scroll-view>
-    
-    <!-- 右边：商品列表 -->
-    <scroll-view 
-      class="shangpin-right" 
-      scroll-y 
-      enhanced="{{true}}"
-      show-scrollbar="{{false}}"
-    >
-      <view class="shangpin-list">
-        <block wx:for="{{filteredShangpinList}}" wx:key="id">
-          <view 
-            class="shangpin-item" 
-            bindtap="goToDetail"
-            data-id="{{item.id}}"
-          >
-            <view class="shangpin-image-box">
-              <image 
-                src="{{ossImageUrl}}{{item.tupian_url}}" 
-                mode="aspectFill" 
-                class="shangpin-image"
-              />
-            </view>
-            
-            <view class="shangpin-info">
-              <view class="shangpin-title">
-                <text class="shangpin-title-text">{{item.biaoqian}}</text>
-              </view>
-              
-              <view class="shangpin-footer">
-                <view class="shangpin-price">
-                  <text class="price-icon">¥</text>
-                  <text class="price-integer">{{item.priceInteger}}</text>
-                  <text class="price-decimal">.{{item.priceDecimal}}</text>
-                </view>
-                <view class="detail-btn">
-                  <text class="detail-btn-text">了解详情</text>
-                </view>
-              </view>
-            </view>
-            
-            <view class="item-divider" wx:if="{{index !== filteredShangpinList.length - 1}}"></view>
-          </view>
-        </block>
-        
-        <view wx:if="{{filteredShangpinList.length === 0 && !isLoading}}" class="shangpin-empty">
-          <image src="/images/empty-goods.png" class="shangpin-empty-icon" />
-          <text class="shangpin-empty-text">该专区暂无商品</text>
-        </view>
-      </view>
-      
-      <view class="load-more" wx:if="{{filteredShangpinList.length > 0}}">
-        <text class="load-more-text">— 已加载全部商品 —</text>
-      </view>
-    </scroll-view>
-  </view>
-  
-  <!-- 搜索结果弹窗 -->
-  <view class="search-results-container" wx:if="{{showSearchResult}}">
-    <view class="search-mask" bindtap="onClearSearch"></view>
-    <view class="search-results-content">
-      <view class="search-results-header">
-        <view class="search-header-left">
-          <text class="search-results-title">搜索结果</text>
-          <text class="search-results-count">({{searchResults.length}}个)</text>
-        </view>
-        <view class="search-close" bindtap="onClearSearch">
-          <image src="/images/close.png" class="close-icon" />
-        </view>
-      </view>
-      
-      <scroll-view class="search-results-list" scroll-y>
-        <block wx:for="{{searchResults}}" wx:key="id">
-          <view class="search-result-item" bindtap="goToDetail" data-id="{{item.id}}">
-            <view class="search-result-left">
-              <image 
-                src="{{ossImageUrl}}{{item.tupian_url}}" 
-                mode="aspectFill" 
-                class="search-result-image"
-              />
-            </view>
-            <view class="search-result-right">
-              <view class="search-result-title">{{item.biaoqian}}</view>
-              <view class="search-result-info">
-                <text class="search-result-category">{{item.leixing_name}}</text>
-                <text class="search-result-separator">·</text>
-                <text class="search-result-zhuanqu">{{item.zhuanqu_name}}</text>
-              </view>
-              <view class="search-result-price">
-                <text class="price-icon">¥</text>
-                <text class="price-integer">{{item.priceInteger}}</text>
-                <text class="price-decimal">.{{item.priceDecimal}}</text>
-              </view>
-            </view>
-          </view>
-        </block>
-        
-        <view wx:if="{{searchResults.length === 0 && !isSearching}}" class="search-empty">
-          <image src="/images/search-empty.png" class="search-empty-icon" />
-          <text class="search-empty-text">未找到相关商品</text>
-        </view>
-        
-        <view wx:if="{{isSearching}}" class="search-loading">
-          <view class="search-spinner">
-            <view class="spinner-circle"></view>
-          </view>
-          <text class="search-loading-text">搜索中...</text>
-        </view>
-      </scroll-view>
-    </view>
-  </view>
-  
-  <!-- 全局加载状态 -->
-  <view class="loading-toast" wx:if="{{isLoading}}">
-    <view class="loading-content">
-      <view class="loading-spinner">
-        <view class="spinner-ring"></view>
-        <view class="spinner-dot"></view>
-      </view>
-      <text class="loading-text">加载中...</text>
-    </view>
-  </view>
-</view>
-
-<!-- 底部自定义TabBar -->
-<custom-tab-bar />
+<!-- pages/category/category.wxml -->
+<view class="fenlei-page">
+  <!-- 1. 毛玻璃搜索框区域（固定） -->
+  <view class="search-container">
+    <view class="search-box search-box--glass">
+      <image src="/images/sousuo.png" class="search-icon" />
+      <input 
+        type="text" 
+        class="search-input" 
+        placeholder="输入商品名称搜索" 
+        placeholder-class="search-placeholder"
+        value="{{searchText}}"
+        bindinput="onSearchInput"
+        bindconfirm="onSearchConfirm"
+        confirm-type="search"
+      />
+      <!-- 清空按钮 -->
+      <view wx:if="{{searchText}}" class="search-clear" bindtap="onClearSearch">
+        <image src="/images/clear.png" class="clear-icon" />
+      </view>
+      <!-- 搜索按钮 -->
+      <view class="search-btn btn btn-sm btn-sm--gold" bindtap="onSearchTap">
+        <text class="search-btn-text">搜索</text>
+      </view>
+    </view>
+  </view>
+  
+  <!-- 2. 商品类型选择区域 -->
+  <view class="leixing-container" wx:if="{{!showSearchResult}}">
+    <scroll-view 
+      class="leixing-scroll" 
+      scroll-x 
+      scroll-with-animation
+      show-scrollbar="{{false}}"
+    >
+      <view class="leixing-list">
+        <block wx:for="{{shangpinleixing}}" wx:key="id" wx:for-index="idx">
+          <view 
+            class="leixing-item {{selectedLeixingId === item.id ? 'leixing-active' : ''}}" 
+            bindtap="selectLeixing"
+            data-id="{{item.id}}"
+            data-index="{{idx}}"
+          >
+            <view class="leixing-image-box">
+              <image 
+                src="{{ossImageUrl}}{{item.tupian_url}}" 
+                mode="aspectFill" 
+                class="leixing-image"
+              />
+              <view class="leixing-glow {{selectedLeixingId === item.id ? 'leixing-glow-active' : ''}}"></view>
+            </view>
+            <text class="leixing-text">{{item.jieshao}}</text>
+            <view class="leixing-active-bar {{selectedLeixingId === item.id ? 'leixing-active-bar-show' : ''}}"></view>
+          </view>
+        </block>
+      </view>
+    </scroll-view>
+  </view>
+  
+  <!-- 3. 左右分栏布局 -->
+  <view class="main-container" wx:if="{{!showSearchResult}}">
+    <!-- 左边：商品专区列表 -->
+    <scroll-view 
+      class="zhuanqu-left" 
+      scroll-y 
+      enhanced="{{true}}"
+      show-scrollbar="{{false}}"
+      scroll-into-view="{{'zhuanqu-' + selectedZhuanquId}}"
+    >
+      <view class="zhuanqu-list">
+        <block wx:for="{{filteredZhuanquList}}" wx:key="id">
+          <view 
+            id="zhuanqu-{{item.id}}"
+            class="zhuanqu-item {{selectedZhuanquId === item.id ? 'zhuanqu-active' : ''}}" 
+            bindtap="selectZhuanqu"
+            data-id="{{item.id}}"
+          >
+            <view class="zhuanqu-item-content">
+              <text class="zhuanqu-name">{{item.mingzi}}</text>
+              <text class="zhuanqu-count">({{zhuanquGoodsCount[item.id] || 0}})</text>
+            </view>
+            <view class="zhuanqu-active-indicator {{selectedZhuanquId === item.id ? 'zhuanqu-indicator-glow' : ''}}"></view>
+          </view>
+        </block>
+        
+        <view wx:if="{{filteredZhuanquList.length === 0}}" class="zhuanqu-empty">
+          <image src="/images/empty-box.png" class="zhuanqu-empty-icon" />
+          <text class="zhuanqu-empty-text">暂无专区</text>
+        </view>
+      </view>
+    </scroll-view>
+    
+    <!-- 右边：商品列表 -->
+    <scroll-view 
+      class="shangpin-right" 
+      scroll-y 
+      enhanced="{{true}}"
+      show-scrollbar="{{false}}"
+    >
+      <view class="shangpin-list">
+        <block wx:for="{{filteredShangpinList}}" wx:key="id">
+          <view 
+            class="shangpin-item" 
+            bindtap="goToDetail"
+            data-id="{{item.id}}"
+          >
+            <view class="shangpin-image-box">
+              <image 
+                src="{{ossImageUrl}}{{item.tupian_url}}" 
+                mode="aspectFill" 
+                class="shangpin-image"
+              />
+            </view>
+            
+            <view class="shangpin-info">
+              <view class="shangpin-title">
+                <text class="shangpin-title-text">{{item.biaoqian}}</text>
+              </view>
+              
+              <view class="shangpin-footer">
+                <view class="shangpin-price">
+                  <text class="price-icon">¥</text>
+                  <text class="price-integer">{{item.priceInteger}}</text>
+                  <text class="price-decimal">.{{item.priceDecimal}}</text>
+                </view>
+                <view class="detail-btn">
+                  <text class="detail-btn-text">了解详情</text>
+                </view>
+              </view>
+            </view>
+            
+            <view class="item-divider" wx:if="{{index !== filteredShangpinList.length - 1}}"></view>
+          </view>
+        </block>
+        
+        <view wx:if="{{filteredShangpinList.length === 0 && !isLoading}}" class="shangpin-empty">
+          <image src="/images/empty-goods.png" class="shangpin-empty-icon" />
+          <text class="shangpin-empty-text">该专区暂无商品</text>
+        </view>
+      </view>
+      
+      <view class="load-more" wx:if="{{filteredShangpinList.length > 0}}">
+        <text class="load-more-text">— 已加载全部商品 —</text>
+      </view>
+    </scroll-view>
+  </view>
+  
+  <!-- 搜索结果弹窗 -->
+  <view class="search-results-container" wx:if="{{showSearchResult}}">
+    <view class="search-mask" bindtap="onClearSearch"></view>
+    <view class="search-results-content">
+      <view class="search-results-header">
+        <view class="search-header-left">
+          <text class="search-results-title">搜索结果</text>
+          <text class="search-results-count">({{searchResults.length}}个)</text>
+        </view>
+        <view class="search-close" bindtap="onClearSearch">
+          <image src="/images/close.png" class="close-icon" />
+        </view>
+      </view>
+      
+      <scroll-view class="search-results-list" scroll-y>
+        <block wx:for="{{searchResults}}" wx:key="id">
+          <view class="search-result-item" bindtap="goToDetail" data-id="{{item.id}}">
+            <view class="search-result-left">
+              <image 
+                src="{{ossImageUrl}}{{item.tupian_url}}" 
+                mode="aspectFill" 
+                class="search-result-image"
+              />
+            </view>
+            <view class="search-result-right">
+              <view class="search-result-title">{{item.biaoqian}}</view>
+              <view class="search-result-info">
+                <text class="search-result-category">{{item.leixing_name}}</text>
+                <text class="search-result-separator">·</text>
+                <text class="search-result-zhuanqu">{{item.zhuanqu_name}}</text>
+              </view>
+              <view class="search-result-price">
+                <text class="price-icon">¥</text>
+                <text class="price-integer">{{item.priceInteger}}</text>
+                <text class="price-decimal">.{{item.priceDecimal}}</text>
+              </view>
+            </view>
+          </view>
+        </block>
+        
+        <view wx:if="{{searchResults.length === 0 && !isSearching}}" class="search-empty">
+          <image src="/images/search-empty.png" class="search-empty-icon" />
+          <text class="search-empty-text">未找到相关商品</text>
+        </view>
+        
+        <view wx:if="{{isSearching}}" class="search-loading">
+          <view class="search-spinner">
+            <view class="spinner-circle"></view>
+          </view>
+          <text class="search-loading-text">搜索中...</text>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+  
+  <!-- 全局加载状态 -->
+  <view class="loading-toast loading-mask loading-mask--dark" wx:if="{{isLoading}}">
+    <view class="loading-content">
+      <view class="loading-spinner">
+        <view class="spinner-ring"></view>
+        <view class="spinner-dot"></view>
+      </view>
+      <text class="loading-text">加载中...</text>
+    </view>
+  </view>
+</view>
+
+<!-- 底部自定义TabBar -->
+<custom-tab-bar />
 <global-notification id="global-notification" />
\ No newline at end of file
diff --git a/pages/fenlei/fenlei.wxss b/pages/category/category.wxss
similarity index 93%
rename from pages/fenlei/fenlei.wxss
rename to pages/category/category.wxss
index d4a3420..9ce1023 100644
--- a/pages/fenlei/fenlei.wxss
+++ b/pages/category/category.wxss
@@ -1,1215 +1,1175 @@
-/* pages/fenlei/fenlei.wxss */
-.fenlei-page {
-    width: 100%;
-    height: 100vh;
-    background: linear-gradient(135deg, #f8f9ff 0%, #f0f2ff 100%);
-    display: flex;
-    flex-direction: column;
-    position: relative;
-    overflow: hidden;
-  }
-  
-  /* 1. 毛玻璃搜索框区域（固定） */
-  .search-container {
-    padding: 24rpx 32rpx;
-    background: transparent;
-    flex-shrink: 0;
-    position: relative;
-    z-index: 100;
-  }
-  
-  .search-box {
-    display: flex;
-    align-items: center;
-    background: rgba(255, 255, 255, 0.85);
-    backdrop-filter: blur(30rpx);
-    -webkit-backdrop-filter: blur(30rpx);
-    border-radius: 50rpx;
-    padding: 0 28rpx;
-    height: 84rpx;
-    box-shadow: 
-      0 8rpx 32rpx rgba(31, 38, 135, 0.1),
-      inset 0 1rpx 0 rgba(255, 255, 255, 0.8);
-    border: 1rpx solid rgba(255, 255, 255, 0.3);
-    position: relative;
-    overflow: hidden;
-  }
-  
-  .search-box::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: linear-gradient(135deg, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.1));
-    border-radius: 50rpx;
-    z-index: -1;
-  }
-  
-  .search-icon {
-    width: 34rpx;
-    height: 34rpx;
-    margin-right: 18rpx;
-    opacity: 0.6;
-  }
-  
-  .search-input {
-    flex: 1;
-    height: 100%;
-    font-size: 28rpx;
-    color: #222;
-    font-weight: 400;
-  }
-  
-  .search-placeholder {
-    color: #aaa;
-    font-size: 28rpx;
-  }
-  
-  .search-btn {
-    background: linear-gradient(135deg, #ffcc00, #ffaa00);
-    border-radius: 40rpx;
-    padding: 14rpx 32rpx;
-    margin-left: 20rpx;
-    position: relative;
-    overflow: hidden;
-    box-shadow: 0 6rpx 20rpx rgba(255, 170, 0, 0.3);
-    transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
-  }
-  
-  .search-btn:active {
-    transform: scale(0.95);
-    box-shadow: 0 4rpx 15rpx rgba(255, 170, 0, 0.4);
-  }
-  
-  .search-btn-text {
-    font-size: 26rpx;
-    color: white;
-    font-weight: 600;
-    position: relative;
-    z-index: 1;
-  }
-  
-  .search-btn-glow {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4), transparent);
-    transform: translateX(-100%);
-    transition: transform 0.6s;
-  }
-  
-  .search-btn:active .search-btn-glow {
-    transform: translateX(100%);
-  }
-  
-  .search-clear {
-    width: 36rpx;
-    height: 36rpx;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-left: 16rpx;
-    opacity: 0.6;
-    transition: opacity 0.3s;
-  }
-  
-  .search-clear:active {
-    opacity: 1;
-  }
-  
-  .clear-icon {
-    width: 24rpx;
-    height: 24rpx;
-  }
-  
-  /* 2. 商品类型选择区域（固定）- 恢复原大小 */
-  .leixing-container {
-    padding: 0 32rpx 24rpx;
-    flex-shrink: 0;
-    position: relative;
-  }
-  
-  .leixing-bg-glow {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: 300rpx;
-    height: 300rpx;
-    background: radial-gradient(circle, rgba(255, 204, 0, 0.1) 0%, transparent 70%);
-    z-index: -1;
-  }
-  
-  .leixing-scroll {
-    white-space: nowrap;
-    height: 180rpx; /* 恢复原大小 */
-  }
-  
-  .leixing-list {
-    display: inline-flex;
-    padding-right: 32rpx;
-  }
-  
-  .leixing-item {
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    margin-right: 48rpx; /* 增加间距 */
-    position: relative;
-    padding: 12rpx;
-  }
-  
-  .leixing-image-box {
-    width: 100rpx; /* 恢复原大小 */
-    height: 100rpx; /* 恢复原大小 */
-    border-radius: 50%;
-    position: relative;
-    margin-bottom: 16rpx;
-    overflow: hidden;
-    background: white;
-    box-shadow: 
-      0 12rpx 30rpx rgba(0, 0, 0, 0.12),
-      0 4rpx 8rpx rgba(0, 0, 0, 0.06);
-    transition: all 0.4s cubic-bezier(0.34, 1.56, 0.64, 1);
-  }
-  
-  .leixing-active .leixing-image-box {
-    transform: scale(1.12);
-    box-shadow: 
-      0 18rpx 40rpx rgba(255, 204, 0, 0.3),
-      0 8rpx 16rpx rgba(255, 170, 0, 0.2);
-  }
-  
-  .leixing-image {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    object-fit: cover;
-  }
-  
-  .leixing-glow {
-    position: absolute;
-    top: -3rpx;
-    left: -3rpx;
-    right: -3rpx;
-    bottom: -3rpx;
-    border-radius: 50%;
-    background: linear-gradient(135deg, #ffcc00, #ffaa00, #ff8800);
-    opacity: 0;
-    transition: opacity 0.4s;
-    z-index: -1;
-    filter: blur(10rpx);
-  }
-  
-  .leixing-glow-active {
-    opacity: 0.6;
-    animation: glowPulse 2s infinite;
-  }
-  
-  .leixing-sparkle {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 20rpx;
-    height: 20rpx;
-    background: white;
-    border-radius: 50%;
-    transform: translate(-50%, -50%) scale(0);
-    opacity: 0;
-    pointer-events: none;
-  }
-  
-  .sparkle-animation {
-    animation: sparkleFlash 1.5s infinite;
-  }
-  
-  .leixing-text {
-    font-size: 24rpx;
-    color: #555; /* 颜色加深 */
-    font-weight: 500;
-    transition: all 0.3s;
-    white-space: nowrap;
-  }
-  
-  .leixing-active .leixing-text {
-    color: #ff9900;
-    font-weight: 600;
-    transform: translateY(-2rpx);
-    text-shadow: 0 2rpx 4rpx rgba(255, 153, 0, 0.2);
-  }
-  
-  .leixing-active-bar {
-    position: absolute;
-    bottom: -4rpx;
-    width: 44rpx;
-    height: 4rpx;
-    background: linear-gradient(90deg, #ffcc00, #ffaa00);
-    border-radius: 2rpx;
-    opacity: 0;
-    transform: scaleX(0);
-    transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
-    box-shadow: 0 2rpx 8rpx rgba(255, 170, 0, 0.4);
-  }
-  
-  .leixing-active-bar-show {
-    opacity: 1;
-    transform: scaleX(1);
-  }
-  
-  .leixing-border-effect {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    border-radius: 50%;
-    border: 2rpx solid transparent;
-    opacity: 0;
-    pointer-events: none;
-  }
-  
-  .border-effect-active {
-    opacity: 1;
-    border-color: rgba(255, 204, 0, 0.5);
-    animation: borderGlow 2s infinite;
-  }
-  
-  /* 3. 左右分栏布局（可滚动区域） */
-  .main-container {
-    flex: 1;
-    display: flex;
-    height: calc(100vh - 300rpx);
-    overflow: hidden;
-  }
-  
-  /* 左边：商品专区列表 */
-  .zhuanqu-left {
-    width: 200rpx;
-    background: rgba(255, 255, 255, 0.7);
-    backdrop-filter: blur(10rpx);
-    border-right: 1rpx solid rgba(0, 0, 0, 0.08);
-    flex-shrink: 0;
-    position: relative;
-  }
-  
-  .zhuanqu-list {
-    padding: 0;
-  }
-  
-  .zhuanqu-item {
-    position: relative;
-    padding: 32rpx 0;
-    border-bottom: 1rpx solid rgba(0, 0, 0, 0.05);
-    transition: all 0.3s;
-  }
-  
-  .zhuanqu-item:active {
-    background: rgba(255, 204, 0, 0.05);
-  }
-  
-  .zhuanqu-item-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 0 20rpx;
-  }
-  
-  .zhuanqu-name {
-    font-size: 26rpx;
-    color: #444; /* 颜色加深 */
-    text-align: center;
-    line-height: 1.4;
-    margin-bottom: 8rpx;
-    transition: all 0.3s;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-    font-weight: 500;
-  }
-  
-  .zhuanqu-active .zhuanqu-name {
-    color: #ff9900;
-    font-weight: 600;
-    text-shadow: 0 2rpx 4rpx rgba(255, 153, 0, 0.2);
-  }
-  
-  .zhuanqu-count {
-    font-size: 22rpx;
-    color: #888;
-    transition: all 0.3s;
-  }
-  
-  .zhuanqu-active .zhuanqu-count {
-    color: #ffaa00;
-    font-weight: 500;
-  }
-  
-  .zhuanqu-active-indicator {
-    position: absolute;
-    right: 0;
-    top: 50%;
-    transform: translateY(-50%);
-    width: 6rpx;
-    height: 44rpx;
-    background: linear-gradient(180deg, #ffcc00, #ffaa00);
-    border-radius: 3rpx 0 0 3rpx;
-    opacity: 0;
-    transition: all 0.3s;
-    overflow: hidden;
-  }
-  
-  .zhuanqu-indicator-glow {
-    opacity: 1;
-    animation: indicatorGlow 2s infinite;
-    box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.5);
-  }
-  
-  .indicator-sparkle {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    height: 10rpx;
-    background: rgba(255, 255, 255, 0.6);
-    animation: sparkleMove 1.5s infinite;
-  }
-  
-  .zhuanqu-hover-glow {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: linear-gradient(90deg, transparent, rgba(255, 204, 0, 0.05), transparent);
-    opacity: 0;
-    transition: opacity 0.3s;
-    pointer-events: none;
-  }
-  
-  .zhuanqu-item:active .zhuanqu-hover-glow {
-    opacity: 1;
-  }
-  
-  .zhuanqu-click-effect {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 0;
-    height: 0;
-    border-radius: 50%;
-    background: rgba(255, 204, 0, 0.1);
-    transform: translate(-50%, -50%);
-    opacity: 0;
-    pointer-events: none;
-  }
-  
-  .zhuanqu-item:active .zhuanqu-click-effect {
-    animation: rippleEffect 0.6s ease-out;
-  }
-  
-  .zhuanqu-empty {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 120rpx 0;
-  }
-  
-  .zhuanqu-empty-icon {
-    width: 120rpx;
-    height: 120rpx;
-    opacity: 0.2;
-    margin-bottom: 28rpx;
-  }
-  
-  .zhuanqu-empty-text {
-    font-size: 26rpx;
-    color: #999;
-  }
-  
-  /* 右边：商品列表（紧凑布局） */
-  .shangpin-right {
-    flex: 1;
-    background: #fafafa;
-  }
-  
-  .shangpin-list {
-    padding: 0;
-  }
-  
-  .shangpin-item {
-    background: white;
-    padding: 28rpx 30rpx 22rpx; /* 底部距离缩小 */
-    position: relative;
-    display: flex;
-    align-items: flex-start;
-    min-height: 140rpx;
-    overflow: hidden;
-  }
-  
-  .shangpin-item:active {
-    background: rgba(0, 0, 0, 0.02);
-  }
-  
-  .shangpin-image-box {
-    margin-right: 24rpx;
-    flex-shrink: 0;
-    position: relative;
-  }
-  
-  .shangpin-image {
-    width: 120rpx;
-    height: 120rpx;
-    border-radius: 14rpx;
-    background: #f5f5f5;
-    object-fit: cover;
-  }
-  
-  .shangpin-image-glow {
-    position: absolute;
-    top: -4rpx;
-    left: -4rpx;
-    right: -4rpx;
-    bottom: -4rpx;
-    border-radius: 18rpx;
-    background: linear-gradient(135deg, rgba(255, 204, 0, 0.2), transparent);
-    opacity: 0;
-    transition: opacity 0.3s;
-    pointer-events: none;
-  }
-  
-  .shangpin-item:active .shangpin-image-glow {
-    opacity: 0.5;
-  }
-  
-  .image-corner {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 20rpx;
-    height: 20rpx;
-    background: linear-gradient(135deg, #ffcc00, transparent 70%);
-    border-radius: 0 14rpx 0 0;
-  }
-  
-  .shangpin-info {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    height: 120rpx;
-    justify-content: space-between;
-    padding-top: 2rpx; /* 标题与图片顶部对齐 */
-  }
-  
-  .shangpin-title {
-    margin-bottom: 0;
-    position: relative;
-  }
-  
-  .shangpin-title-text {
-    font-size: 30rpx;
-    font-weight: 500;
-    color: #222; /* 黑色加深 */
-    line-height: 1.4;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    overflow: hidden;
-  }
-  
-  .title-underline {
-    position: absolute;
-    bottom: -4rpx;
-    left: 0;
-    width: 0;
-    height: 2rpx;
-    background: linear-gradient(90deg, #ffcc00, #ffaa00);
-    transition: width 0.3s;
-  }
-  
-  .shangpin-item:active .title-underline {
-    width: 40rpx;
-  }
-  
-  .shangpin-footer {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: auto;
-  }
-  
-  .shangpin-price {
-    display: flex;
-    align-items: baseline;
-    position: relative;
-  }
-  
-  .price-icon {
-    font-size: 24rpx;
-    color: #ff6600;
-    font-weight: 500;
-  }
-  
-  .price-integer {
-    font-size: 36rpx; /* 适当调整大小 */
-    color: #ff6600;
-    font-weight: 600;
-    margin-left: 2rpx;
-  }
-  
-  .price-decimal {
-    font-size: 24rpx;
-    color: #ff6600;
-    font-weight: 500;
-  }
-  
-  .price-glow {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 80rpx;
-    height: 80rpx;
-    background: radial-gradient(circle, rgba(255, 102, 0, 0.1) 0%, transparent 70%);
-    transform: translate(-50%, -50%);
-    opacity: 0;
-    pointer-events: none;
-  }
-  
-  .shangpin-item:active .price-glow {
-    animation: priceGlow 0.6s;
-  }
-  
-  .detail-btn {
-    position: relative;
-    padding: 12rpx 28rpx;
-    background: linear-gradient(135deg, #ffcc00, #ffaa00);
-    border-radius: 40rpx;
-    transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
-    overflow: hidden;
-    box-shadow: 0 6rpx 20rpx rgba(255, 170, 0, 0.2);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-width: 120rpx;
-  }
-  
-  .detail-btn:active {
-    transform: scale(0.95);
-    box-shadow: 0 4rpx 15rpx rgba(255, 170, 0, 0.4);
-  }
-  
-  .detail-btn-text {
-    font-size: 24rpx;
-    color: white;
-    font-weight: 500;
-    position: relative;
-    z-index: 2;
-    line-height: 1;
-  }
-  
-  .btn-glow-effect {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4), transparent);
-    transform: translateX(-100%);
-    transition: transform 0.6s;
-  }
-  
-  .detail-btn:active .btn-glow-effect {
-    transform: translateX(100%);
-  }
-  
-  .btn-halo {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 0;
-    height: 0;
-    border-radius: 50%;
-    background: rgba(255, 255, 255, 0.3);
-    transform: translate(-50%, -50%);
-    opacity: 0;
-    pointer-events: none;
-  }
-  
-  .detail-btn:active .btn-halo {
-    animation: buttonHalo 0.6s ease-out;
-  }
-  
-  .btn-star {
-    position: absolute;
-    width: 6rpx;
-    height: 6rpx;
-    background: white;
-    border-radius: 50%;
-    opacity: 0;
-    pointer-events: none;
-  }
-  
-  .detail-btn:active .btn-star {
-    animation: starSparkle 0.8s ease-out;
-  }
-  
-  .item-divider {
-    position: absolute;
-    left: 30rpx;
-    right: 30rpx;
-    bottom: 0;
-    height: 1rpx;
-    background: linear-gradient(90deg, rgba(0, 0, 0, 0.08), rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.08));
-  }
-  
-  .item-hover-glow {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: linear-gradient(135deg, transparent, rgba(255, 204, 0, 0.03), transparent);
-    opacity: 0;
-    transition: opacity 0.3s;
-    pointer-events: none;
-  }
-  
-  .shangpin-item:active .item-hover-glow {
-    opacity: 1;
-  }
-  
-  .item-ripple-effect {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 0;
-    height: 0;
-    border-radius: 50%;
-    background: rgba(255, 204, 0, 0.1);
-    transform: translate(-50%, -50%);
-    opacity: 0;
-    pointer-events: none;
-  }
-  
-  .shangpin-item:active .item-ripple-effect {
-    animation: rippleEffect 0.6s ease-out;
-  }
-  
-  .shangpin-empty {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 150rpx 0;
-  }
-  
-  .shangpin-empty-icon {
-    width: 180rpx;
-    height: 180rpx;
-    opacity: 0.15;
-    margin-bottom: 36rpx;
-  }
-  
-  .shangpin-empty-text {
-    font-size: 28rpx;
-    color: #999;
-    margin-bottom: 40rpx;
-  }
-  
-  .shangpin-empty-btn {
-    background: linear-gradient(135deg, #ffcc00, #ffaa00);
-    color: white;
-    font-size: 26rpx;
-    font-weight: 500;
-    padding: 16rpx 44rpx;
-    border-radius: 40rpx;
-    box-shadow: 0 8rpx 24rpx rgba(255, 170, 0, 0.3);
-    transition: all 0.3s;
-  }
-  
-  .shangpin-empty-btn:active {
-    transform: scale(0.95);
-    box-shadow: 0 4rpx 16rpx rgba(255, 170, 0, 0.4);
-  }
-  
-  .load-more {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 40rpx 0;
-  }
-  
-  .load-more-line {
-    width: 60rpx;
-    height: 1rpx;
-    background: linear-gradient(90deg, transparent, rgba(0, 0, 0, 0.1), transparent);
-  }
-  
-  .load-more-text {
-    font-size: 24rpx;
-    color: #bbb;
-    margin: 0 20rpx;
-  }
-  
-  /* 搜索结果弹窗 */
-  .search-results-container {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 2000;
-    display: flex;
-  }
-  
-  .search-mask {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0, 0, 0, 0.5);
-    backdrop-filter: blur(5rpx);
-  }
-  
-  .search-results-content {
-    position: absolute;
-    top: 100rpx;
-    left: 32rpx;
-    right: 32rpx;
-    bottom: 100rpx;
-    background: rgba(255, 255, 255, 0.95);
-    backdrop-filter: blur(30rpx);
-    border-radius: 24rpx;
-    box-shadow: 
-      0 20rpx 60rpx rgba(0, 0, 0, 0.2),
-      inset 0 1rpx 0 rgba(255, 255, 255, 0.8);
-    border: 1rpx solid rgba(255, 255, 255, 0.3);
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-  }
-  
-  .search-results-header {
-    padding: 32rpx;
-    border-bottom: 1rpx solid rgba(0, 0, 0, 0.06);
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    flex-shrink: 0;
-  }
-  
-  .search-header-left {
-    display: flex;
-    align-items: baseline;
-  }
-  
-  .search-results-title {
-    font-size: 34rpx;
-    font-weight: 600;
-    color: #333;
-  }
-  
-  .search-results-count {
-    font-size: 24rpx;
-    color: #999;
-    margin-left: 12rpx;
-  }
-  
-  .search-close {
-    width: 44rpx;
-    height: 44rpx;
-    border-radius: 50%;
-    background: rgba(0, 0, 0, 0.05);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    transition: all 0.3s;
-  }
-  
-  .search-close:active {
-    background: rgba(0, 0, 0, 0.1);
-    transform: scale(0.9);
-  }
-  
-  .close-icon {
-    width: 20rpx;
-    height: 20rpx;
-    opacity: 0.6;
-  }
-  
-  .search-results-list {
-    flex: 1;
-    height: 100%; /* 新增：修复滚动问题的关键代码 */
-  }
-  
-  .search-result-item {
-    display: flex;
-    padding: 28rpx 32rpx;
-    border-bottom: 1rpx solid rgba(0, 0, 0, 0.04);
-    position: relative;
-    transition: all 0.3s;
-  }
-  
-  .search-result-item:active {
-    background: rgba(0, 0, 0, 0.02);
-    transform: translateY(-2rpx);
-  }
-  
-  .search-result-left {
-    margin-right: 24rpx;
-    position: relative;
-  }
-  
-  .search-result-image {
-    width: 120rpx;
-    height: 120rpx;
-    border-radius: 16rpx;
-    background: #f5f5f5;
-    object-fit: cover;
-  }
-  
-  .search-image-glow {
-    position: absolute;
-    top: -4rpx;
-    left: -4rpx;
-    right: -4rpx;
-    bottom: -4rpx;
-    border-radius: 20rpx;
-    background: linear-gradient(135deg, rgba(255, 204, 0, 0.2), transparent);
-    opacity: 0;
-    transition: opacity 0.3s;
-    pointer-events: none;
-  }
-  
-  .search-result-item:active .search-image-glow {
-    opacity: 0.5;
-  }
-  
-  .search-result-right {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-  }
-  
-  .search-result-title {
-    font-size: 28rpx;
-    font-weight: 500;
-    color: #333;
-    line-height: 1.4;
-    margin-bottom: 16rpx;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-  }
-  
-  .search-result-info {
-    display: flex;
-    gap: 12rpx;
-    margin-bottom: 20rpx;
-  }
-  
-  .info-tag {
-    padding: 6rpx 12rpx;
-    background: rgba(255, 204, 0, 0.1);
-    border-radius: 6rpx;
-  }
-  
-  .search-result-category {
-    font-size: 22rpx;
-    color: #666;
-  }
-  
-  .search-result-zhuanqu {
-    font-size: 22rpx;
-    color: #888;
-  }
-  
-  .search-result-price {
-    display: flex;
-    align-items: baseline;
-  }
-  
-  .search-item-glow {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: linear-gradient(135deg, transparent, rgba(255, 204, 0, 0.05), transparent);
-    opacity: 0;
-    transition: opacity 0.3s;
-    pointer-events: none;
-  }
-  
-  .search-result-item:active .search-item-glow {
-    opacity: 1;
-  }
-  
-  .search-empty {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 160rpx 0;
-  }
-  
-  .search-empty-icon {
-    width: 160rpx;
-    height: 160rpx;
-    opacity: 0.2;
-    margin-bottom: 36rpx;
-  }
-  
-  .search-empty-text {
-    font-size: 30rpx;
-    color: #999;
-    margin-bottom: 16rpx;
-  }
-  
-  .search-empty-tip {
-    font-size: 24rpx;
-    color: #bbb;
-  }
-  
-  .search-loading {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 160rpx 0;
-  }
-  
-  .search-spinner {
-    width: 60rpx;
-    height: 60rpx;
-    position: relative;
-    margin-bottom: 24rpx;
-  }
-  
-  .spinner-circle {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    border: 4rpx solid transparent;
-    border-top-color: #ffcc00;
-    border-radius: 50%;
-    animation: spin 1s linear infinite;
-  }
-  
-  .search-loading-text {
-    font-size: 26rpx;
-    color: #999;
-  }
-  
-  /* 全局加载状态 */
-  .loading-toast {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0, 0, 0, 0.7);
-    backdrop-filter: blur(10rpx);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 3000;
-  }
-  
-  .loading-content {
-    background: rgba(255, 255, 255, 0.1);
-    backdrop-filter: blur(20rpx);
-    padding: 60rpx 80rpx;
-    border-radius: 24rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    position: relative;
-    border: 1rpx solid rgba(255, 255, 255, 0.1);
-  }
-  
-  .loading-spinner {
-    width: 80rpx;
-    height: 80rpx;
-    position: relative;
-    margin-bottom: 30rpx;
-  }
-  
-  .spinner-ring {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    border: 4rpx solid rgba(255, 255, 255, 0.2);
-    border-radius: 50%;
-  }
-  
-  .spinner-dot {
-    position: absolute;
-    top: 0;
-    left: 50%;
-    width: 12rpx;
-    height: 12rpx;
-    background: #ffcc00;
-    border-radius: 50%;
-    transform: translateX(-50%);
-    animation: spin 1s linear infinite;
-  }
-  
-  .loading-text {
-    font-size: 28rpx;
-    color: white;
-    font-weight: 500;
-  }
-  
-  .loading-glow {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 200rpx;
-    height: 200rpx;
-    background: radial-gradient(circle, rgba(255, 204, 0, 0.2) 0%, transparent 70%);
-    transform: translate(-50%, -50%);
-    z-index: -1;
-  }
-  
-  /* 动画定义 */
-  @keyframes glowPulse {
-    0%, 100% {
-      opacity: 0.4;
-      transform: scale(1);
-    }
-    50% {
-      opacity: 0.8;
-      transform: scale(1.05);
-    }
-  }
-  
-  @keyframes sparkleFlash {
-    0%, 100% {
-      opacity: 0;
-      transform: translate(-50%, -50%) scale(0);
-    }
-    50% {
-      opacity: 1;
-      transform: translate(-50%, -50%) scale(1);
-      filter: blur(0);
-    }
-  }
-  
-  @keyframes borderGlow {
-    0%, 100% {
-      border-color: rgba(255, 204, 0, 0.3);
-    }
-    50% {
-      border-color: rgba(255, 204, 0, 0.8);
-    }
-  }
-  
-  @keyframes indicatorGlow {
-    0%, 100% {
-      box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.3);
-    }
-    50% {
-      box-shadow: 0 0 30rpx rgba(255, 204, 0, 0.8);
-    }
-  }
-  
-  @keyframes sparkleMove {
-    0% {
-      transform: translateY(-100%);
-      opacity: 0;
-    }
-    50% {
-      opacity: 1;
-    }
-    100% {
-      transform: translateY(400%);
-      opacity: 0;
-    }
-  }
-  
-  @keyframes rippleEffect {
-    0% {
-      width: 0;
-      height: 0;
-      opacity: 0.5;
-    }
-    100% {
-      width: 200rpx;
-      height: 200rpx;
-      opacity: 0;
-    }
-  }
-  
-  @keyframes priceGlow {
-    0% {
-      opacity: 0;
-      transform: translate(-50%, -50%) scale(0.5);
-    }
-    50% {
-      opacity: 0.6;
-      transform: translate(-50%, -50%) scale(1);
-    }
-    100% {
-      opacity: 0;
-      transform: translate(-50%, -50%) scale(1.5);
-    }
-  }
-  
-  @keyframes buttonHalo {
-    0% {
-      width: 0;
-      height: 0;
-      opacity: 0.6;
-    }
-    100% {
-      width: 200rpx;
-      height: 200rpx;
-      opacity: 0;
-    }
-  }
-  
-  @keyframes starSparkle {
-    0% {
-      opacity: 0;
-      transform: translate(0, 0) scale(0);
-    }
-    20% {
-      opacity: 1;
-      transform: translate(-40rpx, -30rpx) scale(1);
-    }
-    40% {
-      opacity: 1;
-      transform: translate(30rpx, -20rpx) scale(1);
-    }
-    60% {
-      opacity: 1;
-      transform: translate(-20rpx, 40rpx) scale(1);
-    }
-    80% {
-      opacity: 1;
-      transform: translate(40rpx, 20rpx) scale(1);
-    }
-    100% {
-      opacity: 0;
-      transform: translate(0, 0) scale(0);
-    }
-  }
-  
-  @keyframes spin {
-    0% {
-      transform: rotate(0deg);
-    }
-    100% {
-      transform: rotate(360deg);
-    }
+/* pages/category/category.wxss */
+.fenlei-page {
+    width: 100%;
+    height: 100vh;
+    background: linear-gradient(135deg, #f8f9ff 0%, #f0f2ff 100%);
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    overflow: hidden;
+  }
+  
+  /* 1. 毛玻璃搜索框区域（固定） */
+  .search-container {
+    padding: 24rpx 32rpx;
+    background: transparent;
+    flex-shrink: 0;
+    position: relative;
+    z-index: 100;
+  }
+  
+  .search-box {
+    backdrop-filter: blur(30rpx);
+    -webkit-backdrop-filter: blur(30rpx);
+    box-shadow:
+      0 8rpx 32rpx rgba(31, 38, 135, 0.1),
+      inset 0 1rpx 0 rgba(255, 255, 255, 0.8);
+    position: relative;
+    overflow: hidden;
+  }
+  
+  .search-box::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(135deg, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.1));
+    border-radius: 50rpx;
+    z-index: -1;
+  }
+  
+  .search-icon {
+    width: 34rpx;
+    height: 34rpx;
+    margin-right: 18rpx;
+    opacity: 0.6;
+  }
+  
+  .search-input {
+    margin-left: 0;
+    color: #222;
+    font-weight: 400;
+  }
+  
+  .search-placeholder {
+    color: #aaa;
+    font-size: 28rpx;
+  }
+  
+  .search-btn {
+    margin-left: 20rpx;
+    box-shadow: 0 6rpx 20rpx rgba(255, 170, 0, 0.3);
+    transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+  }
+  
+  .search-btn:active {
+    transform: scale(0.95);
+    box-shadow: 0 4rpx 15rpx rgba(255, 170, 0, 0.4);
+  }
+  
+  .search-btn-text {
+    font-size: 26rpx;
+    color: white;
+    font-weight: 600;
+    position: relative;
+    z-index: 1;
+  }
+  
+  .search-btn-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4), transparent);
+    transform: translateX(-100%);
+    transition: transform 0.6s;
+  }
+  
+  .search-btn:active .search-btn-glow {
+    transform: translateX(100%);
+  }
+  
+  .search-clear {
+    width: 36rpx;
+    height: 36rpx;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-left: 16rpx;
+    opacity: 0.6;
+    transition: opacity 0.3s;
+  }
+  
+  .search-clear:active {
+    opacity: 1;
+  }
+  
+  .clear-icon {
+    width: 24rpx;
+    height: 24rpx;
+  }
+  
+  /* 2. 商品类型选择区域（固定） */
+  .leixing-container {
+    padding: 0 32rpx 24rpx;
+    flex-shrink: 0;
+    position: relative;
+  }
+  
+  .leixing-bg-glow {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 300rpx;
+    height: 300rpx;
+    background: radial-gradient(circle, rgba(255, 204, 0, 0.1) 0%, transparent 70%);
+    z-index: -1;
+  }
+  
+  .leixing-scroll {
+    white-space: nowrap;
+    height: 180rpx; /* 恢复原大小 */
+  }
+  
+  .leixing-list {
+    display: inline-flex;
+    padding-right: 32rpx;
+  }
+  
+  .leixing-item {
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+    margin-right: 48rpx; /* 增加间距 */
+    position: relative;
+    padding: 12rpx;
+  }
+  
+  .leixing-image-box {
+    width: 100rpx; /* 恢复原大小 */ /* 恢复原大小 */
+    height: 100rpx; /* 恢复原大小 */ /* 恢复原大小 */
+    border-radius: 50%;
+    position: relative;
+    margin-bottom: 16rpx;
+    overflow: hidden;
+    background: white;
+    box-shadow: 
+      0 12rpx 30rpx rgba(0, 0, 0, 0.12),
+      0 4rpx 8rpx rgba(0, 0, 0, 0.06);
+    transition: all 0.4s cubic-bezier(0.34, 1.56, 0.64, 1);
+  }
+  
+  .leixing-active .leixing-image-box {
+    transform: scale(1.12);
+    box-shadow: 
+      0 18rpx 40rpx rgba(255, 204, 0, 0.3),
+      0 8rpx 16rpx rgba(255, 170, 0, 0.2);
+  }
+  
+  .leixing-image {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    object-fit: cover;
+  }
+  
+  .leixing-glow {
+    position: absolute;
+    top: -3rpx;
+    left: -3rpx;
+    right: -3rpx;
+    bottom: -3rpx;
+    border-radius: 50%;
+    background: linear-gradient(135deg, #ffcc00, #ffaa00, #ff8800);
+    opacity: 0;
+    transition: opacity 0.4s;
+    z-index: -1;
+    filter: blur(10rpx);
+  }
+  
+  .leixing-glow-active {
+    opacity: 0.6;
+    animation: glowPulse 2s infinite;
+  }
+  
+  .leixing-sparkle {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 20rpx;
+    height: 20rpx;
+    background: white;
+    border-radius: 50%;
+    transform: translate(-50%, -50%) scale(0);
+    opacity: 0;
+    pointer-events: none;
+  }
+  
+  .sparkle-animation {
+    animation: sparkleFlash 1.5s infinite;
+  }
+  
+  .leixing-text {
+    font-size: 24rpx;
+    color: #555;
+    font-weight: 500;
+    transition: all 0.3s;
+    white-space: nowrap;
+  }
+  
+  .leixing-active .leixing-text {
+    color: #ff9900;
+    font-weight: 600;
+    transform: translateY(-2rpx);
+    text-shadow: 0 2rpx 4rpx rgba(255, 153, 0, 0.2);
+  }
+  
+  .leixing-active-bar {
+    position: absolute;
+    bottom: -4rpx;
+    width: 44rpx;
+    height: 4rpx;
+    background: linear-gradient(90deg, #ffcc00, #ffaa00);
+    border-radius: 2rpx;
+    opacity: 0;
+    transform: scaleX(0);
+    transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+    box-shadow: 0 2rpx 8rpx rgba(255, 170, 0, 0.4);
+  }
+  
+  .leixing-active-bar-show {
+    opacity: 1;
+    transform: scaleX(1);
+  }
+  
+  .leixing-border-effect {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-radius: 50%;
+    border: 2rpx solid transparent;
+    opacity: 0;
+    pointer-events: none;
+  }
+  
+  .border-effect-active {
+    opacity: 1;
+    border-color: rgba(255, 204, 0, 0.5);
+    animation: borderGlow 2s infinite;
+  }
+  
+  /* 3. 左右分栏布局（可滚动区域） */
+  .main-container {
+    flex: 1;
+    display: flex;
+    height: calc(100vh - 300rpx);
+    overflow: hidden;
+  }
+  
+  /* 左边：商品专区列表 */
+  .zhuanqu-left {
+    width: 200rpx;
+    background: rgba(255, 255, 255, 0.7);
+    backdrop-filter: blur(10rpx);
+    border-right: 1rpx solid rgba(0, 0, 0, 0.08);
+    flex-shrink: 0;
+    position: relative;
+  }
+  
+  .zhuanqu-list {
+    padding: 0;
+  }
+  
+  .zhuanqu-item {
+    position: relative;
+    padding: 32rpx 0;
+    border-bottom: 1rpx solid rgba(0, 0, 0, 0.05);
+    transition: all 0.3s;
+  }
+  
+  .zhuanqu-item:active {
+    background: rgba(255, 204, 0, 0.05);
+  }
+  
+  .zhuanqu-item-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 0 20rpx;
+  }
+  
+  .zhuanqu-name {
+    font-size: 26rpx;
+    color: #444;
+    text-align: center;
+    line-height: 1.4;
+    margin-bottom: 8rpx;
+    transition: all 0.3s;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+    font-weight: 500;
+  }
+  
+  .zhuanqu-active .zhuanqu-name {
+    color: #ff9900;
+    font-weight: 600;
+    text-shadow: 0 2rpx 4rpx rgba(255, 153, 0, 0.2);
+  }
+  
+  .zhuanqu-count {
+    font-size: 22rpx;
+    color: #888;
+    transition: all 0.3s;
+  }
+  
+  .zhuanqu-active .zhuanqu-count {
+    color: #ffaa00;
+    font-weight: 500;
+  }
+  
+  .zhuanqu-active-indicator {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 6rpx;
+    height: 44rpx;
+    background: linear-gradient(180deg, #ffcc00, #ffaa00);
+    border-radius: 3rpx 0 0 3rpx;
+    opacity: 0;
+    transition: all 0.3s;
+    overflow: hidden;
+  }
+  
+  .zhuanqu-indicator-glow {
+    opacity: 1;
+    animation: indicatorGlow 2s infinite;
+    box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.5);
+  }
+  
+  .indicator-sparkle {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 10rpx;
+    background: rgba(255, 255, 255, 0.6);
+    animation: sparkleMove 1.5s infinite;
+  }
+  
+  .zhuanqu-hover-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(90deg, transparent, rgba(255, 204, 0, 0.05), transparent);
+    opacity: 0;
+    transition: opacity 0.3s;
+    pointer-events: none;
+  }
+  
+  .zhuanqu-item:active .zhuanqu-hover-glow {
+    opacity: 1;
+  }
+  
+  .zhuanqu-click-effect {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 0;
+    height: 0;
+    border-radius: 50%;
+    background: rgba(255, 204, 0, 0.1);
+    transform: translate(-50%, -50%);
+    opacity: 0;
+    pointer-events: none;
+  }
+  
+  .zhuanqu-item:active .zhuanqu-click-effect {
+    animation: rippleEffect 0.6s ease-out;
+  }
+  
+  .zhuanqu-empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 120rpx 0;
+  }
+  
+  .zhuanqu-empty-icon {
+    width: 120rpx;
+    height: 120rpx;
+    opacity: 0.2;
+    margin-bottom: 28rpx;
+  }
+  
+  .zhuanqu-empty-text {
+    font-size: 26rpx;
+    color: #999;
+  }
+  
+  /* 右边：商品列表（紧凑布局） */
+  .shangpin-right {
+    flex: 1;
+    background: #fafafa;
+  }
+  
+  .shangpin-list {
+    padding: 0;
+  }
+  
+  .shangpin-item {
+    background: white;
+    padding: 28rpx 30rpx 22rpx;
+    position: relative;
+    display: flex;
+    align-items: flex-start;
+    min-height: 140rpx;
+    overflow: hidden;
+  }
+  
+  .shangpin-item:active {
+    background: rgba(0, 0, 0, 0.02);
+  }
+  
+  .shangpin-image-box {
+    margin-right: 24rpx;
+    flex-shrink: 0;
+    position: relative;
+  }
+  
+  .shangpin-image {
+    width: 120rpx;
+    height: 120rpx;
+    border-radius: 14rpx;
+    background: #f5f5f5;
+    object-fit: cover;
+  }
+  
+  .shangpin-image-glow {
+    position: absolute;
+    top: -4rpx;
+    left: -4rpx;
+    right: -4rpx;
+    bottom: -4rpx;
+    border-radius: 18rpx;
+    background: linear-gradient(135deg, rgba(255, 204, 0, 0.2), transparent);
+    opacity: 0;
+    transition: opacity 0.3s;
+    pointer-events: none;
+  }
+  
+  .shangpin-item:active .shangpin-image-glow {
+    opacity: 0.5;
+  }
+  
+  .image-corner {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 20rpx;
+    height: 20rpx;
+    background: linear-gradient(135deg, #ffcc00, transparent 70%);
+    border-radius: 0 14rpx 0 0;
+  }
+  
+  .shangpin-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    height: 120rpx;
+    justify-content: space-between;
+    padding-top: 2rpx; /* 标题与图片顶部对齐 */
+  }
+  
+  .shangpin-title {
+    margin-bottom: 0;
+    position: relative;
+  }
+  
+  .shangpin-title-text {
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #222; /* 黑色加深 */
+    line-height: 1.4;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    overflow: hidden;
+  }
+  
+  .title-underline {
+    position: absolute;
+    bottom: -4rpx;
+    left: 0;
+    width: 0;
+    height: 2rpx;
+    background: linear-gradient(90deg, #ffcc00, #ffaa00);
+    transition: width 0.3s;
+  }
+  
+  .shangpin-item:active .title-underline {
+    width: 40rpx;
+  }
+  
+  .shangpin-footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: auto;
+  }
+  
+  .shangpin-price {
+    display: flex;
+    align-items: baseline;
+    position: relative;
+  }
+  
+  .price-icon {
+    font-size: 24rpx;
+    color: #ff6600;
+    font-weight: 500;
+  }
+  
+  .price-integer {
+    font-size: 36rpx; /* 适当调整大小 */
+    color: #ff6600;
+    font-weight: 600;
+    margin-left: 2rpx;
+  }
+  
+  .price-decimal {
+    font-size: 24rpx;
+    color: #ff6600;
+    font-weight: 500;
+  }
+  
+  .price-glow {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 80rpx;
+    height: 80rpx;
+    background: radial-gradient(circle, rgba(255, 102, 0, 0.1) 0%, transparent 70%);
+    transform: translate(-50%, -50%);
+    opacity: 0;
+    pointer-events: none;
+  }
+  
+  .shangpin-item:active .price-glow {
+    animation: priceGlow 0.6s;
+  }
+  
+  .detail-btn {
+    position: relative;
+    padding: 12rpx 28rpx;
+    background: linear-gradient(135deg, #ffcc00, #ffaa00);
+    border-radius: 40rpx;
+    transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+    overflow: hidden;
+    box-shadow: 0 6rpx 20rpx rgba(255, 170, 0, 0.2);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 120rpx;
+  }
+  
+  .detail-btn:active {
+    transform: scale(0.95);
+    box-shadow: 0 4rpx 15rpx rgba(255, 170, 0, 0.4);
+  }
+  
+  .detail-btn-text {
+    font-size: 24rpx;
+    color: white;
+    font-weight: 500;
+    position: relative;
+    z-index: 2;
+    line-height: 1;
+  }
+  
+  .btn-glow-effect {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4), transparent);
+    transform: translateX(-100%);
+    transition: transform 0.6s;
+  }
+  
+  .detail-btn:active .btn-glow-effect {
+    transform: translateX(100%);
+  }
+  
+  .btn-halo {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 0;
+    height: 0;
+    border-radius: 50%;
+    background: rgba(255, 255, 255, 0.3);
+    transform: translate(-50%, -50%);
+    opacity: 0;
+    pointer-events: none;
+  }
+  
+  .detail-btn:active .btn-halo {
+    animation: buttonHalo 0.6s ease-out;
+  }
+  
+  .btn-star {
+    position: absolute;
+    width: 6rpx;
+    height: 6rpx;
+    background: white;
+    border-radius: 50%;
+    opacity: 0;
+    pointer-events: none;
+  }
+  
+  .detail-btn:active .btn-star {
+    animation: starSparkle 0.8s ease-out;
+  }
+  
+  .item-divider {
+    position: absolute;
+    left: 30rpx;
+    right: 30rpx;
+    bottom: 0;
+    height: 1rpx;
+    background: linear-gradient(90deg, rgba(0, 0, 0, 0.08), rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.08));
+  }
+  
+  .item-hover-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(135deg, transparent, rgba(255, 204, 0, 0.03), transparent);
+    opacity: 0;
+    transition: opacity 0.3s;
+    pointer-events: none;
+  }
+  
+  .shangpin-item:active .item-hover-glow {
+    opacity: 1;
+  }
+  
+  .item-ripple-effect {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 0;
+    height: 0;
+    border-radius: 50%;
+    background: rgba(255, 204, 0, 0.1);
+    transform: translate(-50%, -50%);
+    opacity: 0;
+    pointer-events: none;
+  }
+  
+  .shangpin-item:active .item-ripple-effect {
+    animation: rippleEffect 0.6s ease-out;
+  }
+  
+  .shangpin-empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 150rpx 0;
+  }
+  
+  .shangpin-empty-icon {
+    width: 180rpx;
+    height: 180rpx;
+    opacity: 0.15;
+    margin-bottom: 36rpx;
+  }
+  
+  .shangpin-empty-text {
+    font-size: 28rpx;
+    color: #999;
+    margin-bottom: 40rpx;
+  }
+  
+  .shangpin-empty-btn {
+    background: linear-gradient(135deg, #ffcc00, #ffaa00);
+    color: white;
+    font-size: 26rpx;
+    font-weight: 500;
+    padding: 16rpx 44rpx;
+    border-radius: 40rpx;
+    box-shadow: 0 8rpx 24rpx rgba(255, 170, 0, 0.3);
+    transition: all 0.3s;
+  }
+  
+  .shangpin-empty-btn:active {
+    transform: scale(0.95);
+    box-shadow: 0 4rpx 16rpx rgba(255, 170, 0, 0.4);
+  }
+  
+  .load-more-line {
+    width: 60rpx;
+    height: 1rpx;
+    background: linear-gradient(90deg, transparent, rgba(0, 0, 0, 0.1), transparent);
+  }
+  
+  .load-more-text {
+    font-size: 24rpx;
+    color: #bbb;
+    margin: 0 20rpx;
+  }
+  
+  /* 搜索结果弹窗 */
+  .search-results-container {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 2000;
+    display: flex;
+  }
+  
+  .search-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.5);
+    backdrop-filter: blur(5rpx);
+  }
+  
+  .search-results-content {
+    position: absolute;
+    top: 100rpx;
+    left: 32rpx;
+    right: 32rpx;
+    bottom: 100rpx;
+    background: rgba(255, 255, 255, 0.95);
+    backdrop-filter: blur(30rpx);
+    border-radius: 24rpx;
+    box-shadow: 
+      0 20rpx 60rpx rgba(0, 0, 0, 0.2),
+      inset 0 1rpx 0 rgba(255, 255, 255, 0.8);
+    border: 1rpx solid rgba(255, 255, 255, 0.3);
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+  
+  .search-results-header {
+    padding: 32rpx;
+    border-bottom: 1rpx solid rgba(0, 0, 0, 0.06);
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-shrink: 0;
+  }
+  
+  .search-header-left {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .search-results-title {
+    font-size: 34rpx;
+    font-weight: 600;
+    color: #333;
+  }
+  
+  .search-results-count {
+    font-size: 24rpx;
+    color: #999;
+    margin-left: 12rpx;
+  }
+  
+  .search-close {
+    width: 44rpx;
+    height: 44rpx;
+    border-radius: 50%;
+    background: rgba(0, 0, 0, 0.05);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.3s;
+  }
+  
+  .search-close:active {
+    background: rgba(0, 0, 0, 0.1);
+    transform: scale(0.9);
+  }
+  
+  .close-icon {
+    width: 20rpx;
+    height: 20rpx;
+    opacity: 0.6;
+  }
+  
+  .search-results-list {
+    flex: 1;
+    height: 100%;
+  }
+  
+  .search-result-item {
+    display: flex;
+    padding: 28rpx 32rpx;
+    border-bottom: 1rpx solid rgba(0, 0, 0, 0.04);
+    position: relative;
+    transition: all 0.3s;
+  }
+  
+  .search-result-item:active {
+    background: rgba(0, 0, 0, 0.02);
+    transform: translateY(-2rpx);
+  }
+  
+  .search-result-left {
+    margin-right: 24rpx;
+    position: relative;
+  }
+  
+  .search-result-image {
+    width: 120rpx;
+    height: 120rpx;
+    border-radius: 16rpx;
+    background: #f5f5f5;
+    object-fit: cover;
+  }
+  
+  .search-image-glow {
+    position: absolute;
+    top: -4rpx;
+    left: -4rpx;
+    right: -4rpx;
+    bottom: -4rpx;
+    border-radius: 20rpx;
+    background: linear-gradient(135deg, rgba(255, 204, 0, 0.2), transparent);
+    opacity: 0;
+    transition: opacity 0.3s;
+    pointer-events: none;
+  }
+  
+  .search-result-item:active .search-image-glow {
+    opacity: 0.5;
+  }
+  
+  .search-result-right {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+  
+  .search-result-title {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #333;
+    line-height: 1.4;
+    margin-bottom: 16rpx;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+  }
+  
+  .search-result-info {
+    display: flex;
+    gap: 12rpx;
+    margin-bottom: 20rpx;
+  }
+  
+  .info-tag {
+    padding: 6rpx 12rpx;
+    background: rgba(255, 204, 0, 0.1);
+    border-radius: 6rpx;
+  }
+  
+  .search-result-category {
+    font-size: 22rpx;
+    color: #666;
+  }
+  
+  .search-result-zhuanqu {
+    font-size: 22rpx;
+    color: #888;
+  }
+  
+  .search-result-price {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .search-item-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(135deg, transparent, rgba(255, 204, 0, 0.05), transparent);
+    opacity: 0;
+    transition: opacity 0.3s;
+    pointer-events: none;
+  }
+  
+  .search-result-item:active .search-item-glow {
+    opacity: 1;
+  }
+  
+  .search-empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 160rpx 0;
+  }
+  
+  .search-empty-icon {
+    width: 160rpx;
+    height: 160rpx;
+    opacity: 0.2;
+    margin-bottom: 36rpx;
+  }
+  
+  .search-empty-text {
+    font-size: 30rpx;
+    color: #999;
+    margin-bottom: 16rpx;
+  }
+  
+  .search-empty-tip {
+    font-size: 24rpx;
+    color: #bbb;
+  }
+  
+  .search-loading {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 160rpx 0;
+  }
+  
+  .search-spinner {
+    width: 60rpx;
+    height: 60rpx;
+    position: relative;
+    margin-bottom: 24rpx;
+  }
+  
+  .spinner-circle {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border: 4rpx solid transparent;
+    border-top-color: #ffcc00;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+  }
+  
+  .search-loading-text {
+    font-size: 26rpx;
+    color: #999;
+  }
+  
+  /* 全局加载状态 */
+  .loading-toast {
+    backdrop-filter: blur(10rpx);
+    z-index: 3000;
+  }
+  
+  .loading-content {
+    background: rgba(255, 255, 255, 0.1);
+    backdrop-filter: blur(20rpx);
+    padding: 60rpx 80rpx;
+    border-radius: 24rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    position: relative;
+    border: 1rpx solid rgba(255, 255, 255, 0.1);
+  }
+  
+  .loading-spinner {
+    width: 80rpx;
+    height: 80rpx;
+    position: relative;
+    margin-bottom: 30rpx;
+  }
+  
+  .spinner-ring {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border: 4rpx solid rgba(255, 255, 255, 0.2);
+    border-radius: 50%;
+  }
+  
+  .spinner-dot {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    width: 12rpx;
+    height: 12rpx;
+    background: #ffcc00;
+    border-radius: 50%;
+    transform: translateX(-50%);
+    animation: spin 1s linear infinite;
+  }
+  
+  .loading-text {
+    font-size: 28rpx;
+    font-weight: 500;
+  }
+  
+  .loading-glow {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 200rpx;
+    height: 200rpx;
+    background: radial-gradient(circle, rgba(255, 204, 0, 0.2) 0%, transparent 70%);
+    transform: translate(-50%, -50%);
+    z-index: -1;
+  }
+  
+  /* 动画定义 */
+  @keyframes glowPulse {
+    0%, 100% {
+      opacity: 0.4;
+      transform: scale(1);
+    }
+    50% {
+      opacity: 0.8;
+      transform: scale(1.05);
+    }
+  }
+  
+  @keyframes sparkleFlash {
+    0%, 100% {
+      opacity: 0;
+      transform: translate(-50%, -50%) scale(0);
+    }
+    50% {
+      opacity: 1;
+      transform: translate(-50%, -50%) scale(1);
+      filter: blur(0);
+    }
+  }
+  
+  @keyframes borderGlow {
+    0%, 100% {
+      border-color: rgba(255, 204, 0, 0.3);
+    }
+    50% {
+      border-color: rgba(255, 204, 0, 0.8);
+    }
+  }
+  
+  @keyframes indicatorGlow {
+    0%, 100% {
+      box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.3);
+    }
+    50% {
+      box-shadow: 0 0 30rpx rgba(255, 204, 0, 0.8);
+    }
+  }
+  
+  @keyframes sparkleMove {
+    0% {
+      transform: translateY(-100%);
+      opacity: 0;
+    }
+    50% {
+      opacity: 1;
+    }
+    100% {
+      transform: translateY(400%);
+      opacity: 0;
+    }
+  }
+  
+  @keyframes rippleEffect {
+    0% {
+      width: 0;
+      height: 0;
+      opacity: 0.5;
+    }
+    100% {
+      width: 200rpx;
+      height: 200rpx;
+      opacity: 0;
+    }
+  }
+  
+  @keyframes priceGlow {
+    0% {
+      opacity: 0;
+      transform: translate(-50%, -50%) scale(0.5);
+    }
+    50% {
+      opacity: 0.6;
+      transform: translate(-50%, -50%) scale(1);
+    }
+    100% {
+      opacity: 0;
+      transform: translate(-50%, -50%) scale(1.5);
+    }
+  }
+  
+  @keyframes buttonHalo {
+    0% {
+      width: 0;
+      height: 0;
+      opacity: 0.6;
+    }
+    100% {
+      width: 200rpx;
+      height: 200rpx;
+      opacity: 0;
+    }
+  }
+  
+  @keyframes starSparkle {
+    0% {
+      opacity: 0;
+      transform: translate(0, 0) scale(0);
+    }
+    20% {
+      opacity: 1;
+      transform: translate(-40rpx, -30rpx) scale(1);
+    }
+    40% {
+      opacity: 1;
+      transform: translate(30rpx, -20rpx) scale(1);
+    }
+    60% {
+      opacity: 1;
+      transform: translate(-20rpx, 40rpx) scale(1);
+    }
+    80% {
+      opacity: 1;
+      transform: translate(40rpx, 20rpx) scale(1);
+    }
+    100% {
+      opacity: 0;
+      transform: translate(0, 0) scale(0);
+    }
   }
\ No newline at end of file
diff --git a/pages/cfss/components/fakuan-list/fakuan-list.json b/pages/cfss/components/fakuan-list/fakuan-list.json
deleted file mode 100644
index d192c45..0000000
--- a/pages/cfss/components/fakuan-list/fakuan-list.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "component": true,
-    "usingComponents": {
-        "fakuan-pay": "/pages/cfss/components/fakuan-pay/fakuan-pay"
-    }
-}
\ No newline at end of file
diff --git a/pages/liaotian/liaotian.js b/pages/chat/chat.js
similarity index 100%
rename from pages/liaotian/liaotian.js
rename to pages/chat/chat.js
diff --git a/pages/kefuliaotian/kefuliaotian.json b/pages/chat/chat.json
similarity index 100%
rename from pages/kefuliaotian/kefuliaotian.json
rename to pages/chat/chat.json
diff --git a/pages/liaotian/liaotian.wxml b/pages/chat/chat.wxml
similarity index 100%
rename from pages/liaotian/liaotian.wxml
rename to pages/chat/chat.wxml
diff --git a/pages/liaotian/liaotian.wxss b/pages/chat/chat.wxss
similarity index 100%
rename from pages/liaotian/liaotian.wxss
rename to pages/chat/chat.wxss
diff --git a/pages/kefuliaotian/kefuliaotian.js b/pages/cs-chat/cs-chat.js
similarity index 97%
rename from pages/kefuliaotian/kefuliaotian.js
rename to pages/cs-chat/cs-chat.js
index 1e8f232..645fcd6 100644
--- a/pages/kefuliaotian/kefuliaotian.js
+++ b/pages/cs-chat/cs-chat.js
@@ -41,10 +41,8 @@ Page({
         teamName = p.teamName || '客服';
         teamAvatar = p.teamAvatar || '';
       } catch (e) {
-        console.error('解析客服页面参数失败', e);
       }
     }
-    // 默认头像使用全局配置
     if (!teamAvatar) {
       teamAvatar = app.globalData.ossImageUrl + app.globalData.morentouxiang;
     }
@@ -171,7 +169,7 @@ Page({
     this.setData({ messages: msgs });
   },
 
-  // ---------- 历史消息 + 永久欢迎语 ----------
+  // 历史消息
   loadHistory(refresh) {
     if (!refresh && !this.data.hasMore) return Promise.resolve();
     return new Promise((resolve) => {
@@ -209,7 +207,7 @@ Page({
           const unique = [];
           for (const m of final) { if (!ids.has(m.messageId)) { ids.add(m.messageId); unique.push(m); } }
 
-          // 强制在第一行插入欢迎语（如果不存在）
+          // 插入欢迎语
           const welcomeId = 'welcome-cs';
           if (!unique.some(m => m.messageId === welcomeId)) {
             const welcome = this.createWelcomeMessage();
@@ -249,7 +247,7 @@ Page({
     };
   },
 
-  // ---------- 接收新客服消息 ----------
+  // 接收新客服消息
   listenNewMsg() {
     if (this._msgHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CS_MESSAGE_RECEIVED, this._msgHandler);
     this._msgHandler = (msg) => {
@@ -310,7 +308,7 @@ Page({
     wx.goEasy.im.on(wx.GoEasy.IM_EVENT.MESSAGE_DELETED, this._deleteHandler);
   },
 
-  // ---------- 面板控制 ----------
+  // 面板控制
   togglePlusPanel() { this.setData({ showPlusPanel: !this.data.showPlusPanel, showEmojiPanel: false }); },
   closePlusPanel() { this.setData({ showPlusPanel: false }); },
   openEmojiFromPlus() { this.setData({ showPlusPanel: false, showEmojiPanel: true }); },
@@ -318,7 +316,7 @@ Page({
   insertEmoji(e) { this.setData({ inputText: this.data.inputText + e.currentTarget.dataset.emoji }); },
   closeEmojiPanel() { this.setData({ showEmojiPanel: false }); },
 
-  // ---------- 发送消息 ----------
+  // 发送消息
   onInput(e) { this.setData({ inputText: e.detail.value }); },
   chooseImage() {
     const that = this;
@@ -409,7 +407,7 @@ Page({
     });
   },
 
-  // ---------- 订单发送 ----------
+  // 订单发送
   openOrderSender() { this.setData({ showOrderSender: true, showPlusPanel: false }); },
   closeOrderSender() { this.setData({ showOrderSender: false }); },
   onSendOrder(e) {
@@ -445,7 +443,7 @@ Page({
   updateMsg(id, status) { this.setData({ messages: this.data.messages.map(m => m.messageId === id ? { ...m, status } : m) }); },
   needShow(ts) { const ms = this.data.messages; if (!ms.length) return true; const last = ms[ms.length-1]; return (ts - last.timestamp) / 60000 > 5; },
 
-  // ---------- 消息操作 ----------
+  // 消息操作
   onBubbleTap(e) {
     const msgId = e.currentTarget.dataset.messageid;
     const text = e.currentTarget.dataset.text;
diff --git a/pages/liaotian/liaotian.json b/pages/cs-chat/cs-chat.json
similarity index 100%
rename from pages/liaotian/liaotian.json
rename to pages/cs-chat/cs-chat.json
diff --git a/pages/kefuliaotian/kefuliaotian.wxml b/pages/cs-chat/cs-chat.wxml
similarity index 100%
rename from pages/kefuliaotian/kefuliaotian.wxml
rename to pages/cs-chat/cs-chat.wxml
diff --git a/pages/kefuliaotian/kefuliaotian.wxss b/pages/cs-chat/cs-chat.wxss
similarity index 100%
rename from pages/kefuliaotian/kefuliaotian.wxss
rename to pages/cs-chat/cs-chat.wxss
diff --git a/pages/xiugai/xiugai.js b/pages/edit/edit.js
similarity index 91%
rename from pages/xiugai/xiugai.js
rename to pages/edit/edit.js
index 4615e24..5970c5b 100644
--- a/pages/xiugai/xiugai.js
+++ b/pages/edit/edit.js
@@ -1,228 +1,227 @@
-// pages/xiugai/xiugai.js
-const app = getApp()
-import upload from '../../utils/upload.js'
-
-Page({
-  data: {
-    avatarUrl: '',
-    uid: '',
-    nicheng: '',
-    phone: '',
-    originalAvatar: '',
-    originalNicheng: '',
-    isSaving: false,
-    hasChanges: false,
-    newAvatarFile: null,
-    isLoading: true,
-    isAvatarActive: false,
-    nicknameError: ''
-  },
-
-  onLoad() {
-    wx.setNavigationBarTitle({ title: '编辑资料' })
-    this.loadUserData()
-  },
-
-  onShow() {
-    this.registerNotificationComponent();
-  },
-
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  // 加载用户数据（手机号只读，不参与修改逻辑）
-  loadUserData() {
-    try {
-      const uid = wx.getStorageSync('uid') || ''
-      const nicheng = wx.getStorageSync('nicheng') || ''
-      const phone = wx.getStorageSync('phone') || ''
-      const touxiang = wx.getStorageSync('touxiang') || ''
-      
-      const ossImageUrl = app.globalData.ossImageUrl || ''
-      const defaultAvatar = app.globalData.morentouxiang || ''
-      
-      let avatarUrl = ''
-      if (touxiang) {
-        avatarUrl = touxiang.startsWith('http') ? touxiang : `${ossImageUrl}${touxiang}`
-      } else if (defaultAvatar) {
-        avatarUrl = defaultAvatar.startsWith('http') ? defaultAvatar : `${ossImageUrl}${defaultAvatar}`
-      }
-      
-      this.setData({
-        avatarUrl,
-        uid,
-        nicheng,
-        phone,                   // 仅展示
-        originalAvatar: touxiang,
-        originalNicheng: nicheng,
-        isLoading: false
-      })
-    } catch (error) {
-      console.error('加载用户数据失败:', error)
-      this.setData({ isLoading: false })
-      wx.showToast({ title: '加载数据失败', icon: 'none' })
-    }
-  },
-
-  // 微信头像选择（未改动）
-  onChooseAvatar(e) {
-    const avatarTempPath = e.detail.avatarUrl
-    this.setData({
-      avatarUrl: avatarTempPath,
-      newAvatarFile: avatarTempPath
-    }, () => {
-      this.checkChanges()
-    })
-  },
-
-  chooseAvatar() {
-    // 仅保留动画效果（透明按钮已触发 onChooseAvatar）
-    this.setData({ isAvatarActive: true })
-    setTimeout(() => {
-      this.setData({ isAvatarActive: false })
-    }, 500)
-  },
-
-  // 昵称输入（未改动）
-  onNicknameInput(e) {
-    const value = e.detail.value.trim()
-    this.setData({
-      nicheng: value,
-      nicknameError: ''
-    }, () => {
-      this.checkChanges()
-    })
-  },
-
-  // 检查变化（只比较昵称和头像）
-  checkChanges() {
-    const { originalNicheng, nicheng, newAvatarFile } = this.data;
-    const hasChanges = (nicheng !== originalNicheng) || (newAvatarFile !== null);
-    this.setData({ hasChanges });
-  },
-
-  // 保存（不包含手机号逻辑）
-  async onSave() {
-    if (!this.data.hasChanges) {
-      wx.showToast({ title: '没有需要保存的更改', icon: 'none' });
-      return;
-    }
-    if (this.data.isSaving) return;
-    
-    // 验证数据（昵称）
-    if (!this.validateData()) return;
-    
-    this.setData({ isSaving: true });
-    wx.showLoading({ title: '保存中...', mask: true });
-    
-    try {
-      const formData = {};
-      if (this.data.nicheng !== this.data.originalNicheng) {
-        formData.nicheng = this.data.nicheng;
-      }
-      
-      const res = await upload({
-        url: '/yonghu/xiugai',
-        formData,
-        filePath: this.data.newAvatarFile,
-        fileName: 'avatar'
-      });
-      
-      if (res.statusCode === 200 && res.data) {
-        const response = res.data;
-        if (response.code === 0) {
-          await this.handleUpdateSuccess(response.data);
-        } else {
-          throw new Error(response.msg || '保存失败');
-        }
-      } else {
-        throw new Error('网络错误');
-      }
-    } catch (error) {
-      console.error('保存失败:', error);
-      if (error.message.includes('认证失败') || error.message.includes('401')) {
-        wx.showModal({
-          title: '提示',
-          content: '登录已过期，请重新登录',
-          complete: (res) => {
-            if (res.confirm) {
-              wx.removeStorageSync('token');
-              wx.removeStorageSync('userInfo');
-              wx.switchTab({ url: '/pages/wode/wode' });
-            }
-          }
-        });
-      } else {
-        wx.showToast({ title: error.message || '保存失败', icon: 'none' });
-      }
-    } finally {
-      wx.hideLoading();
-      this.setData({ isSaving: false });
-    }
-  },
-
-  // 验证数据（只验证昵称）
-  validateData() {
-    const { nicheng } = this.data;
-    let hasError = false;
-    this.setData({ nicknameError: '' });
-    
-    if (nicheng && nicheng.length > 20) {
-      this.setData({ nicknameError: '昵称不能超过20个字符' });
-      hasError = true;
-    }
-    if (nicheng !== this.data.originalNicheng && nicheng.trim() === '') {
-      this.setData({ nicknameError: '昵称不能为空' });
-      hasError = true;
-    }
-    if (hasError) {
-      if (this.data.nicknameError) {
-        wx.showToast({ title: this.data.nicknameError, icon: 'none' });
-      }
-      return false;
-    }
-    return true;
-  },
-
-  // 更新成功处理（不再处理手机号）
-  async handleUpdateSuccess(updateData) {
-    if (updateData.touxiang !== undefined && updateData.touxiang !== null) {
-      wx.setStorageSync('touxiang', updateData.touxiang);
-    }
-    if (updateData.nicheng !== undefined && updateData.nicheng !== null) {
-      wx.setStorageSync('nicheng', updateData.nicheng);
-    }
-    
-    if (updateData.nicheng) {
-      app.globalData.userNicheng = updateData.nicheng;
-    }
-    
-    const ossImageUrl = app.globalData.ossImageUrl || '';
-    let avatarUrl = this.data.avatarUrl;
-    if (updateData.touxiang) {
-      avatarUrl = updateData.touxiang.startsWith('http') ? 
-        updateData.touxiang : `${ossImageUrl}${updateData.touxiang}`;
-    }
-    
-    this.setData({
-      avatarUrl,
-      originalAvatar: updateData.touxiang || this.data.originalAvatar,
-      originalNicheng: updateData.nicheng || this.data.originalNicheng,
-      newAvatarFile: null,
-      hasChanges: false
-    });
-    
-    wx.showToast({
-      title: '保存成功',
-      icon: 'success',
-      duration: 2000
-    });
-  }
+// pages/edit/edit.js
+const app = getApp()
+import upload from '../../utils/upload.js'
+
+Page({
+  data: {
+    avatarUrl: '',
+    uid: '',
+    nicheng: '',
+    phone: '',
+    originalAvatar: '',
+    originalNicheng: '',
+    isSaving: false,
+    hasChanges: false,
+    newAvatarFile: null,
+    isLoading: true,
+    isAvatarActive: false,
+    nicknameError: ''
+  },
+
+  onLoad() {
+    wx.setNavigationBarTitle({ title: '编辑资料' })
+    this.loadUserData()
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  // 加载用户数据
+  loadUserData() {
+    try {
+      const uid = wx.getStorageSync('uid') || ''
+      const nicheng = wx.getStorageSync('nicheng') || ''
+      const phone = wx.getStorageSync('phone') || ''
+      const touxiang = wx.getStorageSync('touxiang') || ''
+      
+      const ossImageUrl = app.globalData.ossImageUrl || ''
+      const defaultAvatar = app.globalData.morentouxiang || ''
+      
+      let avatarUrl = ''
+      if (touxiang) {
+        avatarUrl = touxiang.startsWith('http') ? touxiang : `${ossImageUrl}${touxiang}`
+      } else if (defaultAvatar) {
+        avatarUrl = defaultAvatar.startsWith('http') ? defaultAvatar : `${ossImageUrl}${defaultAvatar}`
+      }
+      
+      this.setData({
+        avatarUrl,
+        uid,
+        nicheng,
+        phone,
+        originalAvatar: touxiang,
+        originalNicheng: nicheng,
+        isLoading: false
+      })
+    } catch (error) {
+      console.error('加载用户数据失败:', error)
+      this.setData({ isLoading: false })
+      wx.showToast({ title: '加载数据失败', icon: 'none' })
+    }
+  },
+
+  // 微信头像选择
+  onChooseAvatar(e) {
+    const avatarTempPath = e.detail.avatarUrl
+    this.setData({
+      avatarUrl: avatarTempPath,
+      newAvatarFile: avatarTempPath
+    }, () => {
+      this.checkChanges()
+    })
+  },
+
+  chooseAvatar() {
+    this.setData({ isAvatarActive: true })
+    setTimeout(() => {
+      this.setData({ isAvatarActive: false })
+    }, 500)
+  },
+
+  // 昵称输入
+  onNicknameInput(e) {
+    const value = e.detail.value.trim()
+    this.setData({
+      nicheng: value,
+      nicknameError: ''
+    }, () => {
+      this.checkChanges()
+    })
+  },
+
+  // 检查变化
+  checkChanges() {
+    const { originalNicheng, nicheng, newAvatarFile } = this.data;
+    const hasChanges = (nicheng !== originalNicheng) || (newAvatarFile !== null);
+    this.setData({ hasChanges });
+  },
+
+  // 保存
+  async onSave() {
+    if (!this.data.hasChanges) {
+      wx.showToast({ title: '没有需要保存的更改', icon: 'none' });
+      return;
+    }
+    if (this.data.isSaving) return;
+    
+    // 验证数据
+    if (!this.validateData()) return;
+    
+    this.setData({ isSaving: true });
+    wx.showLoading({ title: '保存中...', mask: true });
+    
+    try {
+      const formData = {};
+      if (this.data.nicheng !== this.data.originalNicheng) {
+        formData.nicheng = this.data.nicheng;
+      }
+      
+      const res = await upload({
+        url: '/yonghu/xiugai',
+        formData,
+        filePath: this.data.newAvatarFile,
+        fileName: 'avatar'
+      });
+      
+      if (res.statusCode === 200 && res.data) {
+        const response = res.data;
+        if (response.code === 0) {
+          await this.handleUpdateSuccess(response.data);
+        } else {
+          throw new Error(response.msg || '保存失败');
+        }
+      } else {
+        throw new Error('网络错误');
+      }
+    } catch (error) {
+      console.error('保存失败:', error);
+      if (error.message.includes('认证失败') || error.message.includes('401')) {
+        wx.showModal({
+          title: '提示',
+          content: '登录已过期，请重新登录',
+          complete: (res) => {
+            if (res.confirm) {
+              wx.removeStorageSync('token');
+              wx.removeStorageSync('userInfo');
+              wx.switchTab({ url: '/pages/mine/mine' });
+            }
+          }
+        });
+      } else {
+        wx.showToast({ title: error.message || '保存失败', icon: 'none' });
+      }
+    } finally {
+      wx.hideLoading();
+      this.setData({ isSaving: false });
+    }
+  },
+
+  // 验证数据
+  validateData() {
+    const { nicheng } = this.data;
+    let hasError = false;
+    this.setData({ nicknameError: '' });
+    
+    if (nicheng && nicheng.length > 20) {
+      this.setData({ nicknameError: '昵称不能超过20个字符' });
+      hasError = true;
+    }
+    if (nicheng !== this.data.originalNicheng && nicheng.trim() === '') {
+      this.setData({ nicknameError: '昵称不能为空' });
+      hasError = true;
+    }
+    if (hasError) {
+      if (this.data.nicknameError) {
+        wx.showToast({ title: this.data.nicknameError, icon: 'none' });
+      }
+      return false;
+    }
+    return true;
+  },
+
+  // 更新成功处理
+  async handleUpdateSuccess(updateData) {
+    if (updateData.touxiang !== undefined && updateData.touxiang !== null) {
+      wx.setStorageSync('touxiang', updateData.touxiang);
+    }
+    if (updateData.nicheng !== undefined && updateData.nicheng !== null) {
+      wx.setStorageSync('nicheng', updateData.nicheng);
+    }
+    
+    if (updateData.nicheng) {
+      app.globalData.userNicheng = updateData.nicheng;
+    }
+    
+    const ossImageUrl = app.globalData.ossImageUrl || '';
+    let avatarUrl = this.data.avatarUrl;
+    if (updateData.touxiang) {
+      avatarUrl = updateData.touxiang.startsWith('http') ? 
+        updateData.touxiang : `${ossImageUrl}${updateData.touxiang}`;
+    }
+    
+    this.setData({
+      avatarUrl,
+      originalAvatar: updateData.touxiang || this.data.originalAvatar,
+      originalNicheng: updateData.nicheng || this.data.originalNicheng,
+      newAvatarFile: null,
+      hasChanges: false
+    });
+    
+    wx.showToast({
+      title: '保存成功',
+      icon: 'success',
+      duration: 2000
+    });
+  }
 });
\ No newline at end of file
diff --git a/pages/xiugai/xiugai.json b/pages/edit/edit.json
similarity index 100%
rename from pages/xiugai/xiugai.json
rename to pages/edit/edit.json
diff --git a/pages/xiugai/xiugai.wxml b/pages/edit/edit.wxml
similarity index 95%
rename from pages/xiugai/xiugai.wxml
rename to pages/edit/edit.wxml
index d5156be..49d217d 100644
--- a/pages/xiugai/xiugai.wxml
+++ b/pages/edit/edit.wxml
@@ -1,69 +1,69 @@
-<!-- pages/xiugai/xiugai.wxml -->
-<view class="xiugai-page">
-  
-  <!-- 头像区域（未改动） -->
-  <view class="avatar-section">
-  <view class="avatar-container {{isAvatarActive ? 'active' : ''}}">
-    <!-- 新增：头像包装器，把头像+光晕包在一起，和提示文字隔离 -->
-    <view class="avatar-image-wrapper">
-      <image class="avatar-image" src="{{avatarUrl}}" mode="aspectFill"></image>
-      <view class="avatar-halo"></view>
-    </view>
-    <view class="avatar-hint">点击更换头像</view>
-  </view>
-  <button 
-    class="avatar-trigger-button"
-    open-type="chooseAvatar"
-    bindchooseavatar="onChooseAvatar"
-    hover-class="none"
-  ></button>
-</view>
-  
-  <!-- 表单区域 -->
-  <view class="form-section">
-    <!-- UID（只读） -->
-    <view class="form-item">
-      <view class="item-label">UID</view>
-      <view class="item-value readonly">{{uid || '••••••'}}</view>
-    </view>
-    
-    <!-- 昵称（可编辑） -->
-    <view class="form-item">
-      <view class="item-label">昵称</view>
-      <view class="input-container">
-        <input 
-          class="item-input {{nicknameError ? 'error' : ''}}" 
-          type="text" 
-          placeholder="请输入昵称"
-          placeholder-class="placeholder"
-          maxlength="20"
-          value="{{nicheng}}"
-          bindinput="onNicknameInput"
-        />
-        <view class="error-hint" wx:if="{{nicknameError}}">{{nicknameError}}</view>
-      </view>
-    </view>
-    
-    <!-- 手机号（只读展示，不可修改） -->
-    <view class="form-item">
-      <view class="item-label">手机号</view>
-      <view class="item-value readonly">{{phone || '未绑定'}}</view>
-    </view>
-  </view>
-  
-  <!-- 保存按钮（未改动） -->
-  <button 
-    class="save-btn" 
-    bindtap="onSave"
-    hover-class="btn-hover"
-    disabled="{{isSaving || !hasChanges}}"
-  >
-    <view class="btn-content">
-      {{isSaving ? '保存中...' : '确认保存'}}
-      <view class="btn-sparkle" wx:if="{{!isSaving}}"></view>
-    </view>
-  </button>
-  
-  <view class="safe-area"></view>
-  <global-notification id="global-notification" />
+<!-- pages/edit/edit.wxml -->
+<view class="xiugai-page">
+  
+  <!-- 头像区域（未改动） -->
+  <view class="avatar-section">
+  <view class="avatar-container {{isAvatarActive ? 'active' : ''}}">
+    <!-- 新增：头像包装器，把头像+光晕包在一起，和提示文字隔离 -->
+    <view class="avatar-image-wrapper">
+      <image class="avatar-image" src="{{avatarUrl}}" mode="aspectFill"></image>
+      <view class="avatar-halo"></view>
+    </view>
+    <view class="avatar-hint">点击更换头像</view>
+  </view>
+  <button 
+    class="avatar-trigger-button"
+    open-type="chooseAvatar"
+    bindchooseavatar="onChooseAvatar"
+    hover-class="none"
+  ></button>
+</view>
+  
+  <!-- 表单区域 -->
+  <view class="form-section">
+    <!-- UID（只读） -->
+    <view class="form-item">
+      <view class="item-label">UID</view>
+      <view class="item-value readonly">{{uid || '••••••'}}</view>
+    </view>
+    
+    <!-- 昵称（可编辑） -->
+    <view class="form-item">
+      <view class="item-label">昵称</view>
+      <view class="input-container">
+        <input 
+          class="item-input {{nicknameError ? 'error' : ''}}" 
+          type="text" 
+          placeholder="请输入昵称"
+          placeholder-class="placeholder"
+          maxlength="20"
+          value="{{nicheng}}"
+          bindinput="onNicknameInput"
+        />
+        <view class="error-hint" wx:if="{{nicknameError}}">{{nicknameError}}</view>
+      </view>
+    </view>
+    
+    <!-- 手机号（只读展示，不可修改） -->
+    <view class="form-item">
+      <view class="item-label">手机号</view>
+      <view class="item-value readonly">{{phone || '未绑定'}}</view>
+    </view>
+  </view>
+  
+  <!-- 保存按钮（未改动） -->
+  <button 
+    class="save-btn" 
+    bindtap="onSave"
+    hover-class="btn-hover"
+    disabled="{{isSaving || !hasChanges}}"
+  >
+    <view class="btn-content">
+      {{isSaving ? '保存中...' : '确认保存'}}
+      <view class="btn-sparkle" wx:if="{{!isSaving}}"></view>
+    </view>
+  </button>
+  
+  <view class="safe-area"></view>
+  <global-notification id="global-notification" />
 </view>
\ No newline at end of file
diff --git a/pages/xiugai/xiugai.wxss b/pages/edit/edit.wxss
similarity index 86%
rename from pages/xiugai/xiugai.wxss
rename to pages/edit/edit.wxss
index 4e176e4..f98b51a 100644
--- a/pages/xiugai/xiugai.wxss
+++ b/pages/edit/edit.wxss
@@ -1,401 +1,380 @@
-/* pages/xiugai/xiugai.wxss */
-page {
-  background: linear-gradient(135deg, #fffaf0 0%, #f0f8ff 100%);
-  min-height: 100vh;
-}
-
-.xiugai-page {
-  padding: 30rpx 40rpx 100rpx;
-}
-
-/* ============ 头像区域样式 ============ */
-.avatar-section {
-  position: relative;
-  display: flex;
-  justify-content: center;
-  margin-bottom: 60rpx;
-  padding-top: 30rpx;
-}
-
-.avatar-container {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-/* 头像包装器：精确居中，包含头像+光晕 */
-.avatar-image-wrapper {
-  position: relative;
-  width: 200rpx;
-  height: 200rpx;
-  flex-shrink: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-/* 头像图片 */
-.avatar-image {
-  width: 200rpx;
-  height: 200rpx;
-  border-radius: 50%;
-  border: 6rpx solid #fff;
-  background-color: #f8f9fa;
-  z-index: 2;
-  position: relative;
-  animation: gentleBreath 4s ease-in-out infinite;
-  box-shadow: 
-      0 0 0 1rpx rgba(0, 200, 83, 0.3),
-      0 15rpx 40rpx rgba(0, 200, 83, 0.15);
-  box-sizing: border-box;  /* 关键：边框向内计算，不占宽度 */
-}
-
-/* ✅ 光晕精确居中：已计算头像 6rpx 边框的偏移量 */
-.avatar-halo {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);  /* 强制居中，无视任何偏差 */
-  width: 228rpx;    /* 精确计算：200 + 6*2(边框) + 8*2(外延) = 228 */
-  height: 228rpx;
-  border-radius: 50%;
-  background: transparent;
-  border: 3rpx solid transparent;
-  animation: gentleGlow 2s ease-in-out infinite, colorShift 3s ease-in-out infinite;
-  opacity: 0;
-  z-index: 1;
-  pointer-events: none;
-}
-
-/* ✅ 像素点环绕也强制居中 */
-.avatar-image-wrapper::before {
-  content: '';
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 230rpx;
-  height: 230rpx;
-  border-radius: 50%;
-  background: 
-      radial-gradient(circle at 30% 30%, rgba(0, 200, 83, 0.1) 0%, transparent 50%),
-      radial-gradient(circle at 70% 70%, rgba(100, 221, 23, 0.1) 0%, transparent 50%);
-  animation: pixelOrbit 4s linear infinite;
-  z-index: 0;
-  pointer-events: none;
-}
-
-/* 温和的呼吸动画 */
-@keyframes gentleBreath {
-  0%, 100% {
-      transform: scale(1);
-      box-shadow: 
-          0 0 0 2rpx rgba(0, 200, 83, 0.4),
-          0 15rpx 40rpx rgba(0, 200, 83, 0.2);
-  }
-  50% {
-      transform: scale(1.03);
-      box-shadow: 
-          0 0 0 5rpx rgba(0, 200, 83, 0.6),
-          0 20rpx 50rpx rgba(0, 200, 83, 0.3);
-  }
-}
-
-/* 光晕动画 */
-@keyframes gentleGlow {
-  0%, 100% {
-      opacity: 0;
-      transform: translate(-50%, -50%) scale(0.98);
-  }
-  50% {
-      opacity: 1;
-      transform: translate(-50%, -50%) scale(1.05);
-  }
-}
-
-@keyframes colorShift {
-  0% {
-      border-color: rgba(0, 200, 83, 0.5);
-  }
-  33% {
-      border-color: rgba(100, 221, 23, 0.5);
-  }
-  66% {
-      border-color: rgba(0, 255, 153, 0.5);
-  }
-  100% {
-      border-color: rgba(0, 200, 83, 0.5);
-  }
-}
-
-@keyframes pixelOrbit {
-  0% {
-      transform: translate(-50%, -50%) rotate(0deg);
-  }
-  100% {
-      transform: translate(-50%, -50%) rotate(360deg);
-  }
-}
-
-/* 更换提示 */
-.avatar-hint {
-  margin-top: 25rpx;
-  font-size: 28rpx;
-  color: #666;
-  padding: 12rpx 30rpx;
-  background: rgba(255, 255, 255, 0.9);
-  border-radius: 25rpx;
-  border: 1rpx solid #eee;
-  box-shadow: 0 5rpx 15rpx rgba(0, 0, 0, 0.05);
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-hint::before {
-  content: '';
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 2rpx;
-  background: linear-gradient(90deg, transparent, #00C853, transparent);
-  animation: hintGlow 2s ease-in-out infinite;
-}
-
-@keyframes hintGlow {
-  0%, 100% {
-      opacity: 0.3;
-  }
-  50% {
-      opacity: 1;
-  }
-}
-
-/* 点击特效 */
-.avatar-container.active .avatar-image {
-  animation: clickScale 0.5s ease;
-}
-
-@keyframes clickScale {
-  0%, 100% {
-      transform: scale(1);
-  }
-  50% {
-      transform: scale(0.95);
-  }
-}
-
-/* 下载状态 */
-.avatar-container.downloading .avatar-image {
-  opacity: 0.7;
-  filter: grayscale(30%);
-}
-
-/* 透明功能按钮 */
-.avatar-trigger-button {
-  position: absolute;
-  top: 30rpx;
-  left: 50%;
-  transform: translateX(-50%);
-  width: 200rpx;
-  height: 200rpx;
-  border-radius: 50%;
-  z-index: 100;
-  background: transparent;
-  border: none;
-  padding: 0;
-  margin: 0;
-  opacity: 0;
-  line-height: 1;
-  font-size: 0;
-}
-
-.avatar-trigger-button::after {
-  border: none;
-}
-
-/* ============ 表单区域 ============ */
-.form-section {
-  background: white;
-  border-radius: 25rpx;
-  overflow: hidden;
-  margin-bottom: 50rpx;
-  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.08);
-  border: 1rpx solid #f0f0f0;
-}
-
-.form-item {
-  display: flex;
-  align-items: center;
-  padding-left: 40rpx;
-  border-bottom: 1rpx solid #f0f0f0;
-  min-height: 110rpx;
-}
-
-.form-item:last-child {
-  border-bottom: none;
-}
-
-.item-label {
-  width: 150rpx;
-  font-size: 32rpx;
-  color: #333;
-  font-weight: 500;
-  flex-shrink: 0;
-}
-
-.item-value.readonly {
-  flex: 1;
-  font-size: 32rpx;
-  color: #666;
-}
-
-.item-input {
-  flex: 1;
-  font-size: 32rpx;
-  color: #333;
-  height: 50rpx;
-  line-height: 50rpx;
-}
-
-.placeholder {
-  color: #ccc;
-  font-size: 30rpx;
-}
-
-.input-container {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-
-.item-input.error {
-  border-bottom: 2rpx solid #ff4d4f;
-  animation: shake 0.5s;
-}
-
-@keyframes shake {
-  0%, 100% { transform: translateX(0); }
-  10%, 30%, 50%, 70%, 90% { transform: translateX(-2rpx); }
-  20%, 40%, 60%, 80% { transform: translateX(2rpx); }
-}
-
-.error-hint {
-  font-size: 24rpx;
-  color: #ff4d4f;
-  margin-top: 8rpx;
-  padding-left: 10rpx;
-  animation: fadeIn 0.3s;
-}
-
-.phone-hint {
-  font-size: 24rpx;
-  color: #00C853;
-  margin-top: 8rpx;
-  padding-left: 10rpx;
-  animation: fadeIn 0.3s;
-}
-
-@keyframes fadeIn {
-  from { opacity: 0; transform: translateY(-10rpx); }
-  to { opacity: 1; transform: translateY(0); }
-}
-
-/* ============ 保存按钮 ============ */
-.save-btn {
-  width: 100%;
-  height: 100rpx;
-  line-height: 100rpx;
-  border-radius: 50rpx;
-  background: linear-gradient(135deg, #00C853 0%, #64DD17 100%);
-  color: white;
-  font-size: 34rpx;
-  font-weight: 500;
-  border: none;
-  position: relative;
-  overflow: hidden;
-  box-shadow: 0 15rpx 40rpx rgba(0, 200, 83, 0.25);
-  margin-top: 30rpx;
-}
-
-.save-btn[disabled] {
-  background: linear-gradient(135deg, #cccccc 0%, #aaaaaa 100%);
-  color: #999;
-  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1);
-}
-
-.btn-content {
-  position: relative;
-  z-index: 2;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-}
-
-.btn-sparkle {
-  position: absolute;
-  top: 0;
-  left: -100%;
-  width: 100%;
-  height: 100%;
-  background: linear-gradient(
-      90deg,
-      transparent 0%,
-      rgba(255, 255, 255, 0.2) 50%,
-      transparent 100%
-  );
-  animation: sparkleMove 2.5s ease-in-out infinite;
-  z-index: 1;
-}
-
-@keyframes sparkleMove {
-  0% { left: -100%; }
-  100% { left: 100%; }
-}
-
-.btn-hover {
-  opacity: 0.9;
-  transform: scale(0.98);
-}
-
-/* ============ 手机号获取按钮 ============ */
-.phone-row {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.phone-value {
-  font-size: 32rpx;
-  color: #333;
-  flex: 1;
-}
-
-.get-phone-btn {
-  flex-shrink: 0;
-  margin-left: 20rpx;
-  padding: 10rpx 24rpx;
-  background: #4a6cf7;
-  color: #fff;
-  font-size: 26rpx;
-  border-radius: 40rpx;
-  border: none;
-  line-height: 1.4;
-  height: 60rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.phone-btn-hover {
-  opacity: 0.8;
-}
-
-.safe-area {
-  height: 100rpx;
-  width: 100%;
+/* pages/edit/edit.wxss */
+page {
+  background: linear-gradient(135deg, #fffaf0 0%, #f0f8ff 100%);
+  min-height: 100vh;
+}
+
+.xiugai-page {
+  padding: 30rpx 40rpx 100rpx;
+}
+
+/* 头像区域样式 */
+.avatar-section {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  margin-bottom: 60rpx;
+  padding-top: 30rpx;
+}
+
+.avatar-container {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+/* 头像包装器 */
+.avatar-image-wrapper {
+  position: relative;
+  width: 200rpx;
+  height: 200rpx;
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 头像图片 */
+.avatar-image {
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 50%;
+  border: 6rpx solid #fff;
+  background-color: #f8f9fa;
+  z-index: 2;
+  position: relative;
+  animation: gentleBreath 4s ease-in-out infinite;
+  box-shadow: 
+      0 0 0 1rpx rgba(0, 200, 83, 0.3),
+      0 15rpx 40rpx rgba(0, 200, 83, 0.15);
+  box-sizing: border-box;
+}
+
+/* 光晕 */
+.avatar-halo {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 228rpx;
+  height: 228rpx;
+  border-radius: 50%;
+  background: transparent;
+  border: 3rpx solid transparent;
+  animation: gentleGlow 2s ease-in-out infinite, colorShift 3s ease-in-out infinite;
+  opacity: 0;
+  z-index: 1;
+  pointer-events: none;
+}
+
+/* 像素点环绕 */
+.avatar-image-wrapper::before {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 230rpx;
+  height: 230rpx;
+  border-radius: 50%;
+  background: 
+      radial-gradient(circle at 30% 30%, rgba(0, 200, 83, 0.1) 0%, transparent 50%),
+      radial-gradient(circle at 70% 70%, rgba(100, 221, 23, 0.1) 0%, transparent 50%);
+  animation: pixelOrbit 4s linear infinite;
+  z-index: 0;
+  pointer-events: none;
+}
+
+/* 温和的呼吸动画 */
+@keyframes gentleBreath {
+  0%, 100% {
+      transform: scale(1);
+      box-shadow: 
+          0 0 0 2rpx rgba(0, 200, 83, 0.4),
+          0 15rpx 40rpx rgba(0, 200, 83, 0.2);
+  }
+  50% {
+      transform: scale(1.03);
+      box-shadow: 
+          0 0 0 5rpx rgba(0, 200, 83, 0.6),
+          0 20rpx 50rpx rgba(0, 200, 83, 0.3);
+  }
+}
+
+/* 光晕动画 */
+@keyframes gentleGlow {
+  0%, 100% {
+      opacity: 0;
+      transform: translate(-50%, -50%) scale(0.98);
+  }
+  50% {
+      opacity: 1;
+      transform: translate(-50%, -50%) scale(1.05);
+  }
+}
+
+@keyframes colorShift {
+  0% {
+      border-color: rgba(0, 200, 83, 0.5);
+  }
+  33% {
+      border-color: rgba(100, 221, 23, 0.5);
+  }
+  66% {
+      border-color: rgba(0, 255, 153, 0.5);
+  }
+  100% {
+      border-color: rgba(0, 200, 83, 0.5);
+  }
+}
+
+@keyframes pixelOrbit {
+  0% {
+      transform: translate(-50%, -50%) rotate(0deg);
+  }
+  100% {
+      transform: translate(-50%, -50%) rotate(360deg);
+  }
+}
+
+/* 更换提示 */
+.avatar-hint {
+  margin-top: 25rpx;
+  font-size: 28rpx;
+  color: #666;
+  padding: 12rpx 30rpx;
+  background: rgba(255, 255, 255, 0.9);
+  border-radius: 25rpx;
+  border: 1rpx solid #eee;
+  box-shadow: 0 5rpx 15rpx rgba(0, 0, 0, 0.05);
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-hint::before {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 2rpx;
+  background: linear-gradient(90deg, transparent, #00C853, transparent);
+  animation: hintGlow 2s ease-in-out infinite;
+}
+
+@keyframes hintGlow {
+  0%, 100% {
+      opacity: 0.3;
+  }
+  50% {
+      opacity: 1;
+  }
+}
+
+/* 点击特效 */
+.avatar-container.active .avatar-image {
+  animation: clickScale 0.5s ease;
+}
+
+@keyframes clickScale {
+  0%, 100% {
+      transform: scale(1);
+  }
+  50% {
+      transform: scale(0.95);
+  }
+}
+
+/* 下载状态 */
+.avatar-container.downloading .avatar-image {
+  opacity: 0.7;
+  filter: grayscale(30%);
+}
+
+/* 透明功能按钮 */
+.avatar-trigger-button {
+  position: absolute;
+  top: 30rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 50%;
+  z-index: 100;
+  background: transparent;
+  border: none;
+  padding: 0;
+  margin: 0;
+  opacity: 0;
+  line-height: 1;
+  font-size: 0;
+}
+
+.avatar-trigger-button::after {
+  border: none;
+}
+
+/* 表单区域 */
+.form-section {
+  border-radius: 25rpx;
+  margin-bottom: 50rpx;
+  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.08);
+  border: 1rpx solid #f0f0f0;
+}
+
+.form-item {
+  display: flex;
+  align-items: center;
+  padding-left: 40rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  min-height: 110rpx;
+}
+
+.form-item:last-child {
+  border-bottom: none;
+}
+
+.item-label {
+  width: 150rpx;
+  font-size: 32rpx;
+  color: #333;
+  font-weight: 500;
+  flex-shrink: 0;
+}
+
+.item-value.readonly {
+  flex: 1;
+  font-size: 32rpx;
+  color: #666;
+}
+
+/* .item-input — 与全局 .input-inline 完全相同，已移除 */
+
+.placeholder {
+  color: #ccc;
+  font-size: 30rpx;
+}
+
+.input-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.item-input.error {
+  border-bottom: 2rpx solid #ff4d4f;
+  animation: shake 0.5s;
+}
+
+@keyframes shake {
+  0%, 100% { transform: translateX(0); }
+  10%, 30%, 50%, 70%, 90% { transform: translateX(-2rpx); }
+  20%, 40%, 60%, 80% { transform: translateX(2rpx); }
+}
+
+.error-hint {
+  font-size: 24rpx;
+  color: #ff4d4f;
+  margin-top: 8rpx;
+  padding-left: 10rpx;
+  animation: fadeIn 0.3s;
+}
+
+.phone-hint {
+  font-size: 24rpx;
+  color: #00C853;
+  margin-top: 8rpx;
+  padding-left: 10rpx;
+  animation: fadeIn 0.3s;
+}
+
+@keyframes fadeIn {
+  from { opacity: 0; transform: translateY(-10rpx); }
+  to { opacity: 1; transform: translateY(0); }
+}
+
+/* 保存按钮 */
+.save-btn {
+  height: 100rpx;
+  line-height: 100rpx;
+  border-radius: 50rpx;
+  background: linear-gradient(135deg, #00C853 0%, #64DD17 100%);
+  font-weight: 500;
+  box-shadow: 0 15rpx 40rpx rgba(0, 200, 83, 0.25);
+  margin-top: 30rpx;
+}
+
+.save-btn[disabled] {
+  background: linear-gradient(135deg, #cccccc 0%, #aaaaaa 100%);
+  color: #999;
+  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1);
+}
+
+.btn-content {
+  position: relative;
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+}
+
+.btn-sparkle {
+  position: absolute;
+  top: 0;
+  left: -100%;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(
+      90deg,
+      transparent 0%,
+      rgba(255, 255, 255, 0.2) 50%,
+      transparent 100%
+  );
+  animation: sparkleMove 2.5s ease-in-out infinite;
+  z-index: 1;
+}
+
+@keyframes sparkleMove {
+  0% { left: -100%; }
+  100% { left: 100%; }
+}
+
+.btn-hover {
+  opacity: 0.9;
+  transform: scale(0.98);
+}
+
+/* 手机号获取按钮 */
+.phone-row {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.phone-value {
+  font-size: 32rpx;
+  color: #333;
+  flex: 1;
+}
+
+.get-phone-btn {
+  flex-shrink: 0;
+  margin-left: 20rpx;
+  padding: 10rpx 24rpx;
+  background: #4a6cf7;
+  line-height: 1.4;
+  height: 60rpx;
+}
+
+.phone-btn-hover {
+  opacity: 0.8;
+}
+
+.safe-area {
+  height: 100rpx;
+  width: 100%;
 }
\ No newline at end of file
diff --git a/pages/peihuDingdan/peihuDingdan.js b/pages/escort-orders/escort-orders.js
similarity index 88%
rename from pages/peihuDingdan/peihuDingdan.js
rename to pages/escort-orders/escort-orders.js
index 3215f4f..4937dd7 100644
--- a/pages/peihuDingdan/peihuDingdan.js
+++ b/pages/escort-orders/escort-orders.js
@@ -1,66 +1,66 @@
-// pages/peihuDingdan/peihuDingdan.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
+// pages/escort-orders/escort-orders.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
 })
\ No newline at end of file
diff --git a/pages/jiedanchi2/jiedanchi2.json b/pages/escort-orders/escort-orders.json
similarity index 100%
rename from pages/jiedanchi2/jiedanchi2.json
rename to pages/escort-orders/escort-orders.json
diff --git a/pages/escort-orders/escort-orders.wxml b/pages/escort-orders/escort-orders.wxml
new file mode 100644
index 0000000..e89d6c3
--- /dev/null
+++ b/pages/escort-orders/escort-orders.wxml
@@ -0,0 +1,2 @@
+<!--pages/escort-orders/escort-orders.wxml-->
+<text>pages/escort-orders/escort-orders.wxml</text>
\ No newline at end of file
diff --git a/pages/escort-orders/escort-orders.wxss b/pages/escort-orders/escort-orders.wxss
new file mode 100644
index 0000000..28f808d
--- /dev/null
+++ b/pages/escort-orders/escort-orders.wxss
@@ -0,0 +1 @@
+/* pages/escort-orders/escort-orders.wxss */
\ No newline at end of file
diff --git a/pages/jisufd/jisufd.js b/pages/express-order/express-order.js
similarity index 96%
rename from pages/jisufd/jisufd.js
rename to pages/express-order/express-order.js
index 49ae9cb..5c14b45 100644
--- a/pages/jisufd/jisufd.js
+++ b/pages/express-order/express-order.js
@@ -1,618 +1,618 @@
-// pages/jisufd/jisufd.js
-import request from '../../utils/request.js'
-
-const PAGE_SIZE = 50
-const LINK_PAGE_SIZE = 5
-
-Page({
-  data: {
-    sjyue: '0.00',
-    shangpinList: [],               // 最终展示的商品类型列表（已倒序）
-    selectedTypeId: null,
-    selectedHuiyuanId: null,
-    selectedYaoqiuleixing: null,
-    currentTypeChenghaoList: [],
-
-    searchParams: { keyword: '', minPrice: '', labelId: '' },
-    searchLabelName: '',
-    isSearchMode: false,
-
-    templateList: [],
-    currentPage: 1,
-    hasMoreData: true,
-    isLoadingMore: false,
-
-    linkMap: {},
-
-    showDetailModal: false,
-    showAddModal: false,
-    showDeleteConfirm: false,
-    showNewLinkConfirm: false,
-
-    currentTemplate: null,
-    currentTemplateIndex: -1,
-
-    isEditing: false,
-    editJieshao: '',
-    editJiage: '',
-    editLabelId: '',
-    editLabelName: '',
-    editCommissionEnabled: false,
-    editCommissionValue: '',
-
-    addJieshao: '',
-    addJiage: '',
-    addLabelId: '',
-    addLabelName: '',
-    addCommissionEnabled: false,
-    addCommissionValue: '',
-
-    detailLinkFilter: 0,
-    detailLinkList: [],
-    detailLinkPage: 1,
-    detailLinkHasMore: true,
-    isLoadingLinks: false,
-
-    isLoading: false
-  },
-
-  onLoad() {
-    this.loadShangjiaYue()
-    this.loadShangpinTypes()
-  },
-
-  onShow() {
-    this.registerNotificationComponent()
-    this.loadShangjiaYue()
-  },
-
-  registerNotificationComponent() {
-    const app = getApp()
-    const comp = this.selectComponent('#global-notification')
-    if (comp && comp.showNotification) {
-      app.globalData.globalNotification = {
-        show: data => comp.showNotification(data),
-        hide: () => comp.hideNotification()
-      }
-    }
-  },
-
-  loadShangjiaYue() {
-    const app = getApp()
-    const data = app.globalData.shangjia || {}
-    this.setData({ sjyue: data.sjyue || '0.00' })
-  },
-
-  async loadShangpinTypes() {
-    this.setData({ isLoading: true })
-    try {
-      const res = await request({ url: '/dingdan/sjspleixing', method: 'POST' })
-      if (res && res.data.code === 200) {
-        let list = res.data.data || []
-        // 强制倒序排列
-        list.reverse()
-        this.setData({ shangpinList: list, isLoading: false })
-        if (list.length > 0) {
-          this.setSelectedType(list[0])
-        }
-      }
-    } catch (e) {
-      console.error(e)
-      this.setData({ isLoading: false })
-      wx.showToast({ title: '加载类型失败', icon: 'error' })
-    }
-  },
-
-  setSelectedType(item) {
-    this.setData({
-      selectedTypeId: item.id,
-      selectedHuiyuanId: item.huiyuan_id,
-      selectedYaoqiuleixing: item.yaoqiuleixing,
-      currentTypeChenghaoList: item.chenghaoList || []
-    }, () => {
-      this.resetAndLoadTemplates()
-    })
-  },
-
-  resetAndLoadTemplates() {
-    this.setData({
-      templateList: [],
-      currentPage: 1,
-      hasMoreData: true,
-      isSearchMode: false,
-      searchParams: { keyword: '', minPrice: '', labelId: '' },
-      searchLabelName: ''
-    })
-    this.loadTemplates()
-  },
-
-  async loadTemplates() {
-    const { selectedTypeId, currentPage, isSearchMode, searchParams, linkMap } = this.data
-    if (!selectedTypeId) {
-      wx.showToast({ title: '请先选择订单类型', icon: 'none' })
-      return
-    }
-    if (currentPage === 1) this.setData({ isLoading: true })
-    else this.setData({ isLoadingMore: true })
-
-    try {
-      const postData = {
-        shangpinTypeId: selectedTypeId,
-        page: currentPage,
-        pageSize: PAGE_SIZE,
-        getType: isSearchMode ? 1 : 2
-      }
-      if (isSearchMode) {
-        if (searchParams.keyword) postData.keyword = searchParams.keyword.trim()
-        if (searchParams.minPrice) postData.minPrice = searchParams.minPrice
-        if (searchParams.labelId) postData.labelId = searchParams.labelId
-      }
-
-      const res = await request({ url: '/peizhi/sjddmblb', method: 'POST', data: postData })
-      if (res && res.data.code === 200) {
-        const data = res.data.data || {}
-        const newTemplates = data.list || []
-        const existingIds = new Set(this.data.templateList.map(item => item.mobanId))
-        const uniqueNew = newTemplates.filter(item => !existingIds.has(item.mobanId))
-
-        const processed = uniqueNew.map(item => {
-          const mobanId = item.mobanId || item.id
-          const cached = linkMap[mobanId] || {}
-          return {
-            ...item,
-            hasGenerated: cached.hasGenerated || !!item.linkUrl,
-            isCopied: cached.isCopied || false,
-            linkUrl: cached.linkUrl || item.linkUrl || '',
-            mobanId: mobanId,
-            jieshao: item.jieshao || item.moban_jieshao,
-            jiage: item.jiage || item.price,
-            fabushuliang: item.fabushuliang || item.fabu_shuliang || 0,
-            labelId: item.labelId,
-            labelName: item.labelName || '',
-            commissionEnabled: item.commissionEnabled,
-            commissionValue: item.commissionValue
-          }
-        })
-
-        this.setData({
-          templateList: currentPage === 1 ? processed : [...this.data.templateList, ...processed],
-          hasMoreData: data.hasMore !== false && processed.length === PAGE_SIZE,
-          isLoading: false,
-          isLoadingMore: false
-        })
-      } else {
-        this.setData({ isLoading: false, isLoadingMore: false, hasMoreData: false })
-      }
-    } catch (e) {
-      console.error(e)
-      this.setData({ isLoading: false, isLoadingMore: false })
-      wx.showToast({ title: '加载模板失败', icon: 'error' })
-    }
-  },
-
-  // ---------- 搜索相关 ----------
-  onSearchKeywordInput(e) { this.setData({ 'searchParams.keyword': e.detail.value }) },
-  onSearchMinPriceInput(e) { this.setData({ 'searchParams.minPrice': e.detail.value }) },
-  onSearchLabelChange(e) {
-    const idx = e.detail.value
-    const label = this.data.currentTypeChenghaoList[idx]
-    this.setData({
-      'searchParams.labelId': label ? label.id : '',
-      searchLabelName: label ? label.mingcheng : ''
-    })
-  },
-  onSearchConfirm() {
-    const { searchParams } = this.data
-    if (!searchParams.keyword && !searchParams.minPrice && !searchParams.labelId) {
-      this.resetAndLoadTemplates()
-      return
-    }
-    this.setData({
-      isSearchMode: true,
-      currentPage: 1,
-      templateList: [],
-      hasMoreData: true
-    }, () => this.loadTemplates())
-  },
-  onClearSearch() { this.resetAndLoadTemplates() },
-
-  // ---------- 卡片生成链接 ----------
-  async onGenerateLink(e) {
-    const { id } = e.currentTarget.dataset
-    const idx = this.data.templateList.findIndex(item => item.mobanId === id)
-    if (idx === -1) return
-    await this.generateLinkForTemplate(this.data.templateList[idx], idx)
-  },
-
-  onCopyLink(e) {
-    const { id } = e.currentTarget.dataset
-    const idx = this.data.templateList.findIndex(item => item.mobanId === id)
-    if (idx === -1) return
-    const template = this.data.templateList[idx]
-    if (!template.linkUrl) {
-      wx.showToast({ title: '请先生成链接', icon: 'none' })
-      return
-    }
-    wx.setClipboardData({
-      data: template.linkUrl,
-      success: () => {
-        const { linkMap } = this.data
-        const mobanId = template.mobanId
-        const updatedLinkMap = { ...linkMap }
-        if (updatedLinkMap[mobanId]) updatedLinkMap[mobanId].isCopied = true
-        const updatedList = [...this.data.templateList]
-        updatedList[idx].isCopied = true
-        this.setData({ linkMap: updatedLinkMap, templateList: updatedList })
-        wx.showToast({ title: '链接已复制', icon: 'success' })
-      }
-    })
-  },
-
-  async generateLinkForTemplate(template, templateIndex) {
-    const { selectedTypeId, linkMap } = this.data
-    if (!selectedTypeId) {
-      wx.showToast({ title: '请选择订单类型', icon: 'none' })
-      return
-    }
-    wx.showLoading({ title: '生成中...', mask: true })
-    try {
-      const res = await request({
-        url: '/peizhi/sjljhq',
-        method: 'POST',
-        data: { mobanId: template.mobanId, shangpinTypeId: selectedTypeId }
-      })
-      if (res && res.data.code === 200) {
-        const data = res.data.data || {}
-        const mobanId = template.mobanId
-        const updatedLinkMap = { ...linkMap }
-        updatedLinkMap[mobanId] = {
-          hasGenerated: true,
-          linkUrl: data.linkUrl || '',
-          isCopied: false,
-          newBalance: data.newBalance
-        }
-        const updatedList = [...this.data.templateList]
-        updatedList[templateIndex] = {
-          ...updatedList[templateIndex],
-          hasGenerated: true,
-          linkUrl: data.linkUrl || '',
-          isCopied: false,
-          newBalance: data.newBalance
-        }
-        if (data.newBalance) {
-          const app = getApp()
-          if (app.globalData.shangjia) app.globalData.shangjia.sjyue = data.newBalance
-          this.setData({ sjyue: data.newBalance })
-        }
-        this.setData({ linkMap: updatedLinkMap, templateList: updatedList })
-        wx.showToast({ title: '链接生成成功', icon: 'success' })
-      } else {
-        wx.showToast({ title: res.data.msg || '生成失败', icon: 'error' })
-      }
-    } catch (e) {
-      wx.showToast({ title: '生成失败', icon: 'error' })
-    } finally {
-      wx.hideLoading()
-    }
-  },
-
-  onCardTap(e) {
-    const { target } = e
-    if (target.className && (target.className.includes('btn') || target.className.includes('action'))) return
-    const { item } = e.currentTarget.dataset
-    if (!item) return
-    const idx = this.data.templateList.findIndex(t => t.mobanId === item.mobanId)
-    this.setData({
-      currentTemplate: item,
-      currentTemplateIndex: idx,
-      showDetailModal: true,
-      isEditing: false,
-      editJieshao: item.jieshao || '',
-      editJiage: item.jiage || '',
-      editLabelId: item.labelId || '',
-      editLabelName: item.labelName || '',
-      editCommissionEnabled: item.commissionEnabled || false,
-      editCommissionValue: item.commissionValue || '',
-      detailLinkFilter: 0,
-      detailLinkList: [],
-      detailLinkPage: 1,
-      detailLinkHasMore: true
-    })
-    this.loadDetailLinks()
-  },
-
-  hideDetailModal() { this.setData({ showDetailModal: false, isEditing: false }) },
-  showAddModal() {
-    this.setData({
-      showAddModal: true,
-      addJieshao: '', addJiage: '', addLabelId: '', addLabelName: '',
-      addCommissionEnabled: false, addCommissionValue: ''
-    })
-  },
-  hideAddModal() { this.setData({ showAddModal: false }) },
-  hideDeleteConfirm() { this.setData({ showDeleteConfirm: false }) },
-  hideNewLinkConfirm() { this.setData({ showNewLinkConfirm: false }) },
-
-  // ---------- 链接筛选与加载 ----------
-  onToggleLinkFilter() {
-    const newFilter = this.data.detailLinkFilter === 0 ? 1 : 0
-    this.setData({
-      detailLinkFilter: newFilter,
-      detailLinkList: [],
-      detailLinkPage: 1,
-      detailLinkHasMore: true
-    }, () => this.loadDetailLinks())
-  },
-
-  async loadDetailLinks() {
-    const { currentTemplate, detailLinkFilter, detailLinkPage, isLoadingLinks } = this.data
-    if (!currentTemplate || isLoadingLinks) return
-    this.setData({ isLoadingLinks: true })
-    try {
-      const res = await request({
-        url: '/peizhi/hqsjlslj',
-        method: 'POST',
-        data: {
-          mobanId: currentTemplate.mobanId,
-          used: detailLinkFilter,
-          page: detailLinkPage,
-          pageSize: LINK_PAGE_SIZE
-        }
-      })
-      if (res && res.data.code === 200) {
-        const data = res.data.data || {}
-        const newLinks = data.list || []
-        const merged = detailLinkPage === 1 ? newLinks : [...this.data.detailLinkList, ...newLinks]
-        this.setData({
-          detailLinkList: merged,
-          detailLinkHasMore: newLinks.length === LINK_PAGE_SIZE,
-          isLoadingLinks: false
-        })
-      } else {
-        this.setData({ isLoadingLinks: false })
-      }
-    } catch (e) {
-      this.setData({ isLoadingLinks: false })
-      wx.showToast({ title: '加载链接失败', icon: 'error' })
-    }
-  },
-
-  onLoadMoreLinks() {
-    if (!this.data.detailLinkHasMore || this.data.isLoadingLinks) return
-    this.setData({ detailLinkPage: this.data.detailLinkPage + 1 }, () => this.loadDetailLinks())
-  },
-
-  onCopyLinkItem(e) {
-    const url = e.currentTarget.dataset.url
-    if (!url) return
-    wx.setClipboardData({ data: url, success: () => wx.showToast({ title: '已复制', icon: 'success' }) })
-  },
-
-  // ---------- 弹窗内操作 ----------
-  onGenerateLinkModal() {
-    const { currentTemplate, currentTemplateIndex } = this.data
-    if (!currentTemplate) return
-    if (currentTemplate.hasGenerated && !currentTemplate.isCopied) {
-      this.setData({ showNewLinkConfirm: true })
-      return
-    }
-    this.generateLinkForTemplate(currentTemplate, currentTemplateIndex)
-  },
-
-  onCopyLinkModal() {
-    const { currentTemplate, linkMap } = this.data
-    if (!currentTemplate || !currentTemplate.linkUrl) {
-      wx.showToast({ title: '请先生成链接', icon: 'none' })
-      return
-    }
-    wx.setClipboardData({
-      data: currentTemplate.linkUrl,
-      success: () => {
-        const mobanId = currentTemplate.mobanId
-        const updatedLinkMap = { ...linkMap }
-        if (updatedLinkMap[mobanId]) updatedLinkMap[mobanId].isCopied = true
-        const updatedList = [...this.data.templateList]
-        if (this.data.currentTemplateIndex !== -1) {
-          updatedList[this.data.currentTemplateIndex].isCopied = true
-        }
-        const updatedCurrent = { ...currentTemplate, isCopied: true }
-        this.setData({ linkMap: updatedLinkMap, templateList: updatedList, currentTemplate: updatedCurrent })
-        wx.showToast({ title: '链接已复制', icon: 'success' })
-      }
-    })
-  },
-
-  // ---------- 编辑 ----------
-  onEditTemplate() {
-    if (!this.data.isEditing) this.setData({ isEditing: true })
-    else this.saveTemplateEdit()
-  },
-  onEditJieshaoInput(e) { this.setData({ editJieshao: e.detail.value }) },
-  onEditJiageInput(e) { this.setData({ editJiage: e.detail.value }) },
-  onEditLabelChange(e) {
-    const idx = e.detail.value
-    const label = this.data.currentTypeChenghaoList[idx]
-    this.setData({ editLabelId: label ? label.id : '', editLabelName: label ? label.mingcheng : '' })
-  },
-  onEditCommissionToggle() { this.setData({ editCommissionEnabled: !this.data.editCommissionEnabled }) },
-  onEditCommissionValueInput(e) { this.setData({ editCommissionValue: e.detail.value }) },
-
-  async saveTemplateEdit() {
-    const { currentTemplate, selectedTypeId, editJieshao, editJiage, editLabelId, editCommissionEnabled, editCommissionValue } = this.data
-    if (!currentTemplate || !selectedTypeId) return
-    if (editCommissionEnabled && (!editCommissionValue || isNaN(parseFloat(editCommissionValue)))) {
-      wx.showToast({ title: '请输入有效佣金金额', icon: 'none' })
-      return
-    }
-    wx.showLoading({ title: '保存中...', mask: true })
-    try {
-      const res = await request({
-        url: '/peizhi/sjddmbgx',
-        method: 'POST',
-        data: {
-          mobanId: currentTemplate.mobanId,
-          shangpinTypeId: selectedTypeId,
-          jieshao: editJieshao,
-          jiage: editJiage,
-          labelId: editLabelId || '',
-          commissionEnabled: editCommissionEnabled,
-          commissionValue: editCommissionValue
-        }
-      })
-      if (res && res.data.code === 200) {
-        const updatedList = [...this.data.templateList]
-        const idx = this.data.currentTemplateIndex
-        if (idx !== -1) {
-          updatedList[idx] = {
-            ...updatedList[idx],
-            jieshao: editJieshao,
-            jiage: editJiage,
-            labelId: editLabelId,
-            labelName: this.getLabelNameById(editLabelId),
-            commissionEnabled: editCommissionEnabled,
-            commissionValue: editCommissionValue
-          }
-          this.setData({ templateList: updatedList, currentTemplate: updatedList[idx], isEditing: false })
-        }
-        wx.showToast({ title: '修改成功', icon: 'success' })
-      } else {
-        wx.showToast({ title: res.data.msg || '修改失败', icon: 'error' })
-      }
-    } catch (e) {
-      wx.showToast({ title: '修改失败', icon: 'error' })
-    } finally { wx.hideLoading() }
-  },
-
-  onDeleteTemplate() { this.setData({ showDeleteConfirm: true }) },
-
-  async confirmDeleteTemplate() {
-    const { currentTemplate, selectedTypeId, linkMap } = this.data
-    if (!currentTemplate || !selectedTypeId) return
-    wx.showLoading({ title: '删除中...', mask: true })
-    try {
-      const res = await request({
-        url: '/peizhi/sjddmbsc',
-        method: 'POST',
-        data: { mobanId: currentTemplate.mobanId, shangpinTypeId: selectedTypeId }
-      })
-      if (res && res.data.code === 200) {
-        const updatedLinkMap = { ...linkMap }
-        delete updatedLinkMap[currentTemplate.mobanId]
-        const updatedList = [...this.data.templateList]
-        updatedList.splice(this.data.currentTemplateIndex, 1)
-        this.setData({
-          linkMap: updatedLinkMap,
-          templateList: updatedList,
-          showDetailModal: false,
-          showDeleteConfirm: false,
-          currentTemplate: null,
-          currentTemplateIndex: -1
-        })
-        wx.showToast({ title: '删除成功', icon: 'success' })
-      } else {
-        wx.showToast({ title: res.data.msg || '删除失败', icon: 'error' })
-      }
-    } catch (e) {
-      wx.showToast({ title: '删除失败', icon: 'error' })
-    } finally { wx.hideLoading() }
-  },
-
-  async confirmNewLink() {
-    const { currentTemplate, currentTemplateIndex } = this.data
-    if (!currentTemplate) return
-    this.setData({ showNewLinkConfirm: false })
-    await this.generateLinkForTemplate(currentTemplate, currentTemplateIndex)
-  },
-
-  // ---------- 添加模板 ----------
-  onAddJieshaoInput(e) { this.setData({ addJieshao: e.detail.value }) },
-  onAddJiageInput(e) { this.setData({ addJiage: e.detail.value }) },
-  onAddLabelChange(e) {
-    const idx = e.detail.value
-    const label = this.data.currentTypeChenghaoList[idx]
-    this.setData({ addLabelId: label ? label.id : '', addLabelName: label ? label.mingcheng : '' })
-  },
-  onAddCommissionToggle() { this.setData({ addCommissionEnabled: !this.data.addCommissionEnabled }) },
-  onAddCommissionValueInput(e) { this.setData({ addCommissionValue: e.detail.value }) },
-
-  async onAddTemplate() {
-    const { selectedTypeId, addJieshao, addJiage, addLabelId, addCommissionEnabled, addCommissionValue } = this.data
-    if (!selectedTypeId) {
-      wx.showToast({ title: '请选择订单类型', icon: 'none' })
-      return
-    }
-    if (!addJieshao.trim()) {
-      wx.showToast({ title: '请输入订单介绍', icon: 'none' })
-      return
-    }
-    if (!addJiage || isNaN(parseFloat(addJiage)) || parseFloat(addJiage) <= 0) {
-      wx.showToast({ title: '请输入有效的价格', icon: 'none' })
-      return
-    }
-    if (addCommissionEnabled && (!addCommissionValue || isNaN(parseFloat(addCommissionValue)))) {
-      wx.showToast({ title: '请输入有效的佣金金额', icon: 'none' })
-      return
-    }
-
-    wx.showLoading({ title: '添加中...', mask: true })
-    try {
-      const res = await request({
-        url: '/peizhi/sjtjddmb',
-        method: 'POST',
-        data: {
-          shangpinTypeId: selectedTypeId,
-          jieshao: addJieshao.trim(),
-          jiage: addJiage,
-          labelId: addLabelId || '',
-          commissionEnabled: addCommissionEnabled,
-          commissionValue: addCommissionValue
-        }
-      })
-      if (res && res.data.code === 200) {
-        const data = res.data.data || {}
-        const newTemplate = {
-          mobanId: data.mobanId,
-          jieshao: addJieshao,
-          jiage: addJiage,
-          fabushuliang: 0,
-          hasGenerated: false,
-          isCopied: false,
-          linkUrl: '',
-          labelId: addLabelId,
-          labelName: this.getLabelNameById(addLabelId),
-          commissionEnabled: addCommissionEnabled,
-          commissionValue: addCommissionValue
-        }
-        this.setData({
-          templateList: [newTemplate, ...this.data.templateList],
-          showAddModal: false,
-          addJieshao: '', addJiage: '', addLabelId: '', addLabelName: '',
-          addCommissionEnabled: false, addCommissionValue: ''
-        })
-        wx.showToast({ title: '添加成功', icon: 'success' })
-      } else {
-        wx.showToast({ title: res.data.msg || '添加失败', icon: 'error' })
-      }
-    } catch (e) {
-      wx.showToast({ title: '添加失败', icon: 'error' })
-    } finally { wx.hideLoading() }
-  },
-
-  getLabelNameById(labelId) {
-    if (!labelId) return ''
-    const list = this.data.currentTypeChenghaoList
-    const found = list.find(item => item.id == labelId)
-    return found ? found.mingcheng : ''
-  },
-
-  onScrollToLower() {
-    const { hasMoreData, isLoadingMore, isSearchMode } = this.data
-    if (!hasMoreData || isLoadingMore || isSearchMode) return
-    this.setData({ currentPage: this.data.currentPage + 1 }, () => this.loadTemplates())
-  },
-
-  onSelectType(e) {
-    const { id, item } = e.currentTarget.dataset
-    this.setSelectedType(item)
-  }
+// pages/express-order/express-order.js
+import request from '../../utils/request.js'
+
+const PAGE_SIZE = 50
+const LINK_PAGE_SIZE = 5
+
+Page({
+  data: {
+    sjyue: '0.00',
+    shangpinList: [],               // 最终展示的商品类型列表（已倒序）
+    selectedTypeId: null,
+    selectedHuiyuanId: null,
+    selectedYaoqiuleixing: null,
+    currentTypeChenghaoList: [],
+
+    searchParams: { keyword: '', minPrice: '', labelId: '' },
+    searchLabelName: '',
+    isSearchMode: false,
+
+    templateList: [],
+    currentPage: 1,
+    hasMoreData: true,
+    isLoadingMore: false,
+
+    linkMap: {},
+
+    showDetailModal: false,
+    showAddModal: false,
+    showDeleteConfirm: false,
+    showNewLinkConfirm: false,
+
+    currentTemplate: null,
+    currentTemplateIndex: -1,
+
+    isEditing: false,
+    editJieshao: '',
+    editJiage: '',
+    editLabelId: '',
+    editLabelName: '',
+    editCommissionEnabled: false,
+    editCommissionValue: '',
+
+    addJieshao: '',
+    addJiage: '',
+    addLabelId: '',
+    addLabelName: '',
+    addCommissionEnabled: false,
+    addCommissionValue: '',
+
+    detailLinkFilter: 0,
+    detailLinkList: [],
+    detailLinkPage: 1,
+    detailLinkHasMore: true,
+    isLoadingLinks: false,
+
+    isLoading: false
+  },
+
+  onLoad() {
+    this.loadShangjiaYue()
+    this.loadShangpinTypes()
+  },
+
+  onShow() {
+    this.registerNotificationComponent()
+    this.loadShangjiaYue()
+  },
+
+  registerNotificationComponent() {
+    const app = getApp()
+    const comp = this.selectComponent('#global-notification')
+    if (comp && comp.showNotification) {
+      app.globalData.globalNotification = {
+        show: data => comp.showNotification(data),
+        hide: () => comp.hideNotification()
+      }
+    }
+  },
+
+  loadShangjiaYue() {
+    const app = getApp()
+    const data = app.globalData.shangjia || {}
+    this.setData({ sjyue: data.sjyue || '0.00' })
+  },
+
+  async loadShangpinTypes() {
+    this.setData({ isLoading: true })
+    try {
+      const res = await request({ url: '/dingdan/sjspleixing', method: 'POST' })
+      if (res && res.data.code === 200) {
+        let list = res.data.data || []
+        // 强制倒序排列
+        list.reverse()
+        this.setData({ shangpinList: list, isLoading: false })
+        if (list.length > 0) {
+          this.setSelectedType(list[0])
+        }
+      }
+    } catch (e) {
+      console.error(e)
+      this.setData({ isLoading: false })
+      wx.showToast({ title: '加载类型失败', icon: 'error' })
+    }
+  },
+
+  setSelectedType(item) {
+    this.setData({
+      selectedTypeId: item.id,
+      selectedHuiyuanId: item.huiyuan_id,
+      selectedYaoqiuleixing: item.yaoqiuleixing,
+      currentTypeChenghaoList: item.chenghaoList || []
+    }, () => {
+      this.resetAndLoadTemplates()
+    })
+  },
+
+  resetAndLoadTemplates() {
+    this.setData({
+      templateList: [],
+      currentPage: 1,
+      hasMoreData: true,
+      isSearchMode: false,
+      searchParams: { keyword: '', minPrice: '', labelId: '' },
+      searchLabelName: ''
+    })
+    this.loadTemplates()
+  },
+
+  async loadTemplates() {
+    const { selectedTypeId, currentPage, isSearchMode, searchParams, linkMap } = this.data
+    if (!selectedTypeId) {
+      wx.showToast({ title: '请先选择订单类型', icon: 'none' })
+      return
+    }
+    if (currentPage === 1) this.setData({ isLoading: true })
+    else this.setData({ isLoadingMore: true })
+
+    try {
+      const postData = {
+        shangpinTypeId: selectedTypeId,
+        page: currentPage,
+        pageSize: PAGE_SIZE,
+        getType: isSearchMode ? 1 : 2
+      }
+      if (isSearchMode) {
+        if (searchParams.keyword) postData.keyword = searchParams.keyword.trim()
+        if (searchParams.minPrice) postData.minPrice = searchParams.minPrice
+        if (searchParams.labelId) postData.labelId = searchParams.labelId
+      }
+
+      const res = await request({ url: '/peizhi/sjddmblb', method: 'POST', data: postData })
+      if (res && res.data.code === 200) {
+        const data = res.data.data || {}
+        const newTemplates = data.list || []
+        const existingIds = new Set(this.data.templateList.map(item => item.mobanId))
+        const uniqueNew = newTemplates.filter(item => !existingIds.has(item.mobanId))
+
+        const processed = uniqueNew.map(item => {
+          const mobanId = item.mobanId || item.id
+          const cached = linkMap[mobanId] || {}
+          return {
+            ...item,
+            hasGenerated: cached.hasGenerated || !!item.linkUrl,
+            isCopied: cached.isCopied || false,
+            linkUrl: cached.linkUrl || item.linkUrl || '',
+            mobanId: mobanId,
+            jieshao: item.jieshao || item.moban_jieshao,
+            jiage: item.jiage || item.price,
+            fabushuliang: item.fabushuliang || item.fabu_shuliang || 0,
+            labelId: item.labelId,
+            labelName: item.labelName || '',
+            commissionEnabled: item.commissionEnabled,
+            commissionValue: item.commissionValue
+          }
+        })
+
+        this.setData({
+          templateList: currentPage === 1 ? processed : [...this.data.templateList, ...processed],
+          hasMoreData: data.hasMore !== false && processed.length === PAGE_SIZE,
+          isLoading: false,
+          isLoadingMore: false
+        })
+      } else {
+        this.setData({ isLoading: false, isLoadingMore: false, hasMoreData: false })
+      }
+    } catch (e) {
+      console.error(e)
+      this.setData({ isLoading: false, isLoadingMore: false })
+      wx.showToast({ title: '加载模板失败', icon: 'error' })
+    }
+  },
+
+  // ---------- 搜索相关 ----------
+  onSearchKeywordInput(e) { this.setData({ 'searchParams.keyword': e.detail.value }) },
+  onSearchMinPriceInput(e) { this.setData({ 'searchParams.minPrice': e.detail.value }) },
+  onSearchLabelChange(e) {
+    const idx = e.detail.value
+    const label = this.data.currentTypeChenghaoList[idx]
+    this.setData({
+      'searchParams.labelId': label ? label.id : '',
+      searchLabelName: label ? label.mingcheng : ''
+    })
+  },
+  onSearchConfirm() {
+    const { searchParams } = this.data
+    if (!searchParams.keyword && !searchParams.minPrice && !searchParams.labelId) {
+      this.resetAndLoadTemplates()
+      return
+    }
+    this.setData({
+      isSearchMode: true,
+      currentPage: 1,
+      templateList: [],
+      hasMoreData: true
+    }, () => this.loadTemplates())
+  },
+  onClearSearch() { this.resetAndLoadTemplates() },
+
+  // ---------- 卡片生成链接 ----------
+  async onGenerateLink(e) {
+    const { id } = e.currentTarget.dataset
+    const idx = this.data.templateList.findIndex(item => item.mobanId === id)
+    if (idx === -1) return
+    await this.generateLinkForTemplate(this.data.templateList[idx], idx)
+  },
+
+  onCopyLink(e) {
+    const { id } = e.currentTarget.dataset
+    const idx = this.data.templateList.findIndex(item => item.mobanId === id)
+    if (idx === -1) return
+    const template = this.data.templateList[idx]
+    if (!template.linkUrl) {
+      wx.showToast({ title: '请先生成链接', icon: 'none' })
+      return
+    }
+    wx.setClipboardData({
+      data: template.linkUrl,
+      success: () => {
+        const { linkMap } = this.data
+        const mobanId = template.mobanId
+        const updatedLinkMap = { ...linkMap }
+        if (updatedLinkMap[mobanId]) updatedLinkMap[mobanId].isCopied = true
+        const updatedList = [...this.data.templateList]
+        updatedList[idx].isCopied = true
+        this.setData({ linkMap: updatedLinkMap, templateList: updatedList })
+        wx.showToast({ title: '链接已复制', icon: 'success' })
+      }
+    })
+  },
+
+  async generateLinkForTemplate(template, templateIndex) {
+    const { selectedTypeId, linkMap } = this.data
+    if (!selectedTypeId) {
+      wx.showToast({ title: '请选择订单类型', icon: 'none' })
+      return
+    }
+    wx.showLoading({ title: '生成中...', mask: true })
+    try {
+      const res = await request({
+        url: '/peizhi/sjljhq',
+        method: 'POST',
+        data: { mobanId: template.mobanId, shangpinTypeId: selectedTypeId }
+      })
+      if (res && res.data.code === 200) {
+        const data = res.data.data || {}
+        const mobanId = template.mobanId
+        const updatedLinkMap = { ...linkMap }
+        updatedLinkMap[mobanId] = {
+          hasGenerated: true,
+          linkUrl: data.linkUrl || '',
+          isCopied: false,
+          newBalance: data.newBalance
+        }
+        const updatedList = [...this.data.templateList]
+        updatedList[templateIndex] = {
+          ...updatedList[templateIndex],
+          hasGenerated: true,
+          linkUrl: data.linkUrl || '',
+          isCopied: false,
+          newBalance: data.newBalance
+        }
+        if (data.newBalance) {
+          const app = getApp()
+          if (app.globalData.shangjia) app.globalData.shangjia.sjyue = data.newBalance
+          this.setData({ sjyue: data.newBalance })
+        }
+        this.setData({ linkMap: updatedLinkMap, templateList: updatedList })
+        wx.showToast({ title: '链接生成成功', icon: 'success' })
+      } else {
+        wx.showToast({ title: res.data.msg || '生成失败', icon: 'error' })
+      }
+    } catch (e) {
+      wx.showToast({ title: '生成失败', icon: 'error' })
+    } finally {
+      wx.hideLoading()
+    }
+  },
+
+  onCardTap(e) {
+    const { target } = e
+    if (target.className && (target.className.includes('btn') || target.className.includes('action'))) return
+    const { item } = e.currentTarget.dataset
+    if (!item) return
+    const idx = this.data.templateList.findIndex(t => t.mobanId === item.mobanId)
+    this.setData({
+      currentTemplate: item,
+      currentTemplateIndex: idx,
+      showDetailModal: true,
+      isEditing: false,
+      editJieshao: item.jieshao || '',
+      editJiage: item.jiage || '',
+      editLabelId: item.labelId || '',
+      editLabelName: item.labelName || '',
+      editCommissionEnabled: item.commissionEnabled || false,
+      editCommissionValue: item.commissionValue || '',
+      detailLinkFilter: 0,
+      detailLinkList: [],
+      detailLinkPage: 1,
+      detailLinkHasMore: true
+    })
+    this.loadDetailLinks()
+  },
+
+  hideDetailModal() { this.setData({ showDetailModal: false, isEditing: false }) },
+  showAddModal() {
+    this.setData({
+      showAddModal: true,
+      addJieshao: '', addJiage: '', addLabelId: '', addLabelName: '',
+      addCommissionEnabled: false, addCommissionValue: ''
+    })
+  },
+  hideAddModal() { this.setData({ showAddModal: false }) },
+  hideDeleteConfirm() { this.setData({ showDeleteConfirm: false }) },
+  hideNewLinkConfirm() { this.setData({ showNewLinkConfirm: false }) },
+
+  // ---------- 链接筛选与加载 ----------
+  onToggleLinkFilter() {
+    const newFilter = this.data.detailLinkFilter === 0 ? 1 : 0
+    this.setData({
+      detailLinkFilter: newFilter,
+      detailLinkList: [],
+      detailLinkPage: 1,
+      detailLinkHasMore: true
+    }, () => this.loadDetailLinks())
+  },
+
+  async loadDetailLinks() {
+    const { currentTemplate, detailLinkFilter, detailLinkPage, isLoadingLinks } = this.data
+    if (!currentTemplate || isLoadingLinks) return
+    this.setData({ isLoadingLinks: true })
+    try {
+      const res = await request({
+        url: '/peizhi/hqsjlslj',
+        method: 'POST',
+        data: {
+          mobanId: currentTemplate.mobanId,
+          used: detailLinkFilter,
+          page: detailLinkPage,
+          pageSize: LINK_PAGE_SIZE
+        }
+      })
+      if (res && res.data.code === 200) {
+        const data = res.data.data || {}
+        const newLinks = data.list || []
+        const merged = detailLinkPage === 1 ? newLinks : [...this.data.detailLinkList, ...newLinks]
+        this.setData({
+          detailLinkList: merged,
+          detailLinkHasMore: newLinks.length === LINK_PAGE_SIZE,
+          isLoadingLinks: false
+        })
+      } else {
+        this.setData({ isLoadingLinks: false })
+      }
+    } catch (e) {
+      this.setData({ isLoadingLinks: false })
+      wx.showToast({ title: '加载链接失败', icon: 'error' })
+    }
+  },
+
+  onLoadMoreLinks() {
+    if (!this.data.detailLinkHasMore || this.data.isLoadingLinks) return
+    this.setData({ detailLinkPage: this.data.detailLinkPage + 1 }, () => this.loadDetailLinks())
+  },
+
+  onCopyLinkItem(e) {
+    const url = e.currentTarget.dataset.url
+    if (!url) return
+    wx.setClipboardData({ data: url, success: () => wx.showToast({ title: '已复制', icon: 'success' }) })
+  },
+
+  // ---------- 弹窗内操作 ----------
+  onGenerateLinkModal() {
+    const { currentTemplate, currentTemplateIndex } = this.data
+    if (!currentTemplate) return
+    if (currentTemplate.hasGenerated && !currentTemplate.isCopied) {
+      this.setData({ showNewLinkConfirm: true })
+      return
+    }
+    this.generateLinkForTemplate(currentTemplate, currentTemplateIndex)
+  },
+
+  onCopyLinkModal() {
+    const { currentTemplate, linkMap } = this.data
+    if (!currentTemplate || !currentTemplate.linkUrl) {
+      wx.showToast({ title: '请先生成链接', icon: 'none' })
+      return
+    }
+    wx.setClipboardData({
+      data: currentTemplate.linkUrl,
+      success: () => {
+        const mobanId = currentTemplate.mobanId
+        const updatedLinkMap = { ...linkMap }
+        if (updatedLinkMap[mobanId]) updatedLinkMap[mobanId].isCopied = true
+        const updatedList = [...this.data.templateList]
+        if (this.data.currentTemplateIndex !== -1) {
+          updatedList[this.data.currentTemplateIndex].isCopied = true
+        }
+        const updatedCurrent = { ...currentTemplate, isCopied: true }
+        this.setData({ linkMap: updatedLinkMap, templateList: updatedList, currentTemplate: updatedCurrent })
+        wx.showToast({ title: '链接已复制', icon: 'success' })
+      }
+    })
+  },
+
+  // ---------- 编辑 ----------
+  onEditTemplate() {
+    if (!this.data.isEditing) this.setData({ isEditing: true })
+    else this.saveTemplateEdit()
+  },
+  onEditJieshaoInput(e) { this.setData({ editJieshao: e.detail.value }) },
+  onEditJiageInput(e) { this.setData({ editJiage: e.detail.value }) },
+  onEditLabelChange(e) {
+    const idx = e.detail.value
+    const label = this.data.currentTypeChenghaoList[idx]
+    this.setData({ editLabelId: label ? label.id : '', editLabelName: label ? label.mingcheng : '' })
+  },
+  onEditCommissionToggle() { this.setData({ editCommissionEnabled: !this.data.editCommissionEnabled }) },
+  onEditCommissionValueInput(e) { this.setData({ editCommissionValue: e.detail.value }) },
+
+  async saveTemplateEdit() {
+    const { currentTemplate, selectedTypeId, editJieshao, editJiage, editLabelId, editCommissionEnabled, editCommissionValue } = this.data
+    if (!currentTemplate || !selectedTypeId) return
+    if (editCommissionEnabled && (!editCommissionValue || isNaN(parseFloat(editCommissionValue)))) {
+      wx.showToast({ title: '请输入有效佣金金额', icon: 'none' })
+      return
+    }
+    wx.showLoading({ title: '保存中...', mask: true })
+    try {
+      const res = await request({
+        url: '/peizhi/sjddmbgx',
+        method: 'POST',
+        data: {
+          mobanId: currentTemplate.mobanId,
+          shangpinTypeId: selectedTypeId,
+          jieshao: editJieshao,
+          jiage: editJiage,
+          labelId: editLabelId || '',
+          commissionEnabled: editCommissionEnabled,
+          commissionValue: editCommissionValue
+        }
+      })
+      if (res && res.data.code === 200) {
+        const updatedList = [...this.data.templateList]
+        const idx = this.data.currentTemplateIndex
+        if (idx !== -1) {
+          updatedList[idx] = {
+            ...updatedList[idx],
+            jieshao: editJieshao,
+            jiage: editJiage,
+            labelId: editLabelId,
+            labelName: this.getLabelNameById(editLabelId),
+            commissionEnabled: editCommissionEnabled,
+            commissionValue: editCommissionValue
+          }
+          this.setData({ templateList: updatedList, currentTemplate: updatedList[idx], isEditing: false })
+        }
+        wx.showToast({ title: '修改成功', icon: 'success' })
+      } else {
+        wx.showToast({ title: res.data.msg || '修改失败', icon: 'error' })
+      }
+    } catch (e) {
+      wx.showToast({ title: '修改失败', icon: 'error' })
+    } finally { wx.hideLoading() }
+  },
+
+  onDeleteTemplate() { this.setData({ showDeleteConfirm: true }) },
+
+  async confirmDeleteTemplate() {
+    const { currentTemplate, selectedTypeId, linkMap } = this.data
+    if (!currentTemplate || !selectedTypeId) return
+    wx.showLoading({ title: '删除中...', mask: true })
+    try {
+      const res = await request({
+        url: '/peizhi/sjddmbsc',
+        method: 'POST',
+        data: { mobanId: currentTemplate.mobanId, shangpinTypeId: selectedTypeId }
+      })
+      if (res && res.data.code === 200) {
+        const updatedLinkMap = { ...linkMap }
+        delete updatedLinkMap[currentTemplate.mobanId]
+        const updatedList = [...this.data.templateList]
+        updatedList.splice(this.data.currentTemplateIndex, 1)
+        this.setData({
+          linkMap: updatedLinkMap,
+          templateList: updatedList,
+          showDetailModal: false,
+          showDeleteConfirm: false,
+          currentTemplate: null,
+          currentTemplateIndex: -1
+        })
+        wx.showToast({ title: '删除成功', icon: 'success' })
+      } else {
+        wx.showToast({ title: res.data.msg || '删除失败', icon: 'error' })
+      }
+    } catch (e) {
+      wx.showToast({ title: '删除失败', icon: 'error' })
+    } finally { wx.hideLoading() }
+  },
+
+  async confirmNewLink() {
+    const { currentTemplate, currentTemplateIndex } = this.data
+    if (!currentTemplate) return
+    this.setData({ showNewLinkConfirm: false })
+    await this.generateLinkForTemplate(currentTemplate, currentTemplateIndex)
+  },
+
+  // ---------- 添加模板 ----------
+  onAddJieshaoInput(e) { this.setData({ addJieshao: e.detail.value }) },
+  onAddJiageInput(e) { this.setData({ addJiage: e.detail.value }) },
+  onAddLabelChange(e) {
+    const idx = e.detail.value
+    const label = this.data.currentTypeChenghaoList[idx]
+    this.setData({ addLabelId: label ? label.id : '', addLabelName: label ? label.mingcheng : '' })
+  },
+  onAddCommissionToggle() { this.setData({ addCommissionEnabled: !this.data.addCommissionEnabled }) },
+  onAddCommissionValueInput(e) { this.setData({ addCommissionValue: e.detail.value }) },
+
+  async onAddTemplate() {
+    const { selectedTypeId, addJieshao, addJiage, addLabelId, addCommissionEnabled, addCommissionValue } = this.data
+    if (!selectedTypeId) {
+      wx.showToast({ title: '请选择订单类型', icon: 'none' })
+      return
+    }
+    if (!addJieshao.trim()) {
+      wx.showToast({ title: '请输入订单介绍', icon: 'none' })
+      return
+    }
+    if (!addJiage || isNaN(parseFloat(addJiage)) || parseFloat(addJiage) <= 0) {
+      wx.showToast({ title: '请输入有效的价格', icon: 'none' })
+      return
+    }
+    if (addCommissionEnabled && (!addCommissionValue || isNaN(parseFloat(addCommissionValue)))) {
+      wx.showToast({ title: '请输入有效的佣金金额', icon: 'none' })
+      return
+    }
+
+    wx.showLoading({ title: '添加中...', mask: true })
+    try {
+      const res = await request({
+        url: '/peizhi/sjtjddmb',
+        method: 'POST',
+        data: {
+          shangpinTypeId: selectedTypeId,
+          jieshao: addJieshao.trim(),
+          jiage: addJiage,
+          labelId: addLabelId || '',
+          commissionEnabled: addCommissionEnabled,
+          commissionValue: addCommissionValue
+        }
+      })
+      if (res && res.data.code === 200) {
+        const data = res.data.data || {}
+        const newTemplate = {
+          mobanId: data.mobanId,
+          jieshao: addJieshao,
+          jiage: addJiage,
+          fabushuliang: 0,
+          hasGenerated: false,
+          isCopied: false,
+          linkUrl: '',
+          labelId: addLabelId,
+          labelName: this.getLabelNameById(addLabelId),
+          commissionEnabled: addCommissionEnabled,
+          commissionValue: addCommissionValue
+        }
+        this.setData({
+          templateList: [newTemplate, ...this.data.templateList],
+          showAddModal: false,
+          addJieshao: '', addJiage: '', addLabelId: '', addLabelName: '',
+          addCommissionEnabled: false, addCommissionValue: ''
+        })
+        wx.showToast({ title: '添加成功', icon: 'success' })
+      } else {
+        wx.showToast({ title: res.data.msg || '添加失败', icon: 'error' })
+      }
+    } catch (e) {
+      wx.showToast({ title: '添加失败', icon: 'error' })
+    } finally { wx.hideLoading() }
+  },
+
+  getLabelNameById(labelId) {
+    if (!labelId) return ''
+    const list = this.data.currentTypeChenghaoList
+    const found = list.find(item => item.id == labelId)
+    return found ? found.mingcheng : ''
+  },
+
+  onScrollToLower() {
+    const { hasMoreData, isLoadingMore, isSearchMode } = this.data
+    if (!hasMoreData || isLoadingMore || isSearchMode) return
+    this.setData({ currentPage: this.data.currentPage + 1 }, () => this.loadTemplates())
+  },
+
+  onSelectType(e) {
+    const { id, item } = e.currentTarget.dataset
+    this.setSelectedType(item)
+  }
 })
\ No newline at end of file
diff --git a/pages/jisufd/jisufd.json b/pages/express-order/express-order.json
similarity index 100%
rename from pages/jisufd/jisufd.json
rename to pages/express-order/express-order.json
diff --git a/pages/jisufd/jisufd.wxml b/pages/express-order/express-order.wxml
similarity index 97%
rename from pages/jisufd/jisufd.wxml
rename to pages/express-order/express-order.wxml
index 5d0fc2a..fe89a26 100644
--- a/pages/jisufd/jisufd.wxml
+++ b/pages/express-order/express-order.wxml
@@ -1,230 +1,230 @@
-<!-- pages/jisufd/jisufd.wxml -->
-<view class="page-container">
-  <!-- 余额卡片 -->
-  <view class="balance-card">
-    <text class="balance-label">可用余额</text>
-    <view class="balance-amount">
-      <text class="amount-value">{{sjyue}}</text>
-      <text class="amount-unit">元</text>
-    </view>
-    <text class="balance-tip">生成链接将从此余额扣除</text>
-  </view>
-
-  <!-- 商品类型选择 -->
-  <view class="section">
-    <text class="section-title">选择订单类型</text>
-    <scroll-view class="type-scroll" scroll-x="true" enable-flex>
-      <block wx:for="{{shangpinList}}" wx:key="id">
-        <view class="type-item {{selectedTypeId === item.id ? 'type-active' : ''}}"
-              data-id="{{item.id}}" data-item="{{item}}" bindtap="onSelectType">
-          <text class="type-text">{{item.jieshao}}</text>
-        </view>
-      </block>
-    </scroll-view>
-  </view>
-
-  <!-- 搜索区域 -->
-  <view class="search-section">
-    <view class="search-box">
-      <text class="search-icon">🔍</text>
-      <input class="search-input" placeholder="输入模板ID/介绍..." value="{{searchParams.keyword}}"
-             bindinput="onSearchKeywordInput" bindconfirm="onSearchConfirm"/>
-      <view class="search-btn" bindtap="onSearchConfirm">
-        <text class="search-btn-text">搜索</text>
-      </view>
-    </view>
-    <view class="filter-row">
-      <view class="filter-item">
-        <text class="filter-label">金额≥</text>
-        <input class="filter-input" type="digit" placeholder="元" value="{{searchParams.minPrice}}" bindinput="onSearchMinPriceInput"/>
-      </view>
-      <view class="filter-item">
-        <text class="filter-label">标签</text>
-        <picker mode="selector" range="{{currentTypeChenghaoList}}" range-key="mingcheng" bindchange="onSearchLabelChange">
-          <view class="picker-view">
-            <text>{{searchLabelName || '全部'}}</text>
-          </view>
-        </picker>
-      </view>
-      <view class="clear-search" bindtap="onClearSearch"><text>清空</text></view>
-    </view>
-  </view>
-
-  <!-- 模板卡片网格 -->
-  <view class="template-section">
-    <scroll-view class="template-scroll" scroll-y="true" scroll-with-animation="true" bindscrolltolower="onScrollToLower">
-      <view class="template-grid">
-        <block wx:for="{{templateList}}" wx:key="mobanId">
-          <view class="template-card" bindtap="onCardTap" data-item="{{item}}">
-            <view class="template-intro">
-              <text class="intro-text">{{item.jieshao || '无介绍'}}</text>
-            </view>
-            <view class="template-label" wx:if="{{item.labelName}}">
-              <chenghao-tag mingcheng="{{item.labelName}}" texiaoJson="{{''}}"/>
-            </view>
-            <view class="template-price-row">
-              <text class="template-price-label">价格:</text>
-              <text class="template-price-value">{{item.jiage || '0.00'}}元</text>
-            </view>
-            <view class="template-actions-grid">
-              <view class="action-grid-btn generate-grid-btn {{item.hasGenerated ? 'generated' : ''}}"
-                    data-id="{{item.mobanId}}" catchtap="onGenerateLink">
-                {{item.hasGenerated ? '获取新链接' : '生成链接'}}
-              </view>
-              <view class="action-grid-btn copy-grid-btn {{item.isCopied ? 'copied' : ''}}"
-                    data-id="{{item.mobanId}}" catchtap="onCopyLink">
-                {{item.isCopied ? '已复制' : '一键复制'}}
-              </view>
-            </view>
-          </view>
-        </block>
-        <view class="template-card add-card" bindtap="showAddModal">
-          <view class="add-icon">➕</view>
-          <text class="add-text">添加模板</text>
-          <text class="add-subtext">点击创建新模板</text>
-        </view>
-      </view>
-      <view class="load-more" wx:if="{{isLoadingMore}}">...</view>
-      <view class="no-more" wx:if="{{!hasMoreData && templateList.length > 0}}">没有更多模板了</view>
-      <view class="empty-state" wx:if="{{templateList.length === 0 && !isLoading}}">暂无模板</view>
-    </scroll-view>
-  </view>
-</view>
-
-<!-- 详情弹窗 -->
-<view class="modal-overlay" wx:if="{{showDetailModal}}" bindtap="hideDetailModal">
-  <view class="modal-content detail-modal" catchtap="stopPropagation">
-    <view class="modal-close" bindtap="hideDetailModal">×</view>
-    <view class="modal-header"><text class="modal-title">模板详情</text></view>
-    <view class="detail-info" wx:if="{{currentTemplate}}">
-      <view class="detail-item">
-        <text class="detail-label">订单介绍</text>
-        <view class="detail-value intro-value"><text>{{currentTemplate.jieshao || '无介绍'}}</text></view>
-      </view>
-      <view class="detail-item" wx:if="{{currentTemplate.labelName}}">
-        <text class="detail-label">关联标签</text>
-        <chenghao-tag mingcheng="{{currentTemplate.labelName}}" texiaoJson="{{currentTemplate.texiaoJson}}"/>
-     </view>
-      <view class="detail-meta-row">
-        <view class="meta-item"><text class="meta-label">价格</text><text class="meta-value price-meta">{{currentTemplate.jiage || '0.00'}}元</text></view>
-        <view class="meta-divider">|</view>
-        <view class="meta-item"><text class="meta-label">发布数量</text><text class="meta-value count-meta">{{currentTemplate.fabushuliang || 0}}次</text></view>
-        <view class="meta-divider">|</view>
-        <view class="meta-item"><text class="meta-label">模板ID</text><text class="meta-value id-meta">{{currentTemplate.mobanId || 'N/A'}}</text></view>
-      </view>
-      <view class="detail-item" wx:if="{{currentTemplate.commissionEnabled}}">
-        <text class="detail-label">佣金要求</text>
-        <text class="detail-value">{{currentTemplate.commissionValue}}元（建议≤50）</text>
-      </view>
-      <!-- 链接筛选 -->
-      <view class="link-filter-bar">
-        <text class="filter-label">链接状态：</text>
-        <view class="filter-switch {{detailLinkFilter === 0 ? 'active' : ''}}" bindtap="onToggleLinkFilter">未使用</view>
-        <view class="filter-switch {{detailLinkFilter === 1 ? 'active' : ''}}" bindtap="onToggleLinkFilter">已使用</view>
-      </view>
-      <scroll-view class="link-list" scroll-y="true" style="max-height: 300rpx;">
-        <block wx:for="{{detailLinkList}}" wx:key="id">
-          <view class="link-item">
-            <text class="link-url" selectable="true">{{item.lianjie}}</text>
-            <text class="link-status">{{item.is_used ? '已使用' : '未使用'}}</text>
-            <view wx:if="{{!item.is_used}}" class="copy-link-btn" bindtap="onCopyLinkItem" data-url="{{item.lianjie}}">复制</view>
-          </view>
-        </block>
-        <view class="load-more-links" wx:if="{{detailLinkHasMore}}">
-          <view class="load-more-btn" bindtap="onLoadMoreLinks">获取更多链接</view>
-        </view>
-        <view wx:if="{{isLoadingLinks}}" class="link-loading">加载中...</view>
-        <view wx:if="{{detailLinkList.length === 0 && !isLoadingLinks}}" class="link-empty">暂无链接</view>
-      </scroll-view>
-    </view>
-    <view class="modal-actions-grid">
-      <view class="modal-grid-btn generate-modal-grid-btn" bindtap="onGenerateLinkModal">{{currentTemplate.hasGenerated ? '获取新链接' : '生成链接'}}</view>
-      <view class="modal-grid-btn copy-modal-grid-btn {{currentTemplate.isCopied ? 'copied' : ''}}" bindtap="onCopyLinkModal">{{currentTemplate.isCopied ? '已复制' : '复制链接'}}</view>
-      <view class="modal-grid-btn edit-modal-grid-btn" bindtap="onEditTemplate">{{isEditing ? '保存修改' : '立即修改'}}</view>
-      <view class="modal-grid-btn delete-modal-grid-btn" bindtap="onDeleteTemplate">删除模板</view>
-    </view>
-    <!-- 编辑区 -->
-    <view class="edit-section" wx:if="{{isEditing}}">
-      <view class="edit-item">
-        <text class="edit-label">订单介绍</text>
-        <textarea class="edit-input intro-edit" value="{{editJieshao}}" maxlength="100" placeholder="请输入订单介绍（100字以内）" bindinput="onEditJieshaoInput" auto-height/>
-        <text class="word-count">{{editJieshao.length}}/100</text>
-      </view>
-      <view class="edit-item">
-        <text class="edit-label">价格（元）</text>
-        <input class="edit-input price-edit" type="digit" value="{{editJiage}}" placeholder="0.1 - 10000" bindinput="onEditJiageInput"/>
-      </view>
-      <view class="edit-item">
-        <text class="edit-label">标签</text>
-        <picker mode="selector" range="{{currentTypeChenghaoList}}" range-key="mingcheng" bindchange="onEditLabelChange">
-          <view class="picker-view"><text>{{editLabelName || '无'}}</text></view>
-        </picker>
-      </view>
-      <view class="edit-item commission-item">
-        <text class="edit-label">佣金要求（建议≤50）</text>
-        <switch checked="{{editCommissionEnabled}}" bindchange="onEditCommissionToggle"/>
-        <input wx:if="{{editCommissionEnabled}}" class="commission-input" type="digit" placeholder="佣金金额" value="{{editCommissionValue}}" bindinput="onEditCommissionValueInput"/>
-      </view>
-    </view>
-  </view>
-</view>
-
-<!-- 添加模板弹窗 -->
-<view class="modal-overlay" wx:if="{{showAddModal}}" bindtap="hideAddModal">
-  <view class="modal-content add-modal" catchtap="stopPropagation">
-    <view class="modal-close" bindtap="hideAddModal">×</view>
-    <view class="modal-header"><text class="modal-title">添加模板</text></view>
-    <view class="add-form">
-      <view class="form-item">
-        <text class="form-label">订单介绍</text>
-        <textarea class="form-input intro-input" value="{{addJieshao}}" maxlength="100" placeholder="请输入订单介绍（必填）" bindinput="onAddJieshaoInput" auto-height/>
-        <text class="word-count">{{addJieshao.length}}/100</text>
-      </view>
-      <view class="form-item">
-        <text class="form-label">价格（元）</text>
-        <input class="form-input price-input" type="digit" value="{{addJiage}}" placeholder="0.1 - 10000" bindinput="onAddJiageInput"/>
-      </view>
-      <view class="form-item">
-        <text class="form-label">标签</text>
-        <picker mode="selector" range="{{currentTypeChenghaoList}}" range-key="mingcheng" bindchange="onAddLabelChange">
-          <view class="picker-view"><text>{{addLabelName || '可选'}}</text></view>
-        </picker>
-      </view>
-      <view class="form-item commission-item">
-        <text class="form-label">佣金要求（建议≤50）</text>
-        <switch checked="{{addCommissionEnabled}}" bindchange="onAddCommissionToggle"/>
-        <input wx:if="{{addCommissionEnabled}}" class="commission-input" type="digit" placeholder="佣金金额" value="{{addCommissionValue}}" bindinput="onAddCommissionValueInput"/>
-      </view>
-    </view>
-    <view class="modal-actions-grid add-actions-grid">
-      <view class="modal-grid-btn cancel-grid-btn" bindtap="hideAddModal">取消</view>
-      <view class="modal-grid-btn confirm-add-grid-btn" bindtap="onAddTemplate">确认添加</view>
-    </view>
-  </view>
-</view>
-
-<!-- 删除确认弹窗 -->
-<view class="modal-overlay confirm-overlay" wx:if="{{showDeleteConfirm}}" bindtap="hideDeleteConfirm">
-  <view class="confirm-content" catchtap="stopPropagation">
-    <text class="confirm-title">确认删除</text>
-    <text class="confirm-text">确定要删除这个模板吗？此操作不可恢复。</text>
-    <view class="confirm-actions-grid">
-      <view class="confirm-grid-btn cancel-confirm-grid-btn" bindtap="hideDeleteConfirm">取消</view>
-      <view class="confirm-grid-btn delete-confirm-grid-btn" bindtap="confirmDeleteTemplate">确定删除</view>
-    </view>
-  </view>
-</view>
-
-<!-- 获取新链接确认弹窗 -->
-<view class="modal-overlay confirm-overlay" wx:if="{{showNewLinkConfirm}}" bindtap="hideNewLinkConfirm">
-  <view class="confirm-content" catchtap="stopPropagation">
-    <text class="confirm-title">获取新链接</text>
-    <text class="confirm-text">{{currentTemplate.isCopied ? '确定要获取新链接吗？旧链接将失效。' : '您还没有复制当前链接，确定要获取新链接吗？'}}</text>
-    <view class="confirm-actions-grid">
-      <view class="confirm-grid-btn cancel-confirm-grid-btn" bindtap="hideNewLinkConfirm">取消</view>
-      <view class="confirm-grid-btn confirm-new-link-grid-btn" bindtap="confirmNewLink">确定</view>
-    </view>
-  </view>
-</view>
-
+<!-- pages/express-order/express-order.wxml -->
+<view class="page-container">
+  <!-- 余额卡片 -->
+  <view class="balance-card">
+    <text class="balance-label">可用余额</text>
+    <view class="balance-amount">
+      <text class="amount-value">{{sjyue}}</text>
+      <text class="amount-unit">元</text>
+    </view>
+    <text class="balance-tip">生成链接将从此余额扣除</text>
+  </view>
+
+  <!-- 商品类型选择 -->
+  <view class="section">
+    <text class="section-title">选择订单类型</text>
+    <scroll-view class="type-scroll" scroll-x="true" enable-flex>
+      <block wx:for="{{shangpinList}}" wx:key="id">
+        <view class="type-item {{selectedTypeId === item.id ? 'type-active' : ''}}"
+              data-id="{{item.id}}" data-item="{{item}}" bindtap="onSelectType">
+          <text class="type-text">{{item.jieshao}}</text>
+        </view>
+      </block>
+    </scroll-view>
+  </view>
+
+  <!-- 搜索区域 -->
+  <view class="search-section">
+    <view class="search-box">
+      <text class="search-icon">🔍</text>
+      <input class="search-input" placeholder="输入模板ID/介绍..." value="{{searchParams.keyword}}"
+             bindinput="onSearchKeywordInput" bindconfirm="onSearchConfirm"/>
+      <view class="search-btn" bindtap="onSearchConfirm">
+        <text class="search-btn-text">搜索</text>
+      </view>
+    </view>
+    <view class="filter-row">
+      <view class="filter-item">
+        <text class="filter-label">金额≥</text>
+        <input class="filter-input" type="digit" placeholder="元" value="{{searchParams.minPrice}}" bindinput="onSearchMinPriceInput"/>
+      </view>
+      <view class="filter-item">
+        <text class="filter-label">标签</text>
+        <picker mode="selector" range="{{currentTypeChenghaoList}}" range-key="mingcheng" bindchange="onSearchLabelChange">
+          <view class="picker-view">
+            <text>{{searchLabelName || '全部'}}</text>
+          </view>
+        </picker>
+      </view>
+      <view class="clear-search" bindtap="onClearSearch"><text>清空</text></view>
+    </view>
+  </view>
+
+  <!-- 模板卡片网格 -->
+  <view class="template-section">
+    <scroll-view class="template-scroll" scroll-y="true" scroll-with-animation="true" bindscrolltolower="onScrollToLower">
+      <view class="template-grid">
+        <block wx:for="{{templateList}}" wx:key="mobanId">
+          <view class="template-card" bindtap="onCardTap" data-item="{{item}}">
+            <view class="template-intro">
+              <text class="intro-text">{{item.jieshao || '无介绍'}}</text>
+            </view>
+            <view class="template-label" wx:if="{{item.labelName}}">
+              <chenghao-tag mingcheng="{{item.labelName}}" texiaoJson="{{''}}"/>
+            </view>
+            <view class="template-price-row">
+              <text class="template-price-label">价格:</text>
+              <text class="template-price-value">{{item.jiage || '0.00'}}元</text>
+            </view>
+            <view class="template-actions-grid">
+              <view class="action-grid-btn generate-grid-btn {{item.hasGenerated ? 'generated' : ''}}"
+                    data-id="{{item.mobanId}}" catchtap="onGenerateLink">
+                {{item.hasGenerated ? '获取新链接' : '生成链接'}}
+              </view>
+              <view class="action-grid-btn copy-grid-btn {{item.isCopied ? 'copied' : ''}}"
+                    data-id="{{item.mobanId}}" catchtap="onCopyLink">
+                {{item.isCopied ? '已复制' : '一键复制'}}
+              </view>
+            </view>
+          </view>
+        </block>
+        <view class="template-card add-card" bindtap="showAddModal">
+          <view class="add-icon">➕</view>
+          <text class="add-text">添加模板</text>
+          <text class="add-subtext">点击创建新模板</text>
+        </view>
+      </view>
+      <view class="load-more" wx:if="{{isLoadingMore}}">...</view>
+      <view class="no-more" wx:if="{{!hasMoreData && templateList.length > 0}}">没有更多模板了</view>
+      <view class="empty-state" wx:if="{{templateList.length === 0 && !isLoading}}">暂无模板</view>
+    </scroll-view>
+  </view>
+</view>
+
+<!-- 详情弹窗 -->
+<view class="modal-overlay" wx:if="{{showDetailModal}}" bindtap="hideDetailModal">
+  <view class="modal-content detail-modal" catchtap="stopPropagation">
+    <view class="modal-close" bindtap="hideDetailModal">×</view>
+    <view class="modal-header"><text class="modal-title">模板详情</text></view>
+    <view class="detail-info" wx:if="{{currentTemplate}}">
+      <view class="detail-item">
+        <text class="detail-label">订单介绍</text>
+        <view class="detail-value intro-value"><text>{{currentTemplate.jieshao || '无介绍'}}</text></view>
+      </view>
+      <view class="detail-item" wx:if="{{currentTemplate.labelName}}">
+        <text class="detail-label">关联标签</text>
+        <chenghao-tag mingcheng="{{currentTemplate.labelName}}" texiaoJson="{{currentTemplate.texiaoJson}}"/>
+     </view>
+      <view class="detail-meta-row">
+        <view class="meta-item"><text class="meta-label">价格</text><text class="meta-value price-meta">{{currentTemplate.jiage || '0.00'}}元</text></view>
+        <view class="meta-divider">|</view>
+        <view class="meta-item"><text class="meta-label">发布数量</text><text class="meta-value count-meta">{{currentTemplate.fabushuliang || 0}}次</text></view>
+        <view class="meta-divider">|</view>
+        <view class="meta-item"><text class="meta-label">模板ID</text><text class="meta-value id-meta">{{currentTemplate.mobanId || 'N/A'}}</text></view>
+      </view>
+      <view class="detail-item" wx:if="{{currentTemplate.commissionEnabled}}">
+        <text class="detail-label">佣金要求</text>
+        <text class="detail-value">{{currentTemplate.commissionValue}}元（建议≤50）</text>
+      </view>
+      <!-- 链接筛选 -->
+      <view class="link-filter-bar">
+        <text class="filter-label">链接状态：</text>
+        <view class="filter-switch {{detailLinkFilter === 0 ? 'active' : ''}}" bindtap="onToggleLinkFilter">未使用</view>
+        <view class="filter-switch {{detailLinkFilter === 1 ? 'active' : ''}}" bindtap="onToggleLinkFilter">已使用</view>
+      </view>
+      <scroll-view class="link-list" scroll-y="true" style="max-height: 300rpx;">
+        <block wx:for="{{detailLinkList}}" wx:key="id">
+          <view class="link-item">
+            <text class="link-url" selectable="true">{{item.lianjie}}</text>
+            <text class="link-status">{{item.is_used ? '已使用' : '未使用'}}</text>
+            <view wx:if="{{!item.is_used}}" class="copy-link-btn" bindtap="onCopyLinkItem" data-url="{{item.lianjie}}">复制</view>
+          </view>
+        </block>
+        <view class="load-more-links" wx:if="{{detailLinkHasMore}}">
+          <view class="load-more-btn" bindtap="onLoadMoreLinks">获取更多链接</view>
+        </view>
+        <view wx:if="{{isLoadingLinks}}" class="link-loading">加载中...</view>
+        <view wx:if="{{detailLinkList.length === 0 && !isLoadingLinks}}" class="link-empty">暂无链接</view>
+      </scroll-view>
+    </view>
+    <view class="modal-actions-grid">
+      <view class="modal-grid-btn generate-modal-grid-btn" bindtap="onGenerateLinkModal">{{currentTemplate.hasGenerated ? '获取新链接' : '生成链接'}}</view>
+      <view class="modal-grid-btn copy-modal-grid-btn {{currentTemplate.isCopied ? 'copied' : ''}}" bindtap="onCopyLinkModal">{{currentTemplate.isCopied ? '已复制' : '复制链接'}}</view>
+      <view class="modal-grid-btn edit-modal-grid-btn" bindtap="onEditTemplate">{{isEditing ? '保存修改' : '立即修改'}}</view>
+      <view class="modal-grid-btn delete-modal-grid-btn" bindtap="onDeleteTemplate">删除模板</view>
+    </view>
+    <!-- 编辑区 -->
+    <view class="edit-section" wx:if="{{isEditing}}">
+      <view class="edit-item">
+        <text class="edit-label">订单介绍</text>
+        <textarea class="edit-input intro-edit" value="{{editJieshao}}" maxlength="100" placeholder="请输入订单介绍（100字以内）" bindinput="onEditJieshaoInput" auto-height/>
+        <text class="word-count">{{editJieshao.length}}/100</text>
+      </view>
+      <view class="edit-item">
+        <text class="edit-label">价格（元）</text>
+        <input class="edit-input price-edit" type="digit" value="{{editJiage}}" placeholder="0.1 - 10000" bindinput="onEditJiageInput"/>
+      </view>
+      <view class="edit-item">
+        <text class="edit-label">标签</text>
+        <picker mode="selector" range="{{currentTypeChenghaoList}}" range-key="mingcheng" bindchange="onEditLabelChange">
+          <view class="picker-view"><text>{{editLabelName || '无'}}</text></view>
+        </picker>
+      </view>
+      <view class="edit-item commission-item">
+        <text class="edit-label">佣金要求（建议≤50）</text>
+        <switch checked="{{editCommissionEnabled}}" bindchange="onEditCommissionToggle"/>
+        <input wx:if="{{editCommissionEnabled}}" class="commission-input" type="digit" placeholder="佣金金额" value="{{editCommissionValue}}" bindinput="onEditCommissionValueInput"/>
+      </view>
+    </view>
+  </view>
+</view>
+
+<!-- 添加模板弹窗 -->
+<view class="modal-overlay" wx:if="{{showAddModal}}" bindtap="hideAddModal">
+  <view class="modal-content add-modal" catchtap="stopPropagation">
+    <view class="modal-close" bindtap="hideAddModal">×</view>
+    <view class="modal-header"><text class="modal-title">添加模板</text></view>
+    <view class="add-form">
+      <view class="form-item">
+        <text class="form-label">订单介绍</text>
+        <textarea class="form-input intro-input" value="{{addJieshao}}" maxlength="100" placeholder="请输入订单介绍（必填）" bindinput="onAddJieshaoInput" auto-height/>
+        <text class="word-count">{{addJieshao.length}}/100</text>
+      </view>
+      <view class="form-item">
+        <text class="form-label">价格（元）</text>
+        <input class="form-input price-input" type="digit" value="{{addJiage}}" placeholder="0.1 - 10000" bindinput="onAddJiageInput"/>
+      </view>
+      <view class="form-item">
+        <text class="form-label">标签</text>
+        <picker mode="selector" range="{{currentTypeChenghaoList}}" range-key="mingcheng" bindchange="onAddLabelChange">
+          <view class="picker-view"><text>{{addLabelName || '可选'}}</text></view>
+        </picker>
+      </view>
+      <view class="form-item commission-item">
+        <text class="form-label">佣金要求（建议≤50）</text>
+        <switch checked="{{addCommissionEnabled}}" bindchange="onAddCommissionToggle"/>
+        <input wx:if="{{addCommissionEnabled}}" class="commission-input" type="digit" placeholder="佣金金额" value="{{addCommissionValue}}" bindinput="onAddCommissionValueInput"/>
+      </view>
+    </view>
+    <view class="modal-actions-grid add-actions-grid">
+      <view class="modal-grid-btn cancel-grid-btn" bindtap="hideAddModal">取消</view>
+      <view class="modal-grid-btn confirm-add-grid-btn" bindtap="onAddTemplate">确认添加</view>
+    </view>
+  </view>
+</view>
+
+<!-- 删除确认弹窗 -->
+<view class="modal-overlay confirm-overlay" wx:if="{{showDeleteConfirm}}" bindtap="hideDeleteConfirm">
+  <view class="confirm-content" catchtap="stopPropagation">
+    <text class="confirm-title">确认删除</text>
+    <text class="confirm-text">确定要删除这个模板吗？此操作不可恢复。</text>
+    <view class="confirm-actions-grid">
+      <view class="confirm-grid-btn cancel-confirm-grid-btn" bindtap="hideDeleteConfirm">取消</view>
+      <view class="confirm-grid-btn delete-confirm-grid-btn" bindtap="confirmDeleteTemplate">确定删除</view>
+    </view>
+  </view>
+</view>
+
+<!-- 获取新链接确认弹窗 -->
+<view class="modal-overlay confirm-overlay" wx:if="{{showNewLinkConfirm}}" bindtap="hideNewLinkConfirm">
+  <view class="confirm-content" catchtap="stopPropagation">
+    <text class="confirm-title">获取新链接</text>
+    <text class="confirm-text">{{currentTemplate.isCopied ? '确定要获取新链接吗？旧链接将失效。' : '您还没有复制当前链接，确定要获取新链接吗？'}}</text>
+    <view class="confirm-actions-grid">
+      <view class="confirm-grid-btn cancel-confirm-grid-btn" bindtap="hideNewLinkConfirm">取消</view>
+      <view class="confirm-grid-btn confirm-new-link-grid-btn" bindtap="confirmNewLink">确定</view>
+    </view>
+  </view>
+</view>
+
 <global-notification id="global-notification" />
\ No newline at end of file
diff --git a/pages/jisufd/jisufd.wxss b/pages/express-order/express-order.wxss
similarity index 98%
rename from pages/jisufd/jisufd.wxss
rename to pages/express-order/express-order.wxss
index dc4d7e6..0193931 100644
--- a/pages/jisufd/jisufd.wxss
+++ b/pages/express-order/express-order.wxss
@@ -1,222 +1,222 @@
-/* pages/jisufd/jisufd.wxss - 增强版，包含标签展示 */
-.page-container {
-    min-height: 100vh;
-    background: linear-gradient(135deg, #0a0a0f 0%, #1a1a2e 50%, #16213e 100%);
-    padding: 30rpx;
-    box-sizing: border-box;
-    padding-bottom: 40rpx;
-    font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', sans-serif;
-  }
-  .balance-card {
-    background: linear-gradient(135deg, rgba(20,20,30,0.9), rgba(30,30,50,0.9));
-    border-radius: 24rpx;
-    padding: 36rpx;
-    margin-bottom: 40rpx;
-    color: #fff;
-    box-shadow: 0 15rpx 35rpx rgba(0,0,0,0.4), 0 0 40rpx rgba(0,150,255,0.15);
-    text-align: center;
-    border: 1.5rpx solid rgba(0,180,255,0.2);
-    backdrop-filter: blur(10rpx);
-    position: relative;
-    overflow: hidden;
-  }
-  .balance-card::before {
-    content: '';
-    position: absolute;
-    top: -50%; left: -50%;
-    width: 200%; height: 200%;
-    background: linear-gradient(45deg, transparent 30%, rgba(0,180,255,0.1) 50%, transparent 70%);
-    animation: cardShine 6s infinite linear;
-    z-index: 1;
-  }
-  @keyframes cardShine {
-    0% { transform: translateX(-100%) translateY(-100%) rotate(45deg); }
-    100% { transform: translateX(100%) translateY(100%) rotate(45deg); }
-  }
-  .balance-label { font-size: 28rpx; color: rgba(255,255,255,0.8); margin-bottom: 18rpx; font-weight: 500; position: relative; z-index: 2; }
-  .balance-amount { display: flex; align-items: baseline; justify-content: center; margin-bottom: 15rpx; position: relative; z-index: 2; }
-  .amount-value { font-size: 64rpx; font-weight: bold; color: #00B4FF; text-shadow: 0 0 20rpx rgba(0,180,255,0.7), 0 0 40rpx rgba(0,180,255,0.4); animation: amountGlow 3s infinite alternate; }
-  @keyframes amountGlow {
-    0% { color: #00B4FF; text-shadow: 0 0 15rpx rgba(0,180,255,0.6); }
-    100% { color: #00E0FF; text-shadow: 0 0 25rpx rgba(0,180,255,0.8), 0 0 50rpx rgba(0,180,255,0.5); }
-  }
-  .amount-unit { font-size: 36rpx; color: #00B4FF; margin-left: 12rpx; font-weight: 500; z-index: 2; }
-  .balance-tip { font-size: 24rpx; color: rgba(255,255,255,0.6); z-index: 2; }
-  
-  .section { margin-bottom: 35rpx; }
-  .section-title { font-size: 32rpx; font-weight: 700; color: #FFFFFF; margin-bottom: 25rpx; padding-left: 12rpx; border-left: 6rpx solid #9C27B0; text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.3); }
-  
-  .type-scroll { white-space: nowrap; display: flex; height: 90rpx; }
-  .type-item {
-    display: inline-flex; flex-shrink: 0; align-items: center; justify-content: center;
-    height: 85rpx; padding: 0 40rpx; margin-right: 20rpx;
-    background: rgba(255,255,255,0.08); border-radius: 45rpx; border: 2rpx solid rgba(255,255,255,0.15);
-    font-size: 28rpx; color: rgba(255,255,255,0.8);
-    transition: all 0.3s cubic-bezier(0.175,0.885,0.32,1.275);
-    backdrop-filter: blur(10rpx);
-  }
-  .type-active {
-    background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%);
-    border-color: #9C27B0; color: white; transform: scale(1.05);
-    box-shadow: 0 10rpx 25rpx rgba(156,39,176,0.4), 0 0 30rpx rgba(156,39,176,0.3);
-  }
-  .type-text { max-width: 220rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-weight: 500; }
-  
-  /* 搜索区域 */
-  .search-section { margin-bottom: 35rpx; }
-  .search-box {
-    display: flex; align-items: center;
-    background: rgba(255,255,255,0.1); border-radius: 50rpx;
-    padding: 20rpx 30rpx; border: 2rpx solid rgba(255,255,255,0.2);
-    backdrop-filter: blur(10rpx); transition: all 0.3s ease;
-  }
-  .search-box:focus-within { border-color: #9C27B0; background: rgba(255,255,255,0.15); box-shadow: 0 0 25rpx rgba(156,39,176,0.3); }
-  .search-icon { font-size: 32rpx; color: rgba(255,255,255,0.7); margin-right: 20rpx; flex-shrink: 0; }
-  .search-input { flex: 1; font-size: 28rpx; color: #FFFFFF; background: transparent; border: none; outline: none; min-height: 40rpx; }
-  .search-input::placeholder { color: rgba(255,255,255,0.4); }
-  .search-btn { background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%); border-radius: 40rpx; padding: 15rpx 30rpx; margin-left: 20rpx; flex-shrink: 0; box-shadow: 0 8rpx 20rpx rgba(156,39,176,0.3); }
-  .search-btn:active { transform: scale(0.95); }
-  .search-btn-text { font-size: 26rpx; color: white; font-weight: 600; }
-  
-  .filter-row { display: flex; align-items: center; margin-top: 20rpx; gap: 15rpx; }
-  .filter-item { display: flex; align-items: center; background: rgba(255,255,255,0.08); border-radius: 30rpx; padding: 10rpx 20rpx; border: 1rpx solid rgba(255,255,255,0.15); }
-  .filter-label { font-size: 24rpx; color: rgba(255,255,255,0.7); margin-right: 10rpx; }
-  .filter-input { width: 120rpx; height: 50rpx; background: transparent; color: #fff; font-size: 26rpx; }
-  .picker-view { padding: 10rpx 0; color: rgba(255,255,255,0.9); font-size: 26rpx; max-width: 160rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-  .clear-search { margin-left: auto; padding: 10rpx 20rpx; background: rgba(255,255,255,0.1); border-radius: 20rpx; color: rgba(255,255,255,0.7); font-size: 24rpx; }
-  
-  /* 模板区域 */
-  .template-section { height: calc(100vh - 600rpx); position: relative; }
-  .template-scroll { height: 100%; }
-  .template-grid { display: grid; grid-template-columns: repeat(3, 1fr); gap: 25rpx; padding-bottom: 30rpx; }
-  .template-card {
-    background: linear-gradient(145deg, rgba(30,30,45,0.9), rgba(40,40,60,0.9));
-    border-radius: 20rpx; padding: 25rpx;
-    border: 1.5rpx solid rgba(255,255,255,0.1);
-    box-shadow: 0 10rpx 30rpx rgba(0,0,0,0.3), 0 0 25rpx rgba(0,180,255,0.1);
-    transition: all 0.3s ease; backdrop-filter: blur(10rpx);
-    display: flex; flex-direction: column; min-height: 280rpx; position: relative; overflow: hidden;
-  }
-  .template-card::before { content: ''; position: absolute; top:0; left:0; right:0; height:4rpx; background: linear-gradient(90deg, #9C27B0, #00B4FF, #9C27B0); opacity:0.6; }
-  .template-intro { flex:1; margin-bottom:10rpx; min-height:70rpx; overflow:hidden; }
-  .intro-text { font-size:24rpx; line-height:1.4; color:rgba(255,255,255,0.9); display:-webkit-box; -webkit-box-orient:vertical; -webkit-line-clamp:3; overflow:hidden; font-weight:500; }
-  .template-label { margin-bottom: 10rpx; }
-  .template-price-row { display:flex; align-items:center; margin-bottom:20rpx; padding:10rpx 0; border-bottom:1rpx solid rgba(255,255,255,0.1); }
-  .template-price-label { font-size:22rpx; color:rgba(255,255,255,0.7); margin-right:10rpx; }
-  .template-price-value { font-size:26rpx; font-weight:bold; color:#FFD700; text-shadow:0 0 10rpx rgba(255,215,0,0.3); flex:1; }
-  .template-actions-grid { display:flex; flex-direction:column; gap:12rpx; margin-top:10rpx; }
-  .action-grid-btn {
-    height:65rpx; border-radius:32rpx; font-size:24rpx; font-weight:600; transition:all 0.3s ease;
-    border:none; padding:0 20rpx; box-shadow:0 4rpx 12rpx rgba(0,0,0,0.2), inset 0 1rpx 0 rgba(255,255,255,0.1);
-    display:flex !important; align-items:center !important; justify-content:center !important; text-align:center !important;
-  }
-  .generate-grid-btn { background:linear-gradient(135deg, #00B4FF, #0091EA); color:white; }
-  .generate-grid-btn.generated { background:linear-gradient(135deg, #4CAF50, #2E7D32); }
-  .copy-grid-btn { background:linear-gradient(135deg, #9C27B0, #673AB7); color:white; }
-  .copy-grid-btn.copied { background:linear-gradient(135deg, #FF9800, #F57C00); }
-  .add-card { background: linear-gradient(145deg, rgba(40,40,60,0.7), rgba(60,60,80,0.7)); border:2rpx dashed rgba(255,255,255,0.3); display:flex; flex-direction:column; align-items:center; justify-content:center; min-height:280rpx; }
-  .add-icon { font-size:60rpx; color:rgba(255,255,255,0.6); margin-bottom:20rpx; }
-  .add-text { font-size:30rpx; color:rgba(255,255,255,0.8); font-weight:600; margin-bottom:8rpx; }
-  .add-subtext { font-size:24rpx; color:rgba(255,255,255,0.5); }
-  
-  /* 弹窗通用 */
-  .modal-overlay { position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(0,0,0,0.75); display:flex; align-items:center; justify-content:center; z-index:9999; padding:30rpx; backdrop-filter:blur(10rpx); animation:fadeIn 0.3s ease; }
-  @keyframes fadeIn { from{opacity:0;} to{opacity:1;} }
-  .modal-content {
-    background:linear-gradient(145deg, rgba(30,30,45,0.95), rgba(40,40,60,0.95));
-    border-radius:30rpx; width:100%; max-width:700rpx; max-height:85vh; overflow-y:auto;
-    border:1.5rpx solid rgba(255,255,255,0.15);
-    box-shadow:0 25rpx 80rpx rgba(0,0,0,0.6), 0 0 60rpx rgba(0,180,255,0.2);
-    animation:slideUp 0.4s cubic-bezier(0.175,0.885,0.32,1.275);
-    position:relative;
-  }
-  @keyframes slideUp { from{transform:translateY(100rpx) scale(0.9); opacity:0;} to{transform:translateY(0) scale(1); opacity:1;} }
-  .modal-close { position:absolute; top:25rpx; right:25rpx; width:60rpx; height:60rpx; border-radius:50%; background:rgba(255,255,255,0.1); display:flex; align-items:center; justify-content:center; font-size:40rpx; color:rgba(255,255,255,0.7); z-index:10; }
-  .modal-header { padding:40rpx 40rpx 20rpx; text-align:center; }
-  .modal-title { font-size:36rpx; font-weight:bold; color:#FFFFFF; }
-  
-  .detail-info { padding:30rpx 40rpx; }
-  .detail-item { margin-bottom:30rpx; }
-  .detail-label { font-size:26rpx; color:rgba(255,255,255,0.7); margin-bottom:10rpx; font-weight:500; }
-  .detail-value { font-size:28rpx; color:#FFFFFF; word-break:break-word; }
-  .intro-value { background:rgba(255,255,255,0.05); border-radius:15rpx; padding:20rpx; border:1rpx solid rgba(255,255,255,0.1); max-height:200rpx; overflow-y:auto; }
-  .detail-meta-row { display:flex; align-items:center; justify-content:space-between; padding:25rpx 0; margin:20rpx 0; border-top:1rpx solid rgba(255,255,255,0.1); border-bottom:1rpx solid rgba(255,255,255,0.1); }
-  .meta-item { display:flex; flex-direction:column; align-items:center; flex:1; }
-  .meta-label { font-size:22rpx; color:rgba(255,255,255,0.6); margin-bottom:8rpx; }
-  .meta-value { font-size:26rpx; font-weight:600; }
-  .price-meta { color:#FFD700; text-shadow:0 0 10rpx rgba(255,215,0,0.3); }
-  .count-meta { color:#00B4FF; }
-  .id-meta { color:#4CAF50; font-family:'Courier New',monospace; font-size:24rpx; }
-  .meta-divider { color:rgba(255,255,255,0.2); font-size:24rpx; margin:0 15rpx; }
-  
-  .link-filter-bar { display:flex; align-items:center; margin-top:30rpx; margin-bottom:20rpx; }
-  .filter-switch {
-    padding:10rpx 25rpx; margin-left:10rpx; border-radius:20rpx; background:rgba(255,255,255,0.1);
-    font-size:24rpx; color:rgba(255,255,255,0.7); transition:all 0.3s;
-  }
-  .filter-switch.active { background:linear-gradient(135deg, #00B4FF, #0091EA); color:white; }
-  .link-list { background:rgba(0,0,0,0.2); border-radius:15rpx; padding:15rpx; }
-  .link-item { display:flex; align-items:center; justify-content:space-between; padding:15rpx 0; border-bottom:1rpx solid rgba(255,255,255,0.1); }
-  .link-url { flex:1; font-size:22rpx; color:rgba(255,255,255,0.8); word-break:break-all; margin-right:15rpx; }
-  .link-status { font-size:20rpx; color:rgba(255,255,255,0.5); margin-right:15rpx; }
-  .copy-link-btn { padding:8rpx 20rpx; background:#00B4FF; color:white; border-radius:15rpx; font-size:22rpx; }
-  .load-more-links { text-align:center; padding:20rpx 0; }
-  .load-more-btn { display:inline-block; padding:15rpx 40rpx; background:linear-gradient(135deg, #9C27B0, #673AB7); border-radius:30rpx; color:white; font-size:26rpx; }
-  .link-loading, .link-empty { text-align:center; padding:30rpx; color:rgba(255,255,255,0.5); font-size:24rpx; }
-  
-  /* 弹窗按钮 */
-  .modal-actions-grid { display:grid; grid-template-columns:repeat(2,1fr); gap:18rpx; padding:30rpx 40rpx 40rpx; border-top:1rpx solid rgba(255,255,255,0.1); }
-  .modal-grid-btn {
-    height:85rpx; border-radius:42rpx; font-size:28rpx; font-weight:600; transition:all 0.3s;
-    border:none; padding:0 20rpx; box-shadow:0 8rpx 25rpx rgba(0,0,0,0.3), inset 0 1rpx 0 rgba(255,255,255,0.2);
-    display:flex !important; align-items:center !important; justify-content:center !important;
-  }
-  .generate-modal-grid-btn { background:linear-gradient(145deg, #00B4FF, #0091EA); color:white; }
-  .copy-modal-grid-btn { background:linear-gradient(145deg, #9C27B0, #673AB7); color:white; }
-  .copy-modal-grid-btn.copied { background:linear-gradient(145deg, #FF9800, #F57C00); }
-  .edit-modal-grid-btn { background:linear-gradient(145deg, #4CAF50, #2E7D32); color:white; }
-  .delete-modal-grid-btn { background:linear-gradient(145deg, #FF4444, #CC0000); color:white; }
-  
-  /* 编辑区 */
-  .edit-section { padding:30rpx 40rpx 20rpx; border-top:1rpx solid rgba(255,255,255,0.1); margin-top:20rpx; }
-  .edit-item { margin-bottom:30rpx; }
-  .edit-label { font-size:26rpx; color:rgba(255,255,255,0.8); margin-bottom:15rpx; font-weight:600; }
-  .edit-input { width:100%; background:rgba(255,255,255,0.08); border:1.5rpx solid rgba(255,255,255,0.2); border-radius:15rpx; padding:25rpx; font-size:28rpx; color:#FFFFFF; }
-  .intro-edit { min-height:150rpx; }
-  .price-edit { text-align:center; font-size:32rpx; font-weight:600; height:90rpx; line-height:90rpx; }
-  .picker-view { padding:25rpx; background:rgba(255,255,255,0.08); border-radius:15rpx; border:1.5rpx solid rgba(255,255,255,0.2); color:#fff; }
-  .commission-item { display:flex; align-items:center; gap:20rpx; }
-  .commission-input { flex:1; background:rgba(255,255,255,0.08); border-radius:15rpx; padding:20rpx; color:#fff; }
-  
-  /* 添加表单 */
-  .add-form { padding:30rpx 40rpx 20rpx; }
-  .form-item { margin-bottom:35rpx; }
-  .form-label { font-size:28rpx; color:rgba(255,255,255,0.8); margin-bottom:18rpx; font-weight:600; }
-  .intro-input, .price-input { width:100%; background:rgba(255,255,255,0.08); border:1.5rpx solid rgba(255,255,255,0.2); border-radius:15rpx; padding:25rpx; font-size:28rpx; color:#FFFFFF; }
-  .intro-input { min-height:180rpx; }
-  .price-input { height:90rpx; line-height:90rpx; text-align:center; font-weight:600; }
-  .add-actions-grid { display:grid; grid-template-columns:repeat(2,1fr); gap:25rpx; padding:30rpx 40rpx 40rpx; border-top:1rpx solid rgba(255,255,255,0.1); }
-  .cancel-grid-btn { background:rgba(255,255,255,0.1); color:rgba(255,255,255,0.8); border:1.5rpx solid rgba(255,255,255,0.2); }
-  .confirm-add-grid-btn { background:linear-gradient(145deg, #9C27B0, #673AB7); color:white; }
-  
-  /* 确认弹窗 */
-  .confirm-content {
-    background:linear-gradient(145deg, rgba(40,40,60,0.95), rgba(50,50,70,0.95));
-    border-radius:25rpx; padding:50rpx 40rpx 40rpx; width:85%; max-width:550rpx;
-    border:1.5rpx solid rgba(255,255,255,0.15); box-shadow:0 30rpx 90rpx rgba(0,0,0,0.7); text-align:center;
-    animation:scaleIn 0.3s ease;
-  }
-  @keyframes scaleIn { from{transform:scale(0.8); opacity:0;} to{transform:scale(1); opacity:1;} }
-  .confirm-title { font-size:34rpx; font-weight:bold; color:#FFFFFF; margin-bottom:25rpx; }
-  .confirm-text { font-size:28rpx; color:rgba(255,255,255,0.8); margin-bottom:40rpx; }
-  .confirm-actions-grid { display:grid; grid-template-columns:repeat(2,1fr); gap:25rpx; }
-  .confirm-grid-btn { height:85rpx; border-radius:42rpx; font-size:28rpx; font-weight:600; display:flex; align-items:center; justify-content:center; }
-  .cancel-confirm-grid-btn { background:rgba(255,255,255,0.1); color:rgba(255,255,255,0.8); border:1.5rpx solid rgba(255,255,255,0.2); }
-  .delete-confirm-grid-btn { background:linear-gradient(145deg, #FF4444, #CC0000); color:white; }
-  .confirm-new-link-grid-btn { background:linear-gradient(145deg, #00B4FF, #0091EA); color:white; }
-  
-  .loading-mask { position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(18,18,24,0.95); display:flex; align-items:center; justify-content:center; z-index:10000; }
-  .loading-content { background:rgba(40,40,60,0.95); padding:60rpx 80rpx; border-radius:30rpx; display:flex; flex-direction:column; align-items:center; box-shadow:0 25rpx 70rpx rgba(0,0,0,0.6); }
-  .loading-spinner { width:90rpx; height:90rpx; border:8rpx solid rgba(0,180,255,0.2); border-top:8rpx solid #00B4FF; border-radius:50%; animation:spin 1.2s linear infinite; margin-bottom:35rpx; }
-  .loading-text { font-size:30rpx; color:#00B4FF; font-weight:600; }
+/* pages/express-order/express-order.wxss - 增强版，包含标签展示 */
+.page-container {
+    min-height: 100vh;
+    background: linear-gradient(135deg, #0a0a0f 0%, #1a1a2e 50%, #16213e 100%);
+    padding: 30rpx;
+    box-sizing: border-box;
+    padding-bottom: 40rpx;
+    font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', sans-serif;
+  }
+  .balance-card {
+    background: linear-gradient(135deg, rgba(20,20,30,0.9), rgba(30,30,50,0.9));
+    border-radius: 24rpx;
+    padding: 36rpx;
+    margin-bottom: 40rpx;
+    color: #fff;
+    box-shadow: 0 15rpx 35rpx rgba(0,0,0,0.4), 0 0 40rpx rgba(0,150,255,0.15);
+    text-align: center;
+    border: 1.5rpx solid rgba(0,180,255,0.2);
+    backdrop-filter: blur(10rpx);
+    position: relative;
+    overflow: hidden;
+  }
+  .balance-card::before {
+    content: '';
+    position: absolute;
+    top: -50%; left: -50%;
+    width: 200%; height: 200%;
+    background: linear-gradient(45deg, transparent 30%, rgba(0,180,255,0.1) 50%, transparent 70%);
+    animation: cardShine 6s infinite linear;
+    z-index: 1;
+  }
+  @keyframes cardShine {
+    0% { transform: translateX(-100%) translateY(-100%) rotate(45deg); }
+    100% { transform: translateX(100%) translateY(100%) rotate(45deg); }
+  }
+  .balance-label { font-size: 28rpx; color: rgba(255,255,255,0.8); margin-bottom: 18rpx; font-weight: 500; position: relative; z-index: 2; }
+  .balance-amount { display: flex; align-items: baseline; justify-content: center; margin-bottom: 15rpx; position: relative; z-index: 2; }
+  .amount-value { font-size: 64rpx; font-weight: bold; color: #00B4FF; text-shadow: 0 0 20rpx rgba(0,180,255,0.7), 0 0 40rpx rgba(0,180,255,0.4); animation: amountGlow 3s infinite alternate; }
+  @keyframes amountGlow {
+    0% { color: #00B4FF; text-shadow: 0 0 15rpx rgba(0,180,255,0.6); }
+    100% { color: #00E0FF; text-shadow: 0 0 25rpx rgba(0,180,255,0.8), 0 0 50rpx rgba(0,180,255,0.5); }
+  }
+  .amount-unit { font-size: 36rpx; color: #00B4FF; margin-left: 12rpx; font-weight: 500; z-index: 2; }
+  .balance-tip { font-size: 24rpx; color: rgba(255,255,255,0.6); z-index: 2; }
+  
+  .section { margin-bottom: 35rpx; }
+  .section-title { font-size: 32rpx; font-weight: 700; color: #FFFFFF; margin-bottom: 25rpx; padding-left: 12rpx; border-left: 6rpx solid #9C27B0; text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.3); }
+  
+  .type-scroll { white-space: nowrap; display: flex; height: 90rpx; }
+  .type-item {
+    display: inline-flex; flex-shrink: 0; align-items: center; justify-content: center;
+    height: 85rpx; padding: 0 40rpx; margin-right: 20rpx;
+    background: rgba(255,255,255,0.08); border-radius: 45rpx; border: 2rpx solid rgba(255,255,255,0.15);
+    font-size: 28rpx; color: rgba(255,255,255,0.8);
+    transition: all 0.3s cubic-bezier(0.175,0.885,0.32,1.275);
+    backdrop-filter: blur(10rpx);
+  }
+  .type-active {
+    background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%);
+    border-color: #9C27B0; color: white; transform: scale(1.05);
+    box-shadow: 0 10rpx 25rpx rgba(156,39,176,0.4), 0 0 30rpx rgba(156,39,176,0.3);
+  }
+  .type-text { max-width: 220rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-weight: 500; }
+  
+  /* 搜索区域 */
+  .search-section { margin-bottom: 35rpx; }
+  .search-box {
+    display: flex; align-items: center;
+    background: rgba(255,255,255,0.1); border-radius: 50rpx;
+    padding: 20rpx 30rpx; border: 2rpx solid rgba(255,255,255,0.2);
+    backdrop-filter: blur(10rpx); transition: all 0.3s ease;
+  }
+  .search-box:focus-within { border-color: #9C27B0; background: rgba(255,255,255,0.15); box-shadow: 0 0 25rpx rgba(156,39,176,0.3); }
+  .search-icon { font-size: 32rpx; color: rgba(255,255,255,0.7); margin-right: 20rpx; flex-shrink: 0; }
+  .search-input { flex: 1; font-size: 28rpx; color: #FFFFFF; background: transparent; border: none; outline: none; min-height: 40rpx; }
+  .search-input::placeholder { color: rgba(255,255,255,0.4); }
+  .search-btn { background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%); border-radius: 40rpx; padding: 15rpx 30rpx; margin-left: 20rpx; flex-shrink: 0; box-shadow: 0 8rpx 20rpx rgba(156,39,176,0.3); }
+  .search-btn:active { transform: scale(0.95); }
+  .search-btn-text { font-size: 26rpx; color: white; font-weight: 600; }
+  
+  .filter-row { display: flex; align-items: center; margin-top: 20rpx; gap: 15rpx; }
+  .filter-item { display: flex; align-items: center; background: rgba(255,255,255,0.08); border-radius: 30rpx; padding: 10rpx 20rpx; border: 1rpx solid rgba(255,255,255,0.15); }
+  .filter-label { font-size: 24rpx; color: rgba(255,255,255,0.7); margin-right: 10rpx; }
+  .filter-input { width: 120rpx; height: 50rpx; background: transparent; color: #fff; font-size: 26rpx; }
+  .picker-view { padding: 10rpx 0; color: rgba(255,255,255,0.9); font-size: 26rpx; max-width: 160rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+  .clear-search { margin-left: auto; padding: 10rpx 20rpx; background: rgba(255,255,255,0.1); border-radius: 20rpx; color: rgba(255,255,255,0.7); font-size: 24rpx; }
+  
+  /* 模板区域 */
+  .template-section { height: calc(100vh - 600rpx); position: relative; }
+  .template-scroll { height: 100%; }
+  .template-grid { display: grid; grid-template-columns: repeat(3, 1fr); gap: 25rpx; padding-bottom: 30rpx; }
+  .template-card {
+    background: linear-gradient(145deg, rgba(30,30,45,0.9), rgba(40,40,60,0.9));
+    border-radius: 20rpx; padding: 25rpx;
+    border: 1.5rpx solid rgba(255,255,255,0.1);
+    box-shadow: 0 10rpx 30rpx rgba(0,0,0,0.3), 0 0 25rpx rgba(0,180,255,0.1);
+    transition: all 0.3s ease; backdrop-filter: blur(10rpx);
+    display: flex; flex-direction: column; min-height: 280rpx; position: relative; overflow: hidden;
+  }
+  .template-card::before { content: ''; position: absolute; top:0; left:0; right:0; height:4rpx; background: linear-gradient(90deg, #9C27B0, #00B4FF, #9C27B0); opacity:0.6; }
+  .template-intro { flex:1; margin-bottom:10rpx; min-height:70rpx; overflow:hidden; }
+  .intro-text { font-size:24rpx; line-height:1.4; color:rgba(255,255,255,0.9); display:-webkit-box; -webkit-box-orient:vertical; -webkit-line-clamp:3; overflow:hidden; font-weight:500; }
+  .template-label { margin-bottom: 10rpx; }
+  .template-price-row { display:flex; align-items:center; margin-bottom:20rpx; padding:10rpx 0; border-bottom:1rpx solid rgba(255,255,255,0.1); }
+  .template-price-label { font-size:22rpx; color:rgba(255,255,255,0.7); margin-right:10rpx; }
+  .template-price-value { font-size:26rpx; font-weight:bold; color:#FFD700; text-shadow:0 0 10rpx rgba(255,215,0,0.3); flex:1; }
+  .template-actions-grid { display:flex; flex-direction:column; gap:12rpx; margin-top:10rpx; }
+  .action-grid-btn {
+    height:65rpx; border-radius:32rpx; font-size:24rpx; font-weight:600; transition:all 0.3s ease;
+    border:none; padding:0 20rpx; box-shadow:0 4rpx 12rpx rgba(0,0,0,0.2), inset 0 1rpx 0 rgba(255,255,255,0.1);
+    display:flex !important; align-items:center !important; justify-content:center !important; text-align:center !important;
+  }
+  .generate-grid-btn { background:linear-gradient(135deg, #00B4FF, #0091EA); color:white; }
+  .generate-grid-btn.generated { background:linear-gradient(135deg, #4CAF50, #2E7D32); }
+  .copy-grid-btn { background:linear-gradient(135deg, #9C27B0, #673AB7); color:white; }
+  .copy-grid-btn.copied { background:linear-gradient(135deg, #FF9800, #F57C00); }
+  .add-card { background: linear-gradient(145deg, rgba(40,40,60,0.7), rgba(60,60,80,0.7)); border:2rpx dashed rgba(255,255,255,0.3); display:flex; flex-direction:column; align-items:center; justify-content:center; min-height:280rpx; }
+  .add-icon { font-size:60rpx; color:rgba(255,255,255,0.6); margin-bottom:20rpx; }
+  .add-text { font-size:30rpx; color:rgba(255,255,255,0.8); font-weight:600; margin-bottom:8rpx; }
+  .add-subtext { font-size:24rpx; color:rgba(255,255,255,0.5); }
+  
+  /* 弹窗通用 */
+  .modal-overlay { position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(0,0,0,0.75); display:flex; align-items:center; justify-content:center; z-index:9999; padding:30rpx; backdrop-filter:blur(10rpx); animation:fadeIn 0.3s ease; }
+  @keyframes fadeIn { from{opacity:0;} to{opacity:1;} }
+  .modal-content {
+    background:linear-gradient(145deg, rgba(30,30,45,0.95), rgba(40,40,60,0.95));
+    border-radius:30rpx; width:100%; max-width:700rpx; max-height:85vh; overflow-y:auto;
+    border:1.5rpx solid rgba(255,255,255,0.15);
+    box-shadow:0 25rpx 80rpx rgba(0,0,0,0.6), 0 0 60rpx rgba(0,180,255,0.2);
+    animation:slideUp 0.4s cubic-bezier(0.175,0.885,0.32,1.275);
+    position:relative;
+  }
+  @keyframes slideUp { from{transform:translateY(100rpx) scale(0.9); opacity:0;} to{transform:translateY(0) scale(1); opacity:1;} }
+  .modal-close { position:absolute; top:25rpx; right:25rpx; width:60rpx; height:60rpx; border-radius:50%; background:rgba(255,255,255,0.1); display:flex; align-items:center; justify-content:center; font-size:40rpx; color:rgba(255,255,255,0.7); z-index:10; }
+  .modal-header { padding:40rpx 40rpx 20rpx; text-align:center; }
+  .modal-title { font-size:36rpx; font-weight:bold; color:#FFFFFF; }
+  
+  .detail-info { padding:30rpx 40rpx; }
+  .detail-item { margin-bottom:30rpx; }
+  .detail-label { font-size:26rpx; color:rgba(255,255,255,0.7); margin-bottom:10rpx; font-weight:500; }
+  .detail-value { font-size:28rpx; color:#FFFFFF; word-break:break-word; }
+  .intro-value { background:rgba(255,255,255,0.05); border-radius:15rpx; padding:20rpx; border:1rpx solid rgba(255,255,255,0.1); max-height:200rpx; overflow-y:auto; }
+  .detail-meta-row { display:flex; align-items:center; justify-content:space-between; padding:25rpx 0; margin:20rpx 0; border-top:1rpx solid rgba(255,255,255,0.1); border-bottom:1rpx solid rgba(255,255,255,0.1); }
+  .meta-item { display:flex; flex-direction:column; align-items:center; flex:1; }
+  .meta-label { font-size:22rpx; color:rgba(255,255,255,0.6); margin-bottom:8rpx; }
+  .meta-value { font-size:26rpx; font-weight:600; }
+  .price-meta { color:#FFD700; text-shadow:0 0 10rpx rgba(255,215,0,0.3); }
+  .count-meta { color:#00B4FF; }
+  .id-meta { color:#4CAF50; font-family:'Courier New',monospace; font-size:24rpx; }
+  .meta-divider { color:rgba(255,255,255,0.2); font-size:24rpx; margin:0 15rpx; }
+  
+  .link-filter-bar { display:flex; align-items:center; margin-top:30rpx; margin-bottom:20rpx; }
+  .filter-switch {
+    padding:10rpx 25rpx; margin-left:10rpx; border-radius:20rpx; background:rgba(255,255,255,0.1);
+    font-size:24rpx; color:rgba(255,255,255,0.7); transition:all 0.3s;
+  }
+  .filter-switch.active { background:linear-gradient(135deg, #00B4FF, #0091EA); color:white; }
+  .link-list { background:rgba(0,0,0,0.2); border-radius:15rpx; padding:15rpx; }
+  .link-item { display:flex; align-items:center; justify-content:space-between; padding:15rpx 0; border-bottom:1rpx solid rgba(255,255,255,0.1); }
+  .link-url { flex:1; font-size:22rpx; color:rgba(255,255,255,0.8); word-break:break-all; margin-right:15rpx; }
+  .link-status { font-size:20rpx; color:rgba(255,255,255,0.5); margin-right:15rpx; }
+  .copy-link-btn { padding:8rpx 20rpx; background:#00B4FF; color:white; border-radius:15rpx; font-size:22rpx; }
+  .load-more-links { text-align:center; padding:20rpx 0; }
+  .load-more-btn { display:inline-block; padding:15rpx 40rpx; background:linear-gradient(135deg, #9C27B0, #673AB7); border-radius:30rpx; color:white; font-size:26rpx; }
+  .link-loading, .link-empty { text-align:center; padding:30rpx; color:rgba(255,255,255,0.5); font-size:24rpx; }
+  
+  /* 弹窗按钮 */
+  .modal-actions-grid { display:grid; grid-template-columns:repeat(2,1fr); gap:18rpx; padding:30rpx 40rpx 40rpx; border-top:1rpx solid rgba(255,255,255,0.1); }
+  .modal-grid-btn {
+    height:85rpx; border-radius:42rpx; font-size:28rpx; font-weight:600; transition:all 0.3s;
+    border:none; padding:0 20rpx; box-shadow:0 8rpx 25rpx rgba(0,0,0,0.3), inset 0 1rpx 0 rgba(255,255,255,0.2);
+    display:flex !important; align-items:center !important; justify-content:center !important;
+  }
+  .generate-modal-grid-btn { background:linear-gradient(145deg, #00B4FF, #0091EA); color:white; }
+  .copy-modal-grid-btn { background:linear-gradient(145deg, #9C27B0, #673AB7); color:white; }
+  .copy-modal-grid-btn.copied { background:linear-gradient(145deg, #FF9800, #F57C00); }
+  .edit-modal-grid-btn { background:linear-gradient(145deg, #4CAF50, #2E7D32); color:white; }
+  .delete-modal-grid-btn { background:linear-gradient(145deg, #FF4444, #CC0000); color:white; }
+  
+  /* 编辑区 */
+  .edit-section { padding:30rpx 40rpx 20rpx; border-top:1rpx solid rgba(255,255,255,0.1); margin-top:20rpx; }
+  .edit-item { margin-bottom:30rpx; }
+  .edit-label { font-size:26rpx; color:rgba(255,255,255,0.8); margin-bottom:15rpx; font-weight:600; }
+  .edit-input { width:100%; background:rgba(255,255,255,0.08); border:1.5rpx solid rgba(255,255,255,0.2); border-radius:15rpx; padding:25rpx; font-size:28rpx; color:#FFFFFF; }
+  .intro-edit { min-height:150rpx; }
+  .price-edit { text-align:center; font-size:32rpx; font-weight:600; height:90rpx; line-height:90rpx; }
+  .picker-view { padding:25rpx; background:rgba(255,255,255,0.08); border-radius:15rpx; border:1.5rpx solid rgba(255,255,255,0.2); color:#fff; }
+  .commission-item { display:flex; align-items:center; gap:20rpx; }
+  .commission-input { flex:1; background:rgba(255,255,255,0.08); border-radius:15rpx; padding:20rpx; color:#fff; }
+  
+  /* 添加表单 */
+  .add-form { padding:30rpx 40rpx 20rpx; }
+  .form-item { margin-bottom:35rpx; }
+  .form-label { font-size:28rpx; color:rgba(255,255,255,0.8); margin-bottom:18rpx; font-weight:600; }
+  .intro-input, .price-input { width:100%; background:rgba(255,255,255,0.08); border:1.5rpx solid rgba(255,255,255,0.2); border-radius:15rpx; padding:25rpx; font-size:28rpx; color:#FFFFFF; }
+  .intro-input { min-height:180rpx; }
+  .price-input { height:90rpx; line-height:90rpx; text-align:center; font-weight:600; }
+  .add-actions-grid { display:grid; grid-template-columns:repeat(2,1fr); gap:25rpx; padding:30rpx 40rpx 40rpx; border-top:1rpx solid rgba(255,255,255,0.1); }
+  .cancel-grid-btn { background:rgba(255,255,255,0.1); color:rgba(255,255,255,0.8); border:1.5rpx solid rgba(255,255,255,0.2); }
+  .confirm-add-grid-btn { background:linear-gradient(145deg, #9C27B0, #673AB7); color:white; }
+  
+  /* 确认弹窗 */
+  .confirm-content {
+    background:linear-gradient(145deg, rgba(40,40,60,0.95), rgba(50,50,70,0.95));
+    border-radius:25rpx; padding:50rpx 40rpx 40rpx; width:85%; max-width:550rpx;
+    border:1.5rpx solid rgba(255,255,255,0.15); box-shadow:0 30rpx 90rpx rgba(0,0,0,0.7); text-align:center;
+    animation:scaleIn 0.3s ease;
+  }
+  @keyframes scaleIn { from{transform:scale(0.8); opacity:0;} to{transform:scale(1); opacity:1;} }
+  .confirm-title { font-size:34rpx; font-weight:bold; color:#FFFFFF; margin-bottom:25rpx; }
+  .confirm-text { font-size:28rpx; color:rgba(255,255,255,0.8); margin-bottom:40rpx; }
+  .confirm-actions-grid { display:grid; grid-template-columns:repeat(2,1fr); gap:25rpx; }
+  .confirm-grid-btn { height:85rpx; border-radius:42rpx; font-size:28rpx; font-weight:600; display:flex; align-items:center; justify-content:center; }
+  .cancel-confirm-grid-btn { background:rgba(255,255,255,0.1); color:rgba(255,255,255,0.8); border:1.5rpx solid rgba(255,255,255,0.2); }
+  .delete-confirm-grid-btn { background:linear-gradient(145deg, #FF4444, #CC0000); color:white; }
+  .confirm-new-link-grid-btn { background:linear-gradient(145deg, #00B4FF, #0091EA); color:white; }
+  
+  .loading-mask { position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(18,18,24,0.95); display:flex; align-items:center; justify-content:center; z-index:10000; }
+  .loading-content { background:rgba(40,40,60,0.95); padding:60rpx 80rpx; border-radius:30rpx; display:flex; flex-direction:column; align-items:center; box-shadow:0 25rpx 70rpx rgba(0,0,0,0.6); }
+  .loading-spinner { width:90rpx; height:90rpx; border:8rpx solid rgba(0,180,255,0.2); border-top:8rpx solid #00B4FF; border-radius:50%; animation:spin 1.2s linear infinite; margin-bottom:35rpx; }
+  .loading-text { font-size:30rpx; color:#00B4FF; font-weight:600; }
   @keyframes spin { 0%{transform:rotate(0deg);} 100%{transform:rotate(360deg);} }
\ No newline at end of file
diff --git a/pages/dashouxiugai/dashouxiugai.js b/pages/fighter-edit/fighter-edit.js
similarity index 100%
rename from pages/dashouxiugai/dashouxiugai.js
rename to pages/fighter-edit/fighter-edit.js
diff --git a/pages/dashouxiugai/dashouxiugai.json b/pages/fighter-edit/fighter-edit.json
similarity index 100%
rename from pages/dashouxiugai/dashouxiugai.json
rename to pages/fighter-edit/fighter-edit.json
diff --git a/pages/dashouxiugai/dashouxiugai.wxml b/pages/fighter-edit/fighter-edit.wxml
similarity index 100%
rename from pages/dashouxiugai/dashouxiugai.wxml
rename to pages/fighter-edit/fighter-edit.wxml
diff --git a/pages/dashouxiugai/dashouxiugai.wxss b/pages/fighter-edit/fighter-edit.wxss
similarity index 100%
rename from pages/dashouxiugai/dashouxiugai.wxss
rename to pages/fighter-edit/fighter-edit.wxss
diff --git a/pages/dashouxiaoxi/dashouxiaoxi.js b/pages/fighter-msg/fighter-msg.js
similarity index 96%
rename from pages/dashouxiaoxi/dashouxiaoxi.js
rename to pages/fighter-msg/fighter-msg.js
index 3b7e862..8088f2f 100644
--- a/pages/dashouxiaoxi/dashouxiaoxi.js
+++ b/pages/fighter-msg/fighter-msg.js
@@ -1,684 +1,684 @@
-// pages/cfss/cfss.js
-import request from '../../utils/request.js'
-const app = getApp()
-const MEIYE_TIAOSHU = 5
-
-Page({
-  data: {
-    zongshu: 0,
-    daichuli: 0,
-    yichuli: 0,
-    shenfen: 0,
-    chufaList: [],
-    dangqianye: 1,
-    haiyougengduo: true,
-    jiazhaozhong: false,
-    jiazhaigengduo: false,
-    scrollHeight: 0,
-    showXiangqing: false,
-    xuanzhongChufa: {},
-    showShensuModal: false,
-    shensuLiyou: '',
-    shensuTupian: [],
-    shensuTupianUrls: [],
-    shangchuanJindu: 0,
-    shangchuanZongshu: 0,
-    jinduWidth: '0%',
-    isShangchuanzhong: false,
-    ossImageUrl: '',
-    fangdouTimer: null
-  },
-
-  onLoad(options) {
-    this.registerNotificationComponent()
-    this.initOSSUrl()
-    this.jisuanGaodu()
-    this.chushihuaShuju()
-  },
-
-
-
-  
-    
-    
-
-  onShow() {
-    this.registerNotificationComponent()
-  },
-
-  onUnload() {
-    if (this.data.fangdouTimer) clearTimeout(this.data.fangdouTimer)
-  },
-
-  onReachBottom() {
-    this.shanglaShuaxin()
-  },
-
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification')
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      }
-    }
-  },
-
-  initOSSUrl() {
-    const ossImageUrl = app.globalData.ossImageUrl || ''
-    this.setData({ ossImageUrl })
-  },
-
-  jisuanGaodu() {
-    const systemInfo = wx.getSystemInfoSync()
-    const windowHeight = systemInfo.windowHeight
-    const height = windowHeight - 200 - 100 - 40
-    this.setData({
-      scrollHeight: height > 0 ? height : 400
-    })
-  },
-
-  chushihuaShuju() {
-    this.setData({
-      dangqianye: 1,
-      chufaList: [],
-      haiyougengduo: true
-    })
-    this.jiazhuoquTongji()
-    this.jiazhuoquChufaList()
-  },
-
-  async jiazhuoquTongji() {
-    try {
-      const res = await request({
-        url: '/yonghu/dshqcfjl',
-        method: 'POST',
-        data: { qingqiu_tongji: true }
-      })
-      if (res.statusCode === 200 && res.data.code === 0) {
-        const data = res.data.data
-        this.setData({
-          zongshu: data.zongshu || 0,
-          daichuli: data.daichuli || 0,
-          yichuli: data.yichuli || 0
-        })
-      }
-    } catch (error) {
-      console.error('获取统计信息失败:', error)
-    }
-  },
-
-  async jiazhuoquChufaList(isLoadMore = false) {
-    if (this.data.jiazhaozhong || this.data.jiazhaigengduo) return
-    if (isLoadMore) {
-      if (!this.data.haiyougengduo) return
-      this.setData({ jiazhaigengduo: true })
-    } else {
-      this.setData({ jiazhaozhong: true })
-    }
-    
-    try {
-      const params = {
-        page: this.data.dangqianye,
-        page_size: MEIYE_TIAOSHU
-      }
-      if (this.data.shenfen === 0) {
-        params.zhuangtai = 0
-      } else {
-        params.zhuangtai = 1
-      }
-      
-      const res = await request({
-        url: '/yonghu/dshqcfjl',
-        method: 'POST',
-        data: params
-      })
-      
-      //console.log('🔴【后端返回的数据】:', res.data)
-      
-      if (res.statusCode === 200 && res.data.code === 0) {
-        const data = res.data.data
-        
-        if (data.list && Array.isArray(data.list)) {
-          // 🔴【关键修复】在数据加载时就处理好显示字段
-          const processedList = data.list.map(item => {
-            // 处理显示时间
-            let displayTime = '--'
-            if (item.create_time) {
-              if (typeof item.create_time === 'number') {
-                displayTime = String(item.create_time)
-              } else if (typeof item.create_time === 'string') {
-                displayTime = item.create_time
-              } else {
-                displayTime = String(item.create_time)
-              }
-            }
-            
-            // 处理显示状态
-            let displayStatus = '未知状态'
-            let statusClass = 'zhuangtai-weizhi'
-            const statusNum = Number(item.sqzhuangtai)
-            
-            if (!isNaN(statusNum)) {
-              if (statusNum === 0) {
-                displayStatus = '待处罚'
-                statusClass = 'zhuangtai-daichuli'
-              } else if (statusNum === 1) {
-                displayStatus = '已处罚'
-                statusClass = 'zhuangtai-yichufa'
-              } else if (statusNum === 2) {
-                displayStatus = '已驳回'
-                statusClass = 'zhuangtai-yibohui'
-              } else if (statusNum === 3) {
-                displayStatus = '申诉中'
-                statusClass = 'zhuangtai-shensuzhong'
-              }
-            }
-            
-            // 处理图片URL（在数据加载时就拼接完整URL）
-            const fullZhengjuTupian = (item.zhengju_tupian || []).map(url => this.getFullImageUrl(url))
-            const fullShensuTupian = (item.shensu_tupian || []).map(url => this.getFullImageUrl(url))
-            
-            return {
-              ...item,
-              display_time: displayTime, // 🔴 处理好的显示时间
-              display_status: displayStatus, // 🔴 处理好的显示状态
-              status_class: statusClass, // 🔴 处理好的状态样式类
-              zhengju_tupian: item.zhengju_tupian || [],
-              shensu_tupian: item.shensu_tupian || [],
-              full_zhengju_tupian: fullZhengjuTupian, // 🔴 完整图片URL
-              full_shensu_tupian: fullShensuTupian // 🔴 完整图片URL
-            }
-          })
-          
-          //console.log('🔴【处理后的数据】:', processedList)
-          
-          let newList
-          if (isLoadMore) {
-            newList = [...this.data.chufaList, ...processedList]
-          } else {
-            newList = processedList
-          }
-          
-          const hasMore = data.has_more === true
-          this.setData({
-            chufaList: newList,
-            haiyougengduo: hasMore,
-            dangqianye: this.data.dangqianye + 1
-          })
-        } else {
-          this.setData({ haiyougengduo: false })
-        }
-      } else {
-        throw new Error(res.data?.msg || '加载处罚记录失败')
-      }
-    } catch (error) {
-      console.error('加载处罚记录失败:', error)
-      wx.showToast({
-        title: error.message || '加载失败',
-        icon: 'none'
-      })
-      this.setData({ haiyougengduo: false })
-    } finally {
-      if (isLoadMore) {
-        this.setData({ jiazhaigengduo: false })
-      } else {
-        this.setData({ jiazhaozhong: false })
-      }
-    }
-  },
-
-  qiehuanShenfen(e) {
-    const type = parseInt(e.currentTarget.dataset.type)
-    if (this.data.shenfen === type) return
-    this.setData({
-      shenfen: type,
-      dangqianye: 1,
-      chufaList: [],
-      haiyougengduo: true
-    })
-    this.jiazhuoquChufaList()
-  },
-
-  shanglaShuaxin() {
-    if (this.data.fangdouTimer) clearTimeout(this.data.fangdouTimer)
-    const timer = setTimeout(() => {
-      if (this.data.jiazhaozhong || this.data.jiazhaigengduo) return
-      if (!this.data.haiyougengduo) return
-      this.jiazhuoquChufaList(true)
-    }, 300)
-    this.setData({ fangdouTimer: timer })
-  },
-
-  chakanXiangqing(e) {
-    const item = e.currentTarget.dataset.item
-    this.setData({
-      xuanzhongChufa: item,
-      showXiangqing: true
-    })
-  },
-
-  guanbiXiangqing() {
-    this.setData({
-      showXiangqing: false,
-      xuanzhongChufa: {}
-    })
-  },
-
-  openShensuModal() {
-    if (this.data.xuanzhongChufa.ssliyou || 
-        (this.data.xuanzhongChufa.shensu_tupian && this.data.xuanzhongChufa.shensu_tupian.length > 0)) {
-      wx.showToast({
-        title: '您已经提交过申诉，请等待处理结果',
-        icon: 'none'
-      })
-      return
-    }
-    this.setData({
-      showShensuModal: true,
-      shensuLiyou: '',
-      shensuTupian: [],
-      shensuTupianUrls: [],
-      shangchuanJindu: 0,
-      shangchuanZongshu: 0,
-      jinduWidth: '0%'
-    })
-  },
-
-  closeShensuModal() {
-    this.setData({
-      showShensuModal: false,
-      shensuLiyou: '',
-      shensuTupian: [],
-      shensuTupianUrls: []
-    })
-  },
-
-  onShensuLiyouInput(e) {
-    const value = e.detail.value.slice(0, 500)
-    this.setData({ shensuLiyou: value })
-  },
-
-  chooseShensuTupian() {
-    if (this.data.isShangchuanzhong) return
-    const shengyu = 9 - this.data.shensuTupian.length
-    if (shengyu <= 0) {
-      wx.showToast({
-        title: '最多只能上传9张图片',
-        icon: 'none'
-      })
-      return
-    }
-    wx.chooseMedia({
-      count: shengyu,
-      mediaType: ['image'],
-      sourceType: ['album', 'camera'],
-      success: (res) => {
-        const newTupian = [...this.data.shensuTupian, ...res.tempFiles.map(file => file.tempFilePath)]
-        this.setData({ shensuTupian: newTupian.slice(0, 9) })
-      }
-    })
-  },
-
-  deleteShensuTupian(e) {
-    const index = e.currentTarget.dataset.index
-    const newTupian = [...this.data.shensuTupian]
-    newTupian.splice(index, 1)
-    this.setData({ shensuTupian: newTupian })
-  },
-
-  yulanShensuTupian(e) {
-    const index = e.currentTarget.dataset.index
-    const urls = this.data.shensuTupian
-    if (!urls[index]) return
-    wx.previewImage({
-      current: urls[index],
-      urls: urls
-    })
-  },
-
-  lianxiKefu() {
-    const kefuLink = app.globalData.kefuConfig?.link || '';
-    const corpId = app.globalData.kefuConfig?.enterpriseId || '';
-
-    if (!kefuLink || !corpId) {
-        wx.showToast({
-            title: '客服配置未加载',
-            icon: 'none'
-        });
-        return;
-    }
-
-    wx.openCustomerServiceChat({
-        extInfo: { url: kefuLink },
-        corpId: corpId,
-        success: (res) => {
-            console.log('跳转客服成功', res);
-        },
-        fail: (err) => {
-            console.error('跳转客服失败', err);
-            wx.showToast({
-                title: '暂时无法连接客服',
-                icon: 'none'
-            });
-        }
-    });
-  },
-
-  async getCOSZhengshu() {
-    try {
-      const res = await request({
-        url: '/dingdan/dsscpz',
-        method: 'POST',
-        data: { 
-          dingdan_id: this.data.xuanzhongChufa.dingdan_id,
-          yongtu: 'chufa'
-        }
-      })
-      if (res.statusCode === 200 && res.data.code === 0 && res.data.data) {
-        return res.data.data
-      } else {
-        throw new Error(res?.data?.msg || '获取上传凭证失败')
-      }
-    } catch (error) {
-      console.error('获取COS凭证失败:', error)
-      throw error
-    }
-  },
-
-  initCOSClient(tokenData) {
-    const COS = require('../../utils/cos-wx-sdk-v5.js')
-    const credentials = tokenData.credentials || tokenData
-    const bucket = tokenData.bucket || 'julebu-1361527063'
-    const region = tokenData.region || 'ap-shanghai'
-    const cos = new COS({
-      SimpleUploadMethod: 'putObject',
-      getAuthorization: async (options, callback) => {
-        const authParams = {
-          TmpSecretId: credentials.tmpSecretId,
-          TmpSecretKey: credentials.tmpSecretKey,
-          SecurityToken: credentials.sessionToken || '',
-          StartTime: tokenData.startTime || Math.floor(Date.now() / 1000),
-          ExpiredTime: tokenData.expiredTime || (Math.floor(Date.now() / 1000) + 7200)
-        }
-        callback(authParams)
-      }
-    })
-    return { cos, bucket, region }
-  },
-
-  async shangchuanDanZhangTupian(filePath, cosKey, index, cosInstance, bucket, region) {
-    return new Promise((resolve) => {
-      const timeoutId = setTimeout(() => {
-        resolve({ status: 'optimistic_success', key: cosKey })
-      }, 2000)
-      cosInstance.uploadFile({
-        Bucket: bucket,
-        Region: region,
-        Key: cosKey,
-        FilePath: filePath,
-        onProgress: (progressInfo) => {
-          const percent = Math.round(progressInfo.percent * 100)
-          if (percent === 100) {
-            clearTimeout(timeoutId)
-            resolve({ status: 'optimistic_success', key: cosKey })
-          }
-        }
-      })
-    })
-  },
-
-  async piliangShangchuanShensuTupian() {
-    const total = this.data.shensuTupian.length
-    if (total === 0) return []
-    this.setData({
-      shangchuanZongshu: total,
-      shangchuanJindu: 0,
-      jinduWidth: '0%',
-      isShangchuanzhong: true
-    })
-    let yonghuid = ''
-  
-  // 方案1：直接从全局缓存获取
-  const uid = wx.getStorageSync('uid')
-  if (uid) {
-    yonghuid = String(uid).padStart(7, '0')
-    //console.log('🔴【从uid获取yonghuid】', yonghuid)
-  } 
-  
-  // 方案2：如果还没有，从用户信息获取
-  if (!yonghuid && app.globalData.userInfo && app.globalData.userInfo.yonghuid) {
-    yonghuid = String(app.globalData.userInfo.yonghuid).padStart(7, '0')
-    //console.log('🔴【从userInfo获取yonghuid】', yonghuid)
-  }
-  
-  // 方案3：如果还没有，直接提示并返回
-  if (!yonghuid) {
-    wx.showToast({
-      title: '请先登录',
-      icon: 'none'
-    })
-    this.setData({ isShangchuanzhong: false })
-    return []
-  }
-  
-
-    
-    const preGeneratedUrls = []
-    for (let i = 0; i < total; i++) {
-      const timestamp = Date.now() + i
-      const random = Math.floor(Math.random() * 10000)
-      const fileExt = this.getFileExtension(this.data.shensuTupian[i])
-      const fileName = `${yonghuid}_${timestamp}_${random}${fileExt}`
-      const cosKey = `a_long/chfajltp/dssstp/${fileName}`
-      preGeneratedUrls.push(cosKey)
-    }
-    
-    let cosClient, bucket, region
-    try {
-      const tokenData = await this.getCOSZhengshu()
-      const { cos, bucket: cosBucket, region: cosRegion } = this.initCOSClient(tokenData)
-      cosClient = cos
-      bucket = cosBucket
-      region = cosRegion
-    } catch (error) {
-      wx.showToast({ title: '上传初始化失败', icon: 'none' })
-      this.setData({ isShangchuanzhong: false })
-      return []
-    }
-    
-    const uploadTasks = []
-    for (let i = 0; i < total; i++) {
-      const task = this.shangchuanDanZhangTupian(
-        this.data.shensuTupian[i],
-        preGeneratedUrls[i],
-        i,
-        cosClient,
-        bucket,
-        region
-      ).then((result) => {
-        const currentDone = i + 1
-        const jinduPercent = ((currentDone / total) * 100).toFixed(0)
-        this.setData({
-          shangchuanJindu: currentDone,
-          jinduWidth: `${jinduPercent}%`
-        })
-        return result
-      })
-      uploadTasks.push(task)
-    }
-    await Promise.all(uploadTasks)
-    this.setData({ isShangchuanzhong: false })
-    return preGeneratedUrls
-  },
-
-  getFileExtension(filePath) {
-    const lastDotIndex = filePath.lastIndexOf('.')
-    if (lastDotIndex === -1) return '.jpg'
-    const ext = filePath.substring(lastDotIndex).toLowerCase()
-    const allowedExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
-    return allowedExts.includes(ext) ? ext : '.jpg'
-  },
-
-  async submitShensu() {
-    if (!this.data.shensuLiyou.trim()) {
-      wx.showToast({ title: '请输入申诉理由', icon: 'none' }); return
-    }
-    if (this.data.shensuTupian.length === 0) {
-      wx.showModal({
-        title: '提示',
-        content: '未上传任何图片，确定要提交申诉吗？',
-        success: async (res) => {
-          if (res.confirm) await this.tijiaoShensuData([])
-        }
-      })
-      return
-    }
-    wx.showToast({ title: '开始上传图片...', icon: 'none' })
-    try {
-      const tupianUrls = await this.piliangShangchuanShensuTupian()
-      if (!tupianUrls || tupianUrls.length === 0) throw new Error('图片上传失败')
-      await this.tijiaoShensuData(tupianUrls)
-    } catch (error) {
-      console.error('提交申诉失败:', error)
-      wx.showToast({ title: error.message || '提交失败', icon: 'none' })
-    }
-  },
-
-  async tijiaoShensuData(tupianUrls) {
-    wx.showToast({ title: '提交申诉中...', icon: 'none' })
-    try {
-      const res = await request({
-        url: '/yonghu/dscfss',
-        method: 'POST',
-        data: {
-          chufa_id: this.data.xuanzhongChufa.id,
-          shensu_liyou: this.data.shensuLiyou,
-          shensu_tupian_urls: tupianUrls
-        }
-      })
-      if (res.statusCode === 200 && res.data.code === 0) {
-        this.updateChufaRecord({
-          sqzhuangtai: 3,
-          ssliyou: this.data.shensuLiyou,
-          shensu_tupian: tupianUrls
-        })
-        this.setData({
-          showShensuModal: false,
-          showXiangqing: false,
-          shensuLiyou: '',
-          shensuTupian: [],
-          xuanzhongChufa: {}
-        })
-        wx.showToast({ title: '申诉提交成功，请等待处理', icon: 'success' })
-        setTimeout(() => { this.chushihuaShuju() }, 500)
-      } else {
-        throw new Error(res.data?.msg || '提交申诉失败')
-      }
-    } catch (error) {
-      console.error('提交申诉数据失败:', error)
-      wx.showToast({ title: error.message || '提交失败', icon: 'none' })
-    }
-  },
-
-  updateChufaRecord(newData) {
-    const newList = this.data.chufaList.map(item => {
-      if (item.id === this.data.xuanzhongChufa.id) {
-        const updatedItem = { ...item, ...newData }
-        // 🔴 更新显示字段
-        if (newData.sqzhuangtai === 3) {
-          updatedItem.display_status = '申诉中'
-          updatedItem.status_class = 'zhuangtai-shensuzhong'
-        }
-        if (newData.shensu_tupian) {
-          updatedItem.full_shensu_tupian = newData.shensu_tupian.map(url => this.getFullImageUrl(url))
-        }
-        return updatedItem
-      }
-      return item
-    })
-    this.setData({ chufaList: newList })
-  },
-
-  // 🔴【图片URL拼接 - 确保返回完整URL】
-  getFullImageUrl(relativeUrl) {
-    //console.log('🔴【图片拼接】输入:', relativeUrl)
-    
-    if (!relativeUrl) return ''
-    if (relativeUrl.startsWith('http')) {
-      //console.log('🔴【已经是完整URL】返回:', relativeUrl)
-      return relativeUrl
-    }
-    
-    const ossUrl = this.data.ossImageUrl
-    if (!ossUrl) {
-      //console.log('🔴【OSS地址为空】返回原始URL:', relativeUrl)
-      return relativeUrl
-    }
-    
-    let fullUrl
-    if (ossUrl.endsWith('/') && relativeUrl.startsWith('/')) {
-      fullUrl = ossUrl + relativeUrl.substring(1)
-    } else if (!ossUrl.endsWith('/') && !relativeUrl.startsWith('/')) {
-      fullUrl = ossUrl + '/' + relativeUrl
-    } else {
-      fullUrl = ossUrl + relativeUrl
-    }
-    
-   // console.log('🔴【拼接后URL】:', fullUrl)
-    return fullUrl
-  },
-
-  yulanTupian(e) {
-    const currentUrl = e.currentTarget.dataset.url
-    const urls = e.currentTarget.dataset.urls || []
-    if (!currentUrl) return
-    
-    const fullCurrentUrl = currentUrl.startsWith('http') ? currentUrl : this.getFullImageUrl(currentUrl)
-    const fullUrls = urls.map(url => url.startsWith('http') ? url : this.getFullImageUrl(url))
-    
-    wx.previewImage({
-      current: fullCurrentUrl,
-      urls: fullUrls.length > 0 ? fullUrls : [fullCurrentUrl]
-    })
-  },
-
-  fuzhiWenben(e) {
-    const text = e.currentTarget.dataset.text
-    if (!text) return
-    
-    wx.setClipboardData({
-      data: text,
-      success: () => {
-        wx.showToast({ title: '复制成功', icon: 'success' })
-      },
-      fail: () => {
-        wx.showToast({ title: '复制失败', icon: 'none' })
-      }
-    })
-  },
-
-  // 🔴【保留原函数但已不再使用（用于向后兼容）】
-  formatShijian(shijian) {
-    if (!shijian) return '--'
-    return String(shijian)
-  },
-
-  getZhuangtaiText(zhuangtai) {
-    const statusNum = Number(zhuangtai)
-    if (statusNum === 0) return '待处罚'
-    if (statusNum === 1) return '已处罚'
-    if (statusNum === 2) return '已驳回'
-    if (statusNum === 3) return '申诉中'
-    return '未知状态'
-  },
-
-  getZhuangtaiClass(zhuangtai) {
-    const statusNum = Number(zhuangtai)
-    if (statusNum === 0) return 'zhuangtai-daichuli'
-    if (statusNum === 1) return 'zhuangtai-yichufa'
-    if (statusNum === 2) return 'zhuangtai-yibohui'
-    if (statusNum === 3) return 'zhuangtai-shensuzhong'
-    return 'zhuangtai-weizhi'
-  }
+// pages/penalty/penalty.js
+import request from '../../utils/request.js'
+const app = getApp()
+const MEIYE_TIAOSHU = 5
+
+Page({
+  data: {
+    zongshu: 0,
+    daichuli: 0,
+    yichuli: 0,
+    shenfen: 0,
+    chufaList: [],
+    dangqianye: 1,
+    haiyougengduo: true,
+    jiazhaozhong: false,
+    jiazhaigengduo: false,
+    scrollHeight: 0,
+    showXiangqing: false,
+    xuanzhongChufa: {},
+    showShensuModal: false,
+    shensuLiyou: '',
+    shensuTupian: [],
+    shensuTupianUrls: [],
+    shangchuanJindu: 0,
+    shangchuanZongshu: 0,
+    jinduWidth: '0%',
+    isShangchuanzhong: false,
+    ossImageUrl: '',
+    fangdouTimer: null
+  },
+
+  onLoad(options) {
+    this.registerNotificationComponent()
+    this.initOSSUrl()
+    this.jisuanGaodu()
+    this.chushihuaShuju()
+  },
+
+
+
+  
+    
+    
+
+  onShow() {
+    this.registerNotificationComponent()
+  },
+
+  onUnload() {
+    if (this.data.fangdouTimer) clearTimeout(this.data.fangdouTimer)
+  },
+
+  onReachBottom() {
+    this.shanglaShuaxin()
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  initOSSUrl() {
+    const ossImageUrl = app.globalData.ossImageUrl || ''
+    this.setData({ ossImageUrl })
+  },
+
+  jisuanGaodu() {
+    const systemInfo = wx.getSystemInfoSync()
+    const windowHeight = systemInfo.windowHeight
+    const height = windowHeight - 200 - 100 - 40
+    this.setData({
+      scrollHeight: height > 0 ? height : 400
+    })
+  },
+
+  chushihuaShuju() {
+    this.setData({
+      dangqianye: 1,
+      chufaList: [],
+      haiyougengduo: true
+    })
+    this.jiazhuoquTongji()
+    this.jiazhuoquChufaList()
+  },
+
+  async jiazhuoquTongji() {
+    try {
+      const res = await request({
+        url: '/yonghu/dshqcfjl',
+        method: 'POST',
+        data: { qingqiu_tongji: true }
+      })
+      if (res.statusCode === 200 && res.data.code === 0) {
+        const data = res.data.data
+        this.setData({
+          zongshu: data.zongshu || 0,
+          daichuli: data.daichuli || 0,
+          yichuli: data.yichuli || 0
+        })
+      }
+    } catch (error) {
+      console.error('获取统计信息失败:', error)
+    }
+  },
+
+  async jiazhuoquChufaList(isLoadMore = false) {
+    if (this.data.jiazhaozhong || this.data.jiazhaigengduo) return
+    if (isLoadMore) {
+      if (!this.data.haiyougengduo) return
+      this.setData({ jiazhaigengduo: true })
+    } else {
+      this.setData({ jiazhaozhong: true })
+    }
+    
+    try {
+      const params = {
+        page: this.data.dangqianye,
+        page_size: MEIYE_TIAOSHU
+      }
+      if (this.data.shenfen === 0) {
+        params.zhuangtai = 0
+      } else {
+        params.zhuangtai = 1
+      }
+      
+      const res = await request({
+        url: '/yonghu/dshqcfjl',
+        method: 'POST',
+        data: params
+      })
+      
+      //console.log('🔴【后端返回的数据】:', res.data)
+      
+      if (res.statusCode === 200 && res.data.code === 0) {
+        const data = res.data.data
+        
+        if (data.list && Array.isArray(data.list)) {
+          // 🔴【关键修复】在数据加载时就处理好显示字段
+          const processedList = data.list.map(item => {
+            // 处理显示时间
+            let displayTime = '--'
+            if (item.create_time) {
+              if (typeof item.create_time === 'number') {
+                displayTime = String(item.create_time)
+              } else if (typeof item.create_time === 'string') {
+                displayTime = item.create_time
+              } else {
+                displayTime = String(item.create_time)
+              }
+            }
+            
+            // 处理显示状态
+            let displayStatus = '未知状态'
+            let statusClass = 'zhuangtai-weizhi'
+            const statusNum = Number(item.sqzhuangtai)
+            
+            if (!isNaN(statusNum)) {
+              if (statusNum === 0) {
+                displayStatus = '待处罚'
+                statusClass = 'zhuangtai-daichuli'
+              } else if (statusNum === 1) {
+                displayStatus = '已处罚'
+                statusClass = 'zhuangtai-yichufa'
+              } else if (statusNum === 2) {
+                displayStatus = '已驳回'
+                statusClass = 'zhuangtai-yibohui'
+              } else if (statusNum === 3) {
+                displayStatus = '申诉中'
+                statusClass = 'zhuangtai-shensuzhong'
+              }
+            }
+            
+            // 处理图片URL（在数据加载时就拼接完整URL）
+            const fullZhengjuTupian = (item.zhengju_tupian || []).map(url => this.getFullImageUrl(url))
+            const fullShensuTupian = (item.shensu_tupian || []).map(url => this.getFullImageUrl(url))
+            
+            return {
+              ...item,
+              display_time: displayTime, // 🔴 处理好的显示时间
+              display_status: displayStatus, // 🔴 处理好的显示状态
+              status_class: statusClass, // 🔴 处理好的状态样式类
+              zhengju_tupian: item.zhengju_tupian || [],
+              shensu_tupian: item.shensu_tupian || [],
+              full_zhengju_tupian: fullZhengjuTupian, // 🔴 完整图片URL
+              full_shensu_tupian: fullShensuTupian // 🔴 完整图片URL
+            }
+          })
+          
+          //console.log('🔴【处理后的数据】:', processedList)
+          
+          let newList
+          if (isLoadMore) {
+            newList = [...this.data.chufaList, ...processedList]
+          } else {
+            newList = processedList
+          }
+          
+          const hasMore = data.has_more === true
+          this.setData({
+            chufaList: newList,
+            haiyougengduo: hasMore,
+            dangqianye: this.data.dangqianye + 1
+          })
+        } else {
+          this.setData({ haiyougengduo: false })
+        }
+      } else {
+        throw new Error(res.data?.msg || '加载处罚记录失败')
+      }
+    } catch (error) {
+      console.error('加载处罚记录失败:', error)
+      wx.showToast({
+        title: error.message || '加载失败',
+        icon: 'none'
+      })
+      this.setData({ haiyougengduo: false })
+    } finally {
+      if (isLoadMore) {
+        this.setData({ jiazhaigengduo: false })
+      } else {
+        this.setData({ jiazhaozhong: false })
+      }
+    }
+  },
+
+  qiehuanShenfen(e) {
+    const type = parseInt(e.currentTarget.dataset.type)
+    if (this.data.shenfen === type) return
+    this.setData({
+      shenfen: type,
+      dangqianye: 1,
+      chufaList: [],
+      haiyougengduo: true
+    })
+    this.jiazhuoquChufaList()
+  },
+
+  shanglaShuaxin() {
+    if (this.data.fangdouTimer) clearTimeout(this.data.fangdouTimer)
+    const timer = setTimeout(() => {
+      if (this.data.jiazhaozhong || this.data.jiazhaigengduo) return
+      if (!this.data.haiyougengduo) return
+      this.jiazhuoquChufaList(true)
+    }, 300)
+    this.setData({ fangdouTimer: timer })
+  },
+
+  chakanXiangqing(e) {
+    const item = e.currentTarget.dataset.item
+    this.setData({
+      xuanzhongChufa: item,
+      showXiangqing: true
+    })
+  },
+
+  guanbiXiangqing() {
+    this.setData({
+      showXiangqing: false,
+      xuanzhongChufa: {}
+    })
+  },
+
+  openShensuModal() {
+    if (this.data.xuanzhongChufa.ssliyou || 
+        (this.data.xuanzhongChufa.shensu_tupian && this.data.xuanzhongChufa.shensu_tupian.length > 0)) {
+      wx.showToast({
+        title: '您已经提交过申诉，请等待处理结果',
+        icon: 'none'
+      })
+      return
+    }
+    this.setData({
+      showShensuModal: true,
+      shensuLiyou: '',
+      shensuTupian: [],
+      shensuTupianUrls: [],
+      shangchuanJindu: 0,
+      shangchuanZongshu: 0,
+      jinduWidth: '0%'
+    })
+  },
+
+  closeShensuModal() {
+    this.setData({
+      showShensuModal: false,
+      shensuLiyou: '',
+      shensuTupian: [],
+      shensuTupianUrls: []
+    })
+  },
+
+  onShensuLiyouInput(e) {
+    const value = e.detail.value.slice(0, 500)
+    this.setData({ shensuLiyou: value })
+  },
+
+  chooseShensuTupian() {
+    if (this.data.isShangchuanzhong) return
+    const shengyu = 9 - this.data.shensuTupian.length
+    if (shengyu <= 0) {
+      wx.showToast({
+        title: '最多只能上传9张图片',
+        icon: 'none'
+      })
+      return
+    }
+    wx.chooseMedia({
+      count: shengyu,
+      mediaType: ['image'],
+      sourceType: ['album', 'camera'],
+      success: (res) => {
+        const newTupian = [...this.data.shensuTupian, ...res.tempFiles.map(file => file.tempFilePath)]
+        this.setData({ shensuTupian: newTupian.slice(0, 9) })
+      }
+    })
+  },
+
+  deleteShensuTupian(e) {
+    const index = e.currentTarget.dataset.index
+    const newTupian = [...this.data.shensuTupian]
+    newTupian.splice(index, 1)
+    this.setData({ shensuTupian: newTupian })
+  },
+
+  yulanShensuTupian(e) {
+    const index = e.currentTarget.dataset.index
+    const urls = this.data.shensuTupian
+    if (!urls[index]) return
+    wx.previewImage({
+      current: urls[index],
+      urls: urls
+    })
+  },
+
+  lianxiKefu() {
+    const kefuLink = app.globalData.kefuConfig?.link || '';
+    const corpId = app.globalData.kefuConfig?.enterpriseId || '';
+
+    if (!kefuLink || !corpId) {
+        wx.showToast({
+            title: '客服配置未加载',
+            icon: 'none'
+        });
+        return;
+    }
+
+    wx.openCustomerServiceChat({
+        extInfo: { url: kefuLink },
+        corpId: corpId,
+        success: (res) => {
+            console.log('跳转客服成功', res);
+        },
+        fail: (err) => {
+            console.error('跳转客服失败', err);
+            wx.showToast({
+                title: '暂时无法连接客服',
+                icon: 'none'
+            });
+        }
+    });
+  },
+
+  async getCOSZhengshu() {
+    try {
+      const res = await request({
+        url: '/dingdan/dsscpz',
+        method: 'POST',
+        data: { 
+          dingdan_id: this.data.xuanzhongChufa.dingdan_id,
+          yongtu: 'chufa'
+        }
+      })
+      if (res.statusCode === 200 && res.data.code === 0 && res.data.data) {
+        return res.data.data
+      } else {
+        throw new Error(res?.data?.msg || '获取上传凭证失败')
+      }
+    } catch (error) {
+      console.error('获取COS凭证失败:', error)
+      throw error
+    }
+  },
+
+  initCOSClient(tokenData) {
+    const COS = require('../../utils/cos-wx-sdk-v5.js')
+    const credentials = tokenData.credentials || tokenData
+    const bucket = tokenData.bucket || 'julebu-1361527063'
+    const region = tokenData.region || 'ap-shanghai'
+    const cos = new COS({
+      SimpleUploadMethod: 'putObject',
+      getAuthorization: async (options, callback) => {
+        const authParams = {
+          TmpSecretId: credentials.tmpSecretId,
+          TmpSecretKey: credentials.tmpSecretKey,
+          SecurityToken: credentials.sessionToken || '',
+          StartTime: tokenData.startTime || Math.floor(Date.now() / 1000),
+          ExpiredTime: tokenData.expiredTime || (Math.floor(Date.now() / 1000) + 7200)
+        }
+        callback(authParams)
+      }
+    })
+    return { cos, bucket, region }
+  },
+
+  async shangchuanDanZhangTupian(filePath, cosKey, index, cosInstance, bucket, region) {
+    return new Promise((resolve) => {
+      const timeoutId = setTimeout(() => {
+        resolve({ status: 'optimistic_success', key: cosKey })
+      }, 2000)
+      cosInstance.uploadFile({
+        Bucket: bucket,
+        Region: region,
+        Key: cosKey,
+        FilePath: filePath,
+        onProgress: (progressInfo) => {
+          const percent = Math.round(progressInfo.percent * 100)
+          if (percent === 100) {
+            clearTimeout(timeoutId)
+            resolve({ status: 'optimistic_success', key: cosKey })
+          }
+        }
+      })
+    })
+  },
+
+  async piliangShangchuanShensuTupian() {
+    const total = this.data.shensuTupian.length
+    if (total === 0) return []
+    this.setData({
+      shangchuanZongshu: total,
+      shangchuanJindu: 0,
+      jinduWidth: '0%',
+      isShangchuanzhong: true
+    })
+    let yonghuid = ''
+  
+  // 方案1：直接从全局缓存获取
+  const uid = wx.getStorageSync('uid')
+  if (uid) {
+    yonghuid = String(uid).padStart(7, '0')
+    //console.log('🔴【从uid获取yonghuid】', yonghuid)
+  } 
+  
+  // 方案2：如果还没有，从用户信息获取
+  if (!yonghuid && app.globalData.userInfo && app.globalData.userInfo.yonghuid) {
+    yonghuid = String(app.globalData.userInfo.yonghuid).padStart(7, '0')
+    //console.log('🔴【从userInfo获取yonghuid】', yonghuid)
+  }
+  
+  // 方案3：如果还没有，直接提示并返回
+  if (!yonghuid) {
+    wx.showToast({
+      title: '请先登录',
+      icon: 'none'
+    })
+    this.setData({ isShangchuanzhong: false })
+    return []
+  }
+  
+
+    
+    const preGeneratedUrls = []
+    for (let i = 0; i < total; i++) {
+      const timestamp = Date.now() + i
+      const random = Math.floor(Math.random() * 10000)
+      const fileExt = this.getFileExtension(this.data.shensuTupian[i])
+      const fileName = `${yonghuid}_${timestamp}_${random}${fileExt}`
+      const cosKey = `a_long/chfajltp/dssstp/${fileName}`
+      preGeneratedUrls.push(cosKey)
+    }
+    
+    let cosClient, bucket, region
+    try {
+      const tokenData = await this.getCOSZhengshu()
+      const { cos, bucket: cosBucket, region: cosRegion } = this.initCOSClient(tokenData)
+      cosClient = cos
+      bucket = cosBucket
+      region = cosRegion
+    } catch (error) {
+      wx.showToast({ title: '上传初始化失败', icon: 'none' })
+      this.setData({ isShangchuanzhong: false })
+      return []
+    }
+    
+    const uploadTasks = []
+    for (let i = 0; i < total; i++) {
+      const task = this.shangchuanDanZhangTupian(
+        this.data.shensuTupian[i],
+        preGeneratedUrls[i],
+        i,
+        cosClient,
+        bucket,
+        region
+      ).then((result) => {
+        const currentDone = i + 1
+        const jinduPercent = ((currentDone / total) * 100).toFixed(0)
+        this.setData({
+          shangchuanJindu: currentDone,
+          jinduWidth: `${jinduPercent}%`
+        })
+        return result
+      })
+      uploadTasks.push(task)
+    }
+    await Promise.all(uploadTasks)
+    this.setData({ isShangchuanzhong: false })
+    return preGeneratedUrls
+  },
+
+  getFileExtension(filePath) {
+    const lastDotIndex = filePath.lastIndexOf('.')
+    if (lastDotIndex === -1) return '.jpg'
+    const ext = filePath.substring(lastDotIndex).toLowerCase()
+    const allowedExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
+    return allowedExts.includes(ext) ? ext : '.jpg'
+  },
+
+  async submitShensu() {
+    if (!this.data.shensuLiyou.trim()) {
+      wx.showToast({ title: '请输入申诉理由', icon: 'none' }); return
+    }
+    if (this.data.shensuTupian.length === 0) {
+      wx.showModal({
+        title: '提示',
+        content: '未上传任何图片，确定要提交申诉吗？',
+        success: async (res) => {
+          if (res.confirm) await this.tijiaoShensuData([])
+        }
+      })
+      return
+    }
+    wx.showToast({ title: '开始上传图片...', icon: 'none' })
+    try {
+      const tupianUrls = await this.piliangShangchuanShensuTupian()
+      if (!tupianUrls || tupianUrls.length === 0) throw new Error('图片上传失败')
+      await this.tijiaoShensuData(tupianUrls)
+    } catch (error) {
+      console.error('提交申诉失败:', error)
+      wx.showToast({ title: error.message || '提交失败', icon: 'none' })
+    }
+  },
+
+  async tijiaoShensuData(tupianUrls) {
+    wx.showToast({ title: '提交申诉中...', icon: 'none' })
+    try {
+      const res = await request({
+        url: '/yonghu/dscfss',
+        method: 'POST',
+        data: {
+          chufa_id: this.data.xuanzhongChufa.id,
+          shensu_liyou: this.data.shensuLiyou,
+          shensu_tupian_urls: tupianUrls
+        }
+      })
+      if (res.statusCode === 200 && res.data.code === 0) {
+        this.updateChufaRecord({
+          sqzhuangtai: 3,
+          ssliyou: this.data.shensuLiyou,
+          shensu_tupian: tupianUrls
+        })
+        this.setData({
+          showShensuModal: false,
+          showXiangqing: false,
+          shensuLiyou: '',
+          shensuTupian: [],
+          xuanzhongChufa: {}
+        })
+        wx.showToast({ title: '申诉提交成功，请等待处理', icon: 'success' })
+        setTimeout(() => { this.chushihuaShuju() }, 500)
+      } else {
+        throw new Error(res.data?.msg || '提交申诉失败')
+      }
+    } catch (error) {
+      console.error('提交申诉数据失败:', error)
+      wx.showToast({ title: error.message || '提交失败', icon: 'none' })
+    }
+  },
+
+  updateChufaRecord(newData) {
+    const newList = this.data.chufaList.map(item => {
+      if (item.id === this.data.xuanzhongChufa.id) {
+        const updatedItem = { ...item, ...newData }
+        // 🔴 更新显示字段
+        if (newData.sqzhuangtai === 3) {
+          updatedItem.display_status = '申诉中'
+          updatedItem.status_class = 'zhuangtai-shensuzhong'
+        }
+        if (newData.shensu_tupian) {
+          updatedItem.full_shensu_tupian = newData.shensu_tupian.map(url => this.getFullImageUrl(url))
+        }
+        return updatedItem
+      }
+      return item
+    })
+    this.setData({ chufaList: newList })
+  },
+
+  // 🔴【图片URL拼接 - 确保返回完整URL】
+  getFullImageUrl(relativeUrl) {
+    //console.log('🔴【图片拼接】输入:', relativeUrl)
+    
+    if (!relativeUrl) return ''
+    if (relativeUrl.startsWith('http')) {
+      //console.log('🔴【已经是完整URL】返回:', relativeUrl)
+      return relativeUrl
+    }
+    
+    const ossUrl = this.data.ossImageUrl
+    if (!ossUrl) {
+      //console.log('🔴【OSS地址为空】返回原始URL:', relativeUrl)
+      return relativeUrl
+    }
+    
+    let fullUrl
+    if (ossUrl.endsWith('/') && relativeUrl.startsWith('/')) {
+      fullUrl = ossUrl + relativeUrl.substring(1)
+    } else if (!ossUrl.endsWith('/') && !relativeUrl.startsWith('/')) {
+      fullUrl = ossUrl + '/' + relativeUrl
+    } else {
+      fullUrl = ossUrl + relativeUrl
+    }
+    
+   // console.log('🔴【拼接后URL】:', fullUrl)
+    return fullUrl
+  },
+
+  yulanTupian(e) {
+    const currentUrl = e.currentTarget.dataset.url
+    const urls = e.currentTarget.dataset.urls || []
+    if (!currentUrl) return
+    
+    const fullCurrentUrl = currentUrl.startsWith('http') ? currentUrl : this.getFullImageUrl(currentUrl)
+    const fullUrls = urls.map(url => url.startsWith('http') ? url : this.getFullImageUrl(url))
+    
+    wx.previewImage({
+      current: fullCurrentUrl,
+      urls: fullUrls.length > 0 ? fullUrls : [fullCurrentUrl]
+    })
+  },
+
+  fuzhiWenben(e) {
+    const text = e.currentTarget.dataset.text
+    if (!text) return
+    
+    wx.setClipboardData({
+      data: text,
+      success: () => {
+        wx.showToast({ title: '复制成功', icon: 'success' })
+      },
+      fail: () => {
+        wx.showToast({ title: '复制失败', icon: 'none' })
+      }
+    })
+  },
+
+  // 🔴【保留原函数但已不再使用（用于向后兼容）】
+  formatShijian(shijian) {
+    if (!shijian) return '--'
+    return String(shijian)
+  },
+
+  getZhuangtaiText(zhuangtai) {
+    const statusNum = Number(zhuangtai)
+    if (statusNum === 0) return '待处罚'
+    if (statusNum === 1) return '已处罚'
+    if (statusNum === 2) return '已驳回'
+    if (statusNum === 3) return '申诉中'
+    return '未知状态'
+  },
+
+  getZhuangtaiClass(zhuangtai) {
+    const statusNum = Number(zhuangtai)
+    if (statusNum === 0) return 'zhuangtai-daichuli'
+    if (statusNum === 1) return 'zhuangtai-yichufa'
+    if (statusNum === 2) return 'zhuangtai-yibohui'
+    if (statusNum === 3) return 'zhuangtai-shensuzhong'
+    return 'zhuangtai-weizhi'
+  }
 })
\ No newline at end of file
diff --git a/pages/dashouxiaoxi/dashouxiaoxi.json b/pages/fighter-msg/fighter-msg.json
similarity index 100%
rename from pages/dashouxiaoxi/dashouxiaoxi.json
rename to pages/fighter-msg/fighter-msg.json
diff --git a/pages/dashouxiaoxi/dashouxiaoxi.wxml b/pages/fighter-msg/fighter-msg.wxml
similarity index 97%
rename from pages/dashouxiaoxi/dashouxiaoxi.wxml
rename to pages/fighter-msg/fighter-msg.wxml
index a1e1265..f77b430 100644
--- a/pages/dashouxiaoxi/dashouxiaoxi.wxml
+++ b/pages/fighter-msg/fighter-msg.wxml
@@ -1,316 +1,316 @@
-<!-- pages/cfss/cfss.wxml -->
-<view class="cfss-container">
-  <!-- 顶部统计卡片 -->
-  <view class="tongji-card">
-    <view class="tongji-title">处罚统计</view>
-    <view class="tongji-content">
-      <view class="tongji-item">
-        <text class="tongji-label">总记录</text>
-        <text class="tongji-value">{{ zongshu }}</text>
-      </view>
-      <view class="tongji-item">
-        <text class="tongji-label">待处理</text>
-        <text class="tongji-value daichuli-value">{{ daichuli }}</text>
-      </view>
-      <view class="tongji-item">
-        <text class="tongji-label">已处理</text>
-        <text class="tongji-value yichuli-value">{{ yichuli }}</text>
-      </view>
-    </view>
-  </view>
-
-  <!-- 类型切换 -->
-  <view class="leixing-qiehuan">
-    <view 
-      class="leixing-item {{ shenfen === 0 ? 'leixing-active' : '' }}"
-      bindtap="qiehuanShenfen"
-      data-type="0"
-    >
-      <text class="leixing-text">待处理</text>
-      <text class="leixing-count">{{ daichuli }}</text>
-    </view>
-    <view 
-      class="leixing-item {{ shenfen === 1 ? 'leixing-active' : '' }}"
-      bindtap="qiehuanShenfen"
-      data-type="1"
-    >
-      <text class="leixing-text">已处理</text>
-      <text class="leixing-count">{{ yichuli }}</text>
-    </view>
-  </view>
-
-  <!-- 处罚记录列表 -->
-  <scroll-view 
-    class="chufa-list"
-    scroll-y
-    enable-back-to-top
-    scroll-with-animation
-    style="height: {{ scrollHeight }}px"
-    bindscrolltolower="shanglaShuaxin"
-  >
-    <!-- 加载中 -->
-    <view wx:if="{{ jiazhaozhong && chufaList.length === 0 }}" class="jiazai-zhong">
-      <view class="loading-animation">
-        <view class="loading-dot"></view>
-        <view class="loading-dot"></view>
-        <view class="loading-dot"></view>
-      </view>
-      <text>加载中...</text>
-    </view>
-
-    <!-- 🔴【关键修改】处罚记录卡片列表 - 直接使用处理好的字段 -->
-    <block wx:for="{{ chufaList }}" wx:key="index">
-      <view 
-        class="chufa-card"
-        bindtap="chakanXiangqing"
-        data-item="{{ item }}"
-      >
-        <!-- 卡片顶部：时间和状态 -->
-        <view class="card-top">
-          <!-- 🔴 直接使用display_time -->
-          <text class="shijian">{{ item.display_time }}</text>
-          <!-- 🔴 直接使用display_status和status_class -->
-          <view class="zhuangtai-badge {{ item.status_class }}">
-            {{ item.display_status }}
-          </view>
-        </view>
-
-        <!-- 申请人信息 -->
-        <view class="qingqiu-row">
-          <text class="qingqiu-label">申请人：</text>
-          <text class="qingqiu-value">{{ item.qingqiuid || '--' }}</text>
-        </view>
-
-        <!-- 处罚理由 -->
-        <view class="liyou-row">
-          <text class="liyou-label">处罚理由：</text>
-          <text class="liyou-value">{{ item.cfliyou || '无' }}</text>
-        </view>
-
-        <!-- 订单编号 -->
-        <view class="dingdan-row">
-          <text class="dingdan-label">订单编号：</text>
-          <text class="dingdan-value">{{ item.dingdan_id || '--' }}</text>
-        </view>
-        
-        <!-- 卡片边框效果 -->
-        <view class="card-border"></view>
-        <view class="card-glow"></view>
-      </view>
-    </block>
-
-    <!-- 加载更多 -->
-    <view wx:if="{{ jiazhaigengduo }}" class="jiazai-gengduo">
-      <view class="scan-line"></view>
-      <text>加载更多...</text>
-    </view>
-
-    <!-- 没有更多数据 -->
-    <view wx:if="{{ !haiyougengduo && chufaList.length > 0 }}" class="meiyou-gengduo">
-      <text>—— 没有更多记录了 ——</text>
-    </view>
-
-    <!-- 空状态 -->
-    <view wx:if="{{ !jiazhaozhong && chufaList.length === 0 }}" class="kong-zhuangtai">
-      <view class="empty-icon">⚡</view>
-      <text class="empty-text">暂无处罚记录</text>
-      <text class="empty-subtext">所有事务已处理完毕</text>
-    </view>
-  </scroll-view>
-
-  <!-- 处罚详情弹窗 -->
-  <view wx:if="{{ showXiangqing }}" class="xiangqing-modal">
-    <view class="modal-mask" bindtap="guanbiXiangqing"></view>
-    <view class="modal-content">
-      <!-- 弹窗头部 -->
-      <view class="modal-header">
-        <text class="modal-title">处罚详情</text>
-        <view class="modal-close" bindtap="guanbiXiangqing">
-          <text class="close-icon">×</text>
-        </view>
-      </view>
-
-      <!-- 🔴【弹窗主体 - 确保可以滚动】 -->
-      <scroll-view class="modal-body" scroll-y style="max-height: 1000rpx;">
-        <!-- 基本信息 -->
-        <view class="detail-section">
-          <view class="section-title">基本信息</view>
-          <view class="detail-row">
-            <text class="detail-label">订单编号：</text>
-            <view class="detail-value-container">
-              <text class="detail-value">{{ xuanzhongChufa.dingdan_id || '--' }}</text>
-              <text class="fuzhi-btn" bindtap="fuzhiWenben" data-text="{{ xuanzhongChufa.dingdan_id }}">复制</text>
-            </view>
-          </view>
-          <view class="detail-row">
-            <text class="detail-label">申请人ID：</text>
-            <view class="detail-value-container">
-              <text class="detail-value">{{ xuanzhongChufa.qingqiuid || '--' }}</text>
-              <text class="fuzhi-btn" bindtap="fuzhiWenben" data-text="{{ xuanzhongChufa.qingqiuid }}">复制</text>
-            </view>
-          </view>
-          <view class="detail-row">
-            <!-- 🔴 直接使用display_time -->
-            <text class="detail-label">创建时间：</text>
-            <text class="detail-value">{{ xuanzhongChufa.display_time || '--' }}</text>
-          </view>
-        </view>
-
-        <!-- 处罚信息 -->
-        <view class="detail-section">
-          <view class="section-title">处罚信息</view>
-          <view class="detail-row">
-            <text class="detail-label">处罚状态：</text>
-            <!-- 🔴 直接使用display_status和status_class -->
-            <view class="zhuangtai-badge-inline {{ xuanzhongChufa.status_class }}">
-              {{ xuanzhongChufa.display_status }}
-            </view>
-          </view>
-          <view class="detail-row full-row">
-            <text class="detail-label">处罚理由：</text>
-            <text class="detail-value liyou-full">{{ xuanzhongChufa.cfliyou || '无' }}</text>
-          </view>
-          
-          <!-- 🔴 证据图片展示 - 直接使用full_zhengju_tupian -->
-          <view wx:if="{{ xuanzhongChufa.full_zhengju_tupian && xuanzhongChufa.full_zhengju_tupian.length > 0 }}" class="detail-row full-row">
-            <text class="detail-label">证据图片：</text>
-            <view class="tupian-grid">
-              <block wx:for="{{ xuanzhongChufa.full_zhengju_tupian }}" wx:key="index">
-                <view class="tupian-item" bindtap="yulanTupian" data-url="{{ item }}" data-urls="{{ xuanzhongChufa.full_zhengju_tupian }}">
-                  <image 
-                    src="{{ item }}" 
-                    class="tupian-image"
-                    mode="aspectFill"
-                  />
-                </view>
-              </block>
-            </view>
-          </view>
-        </view>
-
-        <!-- 申诉信息 -->
-        <view wx:if="{{ xuanzhongChufa.ssliyou || (xuanzhongChufa.full_shensu_tupian && xuanzhongChufa.full_shensu_tupian.length > 0) }}" class="detail-section">
-          <view class="section-title">申诉信息</view>
-          <view wx:if="{{ xuanzhongChufa.ssliyou }}" class="detail-row full-row">
-            <text class="detail-label">申诉理由：</text>
-            <text class="detail-value liyou-full">{{ xuanzhongChufa.ssliyou }}</text>
-          </view>
-          <!-- 🔴 申诉图片展示 - 直接使用full_shensu_tupian -->
-          <view wx:if="{{ xuanzhongChufa.full_shensu_tupian && xuanzhongChufa.full_shensu_tupian.length > 0 }}" class="detail-row full-row">
-            <text class="detail-label">申诉图片：</text>
-            <view class="tupian-grid">
-              <block wx:for="{{ xuanzhongChufa.full_shensu_tupian }}" wx:key="index">
-                <view class="tupian-item" bindtap="yulanTupian" data-url="{{ item }}" data-urls="{{ xuanzhongChufa.full_shensu_tupian }}">
-                  <image 
-                    src="{{ item }}" 
-                    class="tupian-image"
-                    mode="aspectFill"
-                  />
-                </view>
-              </block>
-            </view>
-          </view>
-        </view>
-      </scroll-view>
-
-      <!-- 弹窗底部按钮 -->
-      <view class="modal-footer">
-        <view class="btn-group">
-          <!-- 联系客服按钮（始终显示） -->
-          <view class="btn btn-kefu" bindtap="lianxiKefu">
-            <text>联系客服</text>
-          </view>
-          <!-- 申诉按钮（只有待处罚状态可点击） -->
-          <view 
-            class="btn {{ xuanzhongChufa.sqzhuangtai === 0 ? 'btn-shensu' : 'btn-shensu-disabled' }}"
-            bindtap="{{ xuanzhongChufa.sqzhuangtai === 0 ? 'openShensuModal' : '' }}"
-          >
-            <text>申诉</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 申诉弹窗 -->
-  <view wx:if="{{ showShensuModal }}" class="shensu-modal">
-    <view class="modal-mask" bindtap="closeShensuModal"></view>
-    <view class="modal-content small-modal">
-      <view class="modal-header">
-        <text class="modal-title">提交申诉</text>
-      </view>
-      <view class="modal-body">
-        <!-- 申诉理由输入 -->
-        <view class="input-group">
-          <view class="input-label">申诉理由</view>
-          <textarea 
-            class="shensu-textarea"
-            value="{{ shensuLiyou }}"
-            bindinput="onShensuLiyouInput"
-            placeholder="请输入申诉理由（最多500字）..."
-            maxlength="500"
-            auto-height
-          />
-          <view class="word-count">{{ shensuLiyou.length }}/500</view>
-        </view>
-
-        <!-- 申诉图片上传 -->
-        <view class="input-group">
-          <view class="input-label">申诉图片</view>
-          <view class="upload-tip">最多可上传9张图片</view>
-          
-          <!-- 图片网格 -->
-          <view class="tupian-grid-upload">
-            <!-- 已上传图片 -->
-            <block wx:for="{{ shensuTupian }}" wx:key="index">
-              <view class="tupian-item-upload">
-                <image 
-                  src="{{ item }}" 
-                  class="tupian-image-upload"
-                  mode="aspectFill"
-                  bindtap="yulanShensuTupian"
-                  data-index="{{ index }}"
-                />
-                <view class="tupian-delete" bindtap="deleteShensuTupian" data-index="{{ index }}">
-                  <text>×</text>
-                </view>
-              </view>
-            </block>
-            
-            <!-- 添加按钮 -->
-            <view 
-              wx:if="{{ shensuTupian.length < 9 }}"
-              class="tupian-add-btn" 
-              bindtap="chooseShensuTupian"
-            >
-              <view class="add-icon">+</view>
-              <text class="add-text">添加图片</text>
-            </view>
-          </view>
-        </view>
-
-        <!-- 上传进度 -->
-        <view wx:if="{{ shangchuanZongshu > 0 }}" class="upload-progress">
-          <view class="progress-title">上传进度</view>
-          <view class="progress-bar">
-            <view class="progress-inner" style="width: {{ jinduWidth }}"></view>
-          </view>
-          <view class="progress-text">{{ shangchuanJindu }}/{{ shangchuanZongshu }}</view>
-        </view>
-      </view>
-      <view class="modal-footer">
-        <view class="btn-group">
-          <view class="btn btn-quxiao" bindtap="closeShensuModal">
-            <text>取消</text>
-          </view>
-          <view class="btn btn-queren" bindtap="submitShensu">
-            <text>提交申诉</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 全局通知组件 -->
-  <global-notification id="global-notification" />
+<!-- pages/penalty/penalty.wxml -->
+<view class="cfss-container">
+  <!-- 顶部统计卡片 -->
+  <view class="tongji-card">
+    <view class="tongji-title">处罚统计</view>
+    <view class="tongji-content">
+      <view class="tongji-item">
+        <text class="tongji-label">总记录</text>
+        <text class="tongji-value">{{ zongshu }}</text>
+      </view>
+      <view class="tongji-item">
+        <text class="tongji-label">待处理</text>
+        <text class="tongji-value daichuli-value">{{ daichuli }}</text>
+      </view>
+      <view class="tongji-item">
+        <text class="tongji-label">已处理</text>
+        <text class="tongji-value yichuli-value">{{ yichuli }}</text>
+      </view>
+    </view>
+  </view>
+
+  <!-- 类型切换 -->
+  <view class="leixing-qiehuan">
+    <view 
+      class="leixing-item {{ shenfen === 0 ? 'leixing-active' : '' }}"
+      bindtap="qiehuanShenfen"
+      data-type="0"
+    >
+      <text class="leixing-text">待处理</text>
+      <text class="leixing-count">{{ daichuli }}</text>
+    </view>
+    <view 
+      class="leixing-item {{ shenfen === 1 ? 'leixing-active' : '' }}"
+      bindtap="qiehuanShenfen"
+      data-type="1"
+    >
+      <text class="leixing-text">已处理</text>
+      <text class="leixing-count">{{ yichuli }}</text>
+    </view>
+  </view>
+
+  <!-- 处罚记录列表 -->
+  <scroll-view 
+    class="chufa-list"
+    scroll-y
+    enable-back-to-top
+    scroll-with-animation
+    style="height: {{ scrollHeight }}px"
+    bindscrolltolower="shanglaShuaxin"
+  >
+    <!-- 加载中 -->
+    <view wx:if="{{ jiazhaozhong && chufaList.length === 0 }}" class="jiazai-zhong">
+      <view class="loading-animation">
+        <view class="loading-dot"></view>
+        <view class="loading-dot"></view>
+        <view class="loading-dot"></view>
+      </view>
+      <text>加载中...</text>
+    </view>
+
+    <!-- 🔴【关键修改】处罚记录卡片列表 - 直接使用处理好的字段 -->
+    <block wx:for="{{ chufaList }}" wx:key="index">
+      <view 
+        class="chufa-card"
+        bindtap="chakanXiangqing"
+        data-item="{{ item }}"
+      >
+        <!-- 卡片顶部：时间和状态 -->
+        <view class="card-top">
+          <!-- 🔴 直接使用display_time -->
+          <text class="shijian">{{ item.display_time }}</text>
+          <!-- 🔴 直接使用display_status和status_class -->
+          <view class="zhuangtai-badge {{ item.status_class }}">
+            {{ item.display_status }}
+          </view>
+        </view>
+
+        <!-- 申请人信息 -->
+        <view class="qingqiu-row">
+          <text class="qingqiu-label">申请人：</text>
+          <text class="qingqiu-value">{{ item.qingqiuid || '--' }}</text>
+        </view>
+
+        <!-- 处罚理由 -->
+        <view class="liyou-row">
+          <text class="liyou-label">处罚理由：</text>
+          <text class="liyou-value">{{ item.cfliyou || '无' }}</text>
+        </view>
+
+        <!-- 订单编号 -->
+        <view class="dingdan-row">
+          <text class="dingdan-label">订单编号：</text>
+          <text class="dingdan-value">{{ item.dingdan_id || '--' }}</text>
+        </view>
+        
+        <!-- 卡片边框效果 -->
+        <view class="card-border"></view>
+        <view class="card-glow"></view>
+      </view>
+    </block>
+
+    <!-- 加载更多 -->
+    <view wx:if="{{ jiazhaigengduo }}" class="jiazai-gengduo">
+      <view class="scan-line"></view>
+      <text>加载更多...</text>
+    </view>
+
+    <!-- 没有更多数据 -->
+    <view wx:if="{{ !haiyougengduo && chufaList.length > 0 }}" class="meiyou-gengduo">
+      <text>—— 没有更多记录了 ——</text>
+    </view>
+
+    <!-- 空状态 -->
+    <view wx:if="{{ !jiazhaozhong && chufaList.length === 0 }}" class="kong-zhuangtai">
+      <view class="empty-icon">⚡</view>
+      <text class="empty-text">暂无处罚记录</text>
+      <text class="empty-subtext">所有事务已处理完毕</text>
+    </view>
+  </scroll-view>
+
+  <!-- 处罚详情弹窗 -->
+  <view wx:if="{{ showXiangqing }}" class="xiangqing-modal">
+    <view class="modal-mask" bindtap="guanbiXiangqing"></view>
+    <view class="modal-content">
+      <!-- 弹窗头部 -->
+      <view class="modal-header">
+        <text class="modal-title">处罚详情</text>
+        <view class="modal-close" bindtap="guanbiXiangqing">
+          <text class="close-icon">×</text>
+        </view>
+      </view>
+
+      <!-- 🔴【弹窗主体 - 确保可以滚动】 -->
+      <scroll-view class="modal-body" scroll-y style="max-height: 1000rpx;">
+        <!-- 基本信息 -->
+        <view class="detail-section">
+          <view class="section-title">基本信息</view>
+          <view class="detail-row">
+            <text class="detail-label">订单编号：</text>
+            <view class="detail-value-container">
+              <text class="detail-value">{{ xuanzhongChufa.dingdan_id || '--' }}</text>
+              <text class="fuzhi-btn" bindtap="fuzhiWenben" data-text="{{ xuanzhongChufa.dingdan_id }}">复制</text>
+            </view>
+          </view>
+          <view class="detail-row">
+            <text class="detail-label">申请人ID：</text>
+            <view class="detail-value-container">
+              <text class="detail-value">{{ xuanzhongChufa.qingqiuid || '--' }}</text>
+              <text class="fuzhi-btn" bindtap="fuzhiWenben" data-text="{{ xuanzhongChufa.qingqiuid }}">复制</text>
+            </view>
+          </view>
+          <view class="detail-row">
+            <!-- 🔴 直接使用display_time -->
+            <text class="detail-label">创建时间：</text>
+            <text class="detail-value">{{ xuanzhongChufa.display_time || '--' }}</text>
+          </view>
+        </view>
+
+        <!-- 处罚信息 -->
+        <view class="detail-section">
+          <view class="section-title">处罚信息</view>
+          <view class="detail-row">
+            <text class="detail-label">处罚状态：</text>
+            <!-- 🔴 直接使用display_status和status_class -->
+            <view class="zhuangtai-badge-inline {{ xuanzhongChufa.status_class }}">
+              {{ xuanzhongChufa.display_status }}
+            </view>
+          </view>
+          <view class="detail-row full-row">
+            <text class="detail-label">处罚理由：</text>
+            <text class="detail-value liyou-full">{{ xuanzhongChufa.cfliyou || '无' }}</text>
+          </view>
+          
+          <!-- 🔴 证据图片展示 - 直接使用full_zhengju_tupian -->
+          <view wx:if="{{ xuanzhongChufa.full_zhengju_tupian && xuanzhongChufa.full_zhengju_tupian.length > 0 }}" class="detail-row full-row">
+            <text class="detail-label">证据图片：</text>
+            <view class="tupian-grid">
+              <block wx:for="{{ xuanzhongChufa.full_zhengju_tupian }}" wx:key="index">
+                <view class="tupian-item" bindtap="yulanTupian" data-url="{{ item }}" data-urls="{{ xuanzhongChufa.full_zhengju_tupian }}">
+                  <image 
+                    src="{{ item }}" 
+                    class="tupian-image"
+                    mode="aspectFill"
+                  />
+                </view>
+              </block>
+            </view>
+          </view>
+        </view>
+
+        <!-- 申诉信息 -->
+        <view wx:if="{{ xuanzhongChufa.ssliyou || (xuanzhongChufa.full_shensu_tupian && xuanzhongChufa.full_shensu_tupian.length > 0) }}" class="detail-section">
+          <view class="section-title">申诉信息</view>
+          <view wx:if="{{ xuanzhongChufa.ssliyou }}" class="detail-row full-row">
+            <text class="detail-label">申诉理由：</text>
+            <text class="detail-value liyou-full">{{ xuanzhongChufa.ssliyou }}</text>
+          </view>
+          <!-- 🔴 申诉图片展示 - 直接使用full_shensu_tupian -->
+          <view wx:if="{{ xuanzhongChufa.full_shensu_tupian && xuanzhongChufa.full_shensu_tupian.length > 0 }}" class="detail-row full-row">
+            <text class="detail-label">申诉图片：</text>
+            <view class="tupian-grid">
+              <block wx:for="{{ xuanzhongChufa.full_shensu_tupian }}" wx:key="index">
+                <view class="tupian-item" bindtap="yulanTupian" data-url="{{ item }}" data-urls="{{ xuanzhongChufa.full_shensu_tupian }}">
+                  <image 
+                    src="{{ item }}" 
+                    class="tupian-image"
+                    mode="aspectFill"
+                  />
+                </view>
+              </block>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+
+      <!-- 弹窗底部按钮 -->
+      <view class="modal-footer">
+        <view class="btn-group">
+          <!-- 联系客服按钮（始终显示） -->
+          <view class="btn btn-kefu" bindtap="lianxiKefu">
+            <text>联系客服</text>
+          </view>
+          <!-- 申诉按钮（只有待处罚状态可点击） -->
+          <view 
+            class="btn {{ xuanzhongChufa.sqzhuangtai === 0 ? 'btn-shensu' : 'btn-shensu-disabled' }}"
+            bindtap="{{ xuanzhongChufa.sqzhuangtai === 0 ? 'openShensuModal' : '' }}"
+          >
+            <text>申诉</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 申诉弹窗 -->
+  <view wx:if="{{ showShensuModal }}" class="shensu-modal">
+    <view class="modal-mask" bindtap="closeShensuModal"></view>
+    <view class="modal-content small-modal">
+      <view class="modal-header">
+        <text class="modal-title">提交申诉</text>
+      </view>
+      <view class="modal-body">
+        <!-- 申诉理由输入 -->
+        <view class="input-group">
+          <view class="input-label">申诉理由</view>
+          <textarea 
+            class="shensu-textarea"
+            value="{{ shensuLiyou }}"
+            bindinput="onShensuLiyouInput"
+            placeholder="请输入申诉理由（最多500字）..."
+            maxlength="500"
+            auto-height
+          />
+          <view class="word-count">{{ shensuLiyou.length }}/500</view>
+        </view>
+
+        <!-- 申诉图片上传 -->
+        <view class="input-group">
+          <view class="input-label">申诉图片</view>
+          <view class="upload-tip">最多可上传9张图片</view>
+          
+          <!-- 图片网格 -->
+          <view class="tupian-grid-upload">
+            <!-- 已上传图片 -->
+            <block wx:for="{{ shensuTupian }}" wx:key="index">
+              <view class="tupian-item-upload">
+                <image 
+                  src="{{ item }}" 
+                  class="tupian-image-upload"
+                  mode="aspectFill"
+                  bindtap="yulanShensuTupian"
+                  data-index="{{ index }}"
+                />
+                <view class="tupian-delete" bindtap="deleteShensuTupian" data-index="{{ index }}">
+                  <text>×</text>
+                </view>
+              </view>
+            </block>
+            
+            <!-- 添加按钮 -->
+            <view 
+              wx:if="{{ shensuTupian.length < 9 }}"
+              class="tupian-add-btn" 
+              bindtap="chooseShensuTupian"
+            >
+              <view class="add-icon">+</view>
+              <text class="add-text">添加图片</text>
+            </view>
+          </view>
+        </view>
+
+        <!-- 上传进度 -->
+        <view wx:if="{{ shangchuanZongshu > 0 }}" class="upload-progress">
+          <view class="progress-title">上传进度</view>
+          <view class="progress-bar">
+            <view class="progress-inner" style="width: {{ jinduWidth }}"></view>
+          </view>
+          <view class="progress-text">{{ shangchuanJindu }}/{{ shangchuanZongshu }}</view>
+        </view>
+      </view>
+      <view class="modal-footer">
+        <view class="btn-group">
+          <view class="btn btn-quxiao" bindtap="closeShensuModal">
+            <text>取消</text>
+          </view>
+          <view class="btn btn-queren" bindtap="submitShensu">
+            <text>提交申诉</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 全局通知组件 -->
+  <global-notification id="global-notification" />
 </view>
\ No newline at end of file
diff --git a/pages/dashouxiaoxi/dashouxiaoxi.wxss b/pages/fighter-msg/fighter-msg.wxss
similarity index 94%
rename from pages/dashouxiaoxi/dashouxiaoxi.wxss
rename to pages/fighter-msg/fighter-msg.wxss
index c9a6d32..fe267b5 100644
--- a/pages/dashouxiaoxi/dashouxiaoxi.wxss
+++ b/pages/fighter-msg/fighter-msg.wxss
@@ -1,963 +1,963 @@
-/* pages/cfss/cfss.wxss */
-/* 🔴【恢复您原来的深色背景，但调淡一点】 */
-
-:root {
-    /* 🔴【颜色调淡方案】 */
-    --cyber-blue: rgba(0, 243, 255, 0.7);       /* 蓝色调淡70% */
-    --cyber-pink: rgba(255, 0, 255, 0.7);       /* 粉色调淡70% */
-    --cyber-purple: rgba(157, 0, 255, 0.7);     /* 紫色调淡70% */
-    --cyber-green: rgba(0, 255, 157, 0.7);      /* 绿色调淡70% */
-    --cyber-red: rgba(255, 0, 102, 0.7);        /* 红色调淡70% */
-    
-    /* 🔴【背景改为淡灰色，不是深色，也不是白色】 */
-    --cyber-bg: #2a2a3a;                        /* 深灰色背景，比原来的淡 */
-    --cyber-card: #333344;                      /* 卡片：比背景稍深的灰色 */
-    --cyber-border: rgba(255, 255, 255, 0.15);  /* 边框：半透明白色 */
-    --cyber-glow: rgba(0, 243, 255, 0.2);       /* 光效：调淡 */
-    
-    /* 文字颜色保持不变 */
-    --cyber-text: #ffffff;
-    --cyber-text-light: #e6e6e6;
-    --cyber-text-lighter: #cccccc;
-}
-
-.cfss-container {
-    padding: 30rpx;
-    background: var(--cyber-bg);
-    min-height: 100vh;
-    color: var(--cyber-text) !important;
-    position: relative;
-    overflow: hidden;
-    box-sizing: border-box;
-}
-
-/* 恢复网格背景 */
-.cfss-container::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-image: 
-      linear-gradient(rgba(0, 243, 255, 0.05) 1px, transparent 1px),
-      linear-gradient(90deg, rgba(0, 243, 255, 0.05) 1px, transparent 1px);
-    background-size: 40rpx 40rpx;
-    pointer-events: none;
-    opacity: 0.15;
-    z-index: 0;
-}
-
-/* ====== 统计卡片 ====== */
-.tongji-card {
-    background: rgba(255, 0, 102, 0.3); /* 🔴 调淡为30%透明度 */
-    border-radius: 20rpx;
-    padding: 30rpx;
-    margin-bottom: 30rpx;
-    border: 1rpx solid var(--cyber-border);
-    box-shadow: 
-      0 0 20rpx rgba(255, 0, 102, 0.2),
-      inset 0 0 10rpx rgba(0, 243, 255, 0.05);
-    position: relative;
-    overflow: hidden;
-    z-index: 1;
-}
-
-.tongji-title {
-    color: var(--cyber-blue);
-    font-size: 34rpx;
-    font-weight: bold;
-    margin-bottom: 30rpx;
-    text-shadow: 0 0 8rpx var(--cyber-blue);
-    letter-spacing: 2rpx;
-}
-
-.tongji-content {
-    display: flex;
-    justify-content: space-between;
-}
-
-.tongji-item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    flex: 1;
-}
-
-.tongji-label {
-    color: var(--cyber-text-light) !important;
-    font-size: 26rpx;
-    margin-bottom: 15rpx;
-    opacity: 0.9;
-}
-
-.tongji-value {
-    color: var(--cyber-text) !important;
-    font-size: 44rpx;
-    font-weight: bold;
-    text-shadow: 0 0 8rpx currentColor;
-}
-
-.daichuli-value {
-    color: var(--cyber-red) !important;
-    text-shadow: 0 0 8rpx rgba(255, 0, 102, 0.3);
-}
-
-.yichuli-value {
-    color: var(--cyber-green) !important;
-    text-shadow: 0 0 8rpx rgba(0, 255, 157, 0.3);
-}
-
-/* ====== 类型切换 ====== */
-.leixing-qiehuan {
-    display: flex;
-    background: rgba(255, 0, 102, 0.3); /* 🔴 调淡为30%透明度 */
-    border-radius: 16rpx;
-    padding: 10rpx;
-    margin-bottom: 30rpx;
-    border: 1rpx solid var(--cyber-border);
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.2);
-    z-index: 1;
-}
-
-.leixing-item {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 25rpx 0;
-    border-radius: 12rpx;
-    transition: all 0.3s;
-}
-
-.leixing-item:active {
-    transform: scale(0.98);
-}
-
-.leixing-active {
-    background: linear-gradient(135deg, rgba(0, 243, 255, 0.15), rgba(157, 0, 255, 0.15));
-    box-shadow: 0 0 15rpx rgba(0, 243, 255, 0.2);
-}
-
-.leixing-text {
-    font-size: 28rpx;
-    font-weight: bold;
-    margin-bottom: 8rpx;
-    color: var(--cyber-text-light) !important;
-}
-
-.leixing-active .leixing-text {
-    color: var(--cyber-text) !important;
-    text-shadow: 0 0 8rpx var(--cyber-blue);
-}
-
-.leixing-count {
-    font-size: 24rpx;
-    color: var(--cyber-text-lighter) !important;
-    opacity: 0.9;
-}
-
-.leixing-active .leixing-count {
-    color: rgba(255, 255, 255, 0.9) !important;
-}
-
-/* ====== 处罚列表 ====== */
-.chufa-list {
-    margin-bottom: 0;
-    padding-bottom: 30rpx;
-    z-index: 1;
-}
-
-/* 加载动画 */
-.jiazai-zhong {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 60rpx 0;
-    color: var(--cyber-blue);
-}
-
-.loading-animation {
-    display: flex;
-    justify-content: center;
-    margin-bottom: 20rpx;
-}
-
-.loading-dot {
-    width: 20rpx;
-    height: 20rpx;
-    border-radius: 50%;
-    background-color: var(--cyber-blue);
-    margin: 0 10rpx;
-    animation: pulse 1.5s infinite ease-in-out;
-}
-
-.loading-dot:nth-child(2) {
-    animation-delay: 0.2s;
-}
-
-.loading-dot:nth-child(3) {
-    animation-delay: 0.4s;
-}
-
-@keyframes pulse {
-    0%, 100% { 
-        transform: scale(0.8);
-        opacity: 0.5;
-    }
-    50% { 
-        transform: scale(1.2);
-        opacity: 1;
-    }
-}
-
-/* 🔴【关键：处罚卡片背景改为淡灰色】 */
-.chufa-card {
-    background: rgba(50, 50, 65, 0.8); /* 🔴 淡灰色卡片，半透明 */
-    border-radius: 20rpx;
-    padding: 30rpx;
-    margin-bottom: 30rpx;
-    border: 1rpx solid var(--cyber-border);
-    position: relative;
-    overflow: hidden;
-    transition: all 0.3s;
-    z-index: 1;
-}
-
-.chufa-card:active {
-    transform: translateY(-4rpx);
-    box-shadow: 
-      0 10rpx 30rpx rgba(0, 0, 0, 0.3),
-      0 0 25rpx var(--cyber-glow);
-}
-
-.card-border {
-    position: absolute;
-    top: -1px;
-    left: -1px;
-    right: -1px;
-    bottom: -1px;
-    border-radius: 21rpx;
-    background: linear-gradient(45deg, rgba(255, 0, 255, 0.3), rgba(0, 243, 255, 0.3), rgba(255, 0, 255, 0.3), rgba(0, 243, 255, 0.3));
-    z-index: -1;
-    opacity: 0;
-    transition: opacity 0.3s ease;
-}
-
-.chufa-card:active .card-border {
-    opacity: 0.3;
-}
-
-.card-top {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 25rpx;
-}
-
-/* 🔴【时间必须显示】 */
-.shijian {
-    color: var(--cyber-text-light) !important;
-    font-size: 26rpx;
-    font-family: 'Courier New', monospace;
-    letter-spacing: 1rpx;
-    opacity: 0.9;
-}
-
-/* 🔴【状态标签 - 必须显示出来】 */
-.zhuangtai-badge {
-    padding: 8rpx 25rpx;
-    border-radius: 20rpx;
-    font-size: 24rpx;
-    font-weight: bold;
-    text-transform: uppercase;
-    letter-spacing: 2rpx;
-    border: 1rpx solid;
-    box-shadow: 0 0 8rpx;
-    color: #ffffff !important;
-}
-
-.zhuangtai-daichuli {
-    background: rgba(255, 0, 102, 0.2);
-    border-color: var(--cyber-red);
-    box-shadow: 0 0 8rpx rgba(255, 0, 102, 0.2);
-}
-
-.zhuangtai-yichufa {
-    background: rgba(0, 255, 157, 0.2);
-    border-color: var(--cyber-green);
-    box-shadow: 0 0 8rpx rgba(0, 255, 157, 0.2);
-}
-
-.zhuangtai-yibohui {
-    background: rgba(102, 102, 102, 0.2);
-    border-color: #666;
-    box-shadow: 0 0 8rpx rgba(102, 102, 102, 0.2);
-}
-
-.zhuangtai-shensuzhong {
-    background: rgba(255, 165, 0, 0.2);
-    border-color: #FFA500;
-    box-shadow: 0 0 8rpx rgba(255, 165, 0, 0.2);
-}
-
-.zhuangtai-weizhi {
-    background: rgba(128, 0, 255, 0.2); /* 未知状态：紫色 */
-    border-color: rgba(128, 0, 255, 0.5);
-    box-shadow: 0 0 8rpx rgba(128, 0, 255, 0.2);
-}
-
-/* 其他文字内容 */
-.qingqiu-row, .liyou-row, .dingdan-row {
-    display: flex;
-    align-items: flex-start;
-    margin-bottom: 20rpx;
-}
-
-.qingqiu-label, .liyou-label, .dingdan-label {
-    color: var(--cyber-text-light) !important;
-    font-size: 26rpx;
-    font-weight: bold;
-    margin-right: 15rpx;
-    opacity: 0.9;
-    flex-shrink: 0;
-}
-
-.qingqiu-value, .liyou-value, .dingdan-value {
-    color: var(--cyber-text) !important;
-    font-size: 26rpx;
-    flex: 1;
-    word-break: break-all;
-}
-
-.liyou-value {
-    line-height: 1.5;
-}
-
-.dingdan-value {
-    font-family: 'Courier New', monospace;
-    letter-spacing: 1rpx;
-}
-
-/* 加载更多 */
-.jiazai-gengduo {
-    text-align: center;
-    padding: 40rpx 0;
-    color: var(--cyber-blue);
-    position: relative;
-    overflow: hidden;
-}
-
-.scan-line {
-    position: absolute;
-    top: 0;
-    left: -100%;
-    width: 100%;
-    height: 2rpx;
-    background: linear-gradient(90deg, transparent, var(--cyber-blue), transparent);
-    animation: scan 2s linear infinite;
-}
-
-@keyframes scan {
-    0% { left: -100%; }
-    100% { left: 100%; }
-}
-
-/* 没有更多数据 */
-.meiyou-gengduo {
-    text-align: center;
-    padding: 40rpx 0;
-    color: var(--cyber-green);
-    font-size: 28rpx;
-    opacity: 0.9;
-}
-
-/* 空状态 */
-.kong-zhuangtai {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 100rpx 40rpx;
-    text-align: center;
-    z-index: 1;
-}
-
-.empty-icon {
-    font-size: 120rpx;
-    color: var(--cyber-blue);
-    margin-bottom: 30rpx;
-    text-shadow: 0 0 15rpx var(--cyber-blue);
-    animation: pulse 2s infinite;
-}
-
-.empty-text {
-    font-size: 34rpx;
-    color: var(--cyber-text) !important;
-    margin-bottom: 15rpx;
-    font-weight: bold;
-}
-
-.empty-subtext {
-    font-size: 28rpx;
-    color: var(--cyber-text-light) !important;
-    opacity: 0.8;
-}
-
-/* ====== 弹窗样式 ====== */
-.xiangqing-modal,
-.shensu-modal {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 1000;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.modal-mask {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.7);
-}
-
-/* 🔴【关键：弹窗背景改为不透明的淡灰色】 */
-.modal-content {
-    position: relative;
-    background: #3a3a4a; /* 🔴 淡灰色，不透明 */
-    border-radius: 30rpx;
-    width: 90%;
-    max-height: 80vh;
-    display: flex;
-    flex-direction: column;
-    border: 1rpx solid var(--cyber-border);
-    box-shadow: 0 0 35rpx rgba(0, 243, 255, 0.3);
-    z-index: 1001;
-    backdrop-filter: blur(0px); /* 去掉模糊效果 */
-}
-
-.small-modal {
-    max-height: 85vh;
-    width: 85%;
-}
-
-.modal-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 40rpx 30rpx 30rpx 30rpx;
-    border-bottom: 1rpx solid rgba(0, 243, 255, 0.2);
-    flex-shrink: 0;
-}
-
-.modal-title {
-    font-size: 36rpx;
-    font-weight: bold;
-    color: var(--cyber-blue);
-    text-shadow: 0 0 8rpx var(--cyber-blue);
-}
-
-.modal-close {
-    width: 60rpx;
-    height: 60rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 50%;
-    background: rgba(0, 243, 255, 0.1);
-    border: 1rpx solid rgba(0, 243, 255, 0.3);
-}
-
-.modal-close:active {
-    background: rgba(0, 243, 255, 0.2);
-    transform: scale(0.95);
-}
-
-.close-icon {
-    font-size: 40rpx;
-    color: var(--cyber-blue);
-    line-height: 1;
-}
-
-/* 弹窗主体 */
-.modal-body {
-    flex: 1;
-    padding: 30rpx;
-    overflow-y: auto;
-    min-height: 200rpx;
-    box-sizing: border-box;
-}
-
-/* 详情区域 */
-.detail-section {
-    margin-bottom: 40rpx;
-}
-
-.section-title {
-    font-size: 32rpx;
-    font-weight: bold;
-    color: var(--cyber-blue);
-    margin-bottom: 25rpx;
-    padding-bottom: 15rpx;
-    border-bottom: 1rpx solid rgba(0, 243, 255, 0.2);
-    text-shadow: 0 0 8rpx var(--cyber-blue);
-}
-
-.detail-row {
-    display: flex;
-    margin-bottom: 25rpx;
-    align-items: center;
-}
-
-.detail-label {
-    color: var(--cyber-text-light) !important;
-    font-size: 30rpx;
-    min-width: 180rpx;
-    margin-right: 20rpx;
-    line-height: 1.5;
-    opacity: 0.9;
-    flex-shrink: 0;
-}
-
-.detail-value-container {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.detail-value {
-    color: var(--cyber-text) !important;
-    font-size: 30rpx;
-    line-height: 1.5;
-    word-break: break-all;
-    opacity: 0.95;
-    flex: 1;
-    margin-right: 20rpx;
-}
-
-.fuzhi-btn {
-    color: var(--cyber-blue);
-    font-size: 24rpx;
-    padding: 8rpx 20rpx;
-    border-radius: 8rpx;
-    background: rgba(0, 243, 255, 0.1);
-    border: 1rpx solid rgba(0, 243, 255, 0.3);
-    flex-shrink: 0;
-}
-
-.fuzhi-btn:active {
-    background: rgba(0, 243, 255, 0.2);
-}
-
-.full-row {
-    flex-direction: column;
-    align-items: flex-start;
-}
-
-.full-row .detail-label {
-    margin-bottom: 10rpx;
-    min-width: auto;
-}
-
-/* 弹窗内的状态标签 */
-.zhuangtai-badge-inline {
-    padding: 8rpx 24rpx;
-    border-radius: 20rpx;
-    font-size: 26rpx;
-    font-weight: bold;
-    text-transform: uppercase;
-    letter-spacing: 1rpx;
-    border: 1rpx solid;
-    min-width: 120rpx;
-    text-align: center;
-    color: #ffffff !important;
-}
-
-/* 理由方框 */
-.liyou-full {
-    background: rgba(255, 255, 255, 0.05);
-    padding: 25rpx 30rpx;
-    border-radius: 15rpx;
-    line-height: 1.6;
-    border: 1rpx solid rgba(255, 255, 255, 0.1);
-    color: var(--cyber-text) !important;
-    width: 100%;
-    box-sizing: border-box;
-    margin: 0;
-    display: block;
-    opacity: 0.95;
-}
-
-/* 图片网格样式 */
-.tupian-grid {
-    display: flex;
-    flex-wrap: wrap;
-    margin-top: 10rpx;
-    margin-left: -5rpx;
-    margin-right: -5rpx;
-}
-
-.tupian-item {
-    width: calc(33.333% - 10rpx);
-    margin: 5rpx;
-    aspect-ratio: 1;
-    border-radius: 10rpx;
-    overflow: hidden;
-    position: relative;
-    border: 1rpx solid rgba(0, 243, 255, 0.2);
-}
-
-.tupian-image {
-    width: 100%;
-    height: 100%;
-}
-
-/* 弹窗底部按钮 */
-.modal-footer {
-    padding: 30rpx;
-    border-top: 1rpx solid rgba(0, 243, 255, 0.2);
-    flex-shrink: 0;
-}
-
-.btn-group {
-    display: flex;
-    gap: 20rpx;
-}
-
-.btn {
-    flex: 1;
-    height: 90rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 15rpx;
-    font-size: 32rpx;
-    font-weight: bold;
-    transition: all 0.3s;
-    border: 1rpx solid;
-    box-shadow: 0 0 12rpx;
-    color: var(--cyber-text) !important;
-}
-
-.btn:active {
-    transform: scale(0.98);
-}
-
-/* 按钮样式 */
-.btn-kefu {
-    background: rgba(0, 243, 255, 0.1);
-    border-color: var(--cyber-blue);
-    box-shadow: 0 0 12rpx rgba(0, 243, 255, 0.2);
-}
-
-.btn-shensu {
-    background: rgba(255, 165, 0, 0.1);
-    border-color: #FFA500;
-    box-shadow: 0 0 12rpx rgba(255, 165, 0, 0.2);
-}
-
-.btn-shensu-disabled {
-    background: rgba(102, 102, 102, 0.1);
-    border-color: #666;
-    box-shadow: 0 0 12rpx rgba(102, 102, 102, 0.2);
-    opacity: 0.5;
-}
-
-.btn-quxiao {
-    background: rgba(255, 255, 255, 0.07);
-    border-color: rgba(255, 255, 255, 0.2);
-    box-shadow: 0 0 12rpx rgba(255, 255, 255, 0.1);
-}
-
-.btn-queren {
-    background: rgba(0, 255, 157, 0.1);
-    border-color: var(--cyber-green);
-    box-shadow: 0 0 12rpx rgba(0, 255, 157, 0.2);
-}
-
-/* 申诉弹窗输入样式 */
-.input-group {
-    margin-bottom: 40rpx;
-}
-
-.input-label {
-    color: var(--cyber-text-light) !important;
-    font-size: 30rpx;
-    margin-bottom: 15rpx;
-    font-weight: bold;
-}
-
-.shensu-textarea {
-    width: 100%;
-    min-height: 200rpx;
-    padding: 25rpx 30rpx;
-    background: rgba(255, 255, 255, 0.05);
-    border-radius: 15rpx;
-    font-size: 30rpx;
-    line-height: 1.5;
-    color: var(--cyber-text) !important;
-    border: 1rpx solid rgba(0, 243, 255, 0.2);
-    box-sizing: border-box;
-}
-
-.shensu-textarea::placeholder {
-    color: var(--cyber-text-lighter) !important;
-    opacity: 0.6;
-}
-
-.word-count {
-    text-align: right;
-    color: var(--cyber-text-lighter) !important;
-    font-size: 24rpx;
-    margin-top: 10rpx;
-    opacity: 0.7;
-}
-
-.upload-tip {
-    color: var(--cyber-text-lighter) !important;
-    font-size: 26rpx;
-    margin-bottom: 20rpx;
-    opacity: 0.8;
-}
-
-/* 上传图片网格 */
-.tupian-grid-upload {
-    display: flex;
-    flex-wrap: wrap;
-    margin-left: -5rpx;
-    margin-right: -5rpx;
-}
-
-.tupian-item-upload {
-    width: calc(33.333% - 10rpx);
-    margin: 5rpx;
-    aspect-ratio: 1;
-    border-radius: 10rpx;
-    overflow: hidden;
-    position: relative;
-    border: 1rpx solid rgba(0, 243, 255, 0.2);
-}
-
-.tupian-image-upload {
-    width: 100%;
-    height: 100%;
-}
-
-.tupian-delete {
-    position: absolute;
-    top: 5rpx;
-    right: 5rpx;
-    width: 40rpx;
-    height: 40rpx;
-    border-radius: 50%;
-    background: rgba(255, 0, 102, 0.7);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: white;
-    font-size: 30rpx;
-    font-weight: bold;
-}
-
-.tupian-add-btn {
-    width: calc(33.333% - 10rpx);
-    margin: 5rpx;
-    aspect-ratio: 1;
-    border-radius: 10rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    border: 2rpx dashed rgba(0, 243, 255, 0.4);
-    color: var(--cyber-blue);
-}
-
-.tupian-add-btn:active {
-    border-color: var(--cyber-blue);
-    background: rgba(0, 243, 255, 0.07);
-}
-
-.add-icon {
-    font-size: 60rpx;
-    margin-bottom: 10rpx;
-}
-
-.add-text {
-    font-size: 24rpx;
-}
-
-/* 上传进度 */
-.upload-progress {
-    margin-top: 30rpx;
-    padding: 25rpx 30rpx;
-    background: rgba(255, 255, 255, 0.05);
-    border-radius: 15rpx;
-    border: 1rpx solid rgba(0, 243, 255, 0.2);
-}
-
-.progress-title {
-    color: var(--cyber-blue);
-    font-size: 28rpx;
-    margin-bottom: 15rpx;
-    font-weight: bold;
-}
-
-.progress-bar {
-    height: 20rpx;
-    background: rgba(255, 255, 255, 0.07);
-    border-radius: 10rpx;
-    overflow: hidden;
-    margin-bottom: 10rpx;
-}
-
-.progress-inner {
-    height: 100%;
-    background: linear-gradient(90deg, var(--cyber-blue), var(--cyber-purple));
-    border-radius: 10rpx;
-    transition: width 0.3s ease;
-}
-
-.progress-text {
-    text-align: center;
-    color: var(--cyber-text-light) !important;
-    font-size: 26rpx;
-    opacity: 0.9;
-}
-
-/* 响应式调整 */
-@media (max-width: 375px) {
-    .tongji-value {
-        font-size: 36rpx;
-    }
-    
-    .shijian,
-    .qingqiu-label,
-    .liyou-label,
-    .dingdan-label {
-        font-size: 24rpx;
-    }
-    
-    .qingqiu-value,
-    .liyou-value,
-    .dingdan-value {
-        font-size: 24rpx;
-    }
-    
-    .modal-content {
-        width: 95%;
-    }
-}
-
-
-/* 🔴【颜色调整】卡片和弹窗背景色稍微调淡一点 */
-:root {
-    --cyber-bg: #2c2c3c;      /* 从#2a2a3a调亮一点 */
-    --cyber-card: #363648;    /* 从#333344调亮一点 */
-}
-
-/* 🔴【卡片背景色调整 - 更淡一点】 */
-.chufa-card {
-    background: rgba(130, 141, 146, 0.8); /* 从rgba(50,50,65,0.8)调亮 */
-}
-
-/* 🔴【弹窗背景色调整 - 更淡一点】 */
-.modal-content {
-    
-    background: #acacda; /* 从#3a3a4a调亮 */
-}
-
-/* 🔴【增加弹窗高度】 */
-.modal-content {
-    max-height: 88vh; /* 从80vh增加 */
-}
-
-.small-modal {
-    max-height: 88vh; /* 从85vh调整 */
-}
-
-/* 🔴【增加弹窗内部滚动区域高度】 */
-/* 修改wxml中对应的style */
-/* 需要将：<scroll-view class="modal-body" scroll-y style="max-height: 500rpx;"> */
-/* 改为：<scroll-view class="modal-body" scroll-y style="max-height: 600rpx;"> */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/* pages/cfss/cfss.wxss 中新增样式 */
-
-/* 🔴【关键修改】图片网格和图片样式 */
-.tupian-grid {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 12rpx;
-    margin-top: 10rpx;
-    width: 100%;
-  }
-  
-  .tupian-item {
-    position: relative;
-    width: 100%;
-    aspect-ratio: 1;
-    border-radius: 12rpx;
-    overflow: hidden;
-    border: 1rpx solid rgba(0, 243, 255, 0.3);
-    background-color: rgba(0, 0, 0, 0.2);
-  }
-  
-  .tupian-image {
-    width: 100%;
-    height: 100%;
-    display: block;
-    object-fit: cover;
-  }
-  
-  /* 图片预览遮罩 */
-  .tupian-preview {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0, 0, 0, 0.3);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    opacity: 0;
-    transition: opacity 0.3s ease;
-  }
-  
-  .tupian-item:hover .tupian-preview {
-    opacity: 1;
-  }
-  
-  .preview-text {
-    color: white;
-    font-size: 24rpx;
-    background: rgba(0, 243, 255, 0.7);
-    padding: 8rpx 16rpx;
-    border-radius: 8rpx;
+/* pages/penalty/penalty.wxss */
+/* 🔴【恢复您原来的深色背景，但调淡一点】 */
+
+:root {
+    /* 🔴【颜色调淡方案】 */
+    --cyber-blue: rgba(0, 243, 255, 0.7);       /* 蓝色调淡70% */
+    --cyber-pink: rgba(255, 0, 255, 0.7);       /* 粉色调淡70% */
+    --cyber-purple: rgba(157, 0, 255, 0.7);     /* 紫色调淡70% */
+    --cyber-green: rgba(0, 255, 157, 0.7);      /* 绿色调淡70% */
+    --cyber-red: rgba(255, 0, 102, 0.7);        /* 红色调淡70% */
+    
+    /* 🔴【背景改为淡灰色，不是深色，也不是白色】 */
+    --cyber-bg: #2a2a3a;                        /* 深灰色背景，比原来的淡 */
+    --cyber-card: #333344;                      /* 卡片：比背景稍深的灰色 */
+    --cyber-border: rgba(255, 255, 255, 0.15);  /* 边框：半透明白色 */
+    --cyber-glow: rgba(0, 243, 255, 0.2);       /* 光效：调淡 */
+    
+    /* 文字颜色保持不变 */
+    --cyber-text: #ffffff;
+    --cyber-text-light: #e6e6e6;
+    --cyber-text-lighter: #cccccc;
+}
+
+.cfss-container {
+    padding: 30rpx;
+    background: var(--cyber-bg);
+    min-height: 100vh;
+    color: var(--cyber-text) !important;
+    position: relative;
+    overflow: hidden;
+    box-sizing: border-box;
+}
+
+/* 恢复网格背景 */
+.cfss-container::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-image: 
+      linear-gradient(rgba(0, 243, 255, 0.05) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(0, 243, 255, 0.05) 1px, transparent 1px);
+    background-size: 40rpx 40rpx;
+    pointer-events: none;
+    opacity: 0.15;
+    z-index: 0;
+}
+
+/* ====== 统计卡片 ====== */
+.tongji-card {
+    background: rgba(255, 0, 102, 0.3); /* 🔴 调淡为30%透明度 */
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid var(--cyber-border);
+    box-shadow: 
+      0 0 20rpx rgba(255, 0, 102, 0.2),
+      inset 0 0 10rpx rgba(0, 243, 255, 0.05);
+    position: relative;
+    overflow: hidden;
+    z-index: 1;
+}
+
+.tongji-title {
+    color: var(--cyber-blue);
+    font-size: 34rpx;
+    font-weight: bold;
+    margin-bottom: 30rpx;
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+    letter-spacing: 2rpx;
+}
+
+.tongji-content {
+    display: flex;
+    justify-content: space-between;
+}
+
+.tongji-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    flex: 1;
+}
+
+.tongji-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    margin-bottom: 15rpx;
+    opacity: 0.9;
+}
+
+.tongji-value {
+    color: var(--cyber-text) !important;
+    font-size: 44rpx;
+    font-weight: bold;
+    text-shadow: 0 0 8rpx currentColor;
+}
+
+.daichuli-value {
+    color: var(--cyber-red) !important;
+    text-shadow: 0 0 8rpx rgba(255, 0, 102, 0.3);
+}
+
+.yichuli-value {
+    color: var(--cyber-green) !important;
+    text-shadow: 0 0 8rpx rgba(0, 255, 157, 0.3);
+}
+
+/* ====== 类型切换 ====== */
+.leixing-qiehuan {
+    display: flex;
+    background: rgba(255, 0, 102, 0.3); /* 🔴 调淡为30%透明度 */
+    border-radius: 16rpx;
+    padding: 10rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid var(--cyber-border);
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.2);
+    z-index: 1;
+}
+
+.leixing-item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 25rpx 0;
+    border-radius: 12rpx;
+    transition: all 0.3s;
+}
+
+.leixing-item:active {
+    transform: scale(0.98);
+}
+
+.leixing-active {
+    background: linear-gradient(135deg, rgba(0, 243, 255, 0.15), rgba(157, 0, 255, 0.15));
+    box-shadow: 0 0 15rpx rgba(0, 243, 255, 0.2);
+}
+
+.leixing-text {
+    font-size: 28rpx;
+    font-weight: bold;
+    margin-bottom: 8rpx;
+    color: var(--cyber-text-light) !important;
+}
+
+.leixing-active .leixing-text {
+    color: var(--cyber-text) !important;
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+}
+
+.leixing-count {
+    font-size: 24rpx;
+    color: var(--cyber-text-lighter) !important;
+    opacity: 0.9;
+}
+
+.leixing-active .leixing-count {
+    color: rgba(255, 255, 255, 0.9) !important;
+}
+
+/* ====== 处罚列表 ====== */
+.chufa-list {
+    margin-bottom: 0;
+    padding-bottom: 30rpx;
+    z-index: 1;
+}
+
+/* 加载动画 */
+.jiazai-zhong {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 60rpx 0;
+    color: var(--cyber-blue);
+}
+
+.loading-animation {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 20rpx;
+}
+
+.loading-dot {
+    width: 20rpx;
+    height: 20rpx;
+    border-radius: 50%;
+    background-color: var(--cyber-blue);
+    margin: 0 10rpx;
+    animation: pulse 1.5s infinite ease-in-out;
+}
+
+.loading-dot:nth-child(2) {
+    animation-delay: 0.2s;
+}
+
+.loading-dot:nth-child(3) {
+    animation-delay: 0.4s;
+}
+
+@keyframes pulse {
+    0%, 100% { 
+        transform: scale(0.8);
+        opacity: 0.5;
+    }
+    50% { 
+        transform: scale(1.2);
+        opacity: 1;
+    }
+}
+
+/* 🔴【关键：处罚卡片背景改为淡灰色】 */
+.chufa-card {
+    background: rgba(50, 50, 65, 0.8); /* 🔴 淡灰色卡片，半透明 */
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid var(--cyber-border);
+    position: relative;
+    overflow: hidden;
+    transition: all 0.3s;
+    z-index: 1;
+}
+
+.chufa-card:active {
+    transform: translateY(-4rpx);
+    box-shadow: 
+      0 10rpx 30rpx rgba(0, 0, 0, 0.3),
+      0 0 25rpx var(--cyber-glow);
+}
+
+.card-border {
+    position: absolute;
+    top: -1px;
+    left: -1px;
+    right: -1px;
+    bottom: -1px;
+    border-radius: 21rpx;
+    background: linear-gradient(45deg, rgba(255, 0, 255, 0.3), rgba(0, 243, 255, 0.3), rgba(255, 0, 255, 0.3), rgba(0, 243, 255, 0.3));
+    z-index: -1;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+}
+
+.chufa-card:active .card-border {
+    opacity: 0.3;
+}
+
+.card-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 25rpx;
+}
+
+/* 🔴【时间必须显示】 */
+.shijian {
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    font-family: 'Courier New', monospace;
+    letter-spacing: 1rpx;
+    opacity: 0.9;
+}
+
+/* 🔴【状态标签 - 必须显示出来】 */
+.zhuangtai-badge {
+    padding: 8rpx 25rpx;
+    border-radius: 20rpx;
+    font-size: 24rpx;
+    font-weight: bold;
+    text-transform: uppercase;
+    letter-spacing: 2rpx;
+    border: 1rpx solid;
+    box-shadow: 0 0 8rpx;
+    color: #ffffff !important;
+}
+
+.zhuangtai-daichuli {
+    background: rgba(255, 0, 102, 0.2);
+    border-color: var(--cyber-red);
+    box-shadow: 0 0 8rpx rgba(255, 0, 102, 0.2);
+}
+
+.zhuangtai-yichufa {
+    background: rgba(0, 255, 157, 0.2);
+    border-color: var(--cyber-green);
+    box-shadow: 0 0 8rpx rgba(0, 255, 157, 0.2);
+}
+
+.zhuangtai-yibohui {
+    background: rgba(102, 102, 102, 0.2);
+    border-color: #666;
+    box-shadow: 0 0 8rpx rgba(102, 102, 102, 0.2);
+}
+
+.zhuangtai-shensuzhong {
+    background: rgba(255, 165, 0, 0.2);
+    border-color: #FFA500;
+    box-shadow: 0 0 8rpx rgba(255, 165, 0, 0.2);
+}
+
+.zhuangtai-weizhi {
+    background: rgba(128, 0, 255, 0.2); /* 未知状态：紫色 */
+    border-color: rgba(128, 0, 255, 0.5);
+    box-shadow: 0 0 8rpx rgba(128, 0, 255, 0.2);
+}
+
+/* 其他文字内容 */
+.qingqiu-row, .liyou-row, .dingdan-row {
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 20rpx;
+}
+
+.qingqiu-label, .liyou-label, .dingdan-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    font-weight: bold;
+    margin-right: 15rpx;
+    opacity: 0.9;
+    flex-shrink: 0;
+}
+
+.qingqiu-value, .liyou-value, .dingdan-value {
+    color: var(--cyber-text) !important;
+    font-size: 26rpx;
+    flex: 1;
+    word-break: break-all;
+}
+
+.liyou-value {
+    line-height: 1.5;
+}
+
+.dingdan-value {
+    font-family: 'Courier New', monospace;
+    letter-spacing: 1rpx;
+}
+
+/* 加载更多 */
+.jiazai-gengduo {
+    text-align: center;
+    padding: 40rpx 0;
+    color: var(--cyber-blue);
+    position: relative;
+    overflow: hidden;
+}
+
+.scan-line {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, var(--cyber-blue), transparent);
+    animation: scan 2s linear infinite;
+}
+
+@keyframes scan {
+    0% { left: -100%; }
+    100% { left: 100%; }
+}
+
+/* 没有更多数据 */
+.meiyou-gengduo {
+    text-align: center;
+    padding: 40rpx 0;
+    color: var(--cyber-green);
+    font-size: 28rpx;
+    opacity: 0.9;
+}
+
+/* 空状态 */
+.kong-zhuangtai {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 100rpx 40rpx;
+    text-align: center;
+    z-index: 1;
+}
+
+.empty-icon {
+    font-size: 120rpx;
+    color: var(--cyber-blue);
+    margin-bottom: 30rpx;
+    text-shadow: 0 0 15rpx var(--cyber-blue);
+    animation: pulse 2s infinite;
+}
+
+.empty-text {
+    font-size: 34rpx;
+    color: var(--cyber-text) !important;
+    margin-bottom: 15rpx;
+    font-weight: bold;
+}
+
+.empty-subtext {
+    font-size: 28rpx;
+    color: var(--cyber-text-light) !important;
+    opacity: 0.8;
+}
+
+/* ====== 弹窗样式 ====== */
+.xiangqing-modal,
+.shensu-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.modal-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.7);
+}
+
+/* 🔴【关键：弹窗背景改为不透明的淡灰色】 */
+.modal-content {
+    position: relative;
+    background: #3a3a4a; /* 🔴 淡灰色，不透明 */
+    border-radius: 30rpx;
+    width: 90%;
+    max-height: 80vh;
+    display: flex;
+    flex-direction: column;
+    border: 1rpx solid var(--cyber-border);
+    box-shadow: 0 0 35rpx rgba(0, 243, 255, 0.3);
+    z-index: 1001;
+    backdrop-filter: blur(0px); /* 去掉模糊效果 */
+}
+
+.small-modal {
+    max-height: 85vh;
+    width: 85%;
+}
+
+.modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 40rpx 30rpx 30rpx 30rpx;
+    border-bottom: 1rpx solid rgba(0, 243, 255, 0.2);
+    flex-shrink: 0;
+}
+
+.modal-title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: var(--cyber-blue);
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+}
+
+.modal-close {
+    width: 60rpx;
+    height: 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 50%;
+    background: rgba(0, 243, 255, 0.1);
+    border: 1rpx solid rgba(0, 243, 255, 0.3);
+}
+
+.modal-close:active {
+    background: rgba(0, 243, 255, 0.2);
+    transform: scale(0.95);
+}
+
+.close-icon {
+    font-size: 40rpx;
+    color: var(--cyber-blue);
+    line-height: 1;
+}
+
+/* 弹窗主体 */
+.modal-body {
+    flex: 1;
+    padding: 30rpx;
+    overflow-y: auto;
+    min-height: 200rpx;
+    box-sizing: border-box;
+}
+
+/* 详情区域 */
+.detail-section {
+    margin-bottom: 40rpx;
+}
+
+.section-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: var(--cyber-blue);
+    margin-bottom: 25rpx;
+    padding-bottom: 15rpx;
+    border-bottom: 1rpx solid rgba(0, 243, 255, 0.2);
+    text-shadow: 0 0 8rpx var(--cyber-blue);
+}
+
+.detail-row {
+    display: flex;
+    margin-bottom: 25rpx;
+    align-items: center;
+}
+
+.detail-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 30rpx;
+    min-width: 180rpx;
+    margin-right: 20rpx;
+    line-height: 1.5;
+    opacity: 0.9;
+    flex-shrink: 0;
+}
+
+.detail-value-container {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.detail-value {
+    color: var(--cyber-text) !important;
+    font-size: 30rpx;
+    line-height: 1.5;
+    word-break: break-all;
+    opacity: 0.95;
+    flex: 1;
+    margin-right: 20rpx;
+}
+
+.fuzhi-btn {
+    color: var(--cyber-blue);
+    font-size: 24rpx;
+    padding: 8rpx 20rpx;
+    border-radius: 8rpx;
+    background: rgba(0, 243, 255, 0.1);
+    border: 1rpx solid rgba(0, 243, 255, 0.3);
+    flex-shrink: 0;
+}
+
+.fuzhi-btn:active {
+    background: rgba(0, 243, 255, 0.2);
+}
+
+.full-row {
+    flex-direction: column;
+    align-items: flex-start;
+}
+
+.full-row .detail-label {
+    margin-bottom: 10rpx;
+    min-width: auto;
+}
+
+/* 弹窗内的状态标签 */
+.zhuangtai-badge-inline {
+    padding: 8rpx 24rpx;
+    border-radius: 20rpx;
+    font-size: 26rpx;
+    font-weight: bold;
+    text-transform: uppercase;
+    letter-spacing: 1rpx;
+    border: 1rpx solid;
+    min-width: 120rpx;
+    text-align: center;
+    color: #ffffff !important;
+}
+
+/* 理由方框 */
+.liyou-full {
+    background: rgba(255, 255, 255, 0.05);
+    padding: 25rpx 30rpx;
+    border-radius: 15rpx;
+    line-height: 1.6;
+    border: 1rpx solid rgba(255, 255, 255, 0.1);
+    color: var(--cyber-text) !important;
+    width: 100%;
+    box-sizing: border-box;
+    margin: 0;
+    display: block;
+    opacity: 0.95;
+}
+
+/* 图片网格样式 */
+.tupian-grid {
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: 10rpx;
+    margin-left: -5rpx;
+    margin-right: -5rpx;
+}
+
+.tupian-item {
+    width: calc(33.333% - 10rpx);
+    margin: 5rpx;
+    aspect-ratio: 1;
+    border-radius: 10rpx;
+    overflow: hidden;
+    position: relative;
+    border: 1rpx solid rgba(0, 243, 255, 0.2);
+}
+
+.tupian-image {
+    width: 100%;
+    height: 100%;
+}
+
+/* 弹窗底部按钮 */
+.modal-footer {
+    padding: 30rpx;
+    border-top: 1rpx solid rgba(0, 243, 255, 0.2);
+    flex-shrink: 0;
+}
+
+.btn-group {
+    display: flex;
+    gap: 20rpx;
+}
+
+.btn {
+    flex: 1;
+    height: 90rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 15rpx;
+    font-size: 32rpx;
+    font-weight: bold;
+    transition: all 0.3s;
+    border: 1rpx solid;
+    box-shadow: 0 0 12rpx;
+    color: var(--cyber-text) !important;
+}
+
+.btn:active {
+    transform: scale(0.98);
+}
+
+/* 按钮样式 */
+.btn-kefu {
+    background: rgba(0, 243, 255, 0.1);
+    border-color: var(--cyber-blue);
+    box-shadow: 0 0 12rpx rgba(0, 243, 255, 0.2);
+}
+
+.btn-shensu {
+    background: rgba(255, 165, 0, 0.1);
+    border-color: #FFA500;
+    box-shadow: 0 0 12rpx rgba(255, 165, 0, 0.2);
+}
+
+.btn-shensu-disabled {
+    background: rgba(102, 102, 102, 0.1);
+    border-color: #666;
+    box-shadow: 0 0 12rpx rgba(102, 102, 102, 0.2);
+    opacity: 0.5;
+}
+
+.btn-quxiao {
+    background: rgba(255, 255, 255, 0.07);
+    border-color: rgba(255, 255, 255, 0.2);
+    box-shadow: 0 0 12rpx rgba(255, 255, 255, 0.1);
+}
+
+.btn-queren {
+    background: rgba(0, 255, 157, 0.1);
+    border-color: var(--cyber-green);
+    box-shadow: 0 0 12rpx rgba(0, 255, 157, 0.2);
+}
+
+/* 申诉弹窗输入样式 */
+.input-group {
+    margin-bottom: 40rpx;
+}
+
+.input-label {
+    color: var(--cyber-text-light) !important;
+    font-size: 30rpx;
+    margin-bottom: 15rpx;
+    font-weight: bold;
+}
+
+.shensu-textarea {
+    width: 100%;
+    min-height: 200rpx;
+    padding: 25rpx 30rpx;
+    background: rgba(255, 255, 255, 0.05);
+    border-radius: 15rpx;
+    font-size: 30rpx;
+    line-height: 1.5;
+    color: var(--cyber-text) !important;
+    border: 1rpx solid rgba(0, 243, 255, 0.2);
+    box-sizing: border-box;
+}
+
+.shensu-textarea::placeholder {
+    color: var(--cyber-text-lighter) !important;
+    opacity: 0.6;
+}
+
+.word-count {
+    text-align: right;
+    color: var(--cyber-text-lighter) !important;
+    font-size: 24rpx;
+    margin-top: 10rpx;
+    opacity: 0.7;
+}
+
+.upload-tip {
+    color: var(--cyber-text-lighter) !important;
+    font-size: 26rpx;
+    margin-bottom: 20rpx;
+    opacity: 0.8;
+}
+
+/* 上传图片网格 */
+.tupian-grid-upload {
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: -5rpx;
+    margin-right: -5rpx;
+}
+
+.tupian-item-upload {
+    width: calc(33.333% - 10rpx);
+    margin: 5rpx;
+    aspect-ratio: 1;
+    border-radius: 10rpx;
+    overflow: hidden;
+    position: relative;
+    border: 1rpx solid rgba(0, 243, 255, 0.2);
+}
+
+.tupian-image-upload {
+    width: 100%;
+    height: 100%;
+}
+
+.tupian-delete {
+    position: absolute;
+    top: 5rpx;
+    right: 5rpx;
+    width: 40rpx;
+    height: 40rpx;
+    border-radius: 50%;
+    background: rgba(255, 0, 102, 0.7);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: white;
+    font-size: 30rpx;
+    font-weight: bold;
+}
+
+.tupian-add-btn {
+    width: calc(33.333% - 10rpx);
+    margin: 5rpx;
+    aspect-ratio: 1;
+    border-radius: 10rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border: 2rpx dashed rgba(0, 243, 255, 0.4);
+    color: var(--cyber-blue);
+}
+
+.tupian-add-btn:active {
+    border-color: var(--cyber-blue);
+    background: rgba(0, 243, 255, 0.07);
+}
+
+.add-icon {
+    font-size: 60rpx;
+    margin-bottom: 10rpx;
+}
+
+.add-text {
+    font-size: 24rpx;
+}
+
+/* 上传进度 */
+.upload-progress {
+    margin-top: 30rpx;
+    padding: 25rpx 30rpx;
+    background: rgba(255, 255, 255, 0.05);
+    border-radius: 15rpx;
+    border: 1rpx solid rgba(0, 243, 255, 0.2);
+}
+
+.progress-title {
+    color: var(--cyber-blue);
+    font-size: 28rpx;
+    margin-bottom: 15rpx;
+    font-weight: bold;
+}
+
+.progress-bar {
+    height: 20rpx;
+    background: rgba(255, 255, 255, 0.07);
+    border-radius: 10rpx;
+    overflow: hidden;
+    margin-bottom: 10rpx;
+}
+
+.progress-inner {
+    height: 100%;
+    background: linear-gradient(90deg, var(--cyber-blue), var(--cyber-purple));
+    border-radius: 10rpx;
+    transition: width 0.3s ease;
+}
+
+.progress-text {
+    text-align: center;
+    color: var(--cyber-text-light) !important;
+    font-size: 26rpx;
+    opacity: 0.9;
+}
+
+/* 响应式调整 */
+@media (max-width: 375px) {
+    .tongji-value {
+        font-size: 36rpx;
+    }
+    
+    .shijian,
+    .qingqiu-label,
+    .liyou-label,
+    .dingdan-label {
+        font-size: 24rpx;
+    }
+    
+    .qingqiu-value,
+    .liyou-value,
+    .dingdan-value {
+        font-size: 24rpx;
+    }
+    
+    .modal-content {
+        width: 95%;
+    }
+}
+
+
+/* 🔴【颜色调整】卡片和弹窗背景色稍微调淡一点 */
+:root {
+    --cyber-bg: #2c2c3c;      /* 从#2a2a3a调亮一点 */
+    --cyber-card: #363648;    /* 从#333344调亮一点 */
+}
+
+/* 🔴【卡片背景色调整 - 更淡一点】 */
+.chufa-card {
+    background: rgba(130, 141, 146, 0.8); /* 从rgba(50,50,65,0.8)调亮 */
+}
+
+/* 🔴【弹窗背景色调整 - 更淡一点】 */
+.modal-content {
+    
+    background: #acacda; /* 从#3a3a4a调亮 */
+}
+
+/* 🔴【增加弹窗高度】 */
+.modal-content {
+    max-height: 88vh; /* 从80vh增加 */
+}
+
+.small-modal {
+    max-height: 88vh; /* 从85vh调整 */
+}
+
+/* 🔴【增加弹窗内部滚动区域高度】 */
+/* 修改wxml中对应的style */
+/* 需要将：<scroll-view class="modal-body" scroll-y style="max-height: 500rpx;"> */
+/* 改为：<scroll-view class="modal-body" scroll-y style="max-height: 600rpx;"> */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* pages/penalty/penalty.wxss 中新增样式 */
+
+/* 🔴【关键修改】图片网格和图片样式 */
+.tupian-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 12rpx;
+    margin-top: 10rpx;
+    width: 100%;
+  }
+  
+  .tupian-item {
+    position: relative;
+    width: 100%;
+    aspect-ratio: 1;
+    border-radius: 12rpx;
+    overflow: hidden;
+    border: 1rpx solid rgba(0, 243, 255, 0.3);
+    background-color: rgba(0, 0, 0, 0.2);
+  }
+  
+  .tupian-image {
+    width: 100%;
+    height: 100%;
+    display: block;
+    object-fit: cover;
+  }
+  
+  /* 图片预览遮罩 */
+  .tupian-preview {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.3);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+  }
+  
+  .tupian-item:hover .tupian-preview {
+    opacity: 1;
+  }
+  
+  .preview-text {
+    color: white;
+    font-size: 24rpx;
+    background: rgba(0, 243, 255, 0.7);
+    padding: 8rpx 16rpx;
+    border-radius: 8rpx;
   }
\ No newline at end of file
diff --git a/pages/dsddxq/dsddxq.js b/pages/fighter-order-detail/fighter-order-detail.js
similarity index 96%
rename from pages/dsddxq/dsddxq.js
rename to pages/fighter-order-detail/fighter-order-detail.js
index b81660b..79849ea 100644
--- a/pages/dsddxq/dsddxq.js
+++ b/pages/fighter-order-detail/fighter-order-detail.js
@@ -1,741 +1,741 @@
-// pages/dsddxq/dsddxq.js - 【最终版：提交前公告弹窗 + 修改图片至少保留一张】
-const app = getApp()
-import request from '../../utils/request.js'
-const COS = require('../../utils/cos-wx-sdk-v5.js')
-
-Page({
-  data: {
-    jibenShuju: {
-      dingdan_id: '',
-      tupian: '',
-      jieshao: '',
-      create_time: '',
-      jine: '',
-      nicheng: '',
-      beizhu: '',
-      zhuangtai: 0,
-      fadanpingtai: 0
-    },
-    xiangxiShuju: {
-      shangjia_id: '',
-      shangjia_nicheng: '',
-      shangjia_liuyan: '',
-      tuikuan_liyou: '',
-      chufa_liyou: '',
-      chufa_zhuangtai: 0,
-      chufa_jieguo: '',
-      bohui_liyou: '',
-      dashou_jiaofu: [],
-      dashou_liuyan: '',
-      laoban_id: ''
-    },
-    zhuangtaiYanseMap: {
-      1: '#E8F5E9', 2: '#E3F2FD', 3: '#F3E5F5', 4: '#FFF3E0',
-      5: '#FFEBEE', 6: '#EFEBE9', 7: '#E0F7FA', 8: '#FFF8E1'
-    },
-    zhuangtaiWenziMap: {
-      1: '已下单', 2: '进行中', 3: '已完成', 4: '退款中',
-      5: '已退款', 6: '退款失败', 7: '指定中', 8: '结算中'
-    },
-    isLoading: true,
-    isSubmitting: false,
-    liuyan: '',
-    xuanzhongTupian: [],
-    shangchuanJindu: 0,
-    shangchuanZongshu: 0,
-    jinduWidth: '0%',
-    showWanzhengJieshao: false,
-    wanzhengJieshao: '',
-    showWanzhengBeizhu: false,
-    wanzhengBeizhu: '',
-    ossImageUrl: '',
-    morentouxiang: '',
-    showRefundInfo: false,
-
-    // 修改功能所需字段
-    isModifying: false,
-    originalDashouJiaofu: [],
-    originalDashouLiuyan: '',
-    remainingOriginals: [],
-    modifiedLiuyan: '',
-    deletedImages: [],
-    newImages: [],
-    isConfirming: false,
-    modifyUploadProgress: { total: 0, current: 0, width: '0%' }
-  },
-
-  onLoad(options) {
-    wx.setNavigationBarTitle({ title: '订单详情' })
-    this.initGlobalData()
-    this.jiexiTiaozhuanCanshu(options)
-  },
-  onHide() {
-    const popupComp = this.selectComponent('#popupNotice');
-    if (popupComp && popupComp.cleanup) {
-      popupComp.cleanup();
-    }
-  },
-  
-  onShow() {
-    this.registerNotificationComponent();
-  },
-
-  registerNotificationComponent() {
-    const app = getApp();
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  initGlobalData() {
-    const app = getApp()
-    const ossImageUrl = app.globalData.ossImageUrl || 'https://your-oss-domain.com/'
-    const morentouxiang = app.globalData.morentouxiang || '/images/default-avatar.png'
-    this.setData({ ossImageUrl, morentouxiang })
-  },
-
-  jiexiTiaozhuanCanshu(options) {
-    try {
-      const dingdanDataStr = options.dingdanData || ''
-      if (!dingdanDataStr) {
-        wx.showToast({ title: '订单数据错误', icon: 'none' })
-        setTimeout(() => wx.navigateBack(), 1500)
-        return
-      }
-      const dingdanData = JSON.parse(decodeURIComponent(dingdanDataStr))
-      let tupianUrl = dingdanData.tupian || ''
-      if (!tupianUrl) tupianUrl = this.getTupianUrl()
-      let jine = parseFloat(dingdanData.jine || 0)
-      if (isNaN(jine)) jine = 0
-      const formattedJine = jine.toFixed(2)
-      this.setData({
-        'jibenShuju.dingdan_id': dingdanData.dingdan_id || '',
-        'jibenShuju.tupian': tupianUrl,
-        'jibenShuju.jieshao': dingdanData.jieshao || '',
-        'jibenShuju.create_time': dingdanData.create_time || '',
-        'jibenShuju.jine': formattedJine,
-        'jibenShuju.nicheng': dingdanData.nicheng || '',
-        'jibenShuju.beizhu': dingdanData.beizhu || '',
-        'jibenShuju.zhuangtai': dingdanData.zhuangtai || 0,
-        'jibenShuju.fadanpingtai': dingdanData.fadanpingtai || 0,
-        isLoading: false
-      })
-      this.jiazaiXiangxiShuju(dingdanData.dingdan_id)
-    } catch (error) {
-      console.error('解析订单数据失败:', error)
-      wx.showToast({ title: '数据解析失败', icon: 'none' })
-      setTimeout(() => wx.navigateBack(), 1500)
-    }
-  },
-
-  getTupianUrl() {
-    const cacheTouxiang = wx.getStorageSync('touxiang') || ''
-    let tupianPath = cacheTouxiang || app.globalData.morentouxiang || ''
-    const ossImageUrl = app.globalData.ossImageUrl || ''
-    if (tupianPath && ossImageUrl) {
-      if (tupianPath.startsWith('/')) tupianPath = tupianPath.substring(1)
-      return ossImageUrl + tupianPath
-    }
-    return ''
-  },
-
-  async jiazaiXiangxiShuju(dingdanId) {
-    if (!dingdanId) return
-    wx.showLoading({ title: '加载中...', mask: true })
-    try {
-      const res = await request({
-        url: '/dingdan/dsddxq',
-        method: 'POST',
-        data: { dingdan_id: dingdanId },
-        header: { 'content-type': 'application/json' }
-      })
-      wx.hideLoading()
-      if (res && res.data.code === 0 && res.data.data) {
-        const data = res.data.data
-        let dashouJiaofuList = data.dashou_jiaofu || []
-        dashouJiaofuList = dashouJiaofuList.map(imgUrl => {
-          if (imgUrl && !imgUrl.startsWith('http')) {
-            const ossImageUrl = app.globalData.ossImageUrl || ''
-            if (imgUrl.startsWith('/')) imgUrl = imgUrl.substring(1)
-            return ossImageUrl + imgUrl
-          }
-          return imgUrl
-        })
-        this.setData({
-          'xiangxiShuju.shangjia_id': data.shangjia_id || '',
-          'xiangxiShuju.shangjia_nicheng': data.shangjia_nicheng || '',
-          'xiangxiShuju.shangjia_liuyan': data.shangjia_liuyan || '',
-          'xiangxiShuju.tuikuan_liyou': data.tuikuan_liyou || '',
-          'xiangxiShuju.chufa_liyou': data.chufa_liyou || '',
-          'xiangxiShuju.chufa_zhuangtai': data.chufa_zhuangtai || 0,
-          'xiangxiShuju.chufa_jieguo': data.chufa_jieguo || '',
-          'xiangxiShuju.bohui_liyou': data.bohui_liyou || '',
-          'xiangxiShuju.dashou_jiaofu': dashouJiaofuList,
-          'xiangxiShuju.dashou_liuyan': data.dashou_liuyan || '',
-          'xiangxiShuju.laoban_id': data.laoban_id || '',
-          'jibenShuju.zhuangtai': data.zhuangtai || 0,
-          'jibenShuju.beizhu': data.beizhu || '',
-          'liuyan': data.dashou_liuyan || '',
-          'jibenShuju.fadanpingtai': data.fadanpingtai || 0
-        })
-        const currentStatus = data.zhuangtai || 0
-        const showRefund = [4,5,6].includes(currentStatus)
-        this.setData({ showRefundInfo: showRefund })
-      } else {
-        const errorMsg = res?.data?.msg || '获取订单详情失败'
-        wx.showToast({ title: errorMsg, icon: 'none', duration: 2000 })
-      }
-    } catch (error) {
-      console.error('加载详细数据失败:', error)
-      wx.hideLoading()
-      wx.showToast({ title: '加载数据失败，请重试', icon: 'none', duration: 2000 })
-    }
-  },
-
-  // ========== 原有提交功能（部分修改） ==========
-  xuanzeTupian() {
-    if (this.data.isSubmitting) return
-    const shengyu = 9 - this.data.xuanzhongTupian.length
-    if (shengyu <= 0) {
-      wx.showToast({ title: '最多只能选择9张图片', icon: 'none' })
-      return
-    }
-    wx.chooseImage({
-      count: shengyu,
-      sizeType: ['compressed'],
-      sourceType: ['album', 'camera'],
-      success: (res) => {
-        const newTupian = [...this.data.xuanzhongTupian, ...res.tempFilePaths]
-        this.setData({ xuanzhongTupian: newTupian.slice(0, 9) })
-      }
-    })
-  },
-  shanchuTupian(e) {
-    const index = e.currentTarget.dataset.index
-    const newTupian = [...this.data.xuanzhongTupian]
-    newTupian.splice(index, 1)
-    this.setData({ xuanzhongTupian: newTupian })
-  },
-  yulanTupian(e) {
-    const currentUrl = e.currentTarget.dataset.url
-    const urls = e.currentTarget.dataset.urls || []
-    if (!currentUrl) return
-    wx.previewImage({ current: currentUrl, urls: urls.length > 0 ? urls : [currentUrl] })
-  },
-  getFileExtension(filePath) {
-    const lastDotIndex = filePath.lastIndexOf('.')
-    if (lastDotIndex === -1) return '.jpg'
-    const ext = filePath.substring(lastDotIndex).toLowerCase()
-    const allowedExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
-    return allowedExts.includes(ext) ? ext : '.jpg'
-  },
-  shuruLiuyan(e) {
-    const liuyan = e.detail.value.slice(0, 50)
-    this.setData({ liuyan })
-  },
-  chakanWanzhengJieshao() {
-    this.setData({ showWanzhengJieshao: true, wanzhengJieshao: this.data.jibenShuju.jieshao || '无' })
-  },
-  guanbiWanzhengJieshao() { this.setData({ showWanzhengJieshao: false }) },
-  chakanWanzhengBeizhu() {
-    this.setData({ showWanzhengBeizhu: true, wanzhengBeizhu: this.data.jibenShuju.beizhu || '无' })
-  },
-  guanbiWanzhengBeizhu() { this.setData({ showWanzhengBeizhu: false }) },
-  async fuzhiWenben(e) {
-    const text = e.currentTarget.dataset.text
-    if (!text) return
-    try {
-      await wx.setClipboardData({ data: text })
-      wx.showToast({ title: '复制成功', icon: 'success', duration: 1500 })
-    } catch (error) {
-      console.error('复制失败:', error)
-      wx.showToast({ title: '复制失败', icon: 'none' })
-    }
-  },
-  goToKefu() {
-    const kefuLink = app.globalData.kefuConfig?.link || '';
-    const corpId = app.globalData.kefuConfig?.enterpriseId || '';
-
-    if (!kefuLink || !corpId) {
-        wx.showToast({
-            title: '客服配置未加载',
-            icon: 'none'
-        });
-        return;
-    }
-
-    wx.openCustomerServiceChat({
-        extInfo: { url: kefuLink },
-        corpId: corpId,
-        success: (res) => {
-            console.log('跳转客服成功', res);
-        },
-        fail: (err) => {
-            console.error('跳转客服失败', err);
-            wx.showToast({
-                title: '暂时无法连接客服',
-                icon: 'none'
-            });
-        }
-    });
-  },
-
-  // ===== 联系老板（订单群 groupId 即订单号，与商家端 sjddxq 一致） =====
-  goToChatWithBoss() {
-    const uid = wx.getStorageSync('uid')
-    if (!uid) {
-      wx.showToast({ title: '用户信息缺失', icon: 'none' })
-      return
-    }
-
-    const orderId = this.data.jibenShuju.dingdan_id
-    if (!orderId) {
-      wx.showToast({ title: '订单ID缺失', icon: 'none' })
-      return
-    }
-
-    const targetUserId = 'Ds' + uid
-    const connected = wx.goEasy && wx.goEasy.getConnectionStatus && wx.goEasy.getConnectionStatus() === 'connected'
-    const currentUserId = wx.goEasy?.im?.userId
-    if (!connected || currentUserId !== targetUserId) {
-      if (app.ensureConnection) app.ensureConnection()
-      wx.showToast({ title: '连接中，请稍后再试', icon: 'none' })
-      return
-    }
-
-    const orderIdStr = String(orderId)
-    const groupName = (this.data.jibenShuju.nicheng || '订单') + '的订单群'
-    const isCross = this.data.jibenShuju.fadanpingtai || 0
-
-    wx.goEasy.im.subscribeGroup({
-      groupIds: [orderIdStr],
-      onSuccess: () => {
-        const param = {
-          groupId: orderIdStr,
-          orderId: orderIdStr,
-          groupName,
-          groupAvatar: '',
-          isCross,
-        }
-        wx.navigateTo({
-          url: '/pages/qunliaotian/qunliaotian?data=' + encodeURIComponent(JSON.stringify(param)),
-        })
-      },
-      onFailed: (err) => {
-        console.error('订阅群组失败', err)
-        wx.showToast({ title: '连接群聊失败', icon: 'none' })
-      },
-    })
-  },
-
-  async getCOSZhengshu() {
-    try {
-      const res = await request({
-        url: '/dingdan/dsscpz',
-        method: 'POST',
-        data: { dingdan_id: this.data.jibenShuju.dingdan_id }
-      })
-      if (res && res.data.code === 0 && res.data.data) return res.data.data
-      else throw new Error(res?.data?.msg || '获取上传凭证失败')
-    } catch (error) {
-      console.error('获取COS凭证失败:', error)
-      throw error
-    }
-  },
-
-  initCOSClient(tokenData) {
-    const credentials = tokenData.credentials || tokenData
-    const bucket = tokenData.bucket || 'julebu-1361527063'
-    const region = tokenData.region || 'ap-shanghai'
-    const cos = new COS({
-      SimpleUploadMethod: 'putObject',
-      getAuthorization: async (options, callback) => {
-        const authParams = {
-          TmpSecretId: credentials.tmpSecretId,
-          TmpSecretKey: credentials.tmpSecretKey,
-          SecurityToken: credentials.sessionToken || '',
-          StartTime: tokenData.startTime || Math.floor(Date.now() / 1000),
-          ExpiredTime: tokenData.expiredTime || (Math.floor(Date.now() / 1000) + 7200)
-        }
-        callback(authParams)
-      }
-    })
-    return { cos, bucket, region }
-  },
-
-  async shangchuanDanZhangTupian(filePath, cosKey, index, cosInstance, bucket, region) {
-    return new Promise((resolve) => {
-      const timeoutId = setTimeout(() => resolve({ status: 'optimistic_success', key: cosKey }), 2000)
-      cosInstance.uploadFile({
-        Bucket: bucket,
-        Region: region,
-        Key: cosKey,
-        FilePath: filePath,
-        onProgress: (progressInfo) => {
-          const percent = Math.round(progressInfo.percent * 100)
-          if (percent === 100) {
-            clearTimeout(timeoutId)
-            resolve({ status: 'optimistic_success', key: cosKey })
-          }
-        }
-      })
-    })
-  },
-
-  async piliangShangchuanTupian() {
-    const total = this.data.xuanzhongTupian.length
-    this.setData({ shangchuanZongshu: total, shangchuanJindu: 0, jinduWidth: '0%' })
-    wx.showLoading({ title: '正在准备...', mask: true })
-    const preGeneratedUrls = []
-    for (let i = 0; i < total; i++) {
-      const timestamp = Date.now() + i
-      const random = Math.floor(Math.random() * 10000)
-      const fileExt = this.getFileExtension(this.data.xuanzhongTupian[i])
-      const fileName = `${timestamp}_${random}${fileExt}`
-      const cosKey = `order/${this.data.jibenShuju.dingdan_id}/${fileName}`
-      preGeneratedUrls.push(cosKey)
-    }
-    let cosClient, bucket, region
-    try {
-      const tokenData = await this.getCOSZhengshu()
-      const { cos, bucket: cosBucket, region: cosRegion } = this.initCOSClient(tokenData)
-      cosClient = cos
-      bucket = cosBucket
-      region = cosRegion
-    } catch (error) {
-      wx.hideLoading()
-      wx.showToast({ title: '上传初始化失败', icon: 'none' })
-      return []
-    }
-    const uploadTasks = []
-    for (let i = 0; i < total; i++) {
-      const task = this.shangchuanDanZhangTupian(
-        this.data.xuanzhongTupian[i],
-        preGeneratedUrls[i],
-        i,
-        cosClient,
-        bucket,
-        region
-      ).then((result) => {
-        const currentDone = i + 1
-        const jinduPercent = ((currentDone / total) * 100).toFixed(0)
-        this.setData({ shangchuanJindu: currentDone, jinduWidth: `${jinduPercent}%` })
-        return result
-      })
-      uploadTasks.push(task)
-    }
-    wx.showLoading({ title: `上传中...`, mask: true })
-    await Promise.all(uploadTasks)
-    wx.hideLoading()
-    return preGeneratedUrls
-  },
-
-  tijiaoDingdan() {
-    this.showAnnouncementAndConfirm()
-  },
-
-  async showAnnouncementAndConfirm() {
-    try {
-      const res = await request({
-        url: '/peizhi/tanchuang',
-        method: 'POST',
-        data: { pageKey: 'dsddxq' }
-      })
-      if (res.statusCode !== 200 || res.data.code !== 0) {
-        this.showOriginalConfirmAndSubmit()
-        return
-      }
-      const { popups = [], serverTime } = res.data.data
-      if (!popups.length) {
-        this.showOriginalConfirmAndSubmit()
-        return
-      }
-      const popup = popups[0]
-      const popupComp = this.selectComponent('#popupNotice')
-      if (!popupComp) {
-        console.error('未找到弹窗组件 #popupNotice')
-        this.showOriginalConfirmAndSubmit()
-        return
-      }
-      const showData = {
-        popupId: popup.popup_id,
-        title: popup.title || '',
-        duration: popup.duration || 0,
-        images: popup.images || [],
-        showMuteCheckbox: false,
-        serverTime: serverTime
-      }
-      popupComp.show(showData, (result) => {
-        this.showOriginalConfirmAndSubmit()
-      })
-    } catch (error) {
-      console.error('获取公告配置失败', error)
-      this.showOriginalConfirmAndSubmit()
-    }
-  },
-
-  showOriginalConfirmAndSubmit() {
-    if (this.data.isSubmitting) {
-      wx.showToast({ title: '正在提交中', icon: 'none' })
-      return
-    }
-    if (this.data.jibenShuju.zhuangtai !== 2) {
-      wx.showToast({ title: '订单状态不可提交', icon: 'none' })
-      return
-    }
-    if (this.data.xuanzhongTupian.length === 0) {
-      wx.showToast({ title: '请至少上传一张图片', icon: 'none' })
-      return
-    }
-    wx.showModal({
-      title: '⚠️ 提交确认',
-      content: '在提交订单之前，请确保您已在打手端页面认真阅读打手规则。如有漏交图片，订单被退款，概不申诉。',
-      confirmText: '我已阅读',
-      cancelText: '我再想想',
-      success: (res) => {
-        if (res.confirm) this._doSubmit()
-      },
-      fail: (err) => {
-        console.error('弹窗失败', err)
-        wx.showToast({ title: '系统异常，请重试', icon: 'none' })
-      }
-    })
-  },
-
-  async _doSubmit() {
-    this.setData({ isSubmitting: true })
-    wx.showLoading({ title: '开始提交...', mask: true })
-    try {
-      const tupianUrls = await this.piliangShangchuanTupian()
-      if (!tupianUrls || tupianUrls.length === 0) throw new Error('无法生成上传路径')
-      wx.showLoading({ title: '提交订单数据...', mask: true })
-      const res = await request({
-        url: '/dingdan/dstijiao',
-        method: 'POST',
-        data: {
-          dingdan_id: this.data.jibenShuju.dingdan_id,
-          liuyan: this.data.liuyan || '',
-          jiaofu_tupian_urls: tupianUrls
-        },
-        header: { 'content-type': 'application/json' }
-      })
-      wx.hideLoading()
-      this.setData({ isSubmitting: false })
-      if (res && res.data.code === 0) {
-        const ossImageUrl = app.globalData.ossImageUrl || ''
-        const fullUrls = tupianUrls.map(url => {
-          if (url && !url.startsWith('http')) {
-            if (url.startsWith('/')) url = url.substring(1)
-            return ossImageUrl + url
-          }
-          return url
-        })
-        this.setData({
-          'jibenShuju.zhuangtai': 8,
-          'xiangxiShuju.dashou_liuyan': this.data.liuyan || '',
-          'xiangxiShuju.dashou_jiaofu': fullUrls,
-          xuanzhongTupian: [],
-          liuyan: '',
-          shangchuanJindu: 0,
-          shangchuanZongshu: 0,
-          jinduWidth: '0%',
-        })
-        if (app.globalData.dashouzhuangtai != 1) app.globalData.dashouzhuangtai = 1
-        wx.showToast({ title: '提交成功！', icon: 'success', duration: 2000 })
-        setTimeout(() => wx.navigateBack(), 1500)
-      } else {
-        const errorMsg = res?.data?.msg || '提交失败'
-        wx.showToast({ title: errorMsg, icon: 'none' })
-      }
-    } catch (error) {
-      console.error('提交失败:', error)
-      wx.hideLoading()
-      this.setData({ isSubmitting: false })
-      wx.showToast({ title: error.message || '提交失败', icon: 'none' })
-    }
-  },
-
-  // ========== 修改功能（增加最少一张图片校验） ==========
-  extractRelativePath(fullUrl) {
-    const ossImageUrl = this.data.ossImageUrl
-    if (fullUrl.startsWith(ossImageUrl)) return fullUrl.substring(ossImageUrl.length)
-    return fullUrl
-  },
-  enterModify() {
-    const { dashou_jiaofu, dashou_liuyan } = this.data.xiangxiShuju
-    this.setData({
-      isModifying: true,
-      originalDashouJiaofu: dashou_jiaofu.slice(),
-      remainingOriginals: dashou_jiaofu.slice(),
-      originalDashouLiuyan: dashou_liuyan || '',
-      modifiedLiuyan: dashou_liuyan || '',
-      deletedImages: [],
-      newImages: []
-    })
-  },
-  cancelModify() {
-    this.setData({
-      isModifying: false,
-      originalDashouJiaofu: [],
-      remainingOriginals: [],
-      originalDashouLiuyan: '',
-      modifiedLiuyan: '',
-      deletedImages: [],
-      newImages: []
-    })
-  },
-  handleDeleteImage(e) {
-    const fullUrl = e.currentTarget.dataset.url
-    const { originalDashouJiaofu, remainingOriginals, deletedImages, newImages } = this.data
-    if (originalDashouJiaofu.includes(fullUrl)) {
-      const newRemaining = remainingOriginals.filter(url => url !== fullUrl)
-      this.setData({
-        remainingOriginals: newRemaining,
-        deletedImages: [...deletedImages, fullUrl]
-      })
-    } else {
-      const index = newImages.indexOf(fullUrl)
-      if (index > -1) {
-        const newImagesCopy = [...newImages]
-        newImagesCopy.splice(index, 1)
-        this.setData({ newImages: newImagesCopy })
-      }
-    }
-  },
-  handleAddImage() {
-    if (this.data.isConfirming) return
-    const currentCount = this.getCurrentImageCount()
-    const maxCount = 9 - currentCount
-    if (maxCount <= 0) {
-      wx.showToast({ title: '最多9张图片', icon: 'none' })
-      return
-    }
-    wx.chooseImage({
-      count: maxCount,
-      sizeType: ['compressed'],
-      sourceType: ['album', 'camera'],
-      success: (res) => {
-        const newImages = [...this.data.newImages, ...res.tempFilePaths]
-        this.setData({ newImages: newImages.slice(0, 9) })
-      }
-    })
-  },
-  getCurrentImageCount() {
-    const { remainingOriginals, newImages } = this.data
-    return remainingOriginals.length + newImages.length
-  },
-  onModifyLiuyanInput(e) {
-    this.setData({ modifiedLiuyan: e.detail.value.slice(0, 50) })
-  },
-
-  async confirmModify() {
-    if (this.data.isConfirming) return
-    const { dingdan_id } = this.data.jibenShuju
-    const { remainingOriginals, deletedImages, newImages, modifiedLiuyan, originalDashouLiuyan } = this.data
-    const hasLiuyanChange = modifiedLiuyan !== originalDashouLiuyan
-    const hasDelete = deletedImages.length > 0
-    const hasAdd = newImages.length > 0
-
-    if (!hasLiuyanChange && !hasDelete && !hasAdd) {
-      wx.showToast({ title: '没有修改内容', icon: 'none' })
-      return
-    }
-
-    const finalImageCount = remainingOriginals.length + newImages.length
-    if (finalImageCount === 0) {
-      wx.showToast({ title: '至少保留一张图片', icon: 'none' })
-      return
-    }
-
-    this.setData({ isConfirming: true })
-    wx.showLoading({ title: '提交修改...', mask: true })
-    try {
-      const tokenData = await this.getCOSZhengshu()
-      const { cos, bucket, region } = this.initCOSClient(tokenData)
-
-      let newImageRelativePaths = []
-      if (hasAdd) {
-        const total = newImages.length
-        this.setData({ 'modifyUploadProgress.total': total, 'modifyUploadProgress.current': 0, 'modifyUploadProgress.width': '0%' })
-        const preGeneratedKeys = []
-        for (let i = 0; i < total; i++) {
-          const timestamp = Date.now() + i
-          const random = Math.floor(Math.random() * 10000)
-          const fileExt = this.getFileExtension(newImages[i])
-          const fileName = `${timestamp}_${random}${fileExt}`
-          const cosKey = `order/${this.data.jibenShuju.dingdan_id}/${fileName}`
-          preGeneratedKeys.push(cosKey)
-        }
-        const uploadTasks = []
-        for (let i = 0; i < total; i++) {
-          const task = this.shangchuanDanZhangTupian(
-            newImages[i],
-            preGeneratedKeys[i],
-            i,
-            cos,
-            bucket,
-            region
-          ).then((result) => {
-            const currentDone = i + 1
-            const jinduPercent = ((currentDone / total) * 100).toFixed(0)
-            this.setData({
-              'modifyUploadProgress.current': currentDone,
-              'modifyUploadProgress.width': `${jinduPercent}%`
-            })
-            return result.key
-          })
-          uploadTasks.push(task)
-        }
-        wx.showLoading({ title: `上传中...`, mask: true })
-        newImageRelativePaths = await Promise.all(uploadTasks)
-        wx.hideLoading()
-        this.setData({ 'modifyUploadProgress.total': 0, 'modifyUploadProgress.current': 0, 'modifyUploadProgress.width': '0%' })
-      }
-
-      const deletedRelativePaths = deletedImages.map(fullUrl => this.extractRelativePath(fullUrl))
-
-      const res = await request({
-        url: '/dingdan/dsxiugaidd',
-        method: 'POST',
-        data: {
-          dingdan_id,
-          liuyan: modifiedLiuyan,
-          deleted_images: deletedRelativePaths,
-          new_images: newImageRelativePaths
-        },
-        header: { 'content-type': 'application/json' }
-      })
-      wx.hideLoading()
-      this.setData({ isConfirming: false })
-      if (res && res.data.code === 0) {
-        const ossImageUrl = this.data.ossImageUrl
-        const newFullUrls = newImageRelativePaths.map(rel => ossImageUrl + rel)
-        const newDashouJiaofu = [...remainingOriginals, ...newFullUrls]
-        this.setData({
-          'xiangxiShuju.dashou_jiaofu': newDashouJiaofu,
-          'xiangxiShuju.dashou_liuyan': modifiedLiuyan,
-          isModifying: false,
-          originalDashouJiaofu: [],
-          remainingOriginals: [],
-          originalDashouLiuyan: '',
-          deletedImages: [],
-          newImages: [],
-          modifiedLiuyan: ''
-        })
-        wx.showToast({ title: '修改成功', icon: 'success' })
-      } else {
-        const errorMsg = res?.data?.msg || '修改失败'
-        wx.showToast({ title: errorMsg, icon: 'none' })
-      }
-    } catch (error) {
-      console.error('修改失败:', error)
-      wx.hideLoading()
-      this.setData({ isConfirming: false })
-      wx.showToast({ title: error.message || '修改失败', icon: 'none' })
-    }
-  }
+// pages/fighter-order-detail/fighter-order-detail.js - 【最终版：提交前公告弹窗 + 修改图片至少保留一张】
+const app = getApp()
+import request from '../../utils/request.js'
+const COS = require('../../utils/cos-wx-sdk-v5.js')
+
+Page({
+  data: {
+    jibenShuju: {
+      dingdan_id: '',
+      tupian: '',
+      jieshao: '',
+      create_time: '',
+      jine: '',
+      nicheng: '',
+      beizhu: '',
+      zhuangtai: 0,
+      fadanpingtai: 0
+    },
+    xiangxiShuju: {
+      shangjia_id: '',
+      shangjia_nicheng: '',
+      shangjia_liuyan: '',
+      tuikuan_liyou: '',
+      chufa_liyou: '',
+      chufa_zhuangtai: 0,
+      chufa_jieguo: '',
+      bohui_liyou: '',
+      dashou_jiaofu: [],
+      dashou_liuyan: '',
+      laoban_id: ''
+    },
+    zhuangtaiYanseMap: {
+      1: '#E8F5E9', 2: '#E3F2FD', 3: '#F3E5F5', 4: '#FFF3E0',
+      5: '#FFEBEE', 6: '#EFEBE9', 7: '#E0F7FA', 8: '#FFF8E1'
+    },
+    zhuangtaiWenziMap: {
+      1: '已下单', 2: '进行中', 3: '已完成', 4: '退款中',
+      5: '已退款', 6: '退款失败', 7: '指定中', 8: '结算中'
+    },
+    isLoading: true,
+    isSubmitting: false,
+    liuyan: '',
+    xuanzhongTupian: [],
+    shangchuanJindu: 0,
+    shangchuanZongshu: 0,
+    jinduWidth: '0%',
+    showWanzhengJieshao: false,
+    wanzhengJieshao: '',
+    showWanzhengBeizhu: false,
+    wanzhengBeizhu: '',
+    ossImageUrl: '',
+    morentouxiang: '',
+    showRefundInfo: false,
+
+    // 修改功能所需字段
+    isModifying: false,
+    originalDashouJiaofu: [],
+    originalDashouLiuyan: '',
+    remainingOriginals: [],
+    modifiedLiuyan: '',
+    deletedImages: [],
+    newImages: [],
+    isConfirming: false,
+    modifyUploadProgress: { total: 0, current: 0, width: '0%' }
+  },
+
+  onLoad(options) {
+    wx.setNavigationBarTitle({ title: '订单详情' })
+    this.initGlobalData()
+    this.jiexiTiaozhuanCanshu(options)
+  },
+  onHide() {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+      popupComp.cleanup();
+    }
+  },
+  
+  onShow() {
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  initGlobalData() {
+    const app = getApp()
+    const ossImageUrl = app.globalData.ossImageUrl || 'https://your-oss-domain.com/'
+    const morentouxiang = app.globalData.morentouxiang || '/images/default-avatar.png'
+    this.setData({ ossImageUrl, morentouxiang })
+  },
+
+  jiexiTiaozhuanCanshu(options) {
+    try {
+      const dingdanDataStr = options.dingdanData || ''
+      if (!dingdanDataStr) {
+        wx.showToast({ title: '订单数据错误', icon: 'none' })
+        setTimeout(() => wx.navigateBack(), 1500)
+        return
+      }
+      const dingdanData = JSON.parse(decodeURIComponent(dingdanDataStr))
+      let tupianUrl = dingdanData.tupian || ''
+      if (!tupianUrl) tupianUrl = this.getTupianUrl()
+      let jine = parseFloat(dingdanData.jine || 0)
+      if (isNaN(jine)) jine = 0
+      const formattedJine = jine.toFixed(2)
+      this.setData({
+        'jibenShuju.dingdan_id': dingdanData.dingdan_id || '',
+        'jibenShuju.tupian': tupianUrl,
+        'jibenShuju.jieshao': dingdanData.jieshao || '',
+        'jibenShuju.create_time': dingdanData.create_time || '',
+        'jibenShuju.jine': formattedJine,
+        'jibenShuju.nicheng': dingdanData.nicheng || '',
+        'jibenShuju.beizhu': dingdanData.beizhu || '',
+        'jibenShuju.zhuangtai': dingdanData.zhuangtai || 0,
+        'jibenShuju.fadanpingtai': dingdanData.fadanpingtai || 0,
+        isLoading: false
+      })
+      this.jiazaiXiangxiShuju(dingdanData.dingdan_id)
+    } catch (error) {
+      console.error('解析订单数据失败:', error)
+      wx.showToast({ title: '数据解析失败', icon: 'none' })
+      setTimeout(() => wx.navigateBack(), 1500)
+    }
+  },
+
+  getTupianUrl() {
+    const cacheTouxiang = wx.getStorageSync('touxiang') || ''
+    let tupianPath = cacheTouxiang || app.globalData.morentouxiang || ''
+    const ossImageUrl = app.globalData.ossImageUrl || ''
+    if (tupianPath && ossImageUrl) {
+      if (tupianPath.startsWith('/')) tupianPath = tupianPath.substring(1)
+      return ossImageUrl + tupianPath
+    }
+    return ''
+  },
+
+  async jiazaiXiangxiShuju(dingdanId) {
+    if (!dingdanId) return
+    wx.showLoading({ title: '加载中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/dsddxq',
+        method: 'POST',
+        data: { dingdan_id: dingdanId },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      if (res && res.data.code === 0 && res.data.data) {
+        const data = res.data.data
+        let dashouJiaofuList = data.dashou_jiaofu || []
+        dashouJiaofuList = dashouJiaofuList.map(imgUrl => {
+          if (imgUrl && !imgUrl.startsWith('http')) {
+            const ossImageUrl = app.globalData.ossImageUrl || ''
+            if (imgUrl.startsWith('/')) imgUrl = imgUrl.substring(1)
+            return ossImageUrl + imgUrl
+          }
+          return imgUrl
+        })
+        this.setData({
+          'xiangxiShuju.shangjia_id': data.shangjia_id || '',
+          'xiangxiShuju.shangjia_nicheng': data.shangjia_nicheng || '',
+          'xiangxiShuju.shangjia_liuyan': data.shangjia_liuyan || '',
+          'xiangxiShuju.tuikuan_liyou': data.tuikuan_liyou || '',
+          'xiangxiShuju.chufa_liyou': data.chufa_liyou || '',
+          'xiangxiShuju.chufa_zhuangtai': data.chufa_zhuangtai || 0,
+          'xiangxiShuju.chufa_jieguo': data.chufa_jieguo || '',
+          'xiangxiShuju.bohui_liyou': data.bohui_liyou || '',
+          'xiangxiShuju.dashou_jiaofu': dashouJiaofuList,
+          'xiangxiShuju.dashou_liuyan': data.dashou_liuyan || '',
+          'xiangxiShuju.laoban_id': data.laoban_id || '',
+          'jibenShuju.zhuangtai': data.zhuangtai || 0,
+          'jibenShuju.beizhu': data.beizhu || '',
+          'liuyan': data.dashou_liuyan || '',
+          'jibenShuju.fadanpingtai': data.fadanpingtai || 0
+        })
+        const currentStatus = data.zhuangtai || 0
+        const showRefund = [4,5,6].includes(currentStatus)
+        this.setData({ showRefundInfo: showRefund })
+      } else {
+        const errorMsg = res?.data?.msg || '获取订单详情失败'
+        wx.showToast({ title: errorMsg, icon: 'none', duration: 2000 })
+      }
+    } catch (error) {
+      console.error('加载详细数据失败:', error)
+      wx.hideLoading()
+      wx.showToast({ title: '加载数据失败，请重试', icon: 'none', duration: 2000 })
+    }
+  },
+
+  // ========== 原有提交功能（部分修改） ==========
+  xuanzeTupian() {
+    if (this.data.isSubmitting) return
+    const shengyu = 9 - this.data.xuanzhongTupian.length
+    if (shengyu <= 0) {
+      wx.showToast({ title: '最多只能选择9张图片', icon: 'none' })
+      return
+    }
+    wx.chooseImage({
+      count: shengyu,
+      sizeType: ['compressed'],
+      sourceType: ['album', 'camera'],
+      success: (res) => {
+        const newTupian = [...this.data.xuanzhongTupian, ...res.tempFilePaths]
+        this.setData({ xuanzhongTupian: newTupian.slice(0, 9) })
+      }
+    })
+  },
+  shanchuTupian(e) {
+    const index = e.currentTarget.dataset.index
+    const newTupian = [...this.data.xuanzhongTupian]
+    newTupian.splice(index, 1)
+    this.setData({ xuanzhongTupian: newTupian })
+  },
+  yulanTupian(e) {
+    const currentUrl = e.currentTarget.dataset.url
+    const urls = e.currentTarget.dataset.urls || []
+    if (!currentUrl) return
+    wx.previewImage({ current: currentUrl, urls: urls.length > 0 ? urls : [currentUrl] })
+  },
+  getFileExtension(filePath) {
+    const lastDotIndex = filePath.lastIndexOf('.')
+    if (lastDotIndex === -1) return '.jpg'
+    const ext = filePath.substring(lastDotIndex).toLowerCase()
+    const allowedExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
+    return allowedExts.includes(ext) ? ext : '.jpg'
+  },
+  shuruLiuyan(e) {
+    const liuyan = e.detail.value.slice(0, 50)
+    this.setData({ liuyan })
+  },
+  chakanWanzhengJieshao() {
+    this.setData({ showWanzhengJieshao: true, wanzhengJieshao: this.data.jibenShuju.jieshao || '无' })
+  },
+  guanbiWanzhengJieshao() { this.setData({ showWanzhengJieshao: false }) },
+  chakanWanzhengBeizhu() {
+    this.setData({ showWanzhengBeizhu: true, wanzhengBeizhu: this.data.jibenShuju.beizhu || '无' })
+  },
+  guanbiWanzhengBeizhu() { this.setData({ showWanzhengBeizhu: false }) },
+  async fuzhiWenben(e) {
+    const text = e.currentTarget.dataset.text
+    if (!text) return
+    try {
+      await wx.setClipboardData({ data: text })
+      wx.showToast({ title: '复制成功', icon: 'success', duration: 1500 })
+    } catch (error) {
+      console.error('复制失败:', error)
+      wx.showToast({ title: '复制失败', icon: 'none' })
+    }
+  },
+  goToKefu() {
+    const kefuLink = app.globalData.kefuConfig?.link || '';
+    const corpId = app.globalData.kefuConfig?.enterpriseId || '';
+
+    if (!kefuLink || !corpId) {
+        wx.showToast({
+            title: '客服配置未加载',
+            icon: 'none'
+        });
+        return;
+    }
+
+    wx.openCustomerServiceChat({
+        extInfo: { url: kefuLink },
+        corpId: corpId,
+        success: (res) => {
+            console.log('跳转客服成功', res);
+        },
+        fail: (err) => {
+            console.error('跳转客服失败', err);
+            wx.showToast({
+                title: '暂时无法连接客服',
+                icon: 'none'
+            });
+        }
+    });
+  },
+
+  // ===== 联系老板（订单群 groupId 即订单号，与商家端 sjddxq 一致） =====
+  goToChatWithBoss() {
+    const uid = wx.getStorageSync('uid')
+    if (!uid) {
+      wx.showToast({ title: '用户信息缺失', icon: 'none' })
+      return
+    }
+
+    const orderId = this.data.jibenShuju.dingdan_id
+    if (!orderId) {
+      wx.showToast({ title: '订单ID缺失', icon: 'none' })
+      return
+    }
+
+    const targetUserId = 'Ds' + uid
+    const connected = wx.goEasy && wx.goEasy.getConnectionStatus && wx.goEasy.getConnectionStatus() === 'connected'
+    const currentUserId = wx.goEasy?.im?.userId
+    if (!connected || currentUserId !== targetUserId) {
+      if (app.ensureConnection) app.ensureConnection()
+      wx.showToast({ title: '连接中，请稍后再试', icon: 'none' })
+      return
+    }
+
+    const orderIdStr = String(orderId)
+    const groupName = (this.data.jibenShuju.nicheng || '订单') + '的订单群'
+    const isCross = this.data.jibenShuju.fadanpingtai || 0
+
+    wx.goEasy.im.subscribeGroup({
+      groupIds: [orderIdStr],
+      onSuccess: () => {
+        const param = {
+          groupId: orderIdStr,
+          orderId: orderIdStr,
+          groupName,
+          groupAvatar: '',
+          isCross,
+        }
+        wx.navigateTo({
+          url: '/pages/group-chat/group-chat?data=' + encodeURIComponent(JSON.stringify(param)),
+        })
+      },
+      onFailed: (err) => {
+        console.error('订阅群组失败', err)
+        wx.showToast({ title: '连接群聊失败', icon: 'none' })
+      },
+    })
+  },
+
+  async getCOSZhengshu() {
+    try {
+      const res = await request({
+        url: '/dingdan/dsscpz',
+        method: 'POST',
+        data: { dingdan_id: this.data.jibenShuju.dingdan_id }
+      })
+      if (res && res.data.code === 0 && res.data.data) return res.data.data
+      else throw new Error(res?.data?.msg || '获取上传凭证失败')
+    } catch (error) {
+      console.error('获取COS凭证失败:', error)
+      throw error
+    }
+  },
+
+  initCOSClient(tokenData) {
+    const credentials = tokenData.credentials || tokenData
+    const bucket = tokenData.bucket || 'julebu-1361527063'
+    const region = tokenData.region || 'ap-shanghai'
+    const cos = new COS({
+      SimpleUploadMethod: 'putObject',
+      getAuthorization: async (options, callback) => {
+        const authParams = {
+          TmpSecretId: credentials.tmpSecretId,
+          TmpSecretKey: credentials.tmpSecretKey,
+          SecurityToken: credentials.sessionToken || '',
+          StartTime: tokenData.startTime || Math.floor(Date.now() / 1000),
+          ExpiredTime: tokenData.expiredTime || (Math.floor(Date.now() / 1000) + 7200)
+        }
+        callback(authParams)
+      }
+    })
+    return { cos, bucket, region }
+  },
+
+  async shangchuanDanZhangTupian(filePath, cosKey, index, cosInstance, bucket, region) {
+    return new Promise((resolve) => {
+      const timeoutId = setTimeout(() => resolve({ status: 'optimistic_success', key: cosKey }), 2000)
+      cosInstance.uploadFile({
+        Bucket: bucket,
+        Region: region,
+        Key: cosKey,
+        FilePath: filePath,
+        onProgress: (progressInfo) => {
+          const percent = Math.round(progressInfo.percent * 100)
+          if (percent === 100) {
+            clearTimeout(timeoutId)
+            resolve({ status: 'optimistic_success', key: cosKey })
+          }
+        }
+      })
+    })
+  },
+
+  async piliangShangchuanTupian() {
+    const total = this.data.xuanzhongTupian.length
+    this.setData({ shangchuanZongshu: total, shangchuanJindu: 0, jinduWidth: '0%' })
+    wx.showLoading({ title: '正在准备...', mask: true })
+    const preGeneratedUrls = []
+    for (let i = 0; i < total; i++) {
+      const timestamp = Date.now() + i
+      const random = Math.floor(Math.random() * 10000)
+      const fileExt = this.getFileExtension(this.data.xuanzhongTupian[i])
+      const fileName = `${timestamp}_${random}${fileExt}`
+      const cosKey = `order/${this.data.jibenShuju.dingdan_id}/${fileName}`
+      preGeneratedUrls.push(cosKey)
+    }
+    let cosClient, bucket, region
+    try {
+      const tokenData = await this.getCOSZhengshu()
+      const { cos, bucket: cosBucket, region: cosRegion } = this.initCOSClient(tokenData)
+      cosClient = cos
+      bucket = cosBucket
+      region = cosRegion
+    } catch (error) {
+      wx.hideLoading()
+      wx.showToast({ title: '上传初始化失败', icon: 'none' })
+      return []
+    }
+    const uploadTasks = []
+    for (let i = 0; i < total; i++) {
+      const task = this.shangchuanDanZhangTupian(
+        this.data.xuanzhongTupian[i],
+        preGeneratedUrls[i],
+        i,
+        cosClient,
+        bucket,
+        region
+      ).then((result) => {
+        const currentDone = i + 1
+        const jinduPercent = ((currentDone / total) * 100).toFixed(0)
+        this.setData({ shangchuanJindu: currentDone, jinduWidth: `${jinduPercent}%` })
+        return result
+      })
+      uploadTasks.push(task)
+    }
+    wx.showLoading({ title: `上传中...`, mask: true })
+    await Promise.all(uploadTasks)
+    wx.hideLoading()
+    return preGeneratedUrls
+  },
+
+  tijiaoDingdan() {
+    this.showAnnouncementAndConfirm()
+  },
+
+  async showAnnouncementAndConfirm() {
+    try {
+      const res = await request({
+        url: '/peizhi/tanchuang',
+        method: 'POST',
+        data: { pageKey: 'dsddxq' }
+      })
+      if (res.statusCode !== 200 || res.data.code !== 0) {
+        this.showOriginalConfirmAndSubmit()
+        return
+      }
+      const { popups = [], serverTime } = res.data.data
+      if (!popups.length) {
+        this.showOriginalConfirmAndSubmit()
+        return
+      }
+      const popup = popups[0]
+      const popupComp = this.selectComponent('#popupNotice')
+      if (!popupComp) {
+        console.error('未找到弹窗组件 #popupNotice')
+        this.showOriginalConfirmAndSubmit()
+        return
+      }
+      const showData = {
+        popupId: popup.popup_id,
+        title: popup.title || '',
+        duration: popup.duration || 0,
+        images: popup.images || [],
+        showMuteCheckbox: false,
+        serverTime: serverTime
+      }
+      popupComp.show(showData, (result) => {
+        this.showOriginalConfirmAndSubmit()
+      })
+    } catch (error) {
+      console.error('获取公告配置失败', error)
+      this.showOriginalConfirmAndSubmit()
+    }
+  },
+
+  showOriginalConfirmAndSubmit() {
+    if (this.data.isSubmitting) {
+      wx.showToast({ title: '正在提交中', icon: 'none' })
+      return
+    }
+    if (this.data.jibenShuju.zhuangtai !== 2) {
+      wx.showToast({ title: '订单状态不可提交', icon: 'none' })
+      return
+    }
+    if (this.data.xuanzhongTupian.length === 0) {
+      wx.showToast({ title: '请至少上传一张图片', icon: 'none' })
+      return
+    }
+    wx.showModal({
+      title: '⚠️ 提交确认',
+      content: '在提交订单之前，请确保您已在打手端页面认真阅读打手规则。如有漏交图片，订单被退款，概不申诉。',
+      confirmText: '我已阅读',
+      cancelText: '我再想想',
+      success: (res) => {
+        if (res.confirm) this._doSubmit()
+      },
+      fail: (err) => {
+        console.error('弹窗失败', err)
+        wx.showToast({ title: '系统异常，请重试', icon: 'none' })
+      }
+    })
+  },
+
+  async _doSubmit() {
+    this.setData({ isSubmitting: true })
+    wx.showLoading({ title: '开始提交...', mask: true })
+    try {
+      const tupianUrls = await this.piliangShangchuanTupian()
+      if (!tupianUrls || tupianUrls.length === 0) throw new Error('无法生成上传路径')
+      wx.showLoading({ title: '提交订单数据...', mask: true })
+      const res = await request({
+        url: '/dingdan/dstijiao',
+        method: 'POST',
+        data: {
+          dingdan_id: this.data.jibenShuju.dingdan_id,
+          liuyan: this.data.liuyan || '',
+          jiaofu_tupian_urls: tupianUrls
+        },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isSubmitting: false })
+      if (res && res.data.code === 0) {
+        const ossImageUrl = app.globalData.ossImageUrl || ''
+        const fullUrls = tupianUrls.map(url => {
+          if (url && !url.startsWith('http')) {
+            if (url.startsWith('/')) url = url.substring(1)
+            return ossImageUrl + url
+          }
+          return url
+        })
+        this.setData({
+          'jibenShuju.zhuangtai': 8,
+          'xiangxiShuju.dashou_liuyan': this.data.liuyan || '',
+          'xiangxiShuju.dashou_jiaofu': fullUrls,
+          xuanzhongTupian: [],
+          liuyan: '',
+          shangchuanJindu: 0,
+          shangchuanZongshu: 0,
+          jinduWidth: '0%',
+        })
+        if (app.globalData.dashouzhuangtai != 1) app.globalData.dashouzhuangtai = 1
+        wx.showToast({ title: '提交成功！', icon: 'success', duration: 2000 })
+        setTimeout(() => wx.navigateBack(), 1500)
+      } else {
+        const errorMsg = res?.data?.msg || '提交失败'
+        wx.showToast({ title: errorMsg, icon: 'none' })
+      }
+    } catch (error) {
+      console.error('提交失败:', error)
+      wx.hideLoading()
+      this.setData({ isSubmitting: false })
+      wx.showToast({ title: error.message || '提交失败', icon: 'none' })
+    }
+  },
+
+  // ========== 修改功能（增加最少一张图片校验） ==========
+  extractRelativePath(fullUrl) {
+    const ossImageUrl = this.data.ossImageUrl
+    if (fullUrl.startsWith(ossImageUrl)) return fullUrl.substring(ossImageUrl.length)
+    return fullUrl
+  },
+  enterModify() {
+    const { dashou_jiaofu, dashou_liuyan } = this.data.xiangxiShuju
+    this.setData({
+      isModifying: true,
+      originalDashouJiaofu: dashou_jiaofu.slice(),
+      remainingOriginals: dashou_jiaofu.slice(),
+      originalDashouLiuyan: dashou_liuyan || '',
+      modifiedLiuyan: dashou_liuyan || '',
+      deletedImages: [],
+      newImages: []
+    })
+  },
+  cancelModify() {
+    this.setData({
+      isModifying: false,
+      originalDashouJiaofu: [],
+      remainingOriginals: [],
+      originalDashouLiuyan: '',
+      modifiedLiuyan: '',
+      deletedImages: [],
+      newImages: []
+    })
+  },
+  handleDeleteImage(e) {
+    const fullUrl = e.currentTarget.dataset.url
+    const { originalDashouJiaofu, remainingOriginals, deletedImages, newImages } = this.data
+    if (originalDashouJiaofu.includes(fullUrl)) {
+      const newRemaining = remainingOriginals.filter(url => url !== fullUrl)
+      this.setData({
+        remainingOriginals: newRemaining,
+        deletedImages: [...deletedImages, fullUrl]
+      })
+    } else {
+      const index = newImages.indexOf(fullUrl)
+      if (index > -1) {
+        const newImagesCopy = [...newImages]
+        newImagesCopy.splice(index, 1)
+        this.setData({ newImages: newImagesCopy })
+      }
+    }
+  },
+  handleAddImage() {
+    if (this.data.isConfirming) return
+    const currentCount = this.getCurrentImageCount()
+    const maxCount = 9 - currentCount
+    if (maxCount <= 0) {
+      wx.showToast({ title: '最多9张图片', icon: 'none' })
+      return
+    }
+    wx.chooseImage({
+      count: maxCount,
+      sizeType: ['compressed'],
+      sourceType: ['album', 'camera'],
+      success: (res) => {
+        const newImages = [...this.data.newImages, ...res.tempFilePaths]
+        this.setData({ newImages: newImages.slice(0, 9) })
+      }
+    })
+  },
+  getCurrentImageCount() {
+    const { remainingOriginals, newImages } = this.data
+    return remainingOriginals.length + newImages.length
+  },
+  onModifyLiuyanInput(e) {
+    this.setData({ modifiedLiuyan: e.detail.value.slice(0, 50) })
+  },
+
+  async confirmModify() {
+    if (this.data.isConfirming) return
+    const { dingdan_id } = this.data.jibenShuju
+    const { remainingOriginals, deletedImages, newImages, modifiedLiuyan, originalDashouLiuyan } = this.data
+    const hasLiuyanChange = modifiedLiuyan !== originalDashouLiuyan
+    const hasDelete = deletedImages.length > 0
+    const hasAdd = newImages.length > 0
+
+    if (!hasLiuyanChange && !hasDelete && !hasAdd) {
+      wx.showToast({ title: '没有修改内容', icon: 'none' })
+      return
+    }
+
+    const finalImageCount = remainingOriginals.length + newImages.length
+    if (finalImageCount === 0) {
+      wx.showToast({ title: '至少保留一张图片', icon: 'none' })
+      return
+    }
+
+    this.setData({ isConfirming: true })
+    wx.showLoading({ title: '提交修改...', mask: true })
+    try {
+      const tokenData = await this.getCOSZhengshu()
+      const { cos, bucket, region } = this.initCOSClient(tokenData)
+
+      let newImageRelativePaths = []
+      if (hasAdd) {
+        const total = newImages.length
+        this.setData({ 'modifyUploadProgress.total': total, 'modifyUploadProgress.current': 0, 'modifyUploadProgress.width': '0%' })
+        const preGeneratedKeys = []
+        for (let i = 0; i < total; i++) {
+          const timestamp = Date.now() + i
+          const random = Math.floor(Math.random() * 10000)
+          const fileExt = this.getFileExtension(newImages[i])
+          const fileName = `${timestamp}_${random}${fileExt}`
+          const cosKey = `order/${this.data.jibenShuju.dingdan_id}/${fileName}`
+          preGeneratedKeys.push(cosKey)
+        }
+        const uploadTasks = []
+        for (let i = 0; i < total; i++) {
+          const task = this.shangchuanDanZhangTupian(
+            newImages[i],
+            preGeneratedKeys[i],
+            i,
+            cos,
+            bucket,
+            region
+          ).then((result) => {
+            const currentDone = i + 1
+            const jinduPercent = ((currentDone / total) * 100).toFixed(0)
+            this.setData({
+              'modifyUploadProgress.current': currentDone,
+              'modifyUploadProgress.width': `${jinduPercent}%`
+            })
+            return result.key
+          })
+          uploadTasks.push(task)
+        }
+        wx.showLoading({ title: `上传中...`, mask: true })
+        newImageRelativePaths = await Promise.all(uploadTasks)
+        wx.hideLoading()
+        this.setData({ 'modifyUploadProgress.total': 0, 'modifyUploadProgress.current': 0, 'modifyUploadProgress.width': '0%' })
+      }
+
+      const deletedRelativePaths = deletedImages.map(fullUrl => this.extractRelativePath(fullUrl))
+
+      const res = await request({
+        url: '/dingdan/dsxiugaidd',
+        method: 'POST',
+        data: {
+          dingdan_id,
+          liuyan: modifiedLiuyan,
+          deleted_images: deletedRelativePaths,
+          new_images: newImageRelativePaths
+        },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isConfirming: false })
+      if (res && res.data.code === 0) {
+        const ossImageUrl = this.data.ossImageUrl
+        const newFullUrls = newImageRelativePaths.map(rel => ossImageUrl + rel)
+        const newDashouJiaofu = [...remainingOriginals, ...newFullUrls]
+        this.setData({
+          'xiangxiShuju.dashou_jiaofu': newDashouJiaofu,
+          'xiangxiShuju.dashou_liuyan': modifiedLiuyan,
+          isModifying: false,
+          originalDashouJiaofu: [],
+          remainingOriginals: [],
+          originalDashouLiuyan: '',
+          deletedImages: [],
+          newImages: [],
+          modifiedLiuyan: ''
+        })
+        wx.showToast({ title: '修改成功', icon: 'success' })
+      } else {
+        const errorMsg = res?.data?.msg || '修改失败'
+        wx.showToast({ title: errorMsg, icon: 'none' })
+      }
+    } catch (error) {
+      console.error('修改失败:', error)
+      wx.hideLoading()
+      this.setData({ isConfirming: false })
+      wx.showToast({ title: error.message || '修改失败', icon: 'none' })
+    }
+  }
 })
\ No newline at end of file
diff --git a/pages/dingdan/dingdan.json b/pages/fighter-order-detail/fighter-order-detail.json
similarity index 100%
rename from pages/dingdan/dingdan.json
rename to pages/fighter-order-detail/fighter-order-detail.json
diff --git a/pages/dsddxq/dsddxq.wxml b/pages/fighter-order-detail/fighter-order-detail.wxml
similarity index 100%
rename from pages/dsddxq/dsddxq.wxml
rename to pages/fighter-order-detail/fighter-order-detail.wxml
diff --git a/pages/dsddxq/dsddxq.wxss b/pages/fighter-order-detail/fighter-order-detail.wxss
similarity index 94%
rename from pages/dsddxq/dsddxq.wxss
rename to pages/fighter-order-detail/fighter-order-detail.wxss
index 7e9a205..a990b50 100644
--- a/pages/dsddxq/dsddxq.wxss
+++ b/pages/fighter-order-detail/fighter-order-detail.wxss
@@ -1,589 +1,589 @@
-/* pages/dsddxq/dsddxq.wxss */
-
-/* 页面基础样式 */
-.dsddxq-page {
-    min-height: 100vh;
-    background-color: #f8f9fa;
-    position: relative;
-    box-sizing: border-box;
-}
-
-/* 加载中状态 */
-.loading-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 60vh;
-}
-
-.loading-spinner {
-    width: 80rpx;
-    height: 80rpx;
-    border: 8rpx solid #e0e0e0;
-    border-top-color: #2196f3;
-    border-radius: 50%;
-    animation: spin 1.2s linear infinite;
-    margin-bottom: 30rpx;
-}
-
-@keyframes spin {
-    from { transform: rotate(0deg); }
-    to { transform: rotate(360deg); }
-}
-
-.loading-text {
-    font-size: 30rpx;
-    color: #666666;
-}
-
-/* 内容区域 */
-.content-container {
-    padding: 25rpx 25rpx 220rpx;  /* 减少底部内边距，避免过多空白 */
-}
-
-/* 商品图片和介绍区域 */
-.shangpin-area {
-    display: flex;
-    background-color: #ffffff;
-    border-radius: 20rpx;
-    padding: 25rpx;
-    margin-bottom: 25rpx;
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06);
-}
-
-.shangpin-image-container {
-    flex-shrink: 0;
-    width: 180rpx;
-    height: 180rpx;
-    margin-right: 25rpx;
-}
-
-.shangpin-image {
-    width: 100%;
-    height: 100%;
-    border-radius: 12rpx;
-    background-color: #f5f5f5;
-}
-
-.shangpin-jieshao {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-}
-
-.jieshao-text {
-    font-size: 28rpx;
-    line-height: 42rpx;
-    color: #333333;
-    font-weight: 400;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 4;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.chakan-wanzheng {
-    margin-top: 10rpx;
-}
-
-.chakan-wanzheng text {
-    font-size: 24rpx;
-    color: #2196f3;
-    text-decoration: underline;
-}
-
-/* 通用区域样式 */
-.info-title {
-    font-size: 32rpx;
-    color: #333333;
-    font-weight: 600;
-    margin-bottom: 20rpx;
-    padding-bottom: 12rpx;
-    border-bottom: 2rpx solid rgba(0, 0, 0, 0.08);
-}
-
-.section-subtitle {
-    font-size: 28rpx;
-    color: #555555;
-    font-weight: 500;
-    display: block;
-    margin: 15rpx 0 10rpx;
-}
-
-/* 订单信息区域 */
-.dingdan-info-area,
-.shangjia-area,
-.tuikuan-area,
-.chufa-area,
-.dashou-jiaofu-area,
-.tijiao-area {
-    background-color: #ffffff;
-    border-radius: 20rpx;
-    padding: 25rpx;
-    margin-bottom: 25rpx;
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06);
-}
-
-.info-item-row {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 18rpx;
-    padding: 12rpx 0;
-}
-
-.info-item-row:last-child {
-    margin-bottom: 0;
-}
-
-.item-label {
-    font-size: 28rpx;
-    color: #666666;
-    font-weight: 400;
-    flex-shrink: 0;
-    min-width: 150rpx;
-}
-
-/* 右侧区域容器 */
-.item-right-area {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-}
-
-.item-value {
-    font-size: 28rpx;
-    color: #333333;
-    font-weight: 500;
-    word-break: break-all;
-    text-align: right;
-    margin-right: 15rpx;
-}
-
-/* 特殊样式 */
-.jine-green {
-    color: #4caf50 !important;
-    font-weight: 600 !important;
-    font-size: 32rpx !important;
-}
-
-.zhuangtai-text {
-    font-weight: 600 !important;
-    font-size: 30rpx !important;
-    color: #333333 !important;
-}
-
-/* 按钮样式（复制、查看） */
-.copy-btn,
-.chakan-btn {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 24rpx;
-    color: #4caf50;
-    background-color: #e8f5e9;
-    padding: 6rpx 16rpx;
-    border-radius: 20rpx;
-    border: 1rpx solid #4caf50;
-    transition: all 0.2s ease;
-    white-space: nowrap;
-    flex-shrink: 0;
-}
-
-.chakan-btn {
-    color: #2196f3;
-    background-color: #e3f2fd;
-    border-color: #2196f3;
-    margin-left: 10rpx;
-}
-
-.copy-btn-hover,
-.chakan-btn:active {
-    background-color: #c8e6c9;
-    transform: scale(0.95);
-}
-
-.copy-icon {
-    font-size: 20rpx;
-    margin-right: 6rpx;
-}
-
-.copy-text {
-    font-weight: 500;
-}
-
-/* 打手交付图片网格 */
-.jiaofu-grid {
-    display: flex;
-    flex-wrap: wrap;
-    margin: -5rpx;
-}
-
-.jiaofu-image-item {
-    width: calc(33.333% - 10rpx);
-    margin: 5rpx;
-    aspect-ratio: 1/1;
-}
-
-.jiaofu-image {
-    width: 100%;
-    height: 100%;
-    border-radius: 12rpx;
-    background-color: #f5f5f5;
-    transition: transform 0.2s ease;
-}
-
-.jiaofu-image:active {
-    transform: scale(0.95);
-}
-
-/* 留言内容样式 */
-.liuyan-content {
-    font-size: 26rpx;
-    line-height: 40rpx;
-    color: #555555;
-    padding: 15rpx;
-    background-color: #f9f9f9;
-    border-radius: 12rpx;
-    margin-top: 8rpx;
-}
-
-/* 选择图片区域 */
-.yixuan-tupian-grid {
-    display: flex;
-    flex-wrap: wrap;
-    margin: -8rpx;
-}
-
-.yixuan-tupian-item {
-    width: calc(33.333% - 16rpx);
-    margin: 8rpx;
-    aspect-ratio: 1/1;
-    position: relative;
-}
-
-.yixuan-tupian {
-    width: 100%;
-    height: 100%;
-    border-radius: 12rpx;
-    background-color: #f5f5f5;
-}
-
-.shanchu-btn {
-    position: absolute;
-    top: -10rpx;
-    right: -10rpx;
-    width: 40rpx;
-    height: 40rpx;
-    background-color: #ff4444;
-    color: white;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 24rpx;
-    font-weight: bold;
-    z-index: 10;
-}
-
-.tianjia-btn {
-    width: calc(33.333% - 16rpx);
-    margin: 8rpx;
-    aspect-ratio: 1/1;
-    background-color: #f5f5f5;
-    border-radius: 12rpx;
-    border: 2rpx dashed #cccccc;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    color: #666666;
-}
-
-.tianjia-icon {
-    font-size: 48rpx;
-    font-weight: 300;
-    margin-bottom: 10rpx;
-}
-
-.tianjia-text {
-    font-size: 24rpx;
-    margin-bottom: 4rpx;
-}
-
-.tianjia-tip {
-    font-size: 20rpx;
-    color: #999999;
-}
-
-/* 上传进度 */
-.shangchuan-jindu-container {
-    margin-top: 20rpx;
-}
-
-.jindu-bar {
-    width: 100%;
-    height: 20rpx;
-    background-color: #f0f0f0;
-    border-radius: 10rpx;
-    overflow: hidden;
-    margin-bottom: 10rpx;
-}
-
-.jindu-fill {
-    height: 100%;
-    background-color: #4caf50;
-    border-radius: 10rpx;
-    transition: width 0.3s ease;
-}
-
-.jindu-text {
-    font-size: 24rpx;
-    color: #666666;
-    text-align: center;
-    display: block;
-}
-
-/* 留言输入 */
-.liuyan-textarea {
-    width: 100%;
-    min-height: 120rpx;
-    font-size: 28rpx;
-    color: #333333;
-    background-color: #f9f9f9;
-    border-radius: 12rpx;
-    padding: 20rpx;
-    margin-top: 10rpx;
-    box-sizing: border-box;
-}
-
-.zi-shu {
-    display: block;
-    text-align: right;
-    font-size: 24rpx;
-    color: #999999;
-    margin-top: 8rpx;
-}
-
-/* ==================== 底部按钮区域 ==================== */
-.bottom-btns-container {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    background-color: #ffffff;
-    padding: 20rpx 30rpx;
-    border-top: 1rpx solid #f0f0f0;
-    box-shadow: 0 -2rpx 20rpx rgba(0, 0, 0, 0.08);
-    z-index: 100;
-    display: flex;
-    flex-direction: column;
-    gap: 10rpx;  /* 减小按钮间距 */
-}
-
-/* 🆕 新增：按钮行布局（用于并排两个按钮） */
-.btn-row {
-    display: flex;
-    justify-content: space-between;
-    width: 100%;
-}
-
-/* 🆕 当有两个按钮时，各占一半（减去gap的一半） */
-.btn-row .bottom-btn {
-    width: calc(50% - 10rpx);
-}
-
-/* 🆕 当只有一个按钮时，占满 */
-.btn-row .full-width {
-    width: 100%;
-}
-
-/* 统一底部按钮样式 */
-.bottom-btn {
-    width: 100%;
-    height: 88rpx;  /* 统一高度 */
-    border-radius: 44rpx;  /* 圆角 */
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 32rpx;
-    font-weight: 600;
-    transition: all 0.3s ease;
-    position: relative;
-    overflow: hidden;
-    border: none;
-    box-sizing: border-box;
-}
-
-.btn-hover {
-    opacity: 0.9;
-    transform: scale(0.98);
-}
-
-/* 联系客服按钮 */
-.contact-btn {
-    background-color: #2196F3;
-    color: #ffffff;
-    box-shadow: 0 4rpx 15rpx rgba(33, 150, 243, 0.3);
-}
-
-/* 🆕 新增：联系老板按钮 */
-.boss-btn {
-    background-color: #ff9800;
-    color: #ffffff;
-    box-shadow: 0 4rpx 15rpx rgba(255, 152, 0, 0.3);
-}
-
-/* 🆕 新增：修改按钮（黑色） */
-.modify-btn {
-    background-color: #333333;
-    color: #ffffff;
-    box-shadow: 0 4rpx 15rpx rgba(51, 51, 51, 0.3);
-}
-
-/* 🆕 新增：取消修改按钮 */
-.cancel-modify-btn {
-    background-color: #9e9e9e;
-    color: #ffffff;
-    box-shadow: 0 4rpx 15rpx rgba(158, 158, 158, 0.3);
-}
-
-/* 🆕 新增：确认修改按钮 */
-.confirm-modify-btn {
-    background-color: #4caf50;
-    color: #ffffff;
-    box-shadow: 0 4rpx 15rpx rgba(76, 175, 80, 0.3);
-}
-
-/* 提交按钮 */
-.submit-btn {
-    background: linear-gradient(135deg, #4caf50 0%, #2e7d32 100%);
-    color: #ffffff;
-    box-shadow: 0 4rpx 15rpx rgba(76, 175, 80, 0.3);
-}
-
-/* 提交按钮闪光特效 */
-.submit-btn::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: -100%;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
-    animation: flash 2s infinite;
-}
-
-@keyframes flash {
-    0% { left: -100%; }
-    100% { left: 100%; }
-}
-
-.btn-text {
-    position: relative;
-    z-index: 1;
-}
-
-/* ==================== 弹窗样式 ==================== */
-.modal-container {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 1000;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.modal-mask {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.5);
-}
-
-.modal-content {
-    position: relative;
-    width: 600rpx;
-    max-height: 70vh;
-    background-color: #ffffff;
-    border-radius: 20rpx;
-    overflow: hidden;
-    box-shadow: 0 10rpx 40rpx rgba(0, 0, 0, 0.15);
-    z-index: 1001;
-}
-
-.modal-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 30rpx;
-    border-bottom: 1rpx solid #f0f0f0;
-}
-
-.modal-title {
-    font-size: 34rpx;
-    color: #333333;
-    font-weight: 600;
-}
-
-.modal-close {
-    font-size: 40rpx;
-    color: #999999;
-    width: 40rpx;
-    height: 40rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.modal-body {
-    padding: 30rpx;
-    max-height: 50vh;
-    overflow: hidden;
-}
-
-.modal-scroll {
-    height: 100%;
-    max-height: 50vh;
-}
-
-.modal-content-text {
-    font-size: 28rpx;
-    line-height: 44rpx;
-    color: #333333;
-    white-space: pre-wrap;
-}
-
-/* 响应式调整 */
-@media (max-width: 375px) {
-    .shangpin-image-container {
-        width: 160rpx;
-        height: 160rpx;
-    }
-    
-    .bottom-btn {
-        height: 80rpx;
-        font-size: 30rpx;
-    }
-    
-    .item-label {
-        min-width: 140rpx;
-        font-size: 26rpx;
-    }
-    
-    .item-value {
-        font-size: 26rpx;
-    }
-    
-    .modal-content {
-        width: 560rpx;
-    }
+/* pages/fighter-order-detail/fighter-order-detail.wxss */
+
+/* 页面基础样式 */
+.dsddxq-page {
+    min-height: 100vh;
+    background-color: #f8f9fa;
+    position: relative;
+    box-sizing: border-box;
+}
+
+/* 加载中状态 */
+.loading-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 60vh;
+}
+
+.loading-spinner {
+    width: 80rpx;
+    height: 80rpx;
+    border: 8rpx solid #e0e0e0;
+    border-top-color: #2196f3;
+    border-radius: 50%;
+    animation: spin 1.2s linear infinite;
+    margin-bottom: 30rpx;
+}
+
+@keyframes spin {
+    from { transform: rotate(0deg); }
+    to { transform: rotate(360deg); }
+}
+
+.loading-text {
+    font-size: 30rpx;
+    color: #666666;
+}
+
+/* 内容区域 */
+.content-container {
+    padding: 25rpx 25rpx 220rpx;  /* 减少底部内边距，避免过多空白 */
+}
+
+/* 商品图片和介绍区域 */
+.shangpin-area {
+    display: flex;
+    background-color: #ffffff;
+    border-radius: 20rpx;
+    padding: 25rpx;
+    margin-bottom: 25rpx;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06);
+}
+
+.shangpin-image-container {
+    flex-shrink: 0;
+    width: 180rpx;
+    height: 180rpx;
+    margin-right: 25rpx;
+}
+
+.shangpin-image {
+    width: 100%;
+    height: 100%;
+    border-radius: 12rpx;
+    background-color: #f5f5f5;
+}
+
+.shangpin-jieshao {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+}
+
+.jieshao-text {
+    font-size: 28rpx;
+    line-height: 42rpx;
+    color: #333333;
+    font-weight: 400;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 4;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.chakan-wanzheng {
+    margin-top: 10rpx;
+}
+
+.chakan-wanzheng text {
+    font-size: 24rpx;
+    color: #2196f3;
+    text-decoration: underline;
+}
+
+/* 通用区域样式 */
+.info-title {
+    font-size: 32rpx;
+    color: #333333;
+    font-weight: 600;
+    margin-bottom: 20rpx;
+    padding-bottom: 12rpx;
+    border-bottom: 2rpx solid rgba(0, 0, 0, 0.08);
+}
+
+.section-subtitle {
+    font-size: 28rpx;
+    color: #555555;
+    font-weight: 500;
+    display: block;
+    margin: 15rpx 0 10rpx;
+}
+
+/* 订单信息区域 */
+.dingdan-info-area,
+.shangjia-area,
+.tuikuan-area,
+.chufa-area,
+.dashou-jiaofu-area,
+.tijiao-area {
+    background-color: #ffffff;
+    border-radius: 20rpx;
+    padding: 25rpx;
+    margin-bottom: 25rpx;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06);
+}
+
+.info-item-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 18rpx;
+    padding: 12rpx 0;
+}
+
+.info-item-row:last-child {
+    margin-bottom: 0;
+}
+
+.item-label {
+    font-size: 28rpx;
+    color: #666666;
+    font-weight: 400;
+    flex-shrink: 0;
+    min-width: 150rpx;
+}
+
+/* 右侧区域容器 */
+.item-right-area {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+}
+
+.item-value {
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+    word-break: break-all;
+    text-align: right;
+    margin-right: 15rpx;
+}
+
+/* 特殊样式 */
+.jine-green {
+    color: #4caf50 !important;
+    font-weight: 600 !important;
+    font-size: 32rpx !important;
+}
+
+.zhuangtai-text {
+    font-weight: 600 !important;
+    font-size: 30rpx !important;
+    color: #333333 !important;
+}
+
+/* 按钮样式（复制、查看） */
+.copy-btn,
+.chakan-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 24rpx;
+    color: #4caf50;
+    background-color: #e8f5e9;
+    padding: 6rpx 16rpx;
+    border-radius: 20rpx;
+    border: 1rpx solid #4caf50;
+    transition: all 0.2s ease;
+    white-space: nowrap;
+    flex-shrink: 0;
+}
+
+.chakan-btn {
+    color: #2196f3;
+    background-color: #e3f2fd;
+    border-color: #2196f3;
+    margin-left: 10rpx;
+}
+
+.copy-btn-hover,
+.chakan-btn:active {
+    background-color: #c8e6c9;
+    transform: scale(0.95);
+}
+
+.copy-icon {
+    font-size: 20rpx;
+    margin-right: 6rpx;
+}
+
+.copy-text {
+    font-weight: 500;
+}
+
+/* 打手交付图片网格 */
+.jiaofu-grid {
+    display: flex;
+    flex-wrap: wrap;
+    margin: -5rpx;
+}
+
+.jiaofu-image-item {
+    width: calc(33.333% - 10rpx);
+    margin: 5rpx;
+    aspect-ratio: 1/1;
+}
+
+.jiaofu-image {
+    width: 100%;
+    height: 100%;
+    border-radius: 12rpx;
+    background-color: #f5f5f5;
+    transition: transform 0.2s ease;
+}
+
+.jiaofu-image:active {
+    transform: scale(0.95);
+}
+
+/* 留言内容样式 */
+.liuyan-content {
+    font-size: 26rpx;
+    line-height: 40rpx;
+    color: #555555;
+    padding: 15rpx;
+    background-color: #f9f9f9;
+    border-radius: 12rpx;
+    margin-top: 8rpx;
+}
+
+/* 选择图片区域 */
+.yixuan-tupian-grid {
+    display: flex;
+    flex-wrap: wrap;
+    margin: -8rpx;
+}
+
+.yixuan-tupian-item {
+    width: calc(33.333% - 16rpx);
+    margin: 8rpx;
+    aspect-ratio: 1/1;
+    position: relative;
+}
+
+.yixuan-tupian {
+    width: 100%;
+    height: 100%;
+    border-radius: 12rpx;
+    background-color: #f5f5f5;
+}
+
+.shanchu-btn {
+    position: absolute;
+    top: -10rpx;
+    right: -10rpx;
+    width: 40rpx;
+    height: 40rpx;
+    background-color: #ff4444;
+    color: white;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 24rpx;
+    font-weight: bold;
+    z-index: 10;
+}
+
+.tianjia-btn {
+    width: calc(33.333% - 16rpx);
+    margin: 8rpx;
+    aspect-ratio: 1/1;
+    background-color: #f5f5f5;
+    border-radius: 12rpx;
+    border: 2rpx dashed #cccccc;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    color: #666666;
+}
+
+.tianjia-icon {
+    font-size: 48rpx;
+    font-weight: 300;
+    margin-bottom: 10rpx;
+}
+
+.tianjia-text {
+    font-size: 24rpx;
+    margin-bottom: 4rpx;
+}
+
+.tianjia-tip {
+    font-size: 20rpx;
+    color: #999999;
+}
+
+/* 上传进度 */
+.shangchuan-jindu-container {
+    margin-top: 20rpx;
+}
+
+.jindu-bar {
+    width: 100%;
+    height: 20rpx;
+    background-color: #f0f0f0;
+    border-radius: 10rpx;
+    overflow: hidden;
+    margin-bottom: 10rpx;
+}
+
+.jindu-fill {
+    height: 100%;
+    background-color: #4caf50;
+    border-radius: 10rpx;
+    transition: width 0.3s ease;
+}
+
+.jindu-text {
+    font-size: 24rpx;
+    color: #666666;
+    text-align: center;
+    display: block;
+}
+
+/* 留言输入 */
+.liuyan-textarea {
+    width: 100%;
+    min-height: 120rpx;
+    font-size: 28rpx;
+    color: #333333;
+    background-color: #f9f9f9;
+    border-radius: 12rpx;
+    padding: 20rpx;
+    margin-top: 10rpx;
+    box-sizing: border-box;
+}
+
+.zi-shu {
+    display: block;
+    text-align: right;
+    font-size: 24rpx;
+    color: #999999;
+    margin-top: 8rpx;
+}
+
+/* ==================== 底部按钮区域 ==================== */
+.bottom-btns-container {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: #ffffff;
+    padding: 20rpx 30rpx;
+    border-top: 1rpx solid #f0f0f0;
+    box-shadow: 0 -2rpx 20rpx rgba(0, 0, 0, 0.08);
+    z-index: 100;
+    display: flex;
+    flex-direction: column;
+    gap: 10rpx;  /* 减小按钮间距 */
+}
+
+/* 🆕 新增：按钮行布局（用于并排两个按钮） */
+.btn-row {
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+}
+
+/* 🆕 当有两个按钮时，各占一半（减去gap的一半） */
+.btn-row .bottom-btn {
+    width: calc(50% - 10rpx);
+}
+
+/* 🆕 当只有一个按钮时，占满 */
+.btn-row .full-width {
+    width: 100%;
+}
+
+/* 统一底部按钮样式 */
+.bottom-btn {
+    width: 100%;
+    height: 88rpx;  /* 统一高度 */
+    border-radius: 44rpx;  /* 圆角 */
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    font-weight: 600;
+    transition: all 0.3s ease;
+    position: relative;
+    overflow: hidden;
+    border: none;
+    box-sizing: border-box;
+}
+
+.btn-hover {
+    opacity: 0.9;
+    transform: scale(0.98);
+}
+
+/* 联系客服按钮 */
+.contact-btn {
+    background-color: #2196F3;
+    color: #ffffff;
+    box-shadow: 0 4rpx 15rpx rgba(33, 150, 243, 0.3);
+}
+
+/* 🆕 新增：联系老板按钮 */
+.boss-btn {
+    background-color: #ff9800;
+    color: #ffffff;
+    box-shadow: 0 4rpx 15rpx rgba(255, 152, 0, 0.3);
+}
+
+/* 🆕 新增：修改按钮（黑色） */
+.modify-btn {
+    background-color: #333333;
+    color: #ffffff;
+    box-shadow: 0 4rpx 15rpx rgba(51, 51, 51, 0.3);
+}
+
+/* 🆕 新增：取消修改按钮 */
+.cancel-modify-btn {
+    background-color: #9e9e9e;
+    color: #ffffff;
+    box-shadow: 0 4rpx 15rpx rgba(158, 158, 158, 0.3);
+}
+
+/* 🆕 新增：确认修改按钮 */
+.confirm-modify-btn {
+    background-color: #4caf50;
+    color: #ffffff;
+    box-shadow: 0 4rpx 15rpx rgba(76, 175, 80, 0.3);
+}
+
+/* 提交按钮 */
+.submit-btn {
+    background: linear-gradient(135deg, #4caf50 0%, #2e7d32 100%);
+    color: #ffffff;
+    box-shadow: 0 4rpx 15rpx rgba(76, 175, 80, 0.3);
+}
+
+/* 提交按钮闪光特效 */
+.submit-btn::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
+    animation: flash 2s infinite;
+}
+
+@keyframes flash {
+    0% { left: -100%; }
+    100% { left: 100%; }
+}
+
+.btn-text {
+    position: relative;
+    z-index: 1;
+}
+
+/* ==================== 弹窗样式 ==================== */
+.modal-container {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.modal-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+}
+
+.modal-content {
+    position: relative;
+    width: 600rpx;
+    max-height: 70vh;
+    background-color: #ffffff;
+    border-radius: 20rpx;
+    overflow: hidden;
+    box-shadow: 0 10rpx 40rpx rgba(0, 0, 0, 0.15);
+    z-index: 1001;
+}
+
+.modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+}
+
+.modal-title {
+    font-size: 34rpx;
+    color: #333333;
+    font-weight: 600;
+}
+
+.modal-close {
+    font-size: 40rpx;
+    color: #999999;
+    width: 40rpx;
+    height: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.modal-body {
+    padding: 30rpx;
+    max-height: 50vh;
+    overflow: hidden;
+}
+
+.modal-scroll {
+    height: 100%;
+    max-height: 50vh;
+}
+
+.modal-content-text {
+    font-size: 28rpx;
+    line-height: 44rpx;
+    color: #333333;
+    white-space: pre-wrap;
+}
+
+/* 响应式调整 */
+@media (max-width: 375px) {
+    .shangpin-image-container {
+        width: 160rpx;
+        height: 160rpx;
+    }
+    
+    .bottom-btn {
+        height: 80rpx;
+        font-size: 30rpx;
+    }
+    
+    .item-label {
+        min-width: 140rpx;
+        font-size: 26rpx;
+    }
+    
+    .item-value {
+        font-size: 26rpx;
+    }
+    
+    .modal-content {
+        width: 560rpx;
+    }
 }
\ No newline at end of file
diff --git a/pages/dashoudingdan/dashoudingdan.js b/pages/fighter-orders/fighter-orders.js
similarity index 95%
rename from pages/dashoudingdan/dashoudingdan.js
rename to pages/fighter-orders/fighter-orders.js
index 9ff5182..130c191 100644
--- a/pages/dashoudingdan/dashoudingdan.js
+++ b/pages/fighter-orders/fighter-orders.js
@@ -1,307 +1,307 @@
-const app = getApp();
-import request from '../../utils/request.js';
-import { reconnectForRole } from '../../utils/role-tab-bar.js';
-
-Page({
-  data: {
-    // 商品类型
-    shangpinleixing: [],
-    xuanzhongLeixingId: null,
-
-    // 订单类型: normal 普通, peihu 陪护
-    orderType: 'normal',
-
-    // 搜索关键字
-    searchKeyword: '',
-
-    // 状态列表（增加全部）
-    statusList: [
-      { name: '全部', key: 'all', zhuangtaiList: [], color: '#333333' },
-      { name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2], color: '#2196F3' },
-      { name: '退款中', key: 'tuikuanzhong', zhuangtaiList: [4], color: '#FF9800' },
-      { name: '已退款', key: 'yituikuan', zhuangtaiList: [5], color: '#9E9E9E' },
-      { name: '退款失败', key: 'tuikuanshibai', zhuangtaiList: [6], color: '#F44336' },
-      { name: '已完成', key: 'yiwancheng', zhuangtaiList: [3], color: '#4CAF50' },
-      { name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8], color: '#FF5722' }
-    ],
-    currentStatusKey: 'all',
-
-    // 每个状态独立的数据集
-    dsDingdanShuju: {
-      all: { list: [], page: 1, hasMore: true, isLoading: false },
-      jinxingzhong: { list: [], page: 1, hasMore: true, isLoading: false },
-      tuikuanzhong: { list: [], page: 1, hasMore: true, isLoading: false },
-      yituikuan: { list: [], page: 1, hasMore: true, isLoading: false },
-      tuikuanshibai: { list: [], page: 1, hasMore: true, isLoading: false },
-      yiwancheng: { list: [], page: 1, hasMore: true, isLoading: false },
-      jiesuanzhong: { list: [], page: 1, hasMore: true, isLoading: false }
-    },
-
-    currentList: [],
-    hasMore: true,
-    isLoading: false,
-    isLoadingMore: false,
-    scrollViewRefreshing: false,
-    defaultImg: '/images/default-order.png',
-    ossImageUrl: app.globalData.ossImageUrl || '',
-  },
-
-  onLoad() {
-    wx.setNavigationBarTitle({ title: '我的接单' });
-    this.loadShangpinLeixing();
-    this.registerNotificationComponent();
-  },
-
-  onShow() {
-    this.registerNotificationComponent();
-    if (wx.getStorageSync('uid')) {
-      reconnectForRole('dashou');
-      if (app.startImWhenReady) app.startImWhenReady();
-    }
-    if (this.data.currentStatusKey && this.data.xuanzhongLeixingId) {
-      this.loadCurrentStatusOrders(true);
-    }
-  },
-
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  // 加载商品类型（图片拼接）
-  async loadShangpinLeixing() {
-    try {
-      const res = await request({
-        url: '/dingdan/dsqdhqddlx',
-        method: 'POST',
-        header: { 'content-type': 'application/json' }
-      });
-      if (res.data && (res.data.code === 200 || res.data.code === 0)) {
-        let list = res.data.data.list || res.data.data || [];
-        if (!Array.isArray(list)) list = [];
-        const oss = this.data.ossImageUrl;
-        const processed = list.map(item => ({
-          ...item,
-          full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http')
-            ? oss + item.tupian_url
-            : (item.tupian_url || '/images/default-type.png')
-        }));
-        this.setData({
-          shangpinleixing: processed,
-          xuanzhongLeixingId: processed[0]?.id || null
-        });
-        this.loadCurrentStatusOrders(true);
-      }
-    } catch (e) {
-      console.error('加载商品类型失败', e);
-    }
-  },
-
-  selectLeixing(e) {
-    const id = e.currentTarget.dataset.id;
-    if (id === this.data.xuanzhongLeixingId) return;
-    this.setData({ xuanzhongLeixingId: id });
-    this.resetCurrentStatusData();
-    this.loadCurrentStatusOrders(true);
-  },
-
-  switchOrderType(e) {
-    const type = e.currentTarget.dataset.type;
-    if (type === this.data.orderType) return;
-    this.setData({ orderType: type });
-    this.resetCurrentStatusData();
-    this.loadCurrentStatusOrders(true);
-  },
-
-  onSearchInput(e) {
-    this.setData({ searchKeyword: e.detail.value });
-    if (this._searchTimer) clearTimeout(this._searchTimer);
-    this._searchTimer = setTimeout(() => {
-      this.onSearchConfirm();
-    }, 500);
-  },
-
-  onSearchConfirm() {
-    this.resetCurrentStatusData();
-    this.loadCurrentStatusOrders(true);
-  },
-
-  clearSearch() {
-    this.setData({ searchKeyword: '' });
-    this.resetCurrentStatusData();
-    this.loadCurrentStatusOrders(true);
-  },
-
-  switchStatus(e) {
-    const key = e.currentTarget.dataset.key;
-    if (key === this.data.currentStatusKey) return;
-    this.setData({ currentStatusKey: key });
-    const tabData = this.data.dsDingdanShuju[key];
-    if (tabData.list.length === 0 && tabData.hasMore && !tabData.isLoading) {
-      this.loadCurrentStatusOrders(true);
-    } else {
-      this.refreshCurrentListView();
-    }
-  },
-
-  // 加载订单（核心）
-  async loadCurrentStatusOrders(isRefresh = false) {
-    const key = this.data.currentStatusKey;
-    const tabData = this.data.dsDingdanShuju[key];
-    if (tabData.isLoading) return;
-    const page = isRefresh ? 1 : tabData.page;
-
-    this.setData({
-      [`dsDingdanShuju.${key}.isLoading`]: true,
-      isLoading: true,
-      isLoadingMore: !isRefresh
-    });
-
-    try {
-      const apiUrl = this.data.orderType === 'peihu'
-        ? '/dingdan/phddlbhq'
-        : '/dingdan/dshqdingdan';
-
-      const statusItem = this.data.statusList.find(s => s.key === key);
-      const zhuangtaiList = statusItem.zhuangtaiList.length > 0 ? statusItem.zhuangtaiList : undefined;
-      const params = {
-        zhuangtai_list: zhuangtaiList,
-        page: page,
-        page_size: 5,
-        leixing_id: this.data.xuanzhongLeixingId,
-        keyword: this.data.searchKeyword || undefined
-      };
-
-      const res = await request({
-        url: apiUrl,
-        method: 'POST',
-        data: params,
-        header: { 'content-type': 'application/json' }
-      });
-
-      const code = res.data.code;
-      if (code === 200 || code === 0) {
-        const newList = res.data.data.list || [];
-        const hasMore = res.data.data.has_more || false;
-
-        // ✅ 图片URL拼接（核心）
-        const processed = newList.map(item => ({
-          ...item,
-          zhuangtaiZh: this.getZhuangtaiZh(item.zhuangtai),
-          zhuangtaiColor: statusItem.color,
-          tupian: item.tupian
-            ? (item.tupian.startsWith('http') ? item.tupian : this.data.ossImageUrl + item.tupian)
-            : this.data.defaultImg
-        }));
-
-        const currentList = this.data.dsDingdanShuju[key].list;
-        const updatedList = isRefresh ? processed : [...currentList, ...processed];
-
-        this.setData({
-          [`dsDingdanShuju.${key}.list`]: updatedList,
-          [`dsDingdanShuju.${key}.page`]: page,
-          [`dsDingdanShuju.${key}.hasMore`]: hasMore,
-          [`dsDingdanShuju.${key}.isLoading`]: false,
-          isLoading: false,
-          isLoadingMore: false,
-          scrollViewRefreshing: false
-        });
-        this.refreshCurrentListView();
-      } else {
-        throw new Error(res.data.msg || '加载失败');
-      }
-    } catch (err) {
-      console.error('加载订单失败', err);
-      wx.showToast({ title: err.message || '加载失败', icon: 'none' });
-      this.setData({
-        [`dsDingdanShuju.${key}.isLoading`]: false,
-        isLoading: false,
-        isLoadingMore: false,
-        scrollViewRefreshing: false
-      });
-      this.refreshCurrentListView();
-    }
-  },
-
-  refreshCurrentListView() {
-    const key = this.data.currentStatusKey;
-    const tabData = this.data.dsDingdanShuju[key];
-    this.setData({
-      currentList: tabData.list,
-      hasMore: tabData.hasMore,
-      isLoading: tabData.isLoading
-    });
-  },
-
-  resetCurrentStatusData() {
-    const key = this.data.currentStatusKey;
-    this.setData({
-      [`dsDingdanShuju.${key}.list`]: [],
-      [`dsDingdanShuju.${key}.page`]: 1,
-      [`dsDingdanShuju.${key}.hasMore`]: true,
-      [`dsDingdanShuju.${key}.isLoading`]: false
-    });
-    this.refreshCurrentListView();
-  },
-
-  // 下拉刷新（由 scroll-view 触发）
-  onPullDownRefresh() {
-    if (this.data.isLoading) {
-      this.setData({ scrollViewRefreshing: false });
-      return;
-    }
-    this.setData({ scrollViewRefreshing: true });
-    this.resetCurrentStatusData();
-    this.loadCurrentStatusOrders(true);
-  },
-
-  // 上拉加载更多（由 scroll-view 触发）
-  onReachBottom() {
-    const key = this.data.currentStatusKey;
-    const tabData = this.data.dsDingdanShuju[key];
-    if (tabData.isLoading || !tabData.hasMore) return;
-    this.setData({ [`dsDingdanShuju.${key}.page`]: tabData.page + 1 });
-    this.loadCurrentStatusOrders(false);
-  },
-
-  // ✅ 手动点击“加载更多”按钮
-  onLoadMoreTap() {
-    const key = this.data.currentStatusKey;
-    const tabData = this.data.dsDingdanShuju[key];
-    if (tabData.isLoading || !tabData.hasMore) return;
-    this.setData({ [`dsDingdanShuju.${key}.page`]: tabData.page + 1 });
-    this.loadCurrentStatusOrders(false);
-  },
-
-  getZhuangtaiZh(zhuangtai) {
-    const map = {
-      1: '已下单', 2: '进行中', 3: '已完成',
-      4: '退款中', 5: '已退款', 6: '退款失败',
-      7: '指定中', 8: '结算中'
-    };
-    return map[zhuangtai] || '未知状态';
-  },
-
-  goToDsDingdanXiangqing(e) {
-    const item = e.currentTarget.dataset.item;
-    if (!item) return;
-    const dataStr = encodeURIComponent(JSON.stringify(item));
-
-    if (this.data.orderType === 'peihu') {
-      wx.navigateTo({
-        url: `/pages/peihuDingdan/peihuDingdan?dingdanData=${dataStr}`
-      });
-    } else {
-      wx.navigateTo({
-        url: `/pages/dsddxq/dsddxq?dingdanData=${dataStr}`
-      });
-    }
-  },
-
-  onImageError() {}
+const app = getApp();
+import request from '../../utils/request.js';
+import { reconnectForRole } from '../../utils/role-tab-bar.js';
+
+Page({
+  data: {
+    // 商品类型
+    shangpinleixing: [],
+    xuanzhongLeixingId: null,
+
+    // 订单类型: normal 普通, peihu 陪护
+    orderType: 'normal',
+
+    // 搜索关键字
+    searchKeyword: '',
+
+    // 状态列表（增加全部）
+    statusList: [
+      { name: '全部', key: 'all', zhuangtaiList: [], color: '#333333' },
+      { name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2], color: '#2196F3' },
+      { name: '退款中', key: 'tuikuanzhong', zhuangtaiList: [4], color: '#FF9800' },
+      { name: '已退款', key: 'yituikuan', zhuangtaiList: [5], color: '#9E9E9E' },
+      { name: '退款失败', key: 'tuikuanshibai', zhuangtaiList: [6], color: '#F44336' },
+      { name: '已完成', key: 'yiwancheng', zhuangtaiList: [3], color: '#4CAF50' },
+      { name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8], color: '#FF5722' }
+    ],
+    currentStatusKey: 'all',
+
+    // 每个状态独立的数据集
+    dsDingdanShuju: {
+      all: { list: [], page: 1, hasMore: true, isLoading: false },
+      jinxingzhong: { list: [], page: 1, hasMore: true, isLoading: false },
+      tuikuanzhong: { list: [], page: 1, hasMore: true, isLoading: false },
+      yituikuan: { list: [], page: 1, hasMore: true, isLoading: false },
+      tuikuanshibai: { list: [], page: 1, hasMore: true, isLoading: false },
+      yiwancheng: { list: [], page: 1, hasMore: true, isLoading: false },
+      jiesuanzhong: { list: [], page: 1, hasMore: true, isLoading: false }
+    },
+
+    currentList: [],
+    hasMore: true,
+    isLoading: false,
+    isLoadingMore: false,
+    scrollViewRefreshing: false,
+    defaultImg: '/images/default-order.png',
+    ossImageUrl: app.globalData.ossImageUrl || '',
+  },
+
+  onLoad() {
+    wx.setNavigationBarTitle({ title: '我的接单' });
+    this.loadShangpinLeixing();
+    this.registerNotificationComponent();
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+    if (wx.getStorageSync('uid')) {
+      reconnectForRole('dashou');
+      if (app.startImWhenReady) app.startImWhenReady();
+    }
+    if (this.data.currentStatusKey && this.data.xuanzhongLeixingId) {
+      this.loadCurrentStatusOrders(true);
+    }
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  // 加载商品类型（图片拼接）
+  async loadShangpinLeixing() {
+    try {
+      const res = await request({
+        url: '/dingdan/dsqdhqddlx',
+        method: 'POST',
+        header: { 'content-type': 'application/json' }
+      });
+      if (res.data && (res.data.code === 200 || res.data.code === 0)) {
+        let list = res.data.data.list || res.data.data || [];
+        if (!Array.isArray(list)) list = [];
+        const oss = this.data.ossImageUrl;
+        const processed = list.map(item => ({
+          ...item,
+          full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http')
+            ? oss + item.tupian_url
+            : (item.tupian_url || '/images/default-type.png')
+        }));
+        this.setData({
+          shangpinleixing: processed,
+          xuanzhongLeixingId: processed[0]?.id || null
+        });
+        this.loadCurrentStatusOrders(true);
+      }
+    } catch (e) {
+      console.error('加载商品类型失败', e);
+    }
+  },
+
+  selectLeixing(e) {
+    const id = e.currentTarget.dataset.id;
+    if (id === this.data.xuanzhongLeixingId) return;
+    this.setData({ xuanzhongLeixingId: id });
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  switchOrderType(e) {
+    const type = e.currentTarget.dataset.type;
+    if (type === this.data.orderType) return;
+    this.setData({ orderType: type });
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  onSearchInput(e) {
+    this.setData({ searchKeyword: e.detail.value });
+    if (this._searchTimer) clearTimeout(this._searchTimer);
+    this._searchTimer = setTimeout(() => {
+      this.onSearchConfirm();
+    }, 500);
+  },
+
+  onSearchConfirm() {
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  clearSearch() {
+    this.setData({ searchKeyword: '' });
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  switchStatus(e) {
+    const key = e.currentTarget.dataset.key;
+    if (key === this.data.currentStatusKey) return;
+    this.setData({ currentStatusKey: key });
+    const tabData = this.data.dsDingdanShuju[key];
+    if (tabData.list.length === 0 && tabData.hasMore && !tabData.isLoading) {
+      this.loadCurrentStatusOrders(true);
+    } else {
+      this.refreshCurrentListView();
+    }
+  },
+
+  // 加载订单（核心）
+  async loadCurrentStatusOrders(isRefresh = false) {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.dsDingdanShuju[key];
+    if (tabData.isLoading) return;
+    const page = isRefresh ? 1 : tabData.page;
+
+    this.setData({
+      [`dsDingdanShuju.${key}.isLoading`]: true,
+      isLoading: true,
+      isLoadingMore: !isRefresh
+    });
+
+    try {
+      const apiUrl = this.data.orderType === 'peihu'
+        ? '/dingdan/phddlbhq'
+        : '/dingdan/dshqdingdan';
+
+      const statusItem = this.data.statusList.find(s => s.key === key);
+      const zhuangtaiList = statusItem.zhuangtaiList.length > 0 ? statusItem.zhuangtaiList : undefined;
+      const params = {
+        zhuangtai_list: zhuangtaiList,
+        page: page,
+        page_size: 5,
+        leixing_id: this.data.xuanzhongLeixingId,
+        keyword: this.data.searchKeyword || undefined
+      };
+
+      const res = await request({
+        url: apiUrl,
+        method: 'POST',
+        data: params,
+        header: { 'content-type': 'application/json' }
+      });
+
+      const code = res.data.code;
+      if (code === 200 || code === 0) {
+        const newList = res.data.data.list || [];
+        const hasMore = res.data.data.has_more || false;
+
+        // ✅ 图片URL拼接（核心）
+        const processed = newList.map(item => ({
+          ...item,
+          zhuangtaiZh: this.getZhuangtaiZh(item.zhuangtai),
+          zhuangtaiColor: statusItem.color,
+          tupian: item.tupian
+            ? (item.tupian.startsWith('http') ? item.tupian : this.data.ossImageUrl + item.tupian)
+            : this.data.defaultImg
+        }));
+
+        const currentList = this.data.dsDingdanShuju[key].list;
+        const updatedList = isRefresh ? processed : [...currentList, ...processed];
+
+        this.setData({
+          [`dsDingdanShuju.${key}.list`]: updatedList,
+          [`dsDingdanShuju.${key}.page`]: page,
+          [`dsDingdanShuju.${key}.hasMore`]: hasMore,
+          [`dsDingdanShuju.${key}.isLoading`]: false,
+          isLoading: false,
+          isLoadingMore: false,
+          scrollViewRefreshing: false
+        });
+        this.refreshCurrentListView();
+      } else {
+        throw new Error(res.data.msg || '加载失败');
+      }
+    } catch (err) {
+      console.error('加载订单失败', err);
+      wx.showToast({ title: err.message || '加载失败', icon: 'none' });
+      this.setData({
+        [`dsDingdanShuju.${key}.isLoading`]: false,
+        isLoading: false,
+        isLoadingMore: false,
+        scrollViewRefreshing: false
+      });
+      this.refreshCurrentListView();
+    }
+  },
+
+  refreshCurrentListView() {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.dsDingdanShuju[key];
+    this.setData({
+      currentList: tabData.list,
+      hasMore: tabData.hasMore,
+      isLoading: tabData.isLoading
+    });
+  },
+
+  resetCurrentStatusData() {
+    const key = this.data.currentStatusKey;
+    this.setData({
+      [`dsDingdanShuju.${key}.list`]: [],
+      [`dsDingdanShuju.${key}.page`]: 1,
+      [`dsDingdanShuju.${key}.hasMore`]: true,
+      [`dsDingdanShuju.${key}.isLoading`]: false
+    });
+    this.refreshCurrentListView();
+  },
+
+  // 下拉刷新（由 scroll-view 触发）
+  onPullDownRefresh() {
+    if (this.data.isLoading) {
+      this.setData({ scrollViewRefreshing: false });
+      return;
+    }
+    this.setData({ scrollViewRefreshing: true });
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  // 上拉加载更多（由 scroll-view 触发）
+  onReachBottom() {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.dsDingdanShuju[key];
+    if (tabData.isLoading || !tabData.hasMore) return;
+    this.setData({ [`dsDingdanShuju.${key}.page`]: tabData.page + 1 });
+    this.loadCurrentStatusOrders(false);
+  },
+
+  // ✅ 手动点击“加载更多”按钮
+  onLoadMoreTap() {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.dsDingdanShuju[key];
+    if (tabData.isLoading || !tabData.hasMore) return;
+    this.setData({ [`dsDingdanShuju.${key}.page`]: tabData.page + 1 });
+    this.loadCurrentStatusOrders(false);
+  },
+
+  getZhuangtaiZh(zhuangtai) {
+    const map = {
+      1: '已下单', 2: '进行中', 3: '已完成',
+      4: '退款中', 5: '已退款', 6: '退款失败',
+      7: '指定中', 8: '结算中'
+    };
+    return map[zhuangtai] || '未知状态';
+  },
+
+  goToDsDingdanXiangqing(e) {
+    const item = e.currentTarget.dataset.item;
+    if (!item) return;
+    const dataStr = encodeURIComponent(JSON.stringify(item));
+
+    if (this.data.orderType === 'peihu') {
+      wx.navigateTo({
+        url: `/pages/escort-orders/escort-orders?dingdanData=${dataStr}`
+      });
+    } else {
+      wx.navigateTo({
+        url: `/pages/fighter-order-detail/fighter-order-detail?dingdanData=${dataStr}`
+      });
+    }
+  },
+
+  onImageError() {}
 });
\ No newline at end of file
diff --git a/pages/dashoudingdan/dashoudingdan.json b/pages/fighter-orders/fighter-orders.json
similarity index 100%
rename from pages/dashoudingdan/dashoudingdan.json
rename to pages/fighter-orders/fighter-orders.json
diff --git a/pages/dashoudingdan/dashoudingdan.wxml b/pages/fighter-orders/fighter-orders.wxml
similarity index 100%
rename from pages/dashoudingdan/dashoudingdan.wxml
rename to pages/fighter-orders/fighter-orders.wxml
diff --git a/pages/dashoudingdan/dashoudingdan.wxss b/pages/fighter-orders/fighter-orders.wxss
similarity index 99%
rename from pages/dashoudingdan/dashoudingdan.wxss
rename to pages/fighter-orders/fighter-orders.wxss
index a952665..ee1f8ea 100644
--- a/pages/dashoudingdan/dashoudingdan.wxss
+++ b/pages/fighter-orders/fighter-orders.wxss
@@ -281,9 +281,7 @@ page {
     animation: spin 0.8s linear infinite;
     margin-bottom: 24rpx;
   }
-  @keyframes spin {
-    to { transform: rotate(360deg); }
-  }
+
   .empty-img {
     width: 200rpx;
     height: 200rpx;
diff --git a/pages/dashoupaihang/dashoupaihang.js b/pages/fighter-rank/fighter-rank.js
similarity index 100%
rename from pages/dashoupaihang/dashoupaihang.js
rename to pages/fighter-rank/fighter-rank.js
diff --git a/pages/dashoupaihang/dashoupaihang.json b/pages/fighter-rank/fighter-rank.json
similarity index 100%
rename from pages/dashoupaihang/dashoupaihang.json
rename to pages/fighter-rank/fighter-rank.json
diff --git a/pages/dashoupaihang/dashoupaihang.wxml b/pages/fighter-rank/fighter-rank.wxml
similarity index 100%
rename from pages/dashoupaihang/dashoupaihang.wxml
rename to pages/fighter-rank/fighter-rank.wxml
diff --git a/pages/dashoupaihang/dashoupaihang.wxss b/pages/fighter-rank/fighter-rank.wxss
similarity index 99%
rename from pages/dashoupaihang/dashoupaihang.wxss
rename to pages/fighter-rank/fighter-rank.wxss
index 0c3f3b0..232f63d 100644
--- a/pages/dashoupaihang/dashoupaihang.wxss
+++ b/pages/fighter-rank/fighter-rank.wxss
@@ -132,8 +132,6 @@ page {
   margin-bottom: 20rpx;
 }
 
-@keyframes spin { to { transform: rotate(360deg); } }
-
 .state-img {
   width: 160rpx; height: 160rpx;
   margin-bottom: 20rpx;
diff --git a/pages/dashouchongzhi/dashouchongzhi.js b/pages/fighter-recharge/fighter-recharge.js
similarity index 96%
rename from pages/dashouchongzhi/dashouchongzhi.js
rename to pages/fighter-recharge/fighter-recharge.js
index 030a40e..ebb1da2 100644
--- a/pages/dashouchongzhi/dashouchongzhi.js
+++ b/pages/fighter-recharge/fighter-recharge.js
@@ -1,975 +1,975 @@
-// pages/dashou-chongzhi/index.js
-import request from '../../utils/request';
-// 引入弹窗服务（路径根据实际调整）
-import PopupService from '../../services/popupService.js';
-
-Page({
-  data: {
-    // ========== 全局数据 ==========
-    clubmber: [],          // 会员列表（注意：全局变量中是 clumber，这里保持原样）
-    yajin: 0,              // 押金
-    jifen: 0,              // 积分（注意：全局变量中是 jinfen）
-    jifenProgress: 0,      // 积分进度条角度
-    
-    // ========== 会员商品列表 ==========
-    huiyuanList: [],       // 从后端获取的会员列表
-    currentHuiyuanIndex: 0, // 当前选中的会员索引
-    currentHuiyuan: {},    // 当前选中的会员详情
-    
-    // ========== 押金充值相关 ==========
-    showYajinModal: false, // 显示押金弹窗
-    yajinAmount: '100',    // 押金金额
-    
-    // ========== 支付相关 ==========
-    payLoading: false,     // 支付加载状态
-    loadingText: '支付中...',
-    
-    // ========== 订单ID记录 ==========
-    currentDingdanid: '',  // 当前操作的订单ID
-    
-    // ========== 计算高度 ==========
-    huiyuanListHeight: 120,
-    
-    // ========== 会员详情规则 ==========
-    detailRules: [
-      '会员有效期为30天，从购买当天开始计算',
-      '会员期间享受优先接单特权',
-      '可享受专属客服服务',
-      '会员到期前3天会有提醒',
-      '支持随时续费，续费天数叠加'
-    ],
-    
-    // ========== 新增：跳转参数处理 ==========
-    // 用于接收从其他页面跳转过来的参数，决定是否自动滚动
-    jumpParams: {},
-    
-    // ========== 新增：支付方式选择 ==========
-    showPayMethodModal: false,   // 支付方式选择弹窗
-    currentBuyType: null,        // 当前购买类型：1会员 2押金 3积分
-    currentHuiyuanId: null,      // 当前选中的会员ID（用于会员购买）
-    currentYajinAmount: null,    // 当前押金金额（用于押金购买）
-    
-    // ========== 新增：余额抵扣身份选择 ==========
-    showBalanceModal: false,      // 余额抵扣身份选择弹窗
-    balanceOptions: [],           // 后端返回的身份列表
-    selectedBalanceId: null,      // 选中的身份ID
-    
-    // ========== 新增：余额抵扣确认弹窗 ==========
-    showConfirmModal: false,      // 余额抵扣确认弹窗
-    selectedBalanceInfo: null,    // 选中的身份详情（用于确认弹窗）
-    
-    // ========== 新增：会员详情弹窗 ==========
-    showMemberModal: false,
-    currentMemberDetail: null,
-  },
-
-  // ========== 生命周期函数 ==========
-  onLoad(options) {
-    //console.log('页面加载，跳转参数:', options);
-    
-    // ✅ 新增：保存跳转参数
-    this.setData({
-      jumpParams: options || {}
-    });
-    
-    this.initPage();
-  },
-
-  // pages/tijiao/tijiao.js 中添加 onHide 方法（如果已有则合并内容）
-onHide() {
-    const popupComp = this.selectComponent('#popupNotice');
-    if (popupComp && popupComp.cleanup) {
-      popupComp.cleanup();
-    }
-  },
-
-  onShow() {
-    // 每次显示页面都刷新数据
-    this.registerNotificationComponent();
-    this.loadFromGlobalData();
-    this.checkAndRefreshData();
-
-    // 调用统一弹窗组件检查并展示公告
-    PopupService.checkAndShow(this, 'dashouchongzhi');
-  },
-
-  // 注册通知组件（原有，保持不变）
-  registerNotificationComponent() {
-    const app = getApp();
-    const notificationComp = this.selectComponent('#global-notification');
-    
-    if (notificationComp && notificationComp.showNotification) {
-        
-        app.globalData.globalNotification = {
-            show: (data) => notificationComp.showNotification(data),
-            hide: () => notificationComp.hideNotification()
-        };
-    }
-  },
-
-  onReady() {
-    // ✅ 新增：页面渲染完成后处理自动滚动
-    this.handleAutoScroll();
-  },
-
-  // ========== 初始化页面 ==========
-  async initPage() {
-    // 从全局数据加载
-    this.loadFromGlobalData();
-    
-    // 获取会员商品列表
-    await this.fetchHuiyuanList();
-    
-    // 计算会员列表高度
-    this.calculateHuiyuanHeight();
-  },
-
-  // ========== 从全局变量加载数据 ==========
-  loadFromGlobalData() {
-    const app = getApp();
-    const globalData = app.globalData || {};
-    
-    // ✅ 重要：保持字段对应关系
-    // 全局变量中是 clumber，页面中是 clubmber
-    // 全局变量中是 jinfen，页面中是 jifen
-    this.setData({
-      clubmber: globalData.clumber || [],
-      yajin: globalData.yajin || 0,
-      jifen: globalData.jinfen || 0  // ✅ 注意：这里从 jinfen 读取
-    });
-    
-    // 计算积分进度条
-    this.calculateJifenProgress();
-  },
-
-  // ========== 计算积分进度条角度 ==========
-  calculateJifenProgress() {
-    const jifen = this.data.jifen || 0;
-    const progress = (jifen / 10) * 360; // 满分10分
-    this.setData({
-      jifenProgress: progress
-    });
-  },
-
-  // ========== 计算会员列表高度 ==========
-  calculateHuiyuanHeight() {
-    const clubmber = this.data.clubmber || [];
-    
-    const itemHeight = 100; // 每个会员标签高度
-    const maxHeight = 300;  // 最大高度（3个会员）
-    
-    let height = clubmber.length * itemHeight;
-    height = Math.min(height, maxHeight);
-    
-    this.setData({
-      huiyuanListHeight: height
-    });
-  },
-
-  // ========== 获取会员商品列表 ==========
-  async fetchHuiyuanList() {
-    try {
-      const res = await request({
-        url: '/shangpin/dshyhq',
-        method: 'POST',
-        data: {}
-      });
-
-      if (res.data.code === 200) {
-        const huiyuanList = res.data.data || [];
-        
-        // 处理数据，标记已购买的会员
-        const processedList = this.processHuiyuanList(huiyuanList);
-        
-        this.setData({
-          huiyuanList: processedList,
-          currentHuiyuan: processedList[0] || {}
-        });
-      } else {
-        wx.showToast({
-          title: res.data.message || '获取会员列表失败',
-          icon: 'none'
-        });
-      }
-    } catch (error) {
-      console.error('获取会员列表失败:', error);
-      wx.showToast({
-        title: '网络错误，请重试',
-        icon: 'none'
-      });
-    }
-  },
-
-  // ========== 处理会员列表，标记已购买的会员 ==========
-  processHuiyuanList(huiyuanList) {
-    const clubmber = this.data.clubmber || [];
-    
-    return huiyuanList.map(item => {
-      // 检查是否已购买（注意：会员ID字段是 id）
-      const boughtItem = clubmber.find(c => c.huiyuanid === item.id);
-      
-      return {
-        ...item,
-        isBought: !!boughtItem,
-        buyInfo: boughtItem || null
-      };
-    });
-  },
-
-  // ========== Swiper切换事件 ==========
-  onSwiperChange(e) {
-    const current = e.detail.current;
-    const huiyuanList = this.data.huiyuanList || [];
-    
-    this.setData({
-      currentHuiyuanIndex: current,
-      currentHuiyuan: huiyuanList[current] || {}
-    });
-  },
-
-  // ========== 手动选择会员 ==========
-  selectHuiyuan(e) {
-    const index = e.currentTarget.dataset.index;
-    const huiyuanList = this.data.huiyuanList || [];
-    
-    this.setData({
-      currentHuiyuanIndex: index,
-      currentHuiyuan: huiyuanList[index] || {}
-    });
-  },
-
-  // ========== 格式化到期时间 ==========
-  formatDaoqiTime(daoqi) {
-    if (!daoqi) return '';
-    
-    try {
-      // 如果是标准日期格式，格式化为 YYYY-MM-DD
-      if (daoqi.includes(' ')) {
-        const dateStr = daoqi.split(' ')[0];
-        const dateParts = dateStr.split('-');
-        if (dateParts.length === 3) {
-          return `${dateParts[0]}-${dateParts[1]}-${dateParts[2]}`;
-        }
-      }
-      return daoqi;
-    } catch (error) {
-      console.error('格式化到期时间错误:', error);
-      return daoqi;
-    }
-  },
-
-  // ========== 计算剩余时间 ==========
-  formatRemainTime(daoqi) {
-    if (!daoqi) return '';
-    
-    try {
-      const now = new Date();
-      const end = new Date(daoqi);
-      const diff = end - now;
-      
-      if (diff <= 0) return '已过期';
-      
-      const days = Math.floor(diff / (1000 * 60 * 60 * 24));
-      if (days > 0) {
-        return `${days}天`;
-      }
-      
-      const hours = Math.floor(diff / (1000 * 60 * 60));
-      if (hours > 0) {
-        return `${hours}小时`;
-      }
-      
-      return '即将到期';
-    } catch (error) {
-      console.error('计算剩余时间错误:', error);
-      return '时间错误';
-    }
-  },
-
-  // ========== 处理自动滚动 ==========
-  handleAutoScroll() {
-    const { jumpParams } = this.data;
-    
-    if (!jumpParams || !jumpParams.needScroll) return;
-    
-    setTimeout(() => {
-      let scrollTop = 0;
-      
-      if (jumpParams.scrollTo === 'bottom') {
-        scrollTop = 2000;
-      } else if (jumpParams.scrollTo === 'member') {
-        return;
-      }
-      
-      if (scrollTop > 0) {
-        wx.pageScrollTo({
-          scrollTop: scrollTop,
-          duration: 300
-        });
-      }
-    }, 800);
-  },
-
-  // ========== 押金充值相关 ==========
-  showYajinModal() {
-    this.setData({
-      showYajinModal: true,
-      yajinAmount: '100'
-    });
-  },
-
-  hideYajinModal() {
-    this.setData({
-      showYajinModal: false
-    });
-  },
-
-  onYajinInput(e) {
-    let value = e.detail.value;
-    value = value.replace(/[^\d]/g, '');
-    
-    if (value) {
-      const num = parseInt(value);
-      if (num < 1) value = '1';
-      if (num > 10000) value = '10000';
-    }
-    
-    this.setData({
-      yajinAmount: value
-    });
-  },
-
-  setYajinAmount(e) {
-    const amount = e.currentTarget.dataset.amount;
-    this.setData({
-      yajinAmount: amount
-    });
-  },
-
-  async handleYajinPay() {
-    const amount = this.data.yajinAmount;
-    
-    if (!amount || amount < 1 || amount > 10000) {
-      wx.showToast({
-        title: '请输入1-10000元的金额',
-        icon: 'none'
-      });
-      return;
-    }
-
-    this.showLoading('发起支付中...');
-
-    try {
-      const res = await request({
-        url: '/shangpin/yajingoumai',
-        method: 'POST',
-        data: {
-          jine: parseInt(amount)
-        }
-      });
-
-      if (res.data.code === 200) {
-        const payParams = res.data.payParams;
-        const dingdanid = res.data.dingdanid;
-        
-        this.setData({
-          currentDingdanid: dingdanid
-        });
-        
-        await this.wechatPay(payParams, 'yajin');
-      } else {
-        wx.showToast({
-          title: res.data.message || '支付发起失败',
-          icon: 'none'
-        });
-      }
-    } catch (error) {
-      console.error('押金支付失败:', error);
-      wx.showToast({
-        title: '支付失败，请重试',
-        icon: 'none'
-      });
-    } finally {
-      this.hideLoading();
-    }
-  },
-
-  // ========== 积分充值相关 ==========
-  // 🔥 修改点1：增加积分已满的硬拦截，不弹任何提示，直接返回
-  onJifenClick(e) {
-    // 优先判断积分是否已满（10分为满分）
-    if (this.data.jifen >= 10) {
-      // 积分已满，不弹窗，不提示，静默返回
-      return;
-    }
-
-    // 检查是否有会员
-    const clubmber = this.data.clubmber || [];
-    if (clubmber.length === 0) {
-      wx.showToast({
-        title: '请先购买会员才能充值积分',
-        icon: 'none',
-        duration: 3000
-      });
-      return;
-    }
-
-    // 积分未满，正常打开支付方式选择
-    this.setData({
-      currentBuyType: 3,
-      showPayMethodModal: true
-    });
-  },
-
-  // ========== 会员购买相关 ==========
-  async handleHuiyuanBuy(e) {
-    const huiyuanId = e.currentTarget.dataset.id;
-    
-    if (!huiyuanId) {
-      wx.showToast({
-        title: '会员信息错误',
-        icon: 'none'
-      });
-      return;
-    }
-
-    this.showLoading('发起会员支付中...');
-
-    try {
-      const res = await request({
-        url: '/shangpin/huiyuangm',
-        method: 'POST',
-        data: {
-          huiyuanid: huiyuanId
-        }
-      });
-
-      if (res.data.code === 200) {
-        const payParams = res.data.payParams;
-        const dingdanid = res.data.dingdanid;
-        
-        this.setData({
-          currentDingdanid: dingdanid
-        });
-        
-        await this.wechatPay(payParams, 'huiyuan', huiyuanId);
-      } else {
-        wx.showToast({
-          title: res.data.message || '会员支付发起失败',
-          icon: 'none'
-        });
-      }
-    } catch (error) {
-      console.error('会员支付失败:', error);
-      wx.showToast({
-        title: '支付失败，请重试',
-        icon: 'none'
-      });
-    } finally {
-      this.hideLoading();
-    }
-  },
-
-  // ========== 积分购买（微信支付）—— 已替换为正确的后端接口 ==========
-  async handleJifenBuy(e) {
-    const disabled = e.currentTarget.dataset.disabled;
-    
-    // 检查积分是否已满
-    if (disabled === 'true') {
-      wx.showToast({ title: '积分已满，无需补充', icon: 'none' });
-      return;
-    }
-
-    // 检查是否有会员
-    const clubmber = this.data.clubmber || [];
-    if (clubmber.length === 0) {
-      wx.showToast({ title: '请先购买会员才能充值积分', icon: 'none', duration: 3000 });
-      return;
-    }
-
-    this.showLoading('发起积分支付中...');
-
-    try {
-      const res = await request({
-        url: '/shangpin/jifenbc',    // 正确的积分下单接口
-        method: 'POST',
-        data: {}
-      });
-
-      if (res.data.code === 200) {
-        const payParams = res.data.payParams;
-        const dingdanid = res.data.dingdanid;
-        
-        this.setData({ currentDingdanid: dingdanid });
-        await this.wechatPay(payParams, 'jifen');
-      } else {
-        wx.showToast({ title: res.data.message || '积分支付发起失败', icon: 'none' });
-      }
-    } catch (error) {
-      wx.showToast({ title: '支付失败，请重试', icon: 'none' });
-    } finally {
-      this.hideLoading();
-    }
-  },
-
-  // ========== 微信支付封装 ==========
-  async wechatPay(payParams, payType, extraData = null) {
-    return new Promise((resolve, reject) => {
-      if (!payParams || !payParams.timeStamp || !payParams.paySign) {
-        wx.showToast({
-          title: '支付参数错误',
-          icon: 'none'
-        });
-        reject(new Error('支付参数错误'));
-        return;
-      }
-
-      this.showLoading('调起支付中...');
-
-      wx.requestPayment({
-        timeStamp: payParams.timeStamp,
-        nonceStr: payParams.nonceStr,
-        package: payParams.package,
-        signType: payParams.signType || 'MD5',
-        paySign: payParams.paySign,
-        success: async () => {
-          this.hideLoading();
-          
-          wx.showToast({
-            title: '支付成功！确认中...',
-            icon: 'none',
-            duration: 2000
-          });
-          
-          try {
-            await this.startPolling(payType, extraData);
-            resolve();
-          } catch (error) {
-            reject(error);
-          }
-        },
-        fail: async (res) => {
-          this.hideLoading();
-          
-          let errorMsg = '支付失败';
-          if (res.errMsg.includes('cancel')) {
-            errorMsg = '您取消了支付';
-          } else if (res.errMsg.includes('fail')) {
-            errorMsg = '支付失败，请重试';
-          }
-          
-          wx.showToast({
-            title: errorMsg,
-            icon: 'none'
-          });
-          
-          try {
-            await this.handlePayFailure(payType, extraData);
-          } catch (error) {
-            console.error('支付失败通知失败:', error);
-          }
-          
-          reject(new Error(res.errMsg));
-        }
-      });
-    });
-  },
-
-  // ========== 开始轮询支付结果 ==========
-  async startPolling(payType, extraData = null) {
-    const maxRetries = 10;
-    const interval = 2000;
-    const dingdanid = this.data.currentDingdanid;
-    
-    if (!dingdanid) {
-      wx.showToast({
-        title: '订单号缺失',
-        icon: 'none'
-      });
-      return;
-    }
-
-    this.showLoading('确认支付结果中...');
-
-    for (let i = 0; i < maxRetries; i++) {
-      try {
-        const pollResult = await this.checkPayStatus(payType, dingdanid, extraData);
-        
-        if (pollResult.success) {
-          this.hideLoading();
-          await this.updateAfterPayment(payType, extraData, pollResult.data);
-          
-          wx.showToast({
-            title: this.getSuccessMessage(payType),
-            icon: 'success',
-            duration: 2000
-          });
-          
-          return;
-        }
-        
-        await this.sleep(interval);
-      } catch (error) {
-        console.error(`轮询失败第${i + 1}次:`, error);
-      }
-    }
-
-    this.hideLoading();
-    wx.showToast({
-      title: '支付确认超时，请联系客服',
-      icon: 'none'
-    });
-  },
-
-  // ========== 检查支付状态 ==========
-  async checkPayStatus(payType, dingdanid, extraData = null) {
-    let url = '';
-    let data = { dingdanid: dingdanid };
-    
-    switch (payType) {
-      case 'yajin':
-        url = '/shangpin/yajinlunxun';
-        break;
-      case 'jifen':
-        url = '/shangpin/jifenlunxun';
-        break;
-      case 'huiyuan':
-        url = '/shangpin/huiyuanlx';
-        data.huiyuanid = extraData;
-        break;
-      default:
-        throw new Error('未知的支付类型');
-    }
-    
-    try {
-      const res = await request({
-        url,
-        method: 'POST',
-        data
-      });
-      
-      return {
-        success: res.data.code === 200,
-        data: res.data
-      };
-    } catch (error) {
-      console.error('检查支付状态失败:', error);
-      return {
-        success: false,
-        data: null
-      };
-    }
-  },
-
-  // ========== 支付失败处理 ==========
-  async handlePayFailure(payType, extraData = null) {
-    let url = '';
-    let data = { dingdanid: this.data.currentDingdanid };
-    
-    switch (payType) {
-      case 'yajin':
-        url = '/shangpin/yajinshibai';
-        break;
-      case 'jifen':
-        url = '/shangpin/jifenshibai';
-        break;
-      case 'huiyuan':
-        url = '/shangpin/huiyuanshibai';
-        data.huiyuanid = extraData;
-        break;
-      default:
-        return;
-    }
-    
-    try {
-      await request({
-        url,
-        method: 'POST',
-        data
-      });
-    } catch (error) {
-      console.error('支付失败通知失败:', error);
-    }
-  },
-
-  // ========== 支付成功后更新数据 ==========
-  async updateAfterPayment(payType, extraData = null, responseData = null) {
-    const app = getApp();
-    
-    switch (payType) {
-      case 'yajin':
-        if (responseData && responseData.yajin !== undefined) {
-          app.globalData.yajin = responseData.yajin;
-        }
-        await this.refreshYajinData();
-        break;
-        
-      case 'jifen':
-        if (responseData && responseData.jifen !== undefined) {
-          app.globalData.jinfen = responseData.jifen;
-        }
-        await this.refreshJifenData();
-        break;
-        
-      case 'huiyuan':
-        if (responseData && responseData.huiyuan) {
-          app.globalData.jinfen = responseData.jifen;
-          await this.updateClubmberData(responseData.huiyuan);
-        }
-        await this.refreshHuiyuanData(extraData);
-        break;
-    }
-    
-    this.loadFromGlobalData();
-  },
-
-  // ========== 刷新押金数据 ==========
-  async refreshYajinData() {
-    this.loadFromGlobalData();
-  },
-
-  // ========== 刷新积分数据 ==========
-  async refreshJifenData() {
-    this.loadFromGlobalData();
-  },
-
-  // ========== 刷新会员数据 ==========
-  async refreshHuiyuanData(huiyuanId) {
-    this.loadFromGlobalData();
-    await this.fetchHuiyuanList();
-  },
-
-  // ========== 更新会员数据到全局变量 ==========
-  async updateClubmberData(huiyuanData) {
-    const app = getApp();
-    const globalClubmber = app.globalData.clumber || [];
-    
-    const { huiyuanid, huiyuanming, daoqi } = huiyuanData;
-    
-    const index = globalClubmber.findIndex(item => item.huiyuanid === huiyuanid);
-    
-    if (index >= 0) {
-      globalClubmber[index].daoqi = daoqi;
-    } else {
-      globalClubmber.push({
-        huiyuanid: huiyuanid,
-        huiyuanming: huiyuanming,
-        daoqi: daoqi
-      });
-    }
-    
-    app.globalData.clumber = globalClubmber;
-    
-    this.setData({
-      clubmber: [...globalClubmber]
-    });
-  },
-
-  // ========== 检查并刷新数据 ==========
-  async checkAndRefreshData() {
-    this.loadFromGlobalData();
-  },
-
-  // ========== 工具方法 ==========
-  getSuccessMessage(payType) {
-    switch (payType) {
-      case 'yajin': return '押金充值成功';
-      case 'jifen': return '积分补充成功';
-      case 'huiyuan': return '会员购买成功';
-      default: return '支付成功';
-    }
-  },
-
-  showLoading(text = '加载中...') {
-    this.setData({
-      payLoading: true,
-      loadingText: text
-    });
-  },
-
-  hideLoading() {
-    this.setData({
-      payLoading: false
-    });
-  },
-
-  sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  },
-
-  // ========== 新增功能（余额抵扣等） ==========
-  onBuyHuiyuanClick(e) {
-    const huiyuanId = e.currentTarget.dataset.id;
-    this.setData({
-      currentBuyType: 1,
-      currentHuiyuanId: huiyuanId,
-      showPayMethodModal: true
-    });
-  },
-
-  onYajinClick() {
-    this.showYajinModal();
-  },
-
-  onYajinConfirm() {
-    const amount = this.data.yajinAmount;
-    if (!amount || amount < 1 || amount > 10000) {
-      wx.showToast({ title: '请输入1-10000元的金额', icon: 'none' });
-      return;
-    }
-    this.hideYajinModal();
-    this.setData({
-      currentBuyType: 2,
-      currentYajinAmount: amount,
-      showPayMethodModal: true
-    });
-  },
-
-  hidePayMethodModal() {
-    this.setData({ showPayMethodModal: false });
-  },
-
-  // 🔥 修改点2：选择支付方式时再次校验积分状态（防止异步过程中积分变化）
-  onPayMethodSelect(e) {
-    const method = e.currentTarget.dataset.method;
-    const { currentBuyType, currentHuiyuanId, currentYajinAmount, jifen } = this.data;
-    this.hidePayMethodModal();
-
-    // 如果是积分购买，且积分已满，直接拒绝
-    if (currentBuyType === 3 && jifen >= 10) {
-      wx.showToast({
-        title: '积分已满，无需补充',
-        icon: 'none'
-      });
-      return;
-    }
-
-    if (method === 'wx') {
-      if (currentBuyType === 1) {
-        this.handleHuiyuanBuy({ currentTarget: { dataset: { id: currentHuiyuanId } } });
-      } else if (currentBuyType === 2) {
-        this.setData({ yajinAmount: currentYajinAmount }, () => {
-          this.handleYajinPay();
-        });
-      } else if (currentBuyType === 3) {
-        // ✅ 调用已修正的积分支付函数
-        this.handleJifenBuy({ currentTarget: { dataset: { disabled: 'false' } } });
-      }
-    } else if (method === 'balance') {
-      this.fetchBalanceOptions();
-    }
-  },
-
-  // 🔥 修改点3：请求余额抵扣选项前校验积分状态
-  async fetchBalanceOptions() {
-    const { currentBuyType, currentHuiyuanId, currentYajinAmount, jifen } = this.data;
-    
-    // 如果是积分购买，且积分已满，拒绝发起余额抵扣
-    if (currentBuyType === 3 && jifen >= 10) {
-      wx.showToast({
-        title: '积分已满，无需补充',
-        icon: 'none'
-      });
-      return;
-    }
-
-    this.showLoading('获取抵扣信息...');
-    
-    try {
-      const res = await request({
-        url: '/shangpin/czhqdy',
-        method: 'POST',
-        data: {
-          leixing: currentBuyType,
-          huiyuan_id: currentBuyType === 1 ? currentHuiyuanId : undefined,
-          yajin_jine: currentBuyType === 2 ? parseInt(currentYajinAmount) : undefined,
-        }
-      });
-      if (res.data.code === 200) {
-        const options = res.data.data || [];
-        this.setData({
-          balanceOptions: options,
-          showBalanceModal: true
-        });
-      } else {
-        wx.showToast({ title: res.data.message || '获取失败', icon: 'none' });
-      }
-    } catch (error) {
-      console.error('获取抵扣身份失败:', error);
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    } finally {
-      this.hideLoading();
-    }
-  },
-
-  hideBalanceModal() {
-    this.setData({ showBalanceModal: false });
-  },
-
-  onBalanceSelect(e) {
-    const identityId = e.currentTarget.dataset.id;
-    const selected = this.data.balanceOptions.find(opt => opt.id === identityId);
-    if (!selected) return;
-    
-    this.setData({
-      selectedBalanceId: identityId,
-      selectedBalanceInfo: selected,
-      showConfirmModal: true,
-      showBalanceModal: false
-    });
-  },
-
-  hideConfirmModal() {
-    this.setData({ showConfirmModal: false });
-  },
-
-  async confirmBalancePay() {
-    const { selectedBalanceId, currentBuyType, currentHuiyuanId, currentYajinAmount } = this.data;
-    if (!selectedBalanceId) return;
-    
-    this.hideConfirmModal();
-    this.showLoading('抵扣支付中...');
-
-    try {
-      const res = await request({
-        url: '/shangpin/dsqrgmdh',
-        method: 'POST',
-        data: {
-          leixing: currentBuyType,
-          shenfen_id: selectedBalanceId,
-          huiyuan_id: currentBuyType === 1 ? currentHuiyuanId : undefined,
-          yajin_jine: currentBuyType === 2 ? parseInt(currentYajinAmount) : undefined,
-        }
-      });
-
-      if (res.data.code === 200) {
-        const responseData = res.data.data || {};
-        await this.updateAfterPayment(
-          currentBuyType === 1 ? 'huiyuan' : (currentBuyType === 2 ? 'yajin' : 'jifen'),
-          currentBuyType === 1 ? currentHuiyuanId : null,
-          responseData
-        );
-        wx.showToast({ title: '购买成功', icon: 'success' });
-      } else {
-        wx.showToast({ title: res.data.message || '购买失败', icon: 'none' });
-      }
-    } catch (error) {
-      console.error('抵扣支付失败:', error);
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    } finally {
-      this.hideLoading();
-    }
-  },
-
-  showMemberDetail(e) {
-    const item = e.currentTarget.dataset.item;
-    this.setData({
-      currentMemberDetail: item,
-      showMemberModal: true
-    });
-  },
-
-  hideMemberModal() {
-    this.setData({ showMemberModal: false });
-  },
+// pages/dashou-chongzhi/index.js
+import request from '../../utils/request';
+// 引入弹窗服务（路径根据实际调整）
+import PopupService from '../../services/popupService.js';
+
+Page({
+  data: {
+    // ========== 全局数据 ==========
+    clubmber: [],          // 会员列表（注意：全局变量中是 clumber，这里保持原样）
+    yajin: 0,              // 押金
+    jifen: 0,              // 积分（注意：全局变量中是 jinfen）
+    jifenProgress: 0,      // 积分进度条角度
+    
+    // ========== 会员商品列表 ==========
+    huiyuanList: [],       // 从后端获取的会员列表
+    currentHuiyuanIndex: 0, // 当前选中的会员索引
+    currentHuiyuan: {},    // 当前选中的会员详情
+    
+    // ========== 押金充值相关 ==========
+    showYajinModal: false, // 显示押金弹窗
+    yajinAmount: '100',    // 押金金额
+    
+    // ========== 支付相关 ==========
+    payLoading: false,     // 支付加载状态
+    loadingText: '支付中...',
+    
+    // ========== 订单ID记录 ==========
+    currentDingdanid: '',  // 当前操作的订单ID
+    
+    // ========== 计算高度 ==========
+    huiyuanListHeight: 120,
+    
+    // ========== 会员详情规则 ==========
+    detailRules: [
+      '会员有效期为30天，从购买当天开始计算',
+      '会员期间享受优先接单特权',
+      '可享受专属客服服务',
+      '会员到期前3天会有提醒',
+      '支持随时续费，续费天数叠加'
+    ],
+    
+    // ========== 新增：跳转参数处理 ==========
+    // 用于接收从其他页面跳转过来的参数，决定是否自动滚动
+    jumpParams: {},
+    
+    // ========== 新增：支付方式选择 ==========
+    showPayMethodModal: false,   // 支付方式选择弹窗
+    currentBuyType: null,        // 当前购买类型：1会员 2押金 3积分
+    currentHuiyuanId: null,      // 当前选中的会员ID（用于会员购买）
+    currentYajinAmount: null,    // 当前押金金额（用于押金购买）
+    
+    // ========== 新增：余额抵扣身份选择 ==========
+    showBalanceModal: false,      // 余额抵扣身份选择弹窗
+    balanceOptions: [],           // 后端返回的身份列表
+    selectedBalanceId: null,      // 选中的身份ID
+    
+    // ========== 新增：余额抵扣确认弹窗 ==========
+    showConfirmModal: false,      // 余额抵扣确认弹窗
+    selectedBalanceInfo: null,    // 选中的身份详情（用于确认弹窗）
+    
+    // ========== 新增：会员详情弹窗 ==========
+    showMemberModal: false,
+    currentMemberDetail: null,
+  },
+
+  // ========== 生命周期函数 ==========
+  onLoad(options) {
+    //console.log('页面加载，跳转参数:', options);
+    
+    // ✅ 新增：保存跳转参数
+    this.setData({
+      jumpParams: options || {}
+    });
+    
+    this.initPage();
+  },
+
+  // pages/submit/submit.js 中添加 onHide 方法（如果已有则合并内容）
+onHide() {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+      popupComp.cleanup();
+    }
+  },
+
+  onShow() {
+    // 每次显示页面都刷新数据
+    this.registerNotificationComponent();
+    this.loadFromGlobalData();
+    this.checkAndRefreshData();
+
+    // 调用统一弹窗组件检查并展示公告
+    PopupService.checkAndShow(this, 'dashouchongzhi');
+  },
+
+  // 注册通知组件（原有，保持不变）
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    
+    if (notificationComp && notificationComp.showNotification) {
+        
+        app.globalData.globalNotification = {
+            show: (data) => notificationComp.showNotification(data),
+            hide: () => notificationComp.hideNotification()
+        };
+    }
+  },
+
+  onReady() {
+    // ✅ 新增：页面渲染完成后处理自动滚动
+    this.handleAutoScroll();
+  },
+
+  // ========== 初始化页面 ==========
+  async initPage() {
+    // 从全局数据加载
+    this.loadFromGlobalData();
+    
+    // 获取会员商品列表
+    await this.fetchHuiyuanList();
+    
+    // 计算会员列表高度
+    this.calculateHuiyuanHeight();
+  },
+
+  // ========== 从全局变量加载数据 ==========
+  loadFromGlobalData() {
+    const app = getApp();
+    const globalData = app.globalData || {};
+    
+    // ✅ 重要：保持字段对应关系
+    // 全局变量中是 clumber，页面中是 clubmber
+    // 全局变量中是 jinfen，页面中是 jifen
+    this.setData({
+      clubmber: globalData.clumber || [],
+      yajin: globalData.yajin || 0,
+      jifen: globalData.jinfen || 0  // ✅ 注意：这里从 jinfen 读取
+    });
+    
+    // 计算积分进度条
+    this.calculateJifenProgress();
+  },
+
+  // ========== 计算积分进度条角度 ==========
+  calculateJifenProgress() {
+    const jifen = this.data.jifen || 0;
+    const progress = (jifen / 10) * 360; // 满分10分
+    this.setData({
+      jifenProgress: progress
+    });
+  },
+
+  // ========== 计算会员列表高度 ==========
+  calculateHuiyuanHeight() {
+    const clubmber = this.data.clubmber || [];
+    
+    const itemHeight = 100; // 每个会员标签高度
+    const maxHeight = 300;  // 最大高度（3个会员）
+    
+    let height = clubmber.length * itemHeight;
+    height = Math.min(height, maxHeight);
+    
+    this.setData({
+      huiyuanListHeight: height
+    });
+  },
+
+  // ========== 获取会员商品列表 ==========
+  async fetchHuiyuanList() {
+    try {
+      const res = await request({
+        url: '/shangpin/dshyhq',
+        method: 'POST',
+        data: {}
+      });
+
+      if (res.data.code === 200) {
+        const huiyuanList = res.data.data || [];
+        
+        // 处理数据，标记已购买的会员
+        const processedList = this.processHuiyuanList(huiyuanList);
+        
+        this.setData({
+          huiyuanList: processedList,
+          currentHuiyuan: processedList[0] || {}
+        });
+      } else {
+        wx.showToast({
+          title: res.data.message || '获取会员列表失败',
+          icon: 'none'
+        });
+      }
+    } catch (error) {
+      console.error('获取会员列表失败:', error);
+      wx.showToast({
+        title: '网络错误，请重试',
+        icon: 'none'
+      });
+    }
+  },
+
+  // ========== 处理会员列表，标记已购买的会员 ==========
+  processHuiyuanList(huiyuanList) {
+    const clubmber = this.data.clubmber || [];
+    
+    return huiyuanList.map(item => {
+      // 检查是否已购买（注意：会员ID字段是 id）
+      const boughtItem = clubmber.find(c => c.huiyuanid === item.id);
+      
+      return {
+        ...item,
+        isBought: !!boughtItem,
+        buyInfo: boughtItem || null
+      };
+    });
+  },
+
+  // ========== Swiper切换事件 ==========
+  onSwiperChange(e) {
+    const current = e.detail.current;
+    const huiyuanList = this.data.huiyuanList || [];
+    
+    this.setData({
+      currentHuiyuanIndex: current,
+      currentHuiyuan: huiyuanList[current] || {}
+    });
+  },
+
+  // ========== 手动选择会员 ==========
+  selectHuiyuan(e) {
+    const index = e.currentTarget.dataset.index;
+    const huiyuanList = this.data.huiyuanList || [];
+    
+    this.setData({
+      currentHuiyuanIndex: index,
+      currentHuiyuan: huiyuanList[index] || {}
+    });
+  },
+
+  // ========== 格式化到期时间 ==========
+  formatDaoqiTime(daoqi) {
+    if (!daoqi) return '';
+    
+    try {
+      // 如果是标准日期格式，格式化为 YYYY-MM-DD
+      if (daoqi.includes(' ')) {
+        const dateStr = daoqi.split(' ')[0];
+        const dateParts = dateStr.split('-');
+        if (dateParts.length === 3) {
+          return `${dateParts[0]}-${dateParts[1]}-${dateParts[2]}`;
+        }
+      }
+      return daoqi;
+    } catch (error) {
+      console.error('格式化到期时间错误:', error);
+      return daoqi;
+    }
+  },
+
+  // ========== 计算剩余时间 ==========
+  formatRemainTime(daoqi) {
+    if (!daoqi) return '';
+    
+    try {
+      const now = new Date();
+      const end = new Date(daoqi);
+      const diff = end - now;
+      
+      if (diff <= 0) return '已过期';
+      
+      const days = Math.floor(diff / (1000 * 60 * 60 * 24));
+      if (days > 0) {
+        return `${days}天`;
+      }
+      
+      const hours = Math.floor(diff / (1000 * 60 * 60));
+      if (hours > 0) {
+        return `${hours}小时`;
+      }
+      
+      return '即将到期';
+    } catch (error) {
+      console.error('计算剩余时间错误:', error);
+      return '时间错误';
+    }
+  },
+
+  // ========== 处理自动滚动 ==========
+  handleAutoScroll() {
+    const { jumpParams } = this.data;
+    
+    if (!jumpParams || !jumpParams.needScroll) return;
+    
+    setTimeout(() => {
+      let scrollTop = 0;
+      
+      if (jumpParams.scrollTo === 'bottom') {
+        scrollTop = 2000;
+      } else if (jumpParams.scrollTo === 'member') {
+        return;
+      }
+      
+      if (scrollTop > 0) {
+        wx.pageScrollTo({
+          scrollTop: scrollTop,
+          duration: 300
+        });
+      }
+    }, 800);
+  },
+
+  // ========== 押金充值相关 ==========
+  showYajinModal() {
+    this.setData({
+      showYajinModal: true,
+      yajinAmount: '100'
+    });
+  },
+
+  hideYajinModal() {
+    this.setData({
+      showYajinModal: false
+    });
+  },
+
+  onYajinInput(e) {
+    let value = e.detail.value;
+    value = value.replace(/[^\d]/g, '');
+    
+    if (value) {
+      const num = parseInt(value);
+      if (num < 1) value = '1';
+      if (num > 10000) value = '10000';
+    }
+    
+    this.setData({
+      yajinAmount: value
+    });
+  },
+
+  setYajinAmount(e) {
+    const amount = e.currentTarget.dataset.amount;
+    this.setData({
+      yajinAmount: amount
+    });
+  },
+
+  async handleYajinPay() {
+    const amount = this.data.yajinAmount;
+    
+    if (!amount || amount < 1 || amount > 10000) {
+      wx.showToast({
+        title: '请输入1-10000元的金额',
+        icon: 'none'
+      });
+      return;
+    }
+
+    this.showLoading('发起支付中...');
+
+    try {
+      const res = await request({
+        url: '/shangpin/yajingoumai',
+        method: 'POST',
+        data: {
+          jine: parseInt(amount)
+        }
+      });
+
+      if (res.data.code === 200) {
+        const payParams = res.data.payParams;
+        const dingdanid = res.data.dingdanid;
+        
+        this.setData({
+          currentDingdanid: dingdanid
+        });
+        
+        await this.wechatPay(payParams, 'yajin');
+      } else {
+        wx.showToast({
+          title: res.data.message || '支付发起失败',
+          icon: 'none'
+        });
+      }
+    } catch (error) {
+      console.error('押金支付失败:', error);
+      wx.showToast({
+        title: '支付失败，请重试',
+        icon: 'none'
+      });
+    } finally {
+      this.hideLoading();
+    }
+  },
+
+  // ========== 积分充值相关 ==========
+  // 🔥 修改点1：增加积分已满的硬拦截，不弹任何提示，直接返回
+  onJifenClick(e) {
+    // 优先判断积分是否已满（10分为满分）
+    if (this.data.jifen >= 10) {
+      // 积分已满，不弹窗，不提示，静默返回
+      return;
+    }
+
+    // 检查是否有会员
+    const clubmber = this.data.clubmber || [];
+    if (clubmber.length === 0) {
+      wx.showToast({
+        title: '请先购买会员才能充值积分',
+        icon: 'none',
+        duration: 3000
+      });
+      return;
+    }
+
+    // 积分未满，正常打开支付方式选择
+    this.setData({
+      currentBuyType: 3,
+      showPayMethodModal: true
+    });
+  },
+
+  // ========== 会员购买相关 ==========
+  async handleHuiyuanBuy(e) {
+    const huiyuanId = e.currentTarget.dataset.id;
+    
+    if (!huiyuanId) {
+      wx.showToast({
+        title: '会员信息错误',
+        icon: 'none'
+      });
+      return;
+    }
+
+    this.showLoading('发起会员支付中...');
+
+    try {
+      const res = await request({
+        url: '/shangpin/huiyuangm',
+        method: 'POST',
+        data: {
+          huiyuanid: huiyuanId
+        }
+      });
+
+      if (res.data.code === 200) {
+        const payParams = res.data.payParams;
+        const dingdanid = res.data.dingdanid;
+        
+        this.setData({
+          currentDingdanid: dingdanid
+        });
+        
+        await this.wechatPay(payParams, 'huiyuan', huiyuanId);
+      } else {
+        wx.showToast({
+          title: res.data.message || '会员支付发起失败',
+          icon: 'none'
+        });
+      }
+    } catch (error) {
+      console.error('会员支付失败:', error);
+      wx.showToast({
+        title: '支付失败，请重试',
+        icon: 'none'
+      });
+    } finally {
+      this.hideLoading();
+    }
+  },
+
+  // ========== 积分购买（微信支付）—— 已替换为正确的后端接口 ==========
+  async handleJifenBuy(e) {
+    const disabled = e.currentTarget.dataset.disabled;
+    
+    // 检查积分是否已满
+    if (disabled === 'true') {
+      wx.showToast({ title: '积分已满，无需补充', icon: 'none' });
+      return;
+    }
+
+    // 检查是否有会员
+    const clubmber = this.data.clubmber || [];
+    if (clubmber.length === 0) {
+      wx.showToast({ title: '请先购买会员才能充值积分', icon: 'none', duration: 3000 });
+      return;
+    }
+
+    this.showLoading('发起积分支付中...');
+
+    try {
+      const res = await request({
+        url: '/shangpin/jifenbc',    // 正确的积分下单接口
+        method: 'POST',
+        data: {}
+      });
+
+      if (res.data.code === 200) {
+        const payParams = res.data.payParams;
+        const dingdanid = res.data.dingdanid;
+        
+        this.setData({ currentDingdanid: dingdanid });
+        await this.wechatPay(payParams, 'jifen');
+      } else {
+        wx.showToast({ title: res.data.message || '积分支付发起失败', icon: 'none' });
+      }
+    } catch (error) {
+      wx.showToast({ title: '支付失败，请重试', icon: 'none' });
+    } finally {
+      this.hideLoading();
+    }
+  },
+
+  // ========== 微信支付封装 ==========
+  async wechatPay(payParams, payType, extraData = null) {
+    return new Promise((resolve, reject) => {
+      if (!payParams || !payParams.timeStamp || !payParams.paySign) {
+        wx.showToast({
+          title: '支付参数错误',
+          icon: 'none'
+        });
+        reject(new Error('支付参数错误'));
+        return;
+      }
+
+      this.showLoading('调起支付中...');
+
+      wx.requestPayment({
+        timeStamp: payParams.timeStamp,
+        nonceStr: payParams.nonceStr,
+        package: payParams.package,
+        signType: payParams.signType || 'MD5',
+        paySign: payParams.paySign,
+        success: async () => {
+          this.hideLoading();
+          
+          wx.showToast({
+            title: '支付成功！确认中...',
+            icon: 'none',
+            duration: 2000
+          });
+          
+          try {
+            await this.startPolling(payType, extraData);
+            resolve();
+          } catch (error) {
+            reject(error);
+          }
+        },
+        fail: async (res) => {
+          this.hideLoading();
+          
+          let errorMsg = '支付失败';
+          if (res.errMsg.includes('cancel')) {
+            errorMsg = '您取消了支付';
+          } else if (res.errMsg.includes('fail')) {
+            errorMsg = '支付失败，请重试';
+          }
+          
+          wx.showToast({
+            title: errorMsg,
+            icon: 'none'
+          });
+          
+          try {
+            await this.handlePayFailure(payType, extraData);
+          } catch (error) {
+            console.error('支付失败通知失败:', error);
+          }
+          
+          reject(new Error(res.errMsg));
+        }
+      });
+    });
+  },
+
+  // ========== 开始轮询支付结果 ==========
+  async startPolling(payType, extraData = null) {
+    const maxRetries = 10;
+    const interval = 2000;
+    const dingdanid = this.data.currentDingdanid;
+    
+    if (!dingdanid) {
+      wx.showToast({
+        title: '订单号缺失',
+        icon: 'none'
+      });
+      return;
+    }
+
+    this.showLoading('确认支付结果中...');
+
+    for (let i = 0; i < maxRetries; i++) {
+      try {
+        const pollResult = await this.checkPayStatus(payType, dingdanid, extraData);
+        
+        if (pollResult.success) {
+          this.hideLoading();
+          await this.updateAfterPayment(payType, extraData, pollResult.data);
+          
+          wx.showToast({
+            title: this.getSuccessMessage(payType),
+            icon: 'success',
+            duration: 2000
+          });
+          
+          return;
+        }
+        
+        await this.sleep(interval);
+      } catch (error) {
+        console.error(`轮询失败第${i + 1}次:`, error);
+      }
+    }
+
+    this.hideLoading();
+    wx.showToast({
+      title: '支付确认超时，请联系客服',
+      icon: 'none'
+    });
+  },
+
+  // ========== 检查支付状态 ==========
+  async checkPayStatus(payType, dingdanid, extraData = null) {
+    let url = '';
+    let data = { dingdanid: dingdanid };
+    
+    switch (payType) {
+      case 'yajin':
+        url = '/shangpin/yajinlunxun';
+        break;
+      case 'jifen':
+        url = '/shangpin/jifenlunxun';
+        break;
+      case 'huiyuan':
+        url = '/shangpin/huiyuanlx';
+        data.huiyuanid = extraData;
+        break;
+      default:
+        throw new Error('未知的支付类型');
+    }
+    
+    try {
+      const res = await request({
+        url,
+        method: 'POST',
+        data
+      });
+      
+      return {
+        success: res.data.code === 200,
+        data: res.data
+      };
+    } catch (error) {
+      console.error('检查支付状态失败:', error);
+      return {
+        success: false,
+        data: null
+      };
+    }
+  },
+
+  // ========== 支付失败处理 ==========
+  async handlePayFailure(payType, extraData = null) {
+    let url = '';
+    let data = { dingdanid: this.data.currentDingdanid };
+    
+    switch (payType) {
+      case 'yajin':
+        url = '/shangpin/yajinshibai';
+        break;
+      case 'jifen':
+        url = '/shangpin/jifenshibai';
+        break;
+      case 'huiyuan':
+        url = '/shangpin/huiyuanshibai';
+        data.huiyuanid = extraData;
+        break;
+      default:
+        return;
+    }
+    
+    try {
+      await request({
+        url,
+        method: 'POST',
+        data
+      });
+    } catch (error) {
+      console.error('支付失败通知失败:', error);
+    }
+  },
+
+  // ========== 支付成功后更新数据 ==========
+  async updateAfterPayment(payType, extraData = null, responseData = null) {
+    const app = getApp();
+    
+    switch (payType) {
+      case 'yajin':
+        if (responseData && responseData.yajin !== undefined) {
+          app.globalData.yajin = responseData.yajin;
+        }
+        await this.refreshYajinData();
+        break;
+        
+      case 'jifen':
+        if (responseData && responseData.jifen !== undefined) {
+          app.globalData.jinfen = responseData.jifen;
+        }
+        await this.refreshJifenData();
+        break;
+        
+      case 'huiyuan':
+        if (responseData && responseData.huiyuan) {
+          app.globalData.jinfen = responseData.jifen;
+          await this.updateClubmberData(responseData.huiyuan);
+        }
+        await this.refreshHuiyuanData(extraData);
+        break;
+    }
+    
+    this.loadFromGlobalData();
+  },
+
+  // ========== 刷新押金数据 ==========
+  async refreshYajinData() {
+    this.loadFromGlobalData();
+  },
+
+  // ========== 刷新积分数据 ==========
+  async refreshJifenData() {
+    this.loadFromGlobalData();
+  },
+
+  // ========== 刷新会员数据 ==========
+  async refreshHuiyuanData(huiyuanId) {
+    this.loadFromGlobalData();
+    await this.fetchHuiyuanList();
+  },
+
+  // ========== 更新会员数据到全局变量 ==========
+  async updateClubmberData(huiyuanData) {
+    const app = getApp();
+    const globalClubmber = app.globalData.clumber || [];
+    
+    const { huiyuanid, huiyuanming, daoqi } = huiyuanData;
+    
+    const index = globalClubmber.findIndex(item => item.huiyuanid === huiyuanid);
+    
+    if (index >= 0) {
+      globalClubmber[index].daoqi = daoqi;
+    } else {
+      globalClubmber.push({
+        huiyuanid: huiyuanid,
+        huiyuanming: huiyuanming,
+        daoqi: daoqi
+      });
+    }
+    
+    app.globalData.clumber = globalClubmber;
+    
+    this.setData({
+      clubmber: [...globalClubmber]
+    });
+  },
+
+  // ========== 检查并刷新数据 ==========
+  async checkAndRefreshData() {
+    this.loadFromGlobalData();
+  },
+
+  // ========== 工具方法 ==========
+  getSuccessMessage(payType) {
+    switch (payType) {
+      case 'yajin': return '押金充值成功';
+      case 'jifen': return '积分补充成功';
+      case 'huiyuan': return '会员购买成功';
+      default: return '支付成功';
+    }
+  },
+
+  showLoading(text = '加载中...') {
+    this.setData({
+      payLoading: true,
+      loadingText: text
+    });
+  },
+
+  hideLoading() {
+    this.setData({
+      payLoading: false
+    });
+  },
+
+  sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  },
+
+  // ========== 新增功能（余额抵扣等） ==========
+  onBuyHuiyuanClick(e) {
+    const huiyuanId = e.currentTarget.dataset.id;
+    this.setData({
+      currentBuyType: 1,
+      currentHuiyuanId: huiyuanId,
+      showPayMethodModal: true
+    });
+  },
+
+  onYajinClick() {
+    this.showYajinModal();
+  },
+
+  onYajinConfirm() {
+    const amount = this.data.yajinAmount;
+    if (!amount || amount < 1 || amount > 10000) {
+      wx.showToast({ title: '请输入1-10000元的金额', icon: 'none' });
+      return;
+    }
+    this.hideYajinModal();
+    this.setData({
+      currentBuyType: 2,
+      currentYajinAmount: amount,
+      showPayMethodModal: true
+    });
+  },
+
+  hidePayMethodModal() {
+    this.setData({ showPayMethodModal: false });
+  },
+
+  // 🔥 修改点2：选择支付方式时再次校验积分状态（防止异步过程中积分变化）
+  onPayMethodSelect(e) {
+    const method = e.currentTarget.dataset.method;
+    const { currentBuyType, currentHuiyuanId, currentYajinAmount, jifen } = this.data;
+    this.hidePayMethodModal();
+
+    // 如果是积分购买，且积分已满，直接拒绝
+    if (currentBuyType === 3 && jifen >= 10) {
+      wx.showToast({
+        title: '积分已满，无需补充',
+        icon: 'none'
+      });
+      return;
+    }
+
+    if (method === 'wx') {
+      if (currentBuyType === 1) {
+        this.handleHuiyuanBuy({ currentTarget: { dataset: { id: currentHuiyuanId } } });
+      } else if (currentBuyType === 2) {
+        this.setData({ yajinAmount: currentYajinAmount }, () => {
+          this.handleYajinPay();
+        });
+      } else if (currentBuyType === 3) {
+        // ✅ 调用已修正的积分支付函数
+        this.handleJifenBuy({ currentTarget: { dataset: { disabled: 'false' } } });
+      }
+    } else if (method === 'balance') {
+      this.fetchBalanceOptions();
+    }
+  },
+
+  // 🔥 修改点3：请求余额抵扣选项前校验积分状态
+  async fetchBalanceOptions() {
+    const { currentBuyType, currentHuiyuanId, currentYajinAmount, jifen } = this.data;
+    
+    // 如果是积分购买，且积分已满，拒绝发起余额抵扣
+    if (currentBuyType === 3 && jifen >= 10) {
+      wx.showToast({
+        title: '积分已满，无需补充',
+        icon: 'none'
+      });
+      return;
+    }
+
+    this.showLoading('获取抵扣信息...');
+    
+    try {
+      const res = await request({
+        url: '/shangpin/czhqdy',
+        method: 'POST',
+        data: {
+          leixing: currentBuyType,
+          huiyuan_id: currentBuyType === 1 ? currentHuiyuanId : undefined,
+          yajin_jine: currentBuyType === 2 ? parseInt(currentYajinAmount) : undefined,
+        }
+      });
+      if (res.data.code === 200) {
+        const options = res.data.data || [];
+        this.setData({
+          balanceOptions: options,
+          showBalanceModal: true
+        });
+      } else {
+        wx.showToast({ title: res.data.message || '获取失败', icon: 'none' });
+      }
+    } catch (error) {
+      console.error('获取抵扣身份失败:', error);
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+      this.hideLoading();
+    }
+  },
+
+  hideBalanceModal() {
+    this.setData({ showBalanceModal: false });
+  },
+
+  onBalanceSelect(e) {
+    const identityId = e.currentTarget.dataset.id;
+    const selected = this.data.balanceOptions.find(opt => opt.id === identityId);
+    if (!selected) return;
+    
+    this.setData({
+      selectedBalanceId: identityId,
+      selectedBalanceInfo: selected,
+      showConfirmModal: true,
+      showBalanceModal: false
+    });
+  },
+
+  hideConfirmModal() {
+    this.setData({ showConfirmModal: false });
+  },
+
+  async confirmBalancePay() {
+    const { selectedBalanceId, currentBuyType, currentHuiyuanId, currentYajinAmount } = this.data;
+    if (!selectedBalanceId) return;
+    
+    this.hideConfirmModal();
+    this.showLoading('抵扣支付中...');
+
+    try {
+      const res = await request({
+        url: '/shangpin/dsqrgmdh',
+        method: 'POST',
+        data: {
+          leixing: currentBuyType,
+          shenfen_id: selectedBalanceId,
+          huiyuan_id: currentBuyType === 1 ? currentHuiyuanId : undefined,
+          yajin_jine: currentBuyType === 2 ? parseInt(currentYajinAmount) : undefined,
+        }
+      });
+
+      if (res.data.code === 200) {
+        const responseData = res.data.data || {};
+        await this.updateAfterPayment(
+          currentBuyType === 1 ? 'huiyuan' : (currentBuyType === 2 ? 'yajin' : 'jifen'),
+          currentBuyType === 1 ? currentHuiyuanId : null,
+          responseData
+        );
+        wx.showToast({ title: '购买成功', icon: 'success' });
+      } else {
+        wx.showToast({ title: res.data.message || '购买失败', icon: 'none' });
+      }
+    } catch (error) {
+      console.error('抵扣支付失败:', error);
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+      this.hideLoading();
+    }
+  },
+
+  showMemberDetail(e) {
+    const item = e.currentTarget.dataset.item;
+    this.setData({
+      currentMemberDetail: item,
+      showMemberModal: true
+    });
+  },
+
+  hideMemberModal() {
+    this.setData({ showMemberModal: false });
+  },
 });
\ No newline at end of file
diff --git a/pages/dashouchongzhi/dashouchongzhi.json b/pages/fighter-recharge/fighter-recharge.json
similarity index 100%
rename from pages/dashouchongzhi/dashouchongzhi.json
rename to pages/fighter-recharge/fighter-recharge.json
diff --git a/pages/dashouchongzhi/dashouchongzhi.wxml b/pages/fighter-recharge/fighter-recharge.wxml
similarity index 100%
rename from pages/dashouchongzhi/dashouchongzhi.wxml
rename to pages/fighter-recharge/fighter-recharge.wxml
diff --git a/pages/dashouchongzhi/dashouchongzhi.wxss b/pages/fighter-recharge/fighter-recharge.wxss
similarity index 100%
rename from pages/dashouchongzhi/dashouchongzhi.wxss
rename to pages/fighter-recharge/fighter-recharge.wxss
diff --git a/pages/dashouguize/dashouguize.js b/pages/fighter-rules/fighter-rules.js
similarity index 100%
rename from pages/dashouguize/dashouguize.js
rename to pages/fighter-rules/fighter-rules.js
diff --git a/pages/dashouguize/dashouguize.json b/pages/fighter-rules/fighter-rules.json
similarity index 100%
rename from pages/dashouguize/dashouguize.json
rename to pages/fighter-rules/fighter-rules.json
diff --git a/pages/dashouguize/dashouguize.wxml b/pages/fighter-rules/fighter-rules.wxml
similarity index 100%
rename from pages/dashouguize/dashouguize.wxml
rename to pages/fighter-rules/fighter-rules.wxml
diff --git a/pages/dashouguize/dashouguize.wxss b/pages/fighter-rules/fighter-rules.wxss
similarity index 100%
rename from pages/dashouguize/dashouguize.wxss
rename to pages/fighter-rules/fighter-rules.wxss
diff --git a/pages/dashouduan/dashouduan.js b/pages/fighter/fighter.js
similarity index 91%
rename from pages/dashouduan/dashouduan.js
rename to pages/fighter/fighter.js
index 2f5861a..e4b9270 100644
--- a/pages/dashouduan/dashouduan.js
+++ b/pages/fighter/fighter.js
@@ -1,1188 +1,1184 @@
-// pages/dashouzhongxin/dashouzhongxin.js
-import request from '../../utils/request.js'
-import popupService from '../../services/popupService.js'
-import {
-  isRoleStatusActive,
-  isCenterPageActive,
-  syncRoleStatuses,
-  syncProfileFields,
-  syncGroupFields,
-  ensureRoleOnCenterPage,
-  clearCacheAndEnterNormal,
-} from '../../utils/role-tab-bar.js'
-import { lockPrimaryRole, migrateLegacyCenterRole, enterLockedRole } from '../../utils/primary-role.js'
-import { resolveAvatarUrl, resolveAvatarFromStorage } from '../../utils/avatar.js'
-import { openPrivateChat, buildInviterPeerId } from '../../utils/im-user.js'
-
-const PLATFORM_INVITE_CODE = '0000008RffVgKHMj7kQC'
-
-Page({
-  data: {
-    // 🆕 图片路径对象（逻辑层拼接完整URL）
-    imgUrls: {},
-    
-    isDashou: false,
-    isGuanshi: false,
-    isZuzhang: false,
-    isKaoheguan: false,
-    isShangjia: false,
-    shangjiaCertified: false,
-    totalAssets: '0.00',
-    assetBreakdown: [],
-    pendingAuthList: [],
-    showAuthSection: false,
-    isLoading: false,
-    inviteCode: '',
-    guanshiInviteCode: '',
-    zuzhangInviteCode: '',
-    uid: '',
-    touxiang: '',
-    avatarUrl: '',
-    dashouNicheng: '',
-    zhanghaoStatus: '',
-    yongjin: '',
-    zonge: '',
-    yajin: '',
-    chenghao: '',
-    jinfen: '',
-    clumber: [],
-    chengjiaoliang: '',
-    zaixianZhuangtai: 0,
-    lastRefreshTime: 0,
-    canRefresh: true,
-    isAutoRegistering: false,
-    inviterCache: null,
-    zuzhangInviterCache: null,
-    chenghaoList: [],
-    guanshiChenghaoList: [],
-    gszhstatus: '',
-    yaoqingzongshu: 0,
-    fenyongzonge: '0.00',
-    fenyongtixian: '0.00',
-    yichongzhiDashou: 0,
-    zhuanhualv: 0,
-    ketixian: '0.00',
-    guanshiCount: 0,
-    fenhongZonge: '0.00',
-    kaoheYue: '0.00',
-    kaoheZonge: '0.00',
-    shenheZongshu: 0,
-    tongguoZongshu: 0,
-    pendingShenheCount: 0,
-    layoutSparse: false,
-    rankBoardList: [
-      { type: 'dashou', name: '打手榜', sub: '接单成交', icon: '', shapeClass: 'rank-shape-left', themeClass: 'rank-theme-blue' },
-      { type: 'guanshi', name: '管事榜', sub: '邀请收入', icon: '', shapeClass: 'rank-shape-right', themeClass: 'rank-theme-gold' },
-      { type: 'zuzhang', name: '组长榜', sub: '团队分红', icon: '', shapeClass: 'rank-shape-left', themeClass: 'rank-theme-purple' },
-      { type: 'shangjia', name: '商家榜', sub: '派单流水', icon: '', shapeClass: 'rank-shape-right', themeClass: 'rank-theme-orange' },
-    ],
-  },
-
-  _buildImgUrls(ossImageUrl) {
-    const dsBase = ossImageUrl + 'beijing/dashouduan/';
-    const iconBase = ossImageUrl + 'beijing/dashouduan/dashoutubiaobeijing/';
-    const gsBase = ossImageUrl + 'beijing/guanshiduan/';
-    const khBase = ossImageUrl + 'beijing/kaohe/';
-    return {
-      pageBg: dsBase + 'page-bg.jpg',
-      userCardBg: dsBase + 'user-card-bg.png',
-      vipCardBg: dsBase + 'vip-card-bg.jpg',
-      assetPanelBg: dsBase + 'asset-panel-bg.png',
-      rankHubBg: dsBase + 'rank-hub-bg.png',
-      rankTileBg: dsBase + 'rank-tile-bg.png',
-      funcPanelBg: dsBase + 'func-panel-bg.png',
-      listBg: dsBase + 'list-card-bg.png',
-      topBg: iconBase + 'top-bg.jpg',
-      cardBg: iconBase + 'card-bg.jpg',
-      iconRefresh: gsBase + 'icon-refresh.png',
-      iconCopy: gsBase + 'icon-copy.png',
-      iconVip: dsBase + 'icon-vip.png',
-      iconArrowLight: dsBase + 'icon-arrow-light.png',
-      iconSectionAsset: dsBase + 'icon-section-asset.png',
-      iconSectionRank: dsBase + 'icon-section-rank.png',
-      iconSectionFunc: dsBase + 'icon-section-func.png',
-      iconSectionGuanshi: dsBase + 'icon-section-guanshi.png',
-      iconSectionZuzhang: dsBase + 'icon-section-zuzhang.png',
-      iconSectionKaohe: dsBase + 'icon-section-kaohe.png',
-      iconSectionMore: dsBase + 'icon-section-more.png',
-      iconRankDashou: dsBase + 'rank-dashou.png',
-      iconRankGuanshi: dsBase + 'rank-guanshi.png',
-      iconRankZuzhang: dsBase + 'rank-zuzhang.png',
-      iconRankShangjia: dsBase + 'rank-shangjia.png',
-      iconGame: iconBase + 'icon-game.jpg',
-      iconRecharge: iconBase + 'icon-recharge.jpg',
-      iconOrders: iconBase + 'icon-orders.jpg',
-      iconPunish: iconBase + 'icon-punish.jpg',
-      iconRank: iconBase + 'icon-rank.jpg',
-      iconInvite: gsBase + 'icon-invite.png',
-      iconMedal: iconBase + 'icon-medal.jpg',
-      iconEdit: iconBase + 'icon-edit.jpg',
-      iconBook: iconBase + 'icon-book.jpg',
-      iconArrow: gsBase + 'icon-arrow.png',
-      iconSub: gsBase + 'icon-sub.png',
-      iconRecord: gsBase + 'icon-record.png',
-      iconPoster: gsBase + 'icon-poster.png',
-      iconWithdraw: gsBase + 'icon-withdraw.png',
-      iconContact: gsBase + 'icon-contact.png',
-      avatarDefault: ossImageUrl + 'avatar/default.jpg',
-      iconClear: ossImageUrl + 'beijing/tubiao/grzx_qingchu.jpg',
-      iconKefu: ossImageUrl + 'beijing/tubiao/grzx_kefu.jpg',
-      iconKuaishou: ossImageUrl + 'beijing/tubiao/grzx_guanzhualong.jpg',
-      iconKaoheDafen: khBase + 'daofen.png',
-      iconKaoheJilu: khBase + 'jilu.png',
-      iconKaoheZhongxin: khBase + 'zhongxin.png',
-      iconShangjia: ossImageUrl + 'beijing/tubiao/grzx_shangjia.jpg',
-      iconDashouAuth: ossImageUrl + 'beijing/tubiao/grzx_dashou.jpg',
-      iconGuanshiAuth: ossImageUrl + 'beijing/tubiao/grzx_guanshi.jpg',
-      iconZuzhangAuth: ossImageUrl + 'beijing/tubiao/grzx_zuzhang.jpg',
-      kefuBannerBg: dsBase + 'kefu-banner-bg.png',
-      totalAssetBg: dsBase + 'total-asset-bg.png',
-      authPanelBg: dsBase + 'auth-panel-bg.png',
-    };
-  },
-
-  _applyRankBoardIcons(imgUrls) {
-    const iconMap = {
-      dashou: imgUrls.iconRankDashou,
-      guanshi: imgUrls.iconRankGuanshi,
-      zuzhang: imgUrls.iconRankZuzhang,
-      shangjia: imgUrls.iconRankShangjia,
-    };
-    return (this.data.rankBoardList || []).map((item) => ({
-      ...item,
-      icon: iconMap[item.type] || imgUrls.iconRank,
-    }));
-  },
-
-  onLoad(options) {
-    const app = getApp();
-    const ossImageUrl = app.globalData.ossImageUrl || '';
-    const imgUrls = this._buildImgUrls(ossImageUrl);
-    this.setData({
-      imgUrls,
-      rankBoardList: this._applyRankBoardIcons(imgUrls),
-    });
-    this.checkRoleStatuses();
-
-    const registerType = options.registerType || 'dashou';
-    if (options.scene) {
-      try {
-        const scene = decodeURIComponent(options.scene);
-        options.inviteCode = scene;
-      } catch (e) {
-        console.error('scene解码失败', e);
-      }
-    }
-    this.checkDashouStatus();
-    const { inviteCode } = options || {};
-    if (inviteCode) {
-      if (registerType === 'guanshi') {
-        this.setData({ guanshiInviteCode: inviteCode });
-        setTimeout(() => {
-          this.handleGuanshiInviteCodeWithLoginCheck(inviteCode);
-        }, 500);
-      } else {
-        this.setData({ inviteCode });
-        setTimeout(() => {
-          this.handleInviteCodeWithLoginCheck(inviteCode);
-        }, 500);
-      }
-    }
-    // 注意：这里不再重复声明 app，直接使用上面的 app 变量
-    if (!app.globalData.hasShownPopupOnColdStart) {
-      app.globalData.hasShownPopupOnColdStart = true;
-      setTimeout(() => {
-        popupService.checkAndShow(this, 'dashouduan');
-      }, 300);
-    }
-  },
-
-  onReady() {
-    if (isCenterPageActive(this, 'isDashou', 'dashoustatus')) {
-      ensureRoleOnCenterPage(this, 'dashou');
-    }
-  },
-
-  onHide() {
-    const popupComp = this.selectComponent('#popupNotice');
-    if (popupComp && popupComp.cleanup) {
-      popupComp.cleanup();
-    }
-  },
-
-  onShow() {
-    migrateLegacyCenterRole(getApp());
-    lockPrimaryRole('dashou', getApp());
-    wx.setStorageSync('isJinpai', 0);
-    ensureRoleOnCenterPage(this, 'dashou');
-
-    const inviterCache = wx.getStorageSync('inviterCache') || null;
-    const zuzhangInviterCache = wx.getStorageSync('zuzhangInviterCache') || null;
-    this.setData({ inviterCache, zuzhangInviterCache });
-
-    this.registerNotificationComponent();
-    this.checkRoleStatuses();
-    if (isCenterPageActive(this, 'isDashou', 'dashoustatus')) {
-      if (!this.data.isDashou) this.setData({ isDashou: true });
-      ensureRoleOnCenterPage(this, 'dashou');
-      setTimeout(() => this.refreshAllInfo(false), 300);
-    } else if (isRoleStatusActive(wx.getStorageSync('guanshistatus')) ||
-      isRoleStatusActive(wx.getStorageSync('zuzhangstatus')) ||
-      isRoleStatusActive(wx.getStorageSync('kaoheguanstatus'))) {
-      ensureRoleOnCenterPage(this, 'dashou');
-      setTimeout(() => this.refreshAllInfo(false), 300);
-    }
-    const pages = getCurrentPages();
-    const currentPage = pages[pages.length - 1];
-    const options = currentPage.options || {};
-    const registerType = options.registerType || 'dashou';
-    if (options.inviteCode) {
-      if (registerType === 'guanshi' && !isRoleStatusActive(wx.getStorageSync('guanshistatus'))) {
-        setTimeout(() => {
-          this.handleGuanshiInviteCodeWithLoginCheck(options.inviteCode);
-        }, 300);
-      } else if (registerType !== 'guanshi' && !isCenterPageActive(this, 'isDashou', 'dashoustatus')) {
-        setTimeout(() => {
-          this.handleInviteCodeWithLoginCheck(options.inviteCode);
-        }, 300);
-      }
-    }
-  },
-
-  checkRoleStatuses() {
-    const isDashou = isRoleStatusActive(wx.getStorageSync('dashoustatus'));
-    const isGuanshi = isRoleStatusActive(wx.getStorageSync('guanshistatus'));
-    const isZuzhang = isRoleStatusActive(wx.getStorageSync('zuzhangstatus'));
-    const isKaoheguan = isRoleStatusActive(wx.getStorageSync('kaoheguanstatus'));
-    const isShangjia = isRoleStatusActive(wx.getStorageSync('shangjiastatus'));
-    const subRoleCount = [isGuanshi, isZuzhang, isKaoheguan].filter(Boolean).length;
-    this.setData({
-      isDashou, isGuanshi, isZuzhang, isKaoheguan,
-      isShangjia,
-      shangjiaCertified: isShangjia,
-      layoutSparse: subRoleCount === 0,
-    }, () => {
-      this._updateTotalAssets();
-      this._updatePendingAuth();
-    });
-    if (isDashou) {
-      const uid = wx.getStorageSync('uid') || '';
-      const touxiang = wx.getStorageSync('touxiang') || '';
-      this.setData({ uid, touxiang });
-      this.loadAvatar();
-    }
-  },
-
-  _parseMoney(val) {
-    return parseFloat(String(val || '0').replace(/,/g, '')) || 0;
-  },
-
-  _updateTotalAssets() {
-    const d = this.data;
-    const breakdown = [{ label: '打手佣金', amount: d.yongjin || '0.00' }];
-    let total = this._parseMoney(d.yongjin);
-    if (d.isGuanshi) {
-      total += this._parseMoney(d.fenyongtixian);
-      breakdown.push({ label: '管事分成', amount: d.fenyongtixian || '0.00' });
-    }
-    if (d.isZuzhang) {
-      total += this._parseMoney(d.ketixian);
-      breakdown.push({ label: '组长余额', amount: d.ketixian || '0.00' });
-    }
-    if (d.isKaoheguan) {
-      total += this._parseMoney(d.kaoheYue);
-      breakdown.push({ label: '考核余额', amount: d.kaoheYue || '0.00' });
-    }
-    this.setData({ totalAssets: total.toFixed(2), assetBreakdown: breakdown });
-  },
-
-  /** 打手端：已认证不展示；商家始终第一位且靠左排列 */
-  _updatePendingAuth() {
-    const d = this.data;
-    const img = d.imgUrls || {};
-    const list = [];
-    list.push({
-      type: 'shangjia',
-      name: '商家',
-      icon: img.iconShangjia,
-      tag: d.shangjiaCertified ? '进入商家端' : '去认证',
-      done: d.shangjiaCertified,
-    });
-    if (!d.isGuanshi) {
-      list.push({ type: 'guanshi', name: '管事', icon: img.iconGuanshiAuth, tag: '去认证' });
-    }
-    if (!d.isZuzhang) {
-      list.push({ type: 'zuzhang', name: '组长', icon: img.iconZuzhangAuth, tag: '去认证' });
-    }
-    if (!d.isDashou) {
-      list.push({ type: 'dashou', name: '接单员', icon: img.iconDashouAuth, tag: '去认证' });
-    }
-    this.setData({
-      pendingAuthList: list,
-      showAuthSection: list.length > 0,
-    });
-  },
-
-  _isApiSuccess(body) {
-    if (!body) return false;
-    const code = Number(body.code);
-    return code === 200 || code === 0;
-  },
-
-  _getApiMsg(body) {
-    if (!body) return '';
-    return body.msg || body.message || '';
-  },
-
-  _extractUserData(body) {
-    if (!body) return {};
-    if (body.data && typeof body.data === 'object' && !Array.isArray(body.data)) {
-      return body.data;
-    }
-    const userData = { ...body };
-    delete userData.code;
-    delete userData.msg;
-    delete userData.message;
-    return userData;
-  },
-
-  async refreshAllInfo(showToast = true) {
-    const now = Date.now();
-    if (!this.data.canRefresh || (now - this.data.lastRefreshTime < 3000)) return;
-    this.setData({ lastRefreshTime: now, canRefresh: false, isLoading: true });
-    try {
-      this.checkRoleStatuses();
-      const results = await Promise.allSettled([
-        this._fetchDashouInfoSilent(),
-        this.fetchChenghaoList(),
-        this._fetchGuanshiInfoSilent(),
-        this.fetchGuanshiChenghaoList(),
-        this._fetchZuzhangInfoSilent(),
-        this._fetchKaoheguanInfoSilent(),
-      ]);
-      this.checkRoleStatuses();
-      const dashouOk = results[0].status === 'fulfilled';
-      if (showToast) {
-        wx.showToast({
-          title: dashouOk ? '刷新成功' : '刷新失败',
-          icon: dashouOk ? 'success' : 'none',
-          duration: 1500,
-        });
-      }
-    } catch (e) {
-      if (showToast) {
-        wx.showToast({ title: '刷新失败', icon: 'none' });
-      }
-    } finally {
-      this.setData({ isLoading: false });
-      setTimeout(() => this.setData({ canRefresh: true }), 3000);
-    }
-  },
-
-  refreshDashouInfo() {
-    this.refreshAllInfo(true);
-  },
-
-  onTapRefresh() {
-    this.refreshAllInfo(true);
-  },
-
-  async _fetchDashouInfoSilent() {
-    const res = await request({ url: '/yonghu/dashouxinxi', method: 'POST' });
-    if (res && res.data.code == 200) {
-      const data = res.data.data;
-      const app = getApp();
-      const updateData = {
-        dashouNicheng: data.dashounicheng || '',
-        zhanghaoStatus: data.zhanghaostatus || '',
-        yongjin: data.yongjin || '0.00',
-        zonge: data.zonge || '0.00',
-        yajin: data.yajin || '0.00',
-        chenghao: data.chenghao || '',
-        jinfen: data.jifen || '0',
-        clumber: data.clumber || [],
-        chengjiaoliang: data.chengjiaoliang || '0',
-        zaixianZhuangtai: data.zaixianzhuangtai || 0,
-        dashouzhuangtai: data.dashouzhuangtai || '',
-      };
-      Object.assign(app.globalData, updateData);
-      if (data.dashoustatus !== undefined) {
-        wx.setStorageSync('dashoustatus', data.dashoustatus);
-        app.globalData.dashoustatus = data.dashoustatus;
-      }
-      if (data.guanshistatus !== undefined) {
-        wx.setStorageSync('guanshistatus', data.guanshistatus);
-        app.globalData.guanshistatus = data.guanshistatus;
-      }
-      if (data.zuzhangstatus !== undefined) {
-        wx.setStorageSync('zuzhangstatus', data.zuzhangstatus);
-        app.globalData.zuzhangstatus = data.zuzhangstatus;
-      }
-      this.setData({ ...updateData, isLoading: false });
-      this._updateTotalAssets();
-      return;
-    }
-    throw new Error('打手信息获取失败');
-  },
-
-  async _fetchGuanshiInfoSilent() {
-    const res = await request({ url: '/yonghu/guanshixinxi', method: 'POST' });
-    if (res && this._isApiSuccess(res.data)) {
-      const data = this._extractUserData(res.data);
-      if (data.guanshistatus !== undefined) {
-        wx.setStorageSync('guanshistatus', data.guanshistatus);
-        getApp().globalData.guanshistatus = data.guanshistatus;
-      }
-      if (!isRoleStatusActive(data.guanshistatus ?? wx.getStorageSync('guanshistatus'))) {
-        return;
-      }
-      const app = getApp();
-      if (!app.globalData.guanshi) app.globalData.guanshi = {};
-      const updateData = {
-        gszhstatus: data.gszhstatus || '',
-        yaoqingzongshu: data.yaoqingzongshu || 0,
-        fenyongzonge: data.fenyongzonge || '0.00',
-        fenyongtixian: data.fenyongtixian || '0.00',
-        yichongzhiDashou: data.yichongzhiDashou || 0,
-      };
-      Object.assign(app.globalData.guanshi, updateData);
-      const zhuanhualv = updateData.yaoqingzongshu > 0
-        ? (updateData.yichongzhiDashou / updateData.yaoqingzongshu * 100).toFixed(1)
-        : 0;
-      this.setData({ isGuanshi: true, ...updateData, zhuanhualv });
-      this._updateTotalAssets();
-      return;
-    }
-  },
-
-  async _fetchZuzhangInfoSilent() {
-    const res = await request({ url: '/yonghu/zuzhangxinxi', method: 'POST' });
-    if (res && res.data.code === 200) {
-      const data = res.data.data || {};
-      if (data.zuzhangstatus !== undefined) {
-        wx.setStorageSync('zuzhangstatus', data.zuzhangstatus);
-        getApp().globalData.zuzhangstatus = data.zuzhangstatus;
-      }
-      if (!isRoleStatusActive(data.zuzhangstatus ?? wx.getStorageSync('zuzhangstatus'))) {
-        return;
-      }
-      this.setData({
-        isZuzhang: true,
-        ketixian: data.ketixian || '0.00',
-        guanshiCount: data.guanshiCount || 0,
-        fenhongZonge: data.fenhongZonge || '0.00',
-      });
-      this._updateTotalAssets();
-      return;
-    }
-  },
-
-  async _fetchKaoheguanInfoSilent() {
-    const res = await request({ url: '/dengji/khgsx', method: 'POST' });
-    if (res && res.data.code === 200) {
-      const data = res.data.data || {};
-      if (data.zhuangtai === 0 || data.zhuangtai === 2) {
-        wx.setStorageSync('kaoheguanstatus', 0);
-        getApp().globalData.kaoheguanstatus = 0;
-        this.setData({ isKaoheguan: false });
-        return;
-      }
-      wx.setStorageSync('kaoheguanstatus', 1);
-      getApp().globalData.kaoheguanstatus = 1;
-      const app = getApp();
-      if (!app.globalData.kaoheguan) app.globalData.kaoheguan = {};
-      Object.assign(app.globalData.kaoheguan, {
-        shenhe_zongshu: data.shenhe_zongshu || 0,
-        tongguo_zongshu: data.tongguo_zongshu || 0,
-        yue: data.yue || '0.00',
-        zonge: data.zonge || '0.00',
-        pending_shenhe_count: data.pending_shenhe_count || 0,
-      });
-      this.setData({
-        isKaoheguan: true,
-        shenheZongshu: data.shenhe_zongshu || 0,
-        tongguoZongshu: data.tongguo_zongshu || 0,
-        kaoheYue: data.yue || '0.00',
-        kaoheZonge: data.zonge || '0.00',
-        pendingShenheCount: data.pending_shenhe_count || 0,
-      });
-      this._updateTotalAssets();
-    }
-  },
-
-  async fetchGuanshiChenghaoList() {
-    try {
-      const res = await request({
-        url: '/dengji/chenghao',
-        method: 'POST',
-        data: { role: 'guanshi' },
-      });
-      if (res && res.data.code === 0 && res.data.data) {
-        this.setData({ guanshiChenghaoList: res.data.data.chenghao_list || [] });
-      }
-    } catch (e) {}
-  },
-
-  _isAlreadyGuanshiMsg(msg) {
-    if (!msg || typeof msg !== 'string') return false;
-    return msg.includes('已是管事') || msg.includes('已经是管事');
-  },
-
-  async _applyGuanshiRegisterSuccess(userData, toastMsg) {
-    const data = userData || {};
-    syncRoleStatuses(data);
-    syncProfileFields(data);
-    syncGroupFields(data);
-    if (data.token) {
-      wx.setStorageSync('token', data.token);
-      getApp().globalData.token = data.token;
-    }
-    if (!Object.prototype.hasOwnProperty.call(data, 'guanshistatus') &&
-        !isRoleStatusActive(wx.getStorageSync('guanshistatus'))) {
-      wx.setStorageSync('guanshistatus', 1);
-      getApp().globalData.guanshistatus = 1;
-    }
-    const app = getApp();
-    if (!app.globalData.guanshi) app.globalData.guanshi = {};
-    const guanshiData = {
-      gszhstatus: data.gszhstatus ?? '',
-      yaoqingzongshu: data.yaoqingzongshu ?? 0,
-      fenyongzonge: data.fenyongzonge ?? '0.00',
-      fenyongtixian: data.fenyongtixian ?? '0.00',
-      yichongzhiDashou: data.yichongzhiDashou ?? 0,
-    };
-    Object.assign(app.globalData.guanshi, guanshiData);
-    const zhuanhualv = guanshiData.yaoqingzongshu > 0
-      ? (guanshiData.yichongzhiDashou / guanshiData.yaoqingzongshu * 100).toFixed(1)
-      : 0;
-    this.checkRoleStatuses();
-    if (isRoleStatusActive(wx.getStorageSync('dashoustatus'))) {
-      this.setData({ isDashou: true, uid: data.uid || wx.getStorageSync('uid') || '' });
-      this.loadAvatar();
-    }
-    this.setData({
-      isGuanshi: true,
-      ...guanshiData,
-      zhuanhualv,
-      isLoading: false,
-      guanshiInviteCode: '',
-    });
-    lockPrimaryRole('dashou');
-    ensureRoleOnCenterPage(this, 'dashou');
-    await this.refreshAllInfo(false);
-    wx.hideLoading();
-    wx.showToast({ title: toastMsg || '管事注册成功', icon: 'success', duration: 2000 });
-  },
-
-  handleGuanshiInviteCodeWithLoginCheck(inviteCode) {
-    const token = wx.getStorageSync('token');
-    const uid = wx.getStorageSync('uid');
-    if (!token || !uid) {
-      this.loginAndRegisterGuanshiWithInviteCode(inviteCode);
-    } else if (!this.data.isGuanshi) {
-      wx.showLoading({ title: '管事注册中...', mask: true });
-      this.callGuanshiRegisterApi(inviteCode);
-    } else {
-      lockPrimaryRole('dashou');
-      ensureRoleOnCenterPage(this, 'dashou');
-      wx.showToast({ title: '您已是管事', icon: 'success' });
-    }
-  },
-
-  loginAndRegisterGuanshiWithInviteCode(inviteCode) {
-    const that = this;
-    wx.showLoading({ title: '登录注册中...', mask: true });
-    wx.login({
-      success: (loginRes) => {
-        if (loginRes.code) {
-          that.callGuanshiLoginRegisterApi(loginRes.code, inviteCode);
-        } else {
-          wx.hideLoading();
-          wx.showToast({ title: '微信登录失败', icon: 'none' });
-        }
-      },
-      fail: () => {
-        wx.hideLoading();
-        wx.showToast({ title: '微信登录失败', icon: 'none' });
-      },
-    });
-  },
-
-  callGuanshiLoginRegisterApi(code, inviteCode) {
-    const that = this;
-    const app = getApp();
-    const apiBaseUrl = app.globalData.apiBaseUrl;
-    if (!apiBaseUrl) {
-      wx.hideLoading();
-      wx.showToast({ title: '服务器配置错误', icon: 'none' });
-      return;
-    }
-    wx.request({
-      url: apiBaseUrl + '/yonghu/zuzhangyqmzc',
-      method: 'POST',
-      data: { code, inviteCode },
-      header: { 'content-type': 'application/json' },
-      success: (res) => {
-        const body = res.data || {};
-        if (res.statusCode === 200 && that._isApiSuccess(body)) {
-          const userData = that._extractUserData(body);
-          const toastMsg = that._isAlreadyGuanshiMsg(that._getApiMsg(body))
-            ? that._getApiMsg(body)
-            : '管事注册成功';
-          that._applyGuanshiRegisterSuccess(userData, toastMsg);
-        } else if (res.statusCode === 200 && that._isAlreadyGuanshiMsg(that._getApiMsg(body))) {
-          that._applyGuanshiRegisterSuccess(that._extractUserData(body), that._getApiMsg(body) || '您已是管事');
-        } else {
-          wx.hideLoading();
-          wx.showToast({ title: that._getApiMsg(body) || '注册失败', icon: 'none' });
-        }
-      },
-      fail: () => {
-        wx.hideLoading();
-        wx.showToast({ title: '网络请求失败', icon: 'none' });
-      },
-    });
-  },
-
-  async callGuanshiRegisterApi(inviteCode) {
-    try {
-      const res = await request({
-        url: '/yonghu/guanshizhuce',
-        method: 'POST',
-        data: { inviteCode },
-      });
-      const body = res?.data || {};
-      if (res && this._isApiSuccess(body)) {
-        const userData = this._extractUserData(body);
-        const toastMsg = this._isAlreadyGuanshiMsg(this._getApiMsg(body))
-          ? this._getApiMsg(body)
-          : '管事注册成功';
-        await this._applyGuanshiRegisterSuccess(userData, toastMsg);
-      } else if (this._isAlreadyGuanshiMsg(this._getApiMsg(body))) {
-        await this._applyGuanshiRegisterSuccess(this._extractUserData(body), this._getApiMsg(body) || '您已是管事');
-      } else {
-        wx.hideLoading();
-        wx.showToast({ title: this._getApiMsg(body) || '注册失败', icon: 'none' });
-      }
-    } catch (e) {
-      wx.hideLoading();
-      wx.showToast({ title: e.message || '注册失败', icon: 'none' });
-    }
-  },
-
-  goToGuanshiWithdraw() {
-    wx.navigateTo({ url: '/pages/tixian/tixian' });
-  },
-
-  goToZuzhangWithdraw() {
-    wx.navigateTo({ url: `/pages/tixian/tixian?from=zuzhang&amount=${this.data.ketixian}` });
-  },
-
-  goToInviteUser() { wx.navigateTo({ url: '/pages/yaoqingdashou/yaoqingdashou' }); },
-  goToMySubordinate() { wx.navigateTo({ url: '/pages/wodedashou/wodedashou' }); },
-  goToRechargeRecord() { wx.navigateTo({ url: '/pages/czjilu/czjilu' }); },
-  goToGuanshiRanking() {
-    wx.navigateTo({ url: '/pages/dashoupaihang/dashoupaihang?type=guanshi' });
-  },
-  goToPromoPoster() { wx.navigateTo({ url: '/pages/haibao/haibao' }); },
-  goToFenhongJilu() { wx.navigateTo({ url: '/pages/zzfhjilu/zzfhjilu' }); },
-  goToYaoqingGuanshi() { wx.navigateTo({ url: '/pages/yqguanshi/yqguanshi' }); },
-  goToGuanshiAuthPage() { wx.navigateTo({ url: '/pages/renzheng/renzheng?type=guanshi' }); },
-
-  async contactZuzhang() {
-    wx.showLoading({ title: '获取组长信息...', mask: true });
-    try {
-      const res = await request({ url: '/yonghu/guanshi_contact', method: 'POST' });
-      if (res && res.data.code === 200 && res.data.data) {
-        const inviter = res.data.data;
-        const fullAvatar = resolveAvatarUrl(inviter.touxiang);
-        const cacheData = { uid: inviter.uid, nicheng: inviter.nicheng || '', avatar: fullAvatar };
-        wx.setStorageSync('zuzhangInviterCache', cacheData);
-        this.setData({ zuzhangInviterCache: cacheData });
-        await openPrivateChat(this, {
-          toUserId: buildInviterPeerId(inviter.uid),
-          toName: inviter.nicheng || '组长',
-          toAvatar: fullAvatar,
-        });
-      } else {
-        wx.showToast({ title: '未绑定邀请人', icon: 'none' });
-      }
-    } catch (e) {
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    } finally {
-      wx.hideLoading();
-    }
-  },
-
-  async fetchChenghaoList() {
-    try {
-      const res = await request({
-        url: '/dengji/dsbqhq',
-        method: 'POST'
-      });
-      if (res && res.data.code === 0 && res.data.data) {
-        const list = res.data.data.chenghao_list || [];
-        this.setData({ chenghaoList: list });
-        // 可选：也存入全局，方便其他页面使用
-        const app = getApp();
-        app.globalData.chenghaoList = list;
-      } else {
-        this.setData({ chenghaoList: [] });
-      }
-    } catch (e) {
-      console.error('获取称号标签失败', e);
-      // 失败不影响主流程
-    }
-  },
-  // ========================================================
-
-  // 联系邀请人（保持不变）
-  async contactInviter() {
-    wx.showLoading({ title: '获取邀请人...', mask: true });
-    try {
-      const res = await request({ url: '/yonghu/hqwdyqr', method: 'POST' });
-      if (res && res.data.code === 200 && res.data.data) {
-        const inviter = res.data.data;
-        const fullAvatar = resolveAvatarUrl(inviter.touxiang);
-        const cacheData = {
-          uid: inviter.uid,
-          nicheng: inviter.nicheng || '',
-          avatar: fullAvatar,
-        };
-        wx.setStorageSync('inviterCache', cacheData);
-        this.setData({ inviterCache: cacheData });
-        await openPrivateChat(this, {
-          toUserId: buildInviterPeerId(inviter.uid),
-          toName: inviter.nicheng || '管事',
-          toAvatar: fullAvatar,
-        });
-      } else {
-        wx.showToast({ title: res?.data?.msg || '获取失败', icon: 'none' });
-      }
-    } catch (e) {
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    } finally {
-      wx.hideLoading();
-    }
-  },
-
-  handleInviteCodeWithLoginCheck(inviteCode) {
-    const that = this;
-    const token = wx.getStorageSync('token');
-    const uid = wx.getStorageSync('uid');
-    if (!token || !uid) {
-      this.loginAndRegisterWithInviteCode(inviteCode);
-    } else {
-      if (!that.data.isDashou) {
-        wx.showLoading({ title: '自动注册中...', mask: true });
-        that.setData({ isAutoRegistering: true });
-        that.onRegister();
-      } else {
-        wx.showToast({ title: '您已是打手', icon: 'success', duration: 2000 });
-      }
-    }
-  },
-
-  loginAndRegisterWithInviteCode(inviteCode) {
-    const that = this;
-    wx.showLoading({ title: '登录注册中...', mask: true });
-    wx.login({
-      success: (loginRes) => {
-        if (loginRes.code) {
-          that.callLoginRegisterApi(loginRes.code, inviteCode);
-        } else {
-          wx.hideLoading();
-          wx.showToast({ title: '微信登录失败', icon: 'none' });
-        }
-      },
-      fail: () => {
-        wx.hideLoading();
-        console.error('微信登录失败');
-        wx.reLaunch({ url: '/pages/wode/wode' });
-      }
-    });
-  },
-
-  callLoginRegisterApi(code, inviteCode) {
-    const that = this;
-    const app = getApp();
-    const apiBaseUrl = app.globalData.apiBaseUrl;
-    if (!apiBaseUrl) {
-      wx.hideLoading();
-      wx.showToast({ title: '服务器配置错误', icon: 'none' });
-      return;
-    }
-    wx.request({
-      url: apiBaseUrl + '/yonghu/wdlyhdl',
-      method: 'POST',
-      data: { code: code, inviteCode: inviteCode },
-      header: { 'content-type': 'application/json' },
-      success: (res) => {
-        if (res.statusCode === 200 && res.data && res.data.code === 0 && res.data.data) {
-          const userData = res.data.data;
-          syncProfileFields(userData);
-          syncRoleStatuses(userData);
-          syncGroupFields(userData);
-          if (userData.token) wx.setStorageSync('token', userData.token);
-          const identityFields = ['nicheng', 'uid', 'touxiang', 'dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus'];
-          identityFields.forEach(field => {
-            if (userData[field] !== undefined) {
-              wx.setStorageSync(field, userData[field]);
-              app.globalData[field] = userData[field];
-            }
-          });
-          const groupFields = ['dashouqun', 'dashouqunid', 'guanshiqun', 'guanshiqunid'];
-          groupFields.forEach(field => {
-            if (userData[field] !== undefined) {
-              wx.setStorageSync(field, userData[field]);
-              app.globalData[field] = userData[field];
-            }
-          });
-          if (userData.dashounicheng || userData.yongjin) {
-            const updateData = {
-              dashouNicheng: userData.dashounicheng || '',
-              zhanghaoStatus: userData.zhanghaostatus || '',
-              yongjin: userData.yongjin || '0.00',
-              zonge: userData.zonge || '0.00',
-              yajin: userData.yajin || '0.00',
-              chenghao: userData.chenghao || '',
-              jinfen: userData.jifen || userData.jinfen || '0',
-              clumber: userData.clumber || [],
-              chengjiaoliang: userData.chengjiaoliang || '0',
-              zaixianZhuangtai: userData.zaixianzhuangtai || 0,
-              dashouzhuangtai: userData.dashouzhuangtai || '',
-            };
-            Object.assign(app.globalData, updateData);
-          }
-          that.setData({
-            isDashou: true,
-            uid: userData.uid || '',
-            touxiang: userData.touxiang || '',
-            isAutoRegistering: false
-          });
-          that.loadAvatar();
-          that.getDashouInfo();
-          that.switchToDashouRole();
-          lockPrimaryRole('dashou');
-          wx.hideLoading();
-          wx.showToast({ title: '登录注册成功！', icon: 'success', duration: 2000 });
-        } else {
-          wx.hideLoading();
-          wx.showToast({ title: (res.data && res.data.msg) || '登录注册失败', icon: 'none' });
-        }
-      },
-      fail: () => {
-        wx.hideLoading();
-        wx.showToast({ title: '网络请求失败', icon: 'none' });
-      }
-    });
-  },
-
-  registerNotificationComponent() {
-    const app = getApp();
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  checkDashouStatus() {
-    try {
-      const dashoustatus = wx.getStorageSync('dashoustatus');
-      const uid = wx.getStorageSync('uid');
-      const touxiang = wx.getStorageSync('touxiang');
-      if (isRoleStatusActive(dashoustatus)) {
-        this.setData({ isDashou: true, uid: uid || '', touxiang: touxiang || '' });
-        this.loadAvatar();
-        this.checkGlobalData();
-        ensureRoleOnCenterPage(this, 'dashou');
-      } else {
-        this.setData({ isDashou: false });
-      }
-    } catch (error) {
-      console.error('读取缓存失败:', error);
-      this.setData({ isDashou: false });
-    }
-  },
-
-  loadAvatar() {
-    const avatarUrl = resolveAvatarFromStorage(getApp());
-    this.setData({ avatarUrl });
-  },
-
-  checkGlobalData() {
-    const app = getApp();
-    const globalData = app.globalData || {};
-    const needRefresh = !globalData.dashouNicheng || globalData.dashouNicheng === '' || !globalData.yongjin;
-    if (needRefresh) {
-      this.getDashouInfo();
-    } else {
-      this.setDataFromGlobalData();
-    }
-  },
-
-  setDataFromGlobalData() {
-    const app = getApp();
-    const {
-      dashouNicheng = '', zhanghaoStatus = '', yongjin = '0.00', zonge = '0.00',
-      yajin = '0.00', chenghao = '', jinfen = '0', clumber = [],
-      chengjiaoliang = '0', zaixianZhuangtai = 0
-    } = app.globalData || {};
-    this.setData({
-      dashouNicheng, zhanghaoStatus, yongjin, zonge, yajin,
-      chenghao, jinfen,
-      clumber: Array.isArray(clumber) ? clumber : [],
-      chengjiaoliang,
-      zaixianZhuangtai: zaixianZhuangtai === 1 ? 1 : 0
-    });
-  },
-
-  async getDashouInfo() {
-    this.setData({ isLoading: true });
-    try {
-      const res = await request({ url: '/yonghu/dashouxinxi', method: 'POST' });
-      if (res && res.data.code == 200) {
-        const data = res.data.data;
-        const app = getApp();
-        const updateData = {
-          dashouNicheng: data.dashounicheng || '',
-          zhanghaoStatus: data.zhanghaostatus || '',
-          yongjin: data.yongjin || '0.00',
-          zonge: data.zonge || '0.00',
-          yajin: data.yajin || '0.00',
-          chenghao: data.chenghao || '',
-          jinfen: data.jifen || '0',
-          clumber: data.clumber || [],
-          chengjiaoliang: data.chengjiaoliang || '0',
-          zaixianZhuangtai: data.zaixianzhuangtai || 0,
-          dashouzhuangtai: data.dashouzhuangtai || '',
-        };
-        Object.assign(app.globalData, updateData);
-        if (data.dashoustatus !== undefined) {
-          wx.setStorageSync('dashoustatus', data.dashoustatus);
-          app.globalData.dashoustatus = data.dashoustatus;
-        }
-        if (data.guanshistatus !== undefined) {
-          wx.setStorageSync('guanshistatus', data.guanshistatus);
-          app.globalData.guanshistatus = data.guanshistatus;
-        }
-        this.setData({ ...updateData, isLoading: false });
-        this._updateTotalAssets();
-        if (this.data.isAutoRegistering) {
-          this.setData({ isAutoRegistering: false });
-          wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 });
-        } else {
-          wx.showToast({ title: '信息已更新', icon: 'success', duration: 1500 });
-        }
-      }
-    } catch (error) {
-      console.error('获取打手信息失败:', error);
-      this.setData({ isLoading: false, isAutoRegistering: false });
-      wx.showToast({ title: '获取信息失败', icon: 'error', duration: 2000 });
-    }
-  },
-
-  onInviteCodeInput(e) {
-    this.setData({ inviteCode: e.detail.value.trim() });
-  },
-
-  async onRegister() {
-    const { inviteCode } = this.data;
-    if (!inviteCode) {
-      wx.showToast({ title: '请输入邀请码', icon: 'none', duration: 2000 });
-      return;
-    }
-    if (inviteCode.length > 100) {
-      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none', duration: 2000 });
-      return;
-    }
-    this.setData({ isLoading: true });
-    try {
-      const res = await request({
-        url: '/yonghu/dashouzhuce',
-        method: 'POST',
-        data: { inviteCode: inviteCode }
-      });
-      if (res && res.data.code == 200) {
-        const data = res.data.data || {};
-        const app = getApp();
-        syncRoleStatuses(data);
-        syncProfileFields(data);
-        if (data.dashoustatus === undefined && !isRoleStatusActive(wx.getStorageSync('dashoustatus'))) {
-          wx.setStorageSync('dashoustatus', 1);
-          app.globalData.dashoustatus = 1;
-        }
-        const identityFields = ['dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus'];
-        identityFields.forEach(field => {
-          if (data[field] !== undefined) {
-            wx.setStorageSync(field, data[field]);
-            app.globalData[field] = data[field];
-          }
-        });
-        const updateData = {
-          dashouNicheng: data.dashounicheng || '',
-          zhanghaoStatus: data.zhanghaostatus || '',
-          yongjin: data.yongjin || '0.00',
-          zonge: data.zonge || '0.00',
-          yajin: data.yajin || '0.00',
-          chenghao: data.chenghao || '',
-          jinfen: data.jinfen || '0',
-          clumber: data.clumber || [],
-          chengjiaoliang: data.chengjiaoliang || '0',
-          zaixianZhuangtai: data.zaixianzhuangtai || 0,
-          dashouzhuangtai: data.dashouzhuangtai || '',
-        };
-        Object.assign(app.globalData, updateData);
-        this.setData({
-          isDashou: true,
-          ...updateData,
-          isLoading: false,
-          isAutoRegistering: false
-        });
-        this.loadAvatar();
-        ensureRoleOnCenterPage(this, 'dashou');
-        lockPrimaryRole('dashou');
-        wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 });
-      } else {
-        this.setData({ isLoading: false, isAutoRegistering: false });
-        wx.showToast({ title: (res.data && res.data.message) || '注册失败', icon: 'error', duration: 2000 });
-      }
-    } catch (error) {
-      console.error('注册失败:', error);
-      this.setData({ isLoading: false, isAutoRegistering: false });
-      wx.showToast({ title: error.message || '注册失败', icon: 'error', duration: 2000 });
-    }
-  },
-
-  switchToDashouRole() {
-    ensureRoleOnCenterPage(this, 'dashou');
-  },
-
-  copyUid() {
-    const { uid } = this.data;
-    if (!uid) {
-      wx.showToast({ title: 'UID不存在', icon: 'none', duration: 1500 });
-      return;
-    }
-    wx.setClipboardData({
-      data: uid,
-      success: () => wx.showToast({ title: '已复制UID', icon: 'success', duration: 1500 }),
-      fail: () => wx.showToast({ title: '复制失败', icon: 'error', duration: 1500 })
-    });
-  },
-
-  previewAvatar() {
-    const { avatarUrl } = this.data;
-    if (avatarUrl) wx.previewImage({ urls: [avatarUrl] });
-  },
-
-  goToWithdraw() { wx.navigateTo({ url: '/pages/tixian/tixian' }) },
-  goToTotalWithdraw() { this.goToWithdraw(); },
-
-  goToKefu() {
-    const app = getApp();
-    const { link, enterpriseId } = app.globalData.kefuConfig || {};
-    if (!link || !enterpriseId) {
-      wx.showToast({ title: '客服配置未加载', icon: 'none' });
-      return;
-    }
-    wx.openCustomerServiceChat({
-      extInfo: { url: link },
-      corpId: enterpriseId,
-    });
-  },
-
-  goToAuth(e) {
-    const type = e.currentTarget.dataset.type;
-    if (!type || !['dashou', 'shangjia', 'guanshi', 'zuzhang'].includes(type)) return;
-    const statusMap = {
-      dashou: 'dashoustatus',
-      shangjia: 'shangjiastatus',
-      guanshi: 'guanshistatus',
-      zuzhang: 'zuzhangstatus',
-    };
-    const statusKey = statusMap[type];
-    if (isRoleStatusActive(wx.getStorageSync(statusKey))) {
-      if (type === 'shangjia') {
-        enterLockedRole('shangjia', getApp());
-      }
-      return;
-    }
-    wx.navigateTo({ url: `/pages/renzheng/renzheng?type=${type}` });
-  },
-
-  onTapAuthItem(e) {
-    const type = e.currentTarget.dataset.type;
-    if (type === 'shangjia') {
-      this.onTapShangjiaAuth();
-      return;
-    }
-    this.goToAuth(e);
-  },
-
-  enterShangjiaCenter() {
-    if (!this.data.shangjiaCertified) {
-      wx.navigateTo({ url: '/pages/renzheng/renzheng?type=shangjia' });
-      return;
-    }
-    enterLockedRole('shangjia', getApp());
-  },
-
-  onTapShangjiaAuth() {
-    if (this.data.shangjiaCertified) {
-      this.enterShangjiaCenter();
-      return;
-    }
-    wx.navigateTo({ url: '/pages/renzheng/renzheng?type=shangjia' });
-  },
-  goToReceiveOrder() { wx.navigateTo({ url: '/pages/jiedan/jiedan' }) },
-  goToMyOrders() { wx.navigateTo({ url: '/pages/dashoudingdan/dashoudingdan' }) },
-  goToMyPunishment() { wx.navigateTo({ url: '/pages/cfss/cfss/cfss' }) },
-  goToRecharge() { wx.navigateTo({ url: '/pages/dashouchongzhi/dashouchongzhi' }) },
-  goToRanking(e) {
-    const type = e?.currentTarget?.dataset?.type || 'dashou';
-    wx.navigateTo({ url: `/pages/dashoupaihang/dashoupaihang?type=${type}` });
-  },
-  goToGuanzhuKs() { wx.navigateTo({ url: '/pages/guanzhual/guanzhual' }) },
-  goToKaoheDafen() { wx.navigateTo({ url: '/pages/kaohe_dafen/kaohe_dafen' }) },
-  goToKaoheJilu() { wx.navigateTo({ url: '/pages/kaohe_jilu/kaohe_jilu' }) },
-  goToKaoheZhongxin() { wx.navigateTo({ url: '/pages/kaohe_zhongxin/kaohe_zhongxin' }) },
-  goToKaoheWithdraw() {
-    const yue = this.data.kaoheYue || '0.00';
-    wx.navigateTo({ url: `/pages/tixian/tixian?amount=${yue}&from=kaoheguan` });
-  },
-  goToModifyInfo() { wx.navigateTo({ url: '/pages/dashouxiugai/dashouxiugai' }) },
-  goToRules() { wx.navigateTo({ url: '/pages/dashouguize/dashouguize' }) },
-  goToKaohe() {
-    wx.navigateTo({ url: '/pages/kaohe_jinpai/kaohe_jinpai' });
-  },
-
-  quickRegisterAsPlatform() {
-    const that = this;
-    wx.showModal({
-      title: '提示',
-      content: '使用此功能后，您将不属于任何管事，确认注册吗？',
-      success: (res) => {
-        if (res.confirm) {
-          that.setData({ inviteCode: PLATFORM_INVITE_CODE });
-          that.onRegister();
-        }
-      }
-    });
-  },
-
-  clearCache() {
-    wx.showModal({
-      title: '清除缓存',
-      content: '将清除所有登录与身份数据，并回到点单端，确定继续？',
-      confirmText: '确定',
-      cancelText: '取消',
-      success: (r) => {
-        if (r.confirm) clearCacheAndEnterNormal(this);
-      },
-    });
-  },
-})
+// pages/dashouzhongxin/dashouzhongxin.js
+import request from '../../utils/request.js'
+import popupService from '../../services/popupService.js'
+import {
+  isRoleStatusActive,
+  isCenterPageActive,
+  syncRoleStatuses,
+  syncProfileFields,
+  syncGroupFields,
+  ensureRoleOnCenterPage,
+  clearCacheAndEnterNormal,
+} from '../../utils/role-tab-bar.js'
+import { lockPrimaryRole, migrateLegacyCenterRole, enterLockedRole } from '../../utils/primary-role.js'
+import { resolveAvatarUrl, resolveAvatarFromStorage } from '../../utils/avatar.js'
+import { openPrivateChat, buildInviterPeerId } from '../../utils/im-user.js'
+
+const PLATFORM_INVITE_CODE = '0000008RffVgKHMj7kQC'
+
+Page({
+  data: {
+    // 图片路径对象
+    imgUrls: {},
+    
+    isDashou: false,
+    isGuanshi: false,
+    isZuzhang: false,
+    isKaoheguan: false,
+    isShangjia: false,
+    shangjiaCertified: false,
+    totalAssets: '0.00',
+    assetBreakdown: [],
+    pendingAuthList: [],
+    showAuthSection: false,
+    isLoading: false,
+    inviteCode: '',
+    guanshiInviteCode: '',
+    zuzhangInviteCode: '',
+    uid: '',
+    touxiang: '',
+    avatarUrl: '',
+    dashouNicheng: '',
+    zhanghaoStatus: '',
+    yongjin: '',
+    zonge: '',
+    yajin: '',
+    chenghao: '',
+    jinfen: '',
+    clumber: [],
+    chengjiaoliang: '',
+    zaixianZhuangtai: 0,
+    lastRefreshTime: 0,
+    canRefresh: true,
+    isAutoRegistering: false,
+    inviterCache: null,
+    zuzhangInviterCache: null,
+    chenghaoList: [],
+    guanshiChenghaoList: [],
+    gszhstatus: '',
+    yaoqingzongshu: 0,
+    fenyongzonge: '0.00',
+    fenyongtixian: '0.00',
+    yichongzhiDashou: 0,
+    zhuanhualv: 0,
+    ketixian: '0.00',
+    guanshiCount: 0,
+    fenhongZonge: '0.00',
+    kaoheYue: '0.00',
+    kaoheZonge: '0.00',
+    shenheZongshu: 0,
+    tongguoZongshu: 0,
+    pendingShenheCount: 0,
+    layoutSparse: false,
+    rankBoardList: [
+      { type: 'dashou', name: '打手榜', sub: '接单成交', icon: '', shapeClass: 'rank-shape-left', themeClass: 'rank-theme-blue' },
+      { type: 'guanshi', name: '管事榜', sub: '邀请收入', icon: '', shapeClass: 'rank-shape-right', themeClass: 'rank-theme-gold' },
+      { type: 'zuzhang', name: '组长榜', sub: '团队分红', icon: '', shapeClass: 'rank-shape-left', themeClass: 'rank-theme-purple' },
+      { type: 'shangjia', name: '商家榜', sub: '派单流水', icon: '', shapeClass: 'rank-shape-right', themeClass: 'rank-theme-orange' },
+    ],
+  },
+
+  _buildImgUrls(ossImageUrl) {
+    const dsBase = ossImageUrl + 'beijing/dashouduan/';
+    const iconBase = ossImageUrl + 'beijing/dashouduan/dashoutubiaobeijing/';
+    const gsBase = ossImageUrl + 'beijing/guanshiduan/';
+    const khBase = ossImageUrl + 'beijing/kaohe/';
+    return {
+      pageBg: dsBase + 'page-bg.jpg',
+      userCardBg: dsBase + 'user-card-bg.png',
+      vipCardBg: dsBase + 'vip-card-bg.jpg',
+      assetPanelBg: dsBase + 'asset-panel-bg.png',
+      rankHubBg: dsBase + 'rank-hub-bg.png',
+      rankTileBg: dsBase + 'rank-tile-bg.png',
+      funcPanelBg: dsBase + 'func-panel-bg.png',
+      listBg: dsBase + 'list-card-bg.png',
+      topBg: iconBase + 'top-bg.jpg',
+      cardBg: iconBase + 'card-bg.jpg',
+      iconRefresh: gsBase + 'icon-refresh.png',
+      iconCopy: gsBase + 'icon-copy.png',
+      iconVip: dsBase + 'icon-vip.png',
+      iconArrowLight: dsBase + 'icon-arrow-light.png',
+      iconSectionAsset: dsBase + 'icon-section-asset.png',
+      iconSectionRank: dsBase + 'icon-section-rank.png',
+      iconSectionFunc: dsBase + 'icon-section-func.png',
+      iconSectionGuanshi: dsBase + 'icon-section-guanshi.png',
+      iconSectionZuzhang: dsBase + 'icon-section-zuzhang.png',
+      iconSectionKaohe: dsBase + 'icon-section-kaohe.png',
+      iconSectionMore: dsBase + 'icon-section-more.png',
+      iconRankDashou: dsBase + 'rank-dashou.png',
+      iconRankGuanshi: dsBase + 'rank-guanshi.png',
+      iconRankZuzhang: dsBase + 'rank-zuzhang.png',
+      iconRankShangjia: dsBase + 'rank-shangjia.png',
+      iconGame: iconBase + 'icon-game.jpg',
+      iconRecharge: iconBase + 'icon-recharge.jpg',
+      iconOrders: iconBase + 'icon-orders.jpg',
+      iconPunish: iconBase + 'icon-punish.jpg',
+      iconRank: iconBase + 'icon-rank.jpg',
+      iconInvite: gsBase + 'icon-invite.png',
+      iconMedal: iconBase + 'icon-medal.jpg',
+      iconEdit: iconBase + 'icon-edit.jpg',
+      iconBook: iconBase + 'icon-book.jpg',
+      iconArrow: gsBase + 'icon-arrow.png',
+      iconSub: gsBase + 'icon-sub.png',
+      iconRecord: gsBase + 'icon-record.png',
+      iconPoster: gsBase + 'icon-poster.png',
+      iconWithdraw: gsBase + 'icon-withdraw.png',
+      iconContact: gsBase + 'icon-contact.png',
+      avatarDefault: ossImageUrl + 'avatar/default.jpg',
+      iconClear: ossImageUrl + 'beijing/tubiao/grzx_qingchu.jpg',
+      iconKefu: ossImageUrl + 'beijing/tubiao/grzx_kefu.jpg',
+      iconKuaishou: ossImageUrl + 'beijing/tubiao/grzx_guanzhualong.jpg',
+      iconKaoheDafen: khBase + 'daofen.png',
+      iconKaoheJilu: khBase + 'jilu.png',
+      iconKaoheZhongxin: khBase + 'zhongxin.png',
+      iconShangjia: ossImageUrl + 'beijing/tubiao/grzx_shangjia.jpg',
+      iconDashouAuth: ossImageUrl + 'beijing/tubiao/grzx_dashou.jpg',
+      iconGuanshiAuth: ossImageUrl + 'beijing/tubiao/grzx_guanshi.jpg',
+      iconZuzhangAuth: ossImageUrl + 'beijing/tubiao/grzx_zuzhang.jpg',
+      kefuBannerBg: dsBase + 'kefu-banner-bg.png',
+      totalAssetBg: dsBase + 'total-asset-bg.png',
+      authPanelBg: dsBase + 'auth-panel-bg.png',
+    };
+  },
+
+  _applyRankBoardIcons(imgUrls) {
+    const iconMap = {
+      dashou: imgUrls.iconRankDashou,
+      guanshi: imgUrls.iconRankGuanshi,
+      zuzhang: imgUrls.iconRankZuzhang,
+      shangjia: imgUrls.iconRankShangjia,
+    };
+    return (this.data.rankBoardList || []).map((item) => ({
+      ...item,
+      icon: iconMap[item.type] || imgUrls.iconRank,
+    }));
+  },
+
+  onLoad(options) {
+    const app = getApp();
+    const ossImageUrl = app.globalData.ossImageUrl || '';
+    const imgUrls = this._buildImgUrls(ossImageUrl);
+    this.setData({
+      imgUrls,
+      rankBoardList: this._applyRankBoardIcons(imgUrls),
+    });
+    this.checkRoleStatuses();
+
+    const registerType = options.registerType || 'dashou';
+    if (options.scene) {
+      try {
+        const scene = decodeURIComponent(options.scene);
+        options.inviteCode = scene;
+      } catch (e) {
+        console.error('scene解码失败', e);
+      }
+    }
+    this.checkDashouStatus();
+    const { inviteCode } = options || {};
+    if (inviteCode) {
+      if (registerType === 'guanshi') {
+        this.setData({ guanshiInviteCode: inviteCode });
+        setTimeout(() => {
+          this.handleGuanshiInviteCodeWithLoginCheck(inviteCode);
+        }, 500);
+      } else {
+        this.setData({ inviteCode });
+        setTimeout(() => {
+          this.handleInviteCodeWithLoginCheck(inviteCode);
+        }, 500);
+      }
+    }
+    // 注意：不再重复声明 app
+    if (!app.globalData.hasShownPopupOnColdStart) {
+      app.globalData.hasShownPopupOnColdStart = true;
+      setTimeout(() => {
+        popupService.checkAndShow(this, 'dashouduan');
+      }, 300);
+    }
+  },
+
+  onReady() {
+    if (isCenterPageActive(this, 'isDashou', 'dashoustatus')) {
+      ensureRoleOnCenterPage(this, 'dashou');
+    }
+  },
+
+  onHide() {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+      popupComp.cleanup();
+    }
+  },
+
+  onShow() {
+    migrateLegacyCenterRole(getApp());
+    lockPrimaryRole('dashou', getApp());
+    wx.setStorageSync('isJinpai', 0);
+    ensureRoleOnCenterPage(this, 'dashou');
+
+    const inviterCache = wx.getStorageSync('inviterCache') || null;
+    const zuzhangInviterCache = wx.getStorageSync('zuzhangInviterCache') || null;
+    this.setData({ inviterCache, zuzhangInviterCache });
+
+    this.registerNotificationComponent();
+    this.checkRoleStatuses();
+    if (isCenterPageActive(this, 'isDashou', 'dashoustatus')) {
+      if (!this.data.isDashou) this.setData({ isDashou: true });
+      ensureRoleOnCenterPage(this, 'dashou');
+      setTimeout(() => this.refreshAllInfo(false), 300);
+    } else if (isRoleStatusActive(wx.getStorageSync('guanshistatus')) ||
+      isRoleStatusActive(wx.getStorageSync('zuzhangstatus')) ||
+      isRoleStatusActive(wx.getStorageSync('kaoheguanstatus'))) {
+      ensureRoleOnCenterPage(this, 'dashou');
+      setTimeout(() => this.refreshAllInfo(false), 300);
+    }
+    const pages = getCurrentPages();
+    const currentPage = pages[pages.length - 1];
+    const options = currentPage.options || {};
+    const registerType = options.registerType || 'dashou';
+    if (options.inviteCode) {
+      if (registerType === 'guanshi' && !isRoleStatusActive(wx.getStorageSync('guanshistatus'))) {
+        setTimeout(() => {
+          this.handleGuanshiInviteCodeWithLoginCheck(options.inviteCode);
+        }, 300);
+      } else if (registerType !== 'guanshi' && !isCenterPageActive(this, 'isDashou', 'dashoustatus')) {
+        setTimeout(() => {
+          this.handleInviteCodeWithLoginCheck(options.inviteCode);
+        }, 300);
+      }
+    }
+  },
+
+  checkRoleStatuses() {
+    const isDashou = isRoleStatusActive(wx.getStorageSync('dashoustatus'));
+    const isGuanshi = isRoleStatusActive(wx.getStorageSync('guanshistatus'));
+    const isZuzhang = isRoleStatusActive(wx.getStorageSync('zuzhangstatus'));
+    const isKaoheguan = isRoleStatusActive(wx.getStorageSync('kaoheguanstatus'));
+    const isShangjia = isRoleStatusActive(wx.getStorageSync('shangjiastatus'));
+    const subRoleCount = [isGuanshi, isZuzhang, isKaoheguan].filter(Boolean).length;
+    this.setData({
+      isDashou, isGuanshi, isZuzhang, isKaoheguan,
+      isShangjia,
+      shangjiaCertified: isShangjia,
+      layoutSparse: subRoleCount === 0,
+    }, () => {
+      this._updateTotalAssets();
+      this._updatePendingAuth();
+    });
+    if (isDashou) {
+      const uid = wx.getStorageSync('uid') || '';
+      const touxiang = wx.getStorageSync('touxiang') || '';
+      this.setData({ uid, touxiang });
+      this.loadAvatar();
+    }
+  },
+
+  _parseMoney(val) {
+    return parseFloat(String(val || '0').replace(/,/g, '')) || 0;
+  },
+
+  _updateTotalAssets() {
+    const d = this.data;
+    const breakdown = [{ label: '打手佣金', amount: d.yongjin || '0.00' }];
+    let total = this._parseMoney(d.yongjin);
+    if (d.isGuanshi) {
+      total += this._parseMoney(d.fenyongtixian);
+      breakdown.push({ label: '管事分成', amount: d.fenyongtixian || '0.00' });
+    }
+    if (d.isZuzhang) {
+      total += this._parseMoney(d.ketixian);
+      breakdown.push({ label: '组长余额', amount: d.ketixian || '0.00' });
+    }
+    if (d.isKaoheguan) {
+      total += this._parseMoney(d.kaoheYue);
+      breakdown.push({ label: '考核余额', amount: d.kaoheYue || '0.00' });
+    }
+    this.setData({ totalAssets: total.toFixed(2), assetBreakdown: breakdown });
+  },
+
+  /** 打手端：已认证不展示；商家始终第一位 */
+  _updatePendingAuth() {
+    const d = this.data;
+    const img = d.imgUrls || {};
+    const list = [];
+    list.push({
+      type: 'shangjia',
+      name: '商家',
+      icon: img.iconShangjia,
+      tag: d.shangjiaCertified ? '进入商家端' : '去认证',
+      done: d.shangjiaCertified,
+    });
+    if (!d.isGuanshi) {
+      list.push({ type: 'guanshi', name: '管事', icon: img.iconGuanshiAuth, tag: '去认证' });
+    }
+    if (!d.isZuzhang) {
+      list.push({ type: 'zuzhang', name: '组长', icon: img.iconZuzhangAuth, tag: '去认证' });
+    }
+    if (!d.isDashou) {
+      list.push({ type: 'dashou', name: '接单员', icon: img.iconDashouAuth, tag: '去认证' });
+    }
+    this.setData({
+      pendingAuthList: list,
+      showAuthSection: list.length > 0,
+    });
+  },
+
+  _isApiSuccess(body) {
+    if (!body) return false;
+    const code = Number(body.code);
+    return code === 200 || code === 0;
+  },
+
+  _getApiMsg(body) {
+    if (!body) return '';
+    return body.msg || body.message || '';
+  },
+
+  _extractUserData(body) {
+    if (!body) return {};
+    if (body.data && typeof body.data === 'object' && !Array.isArray(body.data)) {
+      return body.data;
+    }
+    const userData = { ...body };
+    delete userData.code;
+    delete userData.msg;
+    delete userData.message;
+    return userData;
+  },
+
+  async refreshAllInfo(showToast = true) {
+    const now = Date.now();
+    if (!this.data.canRefresh || (now - this.data.lastRefreshTime < 3000)) return;
+    this.setData({ lastRefreshTime: now, canRefresh: false, isLoading: true });
+    try {
+      this.checkRoleStatuses();
+      const results = await Promise.allSettled([
+        this._fetchDashouInfoSilent(),
+        this.fetchChenghaoList(),
+        this._fetchGuanshiInfoSilent(),
+        this.fetchGuanshiChenghaoList(),
+        this._fetchZuzhangInfoSilent(),
+        this._fetchKaoheguanInfoSilent(),
+      ]);
+      this.checkRoleStatuses();
+      const dashouOk = results[0].status === 'fulfilled';
+      if (showToast) {
+        wx.showToast({
+          title: dashouOk ? '刷新成功' : '刷新失败',
+          icon: dashouOk ? 'success' : 'none',
+          duration: 1500,
+        });
+      }
+    } catch (e) {
+      if (showToast) {
+        wx.showToast({ title: '刷新失败', icon: 'none' });
+      }
+    } finally {
+      this.setData({ isLoading: false });
+      setTimeout(() => this.setData({ canRefresh: true }), 3000);
+    }
+  },
+
+  refreshDashouInfo() {
+    this.refreshAllInfo(true);
+  },
+
+  onTapRefresh() {
+    this.refreshAllInfo(true);
+  },
+
+  async _fetchDashouInfoSilent() {
+    const res = await request({ url: '/yonghu/dashouxinxi', method: 'POST' });
+    if (res && res.data.code == 200) {
+      const data = res.data.data;
+      const app = getApp();
+      const updateData = {
+        dashouNicheng: data.dashounicheng || '',
+        zhanghaoStatus: data.zhanghaostatus || '',
+        yongjin: data.yongjin || '0.00',
+        zonge: data.zonge || '0.00',
+        yajin: data.yajin || '0.00',
+        chenghao: data.chenghao || '',
+        jinfen: data.jifen || '0',
+        clumber: data.clumber || [],
+        chengjiaoliang: data.chengjiaoliang || '0',
+        zaixianZhuangtai: data.zaixianzhuangtai || 0,
+        dashouzhuangtai: data.dashouzhuangtai || '',
+      };
+      Object.assign(app.globalData, updateData);
+      if (data.dashoustatus !== undefined) {
+        wx.setStorageSync('dashoustatus', data.dashoustatus);
+        app.globalData.dashoustatus = data.dashoustatus;
+      }
+      if (data.guanshistatus !== undefined) {
+        wx.setStorageSync('guanshistatus', data.guanshistatus);
+        app.globalData.guanshistatus = data.guanshistatus;
+      }
+      if (data.zuzhangstatus !== undefined) {
+        wx.setStorageSync('zuzhangstatus', data.zuzhangstatus);
+        app.globalData.zuzhangstatus = data.zuzhangstatus;
+      }
+      this.setData({ ...updateData, isLoading: false });
+      this._updateTotalAssets();
+      return;
+    }
+    throw new Error('打手信息获取失败');
+  },
+
+  async _fetchGuanshiInfoSilent() {
+    const res = await request({ url: '/yonghu/guanshixinxi', method: 'POST' });
+    if (res && this._isApiSuccess(res.data)) {
+      const data = this._extractUserData(res.data);
+      if (data.guanshistatus !== undefined) {
+        wx.setStorageSync('guanshistatus', data.guanshistatus);
+        getApp().globalData.guanshistatus = data.guanshistatus;
+      }
+      if (!isRoleStatusActive(data.guanshistatus ?? wx.getStorageSync('guanshistatus'))) {
+        return;
+      }
+      const app = getApp();
+      if (!app.globalData.guanshi) app.globalData.guanshi = {};
+      const updateData = {
+        gszhstatus: data.gszhstatus || '',
+        yaoqingzongshu: data.yaoqingzongshu || 0,
+        fenyongzonge: data.fenyongzonge || '0.00',
+        fenyongtixian: data.fenyongtixian || '0.00',
+        yichongzhiDashou: data.yichongzhiDashou || 0,
+      };
+      Object.assign(app.globalData.guanshi, updateData);
+      const zhuanhualv = updateData.yaoqingzongshu > 0
+        ? (updateData.yichongzhiDashou / updateData.yaoqingzongshu * 100).toFixed(1)
+        : 0;
+      this.setData({ isGuanshi: true, ...updateData, zhuanhualv });
+      this._updateTotalAssets();
+      return;
+    }
+  },
+
+  async _fetchZuzhangInfoSilent() {
+    const res = await request({ url: '/yonghu/zuzhangxinxi', method: 'POST' });
+    if (res && res.data.code === 200) {
+      const data = res.data.data || {};
+      if (data.zuzhangstatus !== undefined) {
+        wx.setStorageSync('zuzhangstatus', data.zuzhangstatus);
+        getApp().globalData.zuzhangstatus = data.zuzhangstatus;
+      }
+      if (!isRoleStatusActive(data.zuzhangstatus ?? wx.getStorageSync('zuzhangstatus'))) {
+        return;
+      }
+      this.setData({
+        isZuzhang: true,
+        ketixian: data.ketixian || '0.00',
+        guanshiCount: data.guanshiCount || 0,
+        fenhongZonge: data.fenhongZonge || '0.00',
+      });
+      this._updateTotalAssets();
+      return;
+    }
+  },
+
+  async _fetchKaoheguanInfoSilent() {
+    const res = await request({ url: '/dengji/khgsx', method: 'POST' });
+    if (res && res.data.code === 200) {
+      const data = res.data.data || {};
+      if (data.zhuangtai === 0 || data.zhuangtai === 2) {
+        wx.setStorageSync('kaoheguanstatus', 0);
+        getApp().globalData.kaoheguanstatus = 0;
+        this.setData({ isKaoheguan: false });
+        return;
+      }
+      wx.setStorageSync('kaoheguanstatus', 1);
+      getApp().globalData.kaoheguanstatus = 1;
+      const app = getApp();
+      if (!app.globalData.kaoheguan) app.globalData.kaoheguan = {};
+      Object.assign(app.globalData.kaoheguan, {
+        shenhe_zongshu: data.shenhe_zongshu || 0,
+        tongguo_zongshu: data.tongguo_zongshu || 0,
+        yue: data.yue || '0.00',
+        zonge: data.zonge || '0.00',
+        pending_shenhe_count: data.pending_shenhe_count || 0,
+      });
+      this.setData({
+        isKaoheguan: true,
+        shenheZongshu: data.shenhe_zongshu || 0,
+        tongguoZongshu: data.tongguo_zongshu || 0,
+        kaoheYue: data.yue || '0.00',
+        kaoheZonge: data.zonge || '0.00',
+        pendingShenheCount: data.pending_shenhe_count || 0,
+      });
+      this._updateTotalAssets();
+    }
+  },
+
+  async fetchGuanshiChenghaoList() {
+    try {
+      const res = await request({
+        url: '/dengji/chenghao',
+        method: 'POST',
+        data: { role: 'guanshi' },
+      });
+      if (res && res.data.code === 0 && res.data.data) {
+        this.setData({ guanshiChenghaoList: res.data.data.chenghao_list || [] });
+      }
+    } catch (e) {}
+  },
+
+  _isAlreadyGuanshiMsg(msg) {
+    if (!msg || typeof msg !== 'string') return false;
+    return msg.includes('已是管事') || msg.includes('已经是管事');
+  },
+
+  async _applyGuanshiRegisterSuccess(userData, toastMsg) {
+    const data = userData || {};
+    syncRoleStatuses(data);
+    syncProfileFields(data);
+    syncGroupFields(data);
+    if (data.token) {
+      wx.setStorageSync('token', data.token);
+      getApp().globalData.token = data.token;
+    }
+    if (!Object.prototype.hasOwnProperty.call(data, 'guanshistatus') &&
+        !isRoleStatusActive(wx.getStorageSync('guanshistatus'))) {
+      wx.setStorageSync('guanshistatus', 1);
+      getApp().globalData.guanshistatus = 1;
+    }
+    const app = getApp();
+    if (!app.globalData.guanshi) app.globalData.guanshi = {};
+    const guanshiData = {
+      gszhstatus: data.gszhstatus ?? '',
+      yaoqingzongshu: data.yaoqingzongshu ?? 0,
+      fenyongzonge: data.fenyongzonge ?? '0.00',
+      fenyongtixian: data.fenyongtixian ?? '0.00',
+      yichongzhiDashou: data.yichongzhiDashou ?? 0,
+    };
+    Object.assign(app.globalData.guanshi, guanshiData);
+    const zhuanhualv = guanshiData.yaoqingzongshu > 0
+      ? (guanshiData.yichongzhiDashou / guanshiData.yaoqingzongshu * 100).toFixed(1)
+      : 0;
+    this.checkRoleStatuses();
+    if (isRoleStatusActive(wx.getStorageSync('dashoustatus'))) {
+      this.setData({ isDashou: true, uid: data.uid || wx.getStorageSync('uid') || '' });
+      this.loadAvatar();
+    }
+    this.setData({
+      isGuanshi: true,
+      ...guanshiData,
+      zhuanhualv,
+      isLoading: false,
+      guanshiInviteCode: '',
+    });
+    lockPrimaryRole('dashou');
+    ensureRoleOnCenterPage(this, 'dashou');
+    await this.refreshAllInfo(false);
+    wx.hideLoading();
+    wx.showToast({ title: toastMsg || '管事注册成功', icon: 'success', duration: 2000 });
+  },
+
+  handleGuanshiInviteCodeWithLoginCheck(inviteCode) {
+    const token = wx.getStorageSync('token');
+    const uid = wx.getStorageSync('uid');
+    if (!token || !uid) {
+      this.loginAndRegisterGuanshiWithInviteCode(inviteCode);
+    } else if (!this.data.isGuanshi) {
+      wx.showLoading({ title: '管事注册中...', mask: true });
+      this.callGuanshiRegisterApi(inviteCode);
+    } else {
+      lockPrimaryRole('dashou');
+      ensureRoleOnCenterPage(this, 'dashou');
+      wx.showToast({ title: '您已是管事', icon: 'success' });
+    }
+  },
+
+  loginAndRegisterGuanshiWithInviteCode(inviteCode) {
+    const that = this;
+    wx.showLoading({ title: '登录注册中...', mask: true });
+    wx.login({
+      success: (loginRes) => {
+        if (loginRes.code) {
+          that.callGuanshiLoginRegisterApi(loginRes.code, inviteCode);
+        } else {
+          wx.hideLoading();
+          wx.showToast({ title: '微信登录失败', icon: 'none' });
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.showToast({ title: '微信登录失败', icon: 'none' });
+      },
+    });
+  },
+
+  callGuanshiLoginRegisterApi(code, inviteCode) {
+    const that = this;
+    const app = getApp();
+    const apiBaseUrl = app.globalData.apiBaseUrl;
+    if (!apiBaseUrl) {
+      wx.hideLoading();
+      wx.showToast({ title: '服务器配置错误', icon: 'none' });
+      return;
+    }
+    wx.request({
+      url: apiBaseUrl + '/yonghu/zuzhangyqmzc',
+      method: 'POST',
+      data: { code, inviteCode },
+      header: { 'content-type': 'application/json' },
+      success: (res) => {
+        const body = res.data || {};
+        if (res.statusCode === 200 && that._isApiSuccess(body)) {
+          const userData = that._extractUserData(body);
+          const toastMsg = that._isAlreadyGuanshiMsg(that._getApiMsg(body))
+            ? that._getApiMsg(body)
+            : '管事注册成功';
+          that._applyGuanshiRegisterSuccess(userData, toastMsg);
+        } else if (res.statusCode === 200 && that._isAlreadyGuanshiMsg(that._getApiMsg(body))) {
+          that._applyGuanshiRegisterSuccess(that._extractUserData(body), that._getApiMsg(body) || '您已是管事');
+        } else {
+          wx.hideLoading();
+          wx.showToast({ title: that._getApiMsg(body) || '注册失败', icon: 'none' });
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.showToast({ title: '网络请求失败', icon: 'none' });
+      },
+    });
+  },
+
+  async callGuanshiRegisterApi(inviteCode) {
+    try {
+      const res = await request({
+        url: '/yonghu/guanshizhuce',
+        method: 'POST',
+        data: { inviteCode },
+      });
+      const body = res?.data || {};
+      if (res && this._isApiSuccess(body)) {
+        const userData = this._extractUserData(body);
+        const toastMsg = this._isAlreadyGuanshiMsg(this._getApiMsg(body))
+          ? this._getApiMsg(body)
+          : '管事注册成功';
+        await this._applyGuanshiRegisterSuccess(userData, toastMsg);
+      } else if (this._isAlreadyGuanshiMsg(this._getApiMsg(body))) {
+        await this._applyGuanshiRegisterSuccess(this._extractUserData(body), this._getApiMsg(body) || '您已是管事');
+      } else {
+        wx.hideLoading();
+        wx.showToast({ title: this._getApiMsg(body) || '注册失败', icon: 'none' });
+      }
+    } catch (e) {
+      wx.hideLoading();
+      wx.showToast({ title: e.message || '注册失败', icon: 'none' });
+    }
+  },
+
+  goToGuanshiWithdraw() {
+    wx.navigateTo({ url: '/pages/withdraw/withdraw' });
+  },
+
+  goToZuzhangWithdraw() {
+    wx.navigateTo({ url: `/pages/withdraw/withdraw?from=zuzhang&amount=${this.data.ketixian}` });
+  },
+
+  goToInviteUser() { wx.navigateTo({ url: '/pages/invite-fighter/invite-fighter' }); },
+  goToMySubordinate() { wx.navigateTo({ url: '/pages/my-fighter/my-fighter' }); },
+  goToRechargeRecord() { wx.navigateTo({ url: '/pages/recharge-log/recharge-log' }); },
+  goToGuanshiRanking() {
+    wx.navigateTo({ url: '/pages/fighter-rank/fighter-rank?type=guanshi' });
+  },
+  goToPromoPoster() { wx.navigateTo({ url: '/pages/poster/poster' }); },
+  goToFenhongJilu() { wx.navigateTo({ url: '/pages/leader-bonus-log/leader-bonus-log' }); },
+  goToYaoqingGuanshi() { wx.navigateTo({ url: '/pages/invite-manager/invite-manager' }); },
+  goToGuanshiAuthPage() { wx.navigateTo({ url: '/pages/verify/verify?type=guanshi' }); },
+
+  async contactZuzhang() {
+    wx.showLoading({ title: '获取组长信息...', mask: true });
+    try {
+      const res = await request({ url: '/yonghu/guanshi_contact', method: 'POST' });
+      if (res && res.data.code === 200 && res.data.data) {
+        const inviter = res.data.data;
+        const fullAvatar = resolveAvatarUrl(inviter.touxiang);
+        const cacheData = { uid: inviter.uid, nicheng: inviter.nicheng || '', avatar: fullAvatar };
+        wx.setStorageSync('zuzhangInviterCache', cacheData);
+        this.setData({ zuzhangInviterCache: cacheData });
+        await openPrivateChat(this, {
+          toUserId: buildInviterPeerId(inviter.uid),
+          toName: inviter.nicheng || '组长',
+          toAvatar: fullAvatar,
+        });
+      } else {
+        wx.showToast({ title: '未绑定邀请人', icon: 'none' });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+      wx.hideLoading();
+    }
+  },
+
+  async fetchChenghaoList() {
+    try {
+      const res = await request({
+        url: '/dengji/dsbqhq',
+        method: 'POST'
+      });
+      if (res && res.data.code === 0 && res.data.data) {
+        const list = res.data.data.chenghao_list || [];
+        this.setData({ chenghaoList: list });
+        const app = getApp();
+        app.globalData.chenghaoList = list;
+      } else {
+        this.setData({ chenghaoList: [] });
+      }
+    } catch (e) {
+    }
+  },
+
+  // 联系邀请人
+  async contactInviter() {
+    wx.showLoading({ title: '获取邀请人...', mask: true });
+    try {
+      const res = await request({ url: '/yonghu/hqwdyqr', method: 'POST' });
+      if (res && res.data.code === 200 && res.data.data) {
+        const inviter = res.data.data;
+        const fullAvatar = resolveAvatarUrl(inviter.touxiang);
+        const cacheData = {
+          uid: inviter.uid,
+          nicheng: inviter.nicheng || '',
+          avatar: fullAvatar,
+        };
+        wx.setStorageSync('inviterCache', cacheData);
+        this.setData({ inviterCache: cacheData });
+        await openPrivateChat(this, {
+          toUserId: buildInviterPeerId(inviter.uid),
+          toName: inviter.nicheng || '管事',
+          toAvatar: fullAvatar,
+        });
+      } else {
+        wx.showToast({ title: res?.data?.msg || '获取失败', icon: 'none' });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+      wx.hideLoading();
+    }
+  },
+
+  handleInviteCodeWithLoginCheck(inviteCode) {
+    const that = this;
+    const token = wx.getStorageSync('token');
+    const uid = wx.getStorageSync('uid');
+    if (!token || !uid) {
+      this.loginAndRegisterWithInviteCode(inviteCode);
+    } else {
+      if (!that.data.isDashou) {
+        wx.showLoading({ title: '自动注册中...', mask: true });
+        that.setData({ isAutoRegistering: true });
+        that.onRegister();
+      } else {
+        wx.showToast({ title: '您已是打手', icon: 'success', duration: 2000 });
+      }
+    }
+  },
+
+  loginAndRegisterWithInviteCode(inviteCode) {
+    const that = this;
+    wx.showLoading({ title: '登录注册中...', mask: true });
+    wx.login({
+      success: (loginRes) => {
+        if (loginRes.code) {
+          that.callLoginRegisterApi(loginRes.code, inviteCode);
+        } else {
+          wx.hideLoading();
+          wx.showToast({ title: '微信登录失败', icon: 'none' });
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        console.error('微信登录失败');
+        wx.reLaunch({ url: '/pages/mine/mine' });
+      }
+    });
+  },
+
+  callLoginRegisterApi(code, inviteCode) {
+    const that = this;
+    const app = getApp();
+    const apiBaseUrl = app.globalData.apiBaseUrl;
+    if (!apiBaseUrl) {
+      wx.hideLoading();
+      wx.showToast({ title: '服务器配置错误', icon: 'none' });
+      return;
+    }
+    wx.request({
+      url: apiBaseUrl + '/yonghu/wdlyhdl',
+      method: 'POST',
+      data: { code: code, inviteCode: inviteCode },
+      header: { 'content-type': 'application/json' },
+      success: (res) => {
+        if (res.statusCode === 200 && res.data && res.data.code === 0 && res.data.data) {
+          const userData = res.data.data;
+          syncProfileFields(userData);
+          syncRoleStatuses(userData);
+          syncGroupFields(userData);
+          if (userData.token) wx.setStorageSync('token', userData.token);
+          const identityFields = ['nicheng', 'uid', 'touxiang', 'dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus'];
+          identityFields.forEach(field => {
+            if (userData[field] !== undefined) {
+              wx.setStorageSync(field, userData[field]);
+              app.globalData[field] = userData[field];
+            }
+          });
+          const groupFields = ['dashouqun', 'dashouqunid', 'guanshiqun', 'guanshiqunid'];
+          groupFields.forEach(field => {
+            if (userData[field] !== undefined) {
+              wx.setStorageSync(field, userData[field]);
+              app.globalData[field] = userData[field];
+            }
+          });
+          if (userData.dashounicheng || userData.yongjin) {
+            const updateData = {
+              dashouNicheng: userData.dashounicheng || '',
+              zhanghaoStatus: userData.zhanghaostatus || '',
+              yongjin: userData.yongjin || '0.00',
+              zonge: userData.zonge || '0.00',
+              yajin: userData.yajin || '0.00',
+              chenghao: userData.chenghao || '',
+              jinfen: userData.jifen || userData.jinfen || '0',
+              clumber: userData.clumber || [],
+              chengjiaoliang: userData.chengjiaoliang || '0',
+              zaixianZhuangtai: userData.zaixianzhuangtai || 0,
+              dashouzhuangtai: userData.dashouzhuangtai || '',
+            };
+            Object.assign(app.globalData, updateData);
+          }
+          that.setData({
+            isDashou: true,
+            uid: userData.uid || '',
+            touxiang: userData.touxiang || '',
+            isAutoRegistering: false
+          });
+          that.loadAvatar();
+          that.getDashouInfo();
+          that.switchToDashouRole();
+          lockPrimaryRole('dashou');
+          wx.hideLoading();
+          wx.showToast({ title: '登录注册成功！', icon: 'success', duration: 2000 });
+        } else {
+          wx.hideLoading();
+          wx.showToast({ title: (res.data && res.data.msg) || '登录注册失败', icon: 'none' });
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.showToast({ title: '网络请求失败', icon: 'none' });
+      }
+    });
+  },
+
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  checkDashouStatus() {
+    try {
+      const dashoustatus = wx.getStorageSync('dashoustatus');
+      const uid = wx.getStorageSync('uid');
+      const touxiang = wx.getStorageSync('touxiang');
+      if (isRoleStatusActive(dashoustatus)) {
+        this.setData({ isDashou: true, uid: uid || '', touxiang: touxiang || '' });
+        this.loadAvatar();
+        this.checkGlobalData();
+        ensureRoleOnCenterPage(this, 'dashou');
+      } else {
+        this.setData({ isDashou: false });
+      }
+    } catch (error) {
+      console.error('读取缓存失败:', error);
+      this.setData({ isDashou: false });
+    }
+  },
+
+  loadAvatar() {
+    const avatarUrl = resolveAvatarFromStorage(getApp());
+    this.setData({ avatarUrl });
+  },
+
+  checkGlobalData() {
+    const app = getApp();
+    const globalData = app.globalData || {};
+    const needRefresh = !globalData.dashouNicheng || globalData.dashouNicheng === '' || !globalData.yongjin;
+    if (needRefresh) {
+      this.getDashouInfo();
+    } else {
+      this.setDataFromGlobalData();
+    }
+  },
+
+  setDataFromGlobalData() {
+    const app = getApp();
+    const {
+      dashouNicheng = '', zhanghaoStatus = '', yongjin = '0.00', zonge = '0.00',
+      yajin = '0.00', chenghao = '', jinfen = '0', clumber = [],
+      chengjiaoliang = '0', zaixianZhuangtai = 0
+    } = app.globalData || {};
+    this.setData({
+      dashouNicheng, zhanghaoStatus, yongjin, zonge, yajin,
+      chenghao, jinfen,
+      clumber: Array.isArray(clumber) ? clumber : [],
+      chengjiaoliang,
+      zaixianZhuangtai: zaixianZhuangtai === 1 ? 1 : 0
+    });
+  },
+
+  async getDashouInfo() {
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({ url: '/yonghu/dashouxinxi', method: 'POST' });
+      if (res && res.data.code == 200) {
+        const data = res.data.data;
+        const app = getApp();
+        const updateData = {
+          dashouNicheng: data.dashounicheng || '',
+          zhanghaoStatus: data.zhanghaostatus || '',
+          yongjin: data.yongjin || '0.00',
+          zonge: data.zonge || '0.00',
+          yajin: data.yajin || '0.00',
+          chenghao: data.chenghao || '',
+          jinfen: data.jifen || '0',
+          clumber: data.clumber || [],
+          chengjiaoliang: data.chengjiaoliang || '0',
+          zaixianZhuangtai: data.zaixianzhuangtai || 0,
+          dashouzhuangtai: data.dashouzhuangtai || '',
+        };
+        Object.assign(app.globalData, updateData);
+        if (data.dashoustatus !== undefined) {
+          wx.setStorageSync('dashoustatus', data.dashoustatus);
+          app.globalData.dashoustatus = data.dashoustatus;
+        }
+        if (data.guanshistatus !== undefined) {
+          wx.setStorageSync('guanshistatus', data.guanshistatus);
+          app.globalData.guanshistatus = data.guanshistatus;
+        }
+        this.setData({ ...updateData, isLoading: false });
+        this._updateTotalAssets();
+        if (this.data.isAutoRegistering) {
+          this.setData({ isAutoRegistering: false });
+          wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 });
+        } else {
+          wx.showToast({ title: '信息已更新', icon: 'success', duration: 1500 });
+        }
+      }
+    } catch (error) {
+      console.error('获取打手信息失败:', error);
+      this.setData({ isLoading: false, isAutoRegistering: false });
+      wx.showToast({ title: '获取信息失败', icon: 'error', duration: 2000 });
+    }
+  },
+
+  onInviteCodeInput(e) {
+    this.setData({ inviteCode: e.detail.value.trim() });
+  },
+
+  async onRegister() {
+    const { inviteCode } = this.data;
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none', duration: 2000 });
+      return;
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none', duration: 2000 });
+      return;
+    }
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({
+        url: '/yonghu/dashouzhuce',
+        method: 'POST',
+        data: { inviteCode: inviteCode }
+      });
+      if (res && res.data.code == 200) {
+        const data = res.data.data || {};
+        const app = getApp();
+        syncRoleStatuses(data);
+        syncProfileFields(data);
+        if (data.dashoustatus === undefined && !isRoleStatusActive(wx.getStorageSync('dashoustatus'))) {
+          wx.setStorageSync('dashoustatus', 1);
+          app.globalData.dashoustatus = 1;
+        }
+        const identityFields = ['dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus'];
+        identityFields.forEach(field => {
+          if (data[field] !== undefined) {
+            wx.setStorageSync(field, data[field]);
+            app.globalData[field] = data[field];
+          }
+        });
+        const updateData = {
+          dashouNicheng: data.dashounicheng || '',
+          zhanghaoStatus: data.zhanghaostatus || '',
+          yongjin: data.yongjin || '0.00',
+          zonge: data.zonge || '0.00',
+          yajin: data.yajin || '0.00',
+          chenghao: data.chenghao || '',
+          jinfen: data.jinfen || '0',
+          clumber: data.clumber || [],
+          chengjiaoliang: data.chengjiaoliang || '0',
+          zaixianZhuangtai: data.zaixianzhuangtai || 0,
+          dashouzhuangtai: data.dashouzhuangtai || '',
+        };
+        Object.assign(app.globalData, updateData);
+        this.setData({
+          isDashou: true,
+          ...updateData,
+          isLoading: false,
+          isAutoRegistering: false
+        });
+        this.loadAvatar();
+        ensureRoleOnCenterPage(this, 'dashou');
+        lockPrimaryRole('dashou');
+        wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 });
+      } else {
+        this.setData({ isLoading: false, isAutoRegistering: false });
+        wx.showToast({ title: (res.data && res.data.message) || '注册失败', icon: 'error', duration: 2000 });
+      }
+    } catch (error) {
+      console.error('注册失败:', error);
+      this.setData({ isLoading: false, isAutoRegistering: false });
+      wx.showToast({ title: error.message || '注册失败', icon: 'error', duration: 2000 });
+    }
+  },
+
+  switchToDashouRole() {
+    ensureRoleOnCenterPage(this, 'dashou');
+  },
+
+  copyUid() {
+    const { uid } = this.data;
+    if (!uid) {
+      wx.showToast({ title: 'UID不存在', icon: 'none', duration: 1500 });
+      return;
+    }
+    wx.setClipboardData({
+      data: uid,
+      success: () => wx.showToast({ title: '已复制UID', icon: 'success', duration: 1500 }),
+      fail: () => wx.showToast({ title: '复制失败', icon: 'error', duration: 1500 })
+    });
+  },
+
+  previewAvatar() {
+    const { avatarUrl } = this.data;
+    if (avatarUrl) wx.previewImage({ urls: [avatarUrl] });
+  },
+
+  goToWithdraw() { wx.navigateTo({ url: '/pages/withdraw/withdraw' }) },
+  goToTotalWithdraw() { this.goToWithdraw(); },
+
+  goToKefu() {
+    const app = getApp();
+    const { link, enterpriseId } = app.globalData.kefuConfig || {};
+    if (!link || !enterpriseId) {
+      wx.showToast({ title: '客服配置未加载', icon: 'none' });
+      return;
+    }
+    wx.openCustomerServiceChat({
+      extInfo: { url: link },
+      corpId: enterpriseId,
+    });
+  },
+
+  goToAuth(e) {
+    const type = e.currentTarget.dataset.type;
+    if (!type || !['dashou', 'shangjia', 'guanshi', 'zuzhang'].includes(type)) return;
+    const statusMap = {
+      dashou: 'dashoustatus',
+      shangjia: 'shangjiastatus',
+      guanshi: 'guanshistatus',
+      zuzhang: 'zuzhangstatus',
+    };
+    const statusKey = statusMap[type];
+    if (isRoleStatusActive(wx.getStorageSync(statusKey))) {
+      if (type === 'shangjia') {
+        enterLockedRole('shangjia', getApp());
+      }
+      return;
+    }
+    wx.navigateTo({ url: `/pages/verify/verify?type=${type}` });
+  },
+
+  onTapAuthItem(e) {
+    const type = e.currentTarget.dataset.type;
+    if (type === 'shangjia') {
+      this.onTapShangjiaAuth();
+      return;
+    }
+    this.goToAuth(e);
+  },
+
+  enterShangjiaCenter() {
+    if (!this.data.shangjiaCertified) {
+      wx.navigateTo({ url: '/pages/verify/verify?type=shangjia' });
+      return;
+    }
+    enterLockedRole('shangjia', getApp());
+  },
+
+  onTapShangjiaAuth() {
+    if (this.data.shangjiaCertified) {
+      this.enterShangjiaCenter();
+      return;
+    }
+    wx.navigateTo({ url: '/pages/verify/verify?type=shangjia' });
+  },
+  goToReceiveOrder() { wx.navigateTo({ url: '/pages/accept-order/accept-order' }) },
+  goToMyOrders() { wx.navigateTo({ url: '/pages/fighter-orders/fighter-orders' }) },
+  goToMyPunishment() { wx.navigateTo({ url: '/pages/penalty/penalty/penalty' }) },
+  goToRecharge() { wx.navigateTo({ url: '/pages/fighter-recharge/fighter-recharge' }) },
+  goToRanking(e) {
+    const type = e?.currentTarget?.dataset?.type || 'dashou';
+    wx.navigateTo({ url: `/pages/fighter-rank/fighter-rank?type=${type}` });
+  },
+  goToGuanzhuKs() { wx.navigateTo({ url: '/pages/manager-assign/manager-assign' }) },
+  goToKaoheDafen() { wx.navigateTo({ url: '/pages/assess-score/assess-score' }) },
+  goToKaoheJilu() { wx.navigateTo({ url: '/pages/assess-log/assess-log' }) },
+  goToKaoheZhongxin() { wx.navigateTo({ url: '/pages/assess-center/assess-center' }) },
+  goToKaoheWithdraw() {
+    const yue = this.data.kaoheYue || '0.00';
+    wx.navigateTo({ url: `/pages/withdraw/withdraw?amount=${yue}&from=kaoheguan` });
+  },
+  goToModifyInfo() { wx.navigateTo({ url: '/pages/fighter-edit/fighter-edit' }) },
+  goToRules() { wx.navigateTo({ url: '/pages/fighter-rules/fighter-rules' }) },
+  goToKaohe() {
+    wx.navigateTo({ url: '/pages/assess-gold/assess-gold' });
+  },
+
+  quickRegisterAsPlatform() {
+    const that = this;
+    wx.showModal({
+      title: '提示',
+      content: '使用此功能后，您将不属于任何管事，确认注册吗？',
+      success: (res) => {
+        if (res.confirm) {
+          that.setData({ inviteCode: PLATFORM_INVITE_CODE });
+          that.onRegister();
+        }
+      }
+    });
+  },
+
+  clearCache() {
+    wx.showModal({
+      title: '清除缓存',
+      content: '将清除所有登录与身份数据，并回到点单端，确定继续？',
+      confirmText: '确定',
+      cancelText: '取消',
+      success: (r) => {
+        if (r.confirm) clearCacheAndEnterNormal(this);
+      },
+    });
+  },
+})
diff --git a/pages/dashouduan/dashouduan.json b/pages/fighter/fighter.json
similarity index 100%
rename from pages/dashouduan/dashouduan.json
rename to pages/fighter/fighter.json
diff --git a/pages/dashouduan/dashouduan.wxml b/pages/fighter/fighter.wxml
similarity index 100%
rename from pages/dashouduan/dashouduan.wxml
rename to pages/fighter/fighter.wxml
diff --git a/pages/dashouduan/dashouduan.wxss b/pages/fighter/fighter.wxss
similarity index 90%
rename from pages/dashouduan/dashouduan.wxss
rename to pages/fighter/fighter.wxss
index 84e11a8..dfe67c9 100644
--- a/pages/dashouduan/dashouduan.wxss
+++ b/pages/fighter/fighter.wxss
@@ -4,15 +4,9 @@ page {
   color: #1A1A1A;
 }
 
+/* .page-bg 与全局相同，仅保留差异 */
 .page-bg {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
   opacity: 0.42;
-  z-index: 0;
-  pointer-events: none;
 }
 
 .unreg-area {
@@ -50,31 +44,26 @@ page {
   color: #444;
 }
 
+/* .unreg-input 与 .input-rounded 类似，仅保留差异 */
 .unreg-input {
-  width: 100%;
   height: 80rpx;
-  background: #FFFFFF;
   border-radius: 40rpx;
-  padding: 0 32rpx;
-  font-size: 28rpx;
-  box-sizing: border-box;
   margin-bottom: 16rpx;
 }
 
 .ph { color: #999; }
 
+/* .unreg-btn 与 .btn .btn-secondary 类似，仅保留差异 */
 .unreg-btn {
   width: 100%;
   height: 80rpx;
   background: rgba(255, 255, 255, 0.65);
   border-radius: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
   border: 1rpx solid rgba(0, 0, 0, 0.06);
   margin-bottom: 16rpx;
 }
 
+/* .unreg-btn-secondary 与 .btn-secondary 类似，仅保留差异 */
 .unreg-btn-secondary {
   margin-bottom: 0;
   background: rgba(255, 255, 255, 0.45);
@@ -112,27 +101,9 @@ page {
   padding: 0 24rpx 150rpx;
 }
 
-.refresh-btn {
-  position: fixed;
-  top: 36rpx;
-  right: 32rpx;
-  width: 56rpx;
-  height: 56rpx;
-  background: rgba(255, 255, 255, 0.8);
-  backdrop-filter: blur(12rpx);
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 20;
-  border: 1rpx solid rgba(255, 255, 255, 0.6);
-  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.05);
-}
+/* .refresh-btn 与全局 .refresh-btn .refresh-btn--light 完全相同，删除 */
 
-.refresh-icon {
-  width: 28rpx;
-  height: 28rpx;
-}
+/* .refresh-icon 与全局 .refresh-icon 完全相同，删除 */
 
 .user-card {
   position: relative;
@@ -163,13 +134,9 @@ page {
   backdrop-filter: blur(12rpx);
 }
 
+/* .user-avatar 与 .avatar-circle .avatar-md 类似，仅保留差异 */
 .user-avatar {
-  width: 88rpx;
-  height: 88rpx;
-  border-radius: 50%;
-  border: 2rpx solid #FFFFFF;
   margin-right: 20rpx;
-  flex-shrink: 0;
 }
 
 .user-info { flex: 1; min-width: 0; }
@@ -254,7 +221,7 @@ page {
   font-weight: 600;
 }
 
-/* ===== 黑卡 VIP ===== */
+/* 黑卡 VIP */
 .vip-black-card {
   position: relative;
   height: 152rpx;
@@ -329,7 +296,7 @@ page {
   color: #f3ead8;
 }
 
-/* ===== 资产面板 ===== */
+/* 资产面板 */
 .asset-panel {
   position: relative;
   border-radius: 28rpx;
@@ -447,7 +414,7 @@ page {
   margin-top: 4rpx;
 }
 
-/* ===== 排行榜（无大框，梯形格） ===== */
+/* 排行榜 */
 .rank-section {
   margin-bottom: 22rpx;
   padding: 0 2rpx;
@@ -613,7 +580,7 @@ page {
   text-align: right;
 }
 
-/* ===== 功能面板 ===== */
+/* 功能面板 */
 .func-panel {
   position: relative;
   border-radius: 28rpx;
@@ -720,10 +687,10 @@ page {
   font-weight: 600;
 }
 
+/* .list-card 与 .card 类似，仅保留差异 */
 .list-card {
   position: relative;
   border-radius: 28rpx;
-  overflow: hidden;
   box-shadow: 0 6rpx 24rpx rgba(0, 0, 0, 0.04);
 }
 
@@ -743,23 +710,22 @@ page {
   backdrop-filter: blur(12rpx);
 }
 
+/* .list-item 与全局 .list-item 类似，仅保留差异 */
 .list-item {
-  display: flex;
-  align-items: center;
   padding: 22rpx 20rpx;
-  border-bottom: 1rpx solid rgba(0, 0, 0, 0.04);
 }
 
 .list-item:last-child { border-bottom: none; }
 
+/* .list-icon 与全局 .list-icon 类似，仅保留差异（缺少 flex-shrink:0） */
 .list-icon {
   width: 36rpx;
   height: 36rpx;
   margin-right: 16rpx;
 }
 
+/* .list-text 与全局 .list-text 类似，仅保留差异 */
 .list-text {
-  flex: 1;
   font-size: 26rpx;
 }
 
@@ -769,13 +735,12 @@ page {
   margin-right: 8rpx;
 }
 
+/* .list-arrow 与全局 .list-arrow 类似，仅保留差异 */
 .list-arrow {
-  width: 20rpx;
-  height: 20rpx;
   opacity: 0.45;
 }
 
-/* ===== 客服入口 ===== */
+/* 客服入口 */
 .kefu-banner {
   position: relative;
   margin-bottom: 18rpx;
@@ -851,7 +816,7 @@ page {
   margin-left: 16rpx;
 }
 
-/* ===== 总资产 ===== */
+/* 总资产 */
 .total-asset-row {
   position: relative;
   border-radius: 24rpx;
@@ -937,6 +902,7 @@ page {
   font-weight: 500;
 }
 
+/* .withdraw-btn 与 .btn-sm--dark 类似，仅保留差异 */
 .withdraw-btn {
   flex-shrink: 0;
   min-width: 120rpx;
@@ -944,10 +910,7 @@ page {
   line-height: 72rpx;
   text-align: center;
   padding: 0 28rpx;
-  font-size: 26rpx;
   font-weight: 700;
-  color: #fff;
-  background: linear-gradient(135deg, #3d4f66 0%, #2c3e50 100%);
   border-radius: 999rpx;
   box-shadow: 0 6rpx 20rpx rgba(44, 62, 80, 0.22);
 }
@@ -965,7 +928,7 @@ page {
   box-sizing: border-box;
 }
 
-/* ===== 身份认证 ===== */
+/* 身份认证 */
 .auth-grid {
   position: relative;
   z-index: 1;
@@ -1008,28 +971,12 @@ page {
   background: rgba(90, 107, 87, 0.1);
 }
 
-.loading-mask {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(255, 255, 255, 0.85);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 9999;
-}
+/* .loading-mask 与全局 .loading-mask .loading-mask--light 完全相同，删除 */
 
+/* .loading-spinner 与 .spinner--md 类似，仅保留差异 */
 .loading-spinner {
   width: 52rpx;
   height: 52rpx;
   border: 3rpx solid rgba(0, 0, 0, 0.08);
   border-top-color: #1A1A1A;
-  border-radius: 50%;
-  animation: spin 0.8s linear infinite;
-}
-
-@keyframes spin {
-  to { transform: rotate(360deg); }
 }
diff --git a/pages/jinpaids/jinpaids.js b/pages/gold-fighter/gold-fighter.js
similarity index 87%
rename from pages/jinpaids/jinpaids.js
rename to pages/gold-fighter/gold-fighter.js
index c8ee7b7..53ba103 100644
--- a/pages/jinpaids/jinpaids.js
+++ b/pages/gold-fighter/gold-fighter.js
@@ -1,313 +1,313 @@
-// pages/jinpaids/jinpaids.js
-import request from '../../utils/request.js'
-import popupService from '../../services/popupService.js'
-import {
-  isRoleStatusActive,
-  isCenterPageActive,
-  ensureRoleOnCenterPage,
-} from '../../utils/role-tab-bar.js'
-import { buildInviterPeerId } from '../../utils/im-user.js'
-
-const app = getApp()
-
-Page({
-  data: {
-    // OSS地址
-    ossImageUrl: '',
-    
-    // 图标路径
-    icons: {
-      jinpai: '',
-      refresh: '',
-      copy: '',
-      qiangdan: '',
-      chongzhi: '',
-      dingdan: '',
-      chufa: '',
-      paihang: '',
-      xiugai: '',
-      tixian: '',
-      rightArrow: ''
-    },
-    
-    // 用户基本信息
-    uid: '',
-    touxiang: '',
-    avatarUrl: '',
-    dashouNicheng: '',
-    
-    // 打手核心数据
-    chenghao: '',
-    yongjin: '0.00',
-    zonge: '0.00',
-    yajin: '0.00',
-    jinfen: '0',
-    chengjiaoliang: '0',
-    zaixianZhuangtai: 0,
-    dashouzhuangtai: '',
-    clumber: [],
-    
-    // 金牌专属数据
-    jiedanZongliang: '0',
-    jinriJiedan: '0.00',
-    zuijinTixian: '0.00',
-    
-    // 页面状态
-    isLoading: false,
-    lastRefreshTime: 0,
-    canRefresh: true,
-    
-    // 计算数据
-    chengjiaoRate: '0%',
-    chengjiaoAngle: 0,
-    tixianProgress: 0,
-
-    // 邀请人缓存（管事）
-    inviterCache: null,
-    chenghaoList: []  // 新增
-  },
-
-  onLoad() {
-    wx.redirectTo({ url: '/pages/dashouduan/dashouduan' });
-  },
-
-  onShow() {
-    wx.redirectTo({ url: '/pages/dashouduan/dashouduan' });
-  },
-
-  _deprecatedOnLoad() {
-    const notificationComp = this.selectComponent('#global-notification')
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      }
-    }
-  },
-
-  loadUserInfo() {
-    const uid = wx.getStorageSync('uid') || ''
-    const touxiang = wx.getStorageSync('touxiang') || ''
-    const ossUrl = app.globalData.ossImageUrl || ''
-    const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg')
-    
-    let avatarUrl = defaultAvatar
-    if (touxiang) {
-      avatarUrl = ossUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang)
-    }
-    
-    const dashouNicheng = app.globalData.dashouNicheng || wx.getStorageSync('nicheng') || '金牌选手'
-    
-    this.setData({ uid, touxiang, avatarUrl, dashouNicheng })
-  },
-
-  async getJinpaiInfo() {
-    this.setData({ isLoading: true })
-    
-    try {
-      const res = await request({
-        url: '/yonghu/dashouxinxi',
-        method: 'POST'
-      })
-      
-      if (res && res.data.code === 200) {
-        const data = res.data.data
-        
-        const updateData = {
-          dashouNicheng: data.dashounicheng || '',
-          zhanghaoStatus: data.zhanghaostatus || '',
-          yongjin: data.yongjin || '0.00',
-          zonge: data.zonge || '0.00',
-          yajin: data.yajin || '0.00',
-          chenghao: data.chenghao || '',
-          jinfen: data.jifen || '0',
-          chengjiaoliang: data.chengjiaoliang || '0',
-          zaixianZhuangtai: data.zaixianzhuangtai || 0,
-          dashouzhuangtai: data.dashouzhuangtai || '',
-          clumber: data.clumber || [],
-          jiedanZongliang: data.jiedanZongliang || '0',
-          jinriJiedan: data.jinriJiedan || '0.00',
-          zuijinTixian: data.zuijinTixian || '0.00',
-        }
-        
-        const jiedanTotal = parseFloat(updateData.jiedanZongliang) || 0
-        const chengjiaoTotal = parseFloat(updateData.chengjiaoliang) || 0
-        const rateNumber = jiedanTotal > 0 ? (chengjiaoTotal / jiedanTotal) * 100 : 0
-        const chengjiaoRate = rateNumber.toFixed(1) + '%'
-        const chengjiaoAngle = rateNumber * 3.6
-        
-        const zuijin = parseFloat(updateData.zuijinTixian) || 0
-        const zong = parseFloat(updateData.jinriJiedan) || 0
-        const tixianProgress = zong > 0 ? Math.min((zuijin / zong) * 100, 100) : 0
-        
-        const globalUpdate = {
-          dashouNicheng: updateData.dashouNicheng,
-          zhanghaoStatus: updateData.zhanghaoStatus,
-          yongjin: updateData.yongjin,
-          zonge: updateData.zonge,
-          yajin: updateData.yajin,
-          chenghao: updateData.chenghao,
-          jinfen: updateData.jinfen,
-          chengjiaoliang: updateData.chengjiaoliang,
-          zaixianZhuangtai: updateData.zaixianZhuangtai,
-          dashouzhuangtai: updateData.dashouzhuangtai,
-          clumber: updateData.clumber,
-        }
-        Object.assign(app.globalData, globalUpdate)
-        
-        wx.setStorageSync('nicheng', updateData.dashouNicheng)
-        if (data.touxiang) {
-          wx.setStorageSync('touxiang', data.touxiang)
-        }
-        
-        this.setData({
-          ...updateData,
-          chengjiaoRate,
-          chengjiaoAngle,
-          tixianProgress: Math.round(tixianProgress),
-          isLoading: false
-        })
-        
-        this.checkJinpaiAndRedirect(updateData.chenghao)
-        
-      } else {
-        wx.showToast({ title: res?.data?.msg || '获取信息失败', icon: 'none' })
-        this.setData({ isLoading: false })
-      }
-    } catch (error) {
-      console.error('获取金牌信息失败:', error)
-      wx.showToast({ title: '网络错误', icon: 'none' })
-      this.setData({ isLoading: false })
-    }
-  },
-
-  refreshJinpaiInfo() {
-    const now = Date.now()
-    const lastTime = this.data.lastRefreshTime
-    const canRefresh = this.data.canRefresh
-    if (!canRefresh || (now - lastTime < 3000)) return
-
-    
-    this.setData({ lastRefreshTime: now, canRefresh: false })
-    this.getJinpaiInfo()
-    this.fetchChenghaoList()  // 新增
-    setTimeout(() => this.setData({ canRefresh: true }), 3000)
-  },
-
-  checkJinpaiAndRedirect(chenghao) {
-    if (chenghao !== '金牌选手') {
-      wx.setStorageSync('isJinpai', 0)
-      wx.redirectTo({ url: '/pages/dashouduan/dashouduan' })
-    } else {
-      wx.setStorageSync('isJinpai', 1)
-    }
-  },
-
-  // 联系管事（与打手端完全一致，增加容错）
-  async contactInviter() {
-    wx.showLoading({ title: '获取管事信息...', mask: true })
-    try {
-      const res = await request({ url: '/yonghu/hqwdyqr', method: 'POST' })
-      if (res && res.data.code === 200) {
-        const inviter = res.data.data
-        const ossImageUrl = getApp().globalData.ossImageUrl || ''
-        const fullAvatar = inviter.touxiang
-          ? (inviter.touxiang.startsWith('http') ? inviter.touxiang : ossImageUrl + inviter.touxiang)
-          : ''
-
-        // 缓存邀请人信息
-        const cacheData = {
-          uid: inviter.uid,
-          nicheng: inviter.nicheng || '',
-          avatar: fullAvatar
-        }
-        wx.setStorageSync('inviterCache', cacheData)
-        this.setData({ inviterCache: cacheData })
-
-        // 确保打手身份并连接
-        const app = getApp()
-        const myUid = wx.getStorageSync('uid')
-        
-        // 如果当前不是打手身份，则切换并重连
-        if (app.globalData.currentRole !== 'dashou') {
-          app.globalData.currentRole = 'dashou'
-          wx.setStorageSync('currentRole', 'dashou')
-          if (app.switchRoleAndReconnect) {
-            await app.switchRoleAndReconnect('dashou')
-          } else if (app.connectWithIdentity) {
-            // 降级方案：直接用打手身份连接
-            await app.connectWithIdentity('dashou', 'Ds' + myUid, false)
-          }
-        } else {
-          // 已为打手，确保连接存活
-          if (app.connectForCurrentRole) {
-            app.connectForCurrentRole()
-          } else if (app.ensureConnection) {
-            app.ensureConnection()
-          }
-        }
-
-        // 构造私聊参数
-        const param = {
-          toUserId: buildInviterPeerId(inviter.uid),
-          toName: inviter.nicheng || '管事',
-          toAvatar: fullAvatar
-        }
-        wx.navigateTo({
-          url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param)),
-          fail: (err) => {
-            console.error('跳转私聊失败', err)
-            wx.showToast({ title: '打开聊天失败', icon: 'none' })
-          }
-        })
-      } else {
-        wx.showToast({ title: res?.data?.msg || '获取失败', icon: 'none' })
-      }
-    } catch (e) {
-      console.error('联系管事出错:', e)
-      wx.showToast({ title: '网络错误', icon: 'none' })
-    } finally {
-      wx.hideLoading()
-    }
-  },
-
-  copyUid() {
-    const { uid } = this.data
-    if (!uid) return wx.showToast({ title: 'UID不存在', icon: 'none' })
-    wx.setClipboardData({
-      data: uid,
-      success: () => wx.showToast({ title: '已复制UID', icon: 'success' })
-    })
-  },
-
-  previewAvatar() {
-    if (this.data.avatarUrl) wx.previewImage({ urls: [this.data.avatarUrl] })
-  },
-
-  goToWithdraw() { wx.navigateTo({ url: '/pages/tixian/tixian' }) },
-  goToReceiveOrder() { wx.navigateTo({ url: '/pages/jiedan/jiedan' }) },
-  goToRecharge() { wx.navigateTo({ url: '/pages/dashouchongzhi/dashouchongzhi' }) },
-  goToMyOrders() { wx.navigateTo({ url: '/pages/dashoudingdan/dashoudingdan' }) },
-  goToMyPunishment() { wx.navigateTo({ url: '/pages/cfss/cfss/cfss' }) },
-  goToRanking() { wx.navigateTo({ url: '/pages/dashoupaihang/dashoupaihang?type=dashou' }) },
-  goToModifyInfo() { wx.navigateTo({ url: '/pages/dashouxiugai/dashouxiugai' }) },
-  goToRules() { wx.navigateTo({ url: '/pages/dashouguize/dashouguize' }) },
-  // 跳转到考核金牌
-goToKaohe() {
-    wx.navigateTo({ url: '/pages/kaohe_jinpai/kaohe_jinpai' });
-  },
-
-  async fetchChenghaoList() {
-    try {
-        const res = await request({
-            url: '/dengji/dsbqhq',
-            method: 'POST'
-        });
-        if (res && res.data.code === 0 && res.data.data) {
-            this.setData({ chenghaoList: res.data.data.chenghao_list || [] });
-        }
-    } catch (e) {
-        console.error('获取称号标签失败', e);
-    }
-},
+// pages/gold-fighter/gold-fighter.js
+import request from '../../utils/request.js'
+import popupService from '../../services/popupService.js'
+import {
+  isRoleStatusActive,
+  isCenterPageActive,
+  ensureRoleOnCenterPage,
+} from '../../utils/role-tab-bar.js'
+import { buildInviterPeerId } from '../../utils/im-user.js'
+
+const app = getApp()
+
+Page({
+  data: {
+    // OSS地址
+    ossImageUrl: '',
+    
+    // 图标路径
+    icons: {
+      jinpai: '',
+      refresh: '',
+      copy: '',
+      qiangdan: '',
+      chongzhi: '',
+      dingdan: '',
+      chufa: '',
+      paihang: '',
+      xiugai: '',
+      tixian: '',
+      rightArrow: ''
+    },
+    
+    // 用户基本信息
+    uid: '',
+    touxiang: '',
+    avatarUrl: '',
+    dashouNicheng: '',
+    
+    // 打手核心数据
+    chenghao: '',
+    yongjin: '0.00',
+    zonge: '0.00',
+    yajin: '0.00',
+    jinfen: '0',
+    chengjiaoliang: '0',
+    zaixianZhuangtai: 0,
+    dashouzhuangtai: '',
+    clumber: [],
+    
+    // 金牌专属数据
+    jiedanZongliang: '0',
+    jinriJiedan: '0.00',
+    zuijinTixian: '0.00',
+    
+    // 页面状态
+    isLoading: false,
+    lastRefreshTime: 0,
+    canRefresh: true,
+    
+    // 计算数据
+    chengjiaoRate: '0%',
+    chengjiaoAngle: 0,
+    tixianProgress: 0,
+
+    // 邀请人缓存（管事）
+    inviterCache: null,
+    chenghaoList: []  // 新增
+  },
+
+  onLoad() {
+    wx.redirectTo({ url: '/pages/fighter/fighter' });
+  },
+
+  onShow() {
+    wx.redirectTo({ url: '/pages/fighter/fighter' });
+  },
+
+  _deprecatedOnLoad() {
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  loadUserInfo() {
+    const uid = wx.getStorageSync('uid') || ''
+    const touxiang = wx.getStorageSync('touxiang') || ''
+    const ossUrl = app.globalData.ossImageUrl || ''
+    const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg')
+    
+    let avatarUrl = defaultAvatar
+    if (touxiang) {
+      avatarUrl = ossUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang)
+    }
+    
+    const dashouNicheng = app.globalData.dashouNicheng || wx.getStorageSync('nicheng') || '金牌选手'
+    
+    this.setData({ uid, touxiang, avatarUrl, dashouNicheng })
+  },
+
+  async getJinpaiInfo() {
+    this.setData({ isLoading: true })
+    
+    try {
+      const res = await request({
+        url: '/yonghu/dashouxinxi',
+        method: 'POST'
+      })
+      
+      if (res && res.data.code === 200) {
+        const data = res.data.data
+        
+        const updateData = {
+          dashouNicheng: data.dashounicheng || '',
+          zhanghaoStatus: data.zhanghaostatus || '',
+          yongjin: data.yongjin || '0.00',
+          zonge: data.zonge || '0.00',
+          yajin: data.yajin || '0.00',
+          chenghao: data.chenghao || '',
+          jinfen: data.jifen || '0',
+          chengjiaoliang: data.chengjiaoliang || '0',
+          zaixianZhuangtai: data.zaixianzhuangtai || 0,
+          dashouzhuangtai: data.dashouzhuangtai || '',
+          clumber: data.clumber || [],
+          jiedanZongliang: data.jiedanZongliang || '0',
+          jinriJiedan: data.jinriJiedan || '0.00',
+          zuijinTixian: data.zuijinTixian || '0.00',
+        }
+        
+        const jiedanTotal = parseFloat(updateData.jiedanZongliang) || 0
+        const chengjiaoTotal = parseFloat(updateData.chengjiaoliang) || 0
+        const rateNumber = jiedanTotal > 0 ? (chengjiaoTotal / jiedanTotal) * 100 : 0
+        const chengjiaoRate = rateNumber.toFixed(1) + '%'
+        const chengjiaoAngle = rateNumber * 3.6
+        
+        const zuijin = parseFloat(updateData.zuijinTixian) || 0
+        const zong = parseFloat(updateData.jinriJiedan) || 0
+        const tixianProgress = zong > 0 ? Math.min((zuijin / zong) * 100, 100) : 0
+        
+        const globalUpdate = {
+          dashouNicheng: updateData.dashouNicheng,
+          zhanghaoStatus: updateData.zhanghaoStatus,
+          yongjin: updateData.yongjin,
+          zonge: updateData.zonge,
+          yajin: updateData.yajin,
+          chenghao: updateData.chenghao,
+          jinfen: updateData.jinfen,
+          chengjiaoliang: updateData.chengjiaoliang,
+          zaixianZhuangtai: updateData.zaixianZhuangtai,
+          dashouzhuangtai: updateData.dashouzhuangtai,
+          clumber: updateData.clumber,
+        }
+        Object.assign(app.globalData, globalUpdate)
+        
+        wx.setStorageSync('nicheng', updateData.dashouNicheng)
+        if (data.touxiang) {
+          wx.setStorageSync('touxiang', data.touxiang)
+        }
+        
+        this.setData({
+          ...updateData,
+          chengjiaoRate,
+          chengjiaoAngle,
+          tixianProgress: Math.round(tixianProgress),
+          isLoading: false
+        })
+        
+        this.checkJinpaiAndRedirect(updateData.chenghao)
+        
+      } else {
+        wx.showToast({ title: res?.data?.msg || '获取信息失败', icon: 'none' })
+        this.setData({ isLoading: false })
+      }
+    } catch (error) {
+      console.error('获取金牌信息失败:', error)
+      wx.showToast({ title: '网络错误', icon: 'none' })
+      this.setData({ isLoading: false })
+    }
+  },
+
+  refreshJinpaiInfo() {
+    const now = Date.now()
+    const lastTime = this.data.lastRefreshTime
+    const canRefresh = this.data.canRefresh
+    if (!canRefresh || (now - lastTime < 3000)) return
+
+    
+    this.setData({ lastRefreshTime: now, canRefresh: false })
+    this.getJinpaiInfo()
+    this.fetchChenghaoList()  // 新增
+    setTimeout(() => this.setData({ canRefresh: true }), 3000)
+  },
+
+  checkJinpaiAndRedirect(chenghao) {
+    if (chenghao !== '金牌选手') {
+      wx.setStorageSync('isJinpai', 0)
+      wx.redirectTo({ url: '/pages/fighter/fighter' })
+    } else {
+      wx.setStorageSync('isJinpai', 1)
+    }
+  },
+
+  // 联系管事（与打手端完全一致，增加容错）
+  async contactInviter() {
+    wx.showLoading({ title: '获取管事信息...', mask: true })
+    try {
+      const res = await request({ url: '/yonghu/hqwdyqr', method: 'POST' })
+      if (res && res.data.code === 200) {
+        const inviter = res.data.data
+        const ossImageUrl = getApp().globalData.ossImageUrl || ''
+        const fullAvatar = inviter.touxiang
+          ? (inviter.touxiang.startsWith('http') ? inviter.touxiang : ossImageUrl + inviter.touxiang)
+          : ''
+
+        // 缓存邀请人信息
+        const cacheData = {
+          uid: inviter.uid,
+          nicheng: inviter.nicheng || '',
+          avatar: fullAvatar
+        }
+        wx.setStorageSync('inviterCache', cacheData)
+        this.setData({ inviterCache: cacheData })
+
+        // 确保打手身份并连接
+        const app = getApp()
+        const myUid = wx.getStorageSync('uid')
+        
+        // 如果当前不是打手身份，则切换并重连
+        if (app.globalData.currentRole !== 'dashou') {
+          app.globalData.currentRole = 'dashou'
+          wx.setStorageSync('currentRole', 'dashou')
+          if (app.switchRoleAndReconnect) {
+            await app.switchRoleAndReconnect('dashou')
+          } else if (app.connectWithIdentity) {
+            // 降级方案：直接用打手身份连接
+            await app.connectWithIdentity('dashou', 'Ds' + myUid, false)
+          }
+        } else {
+          // 已为打手，确保连接存活
+          if (app.connectForCurrentRole) {
+            app.connectForCurrentRole()
+          } else if (app.ensureConnection) {
+            app.ensureConnection()
+          }
+        }
+
+        // 构造私聊参数
+        const param = {
+          toUserId: buildInviterPeerId(inviter.uid),
+          toName: inviter.nicheng || '管事',
+          toAvatar: fullAvatar
+        }
+        wx.navigateTo({
+          url: '/pages/chat/chat?data=' + encodeURIComponent(JSON.stringify(param)),
+          fail: (err) => {
+            console.error('跳转私聊失败', err)
+            wx.showToast({ title: '打开聊天失败', icon: 'none' })
+          }
+        })
+      } else {
+        wx.showToast({ title: res?.data?.msg || '获取失败', icon: 'none' })
+      }
+    } catch (e) {
+      console.error('联系管事出错:', e)
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    } finally {
+      wx.hideLoading()
+    }
+  },
+
+  copyUid() {
+    const { uid } = this.data
+    if (!uid) return wx.showToast({ title: 'UID不存在', icon: 'none' })
+    wx.setClipboardData({
+      data: uid,
+      success: () => wx.showToast({ title: '已复制UID', icon: 'success' })
+    })
+  },
+
+  previewAvatar() {
+    if (this.data.avatarUrl) wx.previewImage({ urls: [this.data.avatarUrl] })
+  },
+
+  goToWithdraw() { wx.navigateTo({ url: '/pages/withdraw/withdraw' }) },
+  goToReceiveOrder() { wx.navigateTo({ url: '/pages/accept-order/accept-order' }) },
+  goToRecharge() { wx.navigateTo({ url: '/pages/fighter-recharge/fighter-recharge' }) },
+  goToMyOrders() { wx.navigateTo({ url: '/pages/fighter-orders/fighter-orders' }) },
+  goToMyPunishment() { wx.navigateTo({ url: '/pages/penalty/penalty/penalty' }) },
+  goToRanking() { wx.navigateTo({ url: '/pages/fighter-rank/fighter-rank?type=dashou' }) },
+  goToModifyInfo() { wx.navigateTo({ url: '/pages/fighter-edit/fighter-edit' }) },
+  goToRules() { wx.navigateTo({ url: '/pages/fighter-rules/fighter-rules' }) },
+  // 跳转到考核金牌
+goToKaohe() {
+    wx.navigateTo({ url: '/pages/assess-gold/assess-gold' });
+  },
+
+  async fetchChenghaoList() {
+    try {
+        const res = await request({
+            url: '/dengji/dsbqhq',
+            method: 'POST'
+        });
+        if (res && res.data.code === 0 && res.data.data) {
+            this.setData({ chenghaoList: res.data.data.chenghao_list || [] });
+        }
+    } catch (e) {
+        console.error('获取称号标签失败', e);
+    }
+},
 })
\ No newline at end of file
diff --git a/pages/jinpaids/jinpaids.json b/pages/gold-fighter/gold-fighter.json
similarity index 100%
rename from pages/jinpaids/jinpaids.json
rename to pages/gold-fighter/gold-fighter.json
diff --git a/pages/jinpaids/jinpaids.wxml b/pages/gold-fighter/gold-fighter.wxml
similarity index 100%
rename from pages/jinpaids/jinpaids.wxml
rename to pages/gold-fighter/gold-fighter.wxml
diff --git a/pages/jinpaids/jinpaids.wxss b/pages/gold-fighter/gold-fighter.wxss
similarity index 95%
rename from pages/jinpaids/jinpaids.wxss
rename to pages/gold-fighter/gold-fighter.wxss
index 162eae6..c8abc80 100644
--- a/pages/jinpaids/jinpaids.wxss
+++ b/pages/gold-fighter/gold-fighter.wxss
@@ -1,610 +1,610 @@
-/* pages/jinpaids/jinpaids.wxss - 金牌打手机甲风格（CSS变量版） */
-
-/* ========== 全局 ========== */
-page {
-    background: #0B1A2F;
-    min-height: 100vh;
-    font-family: 'Avenir', 'PingFang SC', 'Helvetica Neue', sans-serif;
-    color: #fff;
-  }
-  
-  .bg-grid {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-image: 
-      linear-gradient(rgba(0, 160, 255, 0.1) 1px, transparent 1px),
-      linear-gradient(90deg, rgba(0, 160, 255, 0.1) 1px, transparent 1px);
-    background-size: 50rpx 50rpx;
-    pointer-events: none;
-    z-index: 0;
-  }
-  
-  .bg-energy {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: radial-gradient(circle at 20% 30%, rgba(0,200,255,0.1) 0%, transparent 40%),
-                radial-gradient(circle at 80% 70%, rgba(0,100,255,0.1) 0%, transparent 40%);
-    animation: energyFlow 20s linear infinite;
-    pointer-events: none;
-    z-index: 0;
-  }
-  
-  @keyframes energyFlow {
-    0% { opacity: 0.3; }
-    50% { opacity: 0.6; }
-    100% { opacity: 0.3; }
-  }
-  
-  .page-container {
-    position: relative;
-    z-index: 2;
-    min-height: 100vh;
-    padding: 30rpx 25rpx;
-    box-sizing: border-box;
-  }
-  
-  /* ========== 顶部栏 ========== */
-  .top-bar {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 30rpx;
-    margin-top: 20rpx;
-  }
-  .jinpai-badge {
-    display: flex;
-    align-items: center;
-  }
-  .jinpai-icon {
-    width: 60rpx;
-    height: 60rpx;
-    margin-right: 15rpx;
-  }
-  /* 火苗图标燃烧动画 */
-  .fire-icon {
-    animation: fireBurn 0.8s infinite alternate ease-in-out;
-    filter: drop-shadow(0 0 10rpx #ffaa00);
-  }
-  @keyframes fireBurn {
-    0% { transform: scale(1) rotate(-3deg); filter: drop-shadow(0 0 10rpx #ffaa00); }
-    25% { transform: scale(1.1) rotate(2deg); filter: drop-shadow(0 0 20rpx #ff5500); }
-    50% { transform: scale(1.05) rotate(-2deg); filter: drop-shadow(0 0 30rpx #ffaa00); }
-    75% { transform: scale(1.15) rotate(3deg); filter: drop-shadow(0 0 40rpx #ffaa00); }
-    100% { transform: scale(1) rotate(-3deg); filter: drop-shadow(0 0 10rpx #ffaa00); }
-  }
-  .jinpai-title {
-    font-size: 40rpx;
-    font-weight: bold;
-    color: #ffaa00;
-    text-shadow: 0 0 30rpx #ffaa00, 0 0 60rpx #ffaa00;
-    letter-spacing: 2rpx;
-  }
-  .refresh-btn {
-    display: flex;
-    align-items: center;
-    background: rgba(0,40,70,0.8);
-    border: 2rpx solid #00a6ff;
-    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
-    padding: 8rpx 25rpx;
-  }
-  .refresh-icon {
-    width: 40rpx;
-    height: 40rpx;
-    margin-right: 10rpx;
-  }
-  .refresh-text {
-    font-size: 26rpx;
-    color: #00a6ff;
-  }
-  .refresh-btn:active {
-    opacity: 0.8;
-  }
-  
-  /* ========== 用户信息 ========== */
-  .user-section {
-    display: flex;
-    background: rgba(0,30,50,0.5);
-    backdrop-filter: blur(20px);
-    border: 2rpx solid #00a6ff;
-    clip-path: polygon(0 0, 100% 0, 95% 100%, 0 100%);
-    padding: 30rpx;
-    margin-bottom: 40rpx;
-  }
-  .avatar-wrap {
-    position: relative;
-    width: 120rpx;
-    height: 120rpx;
-    margin-right: 30rpx;
-  }
-  .avatar {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    border: 4rpx solid #00a6ff;
-    box-shadow: 0 0 50rpx #00a6ff;
-    object-fit: cover;
-  }
-  .avatar-ring {
-    position: absolute;
-    top: -10rpx;
-    left: -10rpx;
-    right: -10rpx;
-    bottom: -10rpx;
-    border-radius: 50%;
-    border: 2rpx solid #00a6ff;
-    border-top-color: transparent;
-    border-bottom-color: transparent;
-    animation: ringRotate 6s linear infinite;
-  }
-  @keyframes ringRotate {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-  .user-info {
-    flex: 1;
-  }
-  .name-row {
-    display: flex;
-    align-items: center;
-    margin-bottom: 10rpx;
-  }
-  .nickname {
-    font-size: 40rpx;
-    font-weight: bold;
-    color: #fff;
-    margin-right: 15rpx;
-    max-width: 250rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .status-tag {
-    font-size: 22rpx;
-    padding: 4rpx 16rpx;
-    border-radius: 30rpx;
-    background: rgba(255,255,255,0.1);
-    border: 1rpx solid currentColor;
-  }
-  .status-tag.online { color: #00ff80; border-color: #00ff80; }
-  .status-tag.offline { color: #aaa; border-color: #aaa; }
-  .uid-row {
-    display: flex;
-    align-items: center;
-    background: rgba(0,50,80,0.6);
-    border-left: 4rpx solid #00a6ff;
-    padding: 8rpx 20rpx;
-    margin-bottom: 10rpx;
-    width: fit-content;
-  }
-  .uid-label {
-    font-size: 24rpx;
-    color: #9cf;
-    margin-right: 10rpx;
-  }
-  .uid-value {
-    font-size: 24rpx;
-    color: #fff;
-    font-family: monospace;
-    margin-right: 15rpx;
-  }
-  .copy-icon {
-    width: 30rpx;
-    height: 30rpx;
-  }
-  .order-status {
-    display: flex;
-    align-items: center;
-  }
-  .status-label {
-    font-size: 24rpx;
-    color: #9cf;
-    margin-right: 8rpx;
-  }
-  .status-value {
-    font-size: 24rpx;
-    color: #aaa;
-  }
-  .status-value.active {
-    color: #00ff80;
-    text-shadow: 0 0 10rpx #00ff80;
-  }
-  
-  /* ========== 核心资产卡 ========== */
-  .asset-card {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background: linear-gradient(135deg, #0A1F3A, #0B2A4A);
-    border: 2rpx solid #00a6ff;
-    clip-path: polygon(0 0, 100% 0, 95% 100%, 0 100%);
-    padding: 30rpx 30rpx;
-    margin-bottom: 30rpx;
-    box-shadow: 0 0 40rpx #00a6ff;
-  }
-  .asset-left {
-    flex: 1;
-  }
-  .asset-label {
-    font-size: 28rpx;
-    color: #9cf;
-    display: block;
-    margin-bottom: 10rpx;
-  }
-  .asset-value-group {
-    display: flex;
-    align-items: baseline;
-  }
-  .asset-number {
-    font-size: 68rpx;
-    font-weight: bold;
-    color: #fff;
-    text-shadow: 0 0 30rpx #00a6ff, 0 0 60rpx #00a6ff;
-  }
-  .asset-unit {
-    font-size: 32rpx;
-    color: #00a6ff;
-    margin-left: 10rpx;
-  }
-  .asset-right {
-    display: flex;
-    align-items: center;
-    background: rgba(255,255,255,0.1);
-    border: 2rpx solid #ffaa00;
-    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
-    padding: 15rpx 30rpx;
-    position: relative;
-    overflow: hidden;
-  }
-  .withdraw-icon {
-    width: 50rpx;
-    height: 50rpx;
-    margin-right: 10rpx;
-  }
-  .withdraw-text {
-    font-size: 32rpx;
-    font-weight: bold;
-    color: #ffaa00;
-  }
-  .withdraw-glow {
-    position: absolute;
-    top: 0;
-    left: -100%;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent);
-    animation: scan 2s infinite;
-  }
-  @keyframes scan {
-    0% { left: -100%; }
-    100% { left: 100%; }
-  }
-  .asset-right:active {
-    transform: scale(0.96);
-  }
-  
-  /* ========== 统计网格 ========== */
-  .stats-grid {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 20rpx;
-    margin-bottom: 40rpx;
-  }
-  .stat-item {
-    background: rgba(0,30,50,0.7);
-    border: 1rpx solid #00a6ff;
-    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
-    padding: 20rpx 10rpx;
-    text-align: center;
-  }
-  .stat-label {
-    font-size: 24rpx;
-    color: #9cf;
-    display: block;
-    margin-bottom: 10rpx;
-  }
-  .stat-value {
-    font-size: 32rpx;
-    font-weight: bold;
-    color: #fff;
-  }
-  
-  /* ========== 图形化数据（使用CSS变量） ========== */
-  .graphic-panel {
-    background: rgba(0,30,50,0.6);
-    backdrop-filter: blur(15px);
-    border: 2rpx solid #00a6ff;
-    clip-path: polygon(0 0, 100% 0, 98% 100%, 0 100%);
-    padding: 30rpx;
-    margin-bottom: 40rpx;
-    display: flex;
-    justify-content: space-around;
-    flex-wrap: wrap;
-  }
-  .chart-item {
-    width: 45%;
-    text-align: center;
-  }
-  .chart-title {
-    font-size: 28rpx;
-    color: #9cf;
-    margin-bottom: 15rpx;
-    text-transform: uppercase;
-    border-left: 4rpx solid #00a6ff;
-    padding-left: 15rpx;
-    text-align: left;
-  }
-  
-  /* 环形进度条（使用CSS变量 --progress-angle） */
-  .ring-chart {
-    position: relative;
-    width: 200rpx;
-    height: 200rpx;
-    margin: 0 auto;
-    border-radius: 50%;
-    overflow: hidden;
-    box-shadow: 0 0 40rpx #00a6ff;
-  }
-  .ring-progress {
-    width: 100%;
-    height: 100%;
-    background: conic-gradient(#00a6ff 0deg, #00a6ff var(--progress-angle), #1a3a5a var(--progress-angle), #1a3a5a 360deg);
-    border-radius: 50%;
-  }
-  .ring-inner {
-    position: absolute;
-    top: 15rpx;
-    left: 15rpx;
-    right: 15rpx;
-    bottom: 15rpx;
-    background: #0a1a2a;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 40rpx;
-    font-weight: bold;
-    color: #00a6ff;
-    box-shadow: inset 0 0 20rpx rgba(0,0,0,0.5);
-  }
-  
-  /* 提现进度条（使用CSS变量 --progress-width） */
-  .progress-container {
-    height: 30rpx;
-    background: #1a3a5a;
-    border-radius: 15rpx;
-    position: relative;
-    overflow: hidden;
-    width: 100%;
-    margin-top: 20rpx;
-  }
-  .progress-bar {
-    height: 100%;
-    background: linear-gradient(90deg, #00a6ff, #80d4ff);
-    border-radius: 15rpx;
-    width: var(--progress-width);
-    position: relative;
-  }
-  .flow-bar::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: -100%;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.6), transparent);
-    animation: flow 1.5s infinite;
-  }
-  @keyframes flow {
-    0% { left: -100%; }
-    100% { left: 100%; }
-  }
-  .progress-label {
-    position: absolute;
-    right: 20rpx;
-    top: -30rpx;
-    font-size: 24rpx;
-    color: #00a6ff;
-  }
-  .progress-stats {
-    display: flex;
-    justify-content: space-between;
-    font-size: 24rpx;
-    color: #9cf;
-    margin-top: 15rpx;
-  }
-  
-  /* ========== 功能按钮（图标强光效果） ========== */
-  .function-panel {
-    margin-bottom: 40rpx;
-  }
-  .function-grid {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 20rpx;
-  }
-  .func-item {
-    background: rgba(0,20,40,0.8);
-    border: 1rpx solid #00a6ff;
-    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
-    padding: 25rpx 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    transition: 0.2s;
-    position: relative;
-    overflow: hidden;
-  }
-  .func-item:active {
-    transform: scale(0.96);
-    box-shadow: 0 0 40rpx #00a6ff;
-  }
-  /* 图标超强发光 */
-  .super-glow {
-    width: 60rpx;
-    height: 60rpx;
-    margin-bottom: 15rpx;
-    filter: drop-shadow(0 0 25rpx #00a6ff) drop-shadow(0 0 50rpx #00a6ff) drop-shadow(0 0 80rpx #00a6ff);
-    animation: superGlow 1s infinite alternate;
-  }
-  @keyframes superGlow {
-    0% { filter: drop-shadow(0 0 20rpx #00a6ff) drop-shadow(0 0 40rpx #00a6ff) drop-shadow(0 0 60rpx #00a6ff); }
-    100% { filter: drop-shadow(0 0 30rpx #00a6ff) drop-shadow(0 0 60rpx #00a6ff) drop-shadow(0 0 100rpx #00a6ff); }
-  }
-  .func-label {
-    font-size: 26rpx;
-    color: #fff;
-    z-index: 1;
-  }
-  
-  /* ========== 加载遮罩 ========== */
-  .loading-mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(2,6,12,0.9);
-    backdrop-filter: blur(20px);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 9999;
-  }
-  .loading-core {
-    width: 200rpx;
-    height: 200rpx;
-    border: 4rpx solid #00a6ff;
-    border-radius: 50%;
-    border-top-color: transparent;
-    animation: spin 1s linear infinite;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .loading-core::after {
-    content: '';
-    width: 100rpx;
-    height: 100rpx;
-    border: 4rpx solid #ffaa00;
-    border-radius: 50%;
-    border-bottom-color: transparent;
-    animation: spin 1.5s reverse infinite;
-  }
-  @keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-
-
-
-
-
-  /* ========== 原有样式（完全不变） ========== */
-/* ... 此处省略，切勿修改 ... */
-
-/* ========== 联系管事胶囊（新增，适配机甲风格） ========== */
-.inviter-capsule {
-    margin: 30rpx 25rpx 30rpx;
-    background: rgba(0, 20, 40, 0.85);
-    backdrop-filter: blur(20px);
-    border: 2rpx solid #00a6ff;
-    clip-path: polygon(5% 0, 100% 0, 95% 100%, 0 100%);
-    padding: 20rpx 30rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    box-shadow: 0 0 30rpx rgba(0, 166, 255, 0.4);
-    position: relative;
-    z-index: 1;
-  }
-  
-  .capsule-body {
-    display: flex;
-    align-items: center;
-    flex: 1;
-  }
-  
-  .capsule-avatar {
-    width: 80rpx;
-    height: 80rpx;
-    border-radius: 50%;
-    border: 3rpx solid #00a6ff;
-    box-shadow: 0 0 20rpx #00a6ff;
-    margin-right: 20rpx;
-    background: #0a1a2a;
-  }
-  
-  .capsule-info {
-    display: flex;
-    flex-direction: column;
-  }
-  
-  .capsule-name {
-    font-size: 30rpx;
-    font-weight: bold;
-    color: #fff;
-    text-shadow: 0 0 15rpx #00a6ff;
-    margin-bottom: 6rpx;
-  }
-  
-  .capsule-uid {
-    font-size: 24rpx;
-    color: #9cf;
-  }
-  
-  .capsule-contact {
-    background: linear-gradient(135deg, #00a6ff, #0080ff);
-    border-radius: 30rpx;
-    padding: 12rpx 30rpx;
-    font-size: 26rpx;
-    font-weight: bold;
-    color: #fff;
-    box-shadow: 0 0 20rpx #00a6ff;
-    letter-spacing: 2rpx;
-    transition: all 0.3s;
-  }
-  
-  .capsule-contact:active {
-    transform: scale(0.95);
-    box-shadow: 0 0 40rpx #00a6ff;
-  }
-
-
-
-
-
-
-
-  /* ========== 🆕 称号标签展示区 ========== */
-.badge-area {
-    width: 100%;
-    margin: 20rpx 0 30rpx 0;
-    padding: 0 20rpx;
-    box-sizing: border-box;
-  }
-  
-  .badge-scroll {
-    width: 100%;
-    max-height: 140rpx;
-    overflow-y: auto;
-    background: transparent;
-  }
-  
-  .badge-grid {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8rpx;
-    padding: 6rpx 0;
-    align-items: center;
-    justify-content: flex-start;
-  }
-  
-  .badge-item {
-    flex-shrink: 0;
+/* pages/gold-fighter/gold-fighter.wxss - 金牌打手机甲风格（CSS变量版） */
+
+/* ========== 全局 ========== */
+page {
+    background: #0B1A2F;
+    min-height: 100vh;
+    font-family: 'Avenir', 'PingFang SC', 'Helvetica Neue', sans-serif;
+    color: #fff;
+  }
+  
+  .bg-grid {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image: 
+      linear-gradient(rgba(0, 160, 255, 0.1) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(0, 160, 255, 0.1) 1px, transparent 1px);
+    background-size: 50rpx 50rpx;
+    pointer-events: none;
+    z-index: 0;
+  }
+  
+  .bg-energy {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(circle at 20% 30%, rgba(0,200,255,0.1) 0%, transparent 40%),
+                radial-gradient(circle at 80% 70%, rgba(0,100,255,0.1) 0%, transparent 40%);
+    animation: energyFlow 20s linear infinite;
+    pointer-events: none;
+    z-index: 0;
+  }
+  
+  @keyframes energyFlow {
+    0% { opacity: 0.3; }
+    50% { opacity: 0.6; }
+    100% { opacity: 0.3; }
+  }
+  
+  .page-container {
+    position: relative;
+    z-index: 2;
+    min-height: 100vh;
+    padding: 30rpx 25rpx;
+    box-sizing: border-box;
+  }
+  
+  /* ========== 顶部栏 ========== */
+  .top-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 30rpx;
+    margin-top: 20rpx;
+  }
+  .jinpai-badge {
+    display: flex;
+    align-items: center;
+  }
+  .jinpai-icon {
+    width: 60rpx;
+    height: 60rpx;
+    margin-right: 15rpx;
+  }
+  /* 火苗图标燃烧动画 */
+  .fire-icon {
+    animation: fireBurn 0.8s infinite alternate ease-in-out;
+    filter: drop-shadow(0 0 10rpx #ffaa00);
+  }
+  @keyframes fireBurn {
+    0% { transform: scale(1) rotate(-3deg); filter: drop-shadow(0 0 10rpx #ffaa00); }
+    25% { transform: scale(1.1) rotate(2deg); filter: drop-shadow(0 0 20rpx #ff5500); }
+    50% { transform: scale(1.05) rotate(-2deg); filter: drop-shadow(0 0 30rpx #ffaa00); }
+    75% { transform: scale(1.15) rotate(3deg); filter: drop-shadow(0 0 40rpx #ffaa00); }
+    100% { transform: scale(1) rotate(-3deg); filter: drop-shadow(0 0 10rpx #ffaa00); }
+  }
+  .jinpai-title {
+    font-size: 40rpx;
+    font-weight: bold;
+    color: #ffaa00;
+    text-shadow: 0 0 30rpx #ffaa00, 0 0 60rpx #ffaa00;
+    letter-spacing: 2rpx;
+  }
+  .refresh-btn {
+    display: flex;
+    align-items: center;
+    background: rgba(0,40,70,0.8);
+    border: 2rpx solid #00a6ff;
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    padding: 8rpx 25rpx;
+  }
+  .refresh-icon {
+    width: 40rpx;
+    height: 40rpx;
+    margin-right: 10rpx;
+  }
+  .refresh-text {
+    font-size: 26rpx;
+    color: #00a6ff;
+  }
+  .refresh-btn:active {
+    opacity: 0.8;
+  }
+  
+  /* ========== 用户信息 ========== */
+  .user-section {
+    display: flex;
+    background: rgba(0,30,50,0.5);
+    backdrop-filter: blur(20px);
+    border: 2rpx solid #00a6ff;
+    clip-path: polygon(0 0, 100% 0, 95% 100%, 0 100%);
+    padding: 30rpx;
+    margin-bottom: 40rpx;
+  }
+  .avatar-wrap {
+    position: relative;
+    width: 120rpx;
+    height: 120rpx;
+    margin-right: 30rpx;
+  }
+  .avatar {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    border: 4rpx solid #00a6ff;
+    box-shadow: 0 0 50rpx #00a6ff;
+    object-fit: cover;
+  }
+  .avatar-ring {
+    position: absolute;
+    top: -10rpx;
+    left: -10rpx;
+    right: -10rpx;
+    bottom: -10rpx;
+    border-radius: 50%;
+    border: 2rpx solid #00a6ff;
+    border-top-color: transparent;
+    border-bottom-color: transparent;
+    animation: ringRotate 6s linear infinite;
+  }
+  @keyframes ringRotate {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+  .user-info {
+    flex: 1;
+  }
+  .name-row {
+    display: flex;
+    align-items: center;
+    margin-bottom: 10rpx;
+  }
+  .nickname {
+    font-size: 40rpx;
+    font-weight: bold;
+    color: #fff;
+    margin-right: 15rpx;
+    max-width: 250rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .status-tag {
+    font-size: 22rpx;
+    padding: 4rpx 16rpx;
+    border-radius: 30rpx;
+    background: rgba(255,255,255,0.1);
+    border: 1rpx solid currentColor;
+  }
+  .status-tag.online { color: #00ff80; border-color: #00ff80; }
+  .status-tag.offline { color: #aaa; border-color: #aaa; }
+  .uid-row {
+    display: flex;
+    align-items: center;
+    background: rgba(0,50,80,0.6);
+    border-left: 4rpx solid #00a6ff;
+    padding: 8rpx 20rpx;
+    margin-bottom: 10rpx;
+    width: fit-content;
+  }
+  .uid-label {
+    font-size: 24rpx;
+    color: #9cf;
+    margin-right: 10rpx;
+  }
+  .uid-value {
+    font-size: 24rpx;
+    color: #fff;
+    font-family: monospace;
+    margin-right: 15rpx;
+  }
+  .copy-icon {
+    width: 30rpx;
+    height: 30rpx;
+  }
+  .order-status {
+    display: flex;
+    align-items: center;
+  }
+  .status-label {
+    font-size: 24rpx;
+    color: #9cf;
+    margin-right: 8rpx;
+  }
+  .status-value {
+    font-size: 24rpx;
+    color: #aaa;
+  }
+  .status-value.active {
+    color: #00ff80;
+    text-shadow: 0 0 10rpx #00ff80;
+  }
+  
+  /* ========== 核心资产卡 ========== */
+  .asset-card {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: linear-gradient(135deg, #0A1F3A, #0B2A4A);
+    border: 2rpx solid #00a6ff;
+    clip-path: polygon(0 0, 100% 0, 95% 100%, 0 100%);
+    padding: 30rpx 30rpx;
+    margin-bottom: 30rpx;
+    box-shadow: 0 0 40rpx #00a6ff;
+  }
+  .asset-left {
+    flex: 1;
+  }
+  .asset-label {
+    font-size: 28rpx;
+    color: #9cf;
+    display: block;
+    margin-bottom: 10rpx;
+  }
+  .asset-value-group {
+    display: flex;
+    align-items: baseline;
+  }
+  .asset-number {
+    font-size: 68rpx;
+    font-weight: bold;
+    color: #fff;
+    text-shadow: 0 0 30rpx #00a6ff, 0 0 60rpx #00a6ff;
+  }
+  .asset-unit {
+    font-size: 32rpx;
+    color: #00a6ff;
+    margin-left: 10rpx;
+  }
+  .asset-right {
+    display: flex;
+    align-items: center;
+    background: rgba(255,255,255,0.1);
+    border: 2rpx solid #ffaa00;
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    padding: 15rpx 30rpx;
+    position: relative;
+    overflow: hidden;
+  }
+  .withdraw-icon {
+    width: 50rpx;
+    height: 50rpx;
+    margin-right: 10rpx;
+  }
+  .withdraw-text {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #ffaa00;
+  }
+  .withdraw-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent);
+    animation: scan 2s infinite;
+  }
+  @keyframes scan {
+    0% { left: -100%; }
+    100% { left: 100%; }
+  }
+  .asset-right:active {
+    transform: scale(0.96);
+  }
+  
+  /* ========== 统计网格 ========== */
+  .stats-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 20rpx;
+    margin-bottom: 40rpx;
+  }
+  .stat-item {
+    background: rgba(0,30,50,0.7);
+    border: 1rpx solid #00a6ff;
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    padding: 20rpx 10rpx;
+    text-align: center;
+  }
+  .stat-label {
+    font-size: 24rpx;
+    color: #9cf;
+    display: block;
+    margin-bottom: 10rpx;
+  }
+  .stat-value {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #fff;
+  }
+  
+  /* ========== 图形化数据（使用CSS变量） ========== */
+  .graphic-panel {
+    background: rgba(0,30,50,0.6);
+    backdrop-filter: blur(15px);
+    border: 2rpx solid #00a6ff;
+    clip-path: polygon(0 0, 100% 0, 98% 100%, 0 100%);
+    padding: 30rpx;
+    margin-bottom: 40rpx;
+    display: flex;
+    justify-content: space-around;
+    flex-wrap: wrap;
+  }
+  .chart-item {
+    width: 45%;
+    text-align: center;
+  }
+  .chart-title {
+    font-size: 28rpx;
+    color: #9cf;
+    margin-bottom: 15rpx;
+    text-transform: uppercase;
+    border-left: 4rpx solid #00a6ff;
+    padding-left: 15rpx;
+    text-align: left;
+  }
+  
+  /* 环形进度条（使用CSS变量 --progress-angle） */
+  .ring-chart {
+    position: relative;
+    width: 200rpx;
+    height: 200rpx;
+    margin: 0 auto;
+    border-radius: 50%;
+    overflow: hidden;
+    box-shadow: 0 0 40rpx #00a6ff;
+  }
+  .ring-progress {
+    width: 100%;
+    height: 100%;
+    background: conic-gradient(#00a6ff 0deg, #00a6ff var(--progress-angle), #1a3a5a var(--progress-angle), #1a3a5a 360deg);
+    border-radius: 50%;
+  }
+  .ring-inner {
+    position: absolute;
+    top: 15rpx;
+    left: 15rpx;
+    right: 15rpx;
+    bottom: 15rpx;
+    background: #0a1a2a;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 40rpx;
+    font-weight: bold;
+    color: #00a6ff;
+    box-shadow: inset 0 0 20rpx rgba(0,0,0,0.5);
+  }
+  
+  /* 提现进度条（使用CSS变量 --progress-width） */
+  .progress-container {
+    height: 30rpx;
+    background: #1a3a5a;
+    border-radius: 15rpx;
+    position: relative;
+    overflow: hidden;
+    width: 100%;
+    margin-top: 20rpx;
+  }
+  .progress-bar {
+    height: 100%;
+    background: linear-gradient(90deg, #00a6ff, #80d4ff);
+    border-radius: 15rpx;
+    width: var(--progress-width);
+    position: relative;
+  }
+  .flow-bar::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.6), transparent);
+    animation: flow 1.5s infinite;
+  }
+  @keyframes flow {
+    0% { left: -100%; }
+    100% { left: 100%; }
+  }
+  .progress-label {
+    position: absolute;
+    right: 20rpx;
+    top: -30rpx;
+    font-size: 24rpx;
+    color: #00a6ff;
+  }
+  .progress-stats {
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #9cf;
+    margin-top: 15rpx;
+  }
+  
+  /* ========== 功能按钮（图标强光效果） ========== */
+  .function-panel {
+    margin-bottom: 40rpx;
+  }
+  .function-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 20rpx;
+  }
+  .func-item {
+    background: rgba(0,20,40,0.8);
+    border: 1rpx solid #00a6ff;
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    padding: 25rpx 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    transition: 0.2s;
+    position: relative;
+    overflow: hidden;
+  }
+  .func-item:active {
+    transform: scale(0.96);
+    box-shadow: 0 0 40rpx #00a6ff;
+  }
+  /* 图标超强发光 */
+  .super-glow {
+    width: 60rpx;
+    height: 60rpx;
+    margin-bottom: 15rpx;
+    filter: drop-shadow(0 0 25rpx #00a6ff) drop-shadow(0 0 50rpx #00a6ff) drop-shadow(0 0 80rpx #00a6ff);
+    animation: superGlow 1s infinite alternate;
+  }
+  @keyframes superGlow {
+    0% { filter: drop-shadow(0 0 20rpx #00a6ff) drop-shadow(0 0 40rpx #00a6ff) drop-shadow(0 0 60rpx #00a6ff); }
+    100% { filter: drop-shadow(0 0 30rpx #00a6ff) drop-shadow(0 0 60rpx #00a6ff) drop-shadow(0 0 100rpx #00a6ff); }
+  }
+  .func-label {
+    font-size: 26rpx;
+    color: #fff;
+    z-index: 1;
+  }
+  
+  /* ========== 加载遮罩 ========== */
+  .loading-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(2,6,12,0.9);
+    backdrop-filter: blur(20px);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 9999;
+  }
+  .loading-core {
+    width: 200rpx;
+    height: 200rpx;
+    border: 4rpx solid #00a6ff;
+    border-radius: 50%;
+    border-top-color: transparent;
+    animation: spin 1s linear infinite;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .loading-core::after {
+    content: '';
+    width: 100rpx;
+    height: 100rpx;
+    border: 4rpx solid #ffaa00;
+    border-radius: 50%;
+    border-bottom-color: transparent;
+    animation: spin 1.5s reverse infinite;
+  }
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+
+
+
+
+
+  /* ========== 原有样式（完全不变） ========== */
+/* ... 此处省略，切勿修改 ... */
+
+/* ========== 联系管事胶囊（新增，适配机甲风格） ========== */
+.inviter-capsule {
+    margin: 30rpx 25rpx 30rpx;
+    background: rgba(0, 20, 40, 0.85);
+    backdrop-filter: blur(20px);
+    border: 2rpx solid #00a6ff;
+    clip-path: polygon(5% 0, 100% 0, 95% 100%, 0 100%);
+    padding: 20rpx 30rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-shadow: 0 0 30rpx rgba(0, 166, 255, 0.4);
+    position: relative;
+    z-index: 1;
+  }
+  
+  .capsule-body {
+    display: flex;
+    align-items: center;
+    flex: 1;
+  }
+  
+  .capsule-avatar {
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 50%;
+    border: 3rpx solid #00a6ff;
+    box-shadow: 0 0 20rpx #00a6ff;
+    margin-right: 20rpx;
+    background: #0a1a2a;
+  }
+  
+  .capsule-info {
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .capsule-name {
+    font-size: 30rpx;
+    font-weight: bold;
+    color: #fff;
+    text-shadow: 0 0 15rpx #00a6ff;
+    margin-bottom: 6rpx;
+  }
+  
+  .capsule-uid {
+    font-size: 24rpx;
+    color: #9cf;
+  }
+  
+  .capsule-contact {
+    background: linear-gradient(135deg, #00a6ff, #0080ff);
+    border-radius: 30rpx;
+    padding: 12rpx 30rpx;
+    font-size: 26rpx;
+    font-weight: bold;
+    color: #fff;
+    box-shadow: 0 0 20rpx #00a6ff;
+    letter-spacing: 2rpx;
+    transition: all 0.3s;
+  }
+  
+  .capsule-contact:active {
+    transform: scale(0.95);
+    box-shadow: 0 0 40rpx #00a6ff;
+  }
+
+
+
+
+
+
+
+  /* ========== 🆕 称号标签展示区 ========== */
+.badge-area {
+    width: 100%;
+    margin: 20rpx 0 30rpx 0;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+  }
+  
+  .badge-scroll {
+    width: 100%;
+    max-height: 140rpx;
+    overflow-y: auto;
+    background: transparent;
+  }
+  
+  .badge-grid {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8rpx;
+    padding: 6rpx 0;
+    align-items: center;
+    justify-content: flex-start;
+  }
+  
+  .badge-item {
+    flex-shrink: 0;
   }
\ No newline at end of file
diff --git a/pages/qunliaotian/qunliaotian.js b/pages/group-chat/group-chat.js
similarity index 96%
rename from pages/qunliaotian/qunliaotian.js
rename to pages/group-chat/group-chat.js
index 6e4c895..dbbe03e 100644
--- a/pages/qunliaotian/qunliaotian.js
+++ b/pages/group-chat/group-chat.js
@@ -49,7 +49,6 @@ Page({
       isCross: p.isCross
     });
     wx.setNavigationBarTitle({ title: this.data.groupName });
-    // 如果有外部传入的 currentUser 信息，直接用，不再依赖全局状态
     if (p.currentUserId) {
       this.setData({
         currentUser: {
@@ -111,22 +110,6 @@ Page({
     });
     this.setData({ messages: msgs });
   },
-  /*onLoad(options) {
-    if (options.data) {
-      try {
-        const p = JSON.parse(decodeURIComponent(options.data));
-        this.setData({
-          groupId: p.groupId || '',
-          groupName: p.groupName || '订单群聊',
-          groupAvatar: p.groupAvatar || '',
-          orderId: p.orderId || '',
-          isCross: p.isCross || 0
-        });
-      } catch (e) {}
-    }
-    wx.setNavigationBarTitle({ title: this.data.groupName });
-    this.initCurrentUser();
-  },*/
 
   onShow() {
     this.autoConnect();
@@ -189,8 +172,8 @@ Page({
     if (!groupId) return;
     wx.goEasy.im.subscribeGroup({
       groupIds: [groupId],
-      onSuccess: () => console.log(`[群聊页] 订阅成功: ${groupId}`),
-      onFailed: (err) => console.error(`[群聊页] 订阅失败: ${groupId}`, err)
+      onSuccess: () => {},
+      onFailed: () => {}
     });
   },
 
@@ -279,7 +262,7 @@ Page({
       this.markGroupMessageAsRead();
     };
     wx.goEasy.im.on(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, this._msgHandler);
-    this.markGroupMessageAsRead(); // ← 收到新消息就标记已读
+    this.markGroupMessageAsRead();
   },
 
   markGroupMessageAsRead() {
diff --git a/pages/qunliaotian/qunliaotian.json b/pages/group-chat/group-chat.json
similarity index 100%
rename from pages/qunliaotian/qunliaotian.json
rename to pages/group-chat/group-chat.json
diff --git a/pages/qunliaotian/qunliaotian.wxml b/pages/group-chat/group-chat.wxml
similarity index 100%
rename from pages/qunliaotian/qunliaotian.wxml
rename to pages/group-chat/group-chat.wxml
diff --git a/pages/qunliaotian/qunliaotian.wxss b/pages/group-chat/group-chat.wxss
similarity index 100%
rename from pages/qunliaotian/qunliaotian.wxss
rename to pages/group-chat/group-chat.wxss
diff --git a/pages/index/index.js b/pages/index/index.js
index bfd2000..0ae32b5 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,400 +1,391 @@
-// pages/shangpin/shangpin.js
-const app = getApp();
-import { ensureLogin } from '../../utils/login';
-import { fetchShopGoods, bindShop } from '../../utils/shop';
-import { backfillUserProfileCache, getSessionToken } from '../../utils/role-tab-bar';
-import PopupService from '../../services/popupService.js';
-
-// 🔥 固定参数：扫码时从 scene 中获取店铺ID的字段名（可在此处集中修改）
-const SCENE_PARAM = 'scene'; // 二维码参数统一使用 scene，解码后即为店铺ID
-
-Page({
-  data: {
-    // 全局变量引用
-    ossImageUrl: '',
-    lunbozhanwei: '',
-    
-    // 页面数据
-    shangpingonggao: '',
-    lunboList: [],
-    shangpinleixing: [],
-    shangpinzhuanqu: [],
-    shangpinliebiao: [],
-    
-    // 状态控制
-    selectedLeixingId: null,
-    filteredData: [],
-    showGonggaoModal: false,
-    gonggaoAnim: true,
-    isLoading: false,
-    isRefreshing: false,
-    hasInitialized: false,
-    
-    currentTime: ''
-  },
-
-  // 从二维码解析出的店铺ID（仅在扫码时存在）
-  shopId: null,
-
-  onLoad(options) {
-    // 🔥 解析二维码参数（scene）
-    if (options[SCENE_PARAM]) {
-      try {
-        // 微信会对 scene 进行编码，需要解码
-        const scene = decodeURIComponent(options[SCENE_PARAM]);
-        this.shopId = scene; // 例如：dianpu_123
-      } catch (e) {
-        console.error('scene解码失败', e);
-      }
-    }
-    
-    // 等待全局配置加载完成
-    this.waitForConfigAndInit();
-    // 🆕 修改：仅在已登录时检查弹窗，避免未登录时发起请求导致 401 弹窗
-    const token = getSessionToken(app);
-    if (token) {
-        PopupService.checkAndShow(this, 'index');
-    }
-
-    
-  },
-
-  // 🆕 页面隐藏时清理弹窗视图
-  onHide: function () {
-    const popupComp = this.selectComponent('#popupNotice');
-    if (popupComp && popupComp.cleanup) {
-        popupComp.cleanup();
-    }
-},
-
-  waitForConfigAndInit() {
-    if (app.globalData.ossImageUrl) {
-      this.setData({
-        ossImageUrl: app.globalData.ossImageUrl,
-        lunbozhanwei: app.globalData.lunbozhanwei,
-        currentTime: this.getCurrentTime()
-      });
-      this.initPageData();
-    } else {
-      setTimeout(() => this.waitForConfigAndInit(), 100);
-    }
-  },
-
-  onShow() {
-    backfillUserProfileCache(app);
-    if (this.data.ossImageUrl) {
-      this.setData({
-        gonggaoAnim: true,
-        currentTime: this.getCurrentTime(),
-      });
-    }
-    this.registerNotificationComponent();
-
-    if (!getSessionToken(app)) {
-      this.setData({
-        hasInitialized: false,
-        filteredData: [],
-        shangpinleixing: [],
-        shangpinzhuanqu: [],
-        shangpinliebiao: [],
-      });
-      return;
-    }
-
-    // 已登录时加载/刷新商品；未登录不自动登录、不跳转
-    if (!this.data.isLoading) {
-      const needLoad = !this.data.hasInitialized
-        || !this.data.filteredData
-        || this.data.filteredData.length === 0;
-      if (needLoad) {
-        this.initPageData();
-      }
-    }
-  },
-
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  getCurrentTime() {
-    const now = new Date();
-    const year = now.getFullYear();
-    const month = (now.getMonth() + 1).toString().padStart(2, '0');
-    const day = now.getDate().toString().padStart(2, '0');
-    const hour = now.getHours().toString().padStart(2, '0');
-    const minute = now.getMinutes().toString().padStart(2, '0');
-    return `${year}-${month}-${day} ${hour}:${minute}`;
-  },
-
-  sortByPaixu(list) {
-    if (!list || !Array.isArray(list)) return [];
-    return [...list].sort((a, b) => {
-      const paixuA = a.paixu || 0;
-      const paixuB = b.paixu || 0;
-      if (paixuB !== paixuA) return paixuB - paixuA;
-      return a.id - b.id;
-    });
-  },
-
-  /**
-   * 初始化页面数据（重构后）
-   * 流程：确保登录 → 如有扫码ID则绑定店铺 → 并行加载公告轮播图和商品数据
-   */
-  async initPageData() {
-    this.setData({ isLoading: true });
-
-    try {
-      // 1. 确保登录（静默，不跳转）
-      await ensureLogin({ page: this });
-
-      // 2. 🔥 关键：仅当通过扫码进入且携带了有效的店铺ID时，才执行绑定
-      if (this.shopId) {
-        await bindShop(this.shopId);
-      }
-
-      // 3. 并行加载公告轮播图（复用原接口，独立请求）和店铺商品（新接口）
-      const [gonggaoResult, shopData] = await Promise.all([
-        this.loadGonggaoAndLunbo(),   // 公告轮播图使用原有的 wx.request 方式，不受影响
-        fetchShopGoods()              // 商品数据通过封装的 request 获取
-      ]);
-
-      // 4. 处理商品数据
-      const sortedLeixing = this.sortByPaixu(shopData.shangpinleixing || []);
-      const sortedZhuanqu = this.sortByPaixu(shopData.shangpinzhuanqu || []);
-      const sortedShangpin = this.sortByPaixu(shopData.shangpinliebiao || []);
-      
-
-      // 更新全局缓存（可选，用于其他页面复用）
-      app.globalData.shangpinleixing = sortedLeixing;
-      app.globalData.shangpinzhuanqu = sortedZhuanqu;
-      app.globalData.shangpinliebiao = sortedShangpin;
-
-      this.setData({
-        shangpinleixing: sortedLeixing,
-        shangpinzhuanqu: sortedZhuanqu,
-        shangpinliebiao: sortedShangpin,
-        selectedLeixingId: sortedLeixing[0]?.id || null,
-        isLoading: false,
-        hasInitialized: true,
-      }, () => {
-        this.filterShangpinData();
-      });
-
-    } catch (error) {
-      console.error('初始化失败:', error);
-      this.setData({ isLoading: false });
-      // 错误提示已在各函数内部处理，此处仅做兜底
-    }
-  },
-
-  /**
-   * 加载公告和轮播图（完全复用原逻辑，使用 wx.request，不使用封装 request）
-   */
-  loadGonggaoAndLunbo() {
-    return new Promise((resolve, reject) => {
-      // 如果全局已有数据，直接使用
-      if (app.globalData.shangpingonggao && app.globalData.shangpinlunbo.length > 0) {
-        this.setData({
-          shangpingonggao: app.globalData.shangpingonggao,
-          lunboList: this.processImageUrls(app.globalData.shangpinlunbo)
-        });
-        resolve();
-        return;
-      }
-
-      wx.request({
-        url: app.globalData.apiBaseUrl + '/peizhi/shangpingonggao/',
-        method: 'POST',
-        header: { 'content-type': 'application/json' },
-        success: (res) => {
-          if (res.statusCode === 200 && res.data) {
-            const data = res.data;
-            app.globalData.shangpingonggao = data.shangpingonggao || '';
-            app.globalData.shangpinlunbo = data.shangpinlunbo || [];
-            this.setData({
-              shangpingonggao: app.globalData.shangpingonggao,
-              lunboList: this.processImageUrls(app.globalData.shangpinlunbo)
-            });
-            resolve();
-          } else {
-            reject(new Error('请求失败'));
-          }
-        },
-        fail: reject
-      });
-    });
-  },
-
-  processImageUrls(urlList) {
-    if (!urlList || !Array.isArray(urlList)) return [];
-    return urlList.map(url => url.startsWith('http') ? url : this.data.ossImageUrl + url);
-  },
-
-  /**
-   * 筛选商品数据（完全复用原有逻辑，不做任何改动）
-   */
-  filterShangpinData() {
-    const { selectedLeixingId, shangpinzhuanqu, shangpinliebiao } = this.data;
-    
-    if (!selectedLeixingId || !shangpinzhuanqu || !shangpinliebiao) {
-      this.setData({ filteredData: [] });
-      return;
-    }
-    
-    const zhuanquByLeixing = new Map();
-    shangpinzhuanqu.forEach(zhuanqu => {
-      if (zhuanqu.leixing_id === selectedLeixingId) {
-        if (!zhuanquByLeixing.has(selectedLeixingId)) {
-          zhuanquByLeixing.set(selectedLeixingId, []);
-        }
-        zhuanquByLeixing.get(selectedLeixingId).push(zhuanqu);
-      }
-    });
-    
-    const shangpinByZhuanqu = new Map();
-    shangpinliebiao.forEach(shangpin => {
-      if (shangpin.leixing_id === selectedLeixingId && shangpin.zhuanqu_id) {
-        const zhuanquId = shangpin.zhuanqu_id;
-        if (!shangpinByZhuanqu.has(zhuanquId)) {
-          shangpinByZhuanqu.set(zhuanquId, []);
-        }
-        
-        const jiage = parseFloat(shangpin.jiage) || 0;
-        const priceInteger = Math.floor(jiage);
-        let priceDecimal = '00';
-        const decimalPart = (jiage - priceInteger).toFixed(2);
-        if (decimalPart > 0) {
-          priceDecimal = decimalPart.toString().split('.')[1];
-        }
-        
-        shangpinByZhuanqu.get(zhuanquId).push({
-          id: shangpin.id,
-          biaoqian: shangpin.biaoqian,
-          jiage: jiage,
-          priceInteger: priceInteger,
-          priceDecimal: priceDecimal,
-          tupian_url: shangpin.tupian_url,
-          duiwai_xiaoliang: shangpin.duiwai_xiaoliang || 0,
-          paixu: shangpin.paixu || 0
-        });
-      }
-    });
-    
-    const filteredData = [];
-    const currentZhuanquList = zhuanquByLeixing.get(selectedLeixingId) || [];
-    
-    currentZhuanquList.forEach(zhuanqu => {
-      const shangpinList = shangpinByZhuanqu.get(zhuanqu.id) || [];
-      if (shangpinList.length > 0) {
-        filteredData.push({
-          zhuanqu: {
-            id: zhuanqu.id,
-            mingzi: zhuanqu.mingzi,
-            paixu: zhuanqu.paixu || 0
-          },
-          shangpinList: shangpinList
-        });
-      }
-    });
-    
-    const sortedFilteredData = filteredData.sort((a, b) => {
-      const paixuA = a.zhuanqu.paixu || 0;
-      const paixuB = b.zhuanqu.paixu || 0;
-      if (paixuB !== paixuA) return paixuB - paixuA;
-      return a.zhuanqu.id - b.zhuanqu.id;
-    });
-    
-    this.setData({ filteredData: sortedFilteredData });
-  },
-
-  selectLeixing(e) {
-    const leixingId = e.currentTarget.dataset.id;
-    if (this.data.selectedLeixingId === leixingId) return;
-    this.setData({ selectedLeixingId: leixingId }, () => {
-      this.filterShangpinData();
-    });
-  },
-
-  showGonggaoDetail() {
-    this.setData({ 
-      showGonggaoModal: true,
-      gonggaoAnim: false,
-      currentTime: this.getCurrentTime()
-    });
-  },
-
-  hideGonggaoDetail() {
-    this.setData({ 
-      showGonggaoModal: false,
-      gonggaoAnim: true 
-    });
-  },
-
-  /**
-   * 刷新所有数据（点击刷新按钮）
-   * 只刷新商品数据，公告轮播图保持不变（若需刷新可清空全局缓存后调用 loadGonggaoAndLunbo）
-   */
-  async refreshAllData() {
-    if (this.data.isRefreshing) return;
-    this.setData({ isRefreshing: true });
-    wx.showLoading({ title: '刷新中...', mask: true });
-
-    try {
-      // 重新获取商品数据（登录状态由 fetchShopGoods 内部确保）
-      const shopData = await fetchShopGoods();
-
-      // 公告轮播图通常不需要随刷新按钮更新，保持原样
-      
-      const sortedLeixing = this.sortByPaixu(shopData.shangpinleixing || []);
-      const sortedZhuanqu = this.sortByPaixu(shopData.shangpinzhuanqu || []);
-      const sortedShangpin = this.sortByPaixu(shopData.shangpinliebiao || []);
-
-      app.globalData.shangpinleixing = sortedLeixing;
-      app.globalData.shangpinzhuanqu = sortedZhuanqu;
-      app.globalData.shangpinliebiao = sortedShangpin;
-
-      this.setData({
-        shangpinleixing: sortedLeixing,
-        shangpinzhuanqu: sortedZhuanqu,
-        shangpinliebiao: sortedShangpin,
-        selectedLeixingId: sortedLeixing[0]?.id || null,
-        isRefreshing: false
-      }, () => {
-        this.filterShangpinData();
-      });
-
-      wx.hideLoading();
-      wx.showToast({ title: '刷新成功', icon: 'success', duration: 1500 });
-    } catch (error) {
-      wx.hideLoading();
-      this.setData({ isRefreshing: false });
-    }
-  },
-
-  goToDetail(e) {
-    const shangpinId = e.currentTarget.dataset.id;
-    if (!shangpinId) return;
-    wx.navigateTo({
-      url: `/pages/shangpinxiangqing/shangpinxiangqing?id=${shangpinId}`
-    });
-  },
-
-  onReachBottom() {},
-
-  onShareAppMessage() {
-    return {
-      title: '阿龙电竞',
-      path: '/pages/shangpin/shangpin'
-    };
-  },
-
-  onUnload() {
-    this.setData({ gonggaoAnim: false });
-  }
+// pages/shangpin/shangpin.js
+const app = getApp();
+import { ensureLogin } from '../../utils/login';
+import { fetchShopGoods, bindShop } from '../../utils/shop';
+import { backfillUserProfileCache, getSessionToken } from '../../utils/role-tab-bar';
+import PopupService from '../../services/popupService.js';
+
+// 扫码场景参数名
+const SCENE_PARAM = 'scene';
+
+Page({
+  data: {
+    ossImageUrl: '',
+    lunbozhanwei: '',
+
+    shangpingonggao: '',
+    lunboList: [],
+    shangpinleixing: [],
+    shangpinzhuanqu: [],
+    shangpinliebiao: [],
+
+    selectedLeixingId: null,
+    filteredData: [],
+    showGonggaoModal: false,
+    gonggaoAnim: true,
+    isLoading: false,
+    isRefreshing: false,
+    hasInitialized: false,
+    
+    currentTime: ''
+  },
+
+  // 扫码解析的店铺ID
+  shopId: null,
+
+  onLoad(options) {
+    // 解析二维码参数
+    if (options[SCENE_PARAM]) {
+      try {
+        const scene = decodeURIComponent(options[SCENE_PARAM]);
+        this.shopId = scene;
+      } catch (e) {
+        console.error('scene解码失败', e);
+      }
+    }
+    
+    // 等待全局配置加载完成
+    this.waitForConfigAndInit();
+    // 已登录时才检查弹窗
+    const token = getSessionToken(app);
+    if (token) {
+        PopupService.checkAndShow(this, 'index');
+    }
+
+  },
+
+  // 页面隐藏时清理弹窗视图
+  onHide: function () {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+        popupComp.cleanup();
+    }
+},
+
+  waitForConfigAndInit() {
+    if (app.globalData.ossImageUrl) {
+      this.setData({
+        ossImageUrl: app.globalData.ossImageUrl,
+        lunbozhanwei: app.globalData.lunbozhanwei,
+        currentTime: this.getCurrentTime()
+      });
+      this.initPageData();
+    } else {
+      setTimeout(() => this.waitForConfigAndInit(), 100);
+    }
+  },
+
+  onShow() {
+    backfillUserProfileCache(app);
+    if (this.data.ossImageUrl) {
+      this.setData({
+        gonggaoAnim: true,
+        currentTime: this.getCurrentTime(),
+      });
+    }
+    this.registerNotificationComponent();
+
+    if (!getSessionToken(app)) {
+      this.setData({
+        hasInitialized: false,
+        filteredData: [],
+        shangpinleixing: [],
+        shangpinzhuanqu: [],
+        shangpinliebiao: [],
+      });
+      return;
+    }
+
+    // 已登录时加载/刷新商品；未登录不自动登录、不跳转
+    if (!this.data.isLoading) {
+      const needLoad = !this.data.hasInitialized
+        || !this.data.filteredData
+        || this.data.filteredData.length === 0;
+      if (needLoad) {
+        this.initPageData();
+      }
+    }
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  getCurrentTime() {
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = (now.getMonth() + 1).toString().padStart(2, '0');
+    const day = now.getDate().toString().padStart(2, '0');
+    const hour = now.getHours().toString().padStart(2, '0');
+    const minute = now.getMinutes().toString().padStart(2, '0');
+    return `${year}-${month}-${day} ${hour}:${minute}`;
+  },
+
+  sortByPaixu(list) {
+    if (!list || !Array.isArray(list)) return [];
+    return [...list].sort((a, b) => {
+      const paixuA = a.paixu || 0;
+      const paixuB = b.paixu || 0;
+      if (paixuB !== paixuA) return paixuB - paixuA;
+      return a.id - b.id;
+    });
+  },
+
+  /**
+   * 初始化页面数据（重构后）
+   * 流程：确保登录 → 如有扫码ID则绑定店铺 → 并行加载公告轮播图和商品数据
+   */
+  async initPageData() {
+    this.setData({ isLoading: true });
+
+    try {
+      // 1. 确保登录（静默，不跳转）
+      await ensureLogin({ page: this });
+
+      // 2. 扫码进入时绑定店铺
+      if (this.shopId) {
+        await bindShop(this.shopId);
+      }
+
+      // 3. 并行加载公告轮播图和商品数据
+      const [gonggaoResult, shopData] = await Promise.all([
+        this.loadGonggaoAndLunbo(),
+        fetchShopGoods()
+      ]);
+
+      // 4. 处理商品数据
+      const sortedLeixing = this.sortByPaixu(shopData.shangpinleixing || []);
+      const sortedZhuanqu = this.sortByPaixu(shopData.shangpinzhuanqu || []);
+      const sortedShangpin = this.sortByPaixu(shopData.shangpinliebiao || []);
+
+      // 更新全局缓存
+      app.globalData.shangpinleixing = sortedLeixing;
+      app.globalData.shangpinzhuanqu = sortedZhuanqu;
+      app.globalData.shangpinliebiao = sortedShangpin;
+
+      this.setData({
+        shangpinleixing: sortedLeixing,
+        shangpinzhuanqu: sortedZhuanqu,
+        shangpinliebiao: sortedShangpin,
+        selectedLeixingId: sortedLeixing[0]?.id || null,
+        isLoading: false,
+        hasInitialized: true,
+      }, () => {
+        this.filterShangpinData();
+      });
+
+    } catch (error) {
+      console.error('初始化失败:', error);
+      this.setData({ isLoading: false });
+    }
+  },
+
+  /**
+   * 加载公告和轮播图
+   */
+  loadGonggaoAndLunbo() {
+    return new Promise((resolve, reject) => {
+      // 如果全局已有数据，直接使用
+      if (app.globalData.shangpingonggao && app.globalData.shangpinlunbo.length > 0) {
+        this.setData({
+          shangpingonggao: app.globalData.shangpingonggao,
+          lunboList: this.processImageUrls(app.globalData.shangpinlunbo)
+        });
+        resolve();
+        return;
+      }
+
+      wx.request({
+        url: app.globalData.apiBaseUrl + '/peizhi/shangpingonggao/',
+        method: 'POST',
+        header: { 'content-type': 'application/json' },
+        success: (res) => {
+          if (res.statusCode === 200 && res.data) {
+            const data = res.data;
+            app.globalData.shangpingonggao = data.shangpingonggao || '';
+            app.globalData.shangpinlunbo = data.shangpinlunbo || [];
+            this.setData({
+              shangpingonggao: app.globalData.shangpingonggao,
+              lunboList: this.processImageUrls(app.globalData.shangpinlunbo)
+            });
+            resolve();
+          } else {
+            reject(new Error('请求失败'));
+          }
+        },
+        fail: reject
+      });
+    });
+  },
+
+  processImageUrls(urlList) {
+    if (!urlList || !Array.isArray(urlList)) return [];
+    return urlList.map(url => url.startsWith('http') ? url : this.data.ossImageUrl + url);
+  },
+
+  /**
+   * 筛选商品数据
+   */
+  filterShangpinData() {
+    const { selectedLeixingId, shangpinzhuanqu, shangpinliebiao } = this.data;
+    
+    if (!selectedLeixingId || !shangpinzhuanqu || !shangpinliebiao) {
+      this.setData({ filteredData: [] });
+      return;
+    }
+    
+    const zhuanquByLeixing = new Map();
+    shangpinzhuanqu.forEach(zhuanqu => {
+      if (zhuanqu.leixing_id === selectedLeixingId) {
+        if (!zhuanquByLeixing.has(selectedLeixingId)) {
+          zhuanquByLeixing.set(selectedLeixingId, []);
+        }
+        zhuanquByLeixing.get(selectedLeixingId).push(zhuanqu);
+      }
+    });
+    
+    const shangpinByZhuanqu = new Map();
+    shangpinliebiao.forEach(shangpin => {
+      if (shangpin.leixing_id === selectedLeixingId && shangpin.zhuanqu_id) {
+        const zhuanquId = shangpin.zhuanqu_id;
+        if (!shangpinByZhuanqu.has(zhuanquId)) {
+          shangpinByZhuanqu.set(zhuanquId, []);
+        }
+        
+        const jiage = parseFloat(shangpin.jiage) || 0;
+        const priceInteger = Math.floor(jiage);
+        let priceDecimal = '00';
+        const decimalPart = (jiage - priceInteger).toFixed(2);
+        if (decimalPart > 0) {
+          priceDecimal = decimalPart.toString().split('.')[1];
+        }
+        
+        shangpinByZhuanqu.get(zhuanquId).push({
+          id: shangpin.id,
+          biaoqian: shangpin.biaoqian,
+          jiage: jiage,
+          priceInteger: priceInteger,
+          priceDecimal: priceDecimal,
+          tupian_url: shangpin.tupian_url,
+          duiwai_xiaoliang: shangpin.duiwai_xiaoliang || 0,
+          paixu: shangpin.paixu || 0
+        });
+      }
+    });
+    
+    const filteredData = [];
+    const currentZhuanquList = zhuanquByLeixing.get(selectedLeixingId) || [];
+    
+    currentZhuanquList.forEach(zhuanqu => {
+      const shangpinList = shangpinByZhuanqu.get(zhuanqu.id) || [];
+      if (shangpinList.length > 0) {
+        filteredData.push({
+          zhuanqu: {
+            id: zhuanqu.id,
+            mingzi: zhuanqu.mingzi,
+            paixu: zhuanqu.paixu || 0
+          },
+          shangpinList: shangpinList
+        });
+      }
+    });
+    
+    const sortedFilteredData = filteredData.sort((a, b) => {
+      const paixuA = a.zhuanqu.paixu || 0;
+      const paixuB = b.zhuanqu.paixu || 0;
+      if (paixuB !== paixuA) return paixuB - paixuA;
+      return a.zhuanqu.id - b.zhuanqu.id;
+    });
+    
+    this.setData({ filteredData: sortedFilteredData });
+  },
+
+  selectLeixing(e) {
+    const leixingId = e.currentTarget.dataset.id;
+    if (this.data.selectedLeixingId === leixingId) return;
+    this.setData({ selectedLeixingId: leixingId }, () => {
+      this.filterShangpinData();
+    });
+  },
+
+  showGonggaoDetail() {
+    this.setData({ 
+      showGonggaoModal: true,
+      gonggaoAnim: false,
+      currentTime: this.getCurrentTime()
+    });
+  },
+
+  hideGonggaoDetail() {
+    this.setData({ 
+      showGonggaoModal: false,
+      gonggaoAnim: true 
+    });
+  },
+
+  /**
+   * 刷新所有数据
+   * 只刷新商品数据
+   */
+  async refreshAllData() {
+    if (this.data.isRefreshing) return;
+    this.setData({ isRefreshing: true });
+    wx.showLoading({ title: '刷新中...', mask: true });
+
+    try {
+      // 重新获取商品数据
+      const shopData = await fetchShopGoods();
+
+      const sortedLeixing = this.sortByPaixu(shopData.shangpinleixing || []);
+      const sortedZhuanqu = this.sortByPaixu(shopData.shangpinzhuanqu || []);
+      const sortedShangpin = this.sortByPaixu(shopData.shangpinliebiao || []);
+
+      app.globalData.shangpinleixing = sortedLeixing;
+      app.globalData.shangpinzhuanqu = sortedZhuanqu;
+      app.globalData.shangpinliebiao = sortedShangpin;
+
+      this.setData({
+        shangpinleixing: sortedLeixing,
+        shangpinzhuanqu: sortedZhuanqu,
+        shangpinliebiao: sortedShangpin,
+        selectedLeixingId: sortedLeixing[0]?.id || null,
+        isRefreshing: false
+      }, () => {
+        this.filterShangpinData();
+      });
+
+      wx.hideLoading();
+      wx.showToast({ title: '刷新成功', icon: 'success', duration: 1500 });
+    } catch (error) {
+      wx.hideLoading();
+      this.setData({ isRefreshing: false });
+    }
+  },
+
+  goToDetail(e) {
+    const shangpinId = e.currentTarget.dataset.id;
+    if (!shangpinId) return;
+    wx.navigateTo({
+      url: `/pages/product-detail/product-detail?id=${shangpinId}`
+    });
+  },
+
+  onReachBottom() {},
+
+  onShareAppMessage() {
+    return {
+      title: '阿龙电竞',
+      path: '/pages/shangpin/shangpin'
+    };
+  },
+
+  onUnload() {
+    this.setData({ gonggaoAnim: false });
+  }
 });
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index d5fff6b..7f871f9 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -113,7 +113,6 @@
                   class="shangpin-image"
                   lazy-load="{{true}}"
                 />
-                <!-- 移除已售标签 -->
               </view>
               
               <!-- 商品标题 -->
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 9887a60..d2866df 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,571 +1,413 @@
 /* ===== 1. 全局样式 ===== */
 .shangpin-page {
-    min-height: 100vh;
-    padding-top: 3px;
-    background: linear-gradient(180deg, #f5faff 0%, #f0f8ff 100%);
-  }
-  
+  min-height: 100vh;
+  padding-top: 3px;
+  background: linear-gradient(180deg, #f5faff 0%, #f0f8ff 100%);
+}
+
 /* ===== 2. 公告栏样式 ===== */
 .gonggao-box {
-    margin: 20rpx 30rpx;
-    height: 80rpx;
-    border-radius: 40rpx;
-    background: linear-gradient(135deg,
-      rgba(220, 255, 220, 0.85) 0%,
-      rgba(255, 255, 200, 0.85) 100%);
-    backdrop-filter: blur(10px);
-    display: flex;
-    align-items: center;
-    padding: 0 25rpx;
-    box-shadow: 0 4rpx 15rpx rgba(0, 100, 0, 0.08);
-    border: 1rpx solid rgba(255, 255, 255, 0.3);
-    overflow: hidden;
-  }
+  margin: 20rpx 30rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  background: linear-gradient(135deg,
+    rgba(220, 255, 220, 0.85) 0%,
+    rgba(255, 255, 200, 0.85) 100%);
+  backdrop-filter: blur(10px);
+  display: flex;
+  align-items: center;
+  padding: 0 25rpx;
+  box-shadow: 0 4rpx 15rpx rgba(0, 100, 0, 0.08);
+  border: 1rpx solid rgba(255, 255, 255, 0.3);
+  overflow: hidden;
+}
 
-  .gonggao-icon {
-    width: 40rpx;
-    height: 40rpx;
-    margin-right: 20rpx;
-    flex-shrink: 0;
-    display: flex;
-    align-items: center;
-  }
+.gonggao-icon {
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 20rpx;
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+}
 
-  .gonggao-icon image {
-    width: 100%;
-    height: 100%;
-  }
+.gonggao-icon image {
+  width: 100%;
+  height: 100%;
+}
 
-  .gonggao-content {
-    flex: 1;
-    overflow: hidden;
-    height: 80rpx;
-    display: flex;
-    margin-top: 2.5px; /* 视觉上的微小修正 */
-  }
+.gonggao-content {
+  flex: 1;
+  overflow: hidden;
+  margin-top: 4px; /* 视觉上微微下调，不要删*/
+  height: 80rpx;
+  display: flex;
+}
 
-  .gonggao-text {
-    font-size: 26rpx;
-    color: #333;
-    white-space: nowrap;
-    padding-right: 50rpx;
-    line-height: 1;
-  }
+.gonggao-text {
+  font-size: 26rpx;
+  color: #333;
+  white-space: nowrap;
+  padding-right: 50rpx;
+  line-height: 1;
+}
 
-  .gonggao-anim {
-    animation: marquee 10s linear infinite;
-    animation-delay: 0.5s;
-  }
+.gonggao-anim {
+  animation: marquee 10s linear infinite;
+  animation-delay: 0.5s;
+}
 
-  @keyframes marquee {
-    0% {
-      transform: translateX(100%);
-    }
-    100% {
-      transform: translateX(-100%);
-    }
-  }
-  
-  /* ===== 3. 轮播图样式 ===== */
-  .lunbo-container {
-    margin: 0 30rpx 30rpx;
-    height: 350rpx;
-    border-radius: 25rpx;
-    overflow: hidden;
-    position: relative;
-    box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1);
-  }
-  
-  .lunbo-swiper {
-    width: 100%;
-    height: 100%;
-  }
-  
-  .lunbo-image {
-    width: 100%;
-    height: 100%;
-  }
-  
-  .lunbo-placeholder {
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  
-  .lunbo-placeholder image {
-    width: 100%;
-    height: 100%;
-    opacity: 0.8;
-  }
-  
-  /* 刷新按钮 */
-  .refresh-btn {
-    position: absolute;
-    top: 20rpx;
-    right: 20rpx;
-    width: 80rpx;
-    height: 80rpx;
-    z-index: 10;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  
-  .refresh-icon {
-    width: 60rpx;
-    height: 60rpx;
-    transition: transform 0.3s;
-    filter: drop-shadow(0 4rpx 8rpx rgba(0, 0, 0, 0.2));
-  }
-  
-  .refreshing {
-    animation: rotate360 1s linear infinite;
-  }
-  
-  @keyframes rotate360 {
-    0% {
-      transform: rotate(0deg);
-    }
-    100% {
-      transform: rotate(360deg);
-    }
-  }
-  
-  .refresh-dot {
-    position: absolute;
-    width: 12rpx;
-    height: 12rpx;
-    background: #ffcc00;
-    border-radius: 50%;
-    top: 15rpx;
-    right: 15rpx;
-    animation: pulse 2s infinite;
-  }
-  
-  @keyframes pulse {
-    0%, 100% {
-      opacity: 0.8;
-      transform: scale(1);
-    }
-    50% {
-      opacity: 1;
-      transform: scale(1.2);
-    }
-  }
-  
-  /* ===== 4. 商品展示区域 ===== */
-  .shangpin-container {
-    background: rgba(255, 255, 255, 0.95);
-    border-radius: 40rpx 40rpx 0 0;
-    margin-top: -20rpx;
-    padding: 40rpx 30rpx 100rpx;
-    min-height: 800rpx;
-    box-shadow: 0 -10rpx 30rpx rgba(0, 0, 0, 0.05);
-  }
-  
-  /* 商品类型选择 - 完全重新设计，确保左对齐且间距协调 */
-  .leixing-scroll {
-    width: 100%;
-    white-space: nowrap;
-    margin-bottom: 50rpx;
-  }
-  
-  .leixing-list {
-    display: inline-flex;
-    padding-left: 0;  /* 完全去掉左内边距，100%左对齐 */
-    padding-right: 30rpx; /* 只保留右内边距给最后一个元素一点空间 */
-    padding-top: 10rpx;
-    padding-bottom: 10rpx;
-  }
-  
-  /* 关键：完全协调的间距 */
-  .leixing-item {
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    margin-right: 30rpx;  /* 合适的间距，不会太大也不会太小 */
-    transition: all 0.3s;
-    position: relative;
-    flex-shrink: 0;
-    width: 130rpx;  /* 固定宽度，确保四个看起来协调 */
-  }
-  
-  .leixing-item:last-child {
-    margin-right: 0;
-  }
-  
-  .leixing-image-box {
-    width: 110rpx;  /* 稍微减小，让整体更紧凑 */
-    height: 110rpx;
-    border-radius: 25rpx;
-    overflow: hidden;
-    position: relative;
-    margin-bottom: 12rpx;
-    transition: all 0.3s;
-    box-shadow: 0 8rpx 20rpx rgba(0, 0, 0, 0.1);
-  }
-  
-  .leixing-image {
-    width: 100%;
-    height: 100%;
-  }
-  
-  .leixing-glow {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    border-radius: 25rpx;
-    border: 4rpx solid transparent;
-    transition: all 0.3s;
-  }
-  
-  .leixing-active .leixing-glow {
-    border-color: #ffcc00;
-    box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.5);
-  }
-  
-  .leixing-active .leixing-image-box {
-    transform: translateY(-8rpx);
-  }
-  
-  .leixing-text {
-    font-size: 24rpx;
-    color: #666;
-    white-space: nowrap;
-    transition: all 0.3s;
-    text-align: center;
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  
-  .leixing-active .leixing-text {
-    color: #333;
-    font-weight: bold;
-    transform: scale(1.05);
-  }
-  
-  /* 专区标题 */
-  .zhuanqu-title {
-    display: flex;
-    align-items: center;
-    margin: 40rpx 0 15rpx;
-    padding-left: 0;
-    position: relative;
-  }
-  
-  .zhuanqu-icon {
-    width: 40rpx;
-    height: 40rpx;
-    margin-right: 20rpx;
-    position: relative;
-  }
-  
-  .zhuanqu-icon-image {
-    width: 100%;
-    height: 100%;
+/* ===== 3. 轮播图样式 ===== */
+.lunbo-container {
+  margin: 0 30rpx 30rpx;
+  height: 350rpx;
+  border-radius: 25rpx;
+  overflow: hidden;
+  position: relative;
+  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1);
+}
+
+.lunbo-swiper {
+  width: 100%;
+  height: 100%;
+}
+
+.lunbo-image {
+  width: 100%;
+  height: 100%;
+}
+
+.lunbo-placeholder {
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.lunbo-placeholder image {
+  width: 100%;
+  height: 100%;
+  opacity: 0.8;
+}
+
+/* 刷新按钮 */
+.refresh-btn {
+  position: absolute;
+  top: 20rpx;
+  right: 20rpx;
+  width: 80rpx;
+  height: 80rpx;
+  z-index: 10;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.refresh-icon {
+  width: 60rpx;
+  height: 60rpx;
+  transition: transform 0.3s;
+  filter: drop-shadow(0 4rpx 8rpx rgba(0, 0, 0, 0.2));
+}
+
+.refreshing {
+  animation: rotate360 1s linear infinite;
+}
+
+.refresh-dot {
+  position: absolute;
+  width: 12rpx;
+  height: 12rpx;
+  background: #ffcc00;
+  border-radius: 50%;
+  top: 15rpx;
+  right: 15rpx;
+  animation: pulse 2s infinite;
+}
+
+/* ===== 4. 商品展示区域 ===== */
+.shangpin-container {
+  background: rgba(255, 255, 255, 0.95);
+  border-radius: 40rpx 40rpx 0 0;
+  margin-top: -20rpx;
+  padding: 40rpx 30rpx 100rpx;
+  min-height: 800rpx;
+  box-shadow: 0 -10rpx 30rpx rgba(0, 0, 0, 0.05);
+}
+
+/* 商品类型选择 */
+.leixing-scroll {
+  width: 100%;
+  white-space: nowrap;
+  margin-bottom: 50rpx;
+}
+
+.leixing-list {
+  display: inline-flex;
+  padding-left: 0;
+  padding-right: 30rpx;
+  padding-top: 10rpx;
+  padding-bottom: 10rpx;
+}
+
+.leixing-item {
+  display: inline-flex;
+  flex-direction: column;
+  align-items: center;
+  margin-right: 30rpx;
+  transition: all 0.3s;
+  position: relative;
+  flex-shrink: 0;
+  width: 130rpx;
+}
+
+.leixing-item:last-child {
+  margin-right: 0;
+}
+
+.leixing-image-box {
+  width: 110rpx;
+  height: 110rpx;
+  border-radius: 25rpx;
+  overflow: hidden;
+  position: relative;
+  margin-bottom: 12rpx;
+  transition: all 0.3s;
+  box-shadow: 0 8rpx 20rpx rgba(0, 0, 0, 0.1);
+}
+
+.leixing-image {
+  width: 100%;
+  height: 100%;
+}
+
+.leixing-glow {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border-radius: 25rpx;
+  border: 4rpx solid transparent;
+  transition: all 0.3s;
+}
+
+.leixing-active .leixing-glow {
+  border-color: #ffcc00;
+  box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.5);
+}
+
+.leixing-active .leixing-image-box {
+  transform: translateY(-8rpx);
+}
+
+.leixing-text {
+  font-size: 24rpx;
+  color: #666;
+  white-space: nowrap;
+  transition: all 0.3s;
+  text-align: center;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.leixing-active .leixing-text {
+  color: #333;
+  font-weight: bold;
+  transform: scale(1.05);
+}
+
+/* 专区标题 */
+.zhuanqu-title {
+  display: flex;
+  align-items: center;
+  margin: 40rpx 0 15rpx;
+  padding-left: 0;
+  position: relative;
+}
+
+.zhuanqu-icon {
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 20rpx;
+  position: relative;
+}
+
+.zhuanqu-icon-image {
+  width: 100%;
+  height: 100%;
+  filter: drop-shadow(0 2rpx 4rpx rgba(255, 204, 0, 0.3));
+}
+
+.zhuanqu-sparkle {
+  animation: sparkle 2s infinite;
+}
+
+@keyframes sparkle {
+  0%, 100% {
+    transform: scale(1) rotate(0deg);
     filter: drop-shadow(0 2rpx 4rpx rgba(255, 204, 0, 0.3));
   }
-  
-  .zhuanqu-sparkle {
-    animation: sparkle 2s infinite;
+  50% {
+    transform: scale(1.1) rotate(10deg);
+    filter: drop-shadow(0 4rpx 8rpx rgba(255, 204, 0, 0.6));
   }
-  
-  @keyframes sparkle {
-    0%, 100% {
-      transform: scale(1) rotate(0deg);
-      filter: drop-shadow(0 2rpx 4rpx rgba(255, 204, 0, 0.3));
-    }
-    50% {
-      transform: scale(1.1) rotate(10deg);
-      filter: drop-shadow(0 4rpx 8rpx rgba(255, 204, 0, 0.6));
-    }
-  }
-  
-  .zhuanqu-text {
-    font-size: 32rpx;
-    font-weight: bold;
-    color: #333;
-    position: relative;
-  }
-  
-  .zhuanqu-text::after {
-    content: '';
-    position: absolute;
-    left: 0;
-    bottom: -8rpx;
-    width: 60rpx;
-    height: 4rpx;
-    background: linear-gradient(90deg, #ffcc00, transparent);
-    border-radius: 2rpx;
-  }
-  
-  /* 商品网格 */
-  .shangpin-grid {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 25rpx;
-    margin-bottom: 40rpx;
-  }
-  
-  .shangpin-card {
-    background: #ffffff;
-    border-radius: 20rpx;
-    overflow: hidden;
-    box-shadow: 0 8rpx 25rpx rgba(0, 0, 0, 0.06);
-    transition: all 0.3s;
-    position: relative;
-  }
-  
-  .shangpin-card:active {
-    transform: scale(0.98);
-    box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1);
-  }
-  
-  .shangpin-image-box {
-    width: 100%;
-    height: 220rpx;
-    position: relative;
-    overflow: hidden;
-  }
-  
-  .shangpin-image {
-    width: 100%;
-    height: 100%;
-    transition: transform 0.5s;
-  }
-  
-  /* 商品标题区域 - 协调紧凑 */
-  .shangpin-title {
-    height: 75rpx;
-    padding: 6rpx 12rpx 2rpx 12rpx;
-    display: flex;
-    align-items: flex-start;
-    overflow: hidden;
-  }
-  
-  .title-text {
-    font-size: 26rpx;
-    color: #000;
-    line-height: 34rpx;
-    font-weight: 450;  /* 微调粗细，更加协调 */
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  
-  /* 价格和购买按钮 - 协调紧凑 */
-  .shangpin-footer {
-    height: 50rpx;
-    padding: 0 12rpx 8rpx 12rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-  
-  .price-box {
-    display: flex;
-    align-items: baseline;
-  }
-  
-  .price-icon {
-    font-size: 24rpx;
-    color: #ff4444;
-    font-weight: bold;
-    margin-right: 2rpx;
-  }
-  
-  .price-integer {
-    font-size: 32rpx;
-    color: #ff4444;
-    font-weight: bold;
-  }
-  
-  .price-decimal {
-    font-size: 24rpx;
-    color: #ff4444;
-    font-weight: bold;
-  }
-  
-  .buy-btn {
-    width: 48rpx;
-    height: 48rpx;
-    border-radius: 50%;
-    background: linear-gradient(135deg, #ff4444, #ff6666);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    box-shadow: 0 4rpx 12rpx rgba(255, 68, 68, 0.3);
-    transition: all 0.3s;
-  }
-  
-  .buy-btn:active {
-    transform: scale(0.9);
-  }
-  
-  .buy-icon {
-    width: 26rpx;
-    height: 26rpx;
-    filter: brightness(0) invert(1);
-  }
-  
-  /* ===== 5. 空状态 ===== */
-  .empty-state {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 100rpx 0;
-  }
-  
-  .empty-image {
-    width: 200rpx;
-    height: 200rpx;
-    margin-bottom: 40rpx;
-    opacity: 0.7;
-  }
-  
-  .empty-text {
-    font-size: 30rpx;
-    color: #999;
-    margin-bottom: 40rpx;
-  }
-  
-  .empty-btn {
-    background: linear-gradient(135deg, #667eea, #764ba2);
-    color: white;
-    font-size: 28rpx;
-    padding: 20rpx 60rpx;
-    border-radius: 50rpx;
-    box-shadow: 0 8rpx 25rpx rgba(102, 126, 234, 0.3);
-  }
-  
-  /* ===== 6. 弹窗样式 ===== */
-  .gonggao-modal {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 1000;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  
-  .modal-mask {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0, 0, 0, 0.5);
-    backdrop-filter: blur(5px);
-  }
-  
-  .modal-content {
-    width: 600rpx;
-    background: white;
-    border-radius: 30rpx;
-    overflow: hidden;
-    box-shadow: 0 20rpx 60rpx rgba(0, 0, 0, 0.2);
-    z-index: 1001;
-    animation: modalShow 0.3s;
-  }
-  
-  @keyframes modalShow {
-    from {
-      opacity: 0;
-      transform: scale(0.9);
-    }
-    to {
-      opacity: 1;
-      transform: scale(1);
-    }
-  }
-  
-  .modal-header {
-    padding: 40rpx;
-    border-bottom: 2rpx solid #f0f0f0;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-  
-  .modal-title {
-    font-size: 32rpx;
-    font-weight: bold;
-    color: #333;
-  }
-  
-  .modal-close {
-    font-size: 40rpx;
-    color: #999;
-    width: 60rpx;
-    height: 60rpx;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border-radius: 50%;
-  }
-  
-  .modal-close:active {
-    background: #f5f5f5;
-  }
-  
-  .modal-body {
-    max-height: 600rpx;
-    padding: 40rpx;
-  }
-  
-  .modal-text {
-    font-size: 28rpx;
-    color: #333;
-    line-height: 1.6;
-    white-space: normal;
-    word-break: break-word;
-  }
-  
-  /* ===== 7. 加载提示 ===== */
-  .loading-toast {
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    background: rgba(0, 0, 0, 0.7);
-    backdrop-filter: blur(10px);
-    padding: 30rpx 50rpx;
-    border-radius: 25rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    z-index: 999;
-  }
-  
-  .loading-spinner {
-    width: 60rpx;
-    height: 60rpx;
-    border: 6rpx solid rgba(255, 255, 255, 0.3);
-    border-top-color: white;
-    border-radius: 50%;
-    animation: spin 1s linear infinite;
-    margin-bottom: 20rpx;
-  }
-  
-  @keyframes spin {
-    to {
-      transform: rotate(360deg);
-    }
-  }
-  
-  .loading-text {
-    font-size: 26rpx;
-    color: white;
-  }
\ No newline at end of file
+}
+
+.zhuanqu-text {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  position: relative;
+}
+
+.zhuanqu-text::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: -8rpx;
+  width: 60rpx;
+  height: 4rpx;
+  background: linear-gradient(90deg, #ffcc00, transparent);
+  border-radius: 2rpx;
+}
+
+/* 商品网格 */
+.shangpin-grid {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 25rpx;
+  margin-bottom: 40rpx;
+}
+
+.shangpin-card {
+  background: #ffffff;
+  border-radius: 20rpx;
+  overflow: hidden;
+  box-shadow: 0 8rpx 25rpx rgba(0, 0, 0, 0.06);
+  transition: all 0.3s;
+  position: relative;
+}
+
+.shangpin-card:active {
+  transform: scale(0.98);
+  box-shadow: 0 4rpx 15rpx rgba(0, 0, 0, 0.1);
+}
+
+.shangpin-image-box {
+  width: 100%;
+  height: 220rpx;
+  position: relative;
+  overflow: hidden;
+}
+
+.shangpin-image {
+  width: 100%;
+  height: 100%;
+  transition: transform 0.5s;
+}
+
+/* 商品标题区域 */
+.shangpin-title {
+  height: 75rpx;
+  padding: 6rpx 12rpx 2rpx 12rpx;
+  display: flex;
+  align-items: flex-start;
+  overflow: hidden;
+}
+
+.title-text {
+  font-size: 26rpx;
+  color: #000;
+  line-height: 34rpx;
+  font-weight: 450;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* 价格和购买按钮 */
+.shangpin-footer {
+  height: 50rpx;
+  padding: 0 12rpx 8rpx 12rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.price-box {
+  display: flex;
+  align-items: baseline;
+}
+
+.buy-btn {
+  width: 48rpx;
+  height: 48rpx;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #ff4444, #ff6666);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-shadow: 0 4rpx 12rpx rgba(255, 68, 68, 0.3);
+  transition: all 0.3s;
+}
+
+.buy-btn:active {
+  transform: scale(0.9);
+}
+
+.buy-icon {
+  width: 26rpx;
+  height: 26rpx;
+  filter: brightness(0) invert(1);
+}
+
+/* ===== 5. 空状态 ===== */
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 100rpx 0;
+}
+
+.empty-image {
+  width: 200rpx;
+  height: 200rpx;
+  margin-bottom: 40rpx;
+  opacity: 0.7;
+}
+
+.empty-text {
+  font-size: 30rpx;
+  color: #999;
+  margin-bottom: 40rpx;
+}
+
+.empty-btn {
+  background: linear-gradient(135deg, #667eea, #764ba2);
+  color: white;
+  font-size: 28rpx;
+  padding: 20rpx 60rpx;
+  border-radius: 50rpx;
+  box-shadow: 0 8rpx 25rpx rgba(102, 126, 234, 0.3);
+}
+
+/* ===== 6. 弹窗样式 ===== */
+.gonggao-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
diff --git a/pages/yaoqingdashou/yaoqingdashou.js b/pages/invite-fighter/invite-fighter.js
similarity index 100%
rename from pages/yaoqingdashou/yaoqingdashou.js
rename to pages/invite-fighter/invite-fighter.js
diff --git a/pages/yaoqingdashou/yaoqingdashou.json b/pages/invite-fighter/invite-fighter.json
similarity index 100%
rename from pages/yaoqingdashou/yaoqingdashou.json
rename to pages/invite-fighter/invite-fighter.json
diff --git a/pages/yaoqingdashou/yaoqingdashou.wxml b/pages/invite-fighter/invite-fighter.wxml
similarity index 100%
rename from pages/yaoqingdashou/yaoqingdashou.wxml
rename to pages/invite-fighter/invite-fighter.wxml
diff --git a/pages/yaoqingdashou/yaoqingdashou.wxss b/pages/invite-fighter/invite-fighter.wxss
similarity index 100%
rename from pages/yaoqingdashou/yaoqingdashou.wxss
rename to pages/invite-fighter/invite-fighter.wxss
diff --git a/pages/yqguanshi/yqguanshi.js b/pages/invite-manager/invite-manager.js
similarity index 100%
rename from pages/yqguanshi/yqguanshi.js
rename to pages/invite-manager/invite-manager.js
diff --git a/pages/yqguanshi/yqguanshi.json b/pages/invite-manager/invite-manager.json
similarity index 100%
rename from pages/yqguanshi/yqguanshi.json
rename to pages/invite-manager/invite-manager.json
diff --git a/pages/yqguanshi/yqguanshi.wxml b/pages/invite-manager/invite-manager.wxml
similarity index 100%
rename from pages/yqguanshi/yqguanshi.wxml
rename to pages/invite-manager/invite-manager.wxml
diff --git a/pages/yqguanshi/yqguanshi.wxss b/pages/invite-manager/invite-manager.wxss
similarity index 100%
rename from pages/yqguanshi/yqguanshi.wxss
rename to pages/invite-manager/invite-manager.wxss
diff --git a/pages/jiedanchi2/jiedanchi2.wxml b/pages/jiedanchi2/jiedanchi2.wxml
deleted file mode 100644
index fdd9cd8..0000000
--- a/pages/jiedanchi2/jiedanchi2.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!--pages/jiedanchi2/jiedanchi2.wxml-->
-<text>pages/jiedanchi2/jiedanchi2.wxml</text>
\ No newline at end of file
diff --git a/pages/jiedanchi2/jiedanchi2.wxss b/pages/jiedanchi2/jiedanchi2.wxss
deleted file mode 100644
index fae36a0..0000000
--- a/pages/jiedanchi2/jiedanchi2.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pages/jiedanchi2/jiedanchi2.wxss */
\ No newline at end of file
diff --git a/pages/zzfhjilu/zzfhjilu.js b/pages/leader-bonus-log/leader-bonus-log.js
similarity index 100%
rename from pages/zzfhjilu/zzfhjilu.js
rename to pages/leader-bonus-log/leader-bonus-log.js
diff --git a/pages/zzfhjilu/zzfhjilu.json b/pages/leader-bonus-log/leader-bonus-log.json
similarity index 100%
rename from pages/zzfhjilu/zzfhjilu.json
rename to pages/leader-bonus-log/leader-bonus-log.json
diff --git a/pages/zzfhjilu/zzfhjilu.wxml b/pages/leader-bonus-log/leader-bonus-log.wxml
similarity index 100%
rename from pages/zzfhjilu/zzfhjilu.wxml
rename to pages/leader-bonus-log/leader-bonus-log.wxml
diff --git a/pages/zzfhjilu/zzfhjilu.wxss b/pages/leader-bonus-log/leader-bonus-log.wxss
similarity index 100%
rename from pages/zzfhjilu/zzfhjilu.wxss
rename to pages/leader-bonus-log/leader-bonus-log.wxss
diff --git a/pages/zuzhangduan/zuzhangduan.js b/pages/leader/leader.js
similarity index 88%
rename from pages/zuzhangduan/zuzhangduan.js
rename to pages/leader/leader.js
index 47ffd16..028903d 100644
--- a/pages/zuzhangduan/zuzhangduan.js
+++ b/pages/leader/leader.js
@@ -1,225 +1,225 @@
-// pages/zuzhangduan/zuzhangduan.js
-import request from '../../utils/request.js'
-import {
-  isRoleStatusActive,
-  isCenterPageActive,
-  syncRoleStatuses,
-  syncProfileFields,
-  ensureRoleOnCenterPage,
-} from '../../utils/role-tab-bar.js'
-
-Page({
-  data: {
-    // 页面状态
-    isZuzhang: false,
-    isLoading: false,
-    
-    // 邀请码相关
-    inviteCode: '',
-    
-    // 用户信息
-    uid: '',
-    nicheng: '',
-    avatarUrl: '',
-    
-    // 组长信息
-    ketixian: '0.00',        // 可提现金额
-    guanshiCount: 0,         // 邀请的管事数量
-    fenhongZonge: '0.00',    // 分红总额
-  },
-
-  onLoad() {
-    wx.redirectTo({ url: '/pages/dashouduan/dashouduan' });
-    return;
-    // --- 以下保留供恢复参考 ---
-    this.checkLoginStatus()
-  },
-
-  onReady() {
-    if (isCenterPageActive(this, 'isZuzhang', 'zuzhangstatus')) {
-      ensureRoleOnCenterPage(this, 'zuzhang')
-    }
-  },
-
-  onShow() {
-    this.registerNotificationComponent()
-    if (isCenterPageActive(this, 'isZuzhang', 'zuzhangstatus')) {
-      if (!this.data.isZuzhang) this.setData({ isZuzhang: true })
-      ensureRoleOnCenterPage(this, 'zuzhang')
-      this.getZuzhangInfo()
-    }
-  },
-
-  // 检查登录状态
-  checkLoginStatus() {
-    const token = wx.getStorageSync('token')
-    if (!token) {
-      wx.showModal({
-        title: '提示',
-        content: '您尚未登录，请先登录',
-        confirmText: '去登录',
-        success: (res) => {
-          if (res.confirm) {
-            wx.reLaunch({ url: '/pages/gerenzhongxin/gerenzhongxin' })
-          }
-        }
-      })
-      return false
-    }
-    this.checkZuzhangStatus()
-    return true
-  },
-
-  // 检查组长状态
-  checkZuzhangStatus() {
-    try {
-      const zuzhangstatus = wx.getStorageSync('zuzhangstatus')
-      if (isRoleStatusActive(zuzhangstatus)) {
-        this.setData({ isZuzhang: true })
-        this.loadUserInfo()
-        this.getZuzhangInfo()
-        ensureRoleOnCenterPage(this, 'zuzhang')
-      } else {
-        this.setData({ isZuzhang: false })
-      }
-    } catch (error) {
-      console.error('读取缓存失败:', error)
-      this.setData({ isZuzhang: false })
-    }
-  },
-
-  // 加载用户信息
-  loadUserInfo() {
-    const app = getApp()
-    const globalData = app.globalData || {}
-    
-    const touxiang = wx.getStorageSync('touxiang')
-    const ossImageUrl = globalData.ossImageUrl || ''
-    const morentouxiang = globalData.morentouxiang || 'avatar/default.jpg'
-    
-    let avatarUrl = ''
-    if (touxiang) {
-      avatarUrl = ossImageUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang)
-    } else {
-      avatarUrl = ossImageUrl + (morentouxiang.startsWith('/') ? morentouxiang : '/' + morentouxiang)
-    }
-    
-    const uid = wx.getStorageSync('uid') || ''
-    const nicheng = wx.getStorageSync('nicheng') || globalData.nicheng || ''
-    
-    this.setData({ avatarUrl, uid, nicheng })
-  },
-
-  // 注册通知组件
-  registerNotificationComponent() {
-    const app = getApp()
-    const notificationComp = this.selectComponent('#global-notification')
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      }
-    }
-  },
-
-  // 获取组长信息（刷新）
-  async getZuzhangInfo() {
-    this.setData({ isLoading: true })
-    try {
-      const res = await request({
-        url: '/yonghu/zuzhangxinxi',
-        method: 'POST'
-      })
-      if (res && res.data.code === 200) {
-        const data = res.data.data
-        this.setData({
-          ketixian: data.ketixian || '0.00',
-          guanshiCount: data.guanshiCount || 0,
-          fenhongZonge: data.fenhongZonge || '0.00',
-          isLoading: false
-        })
-        wx.showToast({ title: '刷新成功', icon: 'success', duration: 1500 })
-      } else {
-        throw new Error(res?.data?.msg || '获取信息失败')
-      }
-    } catch (error) {
-      console.error('获取组长信息失败:', error)
-      this.setData({ isLoading: false })
-      wx.showToast({ title: error.message || '刷新失败', icon: 'none' })
-    }
-  },
-
-  // 刷新按钮点击
-  refreshZuzhangInfo() {
-    this.getZuzhangInfo()
-  },
-
-  // 邀请码输入
-  onInviteCodeInput(e) {
-    this.setData({ inviteCode: e.detail.value.trim() })
-  },
-
-  // 注册组长
-  async onRegister() {
-    const { inviteCode } = this.data
-    if (!inviteCode) {
-      wx.showToast({ title: '请输入邀请码', icon: 'none', duration: 2000 })
-      return
-    }
-    if (inviteCode.length > 100) {
-      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none', duration: 2000 })
-      return
-    }
-
-    this.setData({ isLoading: true })
-    try {
-      const res = await request({
-        url: '/yonghu/zuzhangzhuce',
-        method: 'POST',
-        data: { inviteCode }
-      })
-      if (res && res.data.code === 200) {
-        const data = res.data.data || {}
-        syncRoleStatuses(data)
-        syncProfileFields(data)
-        if (!Object.prototype.hasOwnProperty.call(data, 'zuzhangstatus')) {
-          wx.setStorageSync('zuzhangstatus', 1)
-        }
-        this.setData({
-          isZuzhang: true,
-          ketixian: data.ketixian || '0.00',
-          guanshiCount: data.guanshiCount || 0,
-          fenhongZonge: data.fenhongZonge || '0.00',
-          isLoading: false
-        })
-        this.loadUserInfo()
-        ensureRoleOnCenterPage(this, 'zuzhang')
-        wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 })
-      } else {
-        throw new Error(res?.data?.msg || '注册失败')
-      }
-    } catch (error) {
-      console.error('注册失败:', error)
-      this.setData({ isLoading: false })
-      wx.showToast({ title: error.message || '注册失败', icon: 'error' })
-    }
-  },
-
-  // 🔥【修改】跳转到提现页面，传递from=zuzhang参数
-  goToWithdraw() {
-    const { ketixian } = this.data
-    wx.navigateTo({
-      url: `/pages/tixian/tixian?from=zuzhang&amount=${ketixian}`
-    })
-  },
-
-  // 跳转到分红记录页面
-  goToFenhongJilu() {
-    wx.navigateTo({ url: '/pages/zzfhjilu/zzfhjilu' })
-  },
-
-  // 跳转到邀请管事页面
-  goToYaoqingGuanshi() {
-    wx.navigateTo({ url: '/pages/yqguanshi/yqguanshi' })
-  }
+// pages/leader/leader.js
+import request from '../../utils/request.js'
+import {
+  isRoleStatusActive,
+  isCenterPageActive,
+  syncRoleStatuses,
+  syncProfileFields,
+  ensureRoleOnCenterPage,
+} from '../../utils/role-tab-bar.js'
+
+Page({
+  data: {
+    // 页面状态
+    isZuzhang: false,
+    isLoading: false,
+    
+    // 邀请码
+    inviteCode: '',
+    
+    // 用户信息
+    uid: '',
+    nicheng: '',
+    avatarUrl: '',
+    
+    // 组长信息
+    ketixian: '0.00',
+    guanshiCount: 0,
+    fenhongZonge: '0.00',
+  },
+
+  onLoad() {
+    wx.redirectTo({ url: '/pages/fighter/fighter' });
+    return;
+    // 以下保留供恢复参考
+    this.checkLoginStatus()
+  },
+
+  onReady() {
+    if (isCenterPageActive(this, 'isZuzhang', 'zuzhangstatus')) {
+      ensureRoleOnCenterPage(this, 'zuzhang')
+    }
+  },
+
+  onShow() {
+    this.registerNotificationComponent()
+    if (isCenterPageActive(this, 'isZuzhang', 'zuzhangstatus')) {
+      if (!this.data.isZuzhang) this.setData({ isZuzhang: true })
+      ensureRoleOnCenterPage(this, 'zuzhang')
+      this.getZuzhangInfo()
+    }
+  },
+
+  // 检查登录状态
+  checkLoginStatus() {
+    const token = wx.getStorageSync('token')
+    if (!token) {
+      wx.showModal({
+        title: '提示',
+        content: '您尚未登录，请先登录',
+        confirmText: '去登录',
+        success: (res) => {
+          if (res.confirm) {
+            wx.reLaunch({ url: '/pages/gerenzhongxin/gerenzhongxin' })
+          }
+        }
+      })
+      return false
+    }
+    this.checkZuzhangStatus()
+    return true
+  },
+
+  // 检查组长状态
+  checkZuzhangStatus() {
+    try {
+      const zuzhangstatus = wx.getStorageSync('zuzhangstatus')
+      if (isRoleStatusActive(zuzhangstatus)) {
+        this.setData({ isZuzhang: true })
+        this.loadUserInfo()
+        this.getZuzhangInfo()
+        ensureRoleOnCenterPage(this, 'zuzhang')
+      } else {
+        this.setData({ isZuzhang: false })
+      }
+    } catch (error) {
+      console.error('读取缓存失败:', error)
+      this.setData({ isZuzhang: false })
+    }
+  },
+
+  // 加载用户信息
+  loadUserInfo() {
+    const app = getApp()
+    const globalData = app.globalData || {}
+    
+    const touxiang = wx.getStorageSync('touxiang')
+    const ossImageUrl = globalData.ossImageUrl || ''
+    const morentouxiang = globalData.morentouxiang || 'avatar/default.jpg'
+    
+    let avatarUrl = ''
+    if (touxiang) {
+      avatarUrl = ossImageUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang)
+    } else {
+      avatarUrl = ossImageUrl + (morentouxiang.startsWith('/') ? morentouxiang : '/' + morentouxiang)
+    }
+    
+    const uid = wx.getStorageSync('uid') || ''
+    const nicheng = wx.getStorageSync('nicheng') || globalData.nicheng || ''
+    
+    this.setData({ avatarUrl, uid, nicheng })
+  },
+
+  // 注册通知组件
+  registerNotificationComponent() {
+    const app = getApp()
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  // 获取组长信息（刷新）
+  async getZuzhangInfo() {
+    this.setData({ isLoading: true })
+    try {
+      const res = await request({
+        url: '/yonghu/zuzhangxinxi',
+        method: 'POST'
+      })
+      if (res && res.data.code === 200) {
+        const data = res.data.data
+        this.setData({
+          ketixian: data.ketixian || '0.00',
+          guanshiCount: data.guanshiCount || 0,
+          fenhongZonge: data.fenhongZonge || '0.00',
+          isLoading: false
+        })
+        wx.showToast({ title: '刷新成功', icon: 'success', duration: 1500 })
+      } else {
+        throw new Error(res?.data?.msg || '获取信息失败')
+      }
+    } catch (error) {
+      console.error('获取组长信息失败:', error)
+      this.setData({ isLoading: false })
+      wx.showToast({ title: error.message || '刷新失败', icon: 'none' })
+    }
+  },
+
+  // 刷新按钮点击
+  refreshZuzhangInfo() {
+    this.getZuzhangInfo()
+  },
+
+  // 邀请码输入
+  onInviteCodeInput(e) {
+    this.setData({ inviteCode: e.detail.value.trim() })
+  },
+
+  // 注册组长
+  async onRegister() {
+    const { inviteCode } = this.data
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none', duration: 2000 })
+      return
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none', duration: 2000 })
+      return
+    }
+
+    this.setData({ isLoading: true })
+    try {
+      const res = await request({
+        url: '/yonghu/zuzhangzhuce',
+        method: 'POST',
+        data: { inviteCode }
+      })
+      if (res && res.data.code === 200) {
+        const data = res.data.data || {}
+        syncRoleStatuses(data)
+        syncProfileFields(data)
+        if (!Object.prototype.hasOwnProperty.call(data, 'zuzhangstatus')) {
+          wx.setStorageSync('zuzhangstatus', 1)
+        }
+        this.setData({
+          isZuzhang: true,
+          ketixian: data.ketixian || '0.00',
+          guanshiCount: data.guanshiCount || 0,
+          fenhongZonge: data.fenhongZonge || '0.00',
+          isLoading: false
+        })
+        this.loadUserInfo()
+        ensureRoleOnCenterPage(this, 'zuzhang')
+        wx.showToast({ title: '注册成功！', icon: 'success', duration: 2000 })
+      } else {
+        throw new Error(res?.data?.msg || '注册失败')
+      }
+    } catch (error) {
+      console.error('注册失败:', error)
+      this.setData({ isLoading: false })
+      wx.showToast({ title: error.message || '注册失败', icon: 'error' })
+    }
+  },
+
+  // 跳转到提现页面
+  goToWithdraw() {
+    const { ketixian } = this.data
+    wx.navigateTo({
+      url: `/pages/withdraw/withdraw?from=zuzhang&amount=${ketixian}`
+    })
+  },
+
+  // 跳转到分红记录
+  goToFenhongJilu() {
+    wx.navigateTo({ url: '/pages/leader-bonus-log/leader-bonus-log' })
+  },
+
+  // 跳转到邀请管事
+  goToYaoqingGuanshi() {
+    wx.navigateTo({ url: '/pages/invite-manager/invite-manager' })
+  }
 })
\ No newline at end of file
diff --git a/pages/zuzhangduan/zuzhangduan.json b/pages/leader/leader.json
similarity index 100%
rename from pages/zuzhangduan/zuzhangduan.json
rename to pages/leader/leader.json
diff --git a/pages/zuzhangduan/zuzhangduan.wxml b/pages/leader/leader.wxml
similarity index 95%
rename from pages/zuzhangduan/zuzhangduan.wxml
rename to pages/leader/leader.wxml
index e9fa248..494e032 100644
--- a/pages/zuzhangduan/zuzhangduan.wxml
+++ b/pages/leader/leader.wxml
@@ -1,108 +1,108 @@
-<!-- pages/zuzhangduan/zuzhangduan.wxml - 重设计，更饱满科技感 -->
-
-<!-- 未注册状态（保持原样） -->
-<view class="page-container unregistered-page" wx:if="{{!isZuzhang}}">
-  <view class="glitch-title">⚡ 组长认证 ⚡</view>
-  <view class="input-area">
-    <input 
-      class="glitch-input" 
-      type="text" 
-      placeholder="输入邀请码激活权限" 
-      maxlength="100"
-      value="{{inviteCode}}"
-      bindinput="onInviteCodeInput"
-      placeholder-class="placeholder"
-    />
-  </view>
-  <view class="glitch-button" bindtap="onRegister">
-    <text class="button-text">立即激活</text>
-    <view class="button-glow"></view>
-  </view>
-</view>
-
-<!-- 已注册状态 - 赛博驾驶舱（重设计） -->
-<view class="page-container registered-page" wx:else>
-  <!-- 背景网格 + 扫描线 -->
-  <view class="cyber-grid"></view>
-  <view class="scan-line"></view>
-  
-  <!-- 刷新按钮（能量核心）保持不变 -->
-  <view class="refresh-core" bindtap="refreshZuzhangInfo">
-    <view class="core-spinner"></view>
-  </view>
-  
-  <!-- 头部用户信息（增强光效） -->
-  <view class="cyber-header">
-    <view class="avatar-container">
-      <image class="avatar" src="{{avatarUrl}}" mode="aspectFill"></image>
-      <view class="avatar-ring"></view>
-      <view class="avatar-glow"></view>
-    </view>
-    <view class="user-info">
-      <text class="nickname">{{nicheng || '组长'}}</text>
-      <view class="uid-tag">
-        <text>UID: {{uid || '--'}}</text>
-      </view>
-    </view>
-  </view>
-  
-  <!-- 资产总览卡片（突出可提现余额） -->
-  <view class="asset-card">
-    <view class="card-glow"></view>
-    <view class="asset-title">💰 可提现余额</view>
-    <view class="asset-value">
-      <text class="value-number">{{ketixian}}</text>
-      <text class="value-unit">元</text>
-    </view>
-    <!-- 装饰性光条 -->
-    <view class="asset-beam"></view>
-  </view>
-  
-  <!-- 双数据卡片（邀请管事数 + 分红总额） -->
-  <view class="stats-row">
-    <view class="stat-card">
-      <view class="stat-icon">👥</view>
-      <view class="stat-content">
-        <text class="stat-label">邀请管事</text>
-        <text class="stat-number">{{guanshiCount}}</text>
-      </view>
-      <view class="stat-glow"></view>
-    </view>
-    <view class="stat-card">
-      <view class="stat-icon">📊</view>
-      <view class="stat-content">
-        <text class="stat-label">分红总额</text>
-        <text class="stat-number">{{fenhongZonge}}</text>
-      </view>
-      <view class="stat-glow"></view>
-    </view>
-  </view>
-  
-  <!-- 立即提现按钮（无图标，大尺寸） -->
-  <view class="withdraw-btn-wrapper">
-    <view class="withdraw-btn" bindtap="goToWithdraw">
-      <text class="btn-text">⚡ 立即提现 ⚡</text>
-      <view class="btn-glow"></view>
-    </view>
-  </view>
-  
-  <!-- 底部功能按钮（调整样式） -->
-  <view class="function-panel">
-    <view class="function-btn" bindtap="goToFenhongJilu">
-      <text class="btn-icon">📈</text>
-      <text class="btn-label">分红记录</text>
-    </view>
-    <view class="function-btn" bindtap="goToYaoqingGuanshi">
-      <text class="btn-icon">👥</text>
-      <text class="btn-label">邀请管事</text>
-    </view>
-  </view>
-  
-  <global-notification id="global-notification" />
-  <custom-tab-bar />
-</view>
-
-<!-- 加载遮罩（保持不变） -->
-<view class="loading-mask" wx:if="{{isLoading}}">
-  <view class="loader"></view>
+<!-- pages/leader/leader.wxml - 重设计，更饱满科技感 -->
+
+<!-- 未注册状态（保持原样） -->
+<view class="page-container unregistered-page" wx:if="{{!isZuzhang}}">
+  <view class="glitch-title">⚡ 组长认证 ⚡</view>
+  <view class="input-area">
+    <input 
+      class="glitch-input" 
+      type="text" 
+      placeholder="输入邀请码激活权限" 
+      maxlength="100"
+      value="{{inviteCode}}"
+      bindinput="onInviteCodeInput"
+      placeholder-class="placeholder"
+    />
+  </view>
+  <view class="glitch-button" bindtap="onRegister">
+    <text class="button-text">立即激活</text>
+    <view class="button-glow"></view>
+  </view>
+</view>
+
+<!-- 已注册状态 - 赛博驾驶舱（重设计） -->
+<view class="page-container registered-page" wx:else>
+  <!-- 背景网格 + 扫描线 -->
+  <view class="cyber-grid"></view>
+  <view class="scan-line"></view>
+  
+  <!-- 刷新按钮（能量核心）保持不变 -->
+  <view class="refresh-core" bindtap="refreshZuzhangInfo">
+    <view class="core-spinner"></view>
+  </view>
+  
+  <!-- 头部用户信息（增强光效） -->
+  <view class="cyber-header">
+    <view class="avatar-container">
+      <image class="avatar" src="{{avatarUrl}}" mode="aspectFill"></image>
+      <view class="avatar-ring"></view>
+      <view class="avatar-glow"></view>
+    </view>
+    <view class="user-info">
+      <text class="nickname">{{nicheng || '组长'}}</text>
+      <view class="uid-tag">
+        <text>UID: {{uid || '--'}}</text>
+      </view>
+    </view>
+  </view>
+  
+  <!-- 资产总览卡片（突出可提现余额） -->
+  <view class="asset-card">
+    <view class="card-glow"></view>
+    <view class="asset-title">💰 可提现余额</view>
+    <view class="asset-value">
+      <text class="value-number">{{ketixian}}</text>
+      <text class="value-unit">元</text>
+    </view>
+    <!-- 装饰性光条 -->
+    <view class="asset-beam"></view>
+  </view>
+  
+  <!-- 双数据卡片（邀请管事数 + 分红总额） -->
+  <view class="stats-row">
+    <view class="stat-card">
+      <view class="stat-icon">👥</view>
+      <view class="stat-content">
+        <text class="stat-label">邀请管事</text>
+        <text class="stat-number">{{guanshiCount}}</text>
+      </view>
+      <view class="stat-glow"></view>
+    </view>
+    <view class="stat-card">
+      <view class="stat-icon">📊</view>
+      <view class="stat-content">
+        <text class="stat-label">分红总额</text>
+        <text class="stat-number">{{fenhongZonge}}</text>
+      </view>
+      <view class="stat-glow"></view>
+    </view>
+  </view>
+  
+  <!-- 立即提现按钮（无图标，大尺寸） -->
+  <view class="withdraw-btn-wrapper">
+    <view class="withdraw-btn" bindtap="goToWithdraw">
+      <text class="btn-text">⚡ 立即提现 ⚡</text>
+      <view class="btn-glow"></view>
+    </view>
+  </view>
+  
+  <!-- 底部功能按钮（调整样式） -->
+  <view class="function-panel">
+    <view class="function-btn" bindtap="goToFenhongJilu">
+      <text class="btn-icon">📈</text>
+      <text class="btn-label">分红记录</text>
+    </view>
+    <view class="function-btn" bindtap="goToYaoqingGuanshi">
+      <text class="btn-icon">👥</text>
+      <text class="btn-label">邀请管事</text>
+    </view>
+  </view>
+  
+  <global-notification id="global-notification" />
+  <custom-tab-bar />
+</view>
+
+<!-- 加载遮罩（保持不变） -->
+<view class="loading-mask" wx:if="{{isLoading}}">
+  <view class="loader"></view>
 </view>
\ No newline at end of file
diff --git a/pages/zuzhangduan/zuzhangduan.wxss b/pages/leader/leader.wxss
similarity index 93%
rename from pages/zuzhangduan/zuzhangduan.wxss
rename to pages/leader/leader.wxss
index f3e3aa8..5f7dcbf 100644
--- a/pages/zuzhangduan/zuzhangduan.wxss
+++ b/pages/leader/leader.wxss
@@ -1,562 +1,562 @@
-/* pages/zuzhangduan/zuzhangduan.wxss - 重设计，更饱满科技感 */
-
-/* ===== 全局变量 ===== */
-page {
-    background: #0a0c14;
-    min-height: 100vh;
-    font-family: 'Avenir', 'PingFang SC', 'Helvetica Neue', sans-serif;
-    color: #fff;
-  }
-  
-  /* 背景网格（增强） */
-  page::before {
-    content: '';
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-image: 
-      linear-gradient(rgba(0, 255, 255, 0.03) 1px, transparent 1px),
-      linear-gradient(90deg, rgba(0, 255, 255, 0.03) 1px, transparent 1px);
-    background-size: 50rpx 50rpx;
-    pointer-events: none;
-    z-index: 0;
-  }
-  
-  .page-container {
-    position: relative;
-    z-index: 2;
-    min-height: 100vh;
-    padding: 40rpx 30rpx;
-    box-sizing: border-box;
-  }
-  
-  /* ===== 未注册状态（保持原样，稍作调整） ===== */
-  .unregistered-page {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    min-height: 100vh;
-    background: rgba(0, 10, 20, 0.9);
-    backdrop-filter: blur(20px);
-    -webkit-backdrop-filter: blur(20px);
-    border: 2rpx solid #0ff;
-    box-shadow: 0 0 150rpx rgba(0, 255, 255, 0.4);
-    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
-    margin: 20rpx;
-    padding: 60rpx 40rpx;
-  }
-  
-  .glitch-title {
-    font-size: 40rpx;
-    color: #0ff;
-    text-transform: uppercase;
-    letter-spacing: 8rpx;
-    text-shadow: 0 0 20rpx #0ff, 0 0 40rpx #0ff, 0 0 60rpx #0ff;
-    margin-bottom: 80rpx;
-    border-bottom: 2rpx solid #0ff;
-    padding-bottom: 20rpx;
-    animation: glitch 3s infinite;
-  }
-  
-  @keyframes glitch {
-    0%,100% { transform: skew(0deg); }
-    95% { transform: skew(2deg); }
-    96% { transform: skew(-2deg); }
-    97% { transform: skew(0deg); }
-  }
-  
-  .input-area {
-    width: 100%;
-    margin-bottom: 80rpx;
-  }
-  
-  .glitch-input {
-    width: 100%;
-    height: 100rpx;
-    background: transparent;
-    border: 2rpx solid #0ff;
-    border-right: none;
-    border-bottom: none;
-    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
-    padding: 0 40rpx;
-    font-size: 30rpx;
-    color: #fff;
-    caret-color: #0ff;
-    box-sizing: border-box;
-  }
-  
-  .glitch-input:focus {
-    box-shadow: inset 0 0 40rpx rgba(0, 255, 255, 0.3);
-  }
-  
-  .placeholder {
-    color: rgba(255, 255, 255, 0.2);
-  }
-  
-  .glitch-button {
-    width: 100%;
-    height: 100rpx;
-    background: linear-gradient(45deg, #00cccc, #0066ff);
-    clip-path: polygon(0 0, 100% 0, 85% 100%, 0 100%);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: relative;
-    overflow: hidden;
-    box-shadow: 0 0 60rpx #0ff;
-  }
-  
-  .button-text {
-    font-size: 36rpx;
-    font-weight: bold;
-    color: #fff;
-    letter-spacing: 4rpx;
-    z-index: 2;
-  }
-  
-  .button-glow {
-    position: absolute;
-    top: 0;
-    left: -100%;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.3), transparent);
-    animation: scan 3s infinite;
-  }
-  
-  /* ===== 已注册状态（重设计） ===== */
-  .registered-page {
-    position: relative;
-    padding: 30rpx 20rpx;
-  }
-  
-  /* 增强网格背景 */
-  .cyber-grid {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-image: 
-      linear-gradient(rgba(0, 255, 255, 0.05) 1px, transparent 1px),
-      linear-gradient(90deg, rgba(0, 255, 255, 0.05) 1px, transparent 1px);
-    background-size: 80rpx 80rpx;
-    pointer-events: none;
-    z-index: 0;
-  }
-  
-  /* 扫描线效果（调快） */
-  .scan-line {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 8rpx;
-    background: rgba(0, 255, 255, 0.25);
-    box-shadow: 0 0 60rpx #0ff;
-    animation: scanMove 3s linear infinite;
-    pointer-events: none;
-    z-index: 10;
-  }
-  
-  @keyframes scanMove {
-    0% { top: 0; }
-    100% { top: 100%; }
-  }
-  
-  /* 刷新按钮（能量核心）保持不变 */
-  .refresh-core {
-    position: absolute;
-    top: 20rpx;
-    right: 20rpx;
-    width: 80rpx;
-    height: 80rpx;
-    background: rgba(0, 20, 40, 0.9);
-    border: 2rpx solid #0ff;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 30;
-    box-shadow: 0 0 30rpx #0ff;
-  }
-  
-  .core-spinner {
-    width: 40rpx;
-    height: 40rpx;
-    border: 4rpx solid #0ff;
-    border-top-color: transparent;
-    border-radius: 50%;
-    animation: spin 1s linear infinite;
-  }
-  
-  .refresh-core:active {
-    box-shadow: 0 0 80rpx #0ff;
-    transform: scale(0.95);
-  }
-  
-  /* 头部（增强） */
-  .cyber-header {
-    display: flex;
-    align-items: center;
-    margin: 80rpx 0 60rpx;
-    position: relative;
-    z-index: 20;
-  }
-  
-  .avatar-container {
-    width: 140rpx;
-    height: 140rpx;
-    position: relative;
-    margin-right: 30rpx;
-  }
-  
-  .avatar {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    border: 4rpx solid #0ff;
-    box-shadow: 0 0 60rpx #0ff;
-    object-fit: cover;
-    position: relative;
-    z-index: 2;
-  }
-  
-  .avatar-ring {
-    position: absolute;
-    top: -10rpx;
-    left: -10rpx;
-    right: -10rpx;
-    bottom: -10rpx;
-    border: 2rpx solid #0ff;
-    border-radius: 50%;
-    opacity: 0.6;
-    animation: pulse 2s infinite;
-    z-index: 1;
-  }
-  
-  .avatar-glow {
-    position: absolute;
-    top: -20rpx;
-    left: -20rpx;
-    right: -20rpx;
-    bottom: -20rpx;
-    background: radial-gradient(circle, rgba(0, 255, 255, 0.4) 0%, transparent 70%);
-    border-radius: 50%;
-    z-index: 0;
-    animation: glowPulse 3s infinite alternate;
-  }
-  
-  .user-info {
-    flex: 1;
-  }
-  
-  .nickname {
-    font-size: 48rpx;
-    font-weight: bold;
-    color: #fff;
-    text-shadow: 0 0 30rpx #0ff, 0 0 60rpx #0ff;
-    margin-bottom: 10rpx;
-    display: block;
-  }
-  
-  .uid-tag {
-    display: inline-block;
-    background: rgba(0, 30, 50, 0.8);
-    border-left: 4rpx solid #0ff;
-    padding: 10rpx 40rpx;
-    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
-    font-size: 28rpx;
-    color: #9cf;
-    box-shadow: 0 0 20rpx rgba(0, 255, 255, 0.2);
-  }
-  
-  /* 资产总览卡片 */
-  .asset-card {
-    background: rgba(0, 20, 30, 0.7);
-    backdrop-filter: blur(15px);
-    -webkit-backdrop-filter: blur(15px);
-    border: 2rpx solid #0ff;
-    border-radius: 40rpx;
-    padding: 40rpx 30rpx;
-    margin-bottom: 40rpx;
-    position: relative;
-    overflow: hidden;
-    box-shadow: 0 0 100rpx rgba(0, 255, 255, 0.3);
-    z-index: 20;
-  }
-  
-  .card-glow {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: radial-gradient(circle at 70% 30%, rgba(0, 255, 255, 0.2), transparent 70%);
-    pointer-events: none;
-  }
-  
-  .asset-title {
-    font-size: 32rpx;
-    color: #9cf;
-    text-transform: uppercase;
-    letter-spacing: 4rpx;
-    margin-bottom: 20rpx;
-    display: flex;
-    align-items: center;
-  }
-  
-  .asset-title::before {
-    content: '⚡';
-    margin-right: 10rpx;
-    font-size: 40rpx;
-    color: #0ff;
-  }
-  
-  .asset-value {
-    display: flex;
-    align-items: baseline;
-    margin-bottom: 10rpx;
-  }
-  
-  .value-number {
-    font-size: 120rpx;
-    font-weight: 800;
-    color: #fff;
-    text-shadow: 0 0 40rpx #0ff, 0 0 80rpx #0ff, 0 0 120rpx #0ff;
-    margin-right: 15rpx;
-    line-height: 1;
-  }
-  
-  .value-unit {
-    font-size: 40rpx;
-    color: #0ff;
-    text-shadow: 0 0 20rpx #0ff;
-  }
-  
-  .asset-beam {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 4rpx;
-    background: linear-gradient(90deg, transparent, #0ff, #00f, #0ff, transparent);
-    animation: beamMove 4s linear infinite;
-  }
-  
-  @keyframes beamMove {
-    0% { transform: translateX(-100%); }
-    100% { transform: translateX(100%); }
-  }
-  
-  /* 双数据卡片 */
-  .stats-row {
-    display: flex;
-    gap: 30rpx;
-    margin-bottom: 50rpx;
-    z-index: 20;
-    position: relative;
-  }
-  
-  .stat-card {
-    flex: 1;
-    background: rgba(0, 20, 30, 0.7);
-    backdrop-filter: blur(10px);
-    -webkit-backdrop-filter: blur(10px);
-    border: 2rpx solid #0ff;
-    border-radius: 30rpx;
-    padding: 30rpx 20rpx;
-    display: flex;
-    align-items: center;
-    position: relative;
-    overflow: hidden;
-    box-shadow: 0 0 50rpx rgba(0, 255, 255, 0.2);
-  }
-  
-  .stat-icon {
-    font-size: 70rpx;
-    margin-right: 20rpx;
-    filter: drop-shadow(0 0 15rpx #0ff);
-  }
-  
-  .stat-content {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-  }
-  
-  .stat-label {
-    font-size: 28rpx;
-    color: #9cf;
-    margin-bottom: 10rpx;
-  }
-  
-  .stat-number {
-    font-size: 48rpx;
-    font-weight: bold;
-    color: #fff;
-    text-shadow: 0 0 20rpx #0ff;
-  }
-  
-  .stat-glow {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: radial-gradient(circle at 30% 30%, rgba(0, 255, 255, 0.15), transparent 70%);
-    pointer-events: none;
-  }
-  
-  .stat-card:active {
-    transform: scale(0.98);
-    box-shadow: 0 0 80rpx #0ff;
-  }
-  
-  /* 立即提现按钮（无图标，大尺寸） */
-  .withdraw-btn-wrapper {
-    display: flex;
-    justify-content: center;
-    margin: 30rpx 0 50rpx;
-    z-index: 20;
-    position: relative;
-  }
-  
-  .withdraw-btn {
-    width: 80%;
-    height: 100rpx;
-    background: linear-gradient(45deg, #00cccc, #0066ff);
-    border-radius: 60rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: relative;
-    overflow: hidden;
-    box-shadow: 0 0 80rpx #0ff, 0 0 150rpx rgba(0, 255, 255, 0.3);
-    border: 2rpx solid rgba(255, 255, 255, 0.3);
-  }
-  
-  .btn-text {
-    font-size: 40rpx;
-    font-weight: bold;
-    color: #fff;
-    letter-spacing: 6rpx;
-    z-index: 2;
-    text-shadow: 0 0 20rpx #fff;
-  }
-  
-  .btn-glow {
-    position: absolute;
-    top: 0;
-    left: -100%;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4), transparent);
-    animation: scan 2s infinite;
-  }
-  
-  .withdraw-btn:active {
-    transform: scale(0.96);
-    box-shadow: 0 0 120rpx #0ff;
-  }
-  
-  /* 底部功能按钮（调整间距） */
-  .function-panel {
-    display: flex;
-    justify-content: space-around;
-    gap: 30rpx;
-    margin-top: 20rpx;
-    z-index: 20;
-    position: relative;
-  }
-  
-  .function-btn {
-    flex: 1;
-    background: rgba(0, 20, 30, 0.8);
-    border: 2rpx solid #0ff;
-    border-radius: 40rpx;
-    padding: 30rpx 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    position: relative;
-    overflow: hidden;
-    box-shadow: 0 0 40rpx rgba(0, 255, 255, 0.1);
-  }
-  
-  .function-btn::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 4rpx;
-    background: linear-gradient(90deg, transparent, #0ff, transparent);
-  }
-  
-  .function-btn:active {
-    transform: translateY(-8rpx);
-    box-shadow: 0 20rpx 80rpx #0ff;
-  }
-  
-  .btn-icon {
-    font-size: 80rpx;
-    margin-bottom: 15rpx;
-    filter: drop-shadow(0 0 20rpx #0ff);
-  }
-  
-  .btn-label {
-    font-size: 30rpx;
-    color: #fff;
-    font-weight: 500;
-    text-shadow: 0 0 10rpx #0ff;
-  }
-  
-  /* 动画 */
-  @keyframes scan {
-    0% { left: -100%; }
-    100% { left: 100%; }
-  }
-  
-  @keyframes pulse {
-    0%,100% { opacity: 0.5; transform: scale(1); }
-    50% { opacity: 1; transform: scale(1.1); }
-  }
-  
-  @keyframes glowPulse {
-    0% { opacity: 0.3; transform: scale(0.9); }
-    100% { opacity: 0.6; transform: scale(1.2); }
-  }
-  
-  @keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-  
-  /* ===== 加载遮罩（保持不变） ===== */
-  .loading-mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(2, 6, 12, 0.95);
-    backdrop-filter: blur(20px);
-    -webkit-backdrop-filter: blur(20px);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 9999;
-  }
-  
-  .loader {
-    width: 200rpx;
-    height: 200rpx;
-    border: 4rpx solid #0ff;
-    border-radius: 50%;
-    border-top-color: transparent;
-    animation: spin 1s linear infinite;
+/* pages/leader/leader.wxss */
+
+/* 全局变量 */
+page {
+    background: #0a0c14;
+    min-height: 100vh;
+    font-family: 'Avenir', 'PingFang SC', 'Helvetica Neue', sans-serif;
+    color: #fff;
+  }
+  
+  /* 背景网格 */
+  page::before {
+    content: '';
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image: 
+      linear-gradient(rgba(0, 255, 255, 0.03) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(0, 255, 255, 0.03) 1px, transparent 1px);
+    background-size: 50rpx 50rpx;
+    pointer-events: none;
+    z-index: 0;
+  }
+  
+  .page-container {
+    position: relative;
+    z-index: 2;
+    min-height: 100vh;
+    padding: 40rpx 30rpx;
+    box-sizing: border-box;
+  }
+  
+  /* 未注册状态 */
+  .unregistered-page {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    min-height: 100vh;
+    background: rgba(0, 10, 20, 0.9);
+    backdrop-filter: blur(20px);
+    -webkit-backdrop-filter: blur(20px);
+    border: 2rpx solid #0ff;
+    box-shadow: 0 0 150rpx rgba(0, 255, 255, 0.4);
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    margin: 20rpx;
+    padding: 60rpx 40rpx;
+  }
+  
+  .glitch-title {
+    font-size: 40rpx;
+    color: #0ff;
+    text-transform: uppercase;
+    letter-spacing: 8rpx;
+    text-shadow: 0 0 20rpx #0ff, 0 0 40rpx #0ff, 0 0 60rpx #0ff;
+    margin-bottom: 80rpx;
+    border-bottom: 2rpx solid #0ff;
+    padding-bottom: 20rpx;
+    animation: glitch 3s infinite;
+  }
+  
+  @keyframes glitch {
+    0%,100% { transform: skew(0deg); }
+    95% { transform: skew(2deg); }
+    96% { transform: skew(-2deg); }
+    97% { transform: skew(0deg); }
+  }
+  
+  .input-area {
+    width: 100%;
+    margin-bottom: 80rpx;
+  }
+  
+  .glitch-input {
+    width: 100%;
+    height: 100rpx;
+    background: transparent;
+    border: 2rpx solid #0ff;
+    border-right: none;
+    border-bottom: none;
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    padding: 0 40rpx;
+    font-size: 30rpx;
+    color: #fff;
+    caret-color: #0ff;
+    box-sizing: border-box;
+  }
+  
+  .glitch-input:focus {
+    box-shadow: inset 0 0 40rpx rgba(0, 255, 255, 0.3);
+  }
+  
+  .placeholder {
+    color: rgba(255, 255, 255, 0.2);
+  }
+  
+  .glitch-button {
+    width: 100%;
+    height: 100rpx;
+    background: linear-gradient(45deg, #00cccc, #0066ff);
+    clip-path: polygon(0 0, 100% 0, 85% 100%, 0 100%);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 60rpx #0ff;
+  }
+  
+  .button-text {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #fff;
+    letter-spacing: 4rpx;
+    z-index: 2;
+  }
+  
+  .button-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.3), transparent);
+    animation: scan 3s infinite;
+  }
+  
+  /* 已注册状态 */
+  .registered-page {
+    position: relative;
+    padding: 30rpx 20rpx;
+  }
+  
+  /* 增强网格背景 */
+  .cyber-grid {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image: 
+      linear-gradient(rgba(0, 255, 255, 0.05) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(0, 255, 255, 0.05) 1px, transparent 1px);
+    background-size: 80rpx 80rpx;
+    pointer-events: none;
+    z-index: 0;
+  }
+  
+  /* 扫描线效果 */
+  .scan-line {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 8rpx;
+    background: rgba(0, 255, 255, 0.25);
+    box-shadow: 0 0 60rpx #0ff;
+    animation: scanMove 3s linear infinite;
+    pointer-events: none;
+    z-index: 10;
+  }
+  
+  @keyframes scanMove {
+    0% { top: 0; }
+    100% { top: 100%; }
+  }
+  
+  /* 刷新按钮 */
+  .refresh-core {
+    position: absolute;
+    top: 20rpx;
+    right: 20rpx;
+    width: 80rpx;
+    height: 80rpx;
+    background: rgba(0, 20, 40, 0.9);
+    border: 2rpx solid #0ff;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 30;
+    box-shadow: 0 0 30rpx #0ff;
+  }
+  
+  .core-spinner {
+    width: 40rpx;
+    height: 40rpx;
+    border: 4rpx solid #0ff;
+    border-top-color: transparent;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+  }
+  
+  .refresh-core:active {
+    box-shadow: 0 0 80rpx #0ff;
+    transform: scale(0.95);
+  }
+  
+  /* 头部 */
+  .cyber-header {
+    display: flex;
+    align-items: center;
+    margin: 80rpx 0 60rpx;
+    position: relative;
+    z-index: 20;
+  }
+  
+  .avatar-container {
+    width: 140rpx;
+    height: 140rpx;
+    position: relative;
+    margin-right: 30rpx;
+  }
+  
+  .avatar {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    border: 4rpx solid #0ff;
+    box-shadow: 0 0 60rpx #0ff;
+    object-fit: cover;
+    position: relative;
+    z-index: 2;
+  }
+  
+  .avatar-ring {
+    position: absolute;
+    top: -10rpx;
+    left: -10rpx;
+    right: -10rpx;
+    bottom: -10rpx;
+    border: 2rpx solid #0ff;
+    border-radius: 50%;
+    opacity: 0.6;
+    animation: pulse 2s infinite;
+    z-index: 1;
+  }
+  
+  .avatar-glow {
+    position: absolute;
+    top: -20rpx;
+    left: -20rpx;
+    right: -20rpx;
+    bottom: -20rpx;
+    background: radial-gradient(circle, rgba(0, 255, 255, 0.4) 0%, transparent 70%);
+    border-radius: 50%;
+    z-index: 0;
+    animation: glowPulse 3s infinite alternate;
+  }
+  
+  .user-info {
+    flex: 1;
+  }
+  
+  .nickname {
+    font-size: 48rpx;
+    font-weight: bold;
+    color: #fff;
+    text-shadow: 0 0 30rpx #0ff, 0 0 60rpx #0ff;
+    margin-bottom: 10rpx;
+    display: block;
+  }
+  
+  .uid-tag {
+    display: inline-block;
+    background: rgba(0, 30, 50, 0.8);
+    border-left: 4rpx solid #0ff;
+    padding: 10rpx 40rpx;
+    clip-path: polygon(0 0, 100% 0, 90% 100%, 0 100%);
+    font-size: 28rpx;
+    color: #9cf;
+    box-shadow: 0 0 20rpx rgba(0, 255, 255, 0.2);
+  }
+  
+  /* 资产总览卡片 */
+  .asset-card {
+    background: rgba(0, 20, 30, 0.7);
+    backdrop-filter: blur(15px);
+    -webkit-backdrop-filter: blur(15px);
+    border: 2rpx solid #0ff;
+    border-radius: 40rpx;
+    padding: 40rpx 30rpx;
+    margin-bottom: 40rpx;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 100rpx rgba(0, 255, 255, 0.3);
+    z-index: 20;
+  }
+  
+  .card-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(circle at 70% 30%, rgba(0, 255, 255, 0.2), transparent 70%);
+    pointer-events: none;
+  }
+  
+  .asset-title {
+    font-size: 32rpx;
+    color: #9cf;
+    text-transform: uppercase;
+    letter-spacing: 4rpx;
+    margin-bottom: 20rpx;
+    display: flex;
+    align-items: center;
+  }
+  
+  .asset-title::before {
+    content: '⚡';
+    margin-right: 10rpx;
+    font-size: 40rpx;
+    color: #0ff;
+  }
+  
+  .asset-value {
+    display: flex;
+    align-items: baseline;
+    margin-bottom: 10rpx;
+  }
+  
+  .value-number {
+    font-size: 120rpx;
+    font-weight: 800;
+    color: #fff;
+    text-shadow: 0 0 40rpx #0ff, 0 0 80rpx #0ff, 0 0 120rpx #0ff;
+    margin-right: 15rpx;
+    line-height: 1;
+  }
+  
+  .value-unit {
+    font-size: 40rpx;
+    color: #0ff;
+    text-shadow: 0 0 20rpx #0ff;
+  }
+  
+  .asset-beam {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 4rpx;
+    background: linear-gradient(90deg, transparent, #0ff, #00f, #0ff, transparent);
+    animation: beamMove 4s linear infinite;
+  }
+  
+  @keyframes beamMove {
+    0% { transform: translateX(-100%); }
+    100% { transform: translateX(100%); }
+  }
+  
+  /* 双数据卡片 */
+  .stats-row {
+    display: flex;
+    gap: 30rpx;
+    margin-bottom: 50rpx;
+    z-index: 20;
+    position: relative;
+  }
+  
+  .stat-card {
+    flex: 1;
+    background: rgba(0, 20, 30, 0.7);
+    backdrop-filter: blur(10px);
+    -webkit-backdrop-filter: blur(10px);
+    border: 2rpx solid #0ff;
+    border-radius: 30rpx;
+    padding: 30rpx 20rpx;
+    display: flex;
+    align-items: center;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 50rpx rgba(0, 255, 255, 0.2);
+  }
+  
+  .stat-icon {
+    font-size: 70rpx;
+    margin-right: 20rpx;
+    filter: drop-shadow(0 0 15rpx #0ff);
+  }
+  
+  .stat-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .stat-label {
+    font-size: 28rpx;
+    color: #9cf;
+    margin-bottom: 10rpx;
+  }
+  
+  .stat-number {
+    font-size: 48rpx;
+    font-weight: bold;
+    color: #fff;
+    text-shadow: 0 0 20rpx #0ff;
+  }
+  
+  .stat-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(circle at 30% 30%, rgba(0, 255, 255, 0.15), transparent 70%);
+    pointer-events: none;
+  }
+  
+  .stat-card:active {
+    transform: scale(0.98);
+    box-shadow: 0 0 80rpx #0ff;
+  }
+  
+  /* 立即提现按钮 */
+  .withdraw-btn-wrapper {
+    display: flex;
+    justify-content: center;
+    margin: 30rpx 0 50rpx;
+    z-index: 20;
+    position: relative;
+  }
+  
+  .withdraw-btn {
+    width: 80%;
+    height: 100rpx;
+    background: linear-gradient(45deg, #00cccc, #0066ff);
+    border-radius: 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 80rpx #0ff, 0 0 150rpx rgba(0, 255, 255, 0.3);
+    border: 2rpx solid rgba(255, 255, 255, 0.3);
+  }
+  
+  .btn-text {
+    font-size: 40rpx;
+    font-weight: bold;
+    color: #fff;
+    letter-spacing: 6rpx;
+    z-index: 2;
+    text-shadow: 0 0 20rpx #fff;
+  }
+  
+  .btn-glow {
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4), transparent);
+    animation: scan 2s infinite;
+  }
+  
+  .withdraw-btn:active {
+    transform: scale(0.96);
+    box-shadow: 0 0 120rpx #0ff;
+  }
+  
+  /* 底部功能按钮 */
+  .function-panel {
+    display: flex;
+    justify-content: space-around;
+    gap: 30rpx;
+    margin-top: 20rpx;
+    z-index: 20;
+    position: relative;
+  }
+  
+  .function-btn {
+    flex: 1;
+    background: rgba(0, 20, 30, 0.8);
+    border: 2rpx solid #0ff;
+    border-radius: 40rpx;
+    padding: 30rpx 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    position: relative;
+    overflow: hidden;
+    box-shadow: 0 0 40rpx rgba(0, 255, 255, 0.1);
+  }
+  
+  .function-btn::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 4rpx;
+    background: linear-gradient(90deg, transparent, #0ff, transparent);
+  }
+  
+  .function-btn:active {
+    transform: translateY(-8rpx);
+    box-shadow: 0 20rpx 80rpx #0ff;
+  }
+  
+  .btn-icon {
+    font-size: 80rpx;
+    margin-bottom: 15rpx;
+    filter: drop-shadow(0 0 20rpx #0ff);
+  }
+  
+  .btn-label {
+    font-size: 30rpx;
+    color: #fff;
+    font-weight: 500;
+    text-shadow: 0 0 10rpx #0ff;
+  }
+  
+  /* 动画 */
+  @keyframes scan {
+    0% { left: -100%; }
+    100% { left: 100%; }
+  }
+  
+  @keyframes pulse {
+    0%,100% { opacity: 0.5; transform: scale(1); }
+    50% { opacity: 1; transform: scale(1.1); }
+  }
+  
+  @keyframes glowPulse {
+    0% { opacity: 0.3; transform: scale(0.9); }
+    100% { opacity: 0.6; transform: scale(1.2); }
+  }
+  
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+  
+  /* 加载遮罩 */
+  .loading-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(2, 6, 12, 0.95);
+    backdrop-filter: blur(20px);
+    -webkit-backdrop-filter: blur(20px);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 9999;
+  }
+  
+  .loader {
+    width: 200rpx;
+    height: 200rpx;
+    border: 4rpx solid #0ff;
+    border-radius: 50%;
+    border-top-color: transparent;
+    animation: spin 1s linear infinite;
   }
\ No newline at end of file
diff --git a/pages/guanzhual/guanzhual.js b/pages/manager-assign/manager-assign.js
similarity index 94%
rename from pages/guanzhual/guanzhual.js
rename to pages/manager-assign/manager-assign.js
index ea8dbfd..17e421f 100644
--- a/pages/guanzhual/guanzhual.js
+++ b/pages/manager-assign/manager-assign.js
@@ -1,90 +1,90 @@
-// pages/guanzhual/guanzhual.js
-const app = getApp()
-import request from '../../utils/request.js'
-
-Page({
-  data: {
-    images: [],           // 图片完整URL列表
-    lastUpdate: '',       // 最新更新时间
-    visitCount: 0,        // 浏览次数
-    loading: true,        // 加载中
-    ossImageUrl: ''       // OSS基础地址
-  },
-
-  onLoad() {
-    // 获取OSS地址
-    this.setData({
-      ossImageUrl: app.globalData.ossImageUrl || ''
-    })
-    this.loadData()
-  },
-
-  onShow() {
-    this.registerNotificationComponent()
-  },
-
-  // 注册全局通知组件
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification')
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      }
-    }
-  },
-
-  // 加载数据
-  loadData() {
-    this.setData({ loading: true })
-
-    request({
-      url: '/peizhi/gzal',
-      method: 'POST',
-      header: { 'content-type': 'application/json' }
-    })
-    .then(res => {
-      if (res && res.data && res.data.code === 0) {
-        const data = res.data.data || {}
-        const ossImageUrl = this.data.ossImageUrl
-        // 拼接完整URL
-        const fullImages = (data.images || []).map(url => {
-          if (url && !url.startsWith('http')) {
-            return ossImageUrl + url
-          }
-          return url
-        })
-        this.setData({
-          images: fullImages,
-          lastUpdate: data.last_update || '',
-          visitCount: data.visit_count || 0,
-          loading: false
-        })
-      } else {
-        wx.showToast({
-          title: res?.data?.msg || '加载失败',
-          icon: 'none'
-        })
-        this.setData({ loading: false })
-      }
-    })
-    .catch(err => {
-      console.error('加载关注阿龙数据失败', err)
-      wx.showToast({
-        title: '网络错误',
-        icon: 'none'
-      })
-      this.setData({ loading: false })
-    })
-  },
-
-  // 图片加载成功（可选）
-  onImageLoad(e) {
-    // 可忽略
-  },
-
-  // 图片加载失败
-  onImageError(e) {
-    console.warn('图片加载失败', e)
-  }
+// pages/manager-assign/manager-assign.js
+const app = getApp()
+import request from '../../utils/request.js'
+
+Page({
+  data: {
+    images: [],           // 图片完整URL列表
+    lastUpdate: '',       // 最新更新时间
+    visitCount: 0,        // 浏览次数
+    loading: true,        // 加载中
+    ossImageUrl: ''       // OSS基础地址
+  },
+
+  onLoad() {
+    // 获取OSS地址
+    this.setData({
+      ossImageUrl: app.globalData.ossImageUrl || ''
+    })
+    this.loadData()
+  },
+
+  onShow() {
+    this.registerNotificationComponent()
+  },
+
+  // 注册全局通知组件
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  // 加载数据
+  loadData() {
+    this.setData({ loading: true })
+
+    request({
+      url: '/peizhi/gzal',
+      method: 'POST',
+      header: { 'content-type': 'application/json' }
+    })
+    .then(res => {
+      if (res && res.data && res.data.code === 0) {
+        const data = res.data.data || {}
+        const ossImageUrl = this.data.ossImageUrl
+        // 拼接完整URL
+        const fullImages = (data.images || []).map(url => {
+          if (url && !url.startsWith('http')) {
+            return ossImageUrl + url
+          }
+          return url
+        })
+        this.setData({
+          images: fullImages,
+          lastUpdate: data.last_update || '',
+          visitCount: data.visit_count || 0,
+          loading: false
+        })
+      } else {
+        wx.showToast({
+          title: res?.data?.msg || '加载失败',
+          icon: 'none'
+        })
+        this.setData({ loading: false })
+      }
+    })
+    .catch(err => {
+      console.error('加载关注阿龙数据失败', err)
+      wx.showToast({
+        title: '网络错误',
+        icon: 'none'
+      })
+      this.setData({ loading: false })
+    })
+  },
+
+  // 图片加载成功（可选）
+  onImageLoad(e) {
+    // 可忽略
+  },
+
+  // 图片加载失败
+  onImageError(e) {
+    console.warn('图片加载失败', e)
+  }
 })
\ No newline at end of file
diff --git a/pages/guanzhual/guanzhual.json b/pages/manager-assign/manager-assign.json
similarity index 100%
rename from pages/guanzhual/guanzhual.json
rename to pages/manager-assign/manager-assign.json
diff --git a/pages/guanzhual/guanzhual.wxml b/pages/manager-assign/manager-assign.wxml
similarity index 100%
rename from pages/guanzhual/guanzhual.wxml
rename to pages/manager-assign/manager-assign.wxml
diff --git a/pages/guanzhual/guanzhual.wxss b/pages/manager-assign/manager-assign.wxss
similarity index 92%
rename from pages/guanzhual/guanzhual.wxss
rename to pages/manager-assign/manager-assign.wxss
index 675b458..33f1474 100644
--- a/pages/guanzhual/guanzhual.wxss
+++ b/pages/manager-assign/manager-assign.wxss
@@ -1,95 +1,95 @@
-/* pages/guanzhual/guanzhual.wxss */
-page {
-    background-color: #ffffff;
-    min-height: 100vh;
-  }
-  
-  .guanzhual-page {
-    padding-bottom: 30rpx;
-    box-sizing: border-box;
-  }
-  
-  /* 头部信息 */
-  .header-info {
-    padding: 30rpx 20rpx 20rpx 20rpx;
-    border-bottom: 2rpx solid #f5f5f5;
-  }
-  
-  .title-section {
-    display: flex;
-    justify-content: space-between;
-    align-items: baseline;
-    margin-bottom: 12rpx;
-  }
-  
-  .main-title {
-    font-size: 40rpx;
-    font-weight: 600;
-    color: #333333;
-  }
-  
-  .visit-count {
-    font-size: 28rpx;
-    color: #999999;
-  }
-  
-  .sub-info {
-    display: flex;
-    justify-content: space-between;
-    font-size: 26rpx;
-    color: #aaaaaa;
-  }
-  
-  .update-time {
-    color: #888888;
-  }
-  
-  /* 图片列表 */
-  .image-list {
-    padding: 0 8rpx; /* 非常微小的左右边距 */
-  }
-  
-  .image-item {
-    width: 100%;
-    margin-bottom: 6rpx; /* 极小的上下间距 */
-    background-color: #fafafa;
-    overflow: hidden;
-    border-radius: 4rpx;
-  }
-  
-  .image-item image {
-    width: 100%;
-    display: block;
-  }
-  
-  /* 空状态提示 */
-  .empty-tip {
-    padding: 100rpx 0;
-    text-align: center;
-    color: #999999;
-    font-size: 28rpx;
-  }
-  
-  /* 加载状态 */
-  .loading-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 100rpx 0;
-  }
-  
-  .loading-spinner {
-    width: 60rpx;
-    height: 60rpx;
-    border: 4rpx solid #e0e0e0;
-    border-top-color: #00C853;
-    border-radius: 50%;
-    animation: spin 1s linear infinite;
-    margin-bottom: 20rpx;
-  }
-  
-  @keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
+/* pages/manager-assign/manager-assign.wxss */
+page {
+    background-color: #ffffff;
+    min-height: 100vh;
+  }
+  
+  .guanzhual-page {
+    padding-bottom: 30rpx;
+    box-sizing: border-box;
+  }
+  
+  /* 头部信息 */
+  .header-info {
+    padding: 30rpx 20rpx 20rpx 20rpx;
+    border-bottom: 2rpx solid #f5f5f5;
+  }
+  
+  .title-section {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    margin-bottom: 12rpx;
+  }
+  
+  .main-title {
+    font-size: 40rpx;
+    font-weight: 600;
+    color: #333333;
+  }
+  
+  .visit-count {
+    font-size: 28rpx;
+    color: #999999;
+  }
+  
+  .sub-info {
+    display: flex;
+    justify-content: space-between;
+    font-size: 26rpx;
+    color: #aaaaaa;
+  }
+  
+  .update-time {
+    color: #888888;
+  }
+  
+  /* 图片列表 */
+  .image-list {
+    padding: 0 8rpx; /* 非常微小的左右边距 */
+  }
+  
+  .image-item {
+    width: 100%;
+    margin-bottom: 6rpx; /* 极小的上下间距 */
+    background-color: #fafafa;
+    overflow: hidden;
+    border-radius: 4rpx;
+  }
+  
+  .image-item image {
+    width: 100%;
+    display: block;
+  }
+  
+  /* 空状态提示 */
+  .empty-tip {
+    padding: 100rpx 0;
+    text-align: center;
+    color: #999999;
+    font-size: 28rpx;
+  }
+  
+  /* 加载状态 */
+  .loading-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 100rpx 0;
+  }
+  
+  .loading-spinner {
+    width: 60rpx;
+    height: 60rpx;
+    border: 4rpx solid #e0e0e0;
+    border-top-color: #00C853;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 20rpx;
+  }
+  
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
   }
\ No newline at end of file
diff --git a/pages/guanshipaihang/guanshipaihang.js b/pages/manager-rank/manager-rank.js
similarity index 100%
rename from pages/guanshipaihang/guanshipaihang.js
rename to pages/manager-rank/manager-rank.js
diff --git a/pages/guanshipaihang/guanshipaihang.json b/pages/manager-rank/manager-rank.json
similarity index 100%
rename from pages/guanshipaihang/guanshipaihang.json
rename to pages/manager-rank/manager-rank.json
diff --git a/pages/guanshipaihang/guanshipaihang.wxml b/pages/manager-rank/manager-rank.wxml
similarity index 100%
rename from pages/guanshipaihang/guanshipaihang.wxml
rename to pages/manager-rank/manager-rank.wxml
diff --git a/pages/guanshipaihang/guanshipaihang.wxss b/pages/manager-rank/manager-rank.wxss
similarity index 100%
rename from pages/guanshipaihang/guanshipaihang.wxss
rename to pages/manager-rank/manager-rank.wxss
diff --git a/pages/guanshiduan/guanshiduan.js b/pages/manager/manager.js
similarity index 91%
rename from pages/guanshiduan/guanshiduan.js
rename to pages/manager/manager.js
index a8a06b1..a84ce14 100644
--- a/pages/guanshiduan/guanshiduan.js
+++ b/pages/manager/manager.js
@@ -1,680 +1,677 @@
-// pages/guanshizhongxin/guanshizhongxin.js
-import request from '../../utils/request.js';
-import popupService from '../../services/popupService.js';
-import { buildInviterPeerId } from '../../utils/im-user.js';
-import { resolveAvatarUrl } from '../../utils/avatar.js';
-
-Page({
-  data: {
-    // 图片路径对象（逻辑层拼接完整URL）
-    imgUrls: {},
-
-    isGuanshi: false,
-    isLoading: false,
-    inviteCode: '',
-    uid: '',
-    nicheng: '',
-    avatarUrl: '',
-
-    // 管事信息
-    gszhstatus: '',
-    yaoqingzongshu: 0,
-    fenyongzonge: '0.00',
-    fenyongtixian: '0.00',
-    yichongzhiDashou: 0,
-    zhuanhualv: 0,
-
-    // 称号列表
-    chenghaoList: [],
-
-    // 邀请人（组长）缓存
-    inviterCache: null,
-  },
-
-  onLoad(options) {
-    let url = '/pages/dashouduan/dashouduan?registerType=guanshi';
-    if (options.scene) {
-      try {
-        url += '&inviteCode=' + encodeURIComponent(decodeURIComponent(options.scene));
-      } catch (e) {
-        console.error('scene解码失败', e);
-      }
-    } else if (options.inviteCode) {
-      url += '&inviteCode=' + encodeURIComponent(options.inviteCode);
-    }
-    wx.redirectTo({ url });
-    return;
-    // --- 以下保留供恢复参考，不再执行 ---
-    // 拼接所有图片完整路径
-    const app = getApp();
-    const ossImageUrl = app.globalData.ossImageUrl || '';
-    const imgBase = ossImageUrl + 'beijing/guanshiduan/';
-    this.setData({
-      imgUrls: {
-        pageBg: imgBase + 'page-bg.jpg',
-        topDecor: imgBase + 'top-decor.png',
-        cardBg1: imgBase + 'card-bg1.png',
-        cardBg2: imgBase + 'card-bg2.png',
-        iconRefresh: imgBase + 'icon-refresh.png',
-        iconCopy: imgBase + 'icon-copy.png',
-        avatarDefault: ossImageUrl + 'avatar/default.jpg',
-        iconInvite: imgBase + 'icon-invite.png',
-        iconSub: imgBase + 'icon-sub.png',
-        iconRecord: imgBase + 'icon-record.png',
-        iconRank: imgBase + 'icon-rank.png',
-        iconPoster: imgBase + 'icon-poster.png',
-        iconWithdraw: imgBase + 'icon-withdraw.png',
-        iconContact: imgBase + 'icon-contact.png',
-        iconArrow: imgBase + 'icon-arrow.png',
-      }
-    });
-
-    // 处理扫码 scene
-    if (options.scene) {
-      try {
-        const scene = decodeURIComponent(options.scene);
-        options.inviteCode = scene;
-      } catch (e) {
-        console.error('scene解码失败', e);
-      }
-    }
-
-    this.checkGuanshiStatus();
-
-    const { inviteCode } = options || {};
-    if (inviteCode) {
-      this.setData({ inviteCode });
-      setTimeout(() => {
-        this.handleInviteCodeWithLoginCheck(inviteCode);
-      }, 500);
-    }
-
-    if (!app.globalData.hasShownPopupOnColdStart) {
-      app.globalData.hasShownPopupOnColdStart = true;
-      setTimeout(() => {
-        popupService.checkAndShow(this, 'guanshiduan');
-      }, 300);
-    }
-  },
-
-  onReady() {
-    if (this._isGuanshiPageActive()) {
-      this.ensureGuanshiRoleAndTabBar();
-    }
-  },
-
-  onHide() {
-    const popupComp = this.selectComponent('#popupNotice');
-    if (popupComp && popupComp.cleanup) {
-      popupComp.cleanup();
-    }
-  },
-
-  onShow() {
-    const inviterCache = wx.getStorageSync('inviterCache') || null;
-    this.setData({ inviterCache });
-
-    this.registerNotificationComponent();
-
-    if (this._isGuanshiPageActive()) {
-      if (!this.data.isGuanshi) {
-        this.setData({ isGuanshi: true });
-      }
-      this.ensureGuanshiRoleAndTabBar();
-      setTimeout(() => {
-        this.getGuanshiInfo();
-        this.fetchChenghaoList();
-      }, 300);
-    }
-
-    const pages = getCurrentPages();
-    const currentPage = pages[pages.length - 1];
-    const options = currentPage.options || {};
-    if (options.inviteCode && !this._isGuanshiPageActive()) {
-      setTimeout(() => {
-        this.handleInviteCodeWithLoginCheck(options.inviteCode);
-      }, 300);
-    }
-  },
-
-  // ========== 全局通知注册 ==========
-  registerNotificationComponent() {
-    const app = getApp();
-    const comp = this.selectComponent('#global-notification');
-    if (comp && comp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => comp.showNotification(data),
-        hide: () => comp.hideNotification()
-      };
-    }
-  },
-
-  // ========== 称号列表（新接口，区分管事） ==========
-  async fetchChenghaoList() {
-    try {
-      const res = await request({
-        url: '/dengji/chenghao',
-        method: 'POST',
-        data: { role: 'guanshi' }
-      });
-      if (res && res.data.code === 0 && res.data.data) {
-        this.setData({ chenghaoList: res.data.data.chenghao_list || [] });
-      }
-    } catch (e) {
-      console.error('获取称号失败', e);
-    }
-  },
-
-  // ========== 联系组长（新接口） ==========
-  // 管事联系组长 —— 获取组长信息并跳转聊天
-  // 管事联系组长
-async contactInviter() {
-    wx.showLoading({ title: '获取组长信息...', mask: true });
-    try {
-        const res = await request({
-            url: '/yonghu/guanshi_contact',
-            method: 'POST'
-        });
-
-        if (res && res.data.code === 200 && res.data.data) {
-            const inviter = res.data.data;
-            const ossImageUrl = getApp().globalData.ossImageUrl || '';
-            const fullAvatar = inviter.touxiang
-                ? (inviter.touxiang.startsWith('http') ? inviter.touxiang : ossImageUrl + inviter.touxiang)
-                : '';
-
-            // 缓存邀请人信息
-            const cacheData = {
-                uid: inviter.uid,
-                nicheng: inviter.nicheng || '',
-                avatar: fullAvatar
-            };
-            wx.setStorageSync('inviterCache', cacheData);
-            this.setData({ inviterCache: cacheData });
-
-            // 联系邀请人：统一 Ds 前缀（管事/组长均走打手身份）
-            const param = {
-                toUserId: buildInviterPeerId(inviter.uid),
-                toName: inviter.nicheng || '邀请人',
-                toAvatar: fullAvatar
-            };
-            wx.navigateTo({
-                url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param))
-            });
-        } else {
-            wx.showToast({ title: '未绑定邀请人', icon: 'none' });
-        }
-    } catch (e) {
-        wx.showToast({ title: '网络错误', icon: 'none' });
-    } finally {
-        wx.hideLoading();
-    }
-},
-  // ========== 管事状态辅助 ==========
-  _isApiSuccess(body) {
-    if (!body) return false;
-    const code = Number(body.code);
-    return code === 200 || code === 0;
-  },
-
-  _getApiMsg(body) {
-    if (!body) return '';
-    return body.msg || body.message || '';
-  },
-
-  _extractUserData(body) {
-    if (!body) return {};
-    if (body.data && typeof body.data === 'object' && !Array.isArray(body.data)) {
-      return body.data;
-    }
-    const userData = { ...body };
-    delete userData.code;
-    delete userData.msg;
-    delete userData.message;
-    return userData;
-  },
-
-  _isGuanshiStatusActive(status) {
-    return Number(status) === 1;
-  },
-
-  _isAlreadyGuanshiMsg(msg) {
-    if (!msg || typeof msg !== 'string') return false;
-    return msg.includes('已是管事') || msg.includes('已经是管事');
-  },
-
-  _syncGuanshiCache() {
-    const app = getApp();
-    wx.setStorageSync('guanshistatus', 1);
-    app.globalData.guanshistatus = 1;
-  },
-
-  // 仅同步后端响应里「明确返回」的身份 status 字段（含 0），不臆测、不补打手
-  _syncRoleStatuses(data) {
-    if (!data || typeof data !== 'object') return;
-    const app = getApp();
-    const roleFields = ['dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus', 'kaoheguanstatus'];
-    roleFields.forEach(field => {
-      if (Object.prototype.hasOwnProperty.call(data, field)) {
-        const val = Number(data[field]);
-        const normalized = Number.isNaN(val) ? 0 : val;
-        wx.setStorageSync(field, normalized);
-        app.globalData[field] = normalized;
-      }
-    });
-  },
-
-  // 后端若返回打手详情字段则写入 globalData（与 dashoustatus 是否=1 无关）
-  _syncDashouGlobalData(data) {
-    const app = getApp();
-    const map = {
-      dashouNicheng: data.dashounicheng,
-      zhanghaoStatus: data.zhanghaostatus,
-      yongjin: data.yongjin,
-      zonge: data.zonge,
-      yajin: data.yajin,
-      chenghao: data.chenghao,
-      jinfen: data.jinfen,
-      clumber: data.clumber,
-      chengjiaoliang: data.chengjiaoliang,
-      zaixianZhuangtai: data.zaixianzhuangtai,
-      dashouzhuangtai: data.dashouzhuangtai,
-    };
-    Object.keys(map).forEach(key => {
-      if (map[key] !== undefined) {
-        app.globalData[key] = map[key];
-      }
-    });
-  },
-
-  _isGuanshiPageActive() {
-    return this.data.isGuanshi || this._isGuanshiStatusActive(wx.getStorageSync('guanshistatus'));
-  },
-
-  // 管事页必须切到 guanshi 角色，并强制刷新 TabBar（扫码落地页不在老板 Tab 列表里）
-  ensureGuanshiRoleAndTabBar() {
-    const app = getApp();
-    if (app.setCurrentRole) {
-      app.setCurrentRole('guanshi');
-    } else {
-      app.globalData.currentRole = 'guanshi';
-      wx.setStorageSync('currentRole', 'guanshi');
-      app.emitEvent('currentRoleChanged', { role: 'guanshi' });
-    }
-    this._refreshTabBar();
-  },
-
-  _refreshTabBar() {
-    const tryRefresh = () => {
-      const tabBar = this.getTabBar && this.getTabBar();
-      if (tabBar && tabBar.refresh) {
-        tabBar.refresh();
-      }
-    };
-    tryRefresh();
-    [50, 150, 300, 500, 800].forEach((delay) => setTimeout(tryRefresh, delay));
-  },
-
-  _applyRegisterSuccess(userData, toastMsg) {
-    const app = getApp();
-    const data = userData || {};
-    if (data.token) wx.setStorageSync('token', data.token);
-    if (data.token) app.globalData.token = data.token;
-
-    const profileFields = ['nicheng', 'uid', 'touxiang'];
-    profileFields.forEach(field => {
-      if (data[field] !== undefined && data[field] !== null) {
-        wx.setStorageSync(field, data[field]);
-        if (field === 'nicheng') {
-          app.globalData.nicheng = data[field];
-        }
-      }
-    });
-
-    // 身份列表完全以后端返回的 *status 字段为准（见 _syncRoleStatuses）
-    this._syncRoleStatuses(data);
-    // 仅在本页管事注册成功、但后端未带 guanshistatus 时兜底
-    if (!Object.prototype.hasOwnProperty.call(data, 'guanshistatus') &&
-        !this._isGuanshiStatusActive(wx.getStorageSync('guanshistatus'))) {
-      this._syncGuanshiCache();
-    }
-    this._syncDashouGlobalData(data);
-
-    const groupFields = ['dashouqun', 'dashouqunid', 'guanshiqun', 'guanshiqunid'];
-    groupFields.forEach(field => {
-      if (data[field] !== undefined) {
-        wx.setStorageSync(field, data[field]);
-        app.globalData[field] = data[field];
-      }
-    });
-
-    const guanshiData = {
-      gszhstatus: data.gszhstatus ?? '',
-      yaoqingzongshu: data.yaoqingzongshu ?? 0,
-      fenyongzonge: data.fenyongzonge ?? '0.00',
-      fenyongtixian: data.fenyongtixian ?? '0.00',
-      yichongzhiDashou: data.yichongzhiDashou ?? 0
-    };
-    if (!app.globalData.guanshi) app.globalData.guanshi = {};
-    Object.assign(app.globalData.guanshi, guanshiData);
-
-    const zhuanhualv = guanshiData.yaoqingzongshu > 0
-      ? (guanshiData.yichongzhiDashou / guanshiData.yaoqingzongshu * 100).toFixed(1)
-      : 0;
-
-    this.setData({
-      isGuanshi: true,
-      uid: data.uid || wx.getStorageSync('uid') || '',
-      nicheng: data.nicheng || app.globalData.nicheng || wx.getStorageSync('nicheng') || '',
-      ...guanshiData,
-      zhuanhualv,
-      isLoading: false
-    });
-    this.loadUserInfo();
-    this.switchToGuanshiRole();
-    wx.hideLoading();
-    if (toastMsg) {
-      wx.showToast({ title: toastMsg, icon: 'success', duration: 2000 });
-    }
-  },
-
-  _enterRegisteredGuanshiState(toastMsg, userData) {
-    if (userData && typeof userData === 'object') {
-      this._applyRegisterSuccess(userData, toastMsg);
-      return;
-    }
-    this._syncGuanshiCache();
-    this.setData({ isGuanshi: true, isLoading: false });
-    this.loadUserInfo();
-    this.switchToGuanshiRole();
-    this.getGuanshiInfo(false);
-    this.fetchChenghaoList();
-    wx.hideLoading();
-    if (toastMsg) {
-      wx.showToast({ title: toastMsg, icon: 'success', duration: 2000 });
-    }
-  },
-
-  // ========== 邀请码处理 ==========
-  handleInviteCodeWithLoginCheck(inviteCode) {
-    const token = wx.getStorageSync('token');
-    const uid = wx.getStorageSync('uid');
-    if (!token || !uid) {
-      this.loginAndRegisterWithInviteCode(inviteCode);
-    } else {
-      if (!this.data.isGuanshi) {
-        wx.showLoading({ title: '自动注册中...', mask: true });
-        this.callRegisterApi(inviteCode);
-      } else {
-        this._enterRegisteredGuanshiState('您已是管事');
-      }
-    }
-  },
-
-  loginAndRegisterWithInviteCode(inviteCode) {
-    const that = this;
-    wx.showLoading({ title: '登录注册中...', mask: true });
-    wx.login({
-      success: (loginRes) => {
-        if (loginRes.code) {
-          that.callLoginRegisterApi(loginRes.code, inviteCode);
-        } else {
-          wx.hideLoading();
-          wx.showToast({ title: '微信登录失败', icon: 'none' });
-        }
-      },
-      fail: () => {
-        wx.hideLoading();
-        wx.reLaunch({ url: '/pages/gerenzhongxin/gerenzhongxin' });
-      }
-    });
-  },
-
-  callLoginRegisterApi(code, inviteCode) {
-    const that = this;
-    const app = getApp();
-    const apiBaseUrl = app.globalData.apiBaseUrl;
-    if (!apiBaseUrl) {
-      wx.hideLoading();
-      wx.showToast({ title: '服务器配置错误', icon: 'none' });
-      return;
-    }
-    wx.request({
-      url: apiBaseUrl + '/yonghu/zuzhangyqmzc',
-      method: 'POST',
-      data: { code: code, inviteCode: inviteCode },
-      header: { 'content-type': 'application/json' },
-      success: (res) => {
-        const body = res.data || {};
-        if (res.statusCode === 200 && that._isApiSuccess(body)) {
-          const userData = that._extractUserData(body);
-          const toastMsg = that._isAlreadyGuanshiMsg(that._getApiMsg(body))
-            ? that._getApiMsg(body)
-            : '注册成功！';
-          that._applyRegisterSuccess(userData, toastMsg);
-        } else if (res.statusCode === 200 && that._isAlreadyGuanshiMsg(that._getApiMsg(body))) {
-          that._enterRegisteredGuanshiState(that._getApiMsg(body) || '您已是管事', that._extractUserData(body));
-        } else {
-          wx.hideLoading();
-          that.setData({ isLoading: false });
-          wx.showToast({ title: that._getApiMsg(body) || '注册失败', icon: 'none' });
-        }
-      },
-      fail: () => {
-        wx.hideLoading();
-        wx.showToast({ title: '网络请求失败', icon: 'none' });
-      }
-    });
-  },
-
-  async callRegisterApi(inviteCode) {
-    try {
-      const res = await request({
-        url: '/yonghu/guanshizhuce',
-        method: 'POST',
-        data: { inviteCode }
-      });
-      const body = res?.data || {};
-      if (res && this._isApiSuccess(body)) {
-        const userData = this._extractUserData(body);
-        const toastMsg = this._isAlreadyGuanshiMsg(this._getApiMsg(body))
-          ? this._getApiMsg(body)
-          : '注册成功！';
-        this._applyRegisterSuccess(userData, toastMsg);
-      } else if (this._isAlreadyGuanshiMsg(this._getApiMsg(body))) {
-        this._enterRegisteredGuanshiState(this._getApiMsg(body) || '您已是管事', this._extractUserData(body));
-      } else {
-        wx.hideLoading();
-        this.setData({ isLoading: false });
-        wx.showToast({ title: this._getApiMsg(body) || '注册失败', icon: 'none' });
-      }
-    } catch (e) {
-      console.error('注册失败:', e);
-      wx.hideLoading();
-      this.setData({ isLoading: false });
-      wx.showToast({ title: e.message || '注册失败', icon: 'error' });
-    }
-  },
-
-  switchToGuanshiRole() {
-    const app = getApp();
-    this.ensureGuanshiRoleAndTabBar();
-    if (app.switchRoleAndReconnect) {
-      app.switchRoleAndReconnect('dashou').catch(() => {});
-    } else if (app.connectForCurrentRole) {
-      app.connectForCurrentRole();
-    } else if (app.ensureConnection) {
-      app.ensureConnection();
-    }
-  },
-
-  checkGuanshiStatus() {
-    try {
-      const status = wx.getStorageSync('guanshistatus');
-      if (this._isGuanshiStatusActive(status)) {
-        this.setData({ isGuanshi: true });
-        this.loadUserInfo();
-        this.checkGlobalData();
-        this.ensureGuanshiRoleAndTabBar();
-      } else {
-        this.setData({ isGuanshi: false });
-      }
-    } catch (e) {
-      this.setData({ isGuanshi: false });
-    }
-  },
-
-  loadUserInfo() {
-    const app = getApp();
-    const globalData = app.globalData || {};
-    const touxiang = wx.getStorageSync('touxiang');
-    const ossImageUrl = globalData.ossImageUrl || '';
-    const morentouxiang = 'avatar/default.jpg';
-    let avatarUrl = '';
-    if (touxiang) {
-      avatarUrl = ossImageUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang);
-    } else {
-      avatarUrl = ossImageUrl + (morentouxiang.startsWith('/') ? morentouxiang : '/' + morentouxiang);
-    }
-    this.setData({
-      avatarUrl,
-      uid: wx.getStorageSync('uid') || '',
-      nicheng: globalData.nicheng || wx.getStorageSync('nicheng') || ''
-    });
-  },
-
-  checkGlobalData() {
-    const app = getApp();
-    const gd = app.globalData.guanshi || {};
-    const needRefresh = !gd.yaoqingzongshu && !gd.fenyongzonge && !gd.fenyongtixian;
-    if (needRefresh) {
-      this.getGuanshiInfo();
-    } else {
-      this.setDataFromGlobalData();
-    }
-  },
-
-  setDataFromGlobalData() {
-    const gd = getApp().globalData.guanshi || {};
-    const zhuanhualv = gd.yaoqingzongshu > 0
-      ? (gd.yichongzhiDashou / gd.yaoqingzongshu * 100).toFixed(1)
-      : 0;
-    this.setData({
-      gszhstatus: gd.gszhstatus || '',
-      yaoqingzongshu: gd.yaoqingzongshu || 0,
-      fenyongzonge: gd.fenyongzonge || '0.00',
-      fenyongtixian: gd.fenyongtixian || '0.00',
-      yichongzhiDashou: gd.yichongzhiDashou || 0,
-      zhuanhualv,
-      isLoading: false
-    });
-  },
-
-  async getGuanshiInfo(showToast = true) {
-    this.setData({ isLoading: true });
-    try {
-      const res = await request({
-        url: '/yonghu/guanshixinxi',
-        method: 'POST'
-      });
-      if (res && this._isApiSuccess(res.data)) {
-        const data = this._extractUserData(res.data);
-        const app = getApp();
-        this._syncGuanshiCache();
-        if (!app.globalData.guanshi) app.globalData.guanshi = {};
-        const updateData = {
-          gszhstatus: data.gszhstatus || '',
-          yaoqingzongshu: data.yaoqingzongshu || 0,
-          fenyongzonge: data.fenyongzonge || '0.00',
-          fenyongtixian: data.fenyongtixian || '0.00',
-          yichongzhiDashou: data.yichongzhiDashou || 0
-        };
-        Object.assign(app.globalData.guanshi, updateData);
-        const zhuanhualv = updateData.yaoqingzongshu > 0
-          ? (updateData.yichongzhiDashou / updateData.yaoqingzongshu * 100).toFixed(1)
-          : 0;
-        this.setData({
-          isGuanshi: true,
-          ...updateData,
-          zhuanhualv,
-          isLoading: false
-        });
-        if (showToast) {
-          wx.showToast({ title: '信息已更新', icon: 'success', duration: 1500 });
-        }
-      } else {
-        this.setData({ isLoading: false });
-        if (showToast) {
-          wx.showToast({ title: this._getApiMsg(res?.data) || '获取失败', icon: 'none' });
-        }
-      }
-    } catch (e) {
-      this.setData({ isLoading: false });
-      if (showToast) {
-        wx.showToast({ title: e.message || '获取失败', icon: 'error' });
-      }
-    }
-  },
-
-  refreshGuanshiInfo() {
-    this.getGuanshiInfo();
-    this.fetchChenghaoList();
-  },
-
-  onInviteCodeInput(e) {
-    this.setData({ inviteCode: e.detail.value.trim() });
-  },
-
-  async onRegister() {
-    const { inviteCode } = this.data;
-    if (!inviteCode) {
-      wx.showToast({ title: '请输入邀请码', icon: 'none' });
-      return;
-    }
-    if (inviteCode.length > 100) {
-      wx.showToast({ title: '邀请码过长', icon: 'none' });
-      return;
-    }
-    this.setData({ isLoading: true });
-    try {
-      const res = await request({
-        url: '/yonghu/guanshizhuce',
-        method: 'POST',
-        data: { inviteCode }
-      });
-      const body = res?.data || {};
-      if (res && this._isApiSuccess(body)) {
-        const userData = this._extractUserData(body);
-        const toastMsg = this._isAlreadyGuanshiMsg(this._getApiMsg(body))
-          ? this._getApiMsg(body)
-          : '注册成功！';
-        this._applyRegisterSuccess(userData, toastMsg);
-      } else if (this._isAlreadyGuanshiMsg(this._getApiMsg(body))) {
-        this._enterRegisteredGuanshiState(this._getApiMsg(body) || '您已是管事', this._extractUserData(body));
-      } else {
-        this.setData({ isLoading: false });
-        wx.showToast({ title: this._getApiMsg(body) || '注册失败', icon: 'none' });
-      }
-    } catch (e) {
-      this.setData({ isLoading: false });
-      wx.showToast({ title: e.message || '注册失败', icon: 'error' });
-    }
-  },
-
-  copyUid() {
-    const { uid } = this.data;
-    if (!uid) return;
-    wx.setClipboardData({
-      data: uid,
-      success: () => wx.showToast({ title: '已复制', icon: 'success' })
-    });
-  },
-
-  // ========== 页面跳转 ==========
-  goToWithdraw() { wx.navigateTo({ url: '/pages/tixian/tixian' }); },
-  goToInviteUser() { wx.navigateTo({ url: '/pages/yaoqingdashou/yaoqingdashou' }); },
-  goToMySubordinate() { wx.navigateTo({ url: '/pages/wodedashou/wodedashou' }); },
-  goToRechargeRecord() { wx.navigateTo({ url: '/pages/czjilu/czjilu' }); },
-  goToGuanshiRanking() { wx.navigateTo({ url: '/pages/guanshipaihang/guanshipaihang' }); },
-  goToPromoPoster() { wx.navigateTo({ url: '/pages/haibao/haibao' }); }
+// pages/guanshizhongxin/guanshizhongxin.js
+import request from '../../utils/request.js';
+import popupService from '../../services/popupService.js';
+import { buildInviterPeerId } from '../../utils/im-user.js';
+import { resolveAvatarUrl } from '../../utils/avatar.js';
+
+Page({
+  data: {
+    // 图片路径对象
+    imgUrls: {},
+
+    isGuanshi: false,
+    isLoading: false,
+    inviteCode: '',
+    uid: '',
+    nicheng: '',
+    avatarUrl: '',
+
+    // 管事信息
+    gszhstatus: '',
+    yaoqingzongshu: 0,
+    fenyongzonge: '0.00',
+    fenyongtixian: '0.00',
+    yichongzhiDashou: 0,
+    zhuanhualv: 0,
+
+    // 称号列表
+    chenghaoList: [],
+
+    // 邀请人缓存
+    inviterCache: null,
+  },
+
+  onLoad(options) {
+    let url = '/pages/fighter/fighter?registerType=guanshi';
+    if (options.scene) {
+      try {
+        url += '&inviteCode=' + encodeURIComponent(decodeURIComponent(options.scene));
+      } catch (e) {
+        console.error('scene解码失败', e);
+      }
+    } else if (options.inviteCode) {
+      url += '&inviteCode=' + encodeURIComponent(options.inviteCode);
+    }
+    wx.redirectTo({ url });
+    return;
+    // 以下保留供恢复参考
+    // 拼接所有图片完整路径
+    const app = getApp();
+    const ossImageUrl = app.globalData.ossImageUrl || '';
+    const imgBase = ossImageUrl + 'beijing/guanshiduan/';
+    this.setData({
+      imgUrls: {
+        pageBg: imgBase + 'page-bg.jpg',
+        topDecor: imgBase + 'top-decor.png',
+        cardBg1: imgBase + 'card-bg1.png',
+        cardBg2: imgBase + 'card-bg2.png',
+        iconRefresh: imgBase + 'icon-refresh.png',
+        iconCopy: imgBase + 'icon-copy.png',
+        avatarDefault: ossImageUrl + 'avatar/default.jpg',
+        iconInvite: imgBase + 'icon-invite.png',
+        iconSub: imgBase + 'icon-sub.png',
+        iconRecord: imgBase + 'icon-record.png',
+        iconRank: imgBase + 'icon-rank.png',
+        iconPoster: imgBase + 'icon-poster.png',
+        iconWithdraw: imgBase + 'icon-withdraw.png',
+        iconContact: imgBase + 'icon-contact.png',
+        iconArrow: imgBase + 'icon-arrow.png',
+      }
+    });
+
+    // 处理扫码 scene
+    if (options.scene) {
+      try {
+        const scene = decodeURIComponent(options.scene);
+        options.inviteCode = scene;
+      } catch (e) {
+        console.error('scene解码失败', e);
+      }
+    }
+
+    this.checkGuanshiStatus();
+
+    const { inviteCode } = options || {};
+    if (inviteCode) {
+      this.setData({ inviteCode });
+      setTimeout(() => {
+        this.handleInviteCodeWithLoginCheck(inviteCode);
+      }, 500);
+    }
+
+    if (!app.globalData.hasShownPopupOnColdStart) {
+      app.globalData.hasShownPopupOnColdStart = true;
+      setTimeout(() => {
+        popupService.checkAndShow(this, 'guanshiduan');
+      }, 300);
+    }
+  },
+
+  onReady() {
+    if (this._isGuanshiPageActive()) {
+      this.ensureGuanshiRoleAndTabBar();
+    }
+  },
+
+  onHide() {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+      popupComp.cleanup();
+    }
+  },
+
+  onShow() {
+    const inviterCache = wx.getStorageSync('inviterCache') || null;
+    this.setData({ inviterCache });
+
+    this.registerNotificationComponent();
+
+    if (this._isGuanshiPageActive()) {
+      if (!this.data.isGuanshi) {
+        this.setData({ isGuanshi: true });
+      }
+      this.ensureGuanshiRoleAndTabBar();
+      setTimeout(() => {
+        this.getGuanshiInfo();
+        this.fetchChenghaoList();
+      }, 300);
+    }
+
+    const pages = getCurrentPages();
+    const currentPage = pages[pages.length - 1];
+    const options = currentPage.options || {};
+    if (options.inviteCode && !this._isGuanshiPageActive()) {
+      setTimeout(() => {
+        this.handleInviteCodeWithLoginCheck(options.inviteCode);
+      }, 300);
+    }
+  },
+
+  // 全局通知注册
+  registerNotificationComponent() {
+    const app = getApp();
+    const comp = this.selectComponent('#global-notification');
+    if (comp && comp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => comp.showNotification(data),
+        hide: () => comp.hideNotification()
+      };
+    }
+  },
+
+  // 称号列表
+  async fetchChenghaoList() {
+    try {
+      const res = await request({
+        url: '/dengji/chenghao',
+        method: 'POST',
+        data: { role: 'guanshi' }
+      });
+      if (res && res.data.code === 0 && res.data.data) {
+        this.setData({ chenghaoList: res.data.data.chenghao_list || [] });
+      }
+    } catch (e) {
+      console.error('获取称号失败', e);
+    }
+  },
+
+  // 联系组长
+async contactInviter() {
+    wx.showLoading({ title: '获取组长信息...', mask: true });
+    try {
+        const res = await request({
+            url: '/yonghu/guanshi_contact',
+            method: 'POST'
+        });
+
+        if (res && res.data.code === 200 && res.data.data) {
+            const inviter = res.data.data;
+            const ossImageUrl = getApp().globalData.ossImageUrl || '';
+            const fullAvatar = inviter.touxiang
+                ? (inviter.touxiang.startsWith('http') ? inviter.touxiang : ossImageUrl + inviter.touxiang)
+                : '';
+
+            // 缓存邀请人信息
+            const cacheData = {
+                uid: inviter.uid,
+                nicheng: inviter.nicheng || '',
+                avatar: fullAvatar
+            };
+            wx.setStorageSync('inviterCache', cacheData);
+            this.setData({ inviterCache: cacheData });
+
+            // 联系邀请人
+            const param = {
+                toUserId: buildInviterPeerId(inviter.uid),
+                toName: inviter.nicheng || '邀请人',
+                toAvatar: fullAvatar
+            };
+            wx.navigateTo({
+                url: '/pages/chat/chat?data=' + encodeURIComponent(JSON.stringify(param))
+            });
+        } else {
+            wx.showToast({ title: '未绑定邀请人', icon: 'none' });
+        }
+    } catch (e) {
+        wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+        wx.hideLoading();
+    }
+},
+  // 管事状态辅助
+  _isApiSuccess(body) {
+    if (!body) return false;
+    const code = Number(body.code);
+    return code === 200 || code === 0;
+  },
+
+  _getApiMsg(body) {
+    if (!body) return '';
+    return body.msg || body.message || '';
+  },
+
+  _extractUserData(body) {
+    if (!body) return {};
+    if (body.data && typeof body.data === 'object' && !Array.isArray(body.data)) {
+      return body.data;
+    }
+    const userData = { ...body };
+    delete userData.code;
+    delete userData.msg;
+    delete userData.message;
+    return userData;
+  },
+
+  _isGuanshiStatusActive(status) {
+    return Number(status) === 1;
+  },
+
+  _isAlreadyGuanshiMsg(msg) {
+    if (!msg || typeof msg !== 'string') return false;
+    return msg.includes('已是管事') || msg.includes('已经是管事');
+  },
+
+  _syncGuanshiCache() {
+    const app = getApp();
+    wx.setStorageSync('guanshistatus', 1);
+    app.globalData.guanshistatus = 1;
+  },
+
+  // 仅同步后端返回的身份 status 字段
+  _syncRoleStatuses(data) {
+    if (!data || typeof data !== 'object') return;
+    const app = getApp();
+    const roleFields = ['dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus', 'kaoheguanstatus'];
+    roleFields.forEach(field => {
+      if (Object.prototype.hasOwnProperty.call(data, field)) {
+        const val = Number(data[field]);
+        const normalized = Number.isNaN(val) ? 0 : val;
+        wx.setStorageSync(field, normalized);
+        app.globalData[field] = normalized;
+      }
+    });
+  },
+
+  // 后端若返回打手详情字段则写入 globalData
+  _syncDashouGlobalData(data) {
+    const app = getApp();
+    const map = {
+      dashouNicheng: data.dashounicheng,
+      zhanghaoStatus: data.zhanghaostatus,
+      yongjin: data.yongjin,
+      zonge: data.zonge,
+      yajin: data.yajin,
+      chenghao: data.chenghao,
+      jinfen: data.jinfen,
+      clumber: data.clumber,
+      chengjiaoliang: data.chengjiaoliang,
+      zaixianZhuangtai: data.zaixianzhuangtai,
+      dashouzhuangtai: data.dashouzhuangtai,
+    };
+    Object.keys(map).forEach(key => {
+      if (map[key] !== undefined) {
+        app.globalData[key] = map[key];
+      }
+    });
+  },
+
+  _isGuanshiPageActive() {
+    return this.data.isGuanshi || this._isGuanshiStatusActive(wx.getStorageSync('guanshistatus'));
+  },
+
+  // 管事页必须切到 guanshi 角色
+  ensureGuanshiRoleAndTabBar() {
+    const app = getApp();
+    if (app.setCurrentRole) {
+      app.setCurrentRole('guanshi');
+    } else {
+      app.globalData.currentRole = 'guanshi';
+      wx.setStorageSync('currentRole', 'guanshi');
+      app.emitEvent('currentRoleChanged', { role: 'guanshi' });
+    }
+    this._refreshTabBar();
+  },
+
+  _refreshTabBar() {
+    const tryRefresh = () => {
+      const tabBar = this.getTabBar && this.getTabBar();
+      if (tabBar && tabBar.refresh) {
+        tabBar.refresh();
+      }
+    };
+    tryRefresh();
+    [50, 150, 300, 500, 800].forEach((delay) => setTimeout(tryRefresh, delay));
+  },
+
+  _applyRegisterSuccess(userData, toastMsg) {
+    const app = getApp();
+    const data = userData || {};
+    if (data.token) wx.setStorageSync('token', data.token);
+    if (data.token) app.globalData.token = data.token;
+
+    const profileFields = ['nicheng', 'uid', 'touxiang'];
+    profileFields.forEach(field => {
+      if (data[field] !== undefined && data[field] !== null) {
+        wx.setStorageSync(field, data[field]);
+        if (field === 'nicheng') {
+          app.globalData.nicheng = data[field];
+        }
+      }
+    });
+
+    // 身份列表以后端返回的 *status 字段为准
+    this._syncRoleStatuses(data);
+    if (!Object.prototype.hasOwnProperty.call(data, 'guanshistatus') &&
+        !this._isGuanshiStatusActive(wx.getStorageSync('guanshistatus'))) {
+      this._syncGuanshiCache();
+    }
+    this._syncDashouGlobalData(data);
+
+    const groupFields = ['dashouqun', 'dashouqunid', 'guanshiqun', 'guanshiqunid'];
+    groupFields.forEach(field => {
+      if (data[field] !== undefined) {
+        wx.setStorageSync(field, data[field]);
+        app.globalData[field] = data[field];
+      }
+    });
+
+    const guanshiData = {
+      gszhstatus: data.gszhstatus ?? '',
+      yaoqingzongshu: data.yaoqingzongshu ?? 0,
+      fenyongzonge: data.fenyongzonge ?? '0.00',
+      fenyongtixian: data.fenyongtixian ?? '0.00',
+      yichongzhiDashou: data.yichongzhiDashou ?? 0
+    };
+    if (!app.globalData.guanshi) app.globalData.guanshi = {};
+    Object.assign(app.globalData.guanshi, guanshiData);
+
+    const zhuanhualv = guanshiData.yaoqingzongshu > 0
+      ? (guanshiData.yichongzhiDashou / guanshiData.yaoqingzongshu * 100).toFixed(1)
+      : 0;
+
+    this.setData({
+      isGuanshi: true,
+      uid: data.uid || wx.getStorageSync('uid') || '',
+      nicheng: data.nicheng || app.globalData.nicheng || wx.getStorageSync('nicheng') || '',
+      ...guanshiData,
+      zhuanhualv,
+      isLoading: false
+    });
+    this.loadUserInfo();
+    this.switchToGuanshiRole();
+    wx.hideLoading();
+    if (toastMsg) {
+      wx.showToast({ title: toastMsg, icon: 'success', duration: 2000 });
+    }
+  },
+
+  _enterRegisteredGuanshiState(toastMsg, userData) {
+    if (userData && typeof userData === 'object') {
+      this._applyRegisterSuccess(userData, toastMsg);
+      return;
+    }
+    this._syncGuanshiCache();
+    this.setData({ isGuanshi: true, isLoading: false });
+    this.loadUserInfo();
+    this.switchToGuanshiRole();
+    this.getGuanshiInfo(false);
+    this.fetchChenghaoList();
+    wx.hideLoading();
+    if (toastMsg) {
+      wx.showToast({ title: toastMsg, icon: 'success', duration: 2000 });
+    }
+  },
+
+  // 邀请码处理
+  handleInviteCodeWithLoginCheck(inviteCode) {
+    const token = wx.getStorageSync('token');
+    const uid = wx.getStorageSync('uid');
+    if (!token || !uid) {
+      this.loginAndRegisterWithInviteCode(inviteCode);
+    } else {
+      if (!this.data.isGuanshi) {
+        wx.showLoading({ title: '自动注册中...', mask: true });
+        this.callRegisterApi(inviteCode);
+      } else {
+        this._enterRegisteredGuanshiState('您已是管事');
+      }
+    }
+  },
+
+  loginAndRegisterWithInviteCode(inviteCode) {
+    const that = this;
+    wx.showLoading({ title: '登录注册中...', mask: true });
+    wx.login({
+      success: (loginRes) => {
+        if (loginRes.code) {
+          that.callLoginRegisterApi(loginRes.code, inviteCode);
+        } else {
+          wx.hideLoading();
+          wx.showToast({ title: '微信登录失败', icon: 'none' });
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.reLaunch({ url: '/pages/gerenzhongxin/gerenzhongxin' });
+      }
+    });
+  },
+
+  callLoginRegisterApi(code, inviteCode) {
+    const that = this;
+    const app = getApp();
+    const apiBaseUrl = app.globalData.apiBaseUrl;
+    if (!apiBaseUrl) {
+      wx.hideLoading();
+      wx.showToast({ title: '服务器配置错误', icon: 'none' });
+      return;
+    }
+    wx.request({
+      url: apiBaseUrl + '/yonghu/zuzhangyqmzc',
+      method: 'POST',
+      data: { code: code, inviteCode: inviteCode },
+      header: { 'content-type': 'application/json' },
+      success: (res) => {
+        const body = res.data || {};
+        if (res.statusCode === 200 && that._isApiSuccess(body)) {
+          const userData = that._extractUserData(body);
+          const toastMsg = that._isAlreadyGuanshiMsg(that._getApiMsg(body))
+            ? that._getApiMsg(body)
+            : '注册成功！';
+          that._applyRegisterSuccess(userData, toastMsg);
+        } else if (res.statusCode === 200 && that._isAlreadyGuanshiMsg(that._getApiMsg(body))) {
+          that._enterRegisteredGuanshiState(that._getApiMsg(body) || '您已是管事', that._extractUserData(body));
+        } else {
+          wx.hideLoading();
+          that.setData({ isLoading: false });
+          wx.showToast({ title: that._getApiMsg(body) || '注册失败', icon: 'none' });
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.showToast({ title: '网络请求失败', icon: 'none' });
+      }
+    });
+  },
+
+  async callRegisterApi(inviteCode) {
+    try {
+      const res = await request({
+        url: '/yonghu/guanshizhuce',
+        method: 'POST',
+        data: { inviteCode }
+      });
+      const body = res?.data || {};
+      if (res && this._isApiSuccess(body)) {
+        const userData = this._extractUserData(body);
+        const toastMsg = this._isAlreadyGuanshiMsg(this._getApiMsg(body))
+          ? this._getApiMsg(body)
+          : '注册成功！';
+        this._applyRegisterSuccess(userData, toastMsg);
+      } else if (this._isAlreadyGuanshiMsg(this._getApiMsg(body))) {
+        this._enterRegisteredGuanshiState(this._getApiMsg(body) || '您已是管事', this._extractUserData(body));
+      } else {
+        wx.hideLoading();
+        this.setData({ isLoading: false });
+        wx.showToast({ title: this._getApiMsg(body) || '注册失败', icon: 'none' });
+      }
+    } catch (e) {
+      console.error('注册失败:', e);
+      wx.hideLoading();
+      this.setData({ isLoading: false });
+      wx.showToast({ title: e.message || '注册失败', icon: 'error' });
+    }
+  },
+
+  switchToGuanshiRole() {
+    const app = getApp();
+    this.ensureGuanshiRoleAndTabBar();
+    if (app.switchRoleAndReconnect) {
+      app.switchRoleAndReconnect('dashou').catch(() => {});
+    } else if (app.connectForCurrentRole) {
+      app.connectForCurrentRole();
+    } else if (app.ensureConnection) {
+      app.ensureConnection();
+    }
+  },
+
+  checkGuanshiStatus() {
+    try {
+      const status = wx.getStorageSync('guanshistatus');
+      if (this._isGuanshiStatusActive(status)) {
+        this.setData({ isGuanshi: true });
+        this.loadUserInfo();
+        this.checkGlobalData();
+        this.ensureGuanshiRoleAndTabBar();
+      } else {
+        this.setData({ isGuanshi: false });
+      }
+    } catch (e) {
+      this.setData({ isGuanshi: false });
+    }
+  },
+
+  loadUserInfo() {
+    const app = getApp();
+    const globalData = app.globalData || {};
+    const touxiang = wx.getStorageSync('touxiang');
+    const ossImageUrl = globalData.ossImageUrl || '';
+    const morentouxiang = 'avatar/default.jpg';
+    let avatarUrl = '';
+    if (touxiang) {
+      avatarUrl = ossImageUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang);
+    } else {
+      avatarUrl = ossImageUrl + (morentouxiang.startsWith('/') ? morentouxiang : '/' + morentouxiang);
+    }
+    this.setData({
+      avatarUrl,
+      uid: wx.getStorageSync('uid') || '',
+      nicheng: globalData.nicheng || wx.getStorageSync('nicheng') || ''
+    });
+  },
+
+  checkGlobalData() {
+    const app = getApp();
+    const gd = app.globalData.guanshi || {};
+    const needRefresh = !gd.yaoqingzongshu && !gd.fenyongzonge && !gd.fenyongtixian;
+    if (needRefresh) {
+      this.getGuanshiInfo();
+    } else {
+      this.setDataFromGlobalData();
+    }
+  },
+
+  setDataFromGlobalData() {
+    const gd = getApp().globalData.guanshi || {};
+    const zhuanhualv = gd.yaoqingzongshu > 0
+      ? (gd.yichongzhiDashou / gd.yaoqingzongshu * 100).toFixed(1)
+      : 0;
+    this.setData({
+      gszhstatus: gd.gszhstatus || '',
+      yaoqingzongshu: gd.yaoqingzongshu || 0,
+      fenyongzonge: gd.fenyongzonge || '0.00',
+      fenyongtixian: gd.fenyongtixian || '0.00',
+      yichongzhiDashou: gd.yichongzhiDashou || 0,
+      zhuanhualv,
+      isLoading: false
+    });
+  },
+
+  async getGuanshiInfo(showToast = true) {
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({
+        url: '/yonghu/guanshixinxi',
+        method: 'POST'
+      });
+      if (res && this._isApiSuccess(res.data)) {
+        const data = this._extractUserData(res.data);
+        const app = getApp();
+        this._syncGuanshiCache();
+        if (!app.globalData.guanshi) app.globalData.guanshi = {};
+        const updateData = {
+          gszhstatus: data.gszhstatus || '',
+          yaoqingzongshu: data.yaoqingzongshu || 0,
+          fenyongzonge: data.fenyongzonge || '0.00',
+          fenyongtixian: data.fenyongtixian || '0.00',
+          yichongzhiDashou: data.yichongzhiDashou || 0
+        };
+        Object.assign(app.globalData.guanshi, updateData);
+        const zhuanhualv = updateData.yaoqingzongshu > 0
+          ? (updateData.yichongzhiDashou / updateData.yaoqingzongshu * 100).toFixed(1)
+          : 0;
+        this.setData({
+          isGuanshi: true,
+          ...updateData,
+          zhuanhualv,
+          isLoading: false
+        });
+        if (showToast) {
+          wx.showToast({ title: '信息已更新', icon: 'success', duration: 1500 });
+        }
+      } else {
+        this.setData({ isLoading: false });
+        if (showToast) {
+          wx.showToast({ title: this._getApiMsg(res?.data) || '获取失败', icon: 'none' });
+        }
+      }
+    } catch (e) {
+      this.setData({ isLoading: false });
+      if (showToast) {
+        wx.showToast({ title: e.message || '获取失败', icon: 'error' });
+      }
+    }
+  },
+
+  refreshGuanshiInfo() {
+    this.getGuanshiInfo();
+    this.fetchChenghaoList();
+  },
+
+  onInviteCodeInput(e) {
+    this.setData({ inviteCode: e.detail.value.trim() });
+  },
+
+  async onRegister() {
+    const { inviteCode } = this.data;
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none' });
+      return;
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码过长', icon: 'none' });
+      return;
+    }
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({
+        url: '/yonghu/guanshizhuce',
+        method: 'POST',
+        data: { inviteCode }
+      });
+      const body = res?.data || {};
+      if (res && this._isApiSuccess(body)) {
+        const userData = this._extractUserData(body);
+        const toastMsg = this._isAlreadyGuanshiMsg(this._getApiMsg(body))
+          ? this._getApiMsg(body)
+          : '注册成功！';
+        this._applyRegisterSuccess(userData, toastMsg);
+      } else if (this._isAlreadyGuanshiMsg(this._getApiMsg(body))) {
+        this._enterRegisteredGuanshiState(this._getApiMsg(body) || '您已是管事', this._extractUserData(body));
+      } else {
+        this.setData({ isLoading: false });
+        wx.showToast({ title: this._getApiMsg(body) || '注册失败', icon: 'none' });
+      }
+    } catch (e) {
+      this.setData({ isLoading: false });
+      wx.showToast({ title: e.message || '注册失败', icon: 'error' });
+    }
+  },
+
+  copyUid() {
+    const { uid } = this.data;
+    if (!uid) return;
+    wx.setClipboardData({
+      data: uid,
+      success: () => wx.showToast({ title: '已复制', icon: 'success' })
+    });
+  },
+
+  // 页面跳转
+  goToWithdraw() { wx.navigateTo({ url: '/pages/withdraw/withdraw' }); },
+  goToInviteUser() { wx.navigateTo({ url: '/pages/invite-fighter/invite-fighter' }); },
+  goToMySubordinate() { wx.navigateTo({ url: '/pages/my-fighter/my-fighter' }); },
+  goToRechargeRecord() { wx.navigateTo({ url: '/pages/recharge-log/recharge-log' }); },
+  goToGuanshiRanking() { wx.navigateTo({ url: '/pages/manager-rank/manager-rank' }); },
+  goToPromoPoster() { wx.navigateTo({ url: '/pages/poster/poster' }); }
 });
\ No newline at end of file
diff --git a/pages/guanshiduan/guanshiduan.json b/pages/manager/manager.json
similarity index 100%
rename from pages/guanshiduan/guanshiduan.json
rename to pages/manager/manager.json
diff --git a/pages/guanshiduan/guanshiduan.wxml b/pages/manager/manager.wxml
similarity index 100%
rename from pages/guanshiduan/guanshiduan.wxml
rename to pages/manager/manager.wxml
diff --git a/pages/guanshiduan/guanshiduan.wxss b/pages/manager/manager.wxss
similarity index 95%
rename from pages/guanshiduan/guanshiduan.wxss
rename to pages/manager/manager.wxss
index 3cf8113..8d85aa4 100644
--- a/pages/guanshiduan/guanshiduan.wxss
+++ b/pages/manager/manager.wxss
@@ -1,11 +1,11 @@
-/* ========== 全局背景 ========== */
+/* 全局背景 */
 page {
     background: #F8FAFE;
     font-family: -apple-system, BlinkMacSystemFont, 'PingFang SC', sans-serif;
     color: #1A1A1A;
   }
   
-  /* 背景图清晰可见 */
+  /* 背景图 */
   .page-bg {
     position: fixed;
     top: 0;
@@ -17,7 +17,7 @@ page {
     pointer-events: none;
   }
   
-  /* ========== 未注册区域 ========== */
+  /* 未注册区域 */
   .unreg-area {
     position: relative;
     z-index: 2;
@@ -83,7 +83,7 @@ page {
     font-weight: 600;
   }
   
-  /* ========== 已注册主区域 ========== */
+  /* 已注册主区域 */
   .main-body {
     position: relative;
     z-index: 2;
@@ -170,7 +170,7 @@ page {
     white-space: nowrap;
   }
   
-  /* 资产卡片（纯玻璃质感） */
+  /* 资产卡片 */
   .asset-card {
     background: rgba(255,255,255,0.7);
     backdrop-filter: blur(20rpx);
@@ -300,7 +300,7 @@ page {
     text-align: center;
   }
   
-  /* 联系组长卡片（底部横条） */
+  /* 联系组长卡片 */
   .contact-card {
     display: flex;
     align-items: center;
@@ -363,5 +363,4 @@ page {
     border-top-color: #1A1A1A;
     border-radius: 50%;
     animation: spin 0.8s linear infinite;
-  }
-  @keyframes spin { to { transform: rotate(360deg); } }
\ No newline at end of file
+  }
\ No newline at end of file
diff --git a/pages/sjpaidan/sjpaidan.js b/pages/merchant-dispatch/merchant-dispatch.js
similarity index 96%
rename from pages/sjpaidan/sjpaidan.js
rename to pages/merchant-dispatch/merchant-dispatch.js
index 7fa4993..8d64071 100644
--- a/pages/sjpaidan/sjpaidan.js
+++ b/pages/merchant-dispatch/merchant-dispatch.js
@@ -1,418 +1,418 @@
-// pages/sjpaidan/sjpaidan.js
-import request from '../../utils/request.js'
-import PopupService from '../../services/popupService.js'   // 引入弹窗服务
-
-Page({
-  data: {
-    // 商家余额 (从全局变量获取)
-    sjyue: '0.00',
-
-    // 商品类型列表
-    shangpinList: [],
-    // 当前选中的商品类型信息
-    selectedTypeId: null,
-    selectedHuiyuanId: null,
-    selectedYaoqiuleixing: null,
-    // 当前商品类型下的称号列表（用于标签选择器）
-    currentTypeChenghaoList: [],
-
-    // 表单字段
-    dingdanJieshao: '',     // 订单介绍
-    dingdanBeizhu: '',      // 订单备注
-    laobanName: '',         // 老板游戏昵称/UID
-    zhidingUid: '',         // 指定打手UID
-    jiage: '',              // 订单价格
-
-    // 新增字段：抢单标签（称号）
-    selectedLabelId: '',    // 选中的标签ID
-    selectedLabelName: '',  // 选中的标签名称
-
-    // 新增字段：佣金要求（压金）
-    commissionEnabled: false,   // 是否开启佣金要求
-    commissionValue: '',        // 佣金金额（元）
-
-    // 页面状态
-    isLoading: false,       // 加载商品类型中
-    isSubmitting: false,    // 提交派单中
-
-    // 教程按钮状态
-    tutorialBtnHidden: false,   // false=完全显示，true=缩进隐藏（只露边）
-
-    // 背景图URL（动态拼接）
-    bgImageUrl: ''
-  },
-
-  onLoad() {
-    this.loadBgImage()          // 拼接背景图
-    this.loadShangjiaYue()      // 从全局变量获取商家余额
-    this.loadShangpinTypes()    // 加载商品类型
-    this.startTutorialBtnTimer() // 启动按钮缩进定时器
-  },
-
-  onShow() {
-    // 每次显示页面时刷新余额（可能从其他页面充值后返回）
-    this.loadShangjiaYue()
-    // 重新拼接背景图（确保最新）
-    this.loadBgImage()
-
-    // 注册通知组件（用于全局消息提示）
-    this.registerNotificationComponent()
-
-    // 重置按钮缩进定时器（重新开始5秒倒计时）
-    this.startTutorialBtnTimer()
-  },
-
-  onHide() {
-    // 页面隐藏时重置弹窗服务状态，避免影响其他页面
-    PopupService.reset()
-  },
-
-  onUnload() {
-    // 清除缩进定时器，避免内存泄漏
-    if (this.tutorialTimer) {
-      clearTimeout(this.tutorialTimer)
-    }
-    // 页面卸载时重置弹窗服务
-    PopupService.reset()
-  },
-
-  // ==================== 背景图动态拼接 ====================
-  loadBgImage() {
-    const app = getApp()
-    const ossBase = app.globalData.ossImageUrl || 'https://your-oss-bucket.oss-cn-region.aliyuncs.com'
-    // 拼接完整路径：beijing/shangjiapaidan/bg.jpg
-    const bgUrl = ossBase.replace(/\/$/, '') + '/beijing/shangjiapaidan/bg.jpg'
-    this.setData({ bgImageUrl: bgUrl })
-  },
-
-  // ==================== 基础数据加载 ====================
-  loadShangjiaYue() {
-    const app = getApp()
-    const shangjiaData = app.globalData.shangjia || {}
-    this.setData({
-      sjyue: shangjiaData.sjyue || '0.00'
-    })
-  },
-
-  // 加载商品类型（与极速派单完全一致）
-  async loadShangpinTypes() {
-    this.setData({ isLoading: true })
-    try {
-      const res = await request({
-        url: '/dingdan/sjspleixing',
-        method: 'POST'
-      })
-      if (res && res.data.code === 200) {
-        let list = res.data.data || []
-        // 强制倒序排列（与极速派单保持一致）
-        list.reverse()
-        this.setData({
-          shangpinList: list,
-          isLoading: false
-        })
-        // 默认选中第一个
-        if (list.length > 0) {
-          this.setSelectedType(list[0])
-        }
-      } else {
-        throw new Error(res.data.msg || '加载失败')
-      }
-    } catch (error) {
-      console.error('加载商品类型失败:', error)
-      this.setData({ isLoading: false })
-      wx.showToast({
-        title: '加载类型失败',
-        icon: 'error',
-        duration: 2000
-      })
-    }
-  },
-
-  // 设置选中的商品类型，并提取该类型下的称号列表
-  setSelectedType(item) {
-    this.setData({
-      selectedTypeId: item.id,
-      selectedHuiyuanId: item.huiyuan_id,
-      selectedYaoqiuleixing: item.yaoqiuleixing,
-      currentTypeChenghaoList: item.chenghaoList || [],
-      // 切换商品类型时，清空之前选择的标签和佣金
-      selectedLabelId: '',
-      selectedLabelName: '',
-      commissionEnabled: false,
-      commissionValue: ''
-    })
-  },
-
-  // 注册全局通知组件（用于顶部提示）
-  registerNotificationComponent() {
-    const app = getApp()
-    const notificationComp = this.selectComponent('#global-notification')
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      }
-    }
-  },
-
-  // ==================== 教程按钮控制 ====================
-  // 启动定时器：5秒后让按钮缩进
-  startTutorialBtnTimer() {
-    // 清除旧的定时器
-    if (this.tutorialTimer) {
-      clearTimeout(this.tutorialTimer)
-    }
-    // 5秒后将按钮缩进隐藏
-    this.tutorialTimer = setTimeout(() => {
-      this.setData({ tutorialBtnHidden: true })
-    }, 5000)
-  },
-
-  // 重置按钮状态（完全显示）并重新开始5秒倒计时
-  resetTutorialBtn() {
-    // 如果按钮当前是缩进状态，先恢复完全显示
-    if (this.data.tutorialBtnHidden) {
-      this.setData({ tutorialBtnHidden: false })
-    }
-    // 重新开始计时（清除旧定时器，新定时器5秒后缩进）
-    if (this.tutorialTimer) {
-      clearTimeout(this.tutorialTimer)
-    }
-    this.tutorialTimer = setTimeout(() => {
-      this.setData({ tutorialBtnHidden: true })
-    }, 5000)
-  },
-
-  // 点击教程按钮：重置按钮状态，并调用 PopupService 弹出教程
-  async onTutorialBtnTap() {
-    // 首先重置按钮状态（完全显示并重新计时）
-    this.resetTutorialBtn()
-    // 调用弹窗服务，页面标识为 'sjpd1'
-    PopupService.checkAndShow(this, 'sjpd1')
-  },
-
-  // ==================== 表单输入事件 ====================
-  onDingdanJieshaoInput(e) {
-    this.setData({ dingdanJieshao: e.detail.value })
-  },
-  onDingdanBeizhuInput(e) {
-    this.setData({ dingdanBeizhu: e.detail.value })
-  },
-  onLaobanNameInput(e) {
-    this.setData({ laobanName: e.detail.value })
-  },
-  onZhidingUidInput(e) {
-    this.setData({ zhidingUid: e.detail.value })
-  },
-  onJiageInput(e) {
-    let value = e.detail.value
-    // 前端验证：确保是数字且最多两位小数
-    if (value === '' || /^\d+(\.\d{0,2})?$/.test(value)) {
-      this.setData({ jiage: value })
-    }
-  },
-
-  // 标签选择器（picker事件）
-  onLabelChange(e) {
-    const idx = e.detail.value
-    const label = this.data.currentTypeChenghaoList[idx]
-    if (label) {
-      this.setData({
-        selectedLabelId: label.id,
-        selectedLabelName: label.mingcheng
-      })
-    } else {
-      this.setData({
-        selectedLabelId: '',
-        selectedLabelName: ''
-      })
-    }
-  },
-
-  // 佣金开关
-  onCommissionToggle() {
-    this.setData({ commissionEnabled: !this.data.commissionEnabled })
-  },
-  onCommissionValueInput(e) {
-    let value = e.detail.value
-    if (value === '' || /^\d+(\.\d{0,2})?$/.test(value)) {
-      this.setData({ commissionValue: value })
-    }
-  },
-
-  // ==================== 表单验证与提交 ====================
-  validateForm() {
-    const {
-      selectedTypeId,
-      dingdanJieshao,
-      laobanName,
-      jiage,
-      sjyue,
-      commissionEnabled,
-      commissionValue
-    } = this.data
-
-    // 1. 验证必填项
-    if (!selectedTypeId) {
-      wx.showToast({ title: '请选择订单类型', icon: 'none' })
-      return false
-    }
-    if (!dingdanJieshao.trim()) {
-      wx.showToast({ title: '请输入订单介绍', icon: 'none' })
-      return false
-    }
-    if (!laobanName.trim()) {
-      wx.showToast({ title: '请输入老板游戏昵称', icon: 'none' })
-      return false
-    }
-    if (!jiage) {
-      wx.showToast({ title: '请输入订单价格', icon: 'none' })
-      return false
-    }
-
-    // 2. 验证价格格式和范围
-    const price = parseFloat(jiage)
-    if (isNaN(price) || price < 0.1 || price > 10000) {
-      wx.showToast({ title: '价格需在0.1-10000元之间', icon: 'none' })
-      return false
-    }
-    if (jiage.includes('.') && jiage.split('.')[1].length > 2) {
-      wx.showToast({ title: '最多支持两位小数', icon: 'none' })
-      return false
-    }
-
-    // 3. 验证佣金要求（若开启）
-    if (commissionEnabled) {
-      const commission = parseFloat(commissionValue)
-      if (isNaN(commission) || commission <= 0) {
-        wx.showToast({ title: '请输入有效的佣金金额', icon: 'none' })
-        return false
-      }
-      if (commission > 50000) {
-        wx.showToast({ title: '佣金建议不超过50000元', icon: 'none' })
-        return false
-      }
-    }
-
-    // 4. 验证余额是否足够
-    const balance = parseFloat(sjyue)
-    if (price > balance) {
-      wx.showModal({
-        title: '余额不足',
-        content: `当前余额${sjyue}元，需要${jiage}元。请先充值。`,
-        confirmText: '去充值',
-        success: (res) => {
-          if (res.confirm) {
-            wx.navigateTo({
-              url: '/pages/sjchongzhi/sjchongzhi'
-            })
-          }
-        }
-      })
-      return false
-    }
-
-    return true
-  },
-
-  // 重置表单（保留商品类型选中状态）
-  resetForm() {
-    this.setData({
-      dingdanJieshao: '',
-      dingdanBeizhu: '',
-      laobanName: '',
-      zhidingUid: '',
-      jiage: '',
-      selectedLabelId: '',
-      selectedLabelName: '',
-      commissionEnabled: false,
-      commissionValue: ''
-    })
-    // 重置选中第一个商品类型（可选）
-    if (this.data.shangpinList.length > 0) {
-      this.setSelectedType(this.data.shangpinList[0])
-    }
-  },
-
-  // 提交派单
-  async onSubmit() {
-    if (this.data.isSubmitting) return
-    if (!this.validateForm()) return
-
-    this.setData({ isSubmitting: true })
-
-    // 准备提交数据（原有字段 + 新增字段）
-    const postData = {
-      // 原有必传字段
-      shangpinTypeId: this.data.selectedTypeId,
-      huiyuanId: this.data.selectedHuiyuanId,
-      yaoqiuleixing: this.data.selectedYaoqiuleixing,
-      dingdanJieshao: this.data.dingdanJieshao.trim(),
-      dingdanBeizhu: this.data.dingdanBeizhu.trim() || '',
-      laobanName: this.data.laobanName.trim(),
-      zhidingUid: this.data.zhidingUid.trim() || '',
-      jiage: this.data.jiage,
-      // 新增字段
-      labelId: this.data.selectedLabelId || '',
-      labelName: this.data.selectedLabelName || '',
-      commissionEnabled: this.data.commissionEnabled,
-      commissionValue: this.data.commissionEnabled ? this.data.commissionValue : ''
-    }
-
-    try {
-      const res = await request({
-        url: '/dingdan/sjpaifa',
-        method: 'POST',
-        data: postData
-      })
-
-      if (res && res.data.code === 200) {
-        // 派单成功
-        wx.showToast({
-          title: '派单成功',
-          icon: 'success',
-          duration: 2000
-        })
-
-        // 更新全局变量中的商家信息（余额、发单量、流水）
-        const orderAmount = parseFloat(this.data.jiage)
-        const app = getApp()
-        if (app.globalData.shangjia) {
-          const newBalance = parseFloat(app.globalData.shangjia.sjyue || '0') - orderAmount
-          app.globalData.shangjia.sjyue = newBalance.toFixed(2)
-          app.globalData.shangjia.fadanzong = (parseInt(app.globalData.shangjia.fadanzong || '0') + 1).toString()
-          app.globalData.shangjia.riliushui = (parseFloat(app.globalData.shangjia.riliushui || '0') + orderAmount).toFixed(2)
-          app.globalData.shangjia.yueliushui = (parseFloat(app.globalData.shangjia.yueliushui || '0') + orderAmount).toFixed(2)
-          this.setData({ sjyue: app.globalData.shangjia.sjyue })
-        }
-
-        // 延迟重置表单，避免用户连续提交
-        setTimeout(() => {
-          this.resetForm()
-          this.setData({ isSubmitting: false })
-        }, 1500)
-      } else {
-        wx.showModal({
-          title: '派单失败',
-          content: res.data.msg || '请稍后重试',
-          showCancel: false
-        })
-        this.setData({ isSubmitting: false })
-      }
-    } catch (error) {
-      console.error('派单请求失败:', error)
-      wx.showModal({
-        title: '请求失败',
-        content: error.message || '网络错误，请检查连接',
-        showCancel: false
-      })
-      this.setData({ isSubmitting: false })
-    }
-  },
-
-  // ==================== 商品类型选择 ====================
-  onSelectType(e) {
-    const { id, item } = e.currentTarget.dataset
-    this.setSelectedType(item)
-  }
+// pages/merchant-dispatch/merchant-dispatch.js
+import request from '../../utils/request.js'
+import PopupService from '../../services/popupService.js'   // 引入弹窗服务
+
+Page({
+  data: {
+    // 商家余额 (从全局变量获取)
+    sjyue: '0.00',
+
+    // 商品类型列表
+    shangpinList: [],
+    // 当前选中的商品类型信息
+    selectedTypeId: null,
+    selectedHuiyuanId: null,
+    selectedYaoqiuleixing: null,
+    // 当前商品类型下的称号列表（用于标签选择器）
+    currentTypeChenghaoList: [],
+
+    // 表单字段
+    dingdanJieshao: '',     // 订单介绍
+    dingdanBeizhu: '',      // 订单备注
+    laobanName: '',         // 老板游戏昵称/UID
+    zhidingUid: '',         // 指定打手UID
+    jiage: '',              // 订单价格
+
+    // 新增字段：抢单标签（称号）
+    selectedLabelId: '',    // 选中的标签ID
+    selectedLabelName: '',  // 选中的标签名称
+
+    // 新增字段：佣金要求（压金）
+    commissionEnabled: false,   // 是否开启佣金要求
+    commissionValue: '',        // 佣金金额（元）
+
+    // 页面状态
+    isLoading: false,       // 加载商品类型中
+    isSubmitting: false,    // 提交派单中
+
+    // 教程按钮状态
+    tutorialBtnHidden: false,   // false=完全显示，true=缩进隐藏（只露边）
+
+    // 背景图URL（动态拼接）
+    bgImageUrl: ''
+  },
+
+  onLoad() {
+    this.loadBgImage()          // 拼接背景图
+    this.loadShangjiaYue()      // 从全局变量获取商家余额
+    this.loadShangpinTypes()    // 加载商品类型
+    this.startTutorialBtnTimer() // 启动按钮缩进定时器
+  },
+
+  onShow() {
+    // 每次显示页面时刷新余额（可能从其他页面充值后返回）
+    this.loadShangjiaYue()
+    // 重新拼接背景图（确保最新）
+    this.loadBgImage()
+
+    // 注册通知组件（用于全局消息提示）
+    this.registerNotificationComponent()
+
+    // 重置按钮缩进定时器（重新开始5秒倒计时）
+    this.startTutorialBtnTimer()
+  },
+
+  onHide() {
+    // 页面隐藏时重置弹窗服务状态，避免影响其他页面
+    PopupService.reset()
+  },
+
+  onUnload() {
+    // 清除缩进定时器，避免内存泄漏
+    if (this.tutorialTimer) {
+      clearTimeout(this.tutorialTimer)
+    }
+    // 页面卸载时重置弹窗服务
+    PopupService.reset()
+  },
+
+  // ==================== 背景图动态拼接 ====================
+  loadBgImage() {
+    const app = getApp()
+    const ossBase = app.globalData.ossImageUrl || 'https://your-oss-bucket.oss-cn-region.aliyuncs.com'
+    // 拼接完整路径：beijing/shangjiapaidan/bg.jpg
+    const bgUrl = ossBase.replace(/\/$/, '') + '/beijing/shangjiapaidan/bg.jpg'
+    this.setData({ bgImageUrl: bgUrl })
+  },
+
+  // ==================== 基础数据加载 ====================
+  loadShangjiaYue() {
+    const app = getApp()
+    const shangjiaData = app.globalData.shangjia || {}
+    this.setData({
+      sjyue: shangjiaData.sjyue || '0.00'
+    })
+  },
+
+  // 加载商品类型（与极速派单完全一致）
+  async loadShangpinTypes() {
+    this.setData({ isLoading: true })
+    try {
+      const res = await request({
+        url: '/dingdan/sjspleixing',
+        method: 'POST'
+      })
+      if (res && res.data.code === 200) {
+        let list = res.data.data || []
+        // 强制倒序排列（与极速派单保持一致）
+        list.reverse()
+        this.setData({
+          shangpinList: list,
+          isLoading: false
+        })
+        // 默认选中第一个
+        if (list.length > 0) {
+          this.setSelectedType(list[0])
+        }
+      } else {
+        throw new Error(res.data.msg || '加载失败')
+      }
+    } catch (error) {
+      console.error('加载商品类型失败:', error)
+      this.setData({ isLoading: false })
+      wx.showToast({
+        title: '加载类型失败',
+        icon: 'error',
+        duration: 2000
+      })
+    }
+  },
+
+  // 设置选中的商品类型，并提取该类型下的称号列表
+  setSelectedType(item) {
+    this.setData({
+      selectedTypeId: item.id,
+      selectedHuiyuanId: item.huiyuan_id,
+      selectedYaoqiuleixing: item.yaoqiuleixing,
+      currentTypeChenghaoList: item.chenghaoList || [],
+      // 切换商品类型时，清空之前选择的标签和佣金
+      selectedLabelId: '',
+      selectedLabelName: '',
+      commissionEnabled: false,
+      commissionValue: ''
+    })
+  },
+
+  // 注册全局通知组件（用于顶部提示）
+  registerNotificationComponent() {
+    const app = getApp()
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  // ==================== 教程按钮控制 ====================
+  // 启动定时器：5秒后让按钮缩进
+  startTutorialBtnTimer() {
+    // 清除旧的定时器
+    if (this.tutorialTimer) {
+      clearTimeout(this.tutorialTimer)
+    }
+    // 5秒后将按钮缩进隐藏
+    this.tutorialTimer = setTimeout(() => {
+      this.setData({ tutorialBtnHidden: true })
+    }, 5000)
+  },
+
+  // 重置按钮状态（完全显示）并重新开始5秒倒计时
+  resetTutorialBtn() {
+    // 如果按钮当前是缩进状态，先恢复完全显示
+    if (this.data.tutorialBtnHidden) {
+      this.setData({ tutorialBtnHidden: false })
+    }
+    // 重新开始计时（清除旧定时器，新定时器5秒后缩进）
+    if (this.tutorialTimer) {
+      clearTimeout(this.tutorialTimer)
+    }
+    this.tutorialTimer = setTimeout(() => {
+      this.setData({ tutorialBtnHidden: true })
+    }, 5000)
+  },
+
+  // 点击教程按钮：重置按钮状态，并调用 PopupService 弹出教程
+  async onTutorialBtnTap() {
+    // 首先重置按钮状态（完全显示并重新计时）
+    this.resetTutorialBtn()
+    // 调用弹窗服务，页面标识为 'sjpd1'
+    PopupService.checkAndShow(this, 'sjpd1')
+  },
+
+  // ==================== 表单输入事件 ====================
+  onDingdanJieshaoInput(e) {
+    this.setData({ dingdanJieshao: e.detail.value })
+  },
+  onDingdanBeizhuInput(e) {
+    this.setData({ dingdanBeizhu: e.detail.value })
+  },
+  onLaobanNameInput(e) {
+    this.setData({ laobanName: e.detail.value })
+  },
+  onZhidingUidInput(e) {
+    this.setData({ zhidingUid: e.detail.value })
+  },
+  onJiageInput(e) {
+    let value = e.detail.value
+    // 前端验证：确保是数字且最多两位小数
+    if (value === '' || /^\d+(\.\d{0,2})?$/.test(value)) {
+      this.setData({ jiage: value })
+    }
+  },
+
+  // 标签选择器（picker事件）
+  onLabelChange(e) {
+    const idx = e.detail.value
+    const label = this.data.currentTypeChenghaoList[idx]
+    if (label) {
+      this.setData({
+        selectedLabelId: label.id,
+        selectedLabelName: label.mingcheng
+      })
+    } else {
+      this.setData({
+        selectedLabelId: '',
+        selectedLabelName: ''
+      })
+    }
+  },
+
+  // 佣金开关
+  onCommissionToggle() {
+    this.setData({ commissionEnabled: !this.data.commissionEnabled })
+  },
+  onCommissionValueInput(e) {
+    let value = e.detail.value
+    if (value === '' || /^\d+(\.\d{0,2})?$/.test(value)) {
+      this.setData({ commissionValue: value })
+    }
+  },
+
+  // ==================== 表单验证与提交 ====================
+  validateForm() {
+    const {
+      selectedTypeId,
+      dingdanJieshao,
+      laobanName,
+      jiage,
+      sjyue,
+      commissionEnabled,
+      commissionValue
+    } = this.data
+
+    // 1. 验证必填项
+    if (!selectedTypeId) {
+      wx.showToast({ title: '请选择订单类型', icon: 'none' })
+      return false
+    }
+    if (!dingdanJieshao.trim()) {
+      wx.showToast({ title: '请输入订单介绍', icon: 'none' })
+      return false
+    }
+    if (!laobanName.trim()) {
+      wx.showToast({ title: '请输入老板游戏昵称', icon: 'none' })
+      return false
+    }
+    if (!jiage) {
+      wx.showToast({ title: '请输入订单价格', icon: 'none' })
+      return false
+    }
+
+    // 2. 验证价格格式和范围
+    const price = parseFloat(jiage)
+    if (isNaN(price) || price < 0.1 || price > 10000) {
+      wx.showToast({ title: '价格需在0.1-10000元之间', icon: 'none' })
+      return false
+    }
+    if (jiage.includes('.') && jiage.split('.')[1].length > 2) {
+      wx.showToast({ title: '最多支持两位小数', icon: 'none' })
+      return false
+    }
+
+    // 3. 验证佣金要求（若开启）
+    if (commissionEnabled) {
+      const commission = parseFloat(commissionValue)
+      if (isNaN(commission) || commission <= 0) {
+        wx.showToast({ title: '请输入有效的佣金金额', icon: 'none' })
+        return false
+      }
+      if (commission > 50000) {
+        wx.showToast({ title: '佣金建议不超过50000元', icon: 'none' })
+        return false
+      }
+    }
+
+    // 4. 验证余额是否足够
+    const balance = parseFloat(sjyue)
+    if (price > balance) {
+      wx.showModal({
+        title: '余额不足',
+        content: `当前余额${sjyue}元，需要${jiage}元。请先充值。`,
+        confirmText: '去充值',
+        success: (res) => {
+          if (res.confirm) {
+            wx.navigateTo({
+              url: '/pages/merchant-recharge/merchant-recharge'
+            })
+          }
+        }
+      })
+      return false
+    }
+
+    return true
+  },
+
+  // 重置表单（保留商品类型选中状态）
+  resetForm() {
+    this.setData({
+      dingdanJieshao: '',
+      dingdanBeizhu: '',
+      laobanName: '',
+      zhidingUid: '',
+      jiage: '',
+      selectedLabelId: '',
+      selectedLabelName: '',
+      commissionEnabled: false,
+      commissionValue: ''
+    })
+    // 重置选中第一个商品类型（可选）
+    if (this.data.shangpinList.length > 0) {
+      this.setSelectedType(this.data.shangpinList[0])
+    }
+  },
+
+  // 提交派单
+  async onSubmit() {
+    if (this.data.isSubmitting) return
+    if (!this.validateForm()) return
+
+    this.setData({ isSubmitting: true })
+
+    // 准备提交数据（原有字段 + 新增字段）
+    const postData = {
+      // 原有必传字段
+      shangpinTypeId: this.data.selectedTypeId,
+      huiyuanId: this.data.selectedHuiyuanId,
+      yaoqiuleixing: this.data.selectedYaoqiuleixing,
+      dingdanJieshao: this.data.dingdanJieshao.trim(),
+      dingdanBeizhu: this.data.dingdanBeizhu.trim() || '',
+      laobanName: this.data.laobanName.trim(),
+      zhidingUid: this.data.zhidingUid.trim() || '',
+      jiage: this.data.jiage,
+      // 新增字段
+      labelId: this.data.selectedLabelId || '',
+      labelName: this.data.selectedLabelName || '',
+      commissionEnabled: this.data.commissionEnabled,
+      commissionValue: this.data.commissionEnabled ? this.data.commissionValue : ''
+    }
+
+    try {
+      const res = await request({
+        url: '/dingdan/sjpaifa',
+        method: 'POST',
+        data: postData
+      })
+
+      if (res && res.data.code === 200) {
+        // 派单成功
+        wx.showToast({
+          title: '派单成功',
+          icon: 'success',
+          duration: 2000
+        })
+
+        // 更新全局变量中的商家信息（余额、发单量、流水）
+        const orderAmount = parseFloat(this.data.jiage)
+        const app = getApp()
+        if (app.globalData.shangjia) {
+          const newBalance = parseFloat(app.globalData.shangjia.sjyue || '0') - orderAmount
+          app.globalData.shangjia.sjyue = newBalance.toFixed(2)
+          app.globalData.shangjia.fadanzong = (parseInt(app.globalData.shangjia.fadanzong || '0') + 1).toString()
+          app.globalData.shangjia.riliushui = (parseFloat(app.globalData.shangjia.riliushui || '0') + orderAmount).toFixed(2)
+          app.globalData.shangjia.yueliushui = (parseFloat(app.globalData.shangjia.yueliushui || '0') + orderAmount).toFixed(2)
+          this.setData({ sjyue: app.globalData.shangjia.sjyue })
+        }
+
+        // 延迟重置表单，避免用户连续提交
+        setTimeout(() => {
+          this.resetForm()
+          this.setData({ isSubmitting: false })
+        }, 1500)
+      } else {
+        wx.showModal({
+          title: '派单失败',
+          content: res.data.msg || '请稍后重试',
+          showCancel: false
+        })
+        this.setData({ isSubmitting: false })
+      }
+    } catch (error) {
+      console.error('派单请求失败:', error)
+      wx.showModal({
+        title: '请求失败',
+        content: error.message || '网络错误，请检查连接',
+        showCancel: false
+      })
+      this.setData({ isSubmitting: false })
+    }
+  },
+
+  // ==================== 商品类型选择 ====================
+  onSelectType(e) {
+    const { id, item } = e.currentTarget.dataset
+    this.setSelectedType(item)
+  }
 })
\ No newline at end of file
diff --git a/pages/sjpaidan/sjpaidan.json b/pages/merchant-dispatch/merchant-dispatch.json
similarity index 100%
rename from pages/sjpaidan/sjpaidan.json
rename to pages/merchant-dispatch/merchant-dispatch.json
diff --git a/pages/sjpaidan/sjpaidan.wxml b/pages/merchant-dispatch/merchant-dispatch.wxml
similarity index 95%
rename from pages/sjpaidan/sjpaidan.wxml
rename to pages/merchant-dispatch/merchant-dispatch.wxml
index f679042..73a2f05 100644
--- a/pages/sjpaidan/sjpaidan.wxml
+++ b/pages/merchant-dispatch/merchant-dispatch.wxml
@@ -1,159 +1,159 @@
-<!-- pages/sjpaidan/sjpaidan.wxml -->
-<view class="page-container" style="background-image: url('{{bgImageUrl}}');">
-  <!-- 顶部商家余额展示 (黑金卡片) -->
-  <view class="balance-card">
-    <text class="balance-label">可用余额</text>
-    <view class="balance-amount">
-      <text class="amount-value">{{sjyue}}</text>
-      <text class="amount-unit">元</text>
-    </view>
-    <text class="balance-tip">派单将从此余额扣除</text>
-  </view>
-
-  <!-- 商品类型选择 (横向滑动) -->
-  <view class="section">
-    <text class="section-title">选择订单类型</text>
-    <scroll-view class="type-scroll" scroll-x="true" enable-flex>
-      <block wx:for="{{shangpinList}}" wx:key="id">
-        <view 
-          class="type-item {{selectedTypeId === item.id ? 'type-active' : ''}}"
-          data-id="{{item.id}}"
-          data-item="{{item}}"
-          bindtap="onSelectType"
-        >
-          <text class="type-text">{{item.jieshao}}</text>
-        </view>
-      </block>
-    </scroll-view>
-  </view>
-
-  <!-- 表单区域 -->
-  <view class="form-container">
-    <!-- 订单介绍 -->
-    <view class="form-item">
-      <text class="form-label required">订单介绍</text>
-      <input 
-        class="form-input" 
-        placeholder="请输入订单主要内容（必填，最多50字）" 
-        maxlength="50"
-        value="{{dingdanJieshao}}"
-        bindinput="onDingdanJieshaoInput"
-      />
-      <text class="word-count">{{dingdanJieshao.length}}/50</text>
-    </view>
-
-    <!-- 订单备注 -->
-    <view class="form-item">
-      <text class="form-label">订单备注（选填）</text>
-      <input 
-        class="form-input" 
-        placeholder="填写或补充其他信息" 
-        maxlength="50"
-        value="{{dingdanBeizhu}}"
-        bindinput="onDingdanBeizhuInput"
-      />
-      <text class="word-count">{{dingdanBeizhu.length}}/50</text>
-    </view>
-
-    <!-- 老板游戏昵称/UID -->
-    <view class="form-item">
-      <text class="form-label required">老板昵称/ID</text>
-      <input 
-        class="form-input" 
-        placeholder="请输入（必填，最多15字）" 
-        maxlength="15"
-        value="{{laobanName}}"
-        bindinput="onLaobanNameInput"
-      />
-      <text class="word-count">{{laobanName.length}}/15</text>
-    </view>
-
-    <!-- 指定打手UID -->
-    <view class="form-item">
-      <text class="form-label">指定UID（选填）</text>
-      <input 
-        class="form-input" 
-        placeholder="请输入指定UID" 
-        maxlength="10"
-        value="{{zhidingUid}}"
-        bindinput="onZhidingUidInput"
-      />
-    </view>
-
-    <!-- 订单价格 -->
-    <view class="form-item">
-      <text class="form-label required">订单价格（元）</text>
-      <input 
-        class="form-input" 
-        type="digit"
-        placeholder="0.1 - 10000，支持两位小数"
-        value="{{jiage}}"
-        bindinput="onJiageInput"
-      />
-      <text class="price-tip">范围：0.1 - 10000元</text>
-    </view>
-
-    <!-- 新增：抢单要求标签（从商品类型的称号列表选择） -->
-    <view class="form-item" wx:if="{{currentTypeChenghaoList.length > 0}}">
-      <text class="form-label">要求打手标签*如金牌打手（选填）</text>
-      <picker 
-        mode="selector" 
-        range="{{currentTypeChenghaoList}}" 
-        range-key="mingcheng" 
-        bindchange="onLabelChange"
-      >
-        <view class="picker-view">
-          <text>{{selectedLabelName || '无'}}</text>
-        </view>
-      </picker>
-    </view>
-
-    <!-- 新增：佣金要求（压金） -->
-    <view class="form-item commission-item">
-      <text class="form-label">要求打手押金（建议≤50元）</text>
-      <switch checked="{{commissionEnabled}}" bindchange="onCommissionToggle"/>
-      <input 
-        wx:if="{{commissionEnabled}}" 
-        class="commission-input" 
-        type="digit" 
-        placeholder="押金金额" 
-        value="{{commissionValue}}"
-        bindinput="onCommissionValueInput"
-      />
-    </view>
-  </view>
-
-  <!-- 立即派发按钮 -->
-  <view class="btn-container">
-    <view 
-      class="submit-btn {{isSubmitting ? 'btn-disabled' : ''}}" 
-      bindtap="onSubmit"
-      hover-class="btn-hover"
-    >
-      <text class="btn-text">{{isSubmitting ? '派发中...' : '立即派发'}}</text>
-    </view>
-  </view>
-
-  <!-- 加载遮罩 -->
-  <view class="loading-mask" wx:if="{{isLoading}}">
-    <view class="loading-content">
-      <view class="loading-spinner"></view>
-      <text class="loading-text">加载中...</text>
-    </view>
-  </view>
-
-  <!-- 全局通知组件 -->
-  <global-notification id="global-notification" />
-
-  <!-- 教程按钮（紧贴右侧，5秒后缩进） -->
-  <view 
-    class="tutorial-btn {{tutorialBtnHidden ? 'tutorial-btn-hidden' : ''}}"
-    bindtap="onTutorialBtnTap"
-    hover-class="tutorial-btn-hover"
-  >
-    <text class="tutorial-btn-text">教程</text>
-  </view>
-
-  <!-- 使用教程弹窗组件 -->
-  <popup-notice id="popupNotice" />
+<!-- pages/merchant-dispatch/merchant-dispatch.wxml -->
+<view class="page-container" style="background-image: url('{{bgImageUrl}}');">
+  <!-- 顶部商家余额展示 (黑金卡片) -->
+  <view class="balance-card">
+    <text class="balance-label">可用余额</text>
+    <view class="balance-amount">
+      <text class="amount-value">{{sjyue}}</text>
+      <text class="amount-unit">元</text>
+    </view>
+    <text class="balance-tip">派单将从此余额扣除</text>
+  </view>
+
+  <!-- 商品类型选择 (横向滑动) -->
+  <view class="section">
+    <text class="section-title">选择订单类型</text>
+    <scroll-view class="type-scroll" scroll-x="true" enable-flex>
+      <block wx:for="{{shangpinList}}" wx:key="id">
+        <view 
+          class="type-item {{selectedTypeId === item.id ? 'type-active' : ''}}"
+          data-id="{{item.id}}"
+          data-item="{{item}}"
+          bindtap="onSelectType"
+        >
+          <text class="type-text">{{item.jieshao}}</text>
+        </view>
+      </block>
+    </scroll-view>
+  </view>
+
+  <!-- 表单区域 -->
+  <view class="form-container">
+    <!-- 订单介绍 -->
+    <view class="form-item">
+      <text class="form-label required">订单介绍</text>
+      <input 
+        class="form-input" 
+        placeholder="请输入订单主要内容（必填，最多50字）" 
+        maxlength="50"
+        value="{{dingdanJieshao}}"
+        bindinput="onDingdanJieshaoInput"
+      />
+      <text class="word-count">{{dingdanJieshao.length}}/50</text>
+    </view>
+
+    <!-- 订单备注 -->
+    <view class="form-item">
+      <text class="form-label">订单备注（选填）</text>
+      <input 
+        class="form-input" 
+        placeholder="填写或补充其他信息" 
+        maxlength="50"
+        value="{{dingdanBeizhu}}"
+        bindinput="onDingdanBeizhuInput"
+      />
+      <text class="word-count">{{dingdanBeizhu.length}}/50</text>
+    </view>
+
+    <!-- 老板游戏昵称/UID -->
+    <view class="form-item">
+      <text class="form-label required">老板昵称/ID</text>
+      <input 
+        class="form-input" 
+        placeholder="请输入（必填，最多15字）" 
+        maxlength="15"
+        value="{{laobanName}}"
+        bindinput="onLaobanNameInput"
+      />
+      <text class="word-count">{{laobanName.length}}/15</text>
+    </view>
+
+    <!-- 指定打手UID -->
+    <view class="form-item">
+      <text class="form-label">指定UID（选填）</text>
+      <input 
+        class="form-input" 
+        placeholder="请输入指定UID" 
+        maxlength="10"
+        value="{{zhidingUid}}"
+        bindinput="onZhidingUidInput"
+      />
+    </view>
+
+    <!-- 订单价格 -->
+    <view class="form-item">
+      <text class="form-label required">订单价格（元）</text>
+      <input 
+        class="form-input" 
+        type="digit"
+        placeholder="0.1 - 10000，支持两位小数"
+        value="{{jiage}}"
+        bindinput="onJiageInput"
+      />
+      <text class="price-tip">范围：0.1 - 10000元</text>
+    </view>
+
+    <!-- 新增：抢单要求标签（从商品类型的称号列表选择） -->
+    <view class="form-item" wx:if="{{currentTypeChenghaoList.length > 0}}">
+      <text class="form-label">要求打手标签*如金牌打手（选填）</text>
+      <picker 
+        mode="selector" 
+        range="{{currentTypeChenghaoList}}" 
+        range-key="mingcheng" 
+        bindchange="onLabelChange"
+      >
+        <view class="picker-view">
+          <text>{{selectedLabelName || '无'}}</text>
+        </view>
+      </picker>
+    </view>
+
+    <!-- 新增：佣金要求（压金） -->
+    <view class="form-item commission-item">
+      <text class="form-label">要求打手押金（建议≤50元）</text>
+      <switch checked="{{commissionEnabled}}" bindchange="onCommissionToggle"/>
+      <input 
+        wx:if="{{commissionEnabled}}" 
+        class="commission-input" 
+        type="digit" 
+        placeholder="押金金额" 
+        value="{{commissionValue}}"
+        bindinput="onCommissionValueInput"
+      />
+    </view>
+  </view>
+
+  <!-- 立即派发按钮 -->
+  <view class="btn-container">
+    <view 
+      class="submit-btn {{isSubmitting ? 'btn-disabled' : ''}}" 
+      bindtap="onSubmit"
+      hover-class="btn-hover"
+    >
+      <text class="btn-text">{{isSubmitting ? '派发中...' : '立即派发'}}</text>
+    </view>
+  </view>
+
+  <!-- 加载遮罩 -->
+  <view class="loading-mask" wx:if="{{isLoading}}">
+    <view class="loading-content">
+      <view class="loading-spinner"></view>
+      <text class="loading-text">加载中...</text>
+    </view>
+  </view>
+
+  <!-- 全局通知组件 -->
+  <global-notification id="global-notification" />
+
+  <!-- 教程按钮（紧贴右侧，5秒后缩进） -->
+  <view 
+    class="tutorial-btn {{tutorialBtnHidden ? 'tutorial-btn-hidden' : ''}}"
+    bindtap="onTutorialBtnTap"
+    hover-class="tutorial-btn-hover"
+  >
+    <text class="tutorial-btn-text">教程</text>
+  </view>
+
+  <!-- 使用教程弹窗组件 -->
+  <popup-notice id="popupNotice" />
 </view>
\ No newline at end of file
diff --git a/pages/sjpaidan/sjpaidan.wxss b/pages/merchant-dispatch/merchant-dispatch.wxss
similarity index 95%
rename from pages/sjpaidan/sjpaidan.wxss
rename to pages/merchant-dispatch/merchant-dispatch.wxss
index b61cb0d..949c6b7 100644
--- a/pages/sjpaidan/sjpaidan.wxss
+++ b/pages/merchant-dispatch/merchant-dispatch.wxss
@@ -1,374 +1,374 @@
-/* pages/sjpaidan/sjpaidan.wxss - 黑金升级版 + 背景图由js动态拼接 */
-page {
-    background-color: #0a0a0f;
-  }
-  
-  .page-container {
-    min-height: 100vh;
-    /* 背景图通过内联 style 动态设置，此处不再写死 */
-    background-size: cover;
-    background-position: center;
-    background-attachment: fixed;
-    position: relative;
-    padding: 30rpx;
-    box-sizing: border-box;
-    padding-bottom: 140rpx;
-  }
-  
-  /* 半透明遮罩增强文字可读性 - 不使用通配符 */
-  .page-container::before {
-    content: '';
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(10, 10, 15, 0.75);
-    backdrop-filter: blur(6rpx);
-    z-index: 0;
-    pointer-events: none;
-  }
-  
-  /* 所有直接子元素手动提升层级（替代 * 选择器） */
-  .balance-card,
-  .section,
-  .form-container,
-  .btn-container,
-  .loading-mask {
-    position: relative;
-    z-index: 1;
-  }
-  
-  /* 余额卡片 - 黑金风格 */
-  .balance-card {
-    background: linear-gradient(135deg, rgba(20,20,30,0.95), rgba(30,30,50,0.95));
-    border-radius: 24rpx;
-    padding: 36rpx;
-    margin-bottom: 40rpx;
-    color: #fff;
-    box-shadow: 0 15rpx 35rpx rgba(0,0,0,0.4), 0 0 40rpx rgba(0,180,255,0.15);
-    text-align: center;
-    border: 1.5rpx solid rgba(0,180,255,0.2);
-    backdrop-filter: blur(10rpx);
-    overflow: hidden;
-  }
-  .balance-card::before {
-    content: '';
-    position: absolute;
-    top: -50%; left: -50%;
-    width: 200%; height: 200%;
-    background: linear-gradient(45deg, transparent 30%, rgba(0,180,255,0.1) 50%, transparent 70%);
-    animation: cardShine 6s infinite linear;
-    z-index: 1;
-  }
-  @keyframes cardShine {
-    0% { transform: translateX(-100%) translateY(-100%) rotate(45deg); }
-    100% { transform: translateX(100%) translateY(100%) rotate(45deg); }
-  }
-  .balance-label {
-    font-size: 28rpx;
-    color: rgba(255,255,255,0.8);
-    margin-bottom: 18rpx;
-    font-weight: 500;
-    position: relative;
-    z-index: 2;
-  }
-  .balance-amount {
-    display: flex;
-    align-items: baseline;
-    justify-content: center;
-    margin-bottom: 15rpx;
-    position: relative;
-    z-index: 2;
-  }
-  .amount-value {
-    font-size: 64rpx;
-    font-weight: bold;
-    color: #FFD700;
-    text-shadow: 0 0 20rpx rgba(255,215,0,0.7);
-    animation: amountGlow 3s infinite alternate;
-  }
-  @keyframes amountGlow {
-    0% { color: #FFD700; text-shadow: 0 0 15rpx rgba(255,215,0,0.6); }
-    100% { color: #FFE44D; text-shadow: 0 0 25rpx rgba(255,215,0,0.9); }
-  }
-  .amount-unit {
-    font-size: 36rpx;
-    color: #FFD700;
-    margin-left: 12rpx;
-    font-weight: 500;
-  }
-  .balance-tip {
-    font-size: 24rpx;
-    color: rgba(255,255,255,0.6);
-    position: relative;
-    z-index: 2;
-  }
-  
-  /* 区域标题 */
-  .section {
-    margin-bottom: 35rpx;
-  }
-  .section-title {
-    font-size: 32rpx;
-    font-weight: 700;
-    color: #FFFFFF;
-    margin-bottom: 25rpx;
-    padding-left: 12rpx;
-    border-left: 6rpx solid #9C27B0;
-    text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.3);
-  }
-  
-  /* 商品类型横向滚动 */
-  .type-scroll {
-    white-space: nowrap;
-    display: flex;
-    height: 90rpx;
-  }
-  .type-item {
-    display: inline-flex;
-    flex-shrink: 0;
-    align-items: center;
-    justify-content: center;
-    height: 85rpx;
-    padding: 0 40rpx;
-    margin-right: 20rpx;
-    background: rgba(255,255,255,0.08);
-    border-radius: 45rpx;
-    border: 2rpx solid rgba(255,255,255,0.15);
-    font-size: 28rpx;
-    color: rgba(255,255,255,0.8);
-    transition: all 0.3s cubic-bezier(0.175,0.885,0.32,1.275);
-    backdrop-filter: blur(10rpx);
-  }
-  .type-active {
-    background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%);
-    border-color: #9C27B0;
-    color: white;
-    transform: scale(1.05);
-    box-shadow: 0 10rpx 25rpx rgba(156,39,176,0.4);
-  }
-  .type-text {
-    max-width: 220rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-weight: 500;
-  }
-  
-  /* 表单容器 - 玻璃态 */
-  .form-container {
-    background: rgba(30,30,45,0.85);
-    backdrop-filter: blur(20rpx);
-    border-radius: 30rpx;
-    padding: 30rpx;
-    box-shadow: 0 10rpx 30rpx rgba(0,0,0,0.3);
-    border: 1.5rpx solid rgba(255,255,255,0.1);
-    margin-bottom: 40rpx;
-  }
-  .form-item {
-    margin-bottom: 35rpx;
-    position: relative;
-  }
-  .form-item:last-child {
-    margin-bottom: 0;
-  }
-  .form-label {
-    font-size: 30rpx;
-    font-weight: 600;
-    color: rgba(255,255,255,0.9);
-    display: block;
-    margin-bottom: 15rpx;
-  }
-  .form-label.required::after {
-    content: '*';
-    color: #ff4444;
-    margin-left: 8rpx;
-  }
-  .form-input {
-    width: 100%;
-    height: 80rpx;
-    background: rgba(255,255,255,0.1);
-    border-radius: 16rpx;
-    padding: 0 25rpx;
-    font-size: 28rpx;
-    color: #FFFFFF;
-    border: 2rpx solid rgba(255,255,255,0.2);
-    box-sizing: border-box;
-    transition: all 0.3s;
-  }
-  .form-input:focus {
-    border-color: #9C27B0;
-    background: rgba(255,255,255,0.15);
-  }
-  .word-count {
-    position: absolute;
-    right: 0;
-    top: 0;
-    font-size: 24rpx;
-    color: rgba(255,255,255,0.5);
-  }
-  .price-tip {
-    font-size: 24rpx;
-    color: rgba(255,255,255,0.5);
-    margin-top: 10rpx;
-    display: block;
-  }
-  .picker-view {
-    background: rgba(255,255,255,0.1);
-    border-radius: 16rpx;
-    padding: 20rpx 25rpx;
-    border: 2rpx solid rgba(255,255,255,0.2);
-    color: rgba(255,255,255,0.9);
-    font-size: 28rpx;
-  }
-  .commission-item {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 20rpx;
-  }
-  .commission-item .form-label {
-    width: 100%;
-    margin-bottom: 10rpx;
-  }
-  .commission-input {
-    flex: 1;
-    background: rgba(255,255,255,0.1);
-    border-radius: 16rpx;
-    padding: 20rpx;
-    color: #fff;
-    border: 2rpx solid rgba(255,255,255,0.2);
-    font-size: 28rpx;
-  }
-  
-  /* 提交按钮区域 */
-  .btn-container {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    background: linear-gradient(to top, rgba(10,10,15,0.95), transparent);
-    padding: 30rpx;
-    box-sizing: border-box;
-    z-index: 9999;
-  }
-  .submit-btn {
-    background: linear-gradient(135deg, #ff4444 0%, #cc0000 100%);
-    border-radius: 50rpx;
-    height: 90rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    box-shadow: 0 10rpx 30rpx rgba(255,68,68,0.3);
-    transition: all 0.3s;
-    position: relative;
-    overflow: hidden;
-  }
-  .submit-btn::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: -100%;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent);
-    animation: shine 2s infinite;
-  }
-  .btn-hover {
-    transform: translateY(-2rpx);
-    box-shadow: 0 15rpx 40rpx rgba(255,68,68,0.4);
-  }
-  .btn-disabled {
-    opacity: 0.6;
-    filter: grayscale(0.3);
-    pointer-events: none;
-  }
-  .btn-text {
-    font-size: 36rpx;
-    font-weight: bold;
-    color: white;
-    letter-spacing: 4rpx;
-    position: relative;
-    z-index: 2;
-  }
-  @keyframes shine {
-    0% { left: -100%; }
-    100% { left: 100%; }
-  }
-  
-  /* 加载遮罩 */
-  .loading-mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0,0,0,0.8);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 10000;
-  }
-  .loading-content {
-    background: rgba(40,40,60,0.95);
-    padding: 60rpx 80rpx;
-    border-radius: 30rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    box-shadow: 0 25rpx 70rpx rgba(0,0,0,0.6);
-  }
-  .loading-spinner {
-    width: 90rpx;
-    height: 90rpx;
-    border: 8rpx solid rgba(0,180,255,0.2);
-    border-top: 8rpx solid #00B4FF;
-    border-radius: 50%;
-    animation: spin 1.2s linear infinite;
-    margin-bottom: 35rpx;
-  }
-  .loading-text {
-    font-size: 30rpx;
-    color: #00B4FF;
-    font-weight: 600;
-  }
-  @keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-  
-  /* ========== 教程按钮样式（修改后：右上角，更大更显眼） ========== */
-  .tutorial-btn {
-    position: fixed;
-    right: 0;
-    top: 20%;                /* 右上区域，不再是垂直居中 */
-    transform: translateY(-50%);
-    width: 120rpx;           /* 增大宽度 */
-    height: 120rpx;          /* 增大高度 */
-    background: rgba(0, 0, 0, 0.75);
-    backdrop-filter: blur(15rpx);
-    border-radius: 60rpx 0 0 60rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 10001;
-    box-shadow: -8rpx 0 20rpx rgba(0,0,0,0.3);
-    transition: right 0.3s ease-out;
-    border: 2rpx solid rgba(255,215,0,0.5);
-    border-right: none;
-  }
-  .tutorial-btn-text {
-    color: #FFD700;
-    font-size: 36rpx;        /* 文字更大 */
-    font-weight: bold;
-    writing-mode: vertical-rl;
-    letter-spacing: 6rpx;
-  }
-  .tutorial-btn-hidden {
-    right: -80rpx;           /* 缩进后只露出约40rpx边缘 */
-  }
-  .tutorial-btn-hover {
-    background: rgba(0, 0, 0, 0.9);
-    transform: translateY(-50%) scale(1.05);
+/* pages/merchant-dispatch/merchant-dispatch.wxss - 黑金升级版 + 背景图由js动态拼接 */
+page {
+    background-color: #0a0a0f;
+  }
+  
+  .page-container {
+    min-height: 100vh;
+    /* 背景图通过内联 style 动态设置，此处不再写死 */
+    background-size: cover;
+    background-position: center;
+    background-attachment: fixed;
+    position: relative;
+    padding: 30rpx;
+    box-sizing: border-box;
+    padding-bottom: 140rpx;
+  }
+  
+  /* 半透明遮罩增强文字可读性 - 不使用通配符 */
+  .page-container::before {
+    content: '';
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(10, 10, 15, 0.75);
+    backdrop-filter: blur(6rpx);
+    z-index: 0;
+    pointer-events: none;
+  }
+  
+  /* 所有直接子元素手动提升层级（替代 * 选择器） */
+  .balance-card,
+  .section,
+  .form-container,
+  .btn-container,
+  .loading-mask {
+    position: relative;
+    z-index: 1;
+  }
+  
+  /* 余额卡片 - 黑金风格 */
+  .balance-card {
+    background: linear-gradient(135deg, rgba(20,20,30,0.95), rgba(30,30,50,0.95));
+    border-radius: 24rpx;
+    padding: 36rpx;
+    margin-bottom: 40rpx;
+    color: #fff;
+    box-shadow: 0 15rpx 35rpx rgba(0,0,0,0.4), 0 0 40rpx rgba(0,180,255,0.15);
+    text-align: center;
+    border: 1.5rpx solid rgba(0,180,255,0.2);
+    backdrop-filter: blur(10rpx);
+    overflow: hidden;
+  }
+  .balance-card::before {
+    content: '';
+    position: absolute;
+    top: -50%; left: -50%;
+    width: 200%; height: 200%;
+    background: linear-gradient(45deg, transparent 30%, rgba(0,180,255,0.1) 50%, transparent 70%);
+    animation: cardShine 6s infinite linear;
+    z-index: 1;
+  }
+  @keyframes cardShine {
+    0% { transform: translateX(-100%) translateY(-100%) rotate(45deg); }
+    100% { transform: translateX(100%) translateY(100%) rotate(45deg); }
+  }
+  .balance-label {
+    font-size: 28rpx;
+    color: rgba(255,255,255,0.8);
+    margin-bottom: 18rpx;
+    font-weight: 500;
+    position: relative;
+    z-index: 2;
+  }
+  .balance-amount {
+    display: flex;
+    align-items: baseline;
+    justify-content: center;
+    margin-bottom: 15rpx;
+    position: relative;
+    z-index: 2;
+  }
+  .amount-value {
+    font-size: 64rpx;
+    font-weight: bold;
+    color: #FFD700;
+    text-shadow: 0 0 20rpx rgba(255,215,0,0.7);
+    animation: amountGlow 3s infinite alternate;
+  }
+  @keyframes amountGlow {
+    0% { color: #FFD700; text-shadow: 0 0 15rpx rgba(255,215,0,0.6); }
+    100% { color: #FFE44D; text-shadow: 0 0 25rpx rgba(255,215,0,0.9); }
+  }
+  .amount-unit {
+    font-size: 36rpx;
+    color: #FFD700;
+    margin-left: 12rpx;
+    font-weight: 500;
+  }
+  .balance-tip {
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.6);
+    position: relative;
+    z-index: 2;
+  }
+  
+  /* 区域标题 */
+  .section {
+    margin-bottom: 35rpx;
+  }
+  .section-title {
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #FFFFFF;
+    margin-bottom: 25rpx;
+    padding-left: 12rpx;
+    border-left: 6rpx solid #9C27B0;
+    text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.3);
+  }
+  
+  /* 商品类型横向滚动 */
+  .type-scroll {
+    white-space: nowrap;
+    display: flex;
+    height: 90rpx;
+  }
+  .type-item {
+    display: inline-flex;
+    flex-shrink: 0;
+    align-items: center;
+    justify-content: center;
+    height: 85rpx;
+    padding: 0 40rpx;
+    margin-right: 20rpx;
+    background: rgba(255,255,255,0.08);
+    border-radius: 45rpx;
+    border: 2rpx solid rgba(255,255,255,0.15);
+    font-size: 28rpx;
+    color: rgba(255,255,255,0.8);
+    transition: all 0.3s cubic-bezier(0.175,0.885,0.32,1.275);
+    backdrop-filter: blur(10rpx);
+  }
+  .type-active {
+    background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%);
+    border-color: #9C27B0;
+    color: white;
+    transform: scale(1.05);
+    box-shadow: 0 10rpx 25rpx rgba(156,39,176,0.4);
+  }
+  .type-text {
+    max-width: 220rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-weight: 500;
+  }
+  
+  /* 表单容器 - 玻璃态 */
+  .form-container {
+    background: rgba(30,30,45,0.85);
+    backdrop-filter: blur(20rpx);
+    border-radius: 30rpx;
+    padding: 30rpx;
+    box-shadow: 0 10rpx 30rpx rgba(0,0,0,0.3);
+    border: 1.5rpx solid rgba(255,255,255,0.1);
+    margin-bottom: 40rpx;
+  }
+  .form-item {
+    margin-bottom: 35rpx;
+    position: relative;
+  }
+  .form-item:last-child {
+    margin-bottom: 0;
+  }
+  .form-label {
+    font-size: 30rpx;
+    font-weight: 600;
+    color: rgba(255,255,255,0.9);
+    display: block;
+    margin-bottom: 15rpx;
+  }
+  .form-label.required::after {
+    content: '*';
+    color: #ff4444;
+    margin-left: 8rpx;
+  }
+  .form-input {
+    width: 100%;
+    height: 80rpx;
+    background: rgba(255,255,255,0.1);
+    border-radius: 16rpx;
+    padding: 0 25rpx;
+    font-size: 28rpx;
+    color: #FFFFFF;
+    border: 2rpx solid rgba(255,255,255,0.2);
+    box-sizing: border-box;
+    transition: all 0.3s;
+  }
+  .form-input:focus {
+    border-color: #9C27B0;
+    background: rgba(255,255,255,0.15);
+  }
+  .word-count {
+    position: absolute;
+    right: 0;
+    top: 0;
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.5);
+  }
+  .price-tip {
+    font-size: 24rpx;
+    color: rgba(255,255,255,0.5);
+    margin-top: 10rpx;
+    display: block;
+  }
+  .picker-view {
+    background: rgba(255,255,255,0.1);
+    border-radius: 16rpx;
+    padding: 20rpx 25rpx;
+    border: 2rpx solid rgba(255,255,255,0.2);
+    color: rgba(255,255,255,0.9);
+    font-size: 28rpx;
+  }
+  .commission-item {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 20rpx;
+  }
+  .commission-item .form-label {
+    width: 100%;
+    margin-bottom: 10rpx;
+  }
+  .commission-input {
+    flex: 1;
+    background: rgba(255,255,255,0.1);
+    border-radius: 16rpx;
+    padding: 20rpx;
+    color: #fff;
+    border: 2rpx solid rgba(255,255,255,0.2);
+    font-size: 28rpx;
+  }
+  
+  /* 提交按钮区域 */
+  .btn-container {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: linear-gradient(to top, rgba(10,10,15,0.95), transparent);
+    padding: 30rpx;
+    box-sizing: border-box;
+    z-index: 9999;
+  }
+  .submit-btn {
+    background: linear-gradient(135deg, #ff4444 0%, #cc0000 100%);
+    border-radius: 50rpx;
+    height: 90rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0 10rpx 30rpx rgba(255,68,68,0.3);
+    transition: all 0.3s;
+    position: relative;
+    overflow: hidden;
+  }
+  .submit-btn::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent);
+    animation: shine 2s infinite;
+  }
+  .btn-hover {
+    transform: translateY(-2rpx);
+    box-shadow: 0 15rpx 40rpx rgba(255,68,68,0.4);
+  }
+  .btn-disabled {
+    opacity: 0.6;
+    filter: grayscale(0.3);
+    pointer-events: none;
+  }
+  .btn-text {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: white;
+    letter-spacing: 4rpx;
+    position: relative;
+    z-index: 2;
+  }
+  @keyframes shine {
+    0% { left: -100%; }
+    100% { left: 100%; }
+  }
+  
+  /* 加载遮罩 */
+  .loading-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0,0,0,0.8);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10000;
+  }
+  .loading-content {
+    background: rgba(40,40,60,0.95);
+    padding: 60rpx 80rpx;
+    border-radius: 30rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    box-shadow: 0 25rpx 70rpx rgba(0,0,0,0.6);
+  }
+  .loading-spinner {
+    width: 90rpx;
+    height: 90rpx;
+    border: 8rpx solid rgba(0,180,255,0.2);
+    border-top: 8rpx solid #00B4FF;
+    border-radius: 50%;
+    animation: spin 1.2s linear infinite;
+    margin-bottom: 35rpx;
+  }
+  .loading-text {
+    font-size: 30rpx;
+    color: #00B4FF;
+    font-weight: 600;
+  }
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+  
+  /* ========== 教程按钮样式（修改后：右上角，更大更显眼） ========== */
+  .tutorial-btn {
+    position: fixed;
+    right: 0;
+    top: 20%;                /* 右上区域，不再是垂直居中 */
+    transform: translateY(-50%);
+    width: 120rpx;           /* 增大宽度 */
+    height: 120rpx;          /* 增大高度 */
+    background: rgba(0, 0, 0, 0.75);
+    backdrop-filter: blur(15rpx);
+    border-radius: 60rpx 0 0 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10001;
+    box-shadow: -8rpx 0 20rpx rgba(0,0,0,0.3);
+    transition: right 0.3s ease-out;
+    border: 2rpx solid rgba(255,215,0,0.5);
+    border-right: none;
+  }
+  .tutorial-btn-text {
+    color: #FFD700;
+    font-size: 36rpx;        /* 文字更大 */
+    font-weight: bold;
+    writing-mode: vertical-rl;
+    letter-spacing: 6rpx;
+  }
+  .tutorial-btn-hidden {
+    right: -80rpx;           /* 缩进后只露出约40rpx边缘 */
+  }
+  .tutorial-btn-hover {
+    background: rgba(0, 0, 0, 0.9);
+    transform: translateY(-50%) scale(1.05);
   }
\ No newline at end of file
diff --git a/pages/sjxiaoxi/sjxiaoxi.js b/pages/merchant-msg/merchant-msg.js
similarity index 100%
rename from pages/sjxiaoxi/sjxiaoxi.js
rename to pages/merchant-msg/merchant-msg.js
diff --git a/pages/sjxiaoxi/sjxiaoxi.json b/pages/merchant-msg/merchant-msg.json
similarity index 100%
rename from pages/sjxiaoxi/sjxiaoxi.json
rename to pages/merchant-msg/merchant-msg.json
diff --git a/pages/sjxiaoxi/sjxiaoxi.wxml b/pages/merchant-msg/merchant-msg.wxml
similarity index 100%
rename from pages/sjxiaoxi/sjxiaoxi.wxml
rename to pages/merchant-msg/merchant-msg.wxml
diff --git a/pages/sjxiaoxi/sjxiaoxi.wxss b/pages/merchant-msg/merchant-msg.wxss
similarity index 100%
rename from pages/sjxiaoxi/sjxiaoxi.wxss
rename to pages/merchant-msg/merchant-msg.wxss
diff --git a/pages/sjddxq/sjddxq.js b/pages/merchant-order-detail/merchant-order-detail.js
similarity index 96%
rename from pages/sjddxq/sjddxq.js
rename to pages/merchant-order-detail/merchant-order-detail.js
index b7fb27a..70437f0 100644
--- a/pages/sjddxq/sjddxq.js
+++ b/pages/merchant-order-detail/merchant-order-detail.js
@@ -1,835 +1,835 @@
-// pages/sjddxq/sjddxq.js - 商家订单详情（完整版，已添加罚款/退款操作及教程按钮）
-const app = getApp()
-import request from '../../utils/request.js'
-import PopupService from '../../services/popupService.js'   // 新增：导入弹窗服务
-
-Page({
-  data: {
-    jibenShuju: {
-      dingdan_id: '', tupian: '', jieshao: '', create_time: '',
-      jine: '', nicheng: '', beizhu: '', zhuangtai: 0, fadanpingtai: 0
-    },
-    dashouInfo: { yonghuid: '', nicheng: '', avatar: '' },
-    xiangxiShuju: {
-      dashou_jiaofu: [], dashou_liuyan: '', tuikuan_liyou: '', shangjia_liuyan: ''
-    },
-    fadanData: null,
-    fenhongLilv: 0,
-    xinDingdanId: '',
-    zhuangtaiYanseMap: {
-      1: '#E8F5E9', 2: '#E3F2FD', 3: '#F3E5F5', 4: '#FFF3E0',
-      5: '#FFEBEE', 6: '#EFEBE9', 7: '#E0F7FA', 8: '#FFF8E1'
-    },
-    zhuangtaiWenziMap: {
-      1: '已下单', 2: '进行中', 3: '已完成', 4: '退款中',
-      5: '已退款', 6: '退款失败', 7: '指定中', 8: '结算中'
-    },
-    isLoading: true,
-    showChexiaoModal: false, chexiaoLiyou: '', isChexiaoLoading: false,
-    showTuikuanModal: false, tuikuanLiyou: '', isTuikuanLoading: false,
-    showFakuanModal: false, fakuanLiyou: '', fakuanJine: '', yingxiangQiangdan: true, isFakuanLoading: false,
-    showGhDashouModal: false, isGhDashouLoading: false,
-    showJiesuanConfirm: false, isJiesuanLoading: false,
-    jiesuanPingfen: 0, jiesuanLiuyan: '',
-    xingxingData: [
-      { id: 1, active: false }, { id: 2, active: false }, { id: 3, active: false },
-      { id: 4, active: false }, { id: 5, active: false }
-    ],
-    currentIMUserId: '',
-
-    // ========== 新增：罚单/订单操作弹窗控制 ==========
-    showModifyFakuanModal: false,     // 修改罚款弹窗
-    modifyFakuanLiyou: '',            // 修改后的罚款理由
-    modifyFakuanJine: '',             // 修改后的罚款金额
-    showCancelFakuanModal: false,     // 撤销罚款弹窗
-    cancelFakuanLiyou: '',            // 撤销驳回理由
-    showResubmitFakuanModal: false,   // 再次申请罚款弹窗
-    resubmitFakuanLiyou: '',          // 再次申请的理由
-    resubmitFakuanJine: '',           // 再次申请的金额
-    showCancelTuikuanModal: false,    // 撤销退款申请弹窗
-    cancelTuikuanLiyou: '',           // 撤销退款理由
-    showModifyTuikuanModal: false,    // 修改退款理由弹窗
-    modifyTuikuanLiyou: '',           // 修改后的退款理由
-    // 教程按钮状态
-    tutorialBtnHidden: false
-  },
-
-  onLoad(options) {
-    wx.setNavigationBarTitle({ title: '订单详情' })
-    this.ensureIMConnection()
-    this.jiexiTiaozhuanCanshu(options)
-    // 新增：启动教程按钮定时器
-    this.startTutorialBtnTimer()
-  },
-
-  onShow() {
-    this.registerNotificationComponent()
-    this.ensureIMConnection()
-  },
-
-  onHide() {
-    // 页面隐藏时重置弹窗服务状态，避免影响其他页面
-    PopupService.reset()
-  },
-
-  onUnload() {
-    // 清除缩进定时器，避免内存泄漏
-    if (this.tutorialTimer) {
-      clearTimeout(this.tutorialTimer)
-    }
-    // 页面卸载时重置弹窗服务
-    PopupService.reset()
-  },
-
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification')
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      }
-    }
-  },
-
-  ensureIMConnection() {
-    const uid = wx.getStorageSync('uid')
-    if (!uid) return
-    const targetUserId = 'Sj' + uid
-    if (wx.goEasy && wx.goEasy.getConnectionStatus) {
-      const status = wx.goEasy.getConnectionStatus()
-      if (status === 'connected' || status === 'reconnected') {
-        const currentUserId = wx.goEasy.im ? wx.goEasy.im.userId : null
-        if (currentUserId === targetUserId) {
-          this.setData({ currentIMUserId: targetUserId })
-          return
-        } else {
-          wx.goEasy.disconnect()
-        }
-      }
-    }
-    this.connectGoEasy(targetUserId)
-  },
-
-  connectGoEasy(userId) {
-    let currentUser = app.globalData.currentUser
-    if (!currentUser) {
-      const uid = wx.getStorageSync('uid')
-      currentUser = {
-        id: uid,
-        name: '用户' + (uid ? uid.substring(0, 6) : ''),
-        avatar: app.globalData.ossImageUrl + app.globalData.morentouxiang
-      }
-    }
-    wx.goEasy.connect({
-      id: userId,
-      data: {
-        name: currentUser.name,
-        avatar: currentUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
-      },
-      onSuccess: () => {
-        this.setData({ currentIMUserId: userId })
-        try {
-          wx.setStorageSync('savedGoEasyConnection', JSON.stringify({
-            userId, identityType: 'shangjia', lastConnectTime: Date.now()
-          }))
-          wx.setStorageSync('goEasyUserId', userId)
-        } catch (e) {}
-      },
-      onFailed: (error) => {
-        if (error.code === 408) {
-          this.setData({ currentIMUserId: userId })
-        } else {
-          console.error('IM连接失败', error)
-        }
-      }
-    })
-  },
-
-  jiexiTiaozhuanCanshu(options) {
-    try {
-      const dingdanDataStr = options.dingdanData || ''
-      if (!dingdanDataStr) {
-        wx.showToast({ title: '订单数据错误', icon: 'none' })
-        setTimeout(() => wx.navigateBack(), 1500)
-        return
-      }
-      const dingdanData = JSON.parse(decodeURIComponent(dingdanDataStr))
-      let tupianUrl = dingdanData.tupian || ''
-      if (!tupianUrl) tupianUrl = this.getTupianUrl()
-      let jine = parseFloat(dingdanData.jine || 0)
-      if (isNaN(jine)) jine = 0
-      this.setData({
-        'jibenShuju.dingdan_id': dingdanData.dingdan_id || '',
-        'jibenShuju.tupian': tupianUrl,
-        'jibenShuju.jieshao': dingdanData.jieshao || '',
-        'jibenShuju.create_time': dingdanData.create_time || '',
-        'jibenShuju.jine': jine.toFixed(2),
-        'jibenShuju.nicheng': dingdanData.nicheng || '',
-        'jibenShuju.beizhu': dingdanData.beizhu || '',
-        'jibenShuju.zhuangtai': dingdanData.zhuangtai || 0,
-        'jibenShuju.fadanpingtai': dingdanData.fadanpingtai || 0,
-        isLoading: false
-      })
-      this.jiazaiXiangxiShuju(dingdanData.dingdan_id)
-    } catch (error) {
-      console.error('解析订单数据失败', error)
-      wx.showToast({ title: '数据解析失败', icon: 'none' })
-      setTimeout(() => wx.navigateBack(), 1500)
-    }
-  },
-
-  getTupianUrl() {
-    const cacheTouxiang = wx.getStorageSync('touxiang') || ''
-    let tupianPath = cacheTouxiang || app.globalData.morentouxiang || ''
-    const ossImageUrl = app.globalData.ossImageUrl || ''
-    if (tupianPath && ossImageUrl) {
-      if (tupianPath.startsWith('/')) tupianPath = tupianPath.substring(1)
-      return ossImageUrl + tupianPath
-    }
-    return ''
-  },
-
-  async jiazaiXiangxiShuju(dingdanId) {
-    if (!dingdanId) return
-    try {
-      const res = await request({
-        url: '/dingdan/sjddxq',
-        method: 'POST',
-        data: { dingdan_id: dingdanId },
-        header: { 'content-type': 'application/json' }
-      })
-      if (res && res.data.code === 0 && res.data.data) {
-        const d = res.data.data
-        let jiaofuList = d.dashou_jiaofu || []
-        jiaofuList = jiaofuList.map(url => {
-          if (url && !url.startsWith('http')) {
-            const oss = app.globalData.ossImageUrl || ''
-            return oss + url
-          }
-          return url
-        })
-        let dashouAvatar = d.dashou_avatar || ''
-        if (dashouAvatar && !dashouAvatar.startsWith('http')) {
-          dashouAvatar = (app.globalData.ossImageUrl || '') + dashouAvatar
-        }
-        this.setData({
-          'dashouInfo.yonghuid': d.dashou_yonghuid || '',
-          'dashouInfo.nicheng': d.dashou_nicheng || '',
-          'dashouInfo.avatar': dashouAvatar,
-          'xiangxiShuju.dashou_jiaofu': jiaofuList,
-          'xiangxiShuju.dashou_liuyan': d.dashou_liuyan || '',
-          'xiangxiShuju.tuikuan_liyou': d.tuikuan_liyou || '',
-          'xiangxiShuju.shangjia_liuyan': d.shangjia_liuyan || '',
-          fadanData: d.fadan || null,
-          fenhongLilv: parseFloat(d.fenhong_lilv) || 0,
-          xinDingdanId: d.xin_dingdan_id || '',
-          'jibenShuju.zhuangtai': d.zhuangtai || this.data.jibenShuju.zhuangtai
-        })
-      } else {
-        wx.showToast({ title: res?.data?.msg || '获取详情失败', icon: 'none' })
-      }
-    } catch (err) {
-      console.error('加载详情失败', err)
-      wx.showToast({ title: '网络错误', icon: 'none' })
-    }
-  },
-
-  fuzhiWenben(e) {
-    const text = e.currentTarget.dataset.text
-    if (!text) return
-    wx.setClipboardData({ data: text })
-    wx.showToast({ title: '已复制', icon: 'success' })
-  },
-
-  yulanTupian(e) {
-    const current = e.currentTarget.dataset.url
-    const urls = e.currentTarget.dataset.urls || [current]
-    wx.previewImage({ current, urls })
-  },
-
-  goToKefu() {
-    const kefuLink = app.globalData.kefuConfig?.link || ''
-    const corpId = app.globalData.kefuConfig?.enterpriseId || ''
-    if (!kefuLink || !corpId) {
-      wx.showToast({ title: '客服配置未加载', icon: 'none' })
-      return
-    }
-    wx.openCustomerServiceChat({
-      extInfo: { url: kefuLink },
-      corpId: corpId,
-      success: (res) => console.log('跳转客服成功', res),
-      fail: (err) => {
-        console.error('跳转客服失败', err)
-        wx.showToast({ title: '暂时无法连接客服', icon: 'none' })
-      }
-    })
-  },
-
-  // ===== 联系打手（替打手订阅 + 发机器人消息 + 跳转） =====
-  goToChatWithDashou() {
-    const uid = wx.getStorageSync('uid')
-    if (!uid) return
-
-    const orderId = this.data.jibenShuju.dingdan_id
-    if (!orderId) {
-      wx.showToast({ title: '订单ID缺失', icon: 'none' })
-      return
-    }
-
-    const targetUserId = 'Sj' + uid
-    if (this.data.currentIMUserId !== targetUserId) {
-      this.ensureIMConnection()
-      wx.showToast({ title: '连接中，请稍后再试', icon: 'none' })
-      return
-    }
-
-    const that = this
-    const groupName = this.data.jibenShuju.nicheng + '的订单群'
-    const isCross = this.data.jibenShuju.fadanpingtai || 0
-    const dashouUid = this.data.dashouInfo.yonghuid
-
-    // 第一步：商家自己订阅群组
-    wx.goEasy.im.subscribeGroup({
-      groupIds: [orderId],
-      onSuccess: () => {
-        // 如果有打手，则需要帮打手订阅并发送消息
-        if (dashouUid) {
-          that.bangDashouDingyue(orderId, dashouUid)
-            .then(() => {
-              that.tiaozhuanQunLiao(orderId, groupName, isCross)
-            })
-            .catch((err) => {
-              console.error('替打手订阅失败，仍可跳转群聊', err)
-              wx.showToast({ title: '通知打手可能失败', icon: 'none' })
-              that.tiaozhuanQunLiao(orderId, groupName, isCross)
-            })
-        } else {
-          // 无打手，直接跳转
-          that.tiaozhuanQunLiao(orderId, groupName, isCross)
-        }
-      },
-      onFailed: (error) => {
-        console.error('订阅群组失败', error)
-        wx.showToast({ title: '连接群聊失败', icon: 'none' })
-      }
-    })
-  },
-
-  // 帮打手订阅群组 + 发送机器人消息
-  bangDashouDingyue(orderId, dashouUid) {
-    return new Promise((resolve, reject) => {
-      const dashouImId = 'Ds' + dashouUid
-      const appkey = 'BC-32e2991c69bc47e1b538e73aaed37fc1' // 你的GoEasy AppKey
-      const restHost = 'https://rest-hz.goeasy.io'
-
-      // 1. 通过 REST API 为打手订阅群组
-      wx.request({
-        url: restHost + '/v2/im/subscribe-groups',
-        method: 'POST',
-        header: { 'content-type': 'application/json' },
-        data: {
-          appkey: appkey,
-          userIds: [dashouImId],
-          groupIds: [orderId]
-        },
-        success: (res) => {
-          if (res.data.code === 200) {
-            // 2. 订阅成功后，以打手身份发送一条系统消息
-            wx.request({
-              url: restHost + '/v2/im/message',
-              method: 'POST',
-              header: { 'content-type': 'application/json' },
-              data: {
-                appkey: appkey,
-                senderId: dashouImId,
-                senderData: { name: '系统通知', avatar: '' },
-                to: {
-                  type: 'group',
-                  id: orderId,
-                  data: { name: '订单群', avatar: '' }
-                },
-                type: 'text',
-                payload: '此消息为系统自动发送，打手看到后会尽快回复您。'
-              },
-              success: (msgRes) => {
-                if (msgRes.data.code === 200) {
-                  resolve()
-                } else {
-                  reject(new Error('发送消息失败'))
-                }
-              },
-              fail: reject
-            })
-          } else {
-            reject(new Error('订阅打手失败'))
-          }
-        },
-        fail: reject
-      })
-    })
-  },
-
-  // 跳转群聊页面
-  tiaozhuanQunLiao(orderId, groupName, isCross) {
-    const param = {
-      groupId: orderId,
-      orderId: orderId,
-      groupName: groupName,
-      groupAvatar: '',
-      isCross: isCross
-    }
-    wx.navigateTo({
-      url: '/pages/qunliaotian/qunliaotian?data=' + encodeURIComponent(JSON.stringify(param))
-    })
-  },
-
-  // ========== 以下所有业务功能完全保持不变 ==========
-  showGhDashouConfirm() { this.setData({ showGhDashouModal: true }) },
-  closeGhDashouModal() { this.setData({ showGhDashouModal: false }) },
-  async tijiaoGhDashou() {
-    if (this.data.isGhDashouLoading) return
-    this.setData({ isGhDashouLoading: true })
-    wx.showLoading({ title: '更换中...', mask: true })
-    try {
-      const res = await request({
-        url: '/dingdan/zxsjghds',
-        method: 'POST',
-        data: { dingdan_id: this.data.jibenShuju.dingdan_id },
-        header: { 'content-type': 'application/json' }
-      })
-      wx.hideLoading()
-      this.setData({ isGhDashouLoading: false, showGhDashouModal: false })
-      if (res && res.data.code === 0) {
-        this.setData({ xinDingdanId: res.data.data?.xin_dingdan_id || '' })
-        wx.showToast({ title: '更换成功', icon: 'success' })
-        this.jiazaiXiangxiShuju(this.data.jibenShuju.dingdan_id)
-      } else {
-        wx.showToast({ title: res?.data?.msg || '更换失败', icon: 'none' })
-      }
-    } catch (err) {
-      wx.hideLoading()
-      this.setData({ isGhDashouLoading: false, showGhDashouModal: false })
-      wx.showToast({ title: '网络错误', icon: 'none' })
-    }
-  },
-
-  showFakuanModal() { this.setData({ showFakuanModal: true, fakuanLiyou: '', fakuanJine: '', yingxiangQiangdan: true }) },
-  closeFakuanModal() { this.setData({ showFakuanModal: false }) },
-  inputFakuanLiyou(e) { this.setData({ fakuanLiyou: e.detail.value.slice(0, 50) }) },
-  inputFakuanJine(e) { this.setData({ fakuanJine: e.detail.value }) },
-  toggleQiangdan() { this.setData({ yingxiangQiangdan: !this.data.yingxiangQiangdan }) },
-  jisuanFenhong() {
-    const jine = parseFloat(this.data.fakuanJine)
-    if (isNaN(jine) || jine <= 0) return '0.00'
-    return (jine * this.data.fenhongLilv).toFixed(2)
-  },
-  async tijiaoFakuan() {
-    const { fakuanLiyou, fakuanJine, jibenShuju, dashouInfo } = this.data
-    if (!fakuanLiyou.trim()) { wx.showToast({ title: '请输入罚款原因', icon: 'none' }); return }
-    const jineNum = parseFloat(fakuanJine)
-    if (isNaN(jineNum) || jineNum <= 0) { wx.showToast({ title: '请输入正确的罚款金额', icon: 'none' }); return }
-    if (this.data.isFakuanLoading) return
-    this.setData({ isFakuanLoading: true })
-    wx.showLoading({ title: '提交中...', mask: true })
-    try {
-      const res = await request({
-        url: '/dingdan/sjfksq',
-        method: 'POST',
-        data: {
-          dingdan_id: jibenShuju.dingdan_id,
-          chufa_liyou: fakuanLiyou,
-          fakuanjine: jineNum.toFixed(2),
-          yingxiang_qiangdan: this.data.yingxiangQiangdan ? 1 : 0,
-          dashou_id: dashouInfo.yonghuid
-        },
-        header: { 'content-type': 'application/json' }
-      })
-      wx.hideLoading()
-      this.setData({ isFakuanLoading: false })
-      if (res && res.data.code === 0) {
-        wx.showToast({ title: '罚款申请已提交', icon: 'success' })
-        this.setData({ showFakuanModal: false })
-        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id)
-      } else {
-        wx.showToast({ title: res?.data?.msg || '提交失败', icon: 'none' })
-      }
-    } catch (err) {
-      wx.hideLoading()
-      this.setData({ isFakuanLoading: false })
-      wx.showToast({ title: '网络错误', icon: 'none' })
-    }
-  },
-
-  showChexiaoBtn() { this.setData({ showChexiaoModal: true, chexiaoLiyou: '' }) },
-  closeChexiaoModal() { this.setData({ showChexiaoModal: false }) },
-  shuruChexiaoLiyou(e) { this.setData({ chexiaoLiyou: e.detail.value.slice(0, 50) }) },
-  async tijiaoChexiao() {
-    if (this.data.isChexiaoLoading) return
-    const { chexiaoLiyou, jibenShuju } = this.data
-    if (!chexiaoLiyou.trim()) { wx.showToast({ title: '请输入撤销原因', icon: 'none' }); return }
-    this.setData({ isChexiaoLoading: true })
-    wx.showLoading({ title: '撤销中...', mask: true })
-    try {
-      const res = await request({
-        url: '/dingdan/sjchexiao',
-        method: 'POST',
-        data: { dingdan_id: jibenShuju.dingdan_id, chexiao_liyou: chexiaoLiyou },
-        header: { 'content-type': 'application/json' }
-      })
-      wx.hideLoading()
-      this.setData({ isChexiaoLoading: false })
-      if (res && res.data.code === 0) {
-        this.setData({ 'jibenShuju.zhuangtai': 5, showChexiaoModal: false })
-        wx.showToast({ title: '撤销成功', icon: 'success' })
-      } else {
-        wx.showToast({ title: res?.data?.msg || '撤销失败', icon: 'none' })
-      }
-    } catch (err) {
-      wx.hideLoading()
-      this.setData({ isChexiaoLoading: false })
-      wx.showToast({ title: '网络错误', icon: 'none' })
-    }
-  },
-
-  showTuikuanBtn() { this.setData({ showTuikuanModal: true, tuikuanLiyou: '' }) },
-  closeTuikuanModal() { this.setData({ showTuikuanModal: false }) },
-  shuruTuikuanLiyou(e) { this.setData({ tuikuanLiyou: e.detail.value.slice(0, 50) }) },
-  async tijiaoTuikuan() {
-    if (this.data.isTuikuanLoading) return
-    const { tuikuanLiyou, jibenShuju } = this.data
-    if (!tuikuanLiyou.trim()) { wx.showToast({ title: '请输入退款原因', icon: 'none' }); return }
-    this.setData({ isTuikuanLoading: true })
-    wx.showLoading({ title: '提交中...', mask: true })
-    try {
-      const res = await request({
-        url: '/dingdan/sjtkshenqing',
-        method: 'POST',
-        data: { dingdan_id: jibenShuju.dingdan_id, tuikuan_liyou: tuikuanLiyou },
-        header: { 'content-type': 'application/json' }
-      })
-      wx.hideLoading()
-      this.setData({ isTuikuanLoading: false })
-      if (res && res.data.code === 0) {
-        this.setData({ 'jibenShuju.zhuangtai': 4, showTuikuanModal: false })
-        wx.showToast({ title: '退款申请已提交', icon: 'success' })
-      } else {
-        wx.showToast({ title: res?.data?.msg || '失败', icon: 'none' })
-      }
-    } catch (err) {
-      wx.hideLoading()
-      this.setData({ isTuikuanLoading: false })
-      wx.showToast({ title: '网络错误', icon: 'none' })
-    }
-  },
-
-  dianjiXingxing(e) {
-    const pf = e.currentTarget.dataset.index
-    const newStars = this.data.xingxingData.map((item, idx) => ({ ...item, active: idx < pf }))
-    this.setData({ xingxingData: newStars, jiesuanPingfen: pf })
-  },
-  shuruLiuyan(e) { this.setData({ jiesuanLiuyan: e.detail.value.slice(0, 50) }) },
-  showJiesuanConfirm() { this.setData({ showJiesuanConfirm: true }) },
-  closeJiesuanConfirm() { this.setData({ showJiesuanConfirm: false }) },
-  async tijiaoJiesuan() {
-    if (this.data.isJiesuanLoading) return
-    this.setData({ isJiesuanLoading: true })
-    wx.showLoading({ title: '结算中...', mask: true })
-    try {
-      const res = await request({
-        url: '/dingdan/sjjiesuan',
-        method: 'POST',
-        data: {
-          dingdan_id: this.data.jibenShuju.dingdan_id,
-          pingfen: this.data.jiesuanPingfen,
-          liuyan: this.data.jiesuanLiuyan
-        },
-        header: { 'content-type': 'application/json' }
-      })
-      wx.hideLoading()
-      this.setData({ isJiesuanLoading: false, showJiesuanConfirm: false })
-      if (res && res.data.code === 0) {
-        this.setData({ 'jibenShuju.zhuangtai': 3 })
-        wx.showToast({ title: '结算成功', icon: 'success' })
-      } else {
-        wx.showToast({ title: res?.data?.msg || '结算失败', icon: 'none' })
-      }
-    } catch (err) {
-      wx.hideLoading()
-      this.setData({ isJiesuanLoading: false })
-      wx.showToast({ title: '网络错误', icon: 'none' })
-    }
-  },
-
-  // ========== 新增：罚款操作（修改/撤销/再次申请） ==========
-  // 显示修改罚款弹窗（仅当状态为待缴纳 或 申诉中 时可用）
-  showModifyFakuan() {
-    const status = this.data.fadanData?.zhuangtai;
-    if (status !== 1 && status !== 3) {
-      wx.showToast({ title: '当前状态不可修改罚款', icon: 'none' });
-      return;
-    }
-    this.setData({
-      showModifyFakuanModal: true,
-      modifyFakuanLiyou: this.data.fadanData?.chufaliyou || '',
-      modifyFakuanJine: this.data.fadanData?.fakuanjine || ''
-    });
-  },
-  closeModifyFakuanModal() {
-    this.setData({ showModifyFakuanModal: false });
-  },
-  inputModifyFakuanLiyou(e) {
-    this.setData({ modifyFakuanLiyou: e.detail.value.slice(0, 100) });
-  },
-  inputModifyFakuanJine(e) {
-    this.setData({ modifyFakuanJine: e.detail.value });
-  },
-  async submitModifyFakuan() {
-    const { modifyFakuanLiyou, modifyFakuanJine, fadanData, jibenShuju } = this.data;
-    if (!modifyFakuanLiyou.trim()) {
-      wx.showToast({ title: '请输入罚款理由', icon: 'none' }); return;
-    }
-    const jine = parseFloat(modifyFakuanJine);
-    if (isNaN(jine) || jine <= 0) {
-      wx.showToast({ title: '请输入正确的罚款金额', icon: 'none' }); return;
-    }
-    wx.showLoading({ title: '提交中...', mask: true });
-    try {
-      const res = await request({
-        url: '/dingdan/sjfkxgycx',
-        method: 'POST',
-        data: {
-          operation: 'modify_penalty',
-          fadan_id: fadanData.id,
-          dingdan_id: jibenShuju.dingdan_id,
-          liyou: modifyFakuanLiyou,
-          jine: jine.toFixed(2)
-        }
-      });
-      wx.hideLoading();
-      if (res && res.data.code === 0) {
-        wx.showToast({ title: '修改成功', icon: 'success' });
-        this.setData({ showModifyFakuanModal: false });
-        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id); // 刷新数据
-      } else {
-        wx.showToast({ title: res?.data?.msg || '修改失败', icon: 'none' });
-      }
-    } catch (err) {
-      wx.hideLoading();
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }
-  },
-
-  // 显示撤销罚款弹窗（待缴纳/申诉中 可撤销，变为已驳回）
-  showCancelFakuan() {
-    const status = this.data.fadanData?.zhuangtai;
-    if (status !== 1 && status !== 3) {
-      wx.showToast({ title: '当前状态不可撤销罚款', icon: 'none' });
-      return;
-    }
-    this.setData({ showCancelFakuanModal: true, cancelFakuanLiyou: '' });
-  },
-  closeCancelFakuanModal() {
-    this.setData({ showCancelFakuanModal: false });
-  },
-  inputCancelFakuanLiyou(e) {
-    this.setData({ cancelFakuanLiyou: e.detail.value.slice(0, 100) });
-  },
-  async submitCancelFakuan() {
-    const { cancelFakuanLiyou, fadanData, jibenShuju } = this.data;
-    if (!cancelFakuanLiyou.trim()) {
-      wx.showToast({ title: '请输入驳回理由', icon: 'none' }); return;
-    }
-    wx.showLoading({ title: '提交中...', mask: true });
-    try {
-      const res = await request({
-        url: '/dingdan/sjfkxgycx',
-        method: 'POST',
-        data: {
-          operation: 'cancel_penalty',
-          fadan_id: fadanData.id,
-          dingdan_id: jibenShuju.dingdan_id,
-          liyou: cancelFakuanLiyou
-        }
-      });
-      wx.hideLoading();
-      if (res && res.data.code === 0) {
-        wx.showToast({ title: '已撤销', icon: 'success' });
-        this.setData({ showCancelFakuanModal: false });
-        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
-      } else {
-        wx.showToast({ title: res?.data?.msg || '撤销失败', icon: 'none' });
-      }
-    } catch (err) {
-      wx.hideLoading();
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }
-  },
-
-  // 显示再次申请罚款弹窗（仅当状态为已驳回时可用）
-  showResubmitFakuan() {
-    if (this.data.fadanData?.zhuangtai !== 4) {
-      wx.showToast({ title: '当前状态不可再次申请', icon: 'none' });
-      return;
-    }
-    this.setData({
-      showResubmitFakuanModal: true,
-      resubmitFakuanLiyou: '',
-      resubmitFakuanJine: ''
-    });
-  },
-  closeResubmitFakuanModal() {
-    this.setData({ showResubmitFakuanModal: false });
-  },
-  inputResubmitFakuanLiyou(e) {
-    this.setData({ resubmitFakuanLiyou: e.detail.value.slice(0, 100) });
-  },
-  inputResubmitFakuanJine(e) {
-    this.setData({ resubmitFakuanJine: e.detail.value });
-  },
-  async submitResubmitFakuan() {
-    const { resubmitFakuanLiyou, resubmitFakuanJine, fadanData, jibenShuju } = this.data;
-    if (!resubmitFakuanLiyou.trim()) {
-      wx.showToast({ title: '请输入罚款理由', icon: 'none' }); return;
-    }
-    const jine = parseFloat(resubmitFakuanJine);
-    if (isNaN(jine) || jine <= 0) {
-      wx.showToast({ title: '请输入正确的罚款金额', icon: 'none' }); return;
-    }
-    wx.showLoading({ title: '提交中...', mask: true });
-    try {
-      const res = await request({
-        url: '/dingdan/sjfkxgycx',
-        method: 'POST',
-        data: {
-          operation: 'resubmit_penalty',
-          fadan_id: fadanData.id,
-          dingdan_id: jibenShuju.dingdan_id,
-          liyou: resubmitFakuanLiyou,
-          jine: jine.toFixed(2)
-        }
-      });
-      wx.hideLoading();
-      if (res && res.data.code === 0) {
-        wx.showToast({ title: '申请成功', icon: 'success' });
-        this.setData({ showResubmitFakuanModal: false });
-        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
-      } else {
-        wx.showToast({ title: res?.data?.msg || '申请失败', icon: 'none' });
-      }
-    } catch (err) {
-      wx.hideLoading();
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }
-  },
-
-  // ========== 新增：订单退款操作（撤销/修改理由） ==========
-  showCancelTuikuan() {
-    if (this.data.jibenShuju.zhuangtai !== 4) {
-      wx.showToast({ title: '只有退款中的订单可撤销', icon: 'none' });
-      return;
-    }
-    this.setData({ showCancelTuikuanModal: true, cancelTuikuanLiyou: '' });
-  },
-  closeCancelTuikuanModal() {
-    this.setData({ showCancelTuikuanModal: false });
-  },
-  inputCancelTuikuanLiyou(e) {
-    this.setData({ cancelTuikuanLiyou: e.detail.value.slice(0, 100) });
-  },
-  async submitCancelTuikuan() {
-    const { cancelTuikuanLiyou, jibenShuju } = this.data;
-    if (!cancelTuikuanLiyou.trim()) {
-      wx.showToast({ title: '请输入撤销理由', icon: 'none' }); return;
-    }
-    wx.showLoading({ title: '撤销中...', mask: true });
-    try {
-      const res = await request({
-        url: '/dingdan/sjfkxgycx',
-        method: 'POST',
-        data: {
-          operation: 'cancel_refund',
-          dingdan_id: jibenShuju.dingdan_id,
-          liyou: cancelTuikuanLiyou
-        }
-      });
-      wx.hideLoading();
-      if (res && res.data.code === 0) {
-        wx.showToast({ title: '已撤销退款申请', icon: 'success' });
-        this.setData({ showCancelTuikuanModal: false });
-        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
-      } else {
-        wx.showToast({ title: res?.data?.msg || '撤销失败', icon: 'none' });
-      }
-    } catch (err) {
-      wx.hideLoading();
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }
-  },
-
-  showModifyTuikuan() {
-    if (this.data.jibenShuju.zhuangtai !== 4) {
-      wx.showToast({ title: '只有退款中的订单可修改理由', icon: 'none' });
-      return;
-    }
-    this.setData({
-      showModifyTuikuanModal: true,
-      modifyTuikuanLiyou: this.data.xiangxiShuju.tuikuan_liyou || ''
-    });
-  },
-  closeModifyTuikuanModal() {
-    this.setData({ showModifyTuikuanModal: false });
-  },
-  inputModifyTuikuanLiyou(e) {
-    this.setData({ modifyTuikuanLiyou: e.detail.value.slice(0, 100) });
-  },
-  async submitModifyTuikuan() {
-    const { modifyTuikuanLiyou, jibenShuju } = this.data;
-    if (!modifyTuikuanLiyou.trim()) {
-      wx.showToast({ title: '请输入退款理由', icon: 'none' }); return;
-    }
-    wx.showLoading({ title: '修改中...', mask: true });
-    try {
-      const res = await request({
-        url: '/dingdan/sjfkxgycx',
-        method: 'POST',
-        data: {
-          operation: 'modify_refund_reason',
-          dingdan_id: jibenShuju.dingdan_id,
-          liyou: modifyTuikuanLiyou
-        }
-      });
-      wx.hideLoading();
-      if (res && res.data.code === 0) {
-        wx.showToast({ title: '修改成功', icon: 'success' });
-        this.setData({ showModifyTuikuanModal: false });
-        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
-      } else {
-        wx.showToast({ title: res?.data?.msg || '修改失败', icon: 'none' });
-      }
-    } catch (err) {
-      wx.hideLoading();
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }
-  },
-
-  // ========== 新增：教程按钮 ==========
-  startTutorialBtnTimer() {
-    if (this.tutorialTimer) clearTimeout(this.tutorialTimer);
-    this.tutorialTimer = setTimeout(() => {
-      this.setData({ tutorialBtnHidden: true });
-    }, 5000);
-  },
-  resetTutorialBtn() {
-    if (this.data.tutorialBtnHidden) {
-      this.setData({ tutorialBtnHidden: false });
-    }
-    if (this.tutorialTimer) clearTimeout(this.tutorialTimer);
-    this.tutorialTimer = setTimeout(() => {
-      this.setData({ tutorialBtnHidden: true });
-    }, 5000);
-  },
-  onTutorialBtnTap() {
-    this.resetTutorialBtn();
-    PopupService.checkAndShow(this, 'sjddxq1');
-  }
+// pages/merchant-order-detail/merchant-order-detail.js - 商家订单详情（完整版，已添加罚款/退款操作及教程按钮）
+const app = getApp()
+import request from '../../utils/request.js'
+import PopupService from '../../services/popupService.js'   // 新增：导入弹窗服务
+
+Page({
+  data: {
+    jibenShuju: {
+      dingdan_id: '', tupian: '', jieshao: '', create_time: '',
+      jine: '', nicheng: '', beizhu: '', zhuangtai: 0, fadanpingtai: 0
+    },
+    dashouInfo: { yonghuid: '', nicheng: '', avatar: '' },
+    xiangxiShuju: {
+      dashou_jiaofu: [], dashou_liuyan: '', tuikuan_liyou: '', shangjia_liuyan: ''
+    },
+    fadanData: null,
+    fenhongLilv: 0,
+    xinDingdanId: '',
+    zhuangtaiYanseMap: {
+      1: '#E8F5E9', 2: '#E3F2FD', 3: '#F3E5F5', 4: '#FFF3E0',
+      5: '#FFEBEE', 6: '#EFEBE9', 7: '#E0F7FA', 8: '#FFF8E1'
+    },
+    zhuangtaiWenziMap: {
+      1: '已下单', 2: '进行中', 3: '已完成', 4: '退款中',
+      5: '已退款', 6: '退款失败', 7: '指定中', 8: '结算中'
+    },
+    isLoading: true,
+    showChexiaoModal: false, chexiaoLiyou: '', isChexiaoLoading: false,
+    showTuikuanModal: false, tuikuanLiyou: '', isTuikuanLoading: false,
+    showFakuanModal: false, fakuanLiyou: '', fakuanJine: '', yingxiangQiangdan: true, isFakuanLoading: false,
+    showGhDashouModal: false, isGhDashouLoading: false,
+    showJiesuanConfirm: false, isJiesuanLoading: false,
+    jiesuanPingfen: 0, jiesuanLiuyan: '',
+    xingxingData: [
+      { id: 1, active: false }, { id: 2, active: false }, { id: 3, active: false },
+      { id: 4, active: false }, { id: 5, active: false }
+    ],
+    currentIMUserId: '',
+
+    // ========== 新增：罚单/订单操作弹窗控制 ==========
+    showModifyFakuanModal: false,     // 修改罚款弹窗
+    modifyFakuanLiyou: '',            // 修改后的罚款理由
+    modifyFakuanJine: '',             // 修改后的罚款金额
+    showCancelFakuanModal: false,     // 撤销罚款弹窗
+    cancelFakuanLiyou: '',            // 撤销驳回理由
+    showResubmitFakuanModal: false,   // 再次申请罚款弹窗
+    resubmitFakuanLiyou: '',          // 再次申请的理由
+    resubmitFakuanJine: '',           // 再次申请的金额
+    showCancelTuikuanModal: false,    // 撤销退款申请弹窗
+    cancelTuikuanLiyou: '',           // 撤销退款理由
+    showModifyTuikuanModal: false,    // 修改退款理由弹窗
+    modifyTuikuanLiyou: '',           // 修改后的退款理由
+    // 教程按钮状态
+    tutorialBtnHidden: false
+  },
+
+  onLoad(options) {
+    wx.setNavigationBarTitle({ title: '订单详情' })
+    this.ensureIMConnection()
+    this.jiexiTiaozhuanCanshu(options)
+    // 新增：启动教程按钮定时器
+    this.startTutorialBtnTimer()
+  },
+
+  onShow() {
+    this.registerNotificationComponent()
+    this.ensureIMConnection()
+  },
+
+  onHide() {
+    // 页面隐藏时重置弹窗服务状态，避免影响其他页面
+    PopupService.reset()
+  },
+
+  onUnload() {
+    // 清除缩进定时器，避免内存泄漏
+    if (this.tutorialTimer) {
+      clearTimeout(this.tutorialTimer)
+    }
+    // 页面卸载时重置弹窗服务
+    PopupService.reset()
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification')
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      }
+    }
+  },
+
+  ensureIMConnection() {
+    const uid = wx.getStorageSync('uid')
+    if (!uid) return
+    const targetUserId = 'Sj' + uid
+    if (wx.goEasy && wx.goEasy.getConnectionStatus) {
+      const status = wx.goEasy.getConnectionStatus()
+      if (status === 'connected' || status === 'reconnected') {
+        const currentUserId = wx.goEasy.im ? wx.goEasy.im.userId : null
+        if (currentUserId === targetUserId) {
+          this.setData({ currentIMUserId: targetUserId })
+          return
+        } else {
+          wx.goEasy.disconnect()
+        }
+      }
+    }
+    this.connectGoEasy(targetUserId)
+  },
+
+  connectGoEasy(userId) {
+    let currentUser = app.globalData.currentUser
+    if (!currentUser) {
+      const uid = wx.getStorageSync('uid')
+      currentUser = {
+        id: uid,
+        name: '用户' + (uid ? uid.substring(0, 6) : ''),
+        avatar: app.globalData.ossImageUrl + app.globalData.morentouxiang
+      }
+    }
+    wx.goEasy.connect({
+      id: userId,
+      data: {
+        name: currentUser.name,
+        avatar: currentUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
+      },
+      onSuccess: () => {
+        this.setData({ currentIMUserId: userId })
+        try {
+          wx.setStorageSync('savedGoEasyConnection', JSON.stringify({
+            userId, identityType: 'shangjia', lastConnectTime: Date.now()
+          }))
+          wx.setStorageSync('goEasyUserId', userId)
+        } catch (e) {}
+      },
+      onFailed: (error) => {
+        if (error.code === 408) {
+          this.setData({ currentIMUserId: userId })
+        } else {
+          console.error('IM连接失败', error)
+        }
+      }
+    })
+  },
+
+  jiexiTiaozhuanCanshu(options) {
+    try {
+      const dingdanDataStr = options.dingdanData || ''
+      if (!dingdanDataStr) {
+        wx.showToast({ title: '订单数据错误', icon: 'none' })
+        setTimeout(() => wx.navigateBack(), 1500)
+        return
+      }
+      const dingdanData = JSON.parse(decodeURIComponent(dingdanDataStr))
+      let tupianUrl = dingdanData.tupian || ''
+      if (!tupianUrl) tupianUrl = this.getTupianUrl()
+      let jine = parseFloat(dingdanData.jine || 0)
+      if (isNaN(jine)) jine = 0
+      this.setData({
+        'jibenShuju.dingdan_id': dingdanData.dingdan_id || '',
+        'jibenShuju.tupian': tupianUrl,
+        'jibenShuju.jieshao': dingdanData.jieshao || '',
+        'jibenShuju.create_time': dingdanData.create_time || '',
+        'jibenShuju.jine': jine.toFixed(2),
+        'jibenShuju.nicheng': dingdanData.nicheng || '',
+        'jibenShuju.beizhu': dingdanData.beizhu || '',
+        'jibenShuju.zhuangtai': dingdanData.zhuangtai || 0,
+        'jibenShuju.fadanpingtai': dingdanData.fadanpingtai || 0,
+        isLoading: false
+      })
+      this.jiazaiXiangxiShuju(dingdanData.dingdan_id)
+    } catch (error) {
+      console.error('解析订单数据失败', error)
+      wx.showToast({ title: '数据解析失败', icon: 'none' })
+      setTimeout(() => wx.navigateBack(), 1500)
+    }
+  },
+
+  getTupianUrl() {
+    const cacheTouxiang = wx.getStorageSync('touxiang') || ''
+    let tupianPath = cacheTouxiang || app.globalData.morentouxiang || ''
+    const ossImageUrl = app.globalData.ossImageUrl || ''
+    if (tupianPath && ossImageUrl) {
+      if (tupianPath.startsWith('/')) tupianPath = tupianPath.substring(1)
+      return ossImageUrl + tupianPath
+    }
+    return ''
+  },
+
+  async jiazaiXiangxiShuju(dingdanId) {
+    if (!dingdanId) return
+    try {
+      const res = await request({
+        url: '/dingdan/sjddxq',
+        method: 'POST',
+        data: { dingdan_id: dingdanId },
+        header: { 'content-type': 'application/json' }
+      })
+      if (res && res.data.code === 0 && res.data.data) {
+        const d = res.data.data
+        let jiaofuList = d.dashou_jiaofu || []
+        jiaofuList = jiaofuList.map(url => {
+          if (url && !url.startsWith('http')) {
+            const oss = app.globalData.ossImageUrl || ''
+            return oss + url
+          }
+          return url
+        })
+        let dashouAvatar = d.dashou_avatar || ''
+        if (dashouAvatar && !dashouAvatar.startsWith('http')) {
+          dashouAvatar = (app.globalData.ossImageUrl || '') + dashouAvatar
+        }
+        this.setData({
+          'dashouInfo.yonghuid': d.dashou_yonghuid || '',
+          'dashouInfo.nicheng': d.dashou_nicheng || '',
+          'dashouInfo.avatar': dashouAvatar,
+          'xiangxiShuju.dashou_jiaofu': jiaofuList,
+          'xiangxiShuju.dashou_liuyan': d.dashou_liuyan || '',
+          'xiangxiShuju.tuikuan_liyou': d.tuikuan_liyou || '',
+          'xiangxiShuju.shangjia_liuyan': d.shangjia_liuyan || '',
+          fadanData: d.fadan || null,
+          fenhongLilv: parseFloat(d.fenhong_lilv) || 0,
+          xinDingdanId: d.xin_dingdan_id || '',
+          'jibenShuju.zhuangtai': d.zhuangtai || this.data.jibenShuju.zhuangtai
+        })
+      } else {
+        wx.showToast({ title: res?.data?.msg || '获取详情失败', icon: 'none' })
+      }
+    } catch (err) {
+      console.error('加载详情失败', err)
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  fuzhiWenben(e) {
+    const text = e.currentTarget.dataset.text
+    if (!text) return
+    wx.setClipboardData({ data: text })
+    wx.showToast({ title: '已复制', icon: 'success' })
+  },
+
+  yulanTupian(e) {
+    const current = e.currentTarget.dataset.url
+    const urls = e.currentTarget.dataset.urls || [current]
+    wx.previewImage({ current, urls })
+  },
+
+  goToKefu() {
+    const kefuLink = app.globalData.kefuConfig?.link || ''
+    const corpId = app.globalData.kefuConfig?.enterpriseId || ''
+    if (!kefuLink || !corpId) {
+      wx.showToast({ title: '客服配置未加载', icon: 'none' })
+      return
+    }
+    wx.openCustomerServiceChat({
+      extInfo: { url: kefuLink },
+      corpId: corpId,
+      success: (res) => console.log('跳转客服成功', res),
+      fail: (err) => {
+        console.error('跳转客服失败', err)
+        wx.showToast({ title: '暂时无法连接客服', icon: 'none' })
+      }
+    })
+  },
+
+  // ===== 联系打手（替打手订阅 + 发机器人消息 + 跳转） =====
+  goToChatWithDashou() {
+    const uid = wx.getStorageSync('uid')
+    if (!uid) return
+
+    const orderId = this.data.jibenShuju.dingdan_id
+    if (!orderId) {
+      wx.showToast({ title: '订单ID缺失', icon: 'none' })
+      return
+    }
+
+    const targetUserId = 'Sj' + uid
+    if (this.data.currentIMUserId !== targetUserId) {
+      this.ensureIMConnection()
+      wx.showToast({ title: '连接中，请稍后再试', icon: 'none' })
+      return
+    }
+
+    const that = this
+    const groupName = this.data.jibenShuju.nicheng + '的订单群'
+    const isCross = this.data.jibenShuju.fadanpingtai || 0
+    const dashouUid = this.data.dashouInfo.yonghuid
+
+    // 第一步：商家自己订阅群组
+    wx.goEasy.im.subscribeGroup({
+      groupIds: [orderId],
+      onSuccess: () => {
+        // 如果有打手，则需要帮打手订阅并发送消息
+        if (dashouUid) {
+          that.bangDashouDingyue(orderId, dashouUid)
+            .then(() => {
+              that.tiaozhuanQunLiao(orderId, groupName, isCross)
+            })
+            .catch((err) => {
+              console.error('替打手订阅失败，仍可跳转群聊', err)
+              wx.showToast({ title: '通知打手可能失败', icon: 'none' })
+              that.tiaozhuanQunLiao(orderId, groupName, isCross)
+            })
+        } else {
+          // 无打手，直接跳转
+          that.tiaozhuanQunLiao(orderId, groupName, isCross)
+        }
+      },
+      onFailed: (error) => {
+        console.error('订阅群组失败', error)
+        wx.showToast({ title: '连接群聊失败', icon: 'none' })
+      }
+    })
+  },
+
+  // 帮打手订阅群组 + 发送机器人消息
+  bangDashouDingyue(orderId, dashouUid) {
+    return new Promise((resolve, reject) => {
+      const dashouImId = 'Ds' + dashouUid
+      const appkey = 'BC-32e2991c69bc47e1b538e73aaed37fc1' // 你的GoEasy AppKey
+      const restHost = 'https://rest-hz.goeasy.io'
+
+      // 1. 通过 REST API 为打手订阅群组
+      wx.request({
+        url: restHost + '/v2/im/subscribe-groups',
+        method: 'POST',
+        header: { 'content-type': 'application/json' },
+        data: {
+          appkey: appkey,
+          userIds: [dashouImId],
+          groupIds: [orderId]
+        },
+        success: (res) => {
+          if (res.data.code === 200) {
+            // 2. 订阅成功后，以打手身份发送一条系统消息
+            wx.request({
+              url: restHost + '/v2/im/message',
+              method: 'POST',
+              header: { 'content-type': 'application/json' },
+              data: {
+                appkey: appkey,
+                senderId: dashouImId,
+                senderData: { name: '系统通知', avatar: '' },
+                to: {
+                  type: 'group',
+                  id: orderId,
+                  data: { name: '订单群', avatar: '' }
+                },
+                type: 'text',
+                payload: '此消息为系统自动发送，打手看到后会尽快回复您。'
+              },
+              success: (msgRes) => {
+                if (msgRes.data.code === 200) {
+                  resolve()
+                } else {
+                  reject(new Error('发送消息失败'))
+                }
+              },
+              fail: reject
+            })
+          } else {
+            reject(new Error('订阅打手失败'))
+          }
+        },
+        fail: reject
+      })
+    })
+  },
+
+  // 跳转群聊页面
+  tiaozhuanQunLiao(orderId, groupName, isCross) {
+    const param = {
+      groupId: orderId,
+      orderId: orderId,
+      groupName: groupName,
+      groupAvatar: '',
+      isCross: isCross
+    }
+    wx.navigateTo({
+      url: '/pages/group-chat/group-chat?data=' + encodeURIComponent(JSON.stringify(param))
+    })
+  },
+
+  // ========== 以下所有业务功能完全保持不变 ==========
+  showGhDashouConfirm() { this.setData({ showGhDashouModal: true }) },
+  closeGhDashouModal() { this.setData({ showGhDashouModal: false }) },
+  async tijiaoGhDashou() {
+    if (this.data.isGhDashouLoading) return
+    this.setData({ isGhDashouLoading: true })
+    wx.showLoading({ title: '更换中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/zxsjghds',
+        method: 'POST',
+        data: { dingdan_id: this.data.jibenShuju.dingdan_id },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isGhDashouLoading: false, showGhDashouModal: false })
+      if (res && res.data.code === 0) {
+        this.setData({ xinDingdanId: res.data.data?.xin_dingdan_id || '' })
+        wx.showToast({ title: '更换成功', icon: 'success' })
+        this.jiazaiXiangxiShuju(this.data.jibenShuju.dingdan_id)
+      } else {
+        wx.showToast({ title: res?.data?.msg || '更换失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isGhDashouLoading: false, showGhDashouModal: false })
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  showFakuanModal() { this.setData({ showFakuanModal: true, fakuanLiyou: '', fakuanJine: '', yingxiangQiangdan: true }) },
+  closeFakuanModal() { this.setData({ showFakuanModal: false }) },
+  inputFakuanLiyou(e) { this.setData({ fakuanLiyou: e.detail.value.slice(0, 50) }) },
+  inputFakuanJine(e) { this.setData({ fakuanJine: e.detail.value }) },
+  toggleQiangdan() { this.setData({ yingxiangQiangdan: !this.data.yingxiangQiangdan }) },
+  jisuanFenhong() {
+    const jine = parseFloat(this.data.fakuanJine)
+    if (isNaN(jine) || jine <= 0) return '0.00'
+    return (jine * this.data.fenhongLilv).toFixed(2)
+  },
+  async tijiaoFakuan() {
+    const { fakuanLiyou, fakuanJine, jibenShuju, dashouInfo } = this.data
+    if (!fakuanLiyou.trim()) { wx.showToast({ title: '请输入罚款原因', icon: 'none' }); return }
+    const jineNum = parseFloat(fakuanJine)
+    if (isNaN(jineNum) || jineNum <= 0) { wx.showToast({ title: '请输入正确的罚款金额', icon: 'none' }); return }
+    if (this.data.isFakuanLoading) return
+    this.setData({ isFakuanLoading: true })
+    wx.showLoading({ title: '提交中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/sjfksq',
+        method: 'POST',
+        data: {
+          dingdan_id: jibenShuju.dingdan_id,
+          chufa_liyou: fakuanLiyou,
+          fakuanjine: jineNum.toFixed(2),
+          yingxiang_qiangdan: this.data.yingxiangQiangdan ? 1 : 0,
+          dashou_id: dashouInfo.yonghuid
+        },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isFakuanLoading: false })
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '罚款申请已提交', icon: 'success' })
+        this.setData({ showFakuanModal: false })
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id)
+      } else {
+        wx.showToast({ title: res?.data?.msg || '提交失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isFakuanLoading: false })
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  showChexiaoBtn() { this.setData({ showChexiaoModal: true, chexiaoLiyou: '' }) },
+  closeChexiaoModal() { this.setData({ showChexiaoModal: false }) },
+  shuruChexiaoLiyou(e) { this.setData({ chexiaoLiyou: e.detail.value.slice(0, 50) }) },
+  async tijiaoChexiao() {
+    if (this.data.isChexiaoLoading) return
+    const { chexiaoLiyou, jibenShuju } = this.data
+    if (!chexiaoLiyou.trim()) { wx.showToast({ title: '请输入撤销原因', icon: 'none' }); return }
+    this.setData({ isChexiaoLoading: true })
+    wx.showLoading({ title: '撤销中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/sjchexiao',
+        method: 'POST',
+        data: { dingdan_id: jibenShuju.dingdan_id, chexiao_liyou: chexiaoLiyou },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isChexiaoLoading: false })
+      if (res && res.data.code === 0) {
+        this.setData({ 'jibenShuju.zhuangtai': 5, showChexiaoModal: false })
+        wx.showToast({ title: '撤销成功', icon: 'success' })
+      } else {
+        wx.showToast({ title: res?.data?.msg || '撤销失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isChexiaoLoading: false })
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  showTuikuanBtn() { this.setData({ showTuikuanModal: true, tuikuanLiyou: '' }) },
+  closeTuikuanModal() { this.setData({ showTuikuanModal: false }) },
+  shuruTuikuanLiyou(e) { this.setData({ tuikuanLiyou: e.detail.value.slice(0, 50) }) },
+  async tijiaoTuikuan() {
+    if (this.data.isTuikuanLoading) return
+    const { tuikuanLiyou, jibenShuju } = this.data
+    if (!tuikuanLiyou.trim()) { wx.showToast({ title: '请输入退款原因', icon: 'none' }); return }
+    this.setData({ isTuikuanLoading: true })
+    wx.showLoading({ title: '提交中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/sjtkshenqing',
+        method: 'POST',
+        data: { dingdan_id: jibenShuju.dingdan_id, tuikuan_liyou: tuikuanLiyou },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isTuikuanLoading: false })
+      if (res && res.data.code === 0) {
+        this.setData({ 'jibenShuju.zhuangtai': 4, showTuikuanModal: false })
+        wx.showToast({ title: '退款申请已提交', icon: 'success' })
+      } else {
+        wx.showToast({ title: res?.data?.msg || '失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isTuikuanLoading: false })
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  dianjiXingxing(e) {
+    const pf = e.currentTarget.dataset.index
+    const newStars = this.data.xingxingData.map((item, idx) => ({ ...item, active: idx < pf }))
+    this.setData({ xingxingData: newStars, jiesuanPingfen: pf })
+  },
+  shuruLiuyan(e) { this.setData({ jiesuanLiuyan: e.detail.value.slice(0, 50) }) },
+  showJiesuanConfirm() { this.setData({ showJiesuanConfirm: true }) },
+  closeJiesuanConfirm() { this.setData({ showJiesuanConfirm: false }) },
+  async tijiaoJiesuan() {
+    if (this.data.isJiesuanLoading) return
+    this.setData({ isJiesuanLoading: true })
+    wx.showLoading({ title: '结算中...', mask: true })
+    try {
+      const res = await request({
+        url: '/dingdan/sjjiesuan',
+        method: 'POST',
+        data: {
+          dingdan_id: this.data.jibenShuju.dingdan_id,
+          pingfen: this.data.jiesuanPingfen,
+          liuyan: this.data.jiesuanLiuyan
+        },
+        header: { 'content-type': 'application/json' }
+      })
+      wx.hideLoading()
+      this.setData({ isJiesuanLoading: false, showJiesuanConfirm: false })
+      if (res && res.data.code === 0) {
+        this.setData({ 'jibenShuju.zhuangtai': 3 })
+        wx.showToast({ title: '结算成功', icon: 'success' })
+      } else {
+        wx.showToast({ title: res?.data?.msg || '结算失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isJiesuanLoading: false })
+      wx.showToast({ title: '网络错误', icon: 'none' })
+    }
+  },
+
+  // ========== 新增：罚款操作（修改/撤销/再次申请） ==========
+  // 显示修改罚款弹窗（仅当状态为待缴纳 或 申诉中 时可用）
+  showModifyFakuan() {
+    const status = this.data.fadanData?.zhuangtai;
+    if (status !== 1 && status !== 3) {
+      wx.showToast({ title: '当前状态不可修改罚款', icon: 'none' });
+      return;
+    }
+    this.setData({
+      showModifyFakuanModal: true,
+      modifyFakuanLiyou: this.data.fadanData?.chufaliyou || '',
+      modifyFakuanJine: this.data.fadanData?.fakuanjine || ''
+    });
+  },
+  closeModifyFakuanModal() {
+    this.setData({ showModifyFakuanModal: false });
+  },
+  inputModifyFakuanLiyou(e) {
+    this.setData({ modifyFakuanLiyou: e.detail.value.slice(0, 100) });
+  },
+  inputModifyFakuanJine(e) {
+    this.setData({ modifyFakuanJine: e.detail.value });
+  },
+  async submitModifyFakuan() {
+    const { modifyFakuanLiyou, modifyFakuanJine, fadanData, jibenShuju } = this.data;
+    if (!modifyFakuanLiyou.trim()) {
+      wx.showToast({ title: '请输入罚款理由', icon: 'none' }); return;
+    }
+    const jine = parseFloat(modifyFakuanJine);
+    if (isNaN(jine) || jine <= 0) {
+      wx.showToast({ title: '请输入正确的罚款金额', icon: 'none' }); return;
+    }
+    wx.showLoading({ title: '提交中...', mask: true });
+    try {
+      const res = await request({
+        url: '/dingdan/sjfkxgycx',
+        method: 'POST',
+        data: {
+          operation: 'modify_penalty',
+          fadan_id: fadanData.id,
+          dingdan_id: jibenShuju.dingdan_id,
+          liyou: modifyFakuanLiyou,
+          jine: jine.toFixed(2)
+        }
+      });
+      wx.hideLoading();
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '修改成功', icon: 'success' });
+        this.setData({ showModifyFakuanModal: false });
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id); // 刷新数据
+      } else {
+        wx.showToast({ title: res?.data?.msg || '修改失败', icon: 'none' });
+      }
+    } catch (err) {
+      wx.hideLoading();
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // 显示撤销罚款弹窗（待缴纳/申诉中 可撤销，变为已驳回）
+  showCancelFakuan() {
+    const status = this.data.fadanData?.zhuangtai;
+    if (status !== 1 && status !== 3) {
+      wx.showToast({ title: '当前状态不可撤销罚款', icon: 'none' });
+      return;
+    }
+    this.setData({ showCancelFakuanModal: true, cancelFakuanLiyou: '' });
+  },
+  closeCancelFakuanModal() {
+    this.setData({ showCancelFakuanModal: false });
+  },
+  inputCancelFakuanLiyou(e) {
+    this.setData({ cancelFakuanLiyou: e.detail.value.slice(0, 100) });
+  },
+  async submitCancelFakuan() {
+    const { cancelFakuanLiyou, fadanData, jibenShuju } = this.data;
+    if (!cancelFakuanLiyou.trim()) {
+      wx.showToast({ title: '请输入驳回理由', icon: 'none' }); return;
+    }
+    wx.showLoading({ title: '提交中...', mask: true });
+    try {
+      const res = await request({
+        url: '/dingdan/sjfkxgycx',
+        method: 'POST',
+        data: {
+          operation: 'cancel_penalty',
+          fadan_id: fadanData.id,
+          dingdan_id: jibenShuju.dingdan_id,
+          liyou: cancelFakuanLiyou
+        }
+      });
+      wx.hideLoading();
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '已撤销', icon: 'success' });
+        this.setData({ showCancelFakuanModal: false });
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
+      } else {
+        wx.showToast({ title: res?.data?.msg || '撤销失败', icon: 'none' });
+      }
+    } catch (err) {
+      wx.hideLoading();
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // 显示再次申请罚款弹窗（仅当状态为已驳回时可用）
+  showResubmitFakuan() {
+    if (this.data.fadanData?.zhuangtai !== 4) {
+      wx.showToast({ title: '当前状态不可再次申请', icon: 'none' });
+      return;
+    }
+    this.setData({
+      showResubmitFakuanModal: true,
+      resubmitFakuanLiyou: '',
+      resubmitFakuanJine: ''
+    });
+  },
+  closeResubmitFakuanModal() {
+    this.setData({ showResubmitFakuanModal: false });
+  },
+  inputResubmitFakuanLiyou(e) {
+    this.setData({ resubmitFakuanLiyou: e.detail.value.slice(0, 100) });
+  },
+  inputResubmitFakuanJine(e) {
+    this.setData({ resubmitFakuanJine: e.detail.value });
+  },
+  async submitResubmitFakuan() {
+    const { resubmitFakuanLiyou, resubmitFakuanJine, fadanData, jibenShuju } = this.data;
+    if (!resubmitFakuanLiyou.trim()) {
+      wx.showToast({ title: '请输入罚款理由', icon: 'none' }); return;
+    }
+    const jine = parseFloat(resubmitFakuanJine);
+    if (isNaN(jine) || jine <= 0) {
+      wx.showToast({ title: '请输入正确的罚款金额', icon: 'none' }); return;
+    }
+    wx.showLoading({ title: '提交中...', mask: true });
+    try {
+      const res = await request({
+        url: '/dingdan/sjfkxgycx',
+        method: 'POST',
+        data: {
+          operation: 'resubmit_penalty',
+          fadan_id: fadanData.id,
+          dingdan_id: jibenShuju.dingdan_id,
+          liyou: resubmitFakuanLiyou,
+          jine: jine.toFixed(2)
+        }
+      });
+      wx.hideLoading();
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '申请成功', icon: 'success' });
+        this.setData({ showResubmitFakuanModal: false });
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
+      } else {
+        wx.showToast({ title: res?.data?.msg || '申请失败', icon: 'none' });
+      }
+    } catch (err) {
+      wx.hideLoading();
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // ========== 新增：订单退款操作（撤销/修改理由） ==========
+  showCancelTuikuan() {
+    if (this.data.jibenShuju.zhuangtai !== 4) {
+      wx.showToast({ title: '只有退款中的订单可撤销', icon: 'none' });
+      return;
+    }
+    this.setData({ showCancelTuikuanModal: true, cancelTuikuanLiyou: '' });
+  },
+  closeCancelTuikuanModal() {
+    this.setData({ showCancelTuikuanModal: false });
+  },
+  inputCancelTuikuanLiyou(e) {
+    this.setData({ cancelTuikuanLiyou: e.detail.value.slice(0, 100) });
+  },
+  async submitCancelTuikuan() {
+    const { cancelTuikuanLiyou, jibenShuju } = this.data;
+    if (!cancelTuikuanLiyou.trim()) {
+      wx.showToast({ title: '请输入撤销理由', icon: 'none' }); return;
+    }
+    wx.showLoading({ title: '撤销中...', mask: true });
+    try {
+      const res = await request({
+        url: '/dingdan/sjfkxgycx',
+        method: 'POST',
+        data: {
+          operation: 'cancel_refund',
+          dingdan_id: jibenShuju.dingdan_id,
+          liyou: cancelTuikuanLiyou
+        }
+      });
+      wx.hideLoading();
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '已撤销退款申请', icon: 'success' });
+        this.setData({ showCancelTuikuanModal: false });
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
+      } else {
+        wx.showToast({ title: res?.data?.msg || '撤销失败', icon: 'none' });
+      }
+    } catch (err) {
+      wx.hideLoading();
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  showModifyTuikuan() {
+    if (this.data.jibenShuju.zhuangtai !== 4) {
+      wx.showToast({ title: '只有退款中的订单可修改理由', icon: 'none' });
+      return;
+    }
+    this.setData({
+      showModifyTuikuanModal: true,
+      modifyTuikuanLiyou: this.data.xiangxiShuju.tuikuan_liyou || ''
+    });
+  },
+  closeModifyTuikuanModal() {
+    this.setData({ showModifyTuikuanModal: false });
+  },
+  inputModifyTuikuanLiyou(e) {
+    this.setData({ modifyTuikuanLiyou: e.detail.value.slice(0, 100) });
+  },
+  async submitModifyTuikuan() {
+    const { modifyTuikuanLiyou, jibenShuju } = this.data;
+    if (!modifyTuikuanLiyou.trim()) {
+      wx.showToast({ title: '请输入退款理由', icon: 'none' }); return;
+    }
+    wx.showLoading({ title: '修改中...', mask: true });
+    try {
+      const res = await request({
+        url: '/dingdan/sjfkxgycx',
+        method: 'POST',
+        data: {
+          operation: 'modify_refund_reason',
+          dingdan_id: jibenShuju.dingdan_id,
+          liyou: modifyTuikuanLiyou
+        }
+      });
+      wx.hideLoading();
+      if (res && res.data.code === 0) {
+        wx.showToast({ title: '修改成功', icon: 'success' });
+        this.setData({ showModifyTuikuanModal: false });
+        this.jiazaiXiangxiShuju(jibenShuju.dingdan_id);
+      } else {
+        wx.showToast({ title: res?.data?.msg || '修改失败', icon: 'none' });
+      }
+    } catch (err) {
+      wx.hideLoading();
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }
+  },
+
+  // ========== 新增：教程按钮 ==========
+  startTutorialBtnTimer() {
+    if (this.tutorialTimer) clearTimeout(this.tutorialTimer);
+    this.tutorialTimer = setTimeout(() => {
+      this.setData({ tutorialBtnHidden: true });
+    }, 5000);
+  },
+  resetTutorialBtn() {
+    if (this.data.tutorialBtnHidden) {
+      this.setData({ tutorialBtnHidden: false });
+    }
+    if (this.tutorialTimer) clearTimeout(this.tutorialTimer);
+    this.tutorialTimer = setTimeout(() => {
+      this.setData({ tutorialBtnHidden: true });
+    }, 5000);
+  },
+  onTutorialBtnTap() {
+    this.resetTutorialBtn();
+    PopupService.checkAndShow(this, 'sjddxq1');
+  }
 })
\ No newline at end of file
diff --git a/pages/dingdanxiangqing/dingdanxiangqing.json b/pages/merchant-order-detail/merchant-order-detail.json
similarity index 100%
rename from pages/dingdanxiangqing/dingdanxiangqing.json
rename to pages/merchant-order-detail/merchant-order-detail.json
diff --git a/pages/sjddxq/sjddxq.wxml b/pages/merchant-order-detail/merchant-order-detail.wxml
similarity index 97%
rename from pages/sjddxq/sjddxq.wxml
rename to pages/merchant-order-detail/merchant-order-detail.wxml
index d952ee0..c91a89f 100644
--- a/pages/sjddxq/sjddxq.wxml
+++ b/pages/merchant-order-detail/merchant-order-detail.wxml
@@ -1,354 +1,354 @@
-<!--pages/sjddxq/sjddxq.wxml - 商家订单详情页完整结构（正方形九宫格，圆形头像）-->
-<!-- 页面根容器 -->
-<view class="sjddxq-page">
-  <!-- 加载状态区域，当 isLoading 为 true 时显示 -->
-  <view class="loading-container" wx:if="{{isLoading}}">
-    <!-- 旋转的加载图标 -->
-    <view class="loading-spinner"></view>
-    <!-- 加载文字提示 -->
-    <text class="loading-text">加载中...</text>
-  </view>
-
-  <!-- 主要内容区域，数据加载完成后显示 -->
-  <view class="content-container" wx:if="{{!isLoading}}">
-    <!-- 商品图片和介绍卡片 -->
-    <view class="card shangpin-card">
-      <!-- 商品图片，固定宽高180rpx，已是正方形 -->
-      <image class="shangpin-img" src="{{jibenShuju.tupian}}" mode="aspectFill"/>
-      <!-- 商品介绍文本区域 -->
-      <view class="shangpin-text">
-        <!-- 订单介绍文字 -->
-        <text class="jieshao-text">{{jibenShuju.jieshao || '无描述'}}</text>
-      </view>
-    </view>
-
-    <!-- 订单信息卡片，左侧带状态颜色边框 -->
-    <view class="card info-card" style="border-left: 8rpx solid {{zhuangtaiYanseMap[jibenShuju.zhuangtai]}}">
-      <view class="card-title">订单信息</view>
-      <!-- 游戏昵称行 -->
-      <view class="info-row" wx:if="{{jibenShuju.nicheng}}"><text class="label">游戏昵称</text><text class="value">{{jibenShuju.nicheng}}</text></view>
-      <!-- 备注信息行 -->
-      <view class="info-row" wx:if="{{jibenShuju.beizhu}}"><text class="label">备注</text><text class="value">{{jibenShuju.beizhu}}</text></view>
-      <!-- 订单ID行，可复制 -->
-      <view class="info-row"><text class="label">订单ID</text><view class="value-with-copy"><text class="value">{{jibenShuju.dingdan_id}}</text><text class="copy-btn" bindtap="fuzhiWenben" data-text="{{jibenShuju.dingdan_id}}">📋</text></view></view>
-      <!-- 创建时间行 -->
-      <view class="info-row"><text class="label">创建时间</text><text class="value">{{jibenShuju.create_time}}</text></view>
-      <!-- 订单金额行，红色高亮 -->
-      <view class="info-row"><text class="label">订单金额</text><text class="value price-red">¥{{jibenShuju.jine}}</text></view>
-      <!-- 订单状态行 -->
-      <view class="info-row"><text class="label">状态</text><text class="value zhuangtai-text">{{zhuangtaiWenziMap[jibenShuju.zhuangtai]}}</text></view>
-      <!-- 新增：退款操作按钮（仅退款中状态） -->
-      <view class="refund-actions" wx:if="{{jibenShuju.zhuangtai == 4}}">
-        <view class="action-btn action-cancel" bindtap="showCancelTuikuan">撤销退款申请</view>
-        <view class="action-btn action-modify" bindtap="showModifyTuikuan">修改退款理由</view>
-      </view>
-    </view>
-
-    <!-- 打手信息卡片，仅当打手ID存在时显示 -->
-    <view class="card dashou-card" wx:if="{{dashouInfo.yonghuid}}">
-      <view class="card-title">服务打手</view>
-      <view class="dashou-header">
-        <!-- 打手头像，圆形 -->
-        <image class="dashou-avatar" src="{{dashouInfo.avatar || '/images/default-avatar.png'}}" mode="aspectFill"/>
-        <view class="dashou-detail">
-          <!-- 打手昵称 -->
-          <text class="dashou-nicheng">{{dashouInfo.nicheng || '未知昵称'}}</text>
-          <!-- 打手用户ID行，可复制 -->
-          <view class="dashou-id-row"><text class="label">用户ID</text><text class="value">{{dashouInfo.yonghuid}}</text><text class="copy-btn" bindtap="fuzhiWenben" data-text="{{dashouInfo.yonghuid}}">📋</text></view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 服务详情卡片，展示交付图片、留言、退款理由等 -->
-    <view class="card service-card" wx:if="{{xiangxiShuju.dashou_jiaofu.length > 0 || xiangxiShuju.dashou_liuyan || xiangxiShuju.tuikuan_liyou || xiangxiShuju.shangjia_liuyan}}">
-      <view class="card-title">服务详情</view>
-      <!-- 交付图片区域：使用 grid-img-wrapper 实现正方形九宫格 -->
-      <block wx:if="{{xiangxiShuju.dashou_jiaofu.length > 0}}">
-        <view class="sub-title">交付图片</view>
-        <view class="image-grid">
-          <!-- 循环渲染每张交付图片 -->
-          <block wx:for="{{xiangxiShuju.dashou_jiaofu}}" wx:key="index">
-            <!-- 正方形容器 -->
-            <view class="grid-img-wrapper">
-              <!-- 图片绝对定位填充容器 -->
-              <image class="grid-img" src="{{item}}" mode="aspectFill" bindtap="yulanTupian" data-url="{{item}}" data-urls="{{xiangxiShuju.dashou_jiaofu}}"/>
-            </view>
-          </block>
-        </view>
-      </block>
-      <!-- 打手留言 -->
-      <block wx:if="{{xiangxiShuju.dashou_liuyan}}">
-        <view class="sub-title">打手留言</view>
-        <view class="content-box">{{xiangxiShuju.dashou_liuyan}}</view>
-      </block>
-      <!-- 退款理由 -->
-      <block wx:if="{{xiangxiShuju.tuikuan_liyou}}">
-        <view class="sub-title">退款理由</view>
-        <view class="content-box">{{xiangxiShuju.tuikuan_liyou}}</view>
-      </block>
-      <!-- 商家留言 -->
-      <block wx:if="{{xiangxiShuju.shangjia_liuyan}}">
-        <view class="sub-title">商家留言</view>
-        <view class="content-box">{{xiangxiShuju.shangjia_liuyan}}</view>
-      </block>
-    </view>
-
-    <!-- 罚款信息卡片，仅当罚单数据存在时显示 -->
-    <view class="card fakuan-card" wx:if="{{fadanData}}">
-      <view class="card-title">罚款信息</view>
-      <!-- 罚款金额，红色显示 -->
-      <view class="info-row"><text class="label">罚款金额</text><text class="value price-red">¥{{fadanData.fakuanjine || '0.00'}}</text></view>
-      <!-- 罚款理由 -->
-      <view class="info-row"><text class="label">罚款理由</text><text class="value">{{fadanData.chufaliyou || '-'}}</text></view>
-      <!-- 是否影响抢单 -->
-      <view class="info-row"><text class="label">是否影响抢单</text><text class="value">{{fadanData.yingxiang_qiangdan == 1 ? '是' : '否'}}</text></view>
-      <!-- 罚单状态 -->
-      <view class="info-row"><text class="label">罚单状态</text><text class="value">{{fadanData.zhuangtai == 1 ? '待缴纳' : fadanData.zhuangtai == 2 ? '已缴纳' : fadanData.zhuangtai == 3 ? '申诉中' : '已驳回'}}</text></view>
-      <!-- 如果有申诉理由，显示 -->
-      <block wx:if="{{fadanData.shensuliyou}}"><view class="sub-title">申诉理由</view><view class="content-box">{{fadanData.shensuliyou}}</view></block>
-      <!-- 如果有同意处罚理由，显示 -->
-      <block wx:if="{{fadanData.tongyi_chufaliyou}}"><view class="sub-title">同意处罚理由</view><view class="content-box">{{fadanData.tongyi_chufaliyou}}</view></block>
-      <!-- 如果有驳回理由，显示 -->
-      <block wx:if="{{fadanData.bohuiliyou}}"><view class="sub-title">驳回理由</view><view class="content-box">{{fadanData.bohuiliyou}}</view></block>
-      <!-- 创建时间 -->
-      <view class="info-row"><text class="label">创建时间</text><text class="value">{{fadanData.create_time}}</text></view>
-      <!-- 更新时间 -->
-      <view class="info-row"><text class="label">更新时间</text><text class="value">{{fadanData.update_time}}</text></view>
-      <!-- 新增：罚单操作按钮区域（根据状态显示） -->
-      <view class="fakuan-actions" wx:if="{{fadanData}}">
-        <!-- 待缴纳(1) 或 申诉中(3)：显示修改和撤销按钮 -->
-        <block wx:if="{{fadanData.zhuangtai == 1 || fadanData.zhuangtai == 3}}">
-          <view class="action-btn action-modify" bindtap="showModifyFakuan">修改罚款</view>
-          <view class="action-btn action-cancel" bindtap="showCancelFakuan">撤销罚款</view>
-        </block>
-        <!-- 已驳回(4)：显示再次申请按钮 -->
-        <block wx:if="{{fadanData.zhuangtai == 4}}">
-          <view class="action-btn action-resubmit" bindtap="showResubmitFakuan">再次申请罚款</view>
-        </block>
-      </view>
-    </view>
-
-    <!-- 更换打手后生成的新订单ID展示卡片 -->
-    <view class="card new-order-card" wx:if="{{xinDingdanId}}">
-      <view class="card-title">更换打手成功</view>
-      <view class="info-row"><text class="label">新订单ID</text><view class="value-with-copy"><text class="value">{{xinDingdanId}}</text><text class="copy-btn" bindtap="fuzhiWenben" data-text="{{xinDingdanId}}">📋</text></view></view>
-    </view>
-
-    <!-- 结算区域卡片，仅当订单状态为8（结算中）时显示 -->
-    <view class="card jiesuan-card" wx:if="{{jibenShuju.zhuangtai == 8}}">
-      <view class="card-title">订单结算</view>
-      <view class="star-row">
-        <text class="label">打星评分</text>
-        <view class="stars">
-          <!-- 循环渲染五颗星星 -->
-          <block wx:for="{{xingxingData}}" wx:key="id">
-            <!-- 点击星星触发评分 -->
-            <text class="star {{item.active ? 'star-active' : ''}}" bindtap="dianjiXingxing" data-index="{{index+1}}">{{item.active ? '★' : '☆'}}</text>
-          </block>
-        </view>
-      </view>
-      <!-- 结算留言输入框 -->
-      <textarea class="liuyan-input" placeholder="留言（选填，50字）" maxlength="50" value="{{jiesuanLiuyan}}" bindinput="shuruLiuyan"/>
-      <!-- 结算按钮 -->
-      <view class="jiesuan-btn" bindtap="showJiesuanConfirm">立即结算</view>
-    </view>
-  </view>
-
-  <!-- 底部固定操作栏 -->
-  <view class="bottom-bar">
-    <!-- 第一行按钮：联系客服、联系打手 -->
-    <view class="bottom-btn-group">
-      <view class="btn-outline" bindtap="goToKefu">联系客服</view>
-      <view class="btn-outline" bindtap="goToChatWithDashou" wx:if="{{dashouInfo.yonghuid}}">联系打手</view>
-    </view>
-    <!-- 第二行按钮：各种操作按钮，根据订单状态显示 -->
-    <view class="bottom-btn-group">
-      <!-- 撤销按钮：状态为1或7时显示 -->
-      <view class="btn-warn" bindtap="showChexiaoBtn" wx:if="{{jibenShuju.zhuangtai == 1 || jibenShuju.zhuangtai == 7}}">撤销订单</view>
-      <!-- 【暂时隐藏】更换打手按钮：恢复时取消下面整段注释即可 -->
-      <!-- <view class="btn-primary" bindtap="showGhDashouConfirm" wx:if="{{(jibenShuju.zhuangtai == 2 || jibenShuju.zhuangtai == 8) && dashouInfo.yonghuid}}">更换打手</view> -->
-      <!-- 申请退款按钮：状态为2或8时显示 -->
-      <view class="btn-danger" bindtap="showTuikuanBtn" wx:if="{{jibenShuju.zhuangtai == 2 || jibenShuju.zhuangtai == 8}}">申请退款</view>
-    </view>
-  </view>
-
-  <!-- 撤销订单弹窗 -->
-  <view class="modal" wx:if="{{showChexiaoModal}}">
-    <view class="modal-mask" bindtap="closeChexiaoModal"></view>
-    <view class="modal-content">
-      <view class="modal-hd">撤销订单<text class="modal-close" bindtap="closeChexiaoModal">×</text></view>
-      <textarea class="modal-input" placeholder="输入撤销原因（最多50字）" maxlength="50" value="{{chexiaoLiyou}}" bindinput="shuruChexiaoLiyou"/>
-      <view class="modal-btns">
-        <view class="modal-btn cancel" bindtap="closeChexiaoModal">取消</view>
-        <view class="modal-btn confirm" bindtap="tijiaoChexiao">{{isChexiaoLoading ? '处理中' : '确认撤销'}}</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 申请退款弹窗 -->
-  <view class="modal" wx:if="{{showTuikuanModal}}">
-    <view class="modal-mask" bindtap="closeTuikuanModal"></view>
-    <view class="modal-content">
-      <view class="modal-hd">申请退款<text class="modal-close" bindtap="closeTuikuanModal">×</text></view>
-      <textarea class="modal-input" placeholder="输入退款原因（最多50字）" maxlength="50" value="{{tuikuanLiyou}}" bindinput="shuruTuikuanLiyou"/>
-      <view class="modal-btns">
-        <view class="modal-btn cancel" bindtap="closeTuikuanModal">取消</view>
-        <view class="modal-btn confirm" bindtap="tijiaoTuikuan">{{isTuikuanLoading ? '处理中' : '确认申请'}}</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 更换打手确认弹窗 -->
-  <view class="modal" wx:if="{{showGhDashouModal}}">
-    <view class="modal-mask" bindtap="closeGhDashouModal"></view>
-    <view class="modal-content">
-      <view class="modal-hd">更换打手<text class="modal-close" bindtap="closeGhDashouModal">×</text></view>
-      <view class="modal-body">
-        <text class="modal-tip">确认更换打手吗？当前订单将被撤销，并生成一条相同内容的新订单（打手清空）。</text>
-      </view>
-      <view class="modal-btns">
-        <view class="modal-btn cancel" bindtap="closeGhDashouModal">取消</view>
-        <view class="modal-btn confirm" bindtap="tijiaoGhDashou">{{isGhDashouLoading ? '处理中' : '确认更换'}}</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 申请罚款弹窗 -->
-  <view class="modal" wx:if="{{showFakuanModal}}">
-    <view class="modal-mask" bindtap="closeFakuanModal"></view>
-    <view class="modal-content">
-      <view class="modal-hd">申请罚款<text class="modal-close" bindtap="closeFakuanModal">×</text></view>
-      <view class="modal-body">
-        <text class="modal-tip">罚款原因</text>
-        <textarea class="modal-input" placeholder="输入罚款原因（最多50字）" maxlength="50" value="{{fakuanLiyou}}" bindinput="inputFakuanLiyou"/>
-        <text class="modal-tip">罚款金额</text>
-        <input class="modal-input-num" type="digit" placeholder="0.00" value="{{fakuanJine}}" bindinput="inputFakuanJine"/>
-        <view class="toggle-row" bindtap="toggleQiangdan">
-          <text class="label">是否影响抢单</text>
-          <view class="toggle {{yingxiangQiangdan ? 'toggle-on' : ''}}">
-            <view class="toggle-knob"></view>
-          </view>
-        </view>
-        <view class="fenhong-tip">此次罚款应得分红：¥{{jisuanFenhong()}}（利率 {{fenhongLilv*100}}%）</view>
-      </view>
-      <view class="modal-btns">
-        <view class="modal-btn cancel" bindtap="closeFakuanModal">取消</view>
-        <view class="modal-btn confirm" bindtap="tijiaoFakuan">{{isFakuanLoading ? '处理中' : '确认申请'}}</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 结算确认弹窗 -->
-  <view class="modal" wx:if="{{showJiesuanConfirm}}">
-    <view class="modal-mask" bindtap="closeJiesuanConfirm"></view>
-    <view class="modal-content">
-      <view class="modal-hd">确认结算<text class="modal-close" bindtap="closeJiesuanConfirm">×</text></view>
-      <view class="modal-body">
-        <text class="modal-tip">确认结算该订单吗？结算后状态变为“已完成”。</text>
-      </view>
-      <view class="modal-btns">
-        <view class="modal-btn cancel" bindtap="closeJiesuanConfirm">取消</view>
-        <view class="modal-btn confirm" bindtap="tijiaoJiesuan">{{isJiesuanLoading ? '处理中' : '确认结算'}}</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- ========== 新增：修改罚款弹窗 ========== -->
-  <view class="modal" wx:if="{{showModifyFakuanModal}}">
-    <view class="modal-mask" bindtap="closeModifyFakuanModal"></view>
-    <view class="modal-content">
-      <view class="modal-hd">修改罚款<text class="modal-close" bindtap="closeModifyFakuanModal">×</text></view>
-      <view class="modal-body">
-        <text class="modal-tip">罚款理由</text>
-        <textarea class="modal-input" placeholder="输入罚款理由" maxlength="100" value="{{modifyFakuanLiyou}}" bindinput="inputModifyFakuanLiyou"/>
-        <text class="modal-tip">罚款金额</text>
-        <input class="modal-input-num" type="digit" placeholder="0.00" value="{{modifyFakuanJine}}" bindinput="inputModifyFakuanJine"/>
-      </view>
-      <view class="modal-btns">
-        <view class="modal-btn cancel" bindtap="closeModifyFakuanModal">取消</view>
-        <view class="modal-btn confirm" bindtap="submitModifyFakuan">确认修改</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 撤销罚款弹窗 -->
-  <view class="modal" wx:if="{{showCancelFakuanModal}}">
-    <view class="modal-mask" bindtap="closeCancelFakuanModal"></view>
-    <view class="modal-content">
-      <view class="modal-hd">撤销罚款<text class="modal-close" bindtap="closeCancelFakuanModal">×</text></view>
-      <view class="modal-body">
-        <text class="modal-tip">驳回理由</text>
-        <textarea class="modal-input" placeholder="输入驳回理由" maxlength="100" value="{{cancelFakuanLiyou}}" bindinput="inputCancelFakuanLiyou"/>
-      </view>
-      <view class="modal-btns">
-        <view class="modal-btn cancel" bindtap="closeCancelFakuanModal">取消</view>
-        <view class="modal-btn confirm" bindtap="submitCancelFakuan">确认撤销</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 再次申请罚款弹窗 -->
-  <view class="modal" wx:if="{{showResubmitFakuanModal}}">
-    <view class="modal-mask" bindtap="closeResubmitFakuanModal"></view>
-    <view class="modal-content">
-      <view class="modal-hd">再次申请罚款<text class="modal-close" bindtap="closeResubmitFakuanModal">×</text></view>
-      <view class="modal-body">
-        <text class="modal-tip">罚款理由</text>
-        <textarea class="modal-input" placeholder="输入罚款理由" maxlength="100" value="{{resubmitFakuanLiyou}}" bindinput="inputResubmitFakuanLiyou"/>
-        <text class="modal-tip">罚款金额</text>
-        <input class="modal-input-num" type="digit" placeholder="0.00" value="{{resubmitFakuanJine}}" bindinput="inputResubmitFakuanJine"/>
-      </view>
-      <view class="modal-btns">
-        <view class="modal-btn cancel" bindtap="closeResubmitFakuanModal">取消</view>
-        <view class="modal-btn confirm" bindtap="submitResubmitFakuan">确认申请</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 撤销退款申请弹窗 -->
-  <view class="modal" wx:if="{{showCancelTuikuanModal}}">
-    <view class="modal-mask" bindtap="closeCancelTuikuanModal"></view>
-    <view class="modal-content">
-      <view class="modal-hd">撤销退款申请<text class="modal-close" bindtap="closeCancelTuikuanModal">×</text></view>
-      <view class="modal-body">
-        <text class="modal-tip">撤销理由</text>
-        <textarea class="modal-input" placeholder="输入撤销理由" maxlength="100" value="{{cancelTuikuanLiyou}}" bindinput="inputCancelTuikuanLiyou"/>
-      </view>
-      <view class="modal-btns">
-        <view class="modal-btn cancel" bindtap="closeCancelTuikuanModal">取消</view>
-        <view class="modal-btn confirm" bindtap="submitCancelTuikuan">确认撤销</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 修改退款理由弹窗 -->
-  <view class="modal" wx:if="{{showModifyTuikuanModal}}">
-    <view class="modal-mask" bindtap="closeModifyTuikuanModal"></view>
-    <view class="modal-content">
-      <view class="modal-hd">修改退款理由<text class="modal-close" bindtap="closeModifyTuikuanModal">×</text></view>
-      <view class="modal-body">
-        <text class="modal-tip">退款理由</text>
-        <textarea class="modal-input" placeholder="输入新的退款理由" maxlength="100" value="{{modifyTuikuanLiyou}}" bindinput="inputModifyTuikuanLiyou"/>
-      </view>
-      <view class="modal-btns">
-        <view class="modal-btn cancel" bindtap="closeModifyTuikuanModal">取消</view>
-        <view class="modal-btn confirm" bindtap="submitModifyTuikuan">确认修改</view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 全局通知组件 -->
-  <global-notification id="global-notification" />
-
-  <!-- 教程按钮（紧贴右侧，右上角，5秒后缩进） -->
-  <view 
-    class="tutorial-btn {{tutorialBtnHidden ? 'tutorial-btn-hidden' : ''}}"
-    bindtap="onTutorialBtnTap"
-    hover-class="tutorial-btn-hover"
-  >
-    <text class="tutorial-btn-text">教程</text>
-  </view>
-
-  <!-- 使用教程弹窗组件 -->
-  <popup-notice id="popupNotice" />
+<!--pages/merchant-order-detail/merchant-order-detail.wxml - 商家订单详情页完整结构（正方形九宫格，圆形头像）-->
+<!-- 页面根容器 -->
+<view class="sjddxq-page">
+  <!-- 加载状态区域，当 isLoading 为 true 时显示 -->
+  <view class="loading-container" wx:if="{{isLoading}}">
+    <!-- 旋转的加载图标 -->
+    <view class="loading-spinner"></view>
+    <!-- 加载文字提示 -->
+    <text class="loading-text">加载中...</text>
+  </view>
+
+  <!-- 主要内容区域，数据加载完成后显示 -->
+  <view class="content-container" wx:if="{{!isLoading}}">
+    <!-- 商品图片和介绍卡片 -->
+    <view class="card shangpin-card">
+      <!-- 商品图片，固定宽高180rpx，已是正方形 -->
+      <image class="shangpin-img" src="{{jibenShuju.tupian}}" mode="aspectFill"/>
+      <!-- 商品介绍文本区域 -->
+      <view class="shangpin-text">
+        <!-- 订单介绍文字 -->
+        <text class="jieshao-text">{{jibenShuju.jieshao || '无描述'}}</text>
+      </view>
+    </view>
+
+    <!-- 订单信息卡片，左侧带状态颜色边框 -->
+    <view class="card info-card" style="border-left: 8rpx solid {{zhuangtaiYanseMap[jibenShuju.zhuangtai]}}">
+      <view class="card-title">订单信息</view>
+      <!-- 游戏昵称行 -->
+      <view class="info-row" wx:if="{{jibenShuju.nicheng}}"><text class="label">游戏昵称</text><text class="value">{{jibenShuju.nicheng}}</text></view>
+      <!-- 备注信息行 -->
+      <view class="info-row" wx:if="{{jibenShuju.beizhu}}"><text class="label">备注</text><text class="value">{{jibenShuju.beizhu}}</text></view>
+      <!-- 订单ID行，可复制 -->
+      <view class="info-row"><text class="label">订单ID</text><view class="value-with-copy"><text class="value">{{jibenShuju.dingdan_id}}</text><text class="copy-btn" bindtap="fuzhiWenben" data-text="{{jibenShuju.dingdan_id}}">📋</text></view></view>
+      <!-- 创建时间行 -->
+      <view class="info-row"><text class="label">创建时间</text><text class="value">{{jibenShuju.create_time}}</text></view>
+      <!-- 订单金额行，红色高亮 -->
+      <view class="info-row"><text class="label">订单金额</text><text class="value price-red">¥{{jibenShuju.jine}}</text></view>
+      <!-- 订单状态行 -->
+      <view class="info-row"><text class="label">状态</text><text class="value zhuangtai-text">{{zhuangtaiWenziMap[jibenShuju.zhuangtai]}}</text></view>
+      <!-- 新增：退款操作按钮（仅退款中状态） -->
+      <view class="refund-actions" wx:if="{{jibenShuju.zhuangtai == 4}}">
+        <view class="action-btn action-cancel" bindtap="showCancelTuikuan">撤销退款申请</view>
+        <view class="action-btn action-modify" bindtap="showModifyTuikuan">修改退款理由</view>
+      </view>
+    </view>
+
+    <!-- 打手信息卡片，仅当打手ID存在时显示 -->
+    <view class="card dashou-card" wx:if="{{dashouInfo.yonghuid}}">
+      <view class="card-title">服务打手</view>
+      <view class="dashou-header">
+        <!-- 打手头像，圆形 -->
+        <image class="dashou-avatar" src="{{dashouInfo.avatar || '/images/default-avatar.png'}}" mode="aspectFill"/>
+        <view class="dashou-detail">
+          <!-- 打手昵称 -->
+          <text class="dashou-nicheng">{{dashouInfo.nicheng || '未知昵称'}}</text>
+          <!-- 打手用户ID行，可复制 -->
+          <view class="dashou-id-row"><text class="label">用户ID</text><text class="value">{{dashouInfo.yonghuid}}</text><text class="copy-btn" bindtap="fuzhiWenben" data-text="{{dashouInfo.yonghuid}}">📋</text></view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 服务详情卡片，展示交付图片、留言、退款理由等 -->
+    <view class="card service-card" wx:if="{{xiangxiShuju.dashou_jiaofu.length > 0 || xiangxiShuju.dashou_liuyan || xiangxiShuju.tuikuan_liyou || xiangxiShuju.shangjia_liuyan}}">
+      <view class="card-title">服务详情</view>
+      <!-- 交付图片区域：使用 grid-img-wrapper 实现正方形九宫格 -->
+      <block wx:if="{{xiangxiShuju.dashou_jiaofu.length > 0}}">
+        <view class="sub-title">交付图片</view>
+        <view class="image-grid">
+          <!-- 循环渲染每张交付图片 -->
+          <block wx:for="{{xiangxiShuju.dashou_jiaofu}}" wx:key="index">
+            <!-- 正方形容器 -->
+            <view class="grid-img-wrapper">
+              <!-- 图片绝对定位填充容器 -->
+              <image class="grid-img" src="{{item}}" mode="aspectFill" bindtap="yulanTupian" data-url="{{item}}" data-urls="{{xiangxiShuju.dashou_jiaofu}}"/>
+            </view>
+          </block>
+        </view>
+      </block>
+      <!-- 打手留言 -->
+      <block wx:if="{{xiangxiShuju.dashou_liuyan}}">
+        <view class="sub-title">打手留言</view>
+        <view class="content-box">{{xiangxiShuju.dashou_liuyan}}</view>
+      </block>
+      <!-- 退款理由 -->
+      <block wx:if="{{xiangxiShuju.tuikuan_liyou}}">
+        <view class="sub-title">退款理由</view>
+        <view class="content-box">{{xiangxiShuju.tuikuan_liyou}}</view>
+      </block>
+      <!-- 商家留言 -->
+      <block wx:if="{{xiangxiShuju.shangjia_liuyan}}">
+        <view class="sub-title">商家留言</view>
+        <view class="content-box">{{xiangxiShuju.shangjia_liuyan}}</view>
+      </block>
+    </view>
+
+    <!-- 罚款信息卡片，仅当罚单数据存在时显示 -->
+    <view class="card fakuan-card" wx:if="{{fadanData}}">
+      <view class="card-title">罚款信息</view>
+      <!-- 罚款金额，红色显示 -->
+      <view class="info-row"><text class="label">罚款金额</text><text class="value price-red">¥{{fadanData.fakuanjine || '0.00'}}</text></view>
+      <!-- 罚款理由 -->
+      <view class="info-row"><text class="label">罚款理由</text><text class="value">{{fadanData.chufaliyou || '-'}}</text></view>
+      <!-- 是否影响抢单 -->
+      <view class="info-row"><text class="label">是否影响抢单</text><text class="value">{{fadanData.yingxiang_qiangdan == 1 ? '是' : '否'}}</text></view>
+      <!-- 罚单状态 -->
+      <view class="info-row"><text class="label">罚单状态</text><text class="value">{{fadanData.zhuangtai == 1 ? '待缴纳' : fadanData.zhuangtai == 2 ? '已缴纳' : fadanData.zhuangtai == 3 ? '申诉中' : '已驳回'}}</text></view>
+      <!-- 如果有申诉理由，显示 -->
+      <block wx:if="{{fadanData.shensuliyou}}"><view class="sub-title">申诉理由</view><view class="content-box">{{fadanData.shensuliyou}}</view></block>
+      <!-- 如果有同意处罚理由，显示 -->
+      <block wx:if="{{fadanData.tongyi_chufaliyou}}"><view class="sub-title">同意处罚理由</view><view class="content-box">{{fadanData.tongyi_chufaliyou}}</view></block>
+      <!-- 如果有驳回理由，显示 -->
+      <block wx:if="{{fadanData.bohuiliyou}}"><view class="sub-title">驳回理由</view><view class="content-box">{{fadanData.bohuiliyou}}</view></block>
+      <!-- 创建时间 -->
+      <view class="info-row"><text class="label">创建时间</text><text class="value">{{fadanData.create_time}}</text></view>
+      <!-- 更新时间 -->
+      <view class="info-row"><text class="label">更新时间</text><text class="value">{{fadanData.update_time}}</text></view>
+      <!-- 新增：罚单操作按钮区域（根据状态显示） -->
+      <view class="fakuan-actions" wx:if="{{fadanData}}">
+        <!-- 待缴纳(1) 或 申诉中(3)：显示修改和撤销按钮 -->
+        <block wx:if="{{fadanData.zhuangtai == 1 || fadanData.zhuangtai == 3}}">
+          <view class="action-btn action-modify" bindtap="showModifyFakuan">修改罚款</view>
+          <view class="action-btn action-cancel" bindtap="showCancelFakuan">撤销罚款</view>
+        </block>
+        <!-- 已驳回(4)：显示再次申请按钮 -->
+        <block wx:if="{{fadanData.zhuangtai == 4}}">
+          <view class="action-btn action-resubmit" bindtap="showResubmitFakuan">再次申请罚款</view>
+        </block>
+      </view>
+    </view>
+
+    <!-- 更换打手后生成的新订单ID展示卡片 -->
+    <view class="card new-order-card" wx:if="{{xinDingdanId}}">
+      <view class="card-title">更换打手成功</view>
+      <view class="info-row"><text class="label">新订单ID</text><view class="value-with-copy"><text class="value">{{xinDingdanId}}</text><text class="copy-btn" bindtap="fuzhiWenben" data-text="{{xinDingdanId}}">📋</text></view></view>
+    </view>
+
+    <!-- 结算区域卡片，仅当订单状态为8（结算中）时显示 -->
+    <view class="card jiesuan-card" wx:if="{{jibenShuju.zhuangtai == 8}}">
+      <view class="card-title">订单结算</view>
+      <view class="star-row">
+        <text class="label">打星评分</text>
+        <view class="stars">
+          <!-- 循环渲染五颗星星 -->
+          <block wx:for="{{xingxingData}}" wx:key="id">
+            <!-- 点击星星触发评分 -->
+            <text class="star {{item.active ? 'star-active' : ''}}" bindtap="dianjiXingxing" data-index="{{index+1}}">{{item.active ? '★' : '☆'}}</text>
+          </block>
+        </view>
+      </view>
+      <!-- 结算留言输入框 -->
+      <textarea class="liuyan-input" placeholder="留言（选填，50字）" maxlength="50" value="{{jiesuanLiuyan}}" bindinput="shuruLiuyan"/>
+      <!-- 结算按钮 -->
+      <view class="jiesuan-btn" bindtap="showJiesuanConfirm">立即结算</view>
+    </view>
+  </view>
+
+  <!-- 底部固定操作栏 -->
+  <view class="bottom-bar">
+    <!-- 第一行按钮：联系客服、联系打手 -->
+    <view class="bottom-btn-group">
+      <view class="btn-outline" bindtap="goToKefu">联系客服</view>
+      <view class="btn-outline" bindtap="goToChatWithDashou" wx:if="{{dashouInfo.yonghuid}}">联系打手</view>
+    </view>
+    <!-- 第二行按钮：各种操作按钮，根据订单状态显示 -->
+    <view class="bottom-btn-group">
+      <!-- 撤销按钮：状态为1或7时显示 -->
+      <view class="btn-warn" bindtap="showChexiaoBtn" wx:if="{{jibenShuju.zhuangtai == 1 || jibenShuju.zhuangtai == 7}}">撤销订单</view>
+      <!-- 【暂时隐藏】更换打手按钮：恢复时取消下面整段注释即可 -->
+      <!-- <view class="btn-primary" bindtap="showGhDashouConfirm" wx:if="{{(jibenShuju.zhuangtai == 2 || jibenShuju.zhuangtai == 8) && dashouInfo.yonghuid}}">更换打手</view> -->
+      <!-- 申请退款按钮：状态为2或8时显示 -->
+      <view class="btn-danger" bindtap="showTuikuanBtn" wx:if="{{jibenShuju.zhuangtai == 2 || jibenShuju.zhuangtai == 8}}">申请退款</view>
+    </view>
+  </view>
+
+  <!-- 撤销订单弹窗 -->
+  <view class="modal" wx:if="{{showChexiaoModal}}">
+    <view class="modal-mask" bindtap="closeChexiaoModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">撤销订单<text class="modal-close" bindtap="closeChexiaoModal">×</text></view>
+      <textarea class="modal-input" placeholder="输入撤销原因（最多50字）" maxlength="50" value="{{chexiaoLiyou}}" bindinput="shuruChexiaoLiyou"/>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeChexiaoModal">取消</view>
+        <view class="modal-btn confirm" bindtap="tijiaoChexiao">{{isChexiaoLoading ? '处理中' : '确认撤销'}}</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 申请退款弹窗 -->
+  <view class="modal" wx:if="{{showTuikuanModal}}">
+    <view class="modal-mask" bindtap="closeTuikuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">申请退款<text class="modal-close" bindtap="closeTuikuanModal">×</text></view>
+      <textarea class="modal-input" placeholder="输入退款原因（最多50字）" maxlength="50" value="{{tuikuanLiyou}}" bindinput="shuruTuikuanLiyou"/>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeTuikuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="tijiaoTuikuan">{{isTuikuanLoading ? '处理中' : '确认申请'}}</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 更换打手确认弹窗 -->
+  <view class="modal" wx:if="{{showGhDashouModal}}">
+    <view class="modal-mask" bindtap="closeGhDashouModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">更换打手<text class="modal-close" bindtap="closeGhDashouModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">确认更换打手吗？当前订单将被撤销，并生成一条相同内容的新订单（打手清空）。</text>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeGhDashouModal">取消</view>
+        <view class="modal-btn confirm" bindtap="tijiaoGhDashou">{{isGhDashouLoading ? '处理中' : '确认更换'}}</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 申请罚款弹窗 -->
+  <view class="modal" wx:if="{{showFakuanModal}}">
+    <view class="modal-mask" bindtap="closeFakuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">申请罚款<text class="modal-close" bindtap="closeFakuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">罚款原因</text>
+        <textarea class="modal-input" placeholder="输入罚款原因（最多50字）" maxlength="50" value="{{fakuanLiyou}}" bindinput="inputFakuanLiyou"/>
+        <text class="modal-tip">罚款金额</text>
+        <input class="modal-input-num" type="digit" placeholder="0.00" value="{{fakuanJine}}" bindinput="inputFakuanJine"/>
+        <view class="toggle-row" bindtap="toggleQiangdan">
+          <text class="label">是否影响抢单</text>
+          <view class="toggle {{yingxiangQiangdan ? 'toggle-on' : ''}}">
+            <view class="toggle-knob"></view>
+          </view>
+        </view>
+        <view class="fenhong-tip">此次罚款应得分红：¥{{jisuanFenhong()}}（利率 {{fenhongLilv*100}}%）</view>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeFakuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="tijiaoFakuan">{{isFakuanLoading ? '处理中' : '确认申请'}}</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 结算确认弹窗 -->
+  <view class="modal" wx:if="{{showJiesuanConfirm}}">
+    <view class="modal-mask" bindtap="closeJiesuanConfirm"></view>
+    <view class="modal-content">
+      <view class="modal-hd">确认结算<text class="modal-close" bindtap="closeJiesuanConfirm">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">确认结算该订单吗？结算后状态变为“已完成”。</text>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeJiesuanConfirm">取消</view>
+        <view class="modal-btn confirm" bindtap="tijiaoJiesuan">{{isJiesuanLoading ? '处理中' : '确认结算'}}</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- ========== 新增：修改罚款弹窗 ========== -->
+  <view class="modal" wx:if="{{showModifyFakuanModal}}">
+    <view class="modal-mask" bindtap="closeModifyFakuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">修改罚款<text class="modal-close" bindtap="closeModifyFakuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">罚款理由</text>
+        <textarea class="modal-input" placeholder="输入罚款理由" maxlength="100" value="{{modifyFakuanLiyou}}" bindinput="inputModifyFakuanLiyou"/>
+        <text class="modal-tip">罚款金额</text>
+        <input class="modal-input-num" type="digit" placeholder="0.00" value="{{modifyFakuanJine}}" bindinput="inputModifyFakuanJine"/>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeModifyFakuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="submitModifyFakuan">确认修改</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 撤销罚款弹窗 -->
+  <view class="modal" wx:if="{{showCancelFakuanModal}}">
+    <view class="modal-mask" bindtap="closeCancelFakuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">撤销罚款<text class="modal-close" bindtap="closeCancelFakuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">驳回理由</text>
+        <textarea class="modal-input" placeholder="输入驳回理由" maxlength="100" value="{{cancelFakuanLiyou}}" bindinput="inputCancelFakuanLiyou"/>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeCancelFakuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="submitCancelFakuan">确认撤销</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 再次申请罚款弹窗 -->
+  <view class="modal" wx:if="{{showResubmitFakuanModal}}">
+    <view class="modal-mask" bindtap="closeResubmitFakuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">再次申请罚款<text class="modal-close" bindtap="closeResubmitFakuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">罚款理由</text>
+        <textarea class="modal-input" placeholder="输入罚款理由" maxlength="100" value="{{resubmitFakuanLiyou}}" bindinput="inputResubmitFakuanLiyou"/>
+        <text class="modal-tip">罚款金额</text>
+        <input class="modal-input-num" type="digit" placeholder="0.00" value="{{resubmitFakuanJine}}" bindinput="inputResubmitFakuanJine"/>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeResubmitFakuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="submitResubmitFakuan">确认申请</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 撤销退款申请弹窗 -->
+  <view class="modal" wx:if="{{showCancelTuikuanModal}}">
+    <view class="modal-mask" bindtap="closeCancelTuikuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">撤销退款申请<text class="modal-close" bindtap="closeCancelTuikuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">撤销理由</text>
+        <textarea class="modal-input" placeholder="输入撤销理由" maxlength="100" value="{{cancelTuikuanLiyou}}" bindinput="inputCancelTuikuanLiyou"/>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeCancelTuikuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="submitCancelTuikuan">确认撤销</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 修改退款理由弹窗 -->
+  <view class="modal" wx:if="{{showModifyTuikuanModal}}">
+    <view class="modal-mask" bindtap="closeModifyTuikuanModal"></view>
+    <view class="modal-content">
+      <view class="modal-hd">修改退款理由<text class="modal-close" bindtap="closeModifyTuikuanModal">×</text></view>
+      <view class="modal-body">
+        <text class="modal-tip">退款理由</text>
+        <textarea class="modal-input" placeholder="输入新的退款理由" maxlength="100" value="{{modifyTuikuanLiyou}}" bindinput="inputModifyTuikuanLiyou"/>
+      </view>
+      <view class="modal-btns">
+        <view class="modal-btn cancel" bindtap="closeModifyTuikuanModal">取消</view>
+        <view class="modal-btn confirm" bindtap="submitModifyTuikuan">确认修改</view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 全局通知组件 -->
+  <global-notification id="global-notification" />
+
+  <!-- 教程按钮（紧贴右侧，右上角，5秒后缩进） -->
+  <view 
+    class="tutorial-btn {{tutorialBtnHidden ? 'tutorial-btn-hidden' : ''}}"
+    bindtap="onTutorialBtnTap"
+    hover-class="tutorial-btn-hover"
+  >
+    <text class="tutorial-btn-text">教程</text>
+  </view>
+
+  <!-- 使用教程弹窗组件 -->
+  <popup-notice id="popupNotice" />
 </view>
\ No newline at end of file
diff --git a/pages/sjddxq/sjddxq.wxss b/pages/merchant-order-detail/merchant-order-detail.wxss
similarity index 96%
rename from pages/sjddxq/sjddxq.wxss
rename to pages/merchant-order-detail/merchant-order-detail.wxss
index 3f8b6b0..245d3d7 100644
--- a/pages/sjddxq/sjddxq.wxss
+++ b/pages/merchant-order-detail/merchant-order-detail.wxss
@@ -1,185 +1,185 @@
-/* pages/sjddxq/sjddxq.wxss - 商家订单详情页样式（正方形九宫格，圆形头像） */
-/* 页面全局背景 */
-page { background: #f5f7fa; }
-/* 页面底部留出固定栏的空间 */
-.sjddxq-page { padding-bottom: 160rpx; }
-
-/* 加载状态居中布局 */
-.loading-container { display: flex; flex-direction: column; align-items: center; justify-content: center; height: 60vh; }
-/* 加载旋转动画图标 */
-.loading-spinner { width: 64rpx; height: 64rpx; border: 6rpx solid #e0e0e0; border-top-color: #4caf50; border-radius: 50%; animation: spin 1s linear infinite; margin-bottom: 20rpx; }
-@keyframes spin { to { transform: rotate(360deg); } }
-/* 加载文字 */
-.loading-text { color: #666; font-size: 28rpx; }
-
-/* 内容区域的内边距 */
-.content-container { padding: 24rpx; }
-
-/* 通用卡片样式 */
-.card { background: #fff; border-radius: 24rpx; padding: 28rpx; margin-bottom: 24rpx; box-shadow: 0 8rpx 24rpx rgba(0,0,0,0.04); }
-/* 卡片标题样式 */
-.card-title { font-size: 32rpx; font-weight: 600; color: #1a1a1a; margin-bottom: 20rpx; padding-bottom: 12rpx; border-bottom: 1rpx solid #f0f0f0; }
-
-/* 商品卡片：左右布局 */
-.shangpin-card { display: flex; align-items: center; }
-/* 商品图片：固定宽高为正方形 */
-.shangpin-img { width: 180rpx; height: 180rpx; border-radius: 16rpx; background: #f5f5f5; margin-right: 24rpx; flex-shrink: 0; }
-.shangpin-text { flex: 1; }
-.jieshao-text { font-size: 28rpx; color: #333; line-height: 1.6; }
-
-/* 信息行：左右分布，底部虚线 */
-.info-row { display: flex; justify-content: space-between; align-items: center; padding: 14rpx 0; border-bottom: 1rpx dashed #f5f5f5; }
-.info-row:last-child { border-bottom: none; }
-.label { font-size: 28rpx; color: #888; min-width: 140rpx; }
-.value { font-size: 28rpx; color: #333; text-align: right; word-break: break-all; }
-.value-with-copy { display: flex; align-items: center; }
-/* 复制按钮 */
-.copy-btn { margin-left: 12rpx; color: #4caf50; font-size: 26rpx; padding: 4rpx 12rpx; background: #e8f5e9; border-radius: 16rpx; }
-/* 红色价格 */
-.price-red { color: #ff4444; font-weight: 600; }
-.zhuangtai-text { font-weight: 600; }
-
-/* 打手卡片头部 */
-.dashou-header { display: flex; align-items: center; }
-/* 打手头像：固定宽高，圆形 */
-.dashou-avatar { width: 88rpx; height: 88rpx; border-radius: 50%; margin-right: 20rpx; }
-.dashou-detail { flex: 1; }
-.dashou-nicheng { font-size: 30rpx; font-weight: 500; margin-bottom: 6rpx; }
-.dashou-id-row { display: flex; align-items: center; font-size: 26rpx; }
-
-/* 服务详情子标题 */
-.sub-title { font-size: 28rpx; color: #555; margin: 16rpx 0 8rpx; }
-/* 内容框（留言、理由等） */
-.content-box { background: #f9f9f9; border-radius: 12rpx; padding: 16rpx; font-size: 26rpx; color: #444; line-height: 1.5; margin-bottom: 16rpx; }
-
-/* ========= 核心：交付图片九宫格，强制正方形 ========= */
-.image-grid { display: flex; flex-wrap: wrap; margin-bottom: 16rpx; }
-/* 每个图片的外层容器 */
-.grid-img-wrapper {
-  width: calc(33.33% - 8rpx);  /* 每行三个，减去间距 */
-  margin: 4rpx;
-  position: relative;          /* 为绝对定位的图片提供锚点 */
-  overflow: hidden;
-  border-radius: 12rpx;
-}
-/* 使用伪元素撑出 1:1 的正方形高度 */
-.grid-img-wrapper::after {
-  content: '';
-  display: block;
-  padding-bottom: 100%;        /* 100% 相对于自身宽度，实现正方形 */
-}
-/* 图片绝对定位填满整个容器 */
-.grid-img {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  object-fit: cover;           /* 保持比例裁剪，不变形 */
-}
-
-/* 结算区域：星星评分 */
-.star-row { display: flex; align-items: center; justify-content: space-between; margin-bottom: 20rpx; }
-.stars { display: flex; }
-.star { font-size: 48rpx; color: #ccc; margin-left: 8rpx; transition: all 0.2s; }
-.star-active { color: #ffc107; transform: scale(1.1); }
-/* 留言输入框 */
-.liuyan-input { width: 100%; height: 120rpx; background: #f9f9f9; border-radius: 12rpx; padding: 16rpx; font-size: 28rpx; margin-bottom: 20rpx; }
-/* 结算按钮 */
-.jiesuan-btn { background: #4caf50; color: #fff; text-align: center; padding: 20rpx; border-radius: 48rpx; font-size: 30rpx; font-weight: 600; margin-top: 10rpx; }
-
-/* 底部固定操作栏 */
-.bottom-bar { position: fixed; bottom: 0; left: 0; right: 0; background: #fff; padding: 16rpx 24rpx; box-shadow: 0 -4rpx 20rpx rgba(0,0,0,0.06); display: flex; flex-direction: column; gap: 12rpx; z-index: 100; }
-.bottom-btn-group { display: flex; gap: 16rpx; }
-.btn-outline { flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-size: 28rpx; font-weight: 500; border: 2rpx solid #1976D2; color: #1976D2; background: #fff; }
-.btn-primary { background: #2196F3; color: #fff; flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-weight: 600; font-size: 28rpx; }
-.btn-warn { background: #ff9800; color: #fff; flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-weight: 600; font-size: 28rpx; }
-.btn-danger { background: #f44336; color: #fff; flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-weight: 600; font-size: 28rpx; }
-
-/* 弹窗通用样式 */
-.modal { position: fixed; top: 0; left: 0; right: 0; bottom: 0; z-index: 1000; display: flex; align-items: center; justify-content: center; }
-.modal-mask { position: absolute; width: 100%; height: 100%; background: rgba(0,0,0,0.45); }
-.modal-content { position: relative; width: 620rpx; background: #fff; border-radius: 32rpx; overflow: hidden; }
-.modal-hd { padding: 32rpx; font-size: 34rpx; font-weight: 600; display: flex; justify-content: space-between; border-bottom: 1rpx solid #f0f0f0; }
-.modal-close { color: #999; font-size: 40rpx; }
-.modal-body { padding: 32rpx; }
-.modal-tip { font-size: 28rpx; color: #555; margin-bottom: 12rpx; }
-.modal-input { width: 100%; height: 140rpx; background: #f5f5f5; border-radius: 12rpx; padding: 16rpx; font-size: 28rpx; margin-bottom: 20rpx; }
-.modal-input-num { width: 100%; height: 80rpx; background: #f5f5f5; border-radius: 12rpx; padding: 0 20rpx; font-size: 32rpx; margin-bottom: 20rpx; }
-.toggle-row { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20rpx; }
-.toggle { width: 100rpx; height: 50rpx; border-radius: 50rpx; background: #e0e0e0; display: flex; align-items: center; padding: 0 4rpx; transition: background 0.2s; }
-.toggle-on { background: #4caf50; }
-.toggle-knob { width: 42rpx; height: 42rpx; border-radius: 50%; background: #fff; transition: transform 0.2s; }
-.toggle-on .toggle-knob { transform: translateX(50rpx); }
-.fenhong-tip { text-align: center; font-size: 28rpx; color: #ff9800; margin: 16rpx 0 0; }
-.modal-btns { display: flex; border-top: 1rpx solid #f0f0f0; }
-.modal-btn { flex: 1; text-align: center; padding: 28rpx; font-size: 30rpx; font-weight: 500; }
-.modal-btn.cancel { color: #888; background: #f5f5f5; }
-.modal-btn.confirm { color: #4caf50; background: #e8f5e9; }
-
-
-
-
-/* ========== 新增：罚单/订单操作按钮样式 ========== */
-.fakuan-actions, .refund-actions {
-    display: flex;
-    gap: 20rpx;
-    margin-top: 24rpx;
-    padding-top: 16rpx;
-    border-top: 1rpx solid #f0f0f0;
-}
-.action-btn {
-    flex: 1;
-    text-align: center;
-    padding: 16rpx 0;
-    border-radius: 44rpx;
-    font-size: 28rpx;
-    font-weight: 500;
-}
-.action-modify {
-    background: #2196F3;
-    color: #fff;
-}
-.action-cancel {
-    background: #ff9800;
-    color: #fff;
-}
-.action-resubmit {
-    background: #4caf50;
-    color: #fff;
-}
-
-/* ========== 新增：教程按钮样式 ========== */
-.tutorial-btn {
-    position: fixed;
-    right: 0;
-    top: 20%;
-    transform: translateY(-50%);
-    width: 120rpx;
-    height: 120rpx;
-    background: rgba(0, 0, 0, 0.75);
-    backdrop-filter: blur(15rpx);
-    border-radius: 60rpx 0 0 60rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 10001;
-    box-shadow: -8rpx 0 20rpx rgba(0,0,0,0.3);
-    transition: right 0.3s ease-out;
-    border: 2rpx solid rgba(255,215,0,0.5);
-    border-right: none;
-}
-.tutorial-btn-text {
-    color: #FFD700;
-    font-size: 36rpx;
-    font-weight: bold;
-    writing-mode: vertical-rl;
-    letter-spacing: 6rpx;
-}
-.tutorial-btn-hidden {
-    right: -80rpx;
-}
-.tutorial-btn-hover {
-    background: rgba(0, 0, 0, 0.9);
-    transform: translateY(-50%) scale(1.05);
+/* pages/merchant-order-detail/merchant-order-detail.wxss - 商家订单详情页样式（正方形九宫格，圆形头像） */
+/* 页面全局背景 */
+page { background: #f5f7fa; }
+/* 页面底部留出固定栏的空间 */
+.sjddxq-page { padding-bottom: 160rpx; }
+
+/* 加载状态居中布局 */
+.loading-container { display: flex; flex-direction: column; align-items: center; justify-content: center; height: 60vh; }
+/* 加载旋转动画图标 */
+.loading-spinner { width: 64rpx; height: 64rpx; border: 6rpx solid #e0e0e0; border-top-color: #4caf50; border-radius: 50%; animation: spin 1s linear infinite; margin-bottom: 20rpx; }
+
+/* 加载文字 */
+.loading-text { color: #666; font-size: 28rpx; }
+
+/* 内容区域的内边距 */
+.content-container { padding: 24rpx; }
+
+/* 通用卡片样式 */
+.card { background: #fff; border-radius: 24rpx; padding: 28rpx; margin-bottom: 24rpx; box-shadow: 0 8rpx 24rpx rgba(0,0,0,0.04); }
+/* 卡片标题样式 */
+.card-title { font-size: 32rpx; font-weight: 600; color: #1a1a1a; margin-bottom: 20rpx; padding-bottom: 12rpx; border-bottom: 1rpx solid #f0f0f0; }
+
+/* 商品卡片：左右布局 */
+.shangpin-card { display: flex; align-items: center; }
+/* 商品图片：固定宽高为正方形 */
+.shangpin-img { width: 180rpx; height: 180rpx; border-radius: 16rpx; background: #f5f5f5; margin-right: 24rpx; flex-shrink: 0; }
+.shangpin-text { flex: 1; }
+.jieshao-text { font-size: 28rpx; color: #333; line-height: 1.6; }
+
+/* 信息行：左右分布，底部虚线 */
+.info-row { display: flex; justify-content: space-between; align-items: center; padding: 14rpx 0; border-bottom: 1rpx dashed #f5f5f5; }
+.info-row:last-child { border-bottom: none; }
+.label { font-size: 28rpx; color: #888; min-width: 140rpx; }
+.value { font-size: 28rpx; color: #333; text-align: right; word-break: break-all; }
+.value-with-copy { display: flex; align-items: center; }
+/* 复制按钮 */
+.copy-btn { margin-left: 12rpx; color: #4caf50; font-size: 26rpx; padding: 4rpx 12rpx; background: #e8f5e9; border-radius: 16rpx; }
+/* 红色价格 */
+.price-red { color: #ff4444; font-weight: 600; }
+.zhuangtai-text { font-weight: 600; }
+
+/* 打手卡片头部 */
+.dashou-header { display: flex; align-items: center; }
+/* 打手头像：固定宽高，圆形 */
+.dashou-avatar { width: 88rpx; height: 88rpx; border-radius: 50%; margin-right: 20rpx; }
+.dashou-detail { flex: 1; }
+.dashou-nicheng { font-size: 30rpx; font-weight: 500; margin-bottom: 6rpx; }
+.dashou-id-row { display: flex; align-items: center; font-size: 26rpx; }
+
+/* 服务详情子标题 */
+.sub-title { font-size: 28rpx; color: #555; margin: 16rpx 0 8rpx; }
+/* 内容框（留言、理由等） */
+.content-box { background: #f9f9f9; border-radius: 12rpx; padding: 16rpx; font-size: 26rpx; color: #444; line-height: 1.5; margin-bottom: 16rpx; }
+
+/* ========= 核心：交付图片九宫格，强制正方形 ========= */
+.image-grid { display: flex; flex-wrap: wrap; margin-bottom: 16rpx; }
+/* 每个图片的外层容器 */
+.grid-img-wrapper {
+  width: calc(33.33% - 8rpx);  /* 每行三个，减去间距 */
+  margin: 4rpx;
+  position: relative;          /* 为绝对定位的图片提供锚点 */
+  overflow: hidden;
+  border-radius: 12rpx;
+}
+/* 使用伪元素撑出 1:1 的正方形高度 */
+.grid-img-wrapper::after {
+  content: '';
+  display: block;
+  padding-bottom: 100%;        /* 100% 相对于自身宽度，实现正方形 */
+}
+/* 图片绝对定位填满整个容器 */
+.grid-img {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;           /* 保持比例裁剪，不变形 */
+}
+
+/* 结算区域：星星评分 */
+.star-row { display: flex; align-items: center; justify-content: space-between; margin-bottom: 20rpx; }
+.stars { display: flex; }
+.star { font-size: 48rpx; color: #ccc; margin-left: 8rpx; transition: all 0.2s; }
+.star-active { color: #ffc107; transform: scale(1.1); }
+/* 留言输入框 */
+.liuyan-input { width: 100%; height: 120rpx; background: #f9f9f9; border-radius: 12rpx; padding: 16rpx; font-size: 28rpx; margin-bottom: 20rpx; }
+/* 结算按钮 */
+.jiesuan-btn { background: #4caf50; color: #fff; text-align: center; padding: 20rpx; border-radius: 48rpx; font-size: 30rpx; font-weight: 600; margin-top: 10rpx; }
+
+/* 底部固定操作栏 */
+.bottom-bar { position: fixed; bottom: 0; left: 0; right: 0; background: #fff; padding: 16rpx 24rpx; box-shadow: 0 -4rpx 20rpx rgba(0,0,0,0.06); display: flex; flex-direction: column; gap: 12rpx; z-index: 100; }
+.bottom-btn-group { display: flex; gap: 16rpx; }
+.btn-outline { flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-size: 28rpx; font-weight: 500; border: 2rpx solid #1976D2; color: #1976D2; background: #fff; }
+.btn-primary { background: #2196F3; color: #fff; flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-weight: 600; font-size: 28rpx; }
+.btn-warn { background: #ff9800; color: #fff; flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-weight: 600; font-size: 28rpx; }
+.btn-danger { background: #f44336; color: #fff; flex: 1; text-align: center; padding: 18rpx 0; border-radius: 44rpx; font-weight: 600; font-size: 28rpx; }
+
+/* 弹窗通用样式 */
+.modal { position: fixed; top: 0; left: 0; right: 0; bottom: 0; z-index: 1000; display: flex; align-items: center; justify-content: center; }
+.modal-mask { position: absolute; width: 100%; height: 100%; background: rgba(0,0,0,0.45); }
+.modal-content { position: relative; width: 620rpx; background: #fff; border-radius: 32rpx; overflow: hidden; }
+.modal-hd { padding: 32rpx; font-size: 34rpx; font-weight: 600; display: flex; justify-content: space-between; border-bottom: 1rpx solid #f0f0f0; }
+.modal-close { color: #999; font-size: 40rpx; }
+.modal-body { padding: 32rpx; }
+.modal-tip { font-size: 28rpx; color: #555; margin-bottom: 12rpx; }
+.modal-input { width: 100%; height: 140rpx; background: #f5f5f5; border-radius: 12rpx; padding: 16rpx; font-size: 28rpx; margin-bottom: 20rpx; }
+.modal-input-num { width: 100%; height: 80rpx; background: #f5f5f5; border-radius: 12rpx; padding: 0 20rpx; font-size: 32rpx; margin-bottom: 20rpx; }
+.toggle-row { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20rpx; }
+.toggle { width: 100rpx; height: 50rpx; border-radius: 50rpx; background: #e0e0e0; display: flex; align-items: center; padding: 0 4rpx; transition: background 0.2s; }
+.toggle-on { background: #4caf50; }
+.toggle-knob { width: 42rpx; height: 42rpx; border-radius: 50%; background: #fff; transition: transform 0.2s; }
+.toggle-on .toggle-knob { transform: translateX(50rpx); }
+.fenhong-tip { text-align: center; font-size: 28rpx; color: #ff9800; margin: 16rpx 0 0; }
+.modal-btns { display: flex; border-top: 1rpx solid #f0f0f0; }
+.modal-btn { flex: 1; text-align: center; padding: 28rpx; font-size: 30rpx; font-weight: 500; }
+.modal-btn.cancel { color: #888; background: #f5f5f5; }
+.modal-btn.confirm { color: #4caf50; background: #e8f5e9; }
+
+
+
+
+/* ========== 新增：罚单/订单操作按钮样式 ========== */
+.fakuan-actions, .refund-actions {
+    display: flex;
+    gap: 20rpx;
+    margin-top: 24rpx;
+    padding-top: 16rpx;
+    border-top: 1rpx solid #f0f0f0;
+}
+.action-btn {
+    flex: 1;
+    text-align: center;
+    padding: 16rpx 0;
+    border-radius: 44rpx;
+    font-size: 28rpx;
+    font-weight: 500;
+}
+.action-modify {
+    background: #2196F3;
+    color: #fff;
+}
+.action-cancel {
+    background: #ff9800;
+    color: #fff;
+}
+.action-resubmit {
+    background: #4caf50;
+    color: #fff;
+}
+
+/* ========== 新增：教程按钮样式 ========== */
+.tutorial-btn {
+    position: fixed;
+    right: 0;
+    top: 20%;
+    transform: translateY(-50%);
+    width: 120rpx;
+    height: 120rpx;
+    background: rgba(0, 0, 0, 0.75);
+    backdrop-filter: blur(15rpx);
+    border-radius: 60rpx 0 0 60rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10001;
+    box-shadow: -8rpx 0 20rpx rgba(0,0,0,0.3);
+    transition: right 0.3s ease-out;
+    border: 2rpx solid rgba(255,215,0,0.5);
+    border-right: none;
+}
+.tutorial-btn-text {
+    color: #FFD700;
+    font-size: 36rpx;
+    font-weight: bold;
+    writing-mode: vertical-rl;
+    letter-spacing: 6rpx;
+}
+.tutorial-btn-hidden {
+    right: -80rpx;
+}
+.tutorial-btn-hover {
+    background: rgba(0, 0, 0, 0.9);
+    transform: translateY(-50%) scale(1.05);
 }
\ No newline at end of file
diff --git a/pages/sjdingdan/sjdingdan.js b/pages/merchant-orders/merchant-orders.js
similarity index 95%
rename from pages/sjdingdan/sjdingdan.js
rename to pages/merchant-orders/merchant-orders.js
index 5af2a7c..f6c2ec4 100644
--- a/pages/sjdingdan/sjdingdan.js
+++ b/pages/merchant-orders/merchant-orders.js
@@ -1,327 +1,327 @@
-// pages/sjdingdan/sjdingdan.js
-const app = getApp();
-import request from '../../utils/request.js';
-import { reconnectForRole } from '../../utils/role-tab-bar.js';
-
-Page({
-  data: {
-    // 商品类型（和打手端用同一个接口）
-    shangpinleixing: [],
-    xuanzhongLeixingId: null,
-
-    // 搜索关键字（模糊搜索）
-    searchKeyword: '',
-
-    // 状态列表（含全部）
-    statusList: [
-      { name: '全部', key: 'all', zhuangtaiList: [1, 2, 3, 4, 5, 6, 7, 8], color: '#333333' },
-      { name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2], color: '#2196F3' },
-      { name: '退款中', key: 'tuikuanzhong', zhuangtaiList: [4], color: '#FF9800' },
-      { name: '已退款', key: 'yituikuan', zhuangtaiList: [5], color: '#9E9E9E' },
-      { name: '退款失败', key: 'tuikuanshibai', zhuangtaiList: [6], color: '#F44336' },
-      { name: '已完成', key: 'yiwancheng', zhuangtaiList: [3], color: '#4CAF50' },
-      { name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8], color: '#FF5722' }
-    ],
-    currentStatusKey: 'all',
-
-    // 每个状态独立的数据集
-    sjDingdanShuju: {
-      all: { list: [], page: 1, hasMore: true, isLoading: false },
-      jinxingzhong: { list: [], page: 1, hasMore: true, isLoading: false },
-      tuikuanzhong: { list: [], page: 1, hasMore: true, isLoading: false },
-      yituikuan: { list: [], page: 1, hasMore: true, isLoading: false },
-      tuikuanshibai: { list: [], page: 1, hasMore: true, isLoading: false },
-      yiwancheng: { list: [], page: 1, hasMore: true, isLoading: false },
-      jiesuanzhong: { list: [], page: 1, hasMore: true, isLoading: false }
-    },
-
-    currentList: [],
-    hasMore: true,
-    isLoading: false,
-    isLoadingMore: false,
-    scrollViewRefreshing: false,
-    defaultImg: '/images/default-order.png',
-    ossImageUrl: app.globalData.ossImageUrl || '',
-
-    // 待结算数量
-    pendingCount: 0,
-  },
-
-  onLoad() {
-    wx.setNavigationBarTitle({ title: '我的派单' });
-    this.loadShangpinLeixing();
-    this.registerNotificationComponent();
-  },
-
-  onShow() {
-    this.registerNotificationComponent();
-    this.loadPendingCount();
-    if (wx.getStorageSync('uid')) {
-      reconnectForRole('shangjia');
-      if (app.startImWhenReady) app.startImWhenReady();
-    }
-    if (this.data.currentStatusKey && this.data.xuanzhongLeixingId) {
-      this.loadCurrentStatusOrders(true);
-    }
-  },
-
-  // 注册全局通知组件
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  // 🆕 加载商品类型（和打手端用同一个接口 /dingdan/dsqdhqddlx）
-  async loadShangpinLeixing() {
-    try {
-      const res = await request({
-        url: '/dingdan/dsqdhqddlx',
-        method: 'POST',
-        header: { 'content-type': 'application/json' }
-      });
-      if (res.data && (res.data.code === 200 || res.data.code === 0)) {
-        let list = res.data.data.list || res.data.data || [];
-        if (!Array.isArray(list)) list = [];
-        const oss = this.data.ossImageUrl;
-        // 拼接图片完整URL
-        const processed = list.map(item => ({
-          ...item,
-          full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http')
-            ? oss + item.tupian_url
-            : (item.tupian_url || '/images/default-type.png')
-        }));
-        this.setData({
-          shangpinleixing: processed,
-          xuanzhongLeixingId: processed[0]?.id || null
-        });
-        // 初始加载全部状态订单
-        this.loadCurrentStatusOrders(true);
-      }
-    } catch (e) {
-      console.error('加载商品类型失败', e);
-    }
-  },
-
-  // 选择商品类型
-  selectLeixing(e) {
-    const id = e.currentTarget.dataset.id;
-    if (id === this.data.xuanzhongLeixingId) return;
-    this.setData({ xuanzhongLeixingId: id });
-    this.resetCurrentStatusData();
-    this.loadCurrentStatusOrders(true);
-  },
-
-  // 搜索输入（防抖）
-  onSearchInput(e) {
-    this.setData({ searchKeyword: e.detail.value });
-    if (this._searchTimer) clearTimeout(this._searchTimer);
-    this._searchTimer = setTimeout(() => {
-      this.onSearchConfirm();
-    }, 500);
-  },
-
-  // 搜索确认
-  onSearchConfirm() {
-    this.resetCurrentStatusData();
-    this.loadCurrentStatusOrders(true);
-  },
-
-  // 清除搜索
-  clearSearch() {
-    this.setData({ searchKeyword: '' });
-    this.resetCurrentStatusData();
-    this.loadCurrentStatusOrders(true);
-  },
-
-  // 切换状态Tab
-  switchStatus(e) {
-    const key = e.currentTarget.dataset.key;
-    if (key === this.data.currentStatusKey) return;
-    this.setData({ currentStatusKey: key });
-    const tabData = this.data.sjDingdanShuju[key];
-    // 如果该状态没有数据，则加载；否则只刷新视图
-    if (tabData.list.length === 0 && tabData.hasMore && !tabData.isLoading) {
-      this.loadCurrentStatusOrders(true);
-    } else {
-      this.refreshCurrentListView();
-    }
-  },
-
-  // 🆕 加载订单（核心方法，接口固定用商家订单接口 /dingdan/sjdingdanhq）
-  async loadCurrentStatusOrders(isRefresh = false) {
-    const key = this.data.currentStatusKey;
-    const tabData = this.data.sjDingdanShuju[key];
-    if (tabData.isLoading) return;
-    const page = isRefresh ? 1 : tabData.page;
-
-    this.setData({
-      [`sjDingdanShuju.${key}.isLoading`]: true,
-      isLoading: true,
-      isLoadingMore: !isRefresh
-    });
-
-    try {
-      const statusItem = this.data.statusList.find(s => s.key === key);
-      const zhuangtaiList = statusItem.zhuangtaiList;
-
-      // 构建请求参数
-      const params = {
-        zhuangtai_list: zhuangtaiList,
-        page: page,
-        page_size: 5,
-        leixing_id: this.data.xuanzhongLeixingId,  // 🆕 商品类型筛选
-        keyword: this.data.searchKeyword || undefined  // 🆕 模糊搜索
-      };
-
-      const res = await request({
-        url: '/dingdan/sjdingdanhq',  // 商家订单接口（和原来一样）
-        method: 'POST',
-        data: params,
-        header: { 'content-type': 'application/json' }
-      });
-
-      const code = res.data.code;
-      if (code === 200 || code === 0) {
-        const newList = res.data.data.list || [];
-        const hasMore = res.data.data.has_more || false;
-
-        // 处理数据：拼接图片、转换状态中文
-        const processed = newList.map(item => ({
-          ...item,
-          zhuangtaiZh: this.getZhuangtaiZh(item.zhuangtai),
-          zhuangtaiColor: statusItem.color,
-          // 如果有商品图片则用商品图片，否则用默认图
-          tupian: item.tupian
-            ? (item.tupian.startsWith('http') ? item.tupian : this.data.ossImageUrl + item.tupian)
-            : this.data.defaultImg
-        }));
-
-        const currentList = this.data.sjDingdanShuju[key].list;
-        const updatedList = isRefresh ? processed : [...currentList, ...processed];
-
-        this.setData({
-          [`sjDingdanShuju.${key}.list`]: updatedList,
-          [`sjDingdanShuju.${key}.page`]: page,
-          [`sjDingdanShuju.${key}.hasMore`]: hasMore,
-          [`sjDingdanShuju.${key}.isLoading`]: false,
-          isLoading: false,
-          isLoadingMore: false,
-          scrollViewRefreshing: false
-        });
-        this.refreshCurrentListView();
-      } else {
-        throw new Error(res.data.msg || '加载失败');
-      }
-    } catch (err) {
-      console.error('加载订单失败', err);
-      wx.showToast({ title: err.message || '加载失败', icon: 'none' });
-      this.setData({
-        [`sjDingdanShuju.${key}.isLoading`]: false,
-        isLoading: false,
-        isLoadingMore: false,
-        scrollViewRefreshing: false
-      });
-      this.refreshCurrentListView();
-    }
-  },
-
-  // 刷新当前视图
-  refreshCurrentListView() {
-    const key = this.data.currentStatusKey;
-    const tabData = this.data.sjDingdanShuju[key];
-    this.setData({
-      currentList: tabData.list,
-      hasMore: tabData.hasMore,
-      isLoading: tabData.isLoading
-    });
-  },
-
-  // 重置当前状态数据
-  resetCurrentStatusData() {
-    const key = this.data.currentStatusKey;
-    this.setData({
-      [`sjDingdanShuju.${key}.list`]: [],
-      [`sjDingdanShuju.${key}.page`]: 1,
-      [`sjDingdanShuju.${key}.hasMore`]: true,
-      [`sjDingdanShuju.${key}.isLoading`]: false
-    });
-    this.refreshCurrentListView();
-  },
-
-  // 🆕 加载待结算数量
-  async loadPendingCount() {
-    try {
-      const res = await request({
-        url: '/dingdan/sjdingdanhq',
-        method: 'POST',
-        data: {
-          zhuangtai_list: [8],
-          page: 1,
-          page_size: 1
-        }
-      });
-      if (res && res.data.code === 0) {
-        this.setData({ pendingCount: res.data.data.pending_count || 0 });
-      }
-    } catch (error) {
-      console.error('加载待结算数量失败:', error);
-    }
-  },
-
-  // 下拉刷新（由 scroll-view 触发）
-  onPullDownRefresh() {
-    if (this.data.isLoading) {
-      this.setData({ scrollViewRefreshing: false });
-      return;
-    }
-    this.setData({ scrollViewRefreshing: true });
-    this.resetCurrentStatusData();
-    this.loadCurrentStatusOrders(true);
-  },
-
-  // 上拉加载更多（由 scroll-view 触发）
-  onReachBottom() {
-    const key = this.data.currentStatusKey;
-    const tabData = this.data.sjDingdanShuju[key];
-    if (tabData.isLoading || !tabData.hasMore) return;
-    this.setData({ [`sjDingdanShuju.${key}.page`]: tabData.page + 1 });
-    this.loadCurrentStatusOrders(false);
-  },
-
-  // 🆕 手动点击"加载更多"按钮
-  onLoadMoreTap() {
-    const key = this.data.currentStatusKey;
-    const tabData = this.data.sjDingdanShuju[key];
-    if (tabData.isLoading || !tabData.hasMore) return;
-    this.setData({ [`sjDingdanShuju.${key}.page`]: tabData.page + 1 });
-    this.loadCurrentStatusOrders(false);
-  },
-
-  // 状态码转中文
-  getZhuangtaiZh(zhuangtai) {
-    const map = {
-      1: '已下单', 2: '进行中', 3: '已完成',
-      4: '退款中', 5: '已退款', 6: '退款失败',
-      7: '指定中', 8: '结算中'
-    };
-    return map[zhuangtai] || '未知状态';
-  },
-
-  // 跳转订单详情
-  goToSjDingdanXiangqing(e) {
-    const item = e.currentTarget.dataset.item;
-    if (!item) return;
-    const dataStr = encodeURIComponent(JSON.stringify(item));
-    wx.navigateTo({
-      url: `/pages/sjddxq/sjddxq?dingdanData=${dataStr}`
-    });
-  },
-
-  // 图片加载失败
-  onImageError() {}
+// pages/merchant-orders/merchant-orders.js
+const app = getApp();
+import request from '../../utils/request.js';
+import { reconnectForRole } from '../../utils/role-tab-bar.js';
+
+Page({
+  data: {
+    // 商品类型（和打手端用同一个接口）
+    shangpinleixing: [],
+    xuanzhongLeixingId: null,
+
+    // 搜索关键字（模糊搜索）
+    searchKeyword: '',
+
+    // 状态列表（含全部）
+    statusList: [
+      { name: '全部', key: 'all', zhuangtaiList: [1, 2, 3, 4, 5, 6, 7, 8], color: '#333333' },
+      { name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2], color: '#2196F3' },
+      { name: '退款中', key: 'tuikuanzhong', zhuangtaiList: [4], color: '#FF9800' },
+      { name: '已退款', key: 'yituikuan', zhuangtaiList: [5], color: '#9E9E9E' },
+      { name: '退款失败', key: 'tuikuanshibai', zhuangtaiList: [6], color: '#F44336' },
+      { name: '已完成', key: 'yiwancheng', zhuangtaiList: [3], color: '#4CAF50' },
+      { name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8], color: '#FF5722' }
+    ],
+    currentStatusKey: 'all',
+
+    // 每个状态独立的数据集
+    sjDingdanShuju: {
+      all: { list: [], page: 1, hasMore: true, isLoading: false },
+      jinxingzhong: { list: [], page: 1, hasMore: true, isLoading: false },
+      tuikuanzhong: { list: [], page: 1, hasMore: true, isLoading: false },
+      yituikuan: { list: [], page: 1, hasMore: true, isLoading: false },
+      tuikuanshibai: { list: [], page: 1, hasMore: true, isLoading: false },
+      yiwancheng: { list: [], page: 1, hasMore: true, isLoading: false },
+      jiesuanzhong: { list: [], page: 1, hasMore: true, isLoading: false }
+    },
+
+    currentList: [],
+    hasMore: true,
+    isLoading: false,
+    isLoadingMore: false,
+    scrollViewRefreshing: false,
+    defaultImg: '/images/default-order.png',
+    ossImageUrl: app.globalData.ossImageUrl || '',
+
+    // 待结算数量
+    pendingCount: 0,
+  },
+
+  onLoad() {
+    wx.setNavigationBarTitle({ title: '我的派单' });
+    this.loadShangpinLeixing();
+    this.registerNotificationComponent();
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+    this.loadPendingCount();
+    if (wx.getStorageSync('uid')) {
+      reconnectForRole('shangjia');
+      if (app.startImWhenReady) app.startImWhenReady();
+    }
+    if (this.data.currentStatusKey && this.data.xuanzhongLeixingId) {
+      this.loadCurrentStatusOrders(true);
+    }
+  },
+
+  // 注册全局通知组件
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  // 🆕 加载商品类型（和打手端用同一个接口 /dingdan/dsqdhqddlx）
+  async loadShangpinLeixing() {
+    try {
+      const res = await request({
+        url: '/dingdan/dsqdhqddlx',
+        method: 'POST',
+        header: { 'content-type': 'application/json' }
+      });
+      if (res.data && (res.data.code === 200 || res.data.code === 0)) {
+        let list = res.data.data.list || res.data.data || [];
+        if (!Array.isArray(list)) list = [];
+        const oss = this.data.ossImageUrl;
+        // 拼接图片完整URL
+        const processed = list.map(item => ({
+          ...item,
+          full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http')
+            ? oss + item.tupian_url
+            : (item.tupian_url || '/images/default-type.png')
+        }));
+        this.setData({
+          shangpinleixing: processed,
+          xuanzhongLeixingId: processed[0]?.id || null
+        });
+        // 初始加载全部状态订单
+        this.loadCurrentStatusOrders(true);
+      }
+    } catch (e) {
+      console.error('加载商品类型失败', e);
+    }
+  },
+
+  // 选择商品类型
+  selectLeixing(e) {
+    const id = e.currentTarget.dataset.id;
+    if (id === this.data.xuanzhongLeixingId) return;
+    this.setData({ xuanzhongLeixingId: id });
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  // 搜索输入（防抖）
+  onSearchInput(e) {
+    this.setData({ searchKeyword: e.detail.value });
+    if (this._searchTimer) clearTimeout(this._searchTimer);
+    this._searchTimer = setTimeout(() => {
+      this.onSearchConfirm();
+    }, 500);
+  },
+
+  // 搜索确认
+  onSearchConfirm() {
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  // 清除搜索
+  clearSearch() {
+    this.setData({ searchKeyword: '' });
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  // 切换状态Tab
+  switchStatus(e) {
+    const key = e.currentTarget.dataset.key;
+    if (key === this.data.currentStatusKey) return;
+    this.setData({ currentStatusKey: key });
+    const tabData = this.data.sjDingdanShuju[key];
+    // 如果该状态没有数据，则加载；否则只刷新视图
+    if (tabData.list.length === 0 && tabData.hasMore && !tabData.isLoading) {
+      this.loadCurrentStatusOrders(true);
+    } else {
+      this.refreshCurrentListView();
+    }
+  },
+
+  // 🆕 加载订单（核心方法，接口固定用商家订单接口 /dingdan/sjdingdanhq）
+  async loadCurrentStatusOrders(isRefresh = false) {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.sjDingdanShuju[key];
+    if (tabData.isLoading) return;
+    const page = isRefresh ? 1 : tabData.page;
+
+    this.setData({
+      [`sjDingdanShuju.${key}.isLoading`]: true,
+      isLoading: true,
+      isLoadingMore: !isRefresh
+    });
+
+    try {
+      const statusItem = this.data.statusList.find(s => s.key === key);
+      const zhuangtaiList = statusItem.zhuangtaiList;
+
+      // 构建请求参数
+      const params = {
+        zhuangtai_list: zhuangtaiList,
+        page: page,
+        page_size: 5,
+        leixing_id: this.data.xuanzhongLeixingId,  // 🆕 商品类型筛选
+        keyword: this.data.searchKeyword || undefined  // 🆕 模糊搜索
+      };
+
+      const res = await request({
+        url: '/dingdan/sjdingdanhq',  // 商家订单接口（和原来一样）
+        method: 'POST',
+        data: params,
+        header: { 'content-type': 'application/json' }
+      });
+
+      const code = res.data.code;
+      if (code === 200 || code === 0) {
+        const newList = res.data.data.list || [];
+        const hasMore = res.data.data.has_more || false;
+
+        // 处理数据：拼接图片、转换状态中文
+        const processed = newList.map(item => ({
+          ...item,
+          zhuangtaiZh: this.getZhuangtaiZh(item.zhuangtai),
+          zhuangtaiColor: statusItem.color,
+          // 如果有商品图片则用商品图片，否则用默认图
+          tupian: item.tupian
+            ? (item.tupian.startsWith('http') ? item.tupian : this.data.ossImageUrl + item.tupian)
+            : this.data.defaultImg
+        }));
+
+        const currentList = this.data.sjDingdanShuju[key].list;
+        const updatedList = isRefresh ? processed : [...currentList, ...processed];
+
+        this.setData({
+          [`sjDingdanShuju.${key}.list`]: updatedList,
+          [`sjDingdanShuju.${key}.page`]: page,
+          [`sjDingdanShuju.${key}.hasMore`]: hasMore,
+          [`sjDingdanShuju.${key}.isLoading`]: false,
+          isLoading: false,
+          isLoadingMore: false,
+          scrollViewRefreshing: false
+        });
+        this.refreshCurrentListView();
+      } else {
+        throw new Error(res.data.msg || '加载失败');
+      }
+    } catch (err) {
+      console.error('加载订单失败', err);
+      wx.showToast({ title: err.message || '加载失败', icon: 'none' });
+      this.setData({
+        [`sjDingdanShuju.${key}.isLoading`]: false,
+        isLoading: false,
+        isLoadingMore: false,
+        scrollViewRefreshing: false
+      });
+      this.refreshCurrentListView();
+    }
+  },
+
+  // 刷新当前视图
+  refreshCurrentListView() {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.sjDingdanShuju[key];
+    this.setData({
+      currentList: tabData.list,
+      hasMore: tabData.hasMore,
+      isLoading: tabData.isLoading
+    });
+  },
+
+  // 重置当前状态数据
+  resetCurrentStatusData() {
+    const key = this.data.currentStatusKey;
+    this.setData({
+      [`sjDingdanShuju.${key}.list`]: [],
+      [`sjDingdanShuju.${key}.page`]: 1,
+      [`sjDingdanShuju.${key}.hasMore`]: true,
+      [`sjDingdanShuju.${key}.isLoading`]: false
+    });
+    this.refreshCurrentListView();
+  },
+
+  // 🆕 加载待结算数量
+  async loadPendingCount() {
+    try {
+      const res = await request({
+        url: '/dingdan/sjdingdanhq',
+        method: 'POST',
+        data: {
+          zhuangtai_list: [8],
+          page: 1,
+          page_size: 1
+        }
+      });
+      if (res && res.data.code === 0) {
+        this.setData({ pendingCount: res.data.data.pending_count || 0 });
+      }
+    } catch (error) {
+      console.error('加载待结算数量失败:', error);
+    }
+  },
+
+  // 下拉刷新（由 scroll-view 触发）
+  onPullDownRefresh() {
+    if (this.data.isLoading) {
+      this.setData({ scrollViewRefreshing: false });
+      return;
+    }
+    this.setData({ scrollViewRefreshing: true });
+    this.resetCurrentStatusData();
+    this.loadCurrentStatusOrders(true);
+  },
+
+  // 上拉加载更多（由 scroll-view 触发）
+  onReachBottom() {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.sjDingdanShuju[key];
+    if (tabData.isLoading || !tabData.hasMore) return;
+    this.setData({ [`sjDingdanShuju.${key}.page`]: tabData.page + 1 });
+    this.loadCurrentStatusOrders(false);
+  },
+
+  // 🆕 手动点击"加载更多"按钮
+  onLoadMoreTap() {
+    const key = this.data.currentStatusKey;
+    const tabData = this.data.sjDingdanShuju[key];
+    if (tabData.isLoading || !tabData.hasMore) return;
+    this.setData({ [`sjDingdanShuju.${key}.page`]: tabData.page + 1 });
+    this.loadCurrentStatusOrders(false);
+  },
+
+  // 状态码转中文
+  getZhuangtaiZh(zhuangtai) {
+    const map = {
+      1: '已下单', 2: '进行中', 3: '已完成',
+      4: '退款中', 5: '已退款', 6: '退款失败',
+      7: '指定中', 8: '结算中'
+    };
+    return map[zhuangtai] || '未知状态';
+  },
+
+  // 跳转订单详情
+  goToSjDingdanXiangqing(e) {
+    const item = e.currentTarget.dataset.item;
+    if (!item) return;
+    const dataStr = encodeURIComponent(JSON.stringify(item));
+    wx.navigateTo({
+      url: `/pages/merchant-order-detail/merchant-order-detail?dingdanData=${dataStr}`
+    });
+  },
+
+  // 图片加载失败
+  onImageError() {}
 });
\ No newline at end of file
diff --git a/pages/sjdingdan/sjdingdan.json b/pages/merchant-orders/merchant-orders.json
similarity index 100%
rename from pages/sjdingdan/sjdingdan.json
rename to pages/merchant-orders/merchant-orders.json
diff --git a/pages/sjdingdan/sjdingdan.wxml b/pages/merchant-orders/merchant-orders.wxml
similarity index 97%
rename from pages/sjdingdan/sjdingdan.wxml
rename to pages/merchant-orders/merchant-orders.wxml
index 0d36a72..3f209d6 100644
--- a/pages/sjdingdan/sjdingdan.wxml
+++ b/pages/merchant-orders/merchant-orders.wxml
@@ -1,135 +1,135 @@
-<!--pages/sjdingdan/sjdingdan.wxml-->
-<view class="sj-page">
-  <!-- 顶部商品类型滑动 -->
-  <view class="leixing-area">
-    <scroll-view class="leixing-scroll" scroll-x enhanced show-scrollbar="{{false}}">
-      <view class="leixing-container">
-        <block wx:for="{{shangpinleixing}}" wx:key="id">
-          <view
-            class="leixing-item {{xuanzhongLeixingId == item.id ? 'leixing-active' : ''}}"
-            data-id="{{item.id}}"
-            bindtap="selectLeixing"
-          >
-            <image class="leixing-img" src="{{item.full_tupian_url}}" mode="aspectFill"/>
-            <text class="leixing-name">{{item.jieshao || '类型'}}</text>
-          </view>
-        </block>
-      </view>
-    </scroll-view>
-  </view>
-
-  <!-- 搜索行 -->
-  <view class="filter-row">
-    <view class="search-box">
-      <image class="search-icon" src="/images/icon_search.svg" mode="aspectFit"/>
-      <input class="search-input" placeholder="搜索订单ID/介绍/昵称/打手ID" value="{{searchKeyword}}" bindinput="onSearchInput" bindconfirm="onSearchConfirm" confirm-type="search"/>
-      <view class="search-clear" wx:if="{{searchKeyword}}" bindtap="clearSearch"><text>✕</text></view>
-    </view>
-  </view>
-
-  <!-- 待结算数量提示条（保留原功能） -->
-  <view class="sj-pending-tip" wx:if="{{pendingCount > 0}}">
-    <text class="sj-pending-icon"></text>
-    <text class="sj-pending-text">待结算订单</text>
-    <view class="sj-pending-badge">{{pendingCount}}</view>
-  </view>
-
-  <!-- 主体：左右布局 -->
-  <view class="main-container">
-    <!-- 左侧状态栏（固定） -->
-    <view class="left-status">
-      <block wx:for="{{statusList}}" wx:key="key">
-        <view class="status-item {{currentStatusKey == item.key ? 'status-active' : ''}}" data-key="{{item.key}}" bindtap="switchStatus">
-          <text class="status-name">{{item.name}}</text>
-          <!-- 结算中状态旁边显示红色数字（保留原功能） -->
-          <view class="status-dot" wx:if="{{currentStatusKey == item.key}}"></view>
-          <view wx:if="{{item.key === 'jiesuanzhong' && pendingCount > 0}}" class="sj-status-badge">{{pendingCount}}</view>
-        </view>
-      </block>
-    </view>
-
-    <!-- 右侧包裹：撑出右边距，里面是 scroll-view -->
-    <view class="right-wrapper">
-      <scroll-view
-        class="right-list"
-        scroll-y enhanced show-scrollbar="{{false}}"
-        refresher-enabled="{{true}}"
-        refresher-threshold="80"
-        refresher-default-style="black"
-        refresher-background="#f5f6fa"
-        refresher-triggered="{{scrollViewRefreshing}}"
-        bindrefresherrefresh="onPullDownRefresh"
-        bindscrolltolower="onReachBottom"
-        lower-threshold="50"
-      >
-        <view class="refresher-slot" slot="refresher">
-          <text wx:if="{{scrollViewRefreshing}}" class="refreshing-text">⚡ 正在刷新...</text>
-          <text wx:else class="pull-text">▼ 下拉刷新</text>
-        </view>
-
-        <!-- 内容容器 -->
-        <view class="list-inner">
-          <!-- 加载中 -->
-          <view wx:if="{{isLoading && currentList.length === 0}}" class="loading-state">
-            <view class="loading-spinner"></view>
-            <text class="loading-tip">加载订单中...</text>
-          </view>
-
-          <!-- 空状态 -->
-          <view wx:elif="{{!isLoading && currentList.length === 0}}" class="empty-state">
-            <image class="empty-img" src="/images/empty-order.png" mode="aspectFit"/>
-            <text class="empty-text">暂无订单</text>
-            <text class="empty-subtext">快去派发订单吧</text>
-          </view>
-
-          <!-- 订单卡片列表 -->
-          <block wx:for="{{currentList}}" wx:key="dingdan_id">
-            <view class="order-card {{item.zhuangtai === 8 ? 'sj-card-jiesuan' : ''}}" data-item="{{item}}" bindtap="goToSjDingdanXiangqing">
-              <!-- 创建时间 -->
-              <view class="card-time" wx:if="{{item.create_time}}">{{item.create_time}}</view>
-              <!-- 内容行 -->
-              <view class="card-content-row">
-                <image class="card-img" src="{{item.tupian}}" mode="aspectFill" binderror="onImageError"/>
-                <view class="card-info">
-                  <view class="card-title">{{item.jieshao || '暂无描述'}}</view>
-                  <view class="card-id" wx:if="{{item.dingdan_id}}">ID: {{item.dingdan_id}}</view>
-                  <view class="card-nicheng" wx:if="{{item.nicheng}}">昵称: {{item.nicheng}}</view>
-                </view>
-                <view class="card-right">
-                  <view class="card-status {{item.zhuangtai === 8 ? 'sj-status-jiesuan' : ''}}" style="color: {{item.zhuangtaiColor}};">{{item.zhuangtaiZh}}</view>
-                  <view class="card-price">
-                    <text class="price-symbol">¥</text>
-                    <text class="price-number">{{item.jine || '0.00'}}</text>
-                  </view>
-                </view>
-              </view>
-            </view>
-          </block>
-
-          <!-- 上拉加载更多提示 -->
-          <view class="load-more" wx:if="{{hasMore && currentList.length > 0 && !isLoadingMore}}">
-            <text class="load-more-text">上拉加载更多</text>
-          </view>
-
-          <!-- 加载中 -->
-          <view class="loading-more-state" wx:if="{{isLoadingMore}}">
-            <view class="mini-spinner"></view>
-            <text>加载中...</text>
-          </view>
-
-          <!-- 🆕 手动加载更多按钮 -->
-          <view class="manual-load-more" wx:if="{{hasMore && currentList.length > 0 && !isLoadingMore}}">
-            <button class="load-more-btn" bindtap="onLoadMoreTap" loading="{{false}}">点击加载更多</button>
-          </view>
-
-          <!-- 没有更多 -->
-          <view class="no-more" wx:if="{{!hasMore && currentList.length > 0}}">
-            <text>—— 没有更多了 ——</text>
-          </view>
-        </view>
-      </scroll-view>
-    </view>
-  </view>
-</view>
-<global-notification id="global-notification" />
+<!--pages/merchant-orders/merchant-orders.wxml-->
+<view class="sj-page">
+  <!-- 顶部商品类型滑动 -->
+  <view class="leixing-area">
+    <scroll-view class="leixing-scroll" scroll-x enhanced show-scrollbar="{{false}}">
+      <view class="leixing-container">
+        <block wx:for="{{shangpinleixing}}" wx:key="id">
+          <view
+            class="leixing-item {{xuanzhongLeixingId == item.id ? 'leixing-active' : ''}}"
+            data-id="{{item.id}}"
+            bindtap="selectLeixing"
+          >
+            <image class="leixing-img" src="{{item.full_tupian_url}}" mode="aspectFill"/>
+            <text class="leixing-name">{{item.jieshao || '类型'}}</text>
+          </view>
+        </block>
+      </view>
+    </scroll-view>
+  </view>
+
+  <!-- 搜索行 -->
+  <view class="filter-row">
+    <view class="search-box">
+      <image class="search-icon" src="/images/icon_search.svg" mode="aspectFit"/>
+      <input class="search-input" placeholder="搜索订单ID/介绍/昵称/打手ID" value="{{searchKeyword}}" bindinput="onSearchInput" bindconfirm="onSearchConfirm" confirm-type="search"/>
+      <view class="search-clear" wx:if="{{searchKeyword}}" bindtap="clearSearch"><text>✕</text></view>
+    </view>
+  </view>
+
+  <!-- 待结算数量提示条（保留原功能） -->
+  <view class="sj-pending-tip" wx:if="{{pendingCount > 0}}">
+    <text class="sj-pending-icon"></text>
+    <text class="sj-pending-text">待结算订单</text>
+    <view class="sj-pending-badge">{{pendingCount}}</view>
+  </view>
+
+  <!-- 主体：左右布局 -->
+  <view class="main-container">
+    <!-- 左侧状态栏（固定） -->
+    <view class="left-status">
+      <block wx:for="{{statusList}}" wx:key="key">
+        <view class="status-item {{currentStatusKey == item.key ? 'status-active' : ''}}" data-key="{{item.key}}" bindtap="switchStatus">
+          <text class="status-name">{{item.name}}</text>
+          <!-- 结算中状态旁边显示红色数字（保留原功能） -->
+          <view class="status-dot" wx:if="{{currentStatusKey == item.key}}"></view>
+          <view wx:if="{{item.key === 'jiesuanzhong' && pendingCount > 0}}" class="sj-status-badge">{{pendingCount}}</view>
+        </view>
+      </block>
+    </view>
+
+    <!-- 右侧包裹：撑出右边距，里面是 scroll-view -->
+    <view class="right-wrapper">
+      <scroll-view
+        class="right-list"
+        scroll-y enhanced show-scrollbar="{{false}}"
+        refresher-enabled="{{true}}"
+        refresher-threshold="80"
+        refresher-default-style="black"
+        refresher-background="#f5f6fa"
+        refresher-triggered="{{scrollViewRefreshing}}"
+        bindrefresherrefresh="onPullDownRefresh"
+        bindscrolltolower="onReachBottom"
+        lower-threshold="50"
+      >
+        <view class="refresher-slot" slot="refresher">
+          <text wx:if="{{scrollViewRefreshing}}" class="refreshing-text">⚡ 正在刷新...</text>
+          <text wx:else class="pull-text">▼ 下拉刷新</text>
+        </view>
+
+        <!-- 内容容器 -->
+        <view class="list-inner">
+          <!-- 加载中 -->
+          <view wx:if="{{isLoading && currentList.length === 0}}" class="loading-state">
+            <view class="loading-spinner"></view>
+            <text class="loading-tip">加载订单中...</text>
+          </view>
+
+          <!-- 空状态 -->
+          <view wx:elif="{{!isLoading && currentList.length === 0}}" class="empty-state">
+            <image class="empty-img" src="/images/empty-order.png" mode="aspectFit"/>
+            <text class="empty-text">暂无订单</text>
+            <text class="empty-subtext">快去派发订单吧</text>
+          </view>
+
+          <!-- 订单卡片列表 -->
+          <block wx:for="{{currentList}}" wx:key="dingdan_id">
+            <view class="order-card {{item.zhuangtai === 8 ? 'sj-card-jiesuan' : ''}}" data-item="{{item}}" bindtap="goToSjDingdanXiangqing">
+              <!-- 创建时间 -->
+              <view class="card-time" wx:if="{{item.create_time}}">{{item.create_time}}</view>
+              <!-- 内容行 -->
+              <view class="card-content-row">
+                <image class="card-img" src="{{item.tupian}}" mode="aspectFill" binderror="onImageError"/>
+                <view class="card-info">
+                  <view class="card-title">{{item.jieshao || '暂无描述'}}</view>
+                  <view class="card-id" wx:if="{{item.dingdan_id}}">ID: {{item.dingdan_id}}</view>
+                  <view class="card-nicheng" wx:if="{{item.nicheng}}">昵称: {{item.nicheng}}</view>
+                </view>
+                <view class="card-right">
+                  <view class="card-status {{item.zhuangtai === 8 ? 'sj-status-jiesuan' : ''}}" style="color: {{item.zhuangtaiColor}};">{{item.zhuangtaiZh}}</view>
+                  <view class="card-price">
+                    <text class="price-symbol">¥</text>
+                    <text class="price-number">{{item.jine || '0.00'}}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </block>
+
+          <!-- 上拉加载更多提示 -->
+          <view class="load-more" wx:if="{{hasMore && currentList.length > 0 && !isLoadingMore}}">
+            <text class="load-more-text">上拉加载更多</text>
+          </view>
+
+          <!-- 加载中 -->
+          <view class="loading-more-state" wx:if="{{isLoadingMore}}">
+            <view class="mini-spinner"></view>
+            <text>加载中...</text>
+          </view>
+
+          <!-- 🆕 手动加载更多按钮 -->
+          <view class="manual-load-more" wx:if="{{hasMore && currentList.length > 0 && !isLoadingMore}}">
+            <button class="load-more-btn" bindtap="onLoadMoreTap" loading="{{false}}">点击加载更多</button>
+          </view>
+
+          <!-- 没有更多 -->
+          <view class="no-more" wx:if="{{!hasMore && currentList.length > 0}}">
+            <text>—— 没有更多了 ——</text>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</view>
+<global-notification id="global-notification" />
 <custom-tab-bar />
\ No newline at end of file
diff --git a/pages/sjdingdan/sjdingdan.wxss b/pages/merchant-orders/merchant-orders.wxss
similarity index 94%
rename from pages/sjdingdan/sjdingdan.wxss
rename to pages/merchant-orders/merchant-orders.wxss
index 2e85ea1..5d01da2 100644
--- a/pages/sjdingdan/sjdingdan.wxss
+++ b/pages/merchant-orders/merchant-orders.wxss
@@ -1,430 +1,428 @@
-/* pages/sjdingdan/sjdingdan.wxss */
-
-/* 页面容器：禁止整体滚动 */
-page {
-    height: 100%;
-    overflow: hidden;
-  }
-  .sj-page {
-    height: 100vh;
-    display: flex;
-    flex-direction: column;
-    background: #f5f6fa;
-  }
-  
-  /* ========== 商品类型区 ========== */
-  .leixing-area {
-    background: #fff;
-    padding: 24rpx 0;
-    border-bottom: 1rpx solid #f0f0f0;
-    flex-shrink: 0;
-  }
-  .leixing-scroll {
-    white-space: nowrap;
-  }
-  .leixing-container {
-    display: inline-flex;
-    padding: 0 24rpx;
-  }
-  .leixing-item {
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    margin-right: 32rpx;
-    padding: 12rpx 20rpx;
-    border-radius: 28rpx;
-    transition: all 0.2s;
-  }
-  .leixing-item.leixing-active {
-    background: linear-gradient(135deg, #e8f0fe, #d4e4ff);
-    box-shadow: 0 4rpx 12rpx rgba(33,150,243,0.15);
-  }
-  .leixing-img {
-    width: 72rpx;
-    height: 72rpx;
-    border-radius: 50%;
-    background: #f0f0f0;
-    margin-bottom: 8rpx;
-  }
-  .leixing-name {
-    font-size: 24rpx;
-    color: #333;
-    max-width: 100rpx;
-    text-align: center;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  
-  /* ========== 搜索行 ========== */
-  .filter-row {
-    display: flex;
-    align-items: center;
-    padding: 20rpx 24rpx;
-    background: #fff;
-    border-bottom: 1rpx solid #f0f0f0;
-    flex-shrink: 0;
-  }
-  .search-box {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    background: #f0f2f5;
-    border-radius: 36rpx;
-    padding: 0 20rpx;
-    height: 68rpx;
-  }
-  .search-icon {
-    width: 32rpx;
-    height: 32rpx;
-    margin-right: 12rpx;
-    opacity: 0.5;
-  }
-  .search-input {
-    flex: 1;
-    font-size: 26rpx;
-    color: #333;
-  }
-  .search-clear {
-    width: 40rpx;
-    height: 40rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background: #ccc;
-    border-radius: 50%;
-    margin-left: 8rpx;
-  }
-  .search-clear text {
-    font-size: 24rpx;
-    color: #fff;
-    font-weight: bold;
-  }
-  
-  /* ========== 待结算提示条（保留原样式） ========== */
-  .sj-pending-tip {
-    margin: 20rpx 24rpx;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(145deg, #ffe8cc, #ffdbb5);
-    border-left: 8rpx solid #ffaa00;
-    border-radius: 16rpx;
-    display: flex;
-    align-items: center;
-    gap: 16rpx;
-    box-shadow: 0 8rpx 20rpx rgba(255,170,0,0.3);
-    flex-shrink: 0;
-  }
-  .sj-pending-icon {
-    font-size: 36rpx;
-    color: #ffaa00;
-  }
-  .sj-pending-text {
-    font-size: 28rpx;
-    color: #b25700;
-    font-weight: 600;
-  }
-  .sj-pending-badge {
-    min-width: 44rpx;
-    height: 44rpx;
-    padding: 0 12rpx;
-    background: linear-gradient(145deg, #ff3b3b, #d10000);
-    color: #fff;
-    font-size: 26rpx;
-    font-weight: 700;
-    line-height: 44rpx;
-    text-align: center;
-    border-radius: 22rpx;
-    margin-left: auto;
-    box-shadow: 0 4rpx 12rpx rgba(255,0,0,0.5);
-  }
-  
-  /* ========== 主体布局 ========== */
-  .main-container {
-    flex: 1;
-    display: flex;
-    overflow: hidden;
-  }
-  
-  /* 左侧状态栏 */
-  .left-status {
-    width: 180rpx;
-    background: #fff;
-    border-right: 1rpx solid #f0f0f0;
-    padding: 28rpx 0;
-    flex-shrink: 0;
-  }
-  .status-item {
-    padding: 28rpx 20rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    position: relative;
-  }
-  .status-item.status-active {
-    background: linear-gradient(to right, #e3f2fd, #fff);
-  }
-  .status-name {
-    font-size: 28rpx;
-    color: #555;
-  }
-  .status-active .status-name {
-    color: #1976D2;
-    font-weight: 600;
-  }
-  .status-dot {
-    width: 14rpx;
-    height: 14rpx;
-    border-radius: 50%;
-    background: #1976D2;
-  }
-  /* 结算中状态的小红点数字 */
-  .sj-status-badge {
-    min-width: 36rpx;
-    height: 36rpx;
-    padding: 0 8rpx;
-    background: linear-gradient(145deg, #ff4d4f, #d10000);
-    color: #fff;
-    font-size: 22rpx;
-    font-weight: 700;
-    line-height: 36rpx;
-    text-align: center;
-    border-radius: 18rpx;
-    margin-left: 8rpx;
-    box-shadow: 0 4rpx 8rpx rgba(255,0,0,0.4);
-  }
-  
-  /* 右侧包裹 */
-  .right-wrapper {
-    flex: 1;
-    padding-right: 30rpx;
-    box-sizing: border-box;
-    overflow: hidden;
-  }
-  .right-list {
-    width: 100%;
-    height: 100%;
-    background: #f5f6fa;
-  }
-  .refresher-slot {
-    text-align: center;
-    padding: 14rpx 0;
-    font-size: 24rpx;
-    color: #999;
-  }
-  
-  /* 内容容器 */
-  .list-inner {
-    padding: 24rpx 0 200rpx 20rpx;
-    box-sizing: border-box;
-  }
-  
-  /* ========== 订单卡片 ========== */
-  .order-card {
-    background: #fff;
-    border-radius: 24rpx;
-    padding: 24rpx;
-    margin-bottom: 24rpx;
-    box-shadow: 0 6rpx 20rpx rgba(0,0,0,0.04);
-    box-sizing: border-box;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-  }
-  /* 结算中卡片特殊边框 */
-  .sj-card-jiesuan {
-    border: 2rpx solid #ff5722;
-    box-shadow: 0 6rpx 20rpx rgba(255,87,34,0.15);
-  }
-  .order-card:active {
-    transform: scale(0.98);
-  }
-  
-  /* 创建时间 */
-  .card-time {
-    font-size: 24rpx;
-    color: #999;
-    margin-bottom: 12rpx;
-    padding-bottom: 8rpx;
-    border-bottom: 1rpx dashed rgba(0,120,255,0.15);
-  }
-  
-  /* 内容行 */
-  .card-content-row {
-    display: flex;
-    align-items: flex-start;
-  }
-  
-  /* 商品图片 */
-  .card-img {
-    width: 130rpx;
-    height: 130rpx;
-    border-radius: 18rpx;
-    background: #f0f0f0;
-    margin-right: 24rpx;
-    flex-shrink: 0;
-  }
-  
-  /* 中间信息区 */
-  .card-info {
-    flex: 1;
-    min-height: 130rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    min-width: 0;
-  }
-  .card-title {
-    font-size: 28rpx;
-    color: #222;
-    line-height: 1.5;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-  }
-  .card-id {
-    font-size: 22rpx;
-    color: #999;
-    margin-top: 6rpx;
-  }
-  .card-nicheng {
-    font-size: 22rpx;
-    color: #666;
-    margin-top: 4rpx;
-  }
-  
-  /* 右侧状态和价格 */
-  .card-right {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-    justify-content: center;
-    min-height: 130rpx;
-    margin-left: 20rpx;
-    flex-shrink: 0;
-    max-width: 160rpx;
-  }
-  .card-status {
-    font-size: 24rpx;
-    font-weight: 500;
-    padding: 4rpx 12rpx;
-    background: #f5f5f5;
-    border-radius: 20rpx;
-    margin-bottom: 8rpx;
-    white-space: nowrap;
-    max-width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  /* 结算中状态红色高亮（保留原样式） */
-  .sj-status-jiesuan {
-    background: linear-gradient(145deg, #ff4d4f, #d10000) !important;
-    color: #fff !important;
-    border-color: #ffaa00;
-    box-shadow: 0 0 15rpx #ff4d4f;
-  }
-  .card-price {
-    display: flex;
-    align-items: baseline;
-    white-space: nowrap;
-  }
-  .price-symbol {
-    font-size: 28rpx;
-    color: #ffaa00;
-    font-weight: 700;
-    margin-right: 4rpx;
-  }
-  .price-number {
-    font-size: 36rpx;
-    font-weight: 700;
-    color: #333;
-  }
-  
-  /* ========== 加载与空状态 ========== */
-  .loading-state, .empty-state {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 120rpx 0;
-  }
-  .loading-spinner {
-    width: 52rpx;
-    height: 52rpx;
-    border: 4rpx solid #e0e0e0;
-    border-top-color: #1976D2;
-    border-radius: 50%;
-    animation: spin 0.8s linear infinite;
-    margin-bottom: 24rpx;
-  }
-  @keyframes spin {
-    to { transform: rotate(360deg); }
-  }
-  .empty-img {
-    width: 200rpx;
-    height: 200rpx;
-    opacity: 0.4;
-    margin-bottom: 24rpx;
-  }
-  .empty-text, .loading-tip {
-    font-size: 28rpx;
-    color: #999;
-  }
-  .empty-subtext {
-    font-size: 26rpx;
-    color: #b0b0b0;
-    margin-top: 10rpx;
-  }
-  
-  .load-more {
-    text-align: center;
-    padding: 36rpx 0 20rpx 0;
-    font-size: 26rpx;
-    color: #999;
-  }
-  .loading-more-state {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 20rpx 0;
-    font-size: 26rpx;
-    color: #999;
-  }
-  .mini-spinner {
-    display: inline-block;
-    width: 26rpx;
-    height: 26rpx;
-    border: 3rpx solid #ccc;
-    border-top-color: #1976D2;
-    border-radius: 50%;
-    animation: spin 0.6s linear infinite;
-    vertical-align: middle;
-    margin-right: 10rpx;
-  }
-  
-  .manual-load-more {
-    display: flex;
-    justify-content: center;
-    padding: 30rpx 0 10rpx 0;
-  }
-  .load-more-btn {
-    background: #ffffff;
-    color: #1976D2;
-    font-size: 28rpx;
-    font-weight: 500;
-    border: 2rpx solid #1976D2;
-    border-radius: 40rpx;
-    padding: 16rpx 60rpx;
-    text-align: center;
-    box-shadow: 0 4rpx 12rpx rgba(33,150,243,0.1);
-  }
-  .load-more-btn::after {
-    border: none;
-  }
-  
-  .no-more {
-    text-align: center;
-    padding: 40rpx 0;
-    font-size: 26rpx;
-    color: #999;
+/* pages/merchant-orders/merchant-orders.wxss */
+
+/* 页面容器：禁止整体滚动 */
+page {
+    height: 100%;
+    overflow: hidden;
+  }
+  .sj-page {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background: #f5f6fa;
+  }
+  
+  /* ========== 商品类型区 ========== */
+  .leixing-area {
+    background: #fff;
+    padding: 24rpx 0;
+    border-bottom: 1rpx solid #f0f0f0;
+    flex-shrink: 0;
+  }
+  .leixing-scroll {
+    white-space: nowrap;
+  }
+  .leixing-container {
+    display: inline-flex;
+    padding: 0 24rpx;
+  }
+  .leixing-item {
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+    margin-right: 32rpx;
+    padding: 12rpx 20rpx;
+    border-radius: 28rpx;
+    transition: all 0.2s;
+  }
+  .leixing-item.leixing-active {
+    background: linear-gradient(135deg, #e8f0fe, #d4e4ff);
+    box-shadow: 0 4rpx 12rpx rgba(33,150,243,0.15);
+  }
+  .leixing-img {
+    width: 72rpx;
+    height: 72rpx;
+    border-radius: 50%;
+    background: #f0f0f0;
+    margin-bottom: 8rpx;
+  }
+  .leixing-name {
+    font-size: 24rpx;
+    color: #333;
+    max-width: 100rpx;
+    text-align: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  
+  /* ========== 搜索行 ========== */
+  .filter-row {
+    display: flex;
+    align-items: center;
+    padding: 20rpx 24rpx;
+    background: #fff;
+    border-bottom: 1rpx solid #f0f0f0;
+    flex-shrink: 0;
+  }
+  .search-box {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    background: #f0f2f5;
+    border-radius: 36rpx;
+    padding: 0 20rpx;
+    height: 68rpx;
+  }
+  .search-icon {
+    width: 32rpx;
+    height: 32rpx;
+    margin-right: 12rpx;
+    opacity: 0.5;
+  }
+  .search-input {
+    flex: 1;
+    font-size: 26rpx;
+    color: #333;
+  }
+  .search-clear {
+    width: 40rpx;
+    height: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #ccc;
+    border-radius: 50%;
+    margin-left: 8rpx;
+  }
+  .search-clear text {
+    font-size: 24rpx;
+    color: #fff;
+    font-weight: bold;
+  }
+  
+  /* ========== 待结算提示条（保留原样式） ========== */
+  .sj-pending-tip {
+    margin: 20rpx 24rpx;
+    padding: 16rpx 24rpx;
+    background: linear-gradient(145deg, #ffe8cc, #ffdbb5);
+    border-left: 8rpx solid #ffaa00;
+    border-radius: 16rpx;
+    display: flex;
+    align-items: center;
+    gap: 16rpx;
+    box-shadow: 0 8rpx 20rpx rgba(255,170,0,0.3);
+    flex-shrink: 0;
+  }
+  .sj-pending-icon {
+    font-size: 36rpx;
+    color: #ffaa00;
+  }
+  .sj-pending-text {
+    font-size: 28rpx;
+    color: #b25700;
+    font-weight: 600;
+  }
+  .sj-pending-badge {
+    min-width: 44rpx;
+    height: 44rpx;
+    padding: 0 12rpx;
+    background: linear-gradient(145deg, #ff3b3b, #d10000);
+    color: #fff;
+    font-size: 26rpx;
+    font-weight: 700;
+    line-height: 44rpx;
+    text-align: center;
+    border-radius: 22rpx;
+    margin-left: auto;
+    box-shadow: 0 4rpx 12rpx rgba(255,0,0,0.5);
+  }
+  
+  /* ========== 主体布局 ========== */
+  .main-container {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+  }
+  
+  /* 左侧状态栏 */
+  .left-status {
+    width: 180rpx;
+    background: #fff;
+    border-right: 1rpx solid #f0f0f0;
+    padding: 28rpx 0;
+    flex-shrink: 0;
+  }
+  .status-item {
+    padding: 28rpx 20rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    position: relative;
+  }
+  .status-item.status-active {
+    background: linear-gradient(to right, #e3f2fd, #fff);
+  }
+  .status-name {
+    font-size: 28rpx;
+    color: #555;
+  }
+  .status-active .status-name {
+    color: #1976D2;
+    font-weight: 600;
+  }
+  .status-dot {
+    width: 14rpx;
+    height: 14rpx;
+    border-radius: 50%;
+    background: #1976D2;
+  }
+  /* 结算中状态的小红点数字 */
+  .sj-status-badge {
+    min-width: 36rpx;
+    height: 36rpx;
+    padding: 0 8rpx;
+    background: linear-gradient(145deg, #ff4d4f, #d10000);
+    color: #fff;
+    font-size: 22rpx;
+    font-weight: 700;
+    line-height: 36rpx;
+    text-align: center;
+    border-radius: 18rpx;
+    margin-left: 8rpx;
+    box-shadow: 0 4rpx 8rpx rgba(255,0,0,0.4);
+  }
+  
+  /* 右侧包裹 */
+  .right-wrapper {
+    flex: 1;
+    padding-right: 30rpx;
+    box-sizing: border-box;
+    overflow: hidden;
+  }
+  .right-list {
+    width: 100%;
+    height: 100%;
+    background: #f5f6fa;
+  }
+  .refresher-slot {
+    text-align: center;
+    padding: 14rpx 0;
+    font-size: 24rpx;
+    color: #999;
+  }
+  
+  /* 内容容器 */
+  .list-inner {
+    padding: 24rpx 0 200rpx 20rpx;
+    box-sizing: border-box;
+  }
+  
+  /* ========== 订单卡片 ========== */
+  .order-card {
+    background: #fff;
+    border-radius: 24rpx;
+    padding: 24rpx;
+    margin-bottom: 24rpx;
+    box-shadow: 0 6rpx 20rpx rgba(0,0,0,0.04);
+    box-sizing: border-box;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+  /* 结算中卡片特殊边框 */
+  .sj-card-jiesuan {
+    border: 2rpx solid #ff5722;
+    box-shadow: 0 6rpx 20rpx rgba(255,87,34,0.15);
+  }
+  .order-card:active {
+    transform: scale(0.98);
+  }
+  
+  /* 创建时间 */
+  .card-time {
+    font-size: 24rpx;
+    color: #999;
+    margin-bottom: 12rpx;
+    padding-bottom: 8rpx;
+    border-bottom: 1rpx dashed rgba(0,120,255,0.15);
+  }
+  
+  /* 内容行 */
+  .card-content-row {
+    display: flex;
+    align-items: flex-start;
+  }
+  
+  /* 商品图片 */
+  .card-img {
+    width: 130rpx;
+    height: 130rpx;
+    border-radius: 18rpx;
+    background: #f0f0f0;
+    margin-right: 24rpx;
+    flex-shrink: 0;
+  }
+  
+  /* 中间信息区 */
+  .card-info {
+    flex: 1;
+    min-height: 130rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    min-width: 0;
+  }
+  .card-title {
+    font-size: 28rpx;
+    color: #222;
+    line-height: 1.5;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+  }
+  .card-id {
+    font-size: 22rpx;
+    color: #999;
+    margin-top: 6rpx;
+  }
+  .card-nicheng {
+    font-size: 22rpx;
+    color: #666;
+    margin-top: 4rpx;
+  }
+  
+  /* 右侧状态和价格 */
+  .card-right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    justify-content: center;
+    min-height: 130rpx;
+    margin-left: 20rpx;
+    flex-shrink: 0;
+    max-width: 160rpx;
+  }
+  .card-status {
+    font-size: 24rpx;
+    font-weight: 500;
+    padding: 4rpx 12rpx;
+    background: #f5f5f5;
+    border-radius: 20rpx;
+    margin-bottom: 8rpx;
+    white-space: nowrap;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  /* 结算中状态红色高亮（保留原样式） */
+  .sj-status-jiesuan {
+    background: linear-gradient(145deg, #ff4d4f, #d10000) !important;
+    color: #fff !important;
+    border-color: #ffaa00;
+    box-shadow: 0 0 15rpx #ff4d4f;
+  }
+  .card-price {
+    display: flex;
+    align-items: baseline;
+    white-space: nowrap;
+  }
+  .price-symbol {
+    font-size: 28rpx;
+    color: #ffaa00;
+    font-weight: 700;
+    margin-right: 4rpx;
+  }
+  .price-number {
+    font-size: 36rpx;
+    font-weight: 700;
+    color: #333;
+  }
+  
+  /* ========== 加载与空状态 ========== */
+  .loading-state, .empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 120rpx 0;
+  }
+  .loading-spinner {
+    width: 52rpx;
+    height: 52rpx;
+    border: 4rpx solid #e0e0e0;
+    border-top-color: #1976D2;
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+    margin-bottom: 24rpx;
+  }
+
+  .empty-img {
+    width: 200rpx;
+    height: 200rpx;
+    opacity: 0.4;
+    margin-bottom: 24rpx;
+  }
+  .empty-text, .loading-tip {
+    font-size: 28rpx;
+    color: #999;
+  }
+  .empty-subtext {
+    font-size: 26rpx;
+    color: #b0b0b0;
+    margin-top: 10rpx;
+  }
+  
+  .load-more {
+    text-align: center;
+    padding: 36rpx 0 20rpx 0;
+    font-size: 26rpx;
+    color: #999;
+  }
+  .loading-more-state {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 20rpx 0;
+    font-size: 26rpx;
+    color: #999;
+  }
+  .mini-spinner {
+    display: inline-block;
+    width: 26rpx;
+    height: 26rpx;
+    border: 3rpx solid #ccc;
+    border-top-color: #1976D2;
+    border-radius: 50%;
+    animation: spin 0.6s linear infinite;
+    vertical-align: middle;
+    margin-right: 10rpx;
+  }
+  
+  .manual-load-more {
+    display: flex;
+    justify-content: center;
+    padding: 30rpx 0 10rpx 0;
+  }
+  .load-more-btn {
+    background: #ffffff;
+    color: #1976D2;
+    font-size: 28rpx;
+    font-weight: 500;
+    border: 2rpx solid #1976D2;
+    border-radius: 40rpx;
+    padding: 16rpx 60rpx;
+    text-align: center;
+    box-shadow: 0 4rpx 12rpx rgba(33,150,243,0.1);
+  }
+  .load-more-btn::after {
+    border: none;
+  }
+  
+  .no-more {
+    text-align: center;
+    padding: 40rpx 0;
+    font-size: 26rpx;
+    color: #999;
   }
\ No newline at end of file
diff --git a/pages/sjpaihang/sjpaihang.js b/pages/merchant-rank/merchant-rank.js
similarity index 100%
rename from pages/sjpaihang/sjpaihang.js
rename to pages/merchant-rank/merchant-rank.js
diff --git a/pages/sjpaihang/sjpaihang.json b/pages/merchant-rank/merchant-rank.json
similarity index 100%
rename from pages/sjpaihang/sjpaihang.json
rename to pages/merchant-rank/merchant-rank.json
diff --git a/pages/sjpaihang/sjpaihang.wxml b/pages/merchant-rank/merchant-rank.wxml
similarity index 100%
rename from pages/sjpaihang/sjpaihang.wxml
rename to pages/merchant-rank/merchant-rank.wxml
diff --git a/pages/sjpaihang/sjpaihang.wxss b/pages/merchant-rank/merchant-rank.wxss
similarity index 100%
rename from pages/sjpaihang/sjpaihang.wxss
rename to pages/merchant-rank/merchant-rank.wxss
diff --git a/pages/sjchongzhi/sjchongzhi.js b/pages/merchant-recharge/merchant-recharge.js
similarity index 100%
rename from pages/sjchongzhi/sjchongzhi.js
rename to pages/merchant-recharge/merchant-recharge.js
diff --git a/pages/sjchongzhi/sjchongzhi.json b/pages/merchant-recharge/merchant-recharge.json
similarity index 100%
rename from pages/sjchongzhi/sjchongzhi.json
rename to pages/merchant-recharge/merchant-recharge.json
diff --git a/pages/sjchongzhi/sjchongzhi.wxml b/pages/merchant-recharge/merchant-recharge.wxml
similarity index 100%
rename from pages/sjchongzhi/sjchongzhi.wxml
rename to pages/merchant-recharge/merchant-recharge.wxml
diff --git a/pages/sjchongzhi/sjchongzhi.wxss b/pages/merchant-recharge/merchant-recharge.wxss
similarity index 100%
rename from pages/sjchongzhi/sjchongzhi.wxss
rename to pages/merchant-recharge/merchant-recharge.wxss
diff --git a/pages/shangjiaduan/shangjiaduan.js b/pages/merchant/merchant.js
similarity index 81%
rename from pages/shangjiaduan/shangjiaduan.js
rename to pages/merchant/merchant.js
index 38d4bfb..db052a2 100644
--- a/pages/shangjiaduan/shangjiaduan.js
+++ b/pages/merchant/merchant.js
@@ -1,364 +1,362 @@
-// pages/shangjiazhongxin/shangjiazhongxin.js
-// 🏪 商家中心 - 完全重构版 | 背景图全覆盖 | 称号从商家接口获取
-
-import request from '../../utils/request.js';
-import popupService from '../../services/popupService.js';
-import {
-  isRoleStatusActive,
-  isCenterPageActive,
-  syncRoleStatuses,
-  syncProfileFields,
-  ensureRoleOnCenterPage,
-  clearCacheAndEnterNormal,
-} from '../../utils/role-tab-bar.js';
-import { lockPrimaryRole } from '../../utils/primary-role.js';
-import { ensureLogin } from '../../utils/login.js';
-
-const app = getApp();
-
-Page({
-  data: {
-    // ========== 图片资源 ==========
-    imgUrls: {
-      pageBg: '',
-      avatarCardBg: '',
-      assetCardBg: '',
-      statCardBg: '',
-      funcItemBg: '',
-      primaryFuncBg: '',
-      highlightFuncBg: '',
-      iconRelease: '',
-      iconFast: '',
-      iconOrders: '',
-      iconService: '',
-      iconPunish: '',
-      iconRank: '',
-      iconRecharge: '',
-      iconWithdraw: '',
-      iconRefresh: '',
-        iconCopy: '',
-        avatarFrame: '',
-        iconClear: '',
-      },
-
-    // ========== 商家状态 ==========
-    isShangjia: false,
-    isLoading: false,
-    isAutoRegistering: false,
-
-    // ========== 用户基础信息 ==========
-    uid: '',
-    avatarUrl: '',
-    nicheng: '',
-
-    // ========== 商家核心数据 ==========
-    sjyue: '0.00',
-    fabu: 0,
-    tuikuan: 0,
-    jinriliushui: '0.00',
-    jinyueliushui: '0.00',
-    jinridingdan: 0,
-    jinrituikuan: 0,
-    chenghaoList: [],      // 称号列表（从商家接口获取）
-
-    // ========== 交互控制 ==========
-    inviteCode: '',
-    lastRefreshTime: 0,
-    canRefresh: true,
-  },
-
-  onLoad(options) {
-    this.initImageUrls();
-    this.checkShangjiaStatus();
-
-    const { inviteCode } = options || {};
-    if (inviteCode) {
-      this.setData({ inviteCode });
-      setTimeout(() => this.handleInviteCodeWithLoginCheck(inviteCode), 500);
-    }
-
-    if (!app.globalData.hasShownPopupOnColdStart) {
-      app.globalData.hasShownPopupOnColdStart = true;
-      setTimeout(() => popupService.checkAndShow(this, 'shangjiaduan'), 300);
-    }
-  },
-
-  onReady() {
-    if (isCenterPageActive(this, 'isShangjia', 'shangjiastatus')) {
-      ensureRoleOnCenterPage(this, 'shangjia');
-    }
-  },
-
-  onShow() {
-    this.registerNotificationComponent();
-    if (isCenterPageActive(this, 'isShangjia', 'shangjiastatus')) {
-      if (!this.data.isShangjia) this.setData({ isShangjia: true });
-      ensureRoleOnCenterPage(this, 'shangjia');
-      this.refreshShangjiaInfo();
-    }
-  },
-
-  onHide() {
-    const popupComp = this.selectComponent('#popupNotice');
-    popupComp?.cleanup?.();
-  },
-
-  // ========== 图片路径初始化 ==========
-  initImageUrls() {
-    const ossBase = app.globalData.ossImageUrl || '';
-    const imgDir = `${ossBase}beijing/shangjiaduan/`;
-    this.setData({
-      imgUrls: {
-        pageBg: `${imgDir}page_bg.png`,
-        avatarCardBg: `${imgDir}avatar_card_bg.png`,
-        assetCardBg: `${imgDir}asset_card_bg.png`,
-        statCardBg: `${imgDir}stat_card_bg.png`,
-        funcItemBg: `${imgDir}func_item_bg.png`,
-        primaryFuncBg: `${imgDir}primary_func_bg.png`,
-        highlightFuncBg: `${imgDir}highlight_func_bg.png`,
-        iconRelease: `${imgDir}icon_release.png`,
-        iconFast: `${imgDir}icon_fast.png`,
-        iconOrders: `${imgDir}icon_orders.png`,
-        iconService: `${imgDir}icon_service.png`,
-        iconPunish: `${imgDir}icon_punish.png`,
-        iconRank: `${imgDir}icon_rank.png`,
-        iconRecharge: `${imgDir}icon_recharge.png`,
-        iconWithdraw: `${imgDir}icon_withdraw.png`,
-        iconRefresh: `${imgDir}icon_refresh.png`,
-        iconCopy: `${imgDir}icon_copy.png`,
-        avatarFrame: `${imgDir}avatar_frame.png`,
-        iconClear: `${ossBase}beijing/tubiao/grzx_qingchu.jpg`,
-      }
-    });
-  },
-
-  // ========== 商家状态检查 ==========
-  checkShangjiaStatus() {
-    try {
-      const shangjiastatus = wx.getStorageSync('shangjiastatus');
-      const uid = wx.getStorageSync('uid');
-      if (isRoleStatusActive(shangjiastatus)) {
-        this.setData({ isShangjia: true, uid: uid || '' });
-        this.loadAvatar();
-        this.getShangjiaInfo();
-        ensureRoleOnCenterPage(this, 'shangjia');
-      } else {
-        this.setData({ isShangjia: false });
-      }
-    } catch (error) {
-      console.error('读取商家状态失败', error);
-      this.setData({ isShangjia: false });
-    }
-  },
-
-  loadAvatar() {
-    const { ossImageUrl = '', morentouxiang = 'avatar/default.jpg' } = app.globalData || {};
-    const touxiang = wx.getStorageSync('touxiang') || '';
-    let avatarUrl = '';
-    if (touxiang) {
-      avatarUrl = ossImageUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang);
-    } else {
-      avatarUrl = ossImageUrl + (morentouxiang.startsWith('/') ? morentouxiang : '/' + morentouxiang);
-    }
-    this.setData({ avatarUrl });
-  },
-
-  // ========== 获取商家信息（核心接口，包含称号列表）==========
-  async getShangjiaInfo() {
-    this.setData({ isLoading: true });
-    try {
-      const res = await request({ url: '/yonghu/shangjiaxinxi', method: 'POST' });
-      if (res?.data?.code === 200) {
-        const data = res.data.data;
-        // 更新全局缓存
-        app.globalData.shangjia = data;
-        wx.setStorageSync('shangjiastatus', 1);
-        
-        // 称号列表：优先使用接口返回的 chenghao_list，若无则空数组
-        const chenghaoList = data.chenghao_list || [];
-        
-        // ✅ 字段映射：后端返回字段 → 前端 data 字段（只改这里，其他一律不变）
-        this.setData({
-          nicheng: data.nicheng || '',                      // 商家昵称（后端如有则显示）
-          sjyue: data.sjyue || '0.00',                      // 商家余额
-          fabu: data.fadanzong || 0,                        // 发单总量（后端 fadanzong）
-          tuikuan: data.tuikuanzong || 0,                   // 退款总量（后端 tuikuanzong）
-          jinriliushui: data.riliushui || '0.00',           // 今日流水（后端 riliushui）
-          jinyueliushui: data.yueliushui || '0.00',         // 今月流水（后端 yueliushui）
-          jinridingdan: data.jinripaidan || 0,              // 今日派单数（后端 jinripaidan）
-          jinrituikuan: data.jinrituikuan || 0,             // 今日退款数（后端 jinrituikuan）
-          chenghaoList: chenghaoList,
-          isLoading: false,
-        });
-        
-        if (this.data.isAutoRegistering) {
-          this.setData({ isAutoRegistering: false });
-          wx.showToast({ title: '商家注册成功', icon: 'success' });
-        }
-      } else {
-        throw new Error(res?.data?.msg || '获取商家信息失败');
-      }
-    } catch (error) {
-      console.error('获取商家信息失败', error);
-      this.setData({ isLoading: false });
-      wx.showToast({ title: error.message || '加载失败', icon: 'none' });
-    }
-  },
-
-  refreshShangjiaInfo() {
-    const now = Date.now();
-    if (!this.data.canRefresh || now - this.data.lastRefreshTime < 3000) {
-      wx.showToast({ title: '操作过快', icon: 'none' });
-      return;
-    }
-    this.setData({ lastRefreshTime: now, canRefresh: false });
-    this.getShangjiaInfo();   // 刷新时重新获取所有数据
-    setTimeout(() => this.setData({ canRefresh: true }), 3000);
-  },
-
-  // ========== 邀请码注册 ==========
-  handleInviteCodeWithLoginCheck(inviteCode) {
-    const token = wx.getStorageSync('token');
-    const uid = wx.getStorageSync('uid');
-    if (!token || !uid) {
-      this.setData({ inviteCode });
-      ensureLogin({ silent: false, page: this })
-        .then(() => {
-          if (!this.data.isShangjia) {
-            wx.showLoading({ title: '商家注册中...', mask: true });
-            this.setData({ isAutoRegistering: true });
-            this.onRegister();
-          }
-        })
-        .catch(() => {});
-    } else {
-      if (!this.data.isShangjia) {
-        wx.showLoading({ title: '商家注册中...', mask: true });
-        this.setData({ isAutoRegistering: true });
-        this.onRegister();
-      } else {
-        wx.showToast({ title: '您已是商家', icon: 'success' });
-        ensureRoleOnCenterPage(this, 'shangjia');
-      }
-    }
-  },
-
-  async onRegister() {
-    const { inviteCode } = this.data;
-    if (!inviteCode) {
-      wx.showToast({ title: '请输入邀请码', icon: 'none' });
-      return;
-    }
-    if (inviteCode.length > 100) {
-      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none' });
-      return;
-    }
-    this.setData({ isLoading: true });
-    try {
-      const res = await request({
-        url: '/yonghu/shangjiahuce',
-        method: 'POST',
-        data: { inviteCode }
-      });
-      if (res?.data?.code === 200) {
-        const data = res.data.data || {};
-        syncRoleStatuses(data);
-        syncProfileFields(data);
-        if (!Object.prototype.hasOwnProperty.call(data, 'shangjiastatus')) {
-          wx.setStorageSync('shangjiastatus', 1);
-          app.globalData.shangjiastatus = 1;
-        }
-        app.globalData.shangjia = data;
-        const chenghaoList = data.chenghao_list || [];
-        this.setData({
-          isShangjia: true,
-          nicheng: data.nicheng || '',
-          sjyue: data.sjyue || '0.00',
-          fabu: data.fabu || 0,
-          tuikuan: data.tuikuan || 0,
-          jinriliushui: data.jinriliushui || '0.00',
-          jinyueliushui: data.jinyueliushui || '0.00',
-          jinridingdan: data.jinridingdan || 0,
-          chenghaoList: chenghaoList,
-          isLoading: false,
-          isAutoRegistering: false,
-        });
-        this.loadAvatar();
-        ensureRoleOnCenterPage(this, 'shangjia');
-        lockPrimaryRole('shangjia');
-        wx.showToast({ title: '商家注册成功', icon: 'success' });
-      } else {
-        throw new Error(res?.data?.msg || '注册失败');
-      }
-    } catch (error) {
-      console.error('商家注册失败', error);
-      this.setData({ isLoading: false, isAutoRegistering: false });
-      wx.showToast({ title: error.message, icon: 'error' });
-    }
-  },
-
-  // ========== 辅助功能 ==========
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp?.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  copyUid() {
-    if (!this.data.uid) {
-      wx.showToast({ title: 'UID不存在', icon: 'none' });
-      return;
-    }
-    wx.setClipboardData({
-      data: this.data.uid,
-      success: () => wx.showToast({ title: 'UID已复制', icon: 'success' }),
-      fail: () => wx.showToast({ title: '复制失败', icon: 'error' })
-    });
-  },
-
-  previewAvatar() {
-    if (this.data.avatarUrl) {
-      wx.previewImage({ urls: [this.data.avatarUrl] });
-    }
-  },
-
-  // ========== 页面跳转 ==========
-  goToPaiDan() { wx.navigateTo({ url: '/pages/sjpaidan/sjpaidan' }); },
-  goToJiSuPaiDan() { 
-    wx.vibrateShort({ type: 'medium' });
-    wx.navigateTo({ url: '/pages/jisufd/jisufd' });
-  },
-  goToMyOrders() { wx.navigateTo({ url: '/pages/sjdingdan/sjdingdan' }); },
-  goToRecharge() { wx.navigateTo({ url: '/pages/sjchongzhi/sjchongzhi' }); },
-  goToWithdraw() { wx.navigateTo({ url: '/pages/tixian/tixian' }); },
-  goToRanking() { wx.navigateTo({ url: '/pages/dashoupaihang/dashoupaihang?type=shangjia' }); },
-  goToMessages() { wx.navigateTo({ url: '/pages/sjxiaoxi/sjxiaoxi' }); },
-  goToKefu() {
-    const { kefuConfig } = app.globalData;
-    if (kefuConfig?.link && kefuConfig?.enterpriseId) {
-      wx.openCustomerServiceChat({
-        extInfo: { url: kefuConfig.link },
-        corpId: kefuConfig.enterpriseId,
-        fail: () => wx.showToast({ title: '客服暂不可用', icon: 'none' })
-      });
-    } else {
-      wx.showToast({ title: '客服配置未加载', icon: 'none' });
-    }
-  },
-
-  clearCache() {
-    wx.showModal({
-      title: '清除缓存',
-      content: '将清除所有登录与身份数据，并回到点单端，确定继续？',
-      confirmText: '确定',
-      cancelText: '取消',
-      success: (r) => {
-        if (r.confirm) clearCacheAndEnterNormal(this);
-      },
-    });
-  },
+// pages/shangjiazhongxin/shangjiazhongxin.js
+
+import request from '../../utils/request.js';
+import popupService from '../../services/popupService.js';
+import {
+  isRoleStatusActive,
+  isCenterPageActive,
+  syncRoleStatuses,
+  syncProfileFields,
+  ensureRoleOnCenterPage,
+  clearCacheAndEnterNormal,
+} from '../../utils/role-tab-bar.js';
+import { lockPrimaryRole } from '../../utils/primary-role.js';
+import { ensureLogin } from '../../utils/login.js';
+
+const app = getApp();
+
+Page({
+  data: {
+    // 图片资源
+    imgUrls: {
+      pageBg: '',
+      avatarCardBg: '',
+      assetCardBg: '',
+      statCardBg: '',
+      funcItemBg: '',
+      primaryFuncBg: '',
+      highlightFuncBg: '',
+      iconRelease: '',
+      iconFast: '',
+      iconOrders: '',
+      iconService: '',
+      iconPunish: '',
+      iconRank: '',
+      iconRecharge: '',
+      iconWithdraw: '',
+      iconRefresh: '',
+        iconCopy: '',
+        avatarFrame: '',
+        iconClear: '',
+      },
+
+    // 商家状态
+    isShangjia: false,
+    isLoading: false,
+    isAutoRegistering: false,
+
+    // 用户基础信息
+    uid: '',
+    avatarUrl: '',
+    nicheng: '',
+
+    // 商家核心数据
+    sjyue: '0.00',
+    fabu: 0,
+    tuikuan: 0,
+    jinriliushui: '0.00',
+    jinyueliushui: '0.00',
+    jinridingdan: 0,
+    jinrituikuan: 0,
+    chenghaoList: [],
+
+    // 交互控制
+    inviteCode: '',
+    lastRefreshTime: 0,
+    canRefresh: true,
+  },
+
+  onLoad(options) {
+    this.initImageUrls();
+    this.checkShangjiaStatus();
+
+    const { inviteCode } = options || {};
+    if (inviteCode) {
+      this.setData({ inviteCode });
+      setTimeout(() => this.handleInviteCodeWithLoginCheck(inviteCode), 500);
+    }
+
+    if (!app.globalData.hasShownPopupOnColdStart) {
+      app.globalData.hasShownPopupOnColdStart = true;
+      setTimeout(() => popupService.checkAndShow(this, 'shangjiaduan'), 300);
+    }
+  },
+
+  onReady() {
+    if (isCenterPageActive(this, 'isShangjia', 'shangjiastatus')) {
+      ensureRoleOnCenterPage(this, 'shangjia');
+    }
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+    if (isCenterPageActive(this, 'isShangjia', 'shangjiastatus')) {
+      if (!this.data.isShangjia) this.setData({ isShangjia: true });
+      ensureRoleOnCenterPage(this, 'shangjia');
+      this.refreshShangjiaInfo();
+    }
+  },
+
+  onHide() {
+    const popupComp = this.selectComponent('#popupNotice');
+    popupComp?.cleanup?.();
+  },
+
+  // 图片路径初始化
+  initImageUrls() {
+    const ossBase = app.globalData.ossImageUrl || '';
+    const imgDir = `${ossBase}beijing/shangjiaduan/`;
+    this.setData({
+      imgUrls: {
+        pageBg: `${imgDir}page_bg.png`,
+        avatarCardBg: `${imgDir}avatar_card_bg.png`,
+        assetCardBg: `${imgDir}asset_card_bg.png`,
+        statCardBg: `${imgDir}stat_card_bg.png`,
+        funcItemBg: `${imgDir}func_item_bg.png`,
+        primaryFuncBg: `${imgDir}primary_func_bg.png`,
+        highlightFuncBg: `${imgDir}highlight_func_bg.png`,
+        iconRelease: `${imgDir}icon_release.png`,
+        iconFast: `${imgDir}icon_fast.png`,
+        iconOrders: `${imgDir}icon_orders.png`,
+        iconService: `${imgDir}icon_service.png`,
+        iconPunish: `${imgDir}icon_punish.png`,
+        iconRank: `${imgDir}icon_rank.png`,
+        iconRecharge: `${imgDir}icon_recharge.png`,
+        iconWithdraw: `${imgDir}icon_withdraw.png`,
+        iconRefresh: `${imgDir}icon_refresh.png`,
+        iconCopy: `${imgDir}icon_copy.png`,
+        avatarFrame: `${imgDir}avatar_frame.png`,
+        iconClear: `${ossBase}beijing/tubiao/grzx_qingchu.jpg`,
+      }
+    });
+  },
+
+  // 商家状态检查
+  checkShangjiaStatus() {
+    try {
+      const shangjiastatus = wx.getStorageSync('shangjiastatus');
+      const uid = wx.getStorageSync('uid');
+      if (isRoleStatusActive(shangjiastatus)) {
+        this.setData({ isShangjia: true, uid: uid || '' });
+        this.loadAvatar();
+        this.getShangjiaInfo();
+        ensureRoleOnCenterPage(this, 'shangjia');
+      } else {
+        this.setData({ isShangjia: false });
+      }
+    } catch (error) {
+      console.error('读取商家状态失败', error);
+      this.setData({ isShangjia: false });
+    }
+  },
+
+  loadAvatar() {
+    const { ossImageUrl = '', morentouxiang = 'avatar/default.jpg' } = app.globalData || {};
+    const touxiang = wx.getStorageSync('touxiang') || '';
+    let avatarUrl = '';
+    if (touxiang) {
+      avatarUrl = ossImageUrl + (touxiang.startsWith('/') ? touxiang : '/' + touxiang);
+    } else {
+      avatarUrl = ossImageUrl + (morentouxiang.startsWith('/') ? morentouxiang : '/' + morentouxiang);
+    }
+    this.setData({ avatarUrl });
+  },
+
+  // 获取商家信息
+  async getShangjiaInfo() {
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({ url: '/yonghu/shangjiaxinxi', method: 'POST' });
+      if (res?.data?.code === 200) {
+        const data = res.data.data;
+        // 更新全局缓存
+        app.globalData.shangjia = data;
+        wx.setStorageSync('shangjiastatus', 1);
+
+        const chenghaoList = data.chenghao_list || [];
+
+        // 字段映射
+        this.setData({
+          nicheng: data.nicheng || '',
+          sjyue: data.sjyue || '0.00',
+          fabu: data.fadanzong || 0,
+          tuikuan: data.tuikuanzong || 0,
+          jinriliushui: data.riliushui || '0.00',
+          jinyueliushui: data.yueliushui || '0.00',
+          jinridingdan: data.jinripaidan || 0,
+          jinrituikuan: data.jinrituikuan || 0,
+          chenghaoList: chenghaoList,
+          isLoading: false,
+        });
+        
+        if (this.data.isAutoRegistering) {
+          this.setData({ isAutoRegistering: false });
+          wx.showToast({ title: '商家注册成功', icon: 'success' });
+        }
+      } else {
+        throw new Error(res?.data?.msg || '获取商家信息失败');
+      }
+    } catch (error) {
+      console.error('获取商家信息失败', error);
+      this.setData({ isLoading: false });
+      wx.showToast({ title: error.message || '加载失败', icon: 'none' });
+    }
+  },
+
+  refreshShangjiaInfo() {
+    const now = Date.now();
+    if (!this.data.canRefresh || now - this.data.lastRefreshTime < 3000) {
+      wx.showToast({ title: '操作过快', icon: 'none' });
+      return;
+    }
+    this.setData({ lastRefreshTime: now, canRefresh: false });
+    this.getShangjiaInfo();
+    setTimeout(() => this.setData({ canRefresh: true }), 3000);
+  },
+
+  // 邀请码注册
+  handleInviteCodeWithLoginCheck(inviteCode) {
+    const token = wx.getStorageSync('token');
+    const uid = wx.getStorageSync('uid');
+    if (!token || !uid) {
+      this.setData({ inviteCode });
+      ensureLogin({ silent: false, page: this })
+        .then(() => {
+          if (!this.data.isShangjia) {
+            wx.showLoading({ title: '商家注册中...', mask: true });
+            this.setData({ isAutoRegistering: true });
+            this.onRegister();
+          }
+        })
+        .catch(() => {});
+    } else {
+      if (!this.data.isShangjia) {
+        wx.showLoading({ title: '商家注册中...', mask: true });
+        this.setData({ isAutoRegistering: true });
+        this.onRegister();
+      } else {
+        wx.showToast({ title: '您已是商家', icon: 'success' });
+        ensureRoleOnCenterPage(this, 'shangjia');
+      }
+    }
+  },
+
+  async onRegister() {
+    const { inviteCode } = this.data;
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none' });
+      return;
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none' });
+      return;
+    }
+    this.setData({ isLoading: true });
+    try {
+      const res = await request({
+        url: '/yonghu/shangjiahuce',
+        method: 'POST',
+        data: { inviteCode }
+      });
+      if (res?.data?.code === 200) {
+        const data = res.data.data || {};
+        syncRoleStatuses(data);
+        syncProfileFields(data);
+        if (!Object.prototype.hasOwnProperty.call(data, 'shangjiastatus')) {
+          wx.setStorageSync('shangjiastatus', 1);
+          app.globalData.shangjiastatus = 1;
+        }
+        app.globalData.shangjia = data;
+        const chenghaoList = data.chenghao_list || [];
+        this.setData({
+          isShangjia: true,
+          nicheng: data.nicheng || '',
+          sjyue: data.sjyue || '0.00',
+          fabu: data.fabu || 0,
+          tuikuan: data.tuikuan || 0,
+          jinriliushui: data.jinriliushui || '0.00',
+          jinyueliushui: data.jinyueliushui || '0.00',
+          jinridingdan: data.jinridingdan || 0,
+          chenghaoList: chenghaoList,
+          isLoading: false,
+          isAutoRegistering: false,
+        });
+        this.loadAvatar();
+        ensureRoleOnCenterPage(this, 'shangjia');
+        lockPrimaryRole('shangjia');
+        wx.showToast({ title: '商家注册成功', icon: 'success' });
+      } else {
+        throw new Error(res?.data?.msg || '注册失败');
+      }
+    } catch (error) {
+      console.error('商家注册失败', error);
+      this.setData({ isLoading: false, isAutoRegistering: false });
+      wx.showToast({ title: error.message, icon: 'error' });
+    }
+  },
+
+  // 辅助功能
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp?.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  copyUid() {
+    if (!this.data.uid) {
+      wx.showToast({ title: 'UID不存在', icon: 'none' });
+      return;
+    }
+    wx.setClipboardData({
+      data: this.data.uid,
+      success: () => wx.showToast({ title: 'UID已复制', icon: 'success' }),
+      fail: () => wx.showToast({ title: '复制失败', icon: 'error' })
+    });
+  },
+
+  previewAvatar() {
+    if (this.data.avatarUrl) {
+      wx.previewImage({ urls: [this.data.avatarUrl] });
+    }
+  },
+
+  // 页面跳转
+  goToPaiDan() { wx.navigateTo({ url: '/pages/merchant-dispatch/merchant-dispatch' }); },
+  goToJiSuPaiDan() { 
+    wx.vibrateShort({ type: 'medium' });
+    wx.navigateTo({ url: '/pages/express-order/express-order' });
+  },
+  goToMyOrders() { wx.navigateTo({ url: '/pages/merchant-orders/merchant-orders' }); },
+  goToRecharge() { wx.navigateTo({ url: '/pages/merchant-recharge/merchant-recharge' }); },
+  goToWithdraw() { wx.navigateTo({ url: '/pages/withdraw/withdraw' }); },
+  goToRanking() { wx.navigateTo({ url: '/pages/fighter-rank/fighter-rank?type=shangjia' }); },
+  goToMessages() { wx.navigateTo({ url: '/pages/merchant-msg/merchant-msg' }); },
+  goToKefu() {
+    const { kefuConfig } = app.globalData;
+    if (kefuConfig?.link && kefuConfig?.enterpriseId) {
+      wx.openCustomerServiceChat({
+        extInfo: { url: kefuConfig.link },
+        corpId: kefuConfig.enterpriseId,
+        fail: () => wx.showToast({ title: '客服暂不可用', icon: 'none' })
+      });
+    } else {
+      wx.showToast({ title: '客服配置未加载', icon: 'none' });
+    }
+  },
+
+  clearCache() {
+    wx.showModal({
+      title: '清除缓存',
+      content: '将清除所有登录与身份数据，并回到点单端，确定继续？',
+      confirmText: '确定',
+      cancelText: '取消',
+      success: (r) => {
+        if (r.confirm) clearCacheAndEnterNormal(this);
+      },
+    });
+  },
 });
\ No newline at end of file
diff --git a/pages/shangjiaduan/shangjiaduan.json b/pages/merchant/merchant.json
similarity index 100%
rename from pages/shangjiaduan/shangjiaduan.json
rename to pages/merchant/merchant.json
diff --git a/pages/shangjiaduan/shangjiaduan.wxml b/pages/merchant/merchant.wxml
similarity index 100%
rename from pages/shangjiaduan/shangjiaduan.wxml
rename to pages/merchant/merchant.wxml
diff --git a/pages/shangjiaduan/shangjiaduan.wxss b/pages/merchant/merchant.wxss
similarity index 75%
rename from pages/shangjiaduan/shangjiaduan.wxss
rename to pages/merchant/merchant.wxss
index 06e871a..bf20f32 100644
--- a/pages/shangjiaduan/shangjiaduan.wxss
+++ b/pages/merchant/merchant.wxss
@@ -1,466 +1,425 @@
-/* pages/shangjiazhongxin/shangjiazhongxin.wxss */
-/* 最终优化：指标卡片缩小，图标缩小，资产卡片微缩，背景模糊 */
-
-page {
-    background-color: #f5f7fb;
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
-  }
-  
-  /* 页面背景纹理：添加模糊效果，降低对比 */
-  .page-bg {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 0;
-    opacity: 0.15;          /* 降低不透明度，更柔和 */
-    filter: blur(8rpx);     /* 轻微模糊，不刺眼 */
-    pointer-events: none;
-  }
-  
-  .page-container {
-    position: relative;
-    z-index: 1;
-    min-height: 100vh;
-    padding: 0 32rpx;
-    box-sizing: border-box;
-    background-color: transparent;
-  }
-  
-  /* ========== 未注册卡片 ========== */
-  .unregistered {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding-top: 200rpx;
-  }
-  .unreg-card {
-    width: 90%;
-    border-radius: 48rpx;
-    overflow: hidden;
-    box-shadow: 0 8rpx 20rpx rgba(0,0,0,0.2);
-    background-color: transparent;
-  }
-  .unreg-content {
-    padding: 60rpx 40rpx;
-    text-align: center;
-    background: rgba(0,0,0,0.65);
-    backdrop-filter: blur(16rpx);
-    border-radius: 48rpx;
-  }
-  .status-title {
-    font-size: 44rpx;
-    font-weight: 700;
-    color: #fff;
-    margin-bottom: 16rpx;
-  }
-  .status-desc {
-    font-size: 28rpx;
-    color: #ddd;
-    margin-bottom: 50rpx;
-  }
-  .input-group {
-    margin-bottom: 40rpx;
-  }
-  .invite-input {
-    width: 100%;
-    height: 96rpx;
-    background: rgba(255,255,255,0.2);
-    border-radius: 48rpx;
-    padding: 0 32rpx;
-    font-size: 30rpx;
-    color: #fff;
-    border: 1rpx solid rgba(255,255,255,0.3);
-    box-sizing: border-box;
-  }
-  .register-btn {
-    width: 100%;
-    height: 96rpx;
-    background: linear-gradient(135deg, #ffb347, #ff8c1a);
-    border-radius: 48rpx;
-    font-size: 34rpx;
-    font-weight: 600;
-    color: white;
-    box-shadow: 0 8rpx 20rpx rgba(255,140,26,0.3);
-    border: none;
-    line-height: 96rpx;
-  }
-  .register-tip {
-    margin-top: 32rpx;
-    font-size: 24rpx;
-    color: #ddd;
-  }
-  
-  /* ========== 已注册页面 ========== */
-  .registered {
-    padding-top: 30rpx;
-    padding-bottom: 40rpx;
-  }
-  
-  /* 刷新按钮 */
-  .refresh-btn {
-    position: absolute;
-    top: 30rpx;
-    right: 32rpx;
-    width: 72rpx;
-    height: 72rpx;
-    background: rgba(0,0,0,0.5);
-    border-radius: 36rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 20;
-    backdrop-filter: blur(10rpx);
-  }
-  .refresh-icon {
-    width: 40rpx;
-    height: 40rpx;
-    filter: brightness(0) invert(1);
-  }
-  
-  /* ========== 头像卡片 ========== */
-  .avatar-card {
-    border-radius: 60rpx;
-    overflow: hidden;
-    margin-bottom: 36rpx;
-    box-shadow: 0 6rpx 18rpx rgba(0,0,0,0.2);
-    background-color: transparent;
-  }
-  .avatar-content {
-    display: flex;
-    align-items: center;
-    padding: 28rpx 32rpx;
-    background: rgba(0,0,0,0.55);
-    backdrop-filter: blur(20rpx);
-  }
-  .avatar-wrapper {
-    position: relative;
-    width: 110rpx;
-    height: 110rpx;
-    margin-right: 28rpx;
-  }
-  .avatar-img {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    object-fit: cover;
-    border: 2rpx solid rgba(255,255,255,0.3);
-  }
-  .avatar-frame {
-    position: absolute;
-    top: -8rpx;
-    left: -8rpx;
-    width: 126rpx;
-    height: 126rpx;
-    pointer-events: none;
-  }
-  .user-info {
-    flex: 1;
-  }
-  .nicheng {
-    font-size: 40rpx;
-    font-weight: 700;
-    color: #fff;
-    margin-bottom: 16rpx;
-    text-shadow: 0 2rpx 6rpx rgba(0,0,0,0.5);
-    background: rgba(0,0,0,0.6);
-    display: inline-block;
-    padding: 6rpx 20rpx;
-    border-radius: 40rpx;
-  }
-  .uid-area {
-    display: flex;
-    align-items: center;
-  }
-  .uid-label {
-    font-size: 26rpx;
-    color: #fff;
-    background: rgba(0,0,0,0.7);
-    padding: 6rpx 16rpx;
-    border-radius: 28rpx;
-    margin-right: 16rpx;
-    backdrop-filter: blur(4rpx);
-  }
-  .uid-value {
-    font-size: 28rpx;
-    color: #fff;
-    font-family: monospace;
-    background: rgba(0,0,0,0.6);
-    padding: 6rpx 16rpx;
-    border-radius: 28rpx;
-  }
-  .copy-icon {
-    width: 40rpx;
-    height: 40rpx;
-    margin-left: 20rpx;
-    opacity: 0.9;
-    filter: drop-shadow(0 2rpx 2rpx rgba(0,0,0,0.5));
-  }
-  
-  /* 荣誉标签 */
-  .badge-area {
-    margin-bottom: 36rpx;
-  }
-  .badge-scroll {
-    white-space: nowrap;
-  }
-  .badge-row {
-    display: inline-flex;
-    gap: 16rpx;
-    padding: 8rpx 0;
-  }
-  
-  /* ========== 资产卡片（稍微缩小） ========== */
-  .asset-card {
-    border-radius: 48rpx;
-    overflow: hidden;
-    margin-bottom: 36rpx;
-    box-shadow: 0 10rpx 24rpx rgba(0,0,0,0.2);
-    background-color: transparent;
-  }
-  .glass-effect {
-    padding: 44rpx 36rpx;  /* 原 48rpx 36rpx，稍微缩小 */
-    background: rgba(0,0,0,0.55);
-    backdrop-filter: blur(20rpx);
-  }
-  .balance-area {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-    flex-wrap: wrap;
-    margin-bottom: 32rpx;
-  }
-  .balance-label {
-    font-size: 28rpx;
-    color: #ffdebc;
-    font-weight: 500;
-  }
-  .balance-value {
-    display: flex;
-    align-items: baseline;
-  }
-  .value-num {
-    font-size: 64rpx;   /* 原 68rpx，稍微缩小 */
-    font-weight: 800;
-    color: #ffd966;
-    font-family: 'DIN', monospace;
-  }
-  .value-unit {
-    font-size: 32rpx;
-    color: #ffdebc;
-    margin-left: 6rpx;
-  }
-  .action-buttons {
-    display: flex;
-    gap: 24rpx;
-  }
-  .action-btn {
-    display: flex;
-    align-items: center;
-    gap: 10rpx;
-    background: rgba(255,255,255,0.9);
-    padding: 12rpx 28rpx;
-    border-radius: 60rpx;
-    font-size: 26rpx;
-    font-weight: 500;
-  }
-  .action-btn.recharge {
-    color: #ff8c1a;
-  }
-  .action-btn.withdraw {
-    color: #2d3e6e;
-  }
-  .btn-icon {
-    width: 32rpx;
-    height: 32rpx;
-  }
-  .divider {
-    height: 2rpx;
-    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.5), transparent);
-    margin: 24rpx 0;
-  }
-  .stats-row {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-  }
-  .stat-item {
-    flex: 1;
-    text-align: center;
-  }
-  .stat-label {
-    font-size: 24rpx;
-    color: #ddd;
-    margin-bottom: 12rpx;
-    display: block;
-  }
-  .stat-number {
-    font-size: 34rpx;   /* 原 38rpx，稍微缩小 */
-    font-weight: 700;
-    color: #fff;
-  }
-  
-  /* ========== 核心指标卡片组（缩小版） ========== */
-  .metrics-section {
-    display: flex;
-    gap: 24rpx;
-    margin-bottom: 40rpx;
-  }
-  .metric-card {
-    flex: 1;
-    border-radius: 36rpx;
-    overflow: hidden;
-    box-shadow: 0 6rpx 16rpx rgba(0,0,0,0.2);
-    background-color: transparent;
-  }
-  .metric-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 24rpx 0;    /* 原 36rpx 0，缩小 */
-    background: rgba(0,0,0,0.55);
-    backdrop-filter: blur(12rpx);
-  }
-  .metric-icon {
-    width: 48rpx;       /* 原 60rpx，缩小 */
-    height: 48rpx;
-    margin-bottom: 16rpx;
-    filter: brightness(0) invert(1);
-  }
-  .metric-value {
-    font-size: 44rpx;   /* 原 52rpx，缩小 */
-    font-weight: 800;
-    color: #ffd966;
-    margin-bottom: 8rpx;
-  }
-  .metric-label {
-    font-size: 24rpx;   /* 原 28rpx，缩小 */
-    color: #eee;
-  }
-  
-  /* ========== 功能宫格（图标缩小） ========== */
-  .function-grid {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 24rpx;
-    margin-top: 12rpx;
-  }
-  .func-item {
-    border-radius: 32rpx;
-    overflow: hidden;
-    box-shadow: 0 6rpx 14rpx rgba(0,0,0,0.2);
-    background-color: transparent;
-  }
-  .func-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 32rpx 12rpx 28rpx;  /* 原 40rpx 16rpx 36rpx，稍微缩小 */
-    background: rgba(0,0,0,0.55);
-    backdrop-filter: blur(12rpx);
-    transition: all 0.2s ease;
-  }
-  .func-icon {
-    width: 64rpx;       /* 原 72rpx，缩小 */
-    height: 64rpx;
-    margin-bottom: 20rpx;
-    filter: brightness(0) invert(1);
-  }
-  .func-name {
-    font-size: 28rpx;   /* 原 32rpx，缩小 */
-    font-weight: 600;
-    color: #fff;
-    margin-bottom: 8rpx;
-  }
-  .func-desc {
-    font-size: 22rpx;   /* 原 24rpx，缩小 */
-    color: #ddd;
-  }
-  
-  /* 底部安全区 */
-  .safe-bottom {
-    height: 40rpx;
-  }
-
-  .sys-list {
-    margin: 24rpx 32rpx 0;
-    background: rgba(255, 255, 255, 0.92);
-    border-radius: 20rpx;
-    overflow: hidden;
-    border: 1rpx solid rgba(0, 0, 0, 0.06);
-    box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.08);
-  }
-
-  .sys-item {
-    display: flex;
-    align-items: center;
-    padding: 24rpx 28rpx;
-  }
-
-  .sys-item-unreg {
-    margin-top: 28rpx;
-    padding-top: 24rpx;
-    border-top: 1rpx solid rgba(0, 0, 0, 0.08);
-    justify-content: center;
-    background: rgba(255, 255, 255, 0.55);
-    border-radius: 16rpx;
-  }
-
-  .sys-icon {
-    width: 32rpx;
-    height: 32rpx;
-    margin-right: 14rpx;
-  }
-
-  .sys-text {
-    font-size: 28rpx;
-    color: #1A1A1A;
-    font-weight: 600;
-  }
-
-  .sys-sub {
-    flex: 1;
-    text-align: right;
-    font-size: 22rpx;
-    color: #888;
-    margin-left: 12rpx;
-  }
-  
-  /* 加载遮罩 */
-  .loading-mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0,0,0,0.7);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 9999;
-  }
-  .loading-content {
-    background: rgba(0,0,0,0.8);
-    padding: 48rpx 64rpx;
-    border-radius: 32rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-  .loading-spinner {
-    width: 72rpx;
-    height: 72rpx;
-    border: 6rpx solid rgba(255,255,255,0.3);
-    border-top-color: #ffd966;
-    border-radius: 50%;
-    animation: spin 0.8s linear infinite;
-    margin-bottom: 24rpx;
-  }
-  .loading-text {
-    font-size: 28rpx;
-    color: #fff;
-  }
-  @keyframes spin {
-    to { transform: rotate(360deg); }
-  }
\ No newline at end of file
+/* pages/shangjiazhongxin/shangjiazhongxin.wxss */
+
+page {
+    background-color: #f5f7fb;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+  }
+
+  /* .page-bg 与全局类似，仅保留差异 */
+  .page-bg {
+    opacity: 0.15;
+    filter: blur(8rpx);
+  }
+
+  /* .page-container 与全局类似，仅保留差异 */
+  .page-container {
+    z-index: 1;
+    padding: 0 32rpx;
+    box-sizing: border-box;
+    background-color: transparent;
+  }
+
+  /* 未注册卡片 */
+  .unregistered {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding-top: 200rpx;
+  }
+  /* .unreg-card 与 .card 类似，仅保留差异 */
+  .unreg-card {
+    width: 90%;
+    border-radius: 48rpx;
+    box-shadow: 0 8rpx 20rpx rgba(0,0,0,0.2);
+    background-color: transparent;
+  }
+  .unreg-content {
+    padding: 60rpx 40rpx;
+    text-align: center;
+    background: rgba(0,0,0,0.65);
+    backdrop-filter: blur(16rpx);
+    border-radius: 48rpx;
+  }
+  .status-title {
+    font-size: 44rpx;
+    font-weight: 700;
+    color: #fff;
+    margin-bottom: 16rpx;
+  }
+  .status-desc {
+    font-size: 28rpx;
+    color: #ddd;
+    margin-bottom: 50rpx;
+  }
+  .input-group {
+    margin-bottom: 40rpx;
+  }
+  /* .invite-input 与 .input-rounded--dark 类似，仅保留差异 */
+  .invite-input {
+    height: 96rpx;
+    background: rgba(255,255,255,0.2);
+    border-radius: 48rpx;
+    font-size: 30rpx;
+  }
+  /* .register-btn 与 .btn .btn-primary .btn-primary--orange 完全相同，删除 */
+
+  .register-tip {
+    margin-top: 32rpx;
+    font-size: 24rpx;
+    color: #ddd;
+  }
+
+  /* 已注册页面 */
+  .registered {
+    padding-top: 30rpx;
+    padding-bottom: 40rpx;
+  }
+
+  /* .refresh-btn 与全局 .refresh-btn .refresh-btn--dark 类似，仅保留差异 */
+  .refresh-btn {
+    position: absolute;
+    top: 30rpx;
+    width: 72rpx;
+    height: 72rpx;
+    border-radius: 36rpx;
+  }
+  .refresh-icon {
+    width: 40rpx;
+    height: 40rpx;
+    filter: brightness(0) invert(1);
+  }
+
+  /* 头像卡片 */
+  .avatar-card {
+    border-radius: 60rpx;
+    overflow: hidden;
+    margin-bottom: 36rpx;
+    box-shadow: 0 6rpx 18rpx rgba(0,0,0,0.2);
+    background-color: transparent;
+  }
+  .avatar-content {
+    display: flex;
+    align-items: center;
+    padding: 28rpx 32rpx;
+    background: rgba(0,0,0,0.55);
+    backdrop-filter: blur(20rpx);
+  }
+  .avatar-wrapper {
+    position: relative;
+    width: 110rpx;
+    height: 110rpx;
+    margin-right: 28rpx;
+  }
+  /* .avatar-img 与 .avatar-circle 类似，仅保留差异 */
+  .avatar-img {
+    width: 100%;
+    height: 100%;
+    border: 2rpx solid rgba(255,255,255,0.3);
+  }
+  .avatar-frame {
+    position: absolute;
+    top: -8rpx;
+    left: -8rpx;
+    width: 126rpx;
+    height: 126rpx;
+    pointer-events: none;
+  }
+  .user-info {
+    flex: 1;
+  }
+  .nicheng {
+    font-size: 40rpx;
+    font-weight: 700;
+    color: #fff;
+    margin-bottom: 16rpx;
+    text-shadow: 0 2rpx 6rpx rgba(0,0,0,0.5);
+    background: rgba(0,0,0,0.6);
+    display: inline-block;
+    padding: 6rpx 20rpx;
+    border-radius: 40rpx;
+  }
+  .uid-area {
+    display: flex;
+    align-items: center;
+  }
+  .uid-label {
+    font-size: 26rpx;
+    color: #fff;
+    background: rgba(0,0,0,0.7);
+    padding: 6rpx 16rpx;
+    border-radius: 28rpx;
+    margin-right: 16rpx;
+    backdrop-filter: blur(4rpx);
+  }
+  .uid-value {
+    font-size: 28rpx;
+    color: #fff;
+    font-family: monospace;
+    background: rgba(0,0,0,0.6);
+    padding: 6rpx 16rpx;
+    border-radius: 28rpx;
+  }
+  .copy-icon {
+    width: 40rpx;
+    height: 40rpx;
+    margin-left: 20rpx;
+    opacity: 0.9;
+    filter: drop-shadow(0 2rpx 2rpx rgba(0,0,0,0.5));
+  }
+
+  /* 荣誉标签 */
+  .badge-area {
+    margin-bottom: 36rpx;
+  }
+  .badge-scroll {
+    white-space: nowrap;
+  }
+  .badge-row {
+    display: inline-flex;
+    gap: 16rpx;
+    padding: 8rpx 0;
+  }
+
+  /* 资产卡片 */
+  .asset-card {
+    border-radius: 48rpx;
+    overflow: hidden;
+    margin-bottom: 36rpx;
+    box-shadow: 0 10rpx 24rpx rgba(0,0,0,0.2);
+    background-color: transparent;
+  }
+  .glass-effect {
+    padding: 44rpx 36rpx;
+    background: rgba(0,0,0,0.55);
+    backdrop-filter: blur(20rpx);
+  }
+  .balance-area {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    flex-wrap: wrap;
+    margin-bottom: 32rpx;
+  }
+  .balance-label {
+    font-size: 28rpx;
+    color: #ffdebc;
+    font-weight: 500;
+  }
+  .balance-value {
+    display: flex;
+    align-items: baseline;
+  }
+  .value-num {
+    font-size: 64rpx;
+    font-weight: 800;
+    color: #ffd966;
+    font-family: 'DIN', monospace;
+  }
+  .value-unit {
+    font-size: 32rpx;
+    color: #ffdebc;
+    margin-left: 6rpx;
+  }
+  .action-buttons {
+    display: flex;
+    gap: 24rpx;
+  }
+  .action-btn {
+    display: flex;
+    align-items: center;
+    gap: 10rpx;
+    background: rgba(255,255,255,0.9);
+    padding: 12rpx 28rpx;
+    border-radius: 60rpx;
+    font-size: 26rpx;
+    font-weight: 500;
+  }
+  .action-btn.recharge {
+    color: #ff8c1a;
+  }
+  .action-btn.withdraw {
+    color: #2d3e6e;
+  }
+  .btn-icon {
+    width: 32rpx;
+    height: 32rpx;
+  }
+  /* .divider 与全局 .divider-gradient 类似，仅保留差异 */
+  .divider {
+    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.5), transparent);
+    margin: 24rpx 0;
+  }
+  .stats-row {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+  }
+  .stat-item {
+    flex: 1;
+    text-align: center;
+  }
+  .stat-label {
+    font-size: 24rpx;
+    color: #ddd;
+    margin-bottom: 12rpx;
+    display: block;
+  }
+  .stat-number {
+    font-size: 34rpx;
+    font-weight: 700;
+    color: #fff;
+  }
+
+  /* 核心指标卡片组 */
+  .metrics-section {
+    display: flex;
+    gap: 24rpx;
+    margin-bottom: 40rpx;
+  }
+  .metric-card {
+    flex: 1;
+    border-radius: 36rpx;
+    overflow: hidden;
+    box-shadow: 0 6rpx 16rpx rgba(0,0,0,0.2);
+    background-color: transparent;
+  }
+  .metric-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 24rpx 0;
+    background: rgba(0,0,0,0.55);
+    backdrop-filter: blur(12rpx);
+  }
+  .metric-icon {
+    width: 48rpx;
+    height: 48rpx;
+    margin-bottom: 16rpx;
+    filter: brightness(0) invert(1);
+  }
+  .metric-value {
+    font-size: 44rpx;
+    font-weight: 800;
+    color: #ffd966;
+    margin-bottom: 8rpx;
+  }
+  .metric-label {
+    font-size: 24rpx;
+    color: #eee;
+  }
+
+  /* 功能宫格 */
+  .function-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 24rpx;
+    margin-top: 12rpx;
+  }
+  .func-item {
+    border-radius: 32rpx;
+    overflow: hidden;
+    box-shadow: 0 6rpx 14rpx rgba(0,0,0,0.2);
+    background-color: transparent;
+  }
+  .func-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 32rpx 12rpx 28rpx;
+    background: rgba(0,0,0,0.55);
+    backdrop-filter: blur(12rpx);
+    transition: all 0.2s ease;
+  }
+  .func-icon {
+    width: 64rpx;
+    height: 64rpx;
+    margin-bottom: 20rpx;
+    filter: brightness(0) invert(1);
+  }
+  .func-name {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #fff;
+    margin-bottom: 8rpx;
+  }
+  .func-desc {
+    font-size: 22rpx;
+    color: #ddd;
+  }
+
+  /* 底部安全区 */
+  .safe-bottom {
+    height: 40rpx;
+  }
+
+  /* .sys-list 无全局对应，保留 */
+  .sys-list {
+    margin: 24rpx 32rpx 0;
+    background: rgba(255, 255, 255, 0.92);
+    border-radius: 20rpx;
+    overflow: hidden;
+    border: 1rpx solid rgba(0, 0, 0, 0.06);
+    box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.08);
+  }
+
+  /* .sys-item 与 .list-item 类似，仅保留差异（无 border-bottom） */
+  .sys-item {
+    padding: 24rpx 28rpx;
+  }
+
+  .sys-item-unreg {
+    margin-top: 28rpx;
+    padding-top: 24rpx;
+    border-top: 1rpx solid rgba(0, 0, 0, 0.08);
+    justify-content: center;
+    background: rgba(255, 255, 255, 0.55);
+    border-radius: 16rpx;
+  }
+
+  /* .sys-icon 与 .list-icon 类似，仅保留差异 */
+  .sys-icon {
+    width: 32rpx;
+    height: 32rpx;
+    margin-right: 14rpx;
+  }
+
+  /* .sys-text 与 .list-text 类似，仅保留差异 */
+  .sys-text {
+    font-size: 28rpx;
+    color: #1A1A1A;
+    font-weight: 600;
+  }
+
+  /* .sys-sub 无全局对应，保留 */
+  .sys-sub {
+    flex: 1;
+    text-align: right;
+    font-size: 22rpx;
+    color: #888;
+    margin-left: 12rpx;
+  }
+
+  /* .loading-mask 与全局 .loading-mask .loading-mask--dark 类似，仅保留差异 */
+  .loading-mask {
+    backdrop-filter: blur(10px);
+  }
+  .loading-content {
+    background: rgba(0,0,0,0.8);
+    padding: 48rpx 64rpx;
+    border-radius: 32rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  /* .loading-spinner 与 .spinner--md 类似，仅保留差异 */
+  .loading-spinner {
+    width: 72rpx;
+    height: 72rpx;
+    border: 6rpx solid rgba(255,255,255,0.3);
+    border-top-color: #ffd966;
+    margin-bottom: 24rpx;
+  }
+  /* .loading-text 与全局 .loading-text 类似，仅保留差异 */
+  .loading-text {
+    font-size: 28rpx;
+  }
diff --git a/pages/xiaoxi/xiaoxi.js b/pages/messages/messages.js
similarity index 92%
rename from pages/xiaoxi/xiaoxi.js
rename to pages/messages/messages.js
index e8d6a5f..d39533f 100644
--- a/pages/xiaoxi/xiaoxi.js
+++ b/pages/messages/messages.js
@@ -1,407 +1,403 @@
-// pages/xiaoxi/xiaoxi.js
-const app = getApp();
-import { formatDate } from '../../static/lib/utils';
-import { resolveAvatarUrl, getDefaultAvatarUrl, resolveAvatarFromStorage } from '../../utils/avatar.js';
-import { getLocalImUserId } from '../../utils/im-user.js';
-import { normalizeConversationsList } from '../../utils/conversation-display.js';
-import { reconnectForRole } from '../../utils/role-tab-bar.js';
-import { getPrimaryRole } from '../../utils/primary-role.js';
-const { jianquanxian } = require('../../utils/imAuth/jianquanxian');
-
-Page({
-    data: {
-        allConversations: [],
-        filteredConversations: [],
-        activeTab: 0,
-        tabUnread: [0, 0, 0],
-        displayCount: 10,
-        searchKeyword: '',
-        actionPopup: { visible: false, conversation: null },
-        currentUser: null,
-        notificationMuted: false,
-        scrollHeight: 0
-    },
-
-    _permissionSeq: 0,
-    _peerProfileCache: {},
-
-    onLoad() {
-        this.calculateScrollHeight();
-        const muted = wx.getStorageSync('notificationMuted') || false;
-        this.setData({ notificationMuted: muted });
-    },
-
-    onShow() {
-        if (!this.checkLoginStatus()) return;
-        this.registerNotificationComponent();
-        this.checkPermissionAndAutoConnect();
-    },
-
-    onHide() {},
-
-    onUnload() {},
-
-    // ========== 鉴权检查 ==========
-    async checkPermissionAndAutoConnect() {
-        const seq = ++this._permissionSeq;
-        let quanxian;
-        try {
-            quanxian = await jianquanxian(app);
-        } catch (e) {
-            return;
-        }
-        if (seq !== this._permissionSeq) return;
-
-        if (!quanxian.allowed) {
-            const currentRole = app.globalData.currentRole || 'normal';
-            let content = '您没有权限使用消息功能';
-            if (currentRole === 'dashou') content = '您需要先充值会员才能使用消息功能';
-            wx.showModal({
-                title: '权限不足',
-                content,
-                showCancel: false,
-                confirmText: '我知道了'
-            });
-            return;
-        }
-        this.autoConnect();
-    },
-
-    // ========== 登录状态检查 ==========
-    checkLoginStatus() {
-        const uid = wx.getStorageSync('uid');
-        if (!uid) {
-            wx.showToast({ title: '请先登录', icon: 'none' });
-            setTimeout(() => { wx.redirectTo({ url: '/pages/wode/wode' }); }, 1500);
-            return false;
-        }
-        let currentUser = app.globalData.currentUser;
-        if (!currentUser) {
-            currentUser = {
-                id: getLocalImUserId(app) || uid,
-                name: wx.getStorageSync('nicheng') || app.globalData.dashouNicheng || app.globalData.nicheng || ('用户' + uid.substring(0, 6)),
-                avatar: resolveAvatarFromStorage(app),
-            };
-            app.globalData.currentUser = currentUser;
-        }
-        this.setData({ currentUser });
-        return true;
-    },
-
-    registerNotificationComponent() {
-        const notificationComp = this.selectComponent('#global-notification');
-        if (notificationComp && notificationComp.showNotification) {
-            app.globalData.globalNotification = {
-                show: (data) => notificationComp.showNotification(data),
-                hide: () => notificationComp.hideNotification(),
-            };
-        }
-    },
-
-    autoConnect() {
-        const targetUserId = getLocalImUserId(app);
-        if (!targetUserId) return;
-
-        if (app.ensureConnection) app.ensureConnection();
-        reconnectForRole(getPrimaryRole(app));
-
-        const status = wx.goEasy.getConnectionStatus ? wx.goEasy.getConnectionStatus() : 'disconnected';
-        if (status === 'connected' || status === 'reconnected') {
-            const currentUserId = wx.goEasy.im ? wx.goEasy.im.userId : null;
-            if (currentUserId === targetUserId) {
-                this.setupConversationListener();
-                this.loadConversations();
-                return;
-            }
-            try {
-                wx.goEasy.disconnect();
-            } catch (e) {}
-        }
-
-        this.connectGoEasy(targetUserId);
-    },
-
-    connectGoEasy(userId) {
-        const { currentUser } = this.data;
-        if (!currentUser) return;
-        wx.goEasy.connect({
-            id: userId,
-            data: {
-                name: currentUser.name,
-                avatar: resolveAvatarUrl(currentUser.avatar, app),
-            },
-            onSuccess: () => {
-                try {
-                    wx.setStorageSync('savedGoEasyConnection', JSON.stringify({
-                        userId,
-                        identityType: app.globalData.currentRole,
-                        lastConnectTime: Date.now(),
-                        status: 'connected',
-                    }));
-                } catch (e) {}
-                this.setupConversationListener();
-                this.loadConversations();
-                if (app.registerNotification) {
-                    // 全局通知在 chat-core 注册
-                }
-            },
-            onFailed: (error) => {
-                if (error.code === 408) {
-                    this.setupConversationListener();
-                    this.loadConversations();
-                } else {
-                    wx.showToast({ title: '连接失败，请重试', icon: 'none' });
-                }
-            },
-        });
-    },
-
-    setupConversationListener() {
-        if (!wx.goEasy || !wx.goEasy.im) return;
-        if (this.conversationsUpdatedListener) {
-            wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, this.conversationsUpdatedListener);
-        }
-        this.conversationsUpdatedListener = (result) => {
-            const content = result?.content || result;
-            this.renderConversations(content);
-        };
-        wx.goEasy.im.on(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, this.conversationsUpdatedListener);
-    },
-
-    loadConversations() {
-        if (!wx.goEasy || !wx.goEasy.im) return;
-        wx.goEasy.im.latestConversations({
-            onSuccess: (result) => {
-                const content = result?.content || result;
-                this.renderConversations(content);
-            },
-            onFailed: () => {
-                wx.showToast({ title: '获取会话失败', icon: 'none' });
-            },
-        });
-    },
-
-    // ========== 会话渲染与排序 ==========
-    renderConversations(content) {
-        const conversations = (content && content.conversations) ? content.conversations : [];
-        if (!conversations.length) {
-            this.setData({ allConversations: [] }, () => this.applyFilter());
-            return;
-        }
-        let list = normalizeConversationsList(conversations, app, this._peerProfileCache);
-        list.forEach(item => {
-            if (!item.lastMessage) {
-                item.lastMessage = { type: 'text', payload: { text: '' }, timestamp: 0 };
-            }
-            if (item.lastMessage.timestamp) {
-                item.lastMessage.date = formatDate(item.lastMessage.timestamp);
-            }
-        });
-
-        list.sort((a, b) => {
-            if (a.top && !b.top) return -1;
-            if (!a.top && b.top) return 1;
-            if (a.unread > 0 && b.unread <= 0) return -1;
-            if (a.unread <= 0 && b.unread > 0) return 1;
-            const ta = (a.lastMessage && a.lastMessage.timestamp) || 0;
-            const tb = (b.lastMessage && b.lastMessage.timestamp) || 0;
-            return tb - ta;
-        });
-
-        this.setData({ allConversations: list, displayCount: 10 }, () => {
-            this.applyFilter();
-        });
-
-        const unreadTotal = content.unreadTotal !== undefined
-            ? content.unreadTotal
-            : list.reduce((sum, c) => sum + (c.unread || 0), 0);
-        if (app.updateUnreadCount) {
-            app.updateUnreadCount(unreadTotal);
-        } else if (app.emitEvent) {
-            app.emitEvent('tabBarBadgeChanged', { badgeText: unreadTotal > 0 ? String(unreadTotal) : '' });
-        }
-
-        // ✅ 每次渲染会话后，无条件重新订阅所有群组，确保订阅关系始终有效
-        this.subscribeGroupsIfNeeded(list);
-    },
-
-    /**
-     * 群组订阅（依赖：GoEasy IM）
-     * 根据官方文档，需要主动 subscribeGroup 才能接收群聊消息。
-     * 为了应对切后台、网络波动等导致的订阅丢失，这里不再缓存订阅状态，
-     * 每次获取到群组列表时都直接订阅，保证消息不丢失。
-     */
-    subscribeGroupsIfNeeded(conversations) {
-        if (!wx.goEasy?.im || typeof wx.goEasy.im.subscribeGroup !== 'function') return;
-
-        const groupIds = conversations
-            .filter(c => c.type === 'group' && c.groupId)
-            .map(c => c.groupId);
-
-        if (groupIds.length === 0) return;
-
-        // 不再判断缓存，直接订阅当前所有群组
-        wx.goEasy.im.subscribeGroup({
-            groupIds: groupIds,
-            onSuccess: () => {
-                // 可选的日志输出，不影响功能
-                // console.log('群组订阅成功', groupIds);
-            },
-            onFailed: (error) => {
-                console.error('群组订阅失败:', error);
-            }
-        });
-    },
-
-    applyFilter() {
-        const { allConversations, activeTab, searchKeyword } = this.data;
-        let filtered = [];
-        if (activeTab === 0) {
-            filtered = allConversations.filter(c => c.type === 'group' && c.data && c.data.orderId);
-        } else if (activeTab === 1) {
-            filtered = allConversations.filter(c => c.type === 'private');
-        } else if (activeTab === 2) {
-            filtered = allConversations.filter(c => c.type === 'cs');
-        }
-
-        if (searchKeyword.trim()) {
-            const kw = searchKeyword.trim().toLowerCase();
-            filtered = filtered.filter(c => {
-                const name = (c.data && c.data.name || '').toLowerCase();
-                const orderId = (c.data && c.data.orderId || '').toLowerCase();
-                const id = (c.userId || c.groupId || '').toLowerCase();
-                return name.includes(kw) || id.includes(kw) || orderId.includes(kw);
-            });
-        }
-
-        const tabUnread = [0, 0, 0];
-        allConversations.forEach(c => {
-            if (c.type === 'group' && c.data && c.data.orderId) tabUnread[0] += c.unread || 0;
-            else if (c.type === 'private') tabUnread[1] += c.unread || 0;
-            else if (c.type === 'cs') tabUnread[2] += c.unread || 0;
-        });
-
-        this.setData({ filteredConversations: filtered, tabUnread });
-    },
-
-    switchTab(e) {
-        const index = parseInt(e.currentTarget.dataset.index);
-        this.setData({ activeTab: index, displayCount: 10, searchKeyword: '' }, () => this.applyFilter());
-    },
-
-    onSearchInput(e) {
-        this.setData({ searchKeyword: e.detail.value, displayCount: 10 }, () => this.applyFilter());
-    },
-
-    onScrollToLower() {
-        const { displayCount, filteredConversations } = this.data;
-        if (displayCount < filteredConversations.length) {
-            this.setData({ displayCount: Math.min(displayCount + 10, filteredConversations.length) });
-        }
-    },
-
-    onRefresh() {
-        this.loadConversations();
-    },
-
-    chat(e) {
-        const conversation = e.currentTarget.dataset.conversation;
-        if (!conversation) return;
-
-        if (conversation.type === 'private') {
-            const param = {
-                toUserId: conversation.userId,
-                toName: conversation.data.name || '用户',
-                toAvatar: resolveAvatarUrl(conversation.data.avatar, app),
-            };
-            wx.navigateTo({ url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param)) });
-        } else if (conversation.type === 'group') {
-            const param = {
-                groupId: conversation.groupId,
-                orderId: conversation.data.orderId || '',
-                groupName: conversation.data.name,
-                groupAvatar: conversation.data.avatar,
-                isCross: conversation.data.isCross || 0
-            };
-            wx.navigateTo({ url: '/pages/qunliaotian/qunliaotian?data=' + encodeURIComponent(JSON.stringify(param)) });
-        } else if (conversation.type === 'cs') {
-            const param = { teamId: conversation.teamId || conversation.id };
-            wx.navigateTo({ url: '/pages/kefuliaotian/kefuliaotian?data=' + encodeURIComponent(JSON.stringify(param)) });
-        }
-    },
-
-    chatKefu() {
-        const param = { teamId: 'support_team' };
-        wx.navigateTo({ url: '/pages/kefuliaotian/kefuliaotian?data=' + encodeURIComponent(JSON.stringify(param)) });
-    },
-
-    showAction(e) {
-        const conversation = e.currentTarget.dataset.conversation;
-        this.setData({ ['actionPopup.conversation']: conversation, ['actionPopup.visible']: true });
-    },
-    closeMask() {
-        this.setData({ ['actionPopup.visible']: false });
-    },
-    topConversation() {
-        let conversation = this.data.actionPopup.conversation;
-        if (!conversation) return;
-        const top = !conversation.top;
-        wx.showLoading({ title: '处理中...' });
-        if (conversation.type === 'private') {
-            wx.goEasy.im.topPrivateConversation({
-                userId: conversation.userId, top,
-                onSuccess: () => {
-                    wx.hideLoading(); this.loadConversations();
-                    wx.showToast({ title: top ? '已置顶' : '已取消置顶' });
-                },
-                onFailed: () => { wx.hideLoading(); wx.showToast({ title: '操作失败', icon: 'none' }); }
-            });
-        } else {
-            wx.goEasy.im.topGroupConversation({
-                groupId: conversation.groupId, top,
-                onSuccess: () => {
-                    wx.hideLoading(); this.loadConversations();
-                    wx.showToast({ title: top ? '已置顶' : '已取消置顶' });
-                },
-                onFailed: () => { wx.hideLoading(); wx.showToast({ title: '操作失败', icon: 'none' }); }
-            });
-        }
-        this.closeMask();
-    },
-    removeConversation() {
-        let conversation = this.data.actionPopup.conversation;
-        if (!conversation) return;
-        wx.showLoading({ title: '删除中...' });
-        wx.goEasy.im.removeConversation({
-            conversation: conversation,
-            onSuccess: () => { wx.hideLoading(); this.loadConversations(); wx.showToast({ title: '已删除' }); },
-            onFailed: () => { wx.hideLoading(); wx.showToast({ title: '删除失败', icon: 'none' }); }
-        });
-        this.closeMask();
-    },
-
-    toggleNotification() {
-        const newMuted = !this.data.notificationMuted;
-        this.setData({ notificationMuted: newMuted });
-        wx.setStorageSync('notificationMuted', newMuted);
-        wx.showToast({ title: newMuted ? '已静音' : '已开启通知', icon: 'none' });
-    },
-
-    calculateScrollHeight() {
-        const systemInfo = wx.getSystemInfoSync();
-        const windowHeight = systemInfo.windowHeight;
-        const windowWidth = systemInfo.windowWidth;
-        const rpxRatio = 750 / windowWidth;
-        const headerHeight = 150 / rpxRatio;
-        const tabBarHeight = 130 / rpxRatio;
-        const safeAreaBottom = systemInfo.safeArea ? (windowHeight - systemInfo.safeArea.bottom) : 0;
-        this.setData({ scrollHeight: windowHeight - headerHeight - tabBarHeight - safeAreaBottom });
-    },
-
-    onAvatarError(e) {
-        const index = e.currentTarget.dataset.index;
-        const def = getDefaultAvatarUrl(app);
-        const key = `filteredConversations[${index}].data.avatar`;
-        this.setData({ [key]: def });
-    }
+// pages/messages/messages.js
+const app = getApp();
+import { formatDate } from '../../static/lib/utils';
+import { resolveAvatarUrl, getDefaultAvatarUrl, resolveAvatarFromStorage } from '../../utils/avatar.js';
+import { getLocalImUserId } from '../../utils/im-user.js';
+import { normalizeConversationsList } from '../../utils/conversation-display.js';
+import { reconnectForRole } from '../../utils/role-tab-bar.js';
+import { getPrimaryRole } from '../../utils/primary-role.js';
+const { jianquanxian } = require('../../utils/imAuth/jianquanxian');
+
+Page({
+    data: {
+        allConversations: [],
+        filteredConversations: [],
+        activeTab: 0,
+        tabUnread: [0, 0, 0],
+        displayCount: 10,
+        searchKeyword: '',
+        actionPopup: { visible: false, conversation: null },
+        currentUser: null,
+        notificationMuted: false,
+        scrollHeight: 0
+    },
+
+    _permissionSeq: 0,
+    _peerProfileCache: {},
+
+    onLoad() {
+        this.calculateScrollHeight();
+        const muted = wx.getStorageSync('notificationMuted') || false;
+        this.setData({ notificationMuted: muted });
+    },
+
+    onShow() {
+        if (!this.checkLoginStatus()) return;
+        this.registerNotificationComponent();
+        this.checkPermissionAndAutoConnect();
+    },
+
+    onHide() {},
+
+    onUnload() {},
+
+    // ========== ==== ================ ==== ================ 鉴权检查 ==========
+    async checkPermissionAndAutoConnect() {
+        const seq = ++this._permissionSeq;
+        let quanxian;
+        try {
+            quanxian = await jianquanxian(app);
+        } catch (e) {
+            return;
+        }
+        if (seq !== this._permissionSeq) return;
+
+        if (!quanxian.allowed) {
+            const currentRole = app.globalData.currentRole || 'normal';
+            let content = '您没有权限使用消息功能';
+            if (currentRole === 'dashou') content = '您需要先充值会员才能使用消息功能';
+            wx.showModal({
+                title: '权限不足',
+                content,
+                showCancel: false,
+                confirmText: '我知道了'
+            });
+            return;
+        }
+        this.autoConnect();
+    },
+
+    // 登录状态检查
+    checkLoginStatus() {
+        const uid = wx.getStorageSync('uid');
+        if (!uid) {
+            wx.showToast({ title: '请先登录', icon: 'none' });
+            setTimeout(() => { wx.redirectTo({ url: '/pages/mine/mine' }); }, 1500);
+            return false;
+        }
+        let currentUser = app.globalData.currentUser;
+        if (!currentUser) {
+            currentUser = {
+                id: getLocalImUserId(app) || uid,
+                name: wx.getStorageSync('nicheng') || app.globalData.dashouNicheng || app.globalData.nicheng || ('用户' + uid.substring(0, 6)),
+                avatar: resolveAvatarFromStorage(app),
+            };
+            app.globalData.currentUser = currentUser;
+        }
+        this.setData({ currentUser });
+        return true;
+    },
+
+    registerNotificationComponent() {
+        const notificationComp = this.selectComponent('#global-notification');
+        if (notificationComp && notificationComp.showNotification) {
+            app.globalData.globalNotification = {
+                show: (data) => notificationComp.showNotification(data),
+                hide: () => notificationComp.hideNotification(),
+            };
+        }
+    },
+
+    autoConnect() {
+        const targetUserId = getLocalImUserId(app);
+        if (!targetUserId) return;
+
+        if (app.ensureConnection) app.ensureConnection();
+        reconnectForRole(getPrimaryRole(app));
+
+        const status = wx.goEasy.getConnectionStatus ? wx.goEasy.getConnectionStatus() : 'disconnected';
+        if (status === 'connected' || status === 'reconnected') {
+            const currentUserId = wx.goEasy.im ? wx.goEasy.im.userId : null;
+            if (currentUserId === targetUserId) {
+                this.setupConversationListener();
+                this.loadConversations();
+                return;
+            }
+            try {
+                wx.goEasy.disconnect();
+            } catch (e) {}
+        }
+
+        this.connectGoEasy(targetUserId);
+    },
+
+    connectGoEasy(userId) {
+        const { currentUser } = this.data;
+        if (!currentUser) return;
+        wx.goEasy.connect({
+            id: userId,
+            data: {
+                name: currentUser.name,
+                avatar: resolveAvatarUrl(currentUser.avatar, app),
+            },
+            onSuccess: () => {
+                try {
+                    wx.setStorageSync('savedGoEasyConnection', JSON.stringify({
+                        userId,
+                        identityType: app.globalData.currentRole,
+                        lastConnectTime: Date.now(),
+                        status: 'connected',
+                    }));
+                } catch (e) {}
+                this.setupConversationListener();
+                this.loadConversations();
+                if (app.registerNotification) {
+                }
+            },
+            onFailed: (error) => {
+                if (error.code === 408) {
+                    this.setupConversationListener();
+                    this.loadConversations();
+                } else {
+                    wx.showToast({ title: '连接失败，请重试', icon: 'none' });
+                }
+            },
+        });
+    },
+
+    setupConversationListener() {
+        if (!wx.goEasy || !wx.goEasy.im) return;
+        if (this.conversationsUpdatedListener) {
+            wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, this.conversationsUpdatedListener);
+        }
+        this.conversationsUpdatedListener = (result) => {
+            const content = result?.content || result;
+            this.renderConversations(content);
+        };
+        wx.goEasy.im.on(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, this.conversationsUpdatedListener);
+    },
+
+    loadConversations() {
+        if (!wx.goEasy || !wx.goEasy.im) return;
+        wx.goEasy.im.latestConversations({
+            onSuccess: (result) => {
+                const content = result?.content || result;
+                this.renderConversations(content);
+            },
+            onFailed: () => {
+                wx.showToast({ title: '获取会话失败', icon: 'none' });
+            },
+        });
+    },
+
+    // 会话渲染与排序
+    renderConversations(content) {
+        const conversations = (content && content.conversations) ? content.conversations : [];
+        if (!conversations.length) {
+            this.setData({ allConversations: [] }, () => this.applyFilter());
+            return;
+        }
+        let list = normalizeConversationsList(conversations, app, this._peerProfileCache);
+        list.forEach(item => {
+            if (!item.lastMessage) {
+                item.lastMessage = { type: 'text', payload: { text: '' }, timestamp: 0 };
+            }
+            if (item.lastMessage.timestamp) {
+                item.lastMessage.date = formatDate(item.lastMessage.timestamp);
+            }
+        });
+
+        list.sort((a, b) => {
+            if (a.top && !b.top) return -1;
+            if (!a.top && b.top) return 1;
+            if (a.unread > 0 && b.unread <= 0) return -1;
+            if (a.unread <= 0 && b.unread > 0) return 1;
+            const ta = (a.lastMessage && a.lastMessage.timestamp) || 0;
+            const tb = (b.lastMessage && b.lastMessage.timestamp) || 0;
+            return tb - ta;
+        });
+
+        this.setData({ allConversations: list, displayCount: 10 }, () => {
+            this.applyFilter();
+        });
+
+        const unreadTotal = content.unreadTotal !== undefined
+            ? content.unreadTotal
+            : list.reduce((sum, c) => sum + (c.unread || 0), 0);
+        if (app.updateUnreadCount) {
+            app.updateUnreadCount(unreadTotal);
+        } else if (app.emitEvent) {
+            app.emitEvent('tabBarBadgeChanged', { badgeText: unreadTotal > 0 ? String(unreadTotal) : '' });
+        }
+
+        // 重新订阅群组
+        this.subscribeGroupsIfNeeded(list);
+    },
+
+    /**
+     * 群组订阅，每次获取群组列表时直接订阅保证消息不丢失
+     */
+    subscribeGroupsIfNeeded(conversations) {
+        if (!wx.goEasy?.im || typeof wx.goEasy.im.subscribeGroup !== 'function') return;
+
+        const groupIds = conversations
+            .filter(c => c.type === 'group' && c.groupId)
+            .map(c => c.groupId);
+
+        if (groupIds.length === 0) return;
+
+        // 不再判断缓存，直接订阅当前所有群组
+        wx.goEasy.im.subscribeGroup({
+            groupIds: groupIds,
+            onSuccess: () => {
+                // 可选的日志输出，不影响功能
+                // console.log('群组订阅成功', groupIds);
+            },
+            onFailed: (error) => {
+                console.error('群组订阅失败:', error);
+            }
+        });
+    },
+
+    applyFilter() {
+        const { allConversations, activeTab, searchKeyword } = this.data;
+        let filtered = [];
+        if (activeTab === 0) {
+            filtered = allConversations.filter(c => c.type === 'group' && c.data && c.data.orderId);
+        } else if (activeTab === 1) {
+            filtered = allConversations.filter(c => c.type === 'private');
+        } else if (activeTab === 2) {
+            filtered = allConversations.filter(c => c.type === 'cs');
+        }
+
+        if (searchKeyword.trim()) {
+            const kw = searchKeyword.trim().toLowerCase();
+            filtered = filtered.filter(c => {
+                const name = (c.data && c.data.name || '').toLowerCase();
+                const orderId = (c.data && c.data.orderId || '').toLowerCase();
+                const id = (c.userId || c.groupId || '').toLowerCase();
+                return name.includes(kw) || id.includes(kw) || orderId.includes(kw);
+            });
+        }
+
+        const tabUnread = [0, 0, 0];
+        allConversations.forEach(c => {
+            if (c.type === 'group' && c.data && c.data.orderId) tabUnread[0] += c.unread || 0;
+            else if (c.type === 'private') tabUnread[1] += c.unread || 0;
+            else if (c.type === 'cs') tabUnread[2] += c.unread || 0;
+        });
+
+        this.setData({ filteredConversations: filtered, tabUnread });
+    },
+
+    switchTab(e) {
+        const index = parseInt(e.currentTarget.dataset.index);
+        this.setData({ activeTab: index, displayCount: 10, searchKeyword: '' }, () => this.applyFilter());
+    },
+
+    onSearchInput(e) {
+        this.setData({ searchKeyword: e.detail.value, displayCount: 10 }, () => this.applyFilter());
+    },
+
+    onScrollToLower() {
+        const { displayCount, filteredConversations } = this.data;
+        if (displayCount < filteredConversations.length) {
+            this.setData({ displayCount: Math.min(displayCount + 10, filteredConversations.length) });
+        }
+    },
+
+    onRefresh() {
+        this.loadConversations();
+    },
+
+    chat(e) {
+        const conversation = e.currentTarget.dataset.conversation;
+        if (!conversation) return;
+
+        if (conversation.type === 'private') {
+            const param = {
+                toUserId: conversation.userId,
+                toName: conversation.data.name || '用户',
+                toAvatar: resolveAvatarUrl(conversation.data.avatar, app),
+            };
+            wx.navigateTo({ url: '/pages/chat/chat?data=' + encodeURIComponent(JSON.stringify(param)) });
+        } else if (conversation.type === 'group') {
+            const param = {
+                groupId: conversation.groupId,
+                orderId: conversation.data.orderId || '',
+                groupName: conversation.data.name,
+                groupAvatar: conversation.data.avatar,
+                isCross: conversation.data.isCross || 0
+            };
+            wx.navigateTo({ url: '/pages/group-chat/group-chat?data=' + encodeURIComponent(JSON.stringify(param)) });
+        } else if (conversation.type === 'cs') {
+            const param = { teamId: conversation.teamId || conversation.id };
+            wx.navigateTo({ url: '/pages/cs-chat/cs-chat?data=' + encodeURIComponent(JSON.stringify(param)) });
+        }
+    },
+
+    chatKefu() {
+        const param = { teamId: 'support_team' };
+        wx.navigateTo({ url: '/pages/cs-chat/cs-chat?data=' + encodeURIComponent(JSON.stringify(param)) });
+    },
+
+    showAction(e) {
+        const conversation = e.currentTarget.dataset.conversation;
+        this.setData({ ['actionPopup.conversation']: conversation, ['actionPopup.visible']: true });
+    },
+    closeMask() {
+        this.setData({ ['actionPopup.visible']: false });
+    },
+    topConversation() {
+        let conversation = this.data.actionPopup.conversation;
+        if (!conversation) return;
+        const top = !conversation.top;
+        wx.showLoading({ title: '处理中...' });
+        if (conversation.type === 'private') {
+            wx.goEasy.im.topPrivateConversation({
+                userId: conversation.userId, top,
+                onSuccess: () => {
+                    wx.hideLoading(); this.loadConversations();
+                    wx.showToast({ title: top ? '已置顶' : '已取消置顶' });
+                },
+                onFailed: () => { wx.hideLoading(); wx.showToast({ title: '操作失败', icon: 'none' }); }
+            });
+        } else {
+            wx.goEasy.im.topGroupConversation({
+                groupId: conversation.groupId, top,
+                onSuccess: () => {
+                    wx.hideLoading(); this.loadConversations();
+                    wx.showToast({ title: top ? '已置顶' : '已取消置顶' });
+                },
+                onFailed: () => { wx.hideLoading(); wx.showToast({ title: '操作失败', icon: 'none' }); }
+            });
+        }
+        this.closeMask();
+    },
+    removeConversation() {
+        let conversation = this.data.actionPopup.conversation;
+        if (!conversation) return;
+        wx.showLoading({ title: '删除中...' });
+        wx.goEasy.im.removeConversation({
+            conversation: conversation,
+            onSuccess: () => { wx.hideLoading(); this.loadConversations(); wx.showToast({ title: '已删除' }); },
+            onFailed: () => { wx.hideLoading(); wx.showToast({ title: '删除失败', icon: 'none' }); }
+        });
+        this.closeMask();
+    },
+
+    toggleNotification() {
+        const newMuted = !this.data.notificationMuted;
+        this.setData({ notificationMuted: newMuted });
+        wx.setStorageSync('notificationMuted', newMuted);
+        wx.showToast({ title: newMuted ? '已静音' : '已开启通知', icon: 'none' });
+    },
+
+    calculateScrollHeight() {
+        const systemInfo = wx.getSystemInfoSync();
+        const windowHeight = systemInfo.windowHeight;
+        const windowWidth = systemInfo.windowWidth;
+        const rpxRatio = 750 / windowWidth;
+        const headerHeight = 150 / rpxRatio;
+        const tabBarHeight = 130 / rpxRatio;
+        const safeAreaBottom = systemInfo.safeArea ? (windowHeight - systemInfo.safeArea.bottom) : 0;
+        this.setData({ scrollHeight: windowHeight - headerHeight - tabBarHeight - safeAreaBottom });
+    },
+
+    onAvatarError(e) {
+        const index = e.currentTarget.dataset.index;
+        const def = getDefaultAvatarUrl(app);
+        const key = `filteredConversations[${index}].data.avatar`;
+        this.setData({ [key]: def });
+    }
 });
\ No newline at end of file
diff --git a/pages/xiaoxi/xiaoxi.json b/pages/messages/messages.json
similarity index 100%
rename from pages/xiaoxi/xiaoxi.json
rename to pages/messages/messages.json
diff --git a/pages/xiaoxi/xiaoxi.wxml b/pages/messages/messages.wxml
similarity index 100%
rename from pages/xiaoxi/xiaoxi.wxml
rename to pages/messages/messages.wxml
diff --git a/pages/xiaoxi/xiaoxi.wxss b/pages/messages/messages.wxss
similarity index 73%
rename from pages/xiaoxi/xiaoxi.wxss
rename to pages/messages/messages.wxss
index 09a88ee..15b29b6 100644
--- a/pages/xiaoxi/xiaoxi.wxss
+++ b/pages/messages/messages.wxss
@@ -1,17 +1,17 @@
-.msg-page { background: #f5f5f5; min-height: 100vh; }
+.msg-page { background: #f5f5f5; }
 
 .header { display: flex; align-items: center; padding: 20rpx 24rpx; background: #fff; border-bottom: 1rpx solid #e8e8e8; }
-.search-bar { flex: 1; display: flex; align-items: center; background: #f0f0f0; border-radius: 40rpx; padding: 0 20rpx; height: 68rpx; }
-.search-input { flex: 1; height: 68rpx; font-size: 28rpx; }
+.search-bar { flex: 1; }
+.search-input { height: 68rpx; }
 .search-icon { font-size: 32rpx; margin-left: 10rpx; color: #999; }
 .notify-switch { margin-left: 20rpx; }
 .notify-text { font-size: 26rpx; color: #666; padding: 10rpx 16rpx; background: #f0f0f0; border-radius: 30rpx; }
 
-.tab-row { display: flex; background: #fff; border-bottom: 1rpx solid #e8e8e8; }
-.tab-item { flex: 1; display: flex; justify-content: center; align-items: center; padding: 24rpx 0; position: relative; color: #666; font-size: 28rpx; }
+.tab-row { border-bottom: 1rpx solid #e8e8e8; }
+/* .tab-item 已由全局 .tab-item 覆盖 */
 .tab-item.active { color: #07c160; font-weight: 600; }
 .tab-item.active::after { content: ''; position: absolute; bottom: 0; left: 50%; transform: translateX(-50%); width: 60rpx; height: 6rpx; background: #07c160; border-radius: 3rpx; }
-.tab-badge { background: #fa5151; color: #fff; font-size: 20rpx; border-radius: 20rpx; padding: 2rpx 12rpx; margin-left: 8rpx; min-width: 32rpx; text-align: center; }
+.tab-badge { border-radius: 20rpx; padding: 2rpx 12rpx; margin-left: 8rpx; }
 
 .conversation-list { background: #fff; }
 .conversation-item { display: flex; align-items: center; padding: 20rpx 24rpx; border-bottom: 1rpx solid #f0f0f0; }
@@ -32,7 +32,7 @@
 .kefu-btn { width: 300rpx; background: #07c160; color: #fff; border-radius: 40rpx; font-size: 28rpx; }
 
 /* 操作弹窗 */
-.action-mask { position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.4); z-index: 10000; }
+.action-mask { background: rgba(0,0,0,0.4); z-index: 10000; }
 .action-sheet { position: absolute; bottom: 0; left: 0; right: 0; background: #fff; border-radius: 24rpx 24rpx 0 0; padding: 20rpx 20rpx 150rpx 20rpx; }
 .action-btn { text-align: center; padding: 28rpx 0; font-size: 32rpx; border-bottom: 1rpx solid #eee; }
 .cancel { color: #999; margin-top: 12rpx; border-bottom: none; }
\ No newline at end of file
diff --git a/pages/wode/wode.js b/pages/mine/mine.js
similarity index 89%
rename from pages/wode/wode.js
rename to pages/mine/mine.js
index cf4bab7..22bdd18 100644
--- a/pages/wode/wode.js
+++ b/pages/mine/mine.js
@@ -1,169 +1,169 @@
-// pages/wode/wode.js
-const app = getApp();
-import { ensureLogin } from '../../utils/login';
-import {
-  backfillUserProfileCache,
-  getUserProfileForDisplay,
-  clearCacheAndEnterNormal,
-  isRoleStatusActive,
-  ensureRoleOnCenterPage,
-} from '../../utils/role-tab-bar';
-import { enterLockedRole } from '../../utils/primary-role.js';
-
-Page({
-  data: {
-    avatarUrl: '',
-    userNicheng: '',
-    userUid: '',
-    showLoginBtn: false,
-    orderCounts: { daifuwu:0, fuwuzhong:0, yiwancheng:0, yituikuan:0 },
-    // 图标
-    settingIcon: '', daifuwuIcon: '', fuwuzhongIcon: '', yiwanchengIcon: '', yituikuanIcon: '',
-    dashouIcon: '', shangjiaIcon: '', guanshiIcon: '', kefuIcon: '',
-    zuzhangIcon: '', guanzhualongIcon: '', arrowRightIcon: '', qingchuIcon: '',
-    dashouCertified: false,
-    shangjiaCertified: false,
-    bottomSafePadding: 0
-  },
-
-  onLoad() {
-    this.initIconUrls()
-    this.loadUserData()
-    this.setBottomSafe()
-  },
-
-  onShow() {
-    this.initIconUrls();
-    this.registerNotification();
-    this.checkAvatarPrompt();
-    backfillUserProfileCache(app);
-    this.loadUserData();
-    this.updateOrderCounts();
-  },
-
-  setBottomSafe() {
-    const sys = wx.getSystemInfoSync()
-    const safeBottom = sys.screenHeight - sys.safeArea.bottom  // 底部安全区高度(px)
-    const tabBarHeight = (sys.windowWidth / 750) * 100          // 100rpx 转为 px
-    this.setData({
-      bottomSafePadding: safeBottom + tabBarHeight + 4  // 4px 微调，确保不留缝隙
-    })
-  },
-
-  registerNotification() {
-    const comp = this.selectComponent('#global-notification')
-    if (comp?.showNotification) {
-      app.globalData.globalNotification = {
-        show: d => comp.showNotification(d),
-        hide: () => comp.hideNotification()
-      }
-    }
-  },
-
-  checkAvatarPrompt() {
-    const ds = wx.getStorageSync('dashoustatus')
-    const tx = wx.getStorageSync('touxiang') || ''
-    if (ds === 1 && (!tx || tx === 'a_long/morentouxiang.jpg')) {
-      wx.showModal({
-        title: '提示', content: '请先设置头像',
-        confirmText: '去设置', confirmColor: '#C9A962',
-        success: r => r.confirm && wx.navigateTo({ url: '/pages/xiugai/xiugai' })
-      })
-    }
-  },
-
-  initIconUrls() {
-    const base = (app.globalData.ossImageUrl || '') + '/beijing/tubiao/'
-    this.setData({
-      settingIcon: base + 'grzx_shezhi.jpg',
-      daifuwuIcon: base + 'grzx_daifuwu.jpg',
-      fuwuzhongIcon: base + 'grzx_fuwuzhong.jpg',
-      yiwanchengIcon: base + 'grzx_yiwancheng.jpg',
-      yituikuanIcon: base + 'grzx_yituikuan.jpg',
-      dashouIcon: base + 'grzx_dashou.jpg',
-      shangjiaIcon: base + 'grzx_shangjia.jpg',
-      guanshiIcon: base + 'grzx_guanshi.jpg',
-      kefuIcon: base + 'grzx_kefu.jpg',
-      zuzhangIcon: base + 'grzx_zuzhang.jpg',
-      guanzhualongIcon: base + 'grzx_guanzhualong.jpg',
-      arrowRightIcon: base + 'grzx_arrow_right.jpg',
-      qingchuIcon: base + 'grzx_qingchu.jpg',
-      kaoheguanIcon: base + 'kaoheguan.png',   // 考核官认证图标
-    })
-  },
-
-  loadUserData() {
-    const profile = getUserProfileForDisplay(app);
-    this.setData({
-      avatarUrl: profile.avatarUrl,
-      userNicheng: profile.nick,
-      userUid: profile.uid,
-      showLoginBtn: !profile.isLoggedIn,
-      dashouCertified: isRoleStatusActive(wx.getStorageSync('dashoustatus')),
-      shangjiaCertified: isRoleStatusActive(wx.getStorageSync('shangjiastatus')),
-    });
-  },
-
-  updateOrderCounts() {
-    const c = app.globalData.dingdanTiaoshu || {}
-    this.setData({ orderCounts: {
-      daifuwu: c.daifuwu||0, fuwuzhong: c.fuwuzhong||0,
-      yiwancheng: c.yiwancheng||0, yituikuan: c.yituikuan||0
-    }})
-  },
-
-  goToSetting() { wx.navigateTo({ url: '/pages/xiugai/xiugai' }) },
-
-  handleWechatLogin() {
-    wx.showLoading({ title: '登录中...', mask: true });
-    ensureLogin({ silent: false, page: this })
-      .then(() => {
-        this.loadUserData();
-        this.updateOrderCounts();
-        wx.showToast({ title: '登录成功', icon: 'success' });
-      })
-      .catch(() => {})
-      .finally(() => wx.hideLoading());
-  },
-
-  goToOrder(e) { wx.navigateTo({ url: `/pages/dingdan/dingdan?type=${e.currentTarget.dataset.type}` }) },
-
-  goToAuth(e) {
-    const type = e.currentTarget.dataset.type;
-    if (!type || !['dashou', 'shangjia'].includes(type)) return;
-    ensureLogin({ silent: false, page: this })
-      .then(() => {
-        this.loadUserData();
-        const statusKey = type === 'dashou' ? 'dashoustatus' : 'shangjiastatus';
-        if (isRoleStatusActive(wx.getStorageSync(statusKey))) {
-          ensureRoleOnCenterPage(this, type);
-          enterLockedRole(type, app);
-          return;
-        }
-        wx.navigateTo({ url: `/pages/renzheng/renzheng?type=${type}` });
-      })
-      .catch(() => {});
-  },
-
-  goToKefu() {
-    const { link, enterpriseId } = app.globalData.kefuConfig || {}
-    if (!link || !enterpriseId) { wx.showToast({ title: '客服配置未加载', icon: 'none' }); return }
-    wx.openCustomerServiceChat({ extInfo: { url: link }, corpId: enterpriseId })
-  },
-  goToCustomService() { this.goToKefu() },
-  goToGuanzhuA() { wx.navigateTo({ url: '/pages/guanzhual/guanzhual' }) },
-
-  clearCache() {
-    wx.showModal({
-      title: '清除缓存',
-      content: '将清除所有登录与身份数据，并回到点单端，确定继续？',
-      confirmText: '确定',
-      cancelText: '取消',
-      success: r => {
-        if (r.confirm) {
-          clearCacheAndEnterNormal(this);
-        }
-      },
-    });
-  },
+// pages/mine/mine.js
+const app = getApp();
+import { ensureLogin } from '../../utils/login';
+import {
+  backfillUserProfileCache,
+  getUserProfileForDisplay,
+  clearCacheAndEnterNormal,
+  isRoleStatusActive,
+  ensureRoleOnCenterPage,
+} from '../../utils/role-tab-bar';
+import { enterLockedRole } from '../../utils/primary-role.js';
+
+Page({
+  data: {
+    avatarUrl: '',
+    userNicheng: '',
+    userUid: '',
+    showLoginBtn: false,
+    orderCounts: { daifuwu:0, fuwuzhong:0, yiwancheng:0, yituikuan:0 },
+    // 图标
+    settingIcon: '', daifuwuIcon: '', fuwuzhongIcon: '', yiwanchengIcon: '', yituikuanIcon: '',
+    dashouIcon: '', shangjiaIcon: '', guanshiIcon: '', kefuIcon: '',
+    zuzhangIcon: '', guanzhualongIcon: '', arrowRightIcon: '', qingchuIcon: '',
+    dashouCertified: false,
+    shangjiaCertified: false,
+    bottomSafePadding: 0
+  },
+
+  onLoad() {
+    this.initIconUrls()
+    this.loadUserData()
+    this.setBottomSafe()
+  },
+
+  onShow() {
+    this.initIconUrls();
+    this.registerNotification();
+    this.checkAvatarPrompt();
+    backfillUserProfileCache(app);
+    this.loadUserData();
+    this.updateOrderCounts();
+  },
+
+  setBottomSafe() {
+    const sys = wx.getSystemInfoSync()
+    const safeBottom = sys.screenHeight - sys.safeArea.bottom  // 底部安全区高度(px)
+    const tabBarHeight = (sys.windowWidth / 750) * 100          // 100rpx 转为 px
+    this.setData({
+      bottomSafePadding: safeBottom + tabBarHeight + 4  // 4px 微调，确保不留缝隙
+    })
+  },
+
+  registerNotification() {
+    const comp = this.selectComponent('#global-notification')
+    if (comp?.showNotification) {
+      app.globalData.globalNotification = {
+        show: d => comp.showNotification(d),
+        hide: () => comp.hideNotification()
+      }
+    }
+  },
+
+  checkAvatarPrompt() {
+    const ds = wx.getStorageSync('dashoustatus')
+    const tx = wx.getStorageSync('touxiang') || ''
+    if (ds === 1 && (!tx || tx === 'a_long/morentouxiang.jpg')) {
+      wx.showModal({
+        title: '提示', content: '请先设置头像',
+        confirmText: '去设置', confirmColor: '#C9A962',
+        success: r => r.confirm && wx.navigateTo({ url: '/pages/edit/edit' })
+      })
+    }
+  },
+
+  initIconUrls() {
+    const base = (app.globalData.ossImageUrl || '') + '/beijing/tubiao/'
+    this.setData({
+      settingIcon: base + 'grzx_shezhi.jpg',
+      daifuwuIcon: base + 'grzx_daifuwu.jpg',
+      fuwuzhongIcon: base + 'grzx_fuwuzhong.jpg',
+      yiwanchengIcon: base + 'grzx_yiwancheng.jpg',
+      yituikuanIcon: base + 'grzx_yituikuan.jpg',
+      dashouIcon: base + 'grzx_dashou.jpg',
+      shangjiaIcon: base + 'grzx_shangjia.jpg',
+      guanshiIcon: base + 'grzx_guanshi.jpg',
+      kefuIcon: base + 'grzx_kefu.jpg',
+      zuzhangIcon: base + 'grzx_zuzhang.jpg',
+      guanzhualongIcon: base + 'grzx_guanzhualong.jpg',
+      arrowRightIcon: base + 'grzx_arrow_right.jpg',
+      qingchuIcon: base + 'grzx_qingchu.jpg',
+      kaoheguanIcon: base + 'kaoheguan.png',
+    })
+  },
+
+  loadUserData() {
+    const profile = getUserProfileForDisplay(app);
+    this.setData({
+      avatarUrl: profile.avatarUrl,
+      userNicheng: profile.nick,
+      userUid: profile.uid,
+      showLoginBtn: !profile.isLoggedIn,
+      dashouCertified: isRoleStatusActive(wx.getStorageSync('dashoustatus')),
+      shangjiaCertified: isRoleStatusActive(wx.getStorageSync('shangjiastatus')),
+    });
+  },
+
+  updateOrderCounts() {
+    const c = app.globalData.dingdanTiaoshu || {}
+    this.setData({ orderCounts: {
+      daifuwu: c.daifuwu||0, fuwuzhong: c.fuwuzhong||0,
+      yiwancheng: c.yiwancheng||0, yituikuan: c.yituikuan||0
+    }})
+  },
+
+  goToSetting() { wx.navigateTo({ url: '/pages/edit/edit' }) },
+
+  handleWechatLogin() {
+    wx.showLoading({ title: '登录中...', mask: true });
+    ensureLogin({ silent: false, page: this })
+      .then(() => {
+        this.loadUserData();
+        this.updateOrderCounts();
+        wx.showToast({ title: '登录成功', icon: 'success' });
+      })
+      .catch(() => {})
+      .finally(() => wx.hideLoading());
+  },
+
+  goToOrder(e) { wx.navigateTo({ url: `/pages/orders/orders?type=${e.currentTarget.dataset.type}` }) },
+
+  goToAuth(e) {
+    const type = e.currentTarget.dataset.type;
+    if (!type || !['dashou', 'shangjia'].includes(type)) return;
+    ensureLogin({ silent: false, page: this })
+      .then(() => {
+        this.loadUserData();
+        const statusKey = type === 'dashou' ? 'dashoustatus' : 'shangjiastatus';
+        if (isRoleStatusActive(wx.getStorageSync(statusKey))) {
+          ensureRoleOnCenterPage(this, type);
+          enterLockedRole(type, app);
+          return;
+        }
+        wx.navigateTo({ url: `/pages/verify/verify?type=${type}` });
+      })
+      .catch(() => {});
+  },
+
+  goToKefu() {
+    const { link, enterpriseId } = app.globalData.kefuConfig || {}
+    if (!link || !enterpriseId) { wx.showToast({ title: '客服配置未加载', icon: 'none' }); return }
+    wx.openCustomerServiceChat({ extInfo: { url: link }, corpId: enterpriseId })
+  },
+  goToCustomService() { this.goToKefu() },
+  goToGuanzhuA() { wx.navigateTo({ url: '/pages/manager-assign/manager-assign' }) },
+
+  clearCache() {
+    wx.showModal({
+      title: '清除缓存',
+      content: '将清除所有登录与身份数据，并回到点单端，确定继续？',
+      confirmText: '确定',
+      cancelText: '取消',
+      success: r => {
+        if (r.confirm) {
+          clearCacheAndEnterNormal(this);
+        }
+      },
+    });
+  },
 })
\ No newline at end of file
diff --git a/pages/wode/wode.json b/pages/mine/mine.json
similarity index 100%
rename from pages/wode/wode.json
rename to pages/mine/mine.json
diff --git a/pages/wode/wode.wxml b/pages/mine/mine.wxml
similarity index 100%
rename from pages/wode/wode.wxml
rename to pages/mine/mine.wxml
diff --git a/pages/wode/wode.wxss b/pages/mine/mine.wxss
similarity index 96%
rename from pages/wode/wode.wxss
rename to pages/mine/mine.wxss
index 9ba5ac8..5a0b5cc 100644
--- a/pages/wode/wode.wxss
+++ b/pages/mine/mine.wxss
@@ -104,11 +104,8 @@ page {
   }
   .login-btn {
     margin-top: 45rpx;
-    width: 100%; height: 92rpx;
-    background: linear-gradient(135deg, #C9A962, #D4B56A);
-    color: white; font-size: 34rpx; font-weight: 600;
+    height: 92rpx;
     border-radius: 46rpx;
-    border: none;
   }
   
   /* 分区间距 */
@@ -183,7 +180,7 @@ page {
     font-weight: 600;
   }
   
-  /* 更多服务 / 身份认证 */
+  /* 更多服务 */
   .service-row {
     display: flex;
     gap: 80rpx;
diff --git a/pages/wodedashou/wodedashou.js b/pages/my-fighter/my-fighter.js
similarity index 95%
rename from pages/wodedashou/wodedashou.js
rename to pages/my-fighter/my-fighter.js
index 4092640..a62f723 100644
--- a/pages/wodedashou/wodedashou.js
+++ b/pages/my-fighter/my-fighter.js
@@ -1,176 +1,176 @@
-// pages/wodedashou/wodedashou.js
-import request from '../../utils/request.js'
-import { resolveAvatarUrl } from '../../utils/avatar.js'
-import { openPrivateChat, buildDashouPeerId } from '../../utils/im-user.js'
-const app = getApp()
-
-Page({
-  data: {
-    // 统计
-    yaoqingzongshu: 0,
-    zaixianCount: 0,
-    zhengchangCount: 0,
-    fengjinCount: 0,
-
-    // 列表
-    dashouList: [],
-    currentPage: 1,
-    pageSize: 10,
-    hasMore: true,
-    isLoading: false,      // 首次加载或筛选时使用
-    isLoadingMore: false,  // 上拉加载更多时使用
-
-    // 筛选条件
-    keyword: '',
-    zhanghaozhuangtai: null,  // null=全部, 1=正常, 2=封禁
-    zaixianzhuangtai: null,   // null=全部, 1=在线, 2=离线
-
-    // 公共资源
-    ossImageUrl: '',
-    defaultAvatar: ''
-  },
-
-  onLoad() {
-    this.initGlobal()
-    this.jiazaiShuju(true)
-    this.registerNotification()
-  },
-
-  registerNotification() {
-    const comp = this.selectComponent('#global-notification')
-    if (comp?.showNotification) {
-      app.globalData.globalNotification = {
-        show: d => comp.showNotification(d),
-        hide: () => comp.hideNotification()
-      }
-    }
-  },
-
-  initGlobal() {
-    const g = app.globalData
-    this.setData({
-      ossImageUrl: g.ossImageUrl || '',
-      defaultAvatar: (g.ossImageUrl || '') + (g.morentouxiang || '')
-    })
-  },
-
-  // 手动点击刷新按钮（重新加载第一页）
-  shuaxinShuju() {
-    if (this.data.isLoading) return
-    this.setData({ currentPage: 1 })
-    this.jiazaiShuju(true)
-  },
-
-  // 上拉触底加载更多（同时也作为按钮点击方法）
-  shanglaJiazaiGengduo() {
-    if (!this.data.hasMore || this.data.isLoadingMore || this.data.isLoading) return
-    this.jiazaiShuju(false)
-  },
-
-  // 核心数据请求
-  async jiazaiShuju(isFirstLoad) {
-    if (isFirstLoad && this.data.isLoading) return
-    if (!isFirstLoad && this.data.isLoadingMore) return
-
-    this.setData({
-      isLoading: isFirstLoad ? true : this.data.isLoading,
-      isLoadingMore: isFirstLoad ? false : true
-    })
-
-    try {
-      const res = await request({
-        url: '/yonghu/gshqyqds',
-        method: 'POST',
-        data: {
-          page: isFirstLoad ? 1 : this.data.currentPage,
-          pageSize: this.data.pageSize,
-          keyword: this.data.keyword,
-          zhanghaozhuangtai: this.data.zhanghaozhuangtai,
-          zaixianzhuangtai: this.data.zaixianzhuangtai
-        }
-      })
-
-      if (res.data.code === 200) {
-        this.handleResponse(res.data.data, isFirstLoad)
-      } else {
-        wx.showToast({ title: res.data.message || '加载失败', icon: 'none' })
-        if (!isFirstLoad) {
-          this.setData({ currentPage: this.data.currentPage - 1 })
-        }
-      }
-    } catch (err) {
-      wx.showToast({ title: '网络异常', icon: 'none' })
-      if (!isFirstLoad) {
-        this.setData({ currentPage: this.data.currentPage - 1 })
-      }
-    } finally {
-      this.setData({
-        isLoading: false,
-        isLoadingMore: false
-      })
-    }
-  },
-
-  handleResponse(data, isFirstLoad) {
-    const process = (list) => list.map(item => ({
-      ...item,
-      touxiangUrl: this.fullAvatar(item.touxiang)
-    }))
-
-    if (isFirstLoad) {
-      this.setData({
-        dashouList: process(data.dashouList || []),
-        yaoqingzongshu: data.yaoqingzongshu || 0,
-        zaixianCount: data.zaixianCount || 0,
-        zhengchangCount: data.zhengchangCount || 0,
-        fengjinCount: data.fengjinCount || 0,
-        currentPage: data.hasMore ? 2 : 1,
-        hasMore: data.hasMore
-      })
-    } else {
-      this.setData({
-        dashouList: [...this.data.dashouList, ...process(data.dashouList || [])],
-        currentPage: this.data.currentPage + 1,
-        hasMore: data.hasMore
-      })
-    }
-  },
-
-  fullAvatar(relative) {
-    return resolveAvatarUrl(relative, app)
-  },
-
-  // 筛选输入
-  onKeywordInput(e) {
-    this.setData({ keyword: e.detail.value.trim() })
-  },
-
-  // picker 变更
-  onZhanghaoChange(e) {
-    const idx = parseInt(e.detail.value, 10)
-    this.setData({ zhanghaozhuangtai: idx === 0 ? null : idx })
-  },
-  onZaixianChange(e) {
-    const idx = parseInt(e.detail.value, 10)
-    this.setData({ zaixianzhuangtai: idx === 0 ? null : idx })
-  },
-
-  // 点击筛选按钮
-  applyFilter() {
-    if (this.data.isLoading) return
-    this.setData({ currentPage: 1 })
-    this.jiazaiShuju(true)
-  },
-
-  // 联系打手（私聊）
-  contactDashou(e) {
-    const dashouUid = e.currentTarget.dataset.uid
-    if (!dashouUid) return
-    const item = this.data.dashouList.find(i => i.uid === dashouUid)
-    openPrivateChat(this, {
-      toUserId: buildDashouPeerId(dashouUid),
-      toName: item?.nicheng || '打手',
-      toAvatar: item?.touxiang || item?.touxiangUrl || '',
-    })
-  }
+// pages/my-fighter/my-fighter.js
+import request from '../../utils/request.js'
+import { resolveAvatarUrl } from '../../utils/avatar.js'
+import { openPrivateChat, buildDashouPeerId } from '../../utils/im-user.js'
+const app = getApp()
+
+Page({
+  data: {
+    // 统计
+    yaoqingzongshu: 0,
+    zaixianCount: 0,
+    zhengchangCount: 0,
+    fengjinCount: 0,
+
+    // 列表
+    dashouList: [],
+    currentPage: 1,
+    pageSize: 10,
+    hasMore: true,
+    isLoading: false,      // 首次加载或筛选时使用
+    isLoadingMore: false,  // 上拉加载更多时使用
+
+    // 筛选条件
+    keyword: '',
+    zhanghaozhuangtai: null,  // null=全部, 1=正常, 2=封禁
+    zaixianzhuangtai: null,   // null=全部, 1=在线, 2=离线
+
+    // 公共资源
+    ossImageUrl: '',
+    defaultAvatar: ''
+  },
+
+  onLoad() {
+    this.initGlobal()
+    this.jiazaiShuju(true)
+    this.registerNotification()
+  },
+
+  registerNotification() {
+    const comp = this.selectComponent('#global-notification')
+    if (comp?.showNotification) {
+      app.globalData.globalNotification = {
+        show: d => comp.showNotification(d),
+        hide: () => comp.hideNotification()
+      }
+    }
+  },
+
+  initGlobal() {
+    const g = app.globalData
+    this.setData({
+      ossImageUrl: g.ossImageUrl || '',
+      defaultAvatar: (g.ossImageUrl || '') + (g.morentouxiang || '')
+    })
+  },
+
+  // 手动点击刷新按钮（重新加载第一页）
+  shuaxinShuju() {
+    if (this.data.isLoading) return
+    this.setData({ currentPage: 1 })
+    this.jiazaiShuju(true)
+  },
+
+  // 上拉触底加载更多（同时也作为按钮点击方法）
+  shanglaJiazaiGengduo() {
+    if (!this.data.hasMore || this.data.isLoadingMore || this.data.isLoading) return
+    this.jiazaiShuju(false)
+  },
+
+  // 核心数据请求
+  async jiazaiShuju(isFirstLoad) {
+    if (isFirstLoad && this.data.isLoading) return
+    if (!isFirstLoad && this.data.isLoadingMore) return
+
+    this.setData({
+      isLoading: isFirstLoad ? true : this.data.isLoading,
+      isLoadingMore: isFirstLoad ? false : true
+    })
+
+    try {
+      const res = await request({
+        url: '/yonghu/gshqyqds',
+        method: 'POST',
+        data: {
+          page: isFirstLoad ? 1 : this.data.currentPage,
+          pageSize: this.data.pageSize,
+          keyword: this.data.keyword,
+          zhanghaozhuangtai: this.data.zhanghaozhuangtai,
+          zaixianzhuangtai: this.data.zaixianzhuangtai
+        }
+      })
+
+      if (res.data.code === 200) {
+        this.handleResponse(res.data.data, isFirstLoad)
+      } else {
+        wx.showToast({ title: res.data.message || '加载失败', icon: 'none' })
+        if (!isFirstLoad) {
+          this.setData({ currentPage: this.data.currentPage - 1 })
+        }
+      }
+    } catch (err) {
+      wx.showToast({ title: '网络异常', icon: 'none' })
+      if (!isFirstLoad) {
+        this.setData({ currentPage: this.data.currentPage - 1 })
+      }
+    } finally {
+      this.setData({
+        isLoading: false,
+        isLoadingMore: false
+      })
+    }
+  },
+
+  handleResponse(data, isFirstLoad) {
+    const process = (list) => list.map(item => ({
+      ...item,
+      touxiangUrl: this.fullAvatar(item.touxiang)
+    }))
+
+    if (isFirstLoad) {
+      this.setData({
+        dashouList: process(data.dashouList || []),
+        yaoqingzongshu: data.yaoqingzongshu || 0,
+        zaixianCount: data.zaixianCount || 0,
+        zhengchangCount: data.zhengchangCount || 0,
+        fengjinCount: data.fengjinCount || 0,
+        currentPage: data.hasMore ? 2 : 1,
+        hasMore: data.hasMore
+      })
+    } else {
+      this.setData({
+        dashouList: [...this.data.dashouList, ...process(data.dashouList || [])],
+        currentPage: this.data.currentPage + 1,
+        hasMore: data.hasMore
+      })
+    }
+  },
+
+  fullAvatar(relative) {
+    return resolveAvatarUrl(relative, app)
+  },
+
+  // 筛选输入
+  onKeywordInput(e) {
+    this.setData({ keyword: e.detail.value.trim() })
+  },
+
+  // picker 变更
+  onZhanghaoChange(e) {
+    const idx = parseInt(e.detail.value, 10)
+    this.setData({ zhanghaozhuangtai: idx === 0 ? null : idx })
+  },
+  onZaixianChange(e) {
+    const idx = parseInt(e.detail.value, 10)
+    this.setData({ zaixianzhuangtai: idx === 0 ? null : idx })
+  },
+
+  // 点击筛选按钮
+  applyFilter() {
+    if (this.data.isLoading) return
+    this.setData({ currentPage: 1 })
+    this.jiazaiShuju(true)
+  },
+
+  // 联系打手（私聊）
+  contactDashou(e) {
+    const dashouUid = e.currentTarget.dataset.uid
+    if (!dashouUid) return
+    const item = this.data.dashouList.find(i => i.uid === dashouUid)
+    openPrivateChat(this, {
+      toUserId: buildDashouPeerId(dashouUid),
+      toName: item?.nicheng || '打手',
+      toAvatar: item?.touxiang || item?.touxiangUrl || '',
+    })
+  }
 })
\ No newline at end of file
diff --git a/pages/dsddxq/dsddxq.json b/pages/my-fighter/my-fighter.json
similarity index 100%
rename from pages/dsddxq/dsddxq.json
rename to pages/my-fighter/my-fighter.json
diff --git a/pages/wodedashou/wodedashou.wxml b/pages/my-fighter/my-fighter.wxml
similarity index 100%
rename from pages/wodedashou/wodedashou.wxml
rename to pages/my-fighter/my-fighter.wxml
diff --git a/pages/wodedashou/wodedashou.wxss b/pages/my-fighter/my-fighter.wxss
similarity index 100%
rename from pages/wodedashou/wodedashou.wxss
rename to pages/my-fighter/my-fighter.wxss
diff --git a/pages/dingdanxiangqing/dingdanxiangqing.js b/pages/order-detail/order-detail.js
similarity index 100%
rename from pages/dingdanxiangqing/dingdanxiangqing.js
rename to pages/order-detail/order-detail.js
diff --git a/pages/shangpinxiangqing/shangpinxiangqing.json b/pages/order-detail/order-detail.json
similarity index 100%
rename from pages/shangpinxiangqing/shangpinxiangqing.json
rename to pages/order-detail/order-detail.json
diff --git a/pages/dingdanxiangqing/dingdanxiangqing.wxml b/pages/order-detail/order-detail.wxml
similarity index 97%
rename from pages/dingdanxiangqing/dingdanxiangqing.wxml
rename to pages/order-detail/order-detail.wxml
index c941219..64f1aae 100644
--- a/pages/dingdanxiangqing/dingdanxiangqing.wxml
+++ b/pages/order-detail/order-detail.wxml
@@ -1,203 +1,203 @@
-<!-- pages/dingdanxiangqing/dingdanxiangqing.wxml -->
-<view class="page">
-  <!-- 加载中 -->
-  <view class="loading-box" wx:if="{{isLoading}}">
-    <view class="spinner"></view>
-    <text class="loading-text">加载中...</text>
-  </view>
-
-  <!-- 内容区 -->
-  <view class="main" wx:if="{{!isLoading}}">
-    <!-- 商品图片与简介 -->
-    <view class="goods-box">
-      <image class="goods-img" src="{{jibenShuju.tupian}}" mode="aspectFill" binderror="onGoodsImgError"></image>
-      <view class="goods-text">{{jibenShuju.jieshao || '暂无描述'}}</view>
-    </view>
-
-    <!-- 订单信息 -->
-    <view class="block">
-      <view class="block-title">订单信息</view>
-      <view class="row" wx:if="{{jibenShuju.nicheng}}">
-        <text class="label">游戏昵称</text>
-        <text class="value">{{jibenShuju.nicheng}}</text>
-        <view class="copy-btn" bindtap="copyText" data-text="{{jibenShuju.nicheng}}">复制</view>
-      </view>
-      <view class="row" wx:if="{{jibenShuju.beizhu}}">
-        <text class="label">备注</text>
-        <text class="value">{{jibenShuju.beizhu}}</text>
-      </view>
-      <view class="row">
-        <text class="label">订单ID</text>
-        <text class="value">{{jibenShuju.dingdanId}}</text>
-        <view class="copy-btn" bindtap="copyText" data-text="{{jibenShuju.dingdanId}}">复制</view>
-      </view>
-      <view class="row">
-        <text class="label">价格</text>
-        <text class="value price">¥{{jibenShuju.jine}}</text>
-      </view>
-      <view class="row">
-        <text class="label">状态</text>
-        <text class="value status-text">{{zhuangtaiWenziMap[jibenShuju.zhuangtai] || '未知'}}</text>
-      </view>
-      <view class="row">
-        <text class="label">创建时间</text>
-        <text class="value">{{jibenShuju.chuangjianshijian}}</text>
-      </view>
-      <view class="row" wx:if="{{jibenShuju.updateTime}}">
-        <text class="label">更新时间</text>
-        <text class="value">{{jibenShuju.updateTime}}</text>
-      </view>
-    </view>
-
-    <!-- 打手信息（有打手时显示） -->
-    <view class="block" wx:if="{{xiangxiShuju.dashou}}">
-      <view class="block-title">服务打手</view>
-      <view class="row">
-        <text class="label">头像</text>
-        <image class="avatar" src="{{xiangxiShuju.dashouTouxiang}}" mode="aspectFill"></image>
-      </view>
-      <view class="row">
-        <text class="label">昵称</text>
-        <text class="value">{{xiangxiShuju.dashouNicheng || '未设置'}}</text>
-      </view>
-      <view class="row">
-        <text class="label">打手ID</text>
-        <text class="value">{{xiangxiShuju.dashou}}</text>
-        <view class="copy-btn" bindtap="copyText" data-text="{{xiangxiShuju.dashou}}">复制</view>
-      </view>
-      <view class="row" wx:if="{{xiangxiShuju.jiedanTime}}">
-        <text class="label">接单时间</text>
-        <text class="value">{{xiangxiShuju.jiedanTime}}</text>
-      </view>
-      <view class="row" wx:if="{{xiangxiShuju.tijiaoTime}}">
-        <text class="label">提交时间</text>
-        <text class="value">{{xiangxiShuju.tijiaoTime}}</text>
-      </view>
-      <!-- 联系打手 -->
-      <view class="contact-btn" bindtap="contactDashou">联系打手</view>
-    </view>
-
-    <!-- 交付图片（九宫格） -->
-    <view class="block" wx:if="{{xiangxiShuju.dashoujiaofu.length > 0}}">
-      <view class="block-title">交付截图</view>
-      <view class="grid-nine">
-        <image wx:for="{{xiangxiShuju.dashoujiaofu}}" wx:key="index" class="grid-img" src="{{item}}" mode="aspectFill" bindtap="previewImages" data-url="{{item}}" data-urls="{{xiangxiShuju.dashoujiaofu}}"></image>
-      </view>
-    </view>
-
-    <!-- 打手留言 -->
-    <view class="block" wx:if="{{xiangxiShuju.dashouliuyan}}">
-      <view class="block-title">打手留言</view>
-      <view class="msg-text">{{xiangxiShuju.dashouliuyan}}</view>
-    </view>
-
-    <!-- 老板自己的评价（已完成/退款等状态） -->
-    <view class="block" wx:if="{{showMyEvaluation}}">
-      <view class="block-title">我的评价</view>
-      <view class="row">
-        <text class="label">上线速度</text>
-        <text class="value highlight">{{speedText}}</text>
-      </view>
-      <view class="row">
-        <text class="label">服务态度</text>
-        <text class="value highlight">{{attitudeText}}</text>
-      </view>
-      <view class="row">
-        <text class="label">翻车次数</text>
-        <text class="value">{{xiangxiShuju.fancheCishu}}</text>
-      </view>
-      <view class="row" wx:if="{{xiangxiShuju.laobanPingjia}}">
-        <text class="label">我的留言</text>
-        <text class="value">{{xiangxiShuju.laobanPingjia}}</text>
-      </view>
-    </view>
-
-    <!-- 结算区域（仅状态8） -->
-    <view class="block settle-block" wx:if="{{jibenShuju.zhuangtai == 8}}">
-      <view class="block-title">订单结算</view>
-
-      <!-- 翻车次数 -->
-      <view class="row vertical">
-        <text class="label">翻车次数</text>
-        <input class="input" type="number" placeholder="请输入（必填）" value="{{jiesuan.fancheCishu}}" bindinput="onFancheshuInput" />
-        <text class="hint" wx:if="{{!jiesuan.fancheCishu}}">填写该订单翻车次数，用于评价打手实力</text>
-      </view>
-
-      <!-- 上线速度 -->
-      <view class="row vertical">
-        <view class="label-row">
-          <text class="label">上线速度</text>
-          <text class="standard-link" bindtap="showSpeedStandard">标准详情</text>
-        </view>
-        <view class="options-grid">
-          <view wx:for="{{speedOptions}}" wx:key="value" class="option-card {{jiesuan.speedValue == item.value ? 'active' : ''}}" bindtap="selectSpeed" data-value="{{item.value}}">
-            <text class="option-label">{{item.label}}</text>
-          </view>
-        </view>
-        <!-- 解释文字（纯文本，大号醒目） -->
-        <view class="explain-text" wx:if="{{speedExplain}}">{{speedExplain}}</view>
-      </view>
-
-      <!-- 服务态度 -->
-      <view class="row vertical">
-        <view class="label-row">
-          <text class="label">服务态度</text>
-          <text class="standard-link" bindtap="showAttitudeStandard">标准详情</text>
-        </view>
-        <view class="options-grid">
-          <view wx:for="{{attitudeOptions}}" wx:key="value" class="option-card {{jiesuan.attitudeValue == item.value ? 'active' : ''}}" bindtap="selectAttitude" data-value="{{item.value}}">
-            <text class="option-label">{{item.label}}</text>
-          </view>
-        </view>
-        <view class="explain-text" wx:if="{{attitudeExplain}}">{{attitudeExplain}}</view>
-      </view>
-
-      <!-- 留言 -->
-      <view class="row vertical">
-        <text class="label">留言（选填）</text>
-        <textarea class="textarea" value="{{jiesuan.liuyan}}" placeholder="给打手或平台留言" maxlength="50" bindinput="onLiuyanInput"></textarea>
-        <text class="count">{{jiesuan.liuyan.length}}/50</text>
-      </view>
-
-      <view class="settle-btn" bindtap="showSettleConfirm">确认结算</view>
-    </view>
-  </view>
-
-  <!-- 上线速度标准弹窗 -->
-  <view class="standard-modal" wx:if="{{showSpeedModal}}" bindtap="hideSpeedModal">
-    <view class="modal-content" catchtap="noop">
-      <view class="modal-title">上线速度标准</view>
-      <scroll-view scroll-y class="modal-body">
-        <view wx:for="{{speedOptions}}" wx:key="value" class="standard-item">
-          <text class="s-label">{{item.label}}（{{item.value}}分）</text>
-          <text class="s-desc">{{item.explain}}</text>
-        </view>
-      </scroll-view>
-      <view class="modal-close" bindtap="hideSpeedModal">关闭</view>
-    </view>
-  </view>
-
-  <!-- 服务态度标准弹窗 -->
-  <view class="standard-modal" wx:if="{{showAttitudeModal}}" bindtap="hideAttitudeModal">
-    <view class="modal-content" catchtap="noop">
-      <view class="modal-title">服务态度标准</view>
-      <scroll-view scroll-y class="modal-body">
-        <view wx:for="{{attitudeOptions}}" wx:key="value" class="standard-item">
-          <text class="s-label">{{item.label}}（{{item.value}}分）</text>
-          <text class="s-desc">{{item.explain}}</text>
-        </view>
-      </scroll-view>
-      <view class="modal-close" bindtap="hideAttitudeModal">关闭</view>
-    </view>
-  </view>
-
-  <!-- 结算确认倒计时弹窗 -->
-  <view class="confirm-modal" wx:if="{{showConfirm}}">
-    <view class="confirm-box">
-      <text class="confirm-title">确认结算订单？</text>
-      <text class="confirm-desc">结算后订单将变为已完成，确认无误后再点击按钮（{{countdown}}s）</text>
-      <view class="confirm-btn {{countdown===0 ? 'active' : ''}}" bindtap="confirmSettle">确认结算</view>
-      <view class="cancel-btn" bindtap="cancelConfirm">取消</view>
-    </view>
-  </view>
+<!-- pages/order-detail/order-detail.wxml -->
+<view class="page">
+  <!-- 加载中 -->
+  <view class="loading-box" wx:if="{{isLoading}}">
+    <view class="spinner"></view>
+    <text class="loading-text">加载中...</text>
+  </view>
+
+  <!-- 内容区 -->
+  <view class="main" wx:if="{{!isLoading}}">
+    <!-- 商品图片与简介 -->
+    <view class="goods-box">
+      <image class="goods-img" src="{{jibenShuju.tupian}}" mode="aspectFill" binderror="onGoodsImgError"></image>
+      <view class="goods-text">{{jibenShuju.jieshao || '暂无描述'}}</view>
+    </view>
+
+    <!-- 订单信息 -->
+    <view class="block">
+      <view class="block-title">订单信息</view>
+      <view class="row" wx:if="{{jibenShuju.nicheng}}">
+        <text class="label">游戏昵称</text>
+        <text class="value">{{jibenShuju.nicheng}}</text>
+        <view class="copy-btn" bindtap="copyText" data-text="{{jibenShuju.nicheng}}">复制</view>
+      </view>
+      <view class="row" wx:if="{{jibenShuju.beizhu}}">
+        <text class="label">备注</text>
+        <text class="value">{{jibenShuju.beizhu}}</text>
+      </view>
+      <view class="row">
+        <text class="label">订单ID</text>
+        <text class="value">{{jibenShuju.dingdanId}}</text>
+        <view class="copy-btn" bindtap="copyText" data-text="{{jibenShuju.dingdanId}}">复制</view>
+      </view>
+      <view class="row">
+        <text class="label">价格</text>
+        <text class="value price">¥{{jibenShuju.jine}}</text>
+      </view>
+      <view class="row">
+        <text class="label">状态</text>
+        <text class="value status-text">{{zhuangtaiWenziMap[jibenShuju.zhuangtai] || '未知'}}</text>
+      </view>
+      <view class="row">
+        <text class="label">创建时间</text>
+        <text class="value">{{jibenShuju.chuangjianshijian}}</text>
+      </view>
+      <view class="row" wx:if="{{jibenShuju.updateTime}}">
+        <text class="label">更新时间</text>
+        <text class="value">{{jibenShuju.updateTime}}</text>
+      </view>
+    </view>
+
+    <!-- 打手信息（有打手时显示） -->
+    <view class="block" wx:if="{{xiangxiShuju.dashou}}">
+      <view class="block-title">服务打手</view>
+      <view class="row">
+        <text class="label">头像</text>
+        <image class="avatar" src="{{xiangxiShuju.dashouTouxiang}}" mode="aspectFill"></image>
+      </view>
+      <view class="row">
+        <text class="label">昵称</text>
+        <text class="value">{{xiangxiShuju.dashouNicheng || '未设置'}}</text>
+      </view>
+      <view class="row">
+        <text class="label">打手ID</text>
+        <text class="value">{{xiangxiShuju.dashou}}</text>
+        <view class="copy-btn" bindtap="copyText" data-text="{{xiangxiShuju.dashou}}">复制</view>
+      </view>
+      <view class="row" wx:if="{{xiangxiShuju.jiedanTime}}">
+        <text class="label">接单时间</text>
+        <text class="value">{{xiangxiShuju.jiedanTime}}</text>
+      </view>
+      <view class="row" wx:if="{{xiangxiShuju.tijiaoTime}}">
+        <text class="label">提交时间</text>
+        <text class="value">{{xiangxiShuju.tijiaoTime}}</text>
+      </view>
+      <!-- 联系打手 -->
+      <view class="contact-btn" bindtap="contactDashou">联系打手</view>
+    </view>
+
+    <!-- 交付图片（九宫格） -->
+    <view class="block" wx:if="{{xiangxiShuju.dashoujiaofu.length > 0}}">
+      <view class="block-title">交付截图</view>
+      <view class="grid-nine">
+        <image wx:for="{{xiangxiShuju.dashoujiaofu}}" wx:key="index" class="grid-img" src="{{item}}" mode="aspectFill" bindtap="previewImages" data-url="{{item}}" data-urls="{{xiangxiShuju.dashoujiaofu}}"></image>
+      </view>
+    </view>
+
+    <!-- 打手留言 -->
+    <view class="block" wx:if="{{xiangxiShuju.dashouliuyan}}">
+      <view class="block-title">打手留言</view>
+      <view class="msg-text">{{xiangxiShuju.dashouliuyan}}</view>
+    </view>
+
+    <!-- 老板自己的评价（已完成/退款等状态） -->
+    <view class="block" wx:if="{{showMyEvaluation}}">
+      <view class="block-title">我的评价</view>
+      <view class="row">
+        <text class="label">上线速度</text>
+        <text class="value highlight">{{speedText}}</text>
+      </view>
+      <view class="row">
+        <text class="label">服务态度</text>
+        <text class="value highlight">{{attitudeText}}</text>
+      </view>
+      <view class="row">
+        <text class="label">翻车次数</text>
+        <text class="value">{{xiangxiShuju.fancheCishu}}</text>
+      </view>
+      <view class="row" wx:if="{{xiangxiShuju.laobanPingjia}}">
+        <text class="label">我的留言</text>
+        <text class="value">{{xiangxiShuju.laobanPingjia}}</text>
+      </view>
+    </view>
+
+    <!-- 结算区域（仅状态8） -->
+    <view class="block settle-block" wx:if="{{jibenShuju.zhuangtai == 8}}">
+      <view class="block-title">订单结算</view>
+
+      <!-- 翻车次数 -->
+      <view class="row vertical">
+        <text class="label">翻车次数</text>
+        <input class="input" type="number" placeholder="请输入（必填）" value="{{jiesuan.fancheCishu}}" bindinput="onFancheshuInput" />
+        <text class="hint" wx:if="{{!jiesuan.fancheCishu}}">填写该订单翻车次数，用于评价打手实力</text>
+      </view>
+
+      <!-- 上线速度 -->
+      <view class="row vertical">
+        <view class="label-row">
+          <text class="label">上线速度</text>
+          <text class="standard-link" bindtap="showSpeedStandard">标准详情</text>
+        </view>
+        <view class="options-grid">
+          <view wx:for="{{speedOptions}}" wx:key="value" class="option-card {{jiesuan.speedValue == item.value ? 'active' : ''}}" bindtap="selectSpeed" data-value="{{item.value}}">
+            <text class="option-label">{{item.label}}</text>
+          </view>
+        </view>
+        <!-- 解释文字（纯文本，大号醒目） -->
+        <view class="explain-text" wx:if="{{speedExplain}}">{{speedExplain}}</view>
+      </view>
+
+      <!-- 服务态度 -->
+      <view class="row vertical">
+        <view class="label-row">
+          <text class="label">服务态度</text>
+          <text class="standard-link" bindtap="showAttitudeStandard">标准详情</text>
+        </view>
+        <view class="options-grid">
+          <view wx:for="{{attitudeOptions}}" wx:key="value" class="option-card {{jiesuan.attitudeValue == item.value ? 'active' : ''}}" bindtap="selectAttitude" data-value="{{item.value}}">
+            <text class="option-label">{{item.label}}</text>
+          </view>
+        </view>
+        <view class="explain-text" wx:if="{{attitudeExplain}}">{{attitudeExplain}}</view>
+      </view>
+
+      <!-- 留言 -->
+      <view class="row vertical">
+        <text class="label">留言（选填）</text>
+        <textarea class="textarea" value="{{jiesuan.liuyan}}" placeholder="给打手或平台留言" maxlength="50" bindinput="onLiuyanInput"></textarea>
+        <text class="count">{{jiesuan.liuyan.length}}/50</text>
+      </view>
+
+      <view class="settle-btn" bindtap="showSettleConfirm">确认结算</view>
+    </view>
+  </view>
+
+  <!-- 上线速度标准弹窗 -->
+  <view class="standard-modal" wx:if="{{showSpeedModal}}" bindtap="hideSpeedModal">
+    <view class="modal-content" catchtap="noop">
+      <view class="modal-title">上线速度标准</view>
+      <scroll-view scroll-y class="modal-body">
+        <view wx:for="{{speedOptions}}" wx:key="value" class="standard-item">
+          <text class="s-label">{{item.label}}（{{item.value}}分）</text>
+          <text class="s-desc">{{item.explain}}</text>
+        </view>
+      </scroll-view>
+      <view class="modal-close" bindtap="hideSpeedModal">关闭</view>
+    </view>
+  </view>
+
+  <!-- 服务态度标准弹窗 -->
+  <view class="standard-modal" wx:if="{{showAttitudeModal}}" bindtap="hideAttitudeModal">
+    <view class="modal-content" catchtap="noop">
+      <view class="modal-title">服务态度标准</view>
+      <scroll-view scroll-y class="modal-body">
+        <view wx:for="{{attitudeOptions}}" wx:key="value" class="standard-item">
+          <text class="s-label">{{item.label}}（{{item.value}}分）</text>
+          <text class="s-desc">{{item.explain}}</text>
+        </view>
+      </scroll-view>
+      <view class="modal-close" bindtap="hideAttitudeModal">关闭</view>
+    </view>
+  </view>
+
+  <!-- 结算确认倒计时弹窗 -->
+  <view class="confirm-modal" wx:if="{{showConfirm}}">
+    <view class="confirm-box">
+      <text class="confirm-title">确认结算订单？</text>
+      <text class="confirm-desc">结算后订单将变为已完成，确认无误后再点击按钮（{{countdown}}s）</text>
+      <view class="confirm-btn {{countdown===0 ? 'active' : ''}}" bindtap="confirmSettle">确认结算</view>
+      <view class="cancel-btn" bindtap="cancelConfirm">取消</view>
+    </view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/dingdanxiangqing/dingdanxiangqing.wxss b/pages/order-detail/order-detail.wxss
similarity index 99%
rename from pages/dingdanxiangqing/dingdanxiangqing.wxss
rename to pages/order-detail/order-detail.wxss
index daeb265..16aaede 100644
--- a/pages/dingdanxiangqing/dingdanxiangqing.wxss
+++ b/pages/order-detail/order-detail.wxss
@@ -21,7 +21,7 @@
     animation: spin 1s linear infinite;
     margin-bottom: 20rpx;
   }
-  @keyframes spin { to { transform: rotate(360deg); } }
+
   .loading-text { font-size: 28rpx; color: #888; }
   
   /* 主内容 */
diff --git a/pages/jiedanchi/jiedanchi.js b/pages/order-pool/order-pool.js
similarity index 92%
rename from pages/jiedanchi/jiedanchi.js
rename to pages/order-pool/order-pool.js
index 95089c4..2176f96 100644
--- a/pages/jiedanchi/jiedanchi.js
+++ b/pages/order-pool/order-pool.js
@@ -1,466 +1,458 @@
-// pages/jiedanchi/jiedanchi.js
-const app = getApp();
-import request from '../../utils/request.js';
-import PopupService from '../../services/popupService.js';
-
-Page({
-  data: {
-    // 1. 商品类型相关
-    shangpinleixing: [], // 商品类型列表 {id, jieshao, tupian_url}
-    xuanzhongLeixingId: null, // 当前选中的类型ID
-
-    // 2. 订单列表与分页相关
-    dingdanList: [], // 当前展示的订单列表
-    page: 1,
-    pageSize: 10,
-    hasMore: true,
-    isLoading: false,
-
-    // 3. 全局状态字段
-    dashoustatus: null,
-    zhuanghaoStatus: null,     // 注意变量名：zhuanghaoStatus
-    dashouzhuangtai: null,
-    uid: null,
-    huiyuanList: [], // clumber 列表
-    yajin: 0,
-    jifen: 0,
-
-    // 4. 刷新控制字段
-    scrollViewRefreshing: false,
-    lastRefreshTime: 0,
-    refreshCooldown: 2000,
-    isLoadingMore: false,
-    
-    // 5. 切换类型冷却时间控制
-    lastSwitchTime: 0,
-    switchCooldown: 1500,
-    isSwitching: false,
-
-    // 6. 全局OSS地址
-    ossImageUrl: app.globalData.ossImageUrl || '',
-
-    // 7. 授权状态控制
-    showUnauthorized: false,
-    unauthorizedMsg: '您尚未开启此功能',
-  },
-
-  async onLoad(options) {
-    this.loadGlobalStatus();
-    this.checkAuthorization();
-  },
-  // 🆕 页面隐藏时清理弹窗视图
-  onHide: function () {
-    const popupComp = this.selectComponent('#popupNotice');
-    if (popupComp && popupComp.cleanup) {
-        popupComp.cleanup();
-    }
-},
-  
-  onShow() {
-    this.registerNotificationComponent();
-    this.loadGlobalStatus();
-    this.checkAuthorization();
-  },
-
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  loadGlobalStatus() {
-    const globalData = app.globalData;
-    // 从缓存读取，确保与抢单时使用的数据源一致
-    const dashoustatusCache = wx.getStorageSync('dashoustatus');
-    const dashoustatus = dashoustatusCache !== '' ? dashoustatusCache : null;
-    
-    // 从 globalData 或缓存获取 zhuanghaoStatus（注意字段名可能有差异）
-    let zhuanghaoStatus = globalData.zhanghaoStatus;
-    if (zhuanghaoStatus === undefined || zhuanghaoStatus === null) {
-      zhuanghaoStatus = wx.getStorageSync('zhanghaoStatus');
-    }
-    
-    this.setData({
-      dashoustatus: dashoustatus,
-      zhuanghaoStatus: zhuanghaoStatus,
-      dashouzhuangtai: globalData.dashouzhuangtai,
-      uid: wx.getStorageSync('uid'),
-      huiyuanList: globalData.clumber || [],
-      yajin: globalData.yajin || 0,
-      jifen: globalData.jinfen || 0
-    });
-
-    // 打印当前值，方便调试
-    //console.log('loadGlobalStatus -> dashoustatus:', dashoustatus, 'zhuanghaoStatus:', zhuanghaoStatus);
-  },
-
-  checkAuthorization() {
-    const { dashoustatus, zhuanghaoStatus } = this.data;
-    //console.log('checkAuthorization -> dashoustatus:', dashoustatus, 'zhuanghaoStatus:', zhuanghaoStatus);
-    
-    // 完全复制抢单时的判断逻辑
-    const isDashouValid = (dashoustatus && dashoustatus == 1) || false;  // 存在且等于1
-    const isZhuanghaoValid = (zhuanghaoStatus == 1);  // 宽松比较，null/undefined/0 均视为 false
-    
-    const isAuthorized = isDashouValid && isZhuanghaoValid;
-
-    if (!isAuthorized) {
-      this.setData({ showUnauthorized: true });
-      let msg = '';
-      if (!isDashouValid) msg = '您尚未开启身份';
-      //else if (!isZhuanghaoValid) msg = '您的账号状态异常';
-      this.setData({ unauthorizedMsg: msg || '无法使用抢单功能' });
-    } else {
-      this.setData({ showUnauthorized: false });
-      if (!this.data.shangpinleixing.length) {
-        this.loadShangpinLeixing();
-      } else if (this.data.xuanzhongLeixingId) {
-        this.loadDingdanList(true);
-      }
-      PopupService.checkAndShow(this, 'jiedanchi');
-    }
-  },
-
-  async loadShangpinLeixing() {
-    wx.showLoading({ title: '加载商品类型...' });
-    try {
-      const res = await request({
-        url: '/dingdan/dsqdhqddlx',
-        method: 'POST',
-        header: { 'content-type': 'application/json' }
-      });
-
-      if (res.statusCode === 200 && res.data) {
-        const data = res.data;
-        let list = [];
-        if (data.code === 200 || data.code === 0) {
-          if (data.data && Array.isArray(data.data.list)) {
-            list = data.data.list;
-          } else if (data.data && Array.isArray(data.data)) {
-            list = data.data;
-          } else if (Array.isArray(data.list)) {
-            list = data.list;
-          } else if (Array.isArray(data)) {
-            list = data;
-          }
-        }
-        const processedList = this.processTupianUrl(list);
-        this.setData({ 
-          shangpinleixing: processedList,
-          xuanzhongLeixingId: processedList[0]?.id || null
-        });
-        if (this.data.xuanzhongLeixingId) {
-          this.loadDingdanList(true);
-        }
-      } else {
-        wx.showToast({ title: res.data?.msg || '加载商品类型失败', icon: 'none', duration: 2000 });
-      }
-    } catch (error) {
-      console.error('加载商品类型失败:', error);
-      wx.showToast({ title: '网络错误，加载失败', icon: 'none', duration: 2000 });
-    } finally {
-      wx.hideLoading();
-    }
-  },
-
-  processTupianUrl(list) {
-    const ossUrl = app.globalData.ossImageUrl || '';
-    return list.map(item => ({
-      ...item,
-      full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http') ? ossUrl + item.tupian_url : (item.tupian_url || '/images/default-type.png')
-    }));
-  },
-
-  async selectLeixing(e) {
-    const now = Date.now();
-    if (now - this.data.lastSwitchTime < this.data.switchCooldown) {
-      wx.showToast({
-        title: `操作太快，请${Math.ceil((this.data.switchCooldown - (now - this.data.lastSwitchTime)) / 1000)}秒后再试`,
-        icon: 'none',
-        duration: 1500
-      });
-      return;
-    }
-    if (this.data.isSwitching) return;
-    const leixingId = e.currentTarget.dataset.id;
-    if (leixingId === this.data.xuanzhongLeixingId) return;
-    this.setData({ isSwitching: true, lastSwitchTime: now });
-    wx.showLoading({ title: '切换中...' });
-    try {
-      this.setData({
-        xuanzhongLeixingId: leixingId,
-        dingdanList: [],
-        page: 1,
-        hasMore: true
-      });
-      await this.loadDingdanList(true);
-    } catch (error) {
-      console.error('切换类型失败:', error);
-    } finally {
-      this.setData({ isSwitching: false });
-      wx.hideLoading();
-    }
-  },
-
-  async loadDingdanList(isRefresh = false) {
-    if (this.data.isLoading || !this.data.xuanzhongLeixingId) return;
-
-    const loadPage = isRefresh ? 1 : this.data.page;
-    if (!isRefresh && !this.data.hasMore) return;
-
-    this.setData({ 
-      isLoading: true,
-      isLoadingMore: !isRefresh
-    });
-
-    try {
-      const res = await request({
-        url: '/dingdan/ddhq',
-        method: 'POST',
-        data: {
-          leixing_id: this.data.xuanzhongLeixingId,
-          page: loadPage,
-          page_size: this.data.pageSize
-        }
-      });
-
-      this.setData({ 
-        isLoading: false,
-        isLoadingMore: false,
-        scrollViewRefreshing: false
-      });
-
-      if (res.data.code === 200 || res.data.code === 0) {
-        const newList = res.data.data.list || [];
-        const hasMore = res.data.data.has_more || false;
-
-        const processedList = newList.map(item => this.processDingdanItem(item));
-
-        const updatedList = isRefresh ? processedList : [...this.data.dingdanList, ...processedList];
-
-        updatedList.sort((a, b) => (b.creat_time || '').localeCompare(a.creat_time || ''));
-
-        this.setData({
-          dingdanList: updatedList,
-          page: loadPage,
-          hasMore: hasMore
-        });
-
-        if (isRefresh) {
-          this.setData({ lastRefreshTime: Date.now() });
-        }
-      } else {
-        wx.showToast({ title: res.data.msg || '加载失败', icon: 'none' });
-      }
-    } catch (error) {
-      console.error('加载订单失败:', error);
-      this.setData({ 
-        isLoading: false,
-        isLoadingMore: false,
-        scrollViewRefreshing: false
-      });
-      wx.showToast({ title: '网络请求失败', icon: 'none' });
-    }
-  },
-
-  processDingdanItem(item) {
-    const ossUrl = app.globalData.ossImageUrl || '';
-    let fullTupianUrl = '';
-    if (item.tupian) {
-      fullTupianUrl = !item.tupian.startsWith('http') ? ossUrl + item.tupian : item.tupian;
-    } else {
-      const leixing = this.data.shangpinleixing.find(l => l.id === item.leixing_id);
-      fullTupianUrl = leixing ? leixing.full_tupian_url : '/images/default-order.png';
-    }
-
-    const isZhiding = item.zhuangtai === 7;
-
-    let zhidingAvatar = '';
-    if (item.zhiding_avatar) {
-      zhidingAvatar = !item.zhiding_avatar.startsWith('http') ? ossUrl + item.zhiding_avatar : item.zhiding_avatar;
-    }
-    const zhidingNicheng = item.zhiding_nicheng || '';
-
-    return {
-      ...item,
-      full_tupian_url: fullTupianUrl,
-      isZhiding: isZhiding,
-      isPingtai: item.pingtai == 1,
-      isShangjia: item.pingtai == 2,
-      zhiding_avatar_full: zhidingAvatar,
-      zhiding_nicheng: zhidingNicheng
-    };
-  },
-
-  goToChongzhiPage(failureType, huiyuanId = null, requiredYajin = 0) {
-    let url = '/pages/dashouchongzhi/dashouchongzhi';
-    let params = {};
-    switch (failureType) {
-      case 'huiyuan':
-        params = { needScroll: '0', scrollTo: 'member' };
-        break;
-      case 'yajin':
-        params = { needScroll: '1', scrollTo: 'bottom', requiredYajin: requiredYajin };
-        break;
-      case 'jifen':
-        params = { needScroll: '1', scrollTo: 'bottom' };
-        break;
-    }
-    if (huiyuanId) params.huiyuanId = huiyuanId;
-    const queryString = Object.keys(params).map(key => `${key}=${encodeURIComponent(params[key])}`).join('&');
-    const fullUrl = `${url}?${queryString}`;
-    wx.navigateTo({
-      url: fullUrl,
-      fail: (err) => {
-        console.error('跳转失败:', err);
-        wx.showToast({ title: '跳转失败，请稍后重试', icon: 'none' });
-      }
-    });
-  },
-
-  async onQiangdanTap(e) {
-    const dingdanItem = e.currentTarget.dataset.item;
-    if (!dingdanItem) return;
-
-    if (!this.data.dashoustatus || this.data.dashoustatus != 1) {
-      wx.showToast({ title: '请先开启打手身份', icon: 'none' });
-      return;
-    }
-    if (this.data.zhuanghaoStatus != 1) {
-      wx.showToast({ title: '账号异常，无法接单', icon: 'none' });
-      return;
-    }
-    if (this.data.dashouzhuangtai != 1) {
-      wx.showToast({ title: '您有订单正在接待中', icon: 'none' });
-      return;
-    }
-    if (dingdanItem.isZhiding) {
-      if (!this.data.uid || this.data.uid != dingdanItem.zhiding_uid) {
-        wx.showToast({ title: '此订单为指定单', icon: 'none' });
-        return;
-      }
-    }
-    if (dingdanItem.yaoqiuleixing == 1) {
-      const hasHuiyuan = this.data.huiyuanList.some(h => h.huiyuanid == dingdanItem.huiyuan_id);
-      if (!hasHuiyuan) {
-        wx.showToast({ title: '未开通对应会员，无法抢单', icon: 'none', duration: 2000 });
-        setTimeout(() => this.goToChongzhiPage('huiyuan', dingdanItem.huiyuan_id), 500);
-        return;
-      }
-    }
-    if (dingdanItem.yaoqiuleixing == 2) {
-      if (this.data.yajin < dingdanItem.yajin) {
-        wx.showToast({ title: `押金不足，需${dingdanItem.yajin}`, icon: 'none', duration: 2000 });
-        setTimeout(() => this.goToChongzhiPage('yajin', null, dingdanItem.yajin), 500);
-        return;
-      }
-    }
-    if (this.data.jifen < 5) {
-      wx.showToast({ title: '积分不足，至少需要5积分', icon: 'none', duration: 2000 });
-      setTimeout(() => this.goToChongzhiPage('jifen'), 500);
-      return;
-    }
-
-    const that = this;
-    wx.showModal({
-      title: '确认抢单',
-      content: `确定要抢此订单吗？${dingdanItem.isZhiding ? '(指定订单)' : ''}`,
-      success: async function (res) {
-        if (res.confirm) {
-          wx.showLoading({ title: '抢单中...', mask: true });
-          try {
-            const qiangdanRes = await request({
-              url: '/dingdan/qiangdan',
-              method: 'POST',
-              data: { dingdan_id: dingdanItem.dingdan_id }
-            });
-            wx.hideLoading();
-            if (qiangdanRes.data.code === 200 || qiangdanRes.data.code === 0) {
-              that.showQiangdanSuccessEffect();
-              if (app.globalData) {
-                app.globalData.dashouzhuangtai = 0;
-                that.setData({ dashouzhuangtai: 0 });
-              }
-              const newList = that.data.dingdanList.filter(item => item.dingdan_id !== dingdanItem.dingdan_id);
-              that.setData({ dingdanList: newList });
-            } else {
-              wx.showToast({ title: qiangdanRes.data.msg || '抢单失败', icon: 'none' });
-            }
-          } catch (error) {
-            wx.hideLoading();
-            console.error('抢单请求失败:', error);
-            wx.showToast({ title: '网络错误，抢单失败', icon: 'none' });
-          }
-        }
-      }
-    });
-  },
-
-  showQiangdanSuccessEffect() {
-    wx.showToast({ title: '抢单成功！', icon: 'success', duration: 2000 });
-  },
-
-  onViewDetail(e) {
-    const { type, content } = e.currentTarget.dataset;
-    wx.showModal({
-      title: type === 'jieshao' ? '订单介绍' : '订单备注',
-      content: content,
-      showCancel: false,
-      confirmText: '知道了'
-    });
-  },
-
-  onReachBottom() {
-    const now = Date.now();
-    if (now - this.data.lastRefreshTime < this.data.refreshCooldown) {
-      wx.showToast({
-        title: `操作太快，请${Math.ceil((this.data.refreshCooldown - (now - this.data.lastRefreshTime)) / 1000)}秒后再试`,
-        icon: 'none',
-        duration: 1500
-      });
-      return;
-    }
-    if (this.data.isLoading || this.data.isLoadingMore) return;
-    if (this.data.hasMore && !this.data.isLoading && this.data.xuanzhongLeixingId) {
-      this.setData({ page: this.data.page + 1 });
-      this.loadDingdanList(false);
-    }
-  },
-
-  onPullDownRefresh() {
-    const now = Date.now();
-    if (now - this.data.lastRefreshTime < this.data.refreshCooldown) {
-      this.setData({ scrollViewRefreshing: false });
-      wx.showToast({
-        title: `操作太快，请${Math.ceil((this.data.refreshCooldown - (now - this.data.lastRefreshTime)) / 1000)}秒后再试`,
-        icon: 'none',
-        duration: 1500
-      });
-      return;
-    }
-    if (this.data.isLoading) {
-      this.setData({ scrollViewRefreshing: false });
-      return;
-    }
-    this.setData({ 
-      scrollViewRefreshing: true,
-      lastRefreshTime: now
-    });
-    if (this.data.xuanzhongLeixingId) {
-      this.setData({ page: 1, hasMore: true });
-      this.loadDingdanList(true);
-    } else {
-      this.setData({ scrollViewRefreshing: false });
-    }
-  },
-
-  goToDashouRegister() {
-    wx.navigateTo({
-      url: '/pages/dashouduan/dashouduan'
-    });
-  }
+// pages/order-pool/order-pool.js
+const app = getApp();
+import request from '../../utils/request.js';
+import PopupService from '../../services/popupService.js';
+
+Page({
+  data: {
+    // 1. 商品类型相关
+    shangpinleixing: [],
+    xuanzhongLeixingId: null,
+
+    // 2. 订单列表与分页相关
+    dingdanList: [],
+    page: 1,
+    pageSize: 10,
+    hasMore: true,
+    isLoading: false,
+
+    // 3. 全局状态字段
+    dashoustatus: null,
+    zhuanghaoStatus: null,
+    dashouzhuangtai: null,
+    uid: null,
+    huiyuanList: [],
+    yajin: 0,
+    jifen: 0,
+
+    // 4. 刷新控制字段
+    scrollViewRefreshing: false,
+    lastRefreshTime: 0,
+    refreshCooldown: 2000,
+    isLoadingMore: false,
+    
+    // 5. 切换类型冷却时间控制
+    lastSwitchTime: 0,
+    switchCooldown: 1500,
+    isSwitching: false,
+
+    // 6. 全局OSS地址
+    ossImageUrl: app.globalData.ossImageUrl || '',
+
+    // 7. 授权状态控制
+    showUnauthorized: false,
+    unauthorizedMsg: '您尚未开启此功能',
+  },
+
+  async onLoad(options) {
+    this.loadGlobalStatus();
+    this.checkAuthorization();
+  },
+  // 页面隐藏时清理弹窗视图
+  onHide: function () {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+        popupComp.cleanup();
+    }
+},
+  
+  onShow() {
+    this.registerNotificationComponent();
+    this.loadGlobalStatus();
+    this.checkAuthorization();
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  loadGlobalStatus() {
+    const globalData = app.globalData;
+    const dashoustatusCache = wx.getStorageSync('dashoustatus');
+    const dashoustatus = dashoustatusCache !== '' ? dashoustatusCache : null;
+
+    let zhuanghaoStatus = globalData.zhanghaoStatus;
+    if (zhuanghaoStatus === undefined || zhuanghaoStatus === null) {
+      zhuanghaoStatus = wx.getStorageSync('zhanghaoStatus');
+    }
+    
+    this.setData({
+      dashoustatus: dashoustatus,
+      zhuanghaoStatus: zhuanghaoStatus,
+      dashouzhuangtai: globalData.dashouzhuangtai,
+      uid: wx.getStorageSync('uid'),
+      huiyuanList: globalData.clumber || [],
+      yajin: globalData.yajin || 0,
+      jifen: globalData.jinfen || 0
+    });
+  },
+
+  checkAuthorization() {
+    const { dashoustatus, zhuanghaoStatus } = this.data;
+
+    const isDashouValid = (dashoustatus && dashoustatus == 1) || false;
+    const isZhuanghaoValid = (zhuanghaoStatus == 1);
+    
+    const isAuthorized = isDashouValid && isZhuanghaoValid;
+
+    if (!isAuthorized) {
+      this.setData({ showUnauthorized: true });
+      let msg = '';
+      if (!isDashouValid) msg = '您尚未开启身份';
+      this.setData({ unauthorizedMsg: msg || '无法使用抢单功能' });
+    } else {
+      this.setData({ showUnauthorized: false });
+      if (!this.data.shangpinleixing.length) {
+        this.loadShangpinLeixing();
+      } else if (this.data.xuanzhongLeixingId) {
+        this.loadDingdanList(true);
+      }
+      PopupService.checkAndShow(this, 'jiedanchi');
+    }
+  },
+
+  async loadShangpinLeixing() {
+    wx.showLoading({ title: '加载商品类型...' });
+    try {
+      const res = await request({
+        url: '/dingdan/dsqdhqddlx',
+        method: 'POST',
+        header: { 'content-type': 'application/json' }
+      });
+
+      if (res.statusCode === 200 && res.data) {
+        const data = res.data;
+        let list = [];
+        if (data.code === 200 || data.code === 0) {
+          if (data.data && Array.isArray(data.data.list)) {
+            list = data.data.list;
+          } else if (data.data && Array.isArray(data.data)) {
+            list = data.data;
+          } else if (Array.isArray(data.list)) {
+            list = data.list;
+          } else if (Array.isArray(data)) {
+            list = data;
+          }
+        }
+        const processedList = this.processTupianUrl(list);
+        this.setData({ 
+          shangpinleixing: processedList,
+          xuanzhongLeixingId: processedList[0]?.id || null
+        });
+        if (this.data.xuanzhongLeixingId) {
+          this.loadDingdanList(true);
+        }
+      } else {
+        wx.showToast({ title: res.data?.msg || '加载商品类型失败', icon: 'none', duration: 2000 });
+      }
+    } catch (error) {
+      console.error('加载商品类型失败:', error);
+      wx.showToast({ title: '网络错误，加载失败', icon: 'none', duration: 2000 });
+    } finally {
+      wx.hideLoading();
+    }
+  },
+
+  processTupianUrl(list) {
+    const ossUrl = app.globalData.ossImageUrl || '';
+    return list.map(item => ({
+      ...item,
+      full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http') ? ossUrl + item.tupian_url : (item.tupian_url || '/images/default-type.png')
+    }));
+  },
+
+  async selectLeixing(e) {
+    const now = Date.now();
+    if (now - this.data.lastSwitchTime < this.data.switchCooldown) {
+      wx.showToast({
+        title: `操作太快，请${Math.ceil((this.data.switchCooldown - (now - this.data.lastSwitchTime)) / 1000)}秒后再试`,
+        icon: 'none',
+        duration: 1500
+      });
+      return;
+    }
+    if (this.data.isSwitching) return;
+    const leixingId = e.currentTarget.dataset.id;
+    if (leixingId === this.data.xuanzhongLeixingId) return;
+    this.setData({ isSwitching: true, lastSwitchTime: now });
+    wx.showLoading({ title: '切换中...' });
+    try {
+      this.setData({
+        xuanzhongLeixingId: leixingId,
+        dingdanList: [],
+        page: 1,
+        hasMore: true
+      });
+      await this.loadDingdanList(true);
+    } catch (error) {
+      console.error('切换类型失败:', error);
+    } finally {
+      this.setData({ isSwitching: false });
+      wx.hideLoading();
+    }
+  },
+
+  async loadDingdanList(isRefresh = false) {
+    if (this.data.isLoading || !this.data.xuanzhongLeixingId) return;
+
+    const loadPage = isRefresh ? 1 : this.data.page;
+    if (!isRefresh && !this.data.hasMore) return;
+
+    this.setData({ 
+      isLoading: true,
+      isLoadingMore: !isRefresh
+    });
+
+    try {
+      const res = await request({
+        url: '/dingdan/ddhq',
+        method: 'POST',
+        data: {
+          leixing_id: this.data.xuanzhongLeixingId,
+          page: loadPage,
+          page_size: this.data.pageSize
+        }
+      });
+
+      this.setData({ 
+        isLoading: false,
+        isLoadingMore: false,
+        scrollViewRefreshing: false
+      });
+
+      if (res.data.code === 200 || res.data.code === 0) {
+        const newList = res.data.data.list || [];
+        const hasMore = res.data.data.has_more || false;
+
+        const processedList = newList.map(item => this.processDingdanItem(item));
+
+        const updatedList = isRefresh ? processedList : [...this.data.dingdanList, ...processedList];
+
+        updatedList.sort((a, b) => (b.creat_time || '').localeCompare(a.creat_time || ''));
+
+        this.setData({
+          dingdanList: updatedList,
+          page: loadPage,
+          hasMore: hasMore
+        });
+
+        if (isRefresh) {
+          this.setData({ lastRefreshTime: Date.now() });
+        }
+      } else {
+        wx.showToast({ title: res.data.msg || '加载失败', icon: 'none' });
+      }
+    } catch (error) {
+      console.error('加载订单失败:', error);
+      this.setData({ 
+        isLoading: false,
+        isLoadingMore: false,
+        scrollViewRefreshing: false
+      });
+      wx.showToast({ title: '网络请求失败', icon: 'none' });
+    }
+  },
+
+  processDingdanItem(item) {
+    const ossUrl = app.globalData.ossImageUrl || '';
+    let fullTupianUrl = '';
+    if (item.tupian) {
+      fullTupianUrl = !item.tupian.startsWith('http') ? ossUrl + item.tupian : item.tupian;
+    } else {
+      const leixing = this.data.shangpinleixing.find(l => l.id === item.leixing_id);
+      fullTupianUrl = leixing ? leixing.full_tupian_url : '/images/default-order.png';
+    }
+
+    const isZhiding = item.zhuangtai === 7;
+
+    let zhidingAvatar = '';
+    if (item.zhiding_avatar) {
+      zhidingAvatar = !item.zhiding_avatar.startsWith('http') ? ossUrl + item.zhiding_avatar : item.zhiding_avatar;
+    }
+    const zhidingNicheng = item.zhiding_nicheng || '';
+
+    return {
+      ...item,
+      full_tupian_url: fullTupianUrl,
+      isZhiding: isZhiding,
+      isPingtai: item.pingtai == 1,
+      isShangjia: item.pingtai == 2,
+      zhiding_avatar_full: zhidingAvatar,
+      zhiding_nicheng: zhidingNicheng
+    };
+  },
+
+  goToChongzhiPage(failureType, huiyuanId = null, requiredYajin = 0) {
+    let url = '/pages/fighter-recharge/fighter-recharge';
+    let params = {};
+    switch (failureType) {
+      case 'huiyuan':
+        params = { needScroll: '0', scrollTo: 'member' };
+        break;
+      case 'yajin':
+        params = { needScroll: '1', scrollTo: 'bottom', requiredYajin: requiredYajin };
+        break;
+      case 'jifen':
+        params = { needScroll: '1', scrollTo: 'bottom' };
+        break;
+    }
+    if (huiyuanId) params.huiyuanId = huiyuanId;
+    const queryString = Object.keys(params).map(key => `${key}=${encodeURIComponent(params[key])}`).join('&');
+    const fullUrl = `${url}?${queryString}`;
+    wx.navigateTo({
+      url: fullUrl,
+      fail: (err) => {
+        console.error('跳转失败:', err);
+        wx.showToast({ title: '跳转失败，请稍后重试', icon: 'none' });
+      }
+    });
+  },
+
+  async onQiangdanTap(e) {
+    const dingdanItem = e.currentTarget.dataset.item;
+    if (!dingdanItem) return;
+
+    if (!this.data.dashoustatus || this.data.dashoustatus != 1) {
+      wx.showToast({ title: '请先开启打手身份', icon: 'none' });
+      return;
+    }
+    if (this.data.zhuanghaoStatus != 1) {
+      wx.showToast({ title: '账号异常，无法接单', icon: 'none' });
+      return;
+    }
+    if (this.data.dashouzhuangtai != 1) {
+      wx.showToast({ title: '您有订单正在接待中', icon: 'none' });
+      return;
+    }
+    if (dingdanItem.isZhiding) {
+      if (!this.data.uid || this.data.uid != dingdanItem.zhiding_uid) {
+        wx.showToast({ title: '此订单为指定单', icon: 'none' });
+        return;
+      }
+    }
+    if (dingdanItem.yaoqiuleixing == 1) {
+      const hasHuiyuan = this.data.huiyuanList.some(h => h.huiyuanid == dingdanItem.huiyuan_id);
+      if (!hasHuiyuan) {
+        wx.showToast({ title: '未开通对应会员，无法抢单', icon: 'none', duration: 2000 });
+        setTimeout(() => this.goToChongzhiPage('huiyuan', dingdanItem.huiyuan_id), 500);
+        return;
+      }
+    }
+    if (dingdanItem.yaoqiuleixing == 2) {
+      if (this.data.yajin < dingdanItem.yajin) {
+        wx.showToast({ title: `押金不足，需${dingdanItem.yajin}`, icon: 'none', duration: 2000 });
+        setTimeout(() => this.goToChongzhiPage('yajin', null, dingdanItem.yajin), 500);
+        return;
+      }
+    }
+    if (this.data.jifen < 5) {
+      wx.showToast({ title: '积分不足，至少需要5积分', icon: 'none', duration: 2000 });
+      setTimeout(() => this.goToChongzhiPage('jifen'), 500);
+      return;
+    }
+
+    const that = this;
+    wx.showModal({
+      title: '确认抢单',
+      content: `确定要抢此订单吗？${dingdanItem.isZhiding ? '(指定订单)' : ''}`,
+      success: async function (res) {
+        if (res.confirm) {
+          wx.showLoading({ title: '抢单中...', mask: true });
+          try {
+            const qiangdanRes = await request({
+              url: '/dingdan/qiangdan',
+              method: 'POST',
+              data: { dingdan_id: dingdanItem.dingdan_id }
+            });
+            wx.hideLoading();
+            if (qiangdanRes.data.code === 200 || qiangdanRes.data.code === 0) {
+              that.showQiangdanSuccessEffect();
+              if (app.globalData) {
+                app.globalData.dashouzhuangtai = 0;
+                that.setData({ dashouzhuangtai: 0 });
+              }
+              const newList = that.data.dingdanList.filter(item => item.dingdan_id !== dingdanItem.dingdan_id);
+              that.setData({ dingdanList: newList });
+            } else {
+              wx.showToast({ title: qiangdanRes.data.msg || '抢单失败', icon: 'none' });
+            }
+          } catch (error) {
+            wx.hideLoading();
+            console.error('抢单请求失败:', error);
+            wx.showToast({ title: '网络错误，抢单失败', icon: 'none' });
+          }
+        }
+      }
+    });
+  },
+
+  showQiangdanSuccessEffect() {
+    wx.showToast({ title: '抢单成功！', icon: 'success', duration: 2000 });
+  },
+
+  onViewDetail(e) {
+    const { type, content } = e.currentTarget.dataset;
+    wx.showModal({
+      title: type === 'jieshao' ? '订单介绍' : '订单备注',
+      content: content,
+      showCancel: false,
+      confirmText: '知道了'
+    });
+  },
+
+  onReachBottom() {
+    const now = Date.now();
+    if (now - this.data.lastRefreshTime < this.data.refreshCooldown) {
+      wx.showToast({
+        title: `操作太快，请${Math.ceil((this.data.refreshCooldown - (now - this.data.lastRefreshTime)) / 1000)}秒后再试`,
+        icon: 'none',
+        duration: 1500
+      });
+      return;
+    }
+    if (this.data.isLoading || this.data.isLoadingMore) return;
+    if (this.data.hasMore && !this.data.isLoading && this.data.xuanzhongLeixingId) {
+      this.setData({ page: this.data.page + 1 });
+      this.loadDingdanList(false);
+    }
+  },
+
+  onPullDownRefresh() {
+    const now = Date.now();
+    if (now - this.data.lastRefreshTime < this.data.refreshCooldown) {
+      this.setData({ scrollViewRefreshing: false });
+      wx.showToast({
+        title: `操作太快，请${Math.ceil((this.data.refreshCooldown - (now - this.data.lastRefreshTime)) / 1000)}秒后再试`,
+        icon: 'none',
+        duration: 1500
+      });
+      return;
+    }
+    if (this.data.isLoading) {
+      this.setData({ scrollViewRefreshing: false });
+      return;
+    }
+    this.setData({ 
+      scrollViewRefreshing: true,
+      lastRefreshTime: now
+    });
+    if (this.data.xuanzhongLeixingId) {
+      this.setData({ page: 1, hasMore: true });
+      this.loadDingdanList(true);
+    } else {
+      this.setData({ scrollViewRefreshing: false });
+    }
+  },
+
+  goToDashouRegister() {
+    wx.navigateTo({
+      url: '/pages/fighter/fighter'
+    });
+  }
 });
\ No newline at end of file
diff --git a/pages/jiedanchi/jiedanchi.json b/pages/order-pool/order-pool.json
similarity index 100%
rename from pages/jiedanchi/jiedanchi.json
rename to pages/order-pool/order-pool.json
diff --git a/pages/jiedanchi/jiedanchi.wxml b/pages/order-pool/order-pool.wxml
similarity index 100%
rename from pages/jiedanchi/jiedanchi.wxml
rename to pages/order-pool/order-pool.wxml
diff --git a/pages/jiedanchi/jiedanchi.wxss b/pages/order-pool/order-pool.wxss
similarity index 98%
rename from pages/jiedanchi/jiedanchi.wxss
rename to pages/order-pool/order-pool.wxss
index 5784b03..863351b 100644
--- a/pages/jiedanchi/jiedanchi.wxss
+++ b/pages/order-pool/order-pool.wxss
@@ -8,7 +8,7 @@
     position: relative;
   }
   
-  /* ====== 授权提示页（机甲风格）====== */
+  /* 授权提示页 */
   .unauthorized-container {
     position: absolute;
     top: 0;
@@ -146,7 +146,7 @@
     100% { transform: translateX(100%) rotate(30deg); }
   }
   
-  /* ====== 原有样式（保持不变，仅略作调整以兼容提示页）====== */
+  /* 原有样式 */
   .leixing-quyu {
     padding: 30rpx 0 20rpx;
     background: linear-gradient(135deg, #ffffff 0%, #f8fafc 100%);
diff --git a/pages/order-pool2/order-pool2.js b/pages/order-pool2/order-pool2.js
new file mode 100644
index 0000000..5db9a92
--- /dev/null
+++ b/pages/order-pool2/order-pool2.js
@@ -0,0 +1,39 @@
+// pages/order-pool2/order-pool2.js
+Page({
+
+    data: {
+
+    },
+
+    onLoad(options) {
+
+    },
+
+    onReady() {
+
+    },
+
+    onShow() {
+
+    },
+
+    onHide() {
+
+    },
+
+    onUnload() {
+
+    },
+
+    onPullDownRefresh() {
+
+    },
+
+    onReachBottom() {
+
+    },
+
+    onShareAppMessage() {
+
+    }
+})
diff --git a/pages/peihuDingdan/peihuDingdan.json b/pages/order-pool2/order-pool2.json
similarity index 100%
rename from pages/peihuDingdan/peihuDingdan.json
rename to pages/order-pool2/order-pool2.json
diff --git a/pages/order-pool2/order-pool2.wxml b/pages/order-pool2/order-pool2.wxml
new file mode 100644
index 0000000..c6b4014
--- /dev/null
+++ b/pages/order-pool2/order-pool2.wxml
@@ -0,0 +1,2 @@
+<!--pages/order-pool2/order-pool2.wxml-->
+<text>pages/order-pool2/order-pool2.wxml</text>
\ No newline at end of file
diff --git a/pages/order-pool2/order-pool2.wxss b/pages/order-pool2/order-pool2.wxss
new file mode 100644
index 0000000..1c9293f
--- /dev/null
+++ b/pages/order-pool2/order-pool2.wxss
@@ -0,0 +1 @@
+/* pages/order-pool2/order-pool2.wxss */
\ No newline at end of file
diff --git a/pages/dingdan/dingdan.js b/pages/orders/orders.js
similarity index 90%
rename from pages/dingdan/dingdan.js
rename to pages/orders/orders.js
index 9e31b53..ebee8ba 100644
--- a/pages/dingdan/dingdan.js
+++ b/pages/orders/orders.js
@@ -1,287 +1,273 @@
-// pages/dingdan/dingdan.js
-const app = getApp()
-import request from '../../utils/request.js'
-
-Page({
-  data: {
-    // 订单状态tab配置
-    dingdanZhuangtaiTabs: [
-      { name: '全部', key: 'all', zhuangtaiList: [1, 2, 3, 4, 5, 6, 7, 8] },
-      { name: '已下单', key: 'yixiadan', zhuangtaiList: [1, 7] },
-      { name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2] },
-      { name: '争议订单', key: 'zhengyi', zhuangtaiList: [4, 5, 6] },
-      { name: '已完成', key: 'yiwancheng', zhuangtaiList: [3] },
-      { name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8] }
-    ],
-    
-    // 当前选中的tab索引
-    xuanzhongTabIndex: 0,
-    // 当前选中的tab的key
-    currentTabKey: 'all',
-    
-    // 每个tab对应的订单数据
-    dingdanShuju: {
-      all: { list: [], page: 1, hasMore: true, isLoading: false },
-      yixiadan: { list: [], page: 1, hasMore: true, isLoading: false },
-      jinxingzhong: { list: [], page: 1, hasMore: true, isLoading: false },
-      zhengyi: { list: [], page: 1, hasMore: true, isLoading: false },
-      yiwancheng: { list: [], page: 1, hasMore: true, isLoading: false },
-      jiesuanzhong: { list: [], page: 1, hasMore: true, isLoading: false }
-    },
-    
-    // 个人中心传递过来的type参数
-    gerenzhongxinType: '',
-    
-    // 是否显示加载更多
-    xianshiJiazaigengduo: false,
-    
-    // 页面加载状态
-    isLoading: true
-  },
-
-  onLoad(options) {
-    const type = options.type || ''
-    
-    wx.setNavigationBarTitle({
-      title: '我的订单'
-    })
-    
-    this.qingkongGerenzhongxinJishu(type)
-    
-    const tabIndex = this.yingsheTypeToTabIndex(type)
-    const tabKey = this.data.dingdanZhuangtaiTabs[tabIndex].key
-    
-    this.setData({
-      gerenzhongxinType: type,
-      xuanzhongTabIndex: tabIndex,
-      currentTabKey: tabKey,
-      isLoading: false
-    })
-    
-    this.jiazaiDingdanShuju(tabIndex)
-  },
-  onShow() {
-    // 原有代码...
-    
-    // 🆕 注册通知组件
-    this.registerNotificationComponent();
-},
-
-// 🆕 新增：注册通知组件
-registerNotificationComponent() {
-    const app = getApp();
-    const notificationComp = this.selectComponent('#global-notification');
-    
-    if (notificationComp && notificationComp.showNotification) {
-        console.log('🏪 商城页面注册通知组件');
-        app.globalData.globalNotification = {
-            show: (data) => notificationComp.showNotification(data),
-            hide: () => notificationComp.hideNotification()
-        };
-    }
-},
-
-
-  qingkongGerenzhongxinJishu(type) {
-    const jishuMap = {
-      'daifuwu': 'daifuwu',
-      'fuwuzhong': 'fuwuzhong',
-      'yiwancheng': 'yiwancheng',
-      'yituikuan': 'yituikuan'
-    }
-    
-    const jishuKey = jishuMap[type]
-    if (jishuKey && app.globalData.dingdanTiaoshu) {
-      app.globalData.dingdanTiaoshu[jishuKey] = 0
-    }
-  },
-
-  yingsheTypeToTabIndex(type) {
-    const yingsheMap = {
-      'daifuwu': 1,
-      'fuwuzhong': 2,
-      'yiwancheng': 4,
-      'yituikuan': 3
-    }
-    
-    return yingsheMap[type] || 0
-  },
-
-  switchDingdanTab(e) {
-    const tabIndex = e.currentTarget.dataset.index
-    if (tabIndex === this.data.xuanzhongTabIndex) return
-    
-    const tabKey = this.data.dingdanZhuangtaiTabs[tabIndex].key
-    
-    this.setData({
-      xuanzhongTabIndex: tabIndex,
-      currentTabKey: tabKey
-    })
-    
-    this.jiazaiDingdanShuju(tabIndex)
-  },
-
-  async jiazaiDingdanShuju(tabIndex, isLoadMore = false) {
-    const tab = this.data.dingdanZhuangtaiTabs[tabIndex]
-    const tabKey = tab.key
-    
-    const tabData = this.data.dingdanShuju[tabKey]
-    
-    const page = isLoadMore ? tabData.page + 1 : 1
-    
-    if (tabData.isLoading) return
-    
-    // 重置逻辑：如果不是加载更多，清空已有数据
-    if (!isLoadMore) {
-      this.setData({
-        [`dingdanShuju.${tabKey}.list`]: [],
-        [`dingdanShuju.${tabKey}.page`]: 1
-      })
-    }
-    
-    this.setData({
-      [`dingdanShuju.${tabKey}.isLoading`]: true
-    })
-    
-    wx.showLoading({
-      title: isLoadMore ? '加载更多...' : '加载订单...',
-      mask: true
-    })
-    
-    try {
-      const requestData = {
-        zhuangtai_list: tab.zhuangtaiList,
-        page: page,
-        page_size: 10
-      }
-      
-      
-      
-      const res = await request({
-        url: '/dingdan/dingdanhuoqu',
-        method: 'POST',
-        data: requestData,
-        header: {
-          'content-type': 'application/json'
-        }
-      })
-      
-      
-      
-      wx.hideLoading()
-      
-      // ✅ 关键修正：res是直接返回的数据对象，不是res.data
-      if (res && res.data.code === 0) {
-        // ✅ 关键修正：直接使用res.data.list
-        const newDingdanList = res.data.data.list || []
-        const hasMore = res.data.data.has_more || false
-        
-        
-        
-        // 处理图片URL，拼接完整路径
-        const processedList = newDingdanList.map(item => {
-          let tupianUrl = item.tupian || ''
-          
-          // 如果图片URL不是完整路径，拼接ossImageUrl
-          if (tupianUrl && !tupianUrl.startsWith('http')) {
-            const ossImageUrl = app.globalData.ossImageUrl || ''
-            tupianUrl = ossImageUrl + tupianUrl
-          }
-          
-          const zhuangtaiZh = this.getZhuangtaiZhongwen(item.zhuangtai)
-          
-          
-          return {
-            ...item,
-            tupian: tupianUrl,
-            zhuangtaiZh: zhuangtaiZh
-          }
-        })
-        
-        const currentList = this.data.dingdanShuju[tabKey].list
-        const updatedList = isLoadMore 
-          ? [...currentList, ...processedList]
-          : processedList
-        
-        this.setData({
-          [`dingdanShuju.${tabKey}.list`]: updatedList,
-          [`dingdanShuju.${tabKey}.page`]: page,
-          [`dingdanShuju.${tabKey}.hasMore`]: hasMore,
-          [`dingdanShuju.${tabKey}.isLoading`]: false,
-          xianshiJiazaigengduo: hasMore
-        })
-        
-      } else {
-        wx.showToast({
-          title: res ? (res.msg || '加载失败') : '请求失败',
-          icon: 'none',
-          duration: 2000
-        })
-        
-        this.setData({
-          [`dingdanShuju.${tabKey}.isLoading`]: false
-        })
-      }
-      
-    } catch (error) {
-      console.error('加载订单数据失败:', error)
-      wx.hideLoading()
-      wx.showToast({
-        title: '网络请求失败，请重试',
-        icon: 'none',
-        duration: 2000
-      })
-      
-      this.setData({
-        [`dingdanShuju.${tabKey}.isLoading`]: false
-      })
-    }
-  },
-
-  getZhuangtaiZhongwen(zhuangtai) {
-    const zhuangtaiMap = {
-      1: '已下单',
-      2: '进行中',
-      3: '已完成',
-      4: '退款中',
-      5: '已退款',
-      6: '退款失败',
-      7: '指定中',
-      8: '结算中'
-    }
-    
-    return zhuangtaiMap[zhuangtai] || '未知状态'
-  },
-
-  onReachBottom() {
-    const tabKey = this.data.currentTabKey
-    const tabData = this.data.dingdanShuju[tabKey]
-    
-    if (tabData.hasMore && !tabData.isLoading) {
-      const tabIndex = this.data.xuanzhongTabIndex
-      this.jiazaiDingdanShuju(tabIndex, true)
-    }
-  },
-
-  goToDingdanXiangqing(e) {
-    const dingdanItem = e.currentTarget.dataset.item
-    if (!dingdanItem) return
-    
-    const dingdanDataStr = encodeURIComponent(JSON.stringify(dingdanItem))
-    
-    wx.navigateTo({
-      url: `/pages/dingdanxiangqing/dingdanxiangqing?dingdanData=${dingdanDataStr}`
-    })
-  },
-
-  onImageError(e) {
-    const index = e.currentTarget.dataset.index
-    const tabKey = this.data.currentTabKey
-    
-    const defaultImage = app.globalData.lunbozhanwei || '/images/default.jpg'
-    
-    this.setData({
-      [`dingdanShuju.${tabKey}.list[${index}].tupian`]: defaultImage
-    })
-  }
+// pages/orders/orders.js
+const app = getApp()
+import request from '../../utils/request.js'
+
+Page({
+  data: {
+    // 订单状态tab配置
+    dingdanZhuangtaiTabs: [
+      { name: '全部', key: 'all', zhuangtaiList: [1, 2, 3, 4, 5, 6, 7, 8] },
+      { name: '已下单', key: 'yixiadan', zhuangtaiList: [1, 7] },
+      { name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2] },
+      { name: '争议订单', key: 'zhengyi', zhuangtaiList: [4, 5, 6] },
+      { name: '已完成', key: 'yiwancheng', zhuangtaiList: [3] },
+      { name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8] }
+    ],
+    
+    // 当前选中的tab索引
+    xuanzhongTabIndex: 0,
+    // 当前选中的tab的key
+    currentTabKey: 'all',
+    
+    // 每个tab对应的订单数据
+    dingdanShuju: {
+      all: { list: [], page: 1, hasMore: true, isLoading: false },
+      yixiadan: { list: [], page: 1, hasMore: true, isLoading: false },
+      jinxingzhong: { list: [], page: 1, hasMore: true, isLoading: false },
+      zhengyi: { list: [], page: 1, hasMore: true, isLoading: false },
+      yiwancheng: { list: [], page: 1, hasMore: true, isLoading: false },
+      jiesuanzhong: { list: [], page: 1, hasMore: true, isLoading: false }
+    },
+    
+    // 个人中心传递过来的type参数
+    gerenzhongxinType: '',
+    
+    // 是否显示加载更多
+    xianshiJiazaigengduo: false,
+    
+    // 页面加载状态
+    isLoading: true
+  },
+
+  onLoad(options) {
+    const type = options.type || ''
+    
+    wx.setNavigationBarTitle({
+      title: '我的订单'
+    })
+    
+    this.qingkongGerenzhongxinJishu(type)
+    
+    const tabIndex = this.yingsheTypeToTabIndex(type)
+    const tabKey = this.data.dingdanZhuangtaiTabs[tabIndex].key
+    
+    this.setData({
+      gerenzhongxinType: type,
+      xuanzhongTabIndex: tabIndex,
+      currentTabKey: tabKey,
+      isLoading: false
+    })
+    
+    this.jiazaiDingdanShuju(tabIndex)
+  },
+  onShow() {
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  qingkongGerenzhongxinJishu(type) {
+    const jishuMap = {
+      'daifuwu': 'daifuwu',
+      'fuwuzhong': 'fuwuzhong',
+      'yiwancheng': 'yiwancheng',
+      'yituikuan': 'yituikuan'
+    }
+    
+    const jishuKey = jishuMap[type]
+    if (jishuKey && app.globalData.dingdanTiaoshu) {
+      app.globalData.dingdanTiaoshu[jishuKey] = 0
+    }
+  },
+
+  yingsheTypeToTabIndex(type) {
+    const yingsheMap = {
+      'daifuwu': 1,
+      'fuwuzhong': 2,
+      'yiwancheng': 4,
+      'yituikuan': 3
+    }
+    
+    return yingsheMap[type] || 0
+  },
+
+  switchDingdanTab(e) {
+    const tabIndex = e.currentTarget.dataset.index
+    if (tabIndex === this.data.xuanzhongTabIndex) return
+    
+    const tabKey = this.data.dingdanZhuangtaiTabs[tabIndex].key
+    
+    this.setData({
+      xuanzhongTabIndex: tabIndex,
+      currentTabKey: tabKey
+    })
+    
+    this.jiazaiDingdanShuju(tabIndex)
+  },
+
+  async jiazaiDingdanShuju(tabIndex, isLoadMore = false) {
+    const tab = this.data.dingdanZhuangtaiTabs[tabIndex]
+    const tabKey = tab.key
+    
+    const tabData = this.data.dingdanShuju[tabKey]
+    
+    const page = isLoadMore ? tabData.page + 1 : 1
+    
+    if (tabData.isLoading) return
+    
+    // 重置逻辑：如果不是加载更多，清空已有数据
+    if (!isLoadMore) {
+      this.setData({
+        [`dingdanShuju.${tabKey}.list`]: [],
+        [`dingdanShuju.${tabKey}.page`]: 1
+      })
+    }
+    
+    this.setData({
+      [`dingdanShuju.${tabKey}.isLoading`]: true
+    })
+    
+    wx.showLoading({
+      title: isLoadMore ? '加载更多...' : '加载订单...',
+      mask: true
+    })
+    
+    try {
+      const requestData = {
+        zhuangtai_list: tab.zhuangtaiList,
+        page: page,
+        page_size: 10
+      }
+
+      const res = await request({
+        url: '/dingdan/dingdanhuoqu',
+        method: 'POST',
+        data: requestData,
+        header: {
+          'content-type': 'application/json'
+        }
+      })
+
+      wx.hideLoading()
+      
+      // 关键修正：res是直接返回的数据对象
+      if (res && res.data.code === 0) {
+        const newDingdanList = res.data.data.list || []
+        const hasMore = res.data.data.has_more || false
+
+        // 处理图片URL，拼接完整路径
+        const processedList = newDingdanList.map(item => {
+          let tupianUrl = item.tupian || ''
+          
+          // 如果图片URL不是完整路径，拼接ossImageUrl
+          if (tupianUrl && !tupianUrl.startsWith('http')) {
+            const ossImageUrl = app.globalData.ossImageUrl || ''
+            tupianUrl = ossImageUrl + tupianUrl
+          }
+          
+          const zhuangtaiZh = this.getZhuangtaiZhongwen(item.zhuangtai)
+
+          return {
+            ...item,
+            tupian: tupianUrl,
+            zhuangtaiZh: zhuangtaiZh
+          }
+        })
+        
+        const currentList = this.data.dingdanShuju[tabKey].list
+        const updatedList = isLoadMore 
+          ? [...currentList, ...processedList]
+          : processedList
+        
+        this.setData({
+          [`dingdanShuju.${tabKey}.list`]: updatedList,
+          [`dingdanShuju.${tabKey}.page`]: page,
+          [`dingdanShuju.${tabKey}.hasMore`]: hasMore,
+          [`dingdanShuju.${tabKey}.isLoading`]: false,
+          xianshiJiazaigengduo: hasMore
+        })
+        
+      } else {
+        wx.showToast({
+          title: res ? (res.msg || '加载失败') : '请求失败',
+          icon: 'none',
+          duration: 2000
+        })
+        
+        this.setData({
+          [`dingdanShuju.${tabKey}.isLoading`]: false
+        })
+      }
+      
+    } catch (error) {
+      console.error('加载订单数据失败:', error)
+      wx.hideLoading()
+      wx.showToast({
+        title: '网络请求失败，请重试',
+        icon: 'none',
+        duration: 2000
+      })
+      
+      this.setData({
+        [`dingdanShuju.${tabKey}.isLoading`]: false
+      })
+    }
+  },
+
+  getZhuangtaiZhongwen(zhuangtai) {
+    const zhuangtaiMap = {
+      1: '已下单',
+      2: '进行中',
+      3: '已完成',
+      4: '退款中',
+      5: '已退款',
+      6: '退款失败',
+      7: '指定中',
+      8: '结算中'
+    }
+    
+    return zhuangtaiMap[zhuangtai] || '未知状态'
+  },
+
+  onReachBottom() {
+    const tabKey = this.data.currentTabKey
+    const tabData = this.data.dingdanShuju[tabKey]
+    
+    if (tabData.hasMore && !tabData.isLoading) {
+      const tabIndex = this.data.xuanzhongTabIndex
+      this.jiazaiDingdanShuju(tabIndex, true)
+    }
+  },
+
+  goToDingdanXiangqing(e) {
+    const dingdanItem = e.currentTarget.dataset.item
+    if (!dingdanItem) return
+    
+    const dingdanDataStr = encodeURIComponent(JSON.stringify(dingdanItem))
+    
+    wx.navigateTo({
+      url: `/pages/order-detail/order-detail?dingdanData=${dingdanDataStr}`
+    })
+  },
+
+  onImageError(e) {
+    const index = e.currentTarget.dataset.index
+    const tabKey = this.data.currentTabKey
+    
+    const defaultImage = app.globalData.lunbozhanwei || '/images/default.jpg'
+    
+    this.setData({
+      [`dingdanShuju.${tabKey}.list[${index}].tupian`]: defaultImage
+    })
+  }
 })
\ No newline at end of file
diff --git a/pages/sjddxq/sjddxq.json b/pages/orders/orders.json
similarity index 100%
rename from pages/sjddxq/sjddxq.json
rename to pages/orders/orders.json
diff --git a/pages/dingdan/dingdan.wxml b/pages/orders/orders.wxml
similarity index 95%
rename from pages/dingdan/dingdan.wxml
rename to pages/orders/orders.wxml
index 9d64425..a296496 100644
--- a/pages/dingdan/dingdan.wxml
+++ b/pages/orders/orders.wxml
@@ -1,111 +1,111 @@
-<!--pages/dingdan/dingdan.wxml-->
-<view class="dingdan-page">
-  
-  <!-- 订单状态tab区域 -->
-  <scroll-view 
-    class="dingdan-tabs-scroll"
-    scroll-x="true"
-    scroll-with-animation="true"
-  >
-    <view class="dingdan-tabs-container">
-      <block wx:for="{{dingdanZhuangtaiTabs}}" wx:key="key">
-        <view 
-          class="dingdan-tab-item {{index === xuanzhongTabIndex ? 'tab-active' : ''}}"
-          bindtap="switchDingdanTab"
-          data-index="{{index}}"
-        >
-          <text class="tab-text">{{item.name}}</text>
-          <view class="tab-active-line" wx:if="{{index === xuanzhongTabIndex}}"></view>
-        </view>
-      </block>
-    </view>
-  </scroll-view>
-  
-  <!-- 订单列表区域 -->
-  <view class="dingdan-list-container">
-    
-    <!-- 页面加载中 -->
-    <view class="loading-container" wx:if="{{isLoading}}">
-      <view class="loading-spinner"></view>
-      <text class="loading-text">加载中...</text>
-    </view>
-    
-    <!-- 空状态 -->
-    <view 
-      class="empty-container" 
-      wx:if="{{!isLoading && dingdanShuju[currentTabKey].list.length === 0}}"
-    >
-      <image 
-        class="empty-image" 
-        src="/images/empty-order.png" 
-        mode="aspectFit"
-      ></image>
-      <text class="empty-text">暂无订单</text>
-      <text class="empty-subtext">快去下单体验服务吧</text>
-    </view>
-    
-    <!-- 订单列表 -->
-    <block wx:if="{{!isLoading && dingdanShuju[currentTabKey].list.length > 0}}">
-      <block wx:for="{{dingdanShuju[currentTabKey].list}}" wx:key="dingdanId">
-        <view 
-          class="dingdan-card"
-          bindtap="goToDingdanXiangqing"
-          data-item="{{item}}"
-        >
-          <!-- 商品图片 -->
-          <view class="dingdan-card-left">
-            <image 
-              class="dingdan-image"
-              src="{{item.tupian}}"
-              mode="aspectFill"
-              binderror="onImageError"
-              data-index="{{index}}"
-            ></image>
-          </view>
-          
-          <!-- 订单信息 -->
-          <view class="dingdan-card-center">
-            <view class="dingdan-jieshao">
-              {{item.jieshao || '暂无描述'}}
-            </view>
-          </view>
-          
-          <!-- 订单状态和价格 -->
-          <view class="dingdan-card-right">
-            <!-- 订单状态 -->
-            <view class="dingdan-zhuangtai">
-              {{item.zhuangtaiZh || '未知状态'}}
-            </view>
-            
-            <!-- 订单价格 -->
-            <view class="dingdan-jine">
-              <text class="jine-symbol">¥</text>
-              <text class="jine-number">{{item.jine || '0.00'}}</text>
-            </view>
-          </view>
-        </view>
-      </block>
-    </block>
-    
-    <!-- 加载更多提示 -->
-    <view 
-      class="load-more-container" 
-      wx:if="{{xianshiJiazaigengduo && !isLoading && dingdanShuju[currentTabKey].list.length > 0}}"
-    >
-      <view class="load-more-line"></view>
-      <text class="load-more-text">上拉加载更多</text>
-      <view class="load-more-line"></view>
-    </view>
-    
-    <!-- 没有更多提示 -->
-    <view 
-      class="no-more-container" 
-      wx:if="{{!xianshiJiazaigengduo && !isLoading && dingdanShuju[currentTabKey].list.length > 0}}"
-    >
-      <text class="no-more-text">没有更多订单了</text>
-    </view>
-    
-  </view>
-  
-</view>
-<global-notification id="global-notification" />
+<!--pages/orders/orders.wxml-->
+<view class="dingdan-page">
+  
+  <!-- 订单状态tab区域 -->
+  <scroll-view 
+    class="dingdan-tabs-scroll"
+    scroll-x="true"
+    scroll-with-animation="true"
+  >
+    <view class="dingdan-tabs-container">
+      <block wx:for="{{dingdanZhuangtaiTabs}}" wx:key="key">
+        <view 
+          class="dingdan-tab-item {{index === xuanzhongTabIndex ? 'tab-active' : ''}}"
+          bindtap="switchDingdanTab"
+          data-index="{{index}}"
+        >
+          <text class="tab-text">{{item.name}}</text>
+          <view class="tab-active-line" wx:if="{{index === xuanzhongTabIndex}}"></view>
+        </view>
+      </block>
+    </view>
+  </scroll-view>
+  
+  <!-- 订单列表区域 -->
+  <view class="dingdan-list-container">
+    
+    <!-- 页面加载中 -->
+    <view class="loading-container" wx:if="{{isLoading}}">
+      <view class="loading-spinner"></view>
+      <text class="loading-text">加载中...</text>
+    </view>
+    
+    <!-- 空状态 -->
+    <view 
+      class="empty-container" 
+      wx:if="{{!isLoading && dingdanShuju[currentTabKey].list.length === 0}}"
+    >
+      <image 
+        class="empty-image" 
+        src="/images/empty-order.png" 
+        mode="aspectFit"
+      ></image>
+      <text class="empty-text">暂无订单</text>
+      <text class="empty-subtext">快去下单体验服务吧</text>
+    </view>
+    
+    <!-- 订单列表 -->
+    <block wx:if="{{!isLoading && dingdanShuju[currentTabKey].list.length > 0}}">
+      <block wx:for="{{dingdanShuju[currentTabKey].list}}" wx:key="dingdanId">
+        <view 
+          class="dingdan-card"
+          bindtap="goToDingdanXiangqing"
+          data-item="{{item}}"
+        >
+          <!-- 商品图片 -->
+          <view class="dingdan-card-left">
+            <image 
+              class="dingdan-image"
+              src="{{item.tupian}}"
+              mode="aspectFill"
+              binderror="onImageError"
+              data-index="{{index}}"
+            ></image>
+          </view>
+          
+          <!-- 订单信息 -->
+          <view class="dingdan-card-center">
+            <view class="dingdan-jieshao">
+              {{item.jieshao || '暂无描述'}}
+            </view>
+          </view>
+          
+          <!-- 订单状态和价格 -->
+          <view class="dingdan-card-right">
+            <!-- 订单状态 -->
+            <view class="dingdan-zhuangtai">
+              {{item.zhuangtaiZh || '未知状态'}}
+            </view>
+            
+            <!-- 订单价格 -->
+            <view class="dingdan-jine">
+              <text class="jine-symbol">¥</text>
+              <text class="jine-number">{{item.jine || '0.00'}}</text>
+            </view>
+          </view>
+        </view>
+      </block>
+    </block>
+    
+    <!-- 加载更多提示 -->
+    <view 
+      class="load-more-container" 
+      wx:if="{{xianshiJiazaigengduo && !isLoading && dingdanShuju[currentTabKey].list.length > 0}}"
+    >
+      <view class="load-more-line"></view>
+      <text class="load-more-text">上拉加载更多</text>
+      <view class="load-more-line"></view>
+    </view>
+    
+    <!-- 没有更多提示 -->
+    <view 
+      class="no-more-container" 
+      wx:if="{{!xianshiJiazaigengduo && !isLoading && dingdanShuju[currentTabKey].list.length > 0}}"
+    >
+      <text class="no-more-text">没有更多订单了</text>
+    </view>
+    
+  </view>
+  
+</view>
+<global-notification id="global-notification" />
diff --git a/pages/dingdan/dingdan.wxss b/pages/orders/orders.wxss
similarity index 66%
rename from pages/dingdan/dingdan.wxss
rename to pages/orders/orders.wxss
index afb2316..32f9505 100644
--- a/pages/dingdan/dingdan.wxss
+++ b/pages/orders/orders.wxss
@@ -1,262 +1,190 @@
-/* pages/dingdan/dingdan.wxss */
-
-.dingdan-page {
-    min-height: 100vh;
-    background-color: #f8f9fa;
-    padding-bottom: 20rpx;
-  }
-  
-  .dingdan-tabs-scroll {
-    width: 100%;
-    height: 90rpx;
-    white-space: nowrap;
-    background-color: #ffffff;
-    border-bottom: 1rpx solid #f0f0f0;
-    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.03);
-  }
-  
-  .dingdan-tabs-container {
-    display: flex;
-    align-items: center;
-    height: 100%;
-    padding: 0 20rpx;
-  }
-  
-  .dingdan-tab-item {
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 60rpx;
-    padding: 0 30rpx;
-    margin-right: 20rpx;
-    border-radius: 30rpx;
-    background-color: #f5f5f5;
-    color: #666666;
-    font-size: 28rpx;
-    transition: all 0.3s ease;
-    position: relative;
-    flex-shrink: 0;
-  }
-  
-  .dingdan-tab-item:last-child {
-    margin-right: 0;
-  }
-  
-  .dingdan-tab-item.tab-active {
-    background-color: #e8f5e9;
-    color: #2e7d32;
-    font-weight: 500;
-    box-shadow: 0 4rpx 12rpx rgba(46, 125, 50, 0.1);
-  }
-  
-  .tab-active-line {
-    width: 40rpx;
-    height: 4rpx;
-    background-color: #4caf50;
-    border-radius: 2rpx;
-    margin-top: 6rpx;
-    animation: fadeIn 0.3s ease;
-  }
-  
-  @keyframes fadeIn {
-    from { opacity: 0; transform: scale(0.8); }
-    to { opacity: 1; transform: scale(1); }
-  }
-  
-  .tab-text {
-    font-weight: 400;
-  }
-  
-  .dingdan-list-container {
-    padding: 20rpx;
-  }
-  
-  .loading-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 400rpx;
-  }
-  
-  .loading-spinner {
-    width: 60rpx;
-    height: 60rpx;
-    border: 6rpx solid #e0e0e0;
-    border-top-color: #4caf50;
-    border-radius: 50%;
-    animation: spin 1s linear infinite;
-    margin-bottom: 20rpx;
-  }
-  
-  @keyframes spin {
-    from { transform: rotate(0deg); }
-    to { transform: rotate(360deg); }
-  }
-  
-  .loading-text {
-    font-size: 28rpx;
-    color: #999999;
-  }
-  
-  .empty-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 500rpx;
-    padding-top: 80rpx;
-  }
-  
-  .empty-image {
-    width: 200rpx;
-    height: 200rpx;
-    margin-bottom: 30rpx;
-    opacity: 0.6;
-  }
-  
-  .empty-text {
-    font-size: 32rpx;
-    color: #999999;
-    margin-bottom: 10rpx;
-  }
-  
-  .empty-subtext {
-    font-size: 26rpx;
-    color: #cccccc;
-  }
-  
-  .dingdan-card {
-    display: flex;
-    align-items: center;
-    background-color: #ffffff;
-    border-radius: 16rpx;
-    padding: 24rpx;
-    margin-bottom: 20rpx;
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
-    transition: transform 0.2s ease, box-shadow 0.2s ease;
-  }
-  
-  .dingdan-card:active {
-    transform: translateY(-2rpx);
-    box-shadow: 0 6rpx 24rpx rgba(0, 0, 0, 0.08);
-  }
-  
-  .dingdan-card-left {
-    flex-shrink: 0;
-    margin-right: 24rpx;
-  }
-  
-  .dingdan-image {
-    width: 160rpx;
-    height: 160rpx;
-    border-radius: 12rpx;
-    background-color: #f5f5f5;
-  }
-  
-  .dingdan-card-center {
-    flex: 1;
-    height: 160rpx;
-    display: flex;
-    align-items: flex-start;
-  }
-  
-  .dingdan-jieshao {
-    font-size: 28rpx;
-    line-height: 40rpx;
-    color: #333333;
-    font-weight: 400;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 3;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  
-  .dingdan-card-right {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-    justify-content: space-between;
-    height: 160rpx;
-    margin-left: 20rpx;
-  }
-  
-  .dingdan-zhuangtai {
-    font-size: 24rpx;
-    color: #ff6b6b;
-    font-weight: 500;
-    padding: 6rpx 16rpx;
-    border-radius: 20rpx;
-    background-color: #fff5f5;
-    white-space: nowrap;
-  }
-  
-  /* ✅ 修正后的价格样式 - 简单明了 */
-  .dingdan-jine {
-    display: flex;
-    align-items: center; /* 垂直居中 */
-  }
-  
-  .jine-symbol {
-    font-size: 28rpx;
-    color: #333333;
-    font-weight: 500;
-    margin-right: 4rpx; /* 添加右边距，让符号和数字有间隔 */
-  }
-  
-  .jine-number {
-    font-size: 32rpx; /* 整数和小数一样大 */
-    color: #333333;
-    font-weight: 600;
-  }
-  
-  .load-more-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 40rpx 0;
-  }
-  
-  .load-more-line {
-    width: 80rpx;
-    height: 1rpx;
-    background-color: #e0e0e0;
-    margin: 0 20rpx;
-  }
-  
-  .load-more-text {
-    font-size: 26rpx;
-    color: #999999;
-    white-space: nowrap;
-  }
-  
-  .no-more-container {
-    text-align: center;
-    padding: 40rpx 0;
-  }
-  
-  .no-more-text {
-    font-size: 26rpx;
-    color: #cccccc;
-  }
-  
-  @media (max-width: 375px) {
-    .dingdan-image {
-      width: 140rpx;
-      height: 140rpx;
-    }
-    
-    .dingdan-card-center {
-      height: 140rpx;
-    }
-    
-    .dingdan-card-right {
-      height: 140rpx;
-    }
-    
-    .jine-number {
-      font-size: 30rpx;
-    }
+/* pages/orders/orders.wxss */
+
+.dingdan-page {
+    background-color: #f8f9fa;
+    padding-bottom: 20rpx;
+  }
+  
+  .dingdan-tabs-scroll {
+    width: 100%;
+    height: 90rpx;
+    white-space: nowrap;
+    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.03);
+  }
+  
+  .dingdan-tabs-container {
+    display: flex;
+    align-items: center;
+    height: 100%;
+    padding: 0 20rpx;
+  }
+  
+  .dingdan-tab-item {
+    position: relative;
+  }
+  
+  .dingdan-tab-item:last-child {
+    margin-right: 0;
+  }
+  
+  /* .dingdan-tab-item.tab-active 已由全局 .tab-capsule--active 覆盖 */
+  
+  .tab-active-line {
+    width: 40rpx;
+    height: 4rpx;
+    background-color: #4caf50;
+    border-radius: 2rpx;
+    margin-top: 6rpx;
+    animation: fadeIn 0.3s ease;
+  }
+  
+  @keyframes fadeIn {
+    from { opacity: 0; transform: scale(0.8); }
+    to { opacity: 1; transform: scale(1); }
+  }
+
+  .tab-text {
+    font-weight: 400;
+  }
+
+  .dingdan-list-container {
+    padding: 20rpx;
+  }
+  
+  .loading-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 400rpx;
+  }
+  
+  .loading-spinner {
+    border: 6rpx solid #e0e0e0;
+    border-top-color: #4caf50;
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 20rpx;
+  }
+
+  .loading-text {
+    font-size: 28rpx;
+    color: #999999;
+  }
+  
+  .empty-container {
+    height: 500rpx;
+    padding-top: 80rpx;
+  }
+  
+  .empty-image {
+    opacity: 0.6;
+  }
+  
+  .empty-text {
+    font-size: 32rpx;
+    color: #999999;
+  }
+
+  .dingdan-card {
+    display: flex;
+    align-items: center;
+    border-radius: 16rpx;
+    padding: 24rpx;
+    margin-bottom: 20rpx;
+    transition: transform 0.2s ease, box-shadow 0.2s ease;
+  }
+  
+  .dingdan-card:active {
+    transform: translateY(-2rpx);
+    box-shadow: 0 6rpx 24rpx rgba(0, 0, 0, 0.08);
+  }
+  
+  .dingdan-card-left {
+    flex-shrink: 0;
+    margin-right: 24rpx;
+  }
+  
+  .dingdan-image {
+    width: 160rpx;
+    height: 160rpx;
+    border-radius: 12rpx;
+    background-color: #f5f5f5;
+  }
+  
+  .dingdan-card-center {
+    flex: 1;
+    height: 160rpx;
+    display: flex;
+    align-items: flex-start;
+  }
+  
+  .dingdan-jieshao {
+    font-size: 28rpx;
+    line-height: 40rpx;
+    color: #333333;
+    font-weight: 400;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 3;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  
+  .dingdan-card-right {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    justify-content: space-between;
+    height: 160rpx;
+    margin-left: 20rpx;
+  }
+
+  /* 价格样式 */
+  .dingdan-jine {
+    display: flex;
+    align-items: center; /* 垂直居中 */
+  }
+  
+  .jine-symbol {
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+    margin-right: 4rpx; /* 添加右边距，让符号和数字有间隔 */
+  }
+  
+  .jine-number {
+    font-size: 32rpx; /* 整数和小数一样大 */
+    color: #333333;
+    font-weight: 600;
+  }
+
+  .load-more-line {
+    width: 80rpx;
+    height: 1rpx;
+    background-color: #e0e0e0;
+    margin: 0 20rpx;
+  }
+  
+  .load-more-text {
+    white-space: nowrap;
+  }
+
+  @media (max-width: 375px) {
+    .dingdan-image {
+      width: 140rpx;
+      height: 140rpx;
+    }
+    
+    .dingdan-card-center {
+      height: 140rpx;
+    }
+    
+    .dingdan-card-right {
+      height: 140rpx;
+    }
+    
+    .jine-number {
+      font-size: 30rpx;
+    }
   }
\ No newline at end of file
diff --git a/pages/peihuDingdan/peihuDingdan.wxml b/pages/peihuDingdan/peihuDingdan.wxml
deleted file mode 100644
index 003210f..0000000
--- a/pages/peihuDingdan/peihuDingdan.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!--pages/peihuDingdan/peihuDingdan.wxml-->
-<text>pages/peihuDingdan/peihuDingdan.wxml</text>
\ No newline at end of file
diff --git a/pages/peihuDingdan/peihuDingdan.wxss b/pages/peihuDingdan/peihuDingdan.wxss
deleted file mode 100644
index 17e5091..0000000
--- a/pages/peihuDingdan/peihuDingdan.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pages/peihuDingdan/peihuDingdan.wxss */
\ No newline at end of file
diff --git a/pages/cfss/components/fakuan-list/fakuan-list.js b/pages/penalty/components/fakuan-list/fakuan-list.js
similarity index 100%
rename from pages/cfss/components/fakuan-list/fakuan-list.js
rename to pages/penalty/components/fakuan-list/fakuan-list.js
diff --git a/pages/penalty/components/fakuan-list/fakuan-list.json b/pages/penalty/components/fakuan-list/fakuan-list.json
new file mode 100644
index 0000000..49f6b4d
--- /dev/null
+++ b/pages/penalty/components/fakuan-list/fakuan-list.json
@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        "fakuan-pay": "/pages/penalty/components/fakuan-pay/fakuan-pay"
+    }
+}
\ No newline at end of file
diff --git a/pages/cfss/components/fakuan-list/fakuan-list.wxml b/pages/penalty/components/fakuan-list/fakuan-list.wxml
similarity index 100%
rename from pages/cfss/components/fakuan-list/fakuan-list.wxml
rename to pages/penalty/components/fakuan-list/fakuan-list.wxml
diff --git a/pages/cfss/components/fakuan-list/fakuan-list.wxss b/pages/penalty/components/fakuan-list/fakuan-list.wxss
similarity index 100%
rename from pages/cfss/components/fakuan-list/fakuan-list.wxss
rename to pages/penalty/components/fakuan-list/fakuan-list.wxss
diff --git a/pages/cfss/components/fakuan-pay/fakuan-pay.js b/pages/penalty/components/fakuan-pay/fakuan-pay.js
similarity index 100%
rename from pages/cfss/components/fakuan-pay/fakuan-pay.js
rename to pages/penalty/components/fakuan-pay/fakuan-pay.js
diff --git a/pages/cfss/components/fakuan-pay/fakuan-pay.json b/pages/penalty/components/fakuan-pay/fakuan-pay.json
similarity index 100%
rename from pages/cfss/components/fakuan-pay/fakuan-pay.json
rename to pages/penalty/components/fakuan-pay/fakuan-pay.json
diff --git a/pages/cfss/components/fakuan-pay/fakuan-pay.wxml b/pages/penalty/components/fakuan-pay/fakuan-pay.wxml
similarity index 100%
rename from pages/cfss/components/fakuan-pay/fakuan-pay.wxml
rename to pages/penalty/components/fakuan-pay/fakuan-pay.wxml
diff --git a/pages/cfss/components/fakuan-pay/fakuan-pay.wxss b/pages/penalty/components/fakuan-pay/fakuan-pay.wxss
similarity index 100%
rename from pages/cfss/components/fakuan-pay/fakuan-pay.wxss
rename to pages/penalty/components/fakuan-pay/fakuan-pay.wxss
diff --git a/pages/cfss/components/jifen-list/jifen-list.js b/pages/penalty/components/jifen-list/jifen-list.js
similarity index 100%
rename from pages/cfss/components/jifen-list/jifen-list.js
rename to pages/penalty/components/jifen-list/jifen-list.js
diff --git a/pages/cfss/components/jifen-list/jifen-list.json b/pages/penalty/components/jifen-list/jifen-list.json
similarity index 100%
rename from pages/cfss/components/jifen-list/jifen-list.json
rename to pages/penalty/components/jifen-list/jifen-list.json
diff --git a/pages/cfss/components/jifen-list/jifen-list.wxml b/pages/penalty/components/jifen-list/jifen-list.wxml
similarity index 100%
rename from pages/cfss/components/jifen-list/jifen-list.wxml
rename to pages/penalty/components/jifen-list/jifen-list.wxml
diff --git a/pages/cfss/components/jifen-list/jifen-list.wxss b/pages/penalty/components/jifen-list/jifen-list.wxss
similarity index 100%
rename from pages/cfss/components/jifen-list/jifen-list.wxss
rename to pages/penalty/components/jifen-list/jifen-list.wxss
diff --git a/pages/cfss/cfss/cfss.js b/pages/penalty/penalty/penalty.js
similarity index 95%
rename from pages/cfss/cfss/cfss.js
rename to pages/penalty/penalty/penalty.js
index abdec80..467d977 100644
--- a/pages/cfss/cfss/cfss.js
+++ b/pages/penalty/penalty/penalty.js
@@ -1,100 +1,100 @@
-// pages/cfss/cfss.js
-import request from '../../../utils/request.js';   // 向上4级就是根目录
-// 如果有 COS：
-
-const app = getApp();
-
-Page({
-  data: {
-    // 统计数字（由接口 /yonghu/cffktjhq 返回）
-    stats: {
-      fakuan: { total: 0, daijiaona: 0, shensuzhong: 0, yijiaona: 0, yibohui: 0 },
-      jifen:  { total: 0, daichuli: 0, yichuli: 0, daichuli_0: 0, shensuzhong_3: 0, yichufa_1: 0, yibohui_2: 0 }
-    },
-
-    // 当前选中的主标签：'fakuan' 或 'jifen'
-    activeTab: 'fakuan',
-
-    // 子标签状态值
-    activeFakuanStatus: 1,    // 罚款默认展示“待缴纳”
-    activeJifenStatus: 0,     // 积分默认展示“待处理”
-
-    // 搜索关键词（订单号）
-    searchDingdan: '',
-
-    // 刷新触发器，传给子组件
-    trigger: {
-      fakuan: 0,
-      jifen: 0
-    }
-  },
-
-  onLoad() {
-    this.fetchTongji();
-  },
-
-  onShow() {
-    // 每次显示页面都重新拉取统计，确保数字最新
-    this.fetchTongji();
-  },
-
-  // 获取综合统计
-  async fetchTongji() {
-    try {
-      const res = await request({
-        url: '/yonghu/cffktjhq',
-        method: 'POST'
-      });
-      if (res.statusCode === 200 && res.data.code === 0) {
-        this.setData({ stats: res.data.data });
-      }
-    } catch (error) {
-      console.error('获取处罚统计失败', error);
-    }
-  },
-
-  // 切换主Tab（罚款 / 积分）
-  switchMainTab(e) {
-    const tab = e.currentTarget.dataset.tab;
-    if (tab === this.data.activeTab) return;
-    this.setData({ activeTab: tab });
-  },
-
-  // 切换罚款状态子标签
-  switchFakuanStatus(e) {
-    const status = Number(e.currentTarget.dataset.status);
-    if (status === this.data.activeFakuanStatus) return;
-    this.setData({ activeFakuanStatus: status });
-    this.bumpTrigger('fakuan');     // 通知罚款列表组件刷新
-  },
-
-  // 切换积分状态子标签
-  switchJifenStatus(e) {
-    const status = Number(e.currentTarget.dataset.status);
-    if (status === this.data.activeJifenStatus) return;
-    this.setData({ activeJifenStatus: status });
-    this.bumpTrigger('jifen');      // 通知积分列表组件刷新
-  },
-
-  // 搜索输入
-  onSearchInput(e) {
-    this.setData({ searchDingdan: e.detail.value });
-  },
-
-  // 执行搜索（按键盘搜索按钮或点击搜索图标）
-  onSearchConfirm() {
-    this.bumpTrigger(this.data.activeTab);
-  },
-
-  // 清空搜索关键字
-  clearSearch() {
-    this.setData({ searchDingdan: '' });
-    this.bumpTrigger(this.data.activeTab);
-  },
-
-  // 递增触发器，子组件通过 observer 响应
-  bumpTrigger(tab) {
-    const key = `trigger.${tab}`;
-    this.setData({ [key]: this.data.trigger[tab] + 1 });
-  }
+// pages/penalty/penalty.js
+import request from '../../../utils/request.js';   // 向上4级就是根目录
+// 如果有 COS：
+
+const app = getApp();
+
+Page({
+  data: {
+    // 统计数字（由接口 /yonghu/cffktjhq 返回）
+    stats: {
+      fakuan: { total: 0, daijiaona: 0, shensuzhong: 0, yijiaona: 0, yibohui: 0 },
+      jifen:  { total: 0, daichuli: 0, yichuli: 0, daichuli_0: 0, shensuzhong_3: 0, yichufa_1: 0, yibohui_2: 0 }
+    },
+
+    // 当前选中的主标签：'fakuan' 或 'jifen'
+    activeTab: 'fakuan',
+
+    // 子标签状态值
+    activeFakuanStatus: 1,    // 罚款默认展示“待缴纳”
+    activeJifenStatus: 0,     // 积分默认展示“待处理”
+
+    // 搜索关键词（订单号）
+    searchDingdan: '',
+
+    // 刷新触发器，传给子组件
+    trigger: {
+      fakuan: 0,
+      jifen: 0
+    }
+  },
+
+  onLoad() {
+    this.fetchTongji();
+  },
+
+  onShow() {
+    // 每次显示页面都重新拉取统计，确保数字最新
+    this.fetchTongji();
+  },
+
+  // 获取综合统计
+  async fetchTongji() {
+    try {
+      const res = await request({
+        url: '/yonghu/cffktjhq',
+        method: 'POST'
+      });
+      if (res.statusCode === 200 && res.data.code === 0) {
+        this.setData({ stats: res.data.data });
+      }
+    } catch (error) {
+      console.error('获取处罚统计失败', error);
+    }
+  },
+
+  // 切换主Tab（罚款 / 积分）
+  switchMainTab(e) {
+    const tab = e.currentTarget.dataset.tab;
+    if (tab === this.data.activeTab) return;
+    this.setData({ activeTab: tab });
+  },
+
+  // 切换罚款状态子标签
+  switchFakuanStatus(e) {
+    const status = Number(e.currentTarget.dataset.status);
+    if (status === this.data.activeFakuanStatus) return;
+    this.setData({ activeFakuanStatus: status });
+    this.bumpTrigger('fakuan');     // 通知罚款列表组件刷新
+  },
+
+  // 切换积分状态子标签
+  switchJifenStatus(e) {
+    const status = Number(e.currentTarget.dataset.status);
+    if (status === this.data.activeJifenStatus) return;
+    this.setData({ activeJifenStatus: status });
+    this.bumpTrigger('jifen');      // 通知积分列表组件刷新
+  },
+
+  // 搜索输入
+  onSearchInput(e) {
+    this.setData({ searchDingdan: e.detail.value });
+  },
+
+  // 执行搜索（按键盘搜索按钮或点击搜索图标）
+  onSearchConfirm() {
+    this.bumpTrigger(this.data.activeTab);
+  },
+
+  // 清空搜索关键字
+  clearSearch() {
+    this.setData({ searchDingdan: '' });
+    this.bumpTrigger(this.data.activeTab);
+  },
+
+  // 递增触发器，子组件通过 observer 响应
+  bumpTrigger(tab) {
+    const key = `trigger.${tab}`;
+    this.setData({ [key]: this.data.trigger[tab] + 1 });
+  }
 });
\ No newline at end of file
diff --git a/pages/cfss/cfss/cfss.json b/pages/penalty/penalty/penalty.json
similarity index 56%
rename from pages/cfss/cfss/cfss.json
rename to pages/penalty/penalty/penalty.json
index 4ca406b..df84999 100644
--- a/pages/cfss/cfss/cfss.json
+++ b/pages/penalty/penalty/penalty.json
@@ -1,10 +1,10 @@
-{
-    "usingComponents": {
-      "fakuan-list": "/pages/cfss/components/fakuan-list/fakuan-list",
-      "jifen-list": "/pages/cfss/components/jifen-list/jifen-list"
-    },
-    "navigationBarTitleText": "处罚中心",
-    "navigationBarBackgroundColor": "#ffffff",
-    "navigationBarTextStyle": "black",
-    "backgroundColor": "#f7f8fa"
+{
+    "usingComponents": {
+      "fakuan-list": "/pages/penalty/components/fakuan-list/fakuan-list",
+      "jifen-list": "/pages/penalty/components/jifen-list/jifen-list"
+    },
+    "navigationBarTitleText": "处罚中心",
+    "navigationBarBackgroundColor": "#ffffff",
+    "navigationBarTextStyle": "black",
+    "backgroundColor": "#f7f8fa"
   }
\ No newline at end of file
diff --git a/pages/cfss/cfss/cfss.wxml b/pages/penalty/penalty/penalty.wxml
similarity index 96%
rename from pages/cfss/cfss/cfss.wxml
rename to pages/penalty/penalty/penalty.wxml
index 03e8517..fcc9811 100644
--- a/pages/cfss/cfss/cfss.wxml
+++ b/pages/penalty/penalty/penalty.wxml
@@ -1,68 +1,68 @@
-<!-- pages/cfss/cfss.wxml -->
-<view class="page-container">
-  <!-- 统计卡片 -->
-  <view class="stats-card">
-    <view class="stats-number-row">
-      <view class="number-block">
-        <text class="big-num green">{{ stats.fakuan.daijiaona }}</text>
-        <text class="num-label">待缴罚款</text>
-      </view>
-      <view class="number-block">
-        <text class="big-num orange">{{ stats.jifen.daichuli }}</text>
-        <text class="num-label">待处理积分</text>
-      </view>
-    </view>
-    <view class="stats-detail-row">
-      <text>罚款：已缴{{ stats.fakuan.yijiaona }} · 申诉中{{ stats.fakuan.shensuzhong }} · 成功{{ stats.fakuan.yibohui }}</text>
-      <text>积分：已处理{{ stats.jifen.yichuli }}</text>
-    </view>
-  </view>
-
-  <!-- 主Tab -->
-  <view class="tab-row">
-    <view class="tab-item {{ activeTab === 'fakuan' ? 'active' : '' }}" bindtap="switchMainTab" data-tab="fakuan">
-       罚款
-    </view>
-    <view class="tab-item {{ activeTab === 'jifen' ? 'active' : '' }}" bindtap="switchMainTab" data-tab="jifen">
-       积分处罚
-    </view>
-  </view>
-
-  <!-- 子状态标签（横向滑动） -->
-  <block wx:if="{{ activeTab === 'fakuan' }}">
-    <scroll-view class="sub-tabs" scroll-x enable-flex>
-      <view class="sub-tag {{ activeFakuanStatus === 1 ? 'sub-active' : '' }}" bindtap="switchFakuanStatus" data-status="1">待缴纳 {{ stats.fakuan.daijiaona }}</view>
-      <view class="sub-tag {{ activeFakuanStatus === 3 ? 'sub-active' : '' }}" bindtap="switchFakuanStatus" data-status="3">申诉中 {{ stats.fakuan.shensuzhong }}</view>
-      <view class="sub-tag {{ activeFakuanStatus === 2 ? 'sub-active' : '' }}" bindtap="switchFakuanStatus" data-status="2">已缴纳 {{ stats.fakuan.yijiaona }}</view>
-      <view class="sub-tag {{ activeFakuanStatus === 4 ? 'sub-active' : '' }}" bindtap="switchFakuanStatus" data-status="4">申诉成功 {{ stats.fakuan.yibohui }}</view>
-    </scroll-view>
-  </block>
-  <block wx:else>
-    <scroll-view class="sub-tabs" scroll-x enable-flex>
-      <view class="sub-tag {{ activeJifenStatus === 0 ? 'sub-active' : '' }}" bindtap="switchJifenStatus" data-status="0">待处理 {{ stats.jifen.daichuli }}</view>
-      <view class="sub-tag {{ activeJifenStatus === 1 ? 'sub-active' : '' }}" bindtap="switchJifenStatus" data-status="1">已处理 {{ stats.jifen.yichuli }}</view>
-    </scroll-view>
-  </block>
-
-  <!-- 搜索栏 -->
-  <view class="search-bar">
-    <input class="search-input" placeholder="输入订单号搜索" value="{{ searchDingdan }}" bindinput="onSearchInput" bindconfirm="onSearchConfirm" confirm-type="search"/>
-    <view class="search-btn" bindtap="onSearchConfirm">搜索</view>
-    <view wx:if="{{ searchDingdan }}" class="clear-btn" bindtap="clearSearch">✕</view>
-  </view>
-
-  <!-- 列表区域（动态显示对应组件） -->
-  <view wx:if="{{ activeTab === 'fakuan' }}" class="list-area">
-    <fakuan-list
-      status="{{ activeFakuanStatus }}"
-      searchDingdan="{{ searchDingdan }}"
-      trigger="{{ trigger.fakuan }}"
-    />
-  </view>
-  <view wx:else class="list-area">
-    <jifen-list
-      status="{{ activeJifenStatus }}"
-      trigger="{{ trigger.jifen }}"
-    />
-  </view>
+<!-- pages/penalty/penalty.wxml -->
+<view class="page-container">
+  <!-- 统计卡片 -->
+  <view class="stats-card">
+    <view class="stats-number-row">
+      <view class="number-block">
+        <text class="big-num green">{{ stats.fakuan.daijiaona }}</text>
+        <text class="num-label">待缴罚款</text>
+      </view>
+      <view class="number-block">
+        <text class="big-num orange">{{ stats.jifen.daichuli }}</text>
+        <text class="num-label">待处理积分</text>
+      </view>
+    </view>
+    <view class="stats-detail-row">
+      <text>罚款：已缴{{ stats.fakuan.yijiaona }} · 申诉中{{ stats.fakuan.shensuzhong }} · 成功{{ stats.fakuan.yibohui }}</text>
+      <text>积分：已处理{{ stats.jifen.yichuli }}</text>
+    </view>
+  </view>
+
+  <!-- 主Tab -->
+  <view class="tab-row">
+    <view class="tab-item {{ activeTab === 'fakuan' ? 'active' : '' }}" bindtap="switchMainTab" data-tab="fakuan">
+       罚款
+    </view>
+    <view class="tab-item {{ activeTab === 'jifen' ? 'active' : '' }}" bindtap="switchMainTab" data-tab="jifen">
+       积分处罚
+    </view>
+  </view>
+
+  <!-- 子状态标签（横向滑动） -->
+  <block wx:if="{{ activeTab === 'fakuan' }}">
+    <scroll-view class="sub-tabs" scroll-x enable-flex>
+      <view class="sub-tag {{ activeFakuanStatus === 1 ? 'sub-active' : '' }}" bindtap="switchFakuanStatus" data-status="1">待缴纳 {{ stats.fakuan.daijiaona }}</view>
+      <view class="sub-tag {{ activeFakuanStatus === 3 ? 'sub-active' : '' }}" bindtap="switchFakuanStatus" data-status="3">申诉中 {{ stats.fakuan.shensuzhong }}</view>
+      <view class="sub-tag {{ activeFakuanStatus === 2 ? 'sub-active' : '' }}" bindtap="switchFakuanStatus" data-status="2">已缴纳 {{ stats.fakuan.yijiaona }}</view>
+      <view class="sub-tag {{ activeFakuanStatus === 4 ? 'sub-active' : '' }}" bindtap="switchFakuanStatus" data-status="4">申诉成功 {{ stats.fakuan.yibohui }}</view>
+    </scroll-view>
+  </block>
+  <block wx:else>
+    <scroll-view class="sub-tabs" scroll-x enable-flex>
+      <view class="sub-tag {{ activeJifenStatus === 0 ? 'sub-active' : '' }}" bindtap="switchJifenStatus" data-status="0">待处理 {{ stats.jifen.daichuli }}</view>
+      <view class="sub-tag {{ activeJifenStatus === 1 ? 'sub-active' : '' }}" bindtap="switchJifenStatus" data-status="1">已处理 {{ stats.jifen.yichuli }}</view>
+    </scroll-view>
+  </block>
+
+  <!-- 搜索栏 -->
+  <view class="search-bar">
+    <input class="search-input" placeholder="输入订单号搜索" value="{{ searchDingdan }}" bindinput="onSearchInput" bindconfirm="onSearchConfirm" confirm-type="search"/>
+    <view class="search-btn" bindtap="onSearchConfirm">搜索</view>
+    <view wx:if="{{ searchDingdan }}" class="clear-btn" bindtap="clearSearch">✕</view>
+  </view>
+
+  <!-- 列表区域（动态显示对应组件） -->
+  <view wx:if="{{ activeTab === 'fakuan' }}" class="list-area">
+    <fakuan-list
+      status="{{ activeFakuanStatus }}"
+      searchDingdan="{{ searchDingdan }}"
+      trigger="{{ trigger.fakuan }}"
+    />
+  </view>
+  <view wx:else class="list-area">
+    <jifen-list
+      status="{{ activeJifenStatus }}"
+      trigger="{{ trigger.jifen }}"
+    />
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/cfss/cfss/cfss.wxss b/pages/penalty/penalty/penalty.wxss
similarity index 93%
rename from pages/cfss/cfss/cfss.wxss
rename to pages/penalty/penalty/penalty.wxss
index 4cd5d19..4a57b00 100644
--- a/pages/cfss/cfss/cfss.wxss
+++ b/pages/penalty/penalty/penalty.wxss
@@ -1,121 +1,121 @@
-/* pages/cfss/cfss.wxss */
-page { background: #f7f8fa; font-family: -apple-system, BlinkMacSystemFont, sans-serif; }
-
-.page-container { padding-bottom: 30rpx; }
-
-/* 统计卡片 */
-.stats-card {
-  margin: 24rpx 28rpx;
-  padding: 30rpx 24rpx;
-  background: #fff;
-  border-radius: 24rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.04);
-}
-.stats-number-row {
-  display: flex;
-  justify-content: space-around;
-  margin-bottom: 20rpx;
-}
-.number-block {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-.big-num {
-  font-size: 56rpx;
-  font-weight: 700;
-}
-.green { color: #2E7D32; }
-.orange { color: #E67E22; }
-.num-label {
-  font-size: 24rpx;
-  color: #888;
-  margin-top: 8rpx;
-}
-.stats-detail-row {
-  border-top: 1rpx solid #eee;
-  padding-top: 18rpx;
-}
-.stats-detail-row text {
-  display: block;
-  font-size: 22rpx;
-  color: #aaa;
-  margin-bottom: 4rpx;
-}
-
-/* 主Tab */
-.tab-row {
-  display: flex;
-  margin: 16rpx 28rpx;
-  background: #fff;
-  border-radius: 18rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 6rpx rgba(0,0,0,0.02);
-}
-.tab-item {
-  flex: 1;
-  text-align: center;
-  padding: 24rpx 0;
-  font-size: 28rpx;
-  color: #666;
-  transition: 0.2s;
-}
-.tab-item.active {
-  color: #2E7D32;
-  font-weight: 600;
-  background: #F0F9F0;
-}
-
-/* 子状态标签 */
-.sub-tabs {
-  white-space: nowrap;
-  margin: 8rpx 28rpx 16rpx;
-}
-.sub-tag {
-  display: inline-block;
-  padding: 10rpx 26rpx;
-  margin-right: 14rpx;
-  background: #fff;
-  border-radius: 30rpx;
-  font-size: 24rpx;
-  color: #888;
-  box-shadow: 0 1rpx 4rpx rgba(0,0,0,0.02);
-}
-.sub-tag.sub-active {
-  background: #E8F5E9;
-  color: #2E7D32;
-  font-weight: 600;
-}
-
-/* 搜索栏 */
-.search-bar {
-  display: flex;
-  align-items: center;
-  margin: 16rpx 28rpx;
-  background: #fff;
-  border-radius: 20rpx;
-  padding: 12rpx 22rpx;
-  box-shadow: 0 1rpx 6rpx rgba(0,0,0,0.02);
-}
-.search-input {
-  flex: 1;
-  font-size: 26rpx;
-  color: #333;
-}
-.search-btn {
-  margin-left: 18rpx;
-  padding: 12rpx 30rpx;
-  background: #2E7D32;
-  color: #fff;
-  border-radius: 16rpx;
-  font-size: 24rpx;
-}
-.clear-btn {
-  margin-left: 16rpx;
-  font-size: 30rpx;
-  color: #aaa;
-}
-
-.list-area {
-  margin-top: 10rpx;
+/* pages/penalty/penalty.wxss */
+page { background: #f7f8fa; font-family: -apple-system, BlinkMacSystemFont, sans-serif; }
+
+.page-container { padding-bottom: 30rpx; }
+
+/* 统计卡片 */
+.stats-card {
+  margin: 24rpx 28rpx;
+  padding: 30rpx 24rpx;
+  background: #fff;
+  border-radius: 24rpx;
+  box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.04);
+}
+.stats-number-row {
+  display: flex;
+  justify-content: space-around;
+  margin-bottom: 20rpx;
+}
+.number-block {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.big-num {
+  font-size: 56rpx;
+  font-weight: 700;
+}
+.green { color: #2E7D32; }
+.orange { color: #E67E22; }
+.num-label {
+  font-size: 24rpx;
+  color: #888;
+  margin-top: 8rpx;
+}
+.stats-detail-row {
+  border-top: 1rpx solid #eee;
+  padding-top: 18rpx;
+}
+.stats-detail-row text {
+  display: block;
+  font-size: 22rpx;
+  color: #aaa;
+  margin-bottom: 4rpx;
+}
+
+/* 主Tab */
+.tab-row {
+  display: flex;
+  margin: 16rpx 28rpx;
+  background: #fff;
+  border-radius: 18rpx;
+  overflow: hidden;
+  box-shadow: 0 2rpx 6rpx rgba(0,0,0,0.02);
+}
+.tab-item {
+  flex: 1;
+  text-align: center;
+  padding: 24rpx 0;
+  font-size: 28rpx;
+  color: #666;
+  transition: 0.2s;
+}
+.tab-item.active {
+  color: #2E7D32;
+  font-weight: 600;
+  background: #F0F9F0;
+}
+
+/* 子状态标签 */
+.sub-tabs {
+  white-space: nowrap;
+  margin: 8rpx 28rpx 16rpx;
+}
+.sub-tag {
+  display: inline-block;
+  padding: 10rpx 26rpx;
+  margin-right: 14rpx;
+  background: #fff;
+  border-radius: 30rpx;
+  font-size: 24rpx;
+  color: #888;
+  box-shadow: 0 1rpx 4rpx rgba(0,0,0,0.02);
+}
+.sub-tag.sub-active {
+  background: #E8F5E9;
+  color: #2E7D32;
+  font-weight: 600;
+}
+
+/* 搜索栏 */
+.search-bar {
+  display: flex;
+  align-items: center;
+  margin: 16rpx 28rpx;
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 12rpx 22rpx;
+  box-shadow: 0 1rpx 6rpx rgba(0,0,0,0.02);
+}
+.search-input {
+  flex: 1;
+  font-size: 26rpx;
+  color: #333;
+}
+.search-btn {
+  margin-left: 18rpx;
+  padding: 12rpx 30rpx;
+  background: #2E7D32;
+  color: #fff;
+  border-radius: 16rpx;
+  font-size: 24rpx;
+}
+.clear-btn {
+  margin-left: 16rpx;
+  font-size: 30rpx;
+  color: #aaa;
+}
+
+.list-area {
+  margin-top: 10rpx;
 }
\ No newline at end of file
diff --git a/pages/jiedanchi2/jiedanchi2.js b/pages/pick-user/pick-user.js
similarity index 89%
rename from pages/jiedanchi2/jiedanchi2.js
rename to pages/pick-user/pick-user.js
index 0e33db9..1e3bd36 100644
--- a/pages/jiedanchi2/jiedanchi2.js
+++ b/pages/pick-user/pick-user.js
@@ -1,66 +1,66 @@
-// pages/jiedanchi2/jiedanchi2.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
+// pages/pick-user/pick-user.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
 })
\ No newline at end of file
diff --git a/pages/xuanren/xuanren.json b/pages/pick-user/pick-user.json
similarity index 100%
rename from pages/xuanren/xuanren.json
rename to pages/pick-user/pick-user.json
diff --git a/pages/xuanren/xuanren.wxml b/pages/pick-user/pick-user.wxml
similarity index 100%
rename from pages/xuanren/xuanren.wxml
rename to pages/pick-user/pick-user.wxml
diff --git a/pages/pick-user/pick-user.wxss b/pages/pick-user/pick-user.wxss
new file mode 100644
index 0000000..1fe63ab
--- /dev/null
+++ b/pages/pick-user/pick-user.wxss
@@ -0,0 +1 @@
+/* pages/pick-user/pick-user.wxss */
\ No newline at end of file
diff --git a/pages/haibao/haibao.js b/pages/poster/poster.js
similarity index 96%
rename from pages/haibao/haibao.js
rename to pages/poster/poster.js
index 3985d30..cb57a14 100644
--- a/pages/haibao/haibao.js
+++ b/pages/poster/poster.js
@@ -1,281 +1,281 @@
-// pages/haibao/haibao.js
-import request from '../../utils/request.js';
-
-const app = getApp();
-
-Page({
-  data: {
-    qrcodeUrl: '',
-    isLoading: false,
-    showPosterCanvas: false,
-    posterImageTemp: '',
-    avatarUrl: '',
-    uid: '',
-    nickName: '',
-  },
-
-  onLoad() {
-    this.loadQRCodeFromCache();
-    this.loadUserInfo();
-  },
-
-  onShow() {
-    this.registerNotificationComponent();
-  },
-
-  registerNotificationComponent() {
-    const notificationComp = this.selectComponent('#global-notification');
-    if (notificationComp && notificationComp.showNotification) {
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  loadQRCodeFromCache() {
-    try {
-      const relativeUrl = wx.getStorageSync('haibao_url');
-      if (relativeUrl) {
-        const fullUrl = this.getFullImageUrl(relativeUrl);
-        this.setData({ qrcodeUrl: fullUrl });
-      } else {
-        this.setData({ qrcodeUrl: '' });
-      }
-    } catch (error) {
-      console.error('读取缓存失败', error);
-    }
-  },
-
-  loadUserInfo() {
-    const touxiang = wx.getStorageSync('touxiang');
-    const ossUrl = app.globalData.ossImageUrl || '';
-    const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg');
-    let avatarUrl = defaultAvatar;
-    if (touxiang && typeof touxiang === 'string' && touxiang.trim() !== '') {
-      avatarUrl = this.getFullImageUrl(touxiang);
-    }
-    const uid = wx.getStorageSync('uid') || '';
-    let nickName = app.globalData.nicheng || wx.getStorageSync('nicheng') || '管事';
-    this.setData({ avatarUrl, uid, nickName });
-  },
-
-  getFullImageUrl(url) {
-    if (!url) return '';
-    const ossUrl = app.globalData.ossImageUrl || '';
-    return url.startsWith('http') ? url : ossUrl + url;
-  },
-
-  refreshQRCode() {
-    if (this.data.isLoading) return;
-    this.setData({ isLoading: true });
-    request({
-      url: '/peizhi/guanshiewm',
-      method: 'POST',
-    }).then(res => {
-      if (res.data && res.data.code === 0) {
-        const relativeUrl = res.data.data.url;
-        if (relativeUrl) {
-          wx.setStorageSync('haibao_url', relativeUrl);
-          const fullUrl = this.getFullImageUrl(relativeUrl);
-          this.setData({ qrcodeUrl: fullUrl });
-          wx.showToast({ title: '获取成功', icon: 'success' });
-        } else {
-          wx.showToast({ title: '返回数据异常', icon: 'none' });
-        }
-      } else {
-        wx.showToast({ title: res.data.msg || '获取失败', icon: 'none' });
-      }
-    }).catch(err => {
-      console.error('获取海报失败', err);
-      wx.showToast({ title: '网络错误', icon: 'none' });
-    }).finally(() => {
-      this.setData({ isLoading: false });
-    });
-  },
-
-  // 🔥【修改】保存二维码到相册（先下载网络图片）
-  saveToAlbum() {
-    if (!this.data.qrcodeUrl) {
-      wx.showToast({ title: '暂无二维码', icon: 'none' });
-      return;
-    }
-    
-    wx.showLoading({ title: '保存中...', mask: true });
-    wx.downloadFile({
-      url: this.data.qrcodeUrl,
-      success: (res) => {
-        wx.hideLoading();
-        if (res.statusCode === 200) {
-          // 调用已有的保存函数（传入临时路径）
-          this.downloadAndSave(res.tempFilePath);
-        } else {
-          wx.showToast({ title: '下载失败', icon: 'none' });
-        }
-      },
-      fail: (err) => {
-        wx.hideLoading();
-        console.error('下载二维码失败', err);
-        wx.showToast({ title: '下载失败', icon: 'none' });
-      }
-    });
-  },
-
-  generateMyPoster() {
-    if (!this.data.qrcodeUrl) {
-      wx.showToast({ title: '请先生成二维码', icon: 'none' });
-      return;
-    }
-
-    wx.showLoading({ title: '生成海报中...', mask: true });
-
-    const ossUrl = app.globalData.ossImageUrl || '';
-    const bgUrl = ossUrl + 'beijing/haibaobeijing.jpg';
-    const urls = [bgUrl, this.data.qrcodeUrl, this.data.avatarUrl];
-
-    const promises = urls.map(url => this.loadImage(url));
-    Promise.all(promises)
-      .then((images) => {
-        wx.hideLoading();
-        this.setData({ showPosterCanvas: true }, () => {
-          setTimeout(() => {
-            this.drawPoster(images[0], images[1], images[2]);
-          }, 200);
-        });
-      })
-      .catch((err) => {
-        wx.hideLoading();
-        wx.showToast({ title: '图片加载失败', icon: 'none' });
-        console.error('图片加载失败', err);
-      });
-  },
-
-  loadImage(url) {
-    return new Promise((resolve, reject) => {
-      wx.getImageInfo({
-        src: url,
-        success: (res) => resolve(res.path),
-        fail: reject
-      });
-    });
-  },
-
-  drawPoster(bgPath, qrPath, avatarPath) {
-    const ctx = wx.createCanvasContext('posterCanvas', this);
-    const query = wx.createSelectorQuery().in(this);
-    query.select('.poster-canvas').boundingClientRect(rect => {
-      if (!rect) {
-        wx.showToast({ title: '画布获取失败', icon: 'none' });
-        return;
-      }
-      const canvasWidth = rect.width;
-      const canvasHeight = rect.height;
-
-      // 1. 绘制背景
-      ctx.drawImage(bgPath, 0, 0, canvasWidth, canvasHeight);
-
-      const qrSize = 100;
-      const margin = 5;
-      const qrX = canvasWidth - qrSize - margin;
-      const qrY = canvasHeight - qrSize - margin;
-      ctx.drawImage(qrPath, qrX, qrY, qrSize, qrSize);
-
-      const avatarSize = 60;
-      const avatarX = margin + 20;
-      const avatarY = canvasHeight - avatarSize - margin;
-      ctx.save();
-      ctx.beginPath();
-      ctx.arc(avatarX + avatarSize/2, avatarY + avatarSize/2, avatarSize/2, 0, 2 * Math.PI);
-      ctx.clip();
-      ctx.drawImage(avatarPath, avatarX, avatarY, avatarSize, avatarSize);
-      ctx.restore();
-
-      ctx.setFontSize(16);
-      ctx.setFillStyle('#333333');
-      ctx.setTextAlign('left');
-      
-      let nick = this.data.nickName || '管事';
-      if (nick.length > 3) {
-        nick = nick.substring(0, 3) + '...';
-      }
-      const nameText = nick;
-      
-      const textX = avatarX + avatarSize + 8;
-      const textY = avatarY + avatarSize/2 + 6;
-      ctx.fillText(nameText, textX, textY);
-
-      ctx.setFontSize(18);
-      ctx.setFillStyle('#ffaa00');
-      ctx.setTextAlign('left');
-      const slogan = '快来加入我们 ✦';
-      const sloganX = avatarX;
-      const sloganY = avatarY - 12;
-      ctx.fillText(slogan, sloganX, sloganY);
-
-      ctx.draw(false, () => {
-        wx.canvasToTempFilePath({
-          canvasId: 'posterCanvas',
-          success: (res) => {
-            this.setData({ posterImageTemp: res.tempFilePath });
-          },
-          fail: (err) => {
-            console.error('生成海报临时文件失败', err);
-          }
-        }, this);
-      });
-    }).exec();
-  },
-
-  savePoster() {
-    if (!this.data.posterImageTemp) {
-      wx.showToast({ title: '海报尚未生成', icon: 'none' });
-      return;
-    }
-    this.downloadAndSave(this.data.posterImageTemp);
-  },
-
-  hidePoster() {
-    this.setData({ showPosterCanvas: false, posterImageTemp: '' });
-  },
-
-  downloadAndSave(filePath) {
-    wx.getSetting({
-      success: (res) => {
-        if (!res.authSetting['scope.writePhotosAlbum']) {
-          wx.authorize({
-            scope: 'scope.writePhotosAlbum',
-            success: () => {
-              this._saveImage(filePath);
-            },
-            fail: () => {
-              wx.showModal({
-                title: '提示',
-                content: '需要您授权保存到相册',
-                success: (modalRes) => {
-                  if (modalRes.confirm) {
-                    wx.openSetting();
-                  }
-                }
-              });
-            }
-          });
-        } else {
-          this._saveImage(filePath);
-        }
-      }
-    });
-  },
-
-  _saveImage(filePath) {
-    wx.saveImageToPhotosAlbum({
-      filePath: filePath,
-      success: () => {
-        wx.showToast({ title: '保存成功', icon: 'success' });
-      },
-      fail: (err) => {
-        console.error('保存失败', err);
-        wx.showToast({ title: '保存失败', icon: 'none' });
-      }
-    });
-  },
+// pages/poster/poster.js
+import request from '../../utils/request.js';
+
+const app = getApp();
+
+Page({
+  data: {
+    qrcodeUrl: '',
+    isLoading: false,
+    showPosterCanvas: false,
+    posterImageTemp: '',
+    avatarUrl: '',
+    uid: '',
+    nickName: '',
+  },
+
+  onLoad() {
+    this.loadQRCodeFromCache();
+    this.loadUserInfo();
+  },
+
+  onShow() {
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const notificationComp = this.selectComponent('#global-notification');
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  loadQRCodeFromCache() {
+    try {
+      const relativeUrl = wx.getStorageSync('haibao_url');
+      if (relativeUrl) {
+        const fullUrl = this.getFullImageUrl(relativeUrl);
+        this.setData({ qrcodeUrl: fullUrl });
+      } else {
+        this.setData({ qrcodeUrl: '' });
+      }
+    } catch (error) {
+      console.error('读取缓存失败', error);
+    }
+  },
+
+  loadUserInfo() {
+    const touxiang = wx.getStorageSync('touxiang');
+    const ossUrl = app.globalData.ossImageUrl || '';
+    const defaultAvatar = ossUrl + (app.globalData.morentouxiang || 'avatar/default.jpg');
+    let avatarUrl = defaultAvatar;
+    if (touxiang && typeof touxiang === 'string' && touxiang.trim() !== '') {
+      avatarUrl = this.getFullImageUrl(touxiang);
+    }
+    const uid = wx.getStorageSync('uid') || '';
+    let nickName = app.globalData.nicheng || wx.getStorageSync('nicheng') || '管事';
+    this.setData({ avatarUrl, uid, nickName });
+  },
+
+  getFullImageUrl(url) {
+    if (!url) return '';
+    const ossUrl = app.globalData.ossImageUrl || '';
+    return url.startsWith('http') ? url : ossUrl + url;
+  },
+
+  refreshQRCode() {
+    if (this.data.isLoading) return;
+    this.setData({ isLoading: true });
+    request({
+      url: '/peizhi/guanshiewm',
+      method: 'POST',
+    }).then(res => {
+      if (res.data && res.data.code === 0) {
+        const relativeUrl = res.data.data.url;
+        if (relativeUrl) {
+          wx.setStorageSync('haibao_url', relativeUrl);
+          const fullUrl = this.getFullImageUrl(relativeUrl);
+          this.setData({ qrcodeUrl: fullUrl });
+          wx.showToast({ title: '获取成功', icon: 'success' });
+        } else {
+          wx.showToast({ title: '返回数据异常', icon: 'none' });
+        }
+      } else {
+        wx.showToast({ title: res.data.msg || '获取失败', icon: 'none' });
+      }
+    }).catch(err => {
+      console.error('获取海报失败', err);
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    }).finally(() => {
+      this.setData({ isLoading: false });
+    });
+  },
+
+  // 🔥【修改】保存二维码到相册（先下载网络图片）
+  saveToAlbum() {
+    if (!this.data.qrcodeUrl) {
+      wx.showToast({ title: '暂无二维码', icon: 'none' });
+      return;
+    }
+    
+    wx.showLoading({ title: '保存中...', mask: true });
+    wx.downloadFile({
+      url: this.data.qrcodeUrl,
+      success: (res) => {
+        wx.hideLoading();
+        if (res.statusCode === 200) {
+          // 调用已有的保存函数（传入临时路径）
+          this.downloadAndSave(res.tempFilePath);
+        } else {
+          wx.showToast({ title: '下载失败', icon: 'none' });
+        }
+      },
+      fail: (err) => {
+        wx.hideLoading();
+        console.error('下载二维码失败', err);
+        wx.showToast({ title: '下载失败', icon: 'none' });
+      }
+    });
+  },
+
+  generateMyPoster() {
+    if (!this.data.qrcodeUrl) {
+      wx.showToast({ title: '请先生成二维码', icon: 'none' });
+      return;
+    }
+
+    wx.showLoading({ title: '生成海报中...', mask: true });
+
+    const ossUrl = app.globalData.ossImageUrl || '';
+    const bgUrl = ossUrl + 'beijing/haibaobeijing.jpg';
+    const urls = [bgUrl, this.data.qrcodeUrl, this.data.avatarUrl];
+
+    const promises = urls.map(url => this.loadImage(url));
+    Promise.all(promises)
+      .then((images) => {
+        wx.hideLoading();
+        this.setData({ showPosterCanvas: true }, () => {
+          setTimeout(() => {
+            this.drawPoster(images[0], images[1], images[2]);
+          }, 200);
+        });
+      })
+      .catch((err) => {
+        wx.hideLoading();
+        wx.showToast({ title: '图片加载失败', icon: 'none' });
+        console.error('图片加载失败', err);
+      });
+  },
+
+  loadImage(url) {
+    return new Promise((resolve, reject) => {
+      wx.getImageInfo({
+        src: url,
+        success: (res) => resolve(res.path),
+        fail: reject
+      });
+    });
+  },
+
+  drawPoster(bgPath, qrPath, avatarPath) {
+    const ctx = wx.createCanvasContext('posterCanvas', this);
+    const query = wx.createSelectorQuery().in(this);
+    query.select('.poster-canvas').boundingClientRect(rect => {
+      if (!rect) {
+        wx.showToast({ title: '画布获取失败', icon: 'none' });
+        return;
+      }
+      const canvasWidth = rect.width;
+      const canvasHeight = rect.height;
+
+      // 1. 绘制背景
+      ctx.drawImage(bgPath, 0, 0, canvasWidth, canvasHeight);
+
+      const qrSize = 100;
+      const margin = 5;
+      const qrX = canvasWidth - qrSize - margin;
+      const qrY = canvasHeight - qrSize - margin;
+      ctx.drawImage(qrPath, qrX, qrY, qrSize, qrSize);
+
+      const avatarSize = 60;
+      const avatarX = margin + 20;
+      const avatarY = canvasHeight - avatarSize - margin;
+      ctx.save();
+      ctx.beginPath();
+      ctx.arc(avatarX + avatarSize/2, avatarY + avatarSize/2, avatarSize/2, 0, 2 * Math.PI);
+      ctx.clip();
+      ctx.drawImage(avatarPath, avatarX, avatarY, avatarSize, avatarSize);
+      ctx.restore();
+
+      ctx.setFontSize(16);
+      ctx.setFillStyle('#333333');
+      ctx.setTextAlign('left');
+      
+      let nick = this.data.nickName || '管事';
+      if (nick.length > 3) {
+        nick = nick.substring(0, 3) + '...';
+      }
+      const nameText = nick;
+      
+      const textX = avatarX + avatarSize + 8;
+      const textY = avatarY + avatarSize/2 + 6;
+      ctx.fillText(nameText, textX, textY);
+
+      ctx.setFontSize(18);
+      ctx.setFillStyle('#ffaa00');
+      ctx.setTextAlign('left');
+      const slogan = '快来加入我们 ✦';
+      const sloganX = avatarX;
+      const sloganY = avatarY - 12;
+      ctx.fillText(slogan, sloganX, sloganY);
+
+      ctx.draw(false, () => {
+        wx.canvasToTempFilePath({
+          canvasId: 'posterCanvas',
+          success: (res) => {
+            this.setData({ posterImageTemp: res.tempFilePath });
+          },
+          fail: (err) => {
+            console.error('生成海报临时文件失败', err);
+          }
+        }, this);
+      });
+    }).exec();
+  },
+
+  savePoster() {
+    if (!this.data.posterImageTemp) {
+      wx.showToast({ title: '海报尚未生成', icon: 'none' });
+      return;
+    }
+    this.downloadAndSave(this.data.posterImageTemp);
+  },
+
+  hidePoster() {
+    this.setData({ showPosterCanvas: false, posterImageTemp: '' });
+  },
+
+  downloadAndSave(filePath) {
+    wx.getSetting({
+      success: (res) => {
+        if (!res.authSetting['scope.writePhotosAlbum']) {
+          wx.authorize({
+            scope: 'scope.writePhotosAlbum',
+            success: () => {
+              this._saveImage(filePath);
+            },
+            fail: () => {
+              wx.showModal({
+                title: '提示',
+                content: '需要您授权保存到相册',
+                success: (modalRes) => {
+                  if (modalRes.confirm) {
+                    wx.openSetting();
+                  }
+                }
+              });
+            }
+          });
+        } else {
+          this._saveImage(filePath);
+        }
+      }
+    });
+  },
+
+  _saveImage(filePath) {
+    wx.saveImageToPhotosAlbum({
+      filePath: filePath,
+      success: () => {
+        wx.showToast({ title: '保存成功', icon: 'success' });
+      },
+      fail: (err) => {
+        console.error('保存失败', err);
+        wx.showToast({ title: '保存失败', icon: 'none' });
+      }
+    });
+  },
 });
\ No newline at end of file
diff --git a/pages/haibao/haibao.json b/pages/poster/poster.json
similarity index 100%
rename from pages/haibao/haibao.json
rename to pages/poster/poster.json
diff --git a/pages/haibao/haibao.wxml b/pages/poster/poster.wxml
similarity index 100%
rename from pages/haibao/haibao.wxml
rename to pages/poster/poster.wxml
diff --git a/pages/haibao/haibao.wxss b/pages/poster/poster.wxss
similarity index 100%
rename from pages/haibao/haibao.wxss
rename to pages/poster/poster.wxss
diff --git a/pages/shangpinxiangqing/shangpinxiangqing.js b/pages/product-detail/product-detail.js
similarity index 64%
rename from pages/shangpinxiangqing/shangpinxiangqing.js
rename to pages/product-detail/product-detail.js
index 4ef2c34..f619c1f 100644
--- a/pages/shangpinxiangqing/shangpinxiangqing.js
+++ b/pages/product-detail/product-detail.js
@@ -1,295 +1,249 @@
-// pages/shangpinxiangqing/shangpinxiangqing.js
-const app = getApp()
-import { ensureLogin } from '../../utils/login'
-import { backfillUserProfileCache } from '../../utils/role-tab-bar'
-
-Page({
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    // 全局变量引用
-    ossImageUrl: '',
-    apiBaseUrl: '',
-    
-    // 从上级页面传入的参数
-    shangpinId: '',           // 商品ID
-    shangpinTitle: '',        // 商品标题（可选，用于SEO）
-    shangpinPrice: '',        // 商品价格（可选）
-    
-    // 商品详情数据
-    shangpinData: null,       // 商品详情数据对象
-    isLoading: true,          // 加载状态
-    loadError: false,         // 加载错误
-    
-    // 页面字段映射（后端返回字段名）
-    fieldMapping: {
-      tupian: 'tupian',       // 商品图片URL
-      biaoti: 'biaoti',       // 商品标题
-      jiage: 'jiage',         // 商品价格
-      xiangqing: 'xiangqing', // 商品详细介绍
-      xiadanxuzhi: 'xiadanxuzhi', // 下单须知
-      guize: 'guize',         // 规则图片URL
-      xiaoliang: 'xiaoliang', // 商品销量
-      kucun: 'kucun',         // 商品库存
-      fenlei: 'fenlei',       // 商品分类（可能有用）
-      pingfen: 'pingfen'      // 商品评分（可能有用）
-    }
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    
-    
-    // 获取全局变量
-    this.setData({
-      ossImageUrl: app.globalData.ossImageUrl,
-      apiBaseUrl: app.globalData.apiBaseUrl,
-      shangpinId: options.id || '',
-      shangpinTitle: options.title || '',
-      shangpinPrice: options.price || ''
-    })
-    
-    // 验证商品ID
-    if (!this.data.shangpinId) {
-      wx.showToast({
-        title: '商品不存在',
-        icon: 'none'
-      })
-      setTimeout(() => {
-        wx.navigateBack()
-      }, 1500)
-      return
-    }
-    
-    // 加载商品详情数据
-    this.loadShangpinDetail()
-  },
-  onShow() {
-    backfillUserProfileCache(app);
-    this.registerNotificationComponent();
-  },
-
-// 🆕 新增：注册通知组件
-registerNotificationComponent() {
-    const app = getApp();
-    const notificationComp = this.selectComponent('#global-notification');
-    
-    if (notificationComp && notificationComp.showNotification) {
-        console.log('🏪 商城页面注册通知组件');
-        app.globalData.globalNotification = {
-            show: (data) => notificationComp.showNotification(data),
-            hide: () => notificationComp.hideNotification()
-        };
-    }
-},
-
-  /**
-   * 加载商品详情数据
-   */
-  loadShangpinDetail() {
-    const that = this
-    const { shangpinId, apiBaseUrl } = this.data
-    
-    this.setData({ isLoading: true, loadError: false })
-    
-    wx.request({
-      url: apiBaseUrl + '/shangpin/xiangqinghuoqu/',
-      method: 'POST',
-      header: {
-        'content-type': 'application/json'
-      },
-      data: {
-        shangpin_id: shangpinId
-      },
-      success(res) {
-        
-        
-        if (res.statusCode === 200 && res.data && res.data.code === 0) {
-          // 获取商品数据
-          const shangpinData = res.data.data || {}
-          
-          // 处理价格显示
-          if (shangpinData.jiage) {
-            const jiage = parseFloat(shangpinData.jiage) || 0
-            const priceInteger = Math.floor(jiage)
-            let priceDecimal = '00'
-            
-            const decimalPart = (jiage - priceInteger).toFixed(2)
-            if (decimalPart > 0) {
-              priceDecimal = decimalPart.toString().split('.')[1]
-            }
-            
-            shangpinData.priceInteger = priceInteger
-            shangpinData.priceDecimal = priceDecimal
-          }
-          
-          // 处理图片URL（确保完整URL）
-          if (shangpinData.tupian && !shangpinData.tupian.startsWith('http')) {
-            shangpinData.tupian = that.data.ossImageUrl + shangpinData.tupian
-          }
-          
-          // 处理规则图片URL
-          if (shangpinData.guize && !shangpinData.guize.startsWith('http')) {
-            shangpinData.guize = that.data.ossImageUrl + shangpinData.guize
-          }
-          
-          // 处理销量显示
-          if (shangpinData.xiaoliang) {
-            shangpinData.xiaoliangText = that.formatXiaoliang(shangpinData.xiaoliang)
-          }
-          
-          // 处理库存显示
-          if (shangpinData.kucun) {
-            shangpinData.kucunText = shangpinData.kucun + '件'
-            shangpinData.kucunClass = shangpinData.kucun > 0 ? 'kucun-normal' : 'kucun-none'
-          }
-          
-          // 设置页面标题
-          if (shangpinData.biaoti) {
-            wx.setNavigationBarTitle({
-              title: '商品详情'
-            })
-          }
-          
-          that.setData({
-            shangpinData: shangpinData,
-            isLoading: false
-          })
-        } else {
-          that.handleLoadError(res.data?.msg || '加载失败')
-        }
-      },
-      fail(error) {
-        console.error('商品详情加载失败:', error)
-        that.handleLoadError('网络错误，请重试')
-      }
-    })
-  },
-
-  /**
-   * 格式化销量显示
-   */
-  formatXiaoliang(xiaoliang) {
-    const num = parseInt(xiaoliang) || 0
-    
-    if (num >= 10000) {
-      return (num / 10000).toFixed(1) + '万+'
-    } else if (num >= 1000) {
-      return (num / 1000).toFixed(1) + '千+'
-    } else {
-      return num + ''
-    }
-  },
-
-  /**
-   * 处理加载错误
-   */
-  handleLoadError(errorMsg) {
-    this.setData({
-      isLoading: false,
-      loadError: true
-    })
-    
-    wx.showToast({
-      title: errorMsg || '加载失败',
-      icon: 'none',
-      duration: 2000
-    })
-    
-    // 3秒后自动返回
-    setTimeout(() => {
-      wx.navigateBack()
-    }, 3000)
-  },
-
-  /**
-   * 预览商品图片
-   */
-  previewImage() {
-    const { shangpinData } = this.data
-    if (!shangpinData || !shangpinData.tupian) return
-    
-    wx.previewImage({
-      current: shangpinData.tupian,
-      urls: [shangpinData.tupian]
-    })
-  },
-
-  /**
-   * 点击立即下单按钮
-   */
-  async onOrderClick() {
-    const { shangpinData, shangpinId } = this.data
-    
-    // 检查库存
-    if (shangpinData && shangpinData.kucun <= 0) {
-      wx.showToast({
-        title: '商品已售罄',
-        icon: 'none'
-      })
-      return
-    }
-    
-    // 验证必要数据
-    if (!shangpinData || !shangpinData.biaoti) {
-      wx.showToast({
-        title: '商品信息不完整',
-        icon: 'none'
-      })
-      return
-    }
-
-    try {
-      await ensureLogin()
-    } catch (e) {
-      return
-    }
-    
-    // 准备跳转数据
-    const orderData = {
-      id: shangpinId,                             // 商品ID
-      title: shangpinData.biaoti,                 // 商品标题
-      price: shangpinData.jiage,                  // 商品价格（原价）
-      priceInteger: shangpinData.priceInteger,    // 价格整数部分
-      priceDecimal: shangpinData.priceDecimal,    // 价格小数部分
-      image: shangpinData.tupian,                 // 商品图片
-      kucun: shangpinData.kucun || 0,             // 商品库存
-      xiaoliang: shangpinData.xiaoliang || 0      // 商品销量
-    }
-    
-    // 跳转到提交订单页面
-    wx.navigateTo({
-      url: `/pages/tijiao/tijiao?data=${encodeURIComponent(JSON.stringify(orderData))}`
-    })
-  },
-
-  /**
-   * 刷新页面数据
-   */
-  onRefresh() {
-    this.loadShangpinDetail()
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-    const { shangpinData, shangpinId } = this.data
-    
-    return {
-      title: shangpinData?.biaoti || '阿龙电竞 - 商品详情',
-      path: `/pages/shangpinxiangqing/shangpinxiangqing?id=${shangpinId}`,
-      imageUrl: shangpinData?.tupian || ''
-    }
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-    // 清理工作
-  }
+// pages/product-detail/product-detail.js
+const app = getApp()
+import { ensureLogin } from '../../utils/login'
+import { backfillUserProfileCache } from '../../utils/role-tab-bar'
+
+Page({
+  data: {
+    ossImageUrl: '',
+    apiBaseUrl: '',
+
+    shangpinId: '',
+    shangpinTitle: '',
+    shangpinPrice: '',
+
+    shangpinData: null,
+    isLoading: true,
+    loadError: false,
+
+    // 页面字段映射
+    fieldMapping: {
+      tupian: 'tupian',
+      biaoti: 'biaoti',
+      jiage: 'jiage',
+      xiangqing: 'xiangqing',
+      xiadanxuzhi: 'xiadanxuzhi',
+      guize: 'guize',
+      xiaoliang: 'xiaoliang',
+      kucun: 'kucun',
+      fenlei: 'fenlei',
+      pingfen: 'pingfen'
+    }
+  },
+
+  onLoad(options) {
+    this.setData({
+      ossImageUrl: app.globalData.ossImageUrl,
+      apiBaseUrl: app.globalData.apiBaseUrl,
+      shangpinId: options.id || '',
+      shangpinTitle: options.title || '',
+      shangpinPrice: options.price || ''
+    })
+
+    if (!this.data.shangpinId) {
+      wx.showToast({
+        title: '商品不存在',
+        icon: 'none'
+      })
+      setTimeout(() => {
+        wx.navigateBack()
+      }, 1500)
+      return
+    }
+
+    this.loadShangpinDetail()
+  },
+  onShow() {
+    backfillUserProfileCache(app);
+    this.registerNotificationComponent();
+  },
+
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+
+    if (notificationComp && notificationComp.showNotification) {
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  loadShangpinDetail() {
+    const that = this
+    const { shangpinId, apiBaseUrl } = this.data
+    
+    this.setData({ isLoading: true, loadError: false })
+    
+    wx.request({
+      url: apiBaseUrl + '/shangpin/xiangqinghuoqu/',
+      method: 'POST',
+      header: {
+        'content-type': 'application/json'
+      },
+      data: {
+        shangpin_id: shangpinId
+      },
+      success(res) {
+        if (res.statusCode === 200 && res.data && res.data.code === 0) {
+          const shangpinData = res.data.data || {}
+
+          // 处理价格
+          if (shangpinData.jiage) {
+            const jiage = parseFloat(shangpinData.jiage) || 0
+            const priceInteger = Math.floor(jiage)
+            let priceDecimal = '00'
+            
+            const decimalPart = (jiage - priceInteger).toFixed(2)
+            if (decimalPart > 0) {
+              priceDecimal = decimalPart.toString().split('.')[1]
+            }
+            
+            shangpinData.priceInteger = priceInteger
+            shangpinData.priceDecimal = priceDecimal
+          }
+          
+          // 处理图片URL
+          if (shangpinData.tupian && !shangpinData.tupian.startsWith('http')) {
+            shangpinData.tupian = that.data.ossImageUrl + shangpinData.tupian
+          }
+          
+          // 处理规则图片URL
+          if (shangpinData.guize && !shangpinData.guize.startsWith('http')) {
+            shangpinData.guize = that.data.ossImageUrl + shangpinData.guize
+          }
+          
+          // 处理销量显示
+          if (shangpinData.xiaoliang) {
+            shangpinData.xiaoliangText = that.formatXiaoliang(shangpinData.xiaoliang)
+          }
+          
+          // 处理库存显示
+          if (shangpinData.kucun) {
+            shangpinData.kucunText = shangpinData.kucun + '件'
+            shangpinData.kucunClass = shangpinData.kucun > 0 ? 'kucun-normal' : 'kucun-none'
+          }
+          
+          // 设置页面标题
+          if (shangpinData.biaoti) {
+            wx.setNavigationBarTitle({
+              title: '商品详情'
+            })
+          }
+          
+          that.setData({
+            shangpinData: shangpinData,
+            isLoading: false
+          })
+        } else {
+          that.handleLoadError(res.data?.msg || '加载失败')
+        }
+      },
+      fail(error) {
+        console.error('商品详情加载失败:', error)
+        that.handleLoadError('网络错误，请重试')
+      }
+    })
+  },
+
+  formatXiaoliang(xiaoliang) {
+    const num = parseInt(xiaoliang) || 0
+    
+    if (num >= 10000) {
+      return (num / 10000).toFixed(1) + '万+'
+    } else if (num >= 1000) {
+      return (num / 1000).toFixed(1) + '千+'
+    } else {
+      return num + ''
+    }
+  },
+
+  handleLoadError(errorMsg) {
+    this.setData({
+      isLoading: false,
+      loadError: true
+    })
+    
+    wx.showToast({
+      title: errorMsg || '加载失败',
+      icon: 'none',
+      duration: 2000
+    })
+    
+    // 3秒后自动返回
+    setTimeout(() => {
+      wx.navigateBack()
+    }, 3000)
+  },
+
+  previewImage() {
+    const { shangpinData } = this.data
+    if (!shangpinData || !shangpinData.tupian) return
+    
+    wx.previewImage({
+      current: shangpinData.tupian,
+      urls: [shangpinData.tupian]
+    })
+  },
+
+  async onOrderClick() {
+    const { shangpinData, shangpinId } = this.data
+    
+    // 检查库存
+    if (shangpinData && shangpinData.kucun <= 0) {
+      wx.showToast({
+        title: '商品已售罄',
+        icon: 'none'
+      })
+      return
+    }
+    
+    // 验证必要数据
+    if (!shangpinData || !shangpinData.biaoti) {
+      wx.showToast({
+        title: '商品信息不完整',
+        icon: 'none'
+      })
+      return
+    }
+
+    try {
+      await ensureLogin()
+    } catch (e) {
+      return
+    }
+    
+    const orderData = {
+      id: shangpinId,
+      title: shangpinData.biaoti,
+      price: shangpinData.jiage,
+      priceInteger: shangpinData.priceInteger,
+      priceDecimal: shangpinData.priceDecimal,
+      image: shangpinData.tupian,
+      kucun: shangpinData.kucun || 0,
+      xiaoliang: shangpinData.xiaoliang || 0
+    }
+    
+    wx.navigateTo({
+      url: `/pages/submit/submit?data=${encodeURIComponent(JSON.stringify(orderData))}`
+    })
+  },
+
+  onRefresh() {
+    this.loadShangpinDetail()
+  },
+
+  onShareAppMessage() {
+    const { shangpinData, shangpinId } = this.data
+    
+    return {
+      title: shangpinData?.biaoti || '阿龙电竞 - 商品详情',
+      path: `/pages/product-detail/product-detail?id=${shangpinId}`,
+      imageUrl: shangpinData?.tupian || ''
+    }
+  },
+
+  onUnload() {
+  }
 })
\ No newline at end of file
diff --git a/pages/tijiao/tijiao.json b/pages/product-detail/product-detail.json
similarity index 100%
rename from pages/tijiao/tijiao.json
rename to pages/product-detail/product-detail.json
diff --git a/pages/shangpinxiangqing/shangpinxiangqing.wxml b/pages/product-detail/product-detail.wxml
similarity index 84%
rename from pages/shangpinxiangqing/shangpinxiangqing.wxml
rename to pages/product-detail/product-detail.wxml
index 595ed1f..4ad5e00 100644
--- a/pages/shangpinxiangqing/shangpinxiangqing.wxml
+++ b/pages/product-detail/product-detail.wxml
@@ -1,112 +1,112 @@
-<!--pages/shangpinxiangqing/shangpinxiangqing.wxml-->
-<view class="detail-page">
-  <!-- 加载状态 -->
-  <view class="loading-container" wx:if="{{isLoading}}">
-    <view class="loading-content">
-      <view class="loading-spinner">
-        <view class="spinner-ring"></view>
-        <view class="spinner-dot"></view>
-      </view>
-      <text class="loading-text">加载中...</text>
-    </view>
-  </view>
-  
-  <!-- 错误状态 -->
-  <view class="error-container" wx:if="{{!isLoading && loadError}}">
-    <image src="/images/error.png" class="error-icon" />
-    <text class="error-text">加载失败</text>
-    <button class="error-btn" bindtap="onRefresh">重新加载</button>
-  </view>
-  
-  <!-- 商品详情内容 -->
-  <view class="detail-content" wx:if="{{!isLoading && !loadError && shangpinData}}">
-    <!-- 商品图片区域（占满屏幕） -->
-    <view class="image-section">
-      <view class="image-container" bindtap="previewImage">
-        <image 
-          src="{{shangpinData.tupian}}" 
-          mode="aspectFill" 
-          class="product-image"
-        />
-        <!-- 库存标签 -->
-        <view class="kucun-tag {{shangpinData.kucunClass || 'kucun-normal'}}">
-          <text class="kucun-text">{{shangpinData.kucunText || '库存充足'}}</text>
-        </view>
-      </view>
-    </view>
-    
-    <!-- 下方内容区域（顶部有圆角） -->
-    <view class="content-area">
-      <!-- 商品标题和价格区域 -->
-      <view class="title-price-section">
-        <view class="title-row">
-          <text class="product-title">{{shangpinData.biaoti || ''}}</text>
-        </view>
-        
-        <view class="price-row">
-          <!-- 价格 -->
-          <view class="price-section">
-            <text class="price-icon">¥</text>
-            <text class="price-integer">{{shangpinData.priceInteger || '0'}}</text>
-            <text class="price-decimal">.{{shangpinData.priceDecimal || '00'}}</text>
-          </view>
-          
-          <!-- 销量 -->
-          <view class="sales-section">
-            <image src="/images/xiaoliang.png" class="sales-icon" />
-            <text class="sales-text">{{shangpinData.xiaoliangText || '0'}}次购买</text>
-          </view>
-        </view>
-      </view>
-      
-      <!-- 商品介绍区域 -->
-      <view class="info-section" wx:if="{{shangpinData.xiangqing}}">
-        <view class="section-header">
-          <image src="/images/jieshao.png" class="section-icon" />
-          <text class="section-title">商品介绍：</text>
-        </view>
-        <view class="section-content">
-          <text class="content-text">{{shangpinData.xiangqing}}</text>
-        </view>
-      </view>
-      
-      <!-- 购买须知区域 -->
-      <view class="info-section" wx:if="{{shangpinData.xiadanxuzhi}}">
-        <view class="section-header">
-          <image src="/images/jieshao.png" class="section-icon" />
-          <text class="section-title">购买须知：</text>
-        </view>
-        <view class="section-content">
-          <text class="content-text">{{shangpinData.xiadanxuzhi}}</text>
-        </view>
-      </view>
-      
-      <!-- 规则图片区域（只有有图片时才显示） -->
-      <view class="rule-section" wx:if="{{shangpinData.guize}}">
-        <image 
-          src="{{shangpinData.guize}}" 
-          mode="widthFix" 
-          class="rule-image"
-          binderror="onImageError"
-        />
-      </view>
-      
-      <!-- 占位区域（给底部按钮留空间） -->
-      <view class="placeholder"></view>
-    </view>
-  </view>
-  
-  <!-- 立即下单按钮（固定在底部，无价格标签） -->
-  <view class="order-btn-container" wx:if="{{!isLoading && !loadError && shangpinData}}">
-    <view class="order-btn" bindtap="onOrderClick">
-      <!-- 按钮发光特效 -->
-      <view class="btn-glow"></view>
-      <!-- 按钮流光特效 -->
-      <view class="btn-streamer"></view>
-      <!-- 按钮文字 -->
-      <text class="btn-text">立即预约</text>
-    </view>
-  </view>
-  <global-notification id="global-notification" />
-
+<!--pages/product-detail/product-detail.wxml-->
+<view class="detail-page page-container">
+  <!-- 加载状态 -->
+  <view class="loading-container loading-mask loading-mask--light" wx:if="{{isLoading}}">
+    <view class="loading-content">
+      <view class="loading-spinner">
+        <view class="spinner-ring"></view>
+        <view class="spinner-dot"></view>
+      </view>
+      <text class="loading-text">加载中...</text>
+    </view>
+  </view>
+  
+  <!-- 错误状态 -->
+  <view class="error-container empty-state" wx:if="{{!isLoading && loadError}}">
+    <image src="/images/error.png" class="error-icon" />
+    <text class="error-text">加载失败</text>
+    <button class="error-btn btn btn-sm btn-sm--green" bindtap="onRefresh">重新加载</button>
+  </view>
+  
+  <!-- 商品详情内容 -->
+  <view class="detail-content" wx:if="{{!isLoading && !loadError && shangpinData}}">
+    <!-- 商品图片区域（占满屏幕） -->
+    <view class="image-section">
+      <view class="image-container" bindtap="previewImage">
+        <image 
+          src="{{shangpinData.tupian}}" 
+          mode="aspectFill" 
+          class="product-image"
+        />
+        <!-- 库存标签 -->
+        <view class="kucun-tag {{shangpinData.kucunClass || 'kucun-normal'}}">
+          <text class="kucun-text">{{shangpinData.kucunText || '库存充足'}}</text>
+        </view>
+      </view>
+    </view>
+    
+    <!-- 下方内容区域（顶部有圆角） -->
+    <view class="content-area">
+      <!-- 商品标题和价格区域 -->
+      <view class="title-price-section">
+        <view class="title-row">
+          <text class="product-title">{{shangpinData.biaoti || ''}}</text>
+        </view>
+        
+        <view class="price-row">
+          <!-- 价格 -->
+          <view class="price-section">
+            <text class="price-icon">¥</text>
+            <text class="price-integer">{{shangpinData.priceInteger || '0'}}</text>
+            <text class="price-decimal">.{{shangpinData.priceDecimal || '00'}}</text>
+          </view>
+          
+          <!-- 销量 -->
+          <view class="sales-section">
+            <image src="/images/xiaoliang.png" class="sales-icon" />
+            <text class="sales-text">{{shangpinData.xiaoliangText || '0'}}次购买</text>
+          </view>
+        </view>
+      </view>
+      
+      <!-- 商品介绍区域 -->
+      <view class="info-section" wx:if="{{shangpinData.xiangqing}}">
+        <view class="section-header">
+          <image src="/images/jieshao.png" class="section-icon" />
+          <text class="section-title">商品介绍：</text>
+        </view>
+        <view class="section-content">
+          <text class="content-text">{{shangpinData.xiangqing}}</text>
+        </view>
+      </view>
+      
+      <!-- 购买须知区域 -->
+      <view class="info-section" wx:if="{{shangpinData.xiadanxuzhi}}">
+        <view class="section-header">
+          <image src="/images/jieshao.png" class="section-icon" />
+          <text class="section-title">购买须知：</text>
+        </view>
+        <view class="section-content">
+          <text class="content-text">{{shangpinData.xiadanxuzhi}}</text>
+        </view>
+      </view>
+      
+      <!-- 规则图片区域（只有有图片时才显示） -->
+      <view class="rule-section" wx:if="{{shangpinData.guize}}">
+        <image 
+          src="{{shangpinData.guize}}" 
+          mode="widthFix" 
+          class="rule-image"
+          binderror="onImageError"
+        />
+      </view>
+      
+      <!-- 占位区域（给底部按钮留空间） -->
+      <view class="placeholder"></view>
+    </view>
+  </view>
+  
+  <!-- 立即下单按钮（固定在底部，无价格标签） -->
+  <view class="order-btn-container fixed-bottom" wx:if="{{!isLoading && !loadError && shangpinData}}">
+    <view class="order-btn btn btn-primary btn-primary--green" bindtap="onOrderClick">
+      <!-- 按钮发光特效 -->
+      <view class="btn-glow"></view>
+      <!-- 按钮流光特效 -->
+      <view class="btn-streamer"></view>
+      <!-- 按钮文字 -->
+      <text class="btn-text">立即预约</text>
+    </view>
+  </view>
+  <global-notification id="global-notification" />
+
 </view>
\ No newline at end of file
diff --git a/pages/shangpinxiangqing/shangpinxiangqing.wxss b/pages/product-detail/product-detail.wxss
similarity index 87%
rename from pages/shangpinxiangqing/shangpinxiangqing.wxss
rename to pages/product-detail/product-detail.wxss
index c94d2b8..8590c7c 100644
--- a/pages/shangpinxiangqing/shangpinxiangqing.wxss
+++ b/pages/product-detail/product-detail.wxss
@@ -1,386 +1,349 @@
-/* pages/shangpinxiangqing/shangpinxiangqing.wxss */
-.detail-page {
-    width: 100%;
-    min-height: 100vh;
-    background: #f5f5f5;
-    position: relative;
-  }
-  
-  /* 加载状态 */
-  .loading-container {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background: #f5f5f5;
-    z-index: 100;
-  }
-  
-  .loading-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-  
-  .loading-spinner {
-    width: 80rpx;
-    height: 80rpx;
-    position: relative;
-    margin-bottom: 30rpx;
-  }
-  
-  .spinner-ring {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    border: 4rpx solid rgba(82, 196, 26, 0.2);
-    border-radius: 50%;
-  }
-  
-  .spinner-dot {
-    position: absolute;
-    top: 0;
-    left: 50%;
-    width: 12rpx;
-    height: 12rpx;
-    background: #52c41a;
-    border-radius: 50%;
-    transform: translateX(-50%);
-    animation: spin 1s linear infinite;
-  }
-  
-  .loading-text {
-    font-size: 28rpx;
-    color: #666;
-    font-weight: 500;
-  }
-  
-  /* 错误状态 */
-  .error-container {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    background: #f5f5f5;
-    z-index: 100;
-  }
-  
-  .error-icon {
-    width: 180rpx;
-    height: 180rpx;
-    opacity: 0.3;
-    margin-bottom: 30rpx;
-  }
-  
-  .error-text {
-    font-size: 30rpx;
-    color: #999;
-    margin-bottom: 40rpx;
-  }
-  
-  .error-btn {
-    background: linear-gradient(135deg, #52c41a, #389e0d);
-    color: white;
-    font-size: 26rpx;
-    font-weight: 500;
-    padding: 20rpx 50rpx;
-    border-radius: 50rpx;
-    box-shadow: 0 8rpx 24rpx rgba(82, 196, 26, 0.3);
-  }
-  
-  /* 商品详情内容 */
-  .detail-content {
-    padding-bottom: 140rpx; /* 给底部按钮留出空间 */
-  }
-  
-  /* 商品图片区域（占满屏幕） */
-  .image-section {
-    width: 100%;
-    background: white;
-  }
-  
-  .image-container {
-    width: 100%;
-    height: 750rpx; /* 正方形，占满屏幕宽度 */
-    position: relative;
-    overflow: hidden;
-    background: #f5f5f5;
-  }
-  
-  .product-image {
-    width: 100%;
-    height: 100%;
-  }
-  
-  /* 库存标签 */
-  .kucun-tag {
-    position: absolute;
-    bottom: 30rpx;
-    right: 30rpx;
-    padding: 12rpx 24rpx;
-    border-radius: 30rpx;
-    backdrop-filter: blur(10rpx);
-    z-index: 10;
-  }
-  
-  .kucun-normal {
-    background: rgba(0, 0, 0, 0.6);
-    color: white;
-  }
-  
-  .kucun-none {
-    background: rgba(255, 77, 79, 0.8);
-    color: white;
-  }
-  
-  .kucun-text {
-    font-size: 24rpx;
-    font-weight: 500;
-  }
-  
-  /* 下方内容区域（顶部有圆角，与图片重叠一部分） */
-  .content-area {
-    position: relative;
-    background: white;
-    border-radius: 40rpx 40rpx 0 0;
-    margin-top: -40rpx; /* 与图片重叠一部分，实现平滑过渡 */
-    padding: 40rpx 30rpx 0;
-    min-height: 400rpx;
-  }
-  
-  /* 标题和价格区域 */
-  .title-price-section {
-    margin-bottom: 40rpx;
-  }
-  
-  .title-row {
-    margin-bottom: 30rpx;
-  }
-  
-  .product-title {
-    font-size: 38rpx;
-    font-weight: 700;
-    color: #222;
-    line-height: 1.5;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-  }
-  
-  /* 价格和销量行 */
-  .price-row {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-  
-  /* 价格部分 */
-  .price-section {
-    display: flex;
-    align-items: baseline;
-  }
-  
-  .price-icon {
-    font-size: 34rpx;
-    color: #ff4d4f;
-    font-weight: 600;
-  }
-  
-  .price-integer {
-    font-size: 58rpx;
-    color: #ff4d4f;
-    font-weight: 700;
-    margin-left: 4rpx;
-  }
-  
-  .price-decimal {
-    font-size: 34rpx;
-    color: #ff4d4f;
-    font-weight: 600;
-  }
-  
-  /* 销量部分 */
-  .sales-section {
-    display: flex;
-    align-items: center;
-  }
-  
-  .sales-icon {
-    width: 30rpx;
-    height: 30rpx;
-    margin-right: 12rpx;
-    opacity: 0.6;
-  }
-  
-  .sales-text {
-    font-size: 28rpx;
-    color: #999;
-    font-weight: 400;
-  }
-  
-  /* 信息区域（商品介绍、购买须知） */
-  .info-section {
-    margin-bottom: 40rpx;
-    padding-top: 30rpx;
-    border-top: 1rpx solid #f0f0f0;
-  }
-  
-  .section-header {
-    display: flex;
-    align-items: center;
-    margin-bottom: 20rpx;
-  }
-  
-  .section-icon {
-    width: 36rpx;
-    height: 36rpx;
-    margin-right: 16rpx;
-  }
-  
-  .section-title {
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #52c41a; /* 绿色 */
-  }
-  
-  .section-content {
-    line-height: 1.8;
-    padding-left: 52rpx; /* 与图标对齐 */
-  }
-  
-  .content-text {
-    font-size: 28rpx;
-    color: #333;
-    font-weight: 400;
-    white-space: pre-line;
-    line-height: 1.8;
-  }
-  
-  /* 规则图片区域 */
-  .rule-section {
-    margin: 40rpx 0;
-    padding-top: 30rpx;
-    border-top: 1rpx solid #f0f0f0;
-  }
-  
-  .rule-image {
-    width: 100%;
-    border-radius: 16rpx;
-    display: block;
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
-  }
-  
-  /* 占位区域 */
-  .placeholder {
-    height: 140rpx;
-  }
-  
-  /* 立即下单按钮容器（固定底部） */
-  .order-btn-container {
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    padding: 20rpx 30rpx;
-    background: linear-gradient(transparent, rgba(255, 255, 255, 0.9) 70%);
-    z-index: 100;
-  }
-  
-  /* 立即下单按钮 */
-  .order-btn {
-    background: linear-gradient(135deg, #52c41a, #389e0d);
-    border-radius: 50rpx;
-    height: 100rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: relative;
-    overflow: hidden;
-    box-shadow: 
-      0 12rpx 36rpx rgba(82, 196, 26, 0.4),
-      0 4rpx 12rpx rgba(82, 196, 26, 0.3);
-    transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
-  }
-  
-  .order-btn:active {
-    transform: scale(0.98);
-    box-shadow: 
-      0 6rpx 24rpx rgba(82, 196, 26, 0.5),
-      0 2rpx 8rpx rgba(82, 196, 26, 0.4);
-  }
-  
-  /* 按钮发光特效 */
-  .btn-glow {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(255, 255, 255, 0.1);
-    animation: glowPulse 2s infinite;
-  }
-  
-  /* 按钮流光特效 */
-  .btn-streamer {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100rpx;
-    height: 100%;
-    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.3), transparent);
-    transform: translateX(-100%);
-    animation: streamerFlow 3s infinite;
-  }
-  
-  /* 按钮文字 */
-  .btn-text {
-    font-size: 36rpx;
-    color: white;
-    font-weight: 600;
-    letter-spacing: 2rpx;
-    position: relative;
-    z-index: 2;
-  }
-  
-  /* 动画定义 */
-  @keyframes spin {
-    0% {
-      transform: translateX(-50%) rotate(0deg);
-    }
-    100% {
-      transform: translateX(-50%) rotate(360deg);
-    }
-  }
-  
-  @keyframes glowPulse {
-    0%, 100% {
-      opacity: 0.5;
-    }
-    50% {
-      opacity: 0.8;
-    }
-  }
-  
-  @keyframes streamerFlow {
-    0% {
-      transform: translateX(-100%);
-    }
-    50% {
-      transform: translateX(100%);
-    }
-    100% {
-      transform: translateX(100%);
-    }
+/* pages/product-detail/product-detail.wxss */
+.detail-page {
+    width: 100%;
+    background: #f5f5f5;
+  }
+  
+  /* 加载状态 */
+  .loading-container {
+    position: absolute;
+    background: #f5f5f5;
+    z-index: 100;
+  }
+  
+  .loading-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  
+  .loading-spinner {
+    width: 80rpx;
+    height: 80rpx;
+    position: relative;
+    margin-bottom: 30rpx;
+  }
+  
+  .spinner-ring {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border: 4rpx solid rgba(82, 196, 26, 0.2);
+    border-radius: 50%;
+  }
+  
+  .spinner-dot {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    width: 12rpx;
+    height: 12rpx;
+    background: #52c41a;
+    border-radius: 50%;
+    transform: translateX(-50%);
+    animation: spin 1s linear infinite;
+  }
+  
+  .loading-text {
+    font-size: 28rpx;
+    color: #666;
+    font-weight: 500;
+  }
+  
+  /* 错误状态 */
+  .error-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: #f5f5f5;
+    z-index: 100;
+    padding: 0;
+  }
+  
+  .error-icon {
+    width: 180rpx;
+    height: 180rpx;
+    opacity: 0.3;
+    margin-bottom: 30rpx;
+  }
+  
+  .error-text {
+    font-size: 30rpx;
+    color: #999;
+    margin-bottom: 40rpx;
+  }
+  
+  .error-btn {
+    font-weight: 500;
+    padding: 20rpx 50rpx;
+    border-radius: 50rpx;
+    box-shadow: 0 8rpx 24rpx rgba(82, 196, 26, 0.3);
+  }
+  
+  /* 商品详情内容 */
+  .detail-content {
+    padding-bottom: 140rpx; /* 给底部按钮留出空间 */
+  }
+  
+  /* 商品图片区域（占满屏幕） */
+  .image-section {
+    width: 100%;
+    background: white;
+  }
+  
+  .image-container {
+    width: 100%;
+    height: 750rpx; /* 正方形，占满屏幕宽度 */
+    position: relative;
+    overflow: hidden;
+    background: #f5f5f5;
+  }
+  
+  .product-image {
+    width: 100%;
+    height: 100%;
+  }
+  
+  /* 库存标签 */
+  .kucun-tag {
+    position: absolute;
+    bottom: 30rpx;
+    right: 30rpx;
+    padding: 12rpx 24rpx;
+    border-radius: 30rpx;
+    backdrop-filter: blur(10rpx);
+    z-index: 10;
+  }
+  
+  .kucun-normal {
+    background: rgba(0, 0, 0, 0.6);
+    color: white;
+  }
+  
+  .kucun-none {
+    background: rgba(255, 77, 79, 0.8);
+    color: white;
+  }
+  
+  .kucun-text {
+    font-size: 24rpx;
+    font-weight: 500;
+  }
+  
+  /* 下方内容区域（顶部有圆角，与图片重叠一部分） */
+  .content-area {
+    position: relative;
+    background: white;
+    border-radius: 40rpx 40rpx 0 0;
+    margin-top: -40rpx; /* 与图片重叠一部分，实现平滑过渡 */
+    padding: 40rpx 30rpx 0;
+    min-height: 400rpx;
+  }
+  
+  /* 标题和价格区域 */
+  .title-price-section {
+    margin-bottom: 40rpx;
+  }
+  
+  .title-row {
+    margin-bottom: 30rpx;
+  }
+  
+  .product-title {
+    font-size: 38rpx;
+    font-weight: 700;
+    color: #222;
+    line-height: 1.5;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+  }
+  
+  /* 价格和销量行 */
+  .price-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  
+  /* 价格部分 */
+  .price-section {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .price-icon {
+    font-size: 34rpx;
+    color: #ff4d4f;
+    font-weight: 600;
+  }
+  
+  .price-integer {
+    font-size: 58rpx;
+    color: #ff4d4f;
+    font-weight: 700;
+    margin-left: 4rpx;
+  }
+  
+  .price-decimal {
+    font-size: 34rpx;
+    color: #ff4d4f;
+    font-weight: 600;
+  }
+  
+  /* 销量部分 */
+  .sales-section {
+    display: flex;
+    align-items: center;
+  }
+  
+  .sales-icon {
+    width: 30rpx;
+    height: 30rpx;
+    margin-right: 12rpx;
+    opacity: 0.6;
+  }
+  
+  .sales-text {
+    font-size: 28rpx;
+    color: #999;
+    font-weight: 400;
+  }
+  
+  /* 信息区域（商品介绍、购买须知） */
+  .info-section {
+    margin-bottom: 40rpx;
+    padding-top: 30rpx;
+    border-top: 1rpx solid #f0f0f0;
+  }
+  
+  .section-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20rpx;
+  }
+  
+  .section-icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 16rpx;
+  }
+  
+  .section-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #52c41a; /* 绿色 */
+  }
+  
+  .section-content {
+    line-height: 1.8;
+    padding-left: 52rpx; /* 与图标对齐 */
+  }
+  
+  .content-text {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: 400;
+    white-space: pre-line;
+    line-height: 1.8;
+  }
+  
+  /* 规则图片区域 */
+  .rule-section {
+    margin: 40rpx 0;
+    padding-top: 30rpx;
+    border-top: 1rpx solid #f0f0f0;
+  }
+  
+  .rule-image {
+    width: 100%;
+    border-radius: 16rpx;
+    display: block;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
+  }
+  
+  /* 占位区域 */
+  .placeholder {
+    height: 140rpx;
+  }
+  
+  /* 立即下单按钮容器（固定底部） */
+  .order-btn-container {
+    background: linear-gradient(transparent, rgba(255, 255, 255, 0.9) 70%);
+  }
+  
+  /* 立即下单按钮 */
+  .order-btn {
+    border-radius: 50rpx;
+    height: 100rpx;
+    box-shadow:
+      0 12rpx 36rpx rgba(82, 196, 26, 0.4),
+      0 4rpx 12rpx rgba(82, 196, 26, 0.3);
+    transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+  }
+  
+  .order-btn:active {
+    box-shadow:
+      0 6rpx 24rpx rgba(82, 196, 26, 0.5),
+      0 2rpx 8rpx rgba(82, 196, 26, 0.4);
+  }
+  
+  /* 按钮发光特效 */
+  .btn-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(255, 255, 255, 0.1);
+    animation: glowPulse 2s infinite;
+  }
+  
+  /* 按钮流光特效 */
+  .btn-streamer {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100rpx;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.3), transparent);
+    transform: translateX(-100%);
+    animation: streamerFlow 3s infinite;
+  }
+  
+  /* 按钮文字 */
+  .btn-text {
+    font-size: 36rpx;
+    color: white;
+    font-weight: 600;
+    letter-spacing: 2rpx;
+    position: relative;
+    z-index: 2;
+  }
+  
+  /* 动画定义 */
+  @keyframes glowPulse {
+    0%, 100% {
+      opacity: 0.5;
+    }
+    50% {
+      opacity: 0.8;
+    }
+  }
+  
+  @keyframes streamerFlow {
+    0% {
+      transform: translateX(-100%);
+    }
+    50% {
+      transform: translateX(100%);
+    }
+    100% {
+      transform: translateX(100%);
+    }
   }
\ No newline at end of file
diff --git a/pages/czjilu/czjilu.js b/pages/recharge-log/recharge-log.js
similarity index 100%
rename from pages/czjilu/czjilu.js
rename to pages/recharge-log/recharge-log.js
diff --git a/pages/czjilu/czjilu.json b/pages/recharge-log/recharge-log.json
similarity index 100%
rename from pages/czjilu/czjilu.json
rename to pages/recharge-log/recharge-log.json
diff --git a/pages/czjilu/czjilu.wxml b/pages/recharge-log/recharge-log.wxml
similarity index 100%
rename from pages/czjilu/czjilu.wxml
rename to pages/recharge-log/recharge-log.wxml
diff --git a/pages/czjilu/czjilu.wxss b/pages/recharge-log/recharge-log.wxss
similarity index 100%
rename from pages/czjilu/czjilu.wxss
rename to pages/recharge-log/recharge-log.wxss
diff --git a/pages/tijiao/tijiao.js b/pages/submit/submit.js
similarity index 95%
rename from pages/tijiao/tijiao.js
rename to pages/submit/submit.js
index 7d42ccc..f26b7c2 100644
--- a/pages/tijiao/tijiao.js
+++ b/pages/submit/submit.js
@@ -1,547 +1,547 @@
-// pages/tijiao/tijiao.js
-const app = getApp()
-import request from '../../utils/request.js'
-// 引入弹窗服务（路径请根据项目实际调整）
-import PopupService from '../../services/popupService.js'
-
-Page({
-  data: {
-    // 全局变量
-    ossImageUrl: '',
-    apiBaseUrl: '',
-    
-    // 从商品详情页传入的数据
-    shangpinData: null,
-    shangpinId: '',
-    
-    // 表单数据
-    nicheng: '',      // 游戏昵称/ID
-    beizhu: '',       // 备注信息
-    zhiding: '',      // 指定打手ID（新增）
-    jine: 0,          // 总金额
-    
-    // 页面状态
-    isSubmitting: false,
-    canSubmit: false,
-    isPaying: false,
-    
-    // 支付相关
-    orderId: '',
-    payParams: null,
-    checkCount: 0,
-    maxCheckCount: 3
-  },
-
-  onLoad(options) {
-    // 获取全局变量
-    this.setData({
-      ossImageUrl: app.globalData.ossImageUrl || '',
-      apiBaseUrl: app.globalData.apiBaseUrl || ''
-    })
-    
-    // 设置页面标题
-    wx.setNavigationBarTitle({
-      title: '提交订单'
-    })
-    
-    // 解析传递的商品数据
-    try {
-      if (options.data) {
-        const shangpinData = JSON.parse(decodeURIComponent(options.data))
-        
-        // 处理图片URL（拼接完整路径）
-        if (shangpinData.image && !shangpinData.image.startsWith('http')) {
-          shangpinData.image = this.data.ossImageUrl + shangpinData.image
-        }
-        
-        // 处理价格显示
-        if (shangpinData.price) {
-          const price = parseFloat(shangpinData.price) || 0
-          const priceInteger = Math.floor(price)
-          let priceDecimal = '00'
-          
-          const decimalPart = (price - priceInteger).toFixed(2)
-          if (decimalPart > 0) {
-            priceDecimal = decimalPart.toString().split('.')[1]
-          }
-          
-          shangpinData.priceInteger = priceInteger
-          shangpinData.priceDecimal = priceDecimal
-        }
-        
-        // 设置商品数据
-        this.setData({
-          shangpinData: shangpinData,
-          shangpinId: shangpinData.id || '',
-          jine: parseFloat(shangpinData.price) || 0,
-        })
-      } else {
-        this.handleDataError('商品数据不完整')
-      }
-    } catch (error) {
-      this.handleDataError('解析商品数据失败')
-    }
-  },
-
-  onShow() {
-    // 原有代码：注册通知组件
-    this.registerNotificationComponent();
-    
-    // 🆕 进入页面时触发弹窗检查（PopupService 会自动判断是否展示）
-    PopupService.checkAndShow(this, 'tijiao');
-  },
-
-  // pages/tijiao/tijiao.js 中添加 onHide 方法（如果已有则合并内容）
-onHide() {
-    const popupComp = this.selectComponent('#popupNotice');
-    if (popupComp && popupComp.cleanup) {
-      popupComp.cleanup();
-    }
-  },
-
-  // 新增：注册通知组件
-  registerNotificationComponent() {
-    const app = getApp();
-    const notificationComp = this.selectComponent('#global-notification');
-    
-    if (notificationComp && notificationComp.showNotification) {
-      //console.log('🏪 商城页面注册通知组件');
-      app.globalData.globalNotification = {
-        show: (data) => notificationComp.showNotification(data),
-        hide: () => notificationComp.hideNotification()
-      };
-    }
-  },
-
-  /**
-   * 处理数据错误
-   */
-  handleDataError(errorMsg) {
-    wx.showToast({
-      title: errorMsg || '数据错误',
-      icon: 'none'
-    })
-    
-    setTimeout(() => {
-      wx.navigateBack()
-    }, 1500)
-  },
-
-  /**
-   * 游戏昵称输入事件
-   */
-  onNicknameInput(e) {
-    const value = e.detail.value.trim()
-    this.setData({
-      nicheng: value
-    }, () => {
-      this.checkFormValid()
-    })
-  },
-
-  /**
-   * 备注信息输入事件
-   */
-  onRemarkInput(e) {
-    const value = e.detail.value.trim()
-    this.setData({
-      beizhu: value
-    })
-  },
-
-  /**
-   * 指定打手ID输入事件
-   */
-  onZhidingInput(e) {
-    const value = e.detail.value.trim()
-    this.setData({
-      zhiding: value
-    })
-  },
-
-  /**
-   * 检查表单是否有效
-   */
-  checkFormValid() {
-    const { nicheng } = this.data
-    
-    const isValid = nicheng && nicheng.length > 0 && nicheng.length <= 15
-    
-    this.setData({
-      canSubmit: isValid
-    })
-  },
-
-  /**
-   * 提交订单
-   */
-  onSubmitOrder() {
-    const { nicheng, beizhu, zhiding, jine, shangpinId, canSubmit, isSubmitting } = this.data
-    
-    // 验证表单
-    if (!canSubmit) {
-      wx.showToast({
-        title: '请填写游戏昵称',
-        icon: 'none'
-      })
-      return
-    }
-    
-    // 防止重复提交
-    if (isSubmitting) {
-      return
-    }
-    
-    this.setData({ 
-      isSubmitting: true,
-      isPaying: false 
-    })
-    
-    // 显示loading（超时设为10秒）
-    wx.showLoading({
-      title: '创建订单中...',
-      mask: true
-    })
-    
-    const timeoutTimer = setTimeout(() => {
-      wx.hideLoading()
-      wx.showToast({
-        title: '网络超时，请检查您是否已登录',
-        icon: 'none'
-      })
-      this.setData({ 
-        isSubmitting: false,
-        isPaying: false 
-      })
-    }, 10000)
-    
-    // 构建请求数据（添加zhiding字段）
-    const orderData = {
-      shangpin_id: shangpinId,   // 商品ID
-      nicheng: nicheng,          // 游戏昵称
-      beizhu: beizhu || '',      // 备注（可为空）
-      zhiding: zhiding || '',    // 指定打手ID（可为空）
-      jine: jine                // 金额
-    }
-    
-    // 调用后端创建订单接口
-    request({
-      url: '/dingdan/xiadan',
-      method: 'POST',
-      data: orderData
-    })
-    .then(res => {
-      clearTimeout(timeoutTimer)
-      wx.hideLoading()
-      
-      if (res.statusCode === 200 && res.data) {
-        const response = res.data
-        
-        if (response.code === 0 && response.data) {
-          // 保存订单ID和支付参数
-          const orderId = response.data.dingdanid
-          const payParams = response.data.payParams || {}
-          
-          this.setData({
-            orderId: orderId,
-            payParams: payParams,
-            isSubmitting: false,
-            isPaying: true,
-            checkCount: 0
-          })
-          
-          // 调起微信支付
-          this.triggerWxPayment(payParams)
-        } else {
-          wx.showToast({
-            title: response.msg || '创建订单失败',
-            icon: 'none'
-          })
-          this.setData({ 
-            isSubmitting: false,
-            isPaying: false 
-          })
-        }
-      } else {
-        wx.showToast({
-          title: '网络错误，请重试',
-          icon: 'none'
-        })
-        this.setData({ 
-          isSubmitting: false,
-          isPaying: false 
-        })
-      }
-    })
-    .catch(error => {
-      clearTimeout(timeoutTimer)
-      wx.hideLoading()
-      wx.showToast({
-        title: '创建订单失败',
-        icon: 'none'
-      })
-      this.setData({ 
-        isSubmitting: false,
-        isPaying: false 
-      })
-    })
-  },
-
-  /**
-   * 调起微信支付
-   */
-  triggerWxPayment(payParams) {
-    // 验证支付参数是否完整
-    if (!payParams || !payParams.timeStamp || !payParams.nonceStr || 
-        !payParams.package || !payParams.signType || !payParams.paySign) {
-      wx.showToast({
-        title: '支付参数不完整',
-        icon: 'none'
-      })
-      this.setData({ 
-        isSubmitting: false,
-        isPaying: false 
-      })
-      return
-    }
-    
-    wx.requestPayment({
-      timeStamp: payParams.timeStamp,
-      nonceStr: payParams.nonceStr,
-      package: payParams.package,
-      signType: payParams.signType,
-      paySign: payParams.paySign,
-      
-      success: (res) => {
-        // 支付成功，开始双重确认
-        this.onPaymentSuccess()
-      },
-      
-      fail: (err) => {
-        // 根据错误类型处理
-        if (err.errMsg === 'requestPayment:fail cancel') {
-          // 用户取消支付
-          this.handleUserCancel()
-        } else {
-          // 其他支付错误
-          this.handlePaymentFail(err)
-        }
-      }
-    })
-  },
-
-  /**
-   * 处理用户取消支付
-   */
-  handleUserCancel() {
-    const { orderId } = this.data
-    
-    wx.showToast({
-      title: '已取消支付',
-      icon: 'none',
-      duration: 1500
-    })
-    
-    // 通知后端用户取消（静默请求，不阻塞用户）
-    if (orderId) {
-      request({
-        url: '/dingdan/shibai',
-        method: 'POST',
-        data: { 
-          dingdanid: orderId,
-          yuanyin: 'user_cancel'
-        }
-      }).catch(() => {
-        // 静默失败
-      })
-    }
-    
-    this.setData({ 
-      isSubmitting: false,
-      isPaying: false 
-    })
-  },
-
-  /**
-   * 处理支付失败
-   */
-  handlePaymentFail(err) {
-    const { orderId } = this.data
-    
-    wx.showToast({
-      title: '支付失败',
-      icon: 'none',
-      duration: 1500
-    })
-    
-    // 通知后端支付失败（简化流程，直接请求，不显示loading）
-    if (orderId) {
-      request({
-        url: '/dingdan/shibai',
-        method: 'POST',
-        data: { 
-          dingdanid: orderId,
-          yuanyin: 'payment_fail',
-          cuowu: err.errMsg || ''
-        }
-      }).catch(() => {
-        // 静默失败
-      }).finally(() => {
-        this.setData({ 
-          isSubmitting: false,
-          isPaying: false 
-        })
-      })
-    } else {
-      this.setData({ 
-        isSubmitting: false,
-        isPaying: false 
-      })
-    }
-  },
-
-  /**
-   * 支付成功处理（双重确认）
-   */
-  onPaymentSuccess() {
-    const { orderId } = this.data
-    
-    if (!orderId) {
-      wx.showToast({
-        title: '订单ID不存在',
-        icon: 'none'
-      })
-      this.setData({ 
-        isSubmitting: false,
-        isPaying: false 
-      })
-      return
-    }
-    
-    // 显示支付成功提示（时间缩短）
-    wx.showToast({
-      title: '支付成功，确认中...',
-      icon: 'none',
-      duration: 1500
-    })
-    
-    // 开始双重确认流程
-    this.checkOrderStatus()
-  },
-
-  /**
-   * 检查订单状态（双重确认）
-   */
-  checkOrderStatus() {
-    const { orderId, checkCount, maxCheckCount } = this.data
-    
-    // 显示加载（时间缩短）
-    wx.showLoading({
-      title: `确认支付状态${checkCount > 0 ? `(${checkCount + 1})` : ''}`,
-      mask: true
-    })
-    
-    // 超时设为5秒
-    const timeoutTimer = setTimeout(() => {
-      wx.hideLoading()
-      this.handleConfirmError('网络超时')
-    }, 5000)
-    
-    // 向后端发起支付复查请求
-    request({
-      url: '/dingdan/fucha',
-      method: 'POST',
-      data: { 
-        dingdanid: orderId
-      }
-    })
-    .then(res => {
-      clearTimeout(timeoutTimer)
-      wx.hideLoading()
-      
-      if (res.statusCode === 200 && res.data) {
-        const response = res.data
-        
-        if (response.code === 0) {
-          // 确认成功，订单状态已更新
-          this.handleConfirmSuccess()
-        } else {
-          // 后端返回错误
-          this.handleConfirmError(response.msg || '订单状态异常')
-        }
-      } else {
-        // 网络错误
-        this.handleConfirmError('网络错误')
-      }
-    })
-    .catch(error => {
-      clearTimeout(timeoutTimer)
-      wx.hideLoading()
-      this.handleConfirmError('检查失败')
-    })
-  },
-
-  /**
-   * 处理确认成功
-   */
-  handleConfirmSuccess() {
-    // 显示最终成功提示
-    wx.showToast({
-      title: '购买成功！',
-      icon: 'success',
-      duration: 1500
-    })
-    
-    // 1.5秒后跳转到首页
-    setTimeout(() => {
-      wx.switchTab({
-        url: '/pages/index/index'
-      })
-    }, 1500)
-    
-    this.setData({ 
-      isSubmitting: false,
-      isPaying: false 
-    })
-  },
-
-  /**
-   * 处理确认错误
-   */
-  handleConfirmError(errorMsg) {
-    const { checkCount, maxCheckCount } = this.data
-    const newCheckCount = checkCount + 1
-    
-    if (newCheckCount < maxCheckCount) {
-      // 还可以重试
-      this.setData({
-        checkCount: newCheckCount
-      })
-      
-      // 1秒后重试
-      setTimeout(() => {
-        this.checkOrderStatus()
-      }, 1000)
-    } else {
-      // 达到最大重试次数
-      wx.showModal({
-        title: '支付确认中',
-        content: '支付已成功，但订单状态确认异常。请稍后在订单列表中查看状态，如有问题请联系客服。',
-        showCancel: false,
-        confirmText: '我知道了',
-        success: (res) => {
-          if (res.confirm) {
-            wx.switchTab({
-              url: '/pages/index/index'
-            })
-          }
-        }
-      })
-      
-      this.setData({ 
-        isSubmitting: false,
-        isPaying: false 
-      })
-    }
-  }
+// pages/submit/submit.js
+const app = getApp()
+import request from '../../utils/request.js'
+// 引入弹窗服务（路径请根据项目实际调整）
+import PopupService from '../../services/popupService.js'
+
+Page({
+  data: {
+    // 全局变量
+    ossImageUrl: '',
+    apiBaseUrl: '',
+    
+    // 从商品详情页传入的数据
+    shangpinData: null,
+    shangpinId: '',
+    
+    // 表单数据
+    nicheng: '',      // 游戏昵称/ID
+    beizhu: '',       // 备注信息
+    zhiding: '',      // 指定打手ID（新增）
+    jine: 0,          // 总金额
+    
+    // 页面状态
+    isSubmitting: false,
+    canSubmit: false,
+    isPaying: false,
+    
+    // 支付相关
+    orderId: '',
+    payParams: null,
+    checkCount: 0,
+    maxCheckCount: 3
+  },
+
+  onLoad(options) {
+    // 获取全局变量
+    this.setData({
+      ossImageUrl: app.globalData.ossImageUrl || '',
+      apiBaseUrl: app.globalData.apiBaseUrl || ''
+    })
+    
+    // 设置页面标题
+    wx.setNavigationBarTitle({
+      title: '提交订单'
+    })
+    
+    // 解析传递的商品数据
+    try {
+      if (options.data) {
+        const shangpinData = JSON.parse(decodeURIComponent(options.data))
+        
+        // 处理图片URL（拼接完整路径）
+        if (shangpinData.image && !shangpinData.image.startsWith('http')) {
+          shangpinData.image = this.data.ossImageUrl + shangpinData.image
+        }
+        
+        // 处理价格显示
+        if (shangpinData.price) {
+          const price = parseFloat(shangpinData.price) || 0
+          const priceInteger = Math.floor(price)
+          let priceDecimal = '00'
+          
+          const decimalPart = (price - priceInteger).toFixed(2)
+          if (decimalPart > 0) {
+            priceDecimal = decimalPart.toString().split('.')[1]
+          }
+          
+          shangpinData.priceInteger = priceInteger
+          shangpinData.priceDecimal = priceDecimal
+        }
+        
+        // 设置商品数据
+        this.setData({
+          shangpinData: shangpinData,
+          shangpinId: shangpinData.id || '',
+          jine: parseFloat(shangpinData.price) || 0,
+        })
+      } else {
+        this.handleDataError('商品数据不完整')
+      }
+    } catch (error) {
+      this.handleDataError('解析商品数据失败')
+    }
+  },
+
+  onShow() {
+    // 原有代码：注册通知组件
+    this.registerNotificationComponent();
+    
+    // 🆕 进入页面时触发弹窗检查（PopupService 会自动判断是否展示）
+    PopupService.checkAndShow(this, 'tijiao');
+  },
+
+  // pages/submit/submit.js 中添加 onHide 方法（如果已有则合并内容）
+onHide() {
+    const popupComp = this.selectComponent('#popupNotice');
+    if (popupComp && popupComp.cleanup) {
+      popupComp.cleanup();
+    }
+  },
+
+  // 新增：注册通知组件
+  registerNotificationComponent() {
+    const app = getApp();
+    const notificationComp = this.selectComponent('#global-notification');
+    
+    if (notificationComp && notificationComp.showNotification) {
+      //console.log('🏪 商城页面注册通知组件');
+      app.globalData.globalNotification = {
+        show: (data) => notificationComp.showNotification(data),
+        hide: () => notificationComp.hideNotification()
+      };
+    }
+  },
+
+  /**
+   * 处理数据错误
+   */
+  handleDataError(errorMsg) {
+    wx.showToast({
+      title: errorMsg || '数据错误',
+      icon: 'none'
+    })
+    
+    setTimeout(() => {
+      wx.navigateBack()
+    }, 1500)
+  },
+
+  /**
+   * 游戏昵称输入事件
+   */
+  onNicknameInput(e) {
+    const value = e.detail.value.trim()
+    this.setData({
+      nicheng: value
+    }, () => {
+      this.checkFormValid()
+    })
+  },
+
+  /**
+   * 备注信息输入事件
+   */
+  onRemarkInput(e) {
+    const value = e.detail.value.trim()
+    this.setData({
+      beizhu: value
+    })
+  },
+
+  /**
+   * 指定打手ID输入事件
+   */
+  onZhidingInput(e) {
+    const value = e.detail.value.trim()
+    this.setData({
+      zhiding: value
+    })
+  },
+
+  /**
+   * 检查表单是否有效
+   */
+  checkFormValid() {
+    const { nicheng } = this.data
+    
+    const isValid = nicheng && nicheng.length > 0 && nicheng.length <= 15
+    
+    this.setData({
+      canSubmit: isValid
+    })
+  },
+
+  /**
+   * 提交订单
+   */
+  onSubmitOrder() {
+    const { nicheng, beizhu, zhiding, jine, shangpinId, canSubmit, isSubmitting } = this.data
+    
+    // 验证表单
+    if (!canSubmit) {
+      wx.showToast({
+        title: '请填写游戏昵称',
+        icon: 'none'
+      })
+      return
+    }
+    
+    // 防止重复提交
+    if (isSubmitting) {
+      return
+    }
+    
+    this.setData({ 
+      isSubmitting: true,
+      isPaying: false 
+    })
+    
+    // 显示loading（超时设为10秒）
+    wx.showLoading({
+      title: '创建订单中...',
+      mask: true
+    })
+    
+    const timeoutTimer = setTimeout(() => {
+      wx.hideLoading()
+      wx.showToast({
+        title: '网络超时，请检查您是否已登录',
+        icon: 'none'
+      })
+      this.setData({ 
+        isSubmitting: false,
+        isPaying: false 
+      })
+    }, 10000)
+    
+    // 构建请求数据（添加zhiding字段）
+    const orderData = {
+      shangpin_id: shangpinId,   // 商品ID
+      nicheng: nicheng,          // 游戏昵称
+      beizhu: beizhu || '',      // 备注（可为空）
+      zhiding: zhiding || '',    // 指定打手ID（可为空）
+      jine: jine                // 金额
+    }
+    
+    // 调用后端创建订单接口
+    request({
+      url: '/dingdan/xiadan',
+      method: 'POST',
+      data: orderData
+    })
+    .then(res => {
+      clearTimeout(timeoutTimer)
+      wx.hideLoading()
+      
+      if (res.statusCode === 200 && res.data) {
+        const response = res.data
+        
+        if (response.code === 0 && response.data) {
+          // 保存订单ID和支付参数
+          const orderId = response.data.dingdanid
+          const payParams = response.data.payParams || {}
+          
+          this.setData({
+            orderId: orderId,
+            payParams: payParams,
+            isSubmitting: false,
+            isPaying: true,
+            checkCount: 0
+          })
+          
+          // 调起微信支付
+          this.triggerWxPayment(payParams)
+        } else {
+          wx.showToast({
+            title: response.msg || '创建订单失败',
+            icon: 'none'
+          })
+          this.setData({ 
+            isSubmitting: false,
+            isPaying: false 
+          })
+        }
+      } else {
+        wx.showToast({
+          title: '网络错误，请重试',
+          icon: 'none'
+        })
+        this.setData({ 
+          isSubmitting: false,
+          isPaying: false 
+        })
+      }
+    })
+    .catch(error => {
+      clearTimeout(timeoutTimer)
+      wx.hideLoading()
+      wx.showToast({
+        title: '创建订单失败',
+        icon: 'none'
+      })
+      this.setData({ 
+        isSubmitting: false,
+        isPaying: false 
+      })
+    })
+  },
+
+  /**
+   * 调起微信支付
+   */
+  triggerWxPayment(payParams) {
+    // 验证支付参数是否完整
+    if (!payParams || !payParams.timeStamp || !payParams.nonceStr || 
+        !payParams.package || !payParams.signType || !payParams.paySign) {
+      wx.showToast({
+        title: '支付参数不完整',
+        icon: 'none'
+      })
+      this.setData({ 
+        isSubmitting: false,
+        isPaying: false 
+      })
+      return
+    }
+    
+    wx.requestPayment({
+      timeStamp: payParams.timeStamp,
+      nonceStr: payParams.nonceStr,
+      package: payParams.package,
+      signType: payParams.signType,
+      paySign: payParams.paySign,
+      
+      success: (res) => {
+        // 支付成功，开始双重确认
+        this.onPaymentSuccess()
+      },
+      
+      fail: (err) => {
+        // 根据错误类型处理
+        if (err.errMsg === 'requestPayment:fail cancel') {
+          // 用户取消支付
+          this.handleUserCancel()
+        } else {
+          // 其他支付错误
+          this.handlePaymentFail(err)
+        }
+      }
+    })
+  },
+
+  /**
+   * 处理用户取消支付
+   */
+  handleUserCancel() {
+    const { orderId } = this.data
+    
+    wx.showToast({
+      title: '已取消支付',
+      icon: 'none',
+      duration: 1500
+    })
+    
+    // 通知后端用户取消（静默请求，不阻塞用户）
+    if (orderId) {
+      request({
+        url: '/dingdan/shibai',
+        method: 'POST',
+        data: { 
+          dingdanid: orderId,
+          yuanyin: 'user_cancel'
+        }
+      }).catch(() => {
+        // 静默失败
+      })
+    }
+    
+    this.setData({ 
+      isSubmitting: false,
+      isPaying: false 
+    })
+  },
+
+  /**
+   * 处理支付失败
+   */
+  handlePaymentFail(err) {
+    const { orderId } = this.data
+    
+    wx.showToast({
+      title: '支付失败',
+      icon: 'none',
+      duration: 1500
+    })
+    
+    // 通知后端支付失败（简化流程，直接请求，不显示loading）
+    if (orderId) {
+      request({
+        url: '/dingdan/shibai',
+        method: 'POST',
+        data: { 
+          dingdanid: orderId,
+          yuanyin: 'payment_fail',
+          cuowu: err.errMsg || ''
+        }
+      }).catch(() => {
+        // 静默失败
+      }).finally(() => {
+        this.setData({ 
+          isSubmitting: false,
+          isPaying: false 
+        })
+      })
+    } else {
+      this.setData({ 
+        isSubmitting: false,
+        isPaying: false 
+      })
+    }
+  },
+
+  /**
+   * 支付成功处理（双重确认）
+   */
+  onPaymentSuccess() {
+    const { orderId } = this.data
+    
+    if (!orderId) {
+      wx.showToast({
+        title: '订单ID不存在',
+        icon: 'none'
+      })
+      this.setData({ 
+        isSubmitting: false,
+        isPaying: false 
+      })
+      return
+    }
+    
+    // 显示支付成功提示（时间缩短）
+    wx.showToast({
+      title: '支付成功，确认中...',
+      icon: 'none',
+      duration: 1500
+    })
+    
+    // 开始双重确认流程
+    this.checkOrderStatus()
+  },
+
+  /**
+   * 检查订单状态（双重确认）
+   */
+  checkOrderStatus() {
+    const { orderId, checkCount, maxCheckCount } = this.data
+    
+    // 显示加载（时间缩短）
+    wx.showLoading({
+      title: `确认支付状态${checkCount > 0 ? `(${checkCount + 1})` : ''}`,
+      mask: true
+    })
+    
+    // 超时设为5秒
+    const timeoutTimer = setTimeout(() => {
+      wx.hideLoading()
+      this.handleConfirmError('网络超时')
+    }, 5000)
+    
+    // 向后端发起支付复查请求
+    request({
+      url: '/dingdan/fucha',
+      method: 'POST',
+      data: { 
+        dingdanid: orderId
+      }
+    })
+    .then(res => {
+      clearTimeout(timeoutTimer)
+      wx.hideLoading()
+      
+      if (res.statusCode === 200 && res.data) {
+        const response = res.data
+        
+        if (response.code === 0) {
+          // 确认成功，订单状态已更新
+          this.handleConfirmSuccess()
+        } else {
+          // 后端返回错误
+          this.handleConfirmError(response.msg || '订单状态异常')
+        }
+      } else {
+        // 网络错误
+        this.handleConfirmError('网络错误')
+      }
+    })
+    .catch(error => {
+      clearTimeout(timeoutTimer)
+      wx.hideLoading()
+      this.handleConfirmError('检查失败')
+    })
+  },
+
+  /**
+   * 处理确认成功
+   */
+  handleConfirmSuccess() {
+    // 显示最终成功提示
+    wx.showToast({
+      title: '购买成功！',
+      icon: 'success',
+      duration: 1500
+    })
+    
+    // 1.5秒后跳转到首页
+    setTimeout(() => {
+      wx.switchTab({
+        url: '/pages/index/index'
+      })
+    }, 1500)
+    
+    this.setData({ 
+      isSubmitting: false,
+      isPaying: false 
+    })
+  },
+
+  /**
+   * 处理确认错误
+   */
+  handleConfirmError(errorMsg) {
+    const { checkCount, maxCheckCount } = this.data
+    const newCheckCount = checkCount + 1
+    
+    if (newCheckCount < maxCheckCount) {
+      // 还可以重试
+      this.setData({
+        checkCount: newCheckCount
+      })
+      
+      // 1秒后重试
+      setTimeout(() => {
+        this.checkOrderStatus()
+      }, 1000)
+    } else {
+      // 达到最大重试次数
+      wx.showModal({
+        title: '支付确认中',
+        content: '支付已成功，但订单状态确认异常。请稍后在订单列表中查看状态，如有问题请联系客服。',
+        showCancel: false,
+        confirmText: '我知道了',
+        success: (res) => {
+          if (res.confirm) {
+            wx.switchTab({
+              url: '/pages/index/index'
+            })
+          }
+        }
+      })
+      
+      this.setData({ 
+        isSubmitting: false,
+        isPaying: false 
+      })
+    }
+  }
 })
\ No newline at end of file
diff --git a/pages/wodedashou/wodedashou.json b/pages/submit/submit.json
similarity index 100%
rename from pages/wodedashou/wodedashou.json
rename to pages/submit/submit.json
diff --git a/pages/tijiao/tijiao.wxml b/pages/submit/submit.wxml
similarity index 96%
rename from pages/tijiao/tijiao.wxml
rename to pages/submit/submit.wxml
index 3a6b85e..7d65224 100644
--- a/pages/tijiao/tijiao.wxml
+++ b/pages/submit/submit.wxml
@@ -1,124 +1,124 @@
-<!--pages/tijiao/tijiao.wxml-->
-<view class="submit-page">
-  <!-- 商品信息区域 -->
-  <view class="product-section">
-    <view class="product-card">
-      <!-- 商品图片 -->
-      <view class="product-image-box">
-        <image 
-          src="{{shangpinData && shangpinData.image ? shangpinData.image : ''}}" 
-          mode="aspectFill" 
-          class="product-image"
-        />
-      </view>
-      
-      <!-- 商品信息 -->
-      <view class="product-info">
-        <view class="product-title">
-          <text class="title-text">{{shangpinData && shangpinData.title ? shangpinData.title : '商品标题'}}</text>
-        </view>
-        
-        <!-- 价格信息 -->
-        <view class="price-info">
-          <text class="price-label">价格：</text>
-          <view class="price-value">
-            <text class="price-icon">¥</text>
-            <text class="price-integer">{{shangpinData && shangpinData.priceInteger ? shangpinData.priceInteger : '0'}}</text>
-            <text class="price-decimal">.{{shangpinData && shangpinData.priceDecimal ? shangpinData.priceDecimal : '00'}}</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-  
-  <!-- 表单区域（左右布局） -->
-  <view class="form-section">
-    <view class="form-card">
-      <!-- 游戏昵称 - 左右布局 -->
-      <view class="form-item-row">
-        <view class="item-label-row">
-          <text class="label-text-bold">昵称</text>
-          <text class="label-required">*</text>
-        </view>
-        <input 
-          class="item-input-row"
-          type="text"
-          placeholder="请输入您的昵称"
-          placeholder-class="input-placeholder-gray"
-          maxlength="15"
-          value="{{nicheng}}"
-          bindinput="onNicknameInput"
-        />
-      </view>
-      
-      <!-- 备注信息 - 左右布局 -->
-      <view class="form-item-row">
-        <view class="item-label-row">
-          <text class="label-text-bold">备注</text>
-        </view>
-        <input 
-          class="item-input-row"
-          type="text"
-          placeholder="请补充您要补充的其他联系信息"
-          placeholder-class="input-placeholder-gray"
-          maxlength="30"
-          value="{{beizhu}}"
-          bindinput="onRemarkInput"
-        />
-      </view>
-      
-      <!-- 指定打手ID - 左右布局 -->
-      <view class="form-item-row">
-        <view class="item-label-row">
-          <text class="label-text-bold">指定服务者ID(选填)</text>
-        </view>
-        <input 
-          class="item-input-row"
-          type="text"
-          placeholder="填写您需要指定的服务者"
-          placeholder-class="input-placeholder-gray"
-          maxlength="20"
-          value="{{zhiding}}"
-          bindinput="onZhidingInput"
-        />
-      </view>
-      
-      <!-- 支付方式 -->
-      <view class="payment-item">
-        <view class="payment-method">
-          <image src="/images/weixinzhifu.png" class="payment-icon" />
-          <text class="payment-text">微信支付</text>
-          <view class="payment-checkbox">
-            <text class="checkbox-text">✓</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-  
-  <!-- 底部操作栏 -->
-  <view class="footer-section">
-    <view class="total-price">
-      <text class="total-label">总价：</text>
-      <view class="total-value">
-        <text class="price-icon">¥</text>
-        <text class="price-integer">{{shangpinData && shangpinData.priceInteger ? shangpinData.priceInteger : '0'}}</text>
-        <text class="price-decimal">.{{shangpinData && shangpinData.priceDecimal ? shangpinData.priceDecimal : '00'}}</text>
-      </view>
-    </view>
-    
-    <view 
-      class="submit-btn {{canSubmit && !isSubmitting ? 'submit-btn-active' : 'submit-btn-disabled'}}" 
-      bindtap="onSubmitOrder"
-    >
-      <text class="btn-text">{{isSubmitting ? '提交中...' : '提交订单'}}</text>
-      <view class="btn-glow"></view>
-    </view>
-  </view>
-
-  <!-- 全局通知组件 -->
-  <global-notification id="global-notification" />
-
-  <!-- 弹窗公告组件（供 PopupService 调用） -->
-  <popup-notice id="popupNotice" />
+<!--pages/submit/submit.wxml-->
+<view class="submit-page">
+  <!-- 商品信息区域 -->
+  <view class="product-section">
+    <view class="product-card">
+      <!-- 商品图片 -->
+      <view class="product-image-box">
+        <image 
+          src="{{shangpinData && shangpinData.image ? shangpinData.image : ''}}" 
+          mode="aspectFill" 
+          class="product-image"
+        />
+      </view>
+      
+      <!-- 商品信息 -->
+      <view class="product-info">
+        <view class="product-title">
+          <text class="title-text">{{shangpinData && shangpinData.title ? shangpinData.title : '商品标题'}}</text>
+        </view>
+        
+        <!-- 价格信息 -->
+        <view class="price-info">
+          <text class="price-label">价格：</text>
+          <view class="price-value">
+            <text class="price-icon">¥</text>
+            <text class="price-integer">{{shangpinData && shangpinData.priceInteger ? shangpinData.priceInteger : '0'}}</text>
+            <text class="price-decimal">.{{shangpinData && shangpinData.priceDecimal ? shangpinData.priceDecimal : '00'}}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  
+  <!-- 表单区域（左右布局） -->
+  <view class="form-section">
+    <view class="form-card">
+      <!-- 游戏昵称 - 左右布局 -->
+      <view class="form-item-row">
+        <view class="item-label-row">
+          <text class="label-text-bold">昵称</text>
+          <text class="label-required">*</text>
+        </view>
+        <input 
+          class="item-input-row"
+          type="text"
+          placeholder="请输入您的昵称"
+          placeholder-class="input-placeholder-gray"
+          maxlength="15"
+          value="{{nicheng}}"
+          bindinput="onNicknameInput"
+        />
+      </view>
+      
+      <!-- 备注信息 - 左右布局 -->
+      <view class="form-item-row">
+        <view class="item-label-row">
+          <text class="label-text-bold">备注</text>
+        </view>
+        <input 
+          class="item-input-row"
+          type="text"
+          placeholder="请补充您要补充的其他联系信息"
+          placeholder-class="input-placeholder-gray"
+          maxlength="30"
+          value="{{beizhu}}"
+          bindinput="onRemarkInput"
+        />
+      </view>
+      
+      <!-- 指定打手ID - 左右布局 -->
+      <view class="form-item-row">
+        <view class="item-label-row">
+          <text class="label-text-bold">指定服务者ID(选填)</text>
+        </view>
+        <input 
+          class="item-input-row"
+          type="text"
+          placeholder="填写您需要指定的服务者"
+          placeholder-class="input-placeholder-gray"
+          maxlength="20"
+          value="{{zhiding}}"
+          bindinput="onZhidingInput"
+        />
+      </view>
+      
+      <!-- 支付方式 -->
+      <view class="payment-item">
+        <view class="payment-method">
+          <image src="/images/weixinzhifu.png" class="payment-icon" />
+          <text class="payment-text">微信支付</text>
+          <view class="payment-checkbox">
+            <text class="checkbox-text">✓</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  
+  <!-- 底部操作栏 -->
+  <view class="footer-section">
+    <view class="total-price">
+      <text class="total-label">总价：</text>
+      <view class="total-value">
+        <text class="price-icon">¥</text>
+        <text class="price-integer">{{shangpinData && shangpinData.priceInteger ? shangpinData.priceInteger : '0'}}</text>
+        <text class="price-decimal">.{{shangpinData && shangpinData.priceDecimal ? shangpinData.priceDecimal : '00'}}</text>
+      </view>
+    </view>
+    
+    <view 
+      class="submit-btn {{canSubmit && !isSubmitting ? 'submit-btn-active' : 'submit-btn-disabled'}}" 
+      bindtap="onSubmitOrder"
+    >
+      <text class="btn-text">{{isSubmitting ? '提交中...' : '提交订单'}}</text>
+      <view class="btn-glow"></view>
+    </view>
+  </view>
+
+  <!-- 全局通知组件 -->
+  <global-notification id="global-notification" />
+
+  <!-- 弹窗公告组件（供 PopupService 调用） -->
+  <popup-notice id="popupNotice" />
 </view>
\ No newline at end of file
diff --git a/pages/tijiao/tijiao.wxss b/pages/submit/submit.wxss
similarity index 94%
rename from pages/tijiao/tijiao.wxss
rename to pages/submit/submit.wxss
index c622155..484080e 100644
--- a/pages/tijiao/tijiao.wxss
+++ b/pages/submit/submit.wxss
@@ -1,280 +1,280 @@
-/* pages/tijiao/tijiao.wxss */
-
-.submit-page {
-    display: flex;
-    flex-direction: column;
-    min-height: 100vh;
-    background: linear-gradient(135deg, #f8f9ff 0%, #f0f3ff 100%);
-    box-sizing: border-box;
-  }
-  
-  /* 商品信息区域 */
-  .product-section {
-    padding: 30rpx 30rpx 20rpx 30rpx;
-    flex-shrink: 0;
-  }
-  
-  .product-card {
-    background: white;
-    border-radius: 20rpx;
-    padding: 30rpx;
-    display: flex;
-    align-items: center;
-    box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.06);
-  }
-  
-  .product-image-box {
-    width: 160rpx;
-    height: 160rpx;
-    border-radius: 16rpx;
-    overflow: hidden;
-    background: #f5f5f5;
-    flex-shrink: 0;
-    margin-right: 24rpx;
-  }
-  
-  .product-image {
-    width: 100%;
-    height: 100%;
-  }
-  
-  .product-info {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    height: 160rpx;
-  }
-  
-  .product-title {
-    margin-bottom: 20rpx;
-  }
-  
-  .title-text {
-    font-size: 30rpx;
-    font-weight: 600;
-    color: #222;
-    line-height: 1.4;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-  }
-  
-  .price-info {
-    display: flex;
-    align-items: baseline;
-  }
-  
-  .price-label {
-    font-size: 26rpx;
-    color: #666;
-    font-weight: 500;
-  }
-  
-  .price-value {
-    display: flex;
-    align-items: baseline;
-  }
-  
-  .price-icon {
-    font-size: 28rpx;
-    color: #ff4d4f;
-    font-weight: 600;
-  }
-  
-  .price-integer {
-    font-size: 38rpx;
-    color: #ff4d4f;
-    font-weight: 700;
-    margin-left: 4rpx;
-  }
-  
-  .price-decimal {
-    font-size: 28rpx;
-    color: #ff4d4f;
-    font-weight: 600;
-  }
-  
-  /* 表单区域 */
-  .form-section {
-    padding: 0 30rpx 20rpx 30rpx;
-    flex-shrink: 0;
-  }
-  
-  .form-card {
-    background: white;
-    border-radius: 20rpx;
-    padding: 30rpx;
-    box-shadow: 0 6rpx 24rpx rgba(0, 0, 0, 0.05);
-  }
-  
-  .form-item-row {
-    display: flex;
-    align-items: center;
-    padding: 25rpx 0;
-    border-bottom: 1rpx solid #f5f5f5;
-  }
-  
-  .form-item-row:last-child {
-    border-bottom: none;
-  }
-  
-  .item-label-row {
-    width: 220rpx;
-    flex-shrink: 0;
-    display: flex;
-    align-items: center;
-  }
-  
-  .label-text-bold {
-    font-size: 30rpx;
-    font-weight: 600;
-    color: #333;
-  }
-  
-  .label-required {
-    font-size: 30rpx;
-    color: #ff4d4f;
-    margin-left: 8rpx;
-  }
-  
-  .item-input-row {
-    flex: 1;
-    font-size: 28rpx;
-    color: #222;
-    height: 60rpx;
-    line-height: 60rpx;
-    padding: 0 20rpx;
-    text-align: right;
-    background: #fafafa;
-    border-radius: 10rpx;
-  }
-  
-  .input-placeholder-gray {
-    color: #999;
-    font-size: 28rpx;
-  }
-  
-  /* 支付方式 */
-  .payment-item {
-    margin-top: 30rpx;
-    padding-top: 30rpx;
-    border-top: 1rpx solid #f0f0f0;
-  }
-  
-  .payment-method {
-    display: flex;
-    align-items: center;
-    padding: 20rpx 0;
-  }
-  
-  .payment-icon {
-    width: 48rpx;
-    height: 48rpx;
-    margin-right: 20rpx;
-  }
-  
-  .payment-text {
-    font-size: 28rpx;
-    color: #333;
-    font-weight: 500;
-    flex: 1;
-  }
-  
-  .payment-checkbox {
-    width: 40rpx;
-    height: 40rpx;
-    border-radius: 50%;
-    background: #52c41a;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  
-  .checkbox-text {
-    color: white;
-    font-size: 28rpx;
-    font-weight: 600;
-  }
-  
-  /* 底部操作栏 */
-  .footer-section {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 20rpx 30rpx;
-    background: white;
-    box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.08);
-    margin-top: auto;
-    flex-shrink: 0;
-  }
-  
-  .total-price {
-    display: flex;
-    align-items: baseline;
-    flex: 1;
-  }
-  
-  .total-label {
-    font-size: 30rpx;
-    color: #333;
-    font-weight: 600;
-  }
-  
-  .total-value {
-    display: flex;
-    align-items: baseline;
-  }
-  
-  .submit-btn {
-    width: 240rpx;
-    height: 88rpx;
-    border-radius: 44rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: relative;
-    overflow: hidden;
-    transition: all 0.3s;
-  }
-  
-  .submit-btn-active {
-    background: linear-gradient(135deg, #52c41a, #389e0d);
-    box-shadow: 0 8rpx 32rpx rgba(255, 77, 79, 0.4);
-  }
-  
-  .submit-btn-disabled {
-    background: #ccc;
-    box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
-  }
-  
-  .submit-btn-active:active {
-    transform: scale(0.98);
-    box-shadow: 0 4rpx 20rpx rgba(255, 77, 79, 0.5);
-  }
-  
-  .btn-text {
-    font-size: 32rpx;
-    color: white;
-    font-weight: 600;
-    position: relative;
-    z-index: 2;
-  }
-  
-  .btn-glow {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
-    transform: translateX(-100%);
-    animation: btnGlow 3s infinite;
-  }
-  
-  @keyframes btnGlow {
-    0% { transform: translateX(-100%); }
-    50% { transform: translateX(100%); }
-    100% { transform: translateX(100%); }
+/* pages/submit/submit.wxss */
+
+.submit-page {
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
+    background: linear-gradient(135deg, #f8f9ff 0%, #f0f3ff 100%);
+    box-sizing: border-box;
+  }
+  
+  /* 商品信息区域 */
+  .product-section {
+    padding: 30rpx 30rpx 20rpx 30rpx;
+    flex-shrink: 0;
+  }
+  
+  .product-card {
+    background: white;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    display: flex;
+    align-items: center;
+    box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.06);
+  }
+  
+  .product-image-box {
+    width: 160rpx;
+    height: 160rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+    background: #f5f5f5;
+    flex-shrink: 0;
+    margin-right: 24rpx;
+  }
+  
+  .product-image {
+    width: 100%;
+    height: 100%;
+  }
+  
+  .product-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 160rpx;
+  }
+  
+  .product-title {
+    margin-bottom: 20rpx;
+  }
+  
+  .title-text {
+    font-size: 30rpx;
+    font-weight: 600;
+    color: #222;
+    line-height: 1.4;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+  }
+  
+  .price-info {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .price-label {
+    font-size: 26rpx;
+    color: #666;
+    font-weight: 500;
+  }
+  
+  .price-value {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .price-icon {
+    font-size: 28rpx;
+    color: #ff4d4f;
+    font-weight: 600;
+  }
+  
+  .price-integer {
+    font-size: 38rpx;
+    color: #ff4d4f;
+    font-weight: 700;
+    margin-left: 4rpx;
+  }
+  
+  .price-decimal {
+    font-size: 28rpx;
+    color: #ff4d4f;
+    font-weight: 600;
+  }
+  
+  /* 表单区域 */
+  .form-section {
+    padding: 0 30rpx 20rpx 30rpx;
+    flex-shrink: 0;
+  }
+  
+  .form-card {
+    background: white;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    box-shadow: 0 6rpx 24rpx rgba(0, 0, 0, 0.05);
+  }
+  
+  .form-item-row {
+    display: flex;
+    align-items: center;
+    padding: 25rpx 0;
+    border-bottom: 1rpx solid #f5f5f5;
+  }
+  
+  .form-item-row:last-child {
+    border-bottom: none;
+  }
+  
+  .item-label-row {
+    width: 220rpx;
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+  }
+  
+  .label-text-bold {
+    font-size: 30rpx;
+    font-weight: 600;
+    color: #333;
+  }
+  
+  .label-required {
+    font-size: 30rpx;
+    color: #ff4d4f;
+    margin-left: 8rpx;
+  }
+  
+  .item-input-row {
+    flex: 1;
+    font-size: 28rpx;
+    color: #222;
+    height: 60rpx;
+    line-height: 60rpx;
+    padding: 0 20rpx;
+    text-align: right;
+    background: #fafafa;
+    border-radius: 10rpx;
+  }
+  
+  .input-placeholder-gray {
+    color: #999;
+    font-size: 28rpx;
+  }
+  
+  /* 支付方式 */
+  .payment-item {
+    margin-top: 30rpx;
+    padding-top: 30rpx;
+    border-top: 1rpx solid #f0f0f0;
+  }
+  
+  .payment-method {
+    display: flex;
+    align-items: center;
+    padding: 20rpx 0;
+  }
+  
+  .payment-icon {
+    width: 48rpx;
+    height: 48rpx;
+    margin-right: 20rpx;
+  }
+  
+  .payment-text {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: 500;
+    flex: 1;
+  }
+  
+  .payment-checkbox {
+    width: 40rpx;
+    height: 40rpx;
+    border-radius: 50%;
+    background: #52c41a;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .checkbox-text {
+    color: white;
+    font-size: 28rpx;
+    font-weight: 600;
+  }
+  
+  /* 底部操作栏 */
+  .footer-section {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20rpx 30rpx;
+    background: white;
+    box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.08);
+    margin-top: auto;
+    flex-shrink: 0;
+  }
+  
+  .total-price {
+    display: flex;
+    align-items: baseline;
+    flex: 1;
+  }
+  
+  .total-label {
+    font-size: 30rpx;
+    color: #333;
+    font-weight: 600;
+  }
+  
+  .total-value {
+    display: flex;
+    align-items: baseline;
+  }
+  
+  .submit-btn {
+    width: 240rpx;
+    height: 88rpx;
+    border-radius: 44rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+    transition: all 0.3s;
+  }
+  
+  .submit-btn-active {
+    background: linear-gradient(135deg, #52c41a, #389e0d);
+    box-shadow: 0 8rpx 32rpx rgba(255, 77, 79, 0.4);
+  }
+  
+  .submit-btn-disabled {
+    background: #ccc;
+    box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1);
+  }
+  
+  .submit-btn-active:active {
+    transform: scale(0.98);
+    box-shadow: 0 4rpx 20rpx rgba(255, 77, 79, 0.5);
+  }
+  
+  .btn-text {
+    font-size: 32rpx;
+    color: white;
+    font-weight: 600;
+    position: relative;
+    z-index: 2;
+  }
+  
+  .btn-glow {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
+    transform: translateX(-100%);
+    animation: btnGlow 3s infinite;
+  }
+  
+  @keyframes btnGlow {
+    0% { transform: translateX(-100%); }
+    50% { transform: translateX(100%); }
+    100% { transform: translateX(100%); }
   }
\ No newline at end of file
diff --git a/pages/renzheng/renzheng.js b/pages/verify/verify.js
similarity index 89%
rename from pages/renzheng/renzheng.js
rename to pages/verify/verify.js
index 99703cc..1bb9cde 100644
--- a/pages/renzheng/renzheng.js
+++ b/pages/verify/verify.js
@@ -1,169 +1,169 @@
-// pages/renzheng/renzheng.js
-import request from '../../utils/request.js'
-import { enterLockedRole } from '../../utils/primary-role.js'
-
-const API_MAP = {
-  dashou:    '/yonghu/dashouzhuce',
-  shangjia:  '/yonghu/shangjiahuce',
-  guanshi:   '/yonghu/guanshizhuce',
-  zuzhang:   '/yonghu/zuzhangzhuce',
-  kaoheguan: '/dengji/khgzc'                  // 🆕 考核官注册接口
-}
-
-const STATUS_KEY_MAP = {
-  dashou:    'dashoustatus',
-  shangjia:  'shangjiastatus',
-  guanshi:   'guanshistatus',
-  zuzhang:   'zuzhangstatus',
-  kaoheguan: 'kaoheguanstatus'                // 🆕 考核官缓存键
-}
-
-const NAME_MAP = {
-  dashou:    '接单员',
-  shangjia:  '商家',
-  guanshi:   '管事',
-  zuzhang:   '组长',
-  kaoheguan: '考核官'                         // 🆕 考核官中文名
-}
-
-Page({
-  data: {
-    authType: '',
-    authName: '',
-    pageState: 'need_register',
-    inviteCode: '',
-    isLoading: false,
-  },
-
-  onLoad(options) {
-    const type = options.type || ''
-    if (!API_MAP[type]) {
-      wx.showToast({ title: '认证类型错误', icon: 'none' })
-      setTimeout(() => wx.navigateBack(), 1500)
-      return
-    }
-    this.setData({ authType: type, authName: NAME_MAP[type] })
-    this.checkStatus()
-  },
-
-  onShow() {
-    if (this.data.authType) this.checkStatus()
-  },
-
-  checkStatus() {
-    const key = STATUS_KEY_MAP[this.data.authType]
-    const val = wx.getStorageSync(key)
-    if (val === 1) {
-      this.setData({ pageState: 'done' })
-    } else {
-      this.setData({ pageState: 'need_register' })
-    }
-  },
-
-  onInviteCodeInput(e) {
-    this.setData({ inviteCode: e.detail.value.trim() })
-  },
-
-  async onRegister() {
-    const { inviteCode, authType } = this.data
-    if (!inviteCode) {
-      wx.showToast({ title: '请输入邀请码', icon: 'none' })
-      return
-    }
-    if (inviteCode.length > 100) {
-      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none' })
-      return
-    }
-
-    this.setData({ isLoading: true })
-    wx.showLoading({ title: '注册中...', mask: true })
-
-    try {
-      const res = await request({
-        url: API_MAP[authType],
-        method: 'POST',
-        data: { inviteCode }
-      })
-
-      if (res && res.data.code === 200) {
-        const data = res.data.data || res.data
-        const app = getApp()
-
-        // ----- 缓存身份状态（完全由后端决定） -----
-        const key = STATUS_KEY_MAP[authType]
-        if (data[key] !== undefined) {
-          wx.setStorageSync(key, data[key])
-          app.globalData[key] = data[key]
-        } else {
-          wx.setStorageSync(key, 1)
-          app.globalData[key] = 1
-        }
-
-        // 更新其他可能返回的身份状态字段
-        const allKeys = ['dashoustatus', 'shangjiastatus', 'guanshistatus', 'zuzhangstatus', 'kaoheguanstatus'] // 🆕 新增
-        allKeys.forEach(k => {
-          if (data[k] !== undefined && k !== key) {
-            wx.setStorageSync(k, data[k])
-            app.globalData[k] = data[k]
-          }
-        })
-
-        // 保存各身份详细信息（参照各注册页面的处理）
-        if (authType === 'dashou') {
-          const fields = ['dashounicheng','zhanghaostatus','yongjin','zonge','yajin','chenghao','jifen','clumber','chengjiaoliang','zaixianzhuangtai']
-          fields.forEach(f => { if (data[f] !== undefined) app.globalData[f] = data[f] })
-        } else if (authType === 'shangjia') {
-          app.globalData.shangjia = app.globalData.shangjia || {}
-          const sf = ['nicheng','sjyue','fabu','chengjiao','tuikuan','jinridingdan','jinriliushui','jinyuedingdan','jinyueliushui','zhuangtai']
-          sf.forEach(f => { if (data[f] !== undefined) app.globalData.shangjia[f] = data[f] })
-        } else if (authType === 'guanshi') {
-          app.globalData.guanshi = app.globalData.guanshi || {}
-          const gf = ['gszhstatus','yaoqingzongshu','fenyongzonge','fenyongtixian','yichongzhiDashou']
-          gf.forEach(f => { if (data[f] !== undefined) app.globalData.guanshi[f] = data[f] })
-        } else if (authType === 'zuzhang') {
-          const zf = ['ketixian','guanshiCount','fenhongZonge']
-          zf.forEach(f => { if (data[f] !== undefined) app.globalData[f] = data[f] })
-        } else if (authType === 'kaoheguan') {                        // 🆕 考核官数据更新
-          app.globalData.kaoheguan = app.globalData.kaoheguan || {}
-          const kf = ['shenhe_zongshu','tongguo_zongshu','yue','zonge','shenhe_zhuangtai','bankuai_list']
-          kf.forEach(f => { if (data[f] !== undefined) app.globalData.kaoheguan[f] = data[f] })
-        }
-
-        wx.hideLoading()
-        this.setData({ isLoading: false, pageState: 'done' })
-        wx.showToast({ title: '认证成功', icon: 'success' })
-
-        if (authType === 'dashou' || authType === 'shangjia') {
-          setTimeout(() => enterLockedRole(authType), 1200)
-        } else if (authType === 'guanshi') {
-          setTimeout(() => {
-            const pages = getCurrentPages()
-            if (pages.length > 1) {
-              wx.navigateBack()
-            } else {
-              wx.redirectTo({ url: '/pages/dashouduan/dashouduan' })
-            }
-          }, 800)
-        }
-      } else {
-        wx.hideLoading()
-        this.setData({ isLoading: false })
-        wx.showToast({ title: res?.data?.msg || '注册失败', icon: 'none' })
-      }
-    } catch (err) {
-      wx.hideLoading()
-      this.setData({ isLoading: false })
-      wx.showToast({ title: err.message || '注册失败', icon: 'none' })
-    }
-  },
-
-  goToKefu() {
-    const app = getApp()
-    const { link, enterpriseId } = app.globalData.kefuConfig || {}
-    if (!link || !enterpriseId) {
-      wx.showToast({ title: '客服配置未加载', icon: 'none' })
-      return
-    }
-    wx.openCustomerServiceChat({ extInfo: { url: link }, corpId: enterpriseId })
-  }
+// pages/verify/verify.js
+import request from '../../utils/request.js'
+import { enterLockedRole } from '../../utils/primary-role.js'
+
+const API_MAP = {
+  dashou:    '/yonghu/dashouzhuce',
+  shangjia:  '/yonghu/shangjiahuce',
+  guanshi:   '/yonghu/guanshizhuce',
+  zuzhang:   '/yonghu/zuzhangzhuce',
+  kaoheguan: '/dengji/khgzc'
+}
+
+const STATUS_KEY_MAP = {
+  dashou:    'dashoustatus',
+  shangjia:  'shangjiastatus',
+  guanshi:   'guanshistatus',
+  zuzhang:   'zuzhangstatus',
+  kaoheguan: 'kaoheguanstatus'
+}
+
+const NAME_MAP = {
+  dashou:    '接单员',
+  shangjia:  '商家',
+  guanshi:   '管事',
+  zuzhang:   '组长',
+  kaoheguan: '考核官'
+}
+
+Page({
+  data: {
+    authType: '',
+    authName: '',
+    pageState: 'need_register',
+    inviteCode: '',
+    isLoading: false,
+  },
+
+  onLoad(options) {
+    const type = options.type || ''
+    if (!API_MAP[type]) {
+      wx.showToast({ title: '认证类型错误', icon: 'none' })
+      setTimeout(() => wx.navigateBack(), 1500)
+      return
+    }
+    this.setData({ authType: type, authName: NAME_MAP[type] })
+    this.checkStatus()
+  },
+
+  onShow() {
+    if (this.data.authType) this.checkStatus()
+  },
+
+  checkStatus() {
+    const key = STATUS_KEY_MAP[this.data.authType]
+    const val = wx.getStorageSync(key)
+    if (val === 1) {
+      this.setData({ pageState: 'done' })
+    } else {
+      this.setData({ pageState: 'need_register' })
+    }
+  },
+
+  onInviteCodeInput(e) {
+    this.setData({ inviteCode: e.detail.value.trim() })
+  },
+
+  async onRegister() {
+    const { inviteCode, authType } = this.data
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none' })
+      return
+    }
+    if (inviteCode.length > 100) {
+      wx.showToast({ title: '邀请码不能超过100字符', icon: 'none' })
+      return
+    }
+
+    this.setData({ isLoading: true })
+    wx.showLoading({ title: '注册中...', mask: true })
+
+    try {
+      const res = await request({
+        url: API_MAP[authType],
+        method: 'POST',
+        data: { inviteCode }
+      })
+
+      if (res && res.data.code === 200) {
+        const data = res.data.data || res.data
+        const app = getApp()
+
+        // 缓存身份状态
+        const key = STATUS_KEY_MAP[authType]
+        if (data[key] !== undefined) {
+          wx.setStorageSync(key, data[key])
+          app.globalData[key] = data[key]
+        } else {
+          wx.setStorageSync(key, 1)
+          app.globalData[key] = 1
+        }
+
+        // 更新其他可能返回的身份状态字段
+        const allKeys = ['dashoustatus', 'shangjiastatus', 'guanshistatus', 'zuzhangstatus', 'kaoheguanstatus']
+        allKeys.forEach(k => {
+          if (data[k] !== undefined && k !== key) {
+            wx.setStorageSync(k, data[k])
+            app.globalData[k] = data[k]
+          }
+        })
+
+        // 保存各身份详细信息
+        if (authType === 'dashou') {
+          const fields = ['dashounicheng','zhanghaostatus','yongjin','zonge','yajin','chenghao','jifen','clumber','chengjiaoliang','zaixianzhuangtai']
+          fields.forEach(f => { if (data[f] !== undefined) app.globalData[f] = data[f] })
+        } else if (authType === 'shangjia') {
+          app.globalData.shangjia = app.globalData.shangjia || {}
+          const sf = ['nicheng','sjyue','fabu','chengjiao','tuikuan','jinridingdan','jinriliushui','jinyuedingdan','jinyueliushui','zhuangtai']
+          sf.forEach(f => { if (data[f] !== undefined) app.globalData.shangjia[f] = data[f] })
+        } else if (authType === 'guanshi') {
+          app.globalData.guanshi = app.globalData.guanshi || {}
+          const gf = ['gszhstatus','yaoqingzongshu','fenyongzonge','fenyongtixian','yichongzhiDashou']
+          gf.forEach(f => { if (data[f] !== undefined) app.globalData.guanshi[f] = data[f] })
+        } else if (authType === 'zuzhang') {
+          const zf = ['ketixian','guanshiCount','fenhongZonge']
+          zf.forEach(f => { if (data[f] !== undefined) app.globalData[f] = data[f] })
+        } else if (authType === 'kaoheguan') {
+          app.globalData.kaoheguan = app.globalData.kaoheguan || {}
+          const kf = ['shenhe_zongshu','tongguo_zongshu','yue','zonge','shenhe_zhuangtai','bankuai_list']
+          kf.forEach(f => { if (data[f] !== undefined) app.globalData.kaoheguan[f] = data[f] })
+        }
+
+        wx.hideLoading()
+        this.setData({ isLoading: false, pageState: 'done' })
+        wx.showToast({ title: '认证成功', icon: 'success' })
+
+        if (authType === 'dashou' || authType === 'shangjia') {
+          setTimeout(() => enterLockedRole(authType), 1200)
+        } else if (authType === 'guanshi') {
+          setTimeout(() => {
+            const pages = getCurrentPages()
+            if (pages.length > 1) {
+              wx.navigateBack()
+            } else {
+              wx.redirectTo({ url: '/pages/fighter/fighter' })
+            }
+          }, 800)
+        }
+      } else {
+        wx.hideLoading()
+        this.setData({ isLoading: false })
+        wx.showToast({ title: res?.data?.msg || '注册失败', icon: 'none' })
+      }
+    } catch (err) {
+      wx.hideLoading()
+      this.setData({ isLoading: false })
+      wx.showToast({ title: err.message || '注册失败', icon: 'none' })
+    }
+  },
+
+  goToKefu() {
+    const app = getApp()
+    const { link, enterpriseId } = app.globalData.kefuConfig || {}
+    if (!link || !enterpriseId) {
+      wx.showToast({ title: '客服配置未加载', icon: 'none' })
+      return
+    }
+    wx.openCustomerServiceChat({ extInfo: { url: link }, corpId: enterpriseId })
+  }
 })
\ No newline at end of file
diff --git a/pages/renzheng/renzheng.json b/pages/verify/verify.json
similarity index 100%
rename from pages/renzheng/renzheng.json
rename to pages/verify/verify.json
diff --git a/pages/renzheng/renzheng.wxml b/pages/verify/verify.wxml
similarity index 95%
rename from pages/renzheng/renzheng.wxml
rename to pages/verify/verify.wxml
index 5b4b678..5c78d76 100644
--- a/pages/renzheng/renzheng.wxml
+++ b/pages/verify/verify.wxml
@@ -1,29 +1,29 @@
-<!-- pages/renzheng/renzheng.wxml -->
-<view class="page-container">
-  <!-- 未注册或异常：邀请码注册 + 联系客服 -->
-  <view class="card" wx:if="{{pageState === 'need_register'}}">
-    <view class="card-title">{{authName}}认证</view>
-    <view class="card-desc">您尚未注册此角色或账号已被封禁，请输入邀请码注册或联系客服</view>
-    <view class="input-box">
-      <input class="invite-input" placeholder="请输入邀请码" value="{{inviteCode}}" bindinput="onInviteCodeInput" maxlength="100"/>
-    </view>
-    <view class="btn-primary" bindtap="onRegister">
-      {{isLoading ? '注册中…' : '立即注册'}}
-    </view>
-    <view class="kefu-link" bindtap="goToKefu">联系客服</view>
-  </view>
-
-  <!-- 已注册：切换引导 -->
-  <view class="card done-card" wx:if="{{pageState === 'done'}}">
-    <view class="done-icon">✓</view>
-    <view class="card-title">认证成功</view>
-    <view class="done-tip">
-      您已是<text class="highlight">{{authName}}</text>身份，
-      <text class="highlight">请退出此页面</text>点击底部导航栏左侧的
-      <text class="highlight">「切换」</text>
-      按钮，选择
-      <text class="highlight">「{{authName}}」</text>
-      即可开始使用。
-    </view>
-  </view>
+<!-- pages/verify/verify.wxml -->
+<view class="page-container">
+  <!-- 未注册或异常：邀请码注册 + 联系客服 -->
+  <view class="card" wx:if="{{pageState === 'need_register'}}">
+    <view class="card-title">{{authName}}认证</view>
+    <view class="card-desc">您尚未注册此角色或账号已被封禁，请输入邀请码注册或联系客服</view>
+    <view class="input-box">
+      <input class="invite-input" placeholder="请输入邀请码" value="{{inviteCode}}" bindinput="onInviteCodeInput" maxlength="100"/>
+    </view>
+    <view class="btn-primary" bindtap="onRegister">
+      {{isLoading ? '注册中…' : '立即注册'}}
+    </view>
+    <view class="kefu-link" bindtap="goToKefu">联系客服</view>
+  </view>
+
+  <!-- 已注册：切换引导 -->
+  <view class="card done-card" wx:if="{{pageState === 'done'}}">
+    <view class="done-icon">✓</view>
+    <view class="card-title">认证成功</view>
+    <view class="done-tip">
+      您已是<text class="highlight">{{authName}}</text>身份，
+      <text class="highlight">请退出此页面</text>点击底部导航栏左侧的
+      <text class="highlight">「切换」</text>
+      按钮，选择
+      <text class="highlight">「{{authName}}」</text>
+      即可开始使用。
+    </view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/renzheng/renzheng.wxss b/pages/verify/verify.wxss
similarity index 95%
rename from pages/renzheng/renzheng.wxss
rename to pages/verify/verify.wxss
index 1dbbb97..277408d 100644
--- a/pages/renzheng/renzheng.wxss
+++ b/pages/verify/verify.wxss
@@ -34,9 +34,6 @@ page {
   }
   
   .input-box {
-    background: #F7F3ED;
-    border-radius: 24rpx;
-    padding: 0 24rpx;
     margin-bottom: 40rpx;
   }
   
diff --git a/pages/tixian/components/mode1/mode1.js b/pages/withdraw/components/mode1/mode1.js
similarity index 97%
rename from pages/tixian/components/mode1/mode1.js
rename to pages/withdraw/components/mode1/mode1.js
index 097c9aa..13cd3eb 100644
--- a/pages/tixian/components/mode1/mode1.js
+++ b/pages/withdraw/components/mode1/mode1.js
@@ -1,484 +1,484 @@
-// pages/tixian/tixian.js
-// 子组件版本 - 完整代码，仅适配生命周期，业务逻辑不动
-
-import request from '../../../../utils/request.js';
-import upload from '../../../../utils/upload.js';
-import PopupService from '../../../../services/popupService.js';
-
-const app = getApp();
-const PAGE_SIZE = 10;
-let lastPullDownTime = 0;
-const PULL_DOWN_INTERVAL = 2000;
-
-Component({
-  data: {
-    imgUrls: {
-      pageBg: '',
-      cardBg: '',
-      iconWechat: '',
-      iconAlipay: '',
-      iconRecord: '',
-      iconRefresh: '',
-    },
-    assetList: [],
-    totalAmount: '0.00',
-    selectedAsset: null,
-    txfangshi: null,
-    txdianhua: '',
-    txzh: '',
-    txtupian: '',
-    ossImageUrl: '',
-    showTixianModal: false,
-    tixianAmount: '',
-    shouxufei: '0.00',
-    shijidaozhang: '0.00',
-    currentRate: '0.00',
-    recordList: [],
-    page: 1,
-    nomore: false,
-    loading: false,
-    isRefreshing: false,
-    canloadmore: true,
-    showSkfsModal: false,
-    tempTxfangshi: null,
-    tempTxPhone: '',
-    tempTxAccount: '',
-    tempTxImage: '',
-    choosingImage: false,
-    showModifyModal: false,
-    modifyingRecord: null,
-    modifyTxfangshi: null,
-    modifyTxPhone: '',
-    modifyTxAccount: '',
-    modifyTxImage: '',
-    modifyImageUrl: '',
-    showFailModal: false,
-    currentFailReason: '',
-    isLoading: false,
-  },
-
-  attached() {
-    this.initImageUrls();
-    this.loadAllAssets();
-    this.loadWithdrawMethod();
-    this.loadWithdrawRecords(true);
-  },
-
-  pageLifetimes: {
-    show() {
-      this.registerNotification();
-      PopupService.checkAndShow(this, 'tixian');
-    },
-    hide() {
-      const popup = this.selectComponent('#popupNotice');
-      popup?.cleanup?.();
-    }
-  },
-
-  methods: {
-    // 下拉刷新
-    onPullDownRefresh() {
-      if (this.data.isRefreshing) {
-        wx.stopPullDownRefresh();
-        return;
-      }
-      this.setData({ isRefreshing: true });
-      this.loadWithdrawRecords(true).then(() => {
-        wx.stopPullDownRefresh();
-        this.setData({ isRefreshing: false });
-      }).catch(() => {
-        wx.stopPullDownRefresh();
-        this.setData({ isRefreshing: false });
-      });
-    },
-
-    // 底部按钮加载更多
-    loadMoreRecords() {
-      if (this.data.nomore) {
-        wx.showToast({ title: '没有更多记录了', icon: 'none' });
-        return;
-      }
-      if (this.data.loading) return;
-      this.loadWithdrawRecords();
-    },
-
-    initImageUrls() {
-      const ossBase = app.globalData.ossImageUrl || '';
-      const imgDir = `${ossBase}beijing/tixian/`;
-      this.setData({
-        imgUrls: {
-          pageBg: `${imgDir}page_bg.png`,
-          cardBg: `${imgDir}card_bg.png`,
-          iconWechat: `${imgDir}icon_wechat.png`,
-          iconAlipay: `${imgDir}icon_alipay.png`,
-          iconRecord: `${imgDir}icon_record.png`,
-          iconRefresh: `${imgDir}icon_refresh.png`,
-          assetTileBg: `${imgDir}asset_tile_bg.png`,
-        }
-      });
-    },
-
-    async loadAllAssets() {
-      this.setData({ isLoading: true });
-      try {
-        const res = await request({ url: '/yonghu/tixianzichan', method: 'POST' });
-        if (res?.data?.code === 200) {
-          const data = res.data.data;
-          const assets = [];
-          if (data.dashou_yue && parseFloat(data.dashou_yue) > 0) {
-            assets.push({ type: 'dashou_yue', label: '打手佣金', amount: data.dashou_yue, rate: data.dashou_rate || 0 });
-          }
-          if (data.dashou_yajin && parseFloat(data.dashou_yajin) > 0) {
-            assets.push({ type: 'dashou_yajin', label: '打手保证金', amount: data.dashou_yajin, rate: data.dashou_yajin_rate || 0 });
-          }
-          if (data.shangjia_yue && parseFloat(data.shangjia_yue) > 0) {
-            assets.push({ type: 'shangjia_yue', label: '商家余额', amount: data.shangjia_yue, rate: data.shangjia_rate || 0 });
-          }
-          if (data.guanshi_fenyong && parseFloat(data.guanshi_fenyong) > 0) {
-            assets.push({ type: 'guanshi_fenyong', label: '管事分红', amount: data.guanshi_fenyong, rate: data.guanshi_rate || 0 });
-          }
-          if (data.zuzhang_fenyong && parseFloat(data.zuzhang_fenyong) > 0) {
-            assets.push({ type: 'zuzhang_fenyong', label: '组长分红', amount: data.zuzhang_fenyong, rate: data.zuzhang_rate || 0 });
-          }
-          if (data.kaoheguan_fenyong && parseFloat(data.kaoheguan_fenyong) > 0) {
-            assets.push({ type: 'kaoheguan_fenyong', label: '考核官分佣', amount: data.kaoheguan_fenyong, rate: data.kaoheguan_rate || 0 });
-          }
-          let total = 0;
-          assets.forEach(item => { total += parseFloat(item.amount); });
-          this.setData({ assetList: assets, totalAmount: total.toFixed(2), isLoading: false });
-          // 缓存费率
-          wx.setStorageSync('dashouRate', data.dashou_rate || 0);
-          wx.setStorageSync('dashou_yajin_rate', data.dashou_yajin_rate || 0);
-          wx.setStorageSync('shangjia_rate', data.shangjia_rate || 0);
-          wx.setStorageSync('guanshi_rate', data.guanshi_rate || 0);
-          wx.setStorageSync('zuzhang_rate', data.zuzhang_rate || 0);
-          wx.setStorageSync('kaoheguan_rate', data.kaoheguan_rate || 0);
-        } else {
-          throw new Error(res?.data?.msg || '获取资产失败');
-        }
-      } catch (err) {
-        console.error(err);
-        wx.showToast({ title: '加载失败', icon: 'none' });
-        this.setData({ isLoading: false });
-      }
-    },
-
-    async loadWithdrawMethod() {
-      const txzh = wx.getStorageSync('txzh') || '';
-      const txtupian = wx.getStorageSync('txtupian') || '';
-      const txfangshi = wx.getStorageSync('txfangshi') || null;
-      const txdianhua = wx.getStorageSync('txdianhua') || '';
-      if (txzh || txtupian) {
-        this.setData({ txzh, txtupian, txfangshi, txdianhua, ossImageUrl: app.globalData.ossImageUrl || '' });
-      } else {
-        try {
-          const res = await request({ url: '/yonghu/tixianhq', method: 'POST' });
-          if (res?.data?.code === 0) {
-            const data = res.data.data;
-            this.setData({
-              txzh: data.txzh || '',
-              txtupian: data.txtupian || '',
-              txfangshi: data.txfangshi || null,
-              txdianhua: data.txdianhua || '',
-            });
-            wx.setStorageSync('txzh', data.txzh || '');
-            wx.setStorageSync('txtupian', data.txtupian || '');
-            wx.setStorageSync('txfangshi', data.txfangshi || null);
-            wx.setStorageSync('txdianhua', data.txdianhua || '');
-          }
-        } catch (err) {}
-      }
-    },
-
-    onSelectAsset(e) {
-      const index = e.currentTarget.dataset.index;
-      const asset = this.data.assetList[index];
-      if (!asset || parseFloat(asset.amount) <= 0) {
-        wx.showToast({ title: '无可提现金额', icon: 'none' });
-        return;
-      }
-      this.setData({
-        selectedAsset: asset,
-        showTixianModal: true,
-        tixianAmount: '',
-        shouxufei: '0.00',
-        shijidaozhang: '0.00',
-        currentRate: asset.rate
-      });
-    },
-
-    onAmountInput(e) {
-      let val = e.detail.value;
-      if (val && !/^\d*\.?\d{0,2}$/.test(val)) return;
-      this.setData({ tixianAmount: val });
-      if (val && parseFloat(val) > 0) {
-        const amount = parseFloat(val);
-        const rate = parseFloat(this.data.selectedAsset.rate) || 0;
-        const fee = amount * rate;
-        const actual = amount - fee;
-        this.setData({ shouxufei: fee.toFixed(2), shijidaozhang: actual.toFixed(2) });
-      } else {
-        this.setData({ shouxufei: '0.00', shijidaozhang: '0.00' });
-      }
-    },
-
-    onQuickAmount(e) {
-      const val = e.currentTarget.dataset.value;
-      this.setData({ tixianAmount: val.toString() });
-      this.onAmountInput({ detail: { value: val.toString() } });
-    },
-
-    async onConfirmWithdraw() {
-      const { selectedAsset, tixianAmount, txfangshi, txzh, txtupian, txdianhua } = this.data;
-      if (!selectedAsset) { wx.showToast({ title: '请选择提现项目', icon: 'none' }); return; }
-      const amount = parseFloat(tixianAmount);
-      if (isNaN(amount) || amount <= 0) { wx.showToast({ title: '请输入有效金额', icon: 'none' }); return; }
-      if (amount > parseFloat(selectedAsset.amount)) { wx.showToast({ title: '超过可提现金额', icon: 'none' }); return; }
-      if (!txfangshi || (!txzh && !txtupian)) {
-        wx.showToast({ title: '请先设置收款方式', icon: 'none' });
-        this.setData({ showTixianModal: false });
-        this.onSetSkfs();
-        return;
-      }
-      let leixing = 1;
-      switch (selectedAsset.type) {
-        case 'dashou_yue': leixing = 1; break;
-        case 'dashou_yajin': leixing = 5; break;
-        case 'shangjia_yue': leixing = 6; break;
-        case 'guanshi_fenyong': leixing = 2; break;
-        case 'zuzhang_fenyong': leixing = 3; break;
-        case 'kaoheguan_fenyong': leixing = 4; break;
-      }
-      let txskfs = 0;
-      if (txzh && txtupian) txskfs = 3;
-      else if (txzh) txskfs = 1;
-      else if (txtupian) txskfs = 2;
-      try {
-        const res = await request({
-          url: '/yonghu/tixian',
-          method: 'POST',
-          data: { leixing, jine: amount.toFixed(2), fangshi: txfangshi, txskfs }
-        });
-        if (res?.data?.code === 0) {
-          const newAssetList = this.data.assetList.map(item => {
-            if (item.type === selectedAsset.type) {
-              const newAmount = (parseFloat(item.amount) - amount).toFixed(2);
-              return { ...item, amount: newAmount };
-            }
-            return item;
-          });
-          let newTotal = 0;
-          newAssetList.forEach(item => { newTotal += parseFloat(item.amount); });
-          this.setData({ assetList: newAssetList, totalAmount: newTotal.toFixed(2), showTixianModal: false, selectedAsset: null });
-          this.loadWithdrawRecords(true);
-          wx.showToast({ title: '提现申请已提交', icon: 'success' });
-        } else {
-          wx.showToast({ title: res?.data?.msg || '提现失败', icon: 'none' });
-        }
-      } catch (err) {
-        wx.showToast({ title: '网络错误', icon: 'none' });
-      }
-    },
-
-    onCloseTixianModal() {
-      this.setData({ showTixianModal: false, selectedAsset: null, tixianAmount: '' });
-    },
-
-    onSetSkfs() {
-      this.setData({
-        showSkfsModal: true,
-        tempTxfangshi: this.data.txfangshi,
-        tempTxPhone: this.data.txdianhua,
-        tempTxAccount: this.data.txzh,
-        tempTxImage: ''
-      });
-    },
-
-    onSelectFangshi(e) {
-      this.setData({ tempTxfangshi: e.currentTarget.dataset.fangshi });
-    },
-
-    onPhoneInput(e) { this.setData({ tempTxPhone: e.detail.value }); },
-    onAccountInput(e) { this.setData({ tempTxAccount: e.detail.value }); },
-
-    onChooseImage() {
-      if (this.data.choosingImage) return;
-      this.setData({ choosingImage: true });
-      wx.chooseMedia({
-        count: 1, mediaType: ['image'],
-        success: (res) => { this.setData({ tempTxImage: res.tempFiles[0].tempFilePath }); },
-        complete: () => { this.setData({ choosingImage: false }); }
-      });
-    },
-
-    onPreviewImage() {
-      if (this.data.tempTxImage) wx.previewImage({ urls: [this.data.tempTxImage] });
-    },
-
-    onDeleteImage() { this.setData({ tempTxImage: '' }); },
-
-    async onConfirmSkfs() {
-      const { tempTxfangshi, tempTxPhone, tempTxAccount, tempTxImage } = this.data;
-      if (!tempTxfangshi) { wx.showToast({ title: '请选择提现方式', icon: 'none' }); return; }
-      if (!tempTxPhone) { wx.showToast({ title: '请输入收款人电话', icon: 'none' }); return; }
-      if (tempTxfangshi == 1 && !tempTxImage) { wx.showToast({ title: '请上传微信收款码', icon: 'none' }); return; }
-      if (tempTxfangshi == 2 && !tempTxAccount && !tempTxImage) {
-        wx.showToast({ title: '请填写支付宝账号或上传收款码', icon: 'none' }); return;
-      }
-      const formData = { txdianhua: tempTxPhone, txzh: tempTxAccount || '' };
-      try {
-        const res = await upload({ url: '/yonghu/sksc', formData, filePath: tempTxImage || null, fileName: 'file' });
-        if (res?.data?.code === 0) {
-          const data = res.data.data;
-          this.setData({
-            txfangshi: tempTxfangshi, txdianhua: tempTxPhone, txzh: data.txzh || '', txtupian: data.txtupian || '', showSkfsModal: false
-          });
-          wx.setStorageSync('txfangshi', tempTxfangshi);
-          wx.setStorageSync('txdianhua', tempTxPhone);
-          wx.setStorageSync('txzh', data.txzh || '');
-          wx.setStorageSync('txtupian', data.txtupian || '');
-          wx.showToast({ title: '设置成功', icon: 'success' });
-        } else {
-          wx.showToast({ title: res?.data?.msg || '保存失败', icon: 'none' });
-        }
-      } catch (err) {
-        wx.showToast({ title: '网络错误', icon: 'none' });
-      }
-    },
-
-    onCloseSkfsModal() { this.setData({ showSkfsModal: false }); },
-
-    async loadWithdrawRecords(refresh = false) {
-      const now = Date.now();
-      if (now - lastPullDownTime < PULL_DOWN_INTERVAL && !refresh) return;
-      if (this.data.loading || this.data.isRefreshing) return;
-      const page = refresh ? 1 : this.data.page;
-      if (this.data.nomore && !refresh) return;
-      this.setData({ loading: true, isRefreshing: refresh });
-      lastPullDownTime = now;
-      try {
-        const res = await request({ url: '/yonghu/tixianjiluhq', method: 'POST', data: { page, limit: PAGE_SIZE } });
-        if (res?.data?.code === 0) {
-          const list = (res.data.data.list || []).map(item => ({
-            ...item,
-            statusText: this.getStatusText(item.zhuangtai),
-            statusColor: this.getStatusColor(item.zhuangtai)
-          }));
-          const newList = refresh ? list : [...this.data.recordList, ...list];
-          const hasMore = res.data.data.has_more === true;
-          this.setData({
-            recordList: newList, page: page + 1, nomore: !hasMore, canloadmore: hasMore,
-            loading: false, isRefreshing: false
-          });
-        } else {
-          this.setData({ loading: false, isRefreshing: false });
-        }
-      } catch (err) {
-        this.setData({ loading: false, isRefreshing: false });
-      }
-    },
-
-    onModifyRecord(e) {
-      const record = e.currentTarget.dataset.record;
-      if (parseInt(record.zhuangtai) !== 1) {
-        wx.showToast({ title: '只有审核中的记录可修改', icon: 'none' });
-        return;
-      }
-      this.setData({
-        modifyingRecord: record,
-        modifyTxfangshi: record.fangshi,
-        modifyTxPhone: record.txdianhua || '',
-        modifyTxAccount: record.txzh || '',
-        modifyTxImage: '',
-        modifyImageUrl: record.txtupian ? (app.globalData.ossImageUrl + record.txtupian) : '',
-        showModifyModal: true
-      });
-    },
-
-    onSelectModifyFangshi(e) { this.setData({ modifyTxfangshi: e.currentTarget.dataset.fangshi }); },
-    onModifyPhoneInput(e) { this.setData({ modifyTxPhone: e.detail.value }); },
-    onModifyAccountInput(e) { this.setData({ modifyTxAccount: e.detail.value }); },
-
-    onChooseModifyImage() {
-      if (this.data.choosingImage) return;
-      this.setData({ choosingImage: true });
-      wx.chooseMedia({
-        count: 1, mediaType: ['image'],
-        success: (res) => { this.setData({ modifyTxImage: res.tempFiles[0].tempFilePath }); },
-        complete: () => { this.setData({ choosingImage: false }); }
-      });
-    },
-
-    onPreviewModifyImage() {
-      if (this.data.modifyTxImage) wx.previewImage({ urls: [this.data.modifyTxImage] });
-      else if (this.data.modifyImageUrl) wx.previewImage({ urls: [this.data.modifyImageUrl] });
-    },
-
-    onDeleteModifyImage() { this.setData({ modifyTxImage: '' }); },
-
-    async onConfirmModify() {
-      const { modifyTxfangshi, modifyTxPhone, modifyTxAccount, modifyTxImage, modifyingRecord } = this.data;
-      if (!modifyTxfangshi) { wx.showToast({ title: '请选择提现方式', icon: 'none' }); return; }
-      if (!modifyTxPhone) { wx.showToast({ title: '请输入收款人电话', icon: 'none' }); return; }
-      if (modifyTxfangshi == 1 && !modifyTxImage) { wx.showToast({ title: '请上传微信收款码', icon: 'none' }); return; }
-      if (modifyTxfangshi == 2 && !modifyTxAccount && !modifyTxImage) {
-        wx.showToast({ title: '请填写支付宝账号或上传收款码', icon: 'none' }); return;
-      }
-      const formData = { tixian_id: modifyingRecord.id, fangshi: modifyTxfangshi, txdianhua: modifyTxPhone, txzh: modifyTxAccount || '' };
-      try {
-        const res = await upload({ url: '/yonghu/yonghutxshxg', formData, filePath: modifyTxImage || null, fileName: 'file' });
-        if (res?.data?.code === 0) {
-          const data = res.data.data;
-          const newList = this.data.recordList.map(item => {
-            if (item.id === modifyingRecord.id) {
-              return { ...item, fangshi: modifyTxfangshi, txdianhua: modifyTxPhone, txzh: modifyTxAccount || '', txtupian: data.txtupian || modifyingRecord.txtupian };
-            }
-            return item;
-          });
-          this.setData({ recordList: newList, showModifyModal: false, modifyingRecord: null });
-          wx.showToast({ title: '修改成功', icon: 'success' });
-        } else {
-          wx.showToast({ title: res?.data?.msg || '修改失败', icon: 'none' });
-        }
-      } catch (err) {
-        wx.showToast({ title: '网络错误', icon: 'none' });
-      }
-    },
-
-    onCloseModifyModal() { this.setData({ showModifyModal: false, modifyingRecord: null }); },
-
-    onViewFailReason(e) {
-      const record = e.currentTarget.dataset.record;
-      const reason = record.fail_reason || record.shibaiyuanyin || '暂无详细信息';
-      this.setData({ currentFailReason: reason, showFailModal: true });
-    },
-
-    onCloseFailModal() { this.setData({ showFailModal: false }); },
-
-    getStatusText(zhuangtai) {
-      const s = parseInt(zhuangtai);
-      if (s === 1) return '审核中';
-      if (s === 2) return '成功';
-      if (s === 3) return '失败';
-      return '未知';
-    },
-    getStatusColor(zhuangtai) {
-      const s = parseInt(zhuangtai);
-      if (s === 1) return '#F5A623';
-      if (s === 2) return '#2ED158';
-      if (s === 3) return '#FF4D4F';
-      return '#999';
-    },
-
-    registerNotification() {
-      const comp = this.selectComponent('#global-notification');
-      if (comp?.showNotification) {
-        app.globalData.globalNotification = {
-          show: (data) => comp.showNotification(data),
-          hide: () => comp.hideNotification()
-        };
-      }
-    },
-    stopPropagation() {}
-  }
+// pages/withdraw/withdraw.js
+// 子组件版本 - 完整代码，仅适配生命周期，业务逻辑不动
+
+import request from '../../../../utils/request.js';
+import upload from '../../../../utils/upload.js';
+import PopupService from '../../../../services/popupService.js';
+
+const app = getApp();
+const PAGE_SIZE = 10;
+let lastPullDownTime = 0;
+const PULL_DOWN_INTERVAL = 2000;
+
+Component({
+  data: {
+    imgUrls: {
+      pageBg: '',
+      cardBg: '',
+      iconWechat: '',
+      iconAlipay: '',
+      iconRecord: '',
+      iconRefresh: '',
+    },
+    assetList: [],
+    totalAmount: '0.00',
+    selectedAsset: null,
+    txfangshi: null,
+    txdianhua: '',
+    txzh: '',
+    txtupian: '',
+    ossImageUrl: '',
+    showTixianModal: false,
+    tixianAmount: '',
+    shouxufei: '0.00',
+    shijidaozhang: '0.00',
+    currentRate: '0.00',
+    recordList: [],
+    page: 1,
+    nomore: false,
+    loading: false,
+    isRefreshing: false,
+    canloadmore: true,
+    showSkfsModal: false,
+    tempTxfangshi: null,
+    tempTxPhone: '',
+    tempTxAccount: '',
+    tempTxImage: '',
+    choosingImage: false,
+    showModifyModal: false,
+    modifyingRecord: null,
+    modifyTxfangshi: null,
+    modifyTxPhone: '',
+    modifyTxAccount: '',
+    modifyTxImage: '',
+    modifyImageUrl: '',
+    showFailModal: false,
+    currentFailReason: '',
+    isLoading: false,
+  },
+
+  attached() {
+    this.initImageUrls();
+    this.loadAllAssets();
+    this.loadWithdrawMethod();
+    this.loadWithdrawRecords(true);
+  },
+
+  pageLifetimes: {
+    show() {
+      this.registerNotification();
+      PopupService.checkAndShow(this, 'tixian');
+    },
+    hide() {
+      const popup = this.selectComponent('#popupNotice');
+      popup?.cleanup?.();
+    }
+  },
+
+  methods: {
+    // 下拉刷新
+    onPullDownRefresh() {
+      if (this.data.isRefreshing) {
+        wx.stopPullDownRefresh();
+        return;
+      }
+      this.setData({ isRefreshing: true });
+      this.loadWithdrawRecords(true).then(() => {
+        wx.stopPullDownRefresh();
+        this.setData({ isRefreshing: false });
+      }).catch(() => {
+        wx.stopPullDownRefresh();
+        this.setData({ isRefreshing: false });
+      });
+    },
+
+    // 底部按钮加载更多
+    loadMoreRecords() {
+      if (this.data.nomore) {
+        wx.showToast({ title: '没有更多记录了', icon: 'none' });
+        return;
+      }
+      if (this.data.loading) return;
+      this.loadWithdrawRecords();
+    },
+
+    initImageUrls() {
+      const ossBase = app.globalData.ossImageUrl || '';
+      const imgDir = `${ossBase}beijing/tixian/`;
+      this.setData({
+        imgUrls: {
+          pageBg: `${imgDir}page_bg.png`,
+          cardBg: `${imgDir}card_bg.png`,
+          iconWechat: `${imgDir}icon_wechat.png`,
+          iconAlipay: `${imgDir}icon_alipay.png`,
+          iconRecord: `${imgDir}icon_record.png`,
+          iconRefresh: `${imgDir}icon_refresh.png`,
+          assetTileBg: `${imgDir}asset_tile_bg.png`,
+        }
+      });
+    },
+
+    async loadAllAssets() {
+      this.setData({ isLoading: true });
+      try {
+        const res = await request({ url: '/yonghu/tixianzichan', method: 'POST' });
+        if (res?.data?.code === 200) {
+          const data = res.data.data;
+          const assets = [];
+          if (data.dashou_yue && parseFloat(data.dashou_yue) > 0) {
+            assets.push({ type: 'dashou_yue', label: '打手佣金', amount: data.dashou_yue, rate: data.dashou_rate || 0 });
+          }
+          if (data.dashou_yajin && parseFloat(data.dashou_yajin) > 0) {
+            assets.push({ type: 'dashou_yajin', label: '打手保证金', amount: data.dashou_yajin, rate: data.dashou_yajin_rate || 0 });
+          }
+          if (data.shangjia_yue && parseFloat(data.shangjia_yue) > 0) {
+            assets.push({ type: 'shangjia_yue', label: '商家余额', amount: data.shangjia_yue, rate: data.shangjia_rate || 0 });
+          }
+          if (data.guanshi_fenyong && parseFloat(data.guanshi_fenyong) > 0) {
+            assets.push({ type: 'guanshi_fenyong', label: '管事分红', amount: data.guanshi_fenyong, rate: data.guanshi_rate || 0 });
+          }
+          if (data.zuzhang_fenyong && parseFloat(data.zuzhang_fenyong) > 0) {
+            assets.push({ type: 'zuzhang_fenyong', label: '组长分红', amount: data.zuzhang_fenyong, rate: data.zuzhang_rate || 0 });
+          }
+          if (data.kaoheguan_fenyong && parseFloat(data.kaoheguan_fenyong) > 0) {
+            assets.push({ type: 'kaoheguan_fenyong', label: '考核官分佣', amount: data.kaoheguan_fenyong, rate: data.kaoheguan_rate || 0 });
+          }
+          let total = 0;
+          assets.forEach(item => { total += parseFloat(item.amount); });
+          this.setData({ assetList: assets, totalAmount: total.toFixed(2), isLoading: false });
+          // 缓存费率
+          wx.setStorageSync('dashouRate', data.dashou_rate || 0);
+          wx.setStorageSync('dashou_yajin_rate', data.dashou_yajin_rate || 0);
+          wx.setStorageSync('shangjia_rate', data.shangjia_rate || 0);
+          wx.setStorageSync('guanshi_rate', data.guanshi_rate || 0);
+          wx.setStorageSync('zuzhang_rate', data.zuzhang_rate || 0);
+          wx.setStorageSync('kaoheguan_rate', data.kaoheguan_rate || 0);
+        } else {
+          throw new Error(res?.data?.msg || '获取资产失败');
+        }
+      } catch (err) {
+        console.error(err);
+        wx.showToast({ title: '加载失败', icon: 'none' });
+        this.setData({ isLoading: false });
+      }
+    },
+
+    async loadWithdrawMethod() {
+      const txzh = wx.getStorageSync('txzh') || '';
+      const txtupian = wx.getStorageSync('txtupian') || '';
+      const txfangshi = wx.getStorageSync('txfangshi') || null;
+      const txdianhua = wx.getStorageSync('txdianhua') || '';
+      if (txzh || txtupian) {
+        this.setData({ txzh, txtupian, txfangshi, txdianhua, ossImageUrl: app.globalData.ossImageUrl || '' });
+      } else {
+        try {
+          const res = await request({ url: '/yonghu/tixianhq', method: 'POST' });
+          if (res?.data?.code === 0) {
+            const data = res.data.data;
+            this.setData({
+              txzh: data.txzh || '',
+              txtupian: data.txtupian || '',
+              txfangshi: data.txfangshi || null,
+              txdianhua: data.txdianhua || '',
+            });
+            wx.setStorageSync('txzh', data.txzh || '');
+            wx.setStorageSync('txtupian', data.txtupian || '');
+            wx.setStorageSync('txfangshi', data.txfangshi || null);
+            wx.setStorageSync('txdianhua', data.txdianhua || '');
+          }
+        } catch (err) {}
+      }
+    },
+
+    onSelectAsset(e) {
+      const index = e.currentTarget.dataset.index;
+      const asset = this.data.assetList[index];
+      if (!asset || parseFloat(asset.amount) <= 0) {
+        wx.showToast({ title: '无可提现金额', icon: 'none' });
+        return;
+      }
+      this.setData({
+        selectedAsset: asset,
+        showTixianModal: true,
+        tixianAmount: '',
+        shouxufei: '0.00',
+        shijidaozhang: '0.00',
+        currentRate: asset.rate
+      });
+    },
+
+    onAmountInput(e) {
+      let val = e.detail.value;
+      if (val && !/^\d*\.?\d{0,2}$/.test(val)) return;
+      this.setData({ tixianAmount: val });
+      if (val && parseFloat(val) > 0) {
+        const amount = parseFloat(val);
+        const rate = parseFloat(this.data.selectedAsset.rate) || 0;
+        const fee = amount * rate;
+        const actual = amount - fee;
+        this.setData({ shouxufei: fee.toFixed(2), shijidaozhang: actual.toFixed(2) });
+      } else {
+        this.setData({ shouxufei: '0.00', shijidaozhang: '0.00' });
+      }
+    },
+
+    onQuickAmount(e) {
+      const val = e.currentTarget.dataset.value;
+      this.setData({ tixianAmount: val.toString() });
+      this.onAmountInput({ detail: { value: val.toString() } });
+    },
+
+    async onConfirmWithdraw() {
+      const { selectedAsset, tixianAmount, txfangshi, txzh, txtupian, txdianhua } = this.data;
+      if (!selectedAsset) { wx.showToast({ title: '请选择提现项目', icon: 'none' }); return; }
+      const amount = parseFloat(tixianAmount);
+      if (isNaN(amount) || amount <= 0) { wx.showToast({ title: '请输入有效金额', icon: 'none' }); return; }
+      if (amount > parseFloat(selectedAsset.amount)) { wx.showToast({ title: '超过可提现金额', icon: 'none' }); return; }
+      if (!txfangshi || (!txzh && !txtupian)) {
+        wx.showToast({ title: '请先设置收款方式', icon: 'none' });
+        this.setData({ showTixianModal: false });
+        this.onSetSkfs();
+        return;
+      }
+      let leixing = 1;
+      switch (selectedAsset.type) {
+        case 'dashou_yue': leixing = 1; break;
+        case 'dashou_yajin': leixing = 5; break;
+        case 'shangjia_yue': leixing = 6; break;
+        case 'guanshi_fenyong': leixing = 2; break;
+        case 'zuzhang_fenyong': leixing = 3; break;
+        case 'kaoheguan_fenyong': leixing = 4; break;
+      }
+      let txskfs = 0;
+      if (txzh && txtupian) txskfs = 3;
+      else if (txzh) txskfs = 1;
+      else if (txtupian) txskfs = 2;
+      try {
+        const res = await request({
+          url: '/yonghu/tixian',
+          method: 'POST',
+          data: { leixing, jine: amount.toFixed(2), fangshi: txfangshi, txskfs }
+        });
+        if (res?.data?.code === 0) {
+          const newAssetList = this.data.assetList.map(item => {
+            if (item.type === selectedAsset.type) {
+              const newAmount = (parseFloat(item.amount) - amount).toFixed(2);
+              return { ...item, amount: newAmount };
+            }
+            return item;
+          });
+          let newTotal = 0;
+          newAssetList.forEach(item => { newTotal += parseFloat(item.amount); });
+          this.setData({ assetList: newAssetList, totalAmount: newTotal.toFixed(2), showTixianModal: false, selectedAsset: null });
+          this.loadWithdrawRecords(true);
+          wx.showToast({ title: '提现申请已提交', icon: 'success' });
+        } else {
+          wx.showToast({ title: res?.data?.msg || '提现失败', icon: 'none' });
+        }
+      } catch (err) {
+        wx.showToast({ title: '网络错误', icon: 'none' });
+      }
+    },
+
+    onCloseTixianModal() {
+      this.setData({ showTixianModal: false, selectedAsset: null, tixianAmount: '' });
+    },
+
+    onSetSkfs() {
+      this.setData({
+        showSkfsModal: true,
+        tempTxfangshi: this.data.txfangshi,
+        tempTxPhone: this.data.txdianhua,
+        tempTxAccount: this.data.txzh,
+        tempTxImage: ''
+      });
+    },
+
+    onSelectFangshi(e) {
+      this.setData({ tempTxfangshi: e.currentTarget.dataset.fangshi });
+    },
+
+    onPhoneInput(e) { this.setData({ tempTxPhone: e.detail.value }); },
+    onAccountInput(e) { this.setData({ tempTxAccount: e.detail.value }); },
+
+    onChooseImage() {
+      if (this.data.choosingImage) return;
+      this.setData({ choosingImage: true });
+      wx.chooseMedia({
+        count: 1, mediaType: ['image'],
+        success: (res) => { this.setData({ tempTxImage: res.tempFiles[0].tempFilePath }); },
+        complete: () => { this.setData({ choosingImage: false }); }
+      });
+    },
+
+    onPreviewImage() {
+      if (this.data.tempTxImage) wx.previewImage({ urls: [this.data.tempTxImage] });
+    },
+
+    onDeleteImage() { this.setData({ tempTxImage: '' }); },
+
+    async onConfirmSkfs() {
+      const { tempTxfangshi, tempTxPhone, tempTxAccount, tempTxImage } = this.data;
+      if (!tempTxfangshi) { wx.showToast({ title: '请选择提现方式', icon: 'none' }); return; }
+      if (!tempTxPhone) { wx.showToast({ title: '请输入收款人电话', icon: 'none' }); return; }
+      if (tempTxfangshi == 1 && !tempTxImage) { wx.showToast({ title: '请上传微信收款码', icon: 'none' }); return; }
+      if (tempTxfangshi == 2 && !tempTxAccount && !tempTxImage) {
+        wx.showToast({ title: '请填写支付宝账号或上传收款码', icon: 'none' }); return;
+      }
+      const formData = { txdianhua: tempTxPhone, txzh: tempTxAccount || '' };
+      try {
+        const res = await upload({ url: '/yonghu/sksc', formData, filePath: tempTxImage || null, fileName: 'file' });
+        if (res?.data?.code === 0) {
+          const data = res.data.data;
+          this.setData({
+            txfangshi: tempTxfangshi, txdianhua: tempTxPhone, txzh: data.txzh || '', txtupian: data.txtupian || '', showSkfsModal: false
+          });
+          wx.setStorageSync('txfangshi', tempTxfangshi);
+          wx.setStorageSync('txdianhua', tempTxPhone);
+          wx.setStorageSync('txzh', data.txzh || '');
+          wx.setStorageSync('txtupian', data.txtupian || '');
+          wx.showToast({ title: '设置成功', icon: 'success' });
+        } else {
+          wx.showToast({ title: res?.data?.msg || '保存失败', icon: 'none' });
+        }
+      } catch (err) {
+        wx.showToast({ title: '网络错误', icon: 'none' });
+      }
+    },
+
+    onCloseSkfsModal() { this.setData({ showSkfsModal: false }); },
+
+    async loadWithdrawRecords(refresh = false) {
+      const now = Date.now();
+      if (now - lastPullDownTime < PULL_DOWN_INTERVAL && !refresh) return;
+      if (this.data.loading || this.data.isRefreshing) return;
+      const page = refresh ? 1 : this.data.page;
+      if (this.data.nomore && !refresh) return;
+      this.setData({ loading: true, isRefreshing: refresh });
+      lastPullDownTime = now;
+      try {
+        const res = await request({ url: '/yonghu/tixianjiluhq', method: 'POST', data: { page, limit: PAGE_SIZE } });
+        if (res?.data?.code === 0) {
+          const list = (res.data.data.list || []).map(item => ({
+            ...item,
+            statusText: this.getStatusText(item.zhuangtai),
+            statusColor: this.getStatusColor(item.zhuangtai)
+          }));
+          const newList = refresh ? list : [...this.data.recordList, ...list];
+          const hasMore = res.data.data.has_more === true;
+          this.setData({
+            recordList: newList, page: page + 1, nomore: !hasMore, canloadmore: hasMore,
+            loading: false, isRefreshing: false
+          });
+        } else {
+          this.setData({ loading: false, isRefreshing: false });
+        }
+      } catch (err) {
+        this.setData({ loading: false, isRefreshing: false });
+      }
+    },
+
+    onModifyRecord(e) {
+      const record = e.currentTarget.dataset.record;
+      if (parseInt(record.zhuangtai) !== 1) {
+        wx.showToast({ title: '只有审核中的记录可修改', icon: 'none' });
+        return;
+      }
+      this.setData({
+        modifyingRecord: record,
+        modifyTxfangshi: record.fangshi,
+        modifyTxPhone: record.txdianhua || '',
+        modifyTxAccount: record.txzh || '',
+        modifyTxImage: '',
+        modifyImageUrl: record.txtupian ? (app.globalData.ossImageUrl + record.txtupian) : '',
+        showModifyModal: true
+      });
+    },
+
+    onSelectModifyFangshi(e) { this.setData({ modifyTxfangshi: e.currentTarget.dataset.fangshi }); },
+    onModifyPhoneInput(e) { this.setData({ modifyTxPhone: e.detail.value }); },
+    onModifyAccountInput(e) { this.setData({ modifyTxAccount: e.detail.value }); },
+
+    onChooseModifyImage() {
+      if (this.data.choosingImage) return;
+      this.setData({ choosingImage: true });
+      wx.chooseMedia({
+        count: 1, mediaType: ['image'],
+        success: (res) => { this.setData({ modifyTxImage: res.tempFiles[0].tempFilePath }); },
+        complete: () => { this.setData({ choosingImage: false }); }
+      });
+    },
+
+    onPreviewModifyImage() {
+      if (this.data.modifyTxImage) wx.previewImage({ urls: [this.data.modifyTxImage] });
+      else if (this.data.modifyImageUrl) wx.previewImage({ urls: [this.data.modifyImageUrl] });
+    },
+
+    onDeleteModifyImage() { this.setData({ modifyTxImage: '' }); },
+
+    async onConfirmModify() {
+      const { modifyTxfangshi, modifyTxPhone, modifyTxAccount, modifyTxImage, modifyingRecord } = this.data;
+      if (!modifyTxfangshi) { wx.showToast({ title: '请选择提现方式', icon: 'none' }); return; }
+      if (!modifyTxPhone) { wx.showToast({ title: '请输入收款人电话', icon: 'none' }); return; }
+      if (modifyTxfangshi == 1 && !modifyTxImage) { wx.showToast({ title: '请上传微信收款码', icon: 'none' }); return; }
+      if (modifyTxfangshi == 2 && !modifyTxAccount && !modifyTxImage) {
+        wx.showToast({ title: '请填写支付宝账号或上传收款码', icon: 'none' }); return;
+      }
+      const formData = { tixian_id: modifyingRecord.id, fangshi: modifyTxfangshi, txdianhua: modifyTxPhone, txzh: modifyTxAccount || '' };
+      try {
+        const res = await upload({ url: '/yonghu/yonghutxshxg', formData, filePath: modifyTxImage || null, fileName: 'file' });
+        if (res?.data?.code === 0) {
+          const data = res.data.data;
+          const newList = this.data.recordList.map(item => {
+            if (item.id === modifyingRecord.id) {
+              return { ...item, fangshi: modifyTxfangshi, txdianhua: modifyTxPhone, txzh: modifyTxAccount || '', txtupian: data.txtupian || modifyingRecord.txtupian };
+            }
+            return item;
+          });
+          this.setData({ recordList: newList, showModifyModal: false, modifyingRecord: null });
+          wx.showToast({ title: '修改成功', icon: 'success' });
+        } else {
+          wx.showToast({ title: res?.data?.msg || '修改失败', icon: 'none' });
+        }
+      } catch (err) {
+        wx.showToast({ title: '网络错误', icon: 'none' });
+      }
+    },
+
+    onCloseModifyModal() { this.setData({ showModifyModal: false, modifyingRecord: null }); },
+
+    onViewFailReason(e) {
+      const record = e.currentTarget.dataset.record;
+      const reason = record.fail_reason || record.shibaiyuanyin || '暂无详细信息';
+      this.setData({ currentFailReason: reason, showFailModal: true });
+    },
+
+    onCloseFailModal() { this.setData({ showFailModal: false }); },
+
+    getStatusText(zhuangtai) {
+      const s = parseInt(zhuangtai);
+      if (s === 1) return '审核中';
+      if (s === 2) return '成功';
+      if (s === 3) return '失败';
+      return '未知';
+    },
+    getStatusColor(zhuangtai) {
+      const s = parseInt(zhuangtai);
+      if (s === 1) return '#F5A623';
+      if (s === 2) return '#2ED158';
+      if (s === 3) return '#FF4D4F';
+      return '#999';
+    },
+
+    registerNotification() {
+      const comp = this.selectComponent('#global-notification');
+      if (comp?.showNotification) {
+        app.globalData.globalNotification = {
+          show: (data) => comp.showNotification(data),
+          hide: () => comp.hideNotification()
+        };
+      }
+    },
+    stopPropagation() {}
+  }
 });
\ No newline at end of file
diff --git a/pages/tixian/components/mode1/mode1.json b/pages/withdraw/components/mode1/mode1.json
similarity index 100%
rename from pages/tixian/components/mode1/mode1.json
rename to pages/withdraw/components/mode1/mode1.json
diff --git a/pages/tixian/components/mode1/mode1.wxml b/pages/withdraw/components/mode1/mode1.wxml
similarity index 98%
rename from pages/tixian/components/mode1/mode1.wxml
rename to pages/withdraw/components/mode1/mode1.wxml
index 7fb3bab..c4f5f71 100644
--- a/pages/tixian/components/mode1/mode1.wxml
+++ b/pages/withdraw/components/mode1/mode1.wxml
@@ -1,133 +1,133 @@
-<!-- pages/tixian/tixian.wxml -->
-<!-- 最终版：资产卡片添加背景图，微调模糊 -->
-
-<view class="app">
-  <!-- 页面背景（全局模糊降低） -->
-  <image class="global-bg" src="{{imgUrls.pageBg}}" mode="aspectFill" />
-  
-  <!-- 资产区域 -->
-  <view class="assets-section">
-    <view class="main-card" style="background-image: url('{{imgUrls.cardBg}}'); background-size: cover;">
-      <!-- 总余额 -->
-      <view class="balance-wrap">
-        <text class="balance-label">可提总余额</text>
-        <text class="balance-value">¥{{totalAmount}}</text>
-      </view>
-
-      <!-- 内部分隔线 -->
-      <view class="inner-divider"></view>
-
-      <!-- 左右滑动提示 -->
-      <text class="assets-hint">← 左右滑动查看更多资产 →</text>
-
-      <!-- 资产横向滚动区 -->
-      <scroll-view class="assets-scroll" scroll-x="true" show-scrollbar="{{false}}" enhanced>
-        <view class="assets-track">
-          <block wx:for="{{assetList}}" wx:key="index">
-            <!-- 每个资产卡片加上自己的背景图 -->
-            <view class="asset-tile" bindtap="onSelectAsset" data-index="{{index}}" style="background-image: url('{{imgUrls.assetTileBg}}'); background-size: cover; background-position: center;">
-              <text class="asset-name">{{item.label}}</text>
-              <text class="asset-balance">¥{{item.amount}}</text>
-              <text class="asset-fee">费率 {{item.rate}}%</text>
-            </view>
-          </block>
-          <view wx:if="{{assetList.length === 0 && !isLoading}}" class="assets-empty">暂无可用资金</view>
-        </view>
-      </scroll-view>
-    </view>
-
-    <!-- 层次分隔线 -->
-    <view class="divider-line"></view>
-  </view>
-
-  <!-- 提现记录区 -->
-  <view class="history-section">
-    <view class="history-header">
-      <text class="history-title">提现记录</text>
-      <text class="history-settings" bindtap="onSetSkfs">收款方式</text>
-    </view>
-    <scroll-view class="history-scroll" scroll-y enable-back-to-top bindscrolltolower="onLoadMoreFromScroll">
-      <view wx:for="{{recordList}}" wx:key="index" class="history-item">
-        <view class="history-info">
-          <text class="history-amount">¥{{item.jine}}</text>
-          <text class="history-time">{{item.create}}</text>
-        </view>
-        <view class="history-detail">
-          <text class="history-method">{{item.fangshi == 1 ? '微信' : '支付宝'}}</text>
-          <text class="history-type">{{item.leixing == 1 ? '佣金' : (item.leixing == 2 ? '分红' : (item.leixing == 3 ? '组长' : (item.leixing == 4 ? '考核官' : '保证金')))}}</text>
-        </view>
-        <view class="history-status">
-          <view wx:if="{{item.zhuangtai == 1}}" class="status-badge status-wait" bindtap="onModifyRecord" data-record="{{item}}">{{item.statusText}} ✏修改</view>
-          <view wx:elif="{{item.zhuangtai == 3}}" class="status-badge status-fail">
-            {{item.statusText}}
-            <text class="fail-link" bindtap="onViewFailReason" data-record="{{item}}">详情</text>
-          </view>
-          <view wx:else class="status-badge status-done">{{item.statusText}}</view>
-        </view>
-      </view>
-      <view wx:if="{{loading}}" class="load-tip">加载中...</view>
-      <view wx:if="{{nomore && recordList.length > 0}}" class="more-tip">—— 没有更多了 ——</view>
-      <view wx:if="{{!nomore && recordList.length > 0}}" class="load-more-btn" bindtap="loadMoreRecords">加载更多记录</view>
-    </scroll-view>
-  </view>
-
-  <view class="safe-bottom"></view>
-</view>
-
-<!-- ========== 弹窗（完整保留，无省略） ========== -->
-<!-- 提现弹窗 -->
-<view wx:if="{{showTixianModal}}" class="modal-mask" bindtap="onCloseTixianModal">
-  <view class="modal-dialog" catchtap="stopPropagation">
-    <view class="modal-header">提现</view>
-    <view class="modal-body">
-      <view class="info-row"><text>项目</text><text>{{selectedAsset.label}}</text></view>
-      <view class="info-row"><text>可提</text><text>¥{{selectedAsset.amount}}</text></view>
-      <view class="info-row"><text>费率</text><text>{{currentRate}}%</text></view>
-      <view class="amount-row"><text>金额</text><input type="digit" placeholder="0.00" value="{{tixianAmount}}" bindinput="onAmountInput" /></view>
-      <view class="quick-row"><view wx:for="{{[100,200,500,1000]}}" wx:key="item" class="quick-chip" data-value="{{item}}" bindtap="onQuickAmount">¥{{item}}</view></view>
-      <view class="fee-row"><text>手续费 ¥{{shouxufei}}</text><text>到账 ¥{{shijidaozhang}}</text></view>
-      <view class="method-row"><text>收款方式 {{txfangshi == 1 ? '微信' : (txfangshi == 2 ? '支付宝' : '未设置')}}</text><text class="link-text" bindtap="onSetSkfs">更换</text></view>
-    </view>
-    <view class="modal-footer"><view class="modal-btn cancel" bindtap="onCloseTixianModal">取消</view><view class="modal-btn confirm" bindtap="onConfirmWithdraw">确认</view></view>
-  </view>
-</view>
-
-<!-- 设置收款方式弹窗 -->
-<view wx:if="{{showSkfsModal}}" class="modal-mask" bindtap="onCloseSkfsModal">
-  <view class="modal-dialog" catchtap="stopPropagation">
-    <view class="modal-header">收款方式</view>
-    <view class="modal-body">
-      <view class="toggle-row"><view class="toggle-item {{tempTxfangshi == 1 ? 'active' : ''}}" bindtap="onSelectFangshi" data-fangshi="1">微信</view><view class="toggle-item {{tempTxfangshi == 2 ? 'active' : ''}}" bindtap="onSelectFangshi" data-fangshi="2">支付宝</view></view>
-      <input class="field-input" placeholder="手机号" value="{{tempTxPhone}}" bindinput="onPhoneInput" />
-      <view wx:if="{{tempTxfangshi == 2}}"><input class="field-input" placeholder="支付宝账号" value="{{tempTxAccount}}" bindinput="onAccountInput" /></view>
-      <view class="upload-wrap"><view wx:if="{{!tempTxImage}}" class="upload-trigger" bindtap="onChooseImage">+ 上传收款码</view><view wx:else class="image-preview"><image src="{{tempTxImage}}" mode="aspectFill" /><view class="image-actions"><text bindtap="onPreviewImage">预览</text><text bindtap="onDeleteImage">删除</text></view></view></view>
-    </view>
-    <view class="modal-footer"><view class="modal-btn cancel" bindtap="onCloseSkfsModal">取消</view><view class="modal-btn confirm" bindtap="onConfirmSkfs">保存</view></view>
-  </view>
-</view>
-
-<!-- 修改审核中记录弹窗 -->
-<view wx:if="{{showModifyModal}}" class="modal-mask" bindtap="onCloseModifyModal">
-  <view class="modal-dialog" catchtap="stopPropagation">
-    <view class="modal-header">修改信息</view>
-    <view class="modal-body">
-      <view class="toggle-row"><view class="toggle-item {{modifyTxfangshi == 1 ? 'active' : ''}}" bindtap="onSelectModifyFangshi" data-fangshi="1">微信</view><view class="toggle-item {{modifyTxfangshi == 2 ? 'active' : ''}}" bindtap="onSelectModifyFangshi" data-fangshi="2">支付宝</view></view>
-      <input class="field-input" placeholder="电话" value="{{modifyTxPhone}}" bindinput="onModifyPhoneInput" />
-      <view wx:if="{{modifyTxfangshi == 2}}"><input class="field-input" placeholder="支付宝账号" value="{{modifyTxAccount}}" bindinput="onModifyAccountInput" /></view>
-      <view class="upload-wrap"><view wx:if="{{modifyImageUrl}}" class="current-img"><image src="{{modifyImageUrl}}" mode="aspectFill" bindtap="onPreviewModifyImage" /></view><view class="upload-trigger" bindtap="onChooseModifyImage">+ 上传新图片</view><view wx:if="{{modifyTxImage}}" class="image-preview"><image src="{{modifyTxImage}}" mode="aspectFill" /><view class="image-actions"><text bindtap="onPreviewModifyImage">预览</text><text bindtap="onDeleteModifyImage">删除</text></view></view></view>
-    </view>
-    <view class="modal-footer"><view class="modal-btn cancel" bindtap="onCloseModifyModal">取消</view><view class="modal-btn confirm" bindtap="onConfirmModify">确认</view></view>
-  </view>
-</view>
-
-<!-- 失败原因弹窗 -->
-<view wx:if="{{showFailModal}}" class="modal-mask" bindtap="onCloseFailModal">
-  <view class="modal-dialog" catchtap="stopPropagation">
-    <view class="modal-header">失败原因</view>
-    <view class="modal-body">{{currentFailReason}}</view>
-    <view class="modal-footer"><view class="modal-btn confirm" bindtap="onCloseFailModal">知道了</view></view>
-  </view>
-</view>
-
-<global-notification id="global-notification" />
+<!-- pages/withdraw/withdraw.wxml -->
+<!-- 最终版：资产卡片添加背景图，微调模糊 -->
+
+<view class="app">
+  <!-- 页面背景（全局模糊降低） -->
+  <image class="global-bg" src="{{imgUrls.pageBg}}" mode="aspectFill" />
+  
+  <!-- 资产区域 -->
+  <view class="assets-section">
+    <view class="main-card" style="background-image: url('{{imgUrls.cardBg}}'); background-size: cover;">
+      <!-- 总余额 -->
+      <view class="balance-wrap">
+        <text class="balance-label">可提总余额</text>
+        <text class="balance-value">¥{{totalAmount}}</text>
+      </view>
+
+      <!-- 内部分隔线 -->
+      <view class="inner-divider"></view>
+
+      <!-- 左右滑动提示 -->
+      <text class="assets-hint">← 左右滑动查看更多资产 →</text>
+
+      <!-- 资产横向滚动区 -->
+      <scroll-view class="assets-scroll" scroll-x="true" show-scrollbar="{{false}}" enhanced>
+        <view class="assets-track">
+          <block wx:for="{{assetList}}" wx:key="index">
+            <!-- 每个资产卡片加上自己的背景图 -->
+            <view class="asset-tile" bindtap="onSelectAsset" data-index="{{index}}" style="background-image: url('{{imgUrls.assetTileBg}}'); background-size: cover; background-position: center;">
+              <text class="asset-name">{{item.label}}</text>
+              <text class="asset-balance">¥{{item.amount}}</text>
+              <text class="asset-fee">费率 {{item.rate}}%</text>
+            </view>
+          </block>
+          <view wx:if="{{assetList.length === 0 && !isLoading}}" class="assets-empty">暂无可用资金</view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <!-- 层次分隔线 -->
+    <view class="divider-line"></view>
+  </view>
+
+  <!-- 提现记录区 -->
+  <view class="history-section">
+    <view class="history-header">
+      <text class="history-title">提现记录</text>
+      <text class="history-settings" bindtap="onSetSkfs">收款方式</text>
+    </view>
+    <scroll-view class="history-scroll" scroll-y enable-back-to-top bindscrolltolower="onLoadMoreFromScroll">
+      <view wx:for="{{recordList}}" wx:key="index" class="history-item">
+        <view class="history-info">
+          <text class="history-amount">¥{{item.jine}}</text>
+          <text class="history-time">{{item.create}}</text>
+        </view>
+        <view class="history-detail">
+          <text class="history-method">{{item.fangshi == 1 ? '微信' : '支付宝'}}</text>
+          <text class="history-type">{{item.leixing == 1 ? '佣金' : (item.leixing == 2 ? '分红' : (item.leixing == 3 ? '组长' : (item.leixing == 4 ? '考核官' : '保证金')))}}</text>
+        </view>
+        <view class="history-status">
+          <view wx:if="{{item.zhuangtai == 1}}" class="status-badge status-wait" bindtap="onModifyRecord" data-record="{{item}}">{{item.statusText}} ✏修改</view>
+          <view wx:elif="{{item.zhuangtai == 3}}" class="status-badge status-fail">
+            {{item.statusText}}
+            <text class="fail-link" bindtap="onViewFailReason" data-record="{{item}}">详情</text>
+          </view>
+          <view wx:else class="status-badge status-done">{{item.statusText}}</view>
+        </view>
+      </view>
+      <view wx:if="{{loading}}" class="load-tip">加载中...</view>
+      <view wx:if="{{nomore && recordList.length > 0}}" class="more-tip">—— 没有更多了 ——</view>
+      <view wx:if="{{!nomore && recordList.length > 0}}" class="load-more-btn" bindtap="loadMoreRecords">加载更多记录</view>
+    </scroll-view>
+  </view>
+
+  <view class="safe-bottom"></view>
+</view>
+
+<!-- ========== 弹窗（完整保留，无省略） ========== -->
+<!-- 提现弹窗 -->
+<view wx:if="{{showTixianModal}}" class="modal-mask" bindtap="onCloseTixianModal">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">提现</view>
+    <view class="modal-body">
+      <view class="info-row"><text>项目</text><text>{{selectedAsset.label}}</text></view>
+      <view class="info-row"><text>可提</text><text>¥{{selectedAsset.amount}}</text></view>
+      <view class="info-row"><text>费率</text><text>{{currentRate}}%</text></view>
+      <view class="amount-row"><text>金额</text><input type="digit" placeholder="0.00" value="{{tixianAmount}}" bindinput="onAmountInput" /></view>
+      <view class="quick-row"><view wx:for="{{[100,200,500,1000]}}" wx:key="item" class="quick-chip" data-value="{{item}}" bindtap="onQuickAmount">¥{{item}}</view></view>
+      <view class="fee-row"><text>手续费 ¥{{shouxufei}}</text><text>到账 ¥{{shijidaozhang}}</text></view>
+      <view class="method-row"><text>收款方式 {{txfangshi == 1 ? '微信' : (txfangshi == 2 ? '支付宝' : '未设置')}}</text><text class="link-text" bindtap="onSetSkfs">更换</text></view>
+    </view>
+    <view class="modal-footer"><view class="modal-btn cancel" bindtap="onCloseTixianModal">取消</view><view class="modal-btn confirm" bindtap="onConfirmWithdraw">确认</view></view>
+  </view>
+</view>
+
+<!-- 设置收款方式弹窗 -->
+<view wx:if="{{showSkfsModal}}" class="modal-mask" bindtap="onCloseSkfsModal">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">收款方式</view>
+    <view class="modal-body">
+      <view class="toggle-row"><view class="toggle-item {{tempTxfangshi == 1 ? 'active' : ''}}" bindtap="onSelectFangshi" data-fangshi="1">微信</view><view class="toggle-item {{tempTxfangshi == 2 ? 'active' : ''}}" bindtap="onSelectFangshi" data-fangshi="2">支付宝</view></view>
+      <input class="field-input" placeholder="手机号" value="{{tempTxPhone}}" bindinput="onPhoneInput" />
+      <view wx:if="{{tempTxfangshi == 2}}"><input class="field-input" placeholder="支付宝账号" value="{{tempTxAccount}}" bindinput="onAccountInput" /></view>
+      <view class="upload-wrap"><view wx:if="{{!tempTxImage}}" class="upload-trigger" bindtap="onChooseImage">+ 上传收款码</view><view wx:else class="image-preview"><image src="{{tempTxImage}}" mode="aspectFill" /><view class="image-actions"><text bindtap="onPreviewImage">预览</text><text bindtap="onDeleteImage">删除</text></view></view></view>
+    </view>
+    <view class="modal-footer"><view class="modal-btn cancel" bindtap="onCloseSkfsModal">取消</view><view class="modal-btn confirm" bindtap="onConfirmSkfs">保存</view></view>
+  </view>
+</view>
+
+<!-- 修改审核中记录弹窗 -->
+<view wx:if="{{showModifyModal}}" class="modal-mask" bindtap="onCloseModifyModal">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">修改信息</view>
+    <view class="modal-body">
+      <view class="toggle-row"><view class="toggle-item {{modifyTxfangshi == 1 ? 'active' : ''}}" bindtap="onSelectModifyFangshi" data-fangshi="1">微信</view><view class="toggle-item {{modifyTxfangshi == 2 ? 'active' : ''}}" bindtap="onSelectModifyFangshi" data-fangshi="2">支付宝</view></view>
+      <input class="field-input" placeholder="电话" value="{{modifyTxPhone}}" bindinput="onModifyPhoneInput" />
+      <view wx:if="{{modifyTxfangshi == 2}}"><input class="field-input" placeholder="支付宝账号" value="{{modifyTxAccount}}" bindinput="onModifyAccountInput" /></view>
+      <view class="upload-wrap"><view wx:if="{{modifyImageUrl}}" class="current-img"><image src="{{modifyImageUrl}}" mode="aspectFill" bindtap="onPreviewModifyImage" /></view><view class="upload-trigger" bindtap="onChooseModifyImage">+ 上传新图片</view><view wx:if="{{modifyTxImage}}" class="image-preview"><image src="{{modifyTxImage}}" mode="aspectFill" /><view class="image-actions"><text bindtap="onPreviewModifyImage">预览</text><text bindtap="onDeleteModifyImage">删除</text></view></view></view>
+    </view>
+    <view class="modal-footer"><view class="modal-btn cancel" bindtap="onCloseModifyModal">取消</view><view class="modal-btn confirm" bindtap="onConfirmModify">确认</view></view>
+  </view>
+</view>
+
+<!-- 失败原因弹窗 -->
+<view wx:if="{{showFailModal}}" class="modal-mask" bindtap="onCloseFailModal">
+  <view class="modal-dialog" catchtap="stopPropagation">
+    <view class="modal-header">失败原因</view>
+    <view class="modal-body">{{currentFailReason}}</view>
+    <view class="modal-footer"><view class="modal-btn confirm" bindtap="onCloseFailModal">知道了</view></view>
+  </view>
+</view>
+
+<global-notification id="global-notification" />
 <popup-notice id="popupNotice" />
\ No newline at end of file
diff --git a/pages/tixian/components/mode1/mode1.wxss b/pages/withdraw/components/mode1/mode1.wxss
similarity index 95%
rename from pages/tixian/components/mode1/mode1.wxss
rename to pages/withdraw/components/mode1/mode1.wxss
index a4c4b31..6ce2249 100644
--- a/pages/tixian/components/mode1/mode1.wxss
+++ b/pages/withdraw/components/mode1/mode1.wxss
@@ -1,424 +1,424 @@
-/* pages/tixian/tixian.wxss - 终极优化版 */
-
-page {
-    background-color: #f5f7fb;
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-    height: 100%;
-  }
-  
-  .app {
-    display: flex;
-    flex-direction: column;
-    min-height: 100vh;
-    padding: 0 24rpx 0;
-    position: relative;
-    z-index: 1;
-    box-sizing: border-box;
-  }
-  
-  /* 页面背景模糊极低，不影响阅读 */
-  .global-bg {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: -1;
-    opacity: 0.1;
-    object-fit: cover;
-    filter: blur(1rpx);
-  }
-  
-  /* 资产区域整体与顶部保持间距 */
-  .assets-section {
-    margin-top: 24rpx;
-    flex-shrink: 0;
-  }
-  
-  /* 主卡片玻璃质感 - 模糊加重避免抢眼，同时文字对比加强 */
-  .main-card {
-    background: rgba(248, 250, 252, 0.88);      /* 稍微降低透明度，让背景更柔和 */
-    backdrop-filter: blur(28rpx);               /* 增强模糊，不抢眼 */
-    -webkit-backdrop-filter: blur(28rpx);
-    border-radius: 48rpx;
-    padding: 30rpx 28rpx 24rpx;                /* 稍微缩小高度 */
-    margin-bottom: 20rpx;
-    box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.04);
-    border: 1rpx solid rgba(255, 255, 255, 0.4);
-    background-size: cover;
-  }
-  
-  /* 总余额 - 字体加深加粗，增加阴影提高可读性 */
-  .balance-wrap {
-    text-align: center;
-    margin-bottom: 20rpx;                      /* 减小间距，让卡片更紧凑 */
-  }
-  .balance-label {
-    font-size: 28rpx;
-    color: #0f172a;                            /* 更深色 */
-    letter-spacing: 1px;
-    display: block;
-    margin-bottom: 10rpx;
-    font-weight: 700;                          /* 加粗 */
-    text-shadow: 0 1rpx 2rpx rgba(255,255,255,0.8);
-  }
-  .balance-value {
-    font-size: 68rpx;
-    font-weight: 800;
-    color: #0f172a;
-    font-family: 'DIN', monospace;
-    letter-spacing: -1rpx;
-    text-shadow: 0 1rpx 2rpx rgba(255,255,255,0.6);
-  }
-  
-  /* 内部分隔线（横杠）- 明显且保持层次 */
-  .inner-divider {
-    width: 60%;
-    height: 2rpx;
-    background: linear-gradient(90deg, transparent, #64748b, #64748b, transparent); /* 加深颜色 */
-    margin: 0 auto 20rpx auto;
-    border-radius: 2rpx;
-    opacity: 0.9;
-  }
-  
-  /* 左右滑动提示 - 字体明显 */
-  .assets-hint {
-    display: block;
-    text-align: center;
-    font-size: 24rpx;
-    color: #334155;                            /* 深灰 */
-    margin-bottom: 14rpx;
-    font-weight: 600;
-  }
-  
-  .assets-scroll {
-    width: 100%;
-    white-space: nowrap;
-  }
-  .assets-track {
-    display: inline-flex;
-    gap: 16rpx;
-  }
-  
-  /* 资产小卡片 - 背景半透模糊，字体深色加粗 */
-  .asset-tile {
-    width: 170rpx;
-    background: rgba(255, 255, 255, 0.75);     /* 稍微提高透明度，让模糊背景透出 */
-    backdrop-filter: blur(8rpx);               /* 自身轻微模糊，不抢眼 */
-    border-radius: 28rpx;
-    padding: 18rpx 12rpx;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    text-align: center;
-    border: 1rpx solid rgba(255,255,255,0.5);
-    box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.02);
-    transition: all 0.2s;
-    white-space: normal;
-    background-size: cover;
-    background-position: center;
-  }
-  .asset-tile:active {
-    background: rgba(255, 255, 255, 0.9);
-    transform: scale(0.98);
-  }
-  .asset-name {
-    font-size: 24rpx;
-    font-weight: 700;                          /* 加粗 */
-    color: #1e293b;                            /* 深色 */
-    margin-bottom: 10rpx;
-    text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.5);
-  }
-  .asset-balance {
-    font-size: 28rpx;
-    font-weight: 800;                          /* 加粗 */
-    color: #2d6a4f;
-    font-family: monospace;
-    margin-bottom: 6rpx;
-    text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.3);
-  }
-  .asset-fee {
-    font-size: 20rpx;
-    font-weight: 600;                          /* 加粗并加深 */
-    color: #475569;
-    text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.3);
-  }
-  .assets-empty {
-    width: 400rpx;
-    text-align: center;
-    color: #a0abb9;
-    padding: 40rpx 0;
-  }
-  
-  /* 外部层次分隔线 - 保持不变，保留分层 */
-  .divider-line {
-    height: 2rpx;
-    background: linear-gradient(90deg, transparent, #cbd5e1, #cbd5e1, transparent);
-    margin: 16rpx 0 20rpx;
-    width: 80%;
-    margin-left: auto;
-    margin-right: auto;
-  }
-  
-  /* 提现记录区 - 无改动，自然贴底 */
-  .history-section {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    min-height: 0;
-    margin-top: 0;
-  }
-  .history-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: baseline;
-    padding: 0 8rpx 20rpx;
-    flex-shrink: 0;
-  }
-  .history-title {
-    font-size: 34rpx;
-    font-weight: 600;
-    color: #1e293b;
-  }
-  .history-settings {
-    font-size: 28rpx;
-    color: #3b82f6;
-  }
-  .history-scroll {
-    flex: 1;
-    width: 100%;
-    padding: 0 20rpx;
-    box-sizing: border-box;
-  }
-  .history-item {
-    display: flex;
-    align-items: center;
-    padding: 28rpx 0;
-    border-bottom: 1rpx solid rgba(0,0,0,0.05);
-  }
-  .history-info {
-    width: 160rpx;
-  }
-  .history-amount {
-    font-size: 36rpx;
-    font-weight: 700;
-    color: #1e293b;
-    display: block;
-  }
-  .history-time {
-    font-size: 22rpx;
-    color: #94a3b8;
-  }
-  .history-detail {
-    flex: 1;
-    padding: 0 20rpx;
-  }
-  .history-method {
-    font-size: 30rpx;
-    color: #334155;
-    display: block;
-    margin-bottom: 6rpx;
-  }
-  .history-type {
-    font-size: 24rpx;
-    color: #94a3b8;
-  }
-  .history-status {
-    text-align: right;
-  }
-  .status-badge {
-    font-size: 26rpx;
-    font-weight: 500;
-    padding: 6rpx 14rpx;
-    border-radius: 30rpx;
-    display: inline-block;
-  }
-  .status-wait {
-    color: #f59e0b;
-    background: rgba(245,158,11,0.1);
-  }
-  .status-done {
-    color: #10b981;
-    background: rgba(16,185,129,0.1);
-  }
-  .status-fail {
-    color: #ef4444;
-    background: rgba(239,68,68,0.1);
-  }
-  .fail-link {
-    margin-left: 8rpx;
-    text-decoration: underline;
-  }
-  .load-tip, .more-tip {
-    text-align: center;
-    padding: 30rpx;
-    font-size: 24rpx;
-    color: #94a3b8;
-  }
-  .load-more-btn {
-    margin: 16rpx 0 20rpx;
-    padding: 20rpx;
-    text-align: center;
-    background: rgba(255,255,255,0.7);
-    backdrop-filter: blur(8rpx);
-    border-radius: 40rpx;
-    font-size: 28rpx;
-    color: #3b82f6;
-    border: 1rpx solid rgba(255,255,255,0.5);
-  }
-  .load-more-btn:active {
-    background: rgba(255,255,255,0.9);
-  }
-  .safe-bottom {
-    height: 12rpx;
-    flex-shrink: 0;
-  }
-  
-  /* ========== 弹窗样式（完整保留） ========== */
-  .modal-mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: rgba(0,0,0,0.5);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 1000;
-  }
-  .modal-dialog {
-    width: 600rpx;
-    background: rgba(255,255,255,0.96);
-    backdrop-filter: blur(20rpx);
-    border-radius: 48rpx;
-    overflow: hidden;
-    box-shadow: 0 20rpx 40rpx rgba(0,0,0,0.1);
-    border: 1rpx solid rgba(255,255,255,0.6);
-  }
-  .modal-header {
-    padding: 36rpx 32rpx 20rpx;
-    font-size: 36rpx;
-    font-weight: 700;
-    border-bottom: 1rpx solid rgba(0,0,0,0.05);
-  }
-  .modal-body {
-    padding: 32rpx;
-  }
-  .info-row, .amount-row, .method-row {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 24rpx;
-    font-size: 28rpx;
-  }
-  .amount-row input {
-    border: 1rpx solid rgba(0,0,0,0.1);
-    border-radius: 28rpx;
-    padding: 16rpx 20rpx;
-    width: 260rpx;
-    background: rgba(255,255,255,0.9);
-  }
-  .quick-row {
-    display: flex;
-    gap: 16rpx;
-    margin: 24rpx 0;
-  }
-  .quick-chip {
-    flex: 1;
-    background: rgba(241,245,249,0.8);
-    text-align: center;
-    padding: 12rpx;
-    border-radius: 40rpx;
-    font-size: 28rpx;
-  }
-  .fee-row {
-    display: flex;
-    justify-content: space-between;
-    background: rgba(248,250,252,0.8);
-    padding: 20rpx;
-    border-radius: 28rpx;
-    margin: 20rpx 0;
-  }
-  .link-text {
-    color: #3b82f6;
-  }
-  .toggle-row {
-    display: flex;
-    gap: 20rpx;
-    margin-bottom: 28rpx;
-  }
-  .toggle-item {
-    flex: 1;
-    text-align: center;
-    padding: 20rpx;
-    border: 1rpx solid rgba(0,0,0,0.08);
-    border-radius: 30rpx;
-    background: rgba(255,255,255,0.8);
-  }
-  .toggle-item.active {
-    border-color: #3b82f6;
-    background: #eff6ff;
-  }
-  .field-input {
-    width: 100%;
-    border: 1rpx solid rgba(0,0,0,0.08);
-    border-radius: 28rpx;
-    padding: 20rpx;
-    margin-bottom: 20rpx;
-    box-sizing: border-box;
-    background: rgba(255,255,255,0.9);
-  }
-  .upload-trigger {
-    background: rgba(241,245,249,0.8);
-    border: 1rpx dashed #cbd5e1;
-    border-radius: 28rpx;
-    padding: 28rpx;
-    text-align: center;
-  }
-  .image-preview {
-    margin-top: 16rpx;
-    position: relative;
-  }
-  .image-preview image {
-    width: 100%;
-    height: 200rpx;
-    border-radius: 28rpx;
-  }
-  .image-actions {
-    display: flex;
-    justify-content: space-around;
-    background: rgba(0,0,0,0.6);
-    padding: 12rpx;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    color: white;
-    border-bottom-left-radius: 28rpx;
-    border-bottom-right-radius: 28rpx;
-  }
-  .current-img {
-    margin: 20rpx 0;
-  }
-  .current-img image {
-    width: 100%;
-    height: 140rpx;
-    border-radius: 24rpx;
-  }
-  .modal-footer {
-    display: flex;
-    border-top: 1rpx solid rgba(0,0,0,0.05);
-  }
-  .modal-btn {
-    flex: 1;
-    text-align: center;
-    padding: 28rpx;
-    font-size: 30rpx;
-  }
-  .modal-btn.cancel {
-    color: #8f9bb3;
-    border-right: 1rpx solid rgba(0,0,0,0.05);
-  }
-  .modal-btn.confirm {
-    color: #3b82f6;
+/* pages/withdraw/withdraw.wxss - 终极优化版 */
+
+page {
+    background-color: #f5f7fb;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+    height: 100%;
+  }
+  
+  .app {
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
+    padding: 0 24rpx 0;
+    position: relative;
+    z-index: 1;
+    box-sizing: border-box;
+  }
+  
+  /* 页面背景模糊极低，不影响阅读 */
+  .global-bg {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+    opacity: 0.1;
+    object-fit: cover;
+    filter: blur(1rpx);
+  }
+  
+  /* 资产区域整体与顶部保持间距 */
+  .assets-section {
+    margin-top: 24rpx;
+    flex-shrink: 0;
+  }
+  
+  /* 主卡片玻璃质感 - 模糊加重避免抢眼，同时文字对比加强 */
+  .main-card {
+    background: rgba(248, 250, 252, 0.88);      /* 稍微降低透明度，让背景更柔和 */
+    backdrop-filter: blur(28rpx);               /* 增强模糊，不抢眼 */
+    -webkit-backdrop-filter: blur(28rpx);
+    border-radius: 48rpx;
+    padding: 30rpx 28rpx 24rpx;                /* 稍微缩小高度 */
+    margin-bottom: 20rpx;
+    box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.04);
+    border: 1rpx solid rgba(255, 255, 255, 0.4);
+    background-size: cover;
+  }
+  
+  /* 总余额 - 字体加深加粗，增加阴影提高可读性 */
+  .balance-wrap {
+    text-align: center;
+    margin-bottom: 20rpx;                      /* 减小间距，让卡片更紧凑 */
+  }
+  .balance-label {
+    font-size: 28rpx;
+    color: #0f172a;                            /* 更深色 */
+    letter-spacing: 1px;
+    display: block;
+    margin-bottom: 10rpx;
+    font-weight: 700;                          /* 加粗 */
+    text-shadow: 0 1rpx 2rpx rgba(255,255,255,0.8);
+  }
+  .balance-value {
+    font-size: 68rpx;
+    font-weight: 800;
+    color: #0f172a;
+    font-family: 'DIN', monospace;
+    letter-spacing: -1rpx;
+    text-shadow: 0 1rpx 2rpx rgba(255,255,255,0.6);
+  }
+  
+  /* 内部分隔线（横杠）- 明显且保持层次 */
+  .inner-divider {
+    width: 60%;
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, #64748b, #64748b, transparent); /* 加深颜色 */
+    margin: 0 auto 20rpx auto;
+    border-radius: 2rpx;
+    opacity: 0.9;
+  }
+  
+  /* 左右滑动提示 - 字体明显 */
+  .assets-hint {
+    display: block;
+    text-align: center;
+    font-size: 24rpx;
+    color: #334155;                            /* 深灰 */
+    margin-bottom: 14rpx;
+    font-weight: 600;
+  }
+  
+  .assets-scroll {
+    width: 100%;
+    white-space: nowrap;
+  }
+  .assets-track {
+    display: inline-flex;
+    gap: 16rpx;
+  }
+  
+  /* 资产小卡片 - 背景半透模糊，字体深色加粗 */
+  .asset-tile {
+    width: 170rpx;
+    background: rgba(255, 255, 255, 0.75);     /* 稍微提高透明度，让模糊背景透出 */
+    backdrop-filter: blur(8rpx);               /* 自身轻微模糊，不抢眼 */
+    border-radius: 28rpx;
+    padding: 18rpx 12rpx;
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+    border: 1rpx solid rgba(255,255,255,0.5);
+    box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.02);
+    transition: all 0.2s;
+    white-space: normal;
+    background-size: cover;
+    background-position: center;
+  }
+  .asset-tile:active {
+    background: rgba(255, 255, 255, 0.9);
+    transform: scale(0.98);
+  }
+  .asset-name {
+    font-size: 24rpx;
+    font-weight: 700;                          /* 加粗 */
+    color: #1e293b;                            /* 深色 */
+    margin-bottom: 10rpx;
+    text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.5);
+  }
+  .asset-balance {
+    font-size: 28rpx;
+    font-weight: 800;                          /* 加粗 */
+    color: #2d6a4f;
+    font-family: monospace;
+    margin-bottom: 6rpx;
+    text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.3);
+  }
+  .asset-fee {
+    font-size: 20rpx;
+    font-weight: 600;                          /* 加粗并加深 */
+    color: #475569;
+    text-shadow: 0 1rpx 1rpx rgba(255,255,255,0.3);
+  }
+  .assets-empty {
+    width: 400rpx;
+    text-align: center;
+    color: #a0abb9;
+    padding: 40rpx 0;
+  }
+  
+  /* 外部层次分隔线 - 保持不变，保留分层 */
+  .divider-line {
+    height: 2rpx;
+    background: linear-gradient(90deg, transparent, #cbd5e1, #cbd5e1, transparent);
+    margin: 16rpx 0 20rpx;
+    width: 80%;
+    margin-left: auto;
+    margin-right: auto;
+  }
+  
+  /* 提现记录区 - 无改动，自然贴底 */
+  .history-section {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    min-height: 0;
+    margin-top: 0;
+  }
+  .history-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    padding: 0 8rpx 20rpx;
+    flex-shrink: 0;
+  }
+  .history-title {
+    font-size: 34rpx;
+    font-weight: 600;
+    color: #1e293b;
+  }
+  .history-settings {
+    font-size: 28rpx;
+    color: #3b82f6;
+  }
+  .history-scroll {
+    flex: 1;
+    width: 100%;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+  }
+  .history-item {
+    display: flex;
+    align-items: center;
+    padding: 28rpx 0;
+    border-bottom: 1rpx solid rgba(0,0,0,0.05);
+  }
+  .history-info {
+    width: 160rpx;
+  }
+  .history-amount {
+    font-size: 36rpx;
+    font-weight: 700;
+    color: #1e293b;
+    display: block;
+  }
+  .history-time {
+    font-size: 22rpx;
+    color: #94a3b8;
+  }
+  .history-detail {
+    flex: 1;
+    padding: 0 20rpx;
+  }
+  .history-method {
+    font-size: 30rpx;
+    color: #334155;
+    display: block;
+    margin-bottom: 6rpx;
+  }
+  .history-type {
+    font-size: 24rpx;
+    color: #94a3b8;
+  }
+  .history-status {
+    text-align: right;
+  }
+  .status-badge {
+    font-size: 26rpx;
+    font-weight: 500;
+    padding: 6rpx 14rpx;
+    border-radius: 30rpx;
+    display: inline-block;
+  }
+  .status-wait {
+    color: #f59e0b;
+    background: rgba(245,158,11,0.1);
+  }
+  .status-done {
+    color: #10b981;
+    background: rgba(16,185,129,0.1);
+  }
+  .status-fail {
+    color: #ef4444;
+    background: rgba(239,68,68,0.1);
+  }
+  .fail-link {
+    margin-left: 8rpx;
+    text-decoration: underline;
+  }
+  .load-tip, .more-tip {
+    text-align: center;
+    padding: 30rpx;
+    font-size: 24rpx;
+    color: #94a3b8;
+  }
+  .load-more-btn {
+    margin: 16rpx 0 20rpx;
+    padding: 20rpx;
+    text-align: center;
+    background: rgba(255,255,255,0.7);
+    backdrop-filter: blur(8rpx);
+    border-radius: 40rpx;
+    font-size: 28rpx;
+    color: #3b82f6;
+    border: 1rpx solid rgba(255,255,255,0.5);
+  }
+  .load-more-btn:active {
+    background: rgba(255,255,255,0.9);
+  }
+  .safe-bottom {
+    height: 12rpx;
+    flex-shrink: 0;
+  }
+  
+  /* ========== 弹窗样式（完整保留） ========== */
+  .modal-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0,0,0,0.5);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1000;
+  }
+  .modal-dialog {
+    width: 600rpx;
+    background: rgba(255,255,255,0.96);
+    backdrop-filter: blur(20rpx);
+    border-radius: 48rpx;
+    overflow: hidden;
+    box-shadow: 0 20rpx 40rpx rgba(0,0,0,0.1);
+    border: 1rpx solid rgba(255,255,255,0.6);
+  }
+  .modal-header {
+    padding: 36rpx 32rpx 20rpx;
+    font-size: 36rpx;
+    font-weight: 700;
+    border-bottom: 1rpx solid rgba(0,0,0,0.05);
+  }
+  .modal-body {
+    padding: 32rpx;
+  }
+  .info-row, .amount-row, .method-row {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 24rpx;
+    font-size: 28rpx;
+  }
+  .amount-row input {
+    border: 1rpx solid rgba(0,0,0,0.1);
+    border-radius: 28rpx;
+    padding: 16rpx 20rpx;
+    width: 260rpx;
+    background: rgba(255,255,255,0.9);
+  }
+  .quick-row {
+    display: flex;
+    gap: 16rpx;
+    margin: 24rpx 0;
+  }
+  .quick-chip {
+    flex: 1;
+    background: rgba(241,245,249,0.8);
+    text-align: center;
+    padding: 12rpx;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+  }
+  .fee-row {
+    display: flex;
+    justify-content: space-between;
+    background: rgba(248,250,252,0.8);
+    padding: 20rpx;
+    border-radius: 28rpx;
+    margin: 20rpx 0;
+  }
+  .link-text {
+    color: #3b82f6;
+  }
+  .toggle-row {
+    display: flex;
+    gap: 20rpx;
+    margin-bottom: 28rpx;
+  }
+  .toggle-item {
+    flex: 1;
+    text-align: center;
+    padding: 20rpx;
+    border: 1rpx solid rgba(0,0,0,0.08);
+    border-radius: 30rpx;
+    background: rgba(255,255,255,0.8);
+  }
+  .toggle-item.active {
+    border-color: #3b82f6;
+    background: #eff6ff;
+  }
+  .field-input {
+    width: 100%;
+    border: 1rpx solid rgba(0,0,0,0.08);
+    border-radius: 28rpx;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    box-sizing: border-box;
+    background: rgba(255,255,255,0.9);
+  }
+  .upload-trigger {
+    background: rgba(241,245,249,0.8);
+    border: 1rpx dashed #cbd5e1;
+    border-radius: 28rpx;
+    padding: 28rpx;
+    text-align: center;
+  }
+  .image-preview {
+    margin-top: 16rpx;
+    position: relative;
+  }
+  .image-preview image {
+    width: 100%;
+    height: 200rpx;
+    border-radius: 28rpx;
+  }
+  .image-actions {
+    display: flex;
+    justify-content: space-around;
+    background: rgba(0,0,0,0.6);
+    padding: 12rpx;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    color: white;
+    border-bottom-left-radius: 28rpx;
+    border-bottom-right-radius: 28rpx;
+  }
+  .current-img {
+    margin: 20rpx 0;
+  }
+  .current-img image {
+    width: 100%;
+    height: 140rpx;
+    border-radius: 24rpx;
+  }
+  .modal-footer {
+    display: flex;
+    border-top: 1rpx solid rgba(0,0,0,0.05);
+  }
+  .modal-btn {
+    flex: 1;
+    text-align: center;
+    padding: 28rpx;
+    font-size: 30rpx;
+  }
+  .modal-btn.cancel {
+    color: #8f9bb3;
+    border-right: 1rpx solid rgba(0,0,0,0.05);
+  }
+  .modal-btn.confirm {
+    color: #3b82f6;
   }
\ No newline at end of file
diff --git a/pages/tixian/components/mode2/mode2.js b/pages/withdraw/components/mode2/mode2.js
similarity index 97%
rename from pages/tixian/components/mode2/mode2.js
rename to pages/withdraw/components/mode2/mode2.js
index 426d996..3c1f617 100644
--- a/pages/tixian/components/mode2/mode2.js
+++ b/pages/withdraw/components/mode2/mode2.js
@@ -1,642 +1,642 @@
-// pages/tixian/components/mode2/mode2.js
-// UI 与 mode1 完全一致，业务逻辑为自动打款审核收款
-import request from '../../../../utils/request.js';
-import PopupService from '../../../../services/popupService.js';
-
-const app = getApp();
-const yemianshuju = 5;
-let lastPullDownTime = 0;
-const PULL_DOWN_INTERVAL = 2000;
-
-const TX_STATUS = {
-    SHENHEZHONG: 1,
-    TIXIAN_CHENGGONG: 2,
-    TIXIAN_SHIBAI: 3,
-    SHENHE_CHENGGONG: 4,
-    SHENHE_SHIBAI: 5,
-    DAI_SHOUKUAN: 6,
-};
-
-const ASSET_CONFIG = {
-    dashou_yue:        { leixing: 1, label: '打手佣金' },
-    guanshi_fenyong:   { leixing: 2, label: '管事分红' },
-    zuzhang_fenyong:   { leixing: 3, label: '组长分红' },
-    kaoheguan_fenyong: { leixing: 4, label: '考核官分佣' },
-    dashou_yajin:      { leixing: 5, label: '打手保证金' },
-    shangjia_yue:      { leixing: 6, label: '商家余额' },
-};
-
-const LEIXING_LABEL = {
-    1: '打手佣金', 2: '管事分红', 3: '组长分红',
-    4: '考核官分佣', 5: '打手保证金', 6: '商家余额',
-};
-
-Component({
-    properties: { options: { type: Object, value: {} } },
-    data: {
-        imgUrls: {
-            pageBg: '', cardBg: '', assetTileBg: '',
-        },
-        assetList: [],
-        totalAmount: '0.00',
-        selectedAsset: null,
-        isLoadingAssets: false,
-        tixianleixing: null,
-        tixianjine: '',
-        currentRate: '0.00',
-        showTixian: false,
-        recordList: [],
-        page: 1,
-        loading: false,
-        nomore: false,
-        canloadmore: true,
-        isRefreshing: false,
-        shouxufei: '0.00',
-        shijidaozhang: '0.00',
-        currentTixianId: null,
-        submitting: false,
-        mchId: '',
-        currentStatusFilter: 0,
-        statusTabs: [
-            { value: 0, label: '全部' },
-            { value: 1, label: '审核中' },
-            { value: 6, label: '待收款' },
-            { value: 4, label: '审核成功' },
-            { value: 5, label: '审核失败' },
-            { value: 2, label: '提现成功' },
-            { value: 3, label: '提现失败' },
-        ],
-        hasPendingCollect: false,
-        showCollectConfirm: false,
-        collectConfirmRecord: null,
-        showDetailModal: false,
-        detailTitle: '',
-        detailContent: '',
-    },
-    lifetimes: {
-        attached() {
-            this.initImageUrls();
-            this.chushihuashuju();
-        }
-    },
-    pageLifetimes: {
-        show() {
-            this.registerNotificationComponent();
-            this.loadAllAssets();
-            PopupService.checkAndShow(this, 'tixian');
-        },
-        hide() {
-            const popupComp = this.selectComponent('#popupNotice');
-            if (popupComp && popupComp.cleanup) popupComp.cleanup();
-        }
-    },
-    methods: {
-        registerNotificationComponent() {
-            const notificationComp = this.selectComponent('#global-notification');
-            if (notificationComp && notificationComp.showNotification) {
-                app.globalData.globalNotification = {
-                    show: (data) => notificationComp.showNotification(data),
-                    hide: () => notificationComp.hideNotification()
-                };
-            }
-        },
-
-        initImageUrls() {
-            const ossBase = app.globalData.ossImageUrl || '';
-            const imgDir = `${ossBase}beijing/tixian/`;
-            this.setData({
-                imgUrls: {
-                    pageBg: `${imgDir}page_bg.png`,
-                    cardBg: `${imgDir}card_bg.png`,
-                    assetTileBg: `${imgDir}asset_tile_bg.png`,
-                }
-            });
-        },
-
-        parseZhuangtai(item) {
-            const raw = item.zhuangtai ?? item.status ?? item.state;
-            const n = parseInt(raw, 10);
-            return Number.isNaN(n) ? -1 : n;
-        },
-
-        /** 规范化列表字段（兼容后端多种命名 / 嵌套 audit） */
-        normalizeRecordFields(item) {
-            const audit = item.audit || item.shenhe || item.shenhe_info || {};
-            const shenheJiluId = item.shenhe_jilu_id ?? item.shenheJiluId
-                ?? item.audit_id ?? item.shenheid ?? audit.id ?? audit.shenhe_jilu_id ?? null;
-            const shenheDanhao = String(
-                item.shenhe_danhao || item.shenheDanhao || item.audit_shenhe_danhao
-                || audit.shenhe_danhao || audit.danhao || ''
-            ).trim();
-            const tixianjiluId = item.tixianjilu_id ?? item.tixianjiluId ?? item.id ?? null;
-            const zhuangtai = this.parseZhuangtai(item);
-            return {
-                ...item,
-                zhuangtai: zhuangtai >= 0 ? zhuangtai : item.zhuangtai,
-                shenhe_jilu_id: shenheJiluId,
-                shenhe_danhao: shenheDanhao,
-                tixianjilu_id: tixianjiluId,
-            };
-        },
-
-        hasAuditJiluId(item) {
-            const id = item.shenhe_jilu_id;
-            return id !== null && id !== undefined && id !== '' && id !== 0 && id !== '0';
-        },
-
-        hasShenheDanhao(item) {
-            return !!(item.shenhe_danhao && String(item.shenhe_danhao).trim());
-        },
-
-        isNewAuditRecord(item) {
-            return this.hasAuditJiluId(item) && this.hasShenheDanhao(item);
-        },
-
-        /** 待收款是否可点击：状态6 + 审核记录ID + 审核单号 缺一不可 */
-        canCollectRecord(item) {
-            return this.parseZhuangtai(item) === TX_STATUS.DAI_SHOUKUAN
-                && this.hasAuditJiluId(item)
-                && this.hasShenheDanhao(item);
-        },
-
-        getLeixingLabel(leixing) {
-            return LEIXING_LABEL[parseInt(leixing)] || '提现';
-        },
-
-        getStatusBadgeClass(status) {
-            switch (parseInt(status)) {
-                case TX_STATUS.SHENHEZHONG: return 'status-wait';
-                case TX_STATUS.TIXIAN_CHENGGONG:
-                case TX_STATUS.SHENHE_CHENGGONG: return 'status-done';
-                case TX_STATUS.DAI_SHOUKUAN: return 'status-pending';
-                case TX_STATUS.TIXIAN_SHIBAI:
-                case TX_STATUS.SHENHE_SHIBAI: return 'status-fail';
-                default: return 'status-wait';
-            }
-        },
-
-        processRecordItem(item) {
-            item = this.normalizeRecordFields(item);
-            const isNew = this.isNewAuditRecord(item);
-            const status = this.parseZhuangtai(item);
-            let statusText = '未知';
-            let canCollect = false;
-            let canShowDetail = false;
-            let detailReason = '';
-
-            switch (status) {
-                case TX_STATUS.SHENHEZHONG: statusText = '审核中'; break;
-                case TX_STATUS.TIXIAN_CHENGGONG: statusText = '提现成功'; break;
-                case TX_STATUS.TIXIAN_SHIBAI:
-                    statusText = '提现失败';
-                    if (item.fail_reason || item.bhliyou) {
-                        canShowDetail = true;
-                        detailReason = item.fail_reason || item.bhliyou;
-                    }
-                    break;
-                case TX_STATUS.SHENHE_CHENGGONG: statusText = '审核成功'; break;
-                case TX_STATUS.SHENHE_SHIBAI:
-                    statusText = '审核失败';
-                    if (item.bhliyou) { canShowDetail = true; detailReason = item.bhliyou; }
-                    break;
-                case TX_STATUS.DAI_SHOUKUAN:
-                    statusText = '待收款';
-                    canCollect = this.canCollectRecord(item);
-                    break;
-            }
-
-            return {
-                ...item,
-                isNewAudit: isNew,
-                leixingLabel: this.getLeixingLabel(item.leixing),
-                statusText,
-                statusBadgeClass: this.getStatusBadgeClass(status),
-                canCollect,
-                canShowDetail,
-                detailReason,
-            };
-        },
-
-        gengxinYue(data, leixing) {
-            if (!data) return;
-            if (data.new_yongjin !== undefined && data.new_yongjin !== null) {
-                app.globalData.yongjin = data.new_yongjin;
-            }
-            if (data.new_fenyong !== undefined && data.new_fenyong !== null) {
-                app.globalData.guanshi.fenyongtixian = data.new_fenyong;
-            }
-            if (data.new_yajin !== undefined && data.new_yajin !== null) {
-                app.globalData.yajin = data.new_yajin;
-            }
-            if (data.new_shangjia_yue !== undefined && data.new_shangjia_yue !== null) {
-                if (app.globalData.shangjia) app.globalData.shangjia.sjyue = data.new_shangjia_yue;
-            }
-            if (data.current_rate !== undefined && leixing) {
-                const rate = parseFloat(data.current_rate);
-                const rateKeyMap = { 1: 'dashouRate', 5: 'dashou_yajin_rate', 6: 'shangjia_rate', 2: 'guanshi_rate', 3: 'zuzhang_rate', 4: 'kaoheguan_rate' };
-                const key = rateKeyMap[leixing];
-                if (key) wx.setStorageSync(key, rate);
-            }
-        },
-
-        updatePendingCollectFlag(list) {
-            const hasPending = (list || []).some(item => item.canCollect);
-            if (hasPending !== this.data.hasPendingCollect) {
-                this.setData({ hasPendingCollect: hasPending });
-            }
-        },
-
-        /** 微信确认收款成功后，本地先把对应记录标为「提现成功」 */
-        markLocalRecordWithdrawSuccess(record) {
-            if (!record) return;
-            const matchId = String(record.tixianjilu_id || record.id || '');
-            const matchDanhao = String(record.shenhe_danhao || '').trim();
-            if (!matchId && !matchDanhao) return;
-
-            const newList = (this.data.recordList || []).map((item) => {
-                const itemId = String(item.tixianjilu_id || item.id || '');
-                const itemDanhao = String(item.shenhe_danhao || '').trim();
-                const isMatch = (matchId && itemId === matchId)
-                    || (matchDanhao && itemDanhao === matchDanhao);
-                if (!isMatch) return item;
-                return this.processRecordItem({
-                    ...item,
-                    zhuangtai: TX_STATUS.TIXIAN_CHENGGONG,
-                });
-            });
-            this.setData({ recordList: newList });
-            this.updatePendingCollectFlag(newList);
-        },
-
-        async finishWxCollectSuccess(record) {
-            this.markLocalRecordWithdrawSuccess(record);
-            await this.loadAllAssets();
-            await this.huoquJilu(true, true);
-            // 后端若尚未落库，刷新后仍可能显示待收款，再覆盖一次本地成功态
-            this.markLocalRecordWithdrawSuccess(record);
-            PopupService.checkAndShow(this, 'tixianchenggong');
-            wx.showToast({
-                title: '提现成功',
-                icon: 'success',
-                duration: 3000,
-            });
-        },
-
-        async loadAllAssets() {
-            this.setData({ isLoadingAssets: true });
-            try {
-                const res = await request({ url: '/yonghu/tixianzichan', method: 'POST' });
-                if (res?.data?.code === 200 || res?.data?.code === 0) {
-                    const data = res.data.data || {};
-                    const assets = [];
-                    const pushAsset = (type, amount, rate) => {
-                        const cfg = ASSET_CONFIG[type];
-                        if (!cfg || !amount || parseFloat(amount) <= 0) return;
-                        assets.push({
-                            type,
-                            leixing: cfg.leixing,
-                            label: cfg.label,
-                            amount: parseFloat(amount).toFixed(2),
-                            rate: rate || 0,
-                        });
-                    };
-                    pushAsset('dashou_yue', data.dashou_yue, data.dashou_rate);
-                    pushAsset('dashou_yajin', data.dashou_yajin, data.dashou_yajin_rate);
-                    pushAsset('shangjia_yue', data.shangjia_yue, data.shangjia_rate);
-                    pushAsset('guanshi_fenyong', data.guanshi_fenyong, data.guanshi_rate);
-                    pushAsset('zuzhang_fenyong', data.zuzhang_fenyong, data.zuzhang_rate);
-                    pushAsset('kaoheguan_fenyong', data.kaoheguan_fenyong, data.kaoheguan_rate);
-
-                    let total = 0;
-                    assets.forEach(item => { total += parseFloat(item.amount); });
-                    this.setData({ assetList: assets, totalAmount: total.toFixed(2), isLoadingAssets: false });
-                } else {
-                    throw new Error(res?.data?.msg || '获取资产失败');
-                }
-            } catch (err) {
-                console.error('loadAllAssets', err);
-                this.setData({ isLoadingAssets: false });
-            }
-        },
-
-        chushihuashuju() {
-            this.loadAllAssets();
-            this.huoquJilu(true);
-        },
-
-        /** 点击资产卡片（与 mode1 一致） */
-        onSelectAsset(e) {
-            const index = e.currentTarget.dataset.index;
-            const asset = this.data.assetList[index];
-            if (!asset || parseFloat(asset.amount) <= 0) {
-                wx.showToast({ title: '无可提现金额', icon: 'none' });
-                return;
-            }
-            this.setData({
-                selectedAsset: asset,
-                tixianleixing: asset.leixing,
-                currentRate: asset.rate,
-                tixianjine: '',
-                shouxufei: '0.00',
-                shijidaozhang: '0.00',
-                showTixian: true,
-            });
-        },
-
-        onJineInput(e) {
-            this.setData({ tixianjine: e.detail.value, shouxufei: '0.00', shijidaozhang: '0.00' });
-        },
-
-        onQuickAmountTap(e) {
-            const value = e.currentTarget.dataset.value;
-            this.setData({ tixianjine: value.toString(), shouxufei: '0.00', shijidaozhang: '0.00' });
-        },
-
-        onStatusFilterTap(e) {
-            const value = parseInt(e.currentTarget.dataset.value);
-            if (value === this.data.currentStatusFilter) return;
-            this.setData({ currentStatusFilter: value });
-            this.huoquJilu(true);
-        },
-
-        async onConfirmTixian() {
-            if (this.data.submitting) return;
-            const { tixianleixing, tixianjine, selectedAsset } = this.data;
-            if (!tixianleixing || !selectedAsset) {
-                wx.showToast({ title: '请选择提现类型', icon: 'none' });
-                return;
-            }
-            const jineValue = parseFloat(tixianjine);
-            if (!tixianjine || isNaN(jineValue) || jineValue <= 0) {
-                wx.showToast({ title: '请输入有效金额', icon: 'none' });
-                return;
-            }
-            if (jineValue > parseFloat(selectedAsset.amount)) {
-                wx.showToast({ title: `超过可提${selectedAsset.label}`, icon: 'none' });
-                return;
-            }
-
-            this.setData({ submitting: true });
-            try {
-                const res = await request({
-                    url: '/yonghu/zddksh',
-                    method: 'POST',
-                    data: { leixing: tixianleixing, jine: jineValue.toFixed(2) }
-                });
-                if (res.statusCode === 200 && res.data && res.data.code === 0) {
-                    const data = res.data.data || {};
-                    this.gengxinYue(data, tixianleixing);
-                    if (data.shouxufei !== undefined) {
-                        this.setData({
-                            shouxufei: parseFloat(data.shouxufei || 0).toFixed(2),
-                            shijidaozhang: parseFloat(data.shijidaozhang || 0).toFixed(2),
-                        });
-                    }
-                    this.setData({ showTixian: false, submitting: false, selectedAsset: null });
-                    await this.loadAllAssets();
-                    this.huoquJilu(true);
-                    wx.showModal({
-                        title: '申请已提交',
-                        content: '您的提现申请已提交，请等待后台审核。审核通过后，请在本页「提现记录」中点击「收款」按钮，主动确认后才能到账微信零钱。',
-                        showCancel: false,
-                    });
-                } else {
-                    wx.showModal({ title: '提现申请失败', content: res.data?.msg || '未知错误', showCancel: false });
-                    this.setData({ submitting: false });
-                }
-            } catch (err) {
-                wx.showModal({ title: '网络错误', content: '网络连接失败，请稍后重试', showCancel: false });
-                this.setData({ submitting: false });
-            }
-        },
-
-        onCollectTap(e) {
-            const index = e.currentTarget.dataset.index;
-            const record = this.data.recordList[index];
-            if (!record) return;
-            if (this.parseZhuangtai(record) !== TX_STATUS.DAI_SHOUKUAN) {
-                wx.showToast({ title: '当前状态不可收款', icon: 'none' });
-                return;
-            }
-            if (!this.hasShenheDanhao(record) || !this.hasAuditJiluId(record)) {
-                wx.showToast({ title: '审核信息不完整，请刷新后重试', icon: 'none' });
-                return;
-            }
-            if (this.data.submitting) {
-                wx.showToast({ title: '正在处理中，请稍后', icon: 'none' });
-                return;
-            }
-            this.setData({ showCollectConfirm: true, collectConfirmRecord: record });
-        },
-
-        onCloseCollectConfirm() {
-            if (this.data.submitting) return;
-            this.setData({ showCollectConfirm: false, collectConfirmRecord: null });
-        },
-
-        async onConfirmCollect() {
-            if (this.data.submitting) return;
-            let record = this.data.collectConfirmRecord;
-            if (!record) return;
-
-            if (!this.canCollectRecord(record)) {
-                await this.huoquJilu(true, true);
-                const refreshed = (this.data.recordList || []).find(
-                    r => String(r.id) === String(record.id)
-                        || String(r.tixianjilu_id) === String(record.tixianjilu_id)
-                );
-                if (refreshed) record = refreshed;
-            }
-            if (!this.canCollectRecord(record)) {
-                wx.showModal({
-                    title: '暂时无法收款',
-                    content: '缺少审核单号或审核记录ID，请下拉刷新后重试。仍不行请联系客服。',
-                    showCancel: false,
-                });
-                return;
-            }
-
-            this.setData({ showCollectConfirm: false, submitting: true, collectConfirmRecord: record });
-            try {
-                const res = await request({
-                    url: '/yonghu/tixiansq',
-                    method: 'POST',
-                    data: {
-                        shenhe_danhao: record.shenhe_danhao,
-                        shenhe_jilu_id: record.shenhe_jilu_id || '',
-                        tixianjilu_id: record.tixianjilu_id || record.id || '',
-                        leixing: record.leixing,
-                    }
-                });
-                if (res.statusCode === 200 && res.data && res.data.code === 0) {
-                    const data = res.data.data;
-                    this.setData({
-                        currentTixianId: data.tixian_id,
-                        mchId: data.mch_id || '',
-                        collectConfirmRecord: record,
-                    });
-                    this.tiaoqiWeixinQueRen(data.package_info);
-                } else {
-                    wx.showModal({ title: '收款失败', content: res.data?.msg || '无法发起收款，请稍后重试', showCancel: false });
-                    this.setData({ submitting: false, collectConfirmRecord: null });
-                }
-            } catch (err) {
-                wx.showModal({ title: '网络错误', content: '网络连接失败，请稍后重试', showCancel: false });
-                this.setData({ submitting: false, collectConfirmRecord: null });
-            }
-        },
-
-        tiaoqiWeixinQueRen(packageInfo) {
-            const appId = app.globalData.appId;
-            const mchId = this.data.mchId;
-            if (!appId || !mchId) {
-                wx.showModal({ title: '配置错误', content: '无法调起收款，请联系客服', showCancel: false });
-                this.setData({ submitting: false, collectConfirmRecord: null });
-                return;
-            }
-            wx.requestMerchantTransfer({
-                appId, mchId, package: packageInfo,
-                success: () => { this.tongzhiHouduanQueRen(1); },
-                fail: () => {
-                    this.tongzhiHouduanQueRen(0);
-                    wx.showModal({
-                        title: '确认收款失败',
-                        content: '微信收款确认失败，您可在记录中再次点击「收款」重试。',
-                        showCancel: false,
-                    });
-                }
-            });
-        },
-
-        async tongzhiHouduanQueRen(result) {
-            if (!this.data.currentTixianId) {
-                this.setData({ submitting: false, collectConfirmRecord: null });
-                return;
-            }
-            const record = this.data.collectConfirmRecord;
-            const wxConfirmed = result === 1;
-
-            try {
-                const res = await request({
-                    url: '/yonghu/tixianqr',
-                    method: 'POST',
-                    data: {
-                        tixian_id: this.data.currentTixianId,
-                        result: result,
-                        shenhe_danhao: record ? record.shenhe_danhao : '',
-                        shenhe_jilu_id: record ? (record.shenhe_jilu_id || '') : '',
-                        tixianjilu_id: record ? (record.tixianjilu_id || record.id || '') : '',
-                        leixing: record ? record.leixing : '',
-                    }
-                });
-                if (res.statusCode === 200 && res.data && res.data.code === 0) {
-                    const data = res.data.data || {};
-                    this.gengxinYue(data, record ? record.leixing : null);
-                }
-
-                // 微信已确认收款：不论 tixianqr 返回什么，都刷新列表，不弹系统异常
-                if (wxConfirmed) {
-                    await this.finishWxCollectSuccess(record);
-                } else if (res.statusCode === 200 && res.data && res.data.code === 0) {
-                    await this.loadAllAssets();
-                    this.huoquJilu(true);
-                    wx.showToast({
-                        title: '收款已取消',
-                        icon: 'none',
-                        duration: 3000,
-                    });
-                } else {
-                    wx.showModal({
-                        title: '确认状态失败',
-                        content: res.data?.msg || '操作失败',
-                        showCancel: false,
-                    });
-                }
-            } catch (err) {
-                if (wxConfirmed) {
-                    await this.finishWxCollectSuccess(record);
-                } else {
-                    wx.showModal({
-                        title: '网络错误',
-                        content: '网络连接失败',
-                        showCancel: false,
-                    });
-                }
-            } finally {
-                this.setData({ submitting: false, currentTixianId: null, collectConfirmRecord: null });
-            }
-        },
-
-        onViewDetail(e) {
-            const index = e.currentTarget.dataset.index;
-            const record = this.data.recordList[index];
-            if (!record || !record.canShowDetail) return;
-            const status = parseInt(record.zhuangtai);
-            let detailTitle = '失败原因';
-            if (status === TX_STATUS.SHENHE_SHIBAI) detailTitle = '审核失败原因';
-            else if (status === TX_STATUS.TIXIAN_SHIBAI) detailTitle = '提现失败原因';
-            this.setData({
-                showDetailModal: true,
-                detailTitle,
-                detailContent: record.detailReason || '暂无详细信息',
-            });
-        },
-
-        onCloseDetailModal() {
-            this.setData({ showDetailModal: false, detailTitle: '', detailContent: '' });
-        },
-
-        onCloseTixian() {
-            if (this.data.submitting) { wx.showToast({ title: '正在处理中，请稍后', icon: 'none' }); return; }
-            this.setData({
-                showTixian: false, selectedAsset: null, tixianleixing: null,
-                tixianjine: '', shouxufei: '0.00', shijidaozhang: '0.00', submitting: false,
-            });
-        },
-
-        async huoquJilu(fresh = false, force = false) {
-            const now = Date.now();
-            if (!force && now - lastPullDownTime < 2000 && !fresh) return;
-            if (!force && (this.data.loading || this.data.isRefreshing)) return;
-            const page = fresh ? 1 : this.data.page;
-            if (fresh) this.setData({ nomore: false, canloadmore: true, isRefreshing: true });
-            if (this.data.nomore && !fresh) return;
-            this.setData({ loading: true });
-            lastPullDownTime = now;
-            try {
-                const res = await request({
-                    url: '/yonghu/tixianjiluhq',
-                    method: 'POST',
-                    data: { page, limit: yemianshuju, mode: 2, zhuangtai: this.data.currentStatusFilter }
-                });
-                if (res.statusCode === 200 && res.data && res.data.code === 0) {
-                    const data = res.data.data;
-                    const processedList = (data.list || []).map(item => this.processRecordItem(item));
-                    const newList = fresh ? processedList : [...this.data.recordList, ...processedList];
-                    this.setData({
-                        recordList: newList,
-                        page: page + 1,
-                        nomore: !(data.has_more === true),
-                        canloadmore: data.has_more === true,
-                        loading: false,
-                        isRefreshing: false,
-                    });
-                    this.updatePendingCollectFlag(newList);
-                } else {
-                    this.setData({ loading: false, isRefreshing: false });
-                }
-            } catch (err) {
-                this.setData({ loading: false, isRefreshing: false });
-            }
-        },
-
-        onReachBottom() {
-            if (this.data.canloadmore && !this.data.nomore && !this.data.loading && !this.data.isRefreshing) {
-                const now = Date.now();
-                if (now - lastPullDownTime >= PULL_DOWN_INTERVAL) this.huoquJilu();
-            }
-        },
-
-        stopPropagation() {}
-    }
-});
+// pages/withdraw/components/mode2/mode2.js
+// UI 与 mode1 完全一致，业务逻辑为自动打款审核收款
+import request from '../../../../utils/request.js';
+import PopupService from '../../../../services/popupService.js';
+
+const app = getApp();
+const yemianshuju = 5;
+let lastPullDownTime = 0;
+const PULL_DOWN_INTERVAL = 2000;
+
+const TX_STATUS = {
+    SHENHEZHONG: 1,
+    TIXIAN_CHENGGONG: 2,
+    TIXIAN_SHIBAI: 3,
+    SHENHE_CHENGGONG: 4,
+    SHENHE_SHIBAI: 5,
+    DAI_SHOUKUAN: 6,
+};
+
+const ASSET_CONFIG = {
+    dashou_yue:        { leixing: 1, label: '打手佣金' },
+    guanshi_fenyong:   { leixing: 2, label: '管事分红' },
+    zuzhang_fenyong:   { leixing: 3, label: '组长分红' },
+    kaoheguan_fenyong: { leixing: 4, label: '考核官分佣' },
+    dashou_yajin:      { leixing: 5, label: '打手保证金' },
+    shangjia_yue:      { leixing: 6, label: '商家余额' },
+};
+
+const LEIXING_LABEL = {
+    1: '打手佣金', 2: '管事分红', 3: '组长分红',
+    4: '考核官分佣', 5: '打手保证金', 6: '商家余额',
+};
+
+Component({
+    properties: { options: { type: Object, value: {} } },
+    data: {
+        imgUrls: {
+            pageBg: '', cardBg: '', assetTileBg: '',
+        },
+        assetList: [],
+        totalAmount: '0.00',
+        selectedAsset: null,
+        isLoadingAssets: false,
+        tixianleixing: null,
+        tixianjine: '',
+        currentRate: '0.00',
+        showTixian: false,
+        recordList: [],
+        page: 1,
+        loading: false,
+        nomore: false,
+        canloadmore: true,
+        isRefreshing: false,
+        shouxufei: '0.00',
+        shijidaozhang: '0.00',
+        currentTixianId: null,
+        submitting: false,
+        mchId: '',
+        currentStatusFilter: 0,
+        statusTabs: [
+            { value: 0, label: '全部' },
+            { value: 1, label: '审核中' },
+            { value: 6, label: '待收款' },
+            { value: 4, label: '审核成功' },
+            { value: 5, label: '审核失败' },
+            { value: 2, label: '提现成功' },
+            { value: 3, label: '提现失败' },
+        ],
+        hasPendingCollect: false,
+        showCollectConfirm: false,
+        collectConfirmRecord: null,
+        showDetailModal: false,
+        detailTitle: '',
+        detailContent: '',
+    },
+    lifetimes: {
+        attached() {
+            this.initImageUrls();
+            this.chushihuashuju();
+        }
+    },
+    pageLifetimes: {
+        show() {
+            this.registerNotificationComponent();
+            this.loadAllAssets();
+            PopupService.checkAndShow(this, 'tixian');
+        },
+        hide() {
+            const popupComp = this.selectComponent('#popupNotice');
+            if (popupComp && popupComp.cleanup) popupComp.cleanup();
+        }
+    },
+    methods: {
+        registerNotificationComponent() {
+            const notificationComp = this.selectComponent('#global-notification');
+            if (notificationComp && notificationComp.showNotification) {
+                app.globalData.globalNotification = {
+                    show: (data) => notificationComp.showNotification(data),
+                    hide: () => notificationComp.hideNotification()
+                };
+            }
+        },
+
+        initImageUrls() {
+            const ossBase = app.globalData.ossImageUrl || '';
+            const imgDir = `${ossBase}beijing/tixian/`;
+            this.setData({
+                imgUrls: {
+                    pageBg: `${imgDir}page_bg.png`,
+                    cardBg: `${imgDir}card_bg.png`,
+                    assetTileBg: `${imgDir}asset_tile_bg.png`,
+                }
+            });
+        },
+
+        parseZhuangtai(item) {
+            const raw = item.zhuangtai ?? item.status ?? item.state;
+            const n = parseInt(raw, 10);
+            return Number.isNaN(n) ? -1 : n;
+        },
+
+        /** 规范化列表字段（兼容后端多种命名 / 嵌套 audit） */
+        normalizeRecordFields(item) {
+            const audit = item.audit || item.shenhe || item.shenhe_info || {};
+            const shenheJiluId = item.shenhe_jilu_id ?? item.shenheJiluId
+                ?? item.audit_id ?? item.shenheid ?? audit.id ?? audit.shenhe_jilu_id ?? null;
+            const shenheDanhao = String(
+                item.shenhe_danhao || item.shenheDanhao || item.audit_shenhe_danhao
+                || audit.shenhe_danhao || audit.danhao || ''
+            ).trim();
+            const tixianjiluId = item.tixianjilu_id ?? item.tixianjiluId ?? item.id ?? null;
+            const zhuangtai = this.parseZhuangtai(item);
+            return {
+                ...item,
+                zhuangtai: zhuangtai >= 0 ? zhuangtai : item.zhuangtai,
+                shenhe_jilu_id: shenheJiluId,
+                shenhe_danhao: shenheDanhao,
+                tixianjilu_id: tixianjiluId,
+            };
+        },
+
+        hasAuditJiluId(item) {
+            const id = item.shenhe_jilu_id;
+            return id !== null && id !== undefined && id !== '' && id !== 0 && id !== '0';
+        },
+
+        hasShenheDanhao(item) {
+            return !!(item.shenhe_danhao && String(item.shenhe_danhao).trim());
+        },
+
+        isNewAuditRecord(item) {
+            return this.hasAuditJiluId(item) && this.hasShenheDanhao(item);
+        },
+
+        /** 待收款是否可点击：状态6 + 审核记录ID + 审核单号 缺一不可 */
+        canCollectRecord(item) {
+            return this.parseZhuangtai(item) === TX_STATUS.DAI_SHOUKUAN
+                && this.hasAuditJiluId(item)
+                && this.hasShenheDanhao(item);
+        },
+
+        getLeixingLabel(leixing) {
+            return LEIXING_LABEL[parseInt(leixing)] || '提现';
+        },
+
+        getStatusBadgeClass(status) {
+            switch (parseInt(status)) {
+                case TX_STATUS.SHENHEZHONG: return 'status-wait';
+                case TX_STATUS.TIXIAN_CHENGGONG:
+                case TX_STATUS.SHENHE_CHENGGONG: return 'status-done';
+                case TX_STATUS.DAI_SHOUKUAN: return 'status-pending';
+                case TX_STATUS.TIXIAN_SHIBAI:
+                case TX_STATUS.SHENHE_SHIBAI: return 'status-fail';
+                default: return 'status-wait';
+            }
+        },
+
+        processRecordItem(item) {
+            item = this.normalizeRecordFields(item);
+            const isNew = this.isNewAuditRecord(item);
+            const status = this.parseZhuangtai(item);
+            let statusText = '未知';
+            let canCollect = false;
+            let canShowDetail = false;
+            let detailReason = '';
+
+            switch (status) {
+                case TX_STATUS.SHENHEZHONG: statusText = '审核中'; break;
+                case TX_STATUS.TIXIAN_CHENGGONG: statusText = '提现成功'; break;
+                case TX_STATUS.TIXIAN_SHIBAI:
+                    statusText = '提现失败';
+                    if (item.fail_reason || item.bhliyou) {
+                        canShowDetail = true;
+                        detailReason = item.fail_reason || item.bhliyou;
+                    }
+                    break;
+                case TX_STATUS.SHENHE_CHENGGONG: statusText = '审核成功'; break;
+                case TX_STATUS.SHENHE_SHIBAI:
+                    statusText = '审核失败';
+                    if (item.bhliyou) { canShowDetail = true; detailReason = item.bhliyou; }
+                    break;
+                case TX_STATUS.DAI_SHOUKUAN:
+                    statusText = '待收款';
+                    canCollect = this.canCollectRecord(item);
+                    break;
+            }
+
+            return {
+                ...item,
+                isNewAudit: isNew,
+                leixingLabel: this.getLeixingLabel(item.leixing),
+                statusText,
+                statusBadgeClass: this.getStatusBadgeClass(status),
+                canCollect,
+                canShowDetail,
+                detailReason,
+            };
+        },
+
+        gengxinYue(data, leixing) {
+            if (!data) return;
+            if (data.new_yongjin !== undefined && data.new_yongjin !== null) {
+                app.globalData.yongjin = data.new_yongjin;
+            }
+            if (data.new_fenyong !== undefined && data.new_fenyong !== null) {
+                app.globalData.guanshi.fenyongtixian = data.new_fenyong;
+            }
+            if (data.new_yajin !== undefined && data.new_yajin !== null) {
+                app.globalData.yajin = data.new_yajin;
+            }
+            if (data.new_shangjia_yue !== undefined && data.new_shangjia_yue !== null) {
+                if (app.globalData.shangjia) app.globalData.shangjia.sjyue = data.new_shangjia_yue;
+            }
+            if (data.current_rate !== undefined && leixing) {
+                const rate = parseFloat(data.current_rate);
+                const rateKeyMap = { 1: 'dashouRate', 5: 'dashou_yajin_rate', 6: 'shangjia_rate', 2: 'guanshi_rate', 3: 'zuzhang_rate', 4: 'kaoheguan_rate' };
+                const key = rateKeyMap[leixing];
+                if (key) wx.setStorageSync(key, rate);
+            }
+        },
+
+        updatePendingCollectFlag(list) {
+            const hasPending = (list || []).some(item => item.canCollect);
+            if (hasPending !== this.data.hasPendingCollect) {
+                this.setData({ hasPendingCollect: hasPending });
+            }
+        },
+
+        /** 微信确认收款成功后，本地先把对应记录标为「提现成功」 */
+        markLocalRecordWithdrawSuccess(record) {
+            if (!record) return;
+            const matchId = String(record.tixianjilu_id || record.id || '');
+            const matchDanhao = String(record.shenhe_danhao || '').trim();
+            if (!matchId && !matchDanhao) return;
+
+            const newList = (this.data.recordList || []).map((item) => {
+                const itemId = String(item.tixianjilu_id || item.id || '');
+                const itemDanhao = String(item.shenhe_danhao || '').trim();
+                const isMatch = (matchId && itemId === matchId)
+                    || (matchDanhao && itemDanhao === matchDanhao);
+                if (!isMatch) return item;
+                return this.processRecordItem({
+                    ...item,
+                    zhuangtai: TX_STATUS.TIXIAN_CHENGGONG,
+                });
+            });
+            this.setData({ recordList: newList });
+            this.updatePendingCollectFlag(newList);
+        },
+
+        async finishWxCollectSuccess(record) {
+            this.markLocalRecordWithdrawSuccess(record);
+            await this.loadAllAssets();
+            await this.huoquJilu(true, true);
+            // 后端若尚未落库，刷新后仍可能显示待收款，再覆盖一次本地成功态
+            this.markLocalRecordWithdrawSuccess(record);
+            PopupService.checkAndShow(this, 'tixianchenggong');
+            wx.showToast({
+                title: '提现成功',
+                icon: 'success',
+                duration: 3000,
+            });
+        },
+
+        async loadAllAssets() {
+            this.setData({ isLoadingAssets: true });
+            try {
+                const res = await request({ url: '/yonghu/tixianzichan', method: 'POST' });
+                if (res?.data?.code === 200 || res?.data?.code === 0) {
+                    const data = res.data.data || {};
+                    const assets = [];
+                    const pushAsset = (type, amount, rate) => {
+                        const cfg = ASSET_CONFIG[type];
+                        if (!cfg || !amount || parseFloat(amount) <= 0) return;
+                        assets.push({
+                            type,
+                            leixing: cfg.leixing,
+                            label: cfg.label,
+                            amount: parseFloat(amount).toFixed(2),
+                            rate: rate || 0,
+                        });
+                    };
+                    pushAsset('dashou_yue', data.dashou_yue, data.dashou_rate);
+                    pushAsset('dashou_yajin', data.dashou_yajin, data.dashou_yajin_rate);
+                    pushAsset('shangjia_yue', data.shangjia_yue, data.shangjia_rate);
+                    pushAsset('guanshi_fenyong', data.guanshi_fenyong, data.guanshi_rate);
+                    pushAsset('zuzhang_fenyong', data.zuzhang_fenyong, data.zuzhang_rate);
+                    pushAsset('kaoheguan_fenyong', data.kaoheguan_fenyong, data.kaoheguan_rate);
+
+                    let total = 0;
+                    assets.forEach(item => { total += parseFloat(item.amount); });
+                    this.setData({ assetList: assets, totalAmount: total.toFixed(2), isLoadingAssets: false });
+                } else {
+                    throw new Error(res?.data?.msg || '获取资产失败');
+                }
+            } catch (err) {
+                console.error('loadAllAssets', err);
+                this.setData({ isLoadingAssets: false });
+            }
+        },
+
+        chushihuashuju() {
+            this.loadAllAssets();
+            this.huoquJilu(true);
+        },
+
+        /** 点击资产卡片（与 mode1 一致） */
+        onSelectAsset(e) {
+            const index = e.currentTarget.dataset.index;
+            const asset = this.data.assetList[index];
+            if (!asset || parseFloat(asset.amount) <= 0) {
+                wx.showToast({ title: '无可提现金额', icon: 'none' });
+                return;
+            }
+            this.setData({
+                selectedAsset: asset,
+                tixianleixing: asset.leixing,
+                currentRate: asset.rate,
+                tixianjine: '',
+                shouxufei: '0.00',
+                shijidaozhang: '0.00',
+                showTixian: true,
+            });
+        },
+
+        onJineInput(e) {
+            this.setData({ tixianjine: e.detail.value, shouxufei: '0.00', shijidaozhang: '0.00' });
+        },
+
+        onQuickAmountTap(e) {
+            const value = e.currentTarget.dataset.value;
+            this.setData({ tixianjine: value.toString(), shouxufei: '0.00', shijidaozhang: '0.00' });
+        },
+
+        onStatusFilterTap(e) {
+            const value = parseInt(e.currentTarget.dataset.value);
+            if (value === this.data.currentStatusFilter) return;
+            this.setData({ currentStatusFilter: value });
+            this.huoquJilu(true);
+        },
+
+        async onConfirmTixian() {
+            if (this.data.submitting) return;
+            const { tixianleixing, tixianjine, selectedAsset } = this.data;
+            if (!tixianleixing || !selectedAsset) {
+                wx.showToast({ title: '请选择提现类型', icon: 'none' });
+                return;
+            }
+            const jineValue = parseFloat(tixianjine);
+            if (!tixianjine || isNaN(jineValue) || jineValue <= 0) {
+                wx.showToast({ title: '请输入有效金额', icon: 'none' });
+                return;
+            }
+            if (jineValue > parseFloat(selectedAsset.amount)) {
+                wx.showToast({ title: `超过可提${selectedAsset.label}`, icon: 'none' });
+                return;
+            }
+
+            this.setData({ submitting: true });
+            try {
+                const res = await request({
+                    url: '/yonghu/zddksh',
+                    method: 'POST',
+                    data: { leixing: tixianleixing, jine: jineValue.toFixed(2) }
+                });
+                if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                    const data = res.data.data || {};
+                    this.gengxinYue(data, tixianleixing);
+                    if (data.shouxufei !== undefined) {
+                        this.setData({
+                            shouxufei: parseFloat(data.shouxufei || 0).toFixed(2),
+                            shijidaozhang: parseFloat(data.shijidaozhang || 0).toFixed(2),
+                        });
+                    }
+                    this.setData({ showTixian: false, submitting: false, selectedAsset: null });
+                    await this.loadAllAssets();
+                    this.huoquJilu(true);
+                    wx.showModal({
+                        title: '申请已提交',
+                        content: '您的提现申请已提交，请等待后台审核。审核通过后，请在本页「提现记录」中点击「收款」按钮，主动确认后才能到账微信零钱。',
+                        showCancel: false,
+                    });
+                } else {
+                    wx.showModal({ title: '提现申请失败', content: res.data?.msg || '未知错误', showCancel: false });
+                    this.setData({ submitting: false });
+                }
+            } catch (err) {
+                wx.showModal({ title: '网络错误', content: '网络连接失败，请稍后重试', showCancel: false });
+                this.setData({ submitting: false });
+            }
+        },
+
+        onCollectTap(e) {
+            const index = e.currentTarget.dataset.index;
+            const record = this.data.recordList[index];
+            if (!record) return;
+            if (this.parseZhuangtai(record) !== TX_STATUS.DAI_SHOUKUAN) {
+                wx.showToast({ title: '当前状态不可收款', icon: 'none' });
+                return;
+            }
+            if (!this.hasShenheDanhao(record) || !this.hasAuditJiluId(record)) {
+                wx.showToast({ title: '审核信息不完整，请刷新后重试', icon: 'none' });
+                return;
+            }
+            if (this.data.submitting) {
+                wx.showToast({ title: '正在处理中，请稍后', icon: 'none' });
+                return;
+            }
+            this.setData({ showCollectConfirm: true, collectConfirmRecord: record });
+        },
+
+        onCloseCollectConfirm() {
+            if (this.data.submitting) return;
+            this.setData({ showCollectConfirm: false, collectConfirmRecord: null });
+        },
+
+        async onConfirmCollect() {
+            if (this.data.submitting) return;
+            let record = this.data.collectConfirmRecord;
+            if (!record) return;
+
+            if (!this.canCollectRecord(record)) {
+                await this.huoquJilu(true, true);
+                const refreshed = (this.data.recordList || []).find(
+                    r => String(r.id) === String(record.id)
+                        || String(r.tixianjilu_id) === String(record.tixianjilu_id)
+                );
+                if (refreshed) record = refreshed;
+            }
+            if (!this.canCollectRecord(record)) {
+                wx.showModal({
+                    title: '暂时无法收款',
+                    content: '缺少审核单号或审核记录ID，请下拉刷新后重试。仍不行请联系客服。',
+                    showCancel: false,
+                });
+                return;
+            }
+
+            this.setData({ showCollectConfirm: false, submitting: true, collectConfirmRecord: record });
+            try {
+                const res = await request({
+                    url: '/yonghu/tixiansq',
+                    method: 'POST',
+                    data: {
+                        shenhe_danhao: record.shenhe_danhao,
+                        shenhe_jilu_id: record.shenhe_jilu_id || '',
+                        tixianjilu_id: record.tixianjilu_id || record.id || '',
+                        leixing: record.leixing,
+                    }
+                });
+                if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                    const data = res.data.data;
+                    this.setData({
+                        currentTixianId: data.tixian_id,
+                        mchId: data.mch_id || '',
+                        collectConfirmRecord: record,
+                    });
+                    this.tiaoqiWeixinQueRen(data.package_info);
+                } else {
+                    wx.showModal({ title: '收款失败', content: res.data?.msg || '无法发起收款，请稍后重试', showCancel: false });
+                    this.setData({ submitting: false, collectConfirmRecord: null });
+                }
+            } catch (err) {
+                wx.showModal({ title: '网络错误', content: '网络连接失败，请稍后重试', showCancel: false });
+                this.setData({ submitting: false, collectConfirmRecord: null });
+            }
+        },
+
+        tiaoqiWeixinQueRen(packageInfo) {
+            const appId = app.globalData.appId;
+            const mchId = this.data.mchId;
+            if (!appId || !mchId) {
+                wx.showModal({ title: '配置错误', content: '无法调起收款，请联系客服', showCancel: false });
+                this.setData({ submitting: false, collectConfirmRecord: null });
+                return;
+            }
+            wx.requestMerchantTransfer({
+                appId, mchId, package: packageInfo,
+                success: () => { this.tongzhiHouduanQueRen(1); },
+                fail: () => {
+                    this.tongzhiHouduanQueRen(0);
+                    wx.showModal({
+                        title: '确认收款失败',
+                        content: '微信收款确认失败，您可在记录中再次点击「收款」重试。',
+                        showCancel: false,
+                    });
+                }
+            });
+        },
+
+        async tongzhiHouduanQueRen(result) {
+            if (!this.data.currentTixianId) {
+                this.setData({ submitting: false, collectConfirmRecord: null });
+                return;
+            }
+            const record = this.data.collectConfirmRecord;
+            const wxConfirmed = result === 1;
+
+            try {
+                const res = await request({
+                    url: '/yonghu/tixianqr',
+                    method: 'POST',
+                    data: {
+                        tixian_id: this.data.currentTixianId,
+                        result: result,
+                        shenhe_danhao: record ? record.shenhe_danhao : '',
+                        shenhe_jilu_id: record ? (record.shenhe_jilu_id || '') : '',
+                        tixianjilu_id: record ? (record.tixianjilu_id || record.id || '') : '',
+                        leixing: record ? record.leixing : '',
+                    }
+                });
+                if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                    const data = res.data.data || {};
+                    this.gengxinYue(data, record ? record.leixing : null);
+                }
+
+                // 微信已确认收款：不论 tixianqr 返回什么，都刷新列表，不弹系统异常
+                if (wxConfirmed) {
+                    await this.finishWxCollectSuccess(record);
+                } else if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                    await this.loadAllAssets();
+                    this.huoquJilu(true);
+                    wx.showToast({
+                        title: '收款已取消',
+                        icon: 'none',
+                        duration: 3000,
+                    });
+                } else {
+                    wx.showModal({
+                        title: '确认状态失败',
+                        content: res.data?.msg || '操作失败',
+                        showCancel: false,
+                    });
+                }
+            } catch (err) {
+                if (wxConfirmed) {
+                    await this.finishWxCollectSuccess(record);
+                } else {
+                    wx.showModal({
+                        title: '网络错误',
+                        content: '网络连接失败',
+                        showCancel: false,
+                    });
+                }
+            } finally {
+                this.setData({ submitting: false, currentTixianId: null, collectConfirmRecord: null });
+            }
+        },
+
+        onViewDetail(e) {
+            const index = e.currentTarget.dataset.index;
+            const record = this.data.recordList[index];
+            if (!record || !record.canShowDetail) return;
+            const status = parseInt(record.zhuangtai);
+            let detailTitle = '失败原因';
+            if (status === TX_STATUS.SHENHE_SHIBAI) detailTitle = '审核失败原因';
+            else if (status === TX_STATUS.TIXIAN_SHIBAI) detailTitle = '提现失败原因';
+            this.setData({
+                showDetailModal: true,
+                detailTitle,
+                detailContent: record.detailReason || '暂无详细信息',
+            });
+        },
+
+        onCloseDetailModal() {
+            this.setData({ showDetailModal: false, detailTitle: '', detailContent: '' });
+        },
+
+        onCloseTixian() {
+            if (this.data.submitting) { wx.showToast({ title: '正在处理中，请稍后', icon: 'none' }); return; }
+            this.setData({
+                showTixian: false, selectedAsset: null, tixianleixing: null,
+                tixianjine: '', shouxufei: '0.00', shijidaozhang: '0.00', submitting: false,
+            });
+        },
+
+        async huoquJilu(fresh = false, force = false) {
+            const now = Date.now();
+            if (!force && now - lastPullDownTime < 2000 && !fresh) return;
+            if (!force && (this.data.loading || this.data.isRefreshing)) return;
+            const page = fresh ? 1 : this.data.page;
+            if (fresh) this.setData({ nomore: false, canloadmore: true, isRefreshing: true });
+            if (this.data.nomore && !fresh) return;
+            this.setData({ loading: true });
+            lastPullDownTime = now;
+            try {
+                const res = await request({
+                    url: '/yonghu/tixianjiluhq',
+                    method: 'POST',
+                    data: { page, limit: yemianshuju, mode: 2, zhuangtai: this.data.currentStatusFilter }
+                });
+                if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                    const data = res.data.data;
+                    const processedList = (data.list || []).map(item => this.processRecordItem(item));
+                    const newList = fresh ? processedList : [...this.data.recordList, ...processedList];
+                    this.setData({
+                        recordList: newList,
+                        page: page + 1,
+                        nomore: !(data.has_more === true),
+                        canloadmore: data.has_more === true,
+                        loading: false,
+                        isRefreshing: false,
+                    });
+                    this.updatePendingCollectFlag(newList);
+                } else {
+                    this.setData({ loading: false, isRefreshing: false });
+                }
+            } catch (err) {
+                this.setData({ loading: false, isRefreshing: false });
+            }
+        },
+
+        onReachBottom() {
+            if (this.data.canloadmore && !this.data.nomore && !this.data.loading && !this.data.isRefreshing) {
+                const now = Date.now();
+                if (now - lastPullDownTime >= PULL_DOWN_INTERVAL) this.huoquJilu();
+            }
+        },
+
+        stopPropagation() {}
+    }
+});
diff --git a/pages/tixian/components/mode2/mode2.json b/pages/withdraw/components/mode2/mode2.json
similarity index 100%
rename from pages/tixian/components/mode2/mode2.json
rename to pages/withdraw/components/mode2/mode2.json
diff --git a/pages/tixian/components/mode2/mode2.wxml b/pages/withdraw/components/mode2/mode2.wxml
similarity index 100%
rename from pages/tixian/components/mode2/mode2.wxml
rename to pages/withdraw/components/mode2/mode2.wxml
diff --git a/pages/tixian/components/mode2/mode2.wxss b/pages/withdraw/components/mode2/mode2.wxss
similarity index 100%
rename from pages/tixian/components/mode2/mode2.wxss
rename to pages/withdraw/components/mode2/mode2.wxss
diff --git a/pages/tixian/tixian.js b/pages/withdraw/withdraw.js
similarity index 80%
rename from pages/tixian/tixian.js
rename to pages/withdraw/withdraw.js
index 7764518..1246f6c 100644
--- a/pages/tixian/tixian.js
+++ b/pages/withdraw/withdraw.js
@@ -1,75 +1,72 @@
-// pages/tixian/tixian.js
-import request from '../../utils/request.js';
-import PopupService from '../../services/popupService.js';
-
-const app = getApp();
-
-Page({
-    data: {
-        pageMode: 0,       // 0:加载中  1:收款码模式  2:微信零钱模式
-        pageOptions: {},   // 保存启动参数，传给子组件
-        loadError: false,  // 获取模式失败时展示错误状态
-    },
-
-    onLoad(options) {
-        this.setData({
-            pageOptions: options || {}
-        });
-        this.fetchPageMode();
-    },
-
-    // ✅ 用 onShow，别用 pageLifetimes
-    onShow() {
-        this.registerNotificationComponent();
-        // 如果已经在某个模式下，可以刷新一下子组件数据（可选）
-        // 弹窗检查
-        PopupService.checkAndShow(this, 'tixian');
-    },
-
-    onHide() {
-        const popupComp = this.selectComponent('#popupNotice');
-        if (popupComp && popupComp.cleanup) {
-            popupComp.cleanup();
-        }
-    },
-
-    // ✅ 注册通知组件（弹窗依赖它）
-    registerNotificationComponent() {
-        const notificationComp = this.selectComponent('#global-notification');
-        if (notificationComp && notificationComp.showNotification) {
-            app.globalData.globalNotification = {
-                show: (data) => notificationComp.showNotification(data),
-                hide: () => notificationComp.hideNotification()
-            };
-        }
-    },
-
-    async fetchPageMode() {
-        try {
-            const res = await request({
-                url: '/peizhi/hqtxzsym',
-                method: 'POST'
-            });
-
-            if (res.statusCode === 200 && res.data && res.data.code === 0) {
-                const mode = parseInt(res.data.data.mode);
-                this.setData({
-                    pageMode: (mode === 1 || mode === 2) ? mode : 1,
-                    loadError: false
-                });
-            } else {
-                this.setData({ pageMode: 1, loadError: false });
-            }
-        } catch (err) {
-            console.error('获取展示模式失败:', err);
-            this.setData({ loadError: true });
-        }
-    },
-
-    retryFetch() {
-        this.setData({ loadError: false, pageMode: 0 });
-        this.fetchPageMode();
-    },
-
-    stopPropagation() {}
+// pages/withdraw/withdraw.js
+import request from '../../utils/request.js';
+import PopupService from '../../services/popupService.js';
+
+const app = getApp();
+
+Page({
+    data: {
+        pageMode: 0,
+        pageOptions: {},
+        loadError: false,
+    },
+
+    onLoad(options) {
+        this.setData({
+            pageOptions: options || {}
+        });
+        this.fetchPageMode();
+    },
+
+    onShow() {
+        this.registerNotificationComponent();
+        PopupService.checkAndShow(this, 'tixian');
+    },
+
+    onHide() {
+        const popupComp = this.selectComponent('#popupNotice');
+        if (popupComp && popupComp.cleanup) {
+            popupComp.cleanup();
+        }
+    },
+
+    // 注册通知组件
+    registerNotificationComponent() {
+        const notificationComp = this.selectComponent('#global-notification');
+        if (notificationComp && notificationComp.showNotification) {
+            app.globalData.globalNotification = {
+                show: (data) => notificationComp.showNotification(data),
+                hide: () => notificationComp.hideNotification()
+            };
+        }
+    },
+
+    async fetchPageMode() {
+        try {
+            const res = await request({
+                url: '/peizhi/hqtxzsym',
+                method: 'POST'
+            });
+
+            if (res.statusCode === 200 && res.data && res.data.code === 0) {
+                const mode = parseInt(res.data.data.mode);
+                this.setData({
+                    pageMode: (mode === 1 || mode === 2) ? mode : 1,
+                    loadError: false
+                });
+            } else {
+                this.setData({ pageMode: 1, loadError: false });
+            }
+        } catch (err) {
+            console.error('获取展示模式失败:', err);
+            this.setData({ loadError: true });
+        }
+    },
+
+    retryFetch() {
+        this.setData({ loadError: false, pageMode: 0 });
+        this.fetchPageMode();
+    },
+
+    stopPropagation() {}
 });
\ No newline at end of file
diff --git a/pages/tixian/tixian.json b/pages/withdraw/withdraw.json
similarity index 100%
rename from pages/tixian/tixian.json
rename to pages/withdraw/withdraw.json
diff --git a/pages/tixian/tixian.wxml b/pages/withdraw/withdraw.wxml
similarity index 92%
rename from pages/tixian/tixian.wxml
rename to pages/withdraw/withdraw.wxml
index 88e6cdd..e059375 100644
--- a/pages/tixian/tixian.wxml
+++ b/pages/withdraw/withdraw.wxml
@@ -1,33 +1,33 @@
-<!-- pages/tixian/tixian.wxml -->
-<view class="tixian-container">
-
-<!-- 加载中状态 -->
-<view wx:if="{{pageMode === 0 && !loadError}}" class="loading-center">
-    <view class="loading-spinner"></view>
-    <text class="loading-text">加载中...</text>
-</view>
-
-<!-- 加载失败状态 -->
-<view wx:elif="{{loadError}}" class="error-center">
-    <text class="error-text">加载失败，请检查网络</text>
-    <view class="retry-btn" bindtap="retryFetch">点击重试</view>
-</view>
-
-<!-- 模式1：收款码模式 -->
-<mode1 
-    wx:elif="{{pageMode === 2}}" 
-    options="{{pageOptions}}"
-    id="tixian-mode1"
-/>
-
-<!-- 模式2：微信零钱模式 -->
-<mode2 
-    wx:elif="{{pageMode === 1}}" 
-    options="{{pageOptions}}"
-    id="tixian-mode2"
-/>
-<!-- 弹窗组件（放在最外层，跟原来一样） -->
-<global-notification id="global-notification" />
-  <popup-notice id="popupNotice" />
-
+<!-- pages/withdraw/withdraw.wxml -->
+<view class="tixian-container">
+
+<!-- 加载中状态 -->
+<view wx:if="{{pageMode === 0 && !loadError}}" class="loading-center">
+    <view class="loading-spinner"></view>
+    <text class="loading-text">加载中...</text>
+</view>
+
+<!-- 加载失败状态 -->
+<view wx:elif="{{loadError}}" class="error-center">
+    <text class="error-text">加载失败，请检查网络</text>
+    <view class="retry-btn" bindtap="retryFetch">点击重试</view>
+</view>
+
+<!-- 模式1：收款码模式 -->
+<mode1 
+    wx:elif="{{pageMode === 2}}" 
+    options="{{pageOptions}}"
+    id="tixian-mode1"
+/>
+
+<!-- 模式2：微信零钱模式 -->
+<mode2 
+    wx:elif="{{pageMode === 1}}" 
+    options="{{pageOptions}}"
+    id="tixian-mode2"
+/>
+<!-- 弹窗组件（放在最外层，跟原来一样） -->
+<global-notification id="global-notification" />
+  <popup-notice id="popupNotice" />
+
 </view>
\ No newline at end of file
diff --git a/pages/tixian/tixian.wxss b/pages/withdraw/withdraw.wxss
similarity index 53%
rename from pages/tixian/tixian.wxss
rename to pages/withdraw/withdraw.wxss
index 6aa6530..fe81d0a 100644
--- a/pages/tixian/tixian.wxss
+++ b/pages/withdraw/withdraw.wxss
@@ -1,50 +1,34 @@
-/* pages/tixian/tixian.wxss */
-.tixian-container {
-    width: 100%;
-    min-height: 100vh;
-    position: relative;
-}
-
-/* 加载状态 */
-.loading-center, .error-center {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 100vh;
-    color: #ffffff;
-    background: #1a0b2e;  /* 与赛博朋克背景统一 */
-}
-
-.loading-spinner {
-    width: 60rpx;
-    height: 60rpx;
-    border: 4rpx solid rgba(157, 78, 221, 0.3);
-    border-top-color: #9d4edd;
-    border-radius: 50%;
-    animation: spin 0.8s linear infinite;
-    margin-bottom: 30rpx;
-}
-
-.loading-text {
-    font-size: 28rpx;
-    color: rgba(255, 255, 255, 0.7);
-}
-
-.error-text {
-    font-size: 28rpx;
-    margin-bottom: 30rpx;
-}
-
-.retry-btn {
-    padding: 20rpx 60rpx;
-    background: linear-gradient(90deg, #6a11cb, #2575fc);
-    color: white;
-    border-radius: 40rpx;
-    font-size: 28rpx;
-}
-
-@keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-}
\ No newline at end of file
+/* pages/withdraw/withdraw.wxss */
+.tixian-container {
+    width: 100%;
+}
+
+/* 加载状态 */
+.loading-center, .error-center {
+    height: 100vh;
+    color: #ffffff;
+    background: #1a0b2e;
+}
+
+.loading-spinner {
+    border: 4rpx solid rgba(157, 78, 221, 0.3);
+    border-top-color: #9d4edd;
+    margin-bottom: 30rpx;
+}
+
+.loading-text {
+    font-size: 28rpx;
+    color: rgba(255, 255, 255, 0.7);
+}
+
+.error-text {
+    font-size: 28rpx;
+    margin-bottom: 30rpx;
+}
+
+.retry-btn {
+    padding: 20rpx 60rpx;
+    background: linear-gradient(90deg, #6a11cb, #2575fc);
+    color: white;
+    font-size: 28rpx;
+}
diff --git a/pages/xuanren/xuanren.js b/pages/xuanren/xuanren.js
deleted file mode 100644
index 5ac9bb3..0000000
--- a/pages/xuanren/xuanren.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/xuanren/xuanren.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})
\ No newline at end of file
diff --git a/pages/xuanren/xuanren.wxss b/pages/xuanren/xuanren.wxss
deleted file mode 100644
index 9103bc8..0000000
--- a/pages/xuanren/xuanren.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pages/xuanren/xuanren.wxss */
\ No newline at end of file
diff --git a/utils/chat-core.js b/utils/chat-core.js
index 192f558..02488a4 100644
--- a/utils/chat-core.js
+++ b/utils/chat-core.js
@@ -1,400 +1,400 @@
-// utils/chat-core.js — 全局 IM 连接、监听、角标（稳定版）
-import GoEasy from '../static/lib/goeasy-2.13.24.esm.min';
-import { resolveAvatarUrl } from './avatar.js';
-import { getLocalImUserId, getLocalImIdentity } from './im-user.js';
-
-let _convListener = null;
-let _privateListener = null;
-let _groupListener = null;
-let _notificationHandler = null;
-let _heartbeatTimer = null;
-let _listenersBoundForUser = null;
-let _lastGroupSubscribeAt = 0;
-const _notifiedMessageIds = new Map();
-const NOTIFY_MAX_AGE_MS = 15000;
-
-function shouldShowNotification(message) {
-  if (!message) return false;
-  const id = message.messageId || `${message.senderId}_${message.timestamp}`;
-  if (_notifiedMessageIds.has(id)) return false;
-  if (message.timestamp && Date.now() - message.timestamp > NOTIFY_MAX_AGE_MS) return false;
-  _notifiedMessageIds.set(id, Date.now());
-  if (_notifiedMessageIds.size > 400) {
-    const cutoff = Date.now() - 60000;
-    _notifiedMessageIds.forEach((t, k) => {
-      if (t < cutoff) _notifiedMessageIds.delete(k);
-    });
-  }
-  return true;
-}
-
-function bindGlobalListenersIfNeeded(app, userId) {
-  if (_listenersBoundForUser === userId && _convListener) return;
-  registerGlobalListeners(app);
-  registerNotification(app);
-  _listenersBoundForUser = userId;
-}
-
-function initGlobalMessageSystem(app) {
-  app.ensureConnection = () => ensureConnection(app);
-  app.connectForCurrentRole = () => ensureConnection(app);
-  app.loadConversations = () => loadConversations(app);
-  app.disconnectGoEasy = () => disconnectGoEasy(app);
-  app.switchRoleAndReconnect = (newRole) => switchRoleAndReconnect(app, newRole);
-  app.updateUnreadCount = (count) => updateTabBarBadge(app, count || 0);
-  app.reregisterNotification = () => registerNotification(app);
-  app.startImWhenReady = () => startImWhenReady(app);
-
-  if (!app.globalData.messageManager) {
-    app.globalData.messageManager = {};
-  }
-  try {
-    const muted = wx.getStorageSync('notificationMuted');
-    if (muted !== undefined) app.globalData.messageManager.notificationMuted = muted;
-  } catch (e) {}
-
-  initAppStateListener(app);
-  initNetworkListener(app);
-  startHeartbeat(app);
-  startImWhenReady(app);
-}
-
-/** GoEasy 未就绪时轮询，登录后尽早建立监听 */
-function startImWhenReady(app, maxAttempts = 40) {
-  let attempts = 0;
-  const tick = () => {
-    if (!wx.getStorageSync('uid')) return;
-    attempts += 1;
-    if (!wx.goEasy) {
-      if (attempts < maxAttempts) setTimeout(tick, 250);
-      return;
-    }
-    ensureConnection(app);
-  };
-  tick();
-}
-
-function getCurrentUserId() {
-  return (wx.goEasy && wx.goEasy.im && wx.goEasy.im.userId) || null;
-}
-
-function getConnectionStatus() {
-  if (!wx.goEasy || !wx.goEasy.getConnectionStatus) return 'disconnected';
-  return wx.goEasy.getConnectionStatus();
-}
-
-function isConnected() {
-  const s = getConnectionStatus();
-  return s === 'connected' || s === 'reconnected';
-}
-
-/** 统一会话数据结构，避免不同回调格式导致列表空白 */
-function normalizeConversationsPayload(result) {
-  if (!result) return { conversations: [], unreadTotal: 0 };
-  const content = result.content || result;
-  const conversations = content.conversations || result.conversations || [];
-  const unreadTotal = content.unreadTotal ?? result.unreadTotal ?? 0;
-  return { conversations, unreadTotal };
-}
-
-function emitConversationsUpdated(app, result) {
-  const payload = normalizeConversationsPayload(result);
-  updateTabBarBadge(app, payload.unreadTotal);
-  app.emitEvent('conversationsUpdated', {
-    content: payload,
-    unreadTotal: payload.unreadTotal,
-    raw: result,
-  });
-}
-
-async function ensureConnection(app) {
-  const uid = wx.getStorageSync('uid');
-  if (!uid || !wx.goEasy) return;
-
-  const targetUserId = getLocalImUserId(app);
-  const identityType = getLocalImIdentity(app);
-  if (!targetUserId) return;
-
-  if (isConnected()) {
-    const currentUserId = getCurrentUserId();
-    if (currentUserId === targetUserId) {
-      bindGlobalListenersIfNeeded(app, targetUserId);
-      loadConversations(app);
-      const now = Date.now();
-      if (now - _lastGroupSubscribeAt > 60000) {
-        _lastGroupSubscribeAt = now;
-        await subscribeAllGroups(app);
-      }
-      return;
-    }
-    try {
-      wx.goEasy.disconnect();
-    } catch (e) {}
-  }
-
-  connectGoEasy(app, targetUserId, identityType);
-}
-
-function connectGoEasy(app, userId, identityType) {
-  const defAvatar = resolveAvatarUrl('', app);
-  const tx = wx.getStorageSync('touxiang') || '';
-  const uid = wx.getStorageSync('uid') || '';
-  const nick = wx.getStorageSync('nicheng') || app.globalData.nicheng || app.globalData.dashouNicheng || '';
-  const name = nick || ('用户' + (uid || '').substring(0, 6));
-  const avatar = resolveAvatarUrl(tx, app) || defAvatar;
-
-  wx.goEasy.connect({
-    id: userId,
-    data: {
-      name,
-      avatar,
-      identityType: identityType === 'normal' ? 'boss' : identityType,
-    },
-    onSuccess: async () => {
-      try {
-        wx.setStorageSync('savedGoEasyConnection', JSON.stringify({
-          userId,
-          identityType,
-          lastConnectTime: Date.now(),
-          status: 'connected',
-        }));
-      } catch (e) {}
-      bindGlobalListenersIfNeeded(app, userId);
-      _lastGroupSubscribeAt = Date.now();
-      await subscribeAllGroups(app);
-      loadConversations(app);
-    },
-    onFailed: (error) => {
-      console.error('GoEasy连接失败', error);
-      if (error.code === 408) {
-        bindGlobalListenersIfNeeded(app, userId);
-        loadConversations(app);
-      } else {
-        wx.showToast({ title: '连接失败，请重试', icon: 'none' });
-      }
-    },
-  });
-}
-
-function subscribeAllGroups(app) {
-  return new Promise((resolve) => {
-    if (!wx.goEasy || !wx.goEasy.im) return resolve();
-    wx.goEasy.im.latestConversations({
-      onSuccess: (result) => {
-        const payload = normalizeConversationsPayload(result);
-        const groupIds = payload.conversations
-          .filter((c) => c.type === 'group' && c.groupId)
-          .map((c) => c.groupId);
-        if (groupIds.length && wx.goEasy.im.subscribeGroup) {
-          wx.goEasy.im.subscribeGroup({
-            groupIds,
-            onSuccess: () => resolve(),
-            onFailed: () => resolve(),
-          });
-        } else {
-          resolve();
-        }
-      },
-      onFailed: () => resolve(),
-    });
-  });
-}
-
-function registerGlobalListeners(app) {
-  if (!wx.goEasy || !wx.goEasy.im) return;
-
-  if (_convListener) {
-    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, _convListener);
-  }
-  if (_privateListener) {
-    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _privateListener);
-  }
-  if (_groupListener) {
-    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _groupListener);
-  }
-
-  _convListener = (result) => {
-    emitConversationsUpdated(app, result);
-  };
-  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, _convListener);
-
-  _privateListener = () => {
-    loadConversations(app);
-  };
-  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _privateListener);
-
-  _groupListener = () => {
-    loadConversations(app);
-  };
-  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _groupListener);
-}
-
-function loadConversations(app) {
-  if (!wx.goEasy || !wx.goEasy.im) return;
-  if (!getCurrentUserId()) return;
-
-  wx.goEasy.im.latestConversations({
-    onSuccess: (result) => {
-      emitConversationsUpdated(app, result);
-      subscribeAllGroups(app);
-    },
-    onFailed: (err) => {
-      console.error('加载会话失败', err);
-    },
-  });
-}
-
-function updateTabBarBadge(app, unreadCount) {
-  const badgeText = unreadCount > 0 ? (unreadCount > 99 ? '99+' : String(unreadCount)) : '';
-  if (!app.globalData.messageManager) app.globalData.messageManager = {};
-  app.globalData.messageManager.unreadTotal = unreadCount;
-  app.globalData.messageManager.tabBarBadgeText = badgeText;
-  app.emitEvent('tabBarBadgeChanged', { badgeText, showRedDot: unreadCount > 0 });
-
-  try {
-    const pages = getCurrentPages();
-    if (pages.length) {
-      const page = pages[pages.length - 1];
-      const tabBar = page.selectComponent('#custom-tab-bar');
-      if (tabBar && tabBar.setData) tabBar.setData({ badgeText });
-      if (page.getTabBar) {
-        const tb = page.getTabBar();
-        if (tb && tb.setData) tb.setData({ badgeText });
-      }
-    }
-  } catch (e) {}
-  wx.setStorageSync('messageUnreadTotal', unreadCount);
-}
-
-function registerNotification(app) {
-  if (!wx.goEasy || !wx.goEasy.im) return;
-
-  if (_notificationHandler) {
-    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _notificationHandler);
-    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _notificationHandler);
-  }
-
-  _notificationHandler = (message) => {
-    if (app.globalData.messageManager && app.globalData.messageManager.notificationMuted) return;
-    if (!shouldShowNotification(message)) return;
-    const pages = getCurrentPages();
-    if (pages.length) {
-      const curPage = pages[pages.length - 1];
-      const route = curPage.route || '';
-      if (route === 'pages/liaotian/liaotian' || route === 'pages/qunliaotian/qunliaotian') return;
-    }
-    const senderName = message.senderData?.name || (message.senderId || '用户');
-    let content = '';
-    if (message.type === 'text') content = message.payload?.text || '[文本]';
-    else if (message.type === 'image') content = '[图片]';
-    else if (message.type === 'audio') content = '[语音]';
-    else content = '[新消息]';
-    const avatar = resolveAvatarUrl(message.senderData?.avatar, app);
-
-    if (app.globalData.globalNotification && app.globalData.globalNotification.show) {
-      app.globalData.globalNotification.show({
-        senderName,
-        content,
-        avatar,
-        message,
-        notificationType: message.groupId ? 'group' : 'private',
-        groupId: message.groupId,
-        orderId: message.orderId,
-      });
-    } else {
-      wx.showToast({ title: `${senderName}: ${content}`, icon: 'none', duration: 2000 });
-    }
-  };
-  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _notificationHandler);
-  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _notificationHandler);
-}
-
-function detachGlobalListeners() {
-  if (!wx.goEasy || !wx.goEasy.im) return;
-  if (_convListener) {
-    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, _convListener);
-    _convListener = null;
-  }
-  if (_privateListener) {
-    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _privateListener);
-    _privateListener = null;
-  }
-  if (_groupListener) {
-    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _groupListener);
-    _groupListener = null;
-  }
-  if (_notificationHandler) {
-    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _notificationHandler);
-    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _notificationHandler);
-    _notificationHandler = null;
-  }
-  _listenersBoundForUser = null;
-}
-
-function disconnectGoEasy(app) {
-  stopHeartbeat(app);
-  detachGlobalListeners();
-  if (wx.goEasy && wx.goEasy.disconnect) {
-    wx.goEasy.disconnect({ onSuccess: () => {}, onFailed: () => {} });
-  }
-  wx.removeStorageSync('savedGoEasyConnection');
-}
-
-async function switchRoleAndReconnect(app, newRole) {
-  disconnectGoEasy(app);
-  app.globalData.currentRole = newRole;
-  wx.setStorageSync('currentRole', newRole);
-  if (app.globalData.primaryRole !== newRole && ['normal', 'dashou', 'shangjia'].includes(newRole)) {
-    app.globalData.primaryRole = newRole;
-    wx.setStorageSync('primaryRole', newRole);
-  }
-  startHeartbeat(app);
-  await ensureConnection(app);
-  return true;
-}
-
-function startHeartbeat(app) {
-  stopHeartbeat(app);
-  _heartbeatTimer = setInterval(() => {
-    if (!wx.getStorageSync('uid')) return;
-    if (isConnected()) {
-      loadConversations(app);
-    } else {
-      ensureConnection(app);
-    }
-  }, 45000);
-}
-
-function stopHeartbeat(app) {
-  if (_heartbeatTimer) {
-    clearInterval(_heartbeatTimer);
-    _heartbeatTimer = null;
-  }
-}
-
-function initAppStateListener(app) {
-  wx.onAppShow(() => {
-    setTimeout(() => {
-      if (!wx.getStorageSync('uid')) return;
-      if (!isConnected()) {
-        ensureConnection(app);
-      } else {
-        loadConversations(app);
-        setTimeout(() => {
-          const unread = (app.globalData.messageManager && app.globalData.messageManager.unreadTotal) || 0;
-          updateTabBarBadge(app, unread);
-        }, 300);
-      }
-    }, 200);
-  });
-}
-
-function initNetworkListener(app) {
-  wx.onNetworkStatusChange((res) => {
-    if (res.isConnected) {
-      setTimeout(() => ensureConnection(app), 1000);
-    }
-  });
-}
-
-module.exports = { initGlobalMessageSystem };
+// utils/chat-core.js — 全局 IM 连接、监听、角标（稳定版）
+import GoEasy from '../static/lib/goeasy-2.13.24.esm.min';
+import { resolveAvatarUrl } from './avatar.js';
+import { getLocalImUserId, getLocalImIdentity } from './im-user.js';
+
+let _convListener = null;
+let _privateListener = null;
+let _groupListener = null;
+let _notificationHandler = null;
+let _heartbeatTimer = null;
+let _listenersBoundForUser = null;
+let _lastGroupSubscribeAt = 0;
+const _notifiedMessageIds = new Map();
+const NOTIFY_MAX_AGE_MS = 15000;
+
+function shouldShowNotification(message) {
+  if (!message) return false;
+  const id = message.messageId || `${message.senderId}_${message.timestamp}`;
+  if (_notifiedMessageIds.has(id)) return false;
+  if (message.timestamp && Date.now() - message.timestamp > NOTIFY_MAX_AGE_MS) return false;
+  _notifiedMessageIds.set(id, Date.now());
+  if (_notifiedMessageIds.size > 400) {
+    const cutoff = Date.now() - 60000;
+    _notifiedMessageIds.forEach((t, k) => {
+      if (t < cutoff) _notifiedMessageIds.delete(k);
+    });
+  }
+  return true;
+}
+
+function bindGlobalListenersIfNeeded(app, userId) {
+  if (_listenersBoundForUser === userId && _convListener) return;
+  registerGlobalListeners(app);
+  registerNotification(app);
+  _listenersBoundForUser = userId;
+}
+
+function initGlobalMessageSystem(app) {
+  app.ensureConnection = () => ensureConnection(app);
+  app.connectForCurrentRole = () => ensureConnection(app);
+  app.loadConversations = () => loadConversations(app);
+  app.disconnectGoEasy = () => disconnectGoEasy(app);
+  app.switchRoleAndReconnect = (newRole) => switchRoleAndReconnect(app, newRole);
+  app.updateUnreadCount = (count) => updateTabBarBadge(app, count || 0);
+  app.reregisterNotification = () => registerNotification(app);
+  app.startImWhenReady = () => startImWhenReady(app);
+
+  if (!app.globalData.messageManager) {
+    app.globalData.messageManager = {};
+  }
+  try {
+    const muted = wx.getStorageSync('notificationMuted');
+    if (muted !== undefined) app.globalData.messageManager.notificationMuted = muted;
+  } catch (e) {}
+
+  initAppStateListener(app);
+  initNetworkListener(app);
+  startHeartbeat(app);
+  startImWhenReady(app);
+}
+
+/** GoEasy 未就绪时轮询，登录后尽早建立监听 */
+function startImWhenReady(app, maxAttempts = 40) {
+  let attempts = 0;
+  const tick = () => {
+    if (!wx.getStorageSync('uid')) return;
+    attempts += 1;
+    if (!wx.goEasy) {
+      if (attempts < maxAttempts) setTimeout(tick, 250);
+      return;
+    }
+    ensureConnection(app);
+  };
+  tick();
+}
+
+function getCurrentUserId() {
+  return (wx.goEasy && wx.goEasy.im && wx.goEasy.im.userId) || null;
+}
+
+function getConnectionStatus() {
+  if (!wx.goEasy || !wx.goEasy.getConnectionStatus) return 'disconnected';
+  return wx.goEasy.getConnectionStatus();
+}
+
+function isConnected() {
+  const s = getConnectionStatus();
+  return s === 'connected' || s === 'reconnected';
+}
+
+/** 统一会话数据结构，避免不同回调格式导致列表空白 */
+function normalizeConversationsPayload(result) {
+  if (!result) return { conversations: [], unreadTotal: 0 };
+  const content = result.content || result;
+  const conversations = content.conversations || result.conversations || [];
+  const unreadTotal = content.unreadTotal ?? result.unreadTotal ?? 0;
+  return { conversations, unreadTotal };
+}
+
+function emitConversationsUpdated(app, result) {
+  const payload = normalizeConversationsPayload(result);
+  updateTabBarBadge(app, payload.unreadTotal);
+  app.emitEvent('conversationsUpdated', {
+    content: payload,
+    unreadTotal: payload.unreadTotal,
+    raw: result,
+  });
+}
+
+async function ensureConnection(app) {
+  const uid = wx.getStorageSync('uid');
+  if (!uid || !wx.goEasy) return;
+
+  const targetUserId = getLocalImUserId(app);
+  const identityType = getLocalImIdentity(app);
+  if (!targetUserId) return;
+
+  if (isConnected()) {
+    const currentUserId = getCurrentUserId();
+    if (currentUserId === targetUserId) {
+      bindGlobalListenersIfNeeded(app, targetUserId);
+      loadConversations(app);
+      const now = Date.now();
+      if (now - _lastGroupSubscribeAt > 60000) {
+        _lastGroupSubscribeAt = now;
+        await subscribeAllGroups(app);
+      }
+      return;
+    }
+    try {
+      wx.goEasy.disconnect();
+    } catch (e) {}
+  }
+
+  connectGoEasy(app, targetUserId, identityType);
+}
+
+function connectGoEasy(app, userId, identityType) {
+  const defAvatar = resolveAvatarUrl('', app);
+  const tx = wx.getStorageSync('touxiang') || '';
+  const uid = wx.getStorageSync('uid') || '';
+  const nick = wx.getStorageSync('nicheng') || app.globalData.nicheng || app.globalData.dashouNicheng || '';
+  const name = nick || ('用户' + (uid || '').substring(0, 6));
+  const avatar = resolveAvatarUrl(tx, app) || defAvatar;
+
+  wx.goEasy.connect({
+    id: userId,
+    data: {
+      name,
+      avatar,
+      identityType: identityType === 'normal' ? 'boss' : identityType,
+    },
+    onSuccess: async () => {
+      try {
+        wx.setStorageSync('savedGoEasyConnection', JSON.stringify({
+          userId,
+          identityType,
+          lastConnectTime: Date.now(),
+          status: 'connected',
+        }));
+      } catch (e) {}
+      bindGlobalListenersIfNeeded(app, userId);
+      _lastGroupSubscribeAt = Date.now();
+      await subscribeAllGroups(app);
+      loadConversations(app);
+    },
+    onFailed: (error) => {
+      console.error('GoEasy连接失败', error);
+      if (error.code === 408) {
+        bindGlobalListenersIfNeeded(app, userId);
+        loadConversations(app);
+      } else {
+        wx.showToast({ title: '连接失败，请重试', icon: 'none' });
+      }
+    },
+  });
+}
+
+function subscribeAllGroups(app) {
+  return new Promise((resolve) => {
+    if (!wx.goEasy || !wx.goEasy.im) return resolve();
+    wx.goEasy.im.latestConversations({
+      onSuccess: (result) => {
+        const payload = normalizeConversationsPayload(result);
+        const groupIds = payload.conversations
+          .filter((c) => c.type === 'group' && c.groupId)
+          .map((c) => c.groupId);
+        if (groupIds.length && wx.goEasy.im.subscribeGroup) {
+          wx.goEasy.im.subscribeGroup({
+            groupIds,
+            onSuccess: () => resolve(),
+            onFailed: () => resolve(),
+          });
+        } else {
+          resolve();
+        }
+      },
+      onFailed: () => resolve(),
+    });
+  });
+}
+
+function registerGlobalListeners(app) {
+  if (!wx.goEasy || !wx.goEasy.im) return;
+
+  if (_convListener) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, _convListener);
+  }
+  if (_privateListener) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _privateListener);
+  }
+  if (_groupListener) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _groupListener);
+  }
+
+  _convListener = (result) => {
+    emitConversationsUpdated(app, result);
+  };
+  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, _convListener);
+
+  _privateListener = () => {
+    loadConversations(app);
+  };
+  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _privateListener);
+
+  _groupListener = () => {
+    loadConversations(app);
+  };
+  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _groupListener);
+}
+
+function loadConversations(app) {
+  if (!wx.goEasy || !wx.goEasy.im) return;
+  if (!getCurrentUserId()) return;
+
+  wx.goEasy.im.latestConversations({
+    onSuccess: (result) => {
+      emitConversationsUpdated(app, result);
+      subscribeAllGroups(app);
+    },
+    onFailed: (err) => {
+      console.error('加载会话失败', err);
+    },
+  });
+}
+
+function updateTabBarBadge(app, unreadCount) {
+  const badgeText = unreadCount > 0 ? (unreadCount > 99 ? '99+' : String(unreadCount)) : '';
+  if (!app.globalData.messageManager) app.globalData.messageManager = {};
+  app.globalData.messageManager.unreadTotal = unreadCount;
+  app.globalData.messageManager.tabBarBadgeText = badgeText;
+  app.emitEvent('tabBarBadgeChanged', { badgeText, showRedDot: unreadCount > 0 });
+
+  try {
+    const pages = getCurrentPages();
+    if (pages.length) {
+      const page = pages[pages.length - 1];
+      const tabBar = page.selectComponent('#custom-tab-bar');
+      if (tabBar && tabBar.setData) tabBar.setData({ badgeText });
+      if (page.getTabBar) {
+        const tb = page.getTabBar();
+        if (tb && tb.setData) tb.setData({ badgeText });
+      }
+    }
+  } catch (e) {}
+  wx.setStorageSync('messageUnreadTotal', unreadCount);
+}
+
+function registerNotification(app) {
+  if (!wx.goEasy || !wx.goEasy.im) return;
+
+  if (_notificationHandler) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _notificationHandler);
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _notificationHandler);
+  }
+
+  _notificationHandler = (message) => {
+    if (app.globalData.messageManager && app.globalData.messageManager.notificationMuted) return;
+    if (!shouldShowNotification(message)) return;
+    const pages = getCurrentPages();
+    if (pages.length) {
+      const curPage = pages[pages.length - 1];
+      const route = curPage.route || '';
+      if (route === 'pages/chat/chat' || route === 'pages/group-chat/group-chat') return;
+    }
+    const senderName = message.senderData?.name || (message.senderId || '用户');
+    let content = '';
+    if (message.type === 'text') content = message.payload?.text || '[文本]';
+    else if (message.type === 'image') content = '[图片]';
+    else if (message.type === 'audio') content = '[语音]';
+    else content = '[新消息]';
+    const avatar = resolveAvatarUrl(message.senderData?.avatar, app);
+
+    if (app.globalData.globalNotification && app.globalData.globalNotification.show) {
+      app.globalData.globalNotification.show({
+        senderName,
+        content,
+        avatar,
+        message,
+        notificationType: message.groupId ? 'group' : 'private',
+        groupId: message.groupId,
+        orderId: message.orderId,
+      });
+    } else {
+      wx.showToast({ title: `${senderName}: ${content}`, icon: 'none', duration: 2000 });
+    }
+  };
+  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _notificationHandler);
+  wx.goEasy.im.on(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _notificationHandler);
+}
+
+function detachGlobalListeners() {
+  if (!wx.goEasy || !wx.goEasy.im) return;
+  if (_convListener) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, _convListener);
+    _convListener = null;
+  }
+  if (_privateListener) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _privateListener);
+    _privateListener = null;
+  }
+  if (_groupListener) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _groupListener);
+    _groupListener = null;
+  }
+  if (_notificationHandler) {
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, _notificationHandler);
+    wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, _notificationHandler);
+    _notificationHandler = null;
+  }
+  _listenersBoundForUser = null;
+}
+
+function disconnectGoEasy(app) {
+  stopHeartbeat(app);
+  detachGlobalListeners();
+  if (wx.goEasy && wx.goEasy.disconnect) {
+    wx.goEasy.disconnect({ onSuccess: () => {}, onFailed: () => {} });
+  }
+  wx.removeStorageSync('savedGoEasyConnection');
+}
+
+async function switchRoleAndReconnect(app, newRole) {
+  disconnectGoEasy(app);
+  app.globalData.currentRole = newRole;
+  wx.setStorageSync('currentRole', newRole);
+  if (app.globalData.primaryRole !== newRole && ['normal', 'dashou', 'shangjia'].includes(newRole)) {
+    app.globalData.primaryRole = newRole;
+    wx.setStorageSync('primaryRole', newRole);
+  }
+  startHeartbeat(app);
+  await ensureConnection(app);
+  return true;
+}
+
+function startHeartbeat(app) {
+  stopHeartbeat(app);
+  _heartbeatTimer = setInterval(() => {
+    if (!wx.getStorageSync('uid')) return;
+    if (isConnected()) {
+      loadConversations(app);
+    } else {
+      ensureConnection(app);
+    }
+  }, 45000);
+}
+
+function stopHeartbeat(app) {
+  if (_heartbeatTimer) {
+    clearInterval(_heartbeatTimer);
+    _heartbeatTimer = null;
+  }
+}
+
+function initAppStateListener(app) {
+  wx.onAppShow(() => {
+    setTimeout(() => {
+      if (!wx.getStorageSync('uid')) return;
+      if (!isConnected()) {
+        ensureConnection(app);
+      } else {
+        loadConversations(app);
+        setTimeout(() => {
+          const unread = (app.globalData.messageManager && app.globalData.messageManager.unreadTotal) || 0;
+          updateTabBarBadge(app, unread);
+        }, 300);
+      }
+    }, 200);
+  });
+}
+
+function initNetworkListener(app) {
+  wx.onNetworkStatusChange((res) => {
+    if (res.isConnected) {
+      setTimeout(() => ensureConnection(app), 1000);
+    }
+  });
+}
+
+module.exports = { initGlobalMessageSystem };
diff --git a/utils/im-user.js b/utils/im-user.js
index e1630c8..49f2b39 100644
--- a/utils/im-user.js
+++ b/utils/im-user.js
@@ -1,78 +1,78 @@
-/** IM 用户 ID：三端连接 + 管事/组长/考核官统一走打手 Ds 前缀 */
-import { getPrimaryRole } from './primary-role.js';
-import { resolveAvatarUrl } from './avatar.js';
-import { ensureRoleOnCenterPage } from './role-tab-bar.js';
-
-/** 联系对象前缀：管事/组长/考核官已废弃独立前缀，统一 Ds */
-const PEER_PREFIX = {
-  boss: 'Boss',
-  normal: 'Boss',
-  dashou: 'Ds',
-  shangjia: 'Sj',
-  guanshi: 'Ds',
-  zuzhang: 'Ds',
-  kaoheguan: 'Ds',
-};
-
-export function getImPrefixForRole(role) {
-  return PEER_PREFIX[role] || 'Ds';
-}
-
-/** 当前端连接 GoEasy 用的 userId */
-export function getLocalImUserId(app) {
-  app = app || getApp();
-  const uid = wx.getStorageSync('uid') || '';
-  if (!uid) return '';
-  const primary = getPrimaryRole(app);
-  if (primary === 'dashou') return 'Ds' + uid;
-  if (primary === 'shangjia') return 'Sj' + uid;
-  return 'Boss' + uid;
-}
-
-export function getLocalImIdentity(app) {
-  app = app || getApp();
-  return getPrimaryRole(app) || 'normal';
-}
-
-export function buildPeerImUserId(uid, role = 'dashou') {
-  if (!uid) return '';
-  return getImPrefixForRole(role) + uid;
-}
-
-/** 联系邀请人/管事/组长：统一 Ds 前缀 */
-export function buildGuanshiPeerId(uid) {
-  return buildDashouPeerId(uid);
-}
-
-export function buildDashouPeerId(uid) {
-  return buildPeerImUserId(uid, 'dashou');
-}
-
-export function buildInviterPeerId(uid) {
-  return buildDashouPeerId(uid);
-}
-
-export function ensureDashouImReady(page) {
-  const app = getApp();
-  ensureRoleOnCenterPage(page, 'dashou');
-  if (app.ensureConnection) app.ensureConnection();
-}
-
-export function openPrivateChat(page, { toUserId, toName, toAvatar, delay = 350 }) {
-  ensureDashouImReady(page);
-  const avatar = resolveAvatarUrl(toAvatar);
-  const param = {
-    toUserId,
-    toName: toName || '用户',
-    toAvatar: avatar,
-  };
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      wx.navigateTo({
-        url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param)),
-        fail: () => wx.showToast({ title: '打开聊天失败', icon: 'none' }),
-        complete: resolve,
-      });
-    }, delay);
-  });
-}
+/** IM 用户 ID：三端连接 + 管事/组长/考核官统一走打手 Ds 前缀 */
+import { getPrimaryRole } from './primary-role.js';
+import { resolveAvatarUrl } from './avatar.js';
+import { ensureRoleOnCenterPage } from './role-tab-bar.js';
+
+/** 联系对象前缀：管事/组长/考核官已废弃独立前缀，统一 Ds */
+const PEER_PREFIX = {
+  boss: 'Boss',
+  normal: 'Boss',
+  dashou: 'Ds',
+  shangjia: 'Sj',
+  guanshi: 'Ds',
+  zuzhang: 'Ds',
+  kaoheguan: 'Ds',
+};
+
+export function getImPrefixForRole(role) {
+  return PEER_PREFIX[role] || 'Ds';
+}
+
+/** 当前端连接 GoEasy 用的 userId */
+export function getLocalImUserId(app) {
+  app = app || getApp();
+  const uid = wx.getStorageSync('uid') || '';
+  if (!uid) return '';
+  const primary = getPrimaryRole(app);
+  if (primary === 'dashou') return 'Ds' + uid;
+  if (primary === 'shangjia') return 'Sj' + uid;
+  return 'Boss' + uid;
+}
+
+export function getLocalImIdentity(app) {
+  app = app || getApp();
+  return getPrimaryRole(app) || 'normal';
+}
+
+export function buildPeerImUserId(uid, role = 'dashou') {
+  if (!uid) return '';
+  return getImPrefixForRole(role) + uid;
+}
+
+/** 联系邀请人/管事/组长：统一 Ds 前缀 */
+export function buildGuanshiPeerId(uid) {
+  return buildDashouPeerId(uid);
+}
+
+export function buildDashouPeerId(uid) {
+  return buildPeerImUserId(uid, 'dashou');
+}
+
+export function buildInviterPeerId(uid) {
+  return buildDashouPeerId(uid);
+}
+
+export function ensureDashouImReady(page) {
+  const app = getApp();
+  ensureRoleOnCenterPage(page, 'dashou');
+  if (app.ensureConnection) app.ensureConnection();
+}
+
+export function openPrivateChat(page, { toUserId, toName, toAvatar, delay = 350 }) {
+  ensureDashouImReady(page);
+  const avatar = resolveAvatarUrl(toAvatar);
+  const param = {
+    toUserId,
+    toName: toName || '用户',
+    toAvatar: avatar,
+  };
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      wx.navigateTo({
+        url: '/pages/chat/chat?data=' + encodeURIComponent(JSON.stringify(param)),
+        fail: () => wx.showToast({ title: '打开聊天失败', icon: 'none' }),
+        complete: resolve,
+      });
+    }, delay);
+  });
+}
diff --git a/utils/primary-role.js b/utils/primary-role.js
index 1221323..29005ba 100644
--- a/utils/primary-role.js
+++ b/utils/primary-role.js
@@ -1,105 +1,105 @@
-/** 三端固定：normal | dashou | shangjia，认证后不可回退 */
-
-const VALID = ['normal', 'dashou', 'shangjia'];
-const LEGACY_CENTER_ROLES = ['guanshi', 'zuzhang', 'kaoheguan'];
-
-/** 旧版管事/组长/考核官主端标识 → 统一回落打手 Tab */
-export function migrateLegacyCenterRole(app) {
-  app = app || getApp();
-  const cur = wx.getStorageSync('currentRole') || app.globalData.currentRole || '';
-  const pri = wx.getStorageSync('primaryRole') || '';
-  const isLegacy = LEGACY_CENTER_ROLES.includes(cur) || LEGACY_CENTER_ROLES.includes(pri);
-  if (!isLegacy) return false;
-
-  const hasDashouSide =
-    isRoleStatusActive(wx.getStorageSync('dashoustatus'))
-    || isRoleStatusActive(wx.getStorageSync('guanshistatus'))
-    || isRoleStatusActive(wx.getStorageSync('zuzhangstatus'))
-    || isRoleStatusActive(wx.getStorageSync('kaoheguanstatus'));
-
-  if (hasDashouSide) {
-    lockPrimaryRole('dashou', app);
-    return true;
-  }
-  return false;
-}
-
-export function isRoleStatusActive(status) {
-  return Number(status) === 1;
-}
-
-/** 读取主端（兼容旧 currentRole / 管事组长落地页） */
-export function getPrimaryRole(app) {
-  app = app || getApp();
-  const stored = wx.getStorageSync('primaryRole');
-  if (VALID.includes(stored)) {
-    return stored;
-  }
-  const legacy = wx.getStorageSync('currentRole') || app.globalData.currentRole || 'normal';
-  if (legacy === 'dashou' || legacy === 'shangjia') {
-    return legacy;
-  }
-  if (legacy === 'guanshi' || legacy === 'zuzhang' || legacy === 'kaoheguan') {
-    if (isRoleStatusActive(wx.getStorageSync('dashoustatus'))) {
-      return 'dashou';
-    }
-    if (isRoleStatusActive(wx.getStorageSync('shangjiastatus'))) {
-      return 'shangjia';
-    }
-  }
-  if (isRoleStatusActive(wx.getStorageSync('dashoustatus'))) {
-    return 'dashou';
-  }
-  if (isRoleStatusActive(wx.getStorageSync('shangjiastatus'))) {
-    return 'shangjia';
-  }
-  return 'normal';
-}
-
-/** 锁定主端并同步 TabBar 角色 */
-export function lockPrimaryRole(role, app) {
-  if (!VALID.includes(role)) return;
-  app = app || getApp();
-  wx.setStorageSync('primaryRole', role);
-  wx.setStorageSync('currentRole', role);
-  app.globalData.primaryRole = role;
-  app.globalData.currentRole = role;
-  if (app.emitEvent) {
-    app.emitEvent('currentRoleChanged', { role });
-  }
-}
-
-/** TabBar / IM 使用的有效角色（仅三端） */
-export function getTabRole(app) {
-  return getPrimaryRole(app);
-}
-
-export function clearPrimaryRole(app) {
-  app = app || getApp();
-  wx.removeStorageSync('primaryRole');
-  lockPrimaryRole('normal', app);
-}
-
-export const PRIMARY_DEFAULT_PAGES = {
-  normal: '/pages/wode/wode',
-  dashou: '/pages/jiedan/jiedan',
-  shangjia: '/pages/sjdingdan/sjdingdan',
-};
-
-/** 锁定主端并跳转到该端默认首页，同时建立 IM 长连接 */
-export function enterLockedRole(role, app) {
-  if (!VALID.includes(role) || role === 'normal') return false;
-  app = app || getApp();
-  lockPrimaryRole(role, app);
-  wx.reLaunch({ url: PRIMARY_DEFAULT_PAGES[role] });
-  setTimeout(() => {
-    if (app.switchRoleAndReconnect) {
-      app.switchRoleAndReconnect(role).catch(() => {
-        if (app.connectForCurrentRole) app.connectForCurrentRole();
-      });
-    } else if (app.connectForCurrentRole) {
-      app.connectForCurrentRole();
-    }
-  }, 600);
-  return true;
-}
+/** 三端固定：normal | dashou | shangjia，认证后不可回退 */
+
+const VALID = ['normal', 'dashou', 'shangjia'];
+const LEGACY_CENTER_ROLES = ['guanshi', 'zuzhang', 'kaoheguan'];
+
+/** 旧版管事/组长/考核官主端标识 → 统一回落打手 Tab */
+export function migrateLegacyCenterRole(app) {
+  app = app || getApp();
+  const cur = wx.getStorageSync('currentRole') || app.globalData.currentRole || '';
+  const pri = wx.getStorageSync('primaryRole') || '';
+  const isLegacy = LEGACY_CENTER_ROLES.includes(cur) || LEGACY_CENTER_ROLES.includes(pri);
+  if (!isLegacy) return false;
+
+  const hasDashouSide =
+    isRoleStatusActive(wx.getStorageSync('dashoustatus'))
+    || isRoleStatusActive(wx.getStorageSync('guanshistatus'))
+    || isRoleStatusActive(wx.getStorageSync('zuzhangstatus'))
+    || isRoleStatusActive(wx.getStorageSync('kaoheguanstatus'));
+
+  if (hasDashouSide) {
+    lockPrimaryRole('dashou', app);
+    return true;
+  }
+  return false;
+}
+
+export function isRoleStatusActive(status) {
+  return Number(status) === 1;
+}
+
+/** 读取主端（兼容旧 currentRole / 管事组长落地页） */
+export function getPrimaryRole(app) {
+  app = app || getApp();
+  const stored = wx.getStorageSync('primaryRole');
+  if (VALID.includes(stored)) {
+    return stored;
+  }
+  const legacy = wx.getStorageSync('currentRole') || app.globalData.currentRole || 'normal';
+  if (legacy === 'dashou' || legacy === 'shangjia') {
+    return legacy;
+  }
+  if (legacy === 'guanshi' || legacy === 'zuzhang' || legacy === 'kaoheguan') {
+    if (isRoleStatusActive(wx.getStorageSync('dashoustatus'))) {
+      return 'dashou';
+    }
+    if (isRoleStatusActive(wx.getStorageSync('shangjiastatus'))) {
+      return 'shangjia';
+    }
+  }
+  if (isRoleStatusActive(wx.getStorageSync('dashoustatus'))) {
+    return 'dashou';
+  }
+  if (isRoleStatusActive(wx.getStorageSync('shangjiastatus'))) {
+    return 'shangjia';
+  }
+  return 'normal';
+}
+
+/** 锁定主端并同步 TabBar 角色 */
+export function lockPrimaryRole(role, app) {
+  if (!VALID.includes(role)) return;
+  app = app || getApp();
+  wx.setStorageSync('primaryRole', role);
+  wx.setStorageSync('currentRole', role);
+  app.globalData.primaryRole = role;
+  app.globalData.currentRole = role;
+  if (app.emitEvent) {
+    app.emitEvent('currentRoleChanged', { role });
+  }
+}
+
+/** TabBar / IM 使用的有效角色（仅三端） */
+export function getTabRole(app) {
+  return getPrimaryRole(app);
+}
+
+export function clearPrimaryRole(app) {
+  app = app || getApp();
+  wx.removeStorageSync('primaryRole');
+  lockPrimaryRole('normal', app);
+}
+
+export const PRIMARY_DEFAULT_PAGES = {
+  normal: '/pages/mine/mine',
+  dashou: '/pages/accept-order/accept-order',
+  shangjia: '/pages/merchant-orders/merchant-orders',
+};
+
+/** 锁定主端并跳转到该端默认首页，同时建立 IM 长连接 */
+export function enterLockedRole(role, app) {
+  if (!VALID.includes(role) || role === 'normal') return false;
+  app = app || getApp();
+  lockPrimaryRole(role, app);
+  wx.reLaunch({ url: PRIMARY_DEFAULT_PAGES[role] });
+  setTimeout(() => {
+    if (app.switchRoleAndReconnect) {
+      app.switchRoleAndReconnect(role).catch(() => {
+        if (app.connectForCurrentRole) app.connectForCurrentRole();
+      });
+    } else if (app.connectForCurrentRole) {
+      app.connectForCurrentRole();
+    }
+  }, 600);
+  return true;
+}
diff --git a/utils/request.js b/utils/request.js
index 4ea5e72..1c87956 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,74 +1,74 @@
-// utils/request.js
-const app = getApp();
-
-function request(options) {
-  const token = wx.getStorageSync('token');
-  
-  // 🔥 没有 token 时不发送请求，直接返回一个“空响应”对象，不影响后续代码
-  if (!token) {
-    // 返回一个模拟的响应，状态码为 401，但不会触发任何弹窗或跳转
-    return Promise.resolve({
-      statusCode: 401,
-      data: { code: 401, msg: '未登录' },
-      errMsg: 'request:ok'
-    });
-  }
-
-  const header = {
-    'Content-Type': 'application/json',
-    ...options.header,
-  };
-  if (token) {
-    header['Authorization'] = 'Bearer ' + token;
-  }
-
-  return new Promise((resolve, reject) => {
-    wx.request({
-      url: app.globalData.apiBaseUrl + options.url,
-      method: options.method,
-      data: options.data || {},
-      header,
-      success: async (res) => {
-        if (res.statusCode === 401 || res.statusCode === 403) {
-          // 注意：这里的弹窗逻辑只会在有 token 且 token 失效时触发
-          // 无 token 的情况已经在上面直接返回，不会走到这里
-          if (app.globalData.loginPromise) {
-            try {
-              await app.globalData.loginPromise;
-              const retryRes = await request(options);
-              resolve(retryRes);
-            } catch (err) {
-              wx.showModal({
-                content: '操作失败，请先登录',
-                success: (modalRes) => {
-                  if (modalRes.confirm) {
-                    wx.removeStorageSync('token');
-                    wx.switchTab({ url: '/pages/wode/wode' });
-                  }
-                },
-              });
-              resolve(res);
-            }
-            return;
-          }
-
-          wx.showModal({
-            content: '操作失败，请先登录',
-            success: (modalRes) => {
-              if (modalRes.confirm) {
-                wx.removeStorageSync('token');
-                wx.reLaunch({ url: '/pages/wode/wode' });
-              }
-            },
-          });
-          resolve(res);
-          return;
-        }
-        resolve(res);
-      },
-      fail: reject,
-    });
-  });
-}
-
+// utils/request.js
+const app = getApp();
+
+function request(options) {
+  const token = wx.getStorageSync('token');
+  
+  // 🔥 没有 token 时不发送请求，直接返回一个“空响应”对象，不影响后续代码
+  if (!token) {
+    // 返回一个模拟的响应，状态码为 401，但不会触发任何弹窗或跳转
+    return Promise.resolve({
+      statusCode: 401,
+      data: { code: 401, msg: '未登录' },
+      errMsg: 'request:ok'
+    });
+  }
+
+  const header = {
+    'Content-Type': 'application/json',
+    ...options.header,
+  };
+  if (token) {
+    header['Authorization'] = 'Bearer ' + token;
+  }
+
+  return new Promise((resolve, reject) => {
+    wx.request({
+      url: app.globalData.apiBaseUrl + options.url,
+      method: options.method,
+      data: options.data || {},
+      header,
+      success: async (res) => {
+        if (res.statusCode === 401 || res.statusCode === 403) {
+          // 注意：这里的弹窗逻辑只会在有 token 且 token 失效时触发
+          // 无 token 的情况已经在上面直接返回，不会走到这里
+          if (app.globalData.loginPromise) {
+            try {
+              await app.globalData.loginPromise;
+              const retryRes = await request(options);
+              resolve(retryRes);
+            } catch (err) {
+              wx.showModal({
+                content: '操作失败，请先登录',
+                success: (modalRes) => {
+                  if (modalRes.confirm) {
+                    wx.removeStorageSync('token');
+                    wx.switchTab({ url: '/pages/mine/mine' });
+                  }
+                },
+              });
+              resolve(res);
+            }
+            return;
+          }
+
+          wx.showModal({
+            content: '操作失败，请先登录',
+            success: (modalRes) => {
+              if (modalRes.confirm) {
+                wx.removeStorageSync('token');
+                wx.reLaunch({ url: '/pages/mine/mine' });
+              }
+            },
+          });
+          resolve(res);
+          return;
+        }
+        resolve(res);
+      },
+      fail: reject,
+    });
+  });
+}
+
 export default request;
\ No newline at end of file
diff --git a/utils/role-tab-bar.js b/utils/role-tab-bar.js
index d12c9d4..4a19aa0 100644
--- a/utils/role-tab-bar.js
+++ b/utils/role-tab-bar.js
@@ -1,255 +1,255 @@
-import { clearPrimaryRole } from './primary-role';
-import { getLocalImUserId } from './im-user.js';
-export function isWechatLoginSuccess(body) {
-  if (!body) return false;
-  const code = Number(body.code);
-  return code === 0 || code === 200;
-}
-
-const SESSION_STATUS_KEYS = ['dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus', 'kaoheguanstatus'];
-
-/** 读取 token（Storage 优先，globalData 兜底并回写 Storage） */
-export function getSessionToken(app) {
-  app = app || getApp();
-  let token = wx.getStorageSync('token') || app.globalData.token || '';
-  if (token && !wx.getStorageSync('token')) {
-    wx.setStorageSync('token', token);
-  }
-  return token;
-}
-
-export function isUserLoggedIn(app) {
-  return !!getSessionToken(app);
-}
-
-/** 从 Storage / globalData 汇总展示用用户信息（兼容其他端注册后 nick 未落盘） */
-export function getUserProfileForDisplay(app) {
-  app = app || getApp();
-  const token = getSessionToken(app);
-  const uid = wx.getStorageSync('uid') || app.globalData.uid || '';
-  let nick = wx.getStorageSync('nicheng') || app.globalData.nicheng || '';
-  if (!nick && app.globalData.dashouNicheng) {
-    nick = app.globalData.dashouNicheng;
-  }
-  const tx = wx.getStorageSync('touxiang') || '';
-  const def = app.globalData.morentouxiang || '';
-  const oss = app.globalData.ossImageUrl || '';
-  let avatarUrl = '';
-  if (tx) {
-    avatarUrl = tx.startsWith('http') ? tx : oss + tx;
-  } else if (def) {
-    avatarUrl = def.startsWith('http') ? def : oss + def;
-  }
-  return {
-    nick,
-    uid,
-    avatarUrl,
-    isLoggedIn: !!token,
-  };
-}
-
-/** 其他端登录/注册成功后，把 globalData 里已有字段补写回 Storage */
-export function backfillUserProfileCache(app) {
-  app = app || getApp();
-  if (!isUserLoggedIn()) return;
-  const profile = getUserProfileForDisplay(app);
-  if (profile.nick && !wx.getStorageSync('nicheng')) {
-    wx.setStorageSync('nicheng', profile.nick);
-    app.globalData.nicheng = profile.nick;
-  }
-  if (profile.uid && !wx.getStorageSync('uid')) {
-    wx.setStorageSync('uid', profile.uid);
-  }
-}
-
-export function applyWechatLoginData(data, page) {
-  if (!data || typeof data !== 'object') return;
-  const app = getApp();
-  syncProfileFields(data);
-  if (data.token) {
-    wx.setStorageSync('token', data.token);
-  }
-  syncRoleStatuses(data);
-  syncGroupFields(data);
-  if (data.zuzhangstatus !== undefined) {
-    wx.setStorageSync('zuzhangstatus', data.zuzhangstatus);
-    app.globalData.zuzhangstatus = data.zuzhangstatus;
-  }
-  if (data.kaoheguanstatus !== undefined) {
-    wx.setStorageSync('kaoheguanstatus', data.kaoheguanstatus);
-    app.globalData.kaoheguanstatus = data.kaoheguanstatus;
-  }
-  if (data.dingdantiaoshu) {
-    app.globalData.dingdanTiaoshu = {
-      daifuwu: data.dingdantiaoshu.daifuwu || 0,
-      fuwuzhong: data.dingdantiaoshu.fuwuzhong || 0,
-      yiwancheng: data.dingdantiaoshu.yiwancheng || 0,
-      yituikuan: data.dingdantiaoshu.yituikuan || 0,
-    };
-  }
-  if (data.isJinpai !== undefined) {
-    wx.setStorageSync('isJinpai', Number(data.isJinpai));
-  }
-
-  const targetPage = page || _getCurrentPage();
-  refreshTabBar(targetPage);
-}
-
-function _getCurrentPage() {
-  const pages = getCurrentPages();
-  return pages.length ? pages[pages.length - 1] : null;
-}
-
-export function isRoleStatusActive(status) {
-  return Number(status) === 1;
-}
-
-export function isCenterPageActive(page, dataFlag, statusKey) {
-  return page.data[dataFlag] || isRoleStatusActive(wx.getStorageSync(statusKey));
-}
-
-export function syncRoleStatuses(data) {
-  if (!data || typeof data !== 'object') return;
-  const app = getApp();
-  const roleFields = ['dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus', 'kaoheguanstatus'];
-  roleFields.forEach((field) => {
-    if (Object.prototype.hasOwnProperty.call(data, field)) {
-      const val = Number(data[field]);
-      const normalized = Number.isNaN(val) ? 0 : val;
-      wx.setStorageSync(field, normalized);
-      app.globalData[field] = normalized;
-    }
-  });
-}
-
-export function syncProfileFields(data) {
-  if (!data || typeof data !== 'object') return;
-  const app = getApp();
-  ['nicheng', 'uid', 'touxiang', 'token'].forEach((field) => {
-    if (data[field] !== undefined && data[field] !== null) {
-      wx.setStorageSync(field, data[field]);
-      app.globalData[field] = data[field];
-    }
-  });
-}
-
-/** 清除缓存：清空登录与身份，回到点单端「我的」 */
-export function clearCacheAndEnterNormal(page) {
-  resetGuestSession(page, { skipPageReset: true });
-  wx.reLaunch({ url: '/pages/wode/wode' });
-}
-
-/** 清除缓存并重置为点单端（不跳转，供当前已在点单端时使用） */
-export function resetGuestSession(page, options = {}) {
-  const app = getApp();
-  const configKey = app.CONFIG_CACHE_KEY || 'app_dynamic_config';
-  let configCache = null;
-  try {
-    configCache = wx.getStorageSync(configKey);
-  } catch (e) {}
-
-  wx.clearStorageSync();
-
-  if (configCache && typeof configCache === 'object') {
-    wx.setStorageSync(configKey, configCache);
-  }
-
-  clearPrimaryRole(app);
-  app.globalData.token = '';
-  app.globalData.nicheng = '';
-  app.globalData.uid = '';
-  app.globalData.loginPromise = null;
-  app.globalData.currentUser = null;
-  app.globalData.dashouNicheng = '';
-  app.globalData.dingdanTiaoshu = { daifuwu: 0, fuwuzhong: 0, yiwancheng: 0, yituikuan: 0 };
-  app.globalData.dashouqun = '';
-  app.globalData.dashouqunid = '';
-  app.globalData.guanshiqun = '';
-  app.globalData.guanshiqunid = '';
-  SESSION_STATUS_KEYS.forEach((key) => {
-    app.globalData[key] = 0;
-  });
-  app.globalData.shangpinleixing = [];
-  app.globalData.shangpinzhuanqu = [];
-  app.globalData.shangpinliebiao = [];
-
-  app.emitEvent('currentRoleChanged', { role: 'normal' });
-  refreshTabBar(page);
-
-  if (!options.skipPageReset && page && page.setData) {
-    page.setData({
-      avatarUrl: '',
-      userNicheng: '',
-      userUid: '',
-      showLoginBtn: true,
-      orderCounts: { daifuwu: 0, fuwuzhong: 0, yiwancheng: 0, yituikuan: 0 },
-      dashouCertified: false,
-      shangjiaCertified: false,
-    });
-  }
-}
-
-export function syncGroupFields(data) {
-  if (!data || typeof data !== 'object') return;
-  const app = getApp();
-  ['dashouqun', 'dashouqunid', 'guanshiqun', 'guanshiqunid'].forEach((field) => {
-    if (data[field] !== undefined) {
-      wx.setStorageSync(field, data[field]);
-      app.globalData[field] = data[field];
-    }
-  });
-}
-
-export function refreshTabBar(page) {
-  const tryRefresh = () => {
-    const tabBar = page.getTabBar && page.getTabBar();
-    if (tabBar && tabBar.refresh) tabBar.refresh();
-  };
-  tryRefresh();
-  [50, 150, 300, 500, 800].forEach((delay) => setTimeout(tryRefresh, delay));
-}
-
-export function setRoleAndRefreshTabBar(page, role) {
-  const app = getApp();
-  if (app.setCurrentRole) {
-    app.setCurrentRole(role);
-  } else {
-    app.globalData.currentRole = role;
-    wx.setStorageSync('currentRole', role);
-    app.emitEvent('currentRoleChanged', { role });
-  }
-  refreshTabBar(page);
-}
-
-export function reconnectForRole(role) {
-  const app = getApp();
-  if (!wx.getStorageSync('uid')) return;
-
-  const targetUserId = getLocalImUserId(app);
-  if (!targetUserId) return;
-
-  const status = wx.goEasy?.getConnectionStatus?.() || 'disconnected';
-  const currentUserId = wx.goEasy?.im?.userId || '';
-  const connected = status === 'connected' || status === 'reconnected';
-
-  if (connected && currentUserId === targetUserId) {
-    if (app.loadConversations) app.loadConversations();
-    if (app.ensureConnection) app.ensureConnection();
-    return;
-  }
-
-  if (app.switchRoleAndReconnect) {
-    app.switchRoleAndReconnect(role).catch(() => {
-      if (app.ensureConnection) app.ensureConnection();
-    });
-  } else if (app.connectForCurrentRole) {
-    app.connectForCurrentRole();
-  } else if (app.ensureConnection) {
-    app.ensureConnection();
-  }
-}
-
-export function ensureRoleOnCenterPage(page, role) {
-  setRoleAndRefreshTabBar(page, role);
-  reconnectForRole(role);
-}
+import { clearPrimaryRole } from './primary-role';
+import { getLocalImUserId } from './im-user.js';
+export function isWechatLoginSuccess(body) {
+  if (!body) return false;
+  const code = Number(body.code);
+  return code === 0 || code === 200;
+}
+
+const SESSION_STATUS_KEYS = ['dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus', 'kaoheguanstatus'];
+
+/** 读取 token（Storage 优先，globalData 兜底并回写 Storage） */
+export function getSessionToken(app) {
+  app = app || getApp();
+  let token = wx.getStorageSync('token') || app.globalData.token || '';
+  if (token && !wx.getStorageSync('token')) {
+    wx.setStorageSync('token', token);
+  }
+  return token;
+}
+
+export function isUserLoggedIn(app) {
+  return !!getSessionToken(app);
+}
+
+/** 从 Storage / globalData 汇总展示用用户信息（兼容其他端注册后 nick 未落盘） */
+export function getUserProfileForDisplay(app) {
+  app = app || getApp();
+  const token = getSessionToken(app);
+  const uid = wx.getStorageSync('uid') || app.globalData.uid || '';
+  let nick = wx.getStorageSync('nicheng') || app.globalData.nicheng || '';
+  if (!nick && app.globalData.dashouNicheng) {
+    nick = app.globalData.dashouNicheng;
+  }
+  const tx = wx.getStorageSync('touxiang') || '';
+  const def = app.globalData.morentouxiang || '';
+  const oss = app.globalData.ossImageUrl || '';
+  let avatarUrl = '';
+  if (tx) {
+    avatarUrl = tx.startsWith('http') ? tx : oss + tx;
+  } else if (def) {
+    avatarUrl = def.startsWith('http') ? def : oss + def;
+  }
+  return {
+    nick,
+    uid,
+    avatarUrl,
+    isLoggedIn: !!token,
+  };
+}
+
+/** 其他端登录/注册成功后，把 globalData 里已有字段补写回 Storage */
+export function backfillUserProfileCache(app) {
+  app = app || getApp();
+  if (!isUserLoggedIn()) return;
+  const profile = getUserProfileForDisplay(app);
+  if (profile.nick && !wx.getStorageSync('nicheng')) {
+    wx.setStorageSync('nicheng', profile.nick);
+    app.globalData.nicheng = profile.nick;
+  }
+  if (profile.uid && !wx.getStorageSync('uid')) {
+    wx.setStorageSync('uid', profile.uid);
+  }
+}
+
+export function applyWechatLoginData(data, page) {
+  if (!data || typeof data !== 'object') return;
+  const app = getApp();
+  syncProfileFields(data);
+  if (data.token) {
+    wx.setStorageSync('token', data.token);
+  }
+  syncRoleStatuses(data);
+  syncGroupFields(data);
+  if (data.zuzhangstatus !== undefined) {
+    wx.setStorageSync('zuzhangstatus', data.zuzhangstatus);
+    app.globalData.zuzhangstatus = data.zuzhangstatus;
+  }
+  if (data.kaoheguanstatus !== undefined) {
+    wx.setStorageSync('kaoheguanstatus', data.kaoheguanstatus);
+    app.globalData.kaoheguanstatus = data.kaoheguanstatus;
+  }
+  if (data.dingdantiaoshu) {
+    app.globalData.dingdanTiaoshu = {
+      daifuwu: data.dingdantiaoshu.daifuwu || 0,
+      fuwuzhong: data.dingdantiaoshu.fuwuzhong || 0,
+      yiwancheng: data.dingdantiaoshu.yiwancheng || 0,
+      yituikuan: data.dingdantiaoshu.yituikuan || 0,
+    };
+  }
+  if (data.isJinpai !== undefined) {
+    wx.setStorageSync('isJinpai', Number(data.isJinpai));
+  }
+
+  const targetPage = page || _getCurrentPage();
+  refreshTabBar(targetPage);
+}
+
+function _getCurrentPage() {
+  const pages = getCurrentPages();
+  return pages.length ? pages[pages.length - 1] : null;
+}
+
+export function isRoleStatusActive(status) {
+  return Number(status) === 1;
+}
+
+export function isCenterPageActive(page, dataFlag, statusKey) {
+  return page.data[dataFlag] || isRoleStatusActive(wx.getStorageSync(statusKey));
+}
+
+export function syncRoleStatuses(data) {
+  if (!data || typeof data !== 'object') return;
+  const app = getApp();
+  const roleFields = ['dashoustatus', 'guanshistatus', 'shangjiastatus', 'zuzhangstatus', 'kaoheguanstatus'];
+  roleFields.forEach((field) => {
+    if (Object.prototype.hasOwnProperty.call(data, field)) {
+      const val = Number(data[field]);
+      const normalized = Number.isNaN(val) ? 0 : val;
+      wx.setStorageSync(field, normalized);
+      app.globalData[field] = normalized;
+    }
+  });
+}
+
+export function syncProfileFields(data) {
+  if (!data || typeof data !== 'object') return;
+  const app = getApp();
+  ['nicheng', 'uid', 'touxiang', 'token'].forEach((field) => {
+    if (data[field] !== undefined && data[field] !== null) {
+      wx.setStorageSync(field, data[field]);
+      app.globalData[field] = data[field];
+    }
+  });
+}
+
+/** 清除缓存：清空登录与身份，回到点单端「我的」 */
+export function clearCacheAndEnterNormal(page) {
+  resetGuestSession(page, { skipPageReset: true });
+  wx.reLaunch({ url: '/pages/mine/mine' });
+}
+
+/** 清除缓存并重置为点单端（不跳转，供当前已在点单端时使用） */
+export function resetGuestSession(page, options = {}) {
+  const app = getApp();
+  const configKey = app.CONFIG_CACHE_KEY || 'app_dynamic_config';
+  let configCache = null;
+  try {
+    configCache = wx.getStorageSync(configKey);
+  } catch (e) {}
+
+  wx.clearStorageSync();
+
+  if (configCache && typeof configCache === 'object') {
+    wx.setStorageSync(configKey, configCache);
+  }
+
+  clearPrimaryRole(app);
+  app.globalData.token = '';
+  app.globalData.nicheng = '';
+  app.globalData.uid = '';
+  app.globalData.loginPromise = null;
+  app.globalData.currentUser = null;
+  app.globalData.dashouNicheng = '';
+  app.globalData.dingdanTiaoshu = { daifuwu: 0, fuwuzhong: 0, yiwancheng: 0, yituikuan: 0 };
+  app.globalData.dashouqun = '';
+  app.globalData.dashouqunid = '';
+  app.globalData.guanshiqun = '';
+  app.globalData.guanshiqunid = '';
+  SESSION_STATUS_KEYS.forEach((key) => {
+    app.globalData[key] = 0;
+  });
+  app.globalData.shangpinleixing = [];
+  app.globalData.shangpinzhuanqu = [];
+  app.globalData.shangpinliebiao = [];
+
+  app.emitEvent('currentRoleChanged', { role: 'normal' });
+  refreshTabBar(page);
+
+  if (!options.skipPageReset && page && page.setData) {
+    page.setData({
+      avatarUrl: '',
+      userNicheng: '',
+      userUid: '',
+      showLoginBtn: true,
+      orderCounts: { daifuwu: 0, fuwuzhong: 0, yiwancheng: 0, yituikuan: 0 },
+      dashouCertified: false,
+      shangjiaCertified: false,
+    });
+  }
+}
+
+export function syncGroupFields(data) {
+  if (!data || typeof data !== 'object') return;
+  const app = getApp();
+  ['dashouqun', 'dashouqunid', 'guanshiqun', 'guanshiqunid'].forEach((field) => {
+    if (data[field] !== undefined) {
+      wx.setStorageSync(field, data[field]);
+      app.globalData[field] = data[field];
+    }
+  });
+}
+
+export function refreshTabBar(page) {
+  const tryRefresh = () => {
+    const tabBar = page.getTabBar && page.getTabBar();
+    if (tabBar && tabBar.refresh) tabBar.refresh();
+  };
+  tryRefresh();
+  [50, 150, 300, 500, 800].forEach((delay) => setTimeout(tryRefresh, delay));
+}
+
+export function setRoleAndRefreshTabBar(page, role) {
+  const app = getApp();
+  if (app.setCurrentRole) {
+    app.setCurrentRole(role);
+  } else {
+    app.globalData.currentRole = role;
+    wx.setStorageSync('currentRole', role);
+    app.emitEvent('currentRoleChanged', { role });
+  }
+  refreshTabBar(page);
+}
+
+export function reconnectForRole(role) {
+  const app = getApp();
+  if (!wx.getStorageSync('uid')) return;
+
+  const targetUserId = getLocalImUserId(app);
+  if (!targetUserId) return;
+
+  const status = wx.goEasy?.getConnectionStatus?.() || 'disconnected';
+  const currentUserId = wx.goEasy?.im?.userId || '';
+  const connected = status === 'connected' || status === 'reconnected';
+
+  if (connected && currentUserId === targetUserId) {
+    if (app.loadConversations) app.loadConversations();
+    if (app.ensureConnection) app.ensureConnection();
+    return;
+  }
+
+  if (app.switchRoleAndReconnect) {
+    app.switchRoleAndReconnect(role).catch(() => {
+      if (app.ensureConnection) app.ensureConnection();
+    });
+  } else if (app.connectForCurrentRole) {
+    app.connectForCurrentRole();
+  } else if (app.ensureConnection) {
+    app.ensureConnection();
+  }
+}
+
+export function ensureRoleOnCenterPage(page, role) {
+  setRoleAndRefreshTabBar(page, role);
+  reconnectForRole(role);
+}
diff --git a/utils/xiaoxilj.js b/utils/xiaoxilj.js
index dcf8b60..9e3282e 100644
--- a/utils/xiaoxilj.js
+++ b/utils/xiaoxilj.js
@@ -1,215 +1,215 @@
-/**
- * 连接管理模块 - xiaoxilj.js (根治发送失败：跳转前确保群组已订阅)
- * 从详情页跳转订单群聊时，提前订阅群组，避免发送消息时订阅未完成而失败
- */
-const app = getApp();
-
-function waitForConnection(expectedUserId, timeout = 10000) {
-  return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => {
-      app.off('connectionChanged', handler);
-      reject(new Error('连接超时'));
-    }, timeout);
-
-    const handler = (event) => {
-      if (event.status === 'connected') {
-        if (event.userId === expectedUserId) {
-          clearTimeout(timer);
-          app.off('connectionChanged', handler);
-          resolve();
-        } else {
-          console.error(`连接身份不匹配: 期望 ${expectedUserId}, 实际 ${event.userId}`);
-          wx.removeStorageSync('savedGoEasyConnection');
-          wx.removeStorageSync('goEasyUserId');
-          wx.removeStorageSync('currentGoEasyIdentity');
-          if (app.clearSavedConnection) app.clearSavedConnection();
-          clearTimeout(timer);
-          app.off('connectionChanged', handler);
-          reject(new Error(`连接身份不匹配: 期望 ${expectedUserId}, 实际 ${event.userId}`));
-        }
-      } else if (event.status === 'disconnected' && !event.manual) {
-        wx.removeStorageSync('savedGoEasyConnection');
-        wx.removeStorageSync('goEasyUserId');
-        wx.removeStorageSync('currentGoEasyIdentity');
-        if (app.clearSavedConnection) app.clearSavedConnection();
-        clearTimeout(timer);
-        app.off('connectionChanged', handler);
-        reject(new Error('连接失败'));
-      }
-    };
-    app.on('connectionChanged', handler);
-  });
-}
-
-class ConnectionManager {
-  // 原有的私聊方法保持不变
-  async connectAndChat(params) {
-    const { identityType, userId, targetUser } = params;
-    if (!identityType || !userId || !targetUser || !targetUser.id) {
-      throw new Error('参数不完整');
-    }
-
-    if (identityType === 'dashou' && !userId.startsWith('Ds')) {
-      throw new Error(`打手身份的用户ID必须以Ds开头，实际为 ${userId}`);
-    }
-    if (identityType === 'shangjia' && !userId.startsWith('Sj')) {
-      throw new Error(`商家身份的用户ID必须以Sj开头，实际为 ${userId}`);
-    }
-    if (identityType === 'boss' && !userId.startsWith('Boss')) {
-      throw new Error(`老板身份的用户ID必须以Boss开头，实际为 ${userId}`);
-    }
-
-    wx.removeStorageSync('savedGoEasyConnection');
-    wx.removeStorageSync('goEasyUserId');
-    wx.removeStorageSync('currentGoEasyIdentity');
-    if (app.clearSavedConnection) app.clearSavedConnection();
-
-    if (wx.goEasy && wx.goEasy.getConnectionStatus() === 'connected') {
-      wx.goEasy.disconnect();
-    }
-
-    const waitPromise = waitForConnection(userId);
-    app.connectWithIdentity(identityType, userId, false);
-
-    try {
-      await waitPromise;
-
-      const currentUser = {
-        id: userId,
-        name: app.globalData.currentUser?.name || '用户',
-        avatar: app.globalData.currentUser?.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
-      };
-
-      const to = {
-        id: targetUser.id,
-        name: targetUser.name || '用户',
-        avatar: targetUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
-      };
-
-      const param = { to, currentUser };
-      const path = '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param));
-      wx.navigateTo({ url: path });
-    } catch (err) {
-      console.error('连接失败:', err);
-      wx.showToast({ title: err.message || '连接失败', icon: 'none' });
-      throw err;
-    }
-  }
-
-  async connectToGroupChat(params) {
-    const { identityType, userId, orderId, groupName, groupAvatar, isCross } = params;
-    if (!identityType || !userId || !orderId) {
-      throw new Error('参数不完整：identityType, userId, orderId 必填');
-    }
-
-    // 校验 userId 前缀
-    if (identityType === 'dashou' && !userId.startsWith('Ds')) {
-      throw new Error(`打手身份的用户ID必须以Ds开头，实际为 ${userId}`);
-    }
-    if (identityType === 'shangjia' && !userId.startsWith('Sj')) {
-      throw new Error(`商家身份的用户ID必须以Sj开头，实际为 ${userId}`);
-    }
-    if (identityType === 'boss' && !userId.startsWith('Boss')) {
-      throw new Error(`老板身份的用户ID必须以Boss开头，实际为 ${userId}`);
-    }
-    
-
-    // 1. 同步全局角色，确保群聊页初始化正确
-    app.globalData.currentRole = identityType;
-    wx.setStorageSync('currentRole', identityType);
-
-    const uid = userId.replace(/^(Ds|Sj|Boss|Gs|Zz)/, '');
-    const avatar = wx.getStorageSync('touxiang') ||
-                   (app.globalData.ossImageUrl + app.globalData.morentouxiang);
-    app.globalData.currentUser = {
-      id: userId,
-      name: app.globalData.currentUser?.name || `用户${uid}`,
-      avatar: avatar
-    };
-
-    // 2. 确保 GoEasy 已使用目标身份连接
-    let needConnect = false;
-    if (!wx.goEasy || !wx.goEasy.getConnectionStatus || wx.goEasy.getConnectionStatus() !== 'connected') {
-      needConnect = true;
-    } else {
-      const currentUserId = wx.goEasy.im?.userId;
-      if (currentUserId !== userId) {
-        needConnect = true;
-      }
-    }
-
-    if (needConnect) {
-      wx.removeStorageSync('savedGoEasyConnection');
-      wx.removeStorageSync('goEasyUserId');
-      if (app.clearSavedConnection) app.clearSavedConnection();
-      if (wx.goEasy && wx.goEasy.getConnectionStatus() === 'connected') {
-        wx.goEasy.disconnect();
-      }
-      const waitPromise = waitForConnection(userId);
-      app.connectWithIdentity(identityType, userId, false);
-      try {
-        await waitPromise;
-      } catch (err) {
-        wx.showToast({ title: '连接失败', icon: 'none' });
-        throw err;
-      }
-    }
-
-    // 3. 从会话列表查找真实群组ID
-    let realGroupId = null;
-    try {
-      const result = await new Promise((resolve, reject) => {
-        wx.goEasy.im.latestConversations({
-          onSuccess: (res) => {
-            const conversations = res.content?.conversations || [];
-            const found = conversations.find(c => c.type === 'group' && c.data && c.data.orderId === orderId);
-            resolve(found ? found.groupId : null);
-          },
-          onFailed: reject
-        });
-      });
-      realGroupId = result;
-    } catch (err) {
-      console.error('获取会话列表失败:', err);
-      wx.showToast({ title: '获取群聊信息失败', icon: 'none' });
-      throw err;
-    }
-
-    if (!realGroupId) {
-      wx.showToast({ title: '暂未创建群聊', icon: 'none' });
-      return;
-    }
-
-    // 4. 🔥 关键：主动订阅群组并等待成功，确保发送消息时订阅已完成
-    try {
-      await new Promise((resolve, reject) => {
-        wx.goEasy.im.subscribeGroup({
-          groupIds: [realGroupId],
-          onSuccess: () => {
-            resolve();
-          },
-          onFailed: (error) => {
-            console.error('订阅群组失败:', error);
-            reject(error);
-          }
-        });
-      });
-    } catch (err) {
-      wx.showToast({ title: '订阅群组失败', icon: 'none' });
-      throw err;
-    }
-
-    // 5. 跳转群聊页（参数与消息列表完全一致）
-    const param = {
-      groupId: realGroupId,
-      orderId: orderId,
-      groupName: groupName || '订单群聊',
-      groupAvatar: groupAvatar || '',
-      isCross: isCross || 0
-    };
-    const path = '/pages/qunliaotian/qunliaotian?data=' + encodeURIComponent(JSON.stringify(param));
-    wx.navigateTo({ url: path });
-  }
-}
-
+/**
+ * 连接管理模块 - xiaoxilj.js (根治发送失败：跳转前确保群组已订阅)
+ * 从详情页跳转订单群聊时，提前订阅群组，避免发送消息时订阅未完成而失败
+ */
+const app = getApp();
+
+function waitForConnection(expectedUserId, timeout = 10000) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      app.off('connectionChanged', handler);
+      reject(new Error('连接超时'));
+    }, timeout);
+
+    const handler = (event) => {
+      if (event.status === 'connected') {
+        if (event.userId === expectedUserId) {
+          clearTimeout(timer);
+          app.off('connectionChanged', handler);
+          resolve();
+        } else {
+          console.error(`连接身份不匹配: 期望 ${expectedUserId}, 实际 ${event.userId}`);
+          wx.removeStorageSync('savedGoEasyConnection');
+          wx.removeStorageSync('goEasyUserId');
+          wx.removeStorageSync('currentGoEasyIdentity');
+          if (app.clearSavedConnection) app.clearSavedConnection();
+          clearTimeout(timer);
+          app.off('connectionChanged', handler);
+          reject(new Error(`连接身份不匹配: 期望 ${expectedUserId}, 实际 ${event.userId}`));
+        }
+      } else if (event.status === 'disconnected' && !event.manual) {
+        wx.removeStorageSync('savedGoEasyConnection');
+        wx.removeStorageSync('goEasyUserId');
+        wx.removeStorageSync('currentGoEasyIdentity');
+        if (app.clearSavedConnection) app.clearSavedConnection();
+        clearTimeout(timer);
+        app.off('connectionChanged', handler);
+        reject(new Error('连接失败'));
+      }
+    };
+    app.on('connectionChanged', handler);
+  });
+}
+
+class ConnectionManager {
+  // 原有的私聊方法保持不变
+  async connectAndChat(params) {
+    const { identityType, userId, targetUser } = params;
+    if (!identityType || !userId || !targetUser || !targetUser.id) {
+      throw new Error('参数不完整');
+    }
+
+    if (identityType === 'dashou' && !userId.startsWith('Ds')) {
+      throw new Error(`打手身份的用户ID必须以Ds开头，实际为 ${userId}`);
+    }
+    if (identityType === 'shangjia' && !userId.startsWith('Sj')) {
+      throw new Error(`商家身份的用户ID必须以Sj开头，实际为 ${userId}`);
+    }
+    if (identityType === 'boss' && !userId.startsWith('Boss')) {
+      throw new Error(`老板身份的用户ID必须以Boss开头，实际为 ${userId}`);
+    }
+
+    wx.removeStorageSync('savedGoEasyConnection');
+    wx.removeStorageSync('goEasyUserId');
+    wx.removeStorageSync('currentGoEasyIdentity');
+    if (app.clearSavedConnection) app.clearSavedConnection();
+
+    if (wx.goEasy && wx.goEasy.getConnectionStatus() === 'connected') {
+      wx.goEasy.disconnect();
+    }
+
+    const waitPromise = waitForConnection(userId);
+    app.connectWithIdentity(identityType, userId, false);
+
+    try {
+      await waitPromise;
+
+      const currentUser = {
+        id: userId,
+        name: app.globalData.currentUser?.name || '用户',
+        avatar: app.globalData.currentUser?.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
+      };
+
+      const to = {
+        id: targetUser.id,
+        name: targetUser.name || '用户',
+        avatar: targetUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
+      };
+
+      const param = { to, currentUser };
+      const path = '/pages/chat/chat?data=' + encodeURIComponent(JSON.stringify(param));
+      wx.navigateTo({ url: path });
+    } catch (err) {
+      console.error('连接失败:', err);
+      wx.showToast({ title: err.message || '连接失败', icon: 'none' });
+      throw err;
+    }
+  }
+
+  async connectToGroupChat(params) {
+    const { identityType, userId, orderId, groupName, groupAvatar, isCross } = params;
+    if (!identityType || !userId || !orderId) {
+      throw new Error('参数不完整：identityType, userId, orderId 必填');
+    }
+
+    // 校验 userId 前缀
+    if (identityType === 'dashou' && !userId.startsWith('Ds')) {
+      throw new Error(`打手身份的用户ID必须以Ds开头，实际为 ${userId}`);
+    }
+    if (identityType === 'shangjia' && !userId.startsWith('Sj')) {
+      throw new Error(`商家身份的用户ID必须以Sj开头，实际为 ${userId}`);
+    }
+    if (identityType === 'boss' && !userId.startsWith('Boss')) {
+      throw new Error(`老板身份的用户ID必须以Boss开头，实际为 ${userId}`);
+    }
+    
+
+    // 1. 同步全局角色，确保群聊页初始化正确
+    app.globalData.currentRole = identityType;
+    wx.setStorageSync('currentRole', identityType);
+
+    const uid = userId.replace(/^(Ds|Sj|Boss|Gs|Zz)/, '');
+    const avatar = wx.getStorageSync('touxiang') ||
+                   (app.globalData.ossImageUrl + app.globalData.morentouxiang);
+    app.globalData.currentUser = {
+      id: userId,
+      name: app.globalData.currentUser?.name || `用户${uid}`,
+      avatar: avatar
+    };
+
+    // 2. 确保 GoEasy 已使用目标身份连接
+    let needConnect = false;
+    if (!wx.goEasy || !wx.goEasy.getConnectionStatus || wx.goEasy.getConnectionStatus() !== 'connected') {
+      needConnect = true;
+    } else {
+      const currentUserId = wx.goEasy.im?.userId;
+      if (currentUserId !== userId) {
+        needConnect = true;
+      }
+    }
+
+    if (needConnect) {
+      wx.removeStorageSync('savedGoEasyConnection');
+      wx.removeStorageSync('goEasyUserId');
+      if (app.clearSavedConnection) app.clearSavedConnection();
+      if (wx.goEasy && wx.goEasy.getConnectionStatus() === 'connected') {
+        wx.goEasy.disconnect();
+      }
+      const waitPromise = waitForConnection(userId);
+      app.connectWithIdentity(identityType, userId, false);
+      try {
+        await waitPromise;
+      } catch (err) {
+        wx.showToast({ title: '连接失败', icon: 'none' });
+        throw err;
+      }
+    }
+
+    // 3. 从会话列表查找真实群组ID
+    let realGroupId = null;
+    try {
+      const result = await new Promise((resolve, reject) => {
+        wx.goEasy.im.latestConversations({
+          onSuccess: (res) => {
+            const conversations = res.content?.conversations || [];
+            const found = conversations.find(c => c.type === 'group' && c.data && c.data.orderId === orderId);
+            resolve(found ? found.groupId : null);
+          },
+          onFailed: reject
+        });
+      });
+      realGroupId = result;
+    } catch (err) {
+      console.error('获取会话列表失败:', err);
+      wx.showToast({ title: '获取群聊信息失败', icon: 'none' });
+      throw err;
+    }
+
+    if (!realGroupId) {
+      wx.showToast({ title: '暂未创建群聊', icon: 'none' });
+      return;
+    }
+
+    // 4. 🔥 关键：主动订阅群组并等待成功，确保发送消息时订阅已完成
+    try {
+      await new Promise((resolve, reject) => {
+        wx.goEasy.im.subscribeGroup({
+          groupIds: [realGroupId],
+          onSuccess: () => {
+            resolve();
+          },
+          onFailed: (error) => {
+            console.error('订阅群组失败:', error);
+            reject(error);
+          }
+        });
+      });
+    } catch (err) {
+      wx.showToast({ title: '订阅群组失败', icon: 'none' });
+      throw err;
+    }
+
+    // 5. 跳转群聊页（参数与消息列表完全一致）
+    const param = {
+      groupId: realGroupId,
+      orderId: orderId,
+      groupName: groupName || '订单群聊',
+      groupAvatar: groupAvatar || '',
+      isCross: isCross || 0
+    };
+    const path = '/pages/group-chat/group-chat?data=' + encodeURIComponent(JSON.stringify(param));
+    wx.navigateTo({ url: path });
+  }
+}
+
 export default new ConnectionManager();
\ No newline at end of file