diff --git a/.env.production b/.env.production index cb877b81..15e46cb6 100644 --- a/.env.production +++ b/.env.production @@ -8,7 +8,7 @@ ENV = 'production' #林纪裕cd -VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' @@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/' # 平潭正式 -# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' # 吴总测试服务器 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' diff --git a/package.json b/package.json index 49aa5485..06489e3f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ruoyi-vue-plus", "version": "4.3.0", "description": "UDI自助平台", - "author": "LionLi", + "author": "Glxp", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", @@ -76,7 +76,7 @@ "connect": "3.6.6", "eslint": "7.15.0", "eslint-plugin-vue": "7.2.0", - "html-webpack-plugin": "^5.5.1", + "html-webpack-plugin": "4.5.2", "lint-staged": "10.5.3", "runjs": "4.4.2", "sass": "1.32.13", diff --git a/src/api/thrsys/thrProducts.js b/src/api/thrsys/thrProducts.js index 4a570a17..76d17b2d 100644 --- a/src/api/thrsys/thrProducts.js +++ b/src/api/thrsys/thrProducts.js @@ -40,3 +40,12 @@ export function saveNewProduct(data) { data: data }) } + +export function updateProduct(data) { + return axios({ + url: '/udiwms/udiinfo/erp/products/update', + method: 'post', + data: data + }) +} + diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg deleted file mode 100644 index 8a89eb82..00000000 Binary files a/src/assets/images/login-background.jpg and /dev/null differ diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg deleted file mode 100644 index b3a940b2..00000000 Binary files a/src/assets/images/profile.jpg and /dev/null differ diff --git a/src/views/login.vue b/src/views/login.vue index 916a8a73..6f7dd6e9 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -162,7 +162,7 @@ export default { justify-content: center; align-items: center; height: 100%; - background-image: url("../assets/images/login-background.jpg"); + background-image: url("../assets/login.jpg"); background-size: cover; } diff --git a/src/views/register.vue b/src/views/register.vue index 3f21986a..eb55503c 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -154,7 +154,7 @@ export default { justify-content: center; align-items: center; height: 100%; - background-image: url("../assets/images/login-background.jpg"); + background-image: url("../assets/login.jpg"); background-size: cover; } .title { diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue index bd9647a3..f56c6680 100644 --- a/src/views/thirdSys/product/thrProducts.vue +++ b/src/views/thirdSys/product/thrProducts.vue @@ -5,7 +5,8 @@ - + @@ -22,7 +23,8 @@ - + @@ -48,14 +50,16 @@ -
- - 显示/隐藏搜索栏 - 重置 - 查询 - 新增 - -
+
+ + 显示/隐藏搜索栏 + 重置 + 查询 + 新增 + + +
@@ -69,8 +73,9 @@ @@ -89,16 +94,17 @@ - + + +