Browse Source

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

zhangyong/milestone-20250913-现金管理
zhangrenyuan 2 months ago
parent
commit
7786794a95
  1. 31
      src/views/audit/gold/rechargeAudit.vue
  2. 5
      src/views/consume/gold/coinConsume.vue
  3. 4
      src/views/usergold/bean/userbean.vue

31
src/views/audit/gold/rechargeAudit.vue

@ -48,10 +48,32 @@
</el-col> </el-col>
</el-card> </el-card>
<el-card class="card2"> <el-card class="card2">
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="待审核" name="wait" v-if="hasrechargeWait&&hasrechargeWaitShow"></el-tab-pane>
<el-tab-pane label="已通过" name="pass" v-if="hasrechargeThrough"></el-tab-pane>
<el-tab-pane label="已驳回" name="reject" v-if="hasrechargeReject"></el-tab-pane>
<div class="custom-button-group">
<el-button
v-if="hasrechargeWait&&hasrechargeWaitShow"
:type="activeName === 'wait' ? 'primary' : 'default'"
@click="handleButtonClick('wait')"
class="custom-tab-button"
>
待审核
</el-button>
<el-button
v-if="hasrechargeThrough"
:type="activeName === 'pass' ? 'primary' : 'default'"
@click="handleButtonClick('pass')"
class="custom-tab-button"
>
已通过
</el-button>
<el-button
v-if="hasrechargeReject"
:type="activeName === 'reject' ? 'primary' : 'default'"
@click="handleButtonClick('reject')"
class="custom-tab-button"
>
已驳回
</el-button>
</div>
<div class="goldStatistics"> <div class="goldStatistics">
<!-- 总条数{{ format3(stats.totalNum) }}&nbsp;&nbsp;&nbsp;&nbsp;--> <!-- 总条数{{ format3(stats.totalNum) }}&nbsp;&nbsp;&nbsp;&nbsp;-->
@ -61,7 +83,6 @@
永久金币{{ format3(stats.permanentGolds.toFixed(2)) }}金币&nbsp;&nbsp;&nbsp;&nbsp; 永久金币{{ format3(stats.permanentGolds.toFixed(2)) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(stats.freeGolds.toFixed(2)) }}金币&nbsp;&nbsp;&nbsp;&nbsp; 免费金币{{ format3(stats.freeGolds.toFixed(2)) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
</div> </div>
</el-tabs>
<el-table :data="tableData" style="width: 82vw;height:54vh" @sort-change="handleSortChange" <el-table :data="tableData" style="width: 82vw;height:54vh" @sort-change="handleSortChange"
:row-style="{ height: '50px' }"> :row-style="{ height: '50px' }">

5
src/views/consume/gold/coinConsume.vue

@ -93,6 +93,11 @@ onMounted(() => {
<style scoped lang="scss"> <style scoped lang="scss">
/* 自定义按钮组布局 */ /* 自定义按钮组布局 */
.fatherTop {
height: 4vh;
}
.custom-button-group { .custom-button-group {
display: flex; display: flex;
margin-bottom: 16px; margin-bottom: 16px;

4
src/views/usergold/bean/userbean.vue

@ -190,6 +190,10 @@ onMounted(() => {
<style scoped lang="scss"> <style scoped lang="scss">
.pagination {
display: flex;
margin-top: 1vh;
}
// //
.card1 { .card1 {

Loading…
Cancel
Save