Commit Graph

105 Commits

Author SHA1 Message Date
cmx
252e4b7deb Merge pull request 'update adout upload adout tencentCOS' (#43) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/43
2020-08-12 15:18:55 +08:00
cmxdd
9baac8ef63 update adout upload adout tencentCOS 2020-08-12 15:17:48 +08:00
b1e5b24319
更换图片 2020-08-12 11:31:57 +08:00
cmxdd
26c2e044dc fixed bug 2020-08-11 20:37:54 +08:00
cmxdd
7cf5577cb0 fixed bug adout publish shop 2020-08-11 09:41:12 +08:00
cmxdd
9fac4e8a2e fixed bug adout shop 2020-08-10 20:24:58 +08:00
cmxdd
e223fd5ff9 Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into cmx 2020-08-10 19:06:34 +08:00
gyh
d7c6625416 Merge pull request 'GDPAO' (#36) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/36
2020-08-10 19:04:54 +08:00
Gdpao
0a8f2f815d GDPAO 2020-08-10 19:03:44 +08:00
e946b98abf
防止多次点击 2020-08-10 17:31:56 +08:00
cmxdd
2759972de6 Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into cmx 2020-08-10 16:55:34 +08:00
cmxdd
2ab2d1c38e fixed bug 2020-08-10 15:55:21 +08:00
gyh
d8840edb30 Merge pull request 'gdpao' (#33) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/33
2020-08-10 14:48:10 +08:00
Gdpao
1d98624753 gdpao 2020-08-10 14:47:20 +08:00
cmxdd
de2b7fe26d uopdate about conflict 2020-08-10 10:24:36 +08:00
cmxdd
a0e780d05b update adout color of tag 2020-08-10 10:01:10 +08:00
cmxdd
0b5fa511bf update adout tag color 2020-08-10 09:56:01 +08:00
55695f164b
meiyan 2020-08-09 18:36:37 +08:00
0279128637
解决了不出现的问题 2020-08-08 18:34:43 +08:00
427442f50a
关闭 2020-08-08 17:28:34 +08:00
641cb4a4a2
选中颜色 2020-08-08 16:53:44 +08:00
217e8b51ed
临时测试 2020-08-08 15:17:36 +08:00
74a9778a62
最初版本 合并 2020-08-08 15:09:56 +08:00
cmxdd
71a25fd11d fixed bug 2020-08-06 17:02:11 +08:00
cmxdd
80e3a721a1 formatted style 2020-08-05 20:10:55 +08:00
cmxdd
df1bad0a31 update other api 2020-08-05 17:42:06 +08:00
cmx
e9f0b1ba78 Merge pull request 'cmx' (#19) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/19
2020-08-05 09:16:07 +08:00
cmxdd
61756ac875 update publish 2020-08-05 09:15:02 +08:00
2d7ed292c0
Merge branch 'xbx' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-08-03 17:43:01 +08:00
30451e2767
宽度 2020-08-03 17:42:58 +08:00
59df1ed10f Merge branch 'master' into xbx 2020-08-03 16:50:56 +08:00
385653d391
直播 2020-08-03 16:47:46 +08:00
cmxdd
3e45c9350a 图文视频发布,文章选择删除逻辑没有处理完,需要继续处理 2020-07-31 10:14:46 +08:00
cmx
f6e4562ce2 Merge pull request 'cmx' (#15) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/15
2020-07-30 19:52:16 +08:00
cmxdd
22ea59f5c5 update about api 2020-07-30 19:49:12 +08:00
5520e7ab7c
添加进度条 2020-07-30 15:55:16 +08:00
1d9edefd7f
直播完成 2020-07-30 15:54:32 +08:00
519ec0abe8
直播修改 2020-07-30 08:46:35 +08:00
96adf9e6a9
修正了错误弹窗 2020-07-29 09:37:59 +08:00
49e80c48c0
引入融云 2020-07-25 14:53:19 +08:00
7b8ddc734c
直播选择商品 2020-07-25 08:57:32 +08:00
52bbaf55e1
直播 2020-07-24 08:57:03 +08:00
78f63eb990
1 2020-07-21 20:38:16 +08:00
9838aab5f4
直播需要修改接口 2020-07-21 19:50:26 +08:00
d04146d479
完成 2020-07-21 17:03:59 +08:00
72f56fe563
选择完成 2020-07-21 15:00:39 +08:00
d2ddb26479
选择商品 2020-07-21 08:57:48 +08:00
4bade07d14
直播的修改 2020-07-17 09:49:42 +08:00
c705ad51d7
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-07-16 11:23:22 +08:00
616af0337c
直播添加标签 2020-07-16 11:20:59 +08:00
zmr900709
5f8e0f5f10 添加api管管管理 2020-07-16 09:47:53 +08:00
zmr900709
2220e80494 ceshi 2020-07-16 08:53:47 +08:00
zmr900709
c9be045ae0 v 2020-06-15 10:03:19 +08:00
zmr900709
5a20ca8726 v 2020-06-15 09:02:17 +08:00
zmr900709
ce24d670b6 v 2020-06-12 17:42:23 +08:00