backup: 紫色UI换肤前完整备份（当前橙色逍遥梦主题）

保留改造前全部页面样式与功能代码，便于回滚。 Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-29 01:59:42 +08:00
parent a751708d6e
commit c03d22776f
49 changed files with 6025 additions and 3784 deletions
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
 // 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 { ensurePhoneAuth } from './utils/phone-auth';
 import { getPrimaryRole, lockPrimaryRole, migrateLegacyCenterRole, PRIMARY_DEFAULT_PAGES } from './utils/primary-role';

 // 三端固定首页
@@ -175,11 +175,24 @@ App({
            }
        });

-        // ② 恢复主端并跳转
+        // ② 已登录时先恢复子客服身份，再决定主端 Tab（避免客服被当成未入驻）
+        if (wx.getStorageSync('token')) {
+            try {
+                const { restoreStaffContextAfterAuth } = require('./utils/staff-api.js');
+                await restoreStaffContextAfterAuth();
+            } catch (e) {}
+        }
+
        migrateLegacyCenterRole(this);
        const savedRole = getPrimaryRole(this);
        lockPrimaryRole(savedRole, this);

+        // ②b 冷启动：有 token 时先问后端是否需要手机号认证
+        if (wx.getStorageSync('token')) {
+            const phoneOk = await ensurePhoneAuth({ redirect: true });
+            if (!phoneOk) return;
+        }
+
        const targetPage = roleDefaultPage[savedRole] || '/pages/index/index';
        if (savedRole !== 'normal') {
            setTimeout(() => {
@@ -197,6 +210,9 @@ App({
        this.initGoEasyWithConfig();      // 只有appkey有效时才真正初始化
        ChatCore.initGlobalMessageSystem(this);
        this.initCurrentUser();
+        if (wx.getStorageSync('token') && this.emitEvent) {
+            this.emitEvent('staffContextChanged', {});
+        }

        // ⑤ 建立连接
        const saved = this.getSavedConnection();
@@ -221,15 +237,12 @@ App({
            .catch(err => {
                console.warn('远程配置获取失败，继续使用本地缓存', err);
            });
+    },

-        // ⑦ 手机号认证检查
-        try {
-            const needAuth = await check();
-            if (needAuth) {
-                wx.reLaunch({ url: '/pages/phone-auth/phone-auth' });
-                return;
-            }
-        } catch (e) {}
+    /** 从后台切回前台时再次向后端校验 */
+    async onShow() {
+        if (!wx.getStorageSync('token')) return;
+        await ensurePhoneAuth({ redirect: true });
    },

    // 连接管理方法
--- a/app.json
+++ b/app.json
@@ -13,6 +13,9 @@
        "pages/merchant-home/merchant-home",
        "pages/merchant-kefu-key/merchant-kefu-key",
        "pages/merchant-kefu-list/merchant-kefu-list",
+        "pages/staff-join/staff-join",
+        "pages/merchant-staff-audit/merchant-staff-audit",
+        "pages/merchant-staff-role/merchant-staff-role",
        "pages/manager/manager",
        "pages/orders/orders",
        "pages/order-detail/order-detail",
--- a/pages/accept-order/accept-order.js
+++ b/pages/accept-order/accept-order.js
@@ -3,6 +3,7 @@ const app = getApp();
 import request from '../../utils/request.js';
 import PopupService from '../../services/popupService.js';
 import { reconnectForRole } from '../../utils/role-tab-bar.js';
+import { ensurePhoneAuth } from '../../utils/phone-auth.js';

 Page({
  data: {
@@ -62,7 +63,10 @@ Page({
    }
  },

-  onShow() {
+  async onShow() {
+    const phoneOk = await ensurePhoneAuth({ redirect: true, role: 'dashou' });
+    if (!phoneOk) return;
+
    this.syncShopBannerFromGlobal();
    this.registerNotificationComponent();
    this.loadGlobalStatus();
--- a/pages/express-order/express-order.js
+++ b/pages/express-order/express-order.js
@@ -1,9 +1,15 @@
 // pages/express-order/express-order.js
 import request from '../../utils/request.js'
+import { STAFF_API, isStaffMode, getStaffContext, setStaffContext, syncStaffUi, staffOrOwner, refreshStaffContext, restoreStaffContextAfterAuth, isMerchantPortalUser } from '../../utils/staff-api.js'

 const PAGE_SIZE = 50
 const LINK_PAGE_SIZE = 5

+function apiOk(res) {
+  const code = res && res.data && res.data.code
+  return code === 200 || code === 0
+}
+
 Page({
  data: {
    sjyue: '0.00',
@@ -53,16 +59,29 @@ Page({
    detailLinkHasMore: true,
    isLoadingLinks: false,

-    isLoading: false
+    isLoading: false,
+    canTemplate: true,
+    isStaffMode: false,
+    staffRoleName: '',
  },

-  onLoad() {
+  async onLoad() {
+    if (wx.getStorageSync('token')) {
+      await restoreStaffContextAfterAuth()
+    }
+    if (!isMerchantPortalUser()) {
+      wx.showToast({ title: '请先成为商家或绑定客服', icon: 'none' })
+      setTimeout(() => wx.navigateBack(), 1500)
+      return
+    }
+    syncStaffUi(this)
    this.loadShangjiaYue()
    this.loadShangpinTypes()
  },

  onShow() {
    this.registerNotificationComponent()
+    syncStaffUi(this)
    this.loadShangjiaYue()
  },

@@ -78,6 +97,17 @@ Page({
  },

  loadShangjiaYue() {
+    if (isStaffMode()) {
+      refreshStaffContext(request).then((ctx) => {
+        const wallet = (ctx && ctx.wallet) || (getStaffContext() || {}).wallet || {};
+        this.setData({ sjyue: wallet.quota_available || '0.00' });
+      }).catch(() => {
+        const ctx = getStaffContext() || {};
+        const wallet = ctx.wallet || {};
+        this.setData({ sjyue: wallet.quota_available || '0.00' });
+      });
+      return;
+    }
    const app = getApp()
    const data = app.globalData.shangjia || {}
    this.setData({ sjyue: data.sjyue || '0.00' })
@@ -85,21 +115,29 @@ Page({

  async loadShangpinTypes() {
    this.setData({ isLoading: true })
+    const staff = isStaffMode()
    try {
-      const res = await request({ url: '/dingdan/sjspleixing', method: 'POST' })
-      if (res && res.data.code === 200) {
+      const res = await request({
+        url: staff ? STAFF_API.productTypes : '/dingdan/sjspleixing',
+        method: 'POST',
+      })
+      const code = res && res.data && res.data.code
+      if (code === 200 || code === 0) {
        let list = res.data.data || []
+        if (!Array.isArray(list) && list.list) list = list.list
        // 强制倒序排列
        list.reverse()
        this.setData({ shangpinList: list, isLoading: false })
        if (list.length > 0) {
          this.setSelectedType(list[0])
        }
+      } else {
+        throw new Error((res.data && res.data.msg) || '加载失败')
      }
    } catch (e) {
      console.error(e)
      this.setData({ isLoading: false })
-      wx.showToast({ title: '加载类型失败', icon: 'error' })
+      wx.showToast({ title: e.message || '加载类型失败', icon: 'none' })
    }
  },

@@ -148,8 +186,8 @@ Page({
        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 res = await request({ url: staffOrOwner(STAFF_API.templateList, '/peizhi/sjddmblb'), method: 'POST', data: postData })
+      if (res && apiOk(res)) {
        const data = res.data.data || {}
        const newTemplates = data.list || []
        const existingIds = new Set(this.data.templateList.map(item => item.mobanId))
@@ -257,11 +295,11 @@ Page({
    wx.showLoading({ title: '生成中...', mask: true })
    try {
      const res = await request({
-        url: '/peizhi/sjljhq',
+        url: staffOrOwner(STAFF_API.linkGenerate, '/peizhi/sjljhq'),
        method: 'POST',
        data: { mobanId: template.mobanId, shangpinTypeId: selectedTypeId }
      })
-      if (res && res.data.code === 200) {
+      if (res && apiOk(res)) {
        const data = res.data.data || {}
        const mobanId = template.mobanId
        const updatedLinkMap = { ...linkMap }
@@ -279,10 +317,20 @@ Page({
          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 })
+        if (data.newBalance || data.quotaAvailable) {
+          const balance = data.quotaAvailable || data.newBalance
+          if (isStaffMode()) {
+            const ctx = getStaffContext() || {}
+            if (ctx.wallet) {
+              ctx.wallet.quota_available = balance
+              setStaffContext(ctx)
+            }
+            this.setData({ sjyue: balance })
+          } else {
+            const app = getApp()
+            if (app.globalData.shangjia) app.globalData.shangjia.sjyue = balance
+            this.setData({ sjyue: balance })
+          }
        }
        this.setData({ linkMap: updatedLinkMap, templateList: updatedList })
        wx.showToast({ title: '链接生成成功', icon: 'success' })
@@ -350,7 +398,7 @@ Page({
    this.setData({ isLoadingLinks: true })
    try {
      const res = await request({
-        url: '/peizhi/hqsjlslj',
+        url: staffOrOwner(STAFF_API.linkList, '/peizhi/hqsjlslj'),
        method: 'POST',
        data: {
          mobanId: currentTemplate.mobanId,
@@ -359,7 +407,7 @@ Page({
          pageSize: LINK_PAGE_SIZE
        }
      })
-      if (res && res.data.code === 200) {
+      if (res && apiOk(res)) {
        const data = res.data.data || {}
        const newLinks = data.list || []
        const merged = detailLinkPage === 1 ? newLinks : [...this.data.detailLinkList, ...newLinks]
@@ -447,7 +495,7 @@ Page({
    wx.showLoading({ title: '保存中...', mask: true })
    try {
      const res = await request({
-        url: '/peizhi/sjddmbgx',
+        url: staffOrOwner(STAFF_API.templateUpdate, '/peizhi/sjddmbgx'),
        method: 'POST',
        data: {
          mobanId: currentTemplate.mobanId,
@@ -459,7 +507,7 @@ Page({
          commissionValue: editCommissionValue
        }
      })
-      if (res && res.data.code === 200) {
+      if (res && apiOk(res)) {
        const updatedList = [...this.data.templateList]
        const idx = this.data.currentTemplateIndex
        if (idx !== -1) {
@@ -491,11 +539,11 @@ Page({
    wx.showLoading({ title: '删除中...', mask: true })
    try {
      const res = await request({
-        url: '/peizhi/sjddmbsc',
+        url: staffOrOwner(STAFF_API.templateDelete, '/peizhi/sjddmbsc'),
        method: 'POST',
        data: { mobanId: currentTemplate.mobanId, shangpinTypeId: selectedTypeId }
      })
-      if (res && res.data.code === 200) {
+      if (res && apiOk(res)) {
        const updatedLinkMap = { ...linkMap }
        delete updatedLinkMap[currentTemplate.mobanId]
        const updatedList = [...this.data.templateList]
@@ -557,7 +605,7 @@ Page({
    wx.showLoading({ title: '添加中...', mask: true })
    try {
      const res = await request({
-        url: '/peizhi/sjtjddmb',
+        url: staffOrOwner(STAFF_API.templateCreate, '/peizhi/sjtjddmb'),
        method: 'POST',
        data: {
          shangpinTypeId: selectedTypeId,
@@ -568,7 +616,7 @@ Page({
          commissionValue: addCommissionValue
        }
      })
-      if (res && res.data.code === 200) {
+      if (res && apiOk(res)) {
        const data = res.data.data || {}
        const newTemplate = {
          mobanId: data.mobanId,
--- a/pages/express-order/express-order.wxml
+++ b/pages/express-order/express-order.wxml
@@ -2,12 +2,13 @@
 <view class="page-container sj-form-theme">
  <!-- 余额卡片 -->
  <view class="balance-card">
-    <text class="balance-label">可用余额</text>
+    <text class="balance-label">{{isStaffMode ? '可用额度' : '可用余额'}}</text>
    <view class="balance-amount">
      <text class="amount-value">{{sjyue}}</text>
      <text class="amount-unit">元</text>
    </view>
-    <text class="balance-tip">生成链接将从此余额扣除</text>
+    <text class="balance-tip" wx:if="{{isStaffMode}}">当前身份：{{staffRoleName || '客服'}} · 生成链接从此额度扣除</text>
+    <text class="balance-tip" wx:else>生成链接将从此余额扣除</text>
  </view>

  <!-- 商品类型选择 -->
@@ -126,6 +127,7 @@
        <block wx:for="{{detailLinkList}}" wx:key="id">
          <view class="link-item">
            <text class="link-url" selectable="true">{{item.lianjie}}</text>
+            <text class="link-operator" wx:if="{{item.roleName || item.displayName}}">{{item.roleName || item.displayName}}</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>
--- a/pages/fighter-recharge/fighter-recharge.js
+++ b/pages/fighter-recharge/fighter-recharge.js
@@ -1,7 +1,7 @@
 // pages/dashou-chongzhi/index.js
 import request from '../../utils/request';
-// 引入弹窗服务（路径根据实际调整）
 import PopupService from '../../services/popupService.js';
+import { ensurePhoneAuth } from '../../utils/phone-auth.js';

 Page({
  data: {
@@ -31,13 +31,7 @@ Page({
    huiyuanListHeight: 120,
    
    // ========== 会员详情规则 ==========
-    detailRules: [
-      '会员有效期为30天，从购买当天开始计算',
-      '会员期间享受优先接单特权',
-      '可享受专属客服服务',
-      '会员到期前3天会有提醒',
-      '支持随时续费，续费天数叠加'
-    ],
+    detailRules: [],
    
    // ========== 新增：跳转参数处理 ==========
    // 用于接收从其他页面跳转过来的参数，决定是否自动滚动
@@ -47,6 +41,7 @@ Page({
    showPayMethodModal: false,   // 支付方式选择弹窗
    currentBuyType: null,        // 当前购买类型：1会员 2押金 3积分
    currentHuiyuanId: null,      // 当前选中的会员ID（用于会员购买）
+    currentBuyIsTrial: false,    // 正式/体验：仅体验禁余额抵扣
    currentYajinAmount: null,    // 当前押金金额（用于押金购买）
    
    // ========== 新增：余额抵扣身份选择 ==========
@@ -83,7 +78,10 @@ onHide() {
    }
  },

-  onShow() {
+  async onShow() {
+    const phoneOk = await ensurePhoneAuth({ redirect: true, role: 'dashou' });
+    if (!phoneOk) return;
+
    // 每次显示页面都刷新数据
    this.registerNotificationComponent();
    this.loadFromGlobalData();
@@ -181,9 +179,11 @@ onHide() {
        // 处理数据，标记已购买的会员
        const processedList = this.processHuiyuanList(huiyuanList);
        
+        const currentHuiyuan = processedList[0] || {};
        this.setData({
          huiyuanList: processedList,
-          currentHuiyuan: processedList[0] || {}
+          currentHuiyuan,
+          detailRules: this.buildDetailRules(currentHuiyuan)
        });
      } else {
        wx.showToast({
@@ -220,10 +220,12 @@ onHide() {
  onSwiperChange(e) {
    const current = e.detail.current;
    const huiyuanList = this.data.huiyuanList || [];
+    const currentHuiyuan = huiyuanList[current] || {};

    this.setData({
      currentHuiyuanIndex: current,
-      currentHuiyuan: huiyuanList[current] || {}
+      currentHuiyuan,
+      detailRules: this.buildDetailRules(currentHuiyuan)
    });
  },

@@ -232,12 +234,31 @@ onHide() {
    const index = e.currentTarget.dataset.index;
    const huiyuanList = this.data.huiyuanList || [];
    
+    const currentHuiyuan = huiyuanList[index] || {};
    this.setData({
      currentHuiyuanIndex: index,
-      currentHuiyuan: huiyuanList[index] || {}
+      currentHuiyuan,
+      detailRules: this.buildDetailRules(currentHuiyuan)
    });
  },

+  buildDetailRules(huiyuan = {}) {
+    const formalDays = huiyuan.formal_days || 30;
+    const rules = [
+      `正式会员有效期为${formalDays}天，从购买当天开始计算`,
+      '会员期间享受优先接单特权',
+      '支持随时续费，未过期续费天数叠加，已过期从今天重新计算'
+    ];
+    if (huiyuan.can_buy_trial) {
+      rules.push(`体验会员终身仅可购买1次（${huiyuan.trial_days || 0}天），体验期仅限制佣金提现`);
+    }
+    if (huiyuan.trial_enabled && !huiyuan.can_buy_trial) {
+      rules.push('您已使用过该会员的体验资格');
+    }
+    rules.push('体验会员仅支持微信支付；正式会员可使用佣金、分红或押金抵扣');
+    return rules;
+  },
+
  // ========== 格式化到期时间 ==========
  formatDaoqiTime(daoqi) {
    if (!daoqi) return '';
@@ -424,6 +445,7 @@ onHide() {
  // ========== 会员购买相关 ==========
  async handleHuiyuanBuy(e) {
    const huiyuanId = e.currentTarget.dataset.id;
+    const isTrial = e.currentTarget.dataset.trial === true || e.currentTarget.dataset.trial === 'true';

    if (!huiyuanId) {
      wx.showToast({
@@ -440,7 +462,8 @@ onHide() {
        url: '/shangpin/huiyuangm',
        method: 'POST',
        data: {
-          huiyuanid: huiyuanId
+          huiyuanid: huiyuanId,
+          is_trial: isTrial
        }
      });

@@ -800,9 +823,17 @@ onHide() {
  // ========== 新增功能（余额抵扣等） ==========
  onBuyHuiyuanClick(e) {
    const huiyuanId = e.currentTarget.dataset.id;
+    const isTrial = e.currentTarget.dataset.trial === true || e.currentTarget.dataset.trial === 'true';
+
+    if (isTrial) {
+      this.handleHuiyuanBuy(e);
+      return;
+    }
+
    this.setData({
      currentBuyType: 1,
      currentHuiyuanId: huiyuanId,
+      currentBuyIsTrial: false,
      showPayMethodModal: true
    });
  },
@@ -846,7 +877,9 @@ onHide() {

    if (method === 'wx') {
      if (currentBuyType === 1) {
-        this.handleHuiyuanBuy({ currentTarget: { dataset: { id: currentHuiyuanId } } });
+        this.handleHuiyuanBuy({
+          currentTarget: { dataset: { id: currentHuiyuanId, trial: 'false' } }
+        });
      } else if (currentBuyType === 2) {
        this.setData({ yajinAmount: currentYajinAmount }, () => {
          this.handleYajinPay();
@@ -862,7 +895,12 @@ onHide() {

  // 🔥 修改点3：请求余额抵扣选项前校验积分状态
  async fetchBalanceOptions() {
-    const { currentBuyType, currentHuiyuanId, currentYajinAmount, jifen } = this.data;
+    const { currentBuyType, currentHuiyuanId, currentYajinAmount, currentBuyIsTrial, jifen } = this.data;
+
+    if (currentBuyType === 1 && currentBuyIsTrial) {
+      wx.showToast({ title: '体验会员仅支持微信支付', icon: 'none' });
+      return;
+    }

    // 如果是积分购买，且积分已满，拒绝发起余额抵扣
    if (currentBuyType === 3 && jifen >= 10) {
@@ -882,6 +920,7 @@ onHide() {
        data: {
          leixing: currentBuyType,
          huiyuan_id: currentBuyType === 1 ? currentHuiyuanId : undefined,
+          is_trial: currentBuyType === 1 ? false : undefined,
          yajin_jine: currentBuyType === 2 ? parseInt(currentYajinAmount) : undefined,
        }
      });
@@ -924,7 +963,7 @@ onHide() {
  },

  async confirmBalancePay() {
-    const { selectedBalanceId, currentBuyType, currentHuiyuanId, currentYajinAmount } = this.data;
+    const { selectedBalanceId, currentBuyType, currentHuiyuanId, currentYajinAmount, currentBuyIsTrial } = this.data;
    if (!selectedBalanceId) return;
    
    this.hideConfirmModal();
@@ -938,6 +977,7 @@ onHide() {
          leixing: currentBuyType,
          shenfen_id: selectedBalanceId,
          huiyuan_id: currentBuyType === 1 ? currentHuiyuanId : undefined,
+          is_trial: currentBuyType === 1 ? currentBuyIsTrial : undefined,
          yajin_jine: currentBuyType === 2 ? parseInt(currentYajinAmount) : undefined,
        }
      });
--- a/pages/fighter-recharge/fighter-recharge.wxml
+++ b/pages/fighter-recharge/fighter-recharge.wxml
@@ -56,7 +56,7 @@
            <view class="vip-price">
              <text class="price-symbol">¥</text>
              <text class="price-number">{{item.jiage}}</text>
-              <text class="price-unit">/30天</text>
+              <text class="price-unit">/{{item.formal_days || 30}}天</text>
            </view>
            
            <view class="vip-features">
@@ -107,20 +107,24 @@
            <!-- 🔥 将“机甲能源”改为“价格” -->
            <text class="price-label">价格：</text>
            <text class="price-value">¥{{currentHuiyuan.jiage}}</text>
+            <text class="price-days">/{{currentHuiyuan.formal_days || 30}}天</text>
          </view>
          <text class="buy-desc" wx:if="{{currentHuiyuan.isBought && currentHuiyuan.buyInfo}}">
            已激活，<text class="expire-date">{{currentHuiyuan.buyInfo.daoqi}}</text>后到期
          </text>
-          <text class="buy-desc" wx:else>激活会员特权</text>
+          <text class="buy-desc" wx:else>正式会员支持微信或余额抵扣</text>
+          <text class="buy-desc trial-hint" wx:if="{{currentHuiyuan.can_buy_trial}}">
+            体验版仅微信支付 ¥{{currentHuiyuan.trial_price}}/{{currentHuiyuan.trial_days}}天，终身1次
+          </text>
        </view>
        
        <view class="buy-action">
          <view class="tech-buy-btn {{currentHuiyuan.isBought ? 'renew' : ''}}" 
-                bindtap="onBuyHuiyuanClick" data-id="{{currentHuiyuan.id}}">
+                bindtap="onBuyHuiyuanClick" data-id="{{currentHuiyuan.id}}" data-trial="false">
            <view class="buy-btn-bg"></view>
            <view class="buy-btn-glow"></view>
            <text class="buy-btn-text">
-              {{currentHuiyuan.isBought ? '立即续费' : '立即激活'}}
+              {{currentHuiyuan.isBought ? '正式续费' : '购买正式版'}}
            </text>
            <view class="buy-btn-energy">
              <view class="energy-dot"></view>
@@ -128,6 +132,16 @@
              <view class="energy-dot"></view>
            </view>
          </view>
+          <view
+            wx:if="{{currentHuiyuan.can_buy_trial}}"
+            class="tech-buy-btn trial-buy-btn"
+            bindtap="onBuyHuiyuanClick"
+            data-id="{{currentHuiyuan.id}}"
+            data-trial="true"
+          >
+            <view class="buy-btn-bg"></view>
+            <text class="buy-btn-text">购买体验版</text>
+          </view>
        </view>
      </view>
    </view>
--- a/pages/fighter-recharge/fighter-recharge.wxss
+++ b/pages/fighter-recharge/fighter-recharge.wxss
@@ -855,12 +855,30 @@
  /* 购买区域 */
  .buy-section {
    display: flex;
-    align-items: center;
-    justify-content: space-between;
+    flex-direction: column;
+    align-items: stretch;
+    gap: 20rpx;
    padding-top: 25rpx;
    border-top: 1px solid rgba(64, 156, 255, 0.2);
  }

+  .buy-action {
+    display: flex;
+    flex-direction: column;
+    gap: 16rpx;
+    align-items: flex-end;
+  }
+  
+  .price-days {
+    font-size: 22rpx;
+    color: #a0c8ff;
+  }
+
+  .trial-hint {
+    margin-top: 6rpx;
+    color: #ffb347;
+  }
+  
  .buy-info {
    display: flex;
    flex-direction: column;
@@ -928,6 +946,11 @@
    background: linear-gradient(135deg, #1e4b8f, #409cff);
  }
  
+  .tech-buy-btn.trial-buy-btn .buy-btn-bg {
+    background: linear-gradient(135deg, rgba(255, 179, 71, 0.35), rgba(255, 120, 80, 0.45));
+    border: 1px solid rgba(255, 179, 71, 0.6);
+  }
+
  .tech-buy-btn.renew .buy-btn-bg {
    background: linear-gradient(135deg, #0f2c5c, #36cfc9);
  }
--- a/pages/fighter/fighter.js
+++ b/pages/fighter/fighter.js
@@ -2,6 +2,8 @@
 import { createPage, request, isRoleStatusActive, isCenterPageActive, syncRoleStatuses, syncProfileFields, syncGroupFields, ensureRoleOnCenterPage, clearCacheAndEnterNormal, lockPrimaryRole, migrateLegacyCenterRole, enterLockedRole, parseSceneOptions } from '../../utils/base-page.js'
 import { resolveAvatarUrl } from '../../utils/avatar.js'
 import { openPrivateChat, buildInviterPeerId } from '../../utils/im-user.js'
+import { isStaffMode, getStaffContext } from '../../utils/staff-api.js'
+import { ensurePhoneAuth } from '../../utils/phone-auth.js'

 const PLATFORM_INVITE_CODE = '0000008RffVgKHMj7kQC'

@@ -179,7 +181,10 @@ Page(createPage({
    this.checkColdStartPopup('dashouduan');
  },

-  onShow() {
+  async onShow() {
+    const phoneOk = await ensurePhoneAuth({ redirect: true, role: 'dashou' });
+    if (!phoneOk) return;
+
    migrateLegacyCenterRole(getApp());
    lockPrimaryRole('dashou', getApp());
    wx.setStorageSync('isJinpai', 0);
@@ -277,6 +282,13 @@ Page(createPage({
      tag: d.shangjiaCertified ? '进入商家端' : '去认证',
      done: d.shangjiaCertified,
    });
+    list.push({
+      type: 'staff',
+      name: '商家客服',
+      icon: img.iconKefu || img.iconShangjia,
+      tag: isStaffMode() ? '进入工作台' : '去入驻',
+      done: isStaffMode(),
+    });
    if (!d.isGuanshi) {
      list.push({ type: 'guanshi', name: '管事', icon: img.iconGuanshiAuth, tag: '去认证' });
    }
@@ -1015,6 +1027,14 @@ Page(createPage({

  onTapAuthItem(e) {
    const type = e.currentTarget.dataset.type;
+    if (type === 'staff') {
+      if (isStaffMode()) {
+        enterLockedRole('shangjia', getApp());
+      } else {
+        wx.navigateTo({ url: '/pages/staff-join/staff-join' });
+      }
+      return;
+    }
    if (type === 'shangjia') {
      this.onTapShangjiaAuth();
      return;
--- a/pages/merchant-dispatch/merchant-dispatch.js
+++ b/pages/merchant-dispatch/merchant-dispatch.js
@@ -1,11 +1,15 @@
 // pages/merchant-dispatch/merchant-dispatch.js
 import { createPage, request } from '../../utils/base-page.js'
 import PopupService from '../../services/popupService.js'   // 引入弹窗服务
+import { STAFF_API, isStaffMode, refreshStaffContext, getStaffContext, restoreStaffContextAfterAuth, isMerchantPortalUser } from '../../utils/staff-api.js'

 Page(createPage({
  data: {
-    // 商家余额 (从全局变量获取)
+    // 可用余额 / 客服额度
    sjyue: '0.00',
+    isStaffMode: false,
+    balanceLabel: '可用余额',
+    balanceTip: '派单将从此余额扣除',

    // 商品类型列表
    shangpinList: [],
@@ -42,7 +46,15 @@ Page(createPage({
    bgImageUrl: ''
  },

-  onLoad() {
+  async onLoad() {
+    if (wx.getStorageSync('token')) {
+      await restoreStaffContextAfterAuth()
+    }
+    if (!isMerchantPortalUser()) {
+      wx.showToast({ title: '请先成为商家或绑定客服', icon: 'none' })
+      setTimeout(() => wx.navigateBack(), 1500)
+      return
+    }
    this.loadBgImage()          // 拼接背景图
    this.loadShangjiaYue()      // 从全局变量获取商家余额
    this.loadShangpinTypes()    // 加载商品类型
@@ -50,15 +62,9 @@ Page(createPage({
  },

  onShow() {
-    // 每次显示页面时刷新余额（可能从其他页面充值后返回）
    this.loadShangjiaYue()
-    // 重新拼接背景图（确保最新）
    this.loadBgImage()
-
-    // 注册通知组件（用于全局消息提示）
    this.registerNotificationComponent()
-
-    // 重置按钮缩进定时器（重新开始5秒倒计时）
    this.startTutorialBtnTimer()
  },

@@ -87,6 +93,22 @@ Page(createPage({

  // ==================== 基础数据加载 ====================
  loadShangjiaYue() {
+    const staff = isStaffMode()
+    this.setData({
+      isStaffMode: staff,
+      balanceLabel: staff ? '可用额度' : '可用余额',
+      balanceTip: staff ? '派单将从您的客服额度扣除（需老板先划额度）' : '派单将从此余额扣除',
+    })
+    if (staff) {
+      const ctx = getStaffContext() || {}
+      const wallet = ctx.wallet || {}
+      this.setData({ sjyue: wallet.quota_available || '0.00' })
+      refreshStaffContext(request).then((fresh) => {
+        const w = (fresh && fresh.wallet) || wallet
+        this.setData({ sjyue: w.quota_available || '0.00' })
+      }).catch(() => {})
+      return
+    }
    const app = getApp()
    const shangjiaData = app.globalData.shangjia || {}
    this.setData({
@@ -97,13 +119,16 @@ Page(createPage({
  // 加载商品类型（与极速派单完全一致）
  async loadShangpinTypes() {
    this.setData({ isLoading: true })
+    const staff = isStaffMode()
    try {
      const res = await request({
-        url: '/dingdan/sjspleixing',
+        url: staff ? STAFF_API.productTypes : '/dingdan/sjspleixing',
        method: 'POST'
      })
-      if (res && res.data.code === 200) {
-        let list = res.data.data || []
+      const code = res && res.data && res.data.code
+      if (code === 200 || code === 0) {
+        let list = (res.data.data || [])
+        if (!Array.isArray(list) && list.list) list = list.list
        // 强制倒序排列（与极速派单保持一致）
        list.reverse()
        this.setData({
@@ -115,14 +140,14 @@ Page(createPage({
          this.setSelectedType(list[0])
        }
      } else {
-        throw new Error(res.data.msg || '加载失败')
+        throw new Error((res.data && res.data.msg) || '加载失败')
      }
    } catch (error) {
      console.error('加载商品类型失败:', error)
      this.setData({ isLoading: false })
      wx.showToast({
-        title: '加载类型失败',
-        icon: 'error',
+        title: error.message || '加载类型失败',
+        icon: 'none',
        duration: 2000
      })
    }
@@ -282,21 +307,29 @@ Page(createPage({
      }
    }

-    // 4. 验证余额是否足够
+    // 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'
-            })
+      if (this.data.isStaffMode) {
+        wx.showModal({
+          title: '额度不足',
+          content: `当前可用额度${sjyue}元，需要${jiage}元。请联系商家老板划额度。`,
+          showCancel: false,
+        })
+      } else {
+        wx.showModal({
+          title: '余额不足',
+          content: `当前余额${sjyue}元，需要${jiage}元。请先充值。`,
+          confirmText: '去充值',
+          success: (res) => {
+            if (res.confirm) {
+              wx.navigateTo({
+                url: '/pages/merchant-recharge/merchant-recharge'
+              })
+            }
          }
-        }
-      })
+        })
+      }
      return false
    }

@@ -349,29 +382,31 @@ Page(createPage({

    try {
      const res = await request({
-        url: '/dingdan/sjpaifa',
+        url: isStaffMode() ? STAFF_API.orderDispatch : '/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 })
+        if (this.data.isStaffMode) {
+          this.loadShangjiaYue()
+        } else {
+          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 })
+          }
        }

        // 延迟重置表单，避免用户连续提交
--- a/pages/merchant-dispatch/merchant-dispatch.wxml
+++ b/pages/merchant-dispatch/merchant-dispatch.wxml
@@ -2,12 +2,12 @@
 <view class="page sj-form-theme">
  <!-- 余额卡片 -->
  <view class="balance-card">
-    <text class="balance-label">可用余额</text>
+    <text class="balance-label">{{balanceLabel}}</text>
    <view class="balance-row">
      <text class="balance-value">{{sjyue}}</text>
      <text class="balance-unit">元</text>
    </view>
-    <text class="balance-tip">派单将从此余额扣除</text>
+    <text class="balance-tip">{{balanceTip}}</text>
  </view>

  <!-- 订单类型 -->
--- a/pages/merchant-home/merchant-home.js
+++ b/pages/merchant-home/merchant-home.js
@@ -1,5 +1,10 @@
 import { createPage, request, ensureRoleOnCenterPage } from '../../utils/base-page.js';
 import { getOrderStatusText } from '../../utils/api-helper.js';
+import {
+  STAFF_API, isStaffMode, isMerchantPortalUser, refreshStaffContext, syncStaffUi,
+  restoreStaffContextAfterAuth, applyStaffStatsToPage, getStaffContext,
+} from '../../utils/staff-api.js';
+import { ensurePhoneAuth } from '../../utils/phone-auth.js';

 const app = getApp();

@@ -12,6 +17,11 @@ Page(createPage({
    statusBar: 20,
    navBar: 44,
    isShangjia: false,
+    isStaffMode: false,
+    staffRoleName: '',
+    quotaAvailable: '0.00',
+    canDispatch: true,
+    canStaffManage: true,
    lunboList: [],
    lunbozhanwei: '/images/lunbozhanwei.jpg',
    gonggao: '',
@@ -32,21 +42,42 @@ Page(createPage({
    recentLoading: false,
  },

-  onLoad() {
+  async onLoad() {
    const sys = wx.getSystemInfoSync();
    this.setData({
      statusBar: sys.statusBarHeight || 20,
      navBar: (sys.statusBarHeight || 20) + 44,
      lunbozhanwei: app.globalData.lunbozhanwei || '/images/lunbozhanwei.jpg',
    });
+    if (wx.getStorageSync('token')) {
+      await restoreStaffContextAfterAuth();
+    }
    this.checkRole();
+    syncStaffUi(this);
    this.waitForConfigAndLoadBanner();
    this.checkColdStartPopup('shangjiaduan');
  },

-  onShow() {
+  async onShow() {
+    const phoneOk = await ensurePhoneAuth({ redirect: true, role: 'shangjia' });
+    if (!phoneOk) return;
+
    this.registerNotificationComponent();
+    // 先用本地缓存渲染，再向服务端同步子客服身份
    this.checkRole();
+    syncStaffUi(this);
+    const token = wx.getStorageSync('token');
+    const isOwner = Number(wx.getStorageSync('shangjiastatus')) === 1;
+    if (token && !isOwner) {
+      await restoreStaffContextAfterAuth();
+      this.checkRole();
+      syncStaffUi(this);
+    } else if (isStaffMode()) {
+      await refreshStaffContext(request);
+      this.checkRole();
+      syncStaffUi(this);
+      applyStaffStatsToPage(this, getStaffContext());
+    }
    if (this.data.isShangjia) {
      ensureRoleOnCenterPage(this, 'shangjia');
      this.loadDashboard();
@@ -78,8 +109,7 @@ Page(createPage({
  },

  checkRole() {
-    const ok = Number(wx.getStorageSync('shangjiastatus')) === 1;
-    this.setData({ isShangjia: ok });
+    this.setData({ isShangjia: isMerchantPortalUser() });
  },

  loadBannerData(forceFetch) {
@@ -132,6 +162,12 @@ Page(createPage({
  },

  async loadShangjiaBrief() {
+    if (isStaffMode()) {
+      const ctx = await refreshStaffContext(request);
+      syncStaffUi(this);
+      applyStaffStatsToPage(this, ctx);
+      return;
+    }
    try {
      const res = await request({
        url: '/yonghu/shangjiaxinxi',
@@ -156,7 +192,7 @@ Page(createPage({
  async loadPendingStats() {
    try {
      const res = await request({
-        url: '/dingdan/sjdingdanhq',
+        url: isStaffMode() ? STAFF_API.orderList : '/dingdan/sjdingdanhq',
        method: 'POST',
        data: { zhuangtai_list: [8], page: 1, page_size: 20 },
      });
@@ -187,7 +223,7 @@ Page(createPage({
    this.setData({ recentLoading: true });
    try {
      const res = await request({
-        url: '/dingdan/sjdingdanhq',
+        url: isStaffMode() ? STAFF_API.orderList : '/dingdan/sjdingdanhq',
        method: 'POST',
        data: {
          zhuangtai_list: ALL_ORDER_ZHUANGTAI,
@@ -206,7 +242,7 @@ Page(createPage({
          return {
            dingdan_id: item.dingdan_id,
            title: item.jieshao || '暂无描述',
-            time: item.create_time || '',
+            time: item.create_time || item.CreateTime || '',
            status: getOrderStatusText(item.zhuangtai),
            money: item.jine || '0.00',
            raw,
--- a/pages/merchant-home/merchant-home.wxml
+++ b/pages/merchant-home/merchant-home.wxml
@@ -7,7 +7,7 @@
    </view>
  </view>

-  <block wx:if="{{!isShangjia}}">
+  <block wx:if="{{!isShangjia && !isStaffMode}}">
    <view class="guest-box sj-mx20 sj-panel">
      <text class="guest-title">商家入驻</text>
      <text class="guest-desc">完成入驻后可发单、管理订单</text>
@@ -39,7 +39,11 @@
        <text class="sj-notice-txt">{{gonggao}}</text>
      </view>

-      <view class="sj-fadan-row">
+      <view class="staff-banner sj-mx20" wx:if="{{isStaffMode}}">
+        <text class="staff-banner-txt">商家客服 · {{staffRoleName}} · 可用额度 ¥{{quotaAvailable}}</text>
+      </view>
+
+      <view class="sj-fadan-row" wx:if="{{canDispatch}}">
        <view class="sj-fadan-img-btn sj-fadan-img-btn--left" bindtap="goExpress"/>
        <view class="sj-fadan-img-btn sj-fadan-img-btn--right" bindtap="goDispatch"/>
      </view>
@@ -73,7 +77,7 @@
              <text class="stat-num">{{stats.todayRefund}}</text>
            </view>
          </view>
-          <view class="stats-kefu-wrap">
+          <view class="stats-kefu-wrap" wx:if="{{canStaffManage}}">
            <view class="kefu-row-inset flexm">
              <view class="kefu-btn-inset" bindtap="goKefuKey">
                <image class="kefu-inset-img" src="{{imgUrls.kefuKeyBtn}}" mode="widthFix"/>
--- a/pages/merchant-home/merchant-home.wxss
+++ b/pages/merchant-home/merchant-home.wxss
@@ -307,3 +307,16 @@ page {
  -webkit-line-clamp: 2;
  -webkit-box-orient: vertical;
 }
+
+.staff-banner {
+  margin-top: 16rpx;
+  padding: 16rpx 24rpx;
+  background: #fff8e8;
+  border-radius: 12rpx;
+  border: 1rpx solid #f0d89a;
+}
+
+.staff-banner-txt {
+  font-size: 24rpx;
+  color: #8a6d2b;
+}
--- a/pages/merchant-kefu-key/merchant-kefu-key.js
+++ b/pages/merchant-kefu-key/merchant-kefu-key.js
@@ -1,60 +1,128 @@
-/** 客服邀请码/秘钥 - UI 预览，后端接入前使用 mock 数据 */
+/** 客服邀请码管理 — 对接 merchant-staff API */
+import request from '../../utils/request.js';
+import { STAFF_API } from '../../utils/staff-api.js';
+
 Page({
  data: {
    statusBar: 20,
    gudingCode: 'XQKF2026',
-    kefuTips: '客服秘钥用于绑定子客服账号，后端接口就绪后将自动替换为真实数据。',
-    sublist: [{ name: '全部' }, { name: '未使用' }, { name: '已使用' }],
+    kefuTips: '一次性邀请码绑定子客服，固定码仅展示不可绑定。',
+    sublist: [{ name: '全部', status: null }, { name: '未使用', status: 0 }, { name: '已使用', status: 1 }],
    subCurrent: 0,
-    list: [
-      { id: 1, typeName: '财务', code: 'CW-8X2K9P', status: 0, adddate: '2026-06-10' },
-      { id: 2, typeName: '总管', code: 'ZG-3M7N1Q', status: 1, adddate: '2026-06-08', usedate: '2026-06-12', user: { nickname: '客服小张', avatar: '/images/default-avatar.png' } },
-    ],
+    list: [],
+    roles: [],
    showQrcodeTips: false,
+    loading: false,
  },

  onLoad() {
    const sys = wx.getSystemInfoSync();
    this.setData({ statusBar: sys.statusBarHeight || 20 });
+    this.loadRoles();
+    this.loadList();
  },

-  goBack() {
-    wx.navigateBack();
+  onShow() {
+    this.loadList();
  },

+  async loadRoles() {
+    try {
+      const res = await request({ url: STAFF_API.roleList, method: 'POST' });
+      if (res.data && res.data.code === 0) {
+        this.setData({ roles: res.data.data.roles || [] });
+      }
+    } catch (e) {}
+  },
+
+  async loadList() {
+    const tab = this.data.sublist[this.data.subCurrent];
+    try {
+      const res = await request({
+        url: STAFF_API.inviteList,
+        method: 'POST',
+        data: tab.status === null ? {} : { status: tab.status },
+      });
+      if (res.data && res.data.code === 0) {
+        const d = res.data.data || {};
+        this.setData({
+          list: d.list || [],
+          gudingCode: d.gudingCode || 'XQKF2026',
+        });
+      }
+    } catch (e) {
+      wx.showToast({ title: '加载失败', icon: 'none' });
+    }
+  },
+
+  goBack() { wx.navigateBack(); },
+
  copyFixed() {
    wx.setClipboardData({ data: this.data.gudingCode });
  },

  switchSub(e) {
-    this.setData({ subCurrent: Number(e.currentTarget.dataset.idx) });
+    this.setData({ subCurrent: Number(e.currentTarget.dataset.idx) }, () => this.loadList());
  },

-  addKey() {
-    wx.showToast({ title: '后端接入后可添加', icon: 'none' });
+  async addKey() {
+    const roles = this.data.roles;
+    if (!roles.length) {
+      wx.showToast({ title: '暂无角色，请稍后重试', icon: 'none' });
+      return;
+    }
+    const names = roles.map(r => r.role_name);
+    wx.showActionSheet({
+      itemList: names,
+      success: async (r) => {
+        const role = roles[r.tapIndex];
+        wx.showLoading({ title: '生成中' });
+        try {
+          const res = await request({
+            url: STAFF_API.inviteCreate,
+            method: 'POST',
+            data: { role_id: role.id },
+          });
+          if (res.data && res.data.code === 0) {
+            wx.showToast({ title: '已生成', icon: 'success' });
+            this.loadList();
+          } else {
+            wx.showToast({ title: res.data.msg || '失败', icon: 'none' });
+          }
+        } finally {
+          wx.hideLoading();
+        }
+      },
+    });
  },

  copyCode(e) {
    wx.setClipboardData({ data: e.currentTarget.dataset.code || '' });
  },

-  delKey() {
-    wx.showToast({ title: '预览数据不可删除', icon: 'none' });
-  },
-
-  showTips() {
-    this.setData({ showQrcodeTips: true });
-  },
-
-  closeTips() {
-    this.setData({ showQrcodeTips: false });
-  },
-
-  previewQr() {
-    wx.previewImage({
-      urls: ['https://xy-1314784552.cos.ap-guangzhou.myqcloud.com/uploads/images/ewm.png'],
+  async delKey(e) {
+    const id = e.currentTarget.dataset.id;
+    if (!id) return;
+    const res = await request({
+      url: STAFF_API.inviteRevoke,
+      method: 'POST',
+      data: { id },
    });
+    if (res.data && res.data.code === 0) {
+      wx.showToast({ title: '已作废' });
+      this.loadList();
+    } else {
+      wx.showToast({ title: res.data.msg || '失败', icon: 'none' });
+    }
  },

+  showTips() { this.setData({ showQrcodeTips: true }); },
+  closeTips() { this.setData({ showQrcodeTips: false }); },
+  goAudit() {
+    wx.navigateTo({ url: '/pages/merchant-staff-audit/merchant-staff-audit' });
+  },
+  goToRoleManage() {
+    wx.navigateTo({ url: '/pages/merchant-staff-role/merchant-staff-role' });
+  },
  noop() {},
 });
--- a/pages/merchant-kefu-key/merchant-kefu-key.wxml
+++ b/pages/merchant-kefu-key/merchant-kefu-key.wxml
@@ -26,6 +26,16 @@
        <view class="add-btn" bindtap="addKey">添加</view>
      </view>

+      <view class="help-row flexb" bindtap="goToRoleManage">
+        <text class="help-link">角色与权限管理（资金池/划额度在此配置角色）</text>
+        <text class="help-arrow">›</text>
+      </view>
+
+      <view class="help-row flexb" bindtap="goAudit">
+        <text class="help-link">操作日志与客服排行</text>
+        <text class="help-arrow">›</text>
+      </view>
+
      <view class="help-row flexb" bindtap="showTips">
        <text class="help-link">秘钥使用方法</text>
        <text class="help-arrow">›</text>
@@ -50,7 +60,6 @@
      </view>

      <view wx:if="{{!list.length}}" class="empty-tip">暂无卡密</view>
-      <view class="load-tip">预览 · 接口就绪后对接真实数据</view>
    </scroll-view>
  </view>

--- a/pages/merchant-kefu-list/merchant-kefu-list.js
+++ b/pages/merchant-kefu-list/merchant-kefu-list.js
@@ -1,47 +1,398 @@
-/** 客服列表 - UI 预览，mock 数据 */
+/** 客服列表 — 派单量 / 剩余额度 / 封禁解封 */
+
+import request from '../../utils/request.js';
+
+import { STAFF_API, isStaffMode } from '../../utils/staff-api.js';
+
+
+
+const app = getApp();
+
+
+
+function avatarUrl(path) {
+
+  if (!path) return '/images/default-avatar.png';
+
+  if (path.startsWith('http')) return path;
+
+  const oss = app.globalData.ossImageUrl || '';
+
+  const p = path.startsWith('/') ? path.slice(1) : path;
+
+  return oss ? oss + p : '/images/default-avatar.png';
+
+}
+
+
+
 Page({
+
  data: {
+
    statusBar: 20,
-    list: [
-      {
-        id: 1,
-        nickname: '客服总管-阿星',
-        avatar: '/images/default-avatar.png',
-        uid: '1008601',
-        isChief: true,
-        isFinance: false,
-        orderCount: 128,
-        settleCount: 96,
-        settleAmount: '12800.00',
-      },
-      {
-        id: 2,
-        nickname: '财务-小李',
-        avatar: '/images/default-avatar.png',
-        uid: '1008602',
-        isChief: false,
-        isFinance: true,
-        orderCount: 56,
-        settleCount: 52,
-        settleAmount: '6800.00',
-      },
-    ],
+
+    list: [],
+
+    isOwner: false,
+
  },

+
+
  onLoad() {
+
    const sys = wx.getSystemInfoSync();
-    this.setData({ statusBar: sys.statusBarHeight || 20 });
+
+    this.setData({ statusBar: sys.statusBarHeight || 20, isOwner: !isStaffMode() });
+
+    this.loadList();
+
  },

-  goBack() {
-    wx.navigateBack();
+
+
+  onShow() {
+
+    this.loadList();
+
  },

+
+
+  formatList(raw) {
+
+    return (raw || []).map((item) => ({
+
+      ...item,
+
+      avatar: avatarUrl(item.avatar),
+
+      todayDispatchCount: item.todayDispatchCount != null ? item.todayDispatchCount : 0,
+
+      todayDispatchAmount: item.todayDispatchAmount || '0.00',
+
+      dispatchCount: item.dispatchCount != null ? item.dispatchCount : (item.orderCount || 0),
+
+      dispatchAmount: item.dispatchAmount || '0.00',
+
+      settleCount: item.settleCount != null ? item.settleCount : 0,
+
+      settleAmount: item.settleAmount || '0.00',
+
+      refundCount: item.refundCount != null ? item.refundCount : 0,
+
+      refundAmount: item.refundAmount || '0.00',
+
+      quotaAvailable: item.quota_available || '0.00',
+
+      quotaRevokable: item.quota_available || '0.00',
+
+      isSelf: !!item.isSelf,
+
+    }));
+
+  },
+
+
+
+  rejectSelf(id) {
+
+    const row = (this.data.list || []).find((x) => String(x.id) === String(id));
+
+    if (row && row.isSelf) {
+
+      wx.showToast({ title: '不能对本人操作', icon: 'none' });
+
+      return true;
+
+    }
+
+    return false;
+
+  },
+
+
+
+  async loadList() {
+
+    try {
+
+      const res = await request({ url: STAFF_API.memberList, method: 'POST' });
+
+      if (res.data && res.data.code === 0) {
+
+        const raw = (res.data.data && res.data.data.list) || [];
+
+        this.setData({ list: this.formatList(raw) });
+
+      }
+
+    } catch (e) {
+
+      wx.showToast({ title: '加载失败', icon: 'none' });
+
+    }
+
+  },
+
+
+
+  goBack() { wx.navigateBack(); },
+
+
+
  copyUid(e) {
+
    wx.setClipboardData({ data: e.currentTarget.dataset.uid || '' });
+
  },

-  onAction(e) {
-    wx.showToast({ title: '后端接入后生效', icon: 'none' });
+
+
+  async onAllocate(e) {
+
+    const id = e.currentTarget.dataset.id;
+
+    if (this.rejectSelf(id)) return;
+
+    wx.showModal({
+
+      title: '划额度',
+
+      editable: true,
+
+      placeholderText: '输入金额',
+
+      success: async (r) => {
+
+        if (!r.confirm || !r.content) return;
+
+        const res = await request({
+
+          url: STAFF_API.walletAllocate,
+
+          method: 'POST',
+
+          data: { member_id: id, amount: r.content },
+
+        });
+
+        wx.showToast({
+
+          title: (res.data && res.data.code === 0) ? '成功' : (res.data.msg || '失败'),
+
+          icon: 'none',
+
+        });
+
+        this.loadList();
+
+      },
+
+    });
+
  },
+
+
+
+  async onRevoke(e) {
+
+    const id = e.currentTarget.dataset.id;
+
+    if (this.rejectSelf(id)) return;
+
+    const available = e.currentTarget.dataset.available || '0';
+
+    wx.showModal({
+
+      title: '收回额度',
+
+      editable: true,
+
+      placeholderText: `最多可收回 ${available} 元`,
+
+      success: async (r) => {
+
+        if (!r.confirm || !r.content) return;
+
+        const res = await request({
+
+          url: STAFF_API.walletRevoke,
+
+          method: 'POST',
+
+          data: { member_id: id, amount: r.content },
+
+        });
+
+        wx.showToast({
+
+          title: (res.data && res.data.code === 0) ? '已收回' : (res.data.msg || '失败'),
+
+          icon: 'none',
+
+        });
+
+        if (res.data && res.data.code === 0) this.loadList();
+
+      },
+
+    });
+
+  },
+
+
+
+  async onToggleDisable(e) {
+
+    const id = e.currentTarget.dataset.id;
+
+    if (this.rejectSelf(id)) return;
+
+    const disabled = e.currentTarget.dataset.disabled;
+
+    const action = disabled ? '解封' : '封禁';
+
+    wx.showModal({
+
+      title: `${action}客服`,
+
+      content: disabled ? '解封后该客服可继续登录操作' : '封禁后该客服无法使用商家端功能',
+
+      success: async (r) => {
+
+        if (!r.confirm) return;
+
+        const res = await request({
+
+          url: STAFF_API.memberDisable,
+
+          method: 'POST',
+
+          data: { member_id: id, disable: !disabled },
+
+        });
+
+        wx.showToast({ title: (res.data && res.data.msg) || action, icon: 'none' });
+
+        this.loadList();
+
+      },
+
+    });
+
+  },
+
+
+
+  async onRemove(e) {
+
+    const id = e.currentTarget.dataset.id;
+
+    wx.showModal({
+
+      title: '移除客服',
+
+      content: '移除后该用户可认证商家或绑定其他商家',
+
+      success: async (r) => {
+
+        if (!r.confirm) return;
+
+        const res = await request({
+
+          url: STAFF_API.memberRemove,
+
+          method: 'POST',
+
+          data: { member_id: id },
+
+        });
+
+        wx.showToast({ title: res.data.msg || '完成', icon: 'none' });
+
+        this.loadList();
+
+      },
+
+    });
+
+  },
+
+
+
+  async onAssignRole(e) {
+
+    const memberId = e.currentTarget.dataset.id;
+
+    if (this.rejectSelf(memberId)) return;
+
+    const rolesRes = await request({ url: STAFF_API.roleList, method: 'POST' });
+
+    const roles = (rolesRes.data && rolesRes.data.data && rolesRes.data.data.roles) || [];
+
+    if (!roles.length) {
+
+      wx.showToast({ title: '请先创建角色', icon: 'none' });
+
+      return;
+
+    }
+
+    wx.showActionSheet({
+
+      itemList: roles.map((r) => r.role_name),
+
+      success: async (r) => {
+
+        const role = roles[r.tapIndex];
+
+        const res = await request({
+
+          url: STAFF_API.memberUpdateRole,
+
+          method: 'POST',
+
+          data: { member_id: memberId, role_id: role.id },
+
+        });
+
+        const ok = res.data && res.data.code === 0;
+
+        const roleName = (res.data && res.data.data && res.data.data.role_name) || role.role_name;
+
+        wx.showToast({
+
+          title: ok ? `已设为${roleName}` : (res.data.msg || '失败'),
+
+          icon: 'none',
+
+        });
+
+        if (ok) this.loadList();
+
+      },
+
+    });
+
+  },
+
+
+
+  goRank() {
+
+    wx.navigateTo({ url: '/pages/merchant-staff-audit/merchant-staff-audit?tab=rank' });
+
+  },
+
+
+
+  goAudit() {
+
+    wx.navigateTo({ url: '/pages/merchant-staff-audit/merchant-staff-audit' });
+
+  },
+
 });
+
--- a/pages/merchant-kefu-list/merchant-kefu-list.wxml
+++ b/pages/merchant-kefu-list/merchant-kefu-list.wxml
@@ -1,47 +1,162 @@
 <view class="sub-page sj-page">
+
  <view class="status-bar" style="height:{{statusBar}}px"></view>
+
  <view class="sub-nav flexb">
+
    <text class="back" bindtap="goBack">‹</text>
+
    <text class="sub-nav-title">客服列表</text>
+
    <text class="back placeholder"></text>
+
  </view>

+
+
  <scroll-view scroll-y class="sub-scroll" enhanced show-scrollbar="{{false}}">
-    <view wx:for="{{list}}" wx:key="id" class="kefu-card sj-mx20">
+
+    <view wx:for="{{list}}" wx:key="id" class="kefu-card sj-mx20 {{item.isDisabled ? 'disabled-card' : ''}}">
+
      <view class="kefu-head flex">
+
        <image class="kefu-av" src="{{item.avatar}}" mode="aspectFill"/>
+
        <view class="kefu-info">
+
          <view class="flex">
+
            <text class="kefu-name">{{item.nickname}}</text>
+
+            <text class="badge badge-role">{{item.role_name || '客服'}}</text>
+
            <text wx:if="{{item.isChief}}" class="badge badge-chief">总管</text>
+
+            <text wx:if="{{item.isSelf}}" class="badge badge-self">本人</text>
+
            <text wx:if="{{item.isFinance}}" class="badge badge-finance">财务</text>
+
+            <text wx:if="{{item.isDisabled}}" class="badge badge-off">已封禁</text>
+
          </view>
+
          <view class="uid-row flex">
+
            <text class="kefu-uid">ID: {{item.uid}}</text>
+
            <text class="copy-link" bindtap="copyUid" data-uid="{{item.uid}}">复制</text>
+
          </view>
+
        </view>
+
      </view>
+
+      <view class="quota-row">
+
+        <text class="quota-label">剩余额度</text>
+
+        <text class="quota-val">¥{{item.quotaAvailable}}</text>
+
+      </view>
+
      <view class="kefu-stats flexa">
+
        <view class="stat-box flexmc">
-          <text class="stat-n">{{item.orderCount}}</text>
-          <text class="stat-l">接单数</text>
+
+          <text class="stat-n">{{item.todayDispatchCount}}</text>
+
+          <text class="stat-l">今日派单</text>
+
        </view>
+
        <view class="stat-box flexmc">
+
+          <text class="stat-n">{{item.dispatchCount}}</text>
+
+          <text class="stat-l">累计派单</text>
+
+        </view>
+
+        <view class="stat-box flexmc">
+
          <text class="stat-n">{{item.settleCount}}</text>
-          <text class="stat-l">结算数</text>
+
+          <text class="stat-l">结单数</text>
+
        </view>
+
        <view class="stat-box flexmc">
-          <text class="stat-n">¥{{item.settleAmount}}</text>
-          <text class="stat-l">结算金额</text>
+
+          <text class="stat-n">{{item.refundCount}}</text>
+
+          <text class="stat-l">退款数</text>
+
        </view>
+
      </view>
-      <view class="kefu-actions flexa">
-        <text class="act" bindtap="onAction">查看订单</text>
-        <text class="act" bindtap="onAction">权限管理</text>
-        <text class="act act-del" bindtap="onAction">删除</text>
+
+      <view class="kefu-stats amount-stats flexa">
+
+        <view class="stat-box flexmc">
+
+          <text class="stat-n stat-amt">¥{{item.todayDispatchAmount}}</text>
+
+          <text class="stat-l">今日派单额</text>
+
+        </view>
+
+        <view class="stat-box flexmc">
+
+          <text class="stat-n stat-amt">¥{{item.dispatchAmount}}</text>
+
+          <text class="stat-l">派单金额</text>
+
+        </view>
+
+        <view class="stat-box flexmc">
+
+          <text class="stat-n stat-amt">¥{{item.settleAmount}}</text>
+
+          <text class="stat-l">结算金额</text>
+
+        </view>
+
+        <view class="stat-box flexmc">
+
+          <text class="stat-n stat-amt">¥{{item.refundAmount}}</text>
+
+          <text class="stat-l">退款金额</text>
+
+        </view>
+
      </view>
+
+      <view wx:if="{{!item.isSelf}}" class="kefu-actions flexa">
+
+        <text class="act" bindtap="onAllocate" data-id="{{item.id}}">划额度</text>
+
+        <text class="act" bindtap="onRevoke" data-id="{{item.id}}" data-available="{{item.quotaRevokable}}">收回额度</text>
+
+        <text class="act" bindtap="onAssignRole" data-id="{{item.id}}">换角色</text>
+
+        <text class="act" bindtap="onToggleDisable" data-id="{{item.id}}" data-disabled="{{item.isDisabled}}">{{item.isDisabled ? '解封' : '封禁'}}</text>
+
+        <text wx:if="{{isOwner}}" class="act act-del" bindtap="onRemove" data-id="{{item.id}}">移除</text>
+
+      </view>
+
+      <view wx:else class="self-tip sj-mx20">本人账号不可在此操作，如需调整请联系商家老板</view>
+
    </view>
-    <view class="load-tip">预览 · 接口就绪后对接真实数据</view>
+
+    <view wx:if="{{!list.length}}" class="load-tip">暂无客服成员</view>
+
+    <view class="load-tip link-tip" bindtap="goAudit">操作日志 ›</view>
+
+    <view class="load-tip link-tip" bindtap="goRank">客服排行 ›</view>
+
  </scroll-view>
+
 </view>
+
--- a/pages/merchant-kefu-list/merchant-kefu-list.wxss
+++ b/pages/merchant-kefu-list/merchant-kefu-list.wxss
@@ -31,6 +31,34 @@
  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 }

+.kefu-card.disabled-card { opacity: 0.72; }
+
+.badge-role {
+  font-size: 20rpx;
+  padding: 2rpx 10rpx;
+  background: #f0f0f0;
+  color: #666;
+  border-radius: 6rpx;
+  margin-left: 8rpx;
+}
+
+.badge-off {
+  background: #ffebee;
+  color: #c62828;
+}
+
+.quota-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12rpx 0 8rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  margin-bottom: 12rpx;
+}
+
+.quota-label { font-size: 24rpx; color: #888; }
+.quota-val { font-size: 30rpx; color: #C9A962; font-weight: 600; }
+
 .kefu-av {
  width: 88rpx;
  height: 88rpx;
@@ -55,6 +83,15 @@

 .badge-chief { background: #ffb508; }
 .badge-finance { background: #1b6ef3; }
+.badge-self { background: #9e9e9e; }
+
+.self-tip {
+  margin-top: 16rpx;
+  padding: 16rpx 0 4rpx;
+  font-size: 24rpx;
+  color: #999;
+  text-align: center;
+}

 .kefu-uid {
  font-size: 24rpx;
@@ -75,12 +112,23 @@
  border-bottom: 1rpx solid #f5f5f5;
 }

+.amount-stats {
+  margin-top: 0;
+  border-top: none;
+  padding-top: 0;
+}
+
 .stat-n {
  font-size: 28rpx;
  font-weight: 700;
  color: #e67e22;
 }

+.stat-amt {
+  font-size: 24rpx;
+  color: #c0392b;
+}
+
 .stat-l {
  font-size: 22rpx;
  color: #999;
--- a/pages/merchant-order-detail/merchant-order-detail.js
+++ b/pages/merchant-order-detail/merchant-order-detail.js
@@ -2,6 +2,7 @@
 const app = getApp()
 import request from '../../utils/request.js'
 import PopupService from '../../services/popupService.js'   // 新增：导入弹窗服务
+import { STAFF_API, isStaffMode, syncStaffUi, getStaffContext, staffCan } from '../../utils/staff-api.js'

 Page({
  data: {
@@ -10,6 +11,8 @@ Page({
      jine: '', nicheng: '', beizhu: '', zhuangtai: 0, fadanpingtai: 0
    },
    dashouInfo: { yonghuid: '', nicheng: '', avatar: '' },
+    dispatchStaff: null,
+    dispatchStaffAvatar: '',
    xiangxiShuju: {
      dashou_jiaofu: [], dashou_liuyan: '', tuikuan_liyou: '', shangjia_liuyan: ''
    },
@@ -51,11 +54,17 @@ Page({
    showModifyTuikuanModal: false,    // 修改退款理由弹窗
    modifyTuikuanLiyou: '',           // 修改后的退款理由
    // 教程按钮状态
-    tutorialBtnHidden: false
+    tutorialBtnHidden: false,
+    canCancel: true,
+    canRefund: true,
+    canSettle: true,
+    canPenalty: true,
+    canPenaltyManage: true,
  },

  onLoad(options) {
    wx.setNavigationBarTitle({ title: '订单详情' })
+    syncStaffUi(this)
    this.ensureIMConnection()
    this.jiexiTiaozhuanCanshu(options)
    // 新增：启动教程按钮定时器
@@ -64,6 +73,7 @@ Page({

  onShow() {
    this.registerNotificationComponent()
+    syncStaffUi(this)
    this.ensureIMConnection()
  },

@@ -120,10 +130,17 @@ Page({
        avatar: app.globalData.ossImageUrl + app.globalData.morentouxiang
      }
    }
+    const staffCtx = isStaffMode() ? getStaffContext() : null
+    let imName = currentUser.name || wx.getStorageSync('nicheng') || '商家'
+    if (staffCtx) {
+      const roleLabel = staffCtx.role_name || '客服'
+      const nick = staffCtx.display_name || wx.getStorageSync('nicheng') || ''
+      imName = nick ? `${nick}(${roleLabel})` : roleLabel
+    }
    wx.goEasy.connect({
      id: userId,
      data: {
-        name: currentUser.name,
+        name: imName,
        avatar: currentUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
      },
      onSuccess: () => {
@@ -146,6 +163,15 @@ Page({
  },

  jiexiTiaozhuanCanshu(options) {
+    const directId = options.dingdan_id || options.dingdanId || ''
+    if (directId) {
+      this.setData({
+        'jibenShuju.dingdan_id': directId,
+        isLoading: false,
+      })
+      this.jiazaiXiangxiShuju(directId)
+      return
+    }
    try {
      const dingdanDataStr = options.dingdanData || ''
      if (!dingdanDataStr) {
@@ -193,7 +219,7 @@ Page({
    if (!dingdanId) return
    try {
      const res = await request({
-        url: '/dingdan/sjddxq',
+        url: isStaffMode() ? STAFF_API.orderDetail : '/dingdan/sjddxq',
        method: 'POST',
        data: { dingdan_id: dingdanId },
        header: { 'content-type': 'application/json' }
@@ -212,10 +238,17 @@ Page({
        if (dashouAvatar && !dashouAvatar.startsWith('http')) {
          dashouAvatar = (app.globalData.ossImageUrl || '') + dashouAvatar
        }
+        let dispatchStaffAvatar = (d.dispatch_staff && d.dispatch_staff.dispatch_staff_avatar) || ''
+        if (dispatchStaffAvatar && !dispatchStaffAvatar.startsWith('http')) {
+          const oss = app.globalData.ossImageUrl || ''
+          dispatchStaffAvatar = oss + (dispatchStaffAvatar.startsWith('/') ? dispatchStaffAvatar.slice(1) : dispatchStaffAvatar)
+        }
        this.setData({
          'dashouInfo.yonghuid': d.dashou_yonghuid || '',
          'dashouInfo.nicheng': d.dashou_nicheng || '',
          'dashouInfo.avatar': dashouAvatar,
+          dispatchStaff: d.dispatch_staff || null,
+          dispatchStaffAvatar: dispatchStaffAvatar || '/images/default-avatar.png',
          'xiangxiShuju.dashou_jiaofu': jiaofuList,
          'xiangxiShuju.dashou_liuyan': d.dashou_liuyan || '',
          'xiangxiShuju.tuikuan_liyou': d.tuikuan_liyou || '',
@@ -267,6 +300,10 @@ Page({

  // ===== 联系打手（替打手订阅 + 发机器人消息 + 跳转） =====
  goToChatWithDashou() {
+    if (isStaffMode() && !staffCan('imChat')) {
+      wx.showToast({ title: '当前角色无订单聊天权限', icon: 'none' })
+      return
+    }
    const uid = wx.getStorageSync('uid')
    if (!uid) return

@@ -392,7 +429,7 @@ Page({
    wx.showLoading({ title: '更换中...', mask: true })
    try {
      const res = await request({
-        url: '/dingdan/zxsjghds',
+        url: isStaffMode() ? STAFF_API.changePlayer : '/dingdan/zxsjghds',
        method: 'POST',
        data: { dingdan_id: this.data.jibenShuju.dingdan_id },
        header: { 'content-type': 'application/json' }
@@ -433,7 +470,7 @@ Page({
    wx.showLoading({ title: '提交中...', mask: true })
    try {
      const res = await request({
-        url: '/dingdan/sjfksq',
+        url: isStaffMode() ? STAFF_API.penaltyApply : '/dingdan/sjfksq',
        method: 'POST',
        data: {
          dingdan_id: jibenShuju.dingdan_id,
@@ -471,7 +508,7 @@ Page({
    wx.showLoading({ title: '撤销中...', mask: true })
    try {
      const res = await request({
-        url: '/dingdan/sjchexiao',
+        url: isStaffMode() ? STAFF_API.orderCancel : '/dingdan/sjchexiao',
        method: 'POST',
        data: { dingdan_id: jibenShuju.dingdan_id, chexiao_liyou: chexiaoLiyou },
        header: { 'content-type': 'application/json' }
@@ -502,7 +539,7 @@ Page({
    wx.showLoading({ title: '提交中...', mask: true })
    try {
      const res = await request({
-        url: '/dingdan/sjtkshenqing',
+        url: isStaffMode() ? STAFF_API.orderRefund : '/dingdan/sjtkshenqing',
        method: 'POST',
        data: { dingdan_id: jibenShuju.dingdan_id, tuikuan_liyou: tuikuanLiyou },
        header: { 'content-type': 'application/json' }
@@ -536,7 +573,7 @@ Page({
    wx.showLoading({ title: '结算中...', mask: true })
    try {
      const res = await request({
-        url: '/dingdan/sjjiesuan',
+        url: isStaffMode() ? STAFF_API.orderSettle : '/dingdan/sjjiesuan',
        method: 'POST',
        data: {
          dingdan_id: this.data.jibenShuju.dingdan_id,
@@ -595,7 +632,7 @@ Page({
    wx.showLoading({ title: '提交中...', mask: true });
    try {
      const res = await request({
-        url: '/dingdan/sjfkxgycx',
+        url: isStaffMode() ? STAFF_API.penaltyManage : '/dingdan/sjfkxgycx',
        method: 'POST',
        data: {
          operation: 'modify_penalty',
@@ -642,7 +679,7 @@ Page({
    wx.showLoading({ title: '提交中...', mask: true });
    try {
      const res = await request({
-        url: '/dingdan/sjfkxgycx',
+        url: isStaffMode() ? STAFF_API.penaltyManage : '/dingdan/sjfkxgycx',
        method: 'POST',
        data: {
          operation: 'cancel_penalty',
@@ -698,7 +735,7 @@ Page({
    wx.showLoading({ title: '提交中...', mask: true });
    try {
      const res = await request({
-        url: '/dingdan/sjfkxgycx',
+        url: isStaffMode() ? STAFF_API.penaltyManage : '/dingdan/sjfkxgycx',
        method: 'POST',
        data: {
          operation: 'resubmit_penalty',
@@ -744,7 +781,7 @@ Page({
    wx.showLoading({ title: '撤销中...', mask: true });
    try {
      const res = await request({
-        url: '/dingdan/sjfkxgycx',
+        url: isStaffMode() ? STAFF_API.penaltyManage : '/dingdan/sjfkxgycx',
        method: 'POST',
        data: {
          operation: 'cancel_refund',
@@ -790,7 +827,7 @@ Page({
    wx.showLoading({ title: '修改中...', mask: true });
    try {
      const res = await request({
-        url: '/dingdan/sjfkxgycx',
+        url: isStaffMode() ? STAFF_API.penaltyManage : '/dingdan/sjfkxgycx',
        method: 'POST',
        data: {
          operation: 'modify_refund_reason',
--- a/pages/merchant-order-detail/merchant-order-detail.wxml
+++ b/pages/merchant-order-detail/merchant-order-detail.wxml
@@ -37,6 +37,25 @@
      <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="card dispatch-staff-card" wx:if="{{dispatchStaff}}">
+        <view class="card-title">派单客服</view>
+        <view class="dashou-header">
+          <image class="dashou-avatar" src="{{dispatchStaffAvatar || '/images/default-avatar.png'}}" mode="aspectFill"/>
+          <view class="dashou-detail">
+            <text class="dashou-nicheng">{{dispatchStaff.dispatch_staff_name || '未知'}}</text>
+            <view class="dashou-id-row">
+              <text class="label">用户ID</text>
+              <text class="value">{{dispatchStaff.dispatch_staff_uid}}</text>
+              <text class="copy-btn" bindtap="fuzhiWenben" data-text="{{dispatchStaff.dispatch_staff_uid}}">📋</text>
+            </view>
+            <view class="dashou-id-row" wx:if="{{dispatchStaff.dispatch_role_name}}">
+              <text class="label">角色</text>
+              <text class="value">{{dispatchStaff.dispatch_role_name}}</text>
+            </view>
+          </view>
+        </view>
+      </view>
      <!-- 新增：退款操作按钮（仅退款中状态） -->
      <view class="refund-actions" wx:if="{{jibenShuju.zhuangtai == 4}}">
        <view class="action-btn action-cancel" bindtap="showCancelTuikuan">撤销退款申请</view>
@@ -115,7 +134,7 @@
      <!-- 更新时间 -->
      <view class="info-row"><text class="label">更新时间</text><text class="value">{{fadanData.update_time}}</text></view>
      <!-- 新增：罚单操作按钮区域（根据状态显示） -->
-      <view class="fakuan-actions" wx:if="{{fadanData}}">
+      <view class="fakuan-actions" wx:if="{{fadanData && canPenaltyManage}}">
        <!-- 待缴纳(1) 或 申诉中(3)：显示修改和撤销按钮 -->
        <block wx:if="{{fadanData.zhuangtai == 1 || fadanData.zhuangtai == 3}}">
          <view class="action-btn action-modify" bindtap="showModifyFakuan">修改罚款</view>
@@ -135,7 +154,7 @@
    </view>

    <!-- 结算区域卡片，仅当订单状态为8（结算中）时显示 -->
-    <view class="card jiesuan-card" wx:if="{{jibenShuju.zhuangtai == 8}}">
+    <view class="card jiesuan-card" wx:if="{{jibenShuju.zhuangtai == 8 && canSettle}}">
      <view class="card-title">订单结算</view>
      <view class="star-row">
        <text class="label">打星评分</text>
@@ -164,11 +183,11 @@
    <!-- 第二行按钮：各种操作按钮，根据订单状态显示 -->
    <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-warn" bindtap="showChexiaoBtn" wx:if="{{canCancel && (jibenShuju.zhuangtai == 1 || jibenShuju.zhuangtai == 7)}}">撤销订单</view>
      <!-- 【暂时隐藏】更换接单员按钮：恢复时取消下面整段注释即可 -->
-      <!-- <view class="btn-primary" bindtap="showGhDashouConfirm" wx:if="{{(jibenShuju.zhuangtai == 2 || jibenShuju.zhuangtai == 8) && dashouInfo.yonghuid}}">更换接单员</view> -->
+      <!-- <view class="btn-primary" bindtap="showGhDashouConfirm" wx:if="{{canChangePlayer && (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 class="btn-danger" bindtap="showTuikuanBtn" wx:if="{{canRefund && (jibenShuju.zhuangtai == 2 || jibenShuju.zhuangtai == 8)}}">申请退款</view>
    </view>
  </view>

--- a/pages/merchant-orders/merchant-orders.js
+++ b/pages/merchant-orders/merchant-orders.js
@@ -3,6 +3,8 @@ const app = getApp();
 import { createPage, request } from '../../utils/base-page.js';
 import { reconnectForRole } from '../../utils/role-tab-bar.js';
 import { getOrderStatusText } from '../../utils/api-helper.js';
+import { STAFF_API, isStaffMode, refreshStaffContext, syncStaffUi } from '../../utils/staff-api.js';
+import { ensurePhoneAuth } from '../../utils/phone-auth.js';

 Page(createPage({
  data: {
@@ -49,12 +51,19 @@ Page(createPage({
  },

  onLoad() {
-    wx.setNavigationBarTitle({ title: '我的派单' });
+    wx.setNavigationBarTitle({ title: isStaffMode() ? '客服派单' : '我的派单' });
+    syncStaffUi(this);
+    if (isStaffMode()) {
+      refreshStaffContext(request).then(() => syncStaffUi(this));
+    }
    this.loadShangpinLeixing();
    this.registerNotificationComponent();
  },

-  onShow() {
+  async onShow() {
+    const phoneOk = await ensurePhoneAuth({ redirect: true, role: 'shangjia' });
+    if (!phoneOk) return;
+
    this.registerNotificationComponent();
    this.loadPendingCount();
    if (wx.getStorageSync('uid')) {
@@ -169,7 +178,7 @@ Page(createPage({
      };

      const res = await request({
-        url: '/dingdan/sjdingdanhq',  // 商家订单接口（和原来一样）
+        url: isStaffMode() ? STAFF_API.orderList : '/dingdan/sjdingdanhq',
        method: 'POST',
        data: params,
        header: { 'content-type': 'application/json' }
@@ -247,7 +256,7 @@ Page(createPage({
  async loadPendingCount() {
    try {
      const res = await request({
-        url: '/dingdan/sjdingdanhq',
+        url: isStaffMode() ? STAFF_API.orderList : '/dingdan/sjdingdanhq',
        method: 'POST',
        data: {
          zhuangtai_list: [8],
--- a/pages/merchant-recharge/merchant-recharge.js
+++ b/pages/merchant-recharge/merchant-recharge.js
@@ -1,5 +1,6 @@
 // pages/shangjia-chongzhi/index.js
 import request from '../../utils/request';
+import { guardMerchantOwnerAction } from '../../utils/staff-api.js';

 Page({
  data: {
@@ -37,6 +38,10 @@ Page({
  },

  onLoad() {
+    if (!guardMerchantOwnerAction('仅商家老板可充值')) {
+      setTimeout(() => wx.navigateBack(), 1200);
+      return;
+    }
    this.initPage();
  },

--- a/pages/merchant-staff-audit/merchant-staff-audit.js
+++ b/pages/merchant-staff-audit/merchant-staff-audit.js
@@ -0,0 +1,99 @@
+import request from '../../utils/request.js';
+import { STAFF_API } from '../../utils/staff-api.js';
+
+const ORDER_AUDIT_ACTIONS = [
+  'DISPATCH', 'LINK_GENERATE', 'SETTLE', 'CANCEL', 'REFUND_APPLY',
+  'CHANGE_PLAYER', 'PENALTY_APPLY', 'PENALTY_MANAGE',
+];
+
+Page({
+  data: {
+    tab: 'audit',
+    auditList: [],
+    rankList: [],
+    page: 1,
+    hasMore: true,
+    loading: false,
+    total: 0,
+  },
+
+  onLoad(options) {
+    if (options.tab === 'rank') this.setData({ tab: 'rank' });
+    wx.setNavigationBarTitle({
+      title: options.tab === 'rank' ? '客服排行' : '操作日志',
+    });
+    this.loadData(true);
+  },
+
+  onPullDownRefresh() {
+    this.loadData(true).finally(() => wx.stopPullDownRefresh());
+  },
+
+  onReachBottom() {
+    if (this.data.tab === 'audit' && this.data.hasMore && !this.data.loading) {
+      this.loadAudit(false);
+    }
+  },
+
+  switchTab(e) {
+    const tab = e.currentTarget.dataset.tab;
+    wx.setNavigationBarTitle({ title: tab === 'rank' ? '客服排行' : '操作日志' });
+    this.setData({ tab, page: 1, hasMore: true }, () => this.loadData(true));
+  },
+
+  loadData(reset) {
+    if (this.data.tab === 'audit') return this.loadAudit(reset);
+    return this.loadRank();
+  },
+
+  async loadAudit(reset) {
+    if (this.data.loading) return;
+    const page = reset ? 1 : this.data.page;
+    this.setData({ loading: true });
+    try {
+      const res = await request({
+        url: STAFF_API.auditList,
+        method: 'POST',
+        data: { page, page_size: 20 },
+      });
+      if (res.data && res.data.code === 0) {
+        const d = res.data.data || {};
+        const list = (d.list || []).map((item) => ({
+          ...item,
+          canJumpOrder: ORDER_AUDIT_ACTIONS.indexOf(item.action) >= 0 && !!item.resource_id,
+        }));
+        this.setData({
+          auditList: reset ? list : [...this.data.auditList, ...list],
+          page: page + 1,
+          hasMore: !!d.has_more,
+          total: d.total || 0,
+          loading: false,
+        });
+      } else {
+        this.setData({ loading: false });
+        wx.showToast({ title: res.data?.msg || '加载失败', icon: 'none' });
+      }
+    } catch (e) {
+      this.setData({ loading: false });
+    }
+  },
+
+  async loadRank() {
+    const res = await request({
+      url: STAFF_API.rank,
+      method: 'POST',
+      data: { period: 'month', sort_by: 'dispatch_count' },
+    });
+    if (res.data && res.data.code === 0) {
+      this.setData({ rankList: (res.data.data && res.data.data.list) || [] });
+    }
+  },
+
+  goOrderDetail(e) {
+    const item = e.currentTarget.dataset.item;
+    if (!item || !item.canJumpOrder || !item.resource_id) return;
+    wx.navigateTo({
+      url: `/pages/merchant-order-detail/merchant-order-detail?dingdan_id=${encodeURIComponent(item.resource_id)}`,
+    });
+  },
+});
--- a/pages/merchant-staff-audit/merchant-staff-audit.json
+++ b/pages/merchant-staff-audit/merchant-staff-audit.json
@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "操作日志",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}
--- a/pages/merchant-staff-audit/merchant-staff-audit.wxml
+++ b/pages/merchant-staff-audit/merchant-staff-audit.wxml
@@ -0,0 +1,39 @@
+<view class="page">
+  <view class="head-tip">仅记录派单、退款、模板等重要操作，不含普通查看</view>
+  <view class="tabs">
+    <view class="tab {{tab === 'audit' ? 'on' : ''}}" data-tab="audit" bindtap="switchTab">操作日志</view>
+    <view class="tab {{tab === 'rank' ? 'on' : ''}}" data-tab="rank" bindtap="switchTab">客服排行</view>
+  </view>
+  <block wx:if="{{tab === 'audit'}}">
+    <view class="summary" wx:if="{{total > 0}}">共 {{total}} 条重要操作</view>
+    <view class="item {{item.canJumpOrder ? 'item-link' : ''}}" wx:for="{{auditList}}" wx:key="id"
+          bindtap="goOrderDetail" data-item="{{item}}">
+      <view class="item-hd flexb">
+        <text class="act">{{item.action_label || item.action}}</text>
+        <text class="amount" wx:if="{{item.amount}}">¥{{item.amount}}</text>
+      </view>
+      <view class="operator">
+        <text class="tag {{item.operator_type === 'STAFF' ? 'tag-staff' : 'tag-owner'}}">
+          {{item.role_name || (item.operator_type === 'STAFF' ? '客服' : '老板')}}
+        </text>
+        <text class="name">{{item.operator_name}}</text>
+        <text class="uid">ID:{{item.operator_user_id}}</text>
+      </view>
+      <text class="meta">{{item.time}}</text>
+      <text class="res" wx:if="{{item.resource_id}}">订单：{{item.resource_id}}</text>
+      <text class="jump-tip" wx:if="{{item.canJumpOrder}}">点击查看订单详情 ›</text>
+      <text class="remark" wx:if="{{item.remark}}">{{item.remark}}</text>
+    </view>
+    <view class="load-tip" wx:if="{{loading}}">加载中...</view>
+    <view class="load-tip" wx:elif="{{hasMore && auditList.length}}">上拉加载更多</view>
+    <view class="empty" wx:if="{{!loading && auditList.length === 0}}">暂无操作日志</view>
+  </block>
+  <block wx:else>
+    <view class="item" wx:for="{{rankList}}" wx:key="member_id">
+      <text class="rank">#{{item.rank}} {{item.display_name}}</text>
+      <text class="meta">派单 {{item.dispatch_count}} 单 · ¥{{item.dispatch_amount}}</text>
+      <text class="meta">结单 {{item.settle_count}} 单 · ¥{{item.settle_amount}}</text>
+    </view>
+    <view class="empty" wx:if="{{rankList.length === 0}}">暂无排行数据</view>
+  </block>
+</view>
--- a/pages/merchant-staff-audit/merchant-staff-audit.wxss
+++ b/pages/merchant-staff-audit/merchant-staff-audit.wxss
@@ -0,0 +1,25 @@
+.page { padding: 24rpx; background: #f5f5f5; min-height: 100vh; box-sizing: border-box; }
+.head-tip { font-size: 24rpx; color: #888; margin-bottom: 16rpx; line-height: 1.5; }
+.tabs { display: flex; margin-bottom: 24rpx; }
+.tab { flex: 1; text-align: center; padding: 20rpx; background: #fff; margin-right: 8rpx; border-radius: 8rpx; font-size: 28rpx; }
+.tab.on { background: #C9A962; color: #fff; }
+.summary { font-size: 24rpx; color: #666; margin-bottom: 16rpx; }
+.item { background: #fff; padding: 24rpx; margin-bottom: 16rpx; border-radius: 12rpx; }
+.item-hd { margin-bottom: 12rpx; }
+.act { font-size: 30rpx; color: #333; font-weight: 600; }
+.amount { font-size: 28rpx; color: #C9A962; }
+.operator { display: flex; align-items: center; flex-wrap: wrap; gap: 12rpx; margin-bottom: 8rpx; }
+.tag { font-size: 22rpx; padding: 4rpx 12rpx; border-radius: 6rpx; }
+.tag-staff { background: #e8f4ff; color: #1976d2; }
+.tag-owner { background: #fff3e0; color: #e65100; }
+.name { font-size: 26rpx; color: #333; }
+.uid { font-size: 22rpx; color: #999; }
+.meta { display: block; font-size: 24rpx; color: #999; margin-top: 6rpx; }
+.res { display: block; font-size: 24rpx; color: #666; margin-top: 8rpx; word-break: break-all; }
+.remark { display: block; font-size: 24rpx; color: #888; margin-top: 6rpx; }
+.rank { font-weight: 600; font-size: 28rpx; display: block; }
+.load-tip { text-align: center; color: #999; padding: 24rpx; font-size: 24rpx; }
+.empty { text-align: center; color: #999; padding: 80rpx; }
+.item-link { border-left: 6rpx solid #C9A962; }
+.jump-tip { display: block; font-size: 24rpx; color: #C9A962; margin-top: 8rpx; }
+.flexb { display: flex; justify-content: space-between; align-items: center; }
--- a/pages/merchant-staff-role/merchant-staff-role.js
+++ b/pages/merchant-staff-role/merchant-staff-role.js
@@ -0,0 +1,236 @@
+/** 商家老板：角色与权限管理 */
+import request from '../../utils/request.js';
+import { STAFF_API, isStaffMode, isMerchantOwnerOnly } from '../../utils/staff-api.js';
+
+/** 与后端 constants.PERMISSION_DEFINITIONS 一致，接口为空时前端兜底 */
+const FALLBACK_PERMISSIONS = [
+  { perm_code: 'staff_manage', perm_name: '子客服管理' },
+  { perm_code: 'role_manage', perm_name: '角色管理' },
+  { perm_code: 'wallet_allocate', perm_name: '划额度' },
+  { perm_code: 'wallet_revoke', perm_name: '收回额度' },
+  { perm_code: 'wallet_view', perm_name: '查看额度' },
+  { perm_code: 'finance_view', perm_name: '查看商家余额' },
+  { perm_code: 'order_dispatch', perm_name: '派单发单' },
+  { perm_code: 'order_view_all', perm_name: '查看全部订单' },
+  { perm_code: 'order_view_self', perm_name: '只看自己派的单' },
+  { perm_code: 'order_detail', perm_name: '订单详情' },
+  { perm_code: 'order_settle', perm_name: '结单' },
+  { perm_code: 'order_refund_apply', perm_name: '申请退款' },
+  { perm_code: 'order_cancel', perm_name: '撤销订单' },
+  { perm_code: 'order_change_player', perm_name: '换打手' },
+  { perm_code: 'penalty_apply', perm_name: '申请罚单' },
+  { perm_code: 'penalty_manage', perm_name: '改撤罚单' },
+  { perm_code: 'penalty_view', perm_name: '查看罚单' },
+  { perm_code: 'staff_disable', perm_name: '封禁解封客服' },
+  { perm_code: 'template_manage', perm_name: '派单模板' },
+  { perm_code: 'audit_view', perm_name: '操作日志' },
+  { perm_code: 'rank_view', perm_name: '客服排行榜' },
+  { perm_code: 'im_chat', perm_name: '订单IM' },
+  { perm_code: 'stats_view', perm_name: '统计数据' },
+];
+
+Page({
+  data: {
+    statusBar: 20,
+    permScrollHeight: 360,
+    loading: false,
+    roles: [],
+    rawPermissions: [],
+    permissionOptions: [],
+    selectedPerms: [],
+    showEditPanel: false,
+    showCreatePanel: false,
+    editingRoleId: null,
+    editingRoleName: '',
+    newRoleName: '',
+  },
+
+  onLoad() {
+    const sys = wx.getSystemInfoSync();
+    const h = sys.windowHeight || 667;
+    this.setData({
+      statusBar: sys.statusBarHeight || 20,
+      permScrollHeight: Math.floor(h * 0.45),
+    });
+    if (!this.ensureOwnerAccess()) return;
+    this.loadRoles();
+  },
+
+  onShow() {
+    if (!isMerchantOwnerOnly()) return;
+    if (!this.data.showEditPanel && !this.data.showCreatePanel) {
+      this.loadRoles();
+    }
+  },
+
+  ensureOwnerAccess() {
+    if (isStaffMode() || Number(wx.getStorageSync('shangjiastatus')) !== 1) {
+      wx.showToast({ title: '仅商家老板可管理角色权限', icon: 'none' });
+      setTimeout(() => wx.navigateBack(), 1200);
+      return false;
+    }
+    return true;
+  },
+
+  /** allPerms: [{perm_code, perm_name}]  selectedCodes: ['order_dispatch', ...] */
+  buildPermOptions(allPerms, selectedCodes) {
+    const list = (allPerms && allPerms.length) ? allPerms : FALLBACK_PERMISSIONS;
+    const set = new Set(selectedCodes || []);
+    return list.map((p) => {
+      const code = p.perm_code || p;
+      const name = p.perm_name || code;
+      return {
+        perm_code: code,
+        perm_name: name,
+        checked: set.has(code),
+      };
+    });
+  },
+
+  normalizeRoles(list) {
+    return (list || []).map((r) => ({
+      ...r,
+      permCount: (r.permissions && r.permissions.length) || 0,
+    }));
+  },
+
+  resolveAllPermissions(apiList) {
+    if (apiList && apiList.length) return apiList;
+    return FALLBACK_PERMISSIONS;
+  },
+
+  async loadRoles() {
+    this.setData({ loading: true });
+    try {
+      const res = await request({ url: STAFF_API.roleList, method: 'POST' });
+      if (res.data && res.data.code === 0) {
+        const d = res.data.data || {};
+        const rawPermissions = this.resolveAllPermissions(d.all_permissions);
+        this.setData({
+          roles: this.normalizeRoles(d.roles),
+          rawPermissions,
+        });
+        return rawPermissions;
+      }
+      wx.showToast({ title: (res.data && res.data.msg) || '加载失败', icon: 'none' });
+    } catch (e) {
+      wx.showToast({ title: '加载失败', icon: 'none' });
+    } finally {
+      this.setData({ loading: false });
+    }
+    const fallback = FALLBACK_PERMISSIONS;
+    this.setData({ rawPermissions: fallback });
+    return fallback;
+  },
+
+  goBack() { wx.navigateBack(); },
+
+  openCreate() {
+    const raw = this.data.rawPermissions.length
+      ? this.data.rawPermissions
+      : FALLBACK_PERMISSIONS;
+    this.setData({
+      showCreatePanel: true,
+      showEditPanel: false,
+      newRoleName: '',
+      selectedPerms: [],
+      permissionOptions: this.buildPermOptions(raw, []),
+    });
+  },
+
+  closeCreate() {
+    this.setData({ showCreatePanel: false, permissionOptions: [], selectedPerms: [] });
+  },
+
+  onNameInput(e) {
+    this.setData({ newRoleName: e.detail.value });
+  },
+
+  togglePermItem(e) {
+    const code = e.currentTarget.dataset.code;
+    if (!code) return;
+    const opts = (this.data.permissionOptions || []).map((p) => (
+      p.perm_code === code ? { ...p, checked: !p.checked } : p
+    ));
+    this.setData({
+      permissionOptions: opts,
+      selectedPerms: opts.filter((x) => x.checked).map((x) => x.perm_code),
+    });
+  },
+
+  async editRole(e) {
+    const id = e.currentTarget.dataset.id;
+    let role = this.data.roles.find((r) => String(r.id) === String(id));
+    if (!role) return;
+
+    let rawPermissions = this.data.rawPermissions;
+    if (!rawPermissions.length) {
+      rawPermissions = await this.loadRoles();
+      role = this.data.roles.find((r) => String(r.id) === String(id));
+      if (!role) return;
+    }
+
+    const perms = role.permissions || [];
+    this.setData({
+      showEditPanel: true,
+      showCreatePanel: false,
+      editingRoleId: role.id,
+      editingRoleName: role.role_name || '',
+      selectedPerms: [...perms],
+      permissionOptions: this.buildPermOptions(rawPermissions, perms),
+    });
+  },
+
+  closeEdit() {
+    this.setData({
+      showEditPanel: false,
+      editingRoleId: null,
+      editingRoleName: '',
+      selectedPerms: [],
+      permissionOptions: [],
+    });
+  },
+
+  async saveRolePerms() {
+    const { editingRoleId, selectedPerms } = this.data;
+    if (!editingRoleId) return;
+    wx.showLoading({ title: '保存中' });
+    try {
+      const res = await request({
+        url: STAFF_API.roleSetPerms,
+        method: 'POST',
+        data: { role_id: editingRoleId, permissions: selectedPerms },
+      });
+      wx.showToast({ title: (res.data && res.data.msg) || '已保存', icon: 'none' });
+      if (res.data && res.data.code === 0) {
+        this.closeEdit();
+        this.loadRoles();
+      }
+    } finally {
+      wx.hideLoading();
+    }
+  },
+
+  async createRole() {
+    const name = (this.data.newRoleName || '').trim();
+    if (!name) {
+      wx.showToast({ title: '请输入角色名', icon: 'none' });
+      return;
+    }
+    wx.showLoading({ title: '创建中' });
+    try {
+      const res = await request({
+        url: STAFF_API.roleCreate,
+        method: 'POST',
+        data: { role_name: name, permissions: this.data.selectedPerms },
+      });
+      wx.showToast({ title: (res.data && res.data.msg) || '完成', icon: 'none' });
+      if (res.data && res.data.code === 0) {
+        this.closeCreate();
+        this.loadRoles();
+      }
+    } finally {
+      wx.hideLoading();
+    }
+  },
+});
--- a/pages/merchant-staff-role/merchant-staff-role.json
+++ b/pages/merchant-staff-role/merchant-staff-role.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "角色与权限",
+  "navigationStyle": "custom"
+}
--- a/pages/merchant-staff-role/merchant-staff-role.wxml
+++ b/pages/merchant-staff-role/merchant-staff-role.wxml
@@ -0,0 +1,75 @@
+<view class="role-page">
+  <view class="status-bar" style="height:{{statusBar}}px"></view>
+  <view class="role-nav flexb">
+    <text class="nav-back" bindtap="goBack">‹</text>
+    <text class="nav-title">角色与权限</text>
+    <text class="nav-link" bindtap="openCreate">新建</text>
+  </view>
+
+  <scroll-view scroll-y class="role-scroll" enhanced show-scrollbar="{{false}}">
+    <view class="role-tip">可自由创建角色并勾选权限；预置角色也可改权限。</view>
+    <view wx:if="{{!roles.length && !loading}}" class="role-empty">暂无角色，请先新建或联系管理员同步权限</view>
+    <view wx:for="{{roles}}" wx:key="id" class="role-card" bindtap="editRole" data-id="{{item.id}}">
+      <view class="flexb">
+        <text class="role-name">{{item.role_name}}</text>
+        <text class="role-tag">{{item.is_system ? '系统' : '自定义'}}</text>
+      </view>
+      <text class="role-sub">{{item.role_hint || ''}}</text>
+      <text class="role-sub">已授权 {{item.permCount}} 项 · 点击编辑</text>
+    </view>
+  </scroll-view>
+</view>
+
+<view wx:if="{{showEditPanel}}" class="role-mask">
+  <view class="role-mask-bg" bindtap="closeEdit"></view>
+  <view class="role-panel">
+    <view class="panel-title">编辑角色权限</view>
+    <text class="panel-role-name">{{editingRoleName}}</text>
+    <scroll-view scroll-y class="perm-scroll" style="height:{{permScrollHeight}}px">
+      <view
+        wx:for="{{permissionOptions}}"
+        wx:key="perm_code"
+        class="perm-row flexb {{item.checked ? 'perm-on' : ''}}"
+        bindtap="togglePermItem"
+        data-code="{{item.perm_code}}"
+      >
+        <view class="perm-text">
+          <text class="perm-name">{{item.perm_name}}</text>
+          <text class="perm-code">{{item.perm_code}}</text>
+        </view>
+        <view class="perm-check">{{item.checked ? '✓' : ''}}</view>
+      </view>
+    </scroll-view>
+    <view class="panel-btns flexa">
+      <button class="panel-btn cancel" bindtap="closeEdit" hover-class="btn-hover">取消</button>
+      <button class="panel-btn ok" bindtap="saveRolePerms" hover-class="btn-hover">保存</button>
+    </view>
+  </view>
+</view>
+
+<view wx:if="{{showCreatePanel}}" class="role-mask">
+  <view class="role-mask-bg" bindtap="closeCreate"></view>
+  <view class="role-panel">
+    <view class="panel-title">新建角色</view>
+    <input class="name-input" placeholder="角色名称" value="{{newRoleName}}" bindinput="onNameInput"/>
+    <scroll-view scroll-y class="perm-scroll" style="height:{{permScrollHeight}}px">
+      <view
+        wx:for="{{permissionOptions}}"
+        wx:key="perm_code"
+        class="perm-row flexb {{item.checked ? 'perm-on' : ''}}"
+        bindtap="togglePermItem"
+        data-code="{{item.perm_code}}"
+      >
+        <view class="perm-text">
+          <text class="perm-name">{{item.perm_name}}</text>
+          <text class="perm-code">{{item.perm_code}}</text>
+        </view>
+        <view class="perm-check">{{item.checked ? '✓' : ''}}</view>
+      </view>
+    </scroll-view>
+    <view class="panel-btns flexa">
+      <button class="panel-btn cancel" bindtap="closeCreate" hover-class="btn-hover">取消</button>
+      <button class="panel-btn ok" bindtap="createRole" hover-class="btn-hover">创建</button>
+    </view>
+  </view>
+</view>
--- a/pages/merchant-staff-role/merchant-staff-role.wxss
+++ b/pages/merchant-staff-role/merchant-staff-role.wxss
@@ -0,0 +1,221 @@
+@import '../../styles/shangjia-xym-common.wxss';
+
+.role-page {
+  min-height: 100vh;
+  background: linear-gradient(180deg, #f7dc51 0%, #fff 28%, #fff8e1 100%);
+  box-sizing: border-box;
+}
+
+.role-nav {
+  padding: 0 24rpx 16rpx;
+}
+
+.nav-back {
+  width: 60rpx;
+  font-size: 48rpx;
+  color: #333;
+}
+
+.nav-title {
+  font-size: 34rpx;
+  font-weight: 700;
+  color: #343434;
+}
+
+.nav-link {
+  width: 60rpx;
+  text-align: right;
+  font-size: 28rpx;
+  color: #c9a962;
+}
+
+.role-scroll {
+  height: calc(100vh - 120rpx);
+}
+
+.role-tip {
+  font-size: 24rpx;
+  color: #888;
+  margin: 20rpx 24rpx;
+}
+
+.role-empty {
+  text-align: center;
+  padding: 80rpx 24rpx;
+  font-size: 26rpx;
+  color: #999;
+}
+
+.role-card {
+  background: #fff;
+  border-radius: 16rpx;
+  padding: 24rpx;
+  margin: 0 24rpx 20rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
+}
+
+.role-name {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+.role-tag {
+  font-size: 22rpx;
+  color: #999;
+}
+
+.role-sub {
+  display: block;
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #666;
+}
+
+/* 弹层：独立根节点，全屏 fixed */
+.role-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+}
+
+.role-mask-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.role-panel {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: #fff;
+  border-radius: 24rpx 24rpx 0 0;
+  padding: 32rpx 24rpx calc(24rpx + env(safe-area-inset-bottom));
+  z-index: 1001;
+  max-height: 85vh;
+  box-sizing: border-box;
+}
+
+.panel-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+.panel-role-name {
+  display: block;
+  margin-top: 8rpx;
+  margin-bottom: 16rpx;
+  font-size: 26rpx;
+  color: #888;
+}
+
+.perm-scroll {
+  width: 100%;
+}
+
+.perm-row {
+  padding: 20rpx 8rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  min-height: 88rpx;
+  box-sizing: border-box;
+}
+
+.perm-row.perm-on {
+  background: #fffbf0;
+}
+
+.perm-text {
+  flex: 1;
+  padding-right: 16rpx;
+}
+
+.perm-name {
+  display: block;
+  font-size: 28rpx;
+  color: #333;
+  line-height: 1.4;
+}
+
+.perm-code {
+  display: block;
+  margin-top: 4rpx;
+  font-size: 22rpx;
+  color: #999;
+}
+
+.perm-check {
+  width: 48rpx;
+  height: 48rpx;
+  line-height: 48rpx;
+  text-align: center;
+  font-size: 32rpx;
+  color: #c9a962;
+  font-weight: 700;
+  border: 2rpx solid #ddd;
+  border-radius: 8rpx;
+  flex-shrink: 0;
+}
+
+.perm-on .perm-check {
+  border-color: #c9a962;
+  background: #c9a962;
+  color: #fff;
+}
+
+.perm-empty {
+  padding: 40rpx 0;
+  text-align: center;
+  font-size: 26rpx;
+  color: #999;
+}
+
+.name-input {
+  border: 1rpx solid #eee;
+  padding: 20rpx;
+  margin: 16rpx 0;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+}
+
+.panel-btns {
+  margin-top: 24rpx;
+  gap: 16rpx;
+}
+
+.panel-btn {
+  flex: 1;
+  margin: 0;
+  padding: 0;
+  height: 88rpx;
+  line-height: 88rpx;
+  font-size: 30rpx;
+  border-radius: 12rpx;
+  border: none;
+}
+
+.panel-btn::after {
+  border: none;
+}
+
+.panel-btn.cancel {
+  background: #f5f5f5;
+  color: #666;
+}
+
+.panel-btn.ok {
+  background: #c9a962;
+  color: #fff;
+}
+
+.btn-hover {
+  opacity: 0.85;
+}
--- a/pages/merchant/merchant.js
+++ b/pages/merchant/merchant.js
@@ -2,6 +2,11 @@

 import { createPage, ensureRoleOnCenterPage, lockPrimaryRole, parseSceneOptions, request } from '../../utils/base-page.js';
 import { ensureLogin } from '../../utils/login.js';
+import {
+  STAFF_API, isStaffMode, isMerchantPortalUser, refreshStaffContext, syncStaffUi, getStaffContext,
+  restoreStaffContextAfterAuth, applyStaffStatsToPage, guardMerchantOwnerAction, clearStaffSession,
+} from '../../utils/staff-api.js';
+import { clearCacheAndEnterNormal } from '../../utils/base-page.js';

 const app = getApp();

@@ -32,7 +37,15 @@ Page(createPage({

    // 商家状态
    isShangjia: false,
+    isStaffMode: false,
+    staffRoleName: '',
+    quotaAvailable: '0.00',
+    canDispatch: true,
+    canStaffManage: true,
+    canAudit: true,
+    showRechargeWithdraw: true,
    isAutoRegistering: false,
+    staffBooting: false,

    // 用户基础信息
    uid: '',
@@ -57,7 +70,7 @@ Page(createPage({
    navBar: 44,
  },

-  onLoad(options) {
+  async onLoad(options) {
    const sys = wx.getSystemInfoSync();
    this.setData({
      statusBar: sys.statusBarHeight || 20,
@@ -65,6 +78,9 @@ Page(createPage({
    });
    const parsed = parseSceneOptions(options);
    this.setupImageUrls();
+    if (wx.getStorageSync('token')) {
+      await restoreStaffContextAfterAuth();
+    }
    this.checkRoleStatus();

    const inviteCode = parsed.inviteCode;
@@ -97,13 +113,33 @@ Page(createPage({
    this.checkColdStartPopup('shangjiaduan');
  },

-  onShow() {
+  async onShow() {
    this.registerNotificationComponent();
-    if (this.data.isShangjia) {
-      ensureRoleOnCenterPage(this, 'shangjia');
-      this.refreshShangjiaInfo();
-      this.loadPendingCount();
-      this.loadPunishPending();
+    try {
+      const token = wx.getStorageSync('token');
+      const isOwner = Number(wx.getStorageSync('shangjiastatus')) === 1;
+      if (token && !isOwner) {
+        await restoreStaffContextAfterAuth();
+      } else if (isStaffMode()) {
+        await refreshStaffContext(request);
+      }
+      this.checkRoleStatus();
+      syncStaffUi(this);
+      if (this.data.isShangjia) {
+        ensureRoleOnCenterPage(this, 'shangjia');
+        if (isStaffMode()) {
+          await this.loadStaffProfile();
+        } else {
+          this.refreshShangjiaInfo();
+        }
+        this.loadPendingCount();
+        if (!isStaffMode()) {
+          this.loadPunishPending();
+        }
+      }
+    } catch (err) {
+      console.error('商家个人中心 onShow', err);
+      this.setData({ isLoading: false, staffBooting: false });
    }
  },

@@ -137,27 +173,102 @@ Page(createPage({
    });
  },

-  // 商家状态检查（覆盖基类 checkRoleStatus，增加 getShangjiaInfo 调用）
+  // 商家状态检查（子客服与老板均可进入；子客服绝不走商家注册接口）
  checkRoleStatus() {
    try {
-      const shangjiastatus = wx.getStorageSync('shangjiastatus');
      const uid = wx.getStorageSync('uid');
-      if (shangjiastatus) {
-        this.setData({ isShangjia: true, uid: uid || '' });
-        this.loadAvatar();
-        this.getShangjiaInfo();
+      const portal = isMerchantPortalUser();
+      const staffFlag = Number(wx.getStorageSync('staffstatus')) === 1;
+
+      if (portal) {
+        this.setData({ isShangjia: true, uid: uid || '', staffBooting: false, isLoading: false });
+        syncStaffUi(this);
+        if (isStaffMode()) {
+          this.loadStaffProfile();
+        } else if (Number(wx.getStorageSync('shangjiastatus')) === 1) {
+          this.loadAvatar();
+          this.getShangjiaInfo();
+        } else if (staffFlag) {
+          this.bootStaffPortal(uid);
+        }
        ensureRoleOnCenterPage(this, 'shangjia');
-      } else {
-        this.setData({ isShangjia: false });
+        return;
      }
+
+      if (staffFlag) {
+        this.bootStaffPortal(uid);
+        return;
+      }
+
+      this.setData({ isShangjia: false, staffBooting: false, isLoading: false });
+      syncStaffUi(this);
    } catch (error) {
      console.error('读取商家状态失败', error);
-      this.setData({ isShangjia: false });
+      this.setData({ isShangjia: false, staffBooting: false, isLoading: false });
+      syncStaffUi(this);
    }
  },

-  // 获取商家信息
+  /** 已绑定客服、尚未拉到 context 时恢复身份（不展示商家邀请码） */
+  async bootStaffPortal(uid) {
+    this.setData({ staffBooting: true, isLoading: true, uid: uid || '' });
+    syncStaffUi(this);
+    await restoreStaffContextAfterAuth();
+    if (isMerchantPortalUser()) {
+      this.setData({ isShangjia: true, staffBooting: false, isLoading: false });
+      syncStaffUi(this);
+      if (isStaffMode()) {
+        await this.loadStaffProfile();
+      }
+      ensureRoleOnCenterPage(this, 'shangjia');
+      return;
+    }
+    this.setData({ staffBooting: false, isLoading: false, isShangjia: false });
+    syncStaffUi(this);
+    wx.showToast({ title: '客服身份已失效，请联系商家老板', icon: 'none' });
+  },
+
+  onInviteCodeInput(e) {
+    this.setData({ inviteCode: (e.detail.value || '').trim() });
+  },
+
+  goToStaffJoin() {
+    wx.navigateTo({ url: '/pages/staff-join/staff-join' });
+  },
+
+  clearCache() {
+    wx.showModal({
+      title: '清除缓存',
+      content: '将清除所有登录与身份数据，并回到点单端，确定继续？',
+      confirmText: '确定',
+      cancelText: '取消',
+      success: (r) => {
+        if (!r.confirm) return;
+        clearStaffSession();
+        clearCacheAndEnterNormal(this);
+      },
+    });
+  },
+
+  async loadStaffProfile() {
+    const ctx = await refreshStaffContext(request);
+    const profile = wx.getStorageSync('nicheng') || (ctx && ctx.display_name) || '商家客服';
+    this.loadAvatar();
+    this.setData({
+      nicheng: (ctx && ctx.display_name) || profile,
+      sjyue: (ctx && ctx.wallet && ctx.wallet.quota_available) || '0.00',
+      chenghaoList: [],
+      isLoading: false,
+    });
+    syncStaffUi(this);
+    applyStaffStatsToPage(this, ctx);
+  },
+
+  // 获取商家信息（仅商家老板；子客服禁止调用）
  async getShangjiaInfo() {
+    if (isStaffMode() || Number(wx.getStorageSync('staffstatus')) === 1) {
+      return this.loadStaffProfile();
+    }
    await this.loadData({
      url: '/yonghu/shangjiaxinxi',
      method: 'POST',
@@ -192,13 +303,17 @@ Page(createPage({
  },

  refreshShangjiaInfo() {
+    if (isStaffMode()) {
+      this.throttledRefresh(() => this.loadStaffProfile());
+      return;
+    }
    this.throttledRefresh(() => this.getShangjiaInfo());
  },

  async loadPendingCount() {
    try {
      const res = await request({
-        url: '/dingdan/sjdingdanhq',
+        url: isStaffMode() ? STAFF_API.orderList : '/dingdan/sjdingdanhq',
        method: 'POST',
        data: { zhuangtai_list: [8], page: 1, page_size: 1 },
      });
@@ -273,8 +388,16 @@ Page(createPage({
  goToHome() { wx.redirectTo({ url: '/pages/merchant-home/merchant-home' }); },
  goToKefuKey() { wx.navigateTo({ url: '/pages/merchant-kefu-key/merchant-kefu-key' }); },
  goToKefuList() { wx.navigateTo({ url: '/pages/merchant-kefu-list/merchant-kefu-list' }); },
-  goToRecharge() { wx.navigateTo({ url: '/pages/merchant-recharge/merchant-recharge' }); },
-  goToWithdraw() { wx.navigateTo({ url: '/pages/withdraw/withdraw' }); },
+  goToAuditLog() { wx.navigateTo({ url: '/pages/merchant-staff-audit/merchant-staff-audit' }); },
+  goToStaffRank() { wx.navigateTo({ url: '/pages/merchant-staff-audit/merchant-staff-audit?tab=rank' }); },
+  goToRecharge() {
+    if (!guardMerchantOwnerAction('子客服无法充值，请联系商家老板')) return;
+    wx.navigateTo({ url: '/pages/merchant-recharge/merchant-recharge' });
+  },
+  goToWithdraw() {
+    if (!guardMerchantOwnerAction('子客服无法提现，请联系商家老板')) return;
+    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' }); },
 }, {
--- a/pages/merchant/merchant.wxml
+++ b/pages/merchant/merchant.wxml
@@ -1,5 +1,21 @@
 <!-- 商家端个人中心 - 逍遥梦布局，逻辑/接口不变 -->
-<block wx:if="{{!isShangjia}}">
+<block wx:if="{{staffBooting}}">
+  <view class="sj-page user-page">
+    <view class="sj-page-header">
+      <view class="status-bar" style="height:{{statusBar}}px"></view>
+      <view class="nav-bar flexm" style="height:{{navBar - statusBar}}px"><text class="sj-nav-title">我的</text></view>
+    </view>
+    <view class="unreg-area sj-mx20">
+      <view class="sj-panel unreg-card">
+        <text class="unreg-title">客服身份加载中</text>
+        <text class="unreg-desc">请稍候，正在同步您的派单员权限…</text>
+      </view>
+    </view>
+    <tab-bar/>
+  </view>
+</block>
+
+<block wx:elif="{{!isShangjia && !isStaffMode}}">
  <view class="sj-page user-page">
    <view class="sj-page-header">
      <view class="status-bar" style="height:{{statusBar}}px"></view>
@@ -8,8 +24,10 @@
    <view class="unreg-area sj-mx20">
      <view class="sj-panel unreg-card">
        <text class="unreg-title">商家入驻</text>
-        <input class="unreg-input" placeholder="请输入邀请码" maxlength="100" value="{{inviteCode}}" bindinput="onInviteCodeInput"/>
-        <view class="sj-btn-bg unreg-btn flexm" bindtap="onRegister">立即注册</view>
+        <text class="unreg-desc">商家老板请填写商家邀请码；若您是客服/派单员，请走下方入口</text>
+        <input class="unreg-input" placeholder="商家邀请码（老板专用）" maxlength="100" value="{{inviteCode}}" bindinput="onInviteCodeInput"/>
+        <view class="sj-btn-bg unreg-btn flexm" bindtap="onRegister">商家注册</view>
+        <view class="unreg-link staff-link" bindtap="goToStaffJoin">我是客服 / 派单员，绑定客服秘钥</view>
        <view class="unreg-link" bindtap="switchToNormal">返回点单端</view>
        <view class="unreg-link" bindtap="clearCache">清除缓存，重新登录</view>
      </view>
@@ -36,7 +54,7 @@
          <view>
            <view class="nickname-row flex">
              <text class="nickname">{{nicheng || '商家'}}</text>
-              <view class="sj-identity-tag">商家</view>
+              <view class="sj-identity-tag">{{isStaffMode ? (staffRoleName || '商家客服') : '商家'}}</view>
            </view>
            <view class="sn-row flex" bindtap="copyUid">
              <text class="sn">ID: {{uid || '--'}}</text>
@@ -56,11 +74,12 @@

      <view class="sj-wallet-card flexb">
        <view>
-          <view class="sj-w-label">商家余额(元)</view>
+          <view class="sj-w-label">{{isStaffMode ? '可用派单额度(元)' : '商家余额(元)'}}</view>
          <view class="sj-w-num">¥{{sjyue}}</view>
-          <view class="sj-w-sub">发单总量 {{fabu}} · 退款 {{tuikuan}}</view>
+          <view class="sj-w-sub" wx:if="{{!isStaffMode}}">发单总量 {{fabu}} · 退款 {{tuikuan}}</view>
+          <view class="sj-w-sub" wx:else>角色：{{staffRoleName}}</view>
        </view>
-        <view class="wallet-btns flex">
+        <view class="wallet-btns flex" wx:if="{{showRechargeWithdraw}}">
          <view class="sj-btn-outline" catchtap="goToRecharge">充值</view>
          <view class="sj-btn-outline" catchtap="goToWithdraw">去提现</view>
        </view>
@@ -106,27 +125,35 @@
      <view class="sj-panel sj-mx20">
        <view class="sj-section-hd">交易与发单</view>
        <view class="sj-func-grid">
-          <view class="sj-func-item" bindtap="goToPaiDan">
+          <view class="sj-func-item" bindtap="goToPaiDan" wx:if="{{canDispatch}}">
            <image class="sj-func-icon" src="{{imgUrls.iconRelease}}" mode="aspectFit"/>
            <text class="sj-func-txt">自定义单</text>
          </view>
-          <view class="sj-func-item" bindtap="goToJiSuPaiDan">
+          <view class="sj-func-item" bindtap="goToJiSuPaiDan" wx:if="{{canDispatch}}">
            <image class="sj-func-icon" src="{{imgUrls.iconFast}}" mode="aspectFit"/>
            <text class="sj-func-txt">常规单</text>
          </view>
-          <view class="sj-func-item" bindtap="goToKefuKey">
+          <view class="sj-func-item" bindtap="goToKefuKey" wx:if="{{canStaffManage}}">
            <image class="sj-func-icon" src="{{imgUrls.iconService}}" mode="aspectFit"/>
            <text class="sj-func-txt">客服邀请码</text>
          </view>
-          <view class="sj-func-item" bindtap="goToKefuList">
+          <view class="sj-func-item" bindtap="goToKefuList" wx:if="{{canStaffManage}}">
            <image class="sj-func-icon" src="{{imgUrls.iconService}}" mode="aspectFit"/>
            <text class="sj-func-txt">客服列表</text>
          </view>
-          <view class="sj-func-item" bindtap="goToMessages">
+          <view class="sj-func-item" bindtap="goToAuditLog" wx:if="{{canAudit}}">
+            <image class="sj-func-icon" src="{{imgUrls.iconOrders}}" mode="aspectFit"/>
+            <text class="sj-func-txt">操作日志</text>
+          </view>
+          <view class="sj-func-item" bindtap="goToStaffRank" wx:if="{{canAudit}}">
+            <image class="sj-func-icon" src="{{imgUrls.iconRank}}" mode="aspectFit"/>
+            <text class="sj-func-txt">客服排行</text>
+          </view>
+          <view class="sj-func-item" bindtap="goToMessages" wx:if="{{!isStaffMode}}">
            <image class="sj-func-icon" src="{{imgUrls.iconPunish}}" mode="aspectFit"/>
            <text class="sj-func-txt">处罚记录</text>
          </view>
-          <view class="sj-func-item" bindtap="goToRanking">
+          <view class="sj-func-item" bindtap="goToRanking" wx:if="{{!isStaffMode}}">
            <image class="sj-func-icon" src="{{imgUrls.iconRank}}" mode="aspectFit"/>
            <text class="sj-func-txt">商家排行</text>
          </view>
--- a/pages/merchant/merchant.wxss
+++ b/pages/merchant/merchant.wxss
@@ -149,6 +149,20 @@ page {
  margin-bottom: 24rpx;
 }

+.unreg-desc {
+  display: block;
+  font-size: 24rpx;
+  color: #888;
+  text-align: center;
+  line-height: 1.5;
+  margin-bottom: 24rpx;
+}
+
+.unreg-link.staff-link {
+  color: #1976d2;
+  font-weight: 600;
+}
+
 .unreg-input {
  height: 80rpx;
  border-radius: 12rpx;
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -4,11 +4,14 @@ import { ensureLogin } from '../../utils/login';
 import {
  backfillUserProfileCache,
  getUserProfileForDisplay,
+  getSessionToken,
  isRoleStatusActive,
  ensureRoleOnCenterPage,
 } from '../../utils/role-tab-bar';
 import { enterLockedRole } from '../../utils/primary-role.js';
+import { isStaffMode, getStaffContext, restoreStaffContextAfterAuth } from '../../utils/staff-api.js';
 import { createPage } from '../../utils/base-page.js';
+import { ensurePhoneAuth } from '../../utils/phone-auth.js';

 Page(createPage({
  data: {
@@ -23,6 +26,8 @@ Page(createPage({
    zuzhangIcon: '', guanzhualongIcon: '', arrowRightIcon: '', qingchuIcon: '',
    dashouCertified: false,
    shangjiaCertified: false,
+    staffCertified: false,
+    staffTag: '入驻',
    bottomSafePadding: 0
  },

@@ -32,13 +37,26 @@ Page(createPage({
    this.setBottomSafe()
  },

-  onShow() {
+  async onShow() {
+    const phoneOk = await ensurePhoneAuth({
+      redirect: true,
+      returnPage: '/pages/mine/mine',
+    });
+    if (!phoneOk) return;
+
    this.initIconUrls();
    this.registerNotificationComponent();
    this.checkAvatarPrompt();
    backfillUserProfileCache(app);
-    this.loadUserData();
-    this.updateOrderCounts();
+    if (getSessionToken(app)) {
+      restoreStaffContextAfterAuth().finally(() => {
+        this.loadUserData();
+        this.updateOrderCounts();
+      });
+    } else {
+      this.loadUserData();
+      this.updateOrderCounts();
+    }
  },

  setBottomSafe() {
@@ -84,6 +102,8 @@ Page(createPage({

  loadUserData() {
    const profile = getUserProfileForDisplay(app);
+    const ctx = getStaffContext();
+    const staffActive = isStaffMode();
    this.setData({
      avatarUrl: profile.avatarUrl,
      userNicheng: profile.nick,
@@ -91,6 +111,8 @@ Page(createPage({
      showLoginBtn: !profile.isLoggedIn,
      dashouCertified: isRoleStatusActive(wx.getStorageSync('dashoustatus')),
      shangjiaCertified: isRoleStatusActive(wx.getStorageSync('shangjiastatus')),
+      staffCertified: staffActive,
+      staffTag: staffActive ? (ctx.role_name || '已入驻') : '入驻',
    });
  },

@@ -107,6 +129,7 @@ Page(createPage({
  handleWechatLogin() {
    wx.showLoading({ title: '登录中...', mask: true });
    ensureLogin({ silent: false, page: this })
+      .then(() => restoreStaffContextAfterAuth())
      .then(() => {
        this.loadUserData();
        this.updateOrderCounts();
@@ -122,8 +145,13 @@ Page(createPage({
    const type = e.currentTarget.dataset.type;
    if (!type || !['dashou', 'shangjia'].includes(type)) return;
    ensureLogin({ silent: false, page: this })
+      .then(() => restoreStaffContextAfterAuth())
      .then(() => {
        this.loadUserData();
+        if (type === 'shangjia' && isStaffMode()) {
+          enterLockedRole('shangjia', app);
+          return;
+        }
        const statusKey = type === 'dashou' ? 'dashoustatus' : 'shangjiastatus';
        if (isRoleStatusActive(wx.getStorageSync(statusKey))) {
          ensureRoleOnCenterPage(this, type);
@@ -136,5 +164,20 @@ Page(createPage({
  },

  goToCustomService() { this.goToKefu() },
+
+  goToStaffJoin() {
+    ensureLogin({ silent: false, page: this })
+      .then(() => restoreStaffContextAfterAuth())
+      .then(() => {
+        this.loadUserData();
+        if (isStaffMode()) {
+          enterLockedRole('shangjia', app);
+          return;
+        }
+        wx.navigateTo({ url: '/pages/staff-join/staff-join' });
+      })
+      .catch(() => {});
+  },
+
  goToGuanzhuA() { wx.navigateTo({ url: '/pages/manager-assign/manager-assign' }) },
 }))
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -88,6 +88,13 @@
            <text class="service-name">商家</text>
            <text class="auth-tag {{shangjiaCertified ? 'auth-tag-done' : ''}}">{{shangjiaCertified ? '已认证' : '去认证'}}</text>
          </view>
+          <view class="service-unit" bindtap="goToStaffJoin">
+            <view class="icon-bg icon-bg-sm">
+              <image src="{{kefuIcon}}" mode="aspectFit" class="icon-dark icon-size-sm" />
+            </view>
+            <text class="service-name">商家客服</text>
+            <text class="auth-tag {{staffCertified ? 'auth-tag-done' : ''}}">{{staffTag}}</text>
+          </view>
        </view>
      </view>

--- a/pages/phone-auth/phone-auth.js
+++ b/pages/phone-auth/phone-auth.js
@@ -1,4 +1,4 @@
-import { submit } from '../../utils/phone-auth';
+import { submit, getPhoneAuthReturnPage } from '../../utils/phone-auth';

 Page({
  data: {
@@ -27,8 +27,7 @@ Page({
      wx.showLoading({ title: '认证中...', mask: true });
      await submit(phoneCode, avatarFile);
      wx.hideLoading();
-      // 成功，重启小程序，此时check返回false，用户无感进入
-      wx.reLaunch({ url: '/pages/index/index' });
+      wx.reLaunch({ url: getPhoneAuthReturnPage() });
    } catch (e) {
      wx.hideLoading();
      wx.showToast({ title: e.message, icon: 'none' });
--- a/pages/staff-join/staff-join.js
+++ b/pages/staff-join/staff-join.js
@@ -0,0 +1,55 @@
+import request from '../../utils/request.js';
+import { STAFF_API, applyStaffFromLoginData } from '../../utils/staff-api.js';
+import { enterLockedRole, lockPrimaryRole } from '../../utils/primary-role.js';
+
+const app = getApp();
+
+Page({
+  data: {
+    inviteCode: '',
+    loading: false,
+  },
+
+  onLoad(options) {
+    const code = options.code || options.inviteCode || '';
+    if (code) this.setData({ inviteCode: decodeURIComponent(code) });
+  },
+
+  onInput(e) {
+    this.setData({ inviteCode: (e.detail.value || '').trim() });
+  },
+
+  async onBind() {
+    const inviteCode = this.data.inviteCode;
+    if (!inviteCode) {
+      wx.showToast({ title: '请输入邀请码', icon: 'none' });
+      return;
+    }
+    this.setData({ loading: true });
+    try {
+      const res = await request({
+        url: STAFF_API.bind,
+        method: 'POST',
+        data: { inviteCode },
+      });
+      const d = res.data || {};
+      if (d.code === 0 && d.data && d.data.staff_context) {
+        applyStaffFromLoginData({
+          staffstatus: 1,
+          staff_context: d.data.staff_context,
+        });
+        lockPrimaryRole('shangjia', app);
+        wx.showToast({ title: '绑定成功', icon: 'success' });
+        setTimeout(() => {
+          enterLockedRole('shangjia', app);
+        }, 800);
+      } else {
+        wx.showToast({ title: d.msg || '绑定失败', icon: 'none' });
+      }
+    } catch (e) {
+      wx.showToast({ title: '网络错误', icon: 'none' });
+    } finally {
+      this.setData({ loading: false });
+    }
+  },
+});
--- a/pages/staff-join/staff-join.json
+++ b/pages/staff-join/staff-join.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "客服入驻",
+  "usingComponents": {}
+}
--- a/pages/staff-join/staff-join.wxml
+++ b/pages/staff-join/staff-join.wxml
@@ -0,0 +1,13 @@
+<view class="page">
+  <view class="card">
+    <text class="title">成为商家客服</text>
+    <text class="desc">输入商家提供的一次性邀请码，绑定后可代商家派单（受权限与额度限制）</text>
+    <input class="input" placeholder="例如 PD-ABC123" value="{{inviteCode}}" bindinput="onInput" />
+    <button class="btn" loading="{{loading}}" bindtap="onBind">确认绑定</button>
+  </view>
+  <view class="tips">
+    <text>· 已是商家账号无法绑定客服</text>
+    <text>· 同时只能绑定一个商家</text>
+    <text>· 被移除后可重新绑定或认证商家</text>
+  </view>
+</view>
--- a/pages/staff-join/staff-join.wxss
+++ b/pages/staff-join/staff-join.wxss
@@ -0,0 +1,8 @@
+.page { min-height: 100vh; background: #f5f5f5; padding: 40rpx; box-sizing: border-box; }
+.card { background: #fff; border-radius: 16rpx; padding: 40rpx; }
+.title { display: block; font-size: 36rpx; font-weight: 600; color: #333; margin-bottom: 16rpx; }
+.desc { display: block; font-size: 26rpx; color: #666; line-height: 1.6; margin-bottom: 32rpx; }
+.input { border: 1px solid #ddd; border-radius: 12rpx; padding: 24rpx; font-size: 30rpx; margin-bottom: 32rpx; }
+.btn { background: #C9A962; color: #fff; border-radius: 12rpx; }
+.tips { margin-top: 32rpx; font-size: 24rpx; color: #999; line-height: 2; }
+.tips text { display: block; }
--- a/pages/verify/verify.js
+++ b/pages/verify/verify.js
@@ -1,6 +1,7 @@
 // pages/verify/verify.js
 import { createPage, request } from '../../utils/base-page.js'
 import { enterLockedRole } from '../../utils/primary-role.js'
+import { isStaffMode, restoreStaffContextAfterAuth } from '../../utils/staff-api.js'

 const API_MAP = {
  dashou:    '/yonghu/dashouzhuce',
@@ -46,8 +47,17 @@ Page(createPage({
    this.checkStatus()
  },

-  onShow() {
-    if (this.data.authType) this.checkStatus()
+  async onShow() {
+    if (this.data.authType) {
+      if (this.data.authType === 'shangjia' && wx.getStorageSync('token')) {
+        await restoreStaffContextAfterAuth();
+        if (isStaffMode()) {
+          enterLockedRole('shangjia', getApp());
+          return;
+        }
+      }
+      this.checkStatus();
+    }
  },

  checkStatus() {
--- a/utils/base-page.js
+++ b/utils/base-page.js
@@ -12,6 +12,7 @@ import {
  refreshTabBar,
 } from './role-tab-bar.js';
 import { lockPrimaryRole, migrateLegacyCenterRole, enterLockedRole } from './primary-role.js';
+import { isMerchantPortalUser } from './staff-api.js';
 import { resolveAvatarFromStorage } from './avatar.js';
 import { isApiSuccess, getApiMsg, extractUserData, parseSceneOptions } from './api-helper.js';

@@ -296,7 +297,10 @@ function createRoleCenterMixin(roleConfig) {
      try {
        const status = wx.getStorageSync(statusKey);
        const uid = wx.getStorageSync('uid');
-        if (isRoleStatusActive(status)) {
+        const active = role === 'shangjia'
+          ? isMerchantPortalUser()
+          : isRoleStatusActive(status);
+        if (active) {
          this.setData({ [dataFlag]: true, uid: uid || '' });
          this.loadAvatar();
          if (this.checkGlobalData) this.checkGlobalData();
--- a/utils/login.js
+++ b/utils/login.js
@@ -5,6 +5,7 @@ import {
  getSessionToken,
  isWechatLoginSuccess,
 } from './role-tab-bar';
+import { restoreStaffContextAfterAuth } from './staff-api.js';

 const app = getApp();

@@ -14,6 +15,7 @@ export function ensureLogin(options = {}) {
  const token = getSessionToken(app);
  if (token) {
    backfillUserProfileCache(app);
+    restoreStaffContextAfterAuth();
    return Promise.resolve(true);
  }

--- a/utils/phone-auth.js
+++ b/utils/phone-auth.js
@@ -1,57 +1,31 @@
 /**
- * 手机号强制认证 - 完全自包含逻辑模块
- * 
- * 特点：
- *   1. 不引用项目中的 request.js / upload.js，避免其顶层 getApp() 带来的加载顺序错误
- *   2. 所有请求直接使用 wx.request / wx.uploadFile，基础 URL 写死（与 app.globalData.apiBaseUrl 保持一致）
- *   3. check() 内部捕获所有异常，永远返回 false 或 true，不会抛出错误
- *   4. submit() 抛出错误由认证页面自己处理，不影响主流程
- * 
- * 用法：
- *   app.js 中：
- *     try {
- *       const { check } = require('./utils/phone-auth');
- *       if (await check()) { wx.reLaunch(...); return; }
- *     } catch(e) {}
- * 
- *   认证页面中：
- *     const { submit } = require('../../utils/phone-auth');
- *     await submit(phoneCode, avatarPath);
+ * 手机号强制认证：每次调用 check / ensurePhoneAuth 均请求后端 /peizhi/yhbdsjh
 */

-// ==================== 基础配置 ====================
-const API_BASE = 'https://www.abas.asia/hqhd';   // 与你 app.js 里的 apiBaseUrl 一致
-const AUTH_CHECK_URL = '/peizhi/yhbdsjh';        // 检查是否需要认证
-const AUTH_SUBMIT_URL = '/yonghu/xiugai';        // 提交认证（复用修改信息接口）
+const API_BASE = 'https://www.abas.asia/hqhd';
+const AUTH_CHECK_URL = '/peizhi/yhbdsjh';
+const AUTH_SUBMIT_URL = '/yonghu/xiugai';
+const AUTH_PAGE = '/pages/phone-auth/phone-auth';
+const RETURN_ROLE_KEY = 'phone_auth_return_role';
+const RETURN_PAGE_KEY = 'phone_auth_return_page';

-// ==================== 内部封装：wx.request ====================
 function innerRequest(url, data = {}) {
  return new Promise((resolve, reject) => {
-    const token = wx.getStorageSync('token');   // 运行时获取 token，不提前取
-    const header = {
-      'Content-Type': 'application/json'
-    };
-    if (token) {
-      header['Authorization'] = 'Bearer ' + token;
-    }
+    const token = wx.getStorageSync('token');
+    const header = { 'Content-Type': 'application/json' };
+    if (token) header['Authorization'] = 'Bearer ' + token;

    wx.request({
      url: API_BASE + url,
      method: 'POST',
      data,
      header,
-      success: (res) => {
-        // 正常响应直接 resolve 整个响应对象，让上层自己解析
-        resolve(res);
-      },
-      fail: (err) => {
-        reject(err);
-      }
+      success: (res) => resolve(res),
+      fail: (err) => reject(err),
    });
  });
 }

-// ==================== 内部封装：wx.uploadFile ====================
 function innerUpload(url, filePath, formData = {}, fileName = 'avatar') {
  return new Promise((resolve, reject) => {
    const token = wx.getStorageSync('token');
@@ -60,7 +34,6 @@ function innerUpload(url, filePath, formData = {}, fileName = 'avatar') {
      return;
    }

-    // 先验证文件是否存在
    wx.getFileInfo({
      filePath,
      success: () => {
@@ -69,15 +42,11 @@ function innerUpload(url, filePath, formData = {}, fileName = 'avatar') {
          filePath,
          name: fileName,
          formData,
-          header: {
-            'Authorization': 'Bearer ' + token
-          },
+          header: { Authorization: 'Bearer ' + token },
          success: (res) => {
-            // ✅ 修复：wx.uploadFile 成功时 statusCode 为 200
            if (res.statusCode === 200) {
              try {
-                const data = JSON.parse(res.data);
-                resolve(data);   // 直接返回解析后的对象，方便下游使用
+                resolve(JSON.parse(res.data));
              } catch (e) {
                reject(new Error('解析响应数据失败'));
              }
@@ -88,78 +57,142 @@ function innerUpload(url, filePath, formData = {}, fileName = 'avatar') {
              reject(new Error(`上传失败，状态码：${res.statusCode}`));
            }
          },
-          fail: (err) => {
-            reject(new Error('网络请求失败'));
-          }
+          fail: () => reject(new Error('网络请求失败')),
        });
      },
-      fail: () => {
-        reject(new Error('文件不存在或无法访问'));
-      }
+      fail: () => reject(new Error('文件不存在或无法访问')),
    });
  });
 }

-// ==================== 公开方法 ====================
+function isOnPhoneAuthPage() {
+  const pages = getCurrentPages();
+  const cur = pages[pages.length - 1];
+  return !!(cur && cur.route === 'pages/phone-auth/phone-auth');
+}
+
+function parseCheckResponse(res) {
+  if (!res || res.statusCode === 401) {
+    return { ok: false, needAuth: false };
+  }
+  if (res.statusCode !== 200) {
+    return { ok: false, needAuth: false };
+  }
+  const body = res.data;
+  if (!body || typeof body !== 'object') {
+    return { ok: false, needAuth: false };
+  }
+  const code = Number(body.code);
+  if (code !== 0 && code !== 200) {
+    return { ok: false, needAuth: false };
+  }
+  const needAuth = body.need_auth === true
+    || (body.data && body.data.need_auth === true);
+  return { ok: true, needAuth: !!needAuth };
+}
+
+/** 根据当前主端/身份推断认证完成后回跳角色 */
+function resolveReturnRole() {
+  const primary = wx.getStorageSync('primaryRole') || wx.getStorageSync('currentRole') || '';
+  if (primary === 'dashou' || primary === 'shangjia') return primary;
+  if (Number(wx.getStorageSync('shangjiastatus')) === 1) return 'shangjia';
+  if (Number(wx.getStorageSync('staffstatus')) === 1) return 'shangjia';
+  if (
+    Number(wx.getStorageSync('dashoustatus')) === 1
+    || Number(wx.getStorageSync('guanshistatus')) === 1
+    || Number(wx.getStorageSync('zuzhangstatus')) === 1
+    || Number(wx.getStorageSync('kaoheguanstatus')) === 1
+  ) {
+    return 'dashou';
+  }
+  return 'mine';
+}
+
+function defaultReturnPage(role) {
+  if (role === 'dashou') return '/pages/accept-order/accept-order';
+  if (role === 'shangjia') return '/pages/merchant-home/merchant-home';
+  return '/pages/mine/mine';
+}

-/**
- * 检查是否需要手机号认证
- * - 无 token 或 任何异常 → 返回 false
- * - 后端明确 need_auth: true → 返回 true
- */
 async function check() {
  const token = wx.getStorageSync('token');
  if (!token) return false;

  try {
    const res = await innerRequest(AUTH_CHECK_URL, {});
-    // 假设后端返回格式：{ data: { need_auth: true/false } } 或直接在顶层
-    const body = res.data;
-    return body && body.need_auth === true;
+    const parsed = parseCheckResponse(res);
+    if (!parsed.ok) return false;
+    return parsed.needAuth;
  } catch (e) {
-    // 任何错误（网络、后端异常）都吞掉，不影响主流程
    return false;
  }
 }

+function redirectToPhoneAuth(returnRole, returnPage) {
+  const role = returnRole || resolveReturnRole();
+  wx.setStorageSync(RETURN_ROLE_KEY, role);
+  if (returnPage) {
+    wx.setStorageSync(RETURN_PAGE_KEY, returnPage);
+  } else {
+    wx.removeStorageSync(RETURN_PAGE_KEY);
+  }
+  if (!isOnPhoneAuthPage()) {
+    wx.reLaunch({ url: AUTH_PAGE });
+  }
+}
+
 /**
- * 提交认证（手机号 code + 头像文件）
- * @param {string} phoneCode  微信 getPhoneNumber 返回的 code
- * @param {string} avatarPath 头像临时路径
- * @returns {Promise<object>} 后端返回的完整数据
+ * 向后端确认是否需要手机号认证；需要则跳转认证页
+ * @returns {Promise<boolean>} true=无需认证或已满足；false=已跳转认证页
 */
+async function ensurePhoneAuth(options = {}) {
+  const { redirect = true, role, returnPage } = options;
+  const token = wx.getStorageSync('token');
+  if (!token) return true;
+
+  const needAuth = await check();
+  if (!needAuth) return true;
+  if (redirect) {
+    redirectToPhoneAuth(role || resolveReturnRole(), returnPage);
+  }
+  return false;
+}
+
+function getPhoneAuthReturnPage() {
+  const savedPage = wx.getStorageSync(RETURN_PAGE_KEY);
+  wx.removeStorageSync(RETURN_PAGE_KEY);
+  if (savedPage) {
+    wx.removeStorageSync(RETURN_ROLE_KEY);
+    return savedPage;
+  }
+  const role = wx.getStorageSync(RETURN_ROLE_KEY) || resolveReturnRole();
+  wx.removeStorageSync(RETURN_ROLE_KEY);
+  return defaultReturnPage(role);
+}
+
 async function submit(phoneCode, avatarPath) {
  if (!phoneCode || !avatarPath) {
    throw new Error('缺少参数');
  }

-  // 将手机号 code 放入 formData
-  const formData = {
-    shoujihao_code: phoneCode
-  };
+  const data = await innerUpload(AUTH_SUBMIT_URL, avatarPath, {
+    shoujihao_code: phoneCode,
+  });

-  // 调用上传
-  const data = await innerUpload(AUTH_SUBMIT_URL, avatarPath, formData);
-
-  // ✅ 修复：正确判断后端返回的 code 字段，后端成功时 code === 0
  if (data && data.code === 0) {
-    // data.data 包含 { touxiang: '相对路径', phone: '...' }
    const respData = data.data || data;
-    
-    // 存储手机号
-    if (respData.phone) {
-      wx.setStorageSync('phone', respData.phone);
-    }
-    
-    // ✅ 修复：存储头像相对路径，与 xiugai 页面处理方式一致
-    if (respData.touxiang) {
-      wx.setStorageSync('touxiang', respData.touxiang);
-    }
-    
+    if (respData.phone) wx.setStorageSync('phone', respData.phone);
+    if (respData.touxiang) wx.setStorageSync('touxiang', respData.touxiang);
    return respData;
-  } else {
-    throw new Error((data && data.msg) || '认证失败');
  }
+  throw new Error((data && data.msg) || '认证失败');
 }

-module.exports = { check, submit };
+module.exports = {
+  check,
+  submit,
+  ensurePhoneAuth,
+  redirectToPhoneAuth,
+  getPhoneAuthReturnPage,
+  resolveReturnRole,
+};
--- a/utils/primary-role.js
+++ b/utils/primary-role.js
@@ -1,5 +1,8 @@
 /** 三端固定：normal | dashou | shangjia，认证后不可回退 */

+import { isStaffMode } from './staff-api.js';
+import { ensurePhoneAuth } from './phone-auth.js';
+
 const VALID = ['normal', 'dashou', 'shangjia'];
 const LEGACY_CENTER_ROLES = ['guanshi', 'zuzhang', 'kaoheguan'];

@@ -53,6 +56,9 @@ export function getPrimaryRole(app) {
  if (isRoleStatusActive(wx.getStorageSync('shangjiastatus'))) {
    return 'shangjia';
  }
+  if (isStaffMode()) {
+    return 'shangjia';
+  }
  return 'normal';
 }

@@ -87,8 +93,7 @@ export const PRIMARY_DEFAULT_PAGES = {
 };

 /** 锁定主端并跳转到该端默认首页，同时建立 IM 长连接 */
-export function enterLockedRole(role, app) {
-  if (!VALID.includes(role) || role === 'normal') return false;
+function finishEnterLockedRole(role, app) {
  app = app || getApp();
  lockPrimaryRole(role, app);
  wx.reLaunch({ url: PRIMARY_DEFAULT_PAGES[role] });
@@ -103,3 +108,14 @@ export function enterLockedRole(role, app) {
  }, 600);
  return true;
 }
+
+export function enterLockedRole(role, app) {
+  if (!VALID.includes(role) || role === 'normal') return false;
+  if (role === 'dashou' || role === 'shangjia') {
+    ensurePhoneAuth({ redirect: true, role }).then((ok) => {
+      if (ok) finishEnterLockedRole(role, app);
+    });
+    return true;
+  }
+  return finishEnterLockedRole(role, app);
+}
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,7 +1,6 @@
 // utils/request.js
-const app = getApp();
-
 function request(options) {
+  const app = getApp();
  const token = wx.getStorageSync('token');
  
  // 🔥 没有 token 时不发送请求，直接返回一个“空响应”对象，不影响后续代码
--- a/utils/role-tab-bar.js
+++ b/utils/role-tab-bar.js
@@ -1,5 +1,6 @@
 import { clearPrimaryRole } from './primary-role';
 import { getLocalImUserId } from './im-user.js';
+import { applyStaffFromLoginData, isStaffMode, restoreStaffContextAfterAuth, clearStaffSession } from './staff-api.js';
 export function isWechatLoginSuccess(body) {
  if (!body) return false;
  const code = Number(body.code);
@@ -91,8 +92,16 @@ export function applyWechatLoginData(data, page) {
    wx.setStorageSync('isJinpai', Number(data.isJinpai));
  }

+  applyStaffFromLoginData(data);
+
  const targetPage = page || _getCurrentPage();
  refreshTabBar(targetPage);
+  restoreStaffContextAfterAuth().finally(() => {
+    refreshTabBar(targetPage);
+    if (app.emitEvent) {
+      app.emitEvent('staffContextChanged', {});
+    }
+  });
 }

 function _getCurrentPage() {
@@ -105,7 +114,7 @@ export function isRoleStatusActive(status) {
 }

 export function isCenterPageActive(page, dataFlag, statusKey) {
-  return page.data[dataFlag] || isRoleStatusActive(wx.getStorageSync(statusKey));
+  return page.data[dataFlag] || isRoleStatusActive(wx.getStorageSync(statusKey)) || isStaffMode();
 }

 export function syncRoleStatuses(data) {
@@ -150,6 +159,8 @@ export function resetGuestSession(page, options = {}) {

  wx.clearStorageSync();

+  clearStaffSession();
+
  if (configCache && typeof configCache === 'object') {
    wx.setStorageSync(configKey, configCache);
  }
--- a/utils/staff-api.js
+++ b/utils/staff-api.js
@@ -0,0 +1,253 @@
+/**
+ * 商家子客服 API 与身份上下文
+ *
+ * 身份说明（互斥，不冲突）：
+ * - 商家老板：shangjiastatus=1，走原商家接口，扣商家余额
+ * - 子客服（含总管/财务/派单员）：staff_context.active，走 merchant-staff 接口，扣个人额度
+ * - 同账号不能既是老板又是子客服；换角色只改权限，额度/统计仍归属同一 member 记录
+ */
+import { isApiSuccess } from './api-helper.js';
+
+const STAFF_PREFIX = '/yonghu/merchant-staff';
+
+export const STAFF_API = {
+  me: `${STAFF_PREFIX}/me`,
+  bind: `${STAFF_PREFIX}/bind`,
+  inviteCreate: `${STAFF_PREFIX}/invite/create`,
+  inviteList: `${STAFF_PREFIX}/invite/list`,
+  inviteRevoke: `${STAFF_PREFIX}/invite/revoke`,
+  memberList: `${STAFF_PREFIX}/member/list`,
+  memberUpdateRole: `${STAFF_PREFIX}/member/update-role`,
+  memberRemove: `${STAFF_PREFIX}/member/remove`,
+  memberDisable: `${STAFF_PREFIX}/member/disable`,
+  roleList: `${STAFF_PREFIX}/role/list`,
+  roleSetPerms: `${STAFF_PREFIX}/role/set-perms`,
+  walletAllocate: `${STAFF_PREFIX}/wallet/allocate`,
+  walletRevoke: `${STAFF_PREFIX}/wallet/revoke`,
+  walletLedger: `${STAFF_PREFIX}/wallet/ledger`,
+  auditList: `${STAFF_PREFIX}/audit/list`,
+  rank: `${STAFF_PREFIX}/rank`,
+  roleCreate: `${STAFF_PREFIX}/role/create`,
+  roleSetPerms: `${STAFF_PREFIX}/role/set-perms`,
+  memberUpdatePerms: `${STAFF_PREFIX}/member/update-perms`,
+  templateList: `${STAFF_PREFIX}/template/list`,
+  templateCreate: `${STAFF_PREFIX}/template/create`,
+  templateUpdate: `${STAFF_PREFIX}/template/update`,
+  templateDelete: `${STAFF_PREFIX}/template/delete`,
+  linkGenerate: `${STAFF_PREFIX}/link/generate`,
+  linkList: `${STAFF_PREFIX}/link/list`,
+  orderList: `${STAFF_PREFIX}/order/list`,
+  orderDetail: `${STAFF_PREFIX}/order/detail`,
+  orderDispatch: `${STAFF_PREFIX}/order/dispatch`,
+  productTypes: `${STAFF_PREFIX}/order/product-types`,
+  orderSettle: `${STAFF_PREFIX}/order/settle`,
+  orderCancel: `${STAFF_PREFIX}/order/cancel`,
+  orderRefund: `${STAFF_PREFIX}/order/refund`,
+  penaltyApply: `${STAFF_PREFIX}/order/penalty-apply`,
+  penaltyManage: `${STAFF_PREFIX}/order/penalty-manage`,
+  changePlayer: `${STAFF_PREFIX}/order/change-player`,
+};
+
+export function getStaffContext() {
+  return wx.getStorageSync('staff_context') || null;
+}
+
+export function setStaffContext(ctx) {
+  if (ctx && ctx.active) {
+    wx.setStorageSync('staff_context', ctx);
+    wx.setStorageSync('staffstatus', 1);
+  } else {
+    wx.removeStorageSync('staff_context');
+    wx.setStorageSync('staffstatus', 0);
+  }
+}
+
+export function isStaffMode() {
+  // 商家老板与子客服互斥：已认证商家时一律按老板身份
+  if (Number(wx.getStorageSync('shangjiastatus')) === 1) {
+    return false;
+  }
+  const ctx = getStaffContext();
+  if (ctx && ctx.active) {
+    return true;
+  }
+  // 绑定/登录已写入 staffstatus，context 异步刷新期间仍视为客服
+  return Number(wx.getStorageSync('staffstatus')) === 1;
+}
+
+export function clearStaffSession() {
+  wx.removeStorageSync('staff_context');
+  wx.setStorageSync('staffstatus', 0);
+}
+
+/** 是否仅为商家老板（非子客服） */
+export function isMerchantOwnerOnly() {
+  return Number(wx.getStorageSync('shangjiastatus')) === 1 && !isStaffMode();
+}
+
+/** 子客服/非老板禁止进入商家充值提现等页面 */
+export function guardMerchantOwnerAction(msg) {
+  if (isMerchantOwnerOnly()) return true;
+  wx.showToast({
+    title: msg || '仅商家老板可充值或提现，子客服请联系老板',
+    icon: 'none',
+  });
+  return false;
+}
+
+export function staffHasPerm(code) {
+  const ctx = getStaffContext();
+  if (!ctx || !ctx.permissions) return false;
+  return ctx.permissions.indexOf(code) >= 0;
+}
+
+function loadRequest() {
+  // 延迟加载，避免 App 未注册时 request 模块被提前初始化
+  return require('./request.js').default;
+}
+
+export async function refreshStaffContext(req) {
+  const cached = getStaffContext();
+  const token = wx.getStorageSync('token');
+  if (!token) return null;
+  const doRequest = req || loadRequest();
+  try {
+    const res = await doRequest({ url: STAFF_API.me, method: 'POST' });
+    const body = res.data || {};
+    if (res.statusCode === 401) {
+      return cached;
+    }
+    if (isApiSuccess(body) && body.data && body.data.active) {
+      setStaffContext(body.data);
+      return body.data;
+    }
+    if (body.code === 404 || body.code === 403) {
+      // 已有本地客服身份时勿清空，避免误入「商家入驻」
+      if (cached && cached.active) {
+        return cached;
+      }
+      if (Number(wx.getStorageSync('staffstatus')) === 1) {
+        return cached;
+      }
+      clearStaffSession();
+      return null;
+    }
+    return cached;
+  } catch (e) {
+    return cached;
+  }
+}
+
+/** 登录/注册响应写入子客服身份 */
+export function applyStaffFromLoginData(data) {
+  if (!data || typeof data !== 'object') return;
+  if (data.staff_context && data.staff_context.active) {
+    setStaffContext(data.staff_context);
+    return;
+  }
+  if (Number(data.staffstatus) === 1) {
+    wx.setStorageSync('staffstatus', 1);
+    return;
+  }
+  if (Object.prototype.hasOwnProperty.call(data, 'staffstatus') && Number(data.staffstatus) !== 1) {
+    clearStaffSession();
+  }
+}
+
+/** 登录成功后从 /me 拉取最新子客服身份 */
+export async function restoreStaffContextAfterAuth() {
+  const token = wx.getStorageSync('token');
+  if (!token) return null;
+  return refreshStaffContext(loadRequest());
+}
+
+/** 客服模式下返回客服专用 URL，否则返回商家原 URL */
+export function merchantApi(staffPath, ownerPath) {
+  return isStaffMode() ? staffPath : ownerPath;
+}
+
+export function staffCan(action) {
+  if (!isStaffMode()) return true;
+  const map = {
+    dispatch: 'order_dispatch',
+    detail: 'order_detail',
+    settle: 'order_settle',
+    cancel: 'order_cancel',
+    refund: 'order_refund_apply',
+    penalty: 'penalty_apply',
+    penaltyManage: 'penalty_manage',
+    changePlayer: 'order_change_player',
+    staffManage: 'staff_manage',
+    audit: 'audit_view',
+    finance: 'finance_view',
+    walletAllocate: 'wallet_allocate',
+    walletRevoke: 'wallet_revoke',
+    template: 'template_manage',
+    imChat: 'im_chat',
+  };
+  return staffHasPerm(map[action] || action);
+}
+
+/** 商家老板或有效子客服，均可进入商家端工作台 */
+export function isMerchantPortalUser() {
+  return Number(wx.getStorageSync('shangjiastatus')) === 1 || isStaffMode();
+}
+
+/** 将 /me 返回的 stats 写入页面 */
+export function applyStaffStatsToPage(page, ctx) {
+  const st = (ctx && ctx.stats) || {};
+  if (!st || typeof page.setData !== 'function') return;
+  const patch = {};
+  if (page.data.stats) {
+    patch.stats = {
+      ...page.data.stats,
+      todayDispatch: st.today_dispatch_count || 0,
+      todayRefund: st.today_refund_count || 0,
+    };
+  }
+  if ('jinridingdan' in page.data) {
+    patch.jinridingdan = st.today_dispatch_count || 0;
+    patch.jinrituikuan = st.today_refund_count || 0;
+    patch.fabu = st.dispatch_count || 0;
+    patch.tuikuan = st.refund_count || 0;
+  }
+  if (Object.keys(patch).length) {
+    page.setData(patch);
+  }
+}
+
+/** 同步子客服 UI 权限到页面 data（并确保 isShangjia 对客服为 true） */
+export function syncStaffUi(page) {
+  const staff = isStaffMode();
+  const ctx = staff ? (getStaffContext() || {}) : null;
+  const wallet = (ctx && ctx.wallet) || {};
+  const portal = isMerchantPortalUser();
+  page.setData({
+    isShangjia: portal,
+    isStaffMode: staff,
+    isMerchantOwner: !staff && Number(wx.getStorageSync('shangjiastatus')) === 1,
+    staffRoleName: staff ? (ctx.role_name || '客服') : '',
+    staffMerchantId: staff ? (ctx.merchant_id || '') : '',
+    quotaAvailable: staff ? (wallet.quota_available || '0.00') : '',
+    canDispatch: staffCan('dispatch'),
+    canSettle: staffCan('settle'),
+    canCancel: staffCan('cancel'),
+    canRefund: staffCan('refund'),
+    canPenalty: staffCan('penalty'),
+    canPenaltyManage: staffCan('penaltyManage'),
+    canChangePlayer: staffCan('changePlayer'),
+    canStaffManage: staffCan('staffManage'),
+    canWalletAllocate: staffCan('walletAllocate'),
+    canWalletRevoke: staffCan('walletRevoke'),
+    canFinance: staffCan('finance'),
+    canTemplate: staffCan('template'),
+    canAudit: !staff || staffCan('audit'),
+    canImChat: !staff || staffCan('imChat'),
+    showRechargeWithdraw: isMerchantOwnerOnly(),
+  });
+}
+
+/** 客服模式走 staff 专用 URL，老板走原商家 URL */
+export function staffOrOwner(staffUrl, ownerUrl) {
+  return isStaffMode() ? staffUrl : ownerUrl;
+}