bug提交

@@ -116,7 +116,7 @@ grid.prototype = {
             param.page = urlParam.page;
         }
 
-        if (param.size == p.size) {
+        if (!param.size) {
             param.size = urlParam.size;
         }
 

@@ -205,4 +205,17 @@ if (location.hash) {
 		$('.floatnav').find('li[name="' + hashPos + '"]').trigger('click');
 	}, 500);
 
-}
\ No newline at end of file
+}
+
+// alert(location.hash.replace(/^#/,'').split(',')[0]);
+try{
+	$(".sub-floatnav li").each(function(){
+		var name=$.trim($(this).text());
+		if(name==location.hash.replace(/^#/,'').split(',')[0]){
+			$(this).click();
+		}
+	});
+}
+catch(e){
+
+}

@@ -281,10 +281,10 @@ var g = new common.grid({
 			var HtmArr = [];
 
 			if (item.status == 4 || item.status == 1 || item.status == 5 || item.status == 6) {
-				HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
+				HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '#'+item.missInfo+'" class="btn btn-info btn-xs edit-btn">编辑</a>');
 				HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-index="' + item.__index + '">下架</a>');
 			} else if (item.status == 3 || item.status == 8 || item.status == 2 || item.status == 0) {
-				HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
+				HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '#'+item.missInfo+'" class="btn btn-info btn-xs edit-btn">编辑</a>');
 				HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-index="' + item.__index + '">上架</a>');
 			}
 			HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs info-btn">查看</a>');

@@ -86,11 +86,12 @@ exports.uploadFile = function(req, res) {
                     res.json(errBackMsg);
                 });
             } else {
+
                 request.post({
                     url: domain + '/fileupload/upload',
                     formData: req.body
                 }, function optionalCallback(error, httpResponse, body) {
-
+                    console.log(body);
                     if (!error && httpResponse.statusCode == 200) {
                         var json = JSON.parse(body);
                         json.status = true;
@@ -98,7 +99,6 @@ exports.uploadFile = function(req, res) {
                     } else {
                         res.json(errBackMsg);
                     }
-
                 });
             }
         }