Commit Graph

430 Commits

Author SHA1 Message Date
Haven 12f29b7d16
Update error-content.vue 2018-11-15 17:32:05 +08:00
zhigang.li f4f4a82dcf Merge branch '2.0'
修复多语言路由配置,当title的回调函数返回一个不带{{}}的字符串时title被多语言配置的字符串覆盖的bug
2018-11-14 18:41:56 +08:00
zhigang.li 56742b707e 修复多语言路由配置bug 2018-11-14 18:40:53 +08:00
zhigang.li@tendcloud.com 59a72ae1c0 Merge branch '2.0'
去掉main.js里重复引入的iview样式文件
2018-11-13 14:51:14 +08:00
zhigang.li@tendcloud.com 21b2c15577 去掉main.js里重复引入的iview样式文件 2018-11-13 14:50:39 +08:00
zhigang.li@tendcloud.com ac71d28739 Merge branch '2.0'
新增消息中心
2018-11-08 15:15:53 +08:00
zhigang.li@tendcloud.com a72be82a9b 新增消息中心 2018-11-08 15:15:25 +08:00
zhigang.li@tendcloud.com 585c4028f5 Merge branch '2.0'
fix error word
2018-11-08 10:20:32 +08:00
zhigang.li@tendcloud.com e82724c16f fix error word 2018-11-08 10:19:24 +08:00
zhigang.li@tendcloud.com ae5edc07c5 Merge branch '2.0'
添加图片裁剪组件Cropper
2018-11-07 17:00:39 +08:00
zhigang.li@tendcloud.com afdbeacac2 新增图片裁剪组件Cropper 2018-11-07 17:00:09 +08:00
zhigang.li@tendcloud.com f1feef19ed commit 2018-11-07 10:29:24 +08:00
zhigang.li@tendcloud.com 70fe4ee16a Merge branch '2.0' 2018-11-06 17:55:01 +08:00
zhigang.li@tendcloud.com a7b7a20d33 修复多功能表格组件在未开启搜索功能时报错的bug 2018-11-06 17:53:38 +08:00
zhigang.li@tendcloud.com b5b0b0c123 Merge branch '2.0' 2018-11-05 14:33:57 +08:00
zhigang.li@tendcloud.com 612abab7df 补充notCache注释 2018-11-05 14:33:28 +08:00
zhigang.li@tendcloud.com 5b085204f3 Merge branch '2.0' 2018-11-05 10:11:43 +08:00
zhigang.li@tendcloud.com dc302d0f12 修复页面缓存不起作用的bug 2018-11-05 10:04:38 +08:00
zhigang.li@tendcloud.com 6ac6bf5644 Merge branch '2.0' 2018-11-02 14:45:06 +08:00
zhigang.li@tendcloud.com 9c6f2ee1f2 修复收缩菜单的多语言显示 2018-11-02 14:44:45 +08:00
Lison 80d132d13f
Merge pull request #1066 from iview/2.0
2.0
2018-11-02 11:58:26 +08:00
zhigang.li@tendcloud.com e2c0b12f3e 修复面包屑bug 2018-11-02 11:49:01 +08:00
zhigang.li@tendcloud.com 454ab6fec6 commit 2018-11-02 11:16:52 +08:00
zhigang.li@tendcloud.com 36a0462012 commit 2018-11-02 11:16:29 +08:00
zhigang.li@tendcloud.com 9bbc3705c9 Merge branch '2.0' 2018-11-02 11:00:12 +08:00
zhigang.li@tendcloud.com d86bdb3cc5 修复在Main.vue中调用接口报错的bug 2018-11-02 10:56:11 +08:00
Lison 8f3a2386e6
Merge pull request #1065 from iview/2.0
2.0
2018-11-02 10:27:32 +08:00
zhigang.li@tendcloud.com 1da243719c 打包时不生成.map文件 2018-11-02 10:26:50 +08:00
zhigang.li@tendcloud.com 39db4e473e 更新QQ群二维码 2018-11-02 10:18:17 +08:00
Lison 9c7726d4bc
Merge pull request #1063 from iview/2.0
恢复设置plugin['error-store'].developmentOff设置为false
2018-11-01 18:44:56 +08:00
zhigang.li@tendcloud.com 46ce4cf26c 恢复设置plugin['error-store'].developmentOff设置为false 2018-11-01 18:42:58 +08:00
Lison 84e10d6154
Merge pull request #1062 from iview/2.0
2.0
2018-11-01 18:30:37 +08:00
zhigang.li@tendcloud.com c45d437d3d 补充路由配置注释 2018-11-01 18:29:49 +08:00
zhigang.li@tendcloud.com 096c1db65f 完善路由配置,title支持模板语法形式引入多语言配置 2018-11-01 18:26:54 +08:00
Lison 614c0bf4cb
Merge pull request #1061 from iview/2.0
修复动态路由和带参路由打开多个标签,标签滚动总是定位到最后一个同name标签的bug
2018-11-01 16:55:27 +08:00
zhigang.li@tendcloud.com e23bafc75a 修复动态路由和带参路由打开多个标签,标签滚动总是定位到最后一个同name标签的bug 2018-11-01 16:54:19 +08:00
zhigang.li@tendcloud.com c2d3969ac7 修复启动项目后白屏的问题 2018-10-18 14:36:20 +08:00
zhigang.li@tendcloud.com 8c2548fff0 Merge branch '2.0' 2018-10-15 12:12:00 +08:00
zhigang.li@tendcloud.com 7f4f6ec8e2 完善多级菜单路由多语言配置 2018-10-15 12:11:30 +08:00
Lison 4f0b548e38
Merge pull request #1029 from iview/2.0
修复ie11下info-card组件样式问题
2018-10-12 17:24:05 +08:00
zhigang.li@tendcloud.com c2ff64d973 修复ie11下info-card组件样式问题 2018-10-12 17:23:28 +08:00
Lison 75f8c59d9c
Merge pull request #1028 from iview/2.0
去掉.eslintignore里的routers.js
2018-10-12 12:17:17 +08:00
zhigang.li@tendcloud.com 35cfa08879 update 2018-10-12 12:16:14 +08:00
Lison 0a7dc1a273
Merge pull request #1027 from iview/2.0
修复eslint检测() => import报错的问题
2018-10-12 12:14:19 +08:00
zhigang.li@tendcloud.com 3bae2e7207 修复eslint检测() => import报错的问题 2018-10-12 12:13:56 +08:00
zhigang.li@tendcloud.com bbc5eef5e1 update 2018-10-11 17:29:22 +08:00
zhigang.li@tendcloud.com 6e9eb65ec0 Merge branch '2.0'
# Conflicts:
#	README.md
2018-10-11 17:28:44 +08:00
zhigang.li@tendcloud.com 6d225a9118 update 2018-10-11 17:28:17 +08:00
zhigang.li@tendcloud.com aa46211e2d Merge branch '2.0' 2018-10-11 17:27:11 +08:00
zhigang.li@tendcloud.com 4d5c66cbbd update readme 2018-10-11 17:26:38 +08:00