Merge branch 'master' into release/1.0

@@ -41,8 +41,6 @@
                     return;
                     return;
                 }
                 }
                 return this.$Message.error(err_msg);
                 return this.$Message.error(err_msg);
-            }, (error) => {
-                this.$Message.error(error.message);
             });
             });
         },
         },
         methods: {
         methods: {

@@ -12,7 +12,7 @@ export default {
     },
     },
     production: {
     production: {
         historyMode: 'history',
         historyMode: 'history',
-        shopsFeDomain: 'http://shops.yohops.com',
+        shopsFeDomain: 'http://shops.yohobuy.com',
         axiosBaseUrl: '/Api',
         axiosBaseUrl: '/Api',
         axiosResponseType: 'json',
         axiosResponseType: 'json',
         homePage: 'home.overview',
         homePage: 'home.overview',

@@ -4,7 +4,6 @@
 import _ from 'lodash';
 import _ from 'lodash';
 import axios from 'axios';
 import axios from 'axios';
 import userService from 'user-service';
 import userService from 'user-service';
-import iView from 'iview';
 import Rsa from 'rsa';
 import Rsa from 'rsa';
 
 
 const plugin = {
 const plugin = {
@@ -100,15 +99,11 @@ const plugin = {
             Vue.$router.push('/login.html');
             Vue.$router.push('/login.html');
         };
         };
         axios.defaults.validateStatus = (status) => {
         axios.defaults.validateStatus = (status) => {
-            if (status >= 200 && status < 300) {
-                return true;
-            }
             if (status === 401) {
             if (status === 401) {
                 Vue.logout();
                 Vue.logout();
                 return false;
                 return false;
             }
             }
-            iView.Message.error('接口异常');
-            return false;
+            return true;
         };
         };
     }
     }
 };
 };

@@ -93,6 +93,16 @@ const plugin = {
         // 设置axios默认参数
         // 设置axios默认参数
         axios.defaults.baseURL = Vue.$config.axiosBaseUrl;
         axios.defaults.baseURL = Vue.$config.axiosBaseUrl;
         axios.defaults.responseType = Vue.$config.axiosResponseType;
         axios.defaults.responseType = Vue.$config.axiosResponseType;
+
+        axios.interceptors.response.use(response => {
+            if (response.status >= 200 && response.status < 300) {
+                return response;
+            }
+            iView.Message.error('接口异常');
+            return Promise.reject({response});
+        }, error => {
+            return Promise.reject(error);
+        });
     }
     }
 };
 };
 
 

 {
 {
   "name": "yoho-shop-manage",
   "name": "yoho-shop-manage",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
   "description": "",
   "main": "app.js",
   "main": "app.js",
   "scripts": {
   "scripts": {

@@ -58,7 +58,13 @@ class Api extends Context {
 
 
         return request(params, (error, response) => {
         return request(params, (error, response) => {
             if (!error) {
             if (!error) {
-                logger.info(`api call ${response.statusCode} [${response.request.method}] ${response.request.href} ${response.request.body}`); // eslint-disable-line
+                if (response && /^20\d/.test(response.statusCode)) {
+                    logger.info(`api call ${response.statusCode} [${response.request.method}] ${response.request.href} ${response.request.body}`); // eslint-disable-line
+                } else {
+                    let res = response.toJSON();
+
+                    logger.error(`api call ${res.statusCode} [${res.request.method}] ${res.request.uri.href} ${res.body || ''}`); // eslint-disable-line
+                }
             }
             }
         });
         });
     }
     }

@@ -12,7 +12,7 @@ const apiDomain = require('./api-domain');
 const config = {
 const config = {
     app: 'shop-manage',
     app: 'shop-manage',
     appVersion: '0.0.1', // 调用api的版本
     appVersion: '0.0.1', // 调用api的版本
-    platform: 2,
+    platform: 4,
     port: 6007,
     port: 6007,
     siteUrl: '//shop.yohobuy.com',
     siteUrl: '//shop.yohobuy.com',
     assetUrl: '//127.0.0.1:5001',
     assetUrl: '//127.0.0.1:5001',

@@ -4,6 +4,7 @@ const request = require('request');
 const env = global.env;
 const env = global.env;
 
 
 let mainProxy = (req, res) => {
 let mainProxy = (req, res) => {
+    res.header('x-version', env.version);
     request.get(`http://cdn.yoho.cn/yoho-shop-manage/${env.version}/index.html`).pipe(res);
     request.get(`http://cdn.yoho.cn/yoho-shop-manage/${env.version}/index.html`).pipe(res);
 };
 };