From 451674dd4dd784fa0725b4ba052d94449d892712 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Sat, 28 Sep 2024 15:12:16 +0800
Subject: [PATCH] Merge branch '6-29印度股票' of http://124.156.157.155:8060/r/dg/dabao_admin into 6-29印度股票

---
 src/views/dashboard/Workplace.vue |   74 +++++++++++++++++++++++++++---------
 1 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/src/views/dashboard/Workplace.vue b/src/views/dashboard/Workplace.vue
index a639787..4f0263b 100644
--- a/src/views/dashboard/Workplace.vue
+++ b/src/views/dashboard/Workplace.vue
@@ -144,49 +144,69 @@
               </v-chart>
             </div>
           </a-card>
-          <a-card :loading="loading" title="充值提现统计" :bordered="false">
+          <div style="display:flex;align-items: center;justify-content: space-between;background-color: #fff;border-bottom: 1px solid #e8e8e8;">
+            <div style="display:flex;align-items: center;">
+              <a-card
+                title="充值提现统计"
+                :loading="radarLoading"
+                :bordered="false"
+                :body-style="{ padding: 0 }">
+
+              </a-card>
+            </div>
+
+            <div>
+              <a-date-picker
+                show-time
+                style="width: 100%"
+                @change="getstartTime"
+                v-decorator="['startTime', { rules: [{ required: true, message: '请填写开始时间' }] }]"
+                format="YYYY-MM-DD"
+              >
+              </a-date-picker>
+            </div>
+          </div>
+          <a-card :loading="loading"  :bordered="false">
+
             <div class="members">
               <a-row>
                 <a-col :span="12">
                   <a>
                     <span>今日充值</span>
-                    <span class="member">{{ infodetail.charge_today_sum_amt ? infodetail.charge_today_sum_amt : 0
+                    <span class="member">{{ infodata.todayRechargeAmount
                     }}</span>
                   </a>
                 </a-col>
                 <a-col :span="12">
                   <a>
                     <span>总充值</span>
-                    <span class="member">{{ infodetail.charge_sum_amt ? infodetail.charge_sum_amt : 0 }}</span>
+                    <span class="member">{{ infodata.rechargeTotalAmount  }}</span>
                   </a>
                 </a-col>
                 <a-col :span="12">
                   <a>
                     <span>今日提现</span>
-                    <span class="member">{{ infodetail.sp_withdraw_sum_today_amt_success ?
-                      infodetail.sp_withdraw_sum_today_amt_success : 0
+                    <span class="member">{{ infodata.todayWithdrawAmount
                     }}</span>
                   </a>
                 </a-col>
                 <a-col :span="12">
                   <a>
                     <span>总提现</span>
-                    <span class="member">{{ infodetail.sp_withdraw_sum_amt_success ?
-                      infodetail.sp_withdraw_sum_amt_success : 0
+                    <span class="member">{{ infodata.withdrawalTotalAmount
                     }}</span>
                   </a>
                 </a-col>
-                
+
                 <a-col :span="12">
                   <a>
                     <span>当日注册人数</span>
-                    <span class="member">{{ infodetail.toDayRegCount ?
-                      infodetail.toDayRegCount : 0
+                    <span class="member">{{ infodata.todayRegister
                     }}</span>
                   </a>
                 </a-col>
-                
-                <a-col :span="12">
+
+                <!-- <a-col :span="12">
                   <a>
                     <span>当日首充人数</span>
                     <span class="member">{{ infodetail.toDayFristRechargeCount ?
@@ -194,7 +214,7 @@
                     }}</span>
                   </a>
                 </a-col>
-                
+
                 <a-col :span="12">
                   <a>
                     <span>当日首充金额</span>
@@ -202,13 +222,13 @@
                       infodetail.toDayFristRechargeMoney : 0
                     }}</span>
                   </a>
-                </a-col>
-                
+                </a-col> -->
+
                 <a-col :span="12">
                   <a>
                     <span>当日充值总人数</span>
-                    <span class="member">{{ infodetail.toDayRechargeCount ?
-                      infodetail.toDayRechargeCount : 0
+                    <span class="member">{{ infodata.todayWithdraw  ?
+                      infodata.todayWithdraw  : 0
                     }}</span>
                   </a>
                 </a-col>
@@ -227,7 +247,7 @@
 import { PageHeaderWrapper } from '@ant-design-vue/pro-layout'
 import { Radar } from '@/components'
 import { getRoleList, getServiceList } from '@/api/manage'
-import { stockgetMarket, countdata } from '@/api/home'
+import { stockgetMarket, countdata,moneyCount } from '@/api/home'
 import { positionlist } from '@/api/position'
 import { adminlist } from '@/api/managesettings'
 import axios from 'axios'
@@ -300,9 +320,11 @@
 
       market: [],
       infodetail: {},
+      infodata:{},
       rongzilist: [],
       userdetails: '',
-      lizhidetail: ''
+      lizhidetail: '',
+      startTime:'',
     }
   },
   computed: {
@@ -340,13 +362,27 @@
     this.getrongzilist()
     this.getnowuser()
     this.getlizhi()
+    this.getinfodata()
   },
   methods: {
+    getstartTime (date, dateString) {
+      this.startTime = dateString
+      this.getinfodata()
+    },
+    getinfodata(){
+      var data = {
+        startTime:this.startTime,
+      }
+      moneyCount(data).then(res => {
+        this.infodata = res.data
+      })
+    },
     getlizhi () {
       axios.get('https://saying.api.azwcl.com/saying/get').then(res => {
         this.lizhidetail = res.data.data
       })
     },
+
     getnowuser () {
       adminlist().then(res => {
         if (window.localStorage.getItem('phones')) {

--
Gitblit v1.9.3