Merge branch 'zhangrenyuan/feature-20250917134308-现金管理' into milestone-20250913-现金管理

src/views/audit/bean/beanAudit.vue

@@ -59,7 +59,8 @@
       免费金豆：{{ format3(stats.freeBean) }}金豆
     </div>
 
-    <el-table :data="tableData" height="55vh" @sort-change="handleSortChange">
+    <el-table :data="tableData" height="55vh" @sort-change="handleSortChange"
+    :row-style="{ height: '50px' }">
       <el-table-column type="index" label="序号" width="80">
         <template #default="scope">
           {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}

src/views/audit/gold/rechargeAudit.vue

@@ -106,8 +106,8 @@
       <el-table-column prop="freeGold" label="免费金币" sortable="custom" width="110px">
         <template #default="scope">{{ (scope.row.freeGold) / 100 }}</template>
       </el-table-column>
-      <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
-      <el-table-column prop="payModel" label="支付方式" width="110px" />
+      <el-table-column prop="remark" label="备注" width="180px" show-overflow-tooltip />
+      <el-table-column prop="payModel" label="支付方式" width="130px" />
       <el-table-column prop="voucher" label="支付凭证" width="110px">
         <template #default="scope">
           <div v-if="scope.row.voucher"
@@ -169,7 +169,7 @@
       </el-table-column>
     </el-table>
     <div class="pagination">
-      <el-pagination :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
+      <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="handlePagination('size', $event)"
         @current-change="handlePagination('page', $event)"></el-pagination>
     </div>
@@ -770,7 +770,7 @@ onMounted(async function () {
 <style scoped lang="scss">
 .pagination {
   display: flex;
-  margin-top: 0.5vh;
+  margin-top: 1vh;
 }
 
 .operation {

src/views/audit/gold/refundAudit.vue

@@ -74,7 +74,8 @@
       任务金币：{{ format3(stats.taskGolds.toFixed(2)) }}金币
     </div>
 
-    <el-table :data="tableData" style="height:54vh;width:82vw" @sort-change="handleSortChange">
+    <el-table :data="tableData" style="height:54vh;width:82vw" @sort-change="handleSortChange"
+      :row-style="{ height: '50px' }">
       <el-table-column type="index" label="序号" width="60" />
       <el-table-column prop="name" label="姓名" width="120" show-overflow-tooltip />
       <el-table-column prop="jwcode" label="精网号" width="120" />
@@ -669,7 +670,7 @@ onMounted(async () => {
 <style scoped lang="scss">
 .pagination {
   display: flex;
-  margin-top: 0.5vh;
+  margin-top: 1vh;
 }
 
 .operation {

src/views/consume/bean/articleVideo.vue

@@ -530,7 +530,8 @@ const getTagText = (state) => {
       免费金豆数：{{ format3(Math.abs(freeBean)) }}
     </div>
     <div style="overflow-y: auto">
-      <el-table :data="tableData" style="width: 82vw" height="57vh" @sort-change="handleSortChange">
+      <el-table :data="tableData" style="width: 82vw" height="57vh" @sort-change="handleSortChange"
+      :row-style="{ height: '50px' }">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{

src/views/consume/bean/dieHardFan.vue

@@ -516,7 +516,8 @@ const getTagText = (state) => {
       免费金豆数：{{ format3(Math.abs(freeBean)) }}
     </div>
     <div style="overflow-y: auto">
-      <el-table :data="tableData" style="width: 82vw" height="57vh" @sort-change="handleSortChange">
+      <el-table :data="tableData" style="width: 82vw" height="57vh" @sort-change="handleSortChange"
+      :row-style="{ height: '50px' }">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{

src/views/consume/bean/liveStream.vue

@@ -561,7 +561,8 @@ const getTagText = (state) => {
       免费金豆数：{{ format3(Math.abs(freeBean)) }}
     </div>
     <div style="overflow-y: auto">
-      <el-table :data="tableData" style="width: 82vw" height="56vh" @sort-change="handleSortChange">
+      <el-table :data="tableData" style="width: 82vw" height="56vh" @sort-change="handleSortChange"
+      :row-style="{ height: '50px' }">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{

src/views/consume/gold/coinConsumeDetail.vue

@@ -632,7 +632,8 @@ const getMarket = async function () {
       任务金币：{{ format3(Math.abs(taskGolds)) }}
     </div>
     <div style="height: 58vh;">
-      <el-table :data="tableData" style="height: 57vh" @sort-change="handleSortChange">
+      <el-table :data="tableData" style="height: 57vh" @sort-change="handleSortChange" 
+      :row-style="{ height: '50px' }">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{

src/views/permissions/rolePermission.vue

@@ -738,6 +738,12 @@ onMounted(async function () {
 </template>
 
 <style scoped lang="scss">
+
+// 新增用户按钮
+.add-item {
+  margin-bottom: 1vh;
+}
+
 // 搜索的卡片样式
 .card1 {
   background: #F3FAFE;

src/views/permissions/userPermission.vue

@@ -1177,6 +1177,12 @@ onMounted(async function () {
 </template>
 
 <style scoped lang="scss">
+
+// 新增用户按钮
+.add-item {
+  margin-bottom: 1vh;
+}
+
 // 搜索的卡片样式
 .card1 {
   background: #F3FAFE;

src/views/recharge/bean/beanOnlineRecharge.vue

@@ -409,7 +409,8 @@ onMounted(async function () {
     </div>
     <!-- 设置表格容器的高度和滚动样式 -->
     <div>
-      <el-table :data="tableData" style="width:80vw;" height="60vh" @sort-change="handleSortChange">
+      <el-table :data="tableData" style="width:80vw;" height="60vh" @sort-change="handleSortChange"
+      :row-style="{ height: '50px' }">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{

src/views/recharge/bean/beanSystemRecharge.vue

@@ -385,7 +385,8 @@ onMounted(async function () {
       免费金豆数：{{ format3(freeBean) }}
     </div>
     <div>
-      <el-table :data="tableData" style="width: 82vw;height:60vh;" @sort-change="handleSortChange">
+      <el-table :data="tableData" style="width: 82vw;height:60vh;" @sort-change="handleSortChange" 
+      :row-style="{ height: '50px' }">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{

src/views/refund/gold/coinRefundDetail.vue

@@ -567,7 +567,8 @@ const getMarket = async function () {
     </div>
     <!-- 设置表格容器的高度和滚动样式 -->
     <div style="height: 58vh; ">
-      <el-table :data="tableData" style="height: 57vh" @sort-change="handleSortChange">
+      <el-table :data="tableData" style="height: 57vh" @sort-change="handleSortChange"
+      :row-style="{ height: '50px' }">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{

src/views/usergold/bean/userbean.vue

@@ -20,7 +20,7 @@
             免费金豆数：{{ format3(stats.freeBean) }}金豆    
             消费金豆总数：{{ format3(stats.consumeSum) }}金豆    
         </div>
-        <el-table :data="tableData" height="65vh" @sort-change="handleSortChange" :row-style="{ height: '60px' }">
+        <el-table :data="tableData" height="65vh" @sort-change="handleSortChange" :row-style="{ height: '50px' }">
             <el-table-column type="index" label="序号" width="80px" fixed="left">
                 <template #default="scope">
                     <span>{{

src/views/usergold/gold/clientCountBalance.vue

@@ -413,7 +413,7 @@ const format3 = (num) => {
     <!-- 设置表格容器的高度和滚动样式 -->
     <div style="height: 60vh; overflow-y: auto">
       <el-table :data="tableData" @cellClick="cellClick" style="width: 82vw; height:60vh"
-        @sort-change="handleSortChange">
+        @sort-change="handleSortChange" :row-style="{ height: '50px' }">
         <el-table-column type="index" label="序号" width="100px" fixed="left">
           <template #default="scope">
             <span>{{

src/views/usergold/gold/clientCountDetail.vue

@@ -525,10 +525,10 @@ const format3 = (num) => {
         永久金币：{{ format3(totalPermanentGold || 0) }}    
         免费金币：{{ format3(totalFreeGold || 0) }}    
         任务金币：{{ format3(totalTaskGold || 0) }}  
-        <a style="color:#b1b1b1; font-size: small;">当前合计仅显示筛选范围内的金币净变化（充值总额 - 消费总额 + 退款总额)</a>
+        <a style="color:#b1b1b1; font-size: small;">当前合计仅显示筛选范围内的金币净变化（充值总额 - 消费总额 + 退款总额）</a>
       </div>
       <div style="height: 58vh; ">
-        <el-table :data="tableData" style="height: 57vh" @sort-change="handleSortChange" >
+        <el-table :data="tableData" style="height: 57vh" @sort-change="handleSortChange"  :row-style="{ height: '50px' }">
           <el-table-column type="index" label="序号" width="80px" fixed="left">
             <template #default="scope">
               <span>{{