姜棚
|
e52afd97dd
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-25 11:16:21 +08:00 |
|
姜棚
|
d4becccade
|
Update main.js
|
2021-11-25 11:14:50 +08:00 |
red-deng-deng
|
b693366f8d
|
【我的模板】新增我的模板，key和兑换码的文字背景字符展示不规范
|
2021-11-25 11:08:56 +08:00 |
|
姜棚
|
5353a278d4
|
更新
更新
|
2021-11-25 11:08:06 +08:00 |
|
姜棚
|
bcd4161048
|
更新
|
2021-11-25 11:07:46 +08:00 |
|
姜棚
|
e69a659ebe
|
Update step2.js
|
2021-11-25 11:01:27 +08:00 |
|
姜棚
|
126ede839c
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-25 10:32:40 +08:00 |
|
姜棚
|
6d594a9592
|
Update list.js
|
2021-11-25 10:32:30 +08:00 |
|
red-deng-deng
|
30e6f9ebe8
|
解决兑换码翻页bug
|
2021-11-25 10:21:56 +08:00 |
|
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
|
e5ef4be0e1
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-23 20:48:52 +08:00 |