From 5c10fa3e8a720f573c52b8e6cb602d6f345b5bfb Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 28 Jun 2024 13:07:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0=EF=BC=8C=E5=8E=9F?=
 =?UTF-8?q?=E6=9C=89=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                | 147 ++++
 .../accounts/accountAnalysis/index.vue        | 650 ++++++++++++++++++
 .../accounts/accountDealAnalysis/index.vue    | 495 +++++++++++++
 .../accounts/accountsBalance/index.vue        | 388 +++++++++++
 .../accounts/creditCardDealAnalysis/index.vue | 552 +++++++++++++++
 .../accounts/debitDealAnalysis/index.vue      | 546 +++++++++++++++
 .../accounts/investDealAnalysis/index.vue     | 510 ++++++++++++++
 .../statistic/accounts/posAnalysis/index.vue  | 497 +++++++++++++
 .../bill/creditBillAnalysis/index.vue         | 523 ++++++++++++++
 .../bill/creditInstallmentAnalysis/index.vue  | 514 ++++++++++++++
 .../index.vue                                 | 499 ++++++++++++++
 .../bill/creditRecordAnalysis/index.vue       | 495 +++++++++++++
 .../statistic/bill/futuresAnalysis/index.vue  | 500 ++++++++++++++
 .../statistic/bill/investAnalysis/index.vue   | 499 ++++++++++++++
 .../bill/onlineLendAnalysis/index.vue         | 515 ++++++++++++++
 .../bill/onlineLendSettledAnalysis/index.vue  | 500 ++++++++++++++
 .../statistic/bill/stocksAnalysis/index.vue   | 500 ++++++++++++++
 src/pages/statistic/index.vue                 |  60 +-
 .../accounts/accountDealRecord/addEdit.vue    |   2 +-
 .../work/accounts/accountDealRecord/list.vue  |  26 +-
 .../accounts/creditTransferRecord/list.vue    |  25 +-
 .../accounts/debitTransferRecord/list.vue     |  25 +-
 .../work/accounts/investAccountDeal/list.vue  |  25 +-
 .../accounts/investTransferRecord/list.vue    |  27 +-
 .../work/accounts/lendTransferRecord/list.vue |  26 +-
 .../work/accounts/posTransferRecord/list.vue  |  26 +-
 src/pages/work/base/creditCard/addEdit.vue    |   6 +-
 src/pages/work/base/futures/addEdit.vue       | 228 ++++++
 src/pages/work/base/futures/details.vue       |  91 +++
 src/pages/work/base/futures/list.vue          | 340 +++++++++
 src/pages/work/base/posmachine/addEdit.vue    | 308 +++++++++
 src/pages/work/base/posmachine/details.vue    | 105 +++
 src/pages/work/base/posmachine/list.vue       | 351 ++++++++++
 src/pages/work/base/stocks/addEdit.vue        | 212 ++++++
 src/pages/work/base/stocks/details.vue        |  89 +++
 src/pages/work/base/stocks/list.vue           | 331 +++++++++
 .../work/bill/creditCardBill/addEdit.vue      |   2 +-
 .../bill/creditInstallmentHistory/addEdit.vue |   7 +-
 .../detailsAddEdit.vue                        |   8 +-
 src/pages/work/bill/futuresBill/addEdit.vue   |   2 +-
 .../work/bill/onlineLendHistory/addEdit.vue   |   7 +-
 .../bill/onlineLendHistory/detailsAddEdit.vue |   6 +-
 .../work/bill/peopleLendHistory/addEdit.vue   |   2 +-
 src/pages/work/bill/stocksBill/addEdit.vue    |   2 +-
 src/pages/work/index.vue                      |   8 +-
 src/static/images/average.png                 | Bin 0 -> 1463 bytes
 src/static/images/completionTickets.png       | Bin 0 -> 9115 bytes
 src/static/images/completionTime.png          | Bin 0 -> 7104 bytes
 src/static/images/four.png                    | Bin 0 -> 4694 bytes
 src/static/images/one.png                     | Bin 0 -> 5237 bytes
 src/static/images/positiveRating.png          | Bin 0 -> 4513 bytes
 src/static/images/three.png                   | Bin 0 -> 7173 bytes
 src/static/images/ticketSum.png               | Bin 0 -> 4051 bytes
 src/static/images/two.png                     | Bin 0 -> 6454 bytes
 54 files changed, 10591 insertions(+), 86 deletions(-)
 create mode 100644 src/pages/statistic/accounts/accountAnalysis/index.vue
 create mode 100644 src/pages/statistic/accounts/accountDealAnalysis/index.vue
 create mode 100644 src/pages/statistic/accounts/accountsBalance/index.vue
 create mode 100644 src/pages/statistic/accounts/creditCardDealAnalysis/index.vue
 create mode 100644 src/pages/statistic/accounts/debitDealAnalysis/index.vue
 create mode 100644 src/pages/statistic/accounts/investDealAnalysis/index.vue
 create mode 100644 src/pages/statistic/accounts/posAnalysis/index.vue
 create mode 100644 src/pages/statistic/bill/creditBillAnalysis/index.vue
 create mode 100644 src/pages/statistic/bill/creditInstallmentAnalysis/index.vue
 create mode 100644 src/pages/statistic/bill/creditInstallmentSettledAnalysis/index.vue
 create mode 100644 src/pages/statistic/bill/creditRecordAnalysis/index.vue
 create mode 100644 src/pages/statistic/bill/futuresAnalysis/index.vue
 create mode 100644 src/pages/statistic/bill/investAnalysis/index.vue
 create mode 100644 src/pages/statistic/bill/onlineLendAnalysis/index.vue
 create mode 100644 src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue
 create mode 100644 src/pages/statistic/bill/stocksAnalysis/index.vue
 create mode 100644 src/pages/work/base/futures/addEdit.vue
 create mode 100644 src/pages/work/base/futures/details.vue
 create mode 100644 src/pages/work/base/futures/list.vue
 create mode 100644 src/pages/work/base/posmachine/addEdit.vue
 create mode 100644 src/pages/work/base/posmachine/details.vue
 create mode 100644 src/pages/work/base/posmachine/list.vue
 create mode 100644 src/pages/work/base/stocks/addEdit.vue
 create mode 100644 src/pages/work/base/stocks/details.vue
 create mode 100644 src/pages/work/base/stocks/list.vue
 create mode 100644 src/static/images/average.png
 create mode 100644 src/static/images/completionTickets.png
 create mode 100644 src/static/images/completionTime.png
 create mode 100644 src/static/images/four.png
 create mode 100644 src/static/images/one.png
 create mode 100644 src/static/images/positiveRating.png
 create mode 100644 src/static/images/three.png
 create mode 100644 src/static/images/ticketSum.png
 create mode 100644 src/static/images/two.png

diff --git a/src/pages.json b/src/pages.json
index 282b3e9..a413b1f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -55,6 +55,95 @@
       }
     }
     ,
+    {
+      "path": "pages/statistic/accounts/accountsBalance/index",
+      "style": {
+        "navigationBarTitleText": "记账账户统计"
+      }
+    },{
+      "path": "pages/statistic/bill/creditRecordAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "征信查询统计"
+      }
+    },
+    {
+      "path": "pages/statistic/accounts/posAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "POS机刷卡统计"
+      }
+    },
+    {
+      "path": "pages/statistic/accounts/debitDealAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "储蓄卡收支统计"
+      }
+    },
+    {
+      "path": "pages/statistic/accounts/creditCardDealAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "信用卡收支统计"
+      }
+    },
+    {
+      "path": "pages/statistic/bill/onlineLendAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "网贷待还统计"
+      }
+    },{
+      "path": "pages/statistic/bill/onlineLendSettledAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "网贷已还统计"
+      }
+    },
+    {
+      "path": "pages/statistic/bill/futuresAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "期货统计分析"
+      }
+    },
+    {
+      "path": "pages/statistic/bill/stocksAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "股票统计分析"
+      }
+    }, 
+    {
+      "path": "pages/statistic/bill/investAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "收益统计分析"
+      }
+    },
+    {
+      "path": "pages/statistic/bill/creditInstallmentSettledAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "信用卡分期已还"
+      }
+    },{
+      "path": "pages/statistic/bill/creditBillAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "信用卡账单统计"
+      }
+    },
+    {
+      "path": "pages/statistic/bill/creditInstallmentAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "信用卡分期待还统计"
+      }
+    },
+    {
+      "path": "pages/statistic/accounts/investDealAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "投资收益统计"
+      }
+    }
+    ,
+    {
+      "path": "pages/statistic/accounts/accountDealAnalysis/index",
+      "style": {
+        "navigationBarTitleText": "账户收支统计"
+      }
+    }
+    ,
     {
       "path": "pages/work/accounts/accountDealRecord/list",
       "style": {
@@ -263,6 +352,64 @@
       "style": {
         "navigationBarTitleText": "信用卡管理"
       }
+    },
+    {
+      "path": "pages/work/base/posmachine/list",
+      "style": {
+        "navigationBarTitleText": "POS机管理"
+      }
+    } ,
+    {
+      "path": "pages/work/base/posmachine/details",
+      "style": {
+        "navigationBarTitleText": "POS机管理详情"
+      }
+    }
+    ,
+    {
+      "path": "pages/work/base/posmachine/addEdit",
+      "style": {
+        "navigationBarTitleText": "POS机管理"
+      }
+    }
+    ,
+    {
+      "path": "pages/work/base/futures/list",
+      "style": {
+        "navigationBarTitleText": "期货账户管理"
+      }
+    } ,
+    {
+      "path": "pages/work/base/futures/details",
+      "style": {
+        "navigationBarTitleText": "期货账户管理详情"
+      }
+    }
+    ,
+    {
+      "path": "pages/work/base/futures/addEdit",
+      "style": {
+        "navigationBarTitleText": "期货账户管理"
+      }
+    } ,
+    {
+      "path": "pages/work/base/stocks/list",
+      "style": {
+        "navigationBarTitleText": "股票账户管理"
+      }
+    } ,
+    {
+      "path": "pages/work/base/stocks/details",
+      "style": {
+        "navigationBarTitleText": "股票账户管理详情"
+      }
+    }
+    ,
+    {
+      "path": "pages/work/base/stocks/addEdit",
+      "style": {
+        "navigationBarTitleText": "股票账户管理"
+      }
     }
     ,
     {
diff --git a/src/pages/statistic/accounts/accountAnalysis/index.vue b/src/pages/statistic/accounts/accountAnalysis/index.vue
new file mode 100644
index 0000000..aeda8f9
--- /dev/null
+++ b/src/pages/statistic/accounts/accountAnalysis/index.vue
@@ -0,0 +1,650 @@
+<template>
+    <div class="app-container" style="overflow: auto">
+      <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;负债信息</div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">净资产</div>
+            <div class="num">{{ netAsset }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">总负债</div>
+            <div class="num">{{ totalDebt }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">储蓄卡余额</div>
+            <div class="num">{{ debetBalance }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">投资账户余额</div>
+            <div class="num">{{ investBalance }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">网贷欠款</div>
+            <div class="num">{{ unClearedOnlineDebt }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">信用卡已使用额度</div>
+            <div class="num">{{ creditBalance }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">人情欠款</div>
+            <div class="num">{{ peopleLendHistory }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;投资收益</div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">投资账户余额</div>
+            <div class="num">{{ investBalance }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">总收益</div>
+            <div class="num">{{ totalIncome }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">期货收益</div>
+            <div class="num">{{ futuresIncome }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">股票收益</div>
+            <div class="num">{{ stocksIncome }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;网贷信息</div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">当月应还款</div>
+            <div class="num">{{ dueOnlineDebt }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">当月已还款</div>
+            <div class="num">{{ repaidOnlineDebt }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">当月待还款</div>
+            <div class="num">{{ leftOnlineDebt }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">未结清网贷笔数</div>
+            <div class="num">{{ unclearedOnlineDebtCount }}<span>笔</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">未结清网贷本金</div>
+            <div class="num">{{ unClearedOnlineDebtPrinciple }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">未结清网贷利息</div>
+            <div class="num">{{ unClearedOnlineDebtInterest }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">已结清网贷笔数</div>
+            <div class="num">{{ clearedOnlineDebtCount }}<span>笔</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">已结清网贷本金</div>
+            <div class="num">{{ clearedOnlineDebtPrinciple }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">已结清网贷利息</div>
+            <div class="num">{{ clearedOnlineDebtInterest }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+  
+      <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;信用卡信息</div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">信用卡总数</div>
+            <div class="num">{{ creditCount }}<span>张</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">总额度</div>
+            <div class="num">{{ creditLimit }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">已使用额度</div>
+            <div class="num">{{ creditBalance }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">可用额度</div>
+            <div class="num">{{ creditAvailableLimit }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">信用卡使用率</div>
+            <div class="num">{{ creditBillRate }}<span>%</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">当月账单</div>
+            <div class="num">{{ currentCreditBill }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">当月分期本息</div>
+            <div class="num">{{ creditInstallment }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">未结清分期笔数</div>
+            <div class="num">{{ unclearedCreditInstallmentCount }}<span>笔</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">未结清分期本息</div>
+            <div class="num">{{ unclearedCreditInstallment }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">未结清分期本金</div>
+            <div class="num">{{ unclearedCreditInstallmentPrinciple }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">未结清分期利息</div>
+            <div class="num">{{ unclearedCreditInstallmentInterest }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">已结清分期笔数</div>
+            <div class="num">{{ clearedCreditInstallmentCount }}<span>笔</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">已结清分期本息</div>
+            <div class="num">{{ clearedCreditInstallmentDebt }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">已结清分期本金</div>
+            <div class="num">{{ clearedCreditInstallmentPrinciple }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">已结清分期利息</div>
+            <div class="num">{{ clearedCreditInstallmentInterest }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">上月账单使用率</div>
+            <div class="num">{{ lastMonthUsedRate }}<span>%</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">上月账单</div>
+            <div class="num">{{ lastMonthUsedLimit }}<span>元</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近6个月账单使用率</div>
+            <div class="num">{{ lastSixMonthUsedRate }}<span>%</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近6个月账单平均使用额度</div>
+            <div class="num">{{ lastSixMonthUsedLimit }}<span>元</span></div>
+          </div>
+        </div>
+      </div>
+  
+      <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;征信信息</div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近1月硬查询次数</div>
+            <div class="num">{{ lastOneMonths }}<span>次</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近2月硬查询次数</div>
+            <div class="num">{{ lastTwoMonths }}<span>次</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近3月硬查询次数</div>
+            <div class="num">{{ lastThreeMonths }}<span>次</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近6月硬查询次数</div>
+            <div class="num">{{ lastSixMonths }}<span>次</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近1年硬查询次数</div>
+            <div class="num">{{ lastOneYears }}<span>次</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近2年硬查询次数</div>
+            <div class="num">{{ lastTwoYears }}<span>次</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">总硬查询次数</div>
+            <div class="num">{{ lastAllYears }}<span>次</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近6月个人查询次数</div>
+            <div class="num">{{ lastSixMonthQueryCount }}<span>次</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近6月贷后管理次数</div>
+            <div class="num">{{ lastSixMonthsAfterLoan }}<span>次</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">近2年贷后管理次数</div>
+            <div class="num">{{ lastTwoYearsAfterLoan }}<span>次</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">贷后管理总次数</div>
+            <div class="num">{{ totalAfterLoan }}<span>次</span></div>
+          </div>
+        </div>
+      </div>
+      <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;基础信息</div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">POS机总数</div>
+            <div class="num">{{ posCount }}<span>台</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">信用卡总数</div>
+            <div class="num">{{ creditCount }}<span>张</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">储蓄卡总数</div>
+            <div class="num">{{ debitCount }}<span>张</span></div>
+          </div>
+        </div>
+      </div>
+  
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">股票账户总数</div>
+            <div class="num">{{ stocksCount }}<span>个</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">期货账户总数</div>
+            <div class="num">{{ futuresCount }}<span>个</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">人情总数</div>
+            <div class="num">{{ peopleLendCount }}<span>人</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">网贷总数</div>
+            <div class="num">{{ onlineLendCount }}<span>个</span></div>
+          </div>
+        </div>
+      </div>
+  
+      <div></div>
+    </div>
+  </template>
+  <script setup name="facilityType">
+  import { getBaseAccountInfo, getDebetInfo, getIncomeInfo, getCreditInfo } from '@/api/invest/accountAnalysis.js'
+  import { getCreditRecordAnalysis } from '@/api/invest/creditQueryRecord'
+  
+  //投资收益
+  const futuresIncome = ref(0)
+  const totalIncome = ref(0)
+  const stocksIncome = ref(0)
+  const investBalance = ref(0)
+  
+  //基础信息
+  const posCount = ref(0)
+  const debitCount = ref(0)
+  const stocksCount = ref(0)
+  const futuresCount = ref(0)
+  const peopleLendCount = ref(0)
+  const onlineLendCount = ref(0)
+  const creditCount = ref(0)
+  
+  //网贷信息-公共
+  const creditInstallmentHistory = ref(0)
+  const peopleLendHistory = ref(0)
+  const totalDebt = ref(0)
+  const debetBalance = ref(0)
+  const netAsset = ref(0)
+  
+  //网贷信息
+  const unclearedOnlineDebtCount = ref(0)
+  const unClearedOnlineDebt = ref(0)
+  const unClearedOnlineDebtPrinciple = ref(0)
+  const unClearedOnlineDebtInterest = ref(0)
+  const clearedOnlineDebtCount = ref(0)
+  const clearedOnlineDebt = ref(0)
+  const clearedOnlineDebtPrinciple = ref(0)
+  const clearedOnlineDebtInterest = ref(0)
+  const dueOnlineDebt = ref(0)
+  const repaidOnlineDebt = ref(0)
+  const leftOnlineDebt = ref(0)
+  
+  //信用卡信息
+  
+  const currentCreditBill = ref(0)
+  const creditInstallment = ref(0)
+  const creditLimit = ref(0)
+  const lastSixMonthUsedLimit = ref(0)
+  const lastSixMonthUsedRate = ref(0)
+  const lastMonthUsedLimit = ref(0)
+  const lastMonthUsedRate = ref(0)
+  const creditBalance = ref(0)
+  const creditAvailableLimit = ref(0)
+  const creditBillRate = ref(0)
+  const unclearedCreditInstallmentCount = ref(0)
+  const unclearedCreditInstallment = ref(0)
+  const unclearedCreditInstallmentPrinciple = ref(0)
+  const unclearedCreditInstallmentInterest = ref(0)
+  const clearedCreditInstallmentCount = ref(0)
+  const clearedCreditInstallmentDebt = ref(0)
+  const clearedCreditInstallmentPrinciple = ref(0)
+  const clearedCreditInstallmentInterest = ref(0)
+  
+  //征信信息
+  const lastOneMonths = ref(0)
+  const lastTwoMonths = ref(0)
+  const lastThreeMonths = ref(0)
+  const lastSixMonths = ref(0)
+  const lastOneYears = ref(0)
+  const lastTwoYears = ref(0)
+  const lastAllYears = ref(0)
+  const lastSixMonthQueryCount = ref(0)
+  const lastSixMonthsAfterLoan = ref(0)
+  const lastTwoYearsAfterLoan = ref(0)
+  const totalAfterLoan = ref(0)
+  
+  const getIncomeInfoData = () => {
+    getIncomeInfo().then((res) => {
+      totalIncome.value = res.data.totalIncome
+      futuresIncome.value = res.data.futuresIncome
+      stocksIncome.value = res.data.stocksIncome
+      investBalance.value = res.data.investBalance
+    })
+  }
+  
+  const getBaseAccountInfoData = () => {
+    getBaseAccountInfo().then((res) => {
+      posCount.value = res.data.posCount
+      creditCount.value = res.data.creditCount
+      debitCount.value = res.data.debitCount
+      stocksCount.value = res.data.stocksCount
+      futuresCount.value = res.data.futuresCount
+      peopleLendCount.value = res.data.peopleLendCount
+      onlineLendCount.value = res.data.onlineLendCount
+    })
+  }
+  
+  const getCreditInfoData = () => {
+    getCreditInfo().then((res) => {
+      currentCreditBill.value = res.data.currentCreditBill
+      creditInstallment.value = res.data.creditInstallment
+      creditLimit.value = res.data.creditLimit
+      lastSixMonthUsedLimit.value = res.data.lastSixMonthUsedLimit
+      lastSixMonthUsedRate.value = res.data.lastSixMonthUsedRate
+      lastMonthUsedLimit.value = res.data.lastMonthUsedLimit
+      lastMonthUsedRate.value = res.data.lastMonthUsedRate
+      creditBalance.value = res.data.creditBalance
+      creditAvailableLimit.value = res.data.creditAvailableLimit
+      creditBillRate.value = res.data.creditBillRate
+      unclearedCreditInstallmentCount.value = res.data.unclearedCreditInstallmentCount
+      unclearedCreditInstallment.value = res.data.unclearedCreditInstallment
+      unclearedCreditInstallmentPrinciple.value = res.data.unclearedCreditInstallmentPrinciple
+      unclearedCreditInstallmentInterest.value = res.data.unclearedCreditInstallmentInterest
+      clearedCreditInstallmentCount.value = res.data.clearedCreditInstallmentCount
+      clearedCreditInstallmentDebt.value = res.data.clearedCreditInstallmentDebt
+      clearedCreditInstallmentPrinciple.value = res.data.clearedCreditInstallmentPrinciple
+      clearedCreditInstallmentInterest.value = res.data.clearedCreditInstallmentInterest
+    })
+  }
+  const getDebetInfoData = () => {
+    getDebetInfo().then((res) => {
+      unClearedOnlineDebt.value = res.data.unClearedOnlineDebt
+      creditInstallmentHistory.value = res.data.creditInstallmentHistory
+      totalDebt.value = res.data.totalDebt
+      netAsset.value = res.data.netAsset
+      debetBalance.value = res.data.debetBalance
+      peopleLendHistory.value = res.data.peopleLendHistory
+      unclearedOnlineDebtCount.value = res.data.unclearedOnlineDebtCount
+      clearedOnlineDebtCount.value = res.data.clearedOnlineDebtCount
+      clearedOnlineDebt.value = res.data.clearedOnlineDebt
+      dueOnlineDebt.value = res.data.dueOnlineDebt
+      repaidOnlineDebt.value = res.data.repaidOnlineDebt
+      leftOnlineDebt.value = res.data.leftOnlineDebt
+      unClearedOnlineDebtPrinciple.value = res.data.unClearedOnlineDebtPrinciple
+      unClearedOnlineDebtInterest.value = res.data.unClearedOnlineDebtInterest
+      clearedOnlineDebtPrinciple.value = res.data.clearedOnlineDebtPrinciple
+      clearedOnlineDebtInterest.value = res.data.clearedOnlineDebtInterest
+    })
+  }
+  const getCreditRecordAnalysisData = () => {
+    getCreditRecordAnalysis().then((res) => {
+      lastOneMonths.value = res.data.lastOneMonths
+      lastTwoMonths.value = res.data.lastTwoMonths
+      lastThreeMonths.value = res.data.lastThreeMonths
+      lastSixMonths.value = res.data.lastSixMonths
+      lastOneYears.value = res.data.lastOneYears
+      lastTwoYears.value = res.data.lastTwoYears
+      lastAllYears.value = res.data.lastAllYears
+      lastSixMonthQueryCount.value = res.data.lastSixMonthQueryCount
+      lastSixMonthsAfterLoan.value = res.data.lastSixMonthsAfterLoan
+      lastTwoYearsAfterLoan.value = res.data.lastTwoYearsAfterLoan
+      totalAfterLoan.value = res.data.totalAfterLoan
+    })
+  }
+  
+  onMounted(() => {
+    getIncomeInfoData()
+    getBaseAccountInfoData()
+    getCreditInfoData()
+    getDebetInfoData()
+    getCreditRecordAnalysisData()
+  })
+  </script>
+  <style lang="scss" scoped>
+  .app-container {
+    .header-con {
+      width: 100%;
+      height: 120px;
+      background-color: #ffffff;
+      margin-bottom: 10px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .item {
+        width: 20%;
+        height: 100%;
+        display: flex;
+        position: relative;
+        align-items: center;
+        margin: 30px 60px 30px 60px;
+        .title {
+          margin-left: 20px;
+          color: rgb(133, 133, 148);
+          margin-bottom: 8px;
+        }
+        .num {
+          margin-left: 20px;
+          font-weight: bold;
+        }
+      }
+      img {
+        height: 50px;
+        width: 50px;
+      }
+    }
+    .header-title {
+      width: 100%;
+      height: 30px;
+      background-color: #ffffff;
+      margin-bottom: 3px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/pages/statistic/accounts/accountDealAnalysis/index.vue b/src/pages/statistic/accounts/accountDealAnalysis/index.vue
new file mode 100644
index 0000000..e54b83a
--- /dev/null
+++ b/src/pages/statistic/accounts/accountDealAnalysis/index.vue
@@ -0,0 +1,495 @@
+<template>
+    <view class="container">
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select"   placeholder="" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">交易时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="date"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">收支差额</div>
+          <div class="num">{{ account.balance }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">工资收益</div>
+          <div class="num">{{  account.salaryIncome }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">投资盈利</div>
+          <div class="num">{{ account.investIncome}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">投资亏损</div>
+          <div class="num">{{ account.investOutcome }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">支出总额</div>
+          <div class="num">{{ account.totalOutcome}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">日常支出</div>
+          <div class="num">{{  account.dailyExpenses }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">手续费利息支出</div>
+          <div class="num">{{ account.notDailyExpenses}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">POS机刷卡手续费</div>
+          <div class="num">{{ account.posExpenses }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">信用卡分期利息</div>
+          <div class="num">{{ account.creditInterest}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">网贷利息</div>
+          <div class="num">{{  account.onLineInterest }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 收支金额：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">收支明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getAcccountsOutInAnalysis } from '@/api/invest/statisticAnalysis'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+  import { listAccounts } from '@/api/invest/accounts'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const account = ref({
+    amount: '',
+  income: '',
+  expenses: '',
+  incomeCount: '',
+  expensesCount: '',
+  posExpensesCount: '',
+  posExpenses: '',
+  realExpenses: '',
+  realExpensesCount: '',
+  otherExpensesCount: '',
+  acccountsList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+    pageNum: 1,
+    state: '1',
+    pageSize: 100
+  },
+    queryParams: {
+    type: 1,
+    time: null,
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = '1'
+        let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+   const start = dayjs(end).add(-7, 'day')
+   queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+    }
+  function getList() {
+    getAcccountsOutInAnalysis({...queryParams.value }).then(res => {
+            account.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableAccountsList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+   const start = dayjs(end).add(-7, 'day')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+    listAccounts(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/accounts/accountsBalance/index.vue b/src/pages/statistic/accounts/accountsBalance/index.vue
new file mode 100644
index 0000000..2f7688f
--- /dev/null
+++ b/src/pages/statistic/accounts/accountsBalance/index.vue
@@ -0,0 +1,388 @@
+<template>
+    <view class="container">
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.dataTypeName" border="false" type="select"  @click="handleAccountType" placeholder="请选择账户类型" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+        </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">储蓄卡可用余额</div>
+          <div class="num">{{ accountsBalance.debetBalance }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">信用卡可用额度</div>
+          <div class="num">{{ accountsBalance.creditAvailableLimit }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">信用卡余额</div>
+          <div class="num">{{ accountsBalance.creditBalance }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">投资账户余额</div>
+          <div class="num">{{ accountsBalance.investBalance }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">借贷账户余额</div>
+          <div class="num">{{ accountsBalance.debitBalance }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+
+    <div></div>
+  </div>
+      <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.account+'可用余额：'+item.availableLimit" size="30rpx" color="#333333" ></u--text>
+            </view>
+
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountTypeList" keyName="dictLabel" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getAccountsAnalysis } from '@/api/invest/statisticAnalysis'
+  import { getDicts } from '@/api/system/dict/data.js'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+
+  const accountsBalance = ref({
+  debetBalance: '',
+  creditAvailableLimit: '',
+  creditBalance: '',
+  investBalance: '',
+  debitBalance: '',
+  accountsBalancesList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryParams: {
+    type: 1,
+    time: null,
+    dataType: null,
+    id: null
+     } 
+  })
+  const { filterPanel, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+  function getList() {
+        getAccountsAnalysis({...queryParams.value }).then(res => {
+            accountsBalance.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.accountsBalancesList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+        // 记账类型类型
+        getDicts('account_type').then(res => {
+          accountTypeList.value =[res.data]  
+        })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccountType() {
+          if (accountTypeList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '账户类型为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.dataTypeName = e.value[0].dictLabel
+      queryParams.value.dataType= e.value[0].dictValue
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.dataTypeName = ''
+      queryParams.value.dataType=''
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/accounts/creditCardDealAnalysis/index.vue b/src/pages/statistic/accounts/creditCardDealAnalysis/index.vue
new file mode 100644
index 0000000..6b54038
--- /dev/null
+++ b/src/pages/statistic/accounts/creditCardDealAnalysis/index.vue
@@ -0,0 +1,552 @@
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择信用卡" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+       </view>
+       </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">交易时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="date"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">交易金额</div>
+          <div class="num">{{ account.amount }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">收入金额</div>
+          <div class="num">{{  account.income }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">支出金额</div>
+          <div class="num">{{ account.expenses}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">收入笔数</div>
+          <div class="num">{{ account.incomeCount }}<span>笔</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">支出笔数</div>
+          <div class="num">{{ account.expensesCount}}<span>笔</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">POS刷卡支出</div>
+          <div class="num">{{  account.posExpenses }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">真实消费支出</div>
+          <div class="num">{{ account.realExpenses}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">POS刷卡笔数</div>
+          <div class="num">{{ account.posExpensesCount }}<span>笔</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">真实消费支出笔数</div>
+          <div class="num">{{ account.realExpensesCount}}<span>笔</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">其他支出笔数</div>
+          <div class="num">{{  account.otherExpensesCount }}<span>笔</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 交易金额：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">交易明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getAcccountsDealAnalysis } from '@/api/invest/statisticAnalysis'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+  import { listAccounts } from '@/api/invest/accounts'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const account = ref({
+    amount: '',
+  income: '',
+  expenses: '',
+  incomeCount: '',
+  expensesCount: '',
+  posExpensesCount: '',
+  posExpenses: '',
+  realExpenses: '',
+  realExpensesCount: '',
+  otherExpensesCount: '',
+  acccountsList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+    pageNum: 1,
+    state: '1',
+    type: '2',
+    pageSize: 100
+  },
+    queryParams: {
+    type: 1,
+    time: null,
+    dataType: '2',
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = '1'
+        let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+   const start = dayjs(end).add(-7, 'day')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getAcccountsDealAnalysis({...queryParams.value }).then(res => {
+            account.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableAccountsList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+   const start = dayjs(end).add(-7, 'day')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+    listAccounts(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '储蓄卡为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/accounts/debitDealAnalysis/index.vue b/src/pages/statistic/accounts/debitDealAnalysis/index.vue
new file mode 100644
index 0000000..b6fb6c0
--- /dev/null
+++ b/src/pages/statistic/accounts/debitDealAnalysis/index.vue
@@ -0,0 +1,546 @@
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择储蓄账户" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+       </view>
+       </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">交易时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="date"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">交易金额</div>
+          <div class="num">{{ account.amount }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">收入金额</div>
+          <div class="num">{{  account.income }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">支出金额</div>
+          <div class="num">{{ account.expenses}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">收入笔数</div>
+          <div class="num">{{ account.incomeCount }}<span>笔</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">支出笔数</div>
+          <div class="num">{{ account.expensesCount}}<span>笔</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">POS刷卡收入</div>
+          <div class="num">{{  account.posIncome }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">真实消费支出</div>
+          <div class="num">{{ account.realExpenses}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">POS收入笔数</div>
+          <div class="num">{{ account.posIncomeCount }}<span>笔</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">真实消费支出笔数</div>
+          <div class="num">{{ account.realExpensesCount}}<span>笔</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">支出笔数</div>
+          <div class="num">{{  account.otherExpensesCount }}<span>笔</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 交易金额：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">交易明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getAcccountsDealAnalysis } from '@/api/invest/statisticAnalysis'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+  import { listAccounts } from '@/api/invest/accounts'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const account = ref({
+    amount: '',
+  income: '',
+  expenses: '',
+  incomeCount: '',
+  expensesCount: '',
+  acccountsList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+    pageNum: 1,
+    state: '1',
+    type: '1',
+    pageSize: 100
+  },
+    queryParams: {
+    type: 1,
+    time: null,
+    dataType: '1',
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = '1'
+        let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+   const start = dayjs(end).add(-7, 'day')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getAcccountsDealAnalysis({...queryParams.value }).then(res => {
+            account.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableAccountsList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+   const start = dayjs(end).add(-7, 'day')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+    listAccounts(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '储蓄卡为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/accounts/investDealAnalysis/index.vue b/src/pages/statistic/accounts/investDealAnalysis/index.vue
new file mode 100644
index 0000000..29076cd
--- /dev/null
+++ b/src/pages/statistic/accounts/investDealAnalysis/index.vue
@@ -0,0 +1,510 @@
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择投资账户" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+       </view>
+       </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">交易时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="date"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">收益金额</div>
+          <div class="num">{{ account.amount }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">盈利金额</div>
+          <div class="num">{{  account.income }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">亏损金额</div>
+          <div class="num">{{ account.expenses}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">盈利笔数</div>
+          <div class="num">{{ account.incomeCount }}<span>笔</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">亏损笔数</div>
+          <div class="num">{{ account.expensesCount}}<span>笔</span></div>
+        </div>
+      </div>
+      
+    </div>
+    
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 收益金额：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">收益明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getAcccountsDealAnalysis } from '@/api/invest/statisticAnalysis'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+  import { listAccounts } from '@/api/invest/accounts'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const account = ref({
+    amount: '',
+  income: '',
+  expenses: '',
+  incomeCount: '',
+  expensesCount: '',
+  acccountsList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+    pageNum: 1,
+    state: '1',
+    type: '5',
+    pageSize: 100
+  },
+    queryParams: {
+    type: 1,
+    time: null,
+    dataType: '5',
+    dealCategory: '2',
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = '1'
+        let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+     const start = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-01'
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getAcccountsDealAnalysis({...queryParams.value }).then(res => {
+            account.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableAccountsList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+  const start = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-01'
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+    listAccounts(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '储蓄卡为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/accounts/posAnalysis/index.vue b/src/pages/statistic/accounts/posAnalysis/index.vue
new file mode 100644
index 0000000..cf56658
--- /dev/null
+++ b/src/pages/statistic/accounts/posAnalysis/index.vue
@@ -0,0 +1,497 @@
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+        <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择POS机" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>  
+      </view>
+      </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">刷卡时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="date"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">刷卡金额</div>
+          <div class="num">{{ pos.amount }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">刷卡手续费</div>
+          <div class="num">{{ pos.commission }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">入账金额</div>
+          <div class="num">{{ pos.actualAmount }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">刷卡次数</div>
+          <div class="num">{{ pos.count }}<span>次</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 刷卡金额：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">刷卡明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getPosAnalysis } from '@/api/invest/statisticAnalysis'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+  import { listAccounts } from '@/api/invest/accounts'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const pos = ref({
+    amount: '',
+  commission: '',
+  actualAmount: '',
+  count: '',
+  posList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+    pageNum: 1,
+    state: '1',
+    type: '6',
+    pageSize: 100
+  },
+    queryParams: {
+    type: 1,
+    time: null,
+    dataType: null,
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = '1'
+        let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+   const start = dayjs(end).add(-1, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+    }
+  function getList() {
+    
+    getPosAnalysis({...queryParams.value }).then(res => {
+            pos.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tablePosList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+   const start = dayjs(end).add(-1, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+    listAccounts(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: 'POS机为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    align-items: center;
+    position: relative;
+
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/bill/creditBillAnalysis/index.vue b/src/pages/statistic/bill/creditBillAnalysis/index.vue
new file mode 100644
index 0000000..05859f0
--- /dev/null
+++ b/src/pages/statistic/bill/creditBillAnalysis/index.vue
@@ -0,0 +1,523 @@
+
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择信用卡" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+       </view>
+       </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">账单时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="year-month"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">使用率</div>
+          <div class="num">{{ creditObj.creditBillRate }}<span>%</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">总额度</div>
+          <div class="num">{{  creditObj.creditLimit }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">已用额度</div>
+          <div class="num">{{ creditObj.creditBalance}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">可用额度</div>
+          <div class="num">{{ creditObj.creditAvailableLimit }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">信用卡总数</div>
+          <div class="num">{{ creditObj.creditCardCount}}<span>张</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">月平均账单金额</div>
+          <div class="num">{{ creditObj.averageCreditBill }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">累计账单金额</div>
+          <div class="num">{{ creditObj.actualCreditBill}}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 账单金额：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">账单明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getCreditAnalysis } from '@/api/invest/statisticAnalysis'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+import { listBankcardLend } from '@/api/invest/bankcardlend'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const creditObj = ref({
+    clearedCount: '',
+  clearedPrincipal: '',
+  clearedTotal: '',
+  totalInterest: '',
+  historyList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+      pageNum: 1,
+    type: '2',
+    pageSize: 1000
+  },
+    queryParams: {
+    type: 2,
+    time: null,
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = 2
+        queryParams.value.dataType = '2'
+        let formatValue = 'YYYY-MM'
+        const today = new Date()
+      const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+      const start = dayjs(end).add(-11, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getCreditAnalysis({...queryParams.value }).then(res => {
+            creditObj.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableCreditBillList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM'
+      const today = new Date()
+const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+const start = dayjs(end).add(-11, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+      listBankcardLend(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '信用卡为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/bill/creditInstallmentAnalysis/index.vue b/src/pages/statistic/bill/creditInstallmentAnalysis/index.vue
new file mode 100644
index 0000000..0a767ea
--- /dev/null
+++ b/src/pages/statistic/bill/creditInstallmentAnalysis/index.vue
@@ -0,0 +1,514 @@
+
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择信用卡" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+       </view>
+       </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">还款时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="date"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">未结清分期笔数</div>
+          <div class="num">{{ historyObj.unclearedDetailCount }}<span>笔</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">未结清分期（本息）</div>
+          <div class="num">{{  historyObj.unClearedDetail }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">当期应还金额</div>
+          <div class="num">{{ historyObj.dueDetail}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">当期已还金额</div>
+          <div class="num">{{ historyObj.repaidDetail }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">当期待还金额</div>
+          <div class="num">{{ historyObj.leftDetail}}<span>元</span></div>
+        </div>
+      </div>
+
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 待还款金额：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">待还款明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getInstallmentHistoryAnalysis } from '@/api/invest/statisticAnalysis'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+import { listBankcardLend } from '@/api/invest/bankcardlend'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const historyObj = ref({
+    unclearedDetailCount: '',
+  unClearedDetail: '',
+  dueDetail: '',
+  repaidDetail: '',
+  leftDetail: '',
+  historyDetailList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+      pageNum: 1,
+    type: '2',
+    pageSize: 1000
+  },
+    queryParams: {
+    type: 1,
+    time: null,
+    dataType: '2',
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = '1'
+           queryParams.value.dataType = '2'
+        let formatValue = 'YYYY-MM-DD'
+        const today = new Date()
+const start = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-01'
+// 当前月份的结束日期
+const endDate = new Date(today.getFullYear(), today.getMonth() + 2, 0)
+const end = `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padStart(2, '0')}-${endDate.getDate().toString().padStart(2, '0')}`
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getInstallmentHistoryAnalysis({...queryParams.value }).then(res => {
+            historyObj.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableHistoryDetailList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM-DD'
+      const today = new Date()
+const start = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-01'
+// 当前月份的结束日期
+const endDate = new Date(today.getFullYear(), today.getMonth() + 2, 0)
+const end = `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padStart(2, '0')}-${endDate.getDate().toString().padStart(2, '0')}`
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+      listBankcardLend(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '信用卡为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/bill/creditInstallmentSettledAnalysis/index.vue b/src/pages/statistic/bill/creditInstallmentSettledAnalysis/index.vue
new file mode 100644
index 0000000..13885e6
--- /dev/null
+++ b/src/pages/statistic/bill/creditInstallmentSettledAnalysis/index.vue
@@ -0,0 +1,499 @@
+
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择信用卡" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+       </view>
+       </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">分期时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="year-month"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">已结清分期笔数</div>
+          <div class="num">{{ historyObj.clearedCount }}<span>笔</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">已结清分期（本息）</div>
+          <div class="num">{{  historyObj.clearedTotal }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">已结清分期（本金）</div>
+          <div class="num">{{ historyObj.clearedPrincipal}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">已结清总利息</div>
+          <div class="num">{{ historyObj.totalInterest }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 分期金额（本息）：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">分期金额明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getInstallmentSettledAnalysis } from '@/api/invest/statisticAnalysis'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+import { listBankcardLend } from '@/api/invest/bankcardlend'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const historyObj = ref({
+    clearedCount: '',
+  clearedPrincipal: '',
+  clearedTotal: '',
+  totalInterest: '',
+  historyList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+      pageNum: 1,
+    type: '2',
+    pageSize: 1000
+  },
+    queryParams: {
+    type: 2,
+    time: null,
+    dataType: '2',
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = 2
+        queryParams.value.dataType = '2'
+        let formatValue = 'YYYY-MM'
+        const today = new Date()
+      const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+      const start = dayjs(end).add(-239, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getInstallmentSettledAnalysis({...queryParams.value }).then(res => {
+            historyObj.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableHistoryList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM'
+      const today = new Date()
+const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+const start = dayjs(end).add(-239, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+      listBankcardLend(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '信用卡为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/bill/creditRecordAnalysis/index.vue b/src/pages/statistic/bill/creditRecordAnalysis/index.vue
new file mode 100644
index 0000000..215f30a
--- /dev/null
+++ b/src/pages/statistic/bill/creditRecordAnalysis/index.vue
@@ -0,0 +1,495 @@
+<template>
+    <view class="container">
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select"   placeholder="请选择查询日期" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">查询日期</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="date"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">近1月硬查询</div>
+          <div class="num">{{ creditRecord.lastOneMonths }}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">近2月硬查询</div>
+          <div class="num">{{  creditRecord.lastTwoMonths }}<span>次</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">近3月硬查询</div>
+          <div class="num">{{ creditRecord.lastThreeMonths}}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">近6月硬查询</div>
+          <div class="num">{{ creditRecord.lastSixMonths }}<span>次</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">近1年硬查询</div>
+          <div class="num">{{ creditRecord.lastOneYears}}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">近2年硬查询</div>
+          <div class="num">{{  creditRecord.lastTwoYears }}<span>次</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">近6月个人查询</div>
+          <div class="num">{{ creditRecord.lastSixMonthPersonalCount}}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">个人查询总数</div>
+          <div class="num">{{ creditRecord.totalPersonalCount }}<span>次</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">近2年贷后管理</div>
+          <div class="num">{{ creditRecord.lastTwoYearsAfterLoan}}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">贷后管理总数</div>
+          <div class="num">{{  creditRecord.totalAfterLoan }}<span>次</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 查询次数：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">查询明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getCreditRecordsAnalysis } from '@/api/invest/statisticAnalysis'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+  import { listAccounts } from '@/api/invest/accounts'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const creditRecord = ref({
+    amount: '',
+  income: '',
+  expenses: '',
+  incomeCount: '',
+  expensesCount: '',
+  posExpensesCount: '',
+  posExpenses: '',
+  realExpenses: '',
+  realExpensesCount: '',
+  otherExpensesCount: '',
+  acccountsList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+    pageNum: 1,
+    state: '1',
+    pageSize: 100
+  },
+    queryParams: {
+    type: 1,
+    time: null,
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = '1'
+        let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+   const start =  dayjs(end).add(-23, 'months')
+   queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+    }
+  function getList() {
+    getCreditRecordsAnalysis({...queryParams.value }).then(res => {
+            creditRecord.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableCreditRecordsList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM-DD'
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+   const start =  dayjs(end).add(-23, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+    listAccounts(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/bill/futuresAnalysis/index.vue b/src/pages/statistic/bill/futuresAnalysis/index.vue
new file mode 100644
index 0000000..8907459
--- /dev/null
+++ b/src/pages/statistic/bill/futuresAnalysis/index.vue
@@ -0,0 +1,500 @@
+
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择期货账户" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+       </view>
+       </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">统计日期</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="year-month"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">累计收益</div>
+          <div class="num">{{ futuresStock.accumulateIncome }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">平均收益</div>
+          <div class="num">{{  futuresStock.averageIncome }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">最大收益</div>
+          <div class="num">{{ futuresStock.maxRevenue}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">最大亏损</div>
+          <div class="num">{{ futuresStock.maxLoss }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 收益：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">收益明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getFuturesStocksAnalysis } from '@/api/invest/statisticAnalysis'
+  import { listFutureStocks } from '@/api/invest/futureStocks'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+import { listBankcardLend } from '@/api/invest/bankcardlend'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const futuresStock = ref({
+    maxRevenue: '',
+  maxLoss: '',
+  averageIncome: '',
+  accumulateIncome: '',
+  futuresStocksList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryFutureStocksListParams: {
+      pageNum: 1,
+    type: '1',
+    pageSize: 1000
+  },
+    queryParams: {
+    type: 2,
+    time: null,
+    dataType: '1',
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryFutureStocksListParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = 2
+        queryParams.value.dataType = '1'
+        let formatValue = 'YYYY-MM'
+        const today = new Date()
+      const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+      const start = dayjs(end).add(-59, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getFuturesStocksAnalysis({...queryParams.value }).then(res => {
+            futuresStock.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableFuturesStocksList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM'
+      const today = new Date()
+const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+const start = dayjs(end).add(-59, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+      listFutureStocks(queryFutureStocksListParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '期货账户为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/bill/investAnalysis/index.vue b/src/pages/statistic/bill/investAnalysis/index.vue
new file mode 100644
index 0000000..911f0bb
--- /dev/null
+++ b/src/pages/statistic/bill/investAnalysis/index.vue
@@ -0,0 +1,499 @@
+
+<template>
+    <view class="container">
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">统计日期</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="year-month"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">累计收益</div>
+          <div class="num">{{ futuresStock.accumulateIncome }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">期货累计收益</div>
+          <div class="num">{{  futuresStock.accumulateFutures }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">股票累计收益</div>
+          <div class="num">{{ futuresStock.accumulateStocks}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">最大收益</div>
+          <div class="num">{{ futuresStock.maxRevenue }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">最大亏损</div>
+          <div class="num">{{ futuresStock.maxLoss}}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 收益：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">收益明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getFuturesStocksAnalysis } from '@/api/invest/statisticAnalysis'
+  import { listFutureStocks } from '@/api/invest/futureStocks'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+import { listBankcardLend } from '@/api/invest/bankcardlend'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const futuresStock = ref({
+    maxRevenue: '',
+  maxLoss: '',
+  averageIncome: '',
+  accumulateIncome: '',
+  futuresStocksList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryFutureStocksListParams: {
+      pageNum: 1,
+    type: '2',
+    pageSize: 1000
+  },
+    queryParams: {
+    type: 2,
+    time: null,
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryFutureStocksListParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = 2
+        let formatValue = 'YYYY-MM'
+        const today = new Date()
+      const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+      const start = dayjs(end).add(-59, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getFuturesStocksAnalysis({...queryParams.value }).then(res => {
+            futuresStock.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableFuturesStocksList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM'
+      const today = new Date()
+const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+const start = dayjs(end).add(-59, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+      listFutureStocks(queryFutureStocksListParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '期货账户为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/bill/onlineLendAnalysis/index.vue b/src/pages/statistic/bill/onlineLendAnalysis/index.vue
new file mode 100644
index 0000000..31d3162
--- /dev/null
+++ b/src/pages/statistic/bill/onlineLendAnalysis/index.vue
@@ -0,0 +1,515 @@
+
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择网贷机构" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+       </view>
+       </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">还款时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="date"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">未结清网贷笔数</div>
+          <div class="num">{{ historyObj.unclearedDetailCount }}<span>笔</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">未结清网贷（本息）</div>
+          <div class="num">{{  historyObj.unClearedDetail }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">当期应还金额</div>
+          <div class="num">{{ historyObj.dueDetail}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">当期已还金额</div>
+          <div class="num">{{ historyObj.repaidDetail }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">当期待还金额</div>
+          <div class="num">{{ historyObj.leftDetail}}<span>元</span></div>
+        </div>
+      </div>
+
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 待还款金额：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">待还款明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getInstallmentHistoryAnalysis } from '@/api/invest/statisticAnalysis'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+import { listBankcardLend } from '@/api/invest/bankcardlend'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const historyObj = ref({
+    unclearedDetailCount: '',
+  unClearedDetail: '',
+  dueDetail: '',
+  repaidDetail: '',
+  leftDetail: '',
+  historyDetailList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+      pageNum: 1,
+    type: '3',
+    lendType: '1',
+    pageSize: 1000
+  },
+    queryParams: {
+    type: 1,
+    time: null,
+    dataType: '3',
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = '1'
+        queryParams.value.dataType = '3'
+        let formatValue = 'YYYY-MM-DD'
+        const today = new Date()
+const start = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-01'
+// 当前月份的结束日期
+const endDate = new Date(today.getFullYear(), today.getMonth() + 2, 0)
+const end = `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padStart(2, '0')}-${endDate.getDate().toString().padStart(2, '0')}`
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getInstallmentHistoryAnalysis({...queryParams.value }).then(res => {
+            historyObj.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableHistoryDetailList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM-DD'
+      const today = new Date()
+const start = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-01'
+// 当前月份的结束日期
+const endDate = new Date(today.getFullYear(), today.getMonth() + 2, 0)
+const end = `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padStart(2, '0')}-${endDate.getDate().toString().padStart(2, '0')}`
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+      listBankcardLend(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '网贷机构为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue b/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue
new file mode 100644
index 0000000..586781e
--- /dev/null
+++ b/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue
@@ -0,0 +1,500 @@
+
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择网贷机构" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+       </view>
+       </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">还款时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="year-month"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">已结清网贷笔数</div>
+          <div class="num">{{ historyObj.clearedCount }}<span>笔</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">已结清网贷（本息）</div>
+          <div class="num">{{  historyObj.clearedTotal }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">已结清网贷（本金）</div>
+          <div class="num">{{ historyObj.clearedPrincipal}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">已结清总利息</div>
+          <div class="num">{{ historyObj.totalInterest }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 借款金额（本息）：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">借款金额明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getInstallmentSettledAnalysis } from '@/api/invest/statisticAnalysis'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+import { listBankcardLend } from '@/api/invest/bankcardlend'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const historyObj = ref({
+    clearedCount: '',
+  clearedPrincipal: '',
+  clearedTotal: '',
+  totalInterest: '',
+  historyList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryAccountParams: {
+      pageNum: 1,
+    type: '3',
+    lendType: '1',
+    pageSize: 1000
+  },
+    queryParams: {
+    type: 2,
+    time: null,
+    dataType: '3',
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryAccountParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = 2
+        queryParams.value.dataType = '3'
+        let formatValue = 'YYYY-MM'
+        const today = new Date()
+      const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+      const start = dayjs(end).add(-239, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getInstallmentSettledAnalysis({...queryParams.value }).then(res => {
+            historyObj.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableHistoryList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM'
+      const today = new Date()
+const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+const start = dayjs(end).add(-239, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+      listBankcardLend(queryAccountParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '网贷机构为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/bill/stocksAnalysis/index.vue b/src/pages/statistic/bill/stocksAnalysis/index.vue
new file mode 100644
index 0000000..1ab33a4
--- /dev/null
+++ b/src/pages/statistic/bill/stocksAnalysis/index.vue
@@ -0,0 +1,500 @@
+
+<template>
+    <view class="container">
+      <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择股票账户" suffixIcon="search"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+       </view>
+       </u-sticky>
+        <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+        <view class="search-view">
+          <u-input v-model="queryParams.time" border="false" type="select" readonly
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+          <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+             
+              <view class="select-header">统计日期</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="year-month"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+      </u-sticky>
+        <div class="app-container" style="overflow: auto">
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">累计收益</div>
+          <div class="num">{{ futuresStock.accumulateIncome }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">平均收益</div>
+          <div class="num">{{  futuresStock.averageIncome }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="@/static/images/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">最大收益</div>
+          <div class="num">{{ futuresStock.maxRevenue}}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">最大亏损</div>
+          <div class="num">{{ futuresStock.maxLoss }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div></div>
+  </div>
+      <u-list  :spaceHeight="116" lowerThreshold="100">
+        <u-list-item v-for="(item, index) in listData" :key="index">
+          <view class="list-item">
+            <view class="item-header">
+              <u--text  lines="1" 
+                :text="item.time+' 收益：'+item.value" size="30rpx" color="#333333" ></u--text>
+            </view>
+            <view class="item-row">
+            <text class="row-label">收益明细：</text>
+            <text class="row-value">{{ formatMultiLineData(item.detail)}}</text>
+          </view>
+          </view>
+        </u-list-item>
+        <view>
+        </view>
+      </u-list>
+      <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+        @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+        <u-picker itemHeight="88" :show="showAccount" :columns="accountList" keyName="nameCode" @cancel="handleAccountCancel"
+          @confirm="handleAccountConfirm"></u-picker>
+    </view>
+  </template>
+  
+  <script setup>
+  import { getFuturesStocksAnalysis } from '@/api/invest/statisticAnalysis'
+  import { listFutureStocks } from '@/api/invest/futureStocks'
+  import { getDicts } from '@/api/system/dict/data.js'
+    import dayjs from 'dayjs'
+  import { timeHandler } from '@/utils/common.ts'
+import { listBankcardLend } from '@/api/invest/bankcardlend'
+  import {onLoad,onShow} from "@dcloudio/uni-app";
+      // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+  import {reactive ,toRefs,ref,computed }from "vue";
+  const pageNum = ref(1)
+  const listData = ref([])
+  const isShow = ref(false)
+  const accountList = ref([])
+  const accountTypeList = ref([])
+  const settingPickShow = ref(false)
+  const settingColumns = ref([])
+  const showAccount = ref(false)
+  const timeShow= ref(false)
+  const time =ref( Number(new Date()))
+  const  flag= ref(true)
+  const futuresStock = ref({
+    maxRevenue: '',
+  maxLoss: '',
+  averageIncome: '',
+  accumulateIncome: '',
+  futuresStocksList: []
+})
+  const data = reactive({
+    filterPanel: false,
+    queryFutureStocksListParams: {
+      pageNum: 1,
+    type: '2',
+    pageSize: 1000
+  },
+    queryParams: {
+    type: 2,
+    time: null,
+    dataType: '2',
+    id: null
+     } 
+  })
+
+  const { filterPanel, queryFutureStocksListParams, queryParams} = toRefs(data)
+  const windowHeight = computed(() => {
+              uni.getSystemInfoSync().windowHeight - 50
+          })	
+  onLoad(() => {
+      getDict()
+      getList()
+    });
+  
+   onShow(() => {
+      if (isShow.value) {
+        getList()
+        isShow.value = false
+      }
+    });
+
+    function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '')
+  }
+}
+function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function searchSubmit() {
+  queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function resetQuery() {
+        queryParams.value.id = ''
+        queryParams.value.type = 2
+        queryParams.value.dataType = '2'
+        let formatValue = 'YYYY-MM'
+        const today = new Date()
+      const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+      const start = dayjs(end).add(-59, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+        queryParams.value.accountName = ''
+    }
+  function getList() {
+    getFuturesStocksAnalysis({...queryParams.value }).then(res => {
+            futuresStock.value = { ...res.data }
+          listData.value = listData.value.concat(res.data.tableFuturesStocksList)
+        }).catch(() => {
+        })
+      }
+  function   getDict() {
+      let formatValue = 'YYYY-MM'
+      const today = new Date()
+const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+const start = dayjs(end).add(-59, 'months')
+       queryParams.value.startTime =  dayjs(start).format(formatValue)
+      queryParams.value.endTime =  dayjs(end).format(formatValue)
+      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
+      listFutureStocks(queryFutureStocksListParams.value).then((response) => {
+        accountList.value = [response.rows] 
+      })
+        
+      }
+  function settingConfirm(e) {
+        queryParams.value.settingId = e.value[0].settingId
+        queryParams.value.settingName = e.value[0].settingName
+        settingPickShow.value = false
+      }
+  function settingCancel() {
+        settingPickShow.value = false
+      }
+      function handleAccount() {
+          if (accountList.value[0].length === 0) {
+            proxy.$refs['uToast'].show({
+              message: '期货账户为空  ', type: 'warning'
+            })
+          } else {
+            showAccount.value = true
+          }
+       }
+    function   handleAccountConfirm(e) {
+      queryParams.value.accountName = e.value[0].nameCode
+      queryParams.value.id= e.value[0].id
+          showAccount.value = false
+          pageNum.value = 1
+        listData.value = []
+        getList()
+    }
+   function handleAccountCancel() {
+    queryParams.value.accountName = ''
+      queryParams.value.id=''
+
+         showAccount.value = false
+         listData.value = []
+        getList()
+        filterPanel.value = false
+    }
+    
+
+  </script>
+  
+  <style lang="scss" scoped>
+
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 5px 10px 5px 10px;
+      .title {
+        margin-left: 10px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 10px;
+        font-weight: bold;
+        font-size: 15px;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 18px;
+  }
+}
+  .btnAdd {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        display:float;
+        text-align: center;
+      }
+  
+  .search-view {
+    padding: 12rpx 32rpx;
+    background-color: #ffffff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+
+  
+    .search-input {
+      background: #F5F5F5;
+      color: #333333;
+      margin-right: 36rpx;
+    }
+  
+    .filter-panel {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 96rpx;
+      background-color: rgba(0, 0, 0, 0.5);
+  
+      .filter-panel-content {
+        background-color: #ffff;
+        padding: 0 30rpx 30rpx;
+  
+        .filter-title {
+          color: #000000;
+          font-size: 30rpx;
+          font-weight: 500;
+          padding: 30rpx 0;
+        }
+  
+        .state-list {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+  
+          .state-item {
+            width: 210rpx;
+            height: 72rpx;
+            border: 1rpx solid rgba(0, 0, 0, 0.25);
+            border-radius: 72rpx;
+            text-align: center;
+            line-height: 72rpx;
+            margin: 0 20rpx 20rpx 0;
+            font-size: 28rpx;
+            color: #000000;
+          }
+  
+          .active {
+            background-color: rgba(222, 241, 255, 1);
+            border: 1rpx solid rgba(22, 119, 255, 1);
+          }
+        }
+      }
+  
+      .btn-box {
+        display: flex;
+        padding: 24rpx 30rpx;
+        background-color: #fff;
+        box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+      }
+    }
+  }
+  
+  .list-item {
+    margin: 0 24rpx 24rpx;
+    padding: 32rpx;
+    background-color: #fff;
+  
+    .item-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-bottom: 16rpx;
+  
+      .status {
+        .status-item {
+          width: 120rpx;
+          height: 44rpx;
+          text-align: center;
+          line-height: 44rpx;
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+  
+        .status1 {
+          background: #F0F0F0;
+          color: #8C8C8C;
+        }
+  
+        .status2 {
+          background: rgba(38, 129, 255, 0.2);
+          color: #2681FF;
+        }
+  
+        .status3 {
+          background: #F7F7F7;
+          color: #2681FF;
+        }
+  
+        .status4 {
+          background: rgba(255, 85, 51, 0.2);
+          color: #FF5533;
+        }
+  
+        .status5 {
+          background: #F7F7F7;
+          color: rgba(0, 0, 0, 0.85);
+        }
+  
+        .status7 {
+          background: rgba(255, 129, 51, 0.2);
+          color: #FF8133;
+        }
+  
+        .status8 {
+          background: rgba(65, 217, 165, 0.2);
+          color: #41D9A5;
+        }
+      }
+    }
+  
+    .item-row {
+      padding: 16rpx 0;
+  
+      .row-label {
+        color: rgba(0, 0, 0, 0.55);
+      }
+  
+      .row-value {
+        color: rgba(0, 0, 0, 0.85)
+      }
+    }
+  
+    .operate {
+      display: flex;
+      justify-content: flex-end;
+  
+      .btn {
+        width: 146rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 8rpx;
+        margin-left: 5rpx;
+        text-align: center;
+      }
+  
+      .circulation {
+        background: rgba(0, 0, 0, 0.04);
+        margin-right: 24rpx;
+        color: rgba(0, 0, 0, 0.85);
+      }
+  
+      .filling {
+        background: #2681FF;
+        border-radius: 8rpx;
+        color: #FFFFFF;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistic/index.vue b/src/pages/statistic/index.vue
index e23dd9e..f8b881e 100644
--- a/src/pages/statistic/index.vue
+++ b/src/pages/statistic/index.vue
@@ -1,6 +1,19 @@
 <template>
   <view class="work-container">
 
+         <!-- 宫格组件 -->
+         <uni-section title="常用功能" v-show="auth.hasPermi('invest:accountsBalance:list')"  type="line"></uni-section>
+    <view class="grid-body">
+      <uni-grid :column="4" :showBorder="false" >
+        <uni-grid-item v-for="(item, index) in commonGridList" :key="index" v-show="auth.hasPermi(item.permission)" @click="navigateTo(item.path)">
+        <view class="grid-item-box">
+            <uni-icons :type="item.icon" size="30"></uni-icons>
+            <text class="text">{{ item.text }}</text>
+          </view>
+      </uni-grid-item>
+      </uni-grid>
+    </view>
+
     <!-- 宫格组件 -->
     <uni-section title="账单统计分析" v-show="auth.hasPermi('invest:accountAnalysis:list')"  type="line"></uni-section>
     <view class="grid-body">
@@ -13,8 +26,8 @@
       </uni-grid-item>
       </uni-grid>
     </view>
-     <!-- 宫格组件 -->
-     <uni-section title="记账统计分析" v-show="auth.hasPermi('invest:accountsBalance:list')"  type="line"></uni-section>
+             <!-- 宫格组件 -->
+             <uni-section title="记账统计分析" v-show="auth.hasPermi('invest:accountsBalance:list')"  type="line"></uni-section>
     <view class="grid-body">
       <uni-grid :column="4" :showBorder="false" >
         <uni-grid-item v-for="(item, index) in accountGridList" :key="index" v-show="auth.hasPermi(item.permission)" @click="navigateTo(item.path)">
@@ -31,25 +44,36 @@
 <script setup>
 	import { ref } from "vue";
   import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
+  const commonGridList=ref([
+        { path: '/pages/statistic/accounts/accountsBalance/index', text: '记账账户统计', icon: 'staff-filled' , permission: 'invest:accountsBalance:list' },
+        { path: '/pages/statistic/accounts/posAnalysis/index', text: 'POS机刷卡统计', icon: 'shop-filled' , permission: 'invest:posAnalysis:list' },
+        { path: '/pages/statistic/accounts/creditCardDealAnalysis/index', text: '信用卡收支统计', icon: 'wallet' , permission: 'invest:accountDealRecord:list' },
+        { path: '/pages/statistic/bill/creditBillAnalysis/index', text: '信用卡账单统计', icon: 'map', permission: 'invest:creditAnalysis:list'  },
+        { path: '/pages/statistic/accounts/accountDealAnalysis/index', text: '账户收支统计', icon: 'person', permission: 'invest:accountDealAnalysis:list'  },
+        { path: '/pages/statistic/accounts/investDealAnalysis/index', text: '投资收益统计', icon: 'arrow-down', permission: 'invest:investDealAnalysis:list'  },
+        { path: '/pages/statistic/bill/onlineLendAnalysis/index', text: '网贷待还统计', icon: 'cloud-upload', permission: 'invest:onlineLendAnalysis:list'  },
+        { path: '/pages/statistic/bill/creditInstallmentAnalysis/index', text: '信用卡分期待还', icon: 'map-filled', permission: 'invest:creditInstallment:list'  },
+        { path: '/pages/statistic/bill/creditRecordAnalysis/index', text: '征信查询统计', icon: 'search', permission: 'invest:creditRecordAnalysis:list'  }
+      ])
   const billGridList=ref([
-        { path: '/pages/page1/page1', text: '账户总览', icon: 'person-filled', permission: 'invest:accountAnalysis:list'  },
-        { path: '/pages/page1/page1', text: '收益统计分析', icon: 'arrow-down', permission: 'invest:investAnalysis:list'  },
-        { path: '/pages/page1/page1', text: '期货统计分析', icon: 'settings', permission: 'invest:futuresAnalysis:list'  },
-        { path: '/pages/page1/page1', text: '股票统计分析', icon: 'left', permission: 'invest:stocksAnalysis:list'  },
-        { path: '/pages/page1/page1', text: '网贷待还统计', icon: 'cloud-upload', permission: 'invest:onlineLendAnalysis:list'  },
-        { path: '/pages/page1/page1', text: '网贷已还统计', icon: 'download', permission: 'invest:onlineLendSettledAnalysis:list'  },
-        { path: '/pages/page1/page1', text: '信用卡账单统计', icon: 'map', permission: 'invest:creditAnalysis:list'  },
-        { path: '/pages/page1/page1', text: '信用卡分期待还', icon: 'map-filled', permission: 'invest:creditInstallment:list'  },
-        { path: '/pages/page1/page1', text: '信用卡分期已还', icon: 'map-pin-ellipse', permission: 'invest:creditInstallmentSettledAnalysis:list'  },
-        { path: '/pages/page1/page1', text: '征信查询统计', icon: 'search', permission: 'invest:creditRecordAnalysis:list'  }
+        // { path: '/pages/page1/page1', text: '账户总览', icon: 'person-filled', permission: 'invest:accountAnalysis:list'  },
+        { path: '/pages/statistic/bill/investAnalysis/index', text: '收益统计分析', icon: 'arrow-down', permission: 'invest:investAnalysis:list'  },
+        { path: '/pages/statistic/bill/futuresAnalysis/index', text: '期货统计分析', icon: 'settings', permission: 'invest:futuresAnalysis:list'  },
+        { path: '/pages/statistic/bill/stocksAnalysis/index', text: '股票统计分析', icon: 'left', permission: 'invest:stocksAnalysis:list'  },
+        { path: '/pages/statistic/bill/onlineLendAnalysis/index', text: '网贷待还统计', icon: 'cloud-upload', permission: 'invest:onlineLendAnalysis:list'  },
+        { path: '/pages/statistic/bill/onlineLendSettledAnalysis/index', text: '网贷已还统计', icon: 'download', permission: 'invest:onlineLendSettledAnalysis:list'  },
+        { path: '/pages/statistic/bill/creditBillAnalysis/index', text: '信用卡账单统计', icon: 'map', permission: 'invest:creditAnalysis:list'  },
+        { path: '/pages/statistic/bill/creditInstallmentAnalysis/index', text: '信用卡分期待还', icon: 'map-filled', permission: 'invest:creditInstallment:list'  },
+        { path: '/pages/statistic/bill/creditInstallmentSettledAnalysis/index', text: '信用卡分期已还', icon: 'map-pin-ellipse', permission: 'invest:creditInstallmentSettledAnalysis:list'  },
+        { path: '/pages/statistic/bill/creditRecordAnalysis/index', text: '征信查询统计', icon: 'search', permission: 'invest:creditRecordAnalysis:list'  }
       ])
       const accountGridList=ref([
-        { path: '/pages/page1/page1', text: '记账账户统计', icon: 'staff-filled' , permission: 'invest:accountsBalance:list' },
-        { path: '/pages/page1/page1', text: 'POS机刷卡统计', icon: 'shop-filled' , permission: 'invest:posAnalysis:list' },
-        { path: '/pages/page1/page1', text: '储蓄卡收支统计', icon: 'wallet-filled', permission: 'invest:accountDealRecord:list'  },
-        { path: '/pages/page1/page1', text: '信用卡收支统计', icon: 'wallet' , permission: 'invest:accountDealRecord:list' },
-        { path: '/pages/page1/page1', text: '投资收益统计', icon: 'arrow-down', permission: 'invest:investDealAnalysis:list'  },
-        { path: '/pages/page1/page1', text: '账户收支统计', icon: 'person', permission: 'invest:accountDealAnalysis:list'  }
+        { path: '/pages/statistic/accounts/accountsBalance/index', text: '记账账户统计', icon: 'staff-filled' , permission: 'invest:accountsBalance:list' },
+        { path: '/pages/statistic/accounts/posAnalysis/index', text: 'POS机刷卡统计', icon: 'shop-filled' , permission: 'invest:posAnalysis:list' },
+        { path: '/pages/statistic/accounts/debitDealAnalysis/index', text: '储蓄卡收支统计', icon: 'wallet-filled', permission: 'invest:accountDealRecord:list'  },
+        { path: '/pages/statistic/accounts/creditCardDealAnalysis/index', text: '信用卡收支统计', icon: 'wallet' , permission: 'invest:accountDealRecord:list' },
+        { path: '/pages/statistic/accounts/investDealAnalysis/index', text: '投资收益统计', icon: 'arrow-down', permission: 'invest:investDealAnalysis:list'  },
+        { path: '/pages/statistic/accounts/accountDealAnalysis/index', text: '账户收支统计', icon: 'person', permission: 'invest:accountDealAnalysis:list'  }
       ])
 
 	function navigateTo(path) {
diff --git a/src/pages/work/accounts/accountDealRecord/addEdit.vue b/src/pages/work/accounts/accountDealRecord/addEdit.vue
index cc81cdd..007a203 100644
--- a/src/pages/work/accounts/accountDealRecord/addEdit.vue
+++ b/src/pages/work/accounts/accountDealRecord/addEdit.vue
@@ -114,7 +114,7 @@ const data = reactive({
   rules: {
     typeName: [{ required: true, message: '记账类型不能为空', trigger:['change', 'blur'] }],
     accountName: [{ required: true, message: '记账账户不能为空', trigger: ['change', 'blur'] }],
-    amount: [{type: 'float', required: true, message: '交易金额不能为空', trigger: ['change', 'blur'] }],
+    amount: [{type: 'number', required: true, message: '交易金额不能为空', trigger: ['change', 'blur'] }],
     dealTypeName: [{ required: true, message: '交易类型不能为空', trigger:['change', 'blur'] }],
     dealCategoryName: [{ required: true, message: '交易类别不能为空', trigger: ['change', 'blur'] }],
     createTime: [{ required: true, message: '交易时间不能为空', trigger: ['change', 'blur'] }]
diff --git a/src/pages/work/accounts/accountDealRecord/list.vue b/src/pages/work/accounts/accountDealRecord/list.vue
index a777b83..b29175a 100644
--- a/src/pages/work/accounts/accountDealRecord/list.vue
+++ b/src/pages/work/accounts/accountDealRecord/list.vue
@@ -1,10 +1,17 @@
 <template>
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择记账账户" suffixIcon="search"
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择记账账户" suffixIcon="search"
 	    suffixIconStyle="color: #909399" class="search-input">
         </u-input>
+       </view>
+       </u-sticky>
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择交易时间"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
         <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
           labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
           <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
@@ -63,7 +70,7 @@
               :closeOnClickOverlay="true"
               :show="timeShow"
               v-model="time"
-              mode="datetime"
+              mode="date"
               @close="openOrCloseDate"
               @cancel="openOrCloseDate"
               @confirm="confirm"
@@ -134,6 +141,7 @@ import { listAccounts } from '@/api/invest/accounts'
 import { getDicts } from '@/api/system/dict/data.js'
 import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
@@ -206,10 +214,12 @@ function getList() {
     }
     function confirm(e) {
       const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
       if (flag.value) {
-        queryParams.value.startTime = date
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
       } else {
-        queryParams.value.endTime = date
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
       }
       timeShow.value = false
     }
@@ -301,6 +311,9 @@ function selectAccountType(item) {
       })
     }
     function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
       pageNum.value = 1
       listData.value = []
       getList()
@@ -312,6 +325,7 @@ function selectAccountType(item) {
       getList()
     }
     function resetQuery() {
+       queryParams.value.time = ''
         queryParams.value.accountId = ''
         queryParams.value.accountName = ''
         queryParams.value.type = ''
@@ -374,7 +388,7 @@ function selectAccountType(item) {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
+
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/work/accounts/creditTransferRecord/list.vue b/src/pages/work/accounts/creditTransferRecord/list.vue
index 0d99541..e00f51a 100644
--- a/src/pages/work/accounts/creditTransferRecord/list.vue
+++ b/src/pages/work/accounts/creditTransferRecord/list.vue
@@ -1,10 +1,17 @@
 <template>
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.creditCardName" border="false" type="select"  @click="handleCreditCard" placeholder="请选择信用卡" suffixIcon="search"
+         <view class="search-view">
+          <u-input v-model="queryParams.creditCardName" border="false" type="select"  @click="handleCreditCard" placeholder="请选择信用卡" suffixIcon="search"
 	    suffixIconStyle="color: #909399" class="search-input">
         </u-input>
+       </view>
+       </u-sticky>
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择还款时间"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
         <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
           labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
           <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
@@ -53,7 +60,7 @@
               :closeOnClickOverlay="true"
               :show="timeShow"
               v-model="time"
-              mode="datetime"
+              mode="date"
               @close="openOrCloseDate"
               @cancel="openOrCloseDate"
               @confirm="confirm"
@@ -117,6 +124,7 @@ import { listAccounts } from '@/api/invest/accounts'
 import { getDicts } from '@/api/system/dict/data.js'
 import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
@@ -189,10 +197,12 @@ function getList() {
     }
     function confirm(e) {
       const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
       if (flag.value) {
-        queryParams.value.startTime = date
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
       } else {
-        queryParams.value.endTime = date
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
       }
       timeShow.value = false
     }
@@ -234,6 +244,9 @@ function dictStr(val, arr) {
       return str
     }
     function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
       pageNum.value = 1
       listData.value = []
       getList()
@@ -260,6 +273,7 @@ function dictStr(val, arr) {
        showCreditCard.value = false
   }
     function resetQuery() {
+      queryParams.value.time = ''
         queryParams.value.creditCardName = ''
         queryParams.value.inAccountId = ''
         queryParams.value.type = '2'
@@ -315,7 +329,6 @@ function dictStr(val, arr) {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/work/accounts/debitTransferRecord/list.vue b/src/pages/work/accounts/debitTransferRecord/list.vue
index 35a1972..29c075b 100644
--- a/src/pages/work/accounts/debitTransferRecord/list.vue
+++ b/src/pages/work/accounts/debitTransferRecord/list.vue
@@ -1,10 +1,17 @@
 <template>
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择储蓄账户" suffixIcon="search"
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择储蓄账户" suffixIcon="search"
 	    suffixIconStyle="color: #909399" class="search-input">
         </u-input>
+       </view>
+       </u-sticky>
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择转账时间"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
         <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
           labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
           <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
@@ -48,7 +55,7 @@
               :closeOnClickOverlay="true"
               :show="timeShow"
               v-model="time"
-              mode="datetime"
+              mode="date"
               @close="openOrCloseDate"
               @cancel="openOrCloseDate"
               @confirm="confirm"
@@ -106,6 +113,7 @@ import { listAccounts } from '@/api/invest/accounts'
 import { getDicts } from '@/api/system/dict/data.js'
 import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
@@ -178,10 +186,12 @@ function getList() {
     }
     function confirm(e) {
       const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
       if (flag.value) {
-        queryParams.value.startTime = date
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
       } else {
-        queryParams.value.endTime = date
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
       }
       timeShow.value = false
     }
@@ -223,6 +233,9 @@ function dictStr(val, arr) {
       return str
     }
     function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
       pageNum.value = 1
       listData.value = []
       getList()
@@ -254,6 +267,7 @@ function dictStr(val, arr) {
       getList()
     }
     function resetQuery() {
+         queryParams.value.time = ''
         queryParams.value.name = ''
         queryParams.value.accountName = ''
         queryParams.value.type = ''
@@ -309,7 +323,6 @@ function dictStr(val, arr) {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/work/accounts/investAccountDeal/list.vue b/src/pages/work/accounts/investAccountDeal/list.vue
index 33df3b7..b4182dd 100644
--- a/src/pages/work/accounts/investAccountDeal/list.vue
+++ b/src/pages/work/accounts/investAccountDeal/list.vue
@@ -1,10 +1,17 @@
 <template>
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.name" border="false" placeholder="请输入投资账户名称" class="search-input"
+         <view class="search-view">
+          <u--input v-model="queryParams.name" border="false" placeholder="请输入投资账户名称" class="search-input"
           @blur="searchBlur" suffixIcon="search" suffixIconStyle="color: #909399">
         </u--input>
+       </view>
+       </u-sticky>
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择交易时间"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
         <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
           labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
           <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
@@ -53,7 +60,7 @@
               :closeOnClickOverlay="true"
               :show="timeShow"
               v-model="time"
-              mode="datetime"
+              mode="date"
               @close="openOrCloseDate"
               @cancel="openOrCloseDate"
               @confirm="confirm"
@@ -114,6 +121,7 @@ import {
 import { getDicts } from '@/api/system/dict/data.js'
 import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
@@ -179,10 +187,12 @@ function getList() {
     }
     function confirm(e) {
       const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
       if (flag.value) {
-        queryParams.value.startTime = date
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
       } else {
-        queryParams.value.endTime = date
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
       }
       timeShow.value = false
     }
@@ -243,6 +253,9 @@ function selectAccountType(item) {
       })
     }
     function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
       pageNum.value = 1
       listData.value = []
       getList()
@@ -254,6 +267,7 @@ function selectAccountType(item) {
       getList()
     }
     function resetQuery() {
+       queryParams.value.time = ''
         queryParams.value.name = ''
         queryParams.value.type = '5'
         queryParams.value.dealType = ''
@@ -315,7 +329,6 @@ function selectAccountType(item) {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/work/accounts/investTransferRecord/list.vue b/src/pages/work/accounts/investTransferRecord/list.vue
index 170c03b..e7ab496 100644
--- a/src/pages/work/accounts/investTransferRecord/list.vue
+++ b/src/pages/work/accounts/investTransferRecord/list.vue
@@ -1,10 +1,17 @@
 <template>
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.name" border="false" placeholder="请输入投资账户名称" class="search-input"
+         <view class="search-view">
+          <u--input v-model="queryParams.name" border="false" placeholder="请输入投资账户名称" class="search-input"
           @blur="searchBlur" suffixIcon="search" suffixIconStyle="color: #909399">
         </u--input>
+       </view>
+       </u-sticky>
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择转账时间"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
         <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
           labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
           <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
@@ -17,7 +24,7 @@
                 <view v-for="item in dealTypeList" :key="item.id" class="state-item"
                   :class="item.selected ? 'active' : ''" @click="selectStatus(item)">{{ item.dictLabel }}</view>
               </view>
-              <view class="select-header">还款时间</view>
+              <view class="select-header">转账时间</view>
             <view class="selcet-content" style="padding: 0 24rpx">
               <u-input
                 :disabled="true"
@@ -53,7 +60,7 @@
               :closeOnClickOverlay="true"
               :show="timeShow"
               v-model="time"
-              mode="datetime"
+              mode="date"
               @close="openOrCloseDate"
               @cancel="openOrCloseDate"
               @confirm="confirm"
@@ -114,6 +121,7 @@ import {
 import { getDicts } from '@/api/system/dict/data.js'
 import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
@@ -178,10 +186,12 @@ function getList() {
     }
     function confirm(e) {
       const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
       if (flag.value) {
-        queryParams.value.startTime = date
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
       } else {
-        queryParams.value.endTime = date
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
       }
       timeShow.value = false
     }
@@ -220,6 +230,9 @@ function dictStr(val, arr) {
       return str
     }
     function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
       pageNum.value = 1
       listData.value = []
       getList()
@@ -231,6 +244,7 @@ function dictStr(val, arr) {
       getList()
     }
     function resetQuery() {
+       queryParams.value.time = ''
         queryParams.value.name = ''
         queryParams.value.type = '3'
         queryParams.value.dealType = ''
@@ -285,7 +299,6 @@ function dictStr(val, arr) {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/work/accounts/lendTransferRecord/list.vue b/src/pages/work/accounts/lendTransferRecord/list.vue
index 56f07c7..0214703 100644
--- a/src/pages/work/accounts/lendTransferRecord/list.vue
+++ b/src/pages/work/accounts/lendTransferRecord/list.vue
@@ -1,10 +1,17 @@
 <template>
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.name" border="false" placeholder="请输入借贷账户名称" class="search-input"
+         <view class="search-view">
+          <u--input v-model="queryParams.name" border="false" placeholder="请输入借贷账户名称" class="search-input"
           @blur="searchBlur" suffixIcon="search" suffixIconStyle="color: #909399">
         </u--input>
+       </view>
+       </u-sticky>
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择借贷时间"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
         <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
           labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
           <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
@@ -48,7 +55,7 @@
               :closeOnClickOverlay="true"
               :show="timeShow"
               v-model="time"
-              mode="datetime"
+              mode="date"
               @close="openOrCloseDate"
               @cancel="openOrCloseDate"
               @confirm="confirm"
@@ -112,6 +119,7 @@ import {
 import { getDicts } from '@/api/system/dict/data.js'
 import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
@@ -176,10 +184,12 @@ function getList() {
     }
     function confirm(e) {
       const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
       if (flag.value) {
-        queryParams.value.startTime = date
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
       } else {
-        queryParams.value.endTime = date
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
       }
       timeShow.value = false
     }
@@ -218,6 +228,9 @@ function dictStr(val, arr) {
       return str
     }
     function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
       pageNum.value = 1
       listData.value = []
       getList()
@@ -229,6 +242,7 @@ function dictStr(val, arr) {
       getList()
     }
     function resetQuery() {
+       queryParams.value.time = ''
         queryParams.value.name = ''
         queryParams.value.type = '5'
         queryParams.value.dealType = ''
@@ -283,7 +297,7 @@ function dictStr(val, arr) {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
+
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/work/accounts/posTransferRecord/list.vue b/src/pages/work/accounts/posTransferRecord/list.vue
index 36c8320..cb80d1b 100644
--- a/src/pages/work/accounts/posTransferRecord/list.vue
+++ b/src/pages/work/accounts/posTransferRecord/list.vue
@@ -1,10 +1,17 @@
 <template>
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择POS机" suffixIcon="search"
+         <view class="search-view">
+          <u-input v-model="queryParams.accountName" border="false" type="select"  @click="handleAccount" placeholder="请选择POS机" suffixIcon="search"
 	    suffixIconStyle="color: #909399" class="search-input">
         </u-input>
+       </view>
+       </u-sticky>
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择刷卡时间"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
         <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
           labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
           <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
@@ -48,7 +55,7 @@
               :closeOnClickOverlay="true"
               :show="timeShow"
               v-model="time"
-              mode="datetime"
+              mode="date"
               @close="openOrCloseDate"
               @cancel="openOrCloseDate"
               @confirm="confirm"
@@ -119,9 +126,9 @@ import {
   delAccountsTransferRecord,
 } from '@/api/invest/accountsTransferRecord'
 import { listAccounts } from '@/api/invest/accounts'
-import { getDicts } from '@/api/system/dict/data.js'
 import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
@@ -195,10 +202,12 @@ function getList() {
     }
     function confirm(e) {
       const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
       if (flag.value) {
-        queryParams.value.startTime = date
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
       } else {
-        queryParams.value.endTime = date
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
       }
       timeShow.value = false
     }
@@ -211,6 +220,9 @@ function settingCancel() {
       settingPickShow.value = false
     }
     function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
       pageNum.value = 1
       listData.value = []
       getList()
@@ -242,6 +254,7 @@ function settingCancel() {
       getList()
     }
     function resetQuery() {
+       queryParams.value.time = ''
         queryParams.value.name = ''
         queryParams.value.posId = ''
         queryParams.value.type = '1'
@@ -304,7 +317,6 @@ function settingCancel() {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/work/base/creditCard/addEdit.vue b/src/pages/work/base/creditCard/addEdit.vue
index 890807e..2cacc0c 100644
--- a/src/pages/work/base/creditCard/addEdit.vue
+++ b/src/pages/work/base/creditCard/addEdit.vue
@@ -136,9 +136,9 @@ const data = reactive({
   rules: {
           name: [{ type: 'string', required: true, message: '信用卡名称不能为空', trigger: ['change', 'blur'] }],
           code: [{ type: 'string', required: true, message: '信用卡卡号不能为空', trigger: ['change', 'blur'] }],
-          billDate: [{ type: 'int', required: true, message: '账单日不能为空', trigger: ['change', 'blur'] }],
-          payDate: [{ type: 'int', required: true, message: '还款日不能为空', trigger: ['change', 'blur'] }],  
-          creditLimit: [{ type: 'int', required: true, message: '信用卡额度不能为空', trigger: ['change', 'blur'] }],  
+          billDate: [{ type: 'number', required: true, message: '账单日不能为空', trigger: ['change', 'blur'] }],
+          payDate: [{ type: 'number', required: true, message: '还款日不能为空', trigger: ['change', 'blur'] }],  
+          creditLimit: [{ type: 'number', required: true, message: '信用卡额度不能为空', trigger: ['change', 'blur'] }],  
   }
 })
 const { form, rules} = toRefs(data)
diff --git a/src/pages/work/base/futures/addEdit.vue b/src/pages/work/base/futures/addEdit.vue
new file mode 100644
index 0000000..ae2d5f9
--- /dev/null
+++ b/src/pages/work/base/futures/addEdit.vue
@@ -0,0 +1,228 @@
+<template>
+    <view class="container" style="paddingBottom:1rpx;">
+      <u-navbar
+			leftIconSize="40rpx"
+			leftIconColor="#333333"
+			title="期货账户管理"
+		>
+		</u-navbar>
+      <view class="section">
+        <view class="section-title">{{ title}}</view>
+        <view class="form-view">
+          <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+            :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+            <u-form-item label="期货账户名称" prop="name" required >
+              <u--input v-model="form.name"  placeholder="请填写期货账户名称"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+          
+            <u-form-item label="账号" prop="code" required >
+              <u--input v-model="form.code"  placeholder="请填写账号"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="密码" prop="password"  >
+              <u--input v-model="form.password"  placeholder="请填写密码"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="关联储蓄卡" prop="bankNameCode"  @click="handleDebitCard">
+              <u--input v-model="form.bankNameCode" disabled disabledColor="#ffffff" placeholder="请选择关联储蓄卡"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="期货交易中心账号"  prop="tradingCenterCode" >
+              <u--input v-model="form.tradingCenterCode"  placeholder="请填写期货交易中心账号"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="期货交易中心密码"  prop="tradingCenterPassword" >
+              <u--input v-model="form.tradingCenterPassword"  placeholder="请填写期货交易中心密码"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="资金密码"  prop="fundPassword" >
+              <u--input v-model="form.fundPassword"  placeholder="请填写资金密码"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="开户日期" prop="activationDate"  @click="selectDate()">
+              <u--input v-model="form.activationDate" disabled disabledColor="#ffffff" placeholder="请选择开户日期" inputAlign="right" border="none"></u--input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+            </u-form-item>
+          
+            <u-form-item label="手续费" prop="commission" >
+              <u--input v-model="form.commission"  placeholder="请填写手续费"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="保证金比例" prop="bond" >
+              <u--input v-model="form.bond"  placeholder="请填写保证金比例"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="备注" prop="remark"  labelPosition="top">
+              <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+                maxlength="20000" style="padding:18rpx 0;"></u--textarea>
+            </u-form-item>
+          </u--form>
+          <view class="form-btn">
+            <u-button type="primary" text="提交" @click="submit"></u-button>
+          </view>
+        </view>
+      </view>
+      <u-toast ref="uToast"></u-toast>
+      <u-picker itemHeight="88" :show="showDebitCard" :columns="debitCardList" keyName="nameCodeAvailableLimit" @cancel="handleDebitCardCancel"
+      @confirm="handleDebitCardConfirm"></u-picker>
+        <u-datetime-picker
+			:show="datePickShow"
+			mode="date"
+      ref="createTimeRef" 
+			@cancel="datePickShow=false"
+			@confirm="datePickConfirm"
+			itemHeight="88"
+		></u-datetime-picker>
+    </view>
+  </template>
+  
+  <script setup>
+import { getFutureStocks, addFutureStocks, updateFutureStocks } from '@/api/invest/futureStocks'
+  import { listAccounts } from '@/api/invest/accounts'
+  const { proxy } = getCurrentInstance()
+  import dayjs from 'dayjs'
+  import {onLoad,onReady} from "@dcloudio/uni-app";
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const datePickShow = ref(false)
+const showDebitCard = ref(false)
+const title = ref("期货账户管理")
+const debitCardList = ref([])
+const dateType = ref(1)
+const data = reactive({
+  form: {
+    id: null,
+    name: null,
+    type: '1',
+    code: null,
+    password: null,
+    tradingCenterCode: null,
+    tradingCenterPassword: null,
+    fundPassword: null,
+    commission: null,
+    bond: null,
+    debitCard: null,
+    activationDate: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null
+  },
+  queryDebitCardParams: {
+    pageNum: 1,
+    type: '1',
+    state: '1',
+    pageSize: 1000
+  },
+  // dateType:'1',
+  rules: {
+          name: [{ type: 'string', required: true, message: '期货账户名称不能为空', trigger: ['change', 'blur'] }],
+          code: [{ type: 'string', required: true, message: '账号不能为空', trigger: ['change', 'blur'] }],
+  }
+})
+const { form, queryDebitCardParams, rules} = toRefs(data)
+
+onLoad((option) => {
+       form.value.id = option.id
+       if(form.value.id!=null){
+        title.value="期货账户管理-修改"
+       }else{
+        title.value="期货账户管理-新增"
+       }
+      getDict()
+  })
+  onReady(() => {
+    form.value.activationDate = dayjs(new Date().getTime()).format("YYYY-MM-DD")
+    form.value.effectiveDate = dayjs(new Date().getTime()).format("YYYY-MM-DD")
+  })
+  function  getDict() {
+        // 类型
+        listAccounts(queryDebitCardParams.value).then((response) => {
+       debitCardList.value = [response.rows] 
+       })
+      
+      if(form.value.id!=null){
+        getFutureStocks(form.value.id).then(res => {
+          form.value = res.data
+        })
+      }
+  }
+
+    function handleDebitCard() {
+        if (debitCardList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '结算卡为空  ', type: 'warning'
+          })
+        } else {
+          showDebitCard.value = true
+        }
+     }
+  function   handleDebitCardConfirm(e) {
+       form.value.bankNameCode = e.value[0].nameCodeAvailableLimit
+        form.value.debitCard = e.value[0].id
+        showDebitCard.value = false    
+  }
+ function handleDebitCardCancel() {
+       showDebitCard.value = false
+    }
+      function  selectDate(type) {
+        dateType.value=type
+				datePickShow.value = true
+        proxy.$refs['createTimeRef'].innerValue = new Date().getTime()
+			}
+			function datePickConfirm(e) {
+          form.value.activationDate = dayjs(e.value).format("YYYY-MM-DD")
+				datePickShow.value = false
+			}
+      function submit() {
+        proxy.$refs['uForm'].validate().then(() => {
+          if (form.value.id != null) {
+            updateFutureStocks(form.value).then(res => {
+              proxy.$refs['uToast'].show({
+              message: '修改成功', complete() {
+                uni.navigateTo({ url: `/pages/work/base/futures/list` })
+              }
+            })
+          })
+          }else {
+            addFutureStocks(form.value).then(res => {
+              proxy.$refs['uToast'].show({
+              message: '新增成功', complete() {
+                uni.navigateTo({ url: `/pages/work/base/futures/list` })
+              }
+            })
+          })
+          }
+        })
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+  .section {
+    margin: 24rpx;
+    padding: 16rpx 24rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+  
+    .section-title {
+      width: 360rpx;
+      color: #333333;
+      line-height: 44rpx;
+      font-size: 30rpx;
+      border-left: 6rpx solid #2681FF;
+      padding-left: 26rpx;
+    }
+  
+    .form-view {
+      padding: 20rpx 0rpx 0 10rpx;
+  
+      .form-btn {
+        padding-top: 20rpx;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/work/base/futures/details.vue b/src/pages/work/base/futures/details.vue
new file mode 100644
index 0000000..34333f9
--- /dev/null
+++ b/src/pages/work/base/futures/details.vue
@@ -0,0 +1,91 @@
+<template>
+    <view class="container" style="paddingBottom:1rpx;">
+      <u-navbar
+			leftIconSize="40rpx"
+			leftIconColor="#333333"
+			title="期货账户卡详情"
+		>
+		</u-navbar>
+      <view class="section">
+        <u-cell-group>
+        <u-cell title="名称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
+        <u-cell title="账号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
+        <u-cell title="期货交易中心账号:" titleStyle="font-weight:bolder" :value="detailInfo.tradingCenterCode"></u-cell>
+        <u-cell title="手续费:" titleStyle="font-weight:bolder" center :value="detailInfo.commission"> </u-cell>
+        <u-cell title="保证金比例:" titleStyle="font-weight:bolder" :value="detailInfo.bond"></u-cell>
+        <u-cell title="关联储蓄卡:" titleStyle="font-weight:bolder" :value="detailInfo.bankNameCode"></u-cell>
+        <u-cell title="开户日期:" titleStyle="font-weight:bolder" :value="detailInfo.activationDate"></u-cell>
+        <u-cell title="备注:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
+      </u-cell-group>
+      </view>
+      <u-toast ref="uToast"></u-toast>
+    </view>
+  </template>
+  
+<script setup>
+import {  getFutureStocks } from '@/api/invest/futureStocks'
+import {onLoad} from "@dcloudio/uni-app";
+import {reactive ,toRefs,ref,computed }from "vue";
+const id = ref('')
+const data = reactive({
+  detailInfo: {} 
+})
+const {detailInfo} = toRefs(data)
+onLoad((option) => {
+    id.value = option.id
+    getInfo()
+  })
+  function getInfo() {
+    getFutureStocks(id.value).then(res => {
+          detailInfo.value = res.data
+        })
+  }
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+  </script>
+  
+  <style lang="scss" scoped>
+  .section {
+    margin: 24rpx;
+    padding: 16rpx 24rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+  
+    .section-title {
+      width: 280rpx;
+      color: #333333;
+      line-height: 44rpx;
+      font-size: 30rpx;
+      border-left: 6rpx solid #2681FF;
+      padding-left: 26rpx;
+    }
+  
+    .content {
+      width: 647rpx;
+      font-size: 28rpx;
+      color: #333333;
+      line-height: 40rpx;
+      text-align: left;
+    }
+  
+    .img-con {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 20rpx
+    }
+    .form-view {
+      padding: 20rpx 0rpx 0 10rpx;
+  
+      .form-btn {
+        padding-top: 20rpx;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/work/base/futures/list.vue b/src/pages/work/base/futures/list.vue
new file mode 100644
index 0000000..f6674cd
--- /dev/null
+++ b/src/pages/work/base/futures/list.vue
@@ -0,0 +1,340 @@
+<template>
+  <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u--input v-model="queryParams.name" border="false" placeholder="请输入期货账户名称" class="search-input"
+          @blur="searchBlur" suffixIcon="search" suffixIconStyle="color: #909399">
+        </u--input>
+          <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+      </view>
+    </u-sticky>
+    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+      <u-list-item v-for="(item, index) in listData" :key="index">
+        <view class="list-item">
+          <view class="item-header" @click="enterDetails(item)">
+            <u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="item.name+'-'+item.code " size="30rpx" color="#333333" :bold="true"></u--text>
+          </view>
+         
+          <view class="item-row">
+            <text class="row-label">期货交易中心账号：</text>
+            <text class="row-value">{{ item.tradingCenterCode }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">手续费：</text>
+            <text class="row-value">{{ item.commission }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">保证金比例：</text>
+            <text class="row-value">{{ item.bond}}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">关联储蓄卡：</text>
+            <text class="row-value">{{ item.bankNameCode }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">开户日期：</text>
+            <text class="row-value">{{ item.activationDate}}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">备注：</text>
+            <text class="row-value">{{ item.remark}}</text>
+          </view>
+          <view class="operate" >
+            <!-- <view class="btn filling" @click="enterDetails(item)">查看</view > -->
+               <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleDelete(item)">删除</view>
+          </view>
+        </view>
+      </u-list-item>
+      <view>
+      </view>
+      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+    </u-list>
+    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import { listFutureStocks, delFutureStocks} from '@/api/invest/futureStocks'
+import {onLoad,onShow} from "@dcloudio/uni-app";
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed }from "vue";
+const pageNum = ref(1)
+const listData = ref([])
+const isShow = ref(false)
+const status = ref('loadmore')
+const settingPickShow = ref(false)
+const settingColumns = ref([])
+const data = reactive({
+  queryParams: {
+    name: null,
+    type: '1'
+   } 
+})
+const { queryParams} = toRefs(data)
+const windowHeight = computed(() => {
+			uni.getSystemInfoSync().windowHeight - 50
+		})	
+onLoad(() => {
+    getList()
+  });
+
+ onShow(() => {
+    if (isShow.value) {
+      getList()
+      isShow.value = false
+    }
+  });
+
+function loadmore() {
+      pageNum.value += 1
+      if (status.value == 'loadmore') {
+        getList()
+      }
+    }
+function getList() {
+      status.value = 'loading'
+      listFutureStocks({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+        listData.value = listData.value.concat(res.rows)
+        if (listData.value.length < res.total) {
+          status.value = 'loadmore'
+        } else {
+          status.value = 'nomore'
+        }
+      }).catch(() => {
+        status.value = 'nomore'
+      })
+    }
+function settingConfirm(e) {
+      queryParams.value.settingId = e.value[0].settingId
+      queryParams.value.settingName = e.value[0].settingName
+      settingPickShow.value = false
+    }
+function settingCancel() {
+      settingPickShow.value = false
+    }
+function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+    function searchBlur() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+    }
+    function resetQuery() {
+        queryParams.value.name = '',
+        queryParams.value.type = '1'
+      posTypeList.value.map(ele => {
+        Reflect.set(ele, 'selected', false)
+      })
+    }
+    function enterDetails(item) {
+      uni.navigateTo({ url: `/pages/work/base/futures/details?id=${item.id}` })
+    }
+    function handleEdit(item) {
+      uni.navigateTo({ url: `/pages/work/base/futures/addEdit?id=${item.id}` })
+      isShow.value = true
+    }
+    function handleAdd() {
+      uni.navigateTo({ url: `/pages/work/base/futures/addEdit` })
+      isShow.value = true
+    }
+    function handleDelete(item) {
+      uni.showModal({
+        	title: '提示',
+        	content: '你确定要删除吗',
+        	success: function (res) {
+        		if (res.confirm) {
+        		  delFutureStocks(item.id)
+              uni.navigateTo({ url: `/pages/work/base/futures/list` })
+        		} else if (res.cancel) {
+        			console.log('取消');
+        		}
+        	}
+        });
+    }
+	
+</script>
+
+<style lang="scss" scoped>
+.btnAdd {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      display:float;
+      text-align: center;
+    }
+
+.search-view {
+  padding: 12rpx 32rpx;
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+  margin-bottom: 24rpx;
+
+  .search-input {
+    background: #F5F5F5;
+    color: #333333;
+    margin-right: 36rpx;
+  }
+
+  .filter-panel {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 96rpx;
+    background-color: rgba(0, 0, 0, 0.5);
+
+    .filter-panel-content {
+      background-color: #ffff;
+      padding: 0 30rpx 30rpx;
+
+      .filter-title {
+        color: #000000;
+        font-size: 30rpx;
+        font-weight: 500;
+        padding: 30rpx 0;
+      }
+
+      .state-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .state-item {
+          width: 210rpx;
+          height: 72rpx;
+          border: 1rpx solid rgba(0, 0, 0, 0.25);
+          border-radius: 72rpx;
+          text-align: center;
+          line-height: 72rpx;
+          margin: 0 20rpx 20rpx 0;
+          font-size: 28rpx;
+          color: #000000;
+        }
+
+        .active {
+          background-color: rgba(222, 241, 255, 1);
+          border: 1rpx solid rgba(22, 119, 255, 1);
+        }
+      }
+    }
+
+    .btn-box {
+      display: flex;
+      padding: 24rpx 30rpx;
+      background-color: #fff;
+      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+    }
+  }
+}
+
+.list-item {
+  margin: 0 24rpx 24rpx;
+  padding: 32rpx;
+  background-color: #fff;
+
+  .item-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: 16rpx;
+
+    .status {
+      .status-item {
+        width: 120rpx;
+        height: 44rpx;
+        text-align: center;
+        line-height: 44rpx;
+        border-radius: 4rpx;
+        font-size: 24rpx;
+      }
+
+      .status1 {
+        background: #F0F0F0;
+        color: #8C8C8C;
+      }
+
+      .status2 {
+        background: rgba(38, 129, 255, 0.2);
+        color: #2681FF;
+      }
+
+      .status3 {
+        background: #F7F7F7;
+        color: #2681FF;
+      }
+
+      .status4 {
+        background: rgba(255, 85, 51, 0.2);
+        color: #FF5533;
+      }
+
+      .status5 {
+        background: #F7F7F7;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .status7 {
+        background: rgba(255, 129, 51, 0.2);
+        color: #FF8133;
+      }
+
+      .status8 {
+        background: rgba(65, 217, 165, 0.2);
+        color: #41D9A5;
+      }
+    }
+  }
+
+  .item-row {
+    padding: 16rpx 0;
+
+    .row-label {
+      color: rgba(0, 0, 0, 0.55);
+    }
+
+    .row-value {
+      color: rgba(0, 0, 0, 0.85)
+    }
+  }
+
+  .operate {
+    display: flex;
+    justify-content: flex-end;
+
+    .btn {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      margin-left: 5rpx;
+      text-align: center;
+    }
+
+    .circulation {
+      background: rgba(0, 0, 0, 0.04);
+      margin-right: 24rpx;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    .filling {
+      background: #2681FF;
+      border-radius: 8rpx;
+      color: #FFFFFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/work/base/posmachine/addEdit.vue b/src/pages/work/base/posmachine/addEdit.vue
new file mode 100644
index 0000000..c2cef0c
--- /dev/null
+++ b/src/pages/work/base/posmachine/addEdit.vue
@@ -0,0 +1,308 @@
+<template>
+    <view class="container" style="paddingBottom:1rpx;">
+      <u-navbar
+			leftIconSize="40rpx"
+			leftIconColor="#333333"
+			title="POS机管理"
+		>
+		</u-navbar>
+      <view class="section">
+        <view class="section-title">{{ title}}</view>
+        <view class="form-view">
+          <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+            :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+            <u-form-item label="POS机名称" prop="name" required >
+              <u--input v-model="form.name"  placeholder="请填写POS机名称"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="类型" required prop="typeName"  @click="handleShowType">
+              <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="商户名称" prop="merchantName" required >
+              <u--input v-model="form.merchantName"  placeholder="请填写商户名称"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="结算卡" prop="bankNameCode" required @click="handleDebitCard">
+              <u--input v-model="form.bankNameCode" disabled disabledColor="#ffffff" placeholder="请选择结算卡"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="刷卡费率" required prop="rate" >
+              <u--input v-model="form.rate"  placeholder="请填写刷卡费率"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="费率+" required prop="ratePlus" >
+              <u--input v-model="form.ratePlus"  placeholder="请填写费率+"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="厂商"  prop="manufacture" >
+              <u--input v-model="form.manufacture"  placeholder="请填写厂商"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="支付公司" prop="payCompany" >
+              <u--input v-model="form.payCompany"  placeholder="支付公司"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+          
+            <u-form-item label="编号" prop="code" >
+              <u--input v-model="form.code"  placeholder="请填写编号"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="启用日期" prop="activationDate"  @click="selectDate()">
+              <u--input v-model="form.activationDate" disabled disabledColor="#ffffff" placeholder="请选择启用日期" inputAlign="right" border="none"></u--input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+            </u-form-item>
+            <u-form-item label="商户类型" prop="merchantTypeName"  @click="handleShowMerchantType">
+              <u--input v-model="form.merchantTypeName" disabled disabledColor="#ffffff" placeholder="请选择商户类型"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="商户码" prop="merchantCode" >
+              <u--input v-model="form.merchantCode"  placeholder="请填写商户码"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="备注" prop="remark"  labelPosition="top">
+              <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+                maxlength="20000" style="padding:18rpx 0;"></u--textarea>
+            </u-form-item>
+          </u--form>
+          <view class="form-btn">
+            <u-button type="primary" text="提交" @click="submit"></u-button>
+          </view>
+        </view>
+      </view>
+      <u-toast ref="uToast"></u-toast>
+      <u-picker itemHeight="88" :show="showDebitCard" :columns="debitCardList" keyName="nameCodeAvailableLimit" @cancel="handleDebitCardCancel"
+      @confirm="handleDebitCardConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleCancel"
+        @confirm="handleConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showMerchantType" :columns="merchantTypeList" keyName="dictLabel" @cancel="handleMerchantTypeCancel"
+        @confirm="handleMerchantTypeConfirm"></u-picker>
+        <u-datetime-picker
+			:show="datePickShow"
+			mode="date"
+      ref="createTimeRef" 
+			@cancel="datePickShow=false"
+			@confirm="datePickConfirm"
+			itemHeight="88"
+		></u-datetime-picker>
+    </view>
+  </template>
+  
+  <script setup>
+import { getPosmachine, addPosmachine, updatePosmachine } from '@/api/invest/posmachine'
+  import { getDicts } from '@/api/system/dict/data.js'
+  import { listAccounts } from '@/api/invest/accounts'
+  const { proxy } = getCurrentInstance()
+  import dayjs from 'dayjs'
+  import {onLoad,onReady} from "@dcloudio/uni-app";
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const datePickShow = ref(false)
+const showType = ref(false)
+const showMerchantType = ref(false)
+const showDebitCard = ref(false)
+const title = ref("POS机管理")
+const typeList = ref([])
+const merchantTypeList = ref([])
+const debitCardList = ref([])
+const dateType = ref(1)
+const data = reactive({
+  form: {
+    id: null,
+    name: null,
+    type: null,
+    manufacture: null,
+    payCompany: null,
+    merchantName: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    code: null,
+    rate: null,
+    debitCard: null,
+    merchantType: null,
+    merchantCode: null,
+    ratePlus: 0,
+    activationDate: null
+  },
+  queryDebitCardParams: {
+    pageNum: 1,
+    type: '1',
+    state: '1',
+    pageSize: 1000
+  },
+  // dateType:'1',
+  rules: {
+          name: [{ type: 'string', required: true, message: 'POS机名称不能为空', trigger: ['change', 'blur'] }],
+          typeName: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
+          merchantName: [{ type: 'string', required: true, message: '商户名称不能为空', trigger: ['change', 'blur'] }],
+          rate: [{ type: 'number', required: true, message: '刷卡费率不能为空', trigger: ['change', 'blur'] }],  
+          ratePlus: [{ type: 'number', required: true, message: '费率+不能为空', trigger: ['change', 'blur'] }], 
+          debitCard: [{ type: 'string', required: true, message: '结算卡不能为空', trigger: ['change', 'blur'] }],  
+  }
+})
+const { form, queryDebitCardParams, rules} = toRefs(data)
+
+onLoad((option) => {
+       form.value.id = option.id
+       if(form.value.id!=null){
+        title.value="POS机管理-修改"
+       }else{
+        title.value="POS机管理-新增"
+       }
+      getDict()
+  })
+  onReady(() => {
+    form.value.activationDate = dayjs(new Date().getTime()).format("YYYY-MM-DD")
+    form.value.effectiveDate = dayjs(new Date().getTime()).format("YYYY-MM-DD")
+  })
+  function  getDict() {
+        // 类型
+        listAccounts(queryDebitCardParams.value).then((response) => {
+       debitCardList.value = [response.rows] 
+       })
+        getDicts('pos_type').then(res => {
+        typeList.value =[res.data] 
+      })
+       // 类型
+       getDicts('merchant_type').then(res => {
+        merchantTypeList.value =[res.data] 
+      })
+      if(form.value.id!=null){
+        getPosmachine(form.value.id).then(res => {
+          form.value = res.data
+           // 类型
+        getDicts('pos_type').then(result => {
+          form.value.typeName=dictStr(form.value.type, result.data)
+      })
+          // 类型
+          getDicts('merchant_type').then(result => {
+          form.value.merchantTypeName=dictStr(form.value.merchantType, result.data)
+      })
+          
+        })
+      }
+  }
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+    function handleDebitCard() {
+        if (debitCardList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '结算卡为空  ', type: 'warning'
+          })
+        } else {
+          showDebitCard.value = true
+        }
+     }
+  function   handleDebitCardConfirm(e) {
+       form.value.bankNameCode = e.value[0].nameCodeAvailableLimit
+        form.value.debitCard = e.value[0].id
+        showDebitCard.value = false    
+  }
+ function handleDebitCardCancel() {
+       showDebitCard.value = false
+    }
+  function handleShowType() {
+        if (typeList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '类型为空  ', type: 'warning'
+          })
+        } else {
+          showType.value = true
+        }
+      }
+      function   handleConfirm(e) {
+        form.value.typeName = e.value[0].dictLabel
+        form.value.type = e.value[0].dictValue
+        showType.value = false
+      }
+      function handleCancel() {
+       showType.value = false
+      }
+      function handleShowMerchantType() {
+        if (merchantTypeList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '商户类型为空  ', type: 'warning'
+          })
+        } else {
+          showMerchantType.value = true
+        }
+      }
+      function   handleMerchantTypeConfirm(e) {
+        form.value.merchantTypeName = e.value[0].dictLabel
+        form.value.merchantType = e.value[0].dictValue
+        showMerchantType.value = false
+      }
+      function handleMerchantTypeCancel() {
+       showMerchantType.value = false
+      }
+      function  selectDate(type) {
+        dateType.value=type
+				datePickShow.value = true
+        proxy.$refs['createTimeRef'].innerValue = new Date().getTime()
+			}
+			function datePickConfirm(e) {
+          form.value.activationDate = dayjs(e.value).format("YYYY-MM-DD")
+				datePickShow.value = false
+			}
+      function submit() {
+        proxy.$refs['uForm'].validate().then(() => {
+          if (form.value.id != null) {
+            updatePosmachine(form.value).then(res => {
+              proxy.$refs['uToast'].show({
+              message: '修改成功', complete() {
+                uni.navigateTo({ url: `/pages/work/base/posmachine/list` })
+              }
+            })
+          })
+          }else {
+            addPosmachine(form.value).then(res => {
+              proxy.$refs['uToast'].show({
+              message: '新增成功', complete() {
+                uni.navigateTo({ url: `/pages/work/base/posmachine/list` })
+              }
+            })
+          })
+          }
+        })
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+  .section {
+    margin: 24rpx;
+    padding: 16rpx 24rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+  
+    .section-title {
+      width: 360rpx;
+      color: #333333;
+      line-height: 44rpx;
+      font-size: 30rpx;
+      border-left: 6rpx solid #2681FF;
+      padding-left: 26rpx;
+    }
+  
+    .form-view {
+      padding: 20rpx 0rpx 0 10rpx;
+  
+      .form-btn {
+        padding-top: 20rpx;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/work/base/posmachine/details.vue b/src/pages/work/base/posmachine/details.vue
new file mode 100644
index 0000000..44dd3f0
--- /dev/null
+++ b/src/pages/work/base/posmachine/details.vue
@@ -0,0 +1,105 @@
+<template>
+    <view class="container" style="paddingBottom:1rpx;">
+      <u-navbar
+			leftIconSize="40rpx"
+			leftIconColor="#333333"
+			title="信用卡详情"
+		>
+		</u-navbar>
+      <view class="section">
+        <u-cell-group>
+        <u-cell title="POS机名称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
+        <u-cell title="支付公司:" titleStyle="font-weight:bolder" :value="detailInfo.payCompany"></u-cell>
+        <u-cell title="类型:" titleStyle="font-weight:bolder" :value="detailInfo.type"></u-cell>
+        <u-cell title="商户名称:" titleStyle="font-weight:bolder" center :value="detailInfo.merchantName"> </u-cell>
+        <u-cell title="刷卡费率:" titleStyle="font-weight:bolder" :value="detailInfo.rate"></u-cell>
+        <u-cell title="费率+:" titleStyle="font-weight:bolder" :value="detailInfo.ratePlus+''"></u-cell>
+        <u-cell title="结算卡:" titleStyle="font-weight:bolder" :value="detailInfo.bankNameCode"></u-cell>
+        <u-cell title="商户类型:" titleStyle="font-weight:bolder" :value="detailInfo.merchantType"></u-cell>
+        <u-cell title="商户码:" titleStyle="font-weight:bolder" :value="detailInfo.merchantCode"></u-cell>
+        <u-cell title="厂商:" titleStyle="font-weight:bolder" :value="detailInfo.manufacture"></u-cell>
+        <u-cell title="编号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
+        <u-cell title="启用日期:" titleStyle="font-weight:bolder" :value="detailInfo.activationDate"></u-cell>
+        <u-cell title="备注:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
+      </u-cell-group>
+      </view>
+      <u-toast ref="uToast"></u-toast>
+    </view>
+  </template>
+  
+<script setup>
+import {  getPosmachine } from '@/api/invest/posmachine'
+import { getDicts } from '@/api/system/dict/data.js'
+import {onLoad} from "@dcloudio/uni-app";
+import {reactive ,toRefs,ref,computed }from "vue";
+const id = ref('')
+const data = reactive({
+  detailInfo: {} 
+})
+const {detailInfo} = toRefs(data)
+onLoad((option) => {
+    id.value = option.id
+    getInfo()
+  })
+  function getInfo() {
+    getPosmachine(id.value).then(res => {
+          detailInfo.value = res.data
+                     // 类型
+            getDicts('pos_type').then(result => {
+         detailInfo.value.type=dictStr(detailInfo.value.type, result.data)
+      })
+                           // 类型
+            getDicts('merchant_type').then(result => {
+         detailInfo.value.merchantType=dictStr(detailInfo.value.merchantType, result.data)
+      })
+        })
+  }
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+  </script>
+  
+  <style lang="scss" scoped>
+  .section {
+    margin: 24rpx;
+    padding: 16rpx 24rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+  
+    .section-title {
+      width: 280rpx;
+      color: #333333;
+      line-height: 44rpx;
+      font-size: 30rpx;
+      border-left: 6rpx solid #2681FF;
+      padding-left: 26rpx;
+    }
+  
+    .content {
+      width: 647rpx;
+      font-size: 28rpx;
+      color: #333333;
+      line-height: 40rpx;
+      text-align: left;
+    }
+  
+    .img-con {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 20rpx
+    }
+    .form-view {
+      padding: 20rpx 0rpx 0 10rpx;
+  
+      .form-btn {
+        padding-top: 20rpx;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/work/base/posmachine/list.vue b/src/pages/work/base/posmachine/list.vue
new file mode 100644
index 0000000..8d4d693
--- /dev/null
+++ b/src/pages/work/base/posmachine/list.vue
@@ -0,0 +1,351 @@
+<template>
+  <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u--input v-model="queryParams.name" border="false" placeholder="请输入POS机名称" class="search-input"
+          @blur="searchBlur" suffixIcon="search" suffixIconStyle="color: #909399">
+        </u--input>
+          <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+      </view>
+    </u-sticky>
+    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+      <u-list-item v-for="(item, index) in listData" :key="index">
+        <view class="list-item">
+          <view class="item-header" @click="enterDetails(item)">
+            <u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="item.name+'-'+item.merchantName " size="30rpx" color="#333333" :bold="true"></u--text>
+          </view>
+         
+          <view class="item-row">
+            <text class="row-label">支付公司：</text>
+            <text class="row-value">{{ item.payCompany }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">类型：</text>
+            <text class="row-value">{{ dictStr(item.type, posTypeList) }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">刷卡费率：</text>
+            <text class="row-value">{{ item.rate+'+'+ item.ratePlus}}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">结算卡：</text>
+            <text class="row-value">{{ item.bankNameCode }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">商户类型：</text>
+            <text class="row-value">{{ dictStr(item.merchantType, merchantTypeList) }}</text>
+          </view>
+          <view class="operate" >
+            <!-- <view class="btn filling" @click="enterDetails(item)">查看</view > -->
+               <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleDelete(item)">删除</view>
+          </view>
+        </view>
+      </u-list-item>
+      <view>
+      </view>
+      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+    </u-list>
+    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import { listPosmachine, delPosmachine } from '@/api/invest/posmachine'
+import { getDicts } from '@/api/system/dict/data.js'
+import {onLoad,onShow} from "@dcloudio/uni-app";
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed }from "vue";
+const pageNum = ref(1)
+const listData = ref([])
+const isShow = ref(false)
+const status = ref('loadmore')
+const posTypeList = ref([])
+const merchantTypeList = ref([])
+const settingPickShow = ref(false)
+const settingColumns = ref([])
+const data = reactive({
+  filterPanel: false,
+  queryParams: {
+    name: null,
+    type: ''
+   } 
+})
+const { filterPanel, queryParams} = toRefs(data)
+const windowHeight = computed(() => {
+			uni.getSystemInfoSync().windowHeight - 50
+		})	
+onLoad(() => {
+    getDict()
+    getList()
+  });
+
+ onShow(() => {
+    if (isShow.value) {
+      getList()
+      isShow.value = false
+    }
+  });
+
+function loadmore() {
+      pageNum.value += 1
+      if (status.value == 'loadmore') {
+        getList()
+      }
+    }
+function getList() {
+      status.value = 'loading'
+      listPosmachine({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+        listData.value = listData.value.concat(res.rows)
+        if (listData.value.length < res.total) {
+          status.value = 'loadmore'
+        } else {
+          status.value = 'nomore'
+        }
+      }).catch(() => {
+        status.value = 'nomore'
+      })
+    }
+function   getDict() {
+      // 类型
+      getDicts('pos_type').then(res => {
+        posTypeList.value = res.data
+      })
+       // 类型
+       getDicts('merchant_type').then(res => {
+        merchantTypeList.value = res.data
+      })
+    }
+function settingConfirm(e) {
+      queryParams.value.settingId = e.value[0].settingId
+      queryParams.value.settingName = e.value[0].settingName
+      settingPickShow.value = false
+    }
+function settingCancel() {
+      settingPickShow.value = false
+    }
+function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+    function searchBlur() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+    }
+    function resetQuery() {
+        queryParams.value.name = '',
+        queryParams.value.type = ''
+      posTypeList.value.map(ele => {
+        Reflect.set(ele, 'selected', false)
+      })
+    }
+    function enterDetails(item) {
+      uni.navigateTo({ url: `/pages/work/base/posmachine/details?id=${item.id}` })
+    }
+    function handleEdit(item) {
+      uni.navigateTo({ url: `/pages/work/base/posmachine/addEdit?id=${item.id}` })
+      isShow.value = true
+    }
+    function handleAdd() {
+      uni.navigateTo({ url: `/pages/work/base/posmachine/addEdit` })
+      isShow.value = true
+    }
+    function handleDelete(item) {
+      uni.showModal({
+        	title: '提示',
+        	content: '你确定要删除吗',
+        	success: function (res) {
+        		if (res.confirm) {
+        		  delPosmachine(item.id)
+              uni.navigateTo({ url: `/pages/work/base/posmachine/list` })
+        		} else if (res.cancel) {
+        			console.log('取消');
+        		}
+        	}
+        });
+    }
+	
+</script>
+
+<style lang="scss" scoped>
+.btnAdd {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      display:float;
+      text-align: center;
+    }
+
+.search-view {
+  padding: 12rpx 32rpx;
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+  margin-bottom: 24rpx;
+
+  .search-input {
+    background: #F5F5F5;
+    color: #333333;
+    margin-right: 36rpx;
+  }
+
+  .filter-panel {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 96rpx;
+    background-color: rgba(0, 0, 0, 0.5);
+
+    .filter-panel-content {
+      background-color: #ffff;
+      padding: 0 30rpx 30rpx;
+
+      .filter-title {
+        color: #000000;
+        font-size: 30rpx;
+        font-weight: 500;
+        padding: 30rpx 0;
+      }
+
+      .state-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .state-item {
+          width: 210rpx;
+          height: 72rpx;
+          border: 1rpx solid rgba(0, 0, 0, 0.25);
+          border-radius: 72rpx;
+          text-align: center;
+          line-height: 72rpx;
+          margin: 0 20rpx 20rpx 0;
+          font-size: 28rpx;
+          color: #000000;
+        }
+
+        .active {
+          background-color: rgba(222, 241, 255, 1);
+          border: 1rpx solid rgba(22, 119, 255, 1);
+        }
+      }
+    }
+
+    .btn-box {
+      display: flex;
+      padding: 24rpx 30rpx;
+      background-color: #fff;
+      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+    }
+  }
+}
+
+.list-item {
+  margin: 0 24rpx 24rpx;
+  padding: 32rpx;
+  background-color: #fff;
+
+  .item-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: 16rpx;
+
+    .status {
+      .status-item {
+        width: 120rpx;
+        height: 44rpx;
+        text-align: center;
+        line-height: 44rpx;
+        border-radius: 4rpx;
+        font-size: 24rpx;
+      }
+
+      .status1 {
+        background: #F0F0F0;
+        color: #8C8C8C;
+      }
+
+      .status2 {
+        background: rgba(38, 129, 255, 0.2);
+        color: #2681FF;
+      }
+
+      .status3 {
+        background: #F7F7F7;
+        color: #2681FF;
+      }
+
+      .status4 {
+        background: rgba(255, 85, 51, 0.2);
+        color: #FF5533;
+      }
+
+      .status5 {
+        background: #F7F7F7;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .status7 {
+        background: rgba(255, 129, 51, 0.2);
+        color: #FF8133;
+      }
+
+      .status8 {
+        background: rgba(65, 217, 165, 0.2);
+        color: #41D9A5;
+      }
+    }
+  }
+
+  .item-row {
+    padding: 16rpx 0;
+
+    .row-label {
+      color: rgba(0, 0, 0, 0.55);
+    }
+
+    .row-value {
+      color: rgba(0, 0, 0, 0.85)
+    }
+  }
+
+  .operate {
+    display: flex;
+    justify-content: flex-end;
+
+    .btn {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      margin-left: 5rpx;
+      text-align: center;
+    }
+
+    .circulation {
+      background: rgba(0, 0, 0, 0.04);
+      margin-right: 24rpx;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    .filling {
+      background: #2681FF;
+      border-radius: 8rpx;
+      color: #FFFFFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/work/base/stocks/addEdit.vue b/src/pages/work/base/stocks/addEdit.vue
new file mode 100644
index 0000000..1b92fff
--- /dev/null
+++ b/src/pages/work/base/stocks/addEdit.vue
@@ -0,0 +1,212 @@
+<template>
+    <view class="container" style="paddingBottom:1rpx;">
+      <u-navbar
+			leftIconSize="40rpx"
+			leftIconColor="#333333"
+			title="股票账户管理"
+		>
+		</u-navbar>
+      <view class="section">
+        <view class="section-title">{{ title}}</view>
+        <view class="form-view">
+          <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+            :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+            <u-form-item label="股票账户名称" prop="name" required >
+              <u--input v-model="form.name"  placeholder="请填写股票账户名称"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+          
+            <u-form-item label="账号" prop="code" required >
+              <u--input v-model="form.code"  placeholder="请填写账号"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="密码" prop="password"  >
+              <u--input v-model="form.password"  placeholder="请填写密码"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="关联储蓄卡" prop="bankNameCode"  @click="handleDebitCard">
+              <u--input v-model="form.bankNameCode" disabled disabledColor="#ffffff" placeholder="请选择关联储蓄卡"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="开户日期" prop="activationDate"  @click="selectDate()">
+              <u--input v-model="form.activationDate" disabled disabledColor="#ffffff" placeholder="请选择开户日期" inputAlign="right" border="none"></u--input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+            </u-form-item>
+          
+            <u-form-item label="手续费" prop="commission" >
+              <u--input v-model="form.commission"  placeholder="请填写手续费"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="备注" prop="remark"  labelPosition="top">
+              <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+                maxlength="20000" style="padding:18rpx 0;"></u--textarea>
+            </u-form-item>
+          </u--form>
+          <view class="form-btn">
+            <u-button type="primary" text="提交" @click="submit"></u-button>
+          </view>
+        </view>
+      </view>
+      <u-toast ref="uToast"></u-toast>
+      <u-picker itemHeight="88" :show="showDebitCard" :columns="debitCardList" keyName="nameCodeAvailableLimit" @cancel="handleDebitCardCancel"
+      @confirm="handleDebitCardConfirm"></u-picker>
+        <u-datetime-picker
+			:show="datePickShow"
+			mode="date"
+      ref="createTimeRef" 
+			@cancel="datePickShow=false"
+			@confirm="datePickConfirm"
+			itemHeight="88"
+		></u-datetime-picker>
+    </view>
+  </template>
+  
+  <script setup>
+import { getFutureStocks, addFutureStocks, updateFutureStocks } from '@/api/invest/futureStocks'
+  import { listAccounts } from '@/api/invest/accounts'
+  const { proxy } = getCurrentInstance()
+  import dayjs from 'dayjs'
+  import {onLoad,onReady} from "@dcloudio/uni-app";
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const datePickShow = ref(false)
+const showDebitCard = ref(false)
+const title = ref("股票账户管理")
+const debitCardList = ref([])
+const dateType = ref(1)
+const data = reactive({
+  form: {
+    id: null,
+    name: null,
+    type: '2',
+    code: null,
+    password: null,
+    tradingCenterCode: null,
+    tradingCenterPassword: null,
+    fundPassword: null,
+    commission: null,
+    bond: null,
+    debitCard: null,
+    activationDate: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null
+  },
+  queryDebitCardParams: {
+    pageNum: 1,
+    type: '1',
+    state: '1',
+    pageSize: 1000
+  },
+  // dateType:'1',
+  rules: {
+          name: [{ type: 'string', required: true, message: '股票账户名称不能为空', trigger: ['change', 'blur'] }],
+          code: [{ type: 'string', required: true, message: '账号不能为空', trigger: ['change', 'blur'] }],
+  }
+})
+const { form, queryDebitCardParams, rules} = toRefs(data)
+
+onLoad((option) => {
+       form.value.id = option.id
+       if(form.value.id!=null){
+        title.value="股票账户管理-修改"
+       }else{
+        title.value="股票账户管理-新增"
+       }
+      getDict()
+  })
+  onReady(() => {
+    form.value.activationDate = dayjs(new Date().getTime()).format("YYYY-MM-DD")
+    form.value.effectiveDate = dayjs(new Date().getTime()).format("YYYY-MM-DD")
+  })
+  function  getDict() {
+        // 类型
+        listAccounts(queryDebitCardParams.value).then((response) => {
+       debitCardList.value = [response.rows] 
+       })
+      
+      if(form.value.id!=null){
+        getFutureStocks(form.value.id).then(res => {
+          form.value = res.data
+        })
+      }
+  }
+
+    function handleDebitCard() {
+        if (debitCardList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '结算卡为空  ', type: 'warning'
+          })
+        } else {
+          showDebitCard.value = true
+        }
+     }
+  function   handleDebitCardConfirm(e) {
+       form.value.bankNameCode = e.value[0].nameCodeAvailableLimit
+        form.value.debitCard = e.value[0].id
+        showDebitCard.value = false    
+  }
+ function handleDebitCardCancel() {
+       showDebitCard.value = false
+    }
+      function  selectDate(type) {
+        dateType.value=type
+				datePickShow.value = true
+        proxy.$refs['createTimeRef'].innerValue = new Date().getTime()
+			}
+			function datePickConfirm(e) {
+          form.value.activationDate = dayjs(e.value).format("YYYY-MM-DD")
+				datePickShow.value = false
+			}
+      function submit() {
+        proxy.$refs['uForm'].validate().then(() => {
+          if (form.value.id != null) {
+            updateFutureStocks(form.value).then(res => {
+              proxy.$refs['uToast'].show({
+              message: '修改成功', complete() {
+                uni.navigateTo({ url: `/pages/work/base/stocks/list` })
+              }
+            })
+          })
+          }else {
+            addFutureStocks(form.value).then(res => {
+              proxy.$refs['uToast'].show({
+              message: '新增成功', complete() {
+                uni.navigateTo({ url: `/pages/work/base/stocks/list` })
+              }
+            })
+          })
+          }
+        })
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+  .section {
+    margin: 24rpx;
+    padding: 16rpx 24rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+  
+    .section-title {
+      width: 360rpx;
+      color: #333333;
+      line-height: 44rpx;
+      font-size: 30rpx;
+      border-left: 6rpx solid #2681FF;
+      padding-left: 26rpx;
+    }
+  
+    .form-view {
+      padding: 20rpx 0rpx 0 10rpx;
+  
+      .form-btn {
+        padding-top: 20rpx;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/work/base/stocks/details.vue b/src/pages/work/base/stocks/details.vue
new file mode 100644
index 0000000..8515196
--- /dev/null
+++ b/src/pages/work/base/stocks/details.vue
@@ -0,0 +1,89 @@
+<template>
+    <view class="container" style="paddingBottom:1rpx;">
+      <u-navbar
+			leftIconSize="40rpx"
+			leftIconColor="#333333"
+			title="股票账户详情"
+		>
+		</u-navbar>
+      <view class="section">
+        <u-cell-group>
+        <u-cell title="名称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
+        <u-cell title="账号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
+        <u-cell title="手续费:" titleStyle="font-weight:bolder" center :value="detailInfo.commission"> </u-cell>
+        <u-cell title="关联储蓄卡:" titleStyle="font-weight:bolder" :value="detailInfo.bankNameCode"></u-cell>
+        <u-cell title="开户日期:" titleStyle="font-weight:bolder" :value="detailInfo.activationDate"></u-cell>
+        <u-cell title="备注:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
+      </u-cell-group>
+      </view>
+      <u-toast ref="uToast"></u-toast>
+    </view>
+  </template>
+  
+<script setup>
+import {  getFutureStocks } from '@/api/invest/futureStocks'
+import {onLoad} from "@dcloudio/uni-app";
+import {reactive ,toRefs,ref,computed }from "vue";
+const id = ref('')
+const data = reactive({
+  detailInfo: {} 
+})
+const {detailInfo} = toRefs(data)
+onLoad((option) => {
+    id.value = option.id
+    getInfo()
+  })
+  function getInfo() {
+    getFutureStocks(id.value).then(res => {
+          detailInfo.value = res.data
+        })
+  }
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+  </script>
+  
+  <style lang="scss" scoped>
+  .section {
+    margin: 24rpx;
+    padding: 16rpx 24rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+  
+    .section-title {
+      width: 280rpx;
+      color: #333333;
+      line-height: 44rpx;
+      font-size: 30rpx;
+      border-left: 6rpx solid #2681FF;
+      padding-left: 26rpx;
+    }
+  
+    .content {
+      width: 647rpx;
+      font-size: 28rpx;
+      color: #333333;
+      line-height: 40rpx;
+      text-align: left;
+    }
+  
+    .img-con {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 20rpx
+    }
+    .form-view {
+      padding: 20rpx 0rpx 0 10rpx;
+  
+      .form-btn {
+        padding-top: 20rpx;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/work/base/stocks/list.vue b/src/pages/work/base/stocks/list.vue
new file mode 100644
index 0000000..40f66f2
--- /dev/null
+++ b/src/pages/work/base/stocks/list.vue
@@ -0,0 +1,331 @@
+<template>
+  <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u--input v-model="queryParams.name" border="false" placeholder="请输入股票账户名称" class="search-input"
+          @blur="searchBlur" suffixIcon="search" suffixIconStyle="color: #909399">
+        </u--input>
+          <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+      </view>
+    </u-sticky>
+    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+      <u-list-item v-for="(item, index) in listData" :key="index">
+        <view class="list-item">
+          <view class="item-header" @click="enterDetails(item)">
+            <u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="item.name+'-'+item.code " size="30rpx" color="#333333" :bold="true"></u--text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">关联储蓄卡：</text>
+            <text class="row-value">{{ item.bankNameCode }}</text>
+          </view>         
+          <view class="item-row">
+            <text class="row-label">手续费：</text>
+            <text class="row-value">{{ item.commission }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">开户日期：</text>
+            <text class="row-value">{{ item.activationDate}}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">备注：</text>
+            <text class="row-value">{{ item.remark}}</text>
+          </view>
+          <view class="operate" >
+            <!-- <view class="btn filling" @click="enterDetails(item)">查看</view > -->
+               <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleDelete(item)">删除</view>
+          </view>
+        </view>
+      </u-list-item>
+      <view>
+      </view>
+      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+    </u-list>
+    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import { listFutureStocks, delFutureStocks} from '@/api/invest/futureStocks'
+import {onLoad,onShow} from "@dcloudio/uni-app";
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed }from "vue";
+const pageNum = ref(1)
+const listData = ref([])
+const isShow = ref(false)
+const status = ref('loadmore')
+const settingPickShow = ref(false)
+const settingColumns = ref([])
+const data = reactive({
+  queryParams: {
+    name: null,
+    type: '2'
+   } 
+})
+const { queryParams} = toRefs(data)
+const windowHeight = computed(() => {
+			uni.getSystemInfoSync().windowHeight - 50
+		})	
+onLoad(() => {
+    getList()
+  });
+
+ onShow(() => {
+    if (isShow.value) {
+      getList()
+      isShow.value = false
+    }
+  });
+
+function loadmore() {
+      pageNum.value += 1
+      if (status.value == 'loadmore') {
+        getList()
+      }
+    }
+function getList() {
+      status.value = 'loading'
+      listFutureStocks({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+        listData.value = listData.value.concat(res.rows)
+        if (listData.value.length < res.total) {
+          status.value = 'loadmore'
+        } else {
+          status.value = 'nomore'
+        }
+      }).catch(() => {
+        status.value = 'nomore'
+      })
+    }
+function settingConfirm(e) {
+      queryParams.value.settingId = e.value[0].settingId
+      queryParams.value.settingName = e.value[0].settingName
+      settingPickShow.value = false
+    }
+function settingCancel() {
+      settingPickShow.value = false
+    }
+function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+    function searchBlur() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+    }
+    function resetQuery() {
+        queryParams.value.name = '',
+        queryParams.value.type = '2'
+      posTypeList.value.map(ele => {
+        Reflect.set(ele, 'selected', false)
+      })
+    }
+    function enterDetails(item) {
+      uni.navigateTo({ url: `/pages/work/base/stocks/details?id=${item.id}` })
+    }
+    function handleEdit(item) {
+      uni.navigateTo({ url: `/pages/work/base/stocks/addEdit?id=${item.id}` })
+      isShow.value = true
+    }
+    function handleAdd() {
+      uni.navigateTo({ url: `/pages/work/base/stocks/addEdit` })
+      isShow.value = true
+    }
+    function handleDelete(item) {
+      uni.showModal({
+        	title: '提示',
+        	content: '你确定要删除吗',
+        	success: function (res) {
+        		if (res.confirm) {
+        		  delFutureStocks(item.id)
+              uni.navigateTo({ url: `/pages/work/base/stocks/list` })
+        		} else if (res.cancel) {
+        			console.log('取消');
+        		}
+        	}
+        });
+    }
+	
+</script>
+
+<style lang="scss" scoped>
+.btnAdd {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      display:float;
+      text-align: center;
+    }
+
+.search-view {
+  padding: 12rpx 32rpx;
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+  margin-bottom: 24rpx;
+
+  .search-input {
+    background: #F5F5F5;
+    color: #333333;
+    margin-right: 36rpx;
+  }
+
+  .filter-panel {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 96rpx;
+    background-color: rgba(0, 0, 0, 0.5);
+
+    .filter-panel-content {
+      background-color: #ffff;
+      padding: 0 30rpx 30rpx;
+
+      .filter-title {
+        color: #000000;
+        font-size: 30rpx;
+        font-weight: 500;
+        padding: 30rpx 0;
+      }
+
+      .state-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .state-item {
+          width: 210rpx;
+          height: 72rpx;
+          border: 1rpx solid rgba(0, 0, 0, 0.25);
+          border-radius: 72rpx;
+          text-align: center;
+          line-height: 72rpx;
+          margin: 0 20rpx 20rpx 0;
+          font-size: 28rpx;
+          color: #000000;
+        }
+
+        .active {
+          background-color: rgba(222, 241, 255, 1);
+          border: 1rpx solid rgba(22, 119, 255, 1);
+        }
+      }
+    }
+
+    .btn-box {
+      display: flex;
+      padding: 24rpx 30rpx;
+      background-color: #fff;
+      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+    }
+  }
+}
+
+.list-item {
+  margin: 0 24rpx 24rpx;
+  padding: 32rpx;
+  background-color: #fff;
+
+  .item-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: 16rpx;
+
+    .status {
+      .status-item {
+        width: 120rpx;
+        height: 44rpx;
+        text-align: center;
+        line-height: 44rpx;
+        border-radius: 4rpx;
+        font-size: 24rpx;
+      }
+
+      .status1 {
+        background: #F0F0F0;
+        color: #8C8C8C;
+      }
+
+      .status2 {
+        background: rgba(38, 129, 255, 0.2);
+        color: #2681FF;
+      }
+
+      .status3 {
+        background: #F7F7F7;
+        color: #2681FF;
+      }
+
+      .status4 {
+        background: rgba(255, 85, 51, 0.2);
+        color: #FF5533;
+      }
+
+      .status5 {
+        background: #F7F7F7;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .status7 {
+        background: rgba(255, 129, 51, 0.2);
+        color: #FF8133;
+      }
+
+      .status8 {
+        background: rgba(65, 217, 165, 0.2);
+        color: #41D9A5;
+      }
+    }
+  }
+
+  .item-row {
+    padding: 16rpx 0;
+
+    .row-label {
+      color: rgba(0, 0, 0, 0.55);
+    }
+
+    .row-value {
+      color: rgba(0, 0, 0, 0.85)
+    }
+  }
+
+  .operate {
+    display: flex;
+    justify-content: flex-end;
+
+    .btn {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      margin-left: 5rpx;
+      text-align: center;
+    }
+
+    .circulation {
+      background: rgba(0, 0, 0, 0.04);
+      margin-right: 24rpx;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    .filling {
+      background: #2681FF;
+      border-radius: 8rpx;
+      color: #FFFFFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/work/bill/creditCardBill/addEdit.vue b/src/pages/work/bill/creditCardBill/addEdit.vue
index 8c5cd2a..bd29922 100644
--- a/src/pages/work/bill/creditCardBill/addEdit.vue
+++ b/src/pages/work/bill/creditCardBill/addEdit.vue
@@ -96,7 +96,7 @@ const data = reactive({
            creditCardName: [{ type: 'string', required: true, message: '信用卡不能为空', trigger: ['change', 'blur'] }],
           billDate: [{ type: 'string', required: true, message: '账单日不能为空', trigger: ['change', 'blur'] }],
           billStateName: [{ type: 'string', required: true, message: '账单状态不能为空', trigger: ['change', 'blur'] }],
-          billAmount: [{ type: 'float', required: true, message: '账单金额不能为空', trigger: ['change', 'blur'] }],
+          billAmount: [{ type: 'number', required: true, message: '账单金额不能为空', trigger: ['change', 'blur'] }],
   }
 })
 const { form, queryBankCardLendParams, rules} = toRefs(data)
diff --git a/src/pages/work/bill/creditInstallmentHistory/addEdit.vue b/src/pages/work/bill/creditInstallmentHistory/addEdit.vue
index 1e6df69..8adcd7a 100644
--- a/src/pages/work/bill/creditInstallmentHistory/addEdit.vue
+++ b/src/pages/work/bill/creditInstallmentHistory/addEdit.vue
@@ -101,6 +101,7 @@ import {
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
 const datePickShow = ref(false)
+const closeDatePickShow = ref(false)
 const showTeam = ref(false)
 const showOnlineLend = ref(false)
 const title = ref("信用卡分期账单")
@@ -140,9 +141,9 @@ const data = reactive({
            onlineLendName: [{ type: 'string', required: true, message: '信用卡不能为空', trigger: ['change', 'blur'] }],
           billDate: [{ type: 'string', required: true, message: '分期日期不能为空', trigger: ['change', 'blur'] }],
           settleStateName: [{ type: 'string', required: true, message: '结清状态不能为空', trigger: ['change', 'blur'] }],
-          billAmount: [{ type: 'float', required: true, message: '分期金额不能为空', trigger: ['change', 'blur'] }],
-          period: [{ type: 'int', required: true, message: '分期期数不能为空', trigger: ['change', 'blur'] }],
-          balance: [{ type: 'float', required: true, message: '余额不能为空', trigger: ['change', 'blur'] }],
+          billAmount: [{ type: 'number', required: true, message: '分期金额不能为空', trigger: ['change', 'blur'] }],
+          period: [{ type: 'number', required: true, message: '分期期数不能为空', trigger: ['change', 'blur'] }],
+          balance: [{ type: 'number', required: true, message: '余额不能为空', trigger: ['change', 'blur'] }],
   }
 })
 const { form, queryBankCardLendParams, rules} = toRefs(data)
diff --git a/src/pages/work/bill/creditInstallmentHistory/detailsAddEdit.vue b/src/pages/work/bill/creditInstallmentHistory/detailsAddEdit.vue
index f5c3211..28de245 100644
--- a/src/pages/work/bill/creditInstallmentHistory/detailsAddEdit.vue
+++ b/src/pages/work/bill/creditInstallmentHistory/detailsAddEdit.vue
@@ -81,9 +81,9 @@ const data = reactive({
   form: {},
   rules: {
            repaymentDate: [{ type: 'string', required: true, message: '还款日期不能为空', trigger: ['change', 'blur'] }],
-           periods: [{ type: 'int', required: true, message: '还款期数不能为空', trigger: ['change', 'blur'] }],
-           interest: [{ type: 'float', required: true, message: '利息不能为空', trigger: ['change', 'blur'] }],
-           principal: [{ type: 'float', required: true, message: '应还本金不能为空', trigger: ['change', 'blur'] }],
+           periods: [{ type: 'number', required: true, message: '还款期数不能为空', trigger: ['change', 'blur'] }],
+           interest: [{ type: 'number', required: true, message: '利息不能为空', trigger: ['change', 'blur'] }],
+           principal: [{ type: 'number', required: true, message: '应还本金不能为空', trigger: ['change', 'blur'] }],
           postingStateName: [{ type: 'string', required: true, message: '入账状态不能为空', trigger: ['change', 'blur'] }],
   }
 })
@@ -151,7 +151,7 @@ onLoad((option) => {
         proxy.$refs['createTimeRef'].innerValue = new Date().getTime()
 			}
 			function datePickConfirm(e) {
-				form.value.createTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
+				form.value.repaymentDate = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
 				datePickShow.value = false
 			}
       function submit() {
diff --git a/src/pages/work/bill/futuresBill/addEdit.vue b/src/pages/work/bill/futuresBill/addEdit.vue
index 67e9d59..91bfa13 100644
--- a/src/pages/work/bill/futuresBill/addEdit.vue
+++ b/src/pages/work/bill/futuresBill/addEdit.vue
@@ -90,7 +90,7 @@ const data = reactive({
   rules: {
            futureStocksName: [{ type: 'string', required: true, message: '期货账户不能为空', trigger: ['change', 'blur'] }],
           billDate: [{ type: 'string', required: true, message: '账单日不能为空', trigger: ['change', 'blur'] }],
-          billAmount: [{ type: 'float', required: true, message: '期货收益不能为空', trigger: ['change', 'blur'] }],
+          billAmount: [{ type: 'number', required: true, message: '期货收益不能为空', trigger: ['change', 'blur'] }],
   }
 })
 const { form, queryFutureStocksListParams, rules} = toRefs(data)
diff --git a/src/pages/work/bill/onlineLendHistory/addEdit.vue b/src/pages/work/bill/onlineLendHistory/addEdit.vue
index ba41214..7d8a187 100644
--- a/src/pages/work/bill/onlineLendHistory/addEdit.vue
+++ b/src/pages/work/bill/onlineLendHistory/addEdit.vue
@@ -101,6 +101,7 @@ import {
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
 const datePickShow = ref(false)
+const closeDatePickShow = ref(false)
 const showTeam = ref(false)
 const showOnlineLend = ref(false)
 const title = ref("网贷账单")
@@ -140,9 +141,9 @@ const data = reactive({
            onlineLendName: [{ type: 'string', required: true, message: '网贷机构不能为空', trigger: ['change', 'blur'] }],
           billDate: [{ type: 'string', required: true, message: '借款日期不能为空', trigger: ['change', 'blur'] }],
           settleStateName: [{ type: 'string', required: true, message: '结清状态不能为空', trigger: ['change', 'blur'] }],
-          installmentAmount: [{ type: 'float', required: true, message: '借款金额不能为空', trigger: ['change', 'blur'] }],
-          period: [{ type: 'int', required: true, message: '借款期数不能为空', trigger: ['change', 'blur'] }],
-          balance: [{ type: 'float', required: true, message: '余额不能为空', trigger: ['change', 'blur'] }],
+          installmentAmount: [{ type: 'number', required: true, message: '借款金额不能为空', trigger: ['change', 'blur'] }],
+          period: [{ type: 'number', required: true, message: '借款期数不能为空', trigger: ['change', 'blur'] }],
+          balance: [{ type: 'number', required: true, message: '余额不能为空', trigger: ['change', 'blur'] }],
   }
 })
 const { form, queryBankCardLendParams, rules} = toRefs(data)
diff --git a/src/pages/work/bill/onlineLendHistory/detailsAddEdit.vue b/src/pages/work/bill/onlineLendHistory/detailsAddEdit.vue
index 0710225..9832b68 100644
--- a/src/pages/work/bill/onlineLendHistory/detailsAddEdit.vue
+++ b/src/pages/work/bill/onlineLendHistory/detailsAddEdit.vue
@@ -81,9 +81,9 @@ const data = reactive({
   form: {},
   rules: {
            repaymentDate: [{ type: 'string', required: true, message: '还款日期不能为空', trigger: ['change', 'blur'] }],
-           periods: [{ type: 'int', required: true, message: '还款期数不能为空', trigger: ['change', 'blur'] }],
-           interest: [{ type: 'float', required: true, message: '利息不能为空', trigger: ['change', 'blur'] }],
-           principal: [{ type: 'float', required: true, message: '应还本金不能为空', trigger: ['change', 'blur'] }],
+           periods: [{ type: 'number', required: true, message: '还款期数不能为空', trigger: ['change', 'blur'] }],
+           interest: [{ type: 'number', required: true, message: '利息不能为空', trigger: ['change', 'blur'] }],
+           principal: [{ type: 'number', required: true, message: '应还本金不能为空', trigger: ['change', 'blur'] }],
           postingStateName: [{ type: 'string', required: true, message: '入账状态不能为空', trigger: ['change', 'blur'] }],
   }
 })
diff --git a/src/pages/work/bill/peopleLendHistory/addEdit.vue b/src/pages/work/bill/peopleLendHistory/addEdit.vue
index 23b9dcc..23f666b 100644
--- a/src/pages/work/bill/peopleLendHistory/addEdit.vue
+++ b/src/pages/work/bill/peopleLendHistory/addEdit.vue
@@ -120,7 +120,7 @@ const data = reactive({
            onlineLendName: [{ type: 'string', required: true, message: '人情借贷不能为空', trigger: ['change', 'blur'] }],
           billDate: [{ type: 'string', required: true, message: '借款日期不能为空', trigger: ['change', 'blur'] }],
           settleStateName: [{ type: 'string', required: true, message: '结清状态不能为空', trigger: ['change', 'blur'] }],
-          installmentAmount: [{ type: 'float', required: true, message: '借款金额不能为空', trigger: ['change', 'blur'] }]
+          installmentAmount: [{ type: 'number', required: true, message: '借款金额不能为空', trigger: ['change', 'blur'] }]
   }
 })
 const { form, queryBankCardLendParams, rules} = toRefs(data)
diff --git a/src/pages/work/bill/stocksBill/addEdit.vue b/src/pages/work/bill/stocksBill/addEdit.vue
index 46e68b1..bd34755 100644
--- a/src/pages/work/bill/stocksBill/addEdit.vue
+++ b/src/pages/work/bill/stocksBill/addEdit.vue
@@ -90,7 +90,7 @@ const data = reactive({
   rules: {
            futureStocksName: [{ type: 'string', required: true, message: '股票账户不能为空', trigger: ['change', 'blur'] }],
           billDate: [{ type: 'string', required: true, message: '账单日不能为空', trigger: ['change', 'blur'] }],
-          billAmount: [{ type: 'float', required: true, message: '股票收益不能为空', trigger: ['change', 'blur'] }],
+          billAmount: [{ type: 'number', required: true, message: '股票收益不能为空', trigger: ['change', 'blur'] }],
   }
 })
 const { form, queryFutureStocksListParams, rules} = toRefs(data)
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index e13449f..bd184cf 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -77,6 +77,8 @@ import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
         { path: '/pages/work/accounts/accountDealRecord/list', text: '账户交易记录', icon: 'paperclip', permission: 'invest:accountDealRecord:list'  },
         { path: '/pages/work/accounts/posTransferRecord/list', text: 'POS机刷卡记账', icon: 'reload', permission: 'invest:accountsTransferRecord:list'  },
         { path: '/pages/work/accounts/creditTransferRecord/list', text: '信用卡还款', icon: 'arrow-left', permission: 'invest:accountsTransferRecord:list'  },
+        { path: '/pages/work/accounts/investAccountDeal/list', text: '投资交易记录', icon: 'chatboxes', permission: 'invest:accountDealRecord:list'  },
+        { path: '/pages/work/accounts/investTransferRecord/list', text: '投资账户记账', icon: 'auth-filled', permission: 'invest:accountsTransferRecord:list'  },
         { path: '/pages/work/accounts/debitTransferRecord/list', text: '储蓄账户记账', icon: 'tune', permission: 'invest:accountsTransferRecord:list'  },
         { path: '/pages/work/accounts/accounts/commonList', text: '记账账户', icon: 'staff', permission: 'invest:accounts:list'  },
         { path: '/pages/work/bill/creditCardBill/list', text: '信用卡账单', icon: 'list', permission: 'invest:creditCardBill:list'   },
@@ -85,12 +87,12 @@ import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
         { path: '/pages/work/bill/creditQueryRecord/list', text: '征信查询记录', icon: 'search', permission: 'invest:creditQueryRecord:list'  }
       ])
   const baseGridList=ref([
-        { path: '/pages/page1/page1', text: 'pos机管理', icon: 'shop-filled', permission: 'invest:posmachine:list' },
+        { path: '/pages/work/base/posmachine/list', text: 'pos机管理', icon: 'shop-filled', permission: 'invest:posmachine:list' },
         { path: '/pages/work/base/creditCard/list', text: '信用卡管理', icon: 'wallet', permission: 'invest:bankcard:list'  },
         { path: '/pages/work/base/debitCard/list', text: '储蓄卡管理', icon: 'wallet-filled', permission: 'invest:bankcard:list'  },
         { path: '/pages/work/base/lend/list', text: '借贷账户管理', icon: 'upload', permission: 'invest:bankcard:list'  },
-        { path: '/pages/page1/page1', text: '股票账户管理', icon: 'calendar', permission: 'invest:futureStocks:list'  },
-        { path: '/pages/page1/page1', text: '期货账户管理', icon: 'paperplane-filled', permission: 'invest:futureStocks:list'  }
+        { path: '/pages/work/base/stocks/list', text: '股票账户管理', icon: 'calendar', permission: 'invest:futureStocks:list'  },
+        { path: '/pages/work/base/futures/list', text: '期货账户管理', icon: 'paperplane-filled', permission: 'invest:futureStocks:list'  }
       ])
       const billGridList=ref([
         { path: '/pages/work/bill/futuresBill/list', text: '期货账单', icon: 'map', permission: 'invest:futureStocksBill:list'  },
diff --git a/src/static/images/average.png b/src/static/images/average.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d1c537ddde65bdc460c5dcf93bb4b03794f0e86
GIT binary patch
literal 1463
zcmV;o1xWgdP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px)aY;l$RA@u(n`vwmRUE+In`4j8Ufp(kZ40e!rL>4ONU^1dp#dxyAtWUdjY=Yl
ziJF+0n3xzp@X5pv>KEIXSV=TAKqO!)0)hk<3YDf1N=u*zw%wj|@2fjA@0qu8P1D%!
z%yg-{o9?&C{IB2p|L5Hc!Ghn&$V{HVQnfSy>k$TK0DxwpOoBa!C<q)P0R0S)Y-`q7
z#^=WeqYoHk`qB8~{Q$yx03elM5E8?|2w;4rFfa2sgis_(5x@xCgyTa1K$%2Ki7s}(
zFxUJIfs6nS+h+~{NWGZoQOk-Cqsv8B%P~m4Igx>%C2v_ShK&&|;3IHoVs<~opix%q
zB#AJF;3E8MV)k={L0*!?EGtY3f^j%JKKpeN3<a{l<_U)gV5?H?WYAj$Ool8i72~op
z=p18={pYn+zA45k3Q+YV8iQtVSeGr>*Y5~+rRNK7xjqyF&OTz(yW4epME=QuEd-%i
z9NzS*?{r2X@00_n81QO~akp=Vwi0Kgl^HGe%W*7KRtQ2aS{*uzXs<i$?vSb*nTsmv
zMfo6LE`Dh~hyj4C2K(y|yHBX}C@jaZRN1hXQe9~=HuE9KK>%>$$Bs5u3k0e9iU7US
z6lZHSy+)iEa>UWChumkSI#eQe?K@+WXOb=;y0!1Re$r<l$<?w7_+Kr)nn5LXxP;D%
zm#A-=;;zQ&8+6+lL;nTsX740p#Q*{|hrFhIVXU|=a8H+s0)%_T0pnGo6Md@eyQjIP
z$S?pgq9`aL5wMY=hsAR>Z@W(r$fN}HPSLu~Hp4!Vhnl<%;hyrB0zIr237&CUKX^^M
zLB*j!#je1eq|IP7D_LdXyPKMQolAYTNteNqZgs)EU%4i=4!IiMcb%kJfKm!j2vPLI
z%bIdsj_53?oEwYP=_XwUV*xFEpD=)A-Z*qaQ%VBNEf0?xt%B$Ng|rItY+lPxXFbi&
z4B50L;UH9V7ST<zH`1*s2skK%nnS^&n$XZhADivAvzd?rXkBBVKcPAq=LloGc~rlj
z1XZ>@_<P|Cq2b?-q#q*B*5~+J&%EsGx%8E(IqZd|^tHmkmN&eA-1uI<-DPJAwI=kq
z;RE-nJEwG;CwkdRNCRQ#r_Q#70+d^NQson-L}LX!ctu;9w{dP%YeJz|vh&|31>jV_
zDy!$DZjVZb+}l2K9ZxAhvOu=An)Zggl)1D%c)6q@_#i0(u?XN$r@Hv5>bXHk156-z
zKgIspuHWV!r`PH&$X@%7s{_b9oLlh{U2HYc-LBg@{ZLgwwlTO2VFm+$ebaQV$Ws~>
zhuqZ%J!jI=QBY3y5~>#^!$jXXZMA2TCEE+p!&Pi5;D;;s`fYMMmuN$*cm`uFmq=MU
z?X-!MtRYwQC<RMcK)EFtOMb;O=zC11UH#VdItff~5$&}y_bOunEqrflG4A&Mvj<!E
zp6kcxN?(c{MZ0QPgz)?q>2HzMH<?ncZ}eX><qHle4&}<Y#u#(|MQ$4w0YlM%-|>m_
z2T0>c4=v@V2#^@QbxdD7Gr*QhaS|^XO9|ii`~j~`jy=VIbAG_yJZft4&r&&Z94eLN
zGSK9fH(h7d9N^{HPz*?%kX~}|y0*meh_Q-1r3!hVfy`Fq1hAN_MvojC1NP7?3Y!ZB
zdvQ&0AUb)FV}DtI3mx4*m$qTJOH(5!fW>5sszTSxb_RNvYb&mRqqo`o-e2^)mKzk&
z-}s8Z!}{!;eYv*c3P^&v{j;uW`T<+6^xTjf#bvGI`zrVOx|Rz^^y3Z~kD%gdV-+x-
zt@(f0O8tvKDSwqK<uBu<{B=t5;ivS4*vOnR)vq-F3z@2y(&vv)srI*mzX8sX1ikqh
RRH^^~002ovPDHLkV1iJYy&V7m

literal 0
HcmV?d00001

diff --git a/src/static/images/completionTickets.png b/src/static/images/completionTickets.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6f34bf43f325215f66c988ab0afb0c68cfde612
GIT binary patch
literal 9115
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
D`eXTS

literal 0
HcmV?d00001

diff --git a/src/static/images/completionTime.png b/src/static/images/completionTime.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a1114f5f21ac2aa7054e2f3a69d1b60a62e33e1
GIT binary patch
literal 7104
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

literal 0
HcmV?d00001

diff --git a/src/static/images/four.png b/src/static/images/four.png
new file mode 100644
index 0000000000000000000000000000000000000000..a12edd7c1b1894ccef91495f62cb5538af68edc6
GIT binary patch
literal 4694
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

literal 0
HcmV?d00001

diff --git a/src/static/images/one.png b/src/static/images/one.png
new file mode 100644
index 0000000000000000000000000000000000000000..78d2c2b0534cb7395d516c7dada5b07f4a765155
GIT binary patch
literal 5237
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
Kkgt-p2>TCjI>eg*

literal 0
HcmV?d00001

diff --git a/src/static/images/positiveRating.png b/src/static/images/positiveRating.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4103ec4b86b6f3c1c8c3f0db8e1fa33a7f789bc
GIT binary patch
literal 4513
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
JRp~fJ{}+g$^-BN%

literal 0
HcmV?d00001

diff --git a/src/static/images/three.png b/src/static/images/three.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1e8225f5178a24e1c294290a083f83c270393c3
GIT binary patch
literal 7173
zcma)hWmsEX({6wODH@<qoS-cZg%+0pMT)e=i@Ozf4G<{OK1iXswrFsd;4Y;&#UZo=
zr?}h6^S<9X=Q{t+kJ)SXnpv~=wfD8|HFHn&TMZ>*0$Kt906?swte}Y*2mcii9_CuE
zUy+R&usk%C<Ny_;^xK#l1#5j38+CO67e)sGup;dNz<*sZLW>aq04Em<fP)#a{+-Lk
z{y)~iT%7-_|Ld4xD3t^N(7C86K(&3b_Kkg9>2=Z{{2%ksZ90mnjMCsVbm7&;ikc;R
zQn&ihImB6)&dL1Et#C$2tTH>yBbQ5&=t{J+ST0qG=zPBdo#P)6Nr+$<l%&Q{Z20|X
zLYY9&YGpyPV%~OIb{b4*YI(I(^USkjwsQ5R?Lw;qW;&_tX7H_Y@Y?R@{TFE4U+=6_
zviuKMw}bcjTGIB@S)NjH!sTrhT8v+^OPj<r+ql8w4liOHe4VvVmQbuZ$3_TLVGf6S
z<+w68v7J~8lZn8_xP_Bj*f5{HhMtMG=2t@l##RyKE<Yq=W`X^JF9TaV8%XpYz*sqL
zwqd{v-YQPnP%l;joW;-mR5RjN)JmZ4nCaxQAh+a|w-3S{%v47ixp|2(Uy(qp0Fa%?
zC2_66k6~Dw@4ae9sw}eYrc9OnRs5#+E#hu|c-S@!c~8gj>f4zmn-W<01-5~o?9}~I
zW59);Y1(<9*Y`JXq99{?*Q%p4wNG<?ouV`gpS5$cJ;J7m2D~{WFeYqWDmdtzHO)BP
zMf%dwh(MFeIMcz7#Q_;Ixz2GH=9(s8WjgHi28sBjliJ_7uL6GC%Xd1P2ii(r4Ry4G
z%PMaa2hE?n;7kz&9m;r)7>}5bShwug=zt}(@PF*y4^#428&-d%06wS0y7%R0)JZ)d
zl#nnHd~`f=E#ukjy?Y(07E6=1U~ZoR0rO+4CGch~dik%{H}f0Cc)LuqQ?1a;#o8UJ
zWE+xo$^?!$jU3qpRk4A7*{lC3p_$-{mxOkfgF@KUJ(k?rldNZ&!?boxQE^AXb;BvU
z@DL?1bw`b(hx*Wi(=ru8hAhp}5pB`<+B1*EoMTopGDMeda5RnHp0MdBIiZ}a{3!GK
z;gWDX$$RG9O^Z>>zmX|+@?hn`SEFPkiJ1Y6Sjmah9x`Ql<;nWv<>DUO7HP$C;osPb
z+GRtA-cD31jhTN#8kVm>-by}pzqH^}e##07X(lBJw|PMUTtvngG=G~vHUu9&!A1d^
z%+8U185iSH*Ny~u4_zbic@UHq5ZUH)`nmjO<*Jqb&c!dRb511z0s+OFU(SYyLBaA%
z&idE{;_wg%pj2NAw+{kx9PCrm<%ocovE=$Vt}9HDmqI_Jy4Vc81A~E4Y8t|@FyL7l
z_9sk?aL9OXG~iaZ+WGb}p67}abjgV2ioG;A+!nC6WmW}k@ClM(2Zjg$Ye<<8MvQjj
zbQ}@Zg9yw@0c;draF{UB6Ja106he+o+=J7)xhSKVY(xPJj01S!wCMl7{COb+1yspG
za#kU7U_#gRnpHA0XW&0zAPisbnjfSf7t-T_BA%4i%>M7H$o)<_1q+``7zYSIMuzIt
z2<;!#Age`xhoC+HJBe5N5~^(5vvDV{o`JTSV}?Jy`=p!<LD>SsAuz_E?Ep25BFLP8
z4O5f_{ob5NX&+FK1(8#*aQ^?f)Z8sysqNgv^WE7G72`h}T*&)DT2Yjz_r_N9Byf?6
zSvftjJ$S&R&Uf7i*|Ivfk-W6>K{QCGI&Ot`S+>Z<$gZ7FMl&u1%yyPa_hxUVom)!U
zf@)a?MM7Zbq=&p%kIUn{>mPqo)LwM)T4dtm4!6AnqJxPWsB(1aV?X<ak>O?722r-!
zeCXC;n5Yom%BzdBj;voyt13*4D{^`tTnd}|?qQkd>m|W!P0R_}tgeO{jJ&kZv#3bY
z6!&YsM{G1WzE%(74KirY(q)=g)H!>RjArW*!+excbDHWx@AqQD9cEm2zH@h;hOt8Z
z86pm)+kaS1#}|(I5ij+h95uU7(ERI+nk!7^;r(nwnywIc<fEu(qKi=0bEudKh!mMB
zq-a5{tM#!4nihe3*En;liBE!XI3_7rZL|(Zmgy^`+`TqSxwe<(>FgJ`ms?eMxHkr$
zv3u))5~!WY4$_x=h@^%L8*s$WVpA)xe<OA`?dQA3>}H#BN|?|Y*B>DyL}yLe^2E%m
z;}tmc#k^Ns!+bgU796jK3i5{ZHcn{6Au4Ji=EnH6z0`{y%H;LMEncgAto?Kad&8Vw
zq({C#<>G;OzGg+zJa^gh`kKwmK_1>RyfSs!Rlvl@OxP3bI!80;tI5kPm_;u=vhg82
zYVtr07ogByI`-@jE6jRZQQXu^Oe-VZZJ!)IN1fojFFujiV>`*S((sc+I5N4>&35B)
zs5YYm@6_?r!-hkVQ)yLn<q|SmjCf=`d61lYxKp<3;&A-N9=4`EY#o}DGFcvBV9*2a
z*Wqz(eg9O`ue6#Ht{{t70wE+Unvj<-(!$pzJ900vaF^xkC=A43b^s#+FZBtba^S9G
z`_Wv^*35M1Tdq?rr2j4+f6L3Mh(D`Q+R|32j}Rif{8jxN8A11#XI3vfWr_%Iu{siF
zcE8#1Yx-r=!Dcr;ek0Fcy>e_~L*QajJ9O2!ZO$hof0n*Q8^YDhO551;HZ++tkgsbL
zQCmq<5mjzueb0C07)Os7po*S!R>~bp7tc-)tHf99?^1>lm!0C`f$02`BwN>*cILs{
z(V&=u$3U9|awU|ZZg}tHZts~#wBGOU5>oun_NKnIe51m~N-MPIqfH-i+%XPPoXTob
znmGR?Rc6r<I$B-QmXc`uXp*;5NNRNQAkA?q3$3~BQ>Y<%n-`jOI}Q6|cQWKcoLBzi
z#q9I?W|jIM9>DFv$pfW1&TbrBp8$>PtZ8NLCYlFd%#N{e{8A}#P8p<qF1B1;s(YA!
zs<WNu5-*tylM!8)HV{6QcF0-g3yQkF9Eu+fcK4(!mqun49M@;dcAo)<%xA?&iP|$5
z8ShzlG6OQ6;`QxkHF@uH1ifweXiOQTeg^ef9BxU5jBDIYgh*_=%yG)aof|Jn7fH_F
zf8N_8(Ku+xydACA^wT3>XS^2;KW#A`$j;8xH`&$hi}~zWbw(2u)E}gI)gaApEFf;{
zZ1TNUC&g%7)1Cz^I`HSCpogV9nywe<Z`Ig!`Zz#=X*sX6m2H4X4h6_R*pvKzdK^vU
zpcAO>_5wOmp|K~`t?y3hJtV?EBp3tw>ai7p#uphUee!y0j=+|2|B=`r>89$VV6B@N
z+oUtGvNY~hj#0I^O9zA*F^ZDM_+e+H{nB{^HJJ^GiatoOJ*N%BiQ9^cOWh7wB%ydR
zqr|_b``&z=6P}wWa6BLA{=`Y@u8o-~RJ+YX;!B*qdWcm;fXa&b$FQgE&@%DJ-70?5
zUh;GN$faGsn`1js(X`E1(an_7*-xY9-6kfUe^I{G|DnN<>v6`sYqWftI+{eu)y^FC
z2oPw*e41u=l^)eAEoW>+Sm*to3pQ`tUKgkY_7IQCii!?D6D-EJSL!n{oeR?chBAbw
zh7eiEw7jXQddEYou0R`CMQ_xf9QHKGLTnCs!E4+8H0n{G>-jVZBCyckL1Ynet?zzR
z%zVdplD6MWSs@oMV1?RW=hO|SpPVsW(TH`80?wu1%mk>+3EN4ZWzy$2+djIV^H>vD
zBfYPo5_)$Xuw+Ul$0B>Z@AIIiJM{`=5lW<8>yth2lA74Pk+1jZH?e{6z|jv-XoxZA
zQ7$!u0kiVsKuFTV?X-`gQB1RAz&>tHo8BD$0sikWk>TRT(c@kb5WV{B^ek6nnBvIE
z$B!4Z-Uk|ek}gv8JEM>}LocfjuUnhs1F&FNt>EC^86Zv13R&=rd$OJyaKO21V)OAK
zhkUKxvNkI+MxN!iiPIUxA<ywth-7fU+VrhX+kz-WK*Bfhl81Jfj$R;Ix+gij^5AZ8
zrc1$C6-=#qcQf4)w{^1f7VWlDVx)wBRs4MI=f_81qQ4aFgq_tL_42XiW69AKtK}g{
zZG0+D?AVxkv~X0{f-h$1h6h+~n>Dg9dw^f<N^DI=x9;?=SzhsQ*m8DMfjimLr1G4;
zC0_n%XBzFjN1@P~I&y!S^pr0+#I#tK?sHYHhYVHCXn}-(+&>HGWyjJJCW+Ng1{_*K
z##dirWksUY8M&7yZ1bTkbJ3mZg<LImYQ1{F`YQVUX5IPR*Sz27`79~)!uj5&T`&LY
z5l{;YO=s|_pyqC}E&0=!zL>!MXtKl7WwA?GFy!zD;hSd}ZvsE?i1E!B={(mca?UJz
zSU4jg-WBhBYf9r1)~g|G<)S6&3A)iPWb`v8k{50={4|ioJ!~-&Yh3zvUXtCbB>_^U
z6eVK5EfjFLt|*c=Ft5I`Hn#0=tkXI($7R}2adu(art-(1NN`#&!i&ysx80YJp*?WY
z*Yc~8IPF2XThhVTsV>(MeEgtjJfZRupCVOFJ#rvNHs-iRSUTS{;n9BdsHq{wDVY!B
z5J3(}*2FkGZXQ}1pzzr~fB2@dN5-I98CpiYtsw5VpLyg||Cy3Nhoi~kBe!0Yr+R-D
zcS9<_w(+}pZEG*vn46(f7VCQMGHTT#t7HLvinz6h!`k-%Y9hR=v*3us&{7tirPjeN
zK_A+0*aV^)D&L=f^$_9SE>D;_?Qf4m{4PWu5Si8HnsG^qY(MSC7adJhVRBVF$4MGU
zK(IJnAibXuhMkWk2EYCjK<oi*9o{MJA0=hmEQx|g*q9>*Tq*}dh2>{kH5wLT$FUDi
z*cLsp$?Rt0sfoLud-iuq#FT$1T5A4%vnAuxzCTRrY4+Oyo_qA(fa)%APtLNt?_?q>
zpqxD1ko&dBc#7k*{O4#qcRT2sc5EN41FcE+L%CPL)bO5t25+WcASYcWn<_5#PpX98
zZQ}f3IIMJ?LQkT~8-t6FmQorSp47_lv@FJM1Wm*aROnLU$(Lm1cnywPCaBrgsO7cp
zDIz4NZKQcuor@#1XIDS{8p%I_sKWh&L*+FtJdJIcT5tYwVbfXMQSlLvC6I)IYdfOk
zqq^Fsx<teA{q~9G;qC~@NN3-#DaLQ(d(-a>_SI_*U&qG7dSo57FR%x89_}RxZRQIV
z>dk&t<1H2sY5@gr7O984v-6|_n3GJs?W7p=c#=eJa(6^i3s&FE$HN9rZnY8Ty;B@T
z!~O{n4pEAL>M@gSB8{uPzGG;;_KIW6)PQfns&{tq?GBA4=NUtXSZlhZI@n`8^L(BV
zR}%QqFYZMow~(Z-wGW96L0BcmnZx@_?A)MlqbF;C<U9rEqSkC66#Nf$gFsfSGOm(C
zj$5i=lIE3yZ3e~U!J(}s_pQ{+201IkB*V3}G4;)67mx*<=+%H<*nyjHA+vY7Zmj|%
z7LSe!`sew8xH$VANzmxo0v9Wsx0MU|ZcU($|LFdl0jd_Ft<cvuO0mM>Tbl3B0(IT-
z6wm@cP{iuDr1O$ZsRw#2X$GD0Le+A0cwX@xX<D%_S{5e{=aF(@5*Ts07kG<5OCF1>
z-wNGr1;A5r!sFiS<IBx-ze7kaely!tebv2z1I*XJ73$mQ*(_?eb$1!L{E1KLt5~81
zB9Hh)mw$|j6Gc!DM@yQ-!y<|8HH$FS#wAfGtt#3)X-iw&74eQMc+1_Q;kc^D^!dX3
zZ4tRys8*-yq)Smh;TZ^Ok&9qSaBkJ~qqI^_B2Xvt6_PdtS$ITg^L)q^B>K5lOC{K=
z!+Vi@;zM>?$kvCcF39QfblEkTlk^(Q<FQ}d>zetY6hH}`kdg(1yS=&D)-87V>@UUp
zKE6Ix=-c+O{M9vTHV;0a3bqtwcQaf1)Q+ya-B2|Uiqt0LHGI*Fep<l+3J<LMM!lRD
zg4(uvC~!9jaKy(?{bzMo<@ujtIj$VL0NR4pMWUG$ZPkvo1TX2unx0=w9Tz7R4D{A5
z@8`A*;GIfSpQo}5R~V3u>8c3N$)%mH!0&QgO!q{kC!Smy-3SpL7IPY!zwy}SR3-~Y
z9r?pg(kK}<jD2{aFtNYP{<$bdReIFMLy+!8Nbmw)TUSlyCn8F&4c&dmudra-;)Z;K
zGe&8wjjBq)*1ndS9E;MrY_F-6xtnSoZ$(o~l$Fd2m+4T`Kh=}C_oNMQou{Zus*N&)
z8drn;&-09a!zdE#dUeNSuj}F?jqd-c8cyh14M%pW_ioS&s|EBAsl>JKI+K8*UQ66U
zIgJx-$t<83c+u4kwjX%kI9{Ra(zvatqhvEkPE0QuU<ogX@H}^xC!us5*^9RXrPW4t
z@1ECwV%sF+Q4dm4NCV?sze#+EMRhb_a##3lk2bs7x=f8rv6ap%$Q_^bAq{&;NrGDN
znxfaxmLL6%rL5dcC&@s}5a#)jQ2jb6BbiG#fFIq&a+6Lk-4o|rLeAk$7F^ZOog`ue
zu4Z9AE!50HMbWLi+4G%hbfD|!n)xAH+Rz)YoK&HNCF)&CfIR)&*zptX_P}%Q8ighe
zTrTmhow_x<4;`ur%__-ihlS>>rii1xK|h`Ei5Cw<uKt`??l}w3P&fhtEFWgVm9~m3
zsT$@v9i4N3G8w-Ac)wfA{!-OeS5OZY29R?+xrbfXzVmsrCr8}vB+-^(8Re+W=*iKl
z{w4nygG<andih)@gqj9EPPg;#Nv8*OSJA)y>jrSZp7br%C9hKY@WI>^+1~EF8R+kG
zbCr}Gz}G@;Mh2D0A-?XRE>nS9Jc+Zm5D^rUXw7tU$!n$lrwmC==@0-9neBLW$V+Tf
z#${+}th0KvwzTeI=4fOu-F@iV(>X*)zVC;?!3V2fwe!v;)^9cb{PD-+Z*y*VPRaEF
z;oA3>;TkqI#omlgjp`anLWi`^WAe@#l3-7-iBPx)e23hDpZ6Eq;w9z59s(#L+AwLE
zUYfeJlr6z53~((vdgT~zH_qIBsrVB^NP2pxkmDfLq`dEToW6;{uBn0{8ewhbnnWUi
z<*!F=EWVG`A~8TJ|NXx}8s^fVUN#&?j63tKaKBFJ70noVFR)barXu1sP@9$fOGfHh
zIO7y&5~)+<@@n+!j`E#>(S`G=fVrWbh_46N@9R}&yv8VcffX1UAmUT+SD58bRTZWm
z>2SM3O)jQ4c{)I{SH<?>qOuC6GHk2hUiuMc<7+xDilJT+;oawP2!b9*Y5rei3)t~6
ziTQzq&q|0(l=$m{4QLsxkY&{eC<tX(eEi+7DU3PYC!13+nPL0-fM8psTgprYtv!6&
zn6GtLS2EBD6vT29SEyx9vYom1nWsX_omrm<zK)AH&5)-Tz01N?a+mN^L2s@Hz|9T~
zy?t%i%YCdg3a`ziZW^r-f%8<>5|S9ioI`}|PL$hM<p@^)$j<|_SqW>uMl-vXmH71Q
zu6#Y?F@xqLPP)v+g-tuBz#@t4CuKfD$RNT6Bc#M>&NSb}x}Dzf(`a7R@Y|`AGiUwu
z7UR7$>07^>4qL!}hu>>c2xcRA`}$sM)=1=5yU&uFbo*itnn+~bUE!DYy>1Sc{LQ7`
z$`}pZZVY;Ck@6Vc+aCo<3jRk1E~t`~IIKszbN05ju_npo>Sc}XjZ+@?^s~GBeo(=N
z&UPaM{a!K|eD2k!ABgzjoL1N<xb@@WF!#K%YT{2-da$k0J7#5Ud2ECv&`sk9-KTj3
zFo5yJ4&z2{V86@c0Wf0vn2I@yUAS6ETe-|qW(M|XZaK`;RhyYp5JP`Nul?HLqZEHr
z&IsO&UM*O4>!z%40<&>R9$AauErVC5qI0cVGYeMrHC5d4u=J33ZiTy}vvAUVmoWy%
zWAUv_%x+L!b}S+<b=e+$0vDCUo~!wok-^}|zgD-$(u&a2FT~cN`T~n&{j=1}Q=QrK
z+(Nx1f7PTuDGp>o%TEB+1h!LX`b{l<O7u78+-d*7#EM~v#_R1+3n|0$LewRkpaPD`
zgK3gfFk8K^h|JGeVx`Yck0hm$Q$pq*k;d2ZpoERk+8XS~+dk>|h1*AR@gvmutYv^{
zy?F3|LjG!+pum5o>|aH&fP+I~i1wp|Rl#pVL%<5SC7MOHU@+X*=2-zN7e*<T)!8{E
z!j=P%5fykU;9?ZY;@4T(Pz=A8_U&tIv8*iUJGKsDN(cmkN(z0QB%=fgK<f-BDOI!J
zAva{>4mjzGqoV(K$<R*XKyxXvQHmj+ZO9oNF)|=9R1ug;hczke7d99U2C^`BE}=v~
zI*P-IAK)Pe7@qKuE}ScnG#mi=mnUovby}JFa=f07p&rNWVPRXxcwf@~Yw2={FYEb_
z3FQM6l~%P6$$N5#@`2<(z-8Hh*aoA2J9`NG=_jp9MaZSye-3~`C{T)K)eTM1*|Rq3
zemNu`s16Fq1c(q>zfvc3bkLIH17S-mcCLp*;{mw8uBZvOk&tmbtV9YtsN!S1hFaZ&
zn3o0Xa0p5jSVtF=33(3E6mBR^Ml+WNMSt`(0E3i5n$29{m2^O8dvem9zpt3s6X0!>
z?6W6euQ}!0nF^_T|7|jsw((XDC1__b$PWF3s!j51qo3Dl8=AQL$(;Yr*gcMdKM$x5
z0w76U@0_uLqw-xY{#G7yzw)dFM6j(g|A#>KZl#2pV95OX3S1KsUPuQnR>yyt<?}{L
zX#B*#{Qdl}tB)P?6)(t_5i9$oe~EP0jt<`Xa(mV*v@A0xx-n58e|@?KRCPg~eUf^!
zmgOi9e*DbjZCzxCh6xcr&n7(NDH*ESdE^R|^<ia$c&w-4AmL4Nd(Qy-nx8u#$QKuD
zrJ9Qmc8KmEUT!AXH^fxA1gMC2AH_OQf0D=P)*B%xN}xbv#zqtKNz^pIDm+)9cmH21
zUqPAtk$Cfl4N#y+uu(mUytG|`9pvoq^p{XC&HALN+oJUKIue5701BiCVmvJC7mw-K
zZWZMz(NhH-1(3GhooCH!SD06@lE&VPOqUr<;SIcsQzQRjtz#$SNYUGBKa~FcQC9@A
zao&1+f8&K10X9t>;D=aM(uaCO>zVteNAOSC^JgiUrM7RR%eT7<)OrF-htWt#yfe@j
zt|u!;!feJSrc`#$t^lr`{C}D%6WA}`eX+EG<R-}<fss0EJFG`_{G9Mq(&ttjA51d~
zM5blbkquEplM^F}d60N<;2c+SOqSW$JIRLvb?*+L@AYG3@Nnte;{0cgb&|d=VZQ`&
z;MZ!->%JUsP3&keKT9<9e|kckxlW^#wZFR6UjAxuY8~^+gsc(k|L+bJv44-k_lULI
zi0v`!<N4A+X^GLlqXXxGBU4@$<U@b;MPc`nvkozx8shjqlf?^Bvg2D;ZSYm_o~rn+
l06k;33#HLXaqrdx*5Bw&WMs;;|GzCbl~)=H6>?_q{{=rPs%roM

literal 0
HcmV?d00001

diff --git a/src/static/images/ticketSum.png b/src/static/images/ticketSum.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc1246c192036cacc98c8d8f0cdf3d2a94c69589
GIT binary patch
literal 4051
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

literal 0
HcmV?d00001

diff --git a/src/static/images/two.png b/src/static/images/two.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f474ce41e0a2c496d0e123c441f80965fd46d4d
GIT binary patch
literal 6454
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
X{_Z^qhwJsfHw$%TZKX=&GwlBW(N)k0

literal 0
HcmV?d00001