From 24cc3ab4bbb38a54e23a5b224b9c60f9b741f66b Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 12 Jun 2023 17:02:33 +0800 Subject: [PATCH 1/4] v1.1.36 formal --- src/js/api.js | 4 ++-- src/manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index 555181e..daecf1c 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 -// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 // export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index 01fc516..f4c24c3 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false, "minified" : true From e7814ec9881741de1b5ba300bb6ce0efbe74539e Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 15 Jun 2023 16:31:06 +0800 Subject: [PATCH 2/4] v1.1.37 formal --- src/js/api.js | 4 ++-- src/manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index 555181e..daecf1c 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 -// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 // export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index 01fc516..f4c24c3 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false, "minified" : true From 5ac6f6f46e600dad208b6e8f00070bf7c29823fe Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 10 Jul 2023 11:39:12 +0800 Subject: [PATCH 3/4] v1.1.38 formal --- src/js/api.js | 4 ++-- src/manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index 555181e..daecf1c 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 -// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 // export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index 01fc516..f4c24c3 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false, "minified" : true From a76e538c66631eb812b30d4785795bdd23793353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=B6=E5=8D=8E?= <3599164049@qq.com> Date: Fri, 28 Jul 2023 14:19:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9C=BA=E5=9C=B0=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8D=A0=E7=94=A8=E5=BC=82=E5=B8=B8=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/site/order_modal/order_modal.vue | 73 ++++++++++++++++++++++++- src/js/api.js | 7 ++- src/manifest.json | 2 +- 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index af290dd..c1a178e 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -135,6 +135,16 @@ 已收款 + + + + + + 场地已释放，退款交易正在处理中，退款结果请在后台管理交易订单对应订单详情查看~ + + 知道了 + + @@ -173,13 +183,19 @@ export default { }, data(){ return { - orderInfo: {} + orderInfo: {}, + isShowFail: false } }, mounted(){ this.getOrderInfo(); }, methods: { + okChange() { + this.isShowFail = false; + this.$emit('refresh'); + }, + moveHandle(){}, toCollections(){ this.$emit('btn:toCollections', this.orderInfo); }, @@ -332,7 +348,27 @@ export default { }) .then(res=>{ if(res.data.code == 0){ - setTimeout(_=>this.$emit('refresh'), 1200); + if (orderInfo.stadium_order && orderInfo.stadium_order.pay_type_text === '付款码支付') { + servers.get({ + url: API.venue.refundOrderCheck, + data: { + transNo: orderInfo.order_no + // transNo: 'ZY20230720170701856196' + }, + isDefaultGet: false, + }) + .then(res => { + if (!(res.data.code == 0 && res.data.data.success)) { + this.isShowFail = true; + } else { + this.$emit('refresh'); + } + }).catch(() => { + this.$emit('refresh'); + }) + } else { + setTimeout(_=>this.$emit('refresh'), 1200); + } util.showNone(res.data.message || '操作成功！'); }else{ util.showNone(res.data.message || '操作失败！'); @@ -506,4 +542,37 @@ export default { } } } + .odm-select-modal{ + position: absolute; + left: 65rpx; + top: 16%; + background-color: #fff; + width: 620rpx; + padding: 80rpx 0rpx 80rpx; + border-radius: 10rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + .osm-btn{ + width: 240rpx; + height: 88rpx; + margin-top: 44rpx; + border-radius: 10rpx; + background-color: #009874; + color: #FFFFFF; + font-size: 32rpx; + line-height: 88rpx; + text-align: center; + } + .osm-line{ + width: 504rpx; + margin-bottom: 26rpx; + >view{ + color: #333333; + font-size: 28rpx; + line-height: 48rpx; + } + } + } \ No newline at end of file diff --git a/src/js/api.js b/src/js/api.js index daecf1c..fdb12eb 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 -export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 // export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 @@ -108,7 +108,8 @@ API['venue'] = { // 20220921 releaseVenue: `${ORIGIN}/admin/stadium/order/releaseVenue`, // 【1000995】释放场地 - + // 20230728 + refundOrderCheck: `${ORIGIN}/pay/huishouqian/refundOrderCheck`, // 惠收钱退款-查询订单 } // 2.1 核销 diff --git a/src/manifest.json b/src/manifest.json index f4c24c3..01fc516 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wxf1294b279ad1b845", + "appid" : "wx7106e84614cf0060", "setting" : { "urlCheck" : false, "minified" : true