From bbebcc112d8c0d5e219eeb7659f8055cb5086d2f Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 2 Dec 2024 18:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 2 + env/.env.dev | 4 +- src/components/PagingComponent/index.vue | 125 +- src/style/scss/common.scss | 11 + src/views/cart/index.vue | 2 +- src/views/order/index.vue | 2 +- src/views/user/goodsManagement/index.vue | 1905 ++++++++++++---------- 7 files changed, 1128 insertions(+), 923 deletions(-) diff --git a/components.d.ts b/components.d.ts index f759a60..f818db3 100644 --- a/components.d.ts +++ b/components.d.ts @@ -18,6 +18,7 @@ declare module 'vue' { ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] + ElCountdown: typeof import('element-plus/es')['ElCountdown'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElEmpty: typeof import('element-plus/es')['ElEmpty'] @@ -31,6 +32,7 @@ declare module 'vue' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] diff --git a/env/.env.dev b/env/.env.dev index 3fe5b11..b46887f 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -7,8 +7,8 @@ VITE_API_URL = '/proxyApi' # 开发环境接口地址 # VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 -VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅 -# VITE_proxyTarget = 'http://192.168.0.244:28580' # 马帅 +# VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅 +VITE_proxyTarget = 'http://192.168.0.244:28580' # 马帅 # VITE_proxyTarget = 'http://192.168.2.129:18080' # 马帅 # VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型) diff --git a/src/components/PagingComponent/index.vue b/src/components/PagingComponent/index.vue index 1fd4f04..f96a7a4 100644 --- a/src/components/PagingComponent/index.vue +++ b/src/components/PagingComponent/index.vue @@ -1,66 +1,67 @@ - diff --git a/src/style/scss/common.scss b/src/style/scss/common.scss index e69de29..fd66ee5 100644 --- a/src/style/scss/common.scss +++ b/src/style/scss/common.scss @@ -0,0 +1,11 @@ +.primary-lease { + --el-color-primary:#00a288; + --el-color-primary-light-3:#00ad9d; + --el-color-primary-dark-2:#00ad9d; + --el-color-primary-light-5:#78d3cb +} + +:root { + --el-color-primary:#00a288; + // --el-color-primary-light-9:#78d3cb +} \ No newline at end of file diff --git a/src/views/cart/index.vue b/src/views/cart/index.vue index 82acfd1..ec79519 100644 --- a/src/views/cart/index.vue +++ b/src/views/cart/index.vue @@ -450,7 +450,7 @@ const onCartSubmit = async () => { type: 'success', }) - userStore.editcurrentMenuItem('orderManagementCz') + userStore.editcurrentMenuItem('orderManagement') setTimeout(() => { router.push({ name: 'my-user', diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 248e23f..df608c1 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -387,7 +387,7 @@ const onCartSubmit = async () => { message: '提交成功', type: 'success', }) - userStore.editcurrentMenuItem('orderManagementCz') + userStore.editcurrentMenuItem('orderManagement') setTimeout(() => { router.push({ name: 'my-user', diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue index 7d543de..acc9251 100644 --- a/src/views/user/goodsManagement/index.vue +++ b/src/views/user/goodsManagement/index.vue @@ -1,329 +1,130 @@