red-deng-deng
|
e8a5de0ce6
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
# Conflicts:
# src/pages/system/station/main.js
|
2021-11-11 14:59:10 +08:00 |
|
red-deng-deng
|
3bb8705e45
|
更新
|
2021-11-11 14:58:23 +08:00 |
北海一刀
|
303d818c4d
|
调整表单验证规则
|
2021-11-11 14:55:20 +08:00 |
|
北海一刀
|
d1f699526d
|
更新
|
2021-11-11 11:51:23 +08:00 |
|
red-deng-deng
|
d387f901d2
|
update
|
2021-11-10 20:38:17 +08:00 |
|
red-deng-deng
|
e3319da4f6
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
# Conflicts:
# src/pages/plan/add/step1.js
|
2021-11-10 18:02:23 +08:00 |
|
red-deng-deng
|
2e35f8f9fa
|
完成订单管理和兑换码管理依据AC
|
2021-11-10 18:01:24 +08:00 |
|
北海一刀
|
b760efb84f
|
更新
|
2021-11-10 16:52:53 +08:00 |
|
北海一刀
|
0a5c6e91ee
|
更新
|
2021-11-10 16:28:53 +08:00 |
|
北海一刀
|
83e35aba5d
|
Update step1.js
|
2021-11-10 16:13:05 +08:00 |
|
北海一刀
|
82144187a8
|
Merge branch 'dev'
|
2021-11-10 16:11:34 +08:00 |
|
北海一刀
|
6acef58da7
|
更新
|
2021-11-10 16:10:23 +08:00 |
|
red-deng-deng
|
b886588d61
|
完成订单排版
|
2021-11-09 18:36:41 +08:00 |
|
red-deng-deng
|
edddee640f
|
update 兑换码
|
2021-11-09 11:45:49 +08:00 |
|
red-deng-deng
|
92502a83da
|
解决导航bug
|
2021-11-09 10:38:35 +08:00 |
|
red-deng-deng
|
3e73dea23c
|
update
|
2021-11-09 10:14:12 +08:00 |
|
北海一刀
|
20b277a15f
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-09 10:10:44 +08:00 |
|
北海一刀
|
2b5e085593
|
更新
|
2021-11-09 10:08:45 +08:00 |
|
red-deng-deng
|
85392b48b9
|
解决营销计划导航bug
|
2021-11-09 09:58:26 +08:00 |
|
red-deng-deng
|
0de9ef3f18
|
update
|
2021-11-09 09:53:08 +08:00 |
|
北海一刀
|
6c7aa87fb0
|
Update main.css
|
2021-11-08 20:08:00 +08:00 |
|
北海一刀
|
b516ceb4ac
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-08 19:59:45 +08:00 |
|
北海一刀
|
78d99885e4
|
更新
|
2021-11-08 19:59:39 +08:00 |
|
red-deng-deng
|
ae23e990d5
|
新建兑换码页面
|
2021-11-08 19:45:04 +08:00 |
|
北海一刀
|
4a32e7309e
|
更新
|
2021-11-08 19:41:43 +08:00 |
|
red-deng-deng
|
7861edbc4a
|
update
|
2021-11-08 16:52:56 +08:00 |
|
red-deng-deng
|
94f79d2d71
|
完成导航显示
|
2021-11-08 16:31:48 +08:00 |
|
red-deng-deng
|
870c053042
|
修改页面无操作退出
|
2021-11-08 15:41:00 +08:00 |
|
red-deng-deng
|
b6ea2e5e0c
|
完成兑换码管理列表，完成导航嵌入更新时间说明
|
2021-11-08 14:55:57 +08:00 |
|
red-deng-deng
|
fdf6545067
|
营销系统列表布局
|
2021-11-08 11:43:01 +08:00 |
|
北海一刀
|
ea7cd6a9df
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-08 09:32:40 +08:00 |
|
北海一刀
|
b52153a2b7
|
表单
|
2021-11-08 09:29:10 +08:00 |
|
red-deng-deng
|
c535d3cade
|
根据AC进行整改
|
2021-11-08 09:29:04 +08:00 |
|
red-deng-deng
|
9cd77ed8e7
|
根据AC标准进行页面补全
|
2021-11-06 16:17:26 +08:00 |
|
red-deng-deng
|
e05a045fd8
|
完成页面30分钟没有操作，自动退出登录，弹出提示框 提示用户“请重新登录”，5秒后返回登录页
|
2021-11-06 13:36:21 +08:00 |
|
red-deng-deng
|
d9fc38529f
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-05 17:09:02 +08:00 |
|
red-deng-deng
|
f6d7ed2748
|
update
|
2021-11-05 17:08:43 +08:00 |
|
北海一刀
|
8de728434d
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-05 17:02:54 +08:00 |
|
北海一刀
|
3ac29caca9
|
更新
|
2021-11-05 17:02:52 +08:00 |
|
red-deng-deng
|
338c135cf4
|
样式改版
|
2021-11-05 16:52:02 +08:00 |
|
red-deng-deng
|
95ebf113f0
|
完成系统管理模块
|
2021-11-03 21:03:48 +08:00 |
|
北海一刀
|
584cec7e8a
|
更新
|
2021-11-03 20:44:45 +08:00 |
|
北海一刀
|
2e86d8b7d9
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-03 19:31:26 +08:00 |
|
北海一刀
|
38787802a9
|
更新
|
2021-11-03 19:31:18 +08:00 |
|
red-deng-deng
|
160aeeaa33
|
完成岗位列表
|
2021-11-03 19:26:48 +08:00 |
|
北海一刀
|
fb3594563d
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-03 09:36:17 +08:00 |
|
北海一刀
|
3c5a1a468e
|
更新
|
2021-11-03 09:36:09 +08:00 |
|
red-deng-deng
|
eacf1deec5
|
新增角色列表，封装岗位列表
|
2021-11-03 09:27:55 +08:00 |
|
北海一刀
|
06ac5d3f0a
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-02 09:33:21 +08:00 |
|
北海一刀
|
9cd462c52e
|
更新
|
2021-11-02 09:33:14 +08:00 |