diff --git a/.env.development b/.env.development index bddf448..a0892d0 100644 --- a/.env.development +++ b/.env.development @@ -2,11 +2,11 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://192.168.1.131:8080' +VUE_APP_BASE_API = 'http://192.168.1.107:8080' # VUE_APP_BASE_API = 'https://plus.hwms.shop' # socket 连接地址 -VUE_APP_WS_URL = 'ws://192.168.1.131:8080' +VUE_APP_WS_URL = 'ws://192.168.1.107:8080' # VUE_APP_WS_URL = 'ws://plus.hwms.shop' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue index 5ac20c1..dd82dd6 100644 --- a/src/views/product/addProduct/index.vue +++ b/src/views/product/addProduct/index.vue @@ -2672,7 +2672,7 @@ export default { val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1') val.cost = (e * val.proportion).toFixed(2) // val.growth = parseInt(val.price*(0.9-(val.cost/val.price))) - val.growth = parseInt(val.price*val.proportion) + val.growth = parseInt(val.price*0.5) } if(i=='bar_code'){ val.bar_code = val.bar_code.replace(/[\W]/g,'') diff --git a/src/views/product/productList/index.vue b/src/views/product/productList/index.vue index 3236dc3..008019a 100644 --- a/src/views/product/productList/index.vue +++ b/src/views/product/productList/index.vue @@ -5,7 +5,7 @@ - + @@ -62,7 +62,7 @@ /> - + @@ -424,7 +424,7 @@ - +