Authored by weiqingting

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop

@@ -89,12 +89,7 @@ new common.dropDown({ @@ -89,12 +89,7 @@ new common.dropDown({
89 new common.dropDown({ 89 new common.dropDown({
90 el: "#brandId", 90 el: "#brandId",
91 ajax: "brand", 91 ajax: "brand",
92 - hash: true,  
93 - params: function() {  
94 - return {  
95 - status: 1  
96 - };  
97 - } 92 + hash: true
98 }); 93 });
99 new common.dropDown({ 94 new common.dropDown({
100 el: "#isOutLets", 95 el: "#isOutLets",
@@ -360,7 +360,7 @@ input[type=file] { @@ -360,7 +360,7 @@ input[type=file] {
360 height: 60px; 360 height: 60px;
361 width: 100px; 361 width: 100px;
362 position: absolute; 362 position: absolute;
363 - z-index: 99; 363 + z-index: 30;
364 } 364 }
365 .form-horizontal .form-group{ 365 .form-horizontal .form-group{
366 margin-left: 0px; 366 margin-left: 0px;