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

…fe into release/qqtest

Conflicts:
	server/views/pages/basegoods/edit.html

@@ -288,7 +288,7 @@ var g = new common.grid({
                     }
                     }
 
 
                     html.push("<p>是</p>");
                     html.push("<p>是</p>");
-                    html.push("<p>预售库存：" + item.stock + "</p>");
+                    html.push("<p>预售库存：" + (item.stock||'0') + "</p>");
                     html.push("<p>预计到货时间：" + formatted + "</p>");
                     html.push("<p>预计到货时间：" + formatted + "</p>");
                 } else {
                 } else {
                     var formatted = "";
                     var formatted = "";

@@ -149,7 +149,7 @@ sortmenu.init(function () {
     clearTimeout(timeid);
     clearTimeout(timeid);
     timeid=setTimeout(function(){
     timeid=setTimeout(function(){
         tableGird.init('/product/attr/queryProductAttributeList');
         tableGird.init('/product/attr/queryProductAttributeList');
-    },600);
+    },2000);
 });
 });
 
 
 $('#add-attri').click(function () {
 $('#add-attri').click(function () {

@@ -228,7 +228,6 @@
             </div>
             </div>
             <input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
             <input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
 
 
-        [[if isAuditing==200]]
             <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">
@@ -242,6 +241,8 @@
         [[/if]]
         [[/if]]
 
 
 
 
+
+
         </div>
         </div>
 
 
         <div class="form-group">
         <div class="form-group">