fe / xianyu-ufo-app-web · Commits

11 Oct, 2019

40 commits

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

by huangyCode
2019-10-11 17:22:39 +0800
Browse Files
优惠券参数修改
7f3d56f2

by huangyCode
2019-10-11 17:22:30 +0800
Browse Directory »
npm version
3332ab1a

by lea guo
2019-10-11 17:20:56 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
e8f31f38

by TaoHuang
2019-10-11 17:16:07 +0800
Browse Files
取消订单
57701f24

by lea guo
2019-10-11 17:15:45 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop ...
85b76233
```
# Conflicts:
#	apps/pages/notice/list/notice.vue
```
by TaoHuang
2019-10-11 17:15:40 +0800
Browse Files
取消订单
3678114e

by lea guo
2019-10-11 17:15:00 +0800
Browse Files
fix notice
ba08fe7d

by TaoHuang
2019-10-11 17:13:48 +0800
Browse Directory »
fix notice
7418e612

by TaoHuang
2019-10-11 17:10:25 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
4fbb447d

by baoss
2019-10-11 17:01:05 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
0e8001ec

by baoss
2019-10-11 17:00:47 +0800
Browse Files
添加title
51ac0139

by lea guo
2019-10-11 17:00:42 +0800
Browse Files
我的数据刷新
e4365dbd

by baoss
2019-10-11 17:00:39 +0800
Browse Directory »
优惠券参数修改
2e237652

by huangyCode
2019-10-11 16:54:50 +0800
Browse Files
优惠券
1ddabaa3

by huangyCode
2019-10-11 16:53:22 +0800
Browse Files
优化我的收藏加载更多
0ac5af93

by bevishuang
2019-10-11 16:50:52 +0800
Browse Directory »
订单操作
f3970c36

by lea guo
2019-10-11 16:47:45 +0800
Browse Directory »
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
cf3703b4

by lea guo
2019-10-11 16:36:00 +0800
Browse Files
订单列表确认弹框
ea9b6103

by lea guo
2019-10-11 16:35:57 +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 Directory »
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 Directory »
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 Directory »
圆环倒计时
6cb7235c

by 邱骏
2019-10-11 14:29:18 +0800
Browse Directory »
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