Commit Graph

1624 Commits

Author SHA1 Message Date
北海一刀 76b8a89da1 Update api.js 2021-11-17 16:03:03 +08:00
red-deng-deng 2f84eaa869 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-17 15:18:47 +08:00
red-deng-deng de0a2da400 update 2021-11-17 15:18:35 +08:00
北海一刀 0867742696 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-17 15:17:35 +08:00
北海一刀 a68f53be2f Update api.js 2021-11-17 15:17:28 +08:00
red-deng-deng 9870609868 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
# Conflicts:
#	src/components/gird/main.js
2021-11-17 14:57:12 +08:00
red-deng-deng 6ccc1544c8 解决冲突 2021-11-17 14:56:16 +08:00
北海一刀 97f4814073 更新 2021-11-17 14:55:43 +08:00
北海一刀 0de75e5e69 Update api.js 2021-11-17 14:33:25 +08:00
北海一刀 945b4ef9be Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-17 14:31:37 +08:00
北海一刀 62f8397c4a Update api.js 2021-11-17 14:31:31 +08:00
red-deng-deng ea59a18c5d 更新 2021-11-17 14:15:51 +08:00
red-deng-deng a7b21d4d06 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
# Conflicts:
#	src/assets/api.js
2021-11-17 14:02:30 +08:00
red-deng-deng ec86479279 兑换码管理订单接口 2021-11-17 13:49:18 +08:00
北海一刀 1727cb1e3e Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-17 13:38:02 +08:00
北海一刀 464c8aaf11 更新api封装结构 2021-11-17 13:37:55 +08:00
red-deng-deng e580ff879b 更新 2021-11-17 09:32:42 +08:00
北海一刀 f3baf4708a Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-16 20:17:09 +08:00
北海一刀 41ad41d0de 更新 2021-11-16 20:17:02 +08:00
red-deng-deng 0bef427f62 update 2021-11-16 20:15:48 +08:00
北海一刀 57f47b1a1a Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-16 14:36:27 +08:00
北海一刀 707fcbba1d 更新 2021-11-16 14:35:18 +08:00
red-deng-deng 569e9dbff2 update 2021-11-16 14:27:46 +08:00
北海一刀 482367c814 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-16 09:34:10 +08:00
北海一刀 78fa8777cd 更新 2021-11-16 09:33:56 +08:00
red-deng-deng d0fcc78cd4 完成订单页面审查 2021-11-15 22:15:19 +08:00
北海一刀 a44e727f64 分销商对证 2021-11-15 18:27:22 +08:00
red-deng-deng 7d7944b371 完成兑换码管理AC核对 2021-11-15 18:20:36 +08:00
red-deng-deng 74b069deb5 完成菜单管理审核 2021-11-15 16:07:10 +08:00
北海一刀 46d1b20a33 表单状态调整 2021-11-15 15:43:50 +08:00
北海一刀 7fb7dc1e52 更新 2021-11-15 14:25:53 +08:00
red-deng-deng ea7a304c9c 系统管理页面逻辑测试 2021-11-15 13:48:17 +08:00
北海一刀 2bf5dd19aa 营销计划页面逻辑效果 2021-11-15 11:55:24 +08:00
北海一刀 6cbf962a11 添加兑换页部分 2021-11-15 09:30:03 +08:00
red-deng-deng cf5d7d5ad6 完成分销商/账号添加表单校验 2021-11-13 17:27:22 +08:00
red-deng-deng 934a5141bd 提交角色 2021-11-13 14:48:45 +08:00
red-deng-deng 4b9274fa32 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-13 14:31:35 +08:00
red-deng-deng fe1295e8bc update 2021-11-13 14:31:21 +08:00
北海一刀 68547258c9 456465454545454 2021-11-13 14:30:02 +08:00
red-deng-deng 40c6a909e6 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-11 19:18:52 +08:00
red-deng-deng c4d7604a8f update 2021-11-11 19:18:41 +08:00
北海一刀 c97bba9079 更新 2021-11-11 18:58:36 +08:00
北海一刀 b837423b6b 更新 2021-11-11 18:05:55 +08:00
red-deng-deng add1a74fc2 岗位更新 2021-11-11 18:03:35 +08:00
北海一刀 fabf1dcbcf Update main.js 2021-11-11 17:44:27 +08:00
red-deng-deng 986714effb Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
# Conflicts:
#	src/components/form/main.js
2021-11-11 17:39:29 +08:00
red-deng-deng 0781b8ecc9 update 2021-11-11 17:38:40 +08:00
red-deng-deng 961d7a059a update 2021-11-11 17:37:59 +08:00
北海一刀 7122d1f4a0 Update main.js 2021-11-11 17:34:01 +08:00
北海一刀 5aaa62bb7b 营销计划管理页 2021-11-11 17:31:29 +08:00