新增币种充提统计页

src/components/navLeft.vue

@@ -17,9 +17,12 @@
         <el-menu-item index="BTY">BTY</el-menu-item>
         <el-menu-item index="YCC">YCC</el-menu-item>
       </el-submenu>
-      <el-menu-item index="account">
+      <el-menu-item index="/monitor/account">
         <span slot="title">银行账户</span>
       </el-menu-item>
+      <el-menu-item index="/monitor/coinRecharge">
+        <span slot="title">币种充提统计</span>
+      </el-menu-item>
     </el-menu>
   </div>
 </template>
@@ -34,22 +37,22 @@
       }
     },
     created() {
-      this.active = this.$route.params.name || 'account';
+      this.active = this.$route.params.name || this.$route.path;
     },
     methods: {
       navClick(index) {
         this.active = index;
-        if(index != 'account'){
+        if(index != '/monitor/account' && index != '/monitor/coinRecharge'){
           this.$router.push(`/monitor/${index}`);
           Bus.$emit('refresh');
-        }else{
-          this.$router.push('/monitor/account');
+        }else {
+          this.$router.push(index);
         }
       }
     },
     watch: {
       $route() {
-        this.active = this.$route.params.name || 'account';
+        this.active = this.$route.params.name || this.$route.path;
       },
     },
   }

src/config/api-config.js

@@ -15,6 +15,8 @@ const Api = {
   Records: originUrl + "/records", //充提记录
   Ticket: originUrl + '/ticket', //查询交易对行情
   Excle: originUrl + '/recordsExcle',//导出充提记录
+  GetCountCoin: originUrl + '/countCoin',//币种充提统计查询
+  countCoinExcle: originUrl + '/countCoinExcle',//币种充提统计导出
 }
 
 export default Api;

src/router/index.js

@@ -28,8 +28,12 @@ export default new Router({
           component: function(resolve){
             require(['../views/account.vue'],resolve);
           },
+        },{
+          path: '/monitor/coinRecharge',
+          component: function(resolve){
+            require(['../views/coinRecharge.vue'],resolve);
           },
-          {
+        },{
           path:"/monitor/:name",
           component: function(resolve){
             require(['../views/RobotContainer.vue'],resolve);
@@ -47,14 +51,13 @@ export default new Router({
                 require(['../views/RobotDetails.vue'],resolve);
               },
             },
-
+            {
+                path: 'account',
+                redirect:'/monitor/account',
+              }
           ]
           }
         ]
     },
-    {
-      path: '*',
-      redirect:'/monitor/account',
-    }
   ]
 })

src/views/RobotDetails.vue

@@ -793,9 +793,11 @@
       //交易记录分页
       handleSizeChange(val) {
         this.pageSize = val;
+        this.currentPage = 1;
         this.getTransaction();
       },
       handleCurrentChange(val) {
+        this.currentPage = val;
         this.getTransaction({page: val + ''});
       },
       /*充提记录筛选*/
@@ -839,6 +841,7 @@
       //分页
       handleSizeChange1(val) {
         this.pageSize1 = val;
+        this.currentPage1 = 1;
         this.getRecords();
       },
       handleCurrentChange1(val) {

src/views/account.vue

@@ -431,9 +431,11 @@
       //分页
       handleSizeChange(val) {
         this.pageSize = val;
+        this.currentPage = 1;
         this.getRecords();
       },
       handleCurrentChange(val) {
+        this.currentPage = val;
         this.getRecords(val+'');
       },
     },

src/views/overview.vue

@@ -742,7 +742,7 @@
   /*select组件样式覆盖*/
   .overview {
     .select-bar-content {
-      padding: 2px 0 0 65px;
+      /*padding: 2px 0 0 65px;*/
       .el-checkbox-button:last-child .el-checkbox-button__inner, .el-checkbox-button:first-child .el-checkbox-button__inner {
         border-radius: 3px;
       }