fe / xianyu-ufo-app-web · Commits

11 Oct, 2019

31 commits

fix notice
7418e612

by TaoHuang
2019-10-11 17:10:25 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop ...
5906809a
```
# Conflicts:
#	apps/store/home/news.js
```
by TaoHuang
2019-10-11 16:35:19 +0800
Browse Files
fix
e091b321

by TaoHuang
2019-10-11 16:29:53 +0800
Browse Files
优惠券
6f0fd494

by huangyCode
2019-10-11 16:26:49 +0800
Browse Files
优惠券
890fe4fd

by huangyCode
2019-10-11 16:21:26 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
bb4dbdfd

by Tao
2019-10-11 15:52:02 +0800
Browse Files
add channel
1fd18617

by Tao
2019-10-11 15:51:58 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
c7329736

by 邱骏
2019-10-11 15:46:56 +0800
Browse Files
添加卖家协议跳转
7ab107cc

by 邱骏
2019-10-11 15:46:53 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop ...
a631df2c
```
# Conflicts:
#	apps/store/home/favorite.js
```
by TaoHuang
2019-10-11 15:32:15 +0800
Browse Files
fix
3ec2cbd3

by TaoHuang
2019-10-11 15:31:13 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
292548a7

by baoss
2019-10-11 15:10:01 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
168853e0

by bevishuang
2019-10-11 15:08:30 +0800
Browse Files
优化我的收藏
771a359f

by bevishuang
2019-10-11 15:08:25 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
5aa28cbb

by TaoHuang
2019-10-11 14:54:45 +0800
Browse Files
fix
32059c1f

by TaoHuang
2019-10-11 14:54:11 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
c551eee2

by Tao
2019-10-11 14:41:19 +0800
Browse Files
add news
92d794dc

by Tao
2019-10-11 14:41:15 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
2ce7425c

by 邱骏
2019-10-11 14:29:24 +0800
Browse Files
圆环倒计时
6cb7235c

by 邱骏
2019-10-11 14:29:18 +0800
Browse Files
fix
1deb5706

by TaoHuang
2019-10-11 13:59:20 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
cdd391a9

by baoss
2019-10-11 13:41:43 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
ff9b7fed

by yyq
2019-10-11 13:40:44 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
92269860

by 邱骏
2019-10-11 13:40:42 +0800
Browse Files
fix login
3fd4b1dc

by yyq
2019-10-11 13:40:37 +0800
Browse Files
环形倒计时
efb9c32f

by 邱骏
2019-10-11 13:40:37 +0800
Browse Files
优化收入金额显示
850c7c1b

by baoss
2019-10-11 11:52:08 +0800
Browse Files
商品详情: 取消变现 ...
51fe8496
```
变现是求购需求
```
by zhangwenxue
2019-10-11 10:42:28 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
5de21f7e

by yyq
2019-10-11 10:39:24 +0800
Browse Files
fix index
116e4bdc

by yyq
2019-10-11 10:39:14 +0800
Browse Files
add channel
24dfe900

by Tao
2019-10-11 09:48:16 +0800
Browse Files

10 Oct, 2019

9 commits

Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
86b6c086

by Tao
2019-10-10 19:42:58 +0800
Browse Files
add channel
7b8843aa

by Tao
2019-10-10 19:42:54 +0800
Browse Files
订单类表
d9d2292e

by lea guo
2019-10-10 19:38:02 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
ae2a96ce

by lea guo
2019-10-10 19:14:05 +0800
Browse Files
订单列表
a959ae55

by lea guo
2019-10-10 19:13:42 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop ...
da19fa08
```
# Conflicts:
#	apps/pages/home/index.js
```
by huangyCode
2019-10-10 18:56:35 +0800
Browse Files
搜索
5cfeb7f5

by huangyCode
2019-10-10 18:53:57 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
0ba0b08d

by baoss
2019-10-10 18:23:42 +0800
Browse Files
去掉固定uid 添加消息及我的登录跳转
9fd89b8e

by baoss
2019-10-10 18:23:27 +0800
Browse Files