From f260d52b73ef5e5ca3b8f59fcbe8a97870d17810 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 31 Jul 2024 12:07:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E7=9A=84URL=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2API=EF=BC=8C=E5=95=86?= =?UTF-8?q?=E5=93=81=E8=A7=84=E6=A0=BC=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E9=A2=84=E7=BA=A6=E5=8F=96=E8=B4=A7=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 ++--- src/api/store.js | 7 ++++ src/views/convert/component/detail.vue | 1 + src/views/saleOrder/component/detail.vue | 46 ++++++++++++++++-------- 4 files changed, 44 insertions(+), 18 deletions(-) diff --git a/.env.development b/.env.development index f5f48a0..ded2151 100644 --- a/.env.development +++ b/.env.development @@ -1,14 +1,14 @@ VITE_NOW_TYPE = 'dist' -# VITE_PUSH_URL = 'ws://192.168.1.201:8787' -# VITE_BASE_URL = 'http://192.168.1.201:8545' +#VITE_PUSH_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' +#VITE_BASE_URL = 'https://ceshi-multi-store.lihaink.cn' # VITE_PUSH_URL = 'ws://192.168.1.22:8787' # VITE_BASE_URL = 'http://192.168.1.22:8545' -VITE_PUSH_URL ='wss://test-multi-store.lihaink.cn/pull' -VITE_BASE_URL = 'https://test-multi-store.lihaink.cn' + VITE_PUSH_URL ='wss://test-multi-store.lihaink.cn/pull' + VITE_BASE_URL = 'https://test-multi-store.lihaink.cn' # VITE_PUSH_URL ='wss://multi-store.lihaink.cn/pull' # VITE_BASE_URL = 'https://multi-store.lihaink.cn' \ No newline at end of file diff --git a/src/api/store.js b/src/api/store.js index a6885e7..68d4905 100644 --- a/src/api/store.js +++ b/src/api/store.js @@ -219,3 +219,10 @@ export function userProductStorageApi(data) { export function userProductStorageSupplyApi(data) { return request.post(`/user_product_storage/UserProductStorage/supply`, data) } + +/** + * @description 支付状态查询 + */ +export function storeOrderQueryApi(data) { + return request.get(`/store_order/StoreOrder/wechatQuery`, { params: data }) +} diff --git a/src/views/convert/component/detail.vue b/src/views/convert/component/detail.vue index 1f3498c..a14b5ae 100644 --- a/src/views/convert/component/detail.vue +++ b/src/views/convert/component/detail.vue @@ -234,6 +234,7 @@ onUnmounted(() => { + diff --git a/src/views/saleOrder/component/detail.vue b/src/views/saleOrder/component/detail.vue index 0f4b2d4..b7c2416 100644 --- a/src/views/saleOrder/component/detail.vue +++ b/src/views/saleOrder/component/detail.vue @@ -6,7 +6,8 @@ import { orderLadingApi, cartListApi, cashierinfoListApi, - cashierinfoDetailsApi + cashierinfoDetailsApi, + storeOrderQueryApi } from "@/api/store.js"; import { useUserStore } from "@/store/user.js"; import { ElMessage } from "element-plus"; @@ -59,6 +60,19 @@ const rePay = () => { }); payRef.value.drawer = true; }; +const query = () => { + if (formData.value.order_id) { + storeOrderQueryApi({ 'order_no': formData.value.order_id }).then(res => { + console.log(res) + }) + }else{ + ElMessage({ + message: '订单号不能为空', + type: "error", + }); + } + +}; const getOrderStatus = (id) => { orderStatusApi({ @@ -122,16 +136,16 @@ const getDetail = () => { const emit = defineEmits(['rePaySuccess']) const paySuccess = (data = null) => { - // data = { - // out_trade_no: "PF171568087790938356", //单号 - // create_time: "2024-05-14 17:59:05", //下单时间 - // trade_type: "MICROPAY", //支付方式 - // transaction_id: "4200002159202405159003084211", //支付单号 - // } -// if(data) onPrint(data); - setTimeout(()=>{ - emit('rePaySuccess'); - }) + // data = { + // out_trade_no: "PF171568087790938356", //单号 + // create_time: "2024-05-14 17:59:05", //下单时间 + // trade_type: "MICROPAY", //支付方式 + // transaction_id: "4200002159202405159003084211", //支付单号 + // } + // if(data) onPrint(data); + setTimeout(() => { + emit('rePaySuccess'); + }) }; @@ -224,11 +238,13 @@ onUnmounted(() => { + @@ -237,7 +253,8 @@ onUnmounted(() => {
- 重新支付 + 重新支付 + 查询支付
@@ -295,6 +312,7 @@ onUnmounted(() => { } } } + .footer { position: absolute; bottom: 0; @@ -311,6 +329,6 @@ onUnmounted(() => { border-top: 1px solid #eee; } } - + }