From c8ea35e51c4960e363c3eb7ddfc0368ca2142c4b Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Mon, 1 Jun 2026 16:24:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=88=BF=E9=97=B4=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9):=20=E5=A4=84=E7=90=86=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A0=8F=E5=88=87=E6=8D=A2=E5=88=B0=E2=80=9C=E7=AD=89=E5=BE=85?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E2=80=9D=E6=97=B6=E4=B8=80=E7=9B=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8A=A0=E8=BD=BD=E5=8A=A8=E7=94=BB=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approval/room-theme-approval/index.vue    | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/views/approval/room-theme-approval/index.vue b/src/views/approval/room-theme-approval/index.vue
index 1679b21..b4b1211 100644
--- a/src/views/approval/room-theme-approval/index.vue
+++ b/src/views/approval/room-theme-approval/index.vue
@@ -209,6 +209,7 @@ export default {
     const that = this
     const querySystem = this.permissionsSysOriginPlatforms[0]
     if (!querySystem) {
+      that.listLoading = false
       return
     }
     that.listQuery.sysOrigin = querySystem.value
@@ -219,24 +220,40 @@ export default {
       const that = this
       that.listLoading = true
       that.checkList = []
-      that.isIndeterminate = true
+      that.checkAll = false
+      that.isIndeterminate = false
       if (isClean === true) {
         that.list = []
         that.listQuery.cursor = 1
       }
       pageRoomThemeApproval(that.listQuery).then(res => {
-        const { body } = res
+        const body = res.body || {}
         that.total = body.total || 0
-        that.list = body.records
-        that.listLoading = false
+        that.list = (body.records || []).map(that.normalizeThemeApprovalItem)
       }).catch(er => {
-        that.listLoading = false
         console.error(er)
+      }).then(() => {
+        that.listLoading = false
       })
     },
     handleSearch() {
       this.renderData(true)
     },
+    normalizeThemeApprovalItem(row) {
+      const customize = Object.assign({}, row.customize || {
+        id: row.id,
+        themeBack: row.themeBack,
+        themeMoney: row.themeMoney
+      })
+      const userProfile = Object.assign({}, row.userProfile || row.userBaseInfo || {})
+      if (!userProfile.id) {
+        userProfile.id = row.userId
+      }
+      return Object.assign({}, row, {
+        customize,
+        userProfile
+      })
+    },
     accountHanle(userId) {
       this.accountHandleVisible = true
       this.thatSelectedUserId = userId