Merge branch 'dev_2.2' into test

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

@@ -11,7 +11,7 @@
         <div class="form-group">
         <div class="form-group">
             <label class="col-sm-1 control-label height40" for="searchKeys">商品关键词</label>
             <label class="col-sm-1 control-label height40" for="searchKeys">商品关键词</label>
             <div class="col-sm-6">
             <div class="col-sm-6">
-                <input type="text" class="form-control" id="searchKeys" required="required" />
+                <input type="text" class="form-control" id="searchKeys" />
 
 
             </div>
             </div>
             <div class="height40" style="color: red;">每个关键词请用英文“，”隔开</div>
             <div class="height40" style="color: red;">每个关键词请用英文“，”隔开</div>

@@ -493,8 +493,9 @@ GOLABDATA.on("fenmian", function () {
         }
         }
 
 
         if (!item.goodsImagesList || item.goodsImagesList == 0) {
         if (!item.goodsImagesList || item.goodsImagesList == 0) {
-            errorMsg += '<p>请设置skc:' + item.productSkc + '的封面</p>';
             return;
             return;
+        }else {
+            errorMsg="pass";
         }
         }
         $.each(item.goodsImagesList, function (_index, _item) {
         $.each(item.goodsImagesList, function (_index, _item) {
             if (!_item) {
             if (!_item) {
@@ -506,12 +507,15 @@ GOLABDATA.on("fenmian", function () {
     });
     });
     //if (map.goodsImagesBoList.length == 0) return;
     //if (map.goodsImagesBoList.length == 0) return;
     map.goodsImagesBoList = JSON.stringify(map.goodsImagesBoList);
     map.goodsImagesBoList = JSON.stringify(map.goodsImagesBoList);
-    if (errorMsg === '') {
+    if(typeof(map.productSkc) == "undefined"){
+        return '<p>请设置商品默认封面</p>';
+    }
+    if (errorMsg != '') {
         return {
         return {
             "goodsImagesReq": JSON.stringify(map)
             "goodsImagesReq": JSON.stringify(map)
         }
         }
     } else {
     } else {
-        return errorMsg;
+        return '<p>请设置至少一个skc的封面</p>';
     }
     }
 
 
 });
 });