red-deng-deng
|
75cfc95ed1
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-25 10:14:07 +08:00 |
|
red-deng-deng
|
821f573a30
|
解决bug
|
2021-11-25 10:13:57 +08:00 |
姜棚
|
1ef9701d80
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-25 09:49:55 +08:00 |
|
姜棚
|
eaabbd6771
|
更新
|
2021-11-25 09:49:06 +08:00 |
|
red-deng-deng
|
7bc67bb3e6
|
解决启用停用bug
|
2021-11-24 20:48:56 +08:00 |
|
red-deng-deng
|
60650d994d
|
兑换码bug
|
2021-11-24 20:43:04 +08:00 |
|
red-deng-deng
|
04746ac453
|
解决分销商状态
|
2021-11-24 20:27:12 +08:00 |
|
red-deng-deng
|
37863e4a69
|
update
|
2021-11-24 20:25:15 +08:00 |
|
red-deng-deng
|
8cedd32d85
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
# Conflicts:
# src/components/filterbar/main.js
|
2021-11-24 20:20:54 +08:00 |
|
red-deng-deng
|
5fb468be66
|
解决订单模块bug
|
2021-11-24 20:20:20 +08:00 |
|
姜棚
|
e52e549344
|
更新
|
2021-11-24 20:04:54 +08:00 |
|
姜棚
|
0bbaeba3e4
|
Update step2.js
|
2021-11-24 19:07:03 +08:00 |
|
姜棚
|
d31e118d7d
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-24 19:05:21 +08:00 |
|
姜棚
|
d1914b0092
|
更新
|
2021-11-24 19:05:15 +08:00 |
|
red-deng-deng
|
92cf45585a
|
解决bug
|
2021-11-24 18:59:21 +08:00 |
|
red-deng-deng
|
b15de4ab10
|
解决分销商添加号码
|
2021-11-24 18:06:37 +08:00 |
|
姜棚
|
931fa8de57
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-24 18:02:59 +08:00 |
|
姜棚
|
19575f1283
|
落地页
|
2021-11-24 18:02:52 +08:00 |
|
red-deng-deng
|
eb135e3457
|
更改岗位bug
|
2021-11-24 17:38:50 +08:00 |
|
red-deng-deng
|
b32506ec68
|
解决分销商bug
|
2021-11-24 17:08:40 +08:00 |
|
red-deng-deng
|
242e5c1f9d
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-24 17:08:15 +08:00 |
|
red-deng-deng
|
786e1baffb
|
解决bug
|
2021-11-24 17:08:06 +08:00 |
|
姜棚
|
395676167e
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-24 16:10:35 +08:00 |
|
姜棚
|
1d9f824652
|
更新兑换页
|
2021-11-24 16:10:28 +08:00 |
|
red-deng-deng
|
f665506e3a
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-24 15:13:17 +08:00 |
|
red-deng-deng
|
89ecc56608
|
觉得添加
|
2021-11-24 15:13:07 +08:00 |
|
姜棚
|
ef273bbb25
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-24 14:35:25 +08:00 |
|
姜棚
|
47fa8d1012
|
Update api.js
|
2021-11-24 14:35:22 +08:00 |
|
red-deng-deng
|
efe0d7a950
|
解决岗位管理biug
|
2021-11-24 13:33:25 +08:00 |
|
red-deng-deng
|
32b755ef33
|
调整岗位
|
2021-11-24 11:41:06 +08:00 |
|
red-deng-deng
|
8fe5e169ba
|
新增分销商页面，复制账号密码密码必须为6位才能复制
|
2021-11-24 10:43:13 +08:00 |
|
red-deng-deng
|
4d1ed6c09b
|
【订单列表】订单详情页面，购买数量以及总计前端未展示未计算
|
2021-11-24 10:37:26 +08:00 |
|
red-deng-deng
|
fb9e5c4670
|
【系统管理--账号管理】编辑页面，重新选择了公司（或部门），下一级部门和岗位，应该置空需要根据所选的公司（或部门）重新选择下一级部门和岗位
|
2021-11-24 10:24:56 +08:00 |
|
red-deng-deng
|
06851c541d
|
【订单列表】页面无数据，页数展示为”undefined“
|
2021-11-24 10:01:13 +08:00 |
|
姜棚
|
fc4da4d9e8
|
更新
|
2021-11-24 09:25:34 +08:00 |
|
red-deng-deng
|
52d55badf4
|
更改账号上传按钮
|
2021-11-23 22:09:27 +08:00 |
|
red-deng-deng
|
50c74d1f43
|
解决订单结算
|
2021-11-23 21:38:13 +08:00 |
|
red-deng-deng
|
1deb03c2e6
|
解决订单bug
|
2021-11-23 21:26:38 +08:00 |
|
red-deng-deng
|
f078abc1f2
|
update
|
2021-11-23 21:01:55 +08:00 |
|
red-deng-deng
|
7596a50c15
|
解决冲突
|
2021-11-23 21:00:15 +08:00 |
|
red-deng-deng
|
bd2205c0d9
|
回滚
|
2021-11-23 20:48:42 +08:00 |
|
姜棚
|
7f470c94c3
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-23 15:54:55 +08:00 |
|
姜棚
|
4d1032767f
|
更新
|
2021-11-23 15:54:11 +08:00 |
|
red-deng-deng
|
01ad9d3d5c
|
更改状态
|
2021-11-23 15:17:55 +08:00 |
|
red-deng-deng
|
4d8279db03
|
修改样式
|
2021-11-23 15:13:30 +08:00 |
|
red-deng-deng
|
de95ecf38d
|
取消新建订单日志
|
2021-11-23 14:52:16 +08:00 |
|
red-deng-deng
|
72917491a2
|
完成退出登录
|
2021-11-23 14:48:53 +08:00 |
|
red-deng-deng
|
a45821d52d
|
完成登录失错校验，弹出验证码
|
2021-11-23 11:31:22 +08:00 |
|
red-deng-deng
|
d186856cc9
|
解决角色编辑后端更新路由bug
|
2021-11-23 09:48:39 +08:00 |
|
red-deng-deng
|
6527fbcf93
|
更新
|
2021-11-23 09:37:49 +08:00 |
|
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 |