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(() => { - + {{ row.cart_info?.name }} + @@ -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; } } - + }