feat(ui): 新增/优化界面样式、图标及交互组件

- 新增多个功能图标(箭头、盾牌、位置等)
- 优化全局按钮、标签、输入框等组件样式
- 修复导航栏高度计算逻辑,适配微信小程序
- 优化消息页、订单页、个人中心等页面布局
- 修复微信支付配置及通知接口问题
这个提交包含在:
2026-11-09 09:57:22 +08:00
父节点 68ac7876fd
当前提交 3ebd795cbb
共有 64 个文件被更改,包括 4756 次插入 和 1923 次删除

查看文件

@@ -2,6 +2,7 @@
namespace app\api\controller;
use app\common\library\OrderStatus;
use think\Db;
/**
@@ -179,11 +180,22 @@ class Merchant extends Base
$merchant = $this->requireMerchant();
$uids = $this->merchantUserIds($merchant);
$status = $this->request->param('status', 'all');
$keyword = trim((string)$this->request->param('keyword', ''));
$page = max(1, (int)$this->request->param('page', 1));
$limit = min(50, max(1, (int)$this->request->param('limit', 20)));
$build = function () use ($uids, $status) {
$build = function () use ($uids, $status, $keyword) {
$q = Db::name('order')->where('user_id', 'in', $uids);
if ($keyword !== '') {
$q->where(function ($sub) use ($keyword) {
$sub->where('contact', 'like', "%{$keyword}%")
->whereOr('mobile', 'like', "%{$keyword}%")
->whereOr('order_no', 'like', "%{$keyword}%")
->whereOr('service_name', 'like', "%{$keyword}%")
->whereOr('address', 'like', "%{$keyword}%")
->whereOr('remark', 'like', "%{$keyword}%");
});
}
if ($status === 'active') {
$q->where('status', 'in', \app\common\library\OrderStatus::activeValues());
} elseif ($status === 'completed') {
@@ -204,6 +216,8 @@ class Merchant extends Base
$ownerUser = (int)$row['user_id'] === (int)$merchant['user_id'];
$u = isset($userMap[(int)$row['user_id']]) ? $userMap[(int)$row['user_id']] : null;
$mobile = $u ? (string)$u['mobile'] : '';
$custMobile = (string)$row['mobile'];
$row['mobile_mask'] = strlen($custMobile) === 11 ? substr_replace($custMobile, '****', 3, 4) : $custMobile;
$row['pay_amount'] = (float)$row['pay_amount'];
$row['urgent'] = (int)$row['urgent'];
$row['status_text'] = \app\common\library\OrderStatus::label((int)$row['status']);