Merge branch 'feat-230721' into dev

v1.1.39 formal

src/components/site/order_modal/order_modal.vue

@@ -135,6 +135,16 @@
 				<view class="ob-view gray" v-else>已收款</view>
 			</view>
 		</view>
+		
+		<!-- 弹框 取消占用退款异常提示 -->
+		<view class="ox-dark-mask" v-if="isShowFail" @touchmove.stop.prevent="moveHandle" @click="okChange">
+			<view class="odm-select-modal">
+				<view class="osm-line">
+					<view>场地已释放，退款交易正在处理中，退款结果请在后台管理交易订单对应订单详情查看~</view>
+				</view>
+				<view class="osm-btn" hover-class="hover-active" @click="okChange">知道了</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -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;
+				}
+			}
+		}
 </style>

src/js/api.js

@@ -108,7 +108,8 @@ API['venue'] = {
   // 20220921 
   releaseVenue: `${ORIGIN}/admin/stadium/order/releaseVenue`,  // 【1000995】释放场地
   
-
+	// 20230728
+	refundOrderCheck: `${ORIGIN}/pay/huishouqian/refundOrderCheck`,  // 惠收钱退款-查询订单
 }
 
 // 2.1 核销