Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/1.0

@@ -102,6 +102,11 @@ export default () => {
                     }
                 },
                 {
+                    title: '商品条码',
+                    key: 'skuFactoryCode',
+                    align: 'center'
+                },
+                {
                     title: '订单收发货',
                     align: 'center',
                     render(row) { // eslint-disable-line

@@ -98,6 +98,11 @@ export default () => {
                     }
                 },
                 {
+                    title: '商品条码',
+                    key: 'skuFactoryCode',
+                    align: 'center'
+                },
+                {
                     title: '订单收发货',
                     align: 'center',
                     render(row) { // eslint-disable-line
@@ -112,6 +117,7 @@ export default () => {
                 },
                 {
                     title: '发货',
+                    width: 120,
                     align: 'center',
                     render(row, column, i) {
                         return `<cell-deliver
@@ -124,6 +130,7 @@ export default () => {
                 },
                 {
                     title: '缺货',
+                    width: 140,
                     align: 'center',
                     render(row, column, index) {
                         return `<cell-stock-out

@@ -66,6 +66,21 @@ const domains = {
     shop: 'http://192.168.102.211:30016'
 };
 
+const isProd = process.env.NODE_ENV === 'production';
+const isTest = (process.env.NODE_ENV || '').indexOf('test') >= 0;
+
+if (isTest) {
+    domains.erp = 'http://192.168.103.82:9098';
+    domains.platform = 'http://192.168.102.210:8088/platform';
+    domains.shop = 'http://192.168.102.211:30016';
+}
+
+if (isProd) {
+    domains.erp = 'http://gw.erp.yohoops.org';
+    domains.platform = 'http://api.platform.yohoops.org/platform';
+    domains.shop = 'http://shops.yohobuy.com';
+}
+
 _.each(domainApis, (apis, domainName) => {
     _.each(apis, (url, api) => {
         apis[api] = _.get(domains, domainName, '') + url;

@@ -5,11 +5,8 @@
  */
 
 'use strict';
-const _ = require('lodash');
 const apiDomain = require('./api-domain');
 
-const isProd = process.env.NODE_ENV === 'production';
-const isTest = (process.env.NODE_ENV || '').indexOf('test') >= 0;
 
 //
 const config = {
@@ -47,23 +44,5 @@ const config = {
     }
 };
 
-if (isTest) {
-    _.merge(config, {
-        apiDomain: {
-            erp: 'http://192.168.103.82:9098',
-            platform: 'http://192.168.102.210:8088/platform',
-            shop: 'http://192.168.102.211:30016'
-        }
-    });
-}
-
-if (isProd) {
-    _.merge(config, {
-        apiDomain: {
-            platform: 'http://api.platform.yohoops.org/platform',
-            erp: 'http://gw.erp.yohoops.org'
-        }
-    });
-}
 
 module.exports = config;