fe / yohobuy-portal-fe · Commits

17 Mar, 2016

31 commits

Merge branch 'release/shop_supplier_v' into release/1.6 ...
e9983c98
```
# Conflicts:
#	client/js/brand/index.js
#	client/sass/module/_edit.scss
#	server/interface/basegoods.js
#	server/interface/goods.js
#	server/interface/netSaleTy.js
#	server/interface/subjectManage.js
```
by weiqingting
2016-03-17 17:51:01 +0800
Browse Files
基础商品bug修改
89e46fee

by weiqingting
2016-03-17 17:42:24 +0800
Browse Files
基础商品bug修改
bfd3e250

by weiqingting
2016-03-17 17:32:13 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
60954178

by 王钱钧
2016-03-17 17:20:17 +0800
Browse Files
供应商提交
c785c25b

by weiqingting
2016-03-17 16:05:02 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
6eaaa9e7

by 陶雨
2016-03-17 15:41:51 +0800
Browse Files
网销商品参数改回、修复网销部分提交的bug
534ae397

by 陶雨
2016-03-17 15:41:42 +0800
Browse Files
销售价bug修改
307a2e9e

by weiqingting
2016-03-17 15:32:02 +0800
Browse Files
网销查看页
026dfd06

by liuyue
2016-03-17 15:08:05 +0800
Browse Files
修改基础商品bug。
9b9fabf8

by 王钱钧
2016-03-17 14:43:33 +0800
Browse Files
bucket=yhb-img02
2cec7a69

by weiqingting
2016-03-17 14:37:31 +0800
Browse Files
手机号码验证放开
26787b62

by weiqingting
2016-03-17 14:33:14 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
6493f10f

by liuyue
2016-03-17 14:12:59 +0800
Browse Files
网销编辑页
4445da69

by liuyue
2016-03-17 14:12:56 +0800
Browse Files
店铺单品牌多品牌修改
38930ed6

by weiqingting
2016-03-17 14:11:20 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
cfe7d8cc

by 陶雨
2016-03-17 13:57:57 +0800
Browse Files
专题管理弹窗消失的处理
4fdbf041

by 陶雨
2016-03-17 13:57:45 +0800
Browse Files
基础商品修改
b7a78ea7

by weiqingting
2016-03-17 13:56:51 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
919423d3

by weiqingting
2016-03-17 13:47:31 +0800
Browse Files
提交
f18e11f1

by weiqingting
2016-03-17 11:57:38 +0800
Browse Files
基础商品非销售模块
260cc0f0

by weiqingting
2016-03-17 11:34:27 +0800
Browse Files
品牌提示语、品牌合作模式品牌筛选
517e71a2

by liuyue
2016-03-17 11:12:53 +0800
Browse Files
网销风格、纹理
1b50a49f

by liuyue
2016-03-17 10:47:07 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
16ab8278

by liuyue
2016-03-17 10:42:30 +0800
Browse Files
网销编辑页风格、纹理
a20d1bc3

by liuyue
2016-03-17 10:42:27 +0800
Browse Files
基础商品提交
0abd1815

by weiqingting
2016-03-17 10:25:21 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
db44aa4a

by weiqingting
2016-03-17 10:25:02 +0800
Browse Files
专题管理活动状态修改
e057a995

by 陶雨
2016-03-17 10:03:24 +0800
Browse Files
商品池修改
2dd02de5

by 陶雨
2016-03-17 09:28:23 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
9fc6b181

by liuyue
2016-03-17 09:14:39 +0800
Browse Files
网销保存全部信息
5c1107f5

by liuyue
2016-03-17 09:14:28 +0800
Browse Files

16 Mar, 2016

9 commits

Merge branch 'release/shop_supplier_v' of http://git.dev.yoho.cn/platform/yohobu… ...
05eba7f1
```
…y-portal-fe into release/shop_supplier_v
```
by weiqingting
2016-03-16 22:17:16 +0800
Browse Files
样式修改
affd60cf

by weiqingting
2016-03-16 22:16:40 +0800
Browse Files
Merge branch 'release/shop_supplier_v' of git.dev.yoho.cn:platform/yohobuy-porta… ...
5bdcb09f
```
…l-fe into release/shop_supplier_v
```
by 周奇琪
2016-03-16 22:15:30 +0800
Browse Files
如果是xhr,不走pipe
3aac22f2

by 周奇琪
2016-03-16 22:15:02 +0800
Browse Files
修改bucket
c8acc0bc

by weiqingting
2016-03-16 22:09:28 +0800
Browse Files
提交
95be2d8b

by weiqingting
2016-03-16 22:06:15 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
0e5606e4

by weiqingting
2016-03-16 20:37:01 +0800
Browse Files
提价
54a322c6

by weiqingting
2016-03-16 20:34:10 +0800
Browse Files
基础商品修改
2af55e9c

by weiqingting
2016-03-16 20:24:37 +0800
Browse Files