 liyang
|
e863d67214
|
Merge branch 'develop'
Former-commit-id: 9fca2e95834dee3455d4fc975e7bc40a58bc0192
|
2019-01-17 11:13:33 +08:00 |
|
|
liyang
|
1d21421c70
|
1.6.14
Former-commit-id: 1b8991c591695f39f4a572a9db47bb9f247aaa9c
|
2019-01-17 11:13:28 +08:00 |
|
|
liyang
|
4c654e4493
|
Merge branch 'develop'
Former-commit-id: 65d4e617324cfc4277ebd7e47a07a9af3c15a76c
|
2019-01-16 20:14:40 +08:00 |
|
|
liyang
|
6038fd3b9d
|
新版本号
Former-commit-id: 0e3fbe75d35ea6682f4b68d0a3e0ce8b7bd292a8
|
2019-01-16 20:14:16 +08:00 |
|
|
liyang
|
2e1a4fa7eb
|
优化计算属性命名
Former-commit-id: eddd9cdea2377e8c5a150a659ede4625be09813c
|
2019-01-16 20:08:50 +08:00 |
|
|
liyang
|
e6d731fa7f
|
d2-container 组件不设置 filename 参数即可隐藏源码链接
Former-commit-id: cd26658203898ddc457e4b30b4044c9fe8c6f057
|
2019-01-16 20:03:13 +08:00 |
|
|
liyang
|
47a3e411e0
|
Merge branch 'develop'
Former-commit-id: 0742d6d2062e1c907158faf6d4bca3aff1b0b806
|
2019-01-16 10:45:22 +08:00 |
|
|
liyang
|
9876365d82
|
优化登陆和注销逻辑
Former-commit-id: 342bebf978c2a53193e7d89e7a538c4b72867a55
|
2019-01-16 10:45:16 +08:00 |
|
|
liyang
|
1eb170fdfb
|
Merge branch 'develop'
Former-commit-id: bc86784dfabfd5e01e16c8a3a88713f199151868
|
2019-01-15 22:23:06 +08:00 |
|
|
liyang
|
20bc963eab
|
1.6.11
Former-commit-id: 5379be9a8f9f6cce153af56cc6dc0b0b0cc48d49
|
2019-01-15 22:23:01 +08:00 |
|
|
liyang
|
9370a4cea9
|
Merge branch 'develop'
Former-commit-id: f3aa24b82ad931b87b132a540c19a2e30ce36dce
|
2019-01-09 21:12:41 +08:00 |
|
|
liyang
|
b2a5dd96ee
|
简化写法
Former-commit-id: 629be5c2cda97a02cb72faf528b1791a6dcc4f37
|
2019-01-09 21:12:36 +08:00 |
|
|
liyang
|
deb113190a
|
Merge branch 'hotfix/错词'
Former-commit-id: 20e28bf2f9336707eb4698eae3624477349fb0bb
|
2019-01-08 14:54:27 +08:00 |
|
|
liyang
|
b0acc2edd9
|
Merge branch 'hotfix/错词' into develop
Former-commit-id: 8373c73980b8531d2e278333d05b055b0f31b375
|
2019-01-08 14:54:27 +08:00 |
|
|
liyang
|
5569648918
|
errorCreate
Former-commit-id: ae769a84dc297376e8db7264c8786f3fa0719bcb
|
2019-01-08 14:54:21 +08:00 |
|
|
李杨
|
6cd17e4a4f
|
Merge pull request #11 from sunyongmofang/work
将requiresAuth修改为auth
Former-commit-id: c5956775c6f70ee742c6c8301fe1b3108752295e
|
2019-01-08 14:27:07 +08:00 |
|
|
sunyongmofang
|
626c31a975
|
将requiresAuth修改为auth
Former-commit-id: 97617e634f37e7911d1a43def2eaaf968bc5dc5c
|
2019-01-07 11:34:48 +08:00 |
|
|
liyang
|
ebe3f1ac08
|
Merge branch 'develop'
Former-commit-id: f25e65fa315b9432e262f6c93e93931c7fee9689
|
2018-12-26 13:42:21 +08:00 |
|
|
liyang
|
7dbae4cee5
|
1.6.10
Former-commit-id: 1d694e8eee0b02d33eac0749afc5293e88f8a422
|
2018-12-26 13:42:13 +08:00 |
|
|
liyang
|
8c7c731a6a
|
Merge branch 'hotfix/issues/149'
Former-commit-id: 09ce8b807a17e8fa60e4b96dffa0d71feb1bc348
|
2018-12-26 13:38:51 +08:00 |
|
|
liyang
|
69ca7bc3db
|
Merge branch 'hotfix/issues/149' into develop
Former-commit-id: ea870d8fdf02152f13650cbd071e8d9ee9bef613
|
2018-12-26 13:38:51 +08:00 |
|
|
liyang
|
9fbfd26dcc
|
fixed
Former-commit-id: 288c6b756cea6c92c512f59acc115b6bb4b52101
|
2018-12-26 13:38:40 +08:00 |
|
|
liyang
|
8b1b0954c6
|
Merge branch 'hotfix/12-16'
Former-commit-id: a24414bc5eb7e16004e918424d8c2fcf434779c1
|
2018-12-16 20:10:06 +08:00 |
|
|
liyang
|
c0aeefb896
|
Merge branch 'hotfix/12-16' into develop
Former-commit-id: 2eb080481bc745eaf55f8136b72f503ed1c2fffd
|
2018-12-16 20:10:06 +08:00 |
|
|
liyang
|
bf170bdb39
|
no message
Former-commit-id: 487e22a0c9bf5da4474f9449ce95070e9a4ed727
|
2018-12-16 20:09:57 +08:00 |
|
|
liyang
|
9e12e91c38
|
clean
Former-commit-id: 6d7a4adb3f160ed8ecc06ea9b3f566bffdcc086b
|
2018-12-16 19:44:44 +08:00 |
|
|
李杨
|
55ea4dc64c
|
Merge pull request #7 from imageslr/patch-1
fix: 调用next(...)重定向不会触发router.afterEach钩子
Former-commit-id: d5cca9eae0353df214800d5fcf71ec8c6109d893
|
2018-11-20 16:38:19 +08:00 |
|
|
Zhu
|
354d0d7962
|
fix: 调用next(...)重定向不会触发router.afterEach钩子
在未登录状态下，在地址栏输入需要登录后才能访问的页面url，应用会重定向至login。但是这时顶部的 NProgress 依然在加载中，因为`next(...)`重定向不会触发`router.afterEach`钩子，这里需要手动hack一下。
Former-commit-id: 1fa31ccca534e54a920451320c971eaf4b771417
|
2018-11-19 22:58:24 +08:00 |
|
|
liyang
|
10cc910729
|
Merge branch 'hotfix/1.5.9' into develop
Former-commit-id: 52189066a5de49a89a1bd2f9f6de5590793528e2
|
2018-11-08 12:50:37 +08:00 |
|
|
liyang
|
f719225b5c
|
Merge branch 'hotfix/1.5.9'
Former-commit-id: efcf73f956546f39764c3ee835a4a5c70d5bd8a0
|
2018-11-08 12:50:37 +08:00 |
|
|
liyang
|
e0207020ab
|
update
Former-commit-id: bf59905ab0fa0ac6ea0cd791e75068604601c64d
|
2018-11-08 12:50:28 +08:00 |
|
|
liyang
|
6571c38c6b
|
Merge branch 'hotfix/1.5.8' into develop
Former-commit-id: 2fc2f5a4423ce10faa36c023136b5eff2abe0848
|
2018-11-07 15:19:42 +08:00 |
|
|
liyang
|
9665d32061
|
Merge branch 'hotfix/1.5.8'
Former-commit-id: 2ea74474a2abf7d9243ff486d977d58087fa928f
|
2018-11-07 15:19:42 +08:00 |
|
|
liyang
|
e66c81d32d
|
update
Former-commit-id: e45a95c1f373e6f4d4ee2720c8a4e48dcc9c2852
|
2018-11-07 15:19:35 +08:00 |
|
|
liyang
|
3e79a5750e
|
Merge branch 'hotfix/1.5.7' into develop
Former-commit-id: c9f968ce794e9a68134ea58e3ed858f86d4a9068
|
2018-11-06 23:30:02 +08:00 |
|
|
liyang
|
c27d250af1
|
Merge branch 'hotfix/1.5.7'
Former-commit-id: 85cebf9ea5a4dfb95a70ff466e11cc1e0cc19ef9
|
2018-11-06 23:30:02 +08:00 |
|
|
liyang
|
d4c28522fe
|
no message
Former-commit-id: 0c19f83985ef8b25d0c30a7fb861808a6490c180
|
2018-11-06 23:29:50 +08:00 |
|
|
liyang
|
4fa7b08fa8
|
Merge branch 'hotfix/优化' into develop
Former-commit-id: 3a805dc7d2979a47f1ff070393262144a568a7ee
|
2018-11-02 13:24:40 +08:00 |
|
|
liyang
|
9de364f6ee
|
Merge branch 'hotfix/优化'
Former-commit-id: 97240ed1409b98594aa5e3449b586577e526a429
|
2018-11-02 13:24:40 +08:00 |
|
|
liyang
|
d85b4e0e29
|
优化
Former-commit-id: 23dbf65aeb10765ddda7c8f4faa33d423d59f420
|
2018-11-02 13:24:33 +08:00 |
|
|
liyang
|
a1a8615329
|
Merge branch 'hotfix/新版本' into develop
Former-commit-id: 2ba2d0cca6533a6841067bfb3786c22e2cc20262
|
2018-10-30 23:27:08 +08:00 |
|
|
liyang
|
99728bc8a5
|
Merge branch 'hotfix/新版本'
Former-commit-id: a1536f5dfbce2629f8205ccfb08c843dd411f85d
|
2018-10-30 23:27:08 +08:00 |
|
|
liyang
|
9ac047e67a
|
简化介绍信息
Former-commit-id: 0faef55632e5c24aab54a884e5561632947aef2a
|
2018-10-30 23:20:34 +08:00 |
|
|
liyang
|
23811e58cc
|
Merge branch 'hotfix/新版本' into develop
Former-commit-id: 1876c640bca3e47b8c92a47f92d5847a010446dd
|
2018-10-30 20:59:09 +08:00 |
|
|
liyang
|
426408a9fd
|
Merge branch 'hotfix/新版本'
Former-commit-id: 701cb1ab3a944aa55d830f365f479534242acf91
|
2018-10-30 20:59:09 +08:00 |
|
|
liyang
|
52454d3334
|
travis
Former-commit-id: e4223f2f7c832708d2679004042040d416a7034f
|
2018-10-30 20:53:10 +08:00 |
|
|
liyang
|
1ae33278a0
|
更新依赖
Former-commit-id: 93de86ecd6e2bc0408be9167a039ef059efec9e6
|
2018-10-30 20:44:19 +08:00 |
|
|
liyang
|
efc8dd4694
|
删除依赖
Former-commit-id: 69bb8479931e65117c25761552a97d908a04bf97
|
2018-10-30 20:17:14 +08:00 |
|
|
liyang
|
5a54260483
|
main.js
Former-commit-id: 86e5af838453143f3d0e96669fb4189d319acebd
|
2018-10-30 20:11:50 +08:00 |
|
|
liyang
|
8bd1af6625
|
router
Former-commit-id: 7d8ea44f3d9d2058440fca1f6a0aa9c398d5453b
|
2018-10-30 20:10:00 +08:00 |
|