diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue
index 8dfd4c9..2f86869 100644
--- a/src/views/audit/gold/rechargeAudit.vue
+++ b/src/views/audit/gold/rechargeAudit.vue
@@ -54,7 +54,7 @@
           <span>{{ scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize }}</span>
         </template>
       </el-table-column>
-      <el-table-column fixed="left" prop="name" label="姓名" width="150px"/>
+      <el-table-column fixed="left" prop="name" label="姓名" width="150px" show-overflow-tooltip />
       <el-table-column fixed="left" prop="jwcode" label="精网号" width="110px"/>
       <el-table-column prop="market" label="所属地区" width="100px"/>
       <el-table-column prop="activity" label="活动名称" width="100px" show-overflow-tooltip/>
@@ -208,6 +208,10 @@ const getObj = ref({
 })
 // 支付方式选项
 const payModel = [
+{
+    value: '银行转账',
+    label: '银行转账'
+  },
   {
     value: '现金',
     label: '现金'
@@ -221,9 +225,33 @@ const payModel = [
     label: '刷卡'
   },
   {
-    value: '其他(各地区电子支付)',
-    label: '其他(各地区电子支付)'
+    value: 'Grabpay',
+    label: 'Grabpay'
+  },
+  {
+    value: 'Nets',
+    label: 'Nets'
+  },
+  {
+    value: 'PayPal',
+    label: 'PayPal'
+  },
+  {
+    value: 'Stripe-链接收款',
+    label: 'Stripe-链接收款'
   },
+  {
+    value: 'Ipay88-链接收款',
+    label: 'Ipay88-链接收款'
+  },
+  {
+    value: 'PaymentAsia-链接收款',
+    label: 'PaymentAsia-链接收款'
+  },
+  {
+    value: '其他',
+    label: '其他'
+  }
 ]
 // 统计合计数
 const stats = ref({
diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue
index a8df09d..1830271 100644
--- a/src/views/audit/gold/refundAudit.vue
+++ b/src/views/audit/gold/refundAudit.vue
@@ -51,7 +51,7 @@
 
     <el-table :data="tableData" style="height:55vh" @sort-change="handleSortChange">
       <el-table-column type="index" label="序号" width="60" />
-      <el-table-column prop="name" label="姓名" width="120" />
+      <el-table-column prop="name" label="姓名" width="120" show-overflow-tooltip />
       <el-table-column prop="jwcode" label="精网号" width="120" />
       <el-table-column prop="market" label="所属地区" width="120" />
 
@@ -84,12 +84,10 @@
       </el-table-column>
       <el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip />
       <el-table-column prop="adminName" label="提交人" width="120" />
-      <el-table-column v-if="checkTab === 'reject'" prop="rejectReason" label="驳回理由" width="150"
-        show-overflow-tooltip />
+      <el-table-column v-if="checkTab === 'reject'" prop="rejectReason" label="驳回理由" width="150" show-overflow-tooltip />
       <el-table-column v-if="checkTab !== 'pending'" prop="auditName" label="审核人" width="120" />
       <el-table-column prop="createTime" label="提交时间" width="180" sortable="custom">
         <template #default="{ row }">
-          <!--          {{ moment(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}-->
           {{
             checkTab === 'pending'
               ? moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss')
diff --git a/src/views/consume/bean/addBeanConsume.vue b/src/views/consume/bean/addBeanConsume.vue
index 228a59e..a42c4a0 100644
--- a/src/views/consume/bean/addBeanConsume.vue
+++ b/src/views/consume/bean/addBeanConsume.vue
@@ -230,8 +230,8 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
     </el-form>
 
     <!-- 客户信息栏 -->
-    <el-card v-if="user.jwcode" style="width: 800px; float: right" class="customer-info">
-      <el-form :model="user" label-width="auto" style="max-width: 1000px" label-position="left">
+    <el-card v-if="user.jwcode" class="customer-info">
+      <el-form :model="user" label-width="auto" label-position="left">
         <el-text size="large" style="margin-left: 20px">客户信息</el-text>
 
         <!-- 第一行：姓名 + 当前付费金豆 -->
@@ -282,8 +282,6 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
         </el-row>
       </el-form>
     </el-card>
-
-
   </div>
 </template>
 <style scoped>
@@ -294,7 +292,10 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
 }
 
 .customer-info {
-  max-width: 60%;
+  width: 700px;
+  float: right;
+  margin-right: 300px;
+  margin-top: 50px;
 }
 
 p {
diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index 73ce677..47fea8f 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -522,7 +522,7 @@ const getTagText = (state) => {
               </template>
             </el-table-column>
             <!-- 固定姓名列 -->
-            <el-table-column prop="name" label="姓名" width="150px" fixed="left" />
+            <el-table-column prop="name" label="姓名" width="150px" fixed="left" show-overflow-tooltip />
             <!-- 固定精网号列 -->
             <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
             <el-table-column prop="dept" label="地区" width="110px" />
@@ -540,7 +540,7 @@ const getTagText = (state) => {
             <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px" />
             <el-table-column prop="articleId" label="文章/视频ID" width="150px" />
             <el-table-column prop="articleName" label="文章/视频标题" width="150px" show-overflow-tooltip />
-            <el-table-column prop="author" label="作者" width="120px" />
+            <el-table-column prop="author" label="作者" width="120px" show-overflow-tooltip />
             <el-table-column prop="consumeTime" label="付费时间" sortable="custom" width="180px">
               <template #default="scope">
                 {{ formatTime(scope.row.consumeTime) }}
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index 175bf57..f1a999f 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -515,14 +515,14 @@ const getTagText = (state) => {
               </template>
             </el-table-column>
             <!-- 固定姓名列 -->
-            <el-table-column prop="name" label="姓名" width="150px" fixed="left" />
+            <el-table-column prop="name" label="姓名" width="150px" fixed="left" show-overflow-tooltip />
             <!-- 固定精网号列 -->
             <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
             <el-table-column prop="dept" label="地区" width="110px" />
             <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px" />
             <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px" />
             <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px" />
-            <el-table-column prop="channel" label="频道" width="190px" />
+            <el-table-column prop="channel" label="频道" width="190px" show-overflow-tooltip />
             <el-table-column prop="type" label="会员类型" width="120px">
               <template #default="scope">
                 {{consumeTypes.find(item => item.value === Number(scope.row.type))?.label || '未知类型'}}
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index 71be640..280769b 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -562,7 +562,7 @@ const getTagText = (state) => {
               </template>
             </el-table-column>
             <!-- 固定姓名列 -->
-            <el-table-column prop="name" label="姓名" width="150px" fixed="left" />
+            <el-table-column prop="name" label="姓名" width="150px" fixed="left" show-overflow-tooltip />
             <!-- 固定精网号列 -->
             <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
             <el-table-column prop="dept" label="地区" width="110px" />
@@ -576,7 +576,7 @@ const getTagText = (state) => {
             </el-table-column>
             <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px" />
             <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px" />
-            <el-table-column prop="liveChannel" label="频道" width="120px" />
+            <el-table-column prop="liveChannel" label="频道" width="120px" show-overflow-tooltip />
             <el-table-column prop="liveName" label="直播间名称" width="160px" show-overflow-tooltip />
             <el-table-column prop="consumeTime" label="消费时间" sortable="custom" width="180px" />
           </el-table>
diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index 6101d5e..85e9633 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -763,9 +763,6 @@ p {
   max-width: 50%;
   float: left;
 }
-</style>
-
-<style>
 /* 标题居中 */
 .el-dialog__header {
   text-align: center;
@@ -779,7 +776,10 @@ p {
   margin-bottom: 14px;
 }
 .customer-info {
-  max-width: 60%;
+  width: 700px;
+  float: right;
+  margin-right: 200px;
+  margin-top: 100px;
 }
 
 
diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue
index 58cc5b5..83d3b41 100644
--- a/src/views/consume/gold/coinConsumeDetail.vue
+++ b/src/views/consume/gold/coinConsumeDetail.vue
@@ -1,10 +1,10 @@
 <script setup>
-import {computed, onMounted, ref} from 'vue'
-import {dayjs, ElMessage} from 'element-plus'
+import { computed, onMounted, ref } from 'vue'
+import { dayjs, ElMessage } from 'element-plus'
 import request from '@/util/http.js'
 import API from '@/util/http.js'
 import moment from 'moment'
-import {reverseMarketMapping} from "@/utils/marketMap.js";
+import { reverseMarketMapping } from "@/utils/marketMap.js";
 // 之后整理一下
 
 /*
@@ -16,11 +16,11 @@ const trimJwCode = () => {
   }
 }
 const format3 = (num) => {
-    if (!num) return '0';
-    const parts = Number(num).toFixed(2).split('.');
-    // 添加逗号
-    parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-    return parts.join('.');
+  if (!num) return '0';
+  const parts = Number(num).toFixed(2).split('.');
+  // 添加逗号
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+  return parts.join('.');
 }
 //无法选择的时间
 const disabledDate = (time) => {
@@ -219,7 +219,7 @@ const ConsumeSelectBy = async function (val) {
 
     // 合计数的接口
     // 复制一份 detail.value 并移除排序字段和排序方式
-    const detailWithoutSort = {...consumeUser.value,flag: showEmployeeData.value ? 0 : 1}
+    const detailWithoutSort = { ...consumeUser.value, flag: showEmployeeData.value ? 0 : 1 }
     delete detailWithoutSort.sortField
     delete detailWithoutSort.sortOrder
 
@@ -402,22 +402,9 @@ const handleCurrentChange = function (val) {
   getObj.value.pageNum = val
   ConsumeSelectBy()
 }
-/*
-====================计算属性=================================
-*/
 
 // 计算总金币数
 const sumGold = computed(() => permanentGolds.value + freeGolds.value + taskGolds.value)
-
-/*
-====================监听=================================
-*/
-
-/*
-====================挂载=================================
-*/
-
-
 onMounted(async function () {
   await getAdminData()
   await ConsumeSelectBy()
@@ -442,7 +429,7 @@ const exportExcel = async function () {
 
     }
   }
-  const res = await API({url: '/export/exportConsume', data: params})
+  const res = await API({ url: '/export/exportConsume', data: params })
   if (res.code === 200) {
     ElMessage.success('导出成功')
   }
@@ -463,7 +450,7 @@ const exportListLoading = ref(false)
 const getExportList = async () => {
   exportListLoading.value = true
   try {
-    const result = await API({url: '/export/export'})
+    const result = await API({ url: '/export/export' })
     if (result.code === 200) {
       const filteredData = result.data.filter(item => {
         return item.type === 4; //4表示金币消耗列表
@@ -549,8 +536,8 @@ const getMarket = async function () {
 
       return allChildren.map(child => {
         const grandchildren = child.children && child.children.length
-            ? transformTree([child]) // 递归处理子节点
-            : null;
+          ? transformTree([child]) // 递归处理子节点
+          : null;
 
         return {
           value: child.name,
@@ -570,44 +557,33 @@ const getMarket = async function () {
 </script>
 
 <template>
-  <el-row>
-    <el-col>
       <el-card style="margin-bottom: 20px;margin-top:10px">
         <el-row style="margin-bottom: 10px">
           <el-col :span="5">
             <div class="head-card-element">
               <el-text class="mx-1">精网号：</el-text>
-              <el-input v-model="consumeUser.jwcode" placeholder="请输入精网号" style="width: 150px" clearable/>
+              <el-input v-model="consumeUser.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
             </div>
           </el-col>
           <el-col :span="5">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">商品名称：</el-text>
-              <el-select v-model="consumeUser.goodsName" placeholder="请选择商品名称" style="width: 180px"
-                         clearable>
+              <el-select v-model="consumeUser.goodsName" placeholder="请选择商品名称" style="width: 180px" clearable>
                 <!-- 修改 v-for 绑定逻辑 -->
-                <el-option v-for="(item, index) in goods" :key="index" :label="item" :value="item"/>
+                <el-option v-for="(item, index) in goods" :key="index" :label="item" :value="item" />
               </el-select>
             </div>
           </el-col>
           <el-col :span="5">
             <el-text class="mx-1" size="large">所属地区：</el-text>
-            <el-cascader
-                v-model="selectedMarketPath"
-                :options="market"
-                placeholder="请选择所属地区"
-                clearable
-                style="width:180px"
-                @change="handleMarketChange"
-            />
+            <el-cascader v-model="selectedMarketPath" :options="market" placeholder="请选择所属地区" clearable
+              style="width:180px" @change="handleMarketChange" />
           </el-col>
           <el-col :span="5">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">消耗平台：</el-text>
-              <el-select v-model="consumeUser.payPlatform" placeholder="请选择消耗平台"
-                         style="width: 180px"
-                         clearable>
-                <el-option v-for="item in consumePlatform" :key="item.value" :label="item.label" :value="item.value"/>
+              <el-select v-model="consumeUser.payPlatform" placeholder="请选择消耗平台" style="width: 180px" clearable>
+                <el-option v-for="item in consumePlatform" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </div>
           </el-col>
@@ -622,21 +598,17 @@ const getMarket = async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">消耗时间：</el-text>
               <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                              end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"
-                              :default-time="defaultTime" :disabled-date="disabledDate"/>
+                end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange" :default-time="defaultTime"
+                :disabled-date="disabledDate" />
               <el-button @click="getToday()" style="margin-left: 10px"
-                         :type="activeTimeRange === 'today' ? 'primary' : ''"> 今
+                :type="activeTimeRange === 'today' ? 'primary' : ''"> 今
               </el-button>
               <el-button @click="getYesterday()" style="margin-left: 10px"
-                         :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨
+                :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨
               </el-button>
               <el-button @click="get7Days()" style="margin-left: 10px"
-                         :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天
+                :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天
               </el-button>
-              <!-- </div>
-            </el-col>
-            <el-col :span="3">
-              <div class="head-card-btn"> -->
               <el-button type="success" @click="reset()">重置</el-button>
               <el-button type="primary" @click="search()">查询</el-button>
               <el-button type="primary" @click="exportExcel()">导出excel</el-button>
@@ -645,16 +617,12 @@ const getMarket = async function () {
           </el-col>
         </el-row>
       </el-card>
-    </el-col>
-  </el-row>
-  <el-row>
-    <el-col>
       <el-card>
         <div>
-          消耗新币：{{ format3(Math.abs(permanentGolds) ) }}新币&nbsp;&nbsp;&nbsp;&nbsp;
-          永久金币：{{ format3(Math.abs(permanentGolds) ) }}&nbsp;&nbsp;&nbsp;&nbsp;
-          免费金币：{{ format3(Math.abs(freeGolds) ) }}&nbsp;&nbsp;&nbsp;&nbsp;
-          任务金币：{{ format3(Math.abs(taskGolds) ) }}
+          消耗新币：{{ format3(Math.abs(permanentGolds)) }}新币&nbsp;&nbsp;&nbsp;&nbsp;
+          永久金币：{{ format3(Math.abs(permanentGolds)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+          免费金币：{{ format3(Math.abs(freeGolds)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+          任务金币：{{ format3(Math.abs(taskGolds)) }}
         </div>
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 576px; overflow-y: auto">
@@ -662,76 +630,63 @@ const getMarket = async function () {
             <el-table-column type="index" label="序号" width="80px" fixed="left">
               <template #default="scope">
                 <span>{{
-                    scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
-                  }}</span>
+                  scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                }}</span>
               </template>
             </el-table-column>
-            <!-- 固定姓名列 -->
-            <el-table-column prop="name" label="姓名" width="150px" fixed="left"/>
-            <!-- 固定精网号列 -->
-            <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left"/>
-            <el-table-column prop="market" label="所属地区" width="110px"/>
-            <el-table-column prop="goodsName" label="商品" width="160px" show-overflow-tooltip/>
+            <el-table-column prop="name" label="姓名" width="150px" fixed="left" show-overflow-tooltip />
+            <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
+            <el-table-column prop="market" label="所属地区" width="110px" />
+            <el-table-column prop="goodsName" label="商品" width="160px" show-overflow-tooltip />
             <el-table-column prop="payPlatform" label="消耗平台" width="120px">
               <template #default="scope">
-                <!-- 使用非严格相等比较 -->
                 {{ scope.row.payPlatform }}
-                <!--                <span scope.row.consumePlatform == 1">Homily Chart</span>-->
-
               </template>
             </el-table-column>
-            <!-- <el-table-column
-              prop="consumeType"
-              label="消费类型"
-              width="120px"
-            /> -->
             <el-table-column prop="sumGold" label="消耗金币总数" width="120px">
               <template #default="scope">
                 {{
                   (scope.row.taskGold +
-                      scope.row.freeGold +
-                      scope.row.permanentGold) 
+                    scope.row.freeGold +
+                    scope.row.permanentGold)
                 }}
               </template>
             </el-table-column>
 
             <el-table-column prop="permanentGold" label="永久金币" sortable="“custom”" width="110px">
               <template #default="scope">
-                {{ scope.row.permanentGold}}
+                {{ scope.row.permanentGold }}
               </template>
             </el-table-column>
             <el-table-column prop="freeGold" label="免费金币" sortable="“custom”" width="110px">
               <template #default="scope">
-                {{ scope.row.freeGold  }}
+                {{ scope.row.freeGold }}
               </template>
             </el-table-column>
             <el-table-column prop="taskGold" label="任务金币" sortable="“custom”" width="110px">
               <template #default="scope">
-                {{ scope.row.taskGold  }}
+                {{ scope.row.taskGold }}
               </template>
             </el-table-column>
 
-            <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip/>
-            <el-table-column prop="adminName" label="提交人" width="110px"/>
-            <el-table-column prop="createTime" label="消耗时间" sortable="custom" width="180px"/>
+            <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
+            <el-table-column prop="adminName" label="提交人" width="110px" />
+            <el-table-column prop="createTime" label="消耗时间" sortable="custom" width="180px" />
           </el-table>
         </div>
 
         <!-- 分页 -->
         <div class="pagination">
           <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
-                         layout="total, sizes, prev, pager, next, jumper" :total="total"
-                         @size-change="handlePageSizeChange"
-                         @current-change="handleCurrentChange"></el-pagination>
+            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
+            @current-change="handleCurrentChange"></el-pagination>
         </div>
       </el-card>
-    </el-col>
-  </el-row>
 
   <!-- 导出弹窗 -->
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
     <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
-      <el-table-column prop="fileName" label="文件名"/>
+      <el-table-column prop="fileName" label="文件名" />
       <el-table-column prop="state" label="状态">
         <template #default="scope">
           <el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'">
@@ -747,7 +702,7 @@ const getMarket = async function () {
       <el-table-column label="操作">
         <template #default="scope">
           <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
-                     :disabled="scope.row.state !== 2">
+            :disabled="scope.row.state !== 2">
             下载
           </el-button>
         </template>
diff --git a/src/views/permissions/rolePermission.vue b/src/views/permissions/rolePermission.vue
index 1b31718..eb9b0bd 100644
--- a/src/views/permissions/rolePermission.vue
+++ b/src/views/permissions/rolePermission.vue
@@ -13,7 +13,6 @@ import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
 // 表单验证ref
 const Ref = ref(null)
 const roleData = ref([])
-const total = ref(100)
 const roleTotal = ref(100)
 const treeRef = ref(null)
 const admin = ref({
diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue
index 887d76c..a391b9e 100644
--- a/src/views/permissions/userPermission.vue
+++ b/src/views/permissions/userPermission.vue
@@ -874,15 +874,10 @@ onMounted(async function () {
   await getRoles()
   await getRoleArea()
 })
-
-
 </script>
 
 <template>
   <div>
-    <!--搜索菜单-->
-    <el-row>
-      <el-col>
         <el-card style="margin-bottom: 20px;margin-top:10px">
           <div class="head-card">
             <div class="head-card-element">
@@ -914,11 +909,6 @@ onMounted(async function () {
             </div>
           </div>
         </el-card>
-      </el-col>
-    </el-row>
-    <!--表格-->
-    <el-row>
-      <el-col>
         <el-card>
           <!-- 展示表单 -->
           <div class="add-item">
@@ -987,15 +977,11 @@ onMounted(async function () {
                            @current-change="handleCurrentChange"></el-pagination>
           </div>
         </el-card>
-      </el-col>
-    </el-row>
   </div>
 
   <!-- 新增用户权限 -->
   <el-dialog v-model="userAddVisible" title="新增用户权限" width="800px" :close-on-click-modal="false"  @close="handleDialogClose">
     <template #footer>
-      <!-- 居中显示 -->
-
       <el-form ref="Ref" :rules="addUserRules" :model="addAdmin" label-width="auto"
                style="max-width: 600px; align-items: center">
         <el-form-item prop="account" label="OA号:" required clearable>
diff --git a/src/views/recharge/bean/addBeanRecharge.vue b/src/views/recharge/bean/addBeanRecharge.vue
index d6795de..69a8f1a 100644
--- a/src/views/recharge/bean/addBeanRecharge.vue
+++ b/src/views/recharge/bean/addBeanRecharge.vue
@@ -211,7 +211,7 @@ const handleAddForm = async () => {
     </el-form>
 
     <!-- 客户信息栏 -->
-    <el-card v-if="user.jwcode" style="width: 800px; float: right" class="customer-info">
+    <el-card v-if="user.jwcode" class="customer-info">
       <el-form :model="user" label-width="auto" style="max-width: 1000px" label-position="left">
         <el-text size="large" style="margin-left: 20px">客户信息</el-text>
 
@@ -275,7 +275,10 @@ const handleAddForm = async () => {
 }
 
 .customer-info {
-  max-width: 60%;
+  width: 700px;
+  float: right;
+  margin-right: 300px;
+  margin-top: 50px;
 }
 
 p {
diff --git a/src/views/recharge/bean/beanOnlineRecharge.vue b/src/views/recharge/bean/beanOnlineRecharge.vue
index 4f6180f..1c2bc6b 100644
--- a/src/views/recharge/bean/beanOnlineRecharge.vue
+++ b/src/views/recharge/bean/beanOnlineRecharge.vue
@@ -1,8 +1,8 @@
 <script setup>
-import {ref, onMounted, reactive, computed} from 'vue'
+import { ref, onMounted, reactive, computed } from 'vue'
 import ElementPlus from 'element-plus'
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {AiFillRead} from 'vue-icons-plus/ai'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { AiFillRead } from 'vue-icons-plus/ai'
 import axios from 'axios'
 import moment from 'moment'
 import API from '@/util/http.js'
@@ -73,15 +73,15 @@ const getArea = async () => {
 const getToday = () => {
   const today = new Date()
   const startTime = new Date(
-      today.getFullYear(),
-      today.getMonth(),
-      today.getDate(),
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate(),
   )
   const endTime = new Date(
-      today.getFullYear(),
-      today.getMonth(),
-      today.getDate(),
-      23, 59, 59
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate(),
+    23, 59, 59
   )
   getTime.value = [startTime, endTime]
   activeTimeRange.value = 'today'
@@ -92,15 +92,15 @@ const getYesterday = () => {
   const yesterday = new Date()
   yesterday.setDate(yesterday.getDate() - 1)
   const startTime = new Date(
-      yesterday.getFullYear(),
-      yesterday.getMonth(),
-      yesterday.getDate()
+    yesterday.getFullYear(),
+    yesterday.getMonth(),
+    yesterday.getDate()
   )
   const endTime = new Date(
-      yesterday.getFullYear(),
-      yesterday.getMonth(),
-      yesterday.getDate(),
-      23, 59, 59
+    yesterday.getFullYear(),
+    yesterday.getMonth(),
+    yesterday.getDate(),
+    23, 59, 59
   )
   getTime.value = [startTime, endTime]
   activeTimeRange.value = 'yesterday'
@@ -111,15 +111,15 @@ const getYesterday = () => {
 const get7Days = function () {
   const today = new Date()
   const startTime = new Date(
-      today.getFullYear(),
-      today.getMonth(),
-      today.getDate() - 6
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() - 6
   )
   const endTime = new Date(
-      today.getFullYear(),
-      today.getMonth(),
-      today.getDate(),
-      23, 59, 59
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate(),
+    23, 59, 59
   )
   getTime.value = [startTime, endTime]
   activeTimeRange.value = '7days'
@@ -247,7 +247,7 @@ const exportExcel = async () => {
     },
   }
   try {
-    const res = await API({url: '/export/exportol', data: params})
+    const res = await API({ url: '/export/exportol', data: params })
     if (res.code === 200) {
       ElMessage.success('导出成功')
     } else {
@@ -274,7 +274,7 @@ const exportListLoading = ref(false)
 const getExportList = async () => {
   exportListLoading.value = true
   try {
-    const result = await API({url: '/export/export'})
+    const result = await API({ url: '/export/export' })
     if (result.code === 200) {
       const filteredData = result.data.filter(item => {
         return item.type === 10;
@@ -342,59 +342,53 @@ onMounted(async function () {
 })
 </script>
 <template>
-  <el-row>
-    <el-col>
       <el-card style="margin-bottom: 20px;margin-top: 10px">
         <el-row style="margin-bottom: 10px">
           <el-col :span="5">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">精网号：</el-text>
-              <el-input v-model="selectData.jwcode" placeholder="请输入精网号" style="width: 150px" clearable/>
+              <el-input v-model="selectData.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
             </div>
           </el-col>
           <el-col :span="6">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">所属地区：</el-text>
               <el-select v-model="selectData.market" placeholder="请选择所属地区" clearable style="width:150px">
-                <el-option v-for="item in market" :key="item" :label="item" :value="item"/>
+                <el-option v-for="item in market" :key="item" :label="item" :value="item" />
               </el-select>
             </div>
           </el-col>
           <el-col :span="5">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">订单号：</el-text>
-              <el-input v-model="selectData.orderNo" placeholder="请输入订单号" style="width: 150px"
-                        clearable/>
+              <el-input v-model="selectData.orderNo" placeholder="请输入订单号" style="width: 150px" clearable />
             </div>
           </el-col>
           <el-col :span="6">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">充值平台：</el-text>
-              <el-select v-model="selectData.platform" placeholder="请选择充值平台" clearable
-                         style="width:150px">
-                <el-option v-for="item in platform" :key="item.value" :label="item.label"
-                           :value="item.value"/>
+              <el-select v-model="selectData.platform" placeholder="请选择充值平台" clearable style="width:150px">
+                <el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </div>
           </el-col>
-
         </el-row>
 
         <el-row>
           <el-col :span="24">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">充值时间：</el-text>
-              <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
-                              start-placeholder="起始时间" end-placeholder="结束时间" style="width: 350px"
-                              @change="handleDatePickerChange" :default-time="defaultTime"/>
+              <el-text size="large">充值时间：</el-text>
+              <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
+                end-placeholder="结束时间" style="width: 350px" @change="handleDatePickerChange"
+                :default-time="defaultTime" />
               <el-button @click="getToday()" style="margin-left: 10px"
-                         :type="activeTimeRange === 'today' ? 'primary' : ''"> 今
+                :type="activeTimeRange === 'today' ? 'primary' : ''"> 今
               </el-button>
               <el-button @click="getYesterday()" style="margin-left: 10px"
-                         :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨
+                :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨
               </el-button>
               <el-button @click="get7Days()" style="margin-left: 10px"
-                         :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天
+                :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天
               </el-button>
               <el-button type="success" @click="reset()">重置</el-button>
               <el-button type="primary" @click="search()">查询</el-button>
@@ -404,33 +398,26 @@ onMounted(async function () {
           </el-col>
         </el-row>
       </el-card>
-    </el-col>
-  </el-row>
-  <el-row>
-    <el-col>
       <el-card>
         <div class="bean-info">
-          充值金豆数：{{ format3(num) }}, 合计新币数：{{ format3(money) }}。
-
+          充值金豆数：{{ format3(num) }}&nbsp;&nbsp;&nbsp;&nbsp;合计新币数：{{ format3(money) }}
         </div>
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 520px; overflow-y: auto;margin-top: 10px;">
           <el-table :data="tableData" style="width: 100%" height="520px" @sort-change="handleSortChange">
             <el-table-column type="index" label="序号" width="80px" fixed="left">
               <template #default="scope">
-                                <span>{{
-                                    scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
-                                  }}</span>
+                <span>{{
+                  scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column fixed="left" prop="name" label="姓名" min-width="120" show-overflow-tooltip/>
-            <el-table-column fixed="left" prop="jwcode" label="精网号" min-width="110px"/>
-            <el-table-column prop="market" label="所属地区" min-width="100px"/>
-            <el-table-column prop="orderNo" header-align="center" align="center" label="订单号"
-                             min-width="210px"/>
-            <el-table-column prop="num" label="数量" sortable="custom" min-width="110px"/>
-            <el-table-column prop="money" label="金额" sortable="custom" min-width="150px"
-                             show-overflow-tooltip/>
+            <el-table-column fixed="left" prop="name" label="姓名" min-width="120" show-overflow-tooltip />
+            <el-table-column fixed="left" prop="jwcode" label="精网号" min-width="110px" />
+            <el-table-column prop="market" label="所属地区" min-width="100px" />
+            <el-table-column prop="orderNo" header-align="center" align="center" label="订单号" min-width="210px" />
+            <el-table-column prop="num" label="数量" sortable="custom" min-width="110px" />
+            <el-table-column prop="money" label="金额" sortable="custom" min-width="150px" />
             <el-table-column prop="platform" label="充值平台" min-width="150px" show-overflow-tooltip>
               <template #default=scope>
                 <span v-if="scope.row.platform == 1">PC</span>
@@ -449,16 +436,14 @@ onMounted(async function () {
         <!-- 分页 -->
         <div class="pagination" style="margin-top: 20px">
           <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
-                         layout="total, sizes, prev, pager, next, jumper" :total="total"
-                         @size-change="handlePageSizeChange" @current-change="handleCurrentChange"></el-pagination>
+            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
+            @current-change="handleCurrentChange"></el-pagination>
         </div>
       </el-card>
-    </el-col>
-  </el-row>
   <!-- 导出弹窗 -->
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%" class="custom-height-dialog">
     <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
-      <el-table-column prop="fileName" label="文件名"/>
+      <el-table-column prop="fileName" label="文件名" />
       <el-table-column prop="state" label="状态">
         <template #default="scope">
           <el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'">
@@ -474,7 +459,7 @@ onMounted(async function () {
       <el-table-column label="操作">
         <template #default="scope">
           <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
-                     :disabled="scope.row.state !== 2">
+            :disabled="scope.row.state !== 2">
             下载
           </el-button>
         </template>
diff --git a/src/views/recharge/bean/beanSystemRecharge.vue b/src/views/recharge/bean/beanSystemRecharge.vue
index b030785..cfce448 100644
--- a/src/views/recharge/bean/beanSystemRecharge.vue
+++ b/src/views/recharge/bean/beanSystemRecharge.vue
@@ -329,8 +329,6 @@ onMounted(async function () {
 })
 </script>
 <template>
-    <el-row>
-        <el-col>
             <el-card style="margin-bottom: 20px;margin-top: 10px">
                 <el-row style="margin-bottom: 10px">
                     <el-col :span="3">
@@ -373,10 +371,6 @@ onMounted(async function () {
 
                 </el-row>
             </el-card>
-        </el-col>
-    </el-row>
-    <el-row>
-        <el-col>
             <el-card>
                 <div class="bean-info">
                     <!-- 汉字用 <strong> 加粗，动态数据用 <span> 包一层单独改色 -->
@@ -394,7 +388,7 @@ onMounted(async function () {
                                     }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column fixed="left" prop="name" label="姓名" min-width="100" />
+                        <el-table-column fixed="left" prop="name" label="姓名" min-width="100" show-overflow-tooltip />
                         <el-table-column fixed="left" prop="jwcode" label="精网号" min-width="110px" />
                         <el-table-column prop="market" label="所属地区" min-width="100px" />
                         <el-table-column prop="permanentBean" label="付费金豆" sortable="custom" min-width="110px" />
@@ -415,8 +409,6 @@ onMounted(async function () {
                         @size-change="handlePageSizeChange" @current-change="handleCurrentChange"></el-pagination>
                 </div>
             </el-card>
-        </el-col>
-    </el-row>
     <!-- 导出弹窗 -->
     <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
         <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue
index 3f2b62c..6667e6e 100644
--- a/src/views/recharge/gold/addCoinRecharge.vue
+++ b/src/views/recharge/gold/addCoinRecharge.vue
@@ -1,7 +1,7 @@
 <script setup>
-import {onMounted, reactive, ref} from 'vue'
-import {ElIcon, ElMessage, ElMessageBox} from 'element-plus'
-import {Plus, WarnTriangleFilled} from '@element-plus/icons-vue'
+import { onMounted, reactive, ref } from 'vue'
+import { ElIcon, ElMessage, ElMessageBox } from 'element-plus'
+import { Plus, WarnTriangleFilled } from '@element-plus/icons-vue'
 import axios from 'axios'
 import API from '@/util/http.js'
 import moment from 'moment'
@@ -82,7 +82,7 @@ const ReadCookiesTime = ref(null)
 const add = async function () {
   try {
 
-    const formattedRecharge = {...recharge.value}
+    const formattedRecharge = { ...recharge.value }
 
     // 将永久金币数、免费金币数和充值金额数乘以 100
     if (formattedRecharge.permanentGold) {
@@ -108,7 +108,7 @@ const add = async function () {
     //value 为充值时间
     WriteCookiesTime.value = recharge.value.payTime
     // 设置cookies,用户jwcode为key，value也是jwcode，过期时间为1天
-    Cookies.set(WriteCookies.value, WriteCookiesTime.value, {expires: 1, path: '/'});
+    Cookies.set(WriteCookies.value, WriteCookiesTime.value, { expires: 1, path: '/' });
     // 发送POST请求
     addDisabled.value = true
     const result = await API({
@@ -152,20 +152,20 @@ const RechargeDialogVisibleContinue = () => {
 
 const RechargeDialogVisibleCancel = () => {
   RechargeDialogVisible.value = false
-    deleteRecharge()
-    user.value = {}
+  deleteRecharge()
+  user.value = {}
 };
 
 // 实际执行充值操作
 const proceedWithRecharge = () => {
   ElMessageBox.confirm('确认充值？')
-      .then(() => {
-        add();
-        console.log('充值成功');
-      })
-      .catch(() => {
-        console.log('取消充值');
-      });
+    .then(() => {
+      add();
+      console.log('充值成功');
+    })
+    .catch(() => {
+      console.log('取消充值');
+    });
 };
 
 // 添加充值信息前的按钮点击事件，进行表单验证和用户确认操作
@@ -263,9 +263,9 @@ const rules = reactive({
       callback();
     }, trigger: 'blur'
   }],
-  activity: [{required: true, message: '请选择活动名称', trigger: 'blur'}],
+  activity: [{ required: true, message: '请选择活动名称', trigger: 'blur' }],
   permanentGold: [
-    {required: true, message: '请输入永久金币数', trigger: 'change'},
+    { required: true, message: '请输入永久金币数', trigger: 'change' },
     {
       validator: (rule, value, callback) => {
         if (!value) {
@@ -306,7 +306,7 @@ const rules = reactive({
     }
   ],
   freeGold: [
-    {required: true, message: '请输入免费金币数', trigger: 'change'},
+    { required: true, message: '请输入免费金币数', trigger: 'change' },
     {
       validator: (rule, value, callback) => {
         if (!value) {
@@ -353,7 +353,7 @@ const rules = reactive({
   }],
 
   money: [
-    {required: true, message: '请输入充值金额', trigger: 'blur'},
+    { required: true, message: '请输入充值金额', trigger: 'blur' },
     {
       validator: (rule, value, callback) => {
         // 检查是否包含特殊符号
@@ -390,8 +390,8 @@ const rules = reactive({
       trigger: 'blur'
     }
   ],
-  payModel: [{required: true, message: '请选择付款方式', trigger: 'blur'}],
-  payTime: [{required: true, message: '请选择交款时间', trigger: 'blur'}]
+  payModel: [{ required: true, message: '请选择付款方式', trigger: 'blur' }],
+  payTime: [{ required: true, message: '请选择交款时间', trigger: 'blur' }]
 });
 
 // 查找客户信息的方法
@@ -557,7 +557,7 @@ const handleAvatarSuccess = (response, file) => {
 
 //支付方式条目
 const payModel = [
-{
+  {
     value: '银行转账',
     label: '银行转账'
   },
@@ -644,74 +644,49 @@ onMounted(() => {
 
 <template>
   <div>
-
     <el-form :model="recharge" ref="Ref" :rules="rules" label-width="auto" label-position="right"
-             style="max-width: 600px" class="add-form">
+      style="max-width: 600px" class="add-form">
       <el-form-item prop="jwcode" label="精网号">
-        <el-input v-model="recharge.jwcode" style="width: 220px"/>
+        <el-input v-model="recharge.jwcode" style="width: 220px" />
         <el-button type="primary" @click="getUser(recharge.jwcode)" style="margin-left: 20px">查询</el-button>
       </el-form-item>
       <el-form-item prop="activity" label="活动名称">
-        <el-input v-model="recharge.activity" placeholder="请输入活动名称" style="width: 300px"/>
+        <el-input v-model="recharge.activity" placeholder="请输入活动名称" style="width: 300px" />
       </el-form-item>
       <el-form-item prop="permanentGold" label="永久金币">
-        <el-input v-model="recharge.permanentGold" placeholder="0" style="width: 100px"/>
+        <el-input v-model="recharge.permanentGold" placeholder="0" style="width: 100px" />
         <p>&nbsp;个</p>
-
       </el-form-item>
       <el-form-item prop="freeGold" label="免费金币">
-
-        <el-input v-model="recharge.freeGold" placeholder="0" style="width: 100px"/>
+        <el-input v-model="recharge.freeGold" placeholder="0" style="width: 100px" />
         <p>&nbsp;个</p>
-
       </el-form-item>
-      <!-- <el-form-item label="充值金额">
-      <el-select
-        prop="moneys"
-        v-model="rateName"
-        placeholder="货币名称"
-        style="width: 95px; margin-right: 5px"
-        aria-required="true"
-      >
-        <el-option
-          v-for="item in rateName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
-      </el-select>
-      <el-input prop="money" v-model="recharge.money" style="width: 200px" aria-required="true"/>
-    </el-form-item> -->
-
       <el-form-item label="充值金额" required>
-        <!-- 货币名称 -->
         <el-form-item prop="rateName" style="display: inline-block; margin-left:0;">
           <el-select v-model="recharge.rateName" placeholder="货币名称" style="width: 100px">
-            <el-option v-for="item in rateName" :key="item.value" :label="item.label" :value="item.value"/>
+            <el-option v-for="item in rateName" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
-
-        <!-- 充值金额 -->
         <el-form-item prop="money" style="display: inline-block; margin-left:10px;">
-          <el-input v-model="recharge.money" style="width: 190px"/>
+          <el-input v-model="recharge.money" style="width: 190px" />
         </el-form-item>
       </el-form-item>
 
       <el-form-item prop="payModel" label="收款方式">
         <el-select v-model="recharge.payModel" placeholder="请选择" style="width: 300px">
-          <el-option v-for="item in payModel" :key="item.value" :label="item.label" :value="item.value"/>
+          <el-option v-for="item in payModel" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item prop="payTime" label="交款时间">
         <!-- 修改 type 属性为 datetime 以支持时分秒选择 -->
-        <el-date-picker v-model="recharge.payTime" type="datetime" style="width: 300px"/>
+        <el-date-picker v-model="recharge.payTime" type="datetime" style="width: 300px" />
       </el-form-item>
       <el-form-item prop="voucher" label="交款凭证" style="margin-bottom: 5px">
         <el-upload :http-request="customUpload" class="avatar-uploader" :show-file-list="false"
-                   :before-upload="beforeAvatarUpload" style="width: 100px; height: 115px">
-          <img v-if="imageUrl" :src="imageUrl" class="avatar" style="width: 100px; height: 115px"/>
+          :before-upload="beforeAvatarUpload" style="width: 100px; height: 115px">
+          <img v-if="imageUrl" :src="imageUrl" class="avatar" style="width: 100px; height: 115px" />
           <el-icon v-else class="avatar-uploader-icon" style="width: 100px; height: 100px">
-            <Plus/>
+            <Plus />
           </el-icon>
         </el-upload>
         <p style="margin-left: 10px; color: rgb(177, 176, 176)">
@@ -720,15 +695,15 @@ onMounted(() => {
       </el-form-item>
       <el-form-item prop="remark" label="备注">
         <el-input v-model="recharge.remark" style="width: 300px" :rows="4" maxlength="100" show-word-limit
-                  type="textarea"/>
+          type="textarea" />
       </el-form-item>
 
-      <el-button @click="deleteRecharge" style="margin-left: 280px" type="success">重置</el-button>
-      <el-button type="primary" :disabled="addDisabled" @click="addBefore"> 提交</el-button>
+      <el-button @click="deleteRecharge" style="margin-left: 220px;margin-top:20px" type="success">重置</el-button>
+      <el-button type="primary" style="margin-top:20px" :disabled="addDisabled" @click="addBefore"> 提交</el-button>
     </el-form>
 
     <!-- 客户信息栏 -->
-    <el-card v-if="user.jwcode" style="width: 800px; float: right" class="customer-info">
+    <el-card v-if="user.jwcode" class="beautiful">
       <el-form :model="user" label-width="auto" style="max-width: 1000px" label-position="left">
         <el-text size="large" style="margin-left: 20px">客户信息</el-text>
 
@@ -751,7 +726,7 @@ onMounted(() => {
             </el-form-item>
             <el-form-item style="margin-top: -23px">
               <span style="display: inline; white-space: nowrap; color: #b1b1b1"
-                    v-if="user.historyPermanentGold !== undefined">(永久金币:{{
+                v-if="user.historyPermanentGold !== undefined">(永久金币:{{
                   user.historyPermanentGold / 100
                 }};免费金币:{{
                   (user.historyFreeGold) / 100
@@ -770,15 +745,15 @@ onMounted(() => {
           <el-col :span="14">
             <el-form-item label="当前金币总数" style="width: 500px">
               <span style="color: #2fa1ff; margin-right: 5px" v-if="user.nowSumGold !== undefined">{{
-                  user.nowSumGold
-                  / 100
-                }}</span>
+                user.nowSumGold
+                / 100
+              }}</span>
             </el-form-item>
             <!-- 金币详情独立显示 -->
             <el-form-item style="margin-top: -23px"> <!-- 负边距减少间距 -->
               <span style="color: #b1b1b1; margin-left: 0px" v-if="user.nowPermanentGold !== undefined">(永久金币:{{
-                  user.nowPermanentGold / 100
-                }};
+                user.nowPermanentGold / 100
+              }};
                 免费金币:{{ user.nowFreeGold / 100 }};
                 任务金币:{{ user.nowTaskGold / 100 }})</span>
             </el-form-item>
@@ -817,50 +792,45 @@ onMounted(() => {
       </el-form>
     </el-card>
 
-    <el-dialog
-        v-model="RechargeDialogVisible"
-        title="操作确认"
-        :before-close="RechargeDialogVisiblehandleClose"
-        :close-on-click-modal="false"
-        width="480px"
-    >
+    <el-dialog v-model="RechargeDialogVisible" title="操作确认" :before-close="RechargeDialogVisiblehandleClose"
+      :close-on-click-modal="false" width="480px">
       <!-- 内容整体居中且收窄 -->
       <div class="confirm-body">
         <!-- 用户信息 -->
         <div>
           <div class="field-label">用户信息</div>
-          <el-input :model-value="user.jwcode + (user.name ? '【' + user.name + '】' : '')" disabled/>
+          <el-input :model-value="user.jwcode + (user.name ? '【' + user.name + '】' : '')" disabled />
         </div>
         <!-- 活动名称 -->
         <div class="field">
           <div class="field-label">活动名称</div>
-          <el-input v-model="recharge.activity" disabled/>
+          <el-input v-model="recharge.activity" disabled />
         </div>
         <!-- 金币信息（同一行左右排列） -->
         <el-row :gutter="20" class="coins-row">
           <el-col :span="12">
             <div class="field">
               <div class="field-label">永久金币</div>
-              <el-input v-model="recharge.permanentGold" disabled/>
+              <el-input v-model="recharge.permanentGold" disabled />
             </div>
           </el-col>
           <el-col :span="12">
             <div class="field">
               <div class="field-label">免费金币</div>
-              <el-input v-model="recharge.freeGold" disabled/>
+              <el-input v-model="recharge.freeGold" disabled />
             </div>
           </el-col>
         </el-row>
         <!-- 风险提示 -->
         <div style="display: flex; align-items: center; margin-top: 20px;">
           <el-icon :size="24" color="#FFD700">
-            <WarnTriangleFilled/>
+            <WarnTriangleFilled />
           </el-icon>
           <p>重复充值风险提示</p>
         </div>
         <!-- 记录 + 虚线分隔 -->
         <div>
-          <el-divider border-style="dashed"/>
+          <el-divider border-style="dashed" />
           <p>检测到该用户近期有相似充值记录：</p>
           · {{ ReadCookiesTime }} 充值永久金币: {{ recharge.permanentGold }}
           免费金币: {{ recharge.freeGold }}(操作人：{{ adminData.adminName }})
@@ -909,78 +879,11 @@ p {
   max-width: 50%;
   float: left;
 }
-</style>
 
-<style>
-.error-message {
-  color: red;
-  font-size: 8px;
+.beautiful {
+  width: 700px;
+  float: right;
+  margin-right: 300px;
+  margin-top: 150px;
 }
-
-.is-invalid .el-input__inner {
-  border-color: red;
-}
-
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 50px;
-  height: 50px;
-  text-align: center;
-}
-
-
-
-.customer-info {
-  max-width: 60%;
-}
-
-/* 标题居中 */
-.el-dialog__header {
-  text-align: center;
-}
-
-
-.confirm-body {
-  width: 420px;
-  margin: 0 auto;
-}
-
-/* 字段块与标签样式 */
-.field {
-  margin-top: 10px;
-}
-
-.field-label {
-  font-size: 14px;
-  color: #606266;
-  margin-bottom: 6px;
-}
-
-/* 金币行紧凑 */
-.coins-row .field {
-  margin-bottom: 0;
-}
-
-/* 底部按钮居中 */
-.dialog-footer-center {
-  display: flex;
-  justify-content: center;
-  gap: 12px;
-}
-
-
 </style>
\ No newline at end of file
diff --git a/src/views/recharge/gold/coinRechargeDetail.vue b/src/views/recharge/gold/coinRechargeDetail.vue
index de361a9..c40409b 100644
--- a/src/views/recharge/gold/coinRechargeDetail.vue
+++ b/src/views/recharge/gold/coinRechargeDetail.vue
@@ -588,19 +588,17 @@ const getTagText = (state) => {
 </script>
 
 <template>
-  <el-row>
-    <el-col>
       <el-card style="margin-bottom: 20px;margin-top: 10px">
         <el-row style="margin-bottom: 10px">
           <el-col :span="5">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">精网号：</el-text>
+              <el-text  size="large">精网号：</el-text>
               <el-input v-model="rechargeUser.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
             </div>
           </el-col>
           <el-col :span="5">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">活动名称：</el-text>
+              <el-text  size="large">活动名称：</el-text>
               <el-select v-model="rechargeUser.activity" placeholder="请选择活动名称" style="width: 180px" clearable>
                 <el-option v-for="item in activity" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
@@ -608,14 +606,14 @@ const getTagText = (state) => {
           </el-col>
           <el-col :span="5">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">所属地区：</el-text>
+              <el-text  size="large">所属地区：</el-text>
               <el-cascader v-model="selectedMarketPath" :options="market" placeholder="请选择所属地区" clearable
                 style="width:180px" @change="handleMarketChange" />
             </div>
           </el-col>
           <el-col :span="5">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">充值方式：</el-text>
+              <el-text  size="large">充值方式：</el-text>
               <el-select v-model="rechargeUser.payPlatform" placeholder="请选择充值方式" style="width: 180px" clearable>
                 <el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
@@ -630,7 +628,7 @@ const getTagText = (state) => {
         <el-row>
           <el-col :span="24">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">充值时间：</el-text>
+              <el-text  size="large">充值时间：</el-text>
               <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
                 end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"
                 :default-time="defaultTime" :disabled-date="disabledDate"/>
@@ -651,10 +649,6 @@ const getTagText = (state) => {
           </el-col>
         </el-row>
       </el-card>
-    </el-col>
-  </el-row>
-  <el-row>
-    <el-col>
       <el-card>
         <div>
           充值新币：{{ format3(permanentGolds) }}新币&nbsp;&nbsp;&nbsp;&nbsp;
@@ -672,7 +666,7 @@ const getTagText = (state) => {
                 }}</span>
               </template>
             </el-table-column>
-            <el-table-column fixed="left" prop="name" label="姓名" width="150px" />
+            <el-table-column fixed="left" prop="name" label="姓名" width="150px" show-overflow-tooltip />
             <el-table-column fixed="left" prop="jwcode" label="精网号" width="110px" />
             <el-table-column prop="market" label="所属地区" width="100px" />
             <el-table-column prop="activity" label="活动名称" width="110px" show-overflow-tooltip />
@@ -680,7 +674,7 @@ const getTagText = (state) => {
             <el-table-column prop="money" sortable="custom" label="充值金额" width="110px" />
             <el-table-column prop="permanentGold" label="永久金币" sortable="custom" width="110px" />
             <el-table-column prop="freeGold" label="免费金币" sortable="custom" width="110px" />
-            <el-table-column prop="payPlatform" label="充值方式" width="100px" />
+            <el-table-column prop="payPlatform" label="充值方式" width="120px" />
             <el-table-column prop="payModel" label="支付方式" width="100px" />
             <el-table-column prop="remark" label="备注" width="150px" show-overflow-tooltip />
             <el-table-column prop="adminName" label="提交人" width="100px" />
@@ -699,8 +693,6 @@ const getTagText = (state) => {
             @current-change="handleCurrentChange"></el-pagination>
         </div>
       </el-card>
-    </el-col>
-  </el-row>
   <!-- 导出弹窗 -->
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
     <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
@@ -738,19 +730,7 @@ const getTagText = (state) => {
   display: flex;
 }
 
-.status {
-  display: flex;
-}
-
-.head-card {
-  display: flex;
-}
-
 .head-card-element {
   margin-right: 20px;
 }
-
-.head-card-btn {
-  margin-left: auto;
-}
 </style>
\ No newline at end of file
diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue
index f26e5df..43367ea 100644
--- a/src/views/refund/gold/addCoinRefund.vue
+++ b/src/views/refund/gold/addCoinRefund.vue
@@ -506,7 +506,7 @@ onMounted(async function () {
     </el-form>
 
     <!-- 客户信息栏 -->
-    <el-card v-if="user.jwcode" style="width: 800px; float: right" class="customer-info">
+    <el-card v-if="user.jwcode" class="beautiful">
       <el-form :model="user" label-width="auto" style="max-width: 1000px" label-position="left">
         <el-text size="large" style="margin-left: 20px">客户信息</el-text>
 
@@ -635,4 +635,11 @@ p {
   font-size: 13px;
   transform: scale(1);
 }
+
+.beautiful {
+  width: 700px;
+  float: right;
+  margin-right: 300px;
+  margin-top: 150px;
+}
 </style>
diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue
index fdfb370..77a7989 100644
--- a/src/views/refund/gold/coinRefundDetail.vue
+++ b/src/views/refund/gold/coinRefundDetail.vue
@@ -515,33 +515,31 @@ const getMarket = async function () {
 </script>
 
 <template>
-  <el-row>
-    <el-col>
       <el-card style="margin-bottom: 20px;margin-top:10px">
         <el-row style="margin-bottom: 10px">
           <el-col :span="5">
             <div class="head-card-element">
-              <el-text class="mx-1">精网号：</el-text>
+              <el-text>精网号：</el-text>
               <el-input v-model="refundUser.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
             </div>
           </el-col>
 
           <el-col :span="5">
             <div class="head-card-element">
-              <el-text class="mx-1">商品名称：</el-text>
+              <el-text>商品名称：</el-text>
               <el-select v-model="refundUser.goodsName" placeholder="请选择商品名称" style="width: 180px" clearable>
                 <el-option v-for="item in goods" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </div>
           </el-col>
           <el-col :span="5">
-            <el-text class="mx-1" size="large">所属地区：</el-text>
+            <el-text size="large">所属地区：</el-text>
             <el-cascader v-model="selectedMarketPath" :options="market" placeholder="请选择所属地区" clearable
               style="width:180px" @change="handleMarketChange" />
           </el-col>
           <el-col :span="5">
             <div class="head-card-element">
-              <el-text class="mx-1">退款类型：</el-text>
+              <el-text>退款类型：</el-text>
               <el-select v-model="refundUser.refundType" placeholder="请选择退款类型" style="width: 180px" clearable>
                 <!--                todo 这需要改-->
                 <el-option v-for="item in refundType" :key="item.value" :label="item.label" :value="item.value" />
@@ -557,7 +555,7 @@ const getMarket = async function () {
         <el-row>
           <el-col :span="24">
             <div class="head-card-element">
-              <el-text class="mx-1">退款时间：</el-text>
+              <el-text>退款时间：</el-text>
               <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
                 end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"
                 :default-time="defaultTime" :disabled-date="disabledDate"/>
@@ -579,10 +577,6 @@ const getMarket = async function () {
           </el-col>
         </el-row>
       </el-card>
-    </el-col>
-  </el-row>
-  <el-row>
-    <el-col>
       <el-card>
         <div>
           退款金币总数：{{ format3(Math.abs(sumGolds).toFixed(2)) }}&nbsp;&nbsp;&nbsp;&nbsp;
@@ -601,22 +595,12 @@ const getMarket = async function () {
 
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="姓名" fixed="left" width="130px" />
+            <el-table-column prop="name" label="姓名" fixed="left" width="130px" show-overflow-tooltip />
             <el-table-column prop="jwcode" label="精网号" fixed="left" width="110px" />
             <el-table-column prop="market" label="所属地区" width="110px" />
             <el-table-column prop="goodsName" label="商品名称" width="110px" show-overflow-tooltip />
             <el-table-column prop="refundType" label="退款类型" width="100px" />
-
-            <!-- <el-table-column label="金额总数" width="110px">
-              <template #default="scope">
-                {{
-                  scope.row.sumGold
-                }}
-              </template>
-            </el-table-column> -->
-
             <el-table-column prop="sumGold" label="金额总数" width="110px" sortable="custom" />
-
             <el-table-column prop="refundModel" label="退款方式" width="110px">
               <template #default="scope">
                 {{ scope.row.refundModel === 0 ? '全部退款' : scope.row.refundModel === 1 ? '部分退款' : '' }}
@@ -625,10 +609,8 @@ const getMarket = async function () {
             <el-table-column prop="permanentGold" label="永久金币" width="110px" sortable="custom" />
             <el-table-column prop="freeGold" sortable="custom" label="免费金币" width="110px" />
             <el-table-column prop="taskGold" sortable="custom" label="任务金币" width="110px" />
-            <!-- 修改prop为taskGold -->
             <el-table-column prop="remark" label="退款原因" width="160px" show-overflow-tooltip />
             <el-table-column prop="adminName" label="提交人" width="100px" />
-
             <el-table-column prop="createTime" sortable="custom" label="提交时间" width="180px">
               <template #default="scope">
                 {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
@@ -638,14 +620,12 @@ const getMarket = async function () {
         </div>
 
         <!-- 分页 -->
-        <div class="pagination" style="margin-top: 20px">
+        <div class="pagination" style="margin-top: 20px;display: flex;">
           <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
             layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
             @current-change="handleCurrentChange" @jump="checkPageNumber"></el-pagination>
         </div>
       </el-card>
-    </el-col>
-  </el-row>
 
   <!-- 导出弹窗 -->
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
@@ -681,24 +661,7 @@ const getMarket = async function () {
 </template>
 
 <style scoped>
-.status {
-  display: flex;
-}
-
-.head-card {
-  display: flex;
-}
-
 .head-card-element {
   margin-right: 20px;
 }
-
-.head-card-btn {
-  margin-left: auto;
-}
-
-.pagination {
-  display: flex;
-  margin-top: 20px;
-}
 </style>
diff --git a/src/views/usergold/gold/clientCountBalance.vue b/src/views/usergold/gold/clientCountBalance.vue
index 1287483..e80e963 100644
--- a/src/views/usergold/gold/clientCountBalance.vue
+++ b/src/views/usergold/gold/clientCountBalance.vue
@@ -1,10 +1,10 @@
 <script setup>
 // 这是客户金币余额页面
-import {onMounted, ref} from 'vue'
-import {ElMessage} from 'element-plus'
+import { onMounted, ref } from 'vue'
+import { ElMessage } from 'element-plus'
 import moment from 'moment'
 import API from '@/util/http.js'
-import {reverseMarketMapping} from "@/utils/marketMap.js";
+import { reverseMarketMapping } from "@/utils/marketMap.js";
 
 //新增员工数据复选框
 const showEmployeeData = ref(true)
@@ -16,7 +16,7 @@ const adminData = ref({})
 const dialogVisible = ref(false)
 const getAdminData = async function () {
   try {
-    const result = await API({url: '/admin/userinfo', data: {}})
+    const result = await API({ url: '/admin/userinfo', data: {} })
     adminData.value = result
     // console.log('请求成功', result)
     console.log('管理员用户信息', adminData.value)
@@ -86,7 +86,7 @@ const get = async function (val) {
 
     // 发送POST请求
 
-    const requestData = {...getObj.value, user: {...user.value}};//控制台打印请求的参数
+    const requestData = { ...getObj.value, user: { ...user.value } };//控制台打印请求的参数
     console.log('最终请求参数', JSON.stringify(requestData, null, 2)); // 打印格式化后的请求参数
 
     //console.log('请求参数', requestData);
@@ -108,7 +108,7 @@ const get = async function (val) {
     const result = await API({
       url: '/goldDetail/getGold',
       method: 'post',
-      data: {...getObj.value, user: {...user.value, flag: showEmployeeData.value? 0 : 1}}
+      data: { ...getObj.value, user: { ...user.value, flag: showEmployeeData.value ? 0 : 1 } }
     })
     console.log('响应数据', result)
     tableData.value = result.data.list
@@ -121,7 +121,7 @@ const get = async function (val) {
       data: {
         jwcode: user.value.jwcode,
         markets: user.value.markets,
-      flag: showEmployeeData.value? 0 : 1
+        flag: showEmployeeData.value ? 0 : 1
       }
     })
     // 判断精网号是否存在，假设精网号不存在时 result.data.list 为空数组
@@ -144,7 +144,7 @@ const get = async function (val) {
       // ElMessage.warning('精网号不存在，请检查输入')
     }
     // 判断合计数是否存在,不存在时 result.data.list 为空数组
-    else if(resultGoldTotal.data===0){
+    else if (resultGoldTotal.data === 0) {
       // 将表格数据设置为空数组
       tableData.value = []
       // 将合计数设置为 0
@@ -250,11 +250,11 @@ const exportExcel = async function () {
     user: {
       jwcode: user.value.jwcode || '',
       markets: user.value.markets || [],
-    flag: showEmployeeData.value? 0 : 1
+      flag: showEmployeeData.value ? 0 : 1
     }
 
   }
-  const res = await API({url: '/goldDetail/exportGold', data: params})
+  const res = await API({ url: '/goldDetail/exportGold', data: params })
   if (res.code === 200) {
     ElMessage.success('导出成功')
   }
@@ -276,7 +276,7 @@ const exportListLoading = ref(false)
 const getExportList = async () => {
   exportListLoading.value = true
   try {
-    const result = await API({url: '/export/export'})
+    const result = await API({ url: '/export/export' })
     if (result.code === 200) {
       const filteredData = result.data.filter(item => {
         return item.type === 1; //返回type為0即客户金币余额的数据
@@ -365,8 +365,8 @@ const getMarket = async function () {
 
       return allChildren.map(child => {
         const grandchildren = child.children && child.children.length
-            ? transformTree([child]) // 递归处理子节点
-            : null;
+          ? transformTree([child]) // 递归处理子节点
+          : null;
 
         return {
           value: child.name,
@@ -383,35 +383,27 @@ const getMarket = async function () {
   }
 }
 const format3 = (num) => {
-    // 每三位添加逗号
-    return num.toLocaleString('en-US')
+  // 每三位添加逗号
+  return num.toLocaleString('en-US')
 }
 
 </script>
 
 <template>
-  <el-row>
-    <el-col>
       <el-card style="margin-bottom: 20px;margin-top: 10px">
         <div class="head-card">
           <div class="head-card-element">
-            <el-text class="mx-1" size="large">精网号：</el-text>
-            <el-input v-model="user.jwcode" style="width: 160px" placeholder="请输入精网号" clearable/>
+            <el-text size="large">精网号：</el-text>
+            <el-input v-model="user.jwcode" style="width: 160px" placeholder="请输入精网号" clearable />
           </div>
           <div class="head-card-element">
-            <el-text class="mx-1" size="large">所属地区：</el-text>
-            <el-cascader
-                v-model="selectedMarketPath"
-                :options="markets"
-                placeholder="请选择所属地区"
-                clearable
-                style="width:180px"
-                @change="handleMarketChange"
-            />
+            <el-text size="large">所属地区：</el-text>
+            <el-cascader v-model="selectedMarketPath" :options="markets" placeholder="请选择所属地区" clearable
+              style="width:180px" @change="handleMarketChange" />
+          </div>
+          <div class="head-card-element">
+            <el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox>
           </div>
-            <div class="head-card-element">
-              <el-checkbox v-model="showEmployeeData" @change="search()">员工数据</el-checkbox>
-            </div>
           <el-button type="primary" @click="search()">查询</el-button>
           <el-button @click="reset" type="success">重置</el-button>
 
@@ -420,127 +412,120 @@ const format3 = (num) => {
         </div>
         <!-- </div> -->
       </el-card>
-    </el-col>
-  </el-row>
-  <el-row>
-    <el-col>
-      <el-card>
-        <div>
-          金币总数：{{ format3(goldtotal || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
-          永久金币：{{ format3(permanentGold  || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
-          免费金币：{{ format3(freeGold  || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
-          任务金币：{{ format3(taskGold  || 0) }}
-        </div>
-        <!-- 设置表格容器的高度和滚动样式 -->
-        <div style="height: 626px; overflow-y: auto">
-          <el-table :data="tableData" @cellClick="cellClick" style="width: 100%" height="626px"
-                    @sort-change="handleSortChange">
-            <el-table-column type="index" label="序号" width="100px" fixed="left">
-              <template #default="scope">
-                <span>{{
-                    scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
-                  }}</span>
+  <el-card>
+    <div>
+      金币总数：{{ format3(goldtotal || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
+      永久金币：{{ format3(permanentGold || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
+      免费金币：{{ format3(freeGold || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
+      任务金币：{{ format3(taskGold || 0) }}
+    </div>
+    <!-- 设置表格容器的高度和滚动样式 -->
+    <div style="height: 626px; overflow-y: auto">
+      <el-table :data="tableData" @cellClick="cellClick" style="width: 100%" height="626px"
+        @sort-change="handleSortChange">
+        <el-table-column type="index" label="序号" width="100px" fixed="left">
+          <template #default="scope">
+            <span>{{
+              scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="姓名" width="120" show-overflow-tooltip />
+        <el-table-column prop="jwcode" label="精网号" width="120" />
+        <el-table-column prop="market" label="所属地区" width="120" />
+        <el-table-column prop="allJb" label="金币总数" width="120" aligh="center">
+          <template #default="scope">
+            <span>{{
+              ((scope.row.currentPermanentGold || 0) +
+                (scope.row.currentFreeJune || 0) +
+                (scope.row.currentFreeDecember || 0) +
+                (scope.row.currentTaskGold || 0))
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="currentPermanentGold" label="永久金币" sortable="custom" width="110">
+          <template #default="scope">
+            <span>{{ (scope.row.currentPermanentGold || 0) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="currentFreeJune" label="6月份到期免费金币" sortable="custom" width="110">
+          <template #default="scope">
+            <span>{{ (scope.row.currentFreeJune || 0) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="currentFreeDecember" label="12月份到期免费金币" sortable="custom" width="110">
+          <template #default="scope">
+            <span>{{ (scope.row.currentFreeDecember || 0) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="currentTaskGold" label="任务金币" sortable="custom" width="130">
+          <template #default="scope">
+            <span>{{ (scope.row.currentTaskGold || 0) }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="rcoin" label="历史金币总额" width="150">
+          <template #default="scope">
+            <el-popover trigger="hover" placement="left" width="150">
+              <template #default>
+                <div>
+                  <div>永久金币：{{ (scope.row.sumPermanentGold || 0) }}</div>
+                  <div>免费金币：{{ ((scope.row.sumFreeJune || 0) + (scope.row.sumFreeDecember || 0)) }}</div>
+                  <div>任务金币：{{ (scope.row.sumTaskGold || 0) }}</div>
+                </div>
               </template>
-            </el-table-column>
-            <el-table-column prop="name" label="姓名" width="120"/>
-            <el-table-column prop="jwcode" label="精网号" width="120"/>
-            <el-table-column prop="market" label="所属地区" width="120"/>
-            <el-table-column prop="allJb" label="金币总数" width="120" aligh="center">
-              <template #default="scope">
-                <span>{{
-                    ((scope.row.currentPermanentGold || 0) +
-                        (scope.row.currentFreeJune || 0) +
-                        (scope.row.currentFreeDecember || 0) +
-                        (scope.row.currentTaskGold || 0)) 
+              <template #reference>
+                <span>
+                  {{
+                    (scope.row.sumPermanentGold || 0) +
+                    (scope.row.sumFreeJune || 0) +
+                    (scope.row.sumFreeDecember || 0) +
+                    (scope.row.sumTaskGold || 0)
                   }}</span>
               </template>
-            </el-table-column>
-            <el-table-column prop="currentPermanentGold" label="永久金币" sortable="custom" width="110">
-              <template #default="scope">
-                <span>{{ (scope.row.currentPermanentGold || 0)  }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="currentFreeJune" label="6月份到期免费金币" sortable="custom" width="110">
-              <template #default="scope">
-                <span>{{ (scope.row.currentFreeJune || 0)  }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="currentFreeDecember" label="12月份到期免费金币" sortable="custom" width="110">
-              <template #default="scope">
-                <span>{{ (scope.row.currentFreeDecember || 0)  }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="currentTaskGold" label="任务金币" sortable="custom" width="130">
-              <template #default="scope">
-                <span>{{ (scope.row.currentTaskGold || 0)  }}</span>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column prop="sumConsume" label="历史消费" width="150">
+          <template #default="scope">
+            <el-popover trigger="hover" placement="left" width="150">
+              <template #default>
+                <div>
+                  <div>永久金币：{{ (scope.row.sumConsumeGold || 0) }}</div>
+                  <div>免费金币：{{
+                    ((scope.row.sumConsumeJune || 0) + (scope.row.sumConsumeDecember || 0))
+                  }}
+                  </div>
+                  <div>任务金币：{{ (scope.row.sumConsumeJune || 0) }}</div>
+                </div>
               </template>
-            </el-table-column>
-
-            <el-table-column prop="rcoin" label="历史金币总额" width="150">
-              <template #default="scope">
-                <el-popover trigger="hover" placement="left" width="150">
-                  <template #default>
-                    <div>
-                      <div>永久金币：{{ (scope.row.sumPermanentGold || 0)  }}</div>
-                      <div>免费金币：{{ ((scope.row.sumFreeJune || 0) + (scope.row.sumFreeDecember || 0))  }}</div>
-                      <div>任务金币：{{ (scope.row.sumTaskGold || 0)  }}</div>
-                    </div>
-                  </template>
-                  <template #reference>
-                    <span>
-                      {{
-                        (scope.row.sumPermanentGold || 0)  +
-                        (scope.row.sumFreeJune || 0)  +
-                        (scope.row.sumFreeDecember || 0)  +
-                        (scope.row.sumTaskGold || 0) 
-                      }}</span>
-                  </template>
-                </el-popover>
-              </template>
-            </el-table-column>
-            <el-table-column prop="sumConsume" label="历史消费" width="150">
-              <template #default="scope">
-                <el-popover trigger="hover" placement="left" width="150">
-                  <template #default>
-                    <div>
-                      <div>永久金币：{{ (scope.row.sumConsumeGold || 0)  }}</div>
-                      <div>免费金币：{{
-                          ((scope.row.sumConsumeJune || 0) + (scope.row.sumConsumeDecember || 0)) 
-                        }}
-                      </div>
-                      <div>任务金币：{{ (scope.row.sumConsumeJune || 0)  }}</div>
-                    </div>
-                  </template>
-                  <template #reference>
-                    <span>
-                      {{
-                        (scope.row.sumConsumeGold || 0)  +
-                        (scope.row.sumConsumeTaskGold || 0)  +
-                        (scope.row.sumConsumeJune || 0)  +
-                        (scope.row.sumConsumeDecember || 0) 
-                      }}</span>
-                  </template>
-                </el-popover>
+              <template #reference>
+                <span>
+                  {{
+                    (scope.row.sumConsumeGold || 0) +
+                    (scope.row.sumConsumeTaskGold || 0) +
+                    (scope.row.sumConsumeJune || 0) +
+                    (scope.row.sumConsumeDecember || 0)
+                  }}</span>
               </template>
+            </el-popover>
+          </template>
 
-            </el-table-column>
-          </el-table>
-        </div>
+        </el-table-column>
+      </el-table>
+    </div>
 
-        <!-- 分页 -->
-        <div class="pagination" style="margin-top: 20px">
-          <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
-                         layout="total, sizes, prev, pager, next, jumper" :total="total"
-                         @size-change="handlePageSizeChange"
-                         @current-change="handleCurrentChange"></el-pagination>
-        </div>
-      </el-card>
-    </el-col>
-  </el-row>
+    <!-- 分页 -->
+    <div class="pagination" style="margin-top: 20px;display: flex;">
+      <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
+        @current-change="handleCurrentChange"></el-pagination>
+    </div>
+  </el-card>
 
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
     <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
-      <el-table-column prop="fileName" label="文件名"/>
+      <el-table-column prop="fileName" label="文件名" />
       <el-table-column prop="state" label="状态">
         <template #default="scope">
           <el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'">
@@ -556,7 +541,7 @@ const format3 = (num) => {
       <el-table-column label="操作">
         <template #default="scope">
           <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
-                     :disabled="scope.row.state !== 2">
+            :disabled="scope.row.state !== 2">
             下载
           </el-button>
         </template>
@@ -568,18 +553,9 @@ const format3 = (num) => {
       </div>
     </template>
   </el-dialog>
-
 </template>
 
 <style scoped lang="scss">
-.pagination {
-  display: flex;
-}
-
-.status {
-  display: flex;
-}
-
 .head-card {
   display: flex;
 }
@@ -587,22 +563,4 @@ const format3 = (num) => {
 .head-card-element {
   margin-right: 20px;
 }
-
-.head-card-btn {
-  margin-left: auto;
-}
-
-.custom-box {
-  display: flex;
-  flex-wrap: wrap;
-  row-gap: 5px;
-
-  div:nth-child(1) {
-    flex: 1 0 100%;
-  }
-
-  div {
-    margin-right: 20px;
-  }
-}
 </style>
diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue
index 809f00c..7ae80c7 100644
--- a/src/views/usergold/gold/clientCountDetail.vue
+++ b/src/views/usergold/gold/clientCountDetail.vue
@@ -494,9 +494,6 @@ const format3 = (num) => {
 </script>
 <template>
   <div>
-
-    <el-row>
-      <el-col>
         <el-card style="margin-bottom: 20px;margin-top: 10px;">
           <el-row style="margin-bottom: 10px">
             <el-col :span="5">
@@ -563,10 +560,6 @@ const format3 = (num) => {
             <el-button type="primary" @click="openExportList">查看导出列表</el-button>
           </div>
         </el-card>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col>
         <el-card>
           <div>
             金币总数：{{ format3(totalGoldTotal  || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
@@ -583,13 +576,10 @@ const format3 = (num) => {
                     }}</span>
                 </template>
               </el-table-column>
-              <el-table-column fixed="left" prop="name" label="姓名" width="150"/>
+              <el-table-column fixed="left" prop="name" label="姓名" width="150" show-overflow-tooltip />
               <el-table-column fixed="left" prop="jwcode" label="精网号" width="120"/>
               <el-table-column prop="market" label="所属地区" width="120"/>
-              <el-table-column prop="payPlatform" label="平台信息" width="140">
-
-              </el-table-column>
-
+              <el-table-column prop="payPlatform" label="平台信息" width="140" />
               <el-table-column prop="type" label="更新类型" width="110">
                 <template #default="scope">
                   <span v-if="scope.row.type === 0">充值</span>
@@ -601,14 +591,6 @@ const format3 = (num) => {
 
               <el-table-column prop="sumGold" sortable="custom" label="金币数量" width="110">
                 <template #default="scope">
-
-                  <!-- <span>
-                    {{
-                      scope.row.type === 1 // 消费类型
-                        ? - scope.row.sumGold / 100
-                        : scope.row.sumGold / 100
-                    }}
-                  </span> -->
                   <span>{{ (scope.row.sumGold || 0)  }}</span>
                 </template>
               </el-table-column>
@@ -640,15 +622,13 @@ const format3 = (num) => {
           </div>
 
           <!-- 此处分页 -->
-          <div class="pagination" style="margin-top: 20px">
+          <div class="pagination" style="margin-top: 20px;display: flex;">
             <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
                            layout="total, sizes, prev, pager, next, jumper" :total="total"
                            @size-change="handlePageSizeChange"
                            @current-change="handleCurrentChange"></el-pagination>
           </div>
         </el-card>
-      </el-col>
-    </el-row>
 
     <!-- 导出列表弹窗 -->
     <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
@@ -685,35 +665,8 @@ const format3 = (num) => {
 </template>
 
 <style scoped>
-.pagination {
-  display: flex;
-}
-
-.status {
-  display: flex;
-}
-
-.head-card {
-  display: flex;
-}
-
-.info-panel-header {
-  font-weight: bold;
-  margin-bottom: 10px;
-}
-
 .dialog-footer {
   display: flex;
   justify-content: flex-end;
 }
-
-.export-status {
-  margin-top: 15px;
-  text-align: center;
-  color: #666;
-}
-
-.el-progress-bar__inner {
-  transition: width 0.5s ease;
-}
 </style>
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index 90ae110..2af28e5 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -129,8 +129,7 @@
     </el-col>
   </el-row>
 
-  <el-row style="margin-top: 20px">
-    <el-card>
+    <el-card style="margin-top: 20px">
       <el-row>
         <el-col>
           <el-tabs v-model="activeTab" @tab-change="handleTabChange">
@@ -196,7 +195,6 @@
         </el-col>
       </el-row>
     </el-card>
-  </el-row>
 </template>
 
 <script setup>