From b174c9818ebff392270849c8ba0ae51e1ffa9826 Mon Sep 17 00:00:00 2001
From: khalil <khalil@chuhaiwl2023.com>
Date: Mon, 23 Sep 2024 21:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1-=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0startPay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChargeRecordArPartitionStatisticsView.vue |   1 +
 .../users/ChargeRecordDailyStatisticsView.vue | 364 +++++++--------
 .../ChargeRecordEnPartitionStatisticsView.vue |   1 +
 .../users/ChargeRecordTotalStatisticsView.vue | 424 +++++++++---------
 .../ChargeRecordZhPartitionStatisticsView.vue |   1 +
 5 files changed, 415 insertions(+), 376 deletions(-)

diff --git a/src/views/users/ChargeRecordArPartitionStatisticsView.vue b/src/views/users/ChargeRecordArPartitionStatisticsView.vue
index cb9b59b..09229d8 100644
--- a/src/views/users/ChargeRecordArPartitionStatisticsView.vue
+++ b/src/views/users/ChargeRecordArPartitionStatisticsView.vue
@@ -103,6 +103,7 @@ export default {
             { field: 'googleUsd', title: 'google充值美元', align: 'center', width: '14%' },
             { field: 'payermaxUsd', title: 'payermax充值美元', align: 'center', width: '14%' },
             { field: 'myCardUsd', title: 'myCard充值美元', align: 'center', width: '14%' },
+            { field: 'startPayUsd', title: 'startPay充值美元', align: 'center', width: '14%' },
             { field: 'iosUsd', title: 'ios充值美元', align: 'center', width: '14%' },
             { field: 'companyUsd', title: '对公打款美元', align: 'center', width: '14%' },
             { field: 'totalUsd', title: '总充值美元', align: 'center', width: '14%' },
diff --git a/src/views/users/ChargeRecordDailyStatisticsView.vue b/src/views/users/ChargeRecordDailyStatisticsView.vue
index 2c21c80..d0b219f 100644
--- a/src/views/users/ChargeRecordDailyStatisticsView.vue
+++ b/src/views/users/ChargeRecordDailyStatisticsView.vue
@@ -1,24 +1,29 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1 id="itemTitle"></h1>
-                </section>
-                <div id="toolbar">
-                    <form class="col-sm-12" id="searchForm" action="/admin/chargeRecord/dailyexport" method="get"
-                        target="_blank">
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <!-- Content Header (Page header) -->
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <div id="toolbar">
+          <form class="col-sm-12"
+                id="searchForm"
+                action="/admin/chargeRecord/dailyexport"
+                method="get"
+                target="_blank">
 
-                    </form>
-                    <div class="col-sm-12 pull-left">
-                        <h4>
-                            今日充值数据：<span class="totalAmount" style="color: red">0</span>（总金额）/
-                            <span class="totalCount" style="color: red">0</span>（总笔数）
-                            <span style="color: red">(单位：美元)</span>
-                        </h4>
-                    </div>
-                    <!-- <div class="col-sm-3 pull-right">
+          </form>
+          <div class="col-sm-12 pull-left">
+            <h4>
+              今日充值数据：<span class="totalAmount"
+                    style="color: red">0</span>（总金额）/
+              <span class="totalCount"
+                    style="color: red">0</span>（总笔数）
+              <span style="color: red">(单位：美元)</span>
+            </h4>
+          </div>
+          <!-- <div class="col-sm-3 pull-right">
                      <button id="btnSearch" class="btn btn-default">
                          <i class="glyphicon glyphicon-search"></i>查询
                      </button>
@@ -26,185 +31,194 @@
                          <i class="glyphicon glyphicon-export"></i>导出
                      </button>
                  </div>-->
-                </div>
-                <!-- .content -->
-                <div id="table"></div>
-
-            </div>
         </div>
-    </section>
+        <!-- .content -->
+        <div id="table"></div>
 
-    <div class="modal fade" id="recordDetail" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title" id="modalLabel"></h4>
-                </div>
-                <div class="modal-body">
-                    <div id="detailtable"></div>
-                </div>
-
-            </div>
-        </div>
+      </div>
     </div>
+  </section>
+
+  <div class="modal fade"
+       id="recordDetail"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span>
+          </button>
+          <h4 class="modal-title"
+              id="modalLabel"></h4>
+        </div>
+        <div class="modal-body">
+          <div id="detailtable"></div>
+        </div>
+
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 export default {
-    name: "ChargeRecordDailyStatisticsView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
+  name: "ChargeRecordDailyStatisticsView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
+            /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
+            {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
+            {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
+            {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
+            {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
+            {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
+            {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
+            {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
+            { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
+            { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
+            { field: 'myCardAmount', title: 'MyCard支付', align: 'center', width: '5%' },
+            { field: 'startPayAmount', title: 'startPay支付', align: 'center', width: '5%' },
+            { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
+            { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
+            {
+              field: 'time',
+              title: '操作',
+              align: 'center',
+              width: '5%',
+              formatter: function (val, row, index) {
+                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
+                  '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
+              }
+            }
+          ],
+          undefinedText: 0,
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 20,
+          pagination: true,
+          pageList: [20, 50, 100, 200, 300, 500],
+          search: false,
+          sidePagination: "client", //表示服务端请求
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              pageNum: params.pageNumber,
+              pageSize: params.pageSize
+            };
+            return param;
+          },
+          toolbar: '#toolbar',
+          url: '/admin/chargeRecord/dailylist',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+            getTotalStatis();
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
         });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
-                        /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
-                        {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
-                        {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
-                        {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
-                        {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
-                        {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
-                        {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
-                        {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
-                        { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
-                        { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
-                        { field: 'myCardAmount', title: 'MyCard支付', align: 'center', width: '5%' },
-                        { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
-                        { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
-                        {
-                            field: 'time',
-                            title: '操作',
-                            align: 'center',
-                            width: '5%',
-                            formatter: function (val, row, index) {
-                                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
-                                    '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
-                            }
-                        }
-                    ],
-                    undefinedText: 0,
-                    cache: false,
-                    striped: true,
-                    showRefresh: false,
-                    pageSize: 20,
-                    pagination: true,
-                    pageList: [20, 50, 100, 200, 300, 500],
-                    search: false,
-                    sidePagination: "client", //表示服务端请求
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            pageNum: params.pageNumber,
-                            pageSize: params.pageSize
-                        };
-                        return param;
-                    },
-                    toolbar: '#toolbar',
-                    url: '/admin/chargeRecord/dailylist',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                        getTotalStatis();
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                });
 
-                // 导出EXCEL
-                $('#btnExport').on('click', function () {
-                    $("#searchForm").submit();
-                });
+        // 导出EXCEL
+        $('#btnExport').on('click', function () {
+          $("#searchForm").submit();
+        });
 
-                // 查询刷新
-                $('#btnSearch').on('click', function () {
-                    TableHelper.doRefresh('#table');
-                });
+        // 查询刷新
+        $('#btnSearch').on('click', function () {
+          TableHelper.doRefresh('#table');
+        });
 
-                $("#table").on("click", '.opt-detail', function () {
+        $("#table").on("click", '.opt-detail', function () {
 
-                    $("#recordDetail").modal('show');
-                    var time = $(this).attr("data-id");
+          $("#recordDetail").modal('show');
+          var time = $(this).attr("data-id");
 
-                    var date = new Date().format("yyyy-MM-dd ");
-                    $("#modalLabel").html(date + parseTime(time));
+          var date = new Date().format("yyyy-MM-dd ");
+          $("#modalLabel").html(date + parseTime(time));
 
-                    $('#detailtable').bootstrapTable('destroy');
-                    $('#detailtable').bootstrapTable({
-                        columns: [
-                            { field: 'channel', title: '渠道', align: 'center', width: '5%' },
-                            { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
-                            { field: 'count', title: '充值笔数', align: 'center', width: '5%' }
+          $('#detailtable').bootstrapTable('destroy');
+          $('#detailtable').bootstrapTable({
+            columns: [
+              { field: 'channel', title: '渠道', align: 'center', width: '5%' },
+              { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
+              { field: 'count', title: '充值笔数', align: 'center', width: '5%' }
 
-                        ],
-                        undefinedText: 0,
-                        height: 600,
-                        cache: false,
-                        striped: true,
-                        showRefresh: false,
-                        pageSize: 20,
-                        pagination: false,
-                        pageList: [20, 50, 100, 200, 300, 500],
-                        search: false,
-                        sidePagination: "client", //表示服务端请求
-                        queryParamsType: "undefined",
-                        queryParams: function queryParams(params) {   //设置查询参数
-                            var param = {
-                                pageNum: params.pageNumber,
-                                pageSize: params.pageSize,
-                                time: time
-                            };
-                            return param;
-                        },
-                        url: '/admin/chargeRecord/dailydetail',
-                        onLoadSuccess: function () {  //加载成功时执行
-                            console.log("load success");
-                        },
-                        onLoadError: function () {  //加载失败时执行
-                            console.log("load fail");
-                        }
-                    });
-                });
+            ],
+            undefinedText: 0,
+            height: 600,
+            cache: false,
+            striped: true,
+            showRefresh: false,
+            pageSize: 20,
+            pagination: false,
+            pageList: [20, 50, 100, 200, 300, 500],
+            search: false,
+            sidePagination: "client", //表示服务端请求
+            queryParamsType: "undefined",
+            queryParams: function queryParams (params) {   //设置查询参数
+              var param = {
+                pageNum: params.pageNumber,
+                pageSize: params.pageSize,
+                time: time
+              };
+              return param;
+            },
+            url: '/admin/chargeRecord/dailydetail',
+            onLoadSuccess: function () {  //加载成功时执行
+              console.log("load success");
+            },
+            onLoadError: function () {  //加载失败时执行
+              console.log("load fail");
+            }
+          });
+        });
 
 
-            });
-        }
-    },
+      });
+    }
+  },
 
 };
 
-function parseTime(val) {
-    if (val < 10) {
-        return '0' + val + ':00-0' + val + ':59';
-    } else {
-        return val + ':00-' + val + ':59';
-    }
+function parseTime (val) {
+  if (val < 10) {
+    return '0' + val + ':00-0' + val + ':59';
+  } else {
+    return val + ':00-' + val + ':59';
+  }
 }
-function getTotalStatis() {
-    $.get('/admin/chargeRecord/dailytotal', function (res) {
-        if (res.code == 200) {
-            console.log(res.data);
-            if (res.data) {
-                $('.totalAmount').html(res.data.amount);
-                $('.totalCount').html(res.data.count);
-            }
-        }
-    })
+function getTotalStatis () {
+  $.get('/admin/chargeRecord/dailytotal', function (res) {
+    if (res.code == 200) {
+      console.log(res.data);
+      if (res.data) {
+        $('.totalAmount').html(res.data.amount);
+        $('.totalCount').html(res.data.count);
+      }
+    }
+  })
 }
 </script>
 
diff --git a/src/views/users/ChargeRecordEnPartitionStatisticsView.vue b/src/views/users/ChargeRecordEnPartitionStatisticsView.vue
index c5647a8..f8a1bfc 100644
--- a/src/views/users/ChargeRecordEnPartitionStatisticsView.vue
+++ b/src/views/users/ChargeRecordEnPartitionStatisticsView.vue
@@ -103,6 +103,7 @@ export default {
             { field: 'googleUsd', title: 'google充值美元', align: 'center', width: '14%' },
             { field: 'payermaxUsd', title: 'payermax充值美元', align: 'center', width: '14%' },
             { field: 'myCardUsd', title: 'myCard充值美元', align: 'center', width: '14%' },
+            { field: 'startPayUsd', title: 'startPay充值美元', align: 'center', width: '14%' },
             { field: 'iosUsd', title: 'ios充值美元', align: 'center', width: '14%' },
             { field: 'companyUsd', title: '对公打款美元', align: 'center', width: '14%' },
             { field: 'totalUsd', title: '总充值美元', align: 'center', width: '14%' },
diff --git a/src/views/users/ChargeRecordTotalStatisticsView.vue b/src/views/users/ChargeRecordTotalStatisticsView.vue
index ea06963..6d9e612 100644
--- a/src/views/users/ChargeRecordTotalStatisticsView.vue
+++ b/src/views/users/ChargeRecordTotalStatisticsView.vue
@@ -1,228 +1,250 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1 id="itemTitle"></h1>
-                </section>
-                <div id="toolbar">
-                    <div class="col-sm-12">
-                        <div class="pull-left">
-                            <form id="searchForm" class="col-sm-pull-12" action="/admin/chargeRecord/totalexport"
-                                method="get" target="_blank">
-                                <div class="col-sm-11">
-                                    <label for="beginDate" class="col-sm-2 control-label">开始日期:</label>
-                                    <div class="col-sm-4"><input type="text" class="form-control" name="beginDate"
-                                            id="beginDate" placeholder="必填">
-                                    </div>
-                                    <label for="endDate" class="col-sm-2 control-label">结束日期:</label>
-                                    <div class="col-sm-4"><input type="text" class="form-control" name="endDate"
-                                            id="endDate" placeholder="必填"></div>
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <!-- Content Header (Page header) -->
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <div id="toolbar">
+          <div class="col-sm-12">
+            <div class="pull-left">
+              <form id="searchForm"
+                    class="col-sm-pull-12"
+                    action="/admin/chargeRecord/totalexport"
+                    method="get"
+                    target="_blank">
+                <div class="col-sm-11">
+                  <label for="beginDate"
+                         class="col-sm-2 control-label">开始日期:</label>
+                  <div class="col-sm-4"><input type="text"
+                           class="form-control"
+                           name="beginDate"
+                           id="beginDate"
+                           placeholder="必填">
+                  </div>
+                  <label for="endDate"
+                         class="col-sm-2 control-label">结束日期:</label>
+                  <div class="col-sm-4"><input type="text"
+                           class="form-control"
+                           name="endDate"
+                           id="endDate"
+                           placeholder="必填"></div>
 
-                                </div>
-                            </form>
-                        </div>
-                        <div class="pull-right">
-
-                            <button id="btnSearch" class="btn btn-default">
-                                <i class="glyphicon glyphicon-search"></i>查询
-                            </button>
-                            <button id="btnExport" class="btn btn-default">
-                                <i class="glyphicon glyphicon-export"></i>导出
-                            </button>
-                            <span style="color: red">(单位：美元)</span>
-                        </div>
-
-                    </div>
                 </div>
-
-                <!-- .content -->
-                <div id="table"></div>
-
+              </form>
             </div>
-        </div>
-    </section>
-
-    <div class="modal fade" id="recordDetail" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title" id="modalLabel"></h4>
-                </div>
-                <div class="modal-body">
-                    <div id="detailtable"></div>
-                </div>
+            <div class="pull-right">
 
+              <button id="btnSearch"
+                      class="btn btn-default">
+                <i class="glyphicon glyphicon-search"></i>查询
+              </button>
+              <button id="btnExport"
+                      class="btn btn-default">
+                <i class="glyphicon glyphicon-export"></i>导出
+              </button>
+              <span style="color: red">(单位：美元)</span>
             </div>
+
+          </div>
         </div>
+
+        <!-- .content -->
+        <div id="table"></div>
+
+      </div>
     </div>
+  </section>
+
+  <div class="modal fade"
+       id="recordDetail"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span>
+          </button>
+          <h4 class="modal-title"
+              id="modalLabel"></h4>
+        </div>
+        <div class="modal-body">
+          <div id="detailtable"></div>
+        </div>
+
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 export default {
-    name: "ChargeRecordTotalStatisticsView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
+  name: "ChargeRecordTotalStatisticsView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
+            /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
+            {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
+            {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
+            {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
+            {field: 'alipayV2Amount', title: '支付宝V2', align: 'center', width: '5%'},
+            {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
+            {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
+            {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
+            {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
+            { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
+            { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
+            { field: 'myCardAmount', title: 'myCard支付', align: 'center', width: '5%' },
+            { field: 'startPayAmount', title: 'startPay支付', align: 'center', width: '5%' },
+            { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
+            { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
+            { field: 'totalAmount', title: '总计充值金额数', align: 'center', width: '5%' },
+            {
+              field: 'timeStr',
+              title: '操作',
+              align: 'center',
+              width: '5%',
+              formatter: function (val, row, index) {
+                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
+                  '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
+              }
+            }
+          ],
+          undefinedText: 0,
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 20,
+          pagination: true,
+          pageList: [20, 50, 100, 200, 300, 500],
+          search: false,
+          sidePagination: "server", //表示服务端请求
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              pageNum: params.pageNumber,
+              pageSize: params.pageSize,
+              beginDate: $('#beginDate').val(),
+              endDate: $('#endDate').val()
+            };
+            return param;
+          },
+          toolbar: '#toolbar',
+          url: '/admin/chargeRecord/totallist',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
         });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
-                        /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
-                        {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
-                        {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
-                        {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
-                        {field: 'alipayV2Amount', title: '支付宝V2', align: 'center', width: '5%'},
-                        {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
-                        {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
-                        {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
-                        {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
-                        { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
-                        { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
-                        { field: 'myCardAmount', title: 'myCard支付', align: 'center', width: '5%' },
-                        { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
-                        { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
-                        { field: 'totalAmount', title: '总计充值金额数', align: 'center', width: '5%' },
-                        {
-                            field: 'timeStr',
-                            title: '操作',
-                            align: 'center',
-                            width: '5%',
-                            formatter: function (val, row, index) {
-                                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
-                                    '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
-                            }
-                        }
-                    ],
-                    undefinedText: 0,
-                    cache: false,
-                    striped: true,
-                    showRefresh: false,
-                    pageSize: 20,
-                    pagination: true,
-                    pageList: [20, 50, 100, 200, 300, 500],
-                    search: false,
-                    sidePagination: "server", //表示服务端请求
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            pageNum: params.pageNumber,
-                            pageSize: params.pageSize,
-                            beginDate: $('#beginDate').val(),
-                            endDate: $('#endDate').val()
-                        };
-                        return param;
-                    },
-                    toolbar: '#toolbar',
-                    url: '/admin/chargeRecord/totallist',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                });
 
-                // 导出EXCEL
-                $('#btnExport').on('click', function () {
-                    if (!$('#beginDate').val() || !$('#endDate').val()) {
-                        $("#tipMsg").text("请输入必填的信息");
-                        $("#tipModal").modal('show');
-                        return;
-                    }
-                    $("#searchForm").submit();
-                });
+        // 导出EXCEL
+        $('#btnExport').on('click', function () {
+          if (!$('#beginDate').val() || !$('#endDate').val()) {
+            $("#tipMsg").text("请输入必填的信息");
+            $("#tipModal").modal('show');
+            return;
+          }
+          $("#searchForm").submit();
+        });
 
-                // 查询刷新
-                $('#btnSearch').on('click', function () {
-                    if (!$('#beginDate').val() || !$('#endDate').val()) {
-                        $("#tipMsg").text("请输入必填的信息");
-                        $("#tipModal").modal('show');
-                        return;
-                    }
-                    TableHelper.doRefresh('#table');
-                });
-                var chargeStart = $('#beginDate').datepicker({
-                    format: 'yyyy-mm-dd',
-                    autoclose: true
-                });
+        // 查询刷新
+        $('#btnSearch').on('click', function () {
+          if (!$('#beginDate').val() || !$('#endDate').val()) {
+            $("#tipMsg").text("请输入必填的信息");
+            $("#tipModal").modal('show');
+            return;
+          }
+          TableHelper.doRefresh('#table');
+        });
+        var chargeStart = $('#beginDate').datepicker({
+          format: 'yyyy-mm-dd',
+          autoclose: true
+        });
 
-                var chargeEnd = $('#endDate').datepicker({
-                    format: 'yyyy-mm-dd',
-                    autoclose: true
-                });
-                chargeStart.on('changeDate', function () {
-                    var date = $('#beginDate').datepicker('getDate');
-                    chargeEnd.datepicker('setStartDate', date);
-                });
-                chargeEnd.on('changeDate', function () {
-                    var date = $('#endDate').datepicker('getDate');
-                    chargeStart.datepicker('setEndDate', date);
-                });
+        var chargeEnd = $('#endDate').datepicker({
+          format: 'yyyy-mm-dd',
+          autoclose: true
+        });
+        chargeStart.on('changeDate', function () {
+          var date = $('#beginDate').datepicker('getDate');
+          chargeEnd.datepicker('setStartDate', date);
+        });
+        chargeEnd.on('changeDate', function () {
+          var date = $('#endDate').datepicker('getDate');
+          chargeStart.datepicker('setEndDate', date);
+        });
 
-                $("#table").on("click", '.opt-detail', function () {
+        $("#table").on("click", '.opt-detail', function () {
 
-                    $("#recordDetail").modal('show');
-                    var time = $(this).attr("data-id");
+          $("#recordDetail").modal('show');
+          var time = $(this).attr("data-id");
 
-                    $("#modalLabel").html(time);
+          $("#modalLabel").html(time);
 
-                    $('#detailtable').bootstrapTable('destroy');
-                    $('#detailtable').bootstrapTable({
-                        columns: [
-                            { field: 'channel', title: '渠道', align: 'center', width: '5%' },
-                            { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
-                            { field: 'count', title: '充值笔数', align: 'center', width: '5%' }
+          $('#detailtable').bootstrapTable('destroy');
+          $('#detailtable').bootstrapTable({
+            columns: [
+              { field: 'channel', title: '渠道', align: 'center', width: '5%' },
+              { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
+              { field: 'count', title: '充值笔数', align: 'center', width: '5%' }
 
-                        ],
-                        undefinedText: 0,
-                        height: 600,
-                        cache: false,
-                        striped: true,
-                        showRefresh: false,
-                        pageSize: 20,
-                        pagination: false,
-                        pageList: [20, 50, 100, 200, 300, 500],
-                        search: false,
-                        sidePagination: "client", //表示服务端请求
-                        queryParamsType: "undefined",
-                        queryParams: function queryParams(params) {   //设置查询参数
-                            var param = {
-                                pageNum: params.pageNumber,
-                                pageSize: params.pageSize,
-                                time: time
-                            };
-                            return param;
-                        },
-                        url: '/admin/chargeRecord/totaldetail',
-                        onLoadSuccess: function () {  //加载成功时执行
-                            console.log("load success");
-                        },
-                        onLoadError: function () {  //加载失败时执行
-                            console.log("load fail");
-                        }
-                    });
-                });
-            });
+            ],
+            undefinedText: 0,
+            height: 600,
+            cache: false,
+            striped: true,
+            showRefresh: false,
+            pageSize: 20,
+            pagination: false,
+            pageList: [20, 50, 100, 200, 300, 500],
+            search: false,
+            sidePagination: "client", //表示服务端请求
+            queryParamsType: "undefined",
+            queryParams: function queryParams (params) {   //设置查询参数
+              var param = {
+                pageNum: params.pageNumber,
+                pageSize: params.pageSize,
+                time: time
+              };
+              return param;
+            },
+            url: '/admin/chargeRecord/totaldetail',
+            onLoadSuccess: function () {  //加载成功时执行
+              console.log("load success");
+            },
+            onLoadError: function () {  //加载失败时执行
+              console.log("load fail");
+            }
+          });
+        });
+      });
 
-        }
-    },
+    }
+  },
 
 };
 </script>
diff --git a/src/views/users/ChargeRecordZhPartitionStatisticsView.vue b/src/views/users/ChargeRecordZhPartitionStatisticsView.vue
index 43bcf43..810af4b 100644
--- a/src/views/users/ChargeRecordZhPartitionStatisticsView.vue
+++ b/src/views/users/ChargeRecordZhPartitionStatisticsView.vue
@@ -103,6 +103,7 @@ export default {
             { field: 'googleUsd', title: 'google充值美元', align: 'center', width: '14%' },
             { field: 'payermaxUsd', title: 'payermax充值美元', align: 'center', width: '14%' },
             { field: 'myCardUsd', title: 'myCard充值美元', align: 'center', width: '14%' },
+            { field: 'startPayUsd', title: 'startPay充值美元', align: 'center', width: '14%' },
             { field: 'iosUsd', title: 'ios充值美元', align: 'center', width: '14%' },
             { field: 'companyUsd', title: '对公打款美元', align: 'center', width: '14%' },
             { field: 'totalUsd', title: '总充值美元', align: 'center', width: '14%' },