Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-shops-fe into develop

@@ -164,9 +164,9 @@ if(RESPONSEDATA.isAuditing!=200){
 		return {status:1}
 	}});
 
-	new common.dropDown({el:"#shopId",ajax:"sortbybrand",params:function(){
-		return {brandId:$("#brandId").val()}
-	}});
+	// new common.dropDown({el:"#shopId",ajax:"sortbybrand",params:function(){
+	// 	return {brandId:$("#brandId").val()}
+	// }});
 
 	new common.dropDown({el:"#supplierId",ajax:"getjitSup",params:function(){
 		return  {brandId:$("#brandId").val()}
@@ -293,7 +293,7 @@ $(document).on("change","#brandId",function(){
 	Bll.productNameArr[0]=$(this).find("option[value='"+id+"']").text();
 	Bll.setProductName();
 	$("#supplierId").val(-1).trigger("change"); 
-	$("#shopId").val(-1).trigger("change"); 
+	// $("#shopId").val(-1).trigger("change"); 
 	tabTree.isfeeze=false;
 	tabTree.init([{id:"",sortName:""},{id:"",sortName:""},{id:"",sortName:""},{id:"",sortName:""}]);
 });
@@ -541,7 +541,7 @@ $(document).on("click","#btnReview",function(){
 				var select=tabTree.getAddress();
 
 				option.data.supplierId=common.util.__input("supplierId")?$("#supplierId").val():"0";
-				option.data.shopId=common.util.__input("shopId")?$("#shopId").val():"0";
+				// option.data.shopId=common.util.__input("shopId")?$("#shopId").val():"0";
 				
 				option.data.productSkn=param?param[0]:"";
 				option.data.maxSortId=select[0]?select[0].id:"";

@@ -16,7 +16,7 @@ var config = {
         domain: 'http://192.168.102.202:8088/platform',
         //domain: 'http://192.168.102.216:8088/platform',
         //domain: 'http://172.16.6.227:8088/platform', //马力
-        //domain: 'http://172.16.6.240:8088/platform', //王书生
+        // domain: 'http://172.16.6.176:8088/platform', //王书生
         loggers: {
             api: {
                 level: 'verbose',

-var request = require('request');
-var _ = require('lodash');
-var fs = require('fs');
-var ipaddr = require('ipaddr.js');
-var domain = require('../../config/common.js').domain;
-//var domain = 'http://172.16.6.227:8088/platform'; //马力
-// var domain = 'http://172.16.6.227:8083/yohobuy-platform-web';
-
-exports.downFile = function(req, res) {
-	var options = {
-		method: 'POST',
-		url: domain + '/batch/export',
-		headers: {
-			'content-type': 'application/json'
-		},
-		body: req.query,
-		json: true
-	};
-	request(options).pipe(res);
-}
\ No newline at end of file

@@ -17,7 +17,7 @@ var errBackMsg = {
 // var domain = 'http://172.16.6.162:8088/platform';
 //var domain = 'http://172.16.6.240:8088/platform';
 
-exports.uploadFile = function(req, res) {
+function getHeader(req,res){
     var headers = {};
     if (req.session && req.session.user) {
         var ipObject = ipaddr.process(req.ip).octets
@@ -27,7 +27,8 @@ exports.uploadFile = function(req, res) {
             'x-user-id': req.session.user.auth.pid,
             'x-user-name': req.session.user.auth.account,
             'x-site-type': 1,
-            'x-client-ip': ip
+            'x-client-ip': ip,
+            'x-shop-id':req.session.user.auth.shopId
         };
 
     } else {
@@ -36,6 +37,12 @@ exports.uploadFile = function(req, res) {
             message: "用户失效,请重新登录"
         });
     }
+    return headers;
+}
+
+
+exports.uploadFile = function(req, res) {
+    var headers = getHeader(req,res);
 
     if (req.is("multipart/form-data")) {
         console.log(req.body);
@@ -129,48 +136,11 @@ 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) {
-    var headers = {};
-    if (req.session && req.session.user) {
-        var ipObject = ipaddr.process(req.ip).octets
-        var ip = ipObject ? ipObject.join('.') : req.ip;
 
-        headers = {
-            'x-user-id': req.session.user.auth.pid,
-            'x-user-name': req.session.user.auth.account,
-            'x-site-type': 1,
-            'x-client-ip': ip
-        };
-
-    } else {
-        res.json({
-            code: "501",
-            message: "用户失效,请重新登录"
-        });
-    }
+exports.ueditor = function(req, res) {
+    var headers = getHeader(req,res);
 
-    console.log(req.files);
     if (req.is("multipart/form-data")) {
         req.body.file = fs.createReadStream(req.files.upfile.path);
         req.body.bucket = "goodsimg";

@@ -121,15 +121,6 @@
               </select>
             </div>
 
-            <label class="col-sm-1 control-label">管理店铺 </label>
-            <div class="col-sm-2">
-              <select id="shopId" class="form-control">
-                  <option value="[[shopId||'-1']]">[[shopName||'店铺']]</option>
-              </select>
-            </div>
-
-           
-           
             <label class="col-sm-1 control-label">JIT供应商</label>
             <div class="col-sm-2">
               <select id="supplierId" class="form-control">