Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/views/pile/merchant/components/walletSummary.vue

@@ -33,7 +33,7 @@
                 </p>
             </div>
         </div>
-        <el-tabs
+        <!-- <el-tabs
             v-model="activeName"
             type="card"
             @tab-click="handleClick"
@@ -111,7 +111,7 @@
                 </el-form>
             </el-tab-pane>
             <el-tab-pane label="订单流水" name="second">订单流水</el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
         <el-dialog title="提现申请" :visible.sync="dialogVisible" width="33%" :before-close="handleClose">
             温馨提示
             <div style="font-size:12px;color:gray">