Commit Graph

55 Commits

Author SHA1 Message Date
74fbd629d6
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-07-29 15:28:31 +08:00
cmx
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
zmr900709
82508aa615 massage 2020-07-16 14:23:12 +08:00
fa383397b3 Merge pull request 'xbx' (#7) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/7
2020-07-16 11:29:30 +08:00
feb2b358e1
删除 2020-07-16 11:23:36 +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
afc8ea208a Merge pull request 'zmr' (#6) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/6
2020-07-16 10:11:39 +08:00
a2f522479b
路由 uview升级 api 2020-07-16 10:02:57 +08:00
zmr900709
5f8e0f5f10 添加api管管管理 2020-07-16 09:47:53 +08:00
zmr900709
dcd5b86284 Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into zmr 2020-07-16 08:53:57 +08:00
zmr900709
2220e80494 ceshi 2020-07-16 08:53:47 +08:00
6e727816ce
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-07-15 21:59:56 +08:00
16c21e4152
tab 2020-07-15 11:34:43 +08:00
3445d5feff Merge pull request 'zhy' (#5) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/5
2020-07-15 11:13:13 +08:00
ff2d09c0b3 个人中心 2020-07-15 11:12:41 +08:00
33cb9dad31 Merge pull request 'zmr' (#4) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/4
2020-07-15 10:45:07 +08:00
zmr900709
c9be045ae0 v 2020-06-15 10:03:19 +08:00
zmr900709
5a20ca8726 v 2020-06-15 09:02:17 +08:00
c75af5b303 个人中心 2020-06-13 17:36:24 +08:00
ee119b3be5 个人中心 2020-06-12 18:05:39 +08:00
zmr900709
f82d5653cc Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into zmr 2020-06-12 17:46:28 +08:00
zmr900709
ce24d670b6 v 2020-06-12 17:42:23 +08:00
006a3a5459 Merge pull request 'xbx' (#3) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/3
2020-06-12 15:13:08 +08:00
1acef99f50
1232 2020-06-12 15:08:37 +08:00
b11c3dbc65 Merge pull request '订单完成' (#2) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/2
2020-06-12 14:49:24 +08:00
cdd5c3e8e5 订单完成 2020-06-12 14:46:46 +08:00
bd88e395aa
yarn 2020-06-12 09:52:05 +08:00
b8e8ec343c Merge pull request 'zhy' (#1) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/1
2020-06-11 19:44:28 +08:00
ce92a35e28 remove .vscode 2020-06-11 19:41:50 +08:00