Merge branch 'hotfix_817' into shop_dev_4.9

@@ -164,12 +164,12 @@ module.exports={
             return callback(null, result);
  		},
  		exportExcel:function(req, callback){
+ 			var headers=Utils.createHttpHeader(req);
+ 			headers['content-type']='application/json';
             var result = request({
 		    	method: 'POST',
 		        url: config.domain + '/batch/export',
-		        headers: {
-		            'content-type': 'application/json'
-		        },
+		        headers: headers,
 		        body: req.query,
 		        json: true
             });

@@ -133,7 +133,7 @@
     </div>
     [[if shopList]]
     <div class="form-group">
-        <div class="col-sm-12">
+        <div class="col-sm-12" style="display:none">
             <label class="col-sm-1 control-label">展示店铺：</label>
             <div class="col-sm-4">
             [[each shopList as a index]]

 {
   "name": "yohobuy-shops-fe",
-  "version": "4.7.4",
+  "version": "4.8.1",
   "description": "Construction of the presentation layer solution is based on express, handlebars",
   "main": "app.js",
   "scripts": {

@@ -141,7 +141,7 @@ module.exports = {
                 var path = req.route?req.route.path[0]:req.originalUrl.replace(/\?.+/, '');
                 req._yoheaders = {
                     'x-user-id': user.auth.pid,
-                    'x-user-name': user.auth.account,
+                    'x-user-name': user.auth.account,//防止header中包含中文
                     'x-site-type': Iaccount.WEBSITE,
                     'x-client-ip': req.ip,
                     'x-shop-id': user.auth.shopId

@@ -164,12 +164,12 @@ module.exports={
             return callback(null, result);
  		},
  		exportExcel:function(req, callback){
+ 			var headers=Utils.createHttpHeader(req);
+ 			headers['content-type']='application/json';
             var result = request({
 		    	method: 'POST',
 		        url: config.domain + '/batch/export',
-		        headers: {
-		            'content-type': 'application/json'
-		        },
+		        headers: headers,
 		        body: req.query,
 		        json: true
             });

-{"name":"yohobuy-shops-fe","version":"4.7.4","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file
+{"name":"yohobuy-shops-fe","version":"4.8.1","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file