Merge branch 'dev_2.2' into test

@@ -23,11 +23,14 @@
                 <p>SKC: [[item.productSkc]]</p>
                 <p>[[item.goodsName]]：</p>
                 <p>[[item.factoryGoodsName || '']]</p>
-                <p>SKU:
-                [[each item.goodsSizeList as item2 index2]]
-                    [[item2.productSku || '']]
-                 [[/each]]
-                 </p>
+                <table><tr>
+                <td valign='top'>SKU:</td>
+                  <td>
+                  [[each item.goodsSizeList as item2 index2]]
+                 [[item2.productSku || '']]
+                 [[/each]]</td>
+                </tr></table>
+                 
             </div>
             <div class="cover-color">颜色封面：</div>
         </div>

@@ -426,19 +426,22 @@ grid.prototype = {
                     g.selected.push(g.rows[index]);
                 }
             });
-
         }); //g.selected
         //$(".wqt_checkbox").prop("checked",true);
         $(g.grid).on("change", ".wqt_checkbox", function() {
             $(".wqt_all").prop("checked", false);
             g.selected.length = 0;
+            var selected = true;  
             $(".wqt_checkbox").each(function() {
                 var checked = $(this).prop("checked");
                 var index = $(this).data("index");
                 if (checked) {
                     g.selected.push(g.rows[index]);
+                } else {
+                    selected = false;
                 }
             });
+            $(".wqt_all").prop("checked", selected);
         });
 
         $(g.grid).on("change",".t_size",function(){

@@ -285,7 +285,6 @@ function renderGoodList() {
         gender:gender
     }));
 
-
     //添加封面图
     common.edit.ajaxfileupload(".fenmianfile", {
         params: {
@@ -475,7 +474,6 @@ function getFenManData () {
             map.productSkc = item.productSkc;
             map.productSkn = item.productSkn;
         }
-        console.info(item.goodsImagesList)
         if (!item.goodsImagesList || item.goodsImagesList == 0) {
             return;
         }else{
@@ -491,6 +489,9 @@ function getFenManData () {
     });
     //if (map.goodsImagesBoList.length == 0) return;
     map.goodsImagesBoList = JSON.stringify(map.goodsImagesBoList);
+    if(typeof(map.productSkc) == "undefined"){
+        return '<p>请设置商品默认封面</p>';
+    }
     if (msg != '') {
         return {
             "goodsImagesReq": JSON.stringify(map)
@@ -498,5 +499,4 @@ function getFenManData () {
     } else {
         return '<p>请设置至少一个skc的封面</p>';
     }
-
 };

@@ -130,10 +130,18 @@ $(document).on('click', '#modelTry-save', function () {
    });
 
 // $(".wqt_checkbox").attr("checked",'checked');
-$(".wqt_checkbox").each(function(){
-	this.checked="checked";                 
-    }); 
-setTimeout(function(){$(".wqt_all").attr("checked",'checked');},2000)
+// $(".wqt_all").each(function(){
+// 	this.checked="checked";                 
+//     }); 
+
+$(document).ready(function() {
+	$(".wqt_all").prop("checked", true);
+	$(".wqt_all").change();
+});
+
+//$(".wqt_all").attr("checked", true).trigger("change");
+
+//setTimeout(function(){$(".wqt_all").attr("checked",'checked');},2000)
 
 
 

@@ -111,7 +111,7 @@ var t = new common.tab2({
         g.options.columns[13].hidden = true;
         g.options.columns[14].hidden = true;
         g.options.columns[15].hidden = true;
-
+        g.options.columns[17].hidden = false;
         // 隐藏无权限的审核列表页操作
 	    var authority = $("#authority").val();
 		
@@ -442,7 +442,7 @@ var g = new common.grid({
                 else html += '</p>';
                  
                 html += '<p>降价幅度:'+'<br>';
-                if(item.days) html += 0 +'</p>';
+                if(item.days) html += item.reductExtent +'</p>';
                 else html += '</p>'; 
             return html;
         }}, 
@@ -639,7 +639,7 @@ $(document).on('click', '.modify-btn', function() {
             $vip3Price.attr('disabled', true).val(Number(priceArr[selectVal][2]).toFixed(2));
         }
         if($storagePerPrice.val()){
-            $expectGrossProfitRate.val(((parseFloat($price.val()) - parseFloat($storagePerPrice.val())) / parseFloat($storagePerPrice.val())).toFixed(2) );    
+            $expectGrossProfitRate.val(((parseFloat($price.val()) - parseFloat($storagePerPrice.val())) / parseFloat($price.val())).toFixed(2) );    
         }
         
     }

@@ -11,6 +11,11 @@ e.on("validate", function () {
     }
     //phone
     var phone = $.trim($("#phone").val());
+    var legalPerson = $.trim($("#legalPerson").val());
+    alert(legalPerson)
+    if(legalPerson.length>250){
+         return "法人代表长度不能超过250！";
+    }
     if (phone) {
         if (!(/^[0-9-()]*$/.test(phone))) {
             return "请输入正确的联系人电话";
@@ -19,6 +24,7 @@ e.on("validate", function () {
     if (!phone && !contactPhone) {
         return "请在公司联系电话,联系人电话至少填一个";
     }
+
     return true;
 });
 e.init();