From 5d48b8e8e9b314856bdd3b7c47a48a035f031273 Mon Sep 17 00:00:00 2001
From: zhaohengkun <zhaohengkun>
Date: Thu, 26 Sep 2024 14:48:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AFBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/financialStatement/yunyingfenxi.js    |  3 +-
 .../yunyingfenxi/tab/vip.vue                  | 42 ++++++++++++-------
 fuintAdmin_zt/src/views/setting/sysLog.vue    |  2 +
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js b/fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js
index c5bc1da02..e7c0b110e 100644
--- a/fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js
+++ b/fuintAdmin_zt/src/api/financialStatement/yunyingfenxi.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 
-// 会员充值订单
+// 获取会员数据
   export function getFenXiUserbalanceListApi(query) {
   return request({
     url: '/business/userManager/userbalance/listByZt',
@@ -9,6 +9,7 @@ import request from '@/utils/request'
     params: query
   })
 }
+  // 各种总数
   export function getFenXiUserbalanceDataApi(query) {
   return request({
     url: '/business/userManager/userbalance/getUser',
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
index 763fceeb1..3b21848d3 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
@@ -27,27 +27,28 @@
           <div class="title_">{{orderStatistics.sumnum || 0}}</div>
         </div>
         <div class="k_" id="k_2">
-          <div class="size_">累计充值金额（万元）</div>
+          <div class="size_">累计充值金额（元）</div>
           <div class="title_">{{orderStatistics.tongjMoney || 0}}</div>
         </div>
         <div class="k_" id="k_3">
-          <div class="size_">会员总消费（万元）</div>
+          <div class="size_">会员总消费（元）</div>
           <div class="title_">{{orderStatistics.tongjXfMoney || 0}}</div>
         </div>
-        <div class="k_" id="k_4">
-          <div class="size_">会员总余额（万元）</div>
-          <div class="title_">--</div>
-        </div>
-        <div class="k_" id="k_5">
-          <div class="size_">累计囤油卡余额（万元）</div>
-          <div class="title_">--</div>
-        </div>
+<!--        <div class="k_" id="k_4">-->
+<!--&lt;!&ndash;       会员总余额=储值卡余额+囤油卡余额+车队卡余额   &ndash;&gt;-->
+<!--          <div class="size_">会员总余额（元）</div>-->
+<!--          <div class="title_">&#45;&#45;</div>-->
+<!--        </div>-->
+<!--        <div class="k_" id="k_5">-->
+<!--          <div class="size_">累计囤油卡余额（元）</div>-->
+<!--          <div class="title_">&#45;&#45;</div>-->
+<!--        </div>-->
         <div class="k_" id="k_6">
           <div class="size_">累计礼品卡余额（元）</div>
-          <div class="title_">--</div>
+          <div class="title_">{{orderStatistics.cardGift || 0}}</div>
         </div>
         <div class="k_" id="k_7">
-          <div class="size_">累计储值卡余额（元 ）</div>
+          <div class="size_">储值卡总余额（元 ）</div>
           <div class="title_">{{orderStatistics.balanceSum || 0}}</div>
         </div>
       </div>
@@ -64,16 +65,21 @@
           <el-table-column prop="physicalCard" align="center" label="会员卡号"></el-table-column>
           <el-table-column prop="storeName" align="center" label="所属机构"> </el-table-column>
           <el-table-column prop="gradeName" align="center" label="会员等级" > </el-table-column>
-          <el-table-column prop="consumeNum" align="center" label="累计充值金额（元）" > </el-table-column>
-          <el-table-column prop="amount" align="center" label="累计充值次数" > </el-table-column>
+          <el-table-column prop="amount" align="center" label="累计充值金额（元）" > </el-table-column>
+          <el-table-column prop="countNum" align="center" label="累计充值次数" > </el-table-column>
           <el-table-column prop="leijiMoney" align="center" label="累计消费金额（元）" > </el-table-column>
           <el-table-column prop="leijiNum" align="center" label="累计消费笔数" > </el-table-column>
 <!--          <el-table-column prop="createTime" align="center" label="囤油卡余额" > </el-table-column>-->
 <!--          <el-table-column prop="createTime" align="center" label="电子礼品卡余额" > </el-table-column>-->
-          <el-table-column prop="cardBalance" align="center" label="储值卡余额" > </el-table-column>
+          <el-table-column prop="cardBalance" align="center" label="储值卡余额" >
+            <template v-slot="scope">
+              {{ formatBalance(scope.row.cardBalance) }}
+            </template>
+          </el-table-column>
+
 <!--          <el-table-column prop="createTime" align="center" label="累计余额" > </el-table-column>-->
           <el-table-column prop="leijiMoneyRef" align="center" label="累计退款金额" > </el-table-column>
-          <el-table-column prop="leijiNum" align="center" label="累计退款笔数" > </el-table-column>
+          <el-table-column prop="leijiNumRef" align="center" label="累计退款笔数" > </el-table-column>
 
         </el-table>
       </div>
@@ -157,6 +163,10 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
 
     },
     methods:{
+      formatBalance(balance) {
+        // 使用 toFixed 方法确保保留两位小数
+        return parseFloat(balance).toFixed(2);
+      },
       getDeptList() {
         getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
           this.deptList = response.data.records;
diff --git a/fuintAdmin_zt/src/views/setting/sysLog.vue b/fuintAdmin_zt/src/views/setting/sysLog.vue
index 8a9bab34f..b40432644 100644
--- a/fuintAdmin_zt/src/views/setting/sysLog.vue
+++ b/fuintAdmin_zt/src/views/setting/sysLog.vue
@@ -200,6 +200,8 @@ export default {
         bannerName:'',
         systemPosition:'',
         bannerStatus:'',
+        //初始化是中台系统子页面 默认
+        systemName:1,
       },
 
       // 上传地址