Merge branch 'master' of http://gitlab.roboming.com/Simon/mingPay-Mobile

.gitignore

 node_modules
 .tea
-.DS_Store
\ No newline at end of file
+.DS_Store

pages/recordList/recordList.js

@@ -8,7 +8,7 @@ Page({
     orderType: '',
     orderStatus: '',
     sceneType: '',
-    statusList: ['SUCCESS', 'WAITING_PERMIT', 'REFUND_SUCCESS'],
+    statusList: ['SUCCESS', 'REFUND_SUCCESS'],
     recordListData: [],
     currentPage: 1,
     totalCount: '',
@@ -36,7 +36,7 @@ Page({
       orderType: '',
       orderStatus: '',
       sceneType: '',
-      statusList: ['SUCCESS', 'WAITING_PERMIT', 'REFUND_SUCCESS'],
+      statusList: ['SUCCESS', 'REFUND_SUCCESS'],
       recordListData: [],
       currentPage: 1,
       totalCount: '',
@@ -60,7 +60,7 @@ Page({
             _that.setData({
               orderType: '',
               sceneType: '',
-              statusList: ['SUCCESS', 'WAITING_PERMIT', 'REFUND_SUCCESS'],
+              statusList: ['SUCCESS', 'REFUND_SUCCESS'],
               currentPage: 1,
               recordListData: []
             })
@@ -78,7 +78,7 @@ Page({
             _that.setData({
               orderType: 'RECHARGE',
               sceneType: '',
-              statusList: ['SUCCESS', 'WAITING_PERMIT'],
+              statusList: ['SUCCESS'],
               currentPage: 1,
               recordListData: []
             })