Commit Graph

95 Commits

Author SHA1 Message Date
zyy
abec58b726 desc: 修改弹窗点击蒙层不取消 2019-09-03 18:59:46 +08:00
zyy
bd494599a6 desc: 修改显示权限title 2019-09-03 17:03:05 +08:00
zyy
40b67b8cf3 desc: 调整修改权限逻辑 2019-09-03 16:13:23 +08:00
zyy
7fbadc2bd3 desc: 修改权限编辑 2019-09-03 14:38:05 +08:00
zyy
82cfd670c6 desc: 修改弹窗显示title 2019-09-03 11:21:54 +08:00
zyy
870a4de01b desc: 修改socekt断连逻辑, 调整权限显示及细节,样式问题 2019-09-03 10:45:58 +08:00
zyy
d53661e6ed desc: 增加权限一键生成接口,调整显示位置,字段内容 2019-09-02 18:43:05 +08:00
zyy
95e6008c50 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 17:34:40 +08:00
zyy
f73d7f4b9f desc: 打包权限列表展示 2019-09-02 17:34:34 +08:00
ival
827bb6e870 修改支付页面和订单页面高度错误问题 2019-09-02 17:24:42 +08:00
ival
cc17426731 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 17:11:31 +08:00
ival
de2b6a52b1 修改主页和尺寸 2019-09-02 17:11:19 +08:00
zyy
fa91bc22d9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/orderauthor/author/draft/ruleForm.vue
2019-09-02 17:06:32 +08:00
zyy
d38b3761b8 desc: 对接权限编辑接口,修改显示字段内容 2019-09-02 17:05:53 +08:00
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
zyy
2d906ef9be desc: 调整权限列表接口对接 2019-08-29 09:31:58 +08:00
ival
8c4efb83db 修改国际化导致的界面布局问题 2019-08-20 09:12:54 +08:00
ival
8ca232549f Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/orderauthor/order/draft.vue
2019-08-19 18:51:17 +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
fan
25bdd09388 调整: 国际化样式调整 2019-08-19 18:44:50 +08:00
ival
68e7eaeeb6 修改字典菜单的国际化 2019-08-19 18:42:53 +08:00
fan
c5ecf86107 调整: 国际化+成都三号线人工车显示 2019-08-19 18:31:13 +08:00
fan
c91a4efdcc 修改:国际化调整 2019-08-19 16:35:27 +08:00
fan
d0f7bd46a9 修改:国际化调整 2019-08-19 15:46:52 +08:00
fan
04baa2756e 修改:代码调整 2019-08-16 17:50:57 +08:00
ival
87e35cb38d 同步master代码以及修改交路的问题 2019-08-14 16:37:17 +08:00
ival
6343a79f81 修改接口 2019-08-14 14:01:28 +08:00
ival
ed05cb123e 修改类车添加功能 2019-08-14 13:38:28 +08:00
ival
d8480207aa Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-14 09:35:52 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +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
d70953a130 desc: 增加成都四号线模型, 修改地图删除逻辑 2019-08-07 16:23:04 +08:00
zyy
98a0533b20 修改代码格式 2019-08-06 10:11:32 +08:00
zyy
a010f71252 调整运行图加载, eventbus代码调整 2019-08-02 10:58:28 +08:00
zyy
04e13a7a73 调整代码 2019-08-02 10:36:17 +08:00
ival
4dec6ac93d 调试仿真 2019-07-26 15:52:50 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00