fe / yohobuy-portal-fe · Commits

18 Mar, 2016

23 commits

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

by 王钱钧
2016-03-18 15:18:08 +0800
Browse Files
找回丢失的上架审核查看详情的路由
3d81d8b4

by 王钱钧
2016-03-18 15:17:50 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
08c1bcc3

by 陶雨
2016-03-18 14:33:52 +0800
Browse Files
专题管理添加修改添加修改增加成功失败提示
f745c3c1

by 陶雨
2016-03-18 14:33:43 +0800
Browse Files
基础商品bug修改
eb08d6fe

by weiqingting
2016-03-18 13:46:42 +0800
Browse Files
下拉bug修改
feaa63d8

by weiqingting
2016-03-18 12:10:35 +0800
Browse Files
tianjialuyou
618e911e

by weiqingting
2016-03-18 11:55:53 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
046cf20d

by liuyue
2016-03-18 11:40:58 +0800
Browse Files
描点修改
6093b8ba

by liuyue
2016-03-18 11:40:55 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
5c80d5e9

by weiqingting
2016-03-18 11:37:44 +0800
Browse Files
销售属性
fb3156d0

by weiqingting
2016-03-18 11:37:18 +0800
Browse Files
tab卡保持状态bug
e43bfac2

by liuyue
2016-03-18 11:23:26 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
6b9e10e9

by liuyue
2016-03-18 11:18:01 +0800
Browse Files
网销tab卡
7571a761

by liuyue
2016-03-18 11:17:58 +0800
Browse Files
基础商品修改
caf04e31

by weiqingting
2016-03-18 11:10:27 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
e73bb360

by liuyue
2016-03-18 10:49:39 +0800
Browse Files
tab保持状态，时间戳转换
05d005df

by liuyue
2016-03-18 10:49:36 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
f0f0f544

by 王钱钧
2016-03-18 10:45:44 +0800
Browse Files
修改基础商品列表bug。
4ed7da35

by 王钱钧
2016-03-18 10:45:41 +0800
Browse Files
网销tab状态保持
adbe8909

by liuyue
2016-03-18 10:39:28 +0800
Browse Files
Merge branch 'develop' into release/1.6
0192f688

by weiqingting
2016-03-18 10:39:06 +0800
Browse Files
网销tab卡记忆
caa6ddeb

by liuyue
2016-03-18 10:38:50 +0800
Browse Files
电话验证
abf4674b

by weiqingting
2016-03-18 10:19:45 +0800
Browse Files

17 Mar, 2016

17 commits

Merge branch 'release/shop_supplier_v' into release/1.6
a3afcc3a

by weiqingting
2016-03-17 19:07:49 +0800
Browse Files
路由恢复
751eae71

by weiqingting
2016-03-17 18:12:09 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
372a03c4

by weiqingting
2016-03-17 18:04:42 +0800
Browse Files
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
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
e3fa29bc

by 陶雨
2016-03-17 17:46:11 +0800
Browse Files
商品池管理添加商品池修复添加文件的问题
4d30e12c

by 陶雨
2016-03-17 17:46: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
代销变价单独菜单
8040c84d

by liuyue
2016-03-17 16:16:37 +0800
Browse Files
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
供应商提交
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