From f3d65280e70380a290e8c8d25b329e65ea71efdf Mon Sep 17 00:00:00 2001
From: zhenhui <1276357500@qq.com>
Date: Thu, 19 Mar 2026 16:29:52 +0800
Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E]=E5=85=91?=
 =?UTF-8?q?=E6=8D=A2=E8=AE=A2=E5=8D=95-=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/mall/RedemptionOrder.php        | 4 +++-
 app/common/model/MallRedemptionOrder.php             | 3 +++
 web/src/views/backend/mall/redemptionOrder/index.vue | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/admin/controller/mall/RedemptionOrder.php b/app/admin/controller/mall/RedemptionOrder.php
index f06cb85..df111c4 100644
--- a/app/admin/controller/mall/RedemptionOrder.php
+++ b/app/admin/controller/mall/RedemptionOrder.php
@@ -52,7 +52,9 @@ class RedemptionOrder extends Backend
          */
         list($where, $alias, $limit, $order) = $this->queryBuilder();
         $res = $this->model
-            ->withJoin($this->withJoinTable, $this->withJoinType)
+            ->with(['mallUser' => function ($query) {
+                $query->field('id,username');
+            }])
             ->visible(['mallUser' => ['username'], 'mallItem' => ['title']])
             ->alias($alias)
             ->where($where)
diff --git a/app/common/model/MallRedemptionOrder.php b/app/common/model/MallRedemptionOrder.php
index d63d528..cc381de 100644
--- a/app/common/model/MallRedemptionOrder.php
+++ b/app/common/model/MallRedemptionOrder.php
@@ -2,6 +2,7 @@
 
 namespace app\common\model;
 
+use app\common\model\traits\TimestampInteger;
 use support\think\Model;
 
 /**
@@ -9,6 +10,8 @@ use support\think\Model;
  */
 class MallRedemptionOrder extends Model
 {
+    use TimestampInteger;
+
     // 表名
     protected $name = 'mall_redemption_order';
 
diff --git a/web/src/views/backend/mall/redemptionOrder/index.vue b/web/src/views/backend/mall/redemptionOrder/index.vue
index 3347b9f..612a717 100644
--- a/web/src/views/backend/mall/redemptionOrder/index.vue
+++ b/web/src/views/backend/mall/redemptionOrder/index.vue
@@ -59,6 +59,7 @@ const baTable = new baTableClass(
                 label: t('mall.redemptionOrder.malluser__username'),
                 prop: 'mallUser.username',
                 align: 'center',
+                minWidth: 120,
                 operatorPlaceholder: t('Fuzzy query'),
                 render: 'tags',
                 operator: 'LIKE',
@@ -68,9 +69,10 @@ const baTable = new baTableClass(
                 label: t('mall.redemptionOrder.status'),
                 prop: 'status',
                 align: 'center',
+                custom: { 0: 'info', 1: 'primary' },
                 operator: 'eq',
                 sortable: false,
-                render: 'switch',
+                render: 'tag',
                 replaceValue: { '0': t('mall.redemptionOrder.status 0'), '1': t('mall.redemptionOrder.status 1') },
             },
             {
@@ -102,6 +104,8 @@ const baTable = new baTableClass(
                 label: t('mall.redemptionOrder.type'),
                 prop: 'type',
                 align: 'center',
+                effect: 'dark',
+                custom: { 1: 'success', 2: 'primary', 3: 'info' },
                 operator: 'eq',
                 sortable: false,
                 render: 'tag',