From 0767e23f11ad0b112876392eb34512f79c16ad26 Mon Sep 17 00:00:00 2001 From: TermiNexus Date: Tue, 16 Jun 2026 00:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=AF=B8=E5=A4=9A?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/accept-order/accept-order.js | 4 +- pages/accept-order/accept-order.wxml | 12 +- pages/assess-center/assess-center.js | 2 +- pages/assess-log/assess-log.wxml | 4 +- pages/assess-score/assess-score.js | 4 +- pages/assess-score/assess-score.wxml | 2 +- .../fighter-order-detail.js | 2 +- .../fighter-order-detail.wxml | 4 +- pages/fighter-rank/fighter-rank.js | 4 +- pages/fighter/fighter.js | 6 +- pages/fighter/fighter.wxml | 28 ++-- pages/fighter/fighter.wxss | 141 +++++++++--------- pages/invite-fighter/invite-fighter.wxml | 4 +- pages/leader-bonus-log/leader-bonus-log.js | 2 +- pages/leader-bonus-log/leader-bonus-log.wxml | 2 +- .../merchant-dispatch/merchant-dispatch.wxml | 10 +- pages/merchant-msg/merchant-msg.wxml | 6 +- .../merchant-order-detail.js | 4 +- .../merchant-order-detail.wxml | 32 ++-- pages/merchant-orders/merchant-orders.wxml | 2 +- pages/my-fighter/my-fighter.js | 2 +- pages/my-fighter/my-fighter.wxml | 2 +- pages/order-detail/order-detail.wxml | 18 +-- pages/order-pool/order-pool.js | 2 +- pages/order-pool/order-pool.wxml | 4 +- pages/poster/poster.wxml | 4 +- pages/recharge-log/recharge-log.wxml | 6 +- pages/withdraw/components/mode1/mode1.js | 4 +- pages/withdraw/components/mode2/mode2.js | 8 +- tab-bar/index.js | 2 +- utils/imAuth/dashoujianquan.js | 2 +- utils/xiaoxilj.js | 4 +- 32 files changed, 167 insertions(+), 166 deletions(-) diff --git a/pages/accept-order/accept-order.js b/pages/accept-order/accept-order.js index 804d2a6..d06af4a 100644 --- a/pages/accept-order/accept-order.js +++ b/pages/accept-order/accept-order.js @@ -401,7 +401,7 @@ Page({ // 校验1: 打手身份 if (!this.data.dashoustatus || this.data.dashoustatus != 1) { - wx.showToast({ title: '请先开启打手身份', icon: 'none' }); + wx.showToast({ title: '请先开启接单员身份', icon: 'none' }); return; } // 校验2: 账号状态 @@ -409,7 +409,7 @@ Page({ wx.showToast({ title: '账号异常,无法接单', icon: 'none' }); return; } - // 校验3: 打手接单状态 + // 校验3: 接单员接单状态 if (this.data.dashouzhuangtai != 1) { wx.showToast({ title: '您有订单正在接待中', icon: 'none' }); return; diff --git a/pages/accept-order/accept-order.wxml b/pages/accept-order/accept-order.wxml index 56de902..890d9fd 100644 --- a/pages/accept-order/accept-order.wxml +++ b/pages/accept-order/accept-order.wxml @@ -74,13 +74,13 @@ ⚙️ 平台订单 - + 指定 - {{item.zhiding_nicheng || '指定打手'}} + {{item.zhiding_nicheng || '指定接单员'}} UID: {{item.zhiding_uid || '未知'}} - + @@ -139,13 +139,13 @@ 🏪 商家发单 - + 指定 - {{item.zhiding_nicheng || '指定打手'}} + {{item.zhiding_nicheng || '指定接单员'}} UID: {{item.zhiding_uid || '未知'}} - + diff --git a/pages/assess-center/assess-center.js b/pages/assess-center/assess-center.js index c6a3fe5..ba2fba9 100644 --- a/pages/assess-center/assess-center.js +++ b/pages/assess-center/assess-center.js @@ -186,7 +186,7 @@ Page({ // 抢单成功,弹出联系打手弹窗 wx.showModal({ title: '接待成功', - content: '请认真考核,点击联系他查看打手信息并打分。', + content: '请认真考核,点击联系他查看接单员信息并打分。', showCancel: false, confirmText: '联系他', confirmColor: '#c9a558', diff --git a/pages/assess-log/assess-log.wxml b/pages/assess-log/assess-log.wxml index 29a3e34..18d4bb3 100644 --- a/pages/assess-log/assess-log.wxml +++ b/pages/assess-log/assess-log.wxml @@ -103,8 +103,8 @@ 其他信息 - 打手游戏ID:{{item.dashou_youxi_id || '无'}} - 打手备注:{{item.dashou_beizhu || '无'}} + 接单员游戏ID:{{item.dashou_youxi_id || '无'}} + 接单员备注:{{item.dashou_beizhu || '无'}} 审核官游戏ID:{{item.shenheguan_youxi_id || '无'}} 创建时间:{{item.create_time}} 更新时间:{{item.update_time}} diff --git a/pages/assess-score/assess-score.js b/pages/assess-score/assess-score.js index b227446..0755353 100644 --- a/pages/assess-score/assess-score.js +++ b/pages/assess-score/assess-score.js @@ -73,12 +73,12 @@ Page({ contactDashou(e) { const item = e.currentTarget.dataset.item; if (!item || !item.shenqingren_id) { - wx.showToast({ title: '无法获取打手ID', icon: 'none' }); + wx.showToast({ title: '无法获取接单员ID', icon: 'none' }); return; } openPrivateChat(this, { toUserId: buildDashouPeerId(item.shenqingren_id), - toName: '打手' + item.shenqingren_id, + toName: '接单员' + item.shenqingren_id, toAvatar: resolveAvatarUrl(item.shenqingren_avatar), }); }, diff --git a/pages/assess-score/assess-score.wxml b/pages/assess-score/assess-score.wxml index db5c6ab..5c9860b 100644 --- a/pages/assess-score/assess-score.wxml +++ b/pages/assess-score/assess-score.wxml @@ -31,7 +31,7 @@ - 打手游戏昵称 + 接单员游戏昵称 {{item.dashou_youxi_id}} diff --git a/pages/fighter-order-detail/fighter-order-detail.js b/pages/fighter-order-detail/fighter-order-detail.js index 79849ea..1703829 100644 --- a/pages/fighter-order-detail/fighter-order-detail.js +++ b/pages/fighter-order-detail/fighter-order-detail.js @@ -493,7 +493,7 @@ Page({ } wx.showModal({ title: '⚠️ 提交确认', - content: '在提交订单之前,请确保您已在打手端页面认真阅读打手规则。如有漏交图片,订单被退款,概不申诉。', + content: '在提交订单之前,请确保您已在接单员端页面认真阅读接单员规则。如有漏交图片,订单被退款,概不申诉。', confirmText: '我已阅读', cancelText: '我再想想', success: (res) => { diff --git a/pages/fighter-order-detail/fighter-order-detail.wxml b/pages/fighter-order-detail/fighter-order-detail.wxml index 7a715d6..47ff950 100644 --- a/pages/fighter-order-detail/fighter-order-detail.wxml +++ b/pages/fighter-order-detail/fighter-order-detail.wxml @@ -198,11 +198,11 @@ - + 我的交付 - + 交付图片 diff --git a/pages/fighter-rank/fighter-rank.js b/pages/fighter-rank/fighter-rank.js index 25072cb..7d72942 100644 --- a/pages/fighter-rank/fighter-rank.js +++ b/pages/fighter-rank/fighter-rank.js @@ -6,7 +6,7 @@ import request from '../../utils/request.js' import { resolveAvatarUrl, getDefaultAvatarUrl } from '../../utils/avatar.js' const ROLE_LIST = [ - { key: 'dashou', label: '打手' }, + { key: 'dashou', label: '接单员' }, { key: 'guanshi', label: '管事' }, { key: 'zuzhang', label: '组长' }, { key: 'shangjia', label: '商家' }, @@ -24,7 +24,7 @@ const DATE_LIST = [ const ROLE_META = { dashou: { - title: '打手排行榜', + title: '接单员排行榜', sortField: 'chengjiao_zonge', sortLabel: '分红总额', metrics: [ diff --git a/pages/fighter/fighter.js b/pages/fighter/fighter.js index dbdca01..beed7f0 100644 --- a/pages/fighter/fighter.js +++ b/pages/fighter/fighter.js @@ -57,7 +57,7 @@ Page(createPage({ pendingShenheCount: 0, layoutSparse: false, rankBoardList: [ - { type: 'dashou', name: '打手榜', sub: '接单成交', icon: '', shapeClass: 'rank-shape-left', themeClass: 'rank-theme-blue' }, + { type: 'dashou', name: '接单员榜', sub: '接单成交', icon: '', shapeClass: 'rank-shape-left', themeClass: 'rank-theme-blue' }, { type: 'guanshi', name: '管事榜', sub: '邀请收入', icon: '', shapeClass: 'rank-shape-right', themeClass: 'rank-theme-gold' }, { type: 'zuzhang', name: '组长榜', sub: '团队分红', icon: '', shapeClass: 'rank-shape-left', themeClass: 'rank-theme-purple' }, { type: 'shangjia', name: '商家榜', sub: '派单流水', icon: '', shapeClass: 'rank-shape-right', themeClass: 'rank-theme-orange' }, @@ -240,7 +240,7 @@ Page(createPage({ _updateTotalAssets() { const d = this.data; - const breakdown = [{ label: '打手佣金', amount: d.yongjin || '0.00' }]; + const breakdown = [{ label: '接单员佣金', amount: d.yongjin || '0.00' }]; let total = this._parseMoney(d.yongjin); if (d.isGuanshi) { total += this._parseMoney(d.fenyongtixian); @@ -711,7 +711,7 @@ Page(createPage({ that.setData({ isAutoRegistering: true }); that.onRegister(); } else { - wx.showToast({ title: '您已是打手', icon: 'success', duration: 2000 }); + wx.showToast({ title: '您已是接单员', icon: 'success', duration: 2000 }); } } }, diff --git a/pages/fighter/fighter.wxml b/pages/fighter/fighter.wxml index a3de9c1..9141c8a 100644 --- a/pages/fighter/fighter.wxml +++ b/pages/fighter/fighter.wxml @@ -4,7 +4,7 @@ - 打手认证 + 接单员认证 立即注册 @@ -37,9 +37,9 @@ - + - 打手留言 + 接单员留言 {{xiangxiShuju.dashou_liuyan}} @@ -128,9 +128,9 @@ - + - 更换打手成功 + 更换接单员成功 新订单ID{{xinDingdanId}}📋 @@ -156,17 +156,17 @@ - + 联系客服 - 联系打手 + 联系接单员 撤销订单 - - + + 申请退款 @@ -198,13 +198,13 @@ - + - 更换打手× + 更换接单员× - 确认更换打手吗?当前订单将被撤销,并生成一条相同内容的新订单(打手清空)。 + 确认更换接单员吗?当前订单将被撤销,并生成一条相同内容的新订单(接单员清空)。 取消 diff --git a/pages/merchant-orders/merchant-orders.wxml b/pages/merchant-orders/merchant-orders.wxml index 9c74d97..35ed354 100644 --- a/pages/merchant-orders/merchant-orders.wxml +++ b/pages/merchant-orders/merchant-orders.wxml @@ -22,7 +22,7 @@ - + diff --git a/pages/my-fighter/my-fighter.js b/pages/my-fighter/my-fighter.js index a62f723..0ace995 100644 --- a/pages/my-fighter/my-fighter.js +++ b/pages/my-fighter/my-fighter.js @@ -169,7 +169,7 @@ Page({ const item = this.data.dashouList.find(i => i.uid === dashouUid) openPrivateChat(this, { toUserId: buildDashouPeerId(dashouUid), - toName: item?.nicheng || '打手', + toName: item?.nicheng || '接单员', toAvatar: item?.touxiang || item?.touxiangUrl || '', }) } diff --git a/pages/my-fighter/my-fighter.wxml b/pages/my-fighter/my-fighter.wxml index 6fbb206..9b82b64 100644 --- a/pages/my-fighter/my-fighter.wxml +++ b/pages/my-fighter/my-fighter.wxml @@ -84,7 +84,7 @@ — 已全部加载 — - 暂无下级打手 + 暂无下级接单员 diff --git a/pages/order-detail/order-detail.wxml b/pages/order-detail/order-detail.wxml index 64f1aae..0af3968 100644 --- a/pages/order-detail/order-detail.wxml +++ b/pages/order-detail/order-detail.wxml @@ -49,9 +49,9 @@ - + - 服务打手 + 服务接单员 头像 @@ -61,7 +61,7 @@ {{xiangxiShuju.dashouNicheng || '未设置'}} - 打手ID + 接单员ID {{xiangxiShuju.dashou}} 复制 @@ -73,8 +73,8 @@ 提交时间 {{xiangxiShuju.tijiaoTime}} - - 联系打手 + + 联系接单员 @@ -85,9 +85,9 @@ - + - 打手留言 + 接单员留言 {{xiangxiShuju.dashouliuyan}} @@ -120,7 +120,7 @@ 翻车次数 - 填写该订单翻车次数,用于评价打手实力 + 填写该订单翻车次数,用于评价接单员实力 @@ -155,7 +155,7 @@ 留言(选填) - + {{jiesuan.liuyan.length}}/50 diff --git a/pages/order-pool/order-pool.js b/pages/order-pool/order-pool.js index 2176f96..058450b 100644 --- a/pages/order-pool/order-pool.js +++ b/pages/order-pool/order-pool.js @@ -319,7 +319,7 @@ Page({ if (!dingdanItem) return; if (!this.data.dashoustatus || this.data.dashoustatus != 1) { - wx.showToast({ title: '请先开启打手身份', icon: 'none' }); + wx.showToast({ title: '请先开启接单员身份', icon: 'none' }); return; } if (this.data.zhuanghaoStatus != 1) { diff --git a/pages/order-pool/order-pool.wxml b/pages/order-pool/order-pool.wxml index 027df01..0b2bf70 100644 --- a/pages/order-pool/order-pool.wxml +++ b/pages/order-pool/order-pool.wxml @@ -104,7 +104,7 @@ src="{{item.zhiding_avatar_full}}" mode="aspectFill" /> - {{item.zhiding_nicheng || '指定打手'}} + {{item.zhiding_nicheng || '指定接单员'}} UID: {{item.zhiding_uid || '未知'}} @@ -181,7 +181,7 @@ src="{{item.zhiding_avatar_full}}" mode="aspectFill" /> - {{item.zhiding_nicheng || '指定打手'}} + {{item.zhiding_nicheng || '指定接单员'}} UID: {{item.zhiding_uid || '未知'}} diff --git a/pages/poster/poster.wxml b/pages/poster/poster.wxml index f64dc1f..93195ac 100644 --- a/pages/poster/poster.wxml +++ b/pages/poster/poster.wxml @@ -8,7 +8,7 @@ ⚡ 推广海报 ⚡ - 邀请打手扫码注册,自动填充邀请码 + 邀请接单员扫码注册,自动填充邀请码 @@ -63,7 +63,7 @@ - * 打手扫码后自动进入注册页面,邀请码将自动填充 + * 接单员扫码后自动进入注册页面,邀请码将自动填充 diff --git a/pages/recharge-log/recharge-log.wxml b/pages/recharge-log/recharge-log.wxml index 46fcd82..9131036 100644 --- a/pages/recharge-log/recharge-log.wxml +++ b/pages/recharge-log/recharge-log.wxml @@ -15,14 +15,14 @@ {{yaoqingzongshu}} - 邀请打手 + 邀请接单员 {{chongzhiDashouShuliang}} - 充值打手 + 充值接单员 @@ -50,7 +50,7 @@ 🚀 暂无会员记录 - 快去邀请打手吧 + 快去邀请接单员吧 点击刷新 diff --git a/pages/withdraw/components/mode1/mode1.js b/pages/withdraw/components/mode1/mode1.js index 13cd3eb..8f702a7 100644 --- a/pages/withdraw/components/mode1/mode1.js +++ b/pages/withdraw/components/mode1/mode1.js @@ -126,10 +126,10 @@ Component({ const data = res.data.data; const assets = []; if (data.dashou_yue && parseFloat(data.dashou_yue) > 0) { - assets.push({ type: 'dashou_yue', label: '打手佣金', amount: data.dashou_yue, rate: data.dashou_rate || 0 }); + assets.push({ type: 'dashou_yue', label: '接单员佣金', amount: data.dashou_yue, rate: data.dashou_rate || 0 }); } if (data.dashou_yajin && parseFloat(data.dashou_yajin) > 0) { - assets.push({ type: 'dashou_yajin', label: '打手保证金', amount: data.dashou_yajin, rate: data.dashou_yajin_rate || 0 }); + assets.push({ type: 'dashou_yajin', label: '接单员保证金', amount: data.dashou_yajin, rate: data.dashou_yajin_rate || 0 }); } if (data.shangjia_yue && parseFloat(data.shangjia_yue) > 0) { assets.push({ type: 'shangjia_yue', label: '商家余额', amount: data.shangjia_yue, rate: data.shangjia_rate || 0 }); diff --git a/pages/withdraw/components/mode2/mode2.js b/pages/withdraw/components/mode2/mode2.js index 3c1f617..ee9b6d5 100644 --- a/pages/withdraw/components/mode2/mode2.js +++ b/pages/withdraw/components/mode2/mode2.js @@ -18,17 +18,17 @@ const TX_STATUS = { }; const ASSET_CONFIG = { - dashou_yue: { leixing: 1, label: '打手佣金' }, + dashou_yue: { leixing: 1, label: '接单员佣金' }, guanshi_fenyong: { leixing: 2, label: '管事分红' }, zuzhang_fenyong: { leixing: 3, label: '组长分红' }, kaoheguan_fenyong: { leixing: 4, label: '考核官分佣' }, - dashou_yajin: { leixing: 5, label: '打手保证金' }, + dashou_yajin: { leixing: 5, label: '接单员保证金' }, shangjia_yue: { leixing: 6, label: '商家余额' }, }; const LEIXING_LABEL = { - 1: '打手佣金', 2: '管事分红', 3: '组长分红', - 4: '考核官分佣', 5: '打手保证金', 6: '商家余额', + 1: '接单员佣金', 2: '管事分红', 3: '组长分红', + 4: '考核官分佣', 5: '接单员保证金', 6: '商家余额', }; Component({ diff --git a/tab-bar/index.js b/tab-bar/index.js index 408a95c..13e52d6 100644 --- a/tab-bar/index.js +++ b/tab-bar/index.js @@ -13,7 +13,7 @@ const roleCfg = { ], }, dashou: { - name: '打手', + name: '接单员', tabList: [ { pagePath: 'pages/accept-order/accept-order', text: '接单池', iconPath: '/images/order-pool.png', selectedIconPath: '/images/order-pool.png' }, { pagePath: 'pages/fighter-orders/fighter-orders', text: '订单', iconPath: '/images/orders.png', selectedIconPath: '/images/orders.png' }, diff --git a/utils/imAuth/dashoujianquan.js b/utils/imAuth/dashoujianquan.js index bf33a06..b1fc2be 100644 --- a/utils/imAuth/dashoujianquan.js +++ b/utils/imAuth/dashoujianquan.js @@ -30,7 +30,7 @@ async function dashoujianquan(app) { mask: true }); await new Promise(r => setTimeout(r, 2100)); - return { allowed: false, reason: '打手消息权限被限制' }; + return { allowed: false, reason: '接单员消息权限被限制' }; } } throw new Error(res.data?.msg || '鉴权接口异常'); diff --git a/utils/xiaoxilj.js b/utils/xiaoxilj.js index 9e3282e..d934f09 100644 --- a/utils/xiaoxilj.js +++ b/utils/xiaoxilj.js @@ -50,7 +50,7 @@ class ConnectionManager { } if (identityType === 'dashou' && !userId.startsWith('Ds')) { - throw new Error(`打手身份的用户ID必须以Ds开头,实际为 ${userId}`); + throw new Error(`接单员身份的用户ID必须以Ds开头,实际为 ${userId}`); } if (identityType === 'shangjia' && !userId.startsWith('Sj')) { throw new Error(`商家身份的用户ID必须以Sj开头,实际为 ${userId}`); @@ -104,7 +104,7 @@ class ConnectionManager { // 校验 userId 前缀 if (identityType === 'dashou' && !userId.startsWith('Ds')) { - throw new Error(`打手身份的用户ID必须以Ds开头,实际为 ${userId}`); + throw new Error(`接单员身份的用户ID必须以Ds开头,实际为 ${userId}`); } if (identityType === 'shangjia' && !userId.startsWith('Sj')) { throw new Error(`商家身份的用户ID必须以Sj开头,实际为 ${userId}`);