Merge branch 'master' into feature/hot-people

@@ -118,28 +118,29 @@ export default {
                             );
                         }
                     },
-                    {
-                        title: '款型编码',
-                        key: 'factoryCode',
-                        render: (h, params) => {
-                            if (this.isExist(params.index)) {
-                                return (
-                                    <input-safe
-                                        value={params.row.factoryCode}
-                                        placeholder='请输入...'
-                                        onInput={val => (params.row.factoryCode = val)}
-                                        style={{width: '100%'}}></input-safe>
-                                );
-                            }
-                            return null;
-                        },
-                        renderHeader(h) { //eslint-disable-line
-                            return (
-                                <span>款型编码
-                                </span>
-                            );
-                        }
-                    },
+
+                    // {
+                    //     title: '款型编码',
+                    //     key: 'factoryCode',
+                    //     render: (h, params) => {
+                    //         if (this.isExist(params.index)) {
+                    //             return (
+                    //                 <input-safe
+                    //                     value={params.row.factoryCode}
+                    //                     placeholder='请输入...'
+                    //                     onInput={val => (params.row.factoryCode = val)}
+                    //                     style={{width: '100%'}}></input-safe>
+                    //             );
+                    //         }
+                    //         return null;
+                    //     },
+                    //     renderHeader(h) { //eslint-disable-line
+                    //         return (
+                    //             <span>款型编码
+                    //             </span>
+                    //         );
+                    //     }
+                    // },
                     {
                         title: '尺码',
                         key: 'sizeId',

@@ -6,7 +6,7 @@
 <script>
 export default {
     created() {
-        window.open(`${this.$config.shopsFeDomain}/shop/decorator/modulartool?shopId=${this.$user.currentShop.shopsId}&shopName=${this.$user.currentShop.shopName}&appType=0`); // eslint-disable-line
+        window.open(`/shops-proxy/decorator/modulartool?shopId=${this.$user.currentShop.shopsId}&shopName=${this.$user.currentShop.shopName}&appType=0`); // eslint-disable-line
     }
 };
 </script>

@@ -13,7 +13,7 @@ export default {
             let shop = _.get(result, 'data.list[0]');
 
             if (shop) {
-                window.open(`${this.$config.shopsFeDomain}/supplier/shop/decorationDetail/${shop.shopsId}/${shop.shopsType}/editor/${shop.id}/`); // eslint-disable-line
+                window.open(`/shops-proxy/shop/decorationDetail/${shop.shopsId}/${shop.shopsType}/editor/${shop.id}/`); // eslint-disable-line
             }
         });
     }

@@ -21,7 +21,7 @@ module.exports = {
         },
         port: 6008,
         autoOpenBrowser: true,
-        assetsSubDirectory: 'static',
+        assetsSubDirectory: 'static-dev',
         assetsPublicPath: '/',
         proxyTable: {
             '/Api': 'http://localhost:6007'