117 Commits

Author SHA1 Message Date
wulin
1c4f2e63b1 忘记保存 2020-08-25 16:53:24 +08:00
wulin
8c3cbb16a7 解决冲突 2020-08-25 16:52:59 +08:00
wulin
b89c7f68a2 修改限制详情table的最大高度 2020-08-25 16:51:51 +08:00
quyixiao
963d9e5133 提交修改 2020-08-25 16:38:21 +08:00
quyixiao
ce4f3ea73b Merge branch 'version_1.t push -u or 0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into version_1.0 2020-08-25 16:33:14 +08:00
quyixiao
60a715ab3b 提交修改 2020-08-25 16:33:11 +08:00
wulin
9f0afd0561 增加免登授权跳转到PC浏览器功能 2020-08-25 14:24:59 +08:00
quyixiao
12ecfd0f60 Merge branct push -u or h 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into version_1.0 2020-08-24 19:59:04 +08:00
quyixiao
32a3a7bdd8 提交修改 2020-08-24 19:59:01 +08:00
wulin
5782563c7e 抽奖界面增加loading,防止误操作 2020-08-24 15:42:41 +08:00
wulin
251cfd3ddc 去掉console 2020-08-24 15:32:48 +08:00
wulin
7cb544dd13 修改活动编号为线上编号 2020-08-24 15:29:32 +08:00
wulin
958f10b40e 修改抽奖滚动人员姓名时间未20毫秒 2020-08-24 15:27:57 +08:00
wulin
3416a086f8 Merge branch 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into version_1.0 2020-08-24 15:25:19 +08:00
wulin
cb57a49e4c 修改文案提示 2020-08-24 15:25:13 +08:00
quyixiao
f742001b22 提交修改 2020-08-24 14:45:49 +08:00
quyixiao
90a38f9f83 提交修改 2020-08-24 14:24:49 +08:00
quyixiao
9ae828c83d 提交修改 2020-08-24 14:23:46 +08:00
wulin
ca448e8d16 修改lzluck id为2 2020-08-24 14:19:13 +08:00
wulin
453a1c7171 修改提示文案 2020-08-24 14:14:30 +08:00
wulin
c0b630eaa8 关闭console 2020-08-24 13:47:45 +08:00
wulin
deb79c48b4 添加console 2020-08-24 11:58:25 +08:00
wulin
3041649195 修改抽奖登记ding croip未为公司 2020-08-24 09:50:35 +08:00
wulin
caabe9c6e6 Merge branch 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into version_1.0 2020-08-24 09:27:50 +08:00
wulin
6eed411a99 增加抽奖功能 2020-08-24 09:27:46 +08:00
quyixiao
6ec4a4f444 t push -u oMerge branch 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into version_1.0 2020-08-23 17:42:13 +08:00
quyixiao
c9304ea521 提交修改 2020-08-23 17:42:11 +08:00
wulin
ae5fdf5204 Merge branch 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into version_1.0 2020-08-21 17:29:35 +08:00
wulin
b11f38584d 增加免登,抽奖记录 2020-08-21 17:29:29 +08:00
quyixiao
f0dfe2d916 提交我 2020-08-21 17:24:55 +08:00
quyixiao
c9c8bc8fc0 提交修改 2020-08-21 11:42:40 +08:00
quyixiao
cf8d225ffd 提交修改 2020-08-20 19:24:13 +08:00
quyixiao
b59b056773 rjuq whnt 2020-08-20 14:37:26 +08:00
quyixiao
0543fbccc7 提交修改 2020-08-18 18:30:54 +08:00
quyixiao
504306a0cf 提交修改 2020-08-14 23:32:09 +08:00
quyixiao
49a2e1912d 提交修改 2020-08-14 11:30:35 +08:00
quyixiao
3c8c63548b 提交修改 2020-08-13 17:56:01 +08:00
quyixiao
75a6d9d099 提交修改 2020-08-12 14:31:49 +08:00
quyixiao
8f01a789bc 提交修改 2020-08-12 09:16:00 +08:00
quyixiao
78cb7b9124 提交修改 2020-08-10 18:23:18 +08:00
fumeiai
ccc5e8bc0e add sms login function 2020-06-02 11:42:57 +08:00
fumeiai
d882758e97 update url 2020-05-25 20:59:38 +08:00
fumeiai
4bd117040b update some code 2020-05-25 20:57:38 +08:00
yoe
bfa8c814c7 Merge branch 'V_1.0.0'
# Conflicts:
#	static/config/index-qa.js
#	static/config/index-uat.js
#	static/config/index.js
2020-05-22 17:38:02 +08:00
yoe
3fd829054b update History版本管理 2020-05-22 17:36:51 +08:00
xiongchengqiang
ca85e75101 feat:添加职业信息的transferType字段; 2020-05-22 17:29:15 +08:00
xiongchengqiang
eef022600d style:优化角色管理的已授权菜单; 2020-05-22 17:15:44 +08:00
xiongchengqiang
ef2de5a542 feat:角色权限管理的授权菜单; 2020-05-22 17:00:20 +08:00
xiongchengqiang
1f00d2d554 todo:角色权限管理的授权菜单;fix:L修复bug 2020-05-22 15:45:49 +08:00
xiongchengqiang
5517ac2694 fix:L修复bug 2020-05-22 14:12:03 +08:00