fe / xianyu-ufo-app-web · Commits

25 Sep, 2019

30 commits

订单列表
e4456979

by lea guo
2019-09-25 16:28:17 +0800
Browse Files
订单列表
2f050edf

by lea guo
2019-09-25 16:08:18 +0800
Browse Files
fix bug
df424757

by bevishuang
2019-09-25 16:02:15 +0800
Browse File »
fix home
8f7e7159

by TaoHuang
2019-09-25 16:00:35 +0800
Browse File »
Merge remote-tracking branch 'origin/develop' into develop ...
b03d73c6
```
# Conflicts:
#	apps/common/create-api-server.js
#	apps/pages/home/index.js
#	apps/pages/index.js
#	apps/store/home/index.js
#	apps/store/home/mine.js
#	apps/store/index.js
```
by TaoHuang
2019-09-25 15:58:37 +0800
Browse Files
fix api error
507d04be

by TaoHuang
2019-09-25 15:55:04 +0800
Browse Files
增加公告列表接口请求
74caa6a6

by bevishuang
2019-09-25 15:51:09 +0800
Browse Files
fix redis
cf00884a

by TaoHuang
2019-09-25 14:55:45 +0800
Browse Files
fix redis
9f9a1135

by TaoHuang
2019-09-25 14:52:38 +0800
Browse Files
订单类表
c61683b1

by lea guo
2019-09-25 13:41:43 +0800
Browse Files
添加选择地址页面
a236b6c5

by 张文文
2019-09-25 11:55:09 +0800
Browse File »
fix merge
cc842dfd

by bevishuang
2019-09-25 11:13:32 +0800
Browse Files
fix
25dca7b1

by bevishuang
2019-09-25 11:11:01 +0800
Browse Files
fix conflict
40a9857e

by baoss
2019-09-25 10:53:51 +0800
Browse Files
公告列表
2056530a

by bevishuang
2019-09-25 10:51:05 +0800
Browse Files
add channel
07e5a5d9

by Tao
2019-09-25 10:40:39 +0800
Browse Files
add channel
597b2bf5

by Tao
2019-09-25 10:39:34 +0800
Browse Files
公告列表
2e09be55

by bevishuang
2019-09-25 10:38:41 +0800
Browse Files
fix url port
e5f292c0

by TaoHuang
2019-09-25 10:24:53 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
0349746a

by TaoHuang
2019-09-25 09:57:26 +0800
Browse Files
fix package.json
7114ced9

by TaoHuang
2019-09-25 09:57:05 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
85433216

by Tao
2019-09-25 09:43:10 +0800
Browse Files
channel template
f3b8241f

by Tao
2019-09-25 09:41:51 +0800
Browse Files
yarn lock
710c270d

by yyq
2019-09-25 09:40:57 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
139880fd

by yyq
2019-09-25 09:39:11 +0800
Browse Files
passport
4d5eb7a2

by yyq
2019-09-25 09:39:04 +0800
Browse Files
处理冲突
08f25228

by 邱骏
2019-09-25 09:19:26 +0800
Browse Files
调价
7b7ea839

by 邱骏
2019-09-25 09:13:04 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
803f36db

by lea guo
2019-09-25 09:09:14 +0800
Browse Files
订单列表&升级vue
4baf6514

by lea guo
2019-09-25 09:09:11 +0800
Browse File »

24 Sep, 2019

10 commits

fix conflict
5b7fb3cf

by baoss
2019-09-24 20:40:33 +0800
Browse Files
渲染个人中心页列表
0a6e6d51

by baoss
2019-09-24 20:38:40 +0800
Browse Files
新增个人中心列表、公告及订单组件
6daa1fe5

by baoss
2019-09-24 18:15:46 +0800
Browse Files
订单列表
1677f174

by lea guo
2019-09-24 17:00:55 +0800
Browse Directory »
Merge remote-tracking branch 'origin/master'
1251b5a0

by TaoHuang
2019-09-24 16:06:10 +0800
Browse Files
update lib
ebcad338

by TaoHuang
2019-09-24 16:05:43 +0800
Browse File »
add build
2dc3f033

by TaoHuang
2019-09-24 16:04:15 +0800
Browse Files
Merge branch 'develop' into 'master' ...
3d295eef
```
Develop



See merge request !1
```
by 黄涛
2019-09-24 15:53:38 +0800
Browse Files
add log
5a8a09c0

by TaoHuang
2019-09-24 15:47:02 +0800
Browse File »
Update Dockerfile
6b65d43d

by jimi.ji
2019-09-24 15:30:17 +0800
Browse Files