提交

@@ -256,7 +256,7 @@ var successList = null,
 $('#upload-input').after('<div class="file-name btn btn-default">请选择文件</div>');
 $('#upload-input').after('<div class="file-name btn btn-default">请选择文件</div>');
 common.edit.ajaxfileupload("#upload-input", {
 common.edit.ajaxfileupload("#upload-input", {
     params: {
     params: {
-        type: "price",
+        type: "brandCooperation",
         __type: "batch-import"
         __type: "batch-import"
     },
     },
     onStart: function() {
     onStart: function() {

@@ -15,36 +15,25 @@ exports.uploadFile = function(req, res) {
         var ip = ipObject ? ipObject.join('.') : req.ip;
         var ip = ipObject ? ipObject.join('.') : req.ip;
 
 
         headers = {
         headers = {
-            'x-user-id': req.session.user.pid,
-            'x-user-name': req.session.user.account,
+            'x-user-id': req.session.user.auth.pid,
+            'x-user-name': req.session.user.auth.account,
             'x-site-type': 1,
             'x-site-type': 1,
             'x-client-ip': ip
             'x-client-ip': ip
         };
         };
+
     }
     }
     if (req.is("multipart/form-data")) {
     if (req.is("multipart/form-data")) {
         req.body.file = fs.createReadStream(req.files[req.body.filename].path);
         req.body.file = fs.createReadStream(req.files[req.body.filename].path);
         if (req.body.__type == "batch-import") {
         if (req.body.__type == "batch-import") {
-            var options = {
+            request.post({
                 url: domain + '/batch/import',
                 url: domain + '/batch/import',
-                method: 'POST',
                 formData: req.body,
                 formData: req.body,
                 headers: headers
                 headers: headers
-            };
-            request(options, function(error, response, body) {
+            }, function optionalCallback(err, httpResponse, body) {
                 var json = JSON.parse(body);
                 var json = JSON.parse(body);
                 json.status = true;
                 json.status = true;
                 res.json(json);
                 res.json(json);
-
             });
             });
-            // request.post({
-            //     url: domain + '/batch/import',
-            //     formData: req.body,
-            //     headers: headers
-            // }, function optionalCallback(err, httpResponse, body) {
-            //     var json = JSON.parse(body);
-            //     json.status = true;
-            //     res.json(json);
-            // });
         } else {
         } else {
             request.post({
             request.post({
                 url: domain + '/fileupload/upload',
                 url: domain + '/fileupload/upload',