From ab336bdfc9c8093dfbf25561e84a646c26b1289d Mon Sep 17 00:00:00 2001
From: yziiy <15979918+mayday-yziiy@user.noreply.gitee.com>
Date: Wed, 22 Oct 2025 10:04:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/union.ts                   |  7 +++
 src/views/Statistical/giftRecord/hook.tsx  | 52 ++++++++++++++--------
 src/views/Statistical/giftRecord/index.vue |  7 ++-
 src/views/union/unionList/hook.tsx         | 21 ++++++++-
 src/views/union/unionList/index.vue        |  9 +++-
 5 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/src/api/modules/union.ts b/src/api/modules/union.ts
index ac6f2a5..c875e1b 100644
--- a/src/api/modules/union.ts
+++ b/src/api/modules/union.ts
@@ -3,6 +3,7 @@ import { http } from "@/utils/http";
 type Result = {
   code: string;
   data: any;
+  msg: string;
 };
 // 工会列表
 export const queryUnionList = params => {
@@ -105,4 +106,10 @@ export const grantSubsidyBybatch = data => {
   return http.request<Result>("post", "/adminapi/Guild/subsidy_give_batch", {
     data
   });
+};
+// 隐藏或者展示工会
+export const changeStatus = data => {
+  return http.request<Result>("post", "/adminapi/Guild/guild_show_status_edit", {
+    data
+  });
 };
\ No newline at end of file
diff --git a/src/views/Statistical/giftRecord/hook.tsx b/src/views/Statistical/giftRecord/hook.tsx
index a4e349c..683399a 100644
--- a/src/views/Statistical/giftRecord/hook.tsx
+++ b/src/views/Statistical/giftRecord/hook.tsx
@@ -19,12 +19,7 @@ export function useData() {
   });
   const statisticsList = ref([
     { label: "礼物总数量", prop: "gift_num" },
-    { label: "礼物总价", prop: "total_price" },
-    {
-      label: "平台收益（30%）", prop: "app_earning"
-    },
-    { label: "接收人收益（60%）", prop: "receive_earning" },
-    { label: "房主收益（10%）", prop: "room_owner_earning" },
+    { label: "礼物总价", prop: "total_price" }
   ])
 
   const totalData = ref(null)
@@ -83,18 +78,6 @@ export function useData() {
       label: "礼物总价（金币）",
       prop: "total_price"
     },
-    {
-      label: "平台收益（30%）钻石",
-      prop: "app_earning"
-    },
-    {
-      label: "接收人收益（60%）钻石",
-      prop: "gift_user_earning"
-    },
-    {
-      label: "房主收益（10%）钻石",
-      prop: "room_owner_earning"
-    },
     {
       label: "来源",
       prop: "type",
@@ -117,6 +100,37 @@ export function useData() {
 
     });
     if (code) {
+      const objLabel = [
+        {
+          label: `平台收益（${data.total.app_earning_ratio}%）钻石`,
+          prop: "app_earning"
+        },
+        {
+          label: `接收人收益（${data.total.receive_earning_ratio}%）钻石`,
+          prop: "gift_user_earning"
+        },
+        {
+          label: `房主收益（${data.total.room_owner_earning_ratio}%）钻石`,
+          prop: "room_owner_earning"
+        }
+      ]
+      const objStatistics = [
+        {
+          label: `平台收益（${data.total.app_earning_ratio}%）钻石`,
+          prop: "app_earning"
+        },
+        {
+          label: `接收人收益（${data.total.receive_earning_ratio}%）钻石`,
+          prop: "receive_earning"
+        },
+        {
+          label: `房主收益（${data.total.room_owner_earning_ratio}%）钻石`,
+          prop: "room_owner_earning"
+        }
+      ]
+      statisticsList.value = [...statisticsList.value, ...objStatistics]
+      tableLabel.value.splice(7, 0, ...objLabel)
+      console.log(tableLabel.value)
       tableList.value = data.lists.map(ele => {
         return {
           ...ele,
@@ -125,6 +139,8 @@ export function useData() {
           gift_user_earning: parseFloat(ele.gift_user_earning),
         }
       });
+
+
       totalData.value = data.total;
       pagination.value.total = data.count;
       pagination.value.currentPage = data.page;
diff --git a/src/views/Statistical/giftRecord/index.vue b/src/views/Statistical/giftRecord/index.vue
index afa956a..c484012 100644
--- a/src/views/Statistical/giftRecord/index.vue
+++ b/src/views/Statistical/giftRecord/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted } from "vue";
+import { onBeforeMount } from "vue";
 import { useData } from "./hook";
 import SearchForm from "@/components/SearchForm/index.vue";
 import { PureTableBar } from "@/components/RePureTableBar";
@@ -19,7 +19,7 @@ const {
 	statisticsList,
 	loading
 } = useData();
-onMounted(() => {
+onBeforeMount(() => {
 	onSearch(searchForm.value);
 });
 defineOptions({
@@ -37,10 +37,9 @@ defineOptions({
 			</div>
 		</div>
 		<div ref="contentRef" :class="['flex', deviceDetection() ? 'flex-wrap' : '']">
-			<PureTableBar title="礼物统计列表" :class="[isShow && !deviceDetection() ? '!w-[60vw]' : 'w-full']"
+			<PureTableBar v-if="!loading" title="礼物统计列表" :class="[isShow && !deviceDetection() ? '!w-[60vw]' : 'w-full']"
 				:columns="tableLabel" @refresh="onSearch">
 				<template #buttons>
-					<!-- <div style="display: inline-flex;align-items: center;" class="mr-10">总计：{{ total_price }}</div> -->
 					<el-button type="primary" @click="exportExcel">
 						导出
 					</el-button>
diff --git a/src/views/union/unionList/hook.tsx b/src/views/union/unionList/hook.tsx
index cda4cd2..8dcc05f 100644
--- a/src/views/union/unionList/hook.tsx
+++ b/src/views/union/unionList/hook.tsx
@@ -10,7 +10,8 @@ import {
   addUnionData,
   editUnionData,
   dissolveUnionData,
-  guildUnionData
+  guildUnionData,
+  changeStatus
 } from "@/api/modules/union";
 import { addDialog } from "@/components/ReDialog";
 export function useData() {
@@ -87,6 +88,13 @@ export function useData() {
         <el-tag type={row.status_str === '正常' ? 'success' : 'error'}>{row.status_str}</el-tag>
       ),
     },
+    {
+      label: "显示状态",
+      prop: "is_show",
+      cellRenderer: ({ row }) => (
+        <div>{row.status_str === '正常' ? row.is_show_str : '-'}</div>
+      ),
+    },
     {
       label: "创建时间",
       prop: "createtime"
@@ -259,6 +267,16 @@ export function useData() {
       }
     });
   }
+  // 更改工会状态 隐藏 显示
+  const changeShowStatus = async (rowData) => {
+    const { data, code, msg } = await changeStatus({ id: rowData.id })
+    if (code) {
+      message("操作成功", { type: "success" });
+      onSearch(searchForm.value);
+    } else {
+      message(msg, { type: "error" });
+    }
+  }
   return {
     searchForm,
     searchLabel,
@@ -274,6 +292,7 @@ export function useData() {
     openDialog,
     viewMember,
     viewRoomList,
+    changeShowStatus,
     mergeData
   };
 }
diff --git a/src/views/union/unionList/index.vue b/src/views/union/unionList/index.vue
index 7627667..a89f32e 100644
--- a/src/views/union/unionList/index.vue
+++ b/src/views/union/unionList/index.vue
@@ -21,7 +21,8 @@ const {
   openDialog,
   viewMember,
   viewRoomList,
-  mergeData
+  mergeData,
+  changeShowStatus
 } = useData();
 defineOptions({
   name: "unionList"
@@ -63,6 +64,12 @@ onMounted(() => {
               <el-button link type="primary" :size="size" @click="openDialog('编辑', row)">
                 编辑
               </el-button>
+              <el-popconfirm v-if="row.status_str === '正常'" :title="`是否【${row.is_show ? '隐藏' : '显示'}】当前公会`"
+                @confirm="changeShowStatus(row)">
+                <template #reference>
+                  <el-button link type="primary" :size="size"> {{ row.is_show ? '隐藏' : '显示' }} </el-button>
+                </template>
+              </el-popconfirm>
               <el-popconfirm v-if="row.status_str === '正常'" :title="`是否确认解散名称为【${row.guild_name}】的公会`"
                 @confirm="handleDelete(row)">
                 <template #reference>