小bug+样式

src/views/managerecharge/rate.vue

@@ -122,6 +122,8 @@ const getEditData = async function (row) {
     console.log('请求失败', error)
   }
 }
+const  editRole = ref( true)
+editRole.value = findMenuById(menuTree.value, permissionMapping.Exchange_Rate_Modification)
 // 编辑汇率
 const editRate = async function () {
   if (findMenuById(menuTree.value, permissionMapping.Exchange_Rate_Modification)) {
@@ -267,13 +269,12 @@ onMounted(async function () {
                 <span>{{ formatDate(scope.row.updateTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" :span="3">
+            <el-table-column label="操作" :span="3" v-if="editRole">
               <template #default="scope">
                 <el-button type="text" @click=" () => {
                     regeEdit = true
-                    getEditData(scope.row)
-                  }
-                ">编辑
+                    getEditData(scope.row)}"
+                >编辑
                 </el-button>
               </template>
             </el-table-column>

src/views/permissions/rolePermission.vue

@@ -244,11 +244,12 @@ const getLists = async function () {
       data: { id: roleId }
     })
     data.value = res.data
-    let originalData = res.data.filter(item => item.id !== 9); // 排除权限管理
+    // let originalData = res.data.filter(item => item.id !== 9);
     // 排除金豆菜单
-    data.value = filterGoldenBeanMenus(originalData);
-
+    // data.value = filterGoldenBeanMenus(originalData);
     // data.value = data.value.filter(item => item.id !== 9);
+
+    data.value = data.value.filter(item => item.id !== 9);
     console.log('看看data', data.value)
     console.log('parentID:', addRole.value.parentId, 'roleId:', roleId)
 

src/views/usergold/gold/clientCountBalance.vue

@@ -483,6 +483,60 @@ const format3 = (num) => {
                     (scope.row.sumTaskGold || 0)
                   }}</span>
               </template>
+            </el-table-column>
+            <el-table-column prop="name" label="姓名" width="140"/>
+            <el-table-column prop="jwcode" label="精网号" width="160"/>
+            <el-table-column prop="market" label="所属地区" width="140"/>
+            <el-table-column prop="allJb" label="金币总数" width="140" 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="160">
+              <template #default="scope">
+                <span>{{ (scope.row.currentPermanentGold || 0)  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="currentFreeJune" label="6月份到期免费金币" sortable="custom" width="170">
+              <template #default="scope">
+                <span>{{ (scope.row.currentFreeJune || 0)  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="currentFreeDecember" label="12月份到期免费金币" sortable="custom" width="180">
+              <template #default="scope">
+                <span>{{ (scope.row.currentFreeDecember || 0)  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="currentTaskGold" label="任务金币" sortable="custom" width="180">
+              <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>
+                  <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>
@@ -511,17 +565,20 @@ const format3 = (num) => {
                 </el-popover>
               </template>
 
-        </el-table-column>
+            </el-table-column>-->
           </el-table>
         </div>
 
         <!-- 分页 -->
-    <div class="pagination" style="margin-top: 20px;display: flex;">
+        <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"
+                         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">