4.4 xiugai

@@ -148,8 +148,9 @@ var SORTDATA={
 };
 var tabTree=new common.tabTree("#tree",SORTDATA);
 tabTree.init(SORTDATA.datas);
-if(param&&(RESPONSEDATA.isAuditing==100||(RESPONSEDATA.isAuditing==200&&RESPONSEDATA.status==8))){
+if(param&&(RESPONSEDATA.isAuditing==100)){
 	//上架之前可以修改，编辑状态
+	//||(RESPONSEDATA.isAuditing==200&&RESPONSEDATA.status==8)
 	tabTree.isfeeze=false;
 }else{
 	tabTree.isfeeze=true;

@@ -159,9 +159,15 @@ g.init('/netSale/selectCollocationListBySkn');
 var Bll = {
 		posData: [],
 		toast: function(title, item, url) {
+			console.log();
 			var e = new common.edit("#dapei-form", BUCKET);
-			this.posData = [];
-
+			if(item.info){
+				item.info.forEach(function(d){
+					Bll.posData.push(d);
+				});
+			}
+			
+			
 			var d = new common.dialog({
 				title: title,
 				width: '70%',
@@ -174,7 +180,7 @@ var Bll = {
 							option.data.id = item.id;
 							option.data.productSkn = productSkn;
 							option.data.infoStr = JSON.stringify(Bll.posData);
-							console.log(option.data);
+							console.log("保存",Bll.posData);
 							option.success = function(res) {
 								res = res.data;
 								if (res.code == +"200") {
@@ -244,10 +250,6 @@ $(document).on("click", "#dapeiadd", function() {
 	Bll.toast("添加搭配", {}, "/netSale/insertCollocation");
 	return false;
 });
-//保存
-$(document).on("click", "#dapeisave", function() {
-	//添加的时候已经保存
-});
 //删除
 $(document).on("click", "#dapeiTable .delete", function() {
 	var item = g.rows[$(this).data("index")];
@@ -269,11 +271,9 @@ $(document).on("click", "#dapeiTable .edit", function() {
 			param: item.id
 		}
 	}, function(data) {
-		console.log(data.data);
+		console.log("获取",data.data);
 		Bll.toast("添加搭配", data.data, "/netSale/updateCollocation");
 	});
-	// item.infoStr=[{"top":223,"left":380,"id":"ffffff"},{"top":454,"left":309,"id":"ggggg"}];
-	// Bll.toast("添加搭配",item,"/netSale/updateCollocation");
 });
 
 

@@ -121,7 +121,7 @@ exports.uploadFile = function (req, res) {
                 request.post({
                     url: domain + '/fileupload/upload',
                     formData: req.body
-                }, function optionalCallback(error, httpResponse, body) {
+                }, function (error, httpResponse, body) {
                     if (!error && httpResponse.statusCode == 200) {
                         var json = JSON.parse(body);
                         json.status = true;
@@ -155,26 +155,6 @@ function joinimg(url) {
     }
 }
 
-// exports.getSaveState=function(req,res){
-//     console.log("6666666");
-//     request.post({
-//         url: domain + '/product/queryBatchImportResult',
-//         formData: req.body
-//     }, function optionalCallback(error, httpResponse, body) {
-//         console.log(body);
-//         if (error) {
-//             return console.error('upload failed:', error);
-//         }
-//         if (!error && httpResponse.statusCode == 200) {
-//             var json = JSON.parse(body);
-//             json.status = true;
-//             // console.log(json);
-//             res.json(json);
-//         } else {
-//             res.json(errBackMsg);
-//         }
-//     });
-// }
 
 exports.ueditor = function(req, res) {