Merge branch 'lin_fix' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into develop

src/views/valueAddedService/orderSettleManag/index.vue

@@ -90,17 +90,26 @@ export default {
         {
           name: '支付状态',
           key: 'payStatus',
-          value: 'PAID',
+          value: '',
           conditions: [
             {
+              label: "全部",
+              value: ""
+            }, {
               label: "已支付",
               value: "PAID"
             }, {
               label: "待支付",
               value: "WAIT"
             }, {
-              label: "全部",
-              value: ""
+              label: "已退款",
+              value: "REFUND"
+            }, {
+              label: "过期",
+              value: "EXPIRE"
+            }, {
+              label: "取消",
+              value: "CANCEL"
             }]
         },
       ]