fe / yohobuy-portal-fe · Commits

29 Apr, 2016

8 commits

编辑器
0b9b3996

by weiqingting
2016-04-29 18:11:17 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
92cea544

by weiqingting
2016-04-29 17:25:44 +0800
Browse Files
自动获取品牌
0f91fa63

by weiqingting
2016-04-29 17:25:26 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
afc14c22

by 陶雨
2016-04-29 17:07:03 +0800
Browse Files
更改资源位host
49583464

by 陶雨
2016-04-29 17:06:48 +0800
Browse Files
资源位/逛--商品/组bug修复
64fafe52

by 姜敏
2016-04-29 16:05:25 +0800
Browse Files
更改host
950111ce

by 陶雨
2016-04-29 15:05:12 +0800
Browse Files
action模板更改、路由更改
3561e82c

by 陶雨
2016-04-29 15:03:45 +0800
Browse Files

28 Apr, 2016

14 commits

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
5933a6a4
```
Conflicts:
	server/config/common.js
```
by 陶雨
2016-04-28 18:20:27 +0800
Browse Files
图片路径
f9c82d07

by weiqingting
2016-04-28 18:07:12 +0800
Browse Files
更改domain url
f76d0dd2

by 陶雨
2016-04-28 18:02:11 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
5aeb4606

by 姜敏
2016-04-28 18:00:54 +0800
Browse Files
商品/组--搜索修改
870b3961

by 姜敏
2016-04-28 18:00:45 +0800
Browse Files
资源位内容管理取消延时处理
132014fe

by 陶雨
2016-04-28 16:29:57 +0800
Browse Files
资源位内容管理取消延时处理
f3979454

by 陶雨
2016-04-28 16:29:44 +0800
Browse Files
店铺装修添加字段
4f55e0de

by dongjunjie
2016-04-28 15:20:11 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
9a1ec05d

by 姜敏
2016-04-28 14:17:59 +0800
Browse Files
资源位--修改关于推荐的弹层
38ceac62

by 姜敏
2016-04-28 14:17:49 +0800
Browse Files
时间控件恢复到原来的状态
a79f1fc6

by 陶雨
2016-04-28 11:21:44 +0800
Browse Files
合并代码
8dc6a5e6

by 陶雨
2016-04-28 11:02:18 +0800
Browse Files
拉代码
2a9c2792

by 陶雨
2016-04-28 10:58:48 +0800
Browse Files
销售类目标签页面默认开启列表
b8f367d2

by dongjunjie
2016-04-28 09:41:15 +0800
Browse Files

27 Apr, 2016

14 commits

抽奖活动调通上传
b90024ed

by 陶雨
2016-04-27 21:26:12 +0800
Browse Files
分页
c95078f7

by weiqingting
2016-04-27 20:01:04 +0800
Browse Files
逛~bug修改
e090ca1f

by weiqingting
2016-04-27 17:36:33 +0800
Browse Files
图片路径
b8cbde1c

by weiqingting
2016-04-27 16:40:47 +0800
Browse Files
跳转
9e857f3c

by weiqingting
2016-04-27 15:17:57 +0800
Browse Files
跳转
e6f7aa8e

by weiqingting
2016-04-27 15:02:16 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
810091dc

by weiqingting
2016-04-27 14:56:24 +0800
Browse Files
逛bug修改
d69da396

by weiqingting
2016-04-27 14:56:11 +0800
Browse Files
tab控件现在可以设置默认进入的标签了
abbbac1f

by 陶雨
2016-04-27 14:27:15 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
38313f43

by 姜敏
2016-04-27 13:54:29 +0800
Browse Files
修复商品组删除的bug；修复发券名称修改的bug
05998b91

by 姜敏
2016-04-27 13:54:20 +0800
Browse Files
店铺装修接口修改
d8f8685e

by dongjunjie
2016-04-27 12:38:53 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
85938c0a

by weiqingting
2016-04-27 10:43:44 +0800
Browse Files
template2
532f78ac

by weiqingting
2016-04-27 10:43:33 +0800
Browse Files

26 Apr, 2016

4 commits

资源内容修改部分bug，时间控件待修改
8940ae81

by 陶雨
2016-04-26 20:50:18 +0800
Browse Files
1、资源位预发布删除现在不能删除进行中和发布时间为0的tab页了 ...
5dbb2688
```
2、时间修改不能修改发布时间为0的页面了
3、限购码详情显示sku
4、限购码编辑添加流程走通
```
by 陶雨
2016-04-26 16:55:20 +0800
Browse Files
资源管理添加ID搜索项；修复添加商品组的bug
20e902e3

by 姜敏
2016-04-26 14:39:33 +0800
Browse Files
资源位预发布删除、时间修改、保存内容还有问题
c2cf07d8

by 陶雨
2016-04-26 11:06:12 +0800
Browse Files