fe / xianyu-ufo-app-web · Commits

10 Oct, 2019

40 commits

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
fix
cdc5bde4

by 张文文
2019-10-10 18:17:04 +0800
Browse Files
uid fix
febef24f

by 张文文
2019-10-10 18:10:13 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
24a9344c

by 邱骏
2019-10-10 18:05:18 +0800
Browse Files
调价支付
71dba3f5

by 邱骏
2019-10-10 18:05:14 +0800
Browse Files
出售订单列表
04bdeb69

by lea guo
2019-10-10 17:35:04 +0800
Browse Files
订单删除
004ff94f

by lea guo
2019-10-10 17:29:26 +0800
Browse Files
订单类表空页面
cde04fa7

by lea guo
2019-10-10 17:17:05 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
543e9c05

by lea guo
2019-10-10 17:02:32 +0800
Browse Files
订单列表
31ec2c3a

by lea guo
2019-10-10 17:02:02 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
569b9fd3

by TaoHuang
2019-10-10 16:41:26 +0800
Browse Files
fix
3dadc1f4

by TaoHuang
2019-10-10 16:40:57 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
c5b27e31

by yyq
2019-10-10 16:24:34 +0800
Browse Files
login url
255a5972

by yyq
2019-10-10 16:24:24 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
042489d5

by TaoHuang
2019-10-10 15:40:11 +0800
Browse Files
fix
c63748e5

by TaoHuang
2019-10-10 15:39:45 +0800
Browse Files
公告页面增加空页面
1adc0514

by bevishuang
2019-10-10 15:26:47 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
f5cfac57

by bevishuang
2019-10-10 15:21:00 +0800
Browse Files
收藏增空页面
947637a3

by bevishuang
2019-10-10 15:20:54 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
997ad20d

by Tao
2019-10-10 14:38:53 +0800
Browse Files
add channel
789952c8

by Tao
2019-10-10 14:38:49 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
f943a069

by TaoHuang
2019-10-10 14:37:08 +0800
Browse Files
fix
e30ac52a

by TaoHuang
2019-10-10 14:36:47 +0800
Browse Files
fix
f8759494

by TaoHuang
2019-10-10 14:29:43 +0800
Browse Files
商品详情: 取消出售和变现前的下单
08938f72

by zhangwenxue
2019-10-10 14:29:04 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
7da933f7

by 邱骏
2019-10-10 14:21:02 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
86a334d5

by baoss
2019-10-10 13:55:54 +0800
Browse Files
收入明细筛选优化
f12cd0aa

by baoss
2019-10-10 13:55:30 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
a6c7425d

by Tao
2019-10-10 13:43:30 +0800
Browse Files
add channel
734e04a1

by Tao
2019-10-10 13:43:21 +0800
Browse Files
增加页面title，无数据显示
3ea4ae88

by bevishuang
2019-10-10 11:51:49 +0800
Browse Files
add channel
fbad6ab0

by Tao
2019-10-10 11:50:44 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
42bf9a7b

by TaoHuang
2019-10-10 11:47:01 +0800
Browse Files
fix
0aae66c2

by TaoHuang
2019-10-10 11:46:18 +0800
Browse Files
fix
42cfcf99

by TaoHuang
2019-10-10 11:45:14 +0800
Browse Files
商品详情: 调整变现与交易的判断条件 ...
5dbc50c4
```
变现:bid_moster_price > 0 || bid_skup != null
可交易: storage_num > 0 && least_price > 0
```
by zhangwenxue
2019-10-10 11:35:41 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
c86cd37c

by TaoHuang
2019-10-10 11:24:40 +0800
Browse Files