收款列表

.env.development

@@ -2,6 +2,7 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://192.168.2.75:18015'
+# VUE_APP_BASE_API = 'http://192.168.2.75:18015'
+VUE_APP_BASE_API = 'http://localhost:18015'
 # 图片上传，索引更新等
 VUE_APP_CORE_API = 'https://core-b.caimei365.com'

package-lock.json

@@ -6886,6 +6886,11 @@
       "version": "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1",
       "from": "git://github.com/adobe-webplatform/eve.git#eef80ed"
     },
+    "eve-raphael": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/eve-raphael/-/eve-raphael-0.5.0.tgz",
+      "integrity": "sha1-F8dUt5K+7z+maE15z1pHxjxM2jA="
+    },
     "event-pubsub": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz",
@@ -13906,10 +13911,11 @@
       "dev": true
     },
     "raphael": {
-      "version": "git+https://github.com/nhn/raphael.git#78a6ed3ec269f33b6457b0ec66f8c3d1f2ed70e0",
-      "from": "git+https://github.com/nhn/raphael.git#2.2.0-c",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/raphael/-/raphael-2.3.0.tgz",
+      "integrity": "sha512-w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ==",
       "requires": {
-        "eve": "git://github.com/adobe-webplatform/eve.git#eef80ed"
+        "eve-raphael": "0.5.0"
       }
     },
     "raw-body": {
@@ -16600,6 +16606,13 @@
         "tui-code-snippet": "^2.3.1"
       },
       "dependencies": {
+        "raphael": {
+          "version": "git+https://github.com/nhn/raphael.git#78a6ed3ec269f33b6457b0ec66f8c3d1f2ed70e0",
+          "from": "git+https://github.com/nhn/raphael.git#2.2.0-c",
+          "requires": {
+            "eve": "git://github.com/adobe-webplatform/eve.git#eef80ed"
+          }
+        },
         "tui-code-snippet": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/tui-code-snippet/-/tui-code-snippet-2.3.3.tgz",

package.json

@@ -31,6 +31,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "raphael": "^2.3.0",
     "screenfull": "4.2.0",
     "script-loader": "0.7.2",
     "sortablejs": "1.8.4",

src/router/modules/finance.js

@@ -11,7 +11,30 @@ const financeRouter = {
     {
       path: 'receipt',
       component: () => import('@/views/finance/index'),
-      redirect: '/finance/receipt/users',
+      redirect: '/finance/receipt/list',
+      name: 'ReceiptManage',
+      meta: { title: '收款列表', icon: 'documentation' },
+      children: [
+        {
+          path: 'list',
+          hidden: true,
+          component: () => import('@/views/finance/receipt/list.vue'),
+          name: 'ReceiptList',
+          meta: { title: '收款列表' }
+        },
+        {
+          path: 'detail',
+          hidden: true,
+          component: () => import('@/views/finance/receipt/detail.vue'),
+          name: 'ReceiptDetail',
+          meta: { title: '收款详情', noCache: true }
+        }
+      ]
+    },
+    {
+      path: 'receipts',
+      component: () => import('@/views/finance/index'),
+      redirect: '/finance/receipts/users',
       name: 'ReceiptUserManage',
       meta: { title: '收款人权限', icon: 'documentation' },
       children: [
@@ -20,7 +43,7 @@ const financeRouter = {
           hidden: true,
           component: () => import('@/views/finance/receipt/users.vue'),
           name: 'ReceiptUserList',
-          meta: { title: '收款人列表' }
+          meta: { title: '收款人权限' }
         },
         {
           path: 'user/edit',

src/utils/request.js

@@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth'
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000 // request timeout
+  timeout: 10000 // request timeout
 })
 
 // request interceptor

src/views/finance/receipt/detail.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="app-container">
+    <p>敬请期待...</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReceiptDetail',
+  data() {
+    return {
+    }
+  },
+  created() {
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/finance/receipt/list.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="app-container">
+    <p>敬请期待...</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReceiptList',
+  data() {
+    return {
+    }
+  },
+  created() {
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/sys/login/index.vue

@@ -136,8 +136,8 @@ export default {
             .dispatch('user/login', this.loginForm)
             .then(() => {
               this.$router.push({
-                // path: this.redirect || '/',
-                path: '/profile/index',
+                path: this.redirect || '/profile/index',
+                // path: '/profile/index',
                 query: this.otherQuery
               })
               this.loading = false