Commits · 98d81c9111d24af83a6bec16bffa0a02780fc05e · fe / yohobuy-portal-fe2

02 Nov, 2016

1 commit

Update: 首页翻转页面需求开发
98d81c91

by leo
2016-11-02 18:49:24 +0800
Browse Files

27 Oct, 2016

10 commits

Build project
9e28b749

by xuhongyun
2016-10-27 16:08:25 +0800
Browse Files
Merge branch 'hotfix/searchbugfix' into grey ...
68cfc86f
```
# Conflicts:
#	code/static/js.jquery/module/resource/resourceManage/ContentManage.js
```
by 马力
2016-10-27 15:44:01 +0800
Browse Files
Merge branch 'hotfix-商品参数' into grey ...
85466173
```
# Conflicts:
#	code/static/js.jquery/common/dropDown.js
```
by 马力
2016-10-27 15:30:20 +0800
Browse Files
Merge branch 'grey' of git.yoho.cn:fe/yohobuy-portal-fe2 into grey
a5b211db

by 马力
2016-10-27 15:25:16 +0800
Browse Files
Merge branch 'dev_5.1_presell' into grey ...
acb42bbf
```
# Conflicts:
#	code/static/js.jquery/common/grid.js
#	code/static/js.jquery/module/goods/basegoods/Index.js
#	code/static/js.jquery/module/goods/netsale/Index.js
```
by 马力
2016-10-27 15:25:07 +0800
Browse Files
Merge branch 'dev_link_skn' into grey
5e18e661

by xuhongyun
2016-10-27 15:23:22 +0800
Browse Files

Merge branch 'dev_base_prod_1017' into grey ...

# Conflicts:
#	dist/yohobuy-portal-fe/5.0.2/jquery/brand.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.productdesc.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.specialgoods.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.yohoCoin.Audit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.yohoCoin.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.articleCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.author.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.brandConcern.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.comment.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.info.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.info.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.plusStar.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.plusStarCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.tag.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.tagCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/help.Category.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/help.Content.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/libs.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.BrandCoupon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponList.AddOrUpdate.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponList.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.PublicCoupon.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.Send.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.SendHistory.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.UseHistory.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.ProductPool.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.PromotionCode.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.PromotionCode.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.QueryCoupon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.Vip.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.Vip.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Product.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.category.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.category.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponSend.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.entrance.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.generateLinks.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.hotRankTag.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.hotsuggest.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.icon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.limit.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.limit.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.notice.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.officialAccounts.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.officialAccounts.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.payment.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.TagMgmt.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.shopsVersionUpdate.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.staticFile.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.subject.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.suggest.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.version.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.webshare.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.webshare.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.ziplist.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.platformManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceManage.ContentManage.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceSortManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/searchWords.HotBrand.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/searchWords.SearchWords.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.MeterSize.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.MeterSize.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.Model.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.ProPhoto.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.ShootRequire.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryInfo.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryInfo.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryModel.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Administrator.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Decoration.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.DecorationBLK.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.DecorationList.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Info.js
#	server/interfaces/goods.netsale.js

2016-10-27 15:22:20 +0800

Browse Files

Merge branch 'dev_上下架弹窗优化' into grey
dc0ebd1d

by xuhongyun
2016-10-27 15:20:34 +0800
Browse Files
Fixed: 修改基础商品中，更新校验出错的问题
035147c5

by leo
2016-10-27 15:17:42 +0800
Browse Files
Merge branch 'hotfix-批量上架skn' into grey ...
9aeac284
```
# Conflicts:
#	code/apps/goods/views/netsale/Batch.html
#	code/static/js.jquery/module/goods/netsale/Batch.js
```
by 马力
2016-10-27 15:09:56 +0800
Browse Files

26 Oct, 2016

17 commits

商品名称去掉链接，支持业务复制
e95a6a3b

by xuhongyun
2016-10-27 00:06:41 +0800
Browse Files
增加支持点击背影关闭对话框功能
39226e05

by xuhongyun
2016-10-26 23:54:19 +0800
Browse Files
Fixed: 优化网销多选，上下架操作
6b854827

by leo
2016-10-26 20:40:20 +0800
Browse Files
Build project
3af910dc

by xuhongyun
2016-10-26 18:48:04 +0800
Browse Files

Merge branch 'dev_5.1_pay' into grey ...

5ec55b47

# Conflicts:
#	dist/yohobuy-portal-fe/5.0.2/index.min.css
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.Brandmodel.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.SizeAttribute.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.Sizelibrary.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.color.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.color.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/category.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/common.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/common.Login.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/customService.BlackList.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.audit.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.basegoods.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.basegoods.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.basegoods.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.basegoods.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.batchSetPortal.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.batchUpdateStudentPrice.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.cod.Brand.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.cod.Goods.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.cod.Upload.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.limitcategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.price.BrandCooperation.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.price.PriceChange.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.priceManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.specialgoods.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.yohoCoin.Audit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.yohoCoin.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.articleCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.author.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.brandConcern.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.comment.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.info.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.info.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.plusStarCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.tag.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.tagCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/help.Category.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/help.Content.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.BrandCoupon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponList.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.PublicCoupon.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.Send.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.SendHistory.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.UseHistory.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.ProductPool.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.PromotionCode.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.Vip.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.Vip.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Product.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.entrance.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.generateLinks.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.hotRankTag.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.hotsuggest.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.icon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.limit.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.notice.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.ziplist.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.platformManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceManage.ContentManage.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceSortManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/searchWords.HotBrand.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/searchWords.SearchWords.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.MeterSize.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.MeterSize.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.Model.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.ProPhoto.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.ShootRequire.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryInfo.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryInfo.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryModel.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Administrator.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Decoration.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.DecorationBLK.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.DecorationList.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Info.js
#	server/controllers/brand.brand.js
#	server/controllers/common.select.js
#	server/controllers/goods.basegoods.js
#	server/controllers/goods.netsale.js
#	server/controllers/marketing.QueryCoupon.js
#	server/controllers/operations.generateLinks.js
#	server/controllers/operations.limit.js
#	server/controllers/shop.shopCategory.js
#	server/controllers/shop.shopDecoration.js
#	server/index.js
#	server/interfaces/brand.brand.js
#	server/interfaces/category.category.js
#	server/interfaces/common.select.js
#	server/interfaces/common.upload.js
#	server/interfaces/common.yohosearch.js
#	server/interfaces/goods.basegoods.js
#	server/interfaces/goods.netsale.js
#	server/interfaces/guang.info.js
#	server/interfaces/marketing.CouponList.js
#	server/interfaces/marketing.QueryCoupon.js
#	server/interfaces/operations.activitytemplate.js
#	server/interfaces/operations.limit.js
#	server/interfaces/operations.webshare.js
#	server/interfaces/shop.shopCategory.js
#	server/interfaces/shop.shopDecoration.js
#	server/views/goods/basegoods/Batch.html
#	server/views/goods/basegoods/Edit.html
#	server/views/goods/basegoods/Index.html
#	server/views/goods/basegoods/Info.html
#	server/views/goods/netsale/Batch.html
#	server/views/goods/netsale/Edit.html
#	server/views/goods/netsale/Index.html
#	server/views/goods/netsale/__partail/add_info.html
#	server/views/goods/netsale/__partail/basic_info.html
#	server/views/goods/netsale/__partail/fenmian.html
#	server/views/goods/netsale/__partail/goods_sort.html
#	server/views/goods/priceManage/Index.html
#	server/views/guang/info/Edit.html
#	server/views/marketing/CouponList/AddOrUpdate.html
#	server/views/marketing/CouponList/Index.html
#	server/views/marketing/PromotionCode/Edit.html
#	server/views/operations/activitytemplate/Product.html
#	server/views/operations/category/Index.html
#	server/views/operations/generateLinks/Index.html
#	server/views/operations/icon/Index.html
#	server/views/operations/limit/Edit.html
#	server/views/operations/webshare/Edit.html
#	server/views/resource/__partail/jiangming.html
#	server/views/resource/__partail/taoyu.html
#	server/views/shop/Decoration.html
#	server/views/shop/DecorationBLK.html
#	server/views/shop/ShopCategory/Edit.html
#	server/views/shop/ShopCategory/Index.html
#	server/views/shop/ShopCategory/Info.html

2016-10-26 18:47:24 +0800

Browse Files

build project
2bcb7301

by xuhongyun
2016-10-26 17:11:02 +0800
Browse Files
Merge branch 'dev_base_prod_2.3' into grey ...
7c18fe42
```
# Conflicts:
#	code/apps/goods/views/basegoods/Edit.html
```
by xuhongyun
2016-10-26 17:09:33 +0800
Browse Files
预计上架重新提交
90e88f42

by lijian
2016-10-26 16:43:17 +0800
Browse Files
build project
594dce1d

by xuhongyun
2016-10-26 16:38:41 +0800
Browse Files
Merge branch 'dev_5.1' into grey
7abddae1

by xuhongyun
2016-10-26 16:31:18 +0800
Browse Files
Update: 网销列表中增加预售信息
812edb39

by leo
2016-10-26 15:10:12 +0800
Browse Files
Fixed: 预售购买时间精确到分
24efbb9f

by leo
2016-10-26 14:45:35 +0800
Browse Files
Merge branch 'dev_5.1_presell' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into dev_5.1_presell
032ed2ef

by wangwei
2016-10-26 14:31:20 +0800
Browse Files
网销增加定金预售筛选，基础商品列表增加定金字段展示
b3799e4d

by wangwei
2016-10-26 14:31:05 +0800
Browse Files
Fixed: 修复网销页面中，多选商品，批量上下架，刷选问题
b27f4564

by leo
2016-10-26 14:02:48 +0800
Browse Files
no message
0da8bca0

by lijian
2016-10-26 13:58:09 +0800
Browse Files
加个校验优化
a36bc4da

by lijian
2016-10-26 13:39:31 +0800
Browse Files

25 Oct, 2016

12 commits

Fixed: 修复网销页面多选问题
58f17cac

by leo
2016-10-25 18:21:11 +0800
Browse Files
Merge branch 'dev_5.1_presell' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into dev_5.1_presell
51957f8e

by wangwei
2016-10-25 18:08:58 +0800
Browse Files
修改定金预售筛选
736ee0ff

by wangwei
2016-10-25 18:08:50 +0800
Browse Files
品牌支持搜索
3f2d9f5b

by 梁志锋
2016-10-25 17:18:36 +0800
Browse Files
Fixed: 修复网销页面上，多选上架，筛选之后，选中元素判断问题
9c47bab4

by leo
2016-10-25 16:59:17 +0800
Browse Files
Merge branch 'hotfix_13965' into grey
e3b4463c

by ZhongW
2016-10-25 14:46:46 +0800
Browse Files
build
cd883bac

by xuhongyun
2016-10-25 14:55:38 +0800
Browse Files
Merge branch 'dev-店铺商品排序' into grey
c720bacd

by 马力
2016-10-25 14:38:03 +0800
Browse Files
分页bug
c732c571

by ZhongW
2016-10-25 14:21:28 +0800
Browse Files
Build project
d5259ec6

by xuhongyun
2016-10-25 14:13:14 +0800
Browse Files
build project
bce89d84

by xuhongyun
2016-10-25 14:04:34 +0800
Browse Files

Merge branch 'dev_5.1' into grey ...

0a4b0953

# Conflicts:
#	dist/yohobuy-portal-fe/5.0.2/jquery/brand.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.basegoods.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.basegoods.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.priceExport.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.priceManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.specialgoods.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.yohoCoin.Audit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.yohoCoin.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.articleCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.author.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.brandConcern.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.comment.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.info.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.info.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.plusStar.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.plusStarCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.tag.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.tagCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/help.Category.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/help.Content.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/libs.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.BrandCoupon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponList.AddOrUpdate.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponList.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.PublicCoupon.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.Send.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.SendHistory.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.UseHistory.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.PromotionCode.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.PromotionCode.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.QueryCoupon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.Vip.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.Vip.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Product.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.category.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.category.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponSend.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.entrance.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.generateLinks.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.hotRankTag.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.hotsuggest.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.icon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.limit.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.limit.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.notice.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.officialAccounts.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.officialAccounts.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.payment.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.TagMgmt.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.shopsVersionUpdate.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.staticFile.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.subject.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.suggest.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.version.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.webshare.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.webshare.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.ziplist.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.platformManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceManage.ContentManage.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceSortManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/searchWords.HotBrand.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/searchWords.SearchWords.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.MeterSize.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.MeterSize.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.Model.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.ProPhoto.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.ShootRequire.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryInfo.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryInfo.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryModel.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Administrator.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Decoration.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.DecorationBLK.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.DecorationList.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Info.js
#	server/controllers/goods.basegoods.js
#	server/interfaces/goods.basegoods.js
#	server/views/goods/basegoods/Batch.html
#	server/views/goods/basegoods/Edit.html
#	server/views/goods/basegoods/Info.html
#	server/views/goods/netsale/Batch.html
#	server/views/goods/netsale/Index.html
#	server/views/goods/netsale/__partail/basic_info.html

2016-10-25 14:02:20 +0800

Browse Files

fe / yohobuy-portal-fe2 · Commits

GitLab

02 Nov, 2016

27 Oct, 2016

26 Oct, 2016

25 Oct, 2016