Merge remote-tracking branch 'origin/master'

.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://127.0.0.1:18080'
-# VUE_APP_BASE_API = 'http://localhost:18080'
+# VUE_APP_BASE_API = 'http://127.0.0.1:18080'
+VUE_APP_BASE_API = 'https://430jy.uutime.cn/yxl-back-end/'
 VUE_APP_API_TIMEOUT = 30000
 
 

src/router/index.js

@@ -120,15 +120,15 @@ export const constantRoutes = [
           // icon: 'table'
         }
       },
-      {
-        path: 'FundDetail',
-        name: '资金明细',
-        component: () => import('@/views/financialManagement/fundDetail/index'),
-        meta: {
-          title: '资金明细'
-          // icon: 'tree'
-        }
-      },
+      // {
+      //   path: 'FundDetail',
+      //   name: '资金明细',
+      //   component: () => import('@/views/financialManagement/fundDetail/index'),
+      //   meta: {
+      //     title: '资金明细'
+      //     // icon: 'tree'
+      //   }
+      // },
       {
         path: 'CashDetail',
         name: '用户资金明细',

src/views/financialManagement/orderManagement/index.vue

@@ -81,7 +81,7 @@ export default {
             }
           },
           tagName: row => {
-            switch (row.auditStatus) {
+            switch (row.state) {
               case 1:
                 return '已支付';
               case 0: