Merge branch 'dev'

src/views/user/rechargeRecord.vue

@@ -184,7 +184,7 @@
         <el-table-column
         <el-table-column
           label="付款时间"
           label="付款时间"
           sortable="custom"
           sortable="custom"
-          prop="clientTime"
+          prop="serverTime"
           header-align="center"
           header-align="center"
           align="center"
           align="center"
           width="160"
           width="160"
@@ -230,7 +230,9 @@ export default {
       period: [],
       period: [],
       subjectList: [],
       subjectList: [],
       sortParmas: {},
       sortParmas: {},
-      searchForm: {},
+      searchForm: {
+        payStatus: '已支付'
+      },
       total: 0,
       total: 0,
       pageSize: 50,
       pageSize: 50,
       currentPage: 1,
       currentPage: 1,