页面崩溃bug fix

liuyue
Commit 8be0a20e06a710469e5b3a0d9c25f5c6a3dd891d 1 parent fae0c0ac
Showing 7 changed files with 34 additions and 26 deletions
client/js/goods/netsale-edit.js
client/js/goods/partials/basic-info.js
client/js/goods/partials/brand-relation.js
client/js/goods/partials/editor_recommend.js
server/config/common.js
server/views/partials/netsale/editor-recommend.html
server/views/partials/netsale/goods-description.html
--- a/client/js/goods/netsale-edit.js
View file @8be0a20
+++ b/client/js/goods/netsale-edit.js
View file @8be0a20
@@ -116,9 +116,11 @@ $(document).on("click", "#saveAllInfo", function() {
 		$.extend(data, value, true);
 	});
-	e.submit('/goods/product/saveNetSaleAllInfo', function(option) {
-		option.data = data;
-		option.success = function(res) {
+	if (typeof data != 'string') {
+		common.util.__ajax({
+			url: '/goods/product/saveNetSaleAllInfo',
+			data: data
+		}, function(res) {
 			res = res.data;
 			if (res.code == '200') {
 				e.$tip(res.message, function() {
@@ -128,8 +130,9 @@ $(document).on("click", "#saveAllInfo", function() {
 				e.$tip(res.message);
 			}
 			return false;
-		}
 		});
+	}
+
 })
--- a/client/js/goods/partials/basic-info.js
View file @8be0a20
+++ b/client/js/goods/partials/basic-info.js
View file @8be0a20
@@ -174,20 +174,10 @@ $('#saveBasicInfo').on('click', function() {
 });
 GOLABDATA.on("LYbasicInfo", function() {
-	/*return e.submit('', function(option) {
-		var list = option.data.sellChannels.split('|').join(',');
+	return e.submit('', function(option) {
 		option.data.productSkn = $('#productSkn').val();
-		option.data.sellChannels = list;
-		option.data.shopIds = $('#shopIds').val() ? $('#shopIds').val().split('|').join(',') : '';
+		option.data.sellChannels = option.data.sellChannels.split('|').join(',');
+		option.data.shopIds = option.data.shopIds.split('|').join(',');
 		option.debug = true;
-	});*/
-	var data = {};
-	data.productSkn = $('#productSkn').val();
-	$('#basicInfoWrap').find('input').each(function() {
-		var key = $(this).attr('id');
-		if (key) {
-			data[key] = $(this).val().split('|').join(',');
-		}
 	});
-	return data;
 });
--- a/client/js/goods/partials/brand-relation.js
View file @8be0a20
+++ b/client/js/goods/partials/brand-relation.js
View file @8be0a20
--- a/client/js/goods/partials/editor_recommend.js
View file @8be0a20
+++ b/client/js/goods/partials/editor_recommend.js
View file @8be0a20
@@ -54,8 +54,8 @@ $(document).on("click", "#btn-recommand", function() {
 	return false;
 });
-GOLABDATA.on("bianjiqi", function() {
-	/*if (UMdescriptioner.getContent() != '') {
+/*GOLABDATA.on("bianjiqi", function() {
+	if (UMdescriptioner.getContent() != '') {
 		return {
 			recommend: UMrecommender.getContent(),
 			productDesc: UMdescriptioner.getContent()
@@ -64,14 +64,27 @@ GOLABDATA.on("bianjiqi", function() {
 		common.util.__tip('商品描述不可为空', 'warning');
 		return;
 	}
-*/
-	$('#productDesc').val(UMdescriptioner.getContent());
-	return {
-		recommend: UMrecommender.getContent(),
-		productDesc: $('#productDesc').val()
-	}
+});*/
+GOLABDATA.on("LYrecommend", function() {
+	var recommendEdit = new common.edit('#recommenderWrap');
+	$('#recommend').val(UMrecommender.getContent());
+	return recommendEdit.submit('', function(option) {
+		option.productSkn = productSkn;
+		option.recommend = $('#recommend').val();
+		option.debug = true;
+	});
+});
+
+GOLABDATA.on("LYproductDesc", function() {
+	var descriptionEdit = new common.edit('#descriptionerWrap');
+	$('#productDesc').val(UMdescriptioner.getContent());
+	return descriptionEdit.submit('', function(option) {
+		option.productSkn = productSkn;
+		option.productDesc = $('#productDesc').val();
+		option.debug = true;
+	});
 });
 if (editType == 'info') {
--- a/server/config/common.js
View file @8be0a20
+++ b/server/config/common.js
View file @8be0a20
@@ -17,7 +17,7 @@ var config = {
         // domain:'http://172.16.6.240:8088/platform',//   王书生
         // domain: 'http://172.16.6.124:8088/platform',//陈超
         //http://172.16.6.124:8088/platform/product/queryAllProductAttr
-        //domain: 'http://172.16.6.227:8088/platform', //玛丽
+        // domain: 'http://172.16.6.227:8088/platform', //玛丽
         // domain: 'http://192.168.102.202:8088/platform',
         //domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
         domain: 'http://192.168.102.202:8088/platform',
--- a/server/views/partials/netsale/editor-recommend.html
View file @8be0a20
+++ b/server/views/partials/netsale/editor-recommend.html
View file @8be0a20
@@ -9,6 +9,7 @@
     </div>
     <div class="panel-body nopadding">
      <script id="edit-recommender" type="text/plain" style="width:100%;height:500px;"></script>
+     <input id="recommend" type="hidden">
      <p>
          <span class="red">提示：与商品相关的逛信息自动抓取到下列各模块中，若要在商品详情中展示，请将其编辑在【小编推荐】中。
         </span>
--- a/server/views/partials/netsale/goods-description.html
View file @8be0a20
+++ b/server/views/partials/netsale/goods-description.html
View file @8be0a20
@@ -9,6 +9,7 @@
         </div>
         <div class="panel-body nopadding">
             <script id="edit-descriptioner" type="text/plain" style="width:100%;height:500px;"></script>
+            <input id="productDesc" type="hidden" required>
         </div>
         <div class="panel-footer">
             <input type="hidden" id="productDesc" required placeholder="商品描述">