fe / yohobuy-portal-fe · Commits

21 Mar, 2016

4 commits

公告上传图片添加bucket
c81b9a2f

by 陶雨
2016-03-21 13:42:41 +0800
Browse Files
格式化
385179ce

by 陶雨
2016-03-21 11:21:35 +0800
Browse Files
修改host
165db824

by 陶雨
2016-03-21 10:23:10 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
8d9a2bd5

by 陶雨
2016-03-21 09:32:38 +0800
Browse Files

19 Mar, 2016

17 commits

网销bug提交
37f2c0a4

by weiqingting
2016-03-19 16:57:48 +0800
Browse Files
Merge branch 'release/shop_supplier_v' into release/1.6
f3be520a

by weiqingting
2016-03-19 15:59:55 +0800
Browse Files
修改样式
e962f3c9

by weiqingting
2016-03-19 15:57:36 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
20aaf8d3
```
# Conflicts:
#	client/sass/common/global.scss
```
by weiqingting
2016-03-19 15:48:20 +0800
Browse Files
基础商品提交
bc4a7e09

by weiqingting
2016-03-19 15:46:23 +0800
Browse Files
商品参数修改
2dd09468

by liuyue
2016-03-19 15:23:32 +0800
Browse Files
Merge branch 'release/shop_supplier_v' into release/1.6
d4a10220

by weiqingting
2016-03-19 14:48:00 +0800
Browse Files
供应商统一文案
80cff94e

by weiqingting
2016-03-19 14:44:33 +0800
Browse Files
样式修改
282fd895

by weiqingting
2016-03-19 14:30:15 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
1b52f2b4

by liuyue
2016-03-19 14:18:04 +0800
Browse Files
非销售属性
82277aba

by liuyue
2016-03-19 14:17:52 +0800
Browse Files
基础商品修改
3e207c21

by weiqingting
2016-03-19 14:13:45 +0800
Browse Files
Merge commit 'f08e9d2b ' into release/1.6
55cc7cb0

by weiqingting
2016-03-19 13:04:49 +0800
Browse Files
Merge branch 'release/shop_supplier_v' of http://git.dev.yoho.cn/platform/yohobu… ...
8426844a
```
…y-portal-fe into release/shop_supplier_v
```
by weiqingting
2016-03-19 12:42:01 +0800
Browse Files
供应商修改
f08e9d2b

by weiqingting
2016-03-19 12:40:22 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
55a66ce1

by weiqingting
2016-03-19 12:02:48 +0800
Browse Files
Merge branch 'release/shop_supplier_v' into release/1.6 ...
617dede9
```
# Conflicts:
#	client/js/common/tabTree.js
#	server/interface/supplier.js
```
by weiqingting
2016-03-19 12:02:03 +0800
Browse Files

18 Mar, 2016

19 commits

商品基础属性- 属性值-逻辑修改
43314035

by 王钱钧
2016-03-18 19:59:33 +0800
Browse Files
data.data.goodsSeason={"0":"四季","1":"春","2":"夏","3":"秋","4":"冬","5":"春夏","6"… ...
1213d3a2
```
…:"秋冬"}[""+data.data.goodsSeason];
```
by weiqingting
2016-03-18 18:37:03 +0800
Browse Files
关联逛路由丢失
7fcc6f15

by liuyue
2016-03-18 18:20:51 +0800
Browse Files
弹出多个修改bug bix
9c368a81

by liuyue
2016-03-18 18:15:24 +0800
Browse Files
去编辑商品名称
e0f71e56

by liuyue
2016-03-18 17:34:01 +0800
Browse Files
物理类目添加修改
00c73a77

by weiqingting
2016-03-18 17:23:04 +0800
Browse Files
保存完整信息路由
65a7f98f

by liuyue
2016-03-18 16:33:06 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
56a7bf6b

by 陶雨
2016-03-18 16:29:58 +0800
Browse Files
删除search-key文件
0ab69d6c

by 陶雨
2016-03-18 16:29:46 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
51fbb4ee

by liuyue
2016-03-18 16:12:37 +0800
Browse Files
弹窗导航层级
e2c83c95

by liuyue
2016-03-18 16:12:34 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
ca4e29d4

by weiqingting
2016-03-18 15:55:37 +0800
Browse Files
供应商路由恢复
8f9a697e

by weiqingting
2016-03-18 15:55:11 +0800
Browse Files
提交
cfc8cd24

by weiqingting
2016-03-18 15:54:02 +0800
Browse Files
模板
b2ceb152

by liuyue
2016-03-18 15:48:01 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
6a68aec3

by liuyue
2016-03-18 15:41:30 +0800
Browse Files
富文本框查看页不可编辑
d5c7beab

by liuyue
2016-03-18 15:41:21 +0800
Browse Files
接口管理
859cd099

by weiqingting
2016-03-18 15:30:07 +0800
Browse Files
Merge branch 'release/shop_supplier_v' of http://git.dev.yoho.cn/platform/yohobu… ...
a7382ec5
```
…y-portal-fe into release/shop_supplier_v
```
by weiqingting
2016-03-18 15:26:02 +0800
Browse Files