fe / xianyu-ufo-app-web · Commits

30 Sep, 2019

40 commits

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

by yyq
2019-09-30 17:09:49 +0800
Browse Files
delete unuse
1ec6d212

by yyq
2019-09-30 17:09:45 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
1231b0a4

by Tao
2019-09-30 17:08:06 +0800
Browse Files
add channel params
b8b763ee

by Tao
2019-09-30 17:07:59 +0800
Browse Files
bug fix
34a45f02

by 张文文
2019-09-30 16:46:22 +0800
Browse Files
fix axios base url
a8c5faf4

by yyq
2019-09-30 16:43:19 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
8a200077

by yyq
2019-09-30 16:32:56 +0800
Browse Files
change callback url
fe7536b6

by yyq
2019-09-30 16:32:48 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop
f88b5eda

by Tao
2019-09-30 16:29:48 +0800
Browse Files
add channel
2cf26dad

by Tao
2019-09-30 16:29:35 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
aae946c2

by TaoHuang
2019-09-30 16:19:47 +0800
Browse Files
add promotion list
66566591

by TaoHuang
2019-09-30 16:18:09 +0800
Browse Files
add channel
41063647

by Tao
2019-09-30 16:15:12 +0800
Browse Files
add channel
d944032e

by Tao
2019-09-30 16:00:49 +0800
Browse Files
add channel
a17c6821

by Tao
2019-09-30 15:59:46 +0800
Browse Files
fix lodash import
e2c5c280

by yyq
2019-09-30 15:58:47 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop ...
2f200743
```
# Conflicts:
#	apps/pages/product/components/size-list.vue
```
by TaoHuang
2019-09-30 15:26:22 +0800
Browse Files
fix
22ff76f7

by TaoHuang
2019-09-30 15:24:52 +0800
Browse Files
Revert "fix: typo" ...
c8c5785c
```
This reverts commit 442b0b9c.
```
by zhangwenxue
2019-09-30 14:54:00 +0800
Browse Files
fix: typo
442b0b9c

by zhangwenxue
2019-09-30 14:44:38 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
323ddd63

by TaoHuang
2019-09-30 14:41:12 +0800
Browse Files
调价
27d7c7bc

by 邱骏
2019-09-30 14:42:06 +0800
Browse File »
调价
b5f8e994

by 邱骏
2019-09-30 14:41:00 +0800
Browse File »
Merge remote-tracking branch 'origin/develop' into develop ...
ce3f75a9
```
# Conflicts:
#	apps/pages/order/components/order-actions.vue
```
by TaoHuang
2019-09-30 14:40:48 +0800
Browse Files
fix
46e6490e

by TaoHuang
2019-09-30 14:39:06 +0800
Browse Files
商品详情:调整state
450ff7db

by zhangwenxue
2019-09-30 14:06:31 +0800
Browse Files
订单操作
8c2ecd99

by lea guo
2019-09-30 13:49:36 +0800
Browse Files
订单列表取消订单
9ce229b1

by lea guo
2019-09-30 13:07:24 +0800
Browse Files
订单列表再次购买
ec813429

by lea guo
2019-09-30 11:51:49 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
349896a6

by gs1866
2019-09-30 11:48:48 +0800
Browse Files
订单列表再次购买
2abac247

by lea guo
2019-09-30 11:48:15 +0800
Browse Files
fix lodash
8c206656

by yyq
2019-09-30 11:47:58 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
ee188dbe

by yyq
2019-09-30 11:31:39 +0800
Browse Files
fix
e1bb2d06

by yyq
2019-09-30 11:31:32 +0800
Browse Files
商品详情:添加推荐,调整接口
71ca81f4

by zhangwenxue
2019-09-30 11:12:37 +0800
Browse Files
change host
debbac2b

by yyq
2019-09-30 11:11:41 +0800
Browse Files
keep alive
b940bcb2

by yyq
2019-09-30 10:19:39 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop ...
5275266c
```
# Conflicts:
#	apps/pages/order/index.js
```
by TaoHuang
2019-09-30 09:55:00 +0800
Browse Files
fix api
20e78275

by TaoHuang
2019-09-30 09:53:30 +0800
Browse Files
再次出售
5543f425

by lea guo
2019-09-30 09:46:07 +0800
Browse Files