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