Merge branch 'master' into feature/hot-people
Showing
4 changed files
with
26 additions
and
25 deletions
| @@ -118,28 +118,29 @@ export default { | @@ -118,28 +118,29 @@ export default { | ||
| 118 | ); | 118 | ); |
| 119 | } | 119 | } |
| 120 | }, | 120 | }, |
| 121 | - { | ||
| 122 | - title: '款型编码', | ||
| 123 | - key: 'factoryCode', | ||
| 124 | - render: (h, params) => { | ||
| 125 | - if (this.isExist(params.index)) { | ||
| 126 | - return ( | ||
| 127 | - <input-safe | ||
| 128 | - value={params.row.factoryCode} | ||
| 129 | - placeholder='请输入...' | ||
| 130 | - onInput={val => (params.row.factoryCode = val)} | ||
| 131 | - style={{width: '100%'}}></input-safe> | ||
| 132 | - ); | ||
| 133 | - } | ||
| 134 | - return null; | ||
| 135 | - }, | ||
| 136 | - renderHeader(h) { //eslint-disable-line | ||
| 137 | - return ( | ||
| 138 | - <span>款型编码 | ||
| 139 | - </span> | ||
| 140 | - ); | ||
| 141 | - } | ||
| 142 | - }, | 121 | + |
| 122 | + // { | ||
| 123 | + // title: '款型编码', | ||
| 124 | + // key: 'factoryCode', | ||
| 125 | + // render: (h, params) => { | ||
| 126 | + // if (this.isExist(params.index)) { | ||
| 127 | + // return ( | ||
| 128 | + // <input-safe | ||
| 129 | + // value={params.row.factoryCode} | ||
| 130 | + // placeholder='请输入...' | ||
| 131 | + // onInput={val => (params.row.factoryCode = val)} | ||
| 132 | + // style={{width: '100%'}}></input-safe> | ||
| 133 | + // ); | ||
| 134 | + // } | ||
| 135 | + // return null; | ||
| 136 | + // }, | ||
| 137 | + // renderHeader(h) { //eslint-disable-line | ||
| 138 | + // return ( | ||
| 139 | + // <span>款型编码 | ||
| 140 | + // </span> | ||
| 141 | + // ); | ||
| 142 | + // } | ||
| 143 | + // }, | ||
| 143 | { | 144 | { |
| 144 | title: '尺码', | 145 | title: '尺码', |
| 145 | key: 'sizeId', | 146 | key: 'sizeId', |
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | <script> | 6 | <script> |
| 7 | export default { | 7 | export default { |
| 8 | created() { | 8 | created() { |
| 9 | - window.open(`${this.$config.shopsFeDomain}/shop/decorator/modulartool?shopId=${this.$user.currentShop.shopsId}&shopName=${this.$user.currentShop.shopName}&appType=0`); // eslint-disable-line | 9 | + window.open(`/shops-proxy/decorator/modulartool?shopId=${this.$user.currentShop.shopsId}&shopName=${this.$user.currentShop.shopName}&appType=0`); // eslint-disable-line |
| 10 | } | 10 | } |
| 11 | }; | 11 | }; |
| 12 | </script> | 12 | </script> |
| @@ -13,7 +13,7 @@ export default { | @@ -13,7 +13,7 @@ export default { | ||
| 13 | let shop = _.get(result, 'data.list[0]'); | 13 | let shop = _.get(result, 'data.list[0]'); |
| 14 | 14 | ||
| 15 | if (shop) { | 15 | if (shop) { |
| 16 | - window.open(`${this.$config.shopsFeDomain}/supplier/shop/decorationDetail/${shop.shopsId}/${shop.shopsType}/editor/${shop.id}/`); // eslint-disable-line | 16 | + window.open(`/shops-proxy/shop/decorationDetail/${shop.shopsId}/${shop.shopsType}/editor/${shop.id}/`); // eslint-disable-line |
| 17 | } | 17 | } |
| 18 | }); | 18 | }); |
| 19 | } | 19 | } |
| @@ -21,7 +21,7 @@ module.exports = { | @@ -21,7 +21,7 @@ module.exports = { | ||
| 21 | }, | 21 | }, |
| 22 | port: 6008, | 22 | port: 6008, |
| 23 | autoOpenBrowser: true, | 23 | autoOpenBrowser: true, |
| 24 | - assetsSubDirectory: 'static', | 24 | + assetsSubDirectory: 'static-dev', |
| 25 | assetsPublicPath: '/', | 25 | assetsPublicPath: '/', |
| 26 | proxyTable: { | 26 | proxyTable: { |
| 27 | '/Api': 'http://localhost:6007' | 27 | '/Api': 'http://localhost:6007' |
-
Please register or login to post a comment