HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
300 Commits 12 Branches 0 Tags 171 MiB
Commit Graph

292 Commits

Author SHA1 Message Date
red-deng-deng 1ec5082629 联调订单改为成功和作废接口 2021-11-22 20:47:45 +08:00
red-deng-deng 567f38adc5 解决分销商状态 2021-11-22 20:18:15 +08:00
red-deng-deng b95ee49e11 改变定制化模板 2021-11-22 20:10:49 +08:00
red-deng-deng 7d1a80bfcc 更新菜单 2021-11-22 20:03:46 +08:00
red-deng-deng 279f07adf0 update 2021-11-22 20:02:50 +08:00
red-deng-deng f1ee20290b update 2021-11-22 20:00:51 +08:00
red-deng-deng ce9e3c597e 更新 2021-11-22 19:58:20 +08:00
red-deng-deng 050be9055c 定制化模块 2021-11-22 19:52:27 +08:00
red-deng-deng 5209fc5c01 新增模板 2021-11-22 19:03:16 +08:00
red-deng-deng bbfdd35fd4 菜单接口 2021-11-22 17:20:52 +08:00
red-deng-deng dea38aa840 更新 2021-11-22 16:37:27 +08:00
姜棚 e939e80b76 更新 2021-11-22 15:49:22 +08:00
姜棚 eab8240c8e 更新 2021-11-22 15:43:40 +08:00
red-deng-deng c09f3e1fc4 更新分销商查询字段 2021-11-22 14:41:13 +08:00
red-deng-deng c0e58b4757 update 2021-11-22 14:19:45 +08:00
red-deng-deng 93d0a61518 修改重置密码，编辑，改变状态接口 2021-11-22 14:14:46 +08:00
red-deng-deng a2d63b4871 解决公司无法回显 2021-11-22 14:04:51 +08:00
red-deng-deng f9a0a2e364 解决bug 2021-11-22 13:57:52 +08:00
red-deng-deng 83573af738 更新菜单 2021-11-22 13:41:22 +08:00
red-deng-deng b77b419425 update 2021-11-22 11:00:01 +08:00
red-deng-deng a4cc402b76 更新 2021-11-22 10:08:22 +08:00
red-deng-deng 52dfd82b24 菜单维护接口连调 2021-11-21 19:01:51 +08:00
red-deng-deng d7aa0d7e7a 解决冲突 2021-11-21 18:04:39 +08:00
red-deng-deng a94ca16778 解决冲突 2021-11-21 17:53:37 +08:00
red-deng-deng 15cb3772a2 完成岗位逻辑处理，接口联动 2021-11-21 17:52:14 +08:00
姜棚 8a88b279f0 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-20 19:39:06 +08:00
姜棚 6d21182424 更新 2021-11-20 19:38:01 +08:00
姜棚 ab5ed091be Update enum.js 2021-11-20 19:37:11 +08:00
姜棚 e0ae04a592 g更新 2021-11-20 19:37:01 +08:00
red-deng-deng cc6a9c427b 岗位接口 2021-11-20 19:35:15 +08:00
red-deng-deng 4222528c49 分销商编辑/重置密码 2021-11-20 16:24:30 +08:00
red-deng-deng 806bb60c5b 分销商编辑接口完毕 2021-11-20 15:57:14 +08:00
red-deng-deng 35cf5d5781 分销商新建 2021-11-20 14:41:08 +08:00
red-deng-deng 3bbb7d30dc Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 
# Conflicts:
#	src/pages/distributor/adddistributorinfo/adddistributorinfo.js
 2021-11-20 13:44:51 +08:00
red-deng-deng 3e3b40fd05 更新分销商 2021-11-20 13:43:44 +08:00
姜棚 b3bbebb842 分销商 表单验证 2021-11-20 13:04:09 +08:00
red-deng-deng 2f81eb3944 分销商新建接口 2021-11-20 12:50:29 +08:00
姜棚 59ba507fce Update add.js 2021-11-20 10:58:41 +08:00
姜棚 5d3be7d374 更新 2021-11-20 10:57:31 +08:00
北海一刀 20fe250ff7 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-20 10:14:15 +08:00
北海一刀 344b64ac29 更新 2021-11-20 10:14:07 +08:00
red-deng-deng 0b84d0f24a 角色编辑更新接口 2021-11-19 21:07:17 +08:00
red-deng-deng 2288ae7b1c 完成角色和账号接口 2021-11-19 20:57:51 +08:00
北海一刀 a6979c3a9b Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-19 20:09:31 +08:00
北海一刀 4aba7943b0 更新表单分销商 2021-11-19 20:09:24 +08:00
red-deng-deng e389c2399d 完成账号列表 2021-11-19 19:29:40 +08:00
北海一刀 b0e7b605b6 Update main.js 2021-11-19 19:29:17 +08:00
北海一刀 c89f3c79bd 调整表单 2021-11-19 18:35:32 +08:00
北海一刀 bef5a9d95b 更新 2021-11-19 17:31:29 +08:00
red-deng-deng fe702c6acc Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-19 11:08:16 +08:00
red-deng-deng 4bc146e866 update 2021-11-19 11:08:05 +08:00
北海一刀 fd011adcef 更新 2021-11-19 11:04:16 +08:00
red-deng-deng 7d0ccea130 解决冲突 2021-11-19 09:40:47 +08:00
red-deng-deng b5e164562f 更新分销商 2021-11-19 09:39:24 +08:00
北海一刀 9eec1708fb Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-19 09:38:09 +08:00
北海一刀 b103a0d214 4564654 
456465454
 2021-11-19 09:33:39 +08:00
red-deng-deng c739d8704f 分销商列表接口，异步校验 2021-11-18 16:31:42 +08:00
北海一刀 f80f4999d3 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-18 09:52:50 +08:00
北海一刀 c9503c4a70 Update main.js 2021-11-18 09:52:44 +08:00
red-deng-deng 1d755402d1 Revert "Update main.js" 
This reverts commit c6880530ef.
 2021-11-18 09:51:22 +08:00
red-deng-deng f9b2d5c876 代码回滚 2021-11-18 09:50:16 +08:00
北海一刀 c6880530ef Update main.js 2021-11-18 09:45:51 +08:00
北海一刀 d76f7c8eca Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-18 09:33:23 +08:00
北海一刀 c33af66c3d 新增营销计划一堆东西 2021-11-18 09:33:13 +08:00
red-deng-deng a294f8286d 订单列表接口更新 2021-11-18 09:30:33 +08:00
red-deng-deng fbf5f698e0 订单管理更新 2021-11-17 20:54:17 +08:00
red-deng-deng fedd9b2bcf 兑换码管理列表接口调试完毕 2021-11-17 19:16:31 +08:00
red-deng-deng 5c0a879a62 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 
# Conflicts:
#	src/assets/api.js
 2021-11-17 17:15:11 +08:00
red-deng-deng 81d43693aa 兑换码管理查询接口 2021-11-17 17:13:46 +08:00
北海一刀 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
北海一刀 241eb68801 Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system 2021-11-11 15:04:08 +08:00
北海一刀 9b1d9246aa Update main.js 2021-11-11 15:04:02 +08:00
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