Commits · fa4ff6f6351e36b35e393b4aaa2b298649dae1c1 · fe / yohobuy-portal-fe2

29 Oct, 2016

2 commits

优化调用图片的加载速度
fa4ff6f6

by xuhongyun
2016-10-30 01:34:39 +0800
Browse Files
物理类目筛选框增加重置功能
5d44e79a

by xuhongyun
2016-10-29 16:02:45 +0800
Browse Files

28 Oct, 2016

19 commits

build project
7cd0de5c

by xuhongyun
2016-10-28 17:42:08 +0800
Browse Files
Merge branch 'hotfix/shopbetter2' into grey
2d9f9ff1

by xuhongyun
2016-10-28 17:17:53 +0800
Browse Files
代码回退
2e5cb09d

by 梁志锋
2016-10-28 17:07:23 +0800
Browse Files
Merge branch 'grey' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into grey
0db13c25

by ZhongW
2016-10-28 16:08:21 +0800
Browse Files
Build project
66380eb4

by xuhongyun
2016-10-28 16:07:13 +0800
Browse Files

Merge branch 'Bugfix_1027_leo' into grey ...

# Conflicts:
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.Brandmodel.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.CateSize.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.CateSizeAttr.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.Porattr.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/brand.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/brand.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/category.Edit.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.netsale.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Index.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.priceExport.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.priceManage.Index.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.Batch.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/common.select.js
#	server/controllers/goods.netsale.js
#	server/controllers/marketing.QueryCoupon.js
#	server/index.js
#	server/interfaces/common.select.js
#	server/interfaces/goods.audio.js
#	server/interfaces/goods.basegoods.js
#	server/interfaces/goods.netsale.js
#	server/interfaces/marketing.CouponList.js
#	server/interfaces/marketing.QueryCoupon.js
#	server/interfaces/operations.payment.js
#	server/interfaces/operations.webshare.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/Index.html
#	server/views/goods/netsale/__partail/basic_info.html
#	server/views/goods/netsale/__partail/goods_sort.html
#	server/views/marketing/CouponList/AddOrUpdate.html
#	server/views/marketing/CouponList/Index.html
#	server/views/operations/icon/Index.html
#	server/views/operations/payment/Index.html
#	server/views/operations/webshare/Edit.html
#	server/views/resource/__partail/weiqingting.html

2016-10-28 16:01:04 +0800

Browse Files

Merge branch 'dev_2.3_shops' into grey ...

9f1d6c79

# Conflicts:
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.Brandmodel.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.CateSize.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.CateSizeAttr.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.Porattr.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/brand.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/brand.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/category.Edit.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.netsale.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Index.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.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.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/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/index.js
#	server/interfaces/common.select.js
#	server/interfaces/common.yohosearch.js
#	server/interfaces/goods.audio.js
#	server/interfaces/goods.basegoods.js
#	server/interfaces/goods.netsale.js
#	server/interfaces/marketing.CouponList.js
#	server/interfaces/marketing.QueryCoupon.js
#	server/interfaces/operations.activitytemplate.js
#	server/interfaces/operations.payment.js
#	server/interfaces/operations.webshare.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/Index.html
#	server/views/goods/netsale/__partail/add_info.html
#	server/views/goods/netsale/__partail/basic_info.html
#	server/views/goods/netsale/__partail/goods_sort.html
#	server/views/marketing/CouponList/AddOrUpdate.html
#	server/views/marketing/CouponList/Index.html
#	server/views/operations/activitytemplate/Product.html
#	server/views/operations/generateLinks/Index.html
#	server/views/operations/icon/Index.html
#	server/views/operations/payment/Index.html
#	server/views/operations/webshare/Edit.html
#	server/views/resource/__partail/weiqingting.html

2016-10-28 15:59:52 +0800

Browse Files

Merge branch 'dev_addFilterCondition' into grey
08221c50

by ZhongW
2016-10-28 15:58:48 +0800
Browse Files
Merge branch 'hotfix-商品参数' into grey ...
76963c23
```
# Conflicts:
#	code/static/js.jquery/module/goods/netsale/Index.js
```
by xuhongyun
2016-10-28 15:56:19 +0800
Browse Files
活动模板添加分页
9bcb76ca

by ZhongW
2016-10-28 15:54:36 +0800
Browse Files
Merge branch 'hotfix/shopbetter2' into grey ...
4dc55df4
```
# Conflicts:
#	code/static/js.jquery/module/goods/netsale/Index.js
```
by xuhongyun
2016-10-28 15:46:49 +0800
Browse Files
Merge branch 'dev_decorator_list' into grey
d8506519

by xuhongyun
2016-10-28 15:42:43 +0800
Browse Files
build
3ae1f028

by xuhongyun
2016-10-28 15:49:34 +0800
Browse Files
Merge branch 'hotfix_商品名称筛选' into grey
b1947527

by 马力
2016-10-28 15:32:49 +0800
Browse Files
下架筛选问题
34d4da71

by 马力
2016-10-28 15:31:43 +0800
Browse Files
商品优化
4317b612

by 梁志锋
2016-10-28 14:30:10 +0800
Browse Files
默认显示下载按钮
a89f81a6

by ZhongW
2016-10-28 14:23:00 +0800
Browse Files
build
9617f901

by xuhongyun
2016-10-28 13:43:34 +0800
Browse Files
Merge branch 'hotfix_商品名称筛选' into grey
694fe152

by 马力
2016-10-28 13:26:05 +0800
Browse Files

27 Oct, 2016

16 commits

按钮放开
607fdc16

by lijian
2016-10-27 18:24:48 +0800
Browse Files
店铺优化
a4fbc0d6

by 梁志锋
2016-10-27 18:07:41 +0800
Browse Files
Build project
9e28b749

by xuhongyun
2016-10-27 16:08:25 +0800
Browse Files
商品优化
670e5eb1

by 梁志锋
2016-10-27 16:03:26 +0800
Browse Files
商品名称筛选，上下架审核查询特定接口
0c368e24

by 马力
2016-10-27 15:46:29 +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 ...

233bc295

# 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
Update: 删除编译文件
421cab44

by leo
2016-10-27 11:12:39 +0800
Browse Files
Fixed: 增加店铺域名校验
b6fc2d1b

by leo
2016-10-27 11:10:26 +0800
Browse Files

26 Oct, 2016

3 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

fe / yohobuy-portal-fe2 · Commits

GitLab

29 Oct, 2016

28 Oct, 2016

27 Oct, 2016

26 Oct, 2016