将补全信息中：弹性、厚度、柔软度、透气性、品牌款型、品牌系列，移到商品参数中展示

马力
Commit 0ef6df8e248483112ab853502608bd58056f9f9b 1 parent d6b914a5
Showing 4 changed files with 40 additions and 32 deletions
code/apps/goods/interfaces/netsale.js
code/apps/goods/views/netsale/__partail/add_info.html
code/apps/goods/views/netsale/__partail/goods_params.html
code/static/js.jquery/module/goods/netsale/partials/add-info.js
--- a/code/apps/goods/interfaces/netsale.js
View file @0ef6df8
+++ b/code/apps/goods/interfaces/netsale.js
View file @0ef6df8
@@ -153,8 +153,6 @@ module.exports={
         	url: '/product/saveAfterSaleInfo',
 	        params:{
                 productSkn:{type:Number,required:true},
-                brandModel:{type:String},
-                brandSeries:{type:String},
                 makeCrafts:{type:String},
                 salesPhrase:{type:String},
                 isHostsell:{type:String},
@@ -277,7 +275,9 @@ module.exports={
 	            {name: 'productSkn', type: 'number'},
 	            {name: 'attributeProValuesOne', type: 'string'},
 	            {name: 'productStandardRelationStr', type: 'string'},
-	            {name: 'productMaterial', type: 'string'}
+	            {name: 'productMaterial', type: 'string'},
+	            {name: 'brandModel', type: 'string'},
+	            {name: 'brandSeries', type: 'string'}
 	        ]
         },
         saveProductDesc:{
--- a/code/apps/goods/views/netsale/__partail/add_info.html
View file @0ef6df8
+++ b/code/apps/goods/views/netsale/__partail/add_info.html
View file @0ef6df8
@@ -39,32 +39,6 @@
         </div>
     [[/each]]
-    <div id="brandModelWrap" class="form-group">
-        <label>品牌款型：</label>
-        <div style="display: inline-block;width: 280px;">
-            <select name="brandModelSelect" id="brandModelSelect" tabindex="-1" title="" class="form-control" >
-                [[if brandModelText]]
-                <option value="[[brandModel]]">[[brandModelText]]</option>
-                [[else]]
-                <option value="">请选择品牌款型</option>
-                [[/if]]
-            </select>
-        </div>
-        <input type="hidden" id="brandModel" value="[[brandModel]]"> 
-    </div>
-    <div id="brandSeriesWrap" class="form-group">
-        <label>品牌系列：</label>
-        <div style="display: inline-block;width: 280px;">
-            <select name="brandSeriesSelect" id="brandSeriesSelect"  tabindex="-1" title="" class="form-control">
-                [[if brandSeriesText]]
-                <option value="[[brandSeries]]">[[brandSeriesText]]</option> 
-                [[else]]
-                <option value="">请选择品牌系列</option>
-                [[/if]]        
-            </select>
-        </div>
-        <input type="hidden" id="brandSeries" value="[[brandSeries]]"> 
-    </div>
     <div class="form-group">
         <label>促销短语：</label>
@@ -80,4 +54,5 @@
         </span>
     </div>
     -->
-</script>
+</script>
+
--- a/code/apps/goods/views/netsale/__partail/goods_params.html
View file @0ef6df8
+++ b/code/apps/goods/views/netsale/__partail/goods_params.html
View file @0ef6df8
@@ -13,6 +13,8 @@
         </div>
         <div id="goodsParamWrap2" class="panel-body nopadding">
         </div>
+        <div id="goodsParamWrap3" class="panel-body nopadding">
+        </div>
     </div>
     <div class="panel-footer" id="goodsParams-footer">
@@ -55,4 +57,33 @@
 <textarea class="form-control attr_input" data-index='[[__index]]' [[required]] maxlength='[[maxValueLen]]' placeholder="[[attributeName]]">[[val||'']]</textarea>
 [[/if]]
 </div>
+</script>
+
+<script type="text/template" id="brandModelSeries">
+    <div id="brandModelWrap" class="form-group">
+        <label>品牌款型：</label>
+        <div style="display: inline-block;width: 280px;">
+            <select name="brandModelSelect" id="brandModelSelect" tabindex="-1" title="" class="form-control" >
+                [[if brandModelText]]
+                <option value="[[brandModel]]">[[brandModelText]]</option>
+                [[else]]
+                <option value="">请选择品牌款型</option>
+                [[/if]]
+            </select>
+        </div>
+        <input type="hidden" id="brandModel" value="[[brandModel]]"> 
+    </div>
+    <div id="brandSeriesWrap" class="form-group">
+        <label>品牌系列：</label>
+        <div style="display: inline-block;width: 280px;">
+            <select name="brandSeriesSelect" id="brandSeriesSelect"  tabindex="-1" title="" class="form-control">
+                [[if brandSeriesText]]
+                <option value="[[brandSeries]]">[[brandSeriesText]]</option> 
+                [[else]]
+                <option value="">请选择品牌系列</option>
+                [[/if]]        
+            </select>
+        </div>
+        <input type="hidden" id="brandSeries" value="[[brandSeries]]"> 
+    </div>
 </script>
--- a/code/static/js.jquery/module/goods/netsale/partials/add-info.js
View file @0ef6df8
+++ b/code/static/js.jquery/module/goods/netsale/partials/add-info.js
View file @0ef6df8
@@ -46,8 +46,6 @@ $('#saveAddInfo').on('click', function() {
 		url:'/goods/product/saveAfterSaleInfo',
 		data:{
 			productSkn:basicInfo.productSkn,
-			brandModel:common.util.__input('brandModel'),
-			brandSeries:common.util.__input('brandSeries'),
 			makeCrafts:common.util.__input('makeCrafts'),
 			salesPhrase:common.util.__input('salesPhrase'),
 			isHostsell:common.util.__input('[name=isHostsell]:checked'),
@@ -107,6 +105,7 @@ common.util.__ajax({
 		}
 		$('#addinfo-wrap').html(common.util.__template2($('#addInfoTemp').html(), data));
+		$('#goodsParamWrap3').html(common.util.__template2($('#brandModelSeries').html(), data));
 		e.on("bind", function() {
 			$('#brandModelSelect').on('change', function() {
@@ -372,6 +371,9 @@ function TYgoodsParams(){
 	}
 	data.productSkn = $('#productSkn').val();
+
+	data.brandModel = common.util.__input('brandModel');
+	data.brandSeries = common.util.__input('brandSeries');
 	return data;
 };