feat: 微信授权登录 + 我的中心角色切换 + 师傅工作台全模块 + 图标美化
登录与角色: - Auth::wxlogin 微信 code → jscode2session → 落库发 token(appid/secret 走 .env) - 新增 fa_user_wechat 表,openid 幂等建号(CLI 已验证 is_new 1→0 不重复建号) - Auth::switchRole 角色切换(未入驻 2001 / 审核中 2002 / 未通过 2003) - pages/login 改为微信一键授权;pages/mine 我的中心(师傅入口 + 切换师傅端) 师傅工作台(对齐需求文档): - pages/master/workbench 工作台:接单开关 / 待处理待验收 / 可提现 / 六宫格入口 / 信用四指标 / 技能标签 - pages/master/hall 订单大厅:类型筛选(一口价/报价) + 4 种排序 + 抢单倒计时 + 报价入口 - pages/master/quote 报价竞标:金额/说明/有效期 + 报价记录 - pages/master/wallet 钱包:可提现/今日/累计 + 账单明细 + 提现校验 - pages/master/credit 信用与申诉:五项指标 + 规则 + 申诉提交/记录 - 新增 fa_appeal 表 视觉: - 15 个类目图标重画为双色扁平 SVG,用无头 Chrome 渲染为 192px 透明 PNG - 首页改用 <image src=static/icons/*.png>,移除 200 行 CSS 图标数据 验证:page_flow 47 + e2e_flow 65 + phase2_verify 27 = 139 项断言全通过
这个提交包含在:
@@ -11,7 +11,7 @@ use think\Validate;
|
||||
*/
|
||||
class Auth extends Base
|
||||
{
|
||||
protected $noNeedLogin = ['login'];
|
||||
protected $noNeedLogin = ['login', 'wxlogin'];
|
||||
|
||||
/**
|
||||
* 手机号 + 验证码登录(验证码固定 123456,联调用;接入短信后走 Sms)
|
||||
@@ -99,4 +99,66 @@ class Auth extends Base
|
||||
'master' => $masterInfo,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* 微信授权登录(小程序 uni.login 拿到的 code)
|
||||
* @ApiMethod (POST)
|
||||
*/
|
||||
public function wxlogin()
|
||||
{
|
||||
$code = trim((string)$this->request->post('code'));
|
||||
$nickname = trim((string)$this->request->post('nickname'));
|
||||
$avatar = trim((string)$this->request->post('avatar'));
|
||||
if ($code === '') {
|
||||
$this->error('缺少微信登录凭证 code');
|
||||
}
|
||||
|
||||
$wx = \app\common\library\WxLogin::jscode2session($code);
|
||||
if (isset($wx['error'])) {
|
||||
$this->error($wx['error']);
|
||||
}
|
||||
$ret = \app\common\library\WxLogin::provision(
|
||||
$wx['openid'],
|
||||
isset($wx['unionid']) ? $wx['unionid'] : '',
|
||||
isset($wx['session_key']) ? $wx['session_key'] : '',
|
||||
$nickname,
|
||||
$avatar
|
||||
);
|
||||
$this->auth->direct($ret['user_id']);
|
||||
|
||||
$this->success('登录成功', [
|
||||
'token' => $this->auth->getToken(),
|
||||
'expires' => 2592000,
|
||||
'userinfo' => $this->profileData(),
|
||||
'is_new' => $ret['is_new'],
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 切换角色(用户 / 师傅)
|
||||
* @ApiMethod (POST)
|
||||
*/
|
||||
public function switchRole()
|
||||
{
|
||||
$role = $this->request->post('role', 'user');
|
||||
if (!in_array($role, ['user', 'master'], true)) {
|
||||
$this->error('角色参数错误');
|
||||
}
|
||||
if ($role === 'master') {
|
||||
$master = $this->masterInfo();
|
||||
if (!$master) {
|
||||
$this->error('请先完成师傅入驻', ['need_apply' => 1], 2001);
|
||||
}
|
||||
if ($master['verify_status'] === 'pending') {
|
||||
$this->error('师傅资质审核中,请耐心等待', ['verify_status' => 'pending'], 2002);
|
||||
}
|
||||
if ($master['verify_status'] === 'reject') {
|
||||
$this->error('资质未通过:' . $master['audit_msg'], ['verify_status' => 'reject'], 2003);
|
||||
}
|
||||
}
|
||||
$this->success('切换成功', [
|
||||
'role' => $role,
|
||||
'redirect' => $role === 'master' ? '/pages/master/workbench' : '/YJYF/YJYF',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户