姜棚
|
0bb2c6d70c
|
Update add.less
|
2021-11-30 07:43:41 +08:00 |
|
姜棚
|
e40027bbc0
|
Update add.less
|
2021-11-30 07:29:41 +08:00 |
|
姜棚
|
0d499843de
|
更新
|
2021-11-30 07:24:12 +08:00 |
|
姜棚
|
4302d90081
|
Update add.less
|
2021-11-30 07:21:00 +08:00 |
|
姜棚
|
375d4ff1ff
|
Update add.js
|
2021-11-30 06:50:04 +08:00 |
|
姜棚
|
a279166336
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-30 06:39:06 +08:00 |
|
姜棚
|
f2ae8f99c0
|
Update add.js
|
2021-11-30 06:38:55 +08:00 |
red-deng-deng
|
c5b52249e7
|
解决提示框绿色
|
2021-11-30 06:13:08 +08:00 |
|
姜棚
|
46bbc6affd
|
Update main.js
|
2021-11-30 05:41:08 +08:00 |
|
姜棚
|
a9b97bae90
|
Update main.js
|
2021-11-30 05:33:27 +08:00 |
|
姜棚
|
5d3e5eaeae
|
Update main.js
|
2021-11-30 04:57:30 +08:00 |
|
姜棚
|
930d04fd4c
|
Update api.js
|
2021-11-30 04:38:03 +08:00 |
|
姜棚
|
8971d3a9a0
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-30 04:34:56 +08:00 |
|
姜棚
|
82c506b60a
|
Update main.js
|
2021-11-30 04:34:50 +08:00 |
|
red-deng-deng
|
966297126d
|
解决登录无提示
|
2021-11-30 04:32:24 +08:00 |
|
姜棚
|
64b002b780
|
更新
|
2021-11-30 04:28:35 +08:00 |
|
姜棚
|
738ac200c4
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-30 04:06:27 +08:00 |
|
姜棚
|
95ab084586
|
更新
|
2021-11-30 04:06:06 +08:00 |
|
red-deng-deng
|
681c540ed6
|
解决bug
|
2021-11-30 04:04:46 +08:00 |
|
姜棚
|
c9f8d1a734
|
更新
|
2021-11-30 03:53:59 +08:00 |
|
姜棚
|
689a01f9fc
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-30 03:47:35 +08:00 |
|
姜棚
|
eb5faea2bb
|
Update main.js
|
2021-11-30 03:41:54 +08:00 |
|
red-deng-deng
|
c2a50747e0
|
解决全局消息提示
|
2021-11-30 03:32:28 +08:00 |
|
姜棚
|
e6525eda45
|
Update step1.js
|
2021-11-30 03:25:48 +08:00 |
|
姜棚
|
50e4e0add4
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-30 03:17:09 +08:00 |
|
姜棚
|
166a900f55
|
Update step2.js
|
2021-11-30 03:17:01 +08:00 |
|
red-deng-deng
|
6b4c996283
|
解决订单清空条件
|
2021-11-30 02:59:33 +08:00 |
|
red-deng-deng
|
3a2fc83a05
|
解决分销商订单查询
|
2021-11-30 02:57:29 +08:00 |
|
red-deng-deng
|
bca2eaf9ce
|
解决分销商重置密码提示
|
2021-11-30 02:45:43 +08:00 |
|
姜棚
|
6a602619c5
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-30 02:32:15 +08:00 |
|
姜棚
|
db937f2d7e
|
Update step1.js
|
2021-11-30 02:31:18 +08:00 |
|
red-deng-deng
|
71f90f27e2
|
解决分销商bug
|
2021-11-30 02:28:49 +08:00 |
|
姜棚
|
1dc627daaa
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-30 02:17:37 +08:00 |
|
姜棚
|
aad94e9c3c
|
Update step1.js
|
2021-11-30 02:17:26 +08:00 |
|
red-deng-deng
|
1f17bc6efa
|
解决全局异常报错
|
2021-11-30 01:51:16 +08:00 |
|
姜棚
|
9d49c3cb1d
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-30 01:42:24 +08:00 |
|
姜棚
|
b8b860661a
|
Update main.js
|
2021-11-30 01:42:02 +08:00 |
|
red-deng-deng
|
a95504160b
|
解决邮箱bug
|
2021-11-30 01:41:55 +08:00 |
|
red-deng-deng
|
82f5200bc3
|
解决分销商bug
|
2021-11-30 01:34:40 +08:00 |
|
姜棚
|
479c9c1fb0
|
Update add.js
|
2021-11-30 01:16:59 +08:00 |
|
姜棚
|
0e0e9c446b
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-30 01:14:49 +08:00 |
|
姜棚
|
506037fbc1
|
更新
|
2021-11-30 01:14:42 +08:00 |
|
red-deng-deng
|
78c49a8be3
|
update
|
2021-11-30 00:35:38 +08:00 |
|
red-deng-deng
|
fb0e7d4873
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-30 00:35:21 +08:00 |
|
red-deng-deng
|
8eead77573
|
解决值回显
|
2021-11-30 00:34:37 +08:00 |
|
姜棚
|
7d7e9ee5de
|
更新
|
2021-11-30 00:33:00 +08:00 |
|
姜棚
|
95898ac09c
|
Update add.js
|
2021-11-30 00:01:42 +08:00 |
|
姜棚
|
c2647a7be7
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-29 23:46:58 +08:00 |
|
姜棚
|
167f4a9875
|
更新
|
2021-11-29 23:46:44 +08:00 |
|
red-deng-deng
|
46f3ebdba5
|
解决后台bug
|
2021-11-29 23:22:05 +08:00 |
|
姜棚
|
e86c8bd322
|
更新
|
2021-11-29 23:01:18 +08:00 |
|
姜棚
|
599b7add38
|
更新
|
2021-11-29 22:51:49 +08:00 |
|
姜棚
|
43fce6c05c
|
更新
|
2021-11-29 22:44:07 +08:00 |
|
姜棚
|
a88684ccae
|
更新
|
2021-11-29 22:31:01 +08:00 |
|
姜棚
|
133d7f235e
|
Update step2.js
|
2021-11-29 21:36:32 +08:00 |
|
姜棚
|
836f093790
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-29 21:03:39 +08:00 |
|
姜棚
|
d5bd8e1244
|
更新
|
2021-11-29 21:03:29 +08:00 |
|
red-deng-deng
|
413de286cb
|
解决bug，配置登陆menu为空提示
|
2021-11-29 18:03:24 +08:00 |
|
red-deng-deng
|
9f38dd120b
|
解决bug
|
2021-11-29 17:41:29 +08:00 |
|
red-deng-deng
|
7ac72fe989
|
解决后端登陆不提示
|
2021-11-29 17:19:09 +08:00 |
|
red-deng-deng
|
281614065b
|
动态菜单
|
2021-11-29 17:08:36 +08:00 |
|
red-deng-deng
|
34c41b64be
|
更新
|
2021-11-29 15:35:15 +08:00 |
|
red-deng-deng
|
d55a123580
|
解决登陆存入动态路由
|
2021-11-29 14:52:47 +08:00 |
|
red-deng-deng
|
76c45170fe
|
清除hash
|
2021-11-29 14:47:46 +08:00 |
|
red-deng-deng
|
e178b22753
|
update
|
2021-11-29 14:37:56 +08:00 |
|
red-deng-deng
|
a596f4a487
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-29 14:37:37 +08:00 |
|
red-deng-deng
|
26cfe3e8a6
|
解决token下载文件权限
|
2021-11-29 14:37:25 +08:00 |
|
姜棚
|
6a935e75b0
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-29 14:32:45 +08:00 |
|
姜棚
|
1be0b1fb0e
|
更新
|
2021-11-29 14:32:38 +08:00 |
|
red-deng-deng
|
528b300bc0
|
解决token失效报错
|
2021-11-29 14:28:15 +08:00 |
|
red-deng-deng
|
3168f64e9c
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-29 14:27:54 +08:00 |
|
red-deng-deng
|
c9827f238b
|
解决token失效
|
2021-11-29 14:27:44 +08:00 |
|
姜棚
|
f04a6717f9
|
Update edit.js
|
2021-11-29 14:17:12 +08:00 |
|
姜棚
|
f3724d40f7
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-29 13:53:37 +08:00 |
|
姜棚
|
01839a3e58
|
更新
|
2021-11-29 13:53:30 +08:00 |
|
red-deng-deng
|
04e5560342
|
调整样式
|
2021-11-29 11:29:26 +08:00 |
|
red-deng-deng
|
a4d42d2825
|
解决标签页
|
2021-11-29 11:25:03 +08:00 |
|
姜棚
|
ee17ade0cd
|
Update add.js
|
2021-11-28 22:18:27 +08:00 |
|
姜棚
|
3b87331743
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-28 22:10:19 +08:00 |
|
姜棚
|
f34d025f33
|
更新
|
2021-11-28 22:07:08 +08:00 |
|
red-deng-deng
|
3686744a51
|
解决标签显示
|
2021-11-28 21:46:34 +08:00 |
|
red-deng-deng
|
dd4a69872d
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
# Conflicts:
# src/App.css
|
2021-11-28 21:13:40 +08:00 |
|
red-deng-deng
|
8a1e770342
|
解决B端bug
|
2021-11-28 21:12:44 +08:00 |
|
姜棚
|
b8e70e5266
|
更新
|
2021-11-28 20:44:42 +08:00 |
|
姜棚
|
813023b998
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-28 19:18:31 +08:00 |
|
姜棚
|
350d0fbaad
|
更新
|
2021-11-28 19:18:24 +08:00 |
|
red-deng-deng
|
d9ab474c85
|
更新
|
2021-11-28 19:07:00 +08:00 |
|
姜棚
|
6ea0a1f400
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-28 18:38:16 +08:00 |
|
姜棚
|
7fc8bf59b9
|
更新
|
2021-11-28 18:38:09 +08:00 |
|
red-deng-deng
|
a1fc432ba5
|
解决bug
|
2021-11-28 18:34:00 +08:00 |
|
red-deng-deng
|
537690bfb4
|
解决token失效退出登录
|
2021-11-28 18:01:15 +08:00 |
|
red-deng-deng
|
ba6c1f3fa6
|
解决token失效
|
2021-11-28 17:52:45 +08:00 |
|
red-deng-deng
|
66b2f7a5bb
|
解决订单bug
|
2021-11-28 17:43:05 +08:00 |
|
姜棚
|
6674d16bca
|
Update api.js
|
2021-11-28 17:14:39 +08:00 |
|
姜棚
|
8e1d39e9e9
|
更新
|
2021-11-28 17:00:30 +08:00 |
|
姜棚
|
40c21370e1
|
更新
|
2021-11-28 16:36:50 +08:00 |
|
姜棚
|
bb07818698
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-28 16:14:40 +08:00 |
|
姜棚
|
263d85843b
|
更新
|
2021-11-28 16:14:33 +08:00 |
|
red-deng-deng
|
7d4b4a7fb9
|
update
|
2021-11-28 16:14:04 +08:00 |
|
red-deng-deng
|
7021d3f56f
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-28 16:13:43 +08:00 |
|
red-deng-deng
|
d4e717201b
|
订单更为成功
|
2021-11-28 16:12:41 +08:00 |
|
姜棚
|
4d2ca74c56
|
Update list.js
|
2021-11-28 15:50:50 +08:00 |
|
姜棚
|
c014315ade
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-28 15:48:50 +08:00 |
|
姜棚
|
41097fad69
|
更新
|
2021-11-28 15:48:41 +08:00 |
|
red-deng-deng
|
3e7676879b
|
限制图片上传大小
|
2021-11-28 14:44:13 +08:00 |
|
red-deng-deng
|
b74cd53d91
|
更新账号显示
|
2021-11-28 14:04:28 +08:00 |
|
red-deng-deng
|
501101ee36
|
更改头像，解决账号编辑代码报错
|
2021-11-28 13:59:35 +08:00 |
|
姜棚
|
21c11dae32
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-28 13:10:35 +08:00 |
|
姜棚
|
47706f0c97
|
更新
|
2021-11-28 13:10:26 +08:00 |
|
red-deng-deng
|
b673ce07b6
|
解决图片请求头未带token
|
2021-11-28 11:58:47 +08:00 |
|
姜棚
|
870aac783e
|
Update api.js
|
2021-11-28 11:48:18 +08:00 |
|
姜棚
|
9594d15833
|
Update list.js
|
2021-11-28 11:40:11 +08:00 |
|
姜棚
|
72bc17b6a7
|
更新
|
2021-11-28 11:31:44 +08:00 |
|
姜棚
|
313f15f7e5
|
Update list.js
|
2021-11-28 11:29:05 +08:00 |
|
姜棚
|
159df81ec3
|
更新
|
2021-11-28 11:25:18 +08:00 |
|
姜棚
|
06d0e90be6
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-28 10:56:49 +08:00 |
|
姜棚
|
119aa35393
|
Update api.js
|
2021-11-28 10:56:42 +08:00 |
|
red-deng-deng
|
a1cb9e7175
|
提交订单勾选订单号导出
|
2021-11-28 10:50:00 +08:00 |
|
姜棚
|
ca060f9f77
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-27 22:51:32 +08:00 |
|
姜棚
|
b3c63fd7d9
|
更新
|
2021-11-27 22:51:25 +08:00 |
|
red-deng-deng
|
85a127ede8
|
解决公司id匹配无值
|
2021-11-27 22:45:24 +08:00 |
|
姜棚
|
5ea0e6cf67
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-27 21:30:02 +08:00 |
|
姜棚
|
1608c9940e
|
Update list.js
|
2021-11-27 21:29:55 +08:00 |
|
姜棚
|
400854731a
|
更新
|
2021-11-27 21:22:28 +08:00 |
|
red-deng-deng
|
4225fcb793
|
根据AC更改
|
2021-11-27 20:31:20 +08:00 |
|
red-deng-deng
|
3ccda10c54
|
解决后台表格兼容性
|
2021-11-27 20:03:15 +08:00 |
|
姜棚
|
62ba91fbc6
|
更新
|
2021-11-27 19:04:02 +08:00 |
|
姜棚
|
bb93c1b999
|
Update list.js
|
2021-11-27 18:38:23 +08:00 |
|
姜棚
|
8c12ef7d51
|
更新
|
2021-11-27 18:26:22 +08:00 |
|
姜棚
|
204ab8457d
|
Update list.js
|
2021-11-27 18:09:13 +08:00 |
|
姜棚
|
979b446480
|
更新
更新
|
2021-11-27 18:07:24 +08:00 |
|
姜棚
|
599f08beef
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-27 17:39:23 +08:00 |
|
姜棚
|
71d311e204
|
Update adddistributorinfo.js
|
2021-11-27 17:36:53 +08:00 |
|
red-deng-deng
|
ad60fd1ba2
|
调整路由
|
2021-11-27 17:32:43 +08:00 |
|
red-deng-deng
|
791f470d80
|
更改账号格式
|
2021-11-27 17:05:51 +08:00 |
|
red-deng-deng
|
26dc0640f1
|
订单更改
|
2021-11-27 16:30:46 +08:00 |
|
姜棚
|
8c2895bfa5
|
Update step3.js
|
2021-11-27 16:12:05 +08:00 |
|
姜棚
|
0f3ded2c16
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-27 15:55:53 +08:00 |
|
姜棚
|
8471d7a0f4
|
更新
|
2021-11-27 15:55:46 +08:00 |
|
red-deng-deng
|
57cc144256
|
登录获取验证码
|
2021-11-27 14:46:19 +08:00 |
|
姜棚
|
8c14b34bc8
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-27 14:23:54 +08:00 |
|
姜棚
|
e1a7a16452
|
更新
|
2021-11-27 14:23:52 +08:00 |
|
姜棚
|
7b869bd8ee
|
Update list.js
|
2021-11-26 21:04:28 +08:00 |
|
red-deng-deng
|
240532388f
|
解决bug
|
2021-11-26 20:47:59 +08:00 |
|
姜棚
|
eea4d5e0b4
|
更新
|
2021-11-26 20:40:31 +08:00 |
|
姜棚
|
47768ec612
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-26 20:31:16 +08:00 |
|
姜棚
|
72a4a56644
|
更新
|
2021-11-26 20:30:45 +08:00 |
|
red-deng-deng
|
8504313606
|
营销系统统计
|
2021-11-26 20:22:53 +08:00 |
|
red-deng-deng
|
c44bd69a5a
|
update
|
2021-11-26 19:54:17 +08:00 |
|
red-deng-deng
|
2d7b898b3b
|
调整退出登录样式
|
2021-11-26 19:53:49 +08:00 |
|
red-deng-deng
|
172b340e7b
|
更新添加邮箱
|
2021-11-26 19:46:39 +08:00 |
|
red-deng-deng
|
2f1e67c5b3
|
更新
|
2021-11-26 19:43:54 +08:00 |
|
red-deng-deng
|
16cc073eac
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-26 19:43:26 +08:00 |
|
red-deng-deng
|
33101a0b44
|
完成订单日志
|
2021-11-26 19:43:14 +08:00 |
|
姜棚
|
f78b98d288
|
Update step1.js
|
2021-11-26 19:34:54 +08:00 |
|
姜棚
|
a78930d518
|
更新
|
2021-11-26 19:30:31 +08:00 |
|
姜棚
|
7323deea09
|
Update list.js
|
2021-11-26 17:47:29 +08:00 |
|
姜棚
|
21633bc7d5
|
Update step2.js
|
2021-11-26 17:42:22 +08:00 |
|
姜棚
|
09480081ca
|
韩庚
|
2021-11-26 17:32:25 +08:00 |
|
姜棚
|
f3b433d8a1
|
Update list.js
|
2021-11-26 17:24:01 +08:00 |
|
姜棚
|
b6c07eb5ab
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-26 17:17:22 +08:00 |
|
姜棚
|
41408b31da
|
更新
|
2021-11-26 17:17:14 +08:00 |
|
red-deng-deng
|
48b9fd14fb
|
替换直冲-直充，密码输入框加眼睛
|
2021-11-26 16:35:39 +08:00 |
|
姜棚
|
0cf8ee5aba
|
更新
|
2021-11-26 16:05:43 +08:00 |
|
姜棚
|
c9ed452d38
|
更新
|
2021-11-26 16:00:35 +08:00 |
|
姜棚
|
4404885bc9
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-26 15:05:49 +08:00 |
|
姜棚
|
5c2bad96af
|
更新
|
2021-11-26 15:05:42 +08:00 |
|
red-deng-deng
|
4efa585270
|
解决图片回显
|
2021-11-26 14:59:54 +08:00 |
|
姜棚
|
c818109191
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-26 14:42:14 +08:00 |
|
姜棚
|
8b723ba609
|
更新
|
2021-11-26 14:42:07 +08:00 |
|
red-deng-deng
|
eeddf97906
|
解决官方价格无显示
|
2021-11-26 14:15:57 +08:00 |
|
red-deng-deng
|
ec3d6bfd25
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-26 14:10:51 +08:00 |
|
red-deng-deng
|
d304ac3679
|
解决bug
|
2021-11-26 14:10:40 +08:00 |
|
姜棚
|
ce5782b079
|
更新是否允许
|
2021-11-26 13:59:23 +08:00 |
|
姜棚
|
bf9cea4219
|
Update list.js
|
2021-11-26 13:32:49 +08:00 |
|
姜棚
|
50be465097
|
更新
|
2021-11-26 13:27:36 +08:00 |
|
姜棚
|
dfbb95d6cd
|
更新
|
2021-11-26 11:46:19 +08:00 |
|
姜棚
|
3b73fae49c
|
更新
|
2021-11-26 11:36:41 +08:00 |
|
姜棚
|
551fc1666e
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-26 11:22:29 +08:00 |
|
姜棚
|
d921066bef
|
更新
|
2021-11-26 11:22:21 +08:00 |
|
red-deng-deng
|
0af44b5aef
|
解决bug
|
2021-11-26 11:02:34 +08:00 |
|
red-deng-deng
|
9dcd29828d
|
解决切换bug
|
2021-11-26 10:59:41 +08:00 |
|
姜棚
|
fe0c173380
|
更新
|
2021-11-26 10:56:11 +08:00 |
|
姜棚
|
0ade558d3d
|
Update add.js
|
2021-11-26 09:56:27 +08:00 |
|
姜棚
|
787f30f906
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-26 09:50:36 +08:00 |
|
姜棚
|
a4f1d6849c
|
Update step3.js
|
2021-11-26 09:50:34 +08:00 |
|
red-deng-deng
|
507512a6b6
|
解决冲突
|
2021-11-26 09:41:33 +08:00 |
|
red-deng-deng
|
d57ce78765
|
解决角色管理bug
|
2021-11-26 09:40:23 +08:00 |
|
姜棚
|
59a5473bd8
|
更
|
2021-11-26 09:38:53 +08:00 |
|
姜棚
|
d58f414af3
|
更新
|
2021-11-26 09:38:44 +08:00 |
|
姜棚
|
61123f93dd
|
更新
更新
|
2021-11-26 09:35:33 +08:00 |
|
姜棚
|
73c145d175
|
更新
|
2021-11-26 09:34:12 +08:00 |
|
red-deng-deng
|
3687c26107
|
解决bug
|
2021-11-25 21:44:39 +08:00 |
|
red-deng-deng
|
7399837300
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
# Conflicts:
# src/pages/exchangecode/commodity/goodedit.js
|
2021-11-25 21:02:50 +08:00 |
|
red-deng-deng
|
892e3ecaf4
|
解决bug
|
2021-11-25 21:01:57 +08:00 |
|
姜棚
|
bc07a195b5
|
更新
|
2021-11-25 19:58:28 +08:00 |
|
姜棚
|
2ffac5cdc3
|
Update edit.js
|
2021-11-25 19:38:14 +08:00 |
|
姜棚
|
93c0393f5c
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-25 19:34:06 +08:00 |
|
姜棚
|
51eb4f3c10
|
更新
|
2021-11-25 19:33:58 +08:00 |
|
red-deng-deng
|
6750d99ba8
|
解决bug
|
2021-11-25 19:32:44 +08:00 |
|
姜棚
|
7120f63254
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-25 17:38:50 +08:00 |
|
姜棚
|
538be3024d
|
更新
|
2021-11-25 17:38:43 +08:00 |
|
red-deng-deng
|
6a220aa2e2
|
解决枚举
|
2021-11-25 17:34:16 +08:00 |
|
red-deng-deng
|
42a86153fe
|
更新
|
2021-11-25 17:17:35 +08:00 |
|
red-deng-deng
|
1b26c39b4d
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-25 17:17:20 +08:00 |
|
red-deng-deng
|
c752a5fdfe
|
update
|
2021-11-25 17:17:10 +08:00 |
|
姜棚
|
6926fa0a81
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-25 16:25:14 +08:00 |
|
姜棚
|
667a057733
|
更新
|
2021-11-25 16:25:07 +08:00 |
|
red-deng-deng
|
be5d9edc13
|
解决切换页码bug
|
2021-11-25 16:18:48 +08:00 |
|
姜棚
|
712d39224f
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-25 15:51:38 +08:00 |
|
姜棚
|
8ebc169d5a
|
修复bug
|
2021-11-25 15:51:31 +08:00 |
|
red-deng-deng
|
81200868ba
|
解决无回显bug
|
2021-11-25 15:30:24 +08:00 |
|
red-deng-deng
|
f539a05a6c
|
调整营销系统bug
|
2021-11-25 15:22:16 +08:00 |
|
姜棚
|
dc5182fb89
|
更新
|
2021-11-25 14:56:39 +08:00 |
|
red-deng-deng
|
532e716067
|
解决分销商bug
|
2021-11-25 14:43:11 +08:00 |
|
red-deng-deng
|
a6f3868e27
|
解决启用/禁用计划
|
2021-11-25 14:19:38 +08:00 |
|
red-deng-deng
|
6d0f7c7ed7
|
解决营销系统bug
|
2021-11-25 14:12:58 +08:00 |
|
red-deng-deng
|
7e41af12b7
|
在营销计划的key批次列表页面，页面字段未展示完整，前端应该按照原型图进行添加
|
2021-11-25 14:01:26 +08:00 |
|
red-deng-deng
|
4360642702
|
解决页码无显示
|
2021-11-25 13:47:48 +08:00 |
|
red-deng-deng
|
51ba5ef90d
|
update
|
2021-11-25 13:42:40 +08:00 |
|
red-deng-deng
|
021d6e9545
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-25 13:42:25 +08:00 |
|
red-deng-deng
|
70dd51d1cd
|
解决表格页码tab切换bug
|
2021-11-25 13:42:15 +08:00 |
|
姜棚
|
b3f5b3c041
|
更新
|
2021-11-25 11:57:25 +08:00 |
|
姜棚
|
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 |