Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-…

…fe into release/qqtest

@@ -239,12 +239,19 @@ var g = new common.grid({
         {
         {
             display: "年龄层/性别",
             display: "年龄层/性别",
             render: function(item) {
             render: function(item) {
-                var html = [];
-                var ageLevel = AgeLevelEnum.level[item.ageLevel];
-                var gender = GenderEnum.gender[item.gender];
-                html.push("<p>" + ageLevel + " / " + gender + "</p>");
+                var html = '';
+
+                if (AgeLevelEnum.level[item.ageLevel]) {
+                    html += AgeLevelEnum.level[item.ageLevel];
+                    if (item.gender) {
+                        html += '/';
+                    }
+                }
+                if (GenderEnum.gender[item.gender]) {
+                    html += GenderEnum.gender[item.gender]
+                }
+                return html;
 
 
-                return html.join('');
             }
             }
         },
         },
 
 

@@ -137,7 +137,7 @@ pc端店铺模板css
     display: block;
     display: block;
     float: right;
     float: right;
     height: 50px;
     height: 50px;
-    width: 40%;
+    width: 50px;
 }
 }
 
 
 /*------------------------热销推荐--------------------------*/
 /*------------------------热销推荐--------------------------*/

@@ -196,7 +196,6 @@
             </div>
             </div>
         </div>
         </div>
         <div class="form-group">
         <div class="form-group">
-        <!-- 【年龄层】默认 成人 ，成人和大童小童互斥，如果是童装，年龄层必填，并且大童小童可以复选。 -->
             <label class="col-sm-2 control-label">年龄层<span class="red">*</span></label>
             <label class="col-sm-2 control-label">年龄层<span class="red">*</span></label>
             <div class="col-sm-2">
             <div class="col-sm-2">
                 <label class="radio-inline">
                 <label class="radio-inline">
@@ -227,7 +226,6 @@
                     <input type="radio" name="grade" value="0">否</label>
                     <input type="radio" name="grade" value="0">否</label>
             </div>
             </div>
             <input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
             <input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
-
             <label class="col-sm-1 control-label">适销季<span class="red">*</span></label>
             <label class="col-sm-1 control-label">适销季<span class="red">*</span></label>
             <div class="col-sm-2">
             <div class="col-sm-2">
                 <label class="radio-inline">
                 <label class="radio-inline">
@@ -238,10 +236,6 @@
                     <input type="checkbox" name="seasons" value="seasons">四季</label>
                     <input type="checkbox" name="seasons" value="seasons">四季</label>
                 <input type="hidden" id="seasons" name="seasons" value="[[seasons||'seasons']]" for="checkbox" placeholder="年龄层" />
                 <input type="hidden" id="seasons" name="seasons" value="[[seasons||'seasons']]" for="checkbox" placeholder="年龄层" />
             </div>
             </div>
-        [[/if]]
-
-
-
 
 
         </div>
         </div>