fe / yohobuy-portal-fe · Commits

17 Mar, 2016

23 commits

Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
996eee4a

by liuyue
2016-03-17 16:11:44 +0800
Browse Files
tab卡状态保持
b8a06727

by liuyue
2016-03-17 16:11:40 +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
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
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
网销风格、纹理
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

17 commits

提交
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
基础商品修改
2af55e9c

by weiqingting
2016-03-16 20:24:37 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
2990d889

by 陶雨
2016-03-16 18:42:32 +0800
Browse Files
商品池修改
8d839936

by 陶雨
2016-03-16 18:42:22 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
2d9c9547
```
Conflicts:
	client/js/common/util.js
```
by 王钱钧
2016-03-16 18:25:48 +0800
Browse Files
修改基础商品，上架审核的bug
c8cd957e

by 王钱钧
2016-03-16 18:21:23 +0800
Browse Files
基础商品bug修改
90e1680f

by weiqingting
2016-03-16 18:09:38 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
414f5629

by liuyue
2016-03-16 17:46:23 +0800
Browse Files
网销编辑页bug
bfc3a60a

by liuyue
2016-03-16 17:46:03 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
5b0fb656

by 陶雨
2016-03-16 15:42:12 +0800
Browse Files
修改部分bug
89691b98

by 陶雨
2016-03-16 15:42:03 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
f759a1ae

by weiqingting
2016-03-16 14:10:59 +0800
Browse Files
基础商品bug修改
ee1a19e2

by weiqingting
2016-03-16 14:10:49 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
903c5eb0

by 周奇琪
2016-03-16 13:22:19 +0800
Browse Files
灰度路由:如果是xhr,需要session处理
ad7ec8f7

by 周奇琪
2016-03-16 13:21:28 +0800
Browse Files
舒适度显示
cd5c21d7

by liuyue
2016-03-16 11:11:54 +0800
Browse Files