From e76e3cc77cb48a1e9bb26fe1682650a016d72658 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 16 Jan 2025 11:14:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 ++++---- .env.prod | 6 ++++-- src/views/canteen/canteenSpu/form.vue | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.env.development b/.env.development index 4f4ab51..0906e93 100644 --- a/.env.development +++ b/.env.development @@ -10,14 +10,14 @@ ENV = 'development' # ADMIN 服务地址 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ -# VITE_ADMIN_PROXY_PATH = http://localhost:9999/ -VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地 + VITE_ADMIN_PROXY_PATH = http://localhost:9999/ +#VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地 # 图片访问基础地址 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc -# VITE_IMAGE_BASE_PATH = http://localhost:9999 -VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 + VITE_IMAGE_BASE_PATH = http://localhost:9999 +#VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 # 代码生成服务地址 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003 diff --git a/.env.prod b/.env.prod index eca740b..4df6951 100644 --- a/.env.prod +++ b/.env.prod @@ -8,10 +8,12 @@ VITE_OPEN = true ENV = 'prod' # ADMIN 服务地址 -VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089 +#VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089 +VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81 # 图片访问基础地址 -VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api +#VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api +VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 代码生成服务地址 VITE_GEN_PROXY_PATH = http://123.156.230.15:5003 diff --git a/src/views/canteen/canteenSpu/form.vue b/src/views/canteen/canteenSpu/form.vue index d6adfe4..f6d479e 100644 --- a/src/views/canteen/canteenSpu/form.vue +++ b/src/views/canteen/canteenSpu/form.vue @@ -2,11 +2,11 @@ - - - - - + + + + + From 8acb5144fb8258b608d26003b18e7da4907834d6 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 16 Jan 2025 12:08:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hard/hard-invoice.ts | 67 +++-- src/components/Select/SelectUser.vue | 98 ++++--- .../hard/hard-after-sale/order-refund.vue | 3 +- src/views/hard/hard-invoice/index.vue | 269 +++++++++++------- src/views/hard/hard-order/index.vue | 28 +- 5 files changed, 287 insertions(+), 178 deletions(-) diff --git a/src/api/hard/hard-invoice.ts b/src/api/hard/hard-invoice.ts index 12c7edb..7a9b8dc 100644 --- a/src/api/hard/hard-invoice.ts +++ b/src/api/hard/hard-invoice.ts @@ -1,49 +1,56 @@ import request from "/@/utils/request" +export function print(query?: Object) { + return request({ + url: "/hard/hard-invoice/print", + method: "get", + params: query, + }) +} + export function pageJoin(query?: Object) { - return request({ - url: '/hard/hard-invoice/page-join', - method: 'get', - params: query - }) + return request({ + url: "/hard/hard-invoice/page-join", + method: "get", + params: query, + }) } export function fetchList(query?: Object) { - return request({ - url: '/hard/hard-invoice/page', - method: 'get', - params: query - }) + return request({ + url: "/hard/hard-invoice/page", + method: "get", + params: query, + }) } export function addObj(obj?: Object) { - return request({ - url: '/hard/hard-invoice', - method: 'post', - data: obj - }) + return request({ + url: "/hard/hard-invoice", + method: "post", + data: obj, + }) } export function getObj(id?: string) { - return request({ - url: '/hard/hard-invoice/' + id, - method: 'get' - }) + return request({ + url: "/hard/hard-invoice/" + id, + method: "get", + }) } export function delObjs(ids?: Object) { - return request({ - url: '/hard/hard-invoice', - method: 'delete', - data: ids - }) + return request({ + url: "/hard/hard-invoice", + method: "delete", + data: ids, + }) } export function putObj(obj?: Object) { - return request({ - url: '/hard/hard-invoice', - method: 'put', - data: obj - }) + return request({ + url: "/hard/hard-invoice", + method: "put", + data: obj, + }) } - diff --git a/src/components/Select/SelectUser.vue b/src/components/Select/SelectUser.vue index 72603a5..839ec66 100644 --- a/src/components/Select/SelectUser.vue +++ b/src/components/Select/SelectUser.vue @@ -1,70 +1,82 @@ \ No newline at end of file + diff --git a/src/views/hard/hard-after-sale/order-refund.vue b/src/views/hard/hard-after-sale/order-refund.vue index e281160..75fd603 100644 --- a/src/views/hard/hard-after-sale/order-refund.vue +++ b/src/views/hard/hard-after-sale/order-refund.vue @@ -197,9 +197,10 @@ const agree = async () => { background: "rgba(0, 0, 0, 0.7)", }) await hardAfterSaleApi.agree({ id: globalData.afterSaleData.id }) + useMessage().success("操作成功") await getDetail() } finally { - setTimeout(() => loading.close(), 1000) + setTimeout(() => loading.close(), 500) } } diff --git a/src/views/hard/hard-invoice/index.vue b/src/views/hard/hard-invoice/index.vue index 5abc09b..c775944 100644 --- a/src/views/hard/hard-invoice/index.vue +++ b/src/views/hard/hard-invoice/index.vue @@ -1,77 +1,122 @@ \ No newline at end of file + try { + await hardInvoiceApi.delObjs(ids) + getDataList() + useMessage().success("删除成功") + } catch (err: any) { + useMessage().error(err.msg) + } +} + + + diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue index 4ad6375..66eadc2 100644 --- a/src/views/hard/hard-order/index.vue +++ b/src/views/hard/hard-order/index.vue @@ -167,11 +167,12 @@ - +