Merge branch 'dev_店铺装修优化_15353' into gray

# Conflicts:
#	dist/yohobuy-shops-fe/4.8.3/index.min.css
#	dist/yohobuy-shops-fe/4.8.3/jquery/common.Login.js
#	dist/yohobuy-shops-fe/4.8.3/jquery/goods.netsale.Edit.js
#	dist/yohobuy-shops-fe/4.8.3/jquery/shop.Decoration.js
#	server/controllers/common.index.js
#	server/controllers/shop.shopCategory.js
#	server/filters.js
#	server/interfaces/common.login.js
#	server/interfaces/shop.shopCategory.js
#	server/package.json
#	server/views/common/Login.html

@@ -34,12 +34,14 @@ var g = new common.grid({
 		render: function(item) {
 			console.log(item);
 			if (item.brands instanceof Array && item.brands.length > 0) {
-				var html = '';
+				var brandArr = [];
 				$.each(item.brands, function(i, value) {
-					html += value.brandName + '<br>';
+					if($.inArray(value.brandName, brandArr) === -1) {
+						brandArr.push(value.brandName);
+					}
 				});
 
-				return html;
+				return '<p>' + brandArr.join('</p><p>') + '</p>';
 			} else {
 				return '';
 			}