Commit Graph
139 Commits
Author SHA1 Message Date
liyang 7dbae4cee5 1.6.10
Former-commit-id: 1d694e8eee0b02d33eac0749afc5293e88f8a422
2018-12-26 13:42:13 +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 c0aeefb896 Merge branch 'hotfix/12-16' into develop
Former-commit-id: 2eb080481bc745eaf55f8136b72f503ed1c2fffd
2018-12-16 20:10:06 +08:00
liyang 8b1b0954c6 Merge branch 'hotfix/12-16'
Former-commit-id: a24414bc5eb7e16004e918424d8c2fcf434779c1
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
liyang f7f4ce2043 删除插件
Former-commit-id: 9417c79ef9b19d2b6d9779f88374667074ab3fcd
2018-10-30 20:08:31 +08:00
liyang 364d50c507 示例页面
Former-commit-id: 7c6694902563c8ecd062a4e4acd508ca475fc97e
2018-10-30 20:07:38 +08:00
liyang 0b4acf781a menu 设置
Former-commit-id: 29011ec1882cac7ed89433a9112a343be272df6d
2018-10-30 20:06:14 +08:00
liyang e1cf5ccd2b 删除不必要组件
Former-commit-id: abbe65f8f090ce4f93c2d26d41bc38e5ad8581a3
2018-10-30 20:04:33 +08:00
liyang 7335cdce9b 删除无用的样式补丁
Former-commit-id: 8eabc349dfa7650846e663fbb17a022b9f1bb041
2018-10-30 20:02:55 +08:00
liyang 31e09277df 删除无用的 svg 图标
Former-commit-id: 644811931d6328fdfb44e919927c6ae0b575faf7
2018-10-30 20:01:52 +08:00
liyang 316a93f678 删除文件夹
Former-commit-id: 90222263f0d525cd3cde7070521695b9134f020e
2018-10-30 20:01:17 +08:00
liyang 08b63fa6b9 从完整版转移
Former-commit-id: d164dbcc7f4a728304b1683d763d45fdebca8170
2018-10-30 19:53:02 +08:00
liyang e24098b148 清空
Former-commit-id: d88f8229de770edd6beb1483cb0ff29bf4d609cb
2018-10-30 19:51:49 +08:00
liyang a3e18a6211 Merge branch 'hotfix/cdn' into develop
Former-commit-id: 097dea0b498672c0a3242a41ab8f7a2c477349f7
2018-10-24 18:25:26 +08:00
liyang abda5cc1d2 Merge branch 'hotfix/cdn'
Former-commit-id: 3878e97b9cc58a9108aa58ddba8c91d14b521d27
2018-10-24 18:25:26 +08:00
liyang 8c43fa5bfa no message
Former-commit-id: 5c719fa213774efe0820aaf83fe78db048eb0c1f
2018-10-24 18:25:15 +08:00
liyang cf0b80cfda Merge branch 'hotfix/cdn' into develop
Former-commit-id: 38bbde8b2c7b2a82b4dc555cae33b3109edb85c4
2018-10-24 18:22:20 +08:00
liyang 4abf0a3ef0 Merge branch 'hotfix/cdn'
Former-commit-id: fc4951a28fca446506d90903e3d8658717d7bb2a
2018-10-24 18:22:20 +08:00
liyang 2db51f8bc7 hm
Former-commit-id: 867a8c90f3bafd0a59176664a65c27a69648d6af
2018-10-24 18:22:08 +08:00
liyang 8f381f0f5f Merge branch 'hotfix/cdn' into develop
Former-commit-id: 65ac319d80e6c3981d7c85e0d4c050db3bdc3f01
2018-10-24 18:15:17 +08:00
liyang 24580e7d43 Merge branch 'hotfix/cdn'
Former-commit-id: 32f35df52e48e7ebba10312fa4d5cac6b7a3ca9d
2018-10-24 18:15:17 +08:00
liyang 3499f79fa7 no message
Former-commit-id: 6c1c1d575c50ca1820c44615fa1ec6470d89b9ca
2018-10-24 18:15:07 +08:00
liyang e9bb49c3ff Merge remote-tracking branch 'origin/develop'
Former-commit-id: d107625324a8dd16563b12ecd07cb105df9e2c6e
2018-10-15 22:44:45 +08:00