Commit Graph

18 Commits

Author SHA1 Message Date
ival
3ade8f6d92 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 15:38:11 +08:00
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +08:00
zyy
0388b2a1df desc: 修改权限列表显示字段内容,逻辑流程 2019-09-02 14:43:16 +08:00
zyy
6fa64dd26b desc: 修改显示字段,增加loading 2019-09-02 11:04:23 +08:00
zyy
0398179e0d desc: 用户权限流程修改,接口对接 2019-08-30 17:00:18 +08:00
ival
8c4efb83db 修改国际化导致的界面布局问题 2019-08-20 09:12:54 +08:00
ival
67cf6f5a29 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/i18n/langs/en/orderAuthor.js
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/zh/orderAuthor.js
#	src/i18n/langs/zh/rules.js
#	src/views/orderauthor/commodity/index.vue
#	src/views/orderauthor/order/draft.vue
2019-08-19 18:49:40 +08:00
ival
68e7eaeeb6 修改字典菜单的国际化 2019-08-19 18:42:53 +08:00
fan
c91a4efdcc 修改:国际化调整 2019-08-19 16:35:27 +08:00
fan
d0f7bd46a9 修改:国际化调整 2019-08-19 15:46:52 +08:00
fan
2ab09d664f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-13 18:12:14 +08:00
fan
a3ecc1dfc6 调整:国际化 2019-08-13 18:11:58 +08:00
ival
db109f2a9e 调整地图进路相关的接口 2019-08-13 16:59:38 +08:00
fan
13d7e5df8b 调整:国际化 2019-08-12 18:54:32 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00
zyy
a010f71252 调整运行图加载, eventbus代码调整 2019-08-02 10:58:28 +08:00
zyy
04e13a7a73 调整代码 2019-08-02 10:36:17 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00