|
|
7d82d8d156
|
Merge pull request 'Merge pull request 'cmx' (#21) from cmx into master' (#22) from master into cmx
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/22
|
2020-08-05 20:12:03 +08:00 |
|
|
|
c1a3a11781
|
Merge pull request 'cmx' (#21) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/21
|
2020-08-05 20:11:36 +08:00 |
|
cmxdd
|
80e3a721a1
|
formatted style
|
2020-08-05 20:10:55 +08:00 |
|
cmxdd
|
31474f482f
|
update api
|
2020-08-05 20:03:53 +08:00 |
|
cmxdd
|
df1bad0a31
|
update other api
|
2020-08-05 17:42:06 +08:00 |
|
|
|
ec2bbcdc29
|
Merge pull request 'master' (#20) from master into cmx
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/20
|
2020-08-05 09:16:39 +08:00 |
|
|
|
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 |
|
|
|
c5e16abbc2
|
Merge pull request 'xbx' (#18) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/18
|
2020-08-03 17:44:23 +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 |
|
|
|
cde4e7db87
|
Merge pull request '直播' (#17) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/17
|
2020-08-03 16:51:03 +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 |
|
|
|
2ed7b6798b
|
Merge pull request 'master' (#16) from master into cmx
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/16
|
2020-07-31 08:33:13 +08:00 |
|
|
|
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 |
|
|
|
b9e15c1b02
|
Merge pull request 'xbx' (#14) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/14
|
2020-07-30 15:56:03 +08:00 |
|
|
|
5520e7ab7c
|
添加进度条
|
2020-07-30 15:55:16 +08:00 |
|
|
|
1d9edefd7f
|
直播完成
|
2020-07-30 15:54:32 +08:00 |
|
cmxdd
|
5094efd41e
|
fixed v-toast
|
2020-07-30 10:12:27 +08:00 |
|
cmxdd
|
70e848cbbb
|
update api abput mine
|
2020-07-30 09:41:08 +08:00 |
|
|
|
b605f68e72
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
|
2020-07-30 09:33:13 +08:00 |
|
|
|
2525db391c
|
Merge pull request 'update api' (#13) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/13
|
2020-07-30 09:32:16 +08:00 |
|
|
|
dbffca53c8
|
Merge branch 'master' into cmx
|
2020-07-30 09:32:11 +08:00 |
|
|
|
519ec0abe8
|
直播修改
|
2020-07-30 08:46:35 +08:00 |
|
cmxdd
|
243e1f93bd
|
update api
|
2020-07-29 20:35:33 +08:00 |
|
|
|
74fbd629d6
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
|
2020-07-29 15:28:31 +08:00 |
|
|
|
e71a43eb85
|
Merge pull request 'cmx' (#12) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/12
|
2020-07-29 15:26:56 +08:00 |
|
cmxdd
|
fef56d1b52
|
update two login style
|
2020-07-29 15:21:40 +08:00 |
|
cmxdd
|
cc7a293e18
|
update
|
2020-07-29 10:42:37 +08:00 |
|
cmxdd
|
8660e95d02
|
test
|
2020-07-29 10:40:55 +08:00 |
|
|
|
96adf9e6a9
|
修正了错误弹窗
|
2020-07-29 09:37:59 +08:00 |
|
|
|
7245d83dcd
|
Merge pull request 'xbx' (#11) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/11
|
2020-07-25 14:54:05 +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 |
|
|
|
7924bc0d3b
|
Merge pull request 'xbx' (#10) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/10
|
2020-07-21 19:50:54 +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 |
|
|
|
686a1b5c56
|
临时
|
2020-07-18 10:29:00 +08:00 |
|
|
|
2aef7bed5c
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
|
2020-07-17 09:53:18 +08:00 |
|
|
|
4bade07d14
|
直播的修改
|
2020-07-17 09:49:42 +08:00 |
|
|
|
a4996b2f1c
|
Merge pull request 'zmr' (#9) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/9
|
2020-07-16 14:39:11 +08:00 |
|
zmr900709
|
5ded240466
|
massage
|
2020-07-16 14:37:10 +08:00 |
|
zmr900709
|
34e1c2811a
|
massage
|
2020-07-16 14:36:07 +08:00 |
|
