Merge branch 'hotfix-20190813' into gray

@@ -64,13 +64,7 @@
     <div class="form-group">
         <label class="col-sm-1">搜索商品名称：</label>
         <div class="col-sm-11">
-            [[brandName]] - [[shopName]] - [[maxSortName]] - [[middleSortName]] - [[middleSortName]] - [[smallSortName]] - [[gender]] -
-
-            <span id="productStandardRelationSelected"></span>
-
-            <div class="col-sm-12" style="padding: 10px 10px 10px 0px;">搜索名称用于使商品在搜索结果页搜索到，建议完成以下内容，提高商品在搜索结果页的排序</div>
-
-            <div id="goodsParamWrap4" style="padding: 10px 0 20px 0px;"></div>
+            [[brandName]] - [[shopName]] - [[maxSortName]] - [[middleSortName]] - [[smallSortName]] - [[gender]]
 
             <input id="searchKeys" class="form-control" placeholder="自定义内容" type="text" value="[[productExtBo.searchKeys]]" required maxlength="100">
 

@@ -7,8 +7,8 @@
         <h2 class="panel-title">商品参数</h2>
     </div>
     <div class="panel-body">
-        <!--<div id="attributeTable" class="panel-body nopadding">-->
-        <!--</div>-->
+        <div id="attributeTable" class="panel-body nopadding">
+        </div>
         <div id="goodsParamWrap" class="panel-body nopadding">
         </div>
         <div id="goodsParamWrap2" class="panel-body nopadding">

@@ -211,8 +211,6 @@ var common_columns = [{
 
 /*陈超*/
 
-/**
- * 挪到基本信息里去，成为搜索条件
 var ag = new common.grid({
 	el: "#attributeTable",
 	hash: false,
@@ -256,7 +254,6 @@ common.util.__ajax({
 	});
 }, true);
 
-*/
 
 /*马力*/
 var ag2 = new common.grid({
@@ -346,12 +343,11 @@ $(document).on("change", "#goodsParamWrap .attr_input", function() {
 	item.val = $(this).val();
 });
 
-/**
+
 $(document).on("change", "#attributeTable .attr_input", function() {
 	var item = ag.rows[$(this).data("index")];
 	item.val = $(this).val();
 });
-*/
 
 $(document).on("change", "#goodsParamWrap .attr_checkobx_class", function() {
 	var item = ag2.rows[$(this).data("index")];
@@ -367,6 +363,9 @@ $(document).on("change", "#goodsParamWrap2 .attr_checkobx_class", function() {
 /*保存*/
 function TYgoodsParams(){
 	var data = {};
+	if (!ag.__edit.validate(true)) {
+		return ag.__edit.errMessage;
+	}
 	if (!ag2.__edit.validate(true)) {
 		return ag2.__edit.errMessage;
 	}
@@ -374,6 +373,25 @@ function TYgoodsParams(){
 		return ag3.__edit.errMessage;
 	}
 
+	var productStandardRelationStr = [];
+	if (ag.rows.length > 0) {
+		for (var i in ag.rows) {
+			if (ag.rows[i].val) {
+				var idNameList = ag.rows[i].idNameList;
+				for (var x in idNameList) {
+					if (ag.rows[i].val == idNameList[x].id) {
+						productStandardRelationStr.push({
+							standardId: ag.rows[i].attributeId,
+							standardVal: idNameList[x].text,
+							parameterMakeId: idNameList[x].id
+						});
+					}
+				}
+			}
+		}
+	}
+	data.productStandardRelationStr = JSON.stringify(productStandardRelationStr);
+
 	var goodsParamArr = [];
 	if (ag2.rows.length > 0) {
 		for (var i in ag2.rows) {

@@ -284,7 +284,6 @@ $('#saveBasicInfo').on('click', function() {
                     util.__tip(tipText, 'warning');
                 } else {
                     submitForm();
-					submitPropertySave();
 					saveNetSaleSearchKeys();
                 }
             }