梁展鹏 3 years ago
parent
commit
82dd8bc386

+ 8 - 8
src/views/financialManagement/orderManagement/index.vue

@@ -80,24 +80,24 @@ export default {
           type: 'tag',
           type: 'tag',
           fetchTagType: val => {
           fetchTagType: val => {
             switch (val) {
             switch (val) {
-              case 1:
-                return 'success';
-              case 0:
-                return 'info';
               case -1:
               case -1:
                 return 'warning';
                 return 'warning';
+              case 0:
+                return 'info';
+              case 1:
+                return 'success';
               default:
               default:
                 return 'info';
                 return 'info';
             }
             }
           },
           },
           tagName: row => {
           tagName: row => {
             switch (row.state) {
             switch (row.state) {
-              case 1:
-                return '已支付';
-              case 0:
-                return '未支付';
               case -1:
               case -1:
                 return '取消支付';
                 return '取消支付';
+              case 0:
+                return '未支付';
+              case 1:
+                return '已支付';
               default:
               default:
                 return '-';
                 return '-';
             }
             }

+ 1 - 1
src/views/financialManagement/orderManagement/toolbar.vue

@@ -37,7 +37,7 @@ export default {
           type: 'select',
           type: 'select',
           name: 'state',
           name: 'state',
           label: '订单状态',
           label: '订单状态',
-          options: setStatus(['未支付', '已支付', '待支付'], [-1, 1, 0]),
+          options: setStatus(['取消支付', '待支付', '已支付'], [-1, 0, 1]),
           format: val => (val !== null && val !== '' ? val : null)
           format: val => (val !== null && val !== '' ? val : null)
         }
         }
       ]
       ]