Merge branch 'dev'

src/views/user/Wallet.vue

@@ -275,6 +275,9 @@ export default {
                 .catch(e => {
                     this.$toast(e.error || '申请提现失败');
                 });
+        },
+        all() {
+            console.log('111');
         }
     }
 };
@@ -693,6 +696,7 @@ export default {
             bottom: 0;
             margin: auto;
             right: 16px;
+            z-index: 1;
             &:active {
                 background: fade(@prim, 20%);
             }