fe / yohobuy-portal-fe2 · Commits

17 Oct, 2016

6 commits

Merge branch 'hotfix_厂家编号' into grey
93fa5413

by 马力
2016-10-17 14:59:17 +0800
Browse Files
Merge branch 'local_dev' into grey
68854f97

by xuhongyun
2016-10-17 14:55:13 +0800
Browse Files
网销列表页，SKC/SKU上下架不刷新主列表
18b9ca8b

by xuhongyun
2016-10-17 14:11:25 +0800
Browse Files
商品详情页上传图片时，能够点到下层的商品封面上传图片按钮
889ae8c9

by xuhongyun
2016-10-17 13:50:55 +0800
Browse Files
非jit商品条码填重复的bug，会导致厂家编号为空的bug
4b632db8

by 马力
2016-10-17 10:42:30 +0800
Browse Files
非jit商品条码填重复的bug，会导致厂家编号为空的bug
7be32707

by 马力
2016-10-17 10:23:13 +0800
Browse Files

14 Oct, 2016

21 commits

Merge branch 'grey'
4ebd2290

by 马力
2016-10-14 18:56:42 +0800
Browse Files
Build project
fa21cae6

by xuhongyun
2016-10-14 18:54:06 +0800
Browse Files
Merge branch 'hotfix-批量上架skn' into grey ...
97e9790a
```
# Conflicts:
#	code/apps/goods/controllers/basegoods.js
#	code/apps/goods/views/netsale/Batch.html
#	code/static/js.jquery/module/goods/netsale/Batch.js
```
by xuhongyun
2016-10-14 18:53:06 +0800
Browse Files
resume ++
ea122dad

by chenchao
2016-10-14 18:41:47 +0800
Browse Files
Merge branch 'hotfix/priceexport' into grey
d711c013

by 马力
2016-10-14 18:33:47 +0800
Browse Files
resume
fa0f1e10

by chenchao
2016-10-14 18:32:26 +0800
Browse Files
筛选不区分大小写
0f6a5410

by 梁志锋
2016-10-14 18:26:48 +0800
Browse Files
Merge branch 'grey'
fded24b4

by 马力
2016-10-14 17:51:07 +0800
Browse Files
编译
17b368f2

by ZhongW
2016-10-14 17:34:39 +0800
Browse Files
Merge branch 'dev_addUrl' into grey
addda34f

by ZhongW
2016-10-14 17:32:39 +0800
Browse Files
Merge branch 'hotfix_netsale' into grey
c38520c0

by ZhongW
2016-10-14 17:31:46 +0800
Browse Files
Merge branch 'hotfix/priceexport' into grey
f0489733

by 马力
2016-10-14 16:53:21 +0800
Browse Files
商品价格导出
b2093dcc

by 梁志锋
2016-10-14 16:02:25 +0800
Browse Files
商品价格导出
f2076b30

by 梁志锋
2016-10-14 16:01:01 +0800
Browse Files
设置封面图
82017310

by ZhongW
2016-10-14 15:13:06 +0800
Browse Files
封面图片设置bug
ab7efe0f

by ZhongW
2016-10-14 14:59:20 +0800
Browse Files
Merge branch 'grey'
78514b60

by 马力
2016-10-14 13:44:58 +0800
Browse Files
商品池添加链接优化
8d75dea6

by ZhongW
2016-10-14 11:36:24 +0800
Browse Files
商品池添加链接
b3336a3e

by ZhongW
2016-10-14 10:39:32 +0800
Browse Files
网销页面去掉预计上架时间
26a906d7

by 马力
2016-10-14 10:30:12 +0800
Browse Files
no message
205cdae2

by lijian
2016-10-14 09:33:31 +0800
Browse Files

13 Oct, 2016

9 commits

图片排序
b90ccbdb

by lijian
2016-10-13 20:08:49 +0800
Browse Files
Merge branch 'dev_base_prod_2.3' into grey
9639a6bf

by 马力
2016-10-13 18:34:28 +0800
Browse Files
Build project
05c0c3b9

by xuhongyun
2016-10-13 17:14:32 +0800
Browse Files
网销去掉预计上架时间
ca369b36

by lijian
2016-10-13 14:34:04 +0800
Browse Files
编译
d66135c3

by ZhongW
2016-10-13 10:46:50 +0800
Browse Files
Merge branch 'hotfix_YBW-7989' into grey
0f165800

by ZhongW
2016-10-13 10:41:22 +0800
Browse Files
Merge branch 'hotfix/priceexport' into grey
1bbb8ece

by 马力
2016-10-13 10:26:12 +0800
Browse Files
Merge branch 'hotfix-批量上架skn' into grey
683a928e

by 马力
2016-10-13 10:19:18 +0800
Browse Files
Merge branch 'dev_base_prod_2.3' into grey
07af4760

by 马力
2016-10-13 10:16:17 +0800
Browse Files

12 Oct, 2016

4 commits

Merge branch 'grey'
42368b7f

by 马力
2016-10-12 14:24:10 +0800
Browse Files
周转天数取整
fd2e3466

by ZhongW
2016-10-12 13:41:49 +0800
Browse Files
bug fix
5cda1a1c

by xuhongyun
2016-10-12 10:52:26 +0800
Browse Files
Build project
e1b36540

by xuhongyun
2016-10-12 10:02:35 +0800
Browse Files