diff --git a/jsowell-ui/src/views/financial/financeDetail-旧.vue b/jsowell-ui/src/views/financial/financeDetail-new.vue
similarity index 54%
rename from jsowell-ui/src/views/financial/financeDetail-旧.vue
rename to jsowell-ui/src/views/financial/financeDetail-new.vue
index a4db40920..8235fe9be 100644
--- a/jsowell-ui/src/views/financial/financeDetail-旧.vue
+++ b/jsowell-ui/src/views/financial/financeDetail-new.vue
@@ -1,141 +1,129 @@
 <template>
-  <div class="app-container">
-    <div class="header-cont ">
-      <div class="header-txt">运营汇总</div>
-      <el-button type="primary" @click="goAccount">开户信息</el-button>
-    </div>
-    <div class="header" v-loading="loading">
-      <template v-if="operationStatus == null">
-        <div class="foot1">
-          <div style="margin: 12px 0">未查询到结算账户</div>
-        </div>
-      </template>
-      <template v-else>
-        <template v-if="showAccountList">
-          <div class="foot1" v-for="(item, index) in settleAccountList" :key="index">
-            <el-descriptions :column="1">
-              <el-descriptions-item label="运营商" class="remarks">
-                <span class="color">
-                  {{ merchant }}
-                </span>
-              </el-descriptions-item>
-              <el-descriptions-item label="商家性质">
-                <span class="color">{{
-                  merchantNature === "1" ? "对公" : "对私"
-                }}</span>
-              </el-descriptions-item>
-              <el-descriptions-item label="开户行名称">
-                <span class="color">{{ cityBankCode(item.bankCode) }}</span>
-              </el-descriptions-item>
-              <el-descriptions-item label="收款卡号">
-                <span class="color">{{ item.cardId }}</span>
-              </el-descriptions-item>
-              <el-descriptions-item label="预留手机">
-                <span class="color">{{ item.telNo }}</span>
-              </el-descriptions-item>
-            </el-descriptions>
-          </div>
-        </template>
-        <div class="foot1" v-else>
-          <el-descriptions :column="1">
-            <el-descriptions-item label="运营商">
-              <span class="color">
-                {{ merchant }}
-              </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="商家性质">
-              <span class="color">{{
-                merchantNature === "1" ? "对公" : "对私"
-              }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="开户状态">
-              <span class="color">{{ adapayCorpMember.auditDesc }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="开户行名称">
-              <span class="color">{{
-                cityBankCode(adapayCorpMember.bankCode)
-              }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="收款卡号">
-              <span class="color">{{ adapayCorpMember.cardNo }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="预留手机">
-              <span class="color">{{ adapayCorpMember.legalMp }}</span>
-            </el-descriptions-item>
-          </el-descriptions>
-        </div>
-      </template>
-      <div class="foot2">
-        <el-descriptions :column="1">
-          <el-descriptions-item label="总度数(度)">
-            <span class="color">
-              {{ merchantOrderReport.useElectricity }}
-            </span>
-          </el-descriptions-item>
-          <el-descriptions-item label="充电时长(分钟)">
-            <span class="color">{{ merchantOrderReport.chargeTime }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="电费金额(元)">
-            <span class="color">{{
-              merchantOrderReport.electricityAmount
-            }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="交易金额(元)">
-            <span class="color">{{ merchantOrderReport.tradeAmount }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="虚拟金额(元)">
-            <span class="color">{{ merchantOrderReport.virtualAmount }}</span>
-          </el-descriptions-item>
-        </el-descriptions>
-      </div>
-      <div class="foot3">
-        <el-descriptions :column="1">
-          <el-descriptions-item label="充电次数(次)">
-            <span class="color">{{ merchantOrderReport.chargeNum }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="总结算金额(元)">
-            <span class="color">{{ merchantOrderReport.totalAmount }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="服务费金额(元)">
-            <span class="color">{{ merchantOrderReport.serviceAmount }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="交易手续费(元)">
-            <span class="color">{{ merchantOrderReport.tradeFee }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="白名单支付(次)">
-            <span class="color">{{
-              merchantOrderReport.whitelistPaymentsNum === null
-                ? "一"
-                : merchantOrderReport.whitelistPaymentsNum
-            }}</span>
-          </el-descriptions-item>
-        </el-descriptions>
-      </div>
-      <template v-if="operationStatus == null">
-        <div class="foot4">未查询到运营商结算账户，提现功能现已关闭</div>
-      </template>
-      <template v-else>
-        <div class="margin-right foot4">
-          <div class="color60" style="margin-bottom: 15px;color:#000;">账户总余额（元）：{{ adapayMember.avlBalance }}</div>
-          <div class="color60">可提现(元)</div>
-          <div class="margin-20 color">{{ adapayMember.lastAvlBalance }}</div>
-          <el-button type="primary" @click="dialogVisible = true">提现申请</el-button>
-          <!-- <div v-else>
-            <span class="text">该余额大于{{ withdrawalFee }}元时，才可发起取现</span>
-          </div> -->
-        </div>
-        <div class="margin-right foot4">
-          <div class="color60">总提现金额(元)</div>
-          <div class="margin-20 color" style="cursor: pointer;" @click="already">{{ adapayMember.totalWithdraw }}</div>
+  <div class="wp">
+    <div class="header">
+      <template v-if="showAccountList">
+        <div class="text-gray" v-for="(item, index) in settleAccountList" :key="index">
+          <h3>运营商信息</h3>
           <div>
-            <span class="text">已成功提现到绑定银行卡的金额</span>
+            <p>运营商：</p>
+            <span>{{ merchant }}</span>
+          </div>
+          <div>
+            <p>商家性质：</p>
+            <span>{{ merchantNature === "1" ? "对公" : "对私" }}</span>
+          </div>
+          <div>
+            <p>开户行名称：</p>
+            <span>{{ cityBankCode(item.bankCode) }}</span>
+          </div>
+          <div>
+            <p>收款卡号：</p>
+            <span>{{ item.cardId }}</span>
+          </div>
+          <div>
+            <p>预留手机号：</p>
+            <span>{{ item.telNo }}</span>
           </div>
         </div>
       </template>
+      <div class="text-gray" v-else>
+        <h3>运营商信息</h3>
+        <div>
+          <p>运营商：</p>
+          <span>{{ merchant }}</span>
+        </div>
+        <div>
+          <p>商家性质：</p>
+          <span>{{ merchantNature === "1" ? "对公" : "对私" }}</span>
+        </div>
+        <div>
+          <p>开户行名称：</p>
+          <span>{{ cityBankCode(adapayCorpMember.bankCode) }}</span>
+        </div>
+        <div>
+          <p>收款卡号：</p>
+          <span>{{ adapayCorpMember.cardNo }}</span>
+        </div>
+        <div>
+          <p>预留手机号：</p>
+          <span>{{ adapayCorpMember.legalMp }}</span>
+        </div>
+      </div>
+      <div class="text-gray">
+        <h3>分润数据</h3>
+        <div>
+          <p>参与分润金额：</p>
+          <span style="color: #2563eb">¥ 153,426.82</span>
+        </div>
+        <div>
+          <p>分出总金额：</p>
+          <span style="color: #16a34a">¥ 98,142.35</span>
+        </div>
+        <div>
+          <p>直接分润金额：</p>
+          <span>¥ 9,12.35</span>
+        </div>
+        <div>
+          <p>间接分润金额：</p>
+          <span>¥ 8,42.35</span>
+        </div>
+        <div>
+          <p>分润订单数：</p>
+          <span>286笔</span>
+        </div>
+      </div>
+      <div class="text-gray">
+        <h3>金额信息</h3>
+        <div>
+          <p>电费金额：</p>
+          <span>¥ {{ merchantOrderReport.electricityAmount ? merchantOrderReport.electricityAmount.toFixed(2) :
+            '0.00' }}</span>
+        </div>
+        <div>
+          <p>交易金额：</p>
+          <span>¥ {{ merchantOrderReport.tradeAmount ? merchantOrderReport.tradeAmount.toFixed(2) : '0.00' }}</span>
+        </div>
+        <div>
+          <p>虚拟金额：</p>
+          <span>¥ {{ merchantOrderReport.virtualAmount ? merchantOrderReport.virtualAmount.toFixed(2) : '0.00' }}</span>
+        </div>
+        <div>
+          <p>服务费金额：</p>
+          <span>¥ {{ merchantOrderReport.serviceAmount ? merchantOrderReport.serviceAmount.toFixed(2) : '0.00' }}</span>
+        </div>
+        <div>
+          <p>交易手续费：</p>
+          <span>¥ {{ merchantOrderReport.tradeFee ? merchantOrderReport.tradeFee.toFixed(2) : '0.00' }}</span>
+        </div>
+      </div>
+      <div class="text-gray">
+        <div style="display: flex; align-items: center; justify-content: space-between;">
+          <h3>提现信息</h3>
+          <el-button type="primary" @click="dialogVisible = true">提现申请</el-button>
+        </div>
+        <div>
+          <p>总结算金额：</p>
+          <span>¥ {{ merchantOrderReport.totalAmount ? merchantOrderReport.totalAmount.toFixed(2) : '0.00' }}</span>
+        </div>
+        <div>
+          <p>账户总余额：</p>
+          <span>¥ {{ adapayMember.avlBalance ? adapayMember.avlBalance.toFixed(2) : '0.00' }}</span>
+        </div>
+        <div>
+          <p>可提现金额：</p>
+          <span style="color: #2563eb">¥ {{ adapayMember.lastAvlBalance ? adapayMember.lastAvlBalance.toFixed(2) :
+            '0.00' }}</span>
+        </div>
+        <div>
+          <p>总提现金额：</p>
+          <span style="color: #16a34a">
+            ¥ {{ adapayMember.totalWithdraw ? adapayMember.totalWithdraw.toFixed(2) : '0.00' }}
+          </span>
+        </div>
+        <p class="concentrate">已成功提现到绑定银行卡的金额</p>
+      </div>
     </div>
-    <hr />
-    <div class="center">
-      <div class="header-txt">运营分析</div>
+    <div class="inquire">
       <el-form :model="queryParams" ref="queryForm" size="small" inline label-width="68px">
         <el-form-item label="日期" prop="tradeDate">
           <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd"
@@ -146,29 +134,88 @@
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         </el-form-item>
       </el-form>
+      <el-form>
+        <el-form-item>
+          <el-button style="height: 40px" type="success" icon="el-icon-s-claim" @click="already">提现记录</el-button>
+        </el-form-item>
+      </el-form>
     </div>
-    <hr />
-    <el-table :data="reportList">
-      <el-table-column label="日期" align="center" prop="tradeDate" />
-
-      <el-table-column label="账单状态" align="center" prop="billStatus">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.bill_status" :value="scope.row.billStatus" />
-        </template>
-      </el-table-column>
-      <el-table-column label="应收金额（元）" align="center" prop="receivableAmount" />
-      <el-table-column label="可提现金额（元）" align="center" prop="withdrawAbleAmount" />
-      <el-table-column label="交易手续费（元）" align="center" prop="feeAmount" />
-      <el-table-column label="提现订单号" align="center" prop="withdrawCode" />
-      <el-table-column label="提现申请时间" align="center" prop="applicationTime" />
-      <el-table-column label="操作" align="center">
-        <template slot-scope="scope">
-          <span class="link-type" @click="goTradeDate(scope)">订单流水</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination v-show="reportTotal > 0" :total="reportTotal" :page.sync="reportQueryParams.pageNum"
-      :limit.sync="reportQueryParams.pageSize" @pagination="getList" />
+    <div class="container">
+      <!-- <el-table :data="reportList"> -->
+      <el-table :data="temporary">
+        <el-table-column label="日期" align="center" prop="tradeDate" />
+        <el-table-column label="账单状态" align="center" prop="billStatus">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.bill_status" :value="scope.row.billStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="应收金额（元）" align="center" prop="receivableAmount" />
+        <el-table-column label="可提现金额（元）" align="center" prop="withdrawAbleAmount" />
+        <el-table-column label="交易手续费（元）" align="center" prop="feeAmount" />
+        <el-table-column label="分润金额（元）" align="center" prop="aaa" />
+        <el-table-column label="实际到账金额（元）" align="center" prop="bbb" />
+        <el-table-column label="提现订单号" align="center" prop="withdrawCode" />
+        <el-table-column label="提现申请时间" align="center" prop="applicationTime" />
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <span class="link-type" @click="goTradeDate(scope)">订单流水</span>
+            <span class="link-type" style="margin-left: 10px" @click="getProfitSharing(scope)">分润流水</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="reportTotal > 0" :total="reportTotal" :page.sync="reportQueryParams.pageNum"
+        :limit.sync="reportQueryParams.pageSize" @pagination="getList" />
+    </div>
+    <!-- 提现记录 -->
+    <el-dialog title="提现记录" :visible.sync="recordDialog">
+      <el-table :data="payoutInformation" style="width: 100%">
+        <el-table-column label="申请时间" align="center" property="applicationTime" />
+        <el-table-column label="提现编号" align="center" property="withdrawCode" />
+        <el-table-column label="状态" align="center" property="statusDesc" />
+        <el-table-column label="金额" align="center" property="cashAmt" />
+      </el-table>
+      <pagination v-show="getTotal > 0" :total="getTotal" :page.sync="getWithdrawnParameters.pageNum"
+        :limit.sync="getWithdrawnParameters.pageSize" @pagination="getHistory" />
+    </el-dialog>
+    <!-- 订单流水 -->
+    <el-dialog title="订单流水" :visible.sync="dialogTableVisible" :before-close="orderClose">
+      <el-table :data="orderList" v-loading="orderLoading">
+        <el-table-column property="orderCode" label="订单编号" align="center" />
+        <el-table-column property="settleAmount" label="结算金额(元)" align="center" />
+        <el-table-column property="clearingStatus" label="清分状态" align="center" />
+        <el-table-column property="clearingBillCode" label="清分账单编号" align="center" />
+        <el-table-column property="withdrawStatus" label="提现状态" align="center" />
+        <el-table-column property="withdrawCode" label="提现编号" align="center" />
+      </el-table>
+      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
+        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
+    </el-dialog>
+    <!-- 分润流水 -->
+    <el-dialog title="分润流水" :visible.sync="profitSharing" :before-close="turnOffProfitSharing">
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-width="68px">
+        <el-form-item label="分润类型" prop="tradeDate">
+          <el-select v-model="queryParams.orderStatus" placeholder="请选择分润类型" clearable style="width: 180px">
+            <el-option v-for="item1 in sharingType" :key="item1.value" :label="item1.label" :value="item1.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="">重置</el-button>
+          <el-button type="warning" plain icon="el-icon-download" size="mini" @click=" ">导出</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table :data="orderList">
+        <el-table-column property="orderCode" label="订单编号" align="center" />
+        <el-table-column property="settleAmount" label="结算金额(元)" align="center" />
+        <el-table-column property="" label="分润类型" align="center" />
+        <el-table-column property="" label="电费分润比例" align="center" />
+        <el-table-column property="" label="电费分润金额(元)" align="center" />
+        <el-table-column property="" label="服务费分润比例" align="center" />
+        <el-table-column property="" label="服务费分润金额(元)" align="center" />
+      </el-table>
+      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
+        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
+    </el-dialog>
     <!-- 提现申请弹窗 -->
     <el-dialog title="提现申请" :visible.sync="dialogVisible" width="33%">
       温馨提示
@@ -201,30 +248,6 @@
         <el-button type="primary" @click="submit">提交</el-button>
       </span>
     </el-dialog>
-    <!-- 提现记录 -->
-    <el-dialog title="提现记录" :visible.sync="recordDialog">
-      <el-table :data="payoutInformation" style="width: 100%">
-        <el-table-column label="申请时间" align="center" property="applicationTime" />
-        <el-table-column label="提现编号" align="center" property="withdrawCode" />
-        <el-table-column label="状态" align="center" property="statusDesc" />
-        <el-table-column label="金额" align="center" property="cashAmt" />
-      </el-table>
-      <pagination v-show="getTotal > 0" :total="getTotal" :page.sync="getWithdrawnParameters.pageNum"
-        :limit.sync="getWithdrawnParameters.pageSize" @pagination="getHistory" />
-    </el-dialog>
-    <!-- 订单流水 -->
-    <el-dialog title="订单流水" :visible.sync="dialogTableVisible" :before-close="orderClose">
-      <el-table :data="orderList" v-loading="orderLoading">
-        <el-table-column property="orderCode" label="订单编号" align="center" />
-        <el-table-column property="settleAmount" label="结算金额(元)" align="center" />
-        <el-table-column property="clearingStatus" label="清分状态" align="center" />
-        <el-table-column property="clearingBillCode" label="清分账单编号" align="center" />
-        <el-table-column property="withdrawStatus" label="提现状态" align="center" />
-        <el-table-column property="withdrawCode" label="提现编号" align="center" />
-      </el-table>
-      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
-        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -233,7 +256,7 @@ import {
   withdraw,
   selectAdapayMember,
   queryAdapayAccountBalance,
-  WithdrawalHistory
+  WithdrawalHistory,
 } from "@/api/adapayMember/adapayMember";
 import { getOrderReportDetail } from "@/api/order/order";
 import { getDay } from "@/utils/common";
@@ -291,7 +314,25 @@ export default {
         pageSize: 10,
       },
       payoutInformation: [],
-      getTotal: 0
+      getTotal: 0,
+      profitSharing: false,
+      temporary: [
+        {
+          tradeDate: "2025-02-18",
+          billStatus: "提现申请中",
+          receivableAmount: "313.92",
+          withdrawAbleAmount: "1371.99",
+          feeAmount: "1.83",
+          aaa: "1059.92",
+          bbb: "1059.92",
+          withdrawCode: "0021110738083352290123776",
+          applicationTime: "2025-02-19 08:31:00",
+        },
+      ],
+      sharingType: [
+        { label: "直接分润", value: "1" },
+        { label: "间接分润", value: "2" },
+      ],
     };
   },
   methods: {
@@ -380,8 +421,7 @@ export default {
         console.log("getMerchantOrderReport", response);
         if (response.data) {
           this.merchantOrderReport = response.data.merchantOrderReport;
-          if (response.data.pageResponse === null)
-            return (this.reportList = []);
+          if (response.data.pageResponse === null) return (this.reportList = []);
           this.reportList = response.data.pageResponse.list;
           this.reportTotal = response.data.pageResponse.total;
         } else {
@@ -395,13 +435,12 @@ export default {
         .then((_) => {
           let params = {
             merchantId: this.merchantId,
-            cashAmt: this.adapayMember.lastAvlBalance,
+            cashAmt: this.adapayMember.avlBalance,
           };
           console.log("点击提交按钮之前执行 params", params);
           withdraw(params).then((response) => {
             console.log("res 提现金额", response);
-            if (response.code !== 200)
-              return this.$modal.msgError(response.msg);
+            if (response.code !== 200) return this.$modal.msgError(response.msg);
             this.$modal.msgSuccess("操作成功");
             // 重新查询当前 显示的可提现金额
             this.getAdapayBalance();
@@ -451,17 +490,28 @@ export default {
     },
     already() {
       this.recordDialog = true;
-      this.getHistory()
+      this.getHistory();
     },
     //提现记录
     getHistory() {
-      console.log('etWithdrawnParameters', this.getWithdrawnParameters);
+      console.log("etWithdrawnParameters", this.getWithdrawnParameters);
       WithdrawalHistory(this.getWithdrawnParameters).then((response) => {
         console.log("提现记录", response);
         this.payoutInformation = response.data.list;
         this.getTotal = response.data.total;
       });
-    }
+    },
+    // 分润流水弹框
+    getProfitSharing(scope) {
+      console.log("点击分润流水", scope);
+      this.profitSharing = true;
+    },
+    // 关闭分润流水弹框
+    turnOffProfitSharing() {
+      this.profitSharing = false;
+      this.orderList = [];
+      this.queryParams = {};
+    },
   },
   created() {
     this.defaultDate();
@@ -472,84 +522,71 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.color60 {
-  color: #606266;
-}
-
-.center {
-  display: flex;
-  align-content: center;
-  margin-top: 30px;
-}
-
-.margin-20 {
-  margin: 20px 0;
-  font-size: 20px;
-}
-
-.font-13 {
-  font-size: 13px;
+.wp {
+  background: #f3f3f3;
+  padding: 20px;
+  min-height: 100vh;
 }
 
 .header {
   display: flex;
   align-items: center;
-}
-
-.header-cont {
-  display: flex;
   justify-content: space-between;
+  width: 100%;
+  height: 240px;
+
+  h3 {
+    margin: 0px;
+    margin-bottom: 10px;
+  }
+
+  .text-gray {
+    width: 24.5%;
+    height: 100%;
+    background: #fff;
+    border-radius: 8px;
+    box-shadow: 0 3px 2px rgba(0, 0, 0, 0.15);
+    padding: 20px;
+
+    div {
+      height: 35px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      p {
+        color: #666;
+        font-size: 15px;
+      }
+
+      span {
+        display: block;
+        color: #333;
+        font-size: 16px;
+      }
+    }
+
+    .concentrate {
+      color: #666;
+      font-size: 15px;
+      margin: 5px 0 0;
+    }
+  }
+}
+
+.inquire {
+  padding: 20px 20px 0 20px;
+  background: #fff;
+  margin-top: 20px;
+  display: flex;
   align-items: center;
+  justify-content: space-between;
 }
 
-.header-txt {
-  font-size: 24px;
-}
-
-.text {
-  font-size: 12px;
-  color: red;
-}
-
-.foot1 {
-  width: 20%;
-  margin-top: 10px;
-
-  ::v-deep .el-descriptions-item__label {
-    width: 80px;
-    margin-right: 0;
-  }
-}
-
-.foot2 {
-  margin-left: 10px;
-  margin-right: 10px;
-  width: 450px;
-
-  ::v-deep .el-descriptions-item__label {
-    width: 105px;
-    margin-right: 0;
-  }
-}
-
-.foot3 {
-  width: 400px;
-  margin-right: 10px;
-
-  ::v-deep .el-descriptions-item__label {
-    width: 108px;
-    margin-right: 0;
-  }
-}
-
-.foot4 {
-  display: inline-block;
-}
-
-.margin-right {
-  width: 500px;
-  // margin-right: 50px;
-  text-align: center;
+.container {
+  padding: 20px;
+  background: #fff;
+  margin-top: 20px;
 }
 
 .color {
diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue
index 8235fe9be..a4db40920 100644
--- a/jsowell-ui/src/views/financial/financeDetail.vue
+++ b/jsowell-ui/src/views/financial/financeDetail.vue
@@ -1,129 +1,141 @@
 <template>
-  <div class="wp">
-    <div class="header">
-      <template v-if="showAccountList">
-        <div class="text-gray" v-for="(item, index) in settleAccountList" :key="index">
-          <h3>运营商信息</h3>
-          <div>
-            <p>运营商：</p>
-            <span>{{ merchant }}</span>
+  <div class="app-container">
+    <div class="header-cont ">
+      <div class="header-txt">运营汇总</div>
+      <el-button type="primary" @click="goAccount">开户信息</el-button>
+    </div>
+    <div class="header" v-loading="loading">
+      <template v-if="operationStatus == null">
+        <div class="foot1">
+          <div style="margin: 12px 0">未查询到结算账户</div>
+        </div>
+      </template>
+      <template v-else>
+        <template v-if="showAccountList">
+          <div class="foot1" v-for="(item, index) in settleAccountList" :key="index">
+            <el-descriptions :column="1">
+              <el-descriptions-item label="运营商" class="remarks">
+                <span class="color">
+                  {{ merchant }}
+                </span>
+              </el-descriptions-item>
+              <el-descriptions-item label="商家性质">
+                <span class="color">{{
+                  merchantNature === "1" ? "对公" : "对私"
+                }}</span>
+              </el-descriptions-item>
+              <el-descriptions-item label="开户行名称">
+                <span class="color">{{ cityBankCode(item.bankCode) }}</span>
+              </el-descriptions-item>
+              <el-descriptions-item label="收款卡号">
+                <span class="color">{{ item.cardId }}</span>
+              </el-descriptions-item>
+              <el-descriptions-item label="预留手机">
+                <span class="color">{{ item.telNo }}</span>
+              </el-descriptions-item>
+            </el-descriptions>
           </div>
+        </template>
+        <div class="foot1" v-else>
+          <el-descriptions :column="1">
+            <el-descriptions-item label="运营商">
+              <span class="color">
+                {{ merchant }}
+              </span>
+            </el-descriptions-item>
+            <el-descriptions-item label="商家性质">
+              <span class="color">{{
+                merchantNature === "1" ? "对公" : "对私"
+              }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="开户状态">
+              <span class="color">{{ adapayCorpMember.auditDesc }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="开户行名称">
+              <span class="color">{{
+                cityBankCode(adapayCorpMember.bankCode)
+              }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="收款卡号">
+              <span class="color">{{ adapayCorpMember.cardNo }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="预留手机">
+              <span class="color">{{ adapayCorpMember.legalMp }}</span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </template>
+      <div class="foot2">
+        <el-descriptions :column="1">
+          <el-descriptions-item label="总度数(度)">
+            <span class="color">
+              {{ merchantOrderReport.useElectricity }}
+            </span>
+          </el-descriptions-item>
+          <el-descriptions-item label="充电时长(分钟)">
+            <span class="color">{{ merchantOrderReport.chargeTime }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="电费金额(元)">
+            <span class="color">{{
+              merchantOrderReport.electricityAmount
+            }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="交易金额(元)">
+            <span class="color">{{ merchantOrderReport.tradeAmount }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="虚拟金额(元)">
+            <span class="color">{{ merchantOrderReport.virtualAmount }}</span>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <div class="foot3">
+        <el-descriptions :column="1">
+          <el-descriptions-item label="充电次数(次)">
+            <span class="color">{{ merchantOrderReport.chargeNum }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="总结算金额(元)">
+            <span class="color">{{ merchantOrderReport.totalAmount }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="服务费金额(元)">
+            <span class="color">{{ merchantOrderReport.serviceAmount }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="交易手续费(元)">
+            <span class="color">{{ merchantOrderReport.tradeFee }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="白名单支付(次)">
+            <span class="color">{{
+              merchantOrderReport.whitelistPaymentsNum === null
+                ? "一"
+                : merchantOrderReport.whitelistPaymentsNum
+            }}</span>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <template v-if="operationStatus == null">
+        <div class="foot4">未查询到运营商结算账户，提现功能现已关闭</div>
+      </template>
+      <template v-else>
+        <div class="margin-right foot4">
+          <div class="color60" style="margin-bottom: 15px;color:#000;">账户总余额（元）：{{ adapayMember.avlBalance }}</div>
+          <div class="color60">可提现(元)</div>
+          <div class="margin-20 color">{{ adapayMember.lastAvlBalance }}</div>
+          <el-button type="primary" @click="dialogVisible = true">提现申请</el-button>
+          <!-- <div v-else>
+            <span class="text">该余额大于{{ withdrawalFee }}元时，才可发起取现</span>
+          </div> -->
+        </div>
+        <div class="margin-right foot4">
+          <div class="color60">总提现金额(元)</div>
+          <div class="margin-20 color" style="cursor: pointer;" @click="already">{{ adapayMember.totalWithdraw }}</div>
           <div>
-            <p>商家性质：</p>
-            <span>{{ merchantNature === "1" ? "对公" : "对私" }}</span>
-          </div>
-          <div>
-            <p>开户行名称：</p>
-            <span>{{ cityBankCode(item.bankCode) }}</span>
-          </div>
-          <div>
-            <p>收款卡号：</p>
-            <span>{{ item.cardId }}</span>
-          </div>
-          <div>
-            <p>预留手机号：</p>
-            <span>{{ item.telNo }}</span>
+            <span class="text">已成功提现到绑定银行卡的金额</span>
           </div>
         </div>
       </template>
-      <div class="text-gray" v-else>
-        <h3>运营商信息</h3>
-        <div>
-          <p>运营商：</p>
-          <span>{{ merchant }}</span>
-        </div>
-        <div>
-          <p>商家性质：</p>
-          <span>{{ merchantNature === "1" ? "对公" : "对私" }}</span>
-        </div>
-        <div>
-          <p>开户行名称：</p>
-          <span>{{ cityBankCode(adapayCorpMember.bankCode) }}</span>
-        </div>
-        <div>
-          <p>收款卡号：</p>
-          <span>{{ adapayCorpMember.cardNo }}</span>
-        </div>
-        <div>
-          <p>预留手机号：</p>
-          <span>{{ adapayCorpMember.legalMp }}</span>
-        </div>
-      </div>
-      <div class="text-gray">
-        <h3>分润数据</h3>
-        <div>
-          <p>参与分润金额：</p>
-          <span style="color: #2563eb">¥ 153,426.82</span>
-        </div>
-        <div>
-          <p>分出总金额：</p>
-          <span style="color: #16a34a">¥ 98,142.35</span>
-        </div>
-        <div>
-          <p>直接分润金额：</p>
-          <span>¥ 9,12.35</span>
-        </div>
-        <div>
-          <p>间接分润金额：</p>
-          <span>¥ 8,42.35</span>
-        </div>
-        <div>
-          <p>分润订单数：</p>
-          <span>286笔</span>
-        </div>
-      </div>
-      <div class="text-gray">
-        <h3>金额信息</h3>
-        <div>
-          <p>电费金额：</p>
-          <span>¥ {{ merchantOrderReport.electricityAmount ? merchantOrderReport.electricityAmount.toFixed(2) :
-            '0.00' }}</span>
-        </div>
-        <div>
-          <p>交易金额：</p>
-          <span>¥ {{ merchantOrderReport.tradeAmount ? merchantOrderReport.tradeAmount.toFixed(2) : '0.00' }}</span>
-        </div>
-        <div>
-          <p>虚拟金额：</p>
-          <span>¥ {{ merchantOrderReport.virtualAmount ? merchantOrderReport.virtualAmount.toFixed(2) : '0.00' }}</span>
-        </div>
-        <div>
-          <p>服务费金额：</p>
-          <span>¥ {{ merchantOrderReport.serviceAmount ? merchantOrderReport.serviceAmount.toFixed(2) : '0.00' }}</span>
-        </div>
-        <div>
-          <p>交易手续费：</p>
-          <span>¥ {{ merchantOrderReport.tradeFee ? merchantOrderReport.tradeFee.toFixed(2) : '0.00' }}</span>
-        </div>
-      </div>
-      <div class="text-gray">
-        <div style="display: flex; align-items: center; justify-content: space-between;">
-          <h3>提现信息</h3>
-          <el-button type="primary" @click="dialogVisible = true">提现申请</el-button>
-        </div>
-        <div>
-          <p>总结算金额：</p>
-          <span>¥ {{ merchantOrderReport.totalAmount ? merchantOrderReport.totalAmount.toFixed(2) : '0.00' }}</span>
-        </div>
-        <div>
-          <p>账户总余额：</p>
-          <span>¥ {{ adapayMember.avlBalance ? adapayMember.avlBalance.toFixed(2) : '0.00' }}</span>
-        </div>
-        <div>
-          <p>可提现金额：</p>
-          <span style="color: #2563eb">¥ {{ adapayMember.lastAvlBalance ? adapayMember.lastAvlBalance.toFixed(2) :
-            '0.00' }}</span>
-        </div>
-        <div>
-          <p>总提现金额：</p>
-          <span style="color: #16a34a">
-            ¥ {{ adapayMember.totalWithdraw ? adapayMember.totalWithdraw.toFixed(2) : '0.00' }}
-          </span>
-        </div>
-        <p class="concentrate">已成功提现到绑定银行卡的金额</p>
-      </div>
     </div>
-    <div class="inquire">
+    <hr />
+    <div class="center">
+      <div class="header-txt">运营分析</div>
       <el-form :model="queryParams" ref="queryForm" size="small" inline label-width="68px">
         <el-form-item label="日期" prop="tradeDate">
           <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd"
@@ -134,88 +146,29 @@
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         </el-form-item>
       </el-form>
-      <el-form>
-        <el-form-item>
-          <el-button style="height: 40px" type="success" icon="el-icon-s-claim" @click="already">提现记录</el-button>
-        </el-form-item>
-      </el-form>
     </div>
-    <div class="container">
-      <!-- <el-table :data="reportList"> -->
-      <el-table :data="temporary">
-        <el-table-column label="日期" align="center" prop="tradeDate" />
-        <el-table-column label="账单状态" align="center" prop="billStatus">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.bill_status" :value="scope.row.billStatus" />
-          </template>
-        </el-table-column>
-        <el-table-column label="应收金额（元）" align="center" prop="receivableAmount" />
-        <el-table-column label="可提现金额（元）" align="center" prop="withdrawAbleAmount" />
-        <el-table-column label="交易手续费（元）" align="center" prop="feeAmount" />
-        <el-table-column label="分润金额（元）" align="center" prop="aaa" />
-        <el-table-column label="实际到账金额（元）" align="center" prop="bbb" />
-        <el-table-column label="提现订单号" align="center" prop="withdrawCode" />
-        <el-table-column label="提现申请时间" align="center" prop="applicationTime" />
-        <el-table-column label="操作" align="center">
-          <template slot-scope="scope">
-            <span class="link-type" @click="goTradeDate(scope)">订单流水</span>
-            <span class="link-type" style="margin-left: 10px" @click="getProfitSharing(scope)">分润流水</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="reportTotal > 0" :total="reportTotal" :page.sync="reportQueryParams.pageNum"
-        :limit.sync="reportQueryParams.pageSize" @pagination="getList" />
-    </div>
-    <!-- 提现记录 -->
-    <el-dialog title="提现记录" :visible.sync="recordDialog">
-      <el-table :data="payoutInformation" style="width: 100%">
-        <el-table-column label="申请时间" align="center" property="applicationTime" />
-        <el-table-column label="提现编号" align="center" property="withdrawCode" />
-        <el-table-column label="状态" align="center" property="statusDesc" />
-        <el-table-column label="金额" align="center" property="cashAmt" />
-      </el-table>
-      <pagination v-show="getTotal > 0" :total="getTotal" :page.sync="getWithdrawnParameters.pageNum"
-        :limit.sync="getWithdrawnParameters.pageSize" @pagination="getHistory" />
-    </el-dialog>
-    <!-- 订单流水 -->
-    <el-dialog title="订单流水" :visible.sync="dialogTableVisible" :before-close="orderClose">
-      <el-table :data="orderList" v-loading="orderLoading">
-        <el-table-column property="orderCode" label="订单编号" align="center" />
-        <el-table-column property="settleAmount" label="结算金额(元)" align="center" />
-        <el-table-column property="clearingStatus" label="清分状态" align="center" />
-        <el-table-column property="clearingBillCode" label="清分账单编号" align="center" />
-        <el-table-column property="withdrawStatus" label="提现状态" align="center" />
-        <el-table-column property="withdrawCode" label="提现编号" align="center" />
-      </el-table>
-      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
-        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
-    </el-dialog>
-    <!-- 分润流水 -->
-    <el-dialog title="分润流水" :visible.sync="profitSharing" :before-close="turnOffProfitSharing">
-      <el-form :model="queryParams" ref="queryForm" size="small" inline label-width="68px">
-        <el-form-item label="分润类型" prop="tradeDate">
-          <el-select v-model="queryParams.orderStatus" placeholder="请选择分润类型" clearable style="width: 180px">
-            <el-option v-for="item1 in sharingType" :key="item1.value" :label="item1.label" :value="item1.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="">重置</el-button>
-          <el-button type="warning" plain icon="el-icon-download" size="mini" @click=" ">导出</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table :data="orderList">
-        <el-table-column property="orderCode" label="订单编号" align="center" />
-        <el-table-column property="settleAmount" label="结算金额(元)" align="center" />
-        <el-table-column property="" label="分润类型" align="center" />
-        <el-table-column property="" label="电费分润比例" align="center" />
-        <el-table-column property="" label="电费分润金额(元)" align="center" />
-        <el-table-column property="" label="服务费分润比例" align="center" />
-        <el-table-column property="" label="服务费分润金额(元)" align="center" />
-      </el-table>
-      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
-        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
-    </el-dialog>
+    <hr />
+    <el-table :data="reportList">
+      <el-table-column label="日期" align="center" prop="tradeDate" />
+
+      <el-table-column label="账单状态" align="center" prop="billStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.bill_status" :value="scope.row.billStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="应收金额（元）" align="center" prop="receivableAmount" />
+      <el-table-column label="可提现金额（元）" align="center" prop="withdrawAbleAmount" />
+      <el-table-column label="交易手续费（元）" align="center" prop="feeAmount" />
+      <el-table-column label="提现订单号" align="center" prop="withdrawCode" />
+      <el-table-column label="提现申请时间" align="center" prop="applicationTime" />
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <span class="link-type" @click="goTradeDate(scope)">订单流水</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="reportTotal > 0" :total="reportTotal" :page.sync="reportQueryParams.pageNum"
+      :limit.sync="reportQueryParams.pageSize" @pagination="getList" />
     <!-- 提现申请弹窗 -->
     <el-dialog title="提现申请" :visible.sync="dialogVisible" width="33%">
       温馨提示
@@ -248,6 +201,30 @@
         <el-button type="primary" @click="submit">提交</el-button>
       </span>
     </el-dialog>
+    <!-- 提现记录 -->
+    <el-dialog title="提现记录" :visible.sync="recordDialog">
+      <el-table :data="payoutInformation" style="width: 100%">
+        <el-table-column label="申请时间" align="center" property="applicationTime" />
+        <el-table-column label="提现编号" align="center" property="withdrawCode" />
+        <el-table-column label="状态" align="center" property="statusDesc" />
+        <el-table-column label="金额" align="center" property="cashAmt" />
+      </el-table>
+      <pagination v-show="getTotal > 0" :total="getTotal" :page.sync="getWithdrawnParameters.pageNum"
+        :limit.sync="getWithdrawnParameters.pageSize" @pagination="getHistory" />
+    </el-dialog>
+    <!-- 订单流水 -->
+    <el-dialog title="订单流水" :visible.sync="dialogTableVisible" :before-close="orderClose">
+      <el-table :data="orderList" v-loading="orderLoading">
+        <el-table-column property="orderCode" label="订单编号" align="center" />
+        <el-table-column property="settleAmount" label="结算金额(元)" align="center" />
+        <el-table-column property="clearingStatus" label="清分状态" align="center" />
+        <el-table-column property="clearingBillCode" label="清分账单编号" align="center" />
+        <el-table-column property="withdrawStatus" label="提现状态" align="center" />
+        <el-table-column property="withdrawCode" label="提现编号" align="center" />
+      </el-table>
+      <pagination v-show="orderTotal > 0" :total="orderTotal" :page.sync="getOrderParams.pageNum"
+        :limit.sync="getOrderParams.pageSize" @pagination="getOrderList" />
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -256,7 +233,7 @@ import {
   withdraw,
   selectAdapayMember,
   queryAdapayAccountBalance,
-  WithdrawalHistory,
+  WithdrawalHistory
 } from "@/api/adapayMember/adapayMember";
 import { getOrderReportDetail } from "@/api/order/order";
 import { getDay } from "@/utils/common";
@@ -314,25 +291,7 @@ export default {
         pageSize: 10,
       },
       payoutInformation: [],
-      getTotal: 0,
-      profitSharing: false,
-      temporary: [
-        {
-          tradeDate: "2025-02-18",
-          billStatus: "提现申请中",
-          receivableAmount: "313.92",
-          withdrawAbleAmount: "1371.99",
-          feeAmount: "1.83",
-          aaa: "1059.92",
-          bbb: "1059.92",
-          withdrawCode: "0021110738083352290123776",
-          applicationTime: "2025-02-19 08:31:00",
-        },
-      ],
-      sharingType: [
-        { label: "直接分润", value: "1" },
-        { label: "间接分润", value: "2" },
-      ],
+      getTotal: 0
     };
   },
   methods: {
@@ -421,7 +380,8 @@ export default {
         console.log("getMerchantOrderReport", response);
         if (response.data) {
           this.merchantOrderReport = response.data.merchantOrderReport;
-          if (response.data.pageResponse === null) return (this.reportList = []);
+          if (response.data.pageResponse === null)
+            return (this.reportList = []);
           this.reportList = response.data.pageResponse.list;
           this.reportTotal = response.data.pageResponse.total;
         } else {
@@ -435,12 +395,13 @@ export default {
         .then((_) => {
           let params = {
             merchantId: this.merchantId,
-            cashAmt: this.adapayMember.avlBalance,
+            cashAmt: this.adapayMember.lastAvlBalance,
           };
           console.log("点击提交按钮之前执行 params", params);
           withdraw(params).then((response) => {
             console.log("res 提现金额", response);
-            if (response.code !== 200) return this.$modal.msgError(response.msg);
+            if (response.code !== 200)
+              return this.$modal.msgError(response.msg);
             this.$modal.msgSuccess("操作成功");
             // 重新查询当前 显示的可提现金额
             this.getAdapayBalance();
@@ -490,28 +451,17 @@ export default {
     },
     already() {
       this.recordDialog = true;
-      this.getHistory();
+      this.getHistory()
     },
     //提现记录
     getHistory() {
-      console.log("etWithdrawnParameters", this.getWithdrawnParameters);
+      console.log('etWithdrawnParameters', this.getWithdrawnParameters);
       WithdrawalHistory(this.getWithdrawnParameters).then((response) => {
         console.log("提现记录", response);
         this.payoutInformation = response.data.list;
         this.getTotal = response.data.total;
       });
-    },
-    // 分润流水弹框
-    getProfitSharing(scope) {
-      console.log("点击分润流水", scope);
-      this.profitSharing = true;
-    },
-    // 关闭分润流水弹框
-    turnOffProfitSharing() {
-      this.profitSharing = false;
-      this.orderList = [];
-      this.queryParams = {};
-    },
+    }
   },
   created() {
     this.defaultDate();
@@ -522,71 +472,84 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.wp {
-  background: #f3f3f3;
-  padding: 20px;
-  min-height: 100vh;
+.color60 {
+  color: #606266;
+}
+
+.center {
+  display: flex;
+  align-content: center;
+  margin-top: 30px;
+}
+
+.margin-20 {
+  margin: 20px 0;
+  font-size: 20px;
+}
+
+.font-13 {
+  font-size: 13px;
 }
 
 .header {
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  height: 240px;
-
-  h3 {
-    margin: 0px;
-    margin-bottom: 10px;
-  }
-
-  .text-gray {
-    width: 24.5%;
-    height: 100%;
-    background: #fff;
-    border-radius: 8px;
-    box-shadow: 0 3px 2px rgba(0, 0, 0, 0.15);
-    padding: 20px;
-
-    div {
-      height: 35px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-
-      p {
-        color: #666;
-        font-size: 15px;
-      }
-
-      span {
-        display: block;
-        color: #333;
-        font-size: 16px;
-      }
-    }
-
-    .concentrate {
-      color: #666;
-      font-size: 15px;
-      margin: 5px 0 0;
-    }
-  }
 }
 
-.inquire {
-  padding: 20px 20px 0 20px;
-  background: #fff;
-  margin-top: 20px;
+.header-cont {
   display: flex;
-  align-items: center;
   justify-content: space-between;
+  align-items: center;
 }
 
-.container {
-  padding: 20px;
-  background: #fff;
-  margin-top: 20px;
+.header-txt {
+  font-size: 24px;
+}
+
+.text {
+  font-size: 12px;
+  color: red;
+}
+
+.foot1 {
+  width: 20%;
+  margin-top: 10px;
+
+  ::v-deep .el-descriptions-item__label {
+    width: 80px;
+    margin-right: 0;
+  }
+}
+
+.foot2 {
+  margin-left: 10px;
+  margin-right: 10px;
+  width: 450px;
+
+  ::v-deep .el-descriptions-item__label {
+    width: 105px;
+    margin-right: 0;
+  }
+}
+
+.foot3 {
+  width: 400px;
+  margin-right: 10px;
+
+  ::v-deep .el-descriptions-item__label {
+    width: 108px;
+    margin-right: 0;
+  }
+}
+
+.foot4 {
+  display: inline-block;
+}
+
+.margin-right {
+  width: 500px;
+  // margin-right: 50px;
+  text-align: center;
 }
 
 .color {