diff --git a/src/components/end_billing_modal/end_billing_modal.vue b/src/components/end_billing_modal/end_billing_modal.vue
index efa86df..40e3efd 100644
--- a/src/components/end_billing_modal/end_billing_modal.vue
+++ b/src/components/end_billing_modal/end_billing_modal.vue
@@ -76,6 +76,7 @@ export default {
 				// setTimeout(()=>uni.navigateBack(),1200);
 				this.$emit('timeEndBtn');
 			})
+			.catch(util.hideLoad)
 		},
 		
 		selectBtn(type){
diff --git a/src/components/fixed_bar/fixed_bar.vue b/src/components/fixed_bar/fixed_bar.vue
new file mode 100644
index 0000000..96aa027
--- /dev/null
+++ b/src/components/fixed_bar/fixed_bar.vue
@@ -0,0 +1,38 @@
+<template>
+    <view class="fixed-bar" :style="'padding-top:'+ fbHeight +'px;'">
+        <view class="fb-fixed" id="fb">
+            <slot></slot>
+        </view>
+    </view>
+</template>
+
+<script>
+import { getNodeMes } from '@/utils/util'
+export default {
+    data(){
+        return {
+            fbHeight: 0,
+        }
+    },  
+    mounted() {
+        getNodeMes('#fb', this).then(res => {
+            this.fbHeight = res?.height || 0
+            console.log(res)
+        })
+    },
+}
+</script>
+
+<style lang="scss">
+    .fixed-bar{
+
+    }
+    .fb-fixed{
+        padding-top: 20upx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        z-index: 10;
+    }
+</style>
\ No newline at end of file
diff --git a/src/components/order_refund/button.vue b/src/components/order_refund/button.vue
new file mode 100644
index 0000000..34e6ad0
--- /dev/null
+++ b/src/components/order_refund/button.vue
@@ -0,0 +1,22 @@
+<template>
+    <view class="order-refund-button" @click="$emit('click')">
+        <slot>退款</slot>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .order-refund-button{
+        width: 192upx;
+		text-align: center;
+		border-radius: 10upx;
+		background-color: #fff;
+        border: 2upx solid $mColor;
+        @include flcw(32upx, 84upx, $mColor, 500);
+    }
+</style>
\ No newline at end of file
diff --git a/src/components/order_refund/fixed.vue b/src/components/order_refund/fixed.vue
new file mode 100644
index 0000000..0980267
--- /dev/null
+++ b/src/components/order_refund/fixed.vue
@@ -0,0 +1,57 @@
+<template>
+    <fixed-bar v-if="isShow">
+        <view class="order-refund-fixed">
+            <or-button @click="$emit('click:button')"></or-button>
+        </view>
+    </fixed-bar>
+</template>
+
+<script>
+import fixedBar from "../fixed_bar/fixed_bar.vue";
+import orButton from "./button.vue";
+import { mapState } from 'vuex';
+/**
+ * 全部订单都能退两次, 所有订单最多只能退2次款
+ * 只要订单金额是未全退的，都能退
+ * 0元订单不能退
+ * 
+*/
+export default {
+    components: {
+        fixedBar,
+        orButton
+    },
+    props: [ 'pay_amount', 'refund_amount', 'refund_times' ],
+    computed: {
+        ...mapState([ 'brandInfo' ]),
+        payAmount(){
+            let { pay_amount } = this;
+            return +pay_amount || 0
+        },
+        refundAmount(){
+            let { refund_amount } = this;
+            return +refund_amount || 0
+        },
+        isShow(){
+            console.log('brandInfo', this.brandInfo)
+            let { payAmount, refundAmount, refund_times, brandInfo } = this;
+            if(
+                payAmount - refundAmount > 0
+                &&[0, 1].includes(refund_times)
+                &&brandInfo?.permission?.['1018'] // 退款权限
+            ){
+                return true
+            }
+            return false
+        }
+    },
+}
+</script>
+
+<style lang="scss">
+    .order-refund-fixed{
+        padding: 10upx 24upx;
+        background: #F2F2F7;
+        @include ctf(flex-end);
+    }
+</style>
\ No newline at end of file
diff --git a/src/components/order_refund/info.vue b/src/components/order_refund/info.vue
new file mode 100644
index 0000000..1ce011b
--- /dev/null
+++ b/src/components/order_refund/info.vue
@@ -0,0 +1,56 @@
+<template>
+    <view class="refund-info">
+        <view class="ri-name">退款信息{{ nameKey || '' }}</view>
+        <view class="ri-line">
+            <view class="ri-name">退款金额：</view>
+            <view class="ri-value">{{ refund_price }}</view>
+        </view>
+        <view class="ri-line">
+            <view class="ri-name">退款单号：</view>
+            <view class="ri-value">{{ refund_no }}</view>
+        </view>
+        <view class="ri-line">
+            <view class="ri-name">退款时间：</view>
+            <view class="ri-value">{{ refund_time }}</view>
+        </view>
+        <view class="ri-line">
+            <view class="ri-name">退款原因：</view>
+            <view class="ri-value">{{ refund_reason }}</view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        nameKey: { default: '' },
+        refund_price: { default: '-' },
+        refund_no: { default: '-' },
+        refund_time: { default: '-' },
+        refund_reason: { default: '-' },
+    }
+}
+</script>
+
+<style lang="scss">
+    .refund-info{
+        padding: 30upx;
+        border-radius: 10upx;
+        background: #fff;
+        .ri-name{
+            flex-shrink: 0;
+            @include flcw(28upx, 40upx, #9C9C9F);
+            &+.ri-line{
+                margin-top: 16upx;
+            }
+        }
+        .ri-line{
+            @include ctf(space-between);
+            .ri-value{
+                flex-grow: 1;
+                @include flcw(28upx, 60upx, #1A1A1A);
+                @include tHide;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/components/order_refund/modal.vue b/src/components/order_refund/modal.vue
new file mode 100644
index 0000000..18e3075
--- /dev/null
+++ b/src/components/order_refund/modal.vue
@@ -0,0 +1,231 @@
+<template>
+    <view class="order-refund-modal">
+        <view class="orm-mask" v-show="isShow">
+            <view class="om-content">
+                <image class="oc-close" mode="aspectFit" src="../../static/images/icon/x_close.png" @click="hide"></image>
+                <view class="oc-title">退款</view>
+                <view class="oc-section">
+                    <view class="os-info">
+                        <view class="oi-name">{{ refundInfo.stadium_name || '' }}</view>
+                        <view class="oi-line">订单编号：{{ refundInfo.order_no || '' }}</view>
+                        <view class="oi-line">手机号码：{{ refundInfo.mobile || '' }}</view>
+
+                        <view class="os-ipts">
+                            <view class="oi-item">
+                                <view class="oi-name">
+                                    <text class="on-txt">*</text>
+                                    退款金额
+                                </view>
+                                <view class="oi-right">
+                                    <input 
+                                        class="or-ipt" 
+                                        type="digit" 
+                                        v-model="iptInfo.refund_amount"
+                                        :disabled="refundInfo.refund_times > 0"
+                                        :class="{ 'or-disabled': refundInfo.refund_times > 0 }"
+                                    />
+                                    <view class="or-tip">可退{{ refundInfo.refundable_amount || 0 }}元</view>
+                                </view>
+                            </view>
+                            <view class="oi-item">
+                                <view class="oi-name">
+                                    <text class="on-txt">*</text>
+                                    退款积分
+                                </view>
+                                <view class="oi-right">
+                                    <input 
+                                        class="or-ipt" type="digit"  
+                                        v-model="iptInfo.refund_integral"
+                                        :disabled="refundInfo.refund_times > 0"
+                                        :class="{ 'or-disabled': refundInfo.refund_times > 0 }"
+                                    />
+                                    <view class="or-tip">可退{{ refundInfo.refundable_integral || 0 }}积分</view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    
+                </view>
+                <view class="oc-btns">
+                    <view class="ob-item" @click="cancelBtn">取消</view>
+                    <view class="ob-item" @click="confirmBtn">确认</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+/**
+ * PM: 
+ * 什么状态下都能退
+ * 全部订单都能退两次, 所有订单最多只能退2次款
+ * 只要订单金额是未全退的，都能退
+ * 0元订单不能退
+ * 
+*/
+import { mapState } from 'vuex';
+import { showModal } from '@/utils/util';
+export default {
+    computed: {
+        ...mapState([ 'brandInfo' ])
+    },
+    data() {
+        return {
+            isShow: false,
+            refundInfo: {
+                /**
+                 * @param {String} stadium_name 店铺名称
+                 * @param {String} order_no 订单编号
+                 * @param {String} mobile 手机号码
+                 * @param {String} refundable_amount 退款金额
+                 * @param {String} refundable_integral 退款积分
+                 * @param {Number} refund_times 退款次数
+                 * @param {Function} cancel 取消回调
+                 * @param {Function} confirm 确认回调
+                */
+            },
+            iptInfo: {
+                refund_amount: '',
+                refund_integral: ''
+            }
+        }
+    },
+    methods: {
+        show(initData){
+            let { brandInfo } = this;
+            if(brandInfo?.permission?.['1018']){
+                this.isShow = true;
+                this.init(initData);
+            }else{
+                showModal({
+                    content: '您没有退款权限',
+                })
+            }
+            
+        },
+        init(data){
+            this.iptInfo.refund_amount = data?.refundable_amount || '0';
+            this.iptInfo.refund_integral = data?.refundable_integral || '0';
+            this.refundInfo = data;
+        },
+        hide(){
+            this.isShow = false;
+        },
+        cancelBtn() {
+            this.hide();
+            this.$emit('click:cancel');
+            this.refundInfo?.cancel?.(0);
+        },
+        confirmBtn() {
+            let { iptInfo, refundInfo } = this;
+            
+            this.$emit('click:confirm');
+            this.refundInfo?.confirm?.(iptInfo);
+            this.hide();
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.order-refund-modal{}
+
+.orm-mask{
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0,0,0,.5);
+    z-index: 10;
+}
+.om-content{
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding-bottom: 80upx;
+    width: 620upx;
+    border-radius: 10px;
+    background: #fff;
+    .oc-close{
+        position: absolute;
+        top: 30upx;
+        right: 30upx;
+        width: 34upx;
+        height: 34upx;
+    }
+    .oc-title{
+        padding-top: 78upx;
+        text-align: center;
+        @include flcw(32upx, 44upx, #333, 500);
+    }
+    .oc-section{
+        padding: 30upx 30upx 0;
+        @include ctf(center);
+        .os-info{
+            .oi-name{
+                @include flcw(28upx, 48upx, #333);
+            }
+            .oi-line{
+                @include flcw(28upx, 48upx, #9C9C9F);
+            }
+            .os-ipts{
+                padding-top: 34upx;
+                .oi-item{
+                    display: flex;
+                    align-items: flex-start;
+                    .oi-name{
+                        @include flcw(28upx, 56upx, #333333);
+                        .on-txt{
+                            color: #EA5061;
+                        }
+                    }
+                    .oi-right{
+                        margin-left: 16upx;
+                        flex-shrink: 0;
+                        width: 312upx;
+                        .or-ipt{
+                            display: block;
+                            box-sizing: border-box;
+                            padding: 0 20upx;
+                            width: 100%;
+                            height: 56upx;
+                            border-radius: 10upx;
+                            border: 2upx solid #D8D8D8;
+                            @include flcw(28upx, 48upx, #9C9C9F);
+                            &.or-disabled{
+                                background: #cecece;
+                                color: #9C9C9F;
+                            }
+                        }
+                        .or-tip{
+                            padding-left: 8upx;
+                            @include flcw(24upx, 48upx, #EA5061);
+                            @include tHide;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    .oc-btns{
+        margin-top: 32upx;
+        padding: 0 54upx;
+        @include ctf(space-between);
+        .ob-item{
+            width: 240upx;
+            height: 88upx;
+            text-align: center;
+            border: 2upx solid $mColor;
+            border-radius: 10upx;
+            @include flcw(32upx, 84upx, $mColor, 500);
+            &+.ob-item{
+                background: $mColor;
+                color: #fff;
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/timing_order/timing_order.vue b/src/components/timing_order/timing_order.vue
index be95aa8..1d6743f 100644
--- a/src/components/timing_order/timing_order.vue
+++ b/src/components/timing_order/timing_order.vue
@@ -80,8 +80,8 @@ export default {
 			// _query["stadium_id"] = orderInfo.stadium_id
 			// _query["order_no"] = orderInfo.order_no
 			// _query["order_type"] = 1
-			let _str = `stadium_id=${orderInfo.stadium_id || ''}&order_no=${orderInfo.order_no || ''}&order_type=1`
-			util.routeTo(`/subpackage/device/pages/order_details/order_details?${_str}`,'nT');
+			let _str = `stadium_id=${orderInfo.stadium_id || ''}&order_no=${orderInfo.order_no || ''}`
+			util.routeTo(`/subpackage/order/pages/timing/detail?${_str}`,'nT');
 			// this.$emit('orderDetailChange');
 		},
 		timeEndBtn(){
diff --git a/src/js/api.js b/src/js/api.js
index 1b0663b..1db1e8b 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -152,6 +152,7 @@ API['writeOff'] = {
 API['order'] = {
   reservationDetail:`${ORIGIN}/admin/assistant/stadiumOrder/detail`, //k-订单管理-场馆预约订单-预约场馆订单详情/ 次卡订单详情
   sessionVerify:`${ORIGIN}/admin/person/number/rule/orderinfo/sessionVerify`, // 次票核销，输入二维码数量核销
+  orderRefundList:`${ORIGIN}/admin/stadium/order/refundList`, // 硬件管理(所有的订单)-退款信息列表（包括预订，计时）
 }
 
 // 20240325 后台功能迁移到小程序端
diff --git a/src/pages.json b/src/pages.json
index 813c428..c9eb464 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -604,6 +604,12 @@
 					"style" : {
 						"navigationBarTitleText": "租球机订单详情" 
 					}
+				},
+				{
+					"path": "pages/timing/detail",
+					"style" : {
+						"navigationBarTitleText": "计时订单详情" 
+					}
 				}
 			]
 		},
diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue
index 9baa789..087b161 100644
--- a/src/pages/site/confirm/confirm.vue
+++ b/src/pages/site/confirm/confirm.vue
@@ -94,7 +94,7 @@ export default {
             ocPrice: '',
             ocReaon: '',
             ocUsage: 1, // 1 -> 客户订场， 2-> 散客， 3-> 锁场, 4 -> 挂账
-            light_up: false,
+            light_up: true,
             usageLs: [
                 { name: '客户订场', type: 1 }, { name: '散客', type: 2 },
                 { name: '锁场', type: 3 }, { name: '挂账', type: 4 },
diff --git a/src/store/actions.js b/src/store/actions.js
index e195e2a..ace8154 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -13,5 +13,13 @@ export default {
             commit('setBrandInfo',res);
             return res;
         })
+    },
+
+    getOrderRefundList({commit, state}, order_no){
+        return servers.get({
+            url: API.order.orderRefundList,
+            data: { order_no },
+            isDefaultGet: false
+        })
     }
 }
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 36a4a95..38ef2f5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -44,7 +44,8 @@ export default new Vuex.Store({
 			'1014': '储值卡管理',
 			'1015': '进场人数异常',
 			'1016': '系统工具',
-            '1017': '钱包提现'
+            '1017': '钱包提现',
+            '1018': '退款权限'
         },
         // 场地占用提交页面信息
         occupyInfo: {
diff --git a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
index c9e1f8c..2d36f30 100644
--- a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
+++ b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
@@ -161,6 +161,26 @@
 				<view>微信交易号：<text>{{orderInfo.trade_no || ''}}</text></view>
 			</view>
 		</view>
+
+		<!-- 退款列表 -->
+		<view v-for="(e, i) in orderInfo.refunds" :key="i" style="padding: 24rpx 24rpx 0;">
+			<order-refund-info
+				:refund_price="e.amount || 0"
+				:refund_no="e.refund_no || '-'"
+				:refund_time="e.refund_time || '-'"
+				:refund_reason="e.reason || '-'"
+				:nameKey="i + 1"
+			></order-refund-info>
+		</view>
+
+		<!-- 退款按钮 -->
+		<order-refund-fixed
+			:pay_amount="orderInfo.pay_amount || 0"
+			:refund_amount="orderInfo.refund_amount || 0"
+			:refund_times="(orderInfo.refunds&&orderInfo.refunds.length) || 0"
+			@click:button="refunndBtn"
+		></order-refund-fixed>
+
 		<!-- 弹框 绑定ic卡 -->
 		<view class="ox-dark-mask" v-if="isShowBindIC" @touchmove.stop.prevent="moveHandle">
 			<view class="odm-ic-modal">
@@ -237,7 +257,13 @@ import util from '@/utils/util';
 import deviceServer from '../../../js/device_server';
 import deviceApi from '../../../js/device_api';
 import { mapState } from 'vuex';
+import orderRefundFixed from '@/components/order_refund/fixed.vue'
+import orderRefundInfo from '@/components/order_refund/info.vue';
 export default {
+	components: {
+		'order-refund-fixed': orderRefundFixed,
+		'order-refund-info': orderRefundInfo,
+	},
 	props: {
 	    orderInfo: {
 	        type: Object,
@@ -592,6 +618,10 @@ export default {
 			this.isShowSuccessIC = !this.isShowSuccessIC
 			this.$emit('okChange');
 		},
+		refunndBtn(){
+			// this.$emit('refundbtn');
+			this.$emit('click:refund');
+		}
 	}
 
 }
diff --git a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
index 3239102..fb4d734 100644
--- a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
+++ b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
@@ -98,6 +98,12 @@
 					<view>优惠券优惠</view>
 					<view>-¥{{orderInfo.coupons_amount || 0}}</view>
 				</view>
+				<view class="rs-line" 
+					v-if="orderInfo.extension&&orderInfo.extension.meituan_args&&orderInfo.extension.meituan_args.meituan_coupon_deduction_amount"
+				>
+					<view>团购券抵扣</view>
+					<view>-¥{{ orderInfo.extension.meituan_args.meituan_coupon_deduction_amount || 0}}</view>
+				</view>
 			</view>
 			<view class="rb-total">
 				<view>合计支付：<text>￥</text><text>{{orderInfo.pay_amount || 0}}</text></view>
@@ -135,14 +141,35 @@
 			</view>
 
 		</view>
-		<!-- 2022/01/04 PM: 禁用退款功能 -->
-		<!-- <view class="rs-btn" @click="refunndBtn" v-if="orderInfo.pay_status == 1 || orderInfo.pay_status == 2">退款</view> -->
+		<!-- 退款列表 -->
+		<view v-for="(e, i) in orderInfo.refunds" :key="i" style="padding: 24rpx 24rpx 0;">
+			<order-refund-info
+				:refund_price="e.amount || 0"
+				:refund_no="e.refund_no || '-'"
+				:refund_time="e.refund_time || '-'"
+				:refund_reason="e.reason || '-'"
+				:nameKey="i + 1"
+			></order-refund-info>
+		</view>
 		
+
+		<order-refund-fixed
+			:pay_amount="orderInfo.pay_amount || 0"
+			:refund_amount="orderInfo.refund_amount || 0"
+			:refund_times="(orderInfo.refunds&&orderInfo.refunds.length) || 0"
+			@click:button="refunndBtn"
+		></order-refund-fixed>
 	</view>
 </template>
 
 <script>
+import orderRefundFixed from '@/components/order_refund/fixed.vue';
+import orderRefundInfo from '@/components/order_refund/info.vue';
 export default {
+	components: {
+		'order-refund-fixed': orderRefundFixed,
+		'order-refund-info': orderRefundInfo
+	},
 	props: {
 	    orderInfo: {
 	        type: Object,
@@ -191,7 +218,7 @@ export default {
             return _obj[`${_status}`] || '-'
 		},
 		refunndBtn(){
-			this.$emit('refundbtn');
+			this.$emit('click:refund');
 		}
 	}
 
@@ -344,15 +371,6 @@ export default {
 		}
 		
 	}
-	.rs-btn{
-		margin: 24rpx 24rpx 0 auto;
-		width: 192upx;
-		line-height: 88upx;
-		border-radius: 10upx;
-		background-color: #fff;
-		text-align: center;
-		color: $themeColor;
-	}
 
 
 }	
diff --git a/src/subpackage/device/components/order/timing_detail/timing_detail.vue b/src/subpackage/device/components/order/timing_detail/timing_detail.vue
deleted file mode 100644
index d6bddc8..0000000
--- a/src/subpackage/device/components/order/timing_detail/timing_detail.vue
+++ /dev/null
@@ -1,265 +0,0 @@
-<template>
-	<view class="timing-details">
-		<view class="td-head">
-			<view class="th-store">
-				<image :src="orderInfo.stadium_logo || ''"></image>
-				<view>{{orderInfo.stadium_name || '-'}}</view>
-			</view>
-			<view class="th-line">
-				<view>订单编号：<text>{{orderInfo.order_no || '-'}}</text></view>
-				<view><text :class="[orderInfo.pay_status == 0?'tl-active':'']">{{zh_order_status(orderInfo.pay_status)}}</text></view>
-			</view>
-			<view class="th-line">
-				<view>创建时间：<text>{{orderInfo.model.created_at || '-'}}</text></view>
-			</view>
-			<view class="th-line">
-				<view>用户昵称：<text>{{orderInfo.nickname || '-'}}</text></view>
-			</view>
-		</view>
-		<view class="td-box">
-			<view class="tb-title">计时信息</view>
-			<view class="tb-line">
-				<!-- 项目 场时有 人时没有  order_type: 1场时  2人时  -->
-				<view v-if="orderInfo.order_type==1">项目：<text>{{orderInfo.project_name || '-'}}({{orderInfo.venue_name || '-'}})</text></view>
-				<view>进场时间：<text>{{orderInfo.start_time || '-'}}</text></view>
-				<!-- 离场时间 已完成显示 -->
-				<view v-if="orderInfo.pay_status != 0">离场时间：<text>{{orderInfo.end_time || '-'}}</text></view>
-				<view>时长合计：<text>{{orderInfo.extension.duration || '-'}}</text></view>
-			</view>
-			<view class="tb-section" v-if="!(orderInfo.pay_status== 0&&orderInfo.early_end_timing==false)">
-				<view class="ts-line">
-					<view>金额小计</view>
-					<view>¥{{orderInfo.amount || 0}}</view>
-				</view>
-				<view class="ts-line">
-					<view>积分抵扣</view>
-					<view>-¥{{orderInfo.deduction_amount ||0}}</view>
-				</view>
-				<view class="ts-line">
-					<view>折扣金额</view>
-					<view>-¥{{orderInfo.discount_amount||0}}</view>
-				</view>
-				<view class="ts-line">
-					<view>优惠券优惠</view>
-					<view>-¥{{orderInfo.coupons_amount || 0}}</view>
-				</view>
-				<view class="ts-total">
-					<view>合计支付：<text>￥</text><text>{{orderInfo.pay_amount ||0}}</text></view>
-				</view>
-			</view>
-		</view>
-		<view class="td-box" v-if="orderInfo.pay_status != 0">
-			<view class="tb-title">支付信息</view>
-			<view class="tb-line">
-				<view>支付方式：<text>{{zh_pay_type(orderInfo.pay_type)}}</text></view>
-				<view>支付时间：<text>{{orderInfo.pay_time || '-'}}</text></view>
-				<view v-if="orderInfo.pay_type==0">微信交易号：<text>{{orderInfo.trade_no || ''}}</text></view>
-				<view v-if="orderInfo.pay_type==3">操作人：<text>{{orderInfo.end_bill_operator_name || ''}}</text></view>
-			</view>
-		</view>
-		
-		<view class="td-box" v-if="orderInfo.pay_status == 4">
-			<view class="tb-title">退款信息</view>
-			<view class="tb-line">
-				<view>退款原因：<text>{{orderInfo.refund_reason || '-'}}</text></view>
-				<view>退款时间：<text>{{orderInfo.refund_time || '-'}}</text></view>
-				<view>退款单号：<text>{{orderInfo.refund_no || '-'}}</text></view>
-			</view>
-		</view>
-		<view class="td-btn" @click="isEndBill = true" v-if="orderInfo.pay_status == 0&&orderInfo.early_end_timing==false">结束计费</view>
-		<view class="td-btn" @click="completeBtn"  v-if="orderInfo.pay_status == 0&&orderInfo.early_end_timing==true">完结订单</view>
-		
-		<!-- 结束计费弹框 -->
-		<end-billing-modal 
-			v-if="isEndBill==true"
-			@close="isEndBill=false"
-			@timeEndBtn="timeEndBtn"
-			:orderInfo="orderInfo"
-		></end-billing-modal>
-		
-	</view>
-</template>
-
-<script>
-import util from '@/utils/util';
-import deviceServer from '../../../js/device_server';
-import deviceApi from '../../../js/device_api';
-import { mapState } from 'vuex';
-import end_billing_modal from '../../../../../components/end_billing_modal/end_billing_modal.vue';
-export default {
-	components: {
-		'end-billing-modal': end_billing_modal,
-	},
-	props: {
-		orderInfo: {
-			type: Object,
-			default: ()=>({})
-		}
-	},
-	computed: {
-		...mapState(['brandInfo']),
-		zh_order_status(){
-			// 订单状态 0计费中1已完成
-			let { orderInfo } = this
-			return status =>{
-				const _obj = {
-					'0': orderInfo.early_end_timing==true?'待支付':'计费中',
-					'1': '已完成',
-					'4': '已退款',
-				}
-				return _obj[`${status}`] || '-'
-			}
-		},
-		zh_pay_type(){
-			// 支付类型 0微信支付1支付宝支付2储值卡支付
-			return status =>{
-				const _obj = {
-					'0': '微信支付',
-					'1': '支付宝支付',
-					'2': '储值卡支付',
-					'3': '商家主动结束计费',
-				}
-				return _obj[`${status}`] || '-'
-			}
-		},
-	},
-	data() {
-		return {
-			isEndBill: false,
-		}
-	},
-	methods: {
-		completeBtn(){
-			this.$emit('completeBtn');
-		},
-		
-		timeEndBtn(){
-			this.$emit('refreshPage');
-		},
-	}
-}
-</script>
-
-<style lang="scss" >
-@import '~style/public.scss';
-.timing-details{
-	margin-bottom: 24rpx;
-	.td-head{
-		margin: 24rpx 24rpx 0rpx;
-		padding: 30rpx;
-		background-color: #FFF;
-		border-radius: 10rpx 10rpx 0px 0px;
-		.th-store{
-			padding-bottom: 26rpx;
-			margin-bottom: 18rpx;
-			border-bottom: 2rpx solid #D8D8D8;
-			display: flex;
-			justify-content: flex-start;
-			>image{
-				flex-shrink: 0;
-				width: 40rpx;
-				height: 40rpx;
-				background-color: skyblue;
-				
-			}
-			>view{
-				flex-grow: 1;
-				margin-left: 14rpx;
-				color: #333333;
-				font-size: 28rpx;
-			}
-		}
-		.th-line{
-			margin-top: 8rpx;
-			@include centerFlex(space-between);
-			>view{
-				line-height: 40rpx;
-				font-size: 28rpx;
-				&:first-child{
-					color: #9A9A9D;
-					>text{
-						color: #333333;
-					}
-				}
-				&:nth-child(2){
-					>text{
-						color: #9A9A9D;
-					}
-					.tl-active{
-						color: #009874;
-					}
-				}
-			}
-		}
-	}
-	.td-box{
-		margin: 24rpx 24rpx 0rpx;
-		padding: 30rpx;
-		background-color: #FFF;
-		border-radius: 10rpx;
-		.tb-title{
-			color: #9A9A9D;
-			font-size: 28rpx;
-			margin-bottom: 20rpx;
-		}
-		.tb-line{
-			>view{
-				line-height: 52rpx;
-				font-size: 28rpx;
-				color: #9A9A9D;
-				>text{
-					color: #333333;
-				}
-			}
-			
-		}
-		.tb-section{
-			margin-top: 30rpx;
-			border-top: 2rpx solid #D8D8D8;
-			.ts-line{
-				margin-top: 26rpx;
-				@include centerFlex(space-between);
-				>view{
-					color: #333333;
-					&:first-child{
-						font-size: 28rpx;
-					}
-					&:nth-child(2){
-						font-size: 24rpx;
-						margin-right: 8rpx;
-					}
-				}
-			}
-			.ts-total{
-				margin-top: 22rpx;
-				@include centerFlex(flex-end);
-				>view{
-					color: #333333;
-					font-size: 28rpx;
-					>text{
-						color: #FF873D;
-						&:first-child{
-							font-size: 28rpx;
-						}
-						&:nth-child(2){
-							font-size: 36rpx;
-							margin-right: 8rpx;
-						}
-					}
-				}
-			}
-		}
-	}
-	.td-btn{
-		height: 112rpx;
-		margin: 80rpx 24rpx;
-		border-radius: 10rpx;
-		background-color: #009874;
-		color: #FFF;
-		font-size: 32rpx;
-		line-height: 112rpx;
-		text-align: center;
-	}
-	
-}
-</style>
diff --git a/src/subpackage/device/pages/order_details/order_details.vue b/src/subpackage/device/pages/order_details/order_details.vue
index f294e36..bc8d1cd 100644
--- a/src/subpackage/device/pages/order_details/order_details.vue
+++ b/src/subpackage/device/pages/order_details/order_details.vue
@@ -2,67 +2,56 @@
 	<view class="order-details">
 		<block v-if="optionsQuery.order_type==3">
 			<!-- pageInfo.order_type 场次(0)/人次(1) -->
-			<reservation-site-detail :orderInfo="pageInfo" v-if="pageInfo.order_type == 0" @refundbtn='refundBtn' ></reservation-site-detail>
+			<reservation-site-detail 
+				v-if="pageInfo.order_type == 0" 
+				:orderInfo="pageInfo" 
+				@click:refund="siteAndPeopleDetailRefund"
+			></reservation-site-detail>
 			<reservation-people-detail 
 				v-if="pageInfo.order_type == 1" 
 				:orderInfo="pageInfo" 
 				@recoverBtn="peopleRecoverBtn" 
 				@okChange="okChange"
 				@verify="verifyBtn"
+				@click:refund="siteAndPeopleDetailRefund"
 			></reservation-people-detail>
 		</block>
-		<timing-detail :orderInfo="pageInfo" @completeBtn="completeBtn" @refreshPage="refreshPage" v-if="optionsQuery.order_type==1"></timing-detail>
 		<organize-detail :orderInfo="pageInfo" v-if="optionsQuery.order_type==10"></organize-detail>
 
-		<!-- 次卡、订场退款弹窗 -->
-		<view class="refund-mask" v-if="isOrderRefund" @click="isOrderRefund = false">
-			<view class="rm-content" @click.stop="_=>false">
-				<view class="rc-tit">退款</view>
-				<view class="rc-info">
-					<view class="ri-view">{{ pageInfo.stadium_name || '-' }}</view>
-					<view class="ri-view">订单编号：{{ pageInfo.order_no || '-' }}</view>
-					<view class="ri-view">手机号码：{{ pageInfo.mobile || '-' }}</view>
-				</view>
-				<view class="rc-price">
-					<view class="rp-name"><text class="rn-txt">*</text>退款金额</view>
-					<view class="rp-frame">
-						<input class="rf-ipt" v-model="refundPrice" type="digit" placeholder="请输入金额" />
-					</view>
-					<view class="rp-tip">最多可退{{ (pageInfo.extension&&pageInfo.extension.refundable_amount) || 0 }}元</view>
-				</view>
-				<view class="ri-btn" @click="confirmRefund">确认退款</view>
-			</view>
-		</view>
+		
 		<!-- 次票核销弹窗 -->
 		<ticket-check 
 			ref="ticketCheckModal"
 			@confirm="verifyConfirm"
 		></ticket-check>
+
+		<order-refund-modal
+			ref="orderRefundModal"
+		></order-refund-modal>
 	</view>
 </template>
 
 <script>
-	import timingDetail from '../../components/order/timing_detail/timing_detail.vue'
 	import reservationSiteDetail from '../../components/order/reservation_site_detail/reservation_site_detail.vue';
 	import reservationPeopleDetail from '../../components/order/reservation_people_detail/reservation_people_detail.vue';
 	import organizeDetail from '../../components/order/organize_detail/organize_detail.vue';
 	import ticket_check from '../../../../components/order_list/modal/ticket_check.vue';
+	import orderRefundModal from '../../../../components/order_refund/modal.vue';
 	import util from '../../../../utils/util';
 	import deviceServer from '../../js/device_server';
 	import deviceApi from '../../js/device_api';
 	import { mapState } from 'vuex';
 	export default {
 		components: {
-			'timing-detail': timingDetail,
 			'reservation-site-detail': reservationSiteDetail,
 			'reservation-people-detail': reservationPeopleDetail,
 			'organize-detail': organizeDetail,
 			'ticket-check': ticket_check,
+			'order-refund-modal': orderRefundModal,
 		},
 		computed:{
 		    titleName(){
 		        let { optionsQuery } = this;
-				if(optionsQuery.order_type == 1)return '计时订单详情';  //PM: 2021/4/19 已做
 		        if(optionsQuery.order_type == 3)return '预约订单详情';  //PM: 2021/4/19 已做
 		        if(optionsQuery.order_type == 4)return '储值卡订单详情';
 		        if(optionsQuery.order_type == 5)return '积分商城订单详情';
@@ -78,11 +67,6 @@
 					order_type: -1,
 				},
 				pageInfo: {},
-
-				// 订场/次卡退款 ---
-				isOrderRefund: false,
-				refundPrice: '',
-				// 订场/次卡退款 ---
 			}
 		},
 		onLoad(options) {
@@ -99,6 +83,44 @@
 			})
 		},
 		methods: {
+			// 订场/次卡订单-订单退款
+			siteAndPeopleDetailRefund(){
+				let { pageInfo } = this;
+				this.$refs.orderRefundModal.show({
+					stadium_name: pageInfo?.stadium_name ?? '',
+					order_no: pageInfo?.order_no ?? '',
+					mobile: pageInfo?.mobile ?? '',
+					refundable_amount: pageInfo?.extension?.refundable_amount ?? 0,
+					refundable_integral: pageInfo?.extension?.refundable_integral ?? 0,
+					refund_times: pageInfo?.refunds?.length ?? 0,
+					confirm: e => {
+						this.siteAndPeopleRefund({
+							order_no: pageInfo?.order_no ?? '',
+							amount: e?.refund_amount || 0,
+							integral: e?.refund_integral || 0,
+						})
+					}
+				});
+			},
+			// 场馆预订订单-订单退款(场馆/人次)
+			siteAndPeopleRefund({ order_no = '', amount = 0, integral = 0}){
+				util.showLoad();
+				deviceServer.get({
+				    url: deviceApi.orderRefund,
+				    data: { order_no, amount, integral },
+					isDefaultGet: false
+				})
+				.then(res=>{
+					util.hideLoad();
+					if(res.data.code == 0){
+						util.showNone(res.data.message || '操作成功！');
+						setTimeout(this.refreshPage, 1200);
+					}else{
+						util.showNone(res.data.message || '操作失败！');
+					}
+				})
+				.catch(util.hideLoad)
+			},
 			verifyConfirm(){
 				let { optionsQuery } = this;
 				this.getPageInfo({
@@ -116,40 +138,17 @@
 			},
 			refreshPage(){
 				let { optionsQuery } = this;
-				this.isOrderRefund = false;
-				this.refundPrice = '';
 				this.getPageInfo({
 					orderType: optionsQuery.order_type,
 					stadium_id: optionsQuery.stadium_id,
 					order_no: optionsQuery.order_no,
 				})
 			},
-			refundBtn(){
-				this.isOrderRefund = true;
-			},
-			confirmRefund: util.debounce(function(){
-				let { pageInfo, refundPrice } = this;
-				deviceServer.get({
-				    url: deviceApi.orderRefund,
-				    data: { order_no: pageInfo.order_no || '', amount: refundPrice || 0, integral: 0 }, // integral 传0就好
-					isDefaultGet: false
-				})
-				.then(res=>{
-					if(res.data.code == 0){
-						util.showNone(res.data.message || '操作成功！');
-						setTimeout(this.refreshPage, 1200);
-					}else{
-						util.showNone(res.data.message || '操作失败！');
-					}
-				})
-				.catch(util.hideLoad)
-			}, 300, true),
 			// 次卡恢复二维码状态刷新订单
 			peopleRecoverBtn(){	
 				this.okChange(); // 逻辑一样，刷新
 			},
 			getApiUrl(type){
-				if(type == 1)return deviceApi.timeOrderDetail;
 			    if(type == 3)return deviceApi.reservationDetail;
 				if(type == 10)return deviceApi.organizeOrderDetail; 
 				
@@ -183,38 +182,6 @@
 					order_no: optionsQuery.order_no,
 				})
 			},
-			
-			// 计时订单-完结订单
-			completeBtn(){
-				let { pageInfo } = this
-				util.showModal({
-				    title: '提示',
-				    content: '是否确认完结订单？',
-				    showCancel: true,
-				    success: modalRes=>{
-				        if(modalRes.confirm){
-							util.showLoad();
-							deviceServer.get({
-							    url: deviceApi.timeOrderComplete,  //计时订单完结
-							    data: {
-							        brand_id: pageInfo.brand_id,
-							        order_no: pageInfo.order_no,
-							    },
-							    failMsg: '请求失败！'
-							})
-							.then(res=>{
-							    util.hideLoad();
-							    util.showNone('操作成功！');
-								this.refreshPage()
-								util.previousPageFunction({
-									fnName: 'refreshList',
-									query: { isLoad: false},
-								});
-							})
-						}
-				    }
-				})
-			},
 		}
 	}
 </script>
@@ -225,82 +192,5 @@
 	
 }
 
-.refund-mask{
-	position: fixed;
-	left: 0;
-	top: 0;
-	bottom: 0;
-	right: 0;
-	background-color: rgba($color: #000, $alpha: .5);
-	.rm-content{
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%, -50%);
-		padding: 80upx;
-		background-color: #fff;
-		width: 620upx;
-		border-radius: 10upx;
-		.rc-tit{
-			margin-bottom: 30upx;
-			text-align: center;
-			font-size: 32upx;
-			font-weight: 500;
-			color: #1A1A1A;
-		}
-		.rc-info{
-			margin-bottom: 34upx;
-			.ri-view{
-				line-height: 40upx;
-				font-size: 28upx;
-				color: #9C9C9F;
-				@include textHide(1);
-				&:first-child{
-					font-weight: 500;
-					color: #1A1A1A;
-				}
-			}
-		}
-		.rc-price{
-			margin-bottom: 32upx;
-			.rp-name{
-				margin-bottom: 8upx;
-				font-size: 28upx;
-				line-height: 48upx;
-				color: #1A1A1A;
-				.rn-txt{
-					color: #EA5061;
-				}
-			}
-			.rp-frame{
-				padding: 0 20upx;
-				height: 88upx;
-				border-radius: 10upx;
-				border: 2upx solid #D8D8D8;
-				.rf-ipt{
-					width: 100%;
-					height: 100%;
-					font-size: 28upx;
-					color: #1A1A1A;
-				}
-			}
-			.rp-tip{
-				font-size: 24upx;
-				color: #EA5061;
-			}
-		}
-		.ri-btn{
-			margin: 0 auto;
-			width: 240upx;
-			line-height: 88upx;
-			text-align: center;
-			border-radius: 10upx;
-			font-size: 32upx;
-			font-weight: 500;
-			color: #fff;
-			background-color: $themeColor;
-		}
-	}
-}
 
 </style>
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index ac8af38..4597f0a 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -35,6 +35,13 @@ export const ORDER_API = {
 	rentballEndBilling:`${ORIGIN}/admin/stadium/rentball/order/end`,  // 结束订单-后台
 	// 20220727
 	rentBallOrderDetails:`${ORIGIN}/admin/stadium/hardware/order/rentBallOrderDetails`,  // 硬件管理-订单详情_copy
+	// 20240614 tid1523 统一退款
+	venueCourseOrderRefund:`${ORIGIN}/admin/venueCourse/orderRefund`,  // 课程订单-退款
+	userValueCardRefundFixed:`${ORIGIN}/admin/userValueCard/refundFixed`,  // 储值卡订单-退款
+	timeOrderDetail:`${ORIGIN}/admin/assistant/timeOrder/detail`,      //k-订单管理-计时订单详情
+	timeOrderComplete:`${ORIGIN}/admin/assistant/timeOrder/complete`,  //【20220208】k-订单管理-计时订单完结
+	orderRefund:`${ORIGIN}/admin/stadium/order/refund`,  // A订单管理-场馆预订订单-订单退款 (零售订单、场地、次卡)
+	userMonthlyCardRefundFixed:`${ORIGIN}/admin/userMonthlyCard/refundFixed`,  // 年月卡订单-订单退款
 }
 
 export default ORDER_API;
\ No newline at end of file
diff --git a/src/subpackage/order/pages/curriculum/detail/detail.vue b/src/subpackage/order/pages/curriculum/detail/detail.vue
index 43f2ff8..a74ef44 100644
--- a/src/subpackage/order/pages/curriculum/detail/detail.vue
+++ b/src/subpackage/order/pages/curriculum/detail/detail.vue
@@ -86,21 +86,29 @@
             <a-line :value="orderInfo.trade_no || '-'">
                 <block slot="name">交易流水：</block> 
             </a-line>
-            <block v-if="orderInfo.order_status == 3">
-                <a-line :value="orderInfo.refund_no || '-'">
-                    <block slot="name">退款单号：</block> 
-                </a-line>
-                <a-line :value="orderInfo.refund_time || '-'">
-                    <block slot="name">退款时间：</block> 
-                </a-line>
-                <a-line :value="'￥' + (orderInfo.refund_amount || '0')">
-                    <block slot="name">退款金额：</block> 
-                </a-line>
-            </block>
-            
-
         </view>
 
+        <!-- 退款列表 -->
+		<view v-for="(e, i) in refundList" :key="i" style="padding: 0 0 24rpx;">
+			<order-refund-info
+				:refund_price="e.amount || 0"
+				:refund_no="e.refund_no || '-'"
+				:refund_time="e.refund_time || '-'"
+				:refund_reason="e.reason || '-'"
+				:nameKey="i + 1"
+			></order-refund-info>
+		</view>
+        <!-- 课程订单只支持一次退款，refund_times 写死为1间接 -->
+        <order-refund-fixed
+			:pay_amount="orderInfo.pay_amount || 0"
+			:refund_amount="orderInfo.refund_amount || 0"
+			:refund_times="refundTimes"
+            @click:button="refunndBtn"
+		></order-refund-fixed>
+
+        <order-refund-modal
+			ref="orderRefundModal"
+		></order-refund-modal>
     </view>
 </template>
 
@@ -109,50 +117,104 @@ import a_line from '../../../../../components/order_list/a_line/a_line.vue';
 import util from '../../../../../utils/util';
 import { ORDER_API } from '../../../js/api';
 import server from '../../../js/server';
+import orderRefundFixed from '@/components/order_refund/fixed.vue'
+import orderRefundModal from '@/components/order_refund/modal.vue';
+import orderRefundInfo from '@/components/order_refund/info.vue';
 export default {
     computed: {
         course_period_nums_give(){
             let { orderInfo } = this;
             let _num = orderInfo.course_period_nums_give || 0;
             return (_num + '').replace('-', '')
+        },
+        refundTimes(){
+            // 课程订单只支持一次退款，refund_times + 1 间接实现
+            let _num = this.refundList?.length || 0;
+            return _num + 1;
         }
     },
     // ('订单状态 0-待付款 1-进行中 2-已结束 3-已退款 4-已取消')
     components: {
         'a-line': a_line,
+        'order-refund-fixed': orderRefundFixed,
+        'order-refund-modal': orderRefundModal,
+        'order-refund-info': orderRefundInfo
     },
     data(){
         return {
             orderInfo: {
                 user_info: {}
-            }
+            },
+            refundList: [], // 退款列表
         }
     },
     onLoad(options){
         this.getInfo(options.order_no);
+        this.getRefundTimes(options.order_no);
     },
     methods: {
+        refunndBtn(){
+            let { orderInfo, refundTimes } = this;
+            this.$refs.orderRefundModal.show({
+                stadium_name: orderInfo?.extension?.stadium_name ?? '',
+                order_no: orderInfo?.order_no ?? '',
+                mobile: orderInfo?.student_phone ?? '',
+                refundable_amount: orderInfo?.extension?.refundable_amount ?? 0,
+                refundable_integral: orderInfo?.extension?.refundable_integral ?? 0,
+                refund_times: refundTimes,
+                confirm: e => {
+                    this.venueCourseOrderRefund({
+                        order_no: orderInfo?.order_no ?? '',
+                        amount: e.refund_amount || 0,
+                        integral: e.refund_integral || 0
+                    })  
+                }
+            });
+        },
+        venueCourseOrderRefund({ order_no = '', amount = 0, integral = 0}){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.venueCourseOrderRefund,
+                data: { order_no, amount, integral },
+                isDefaultGet: false
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '操作成功！');
+                }else{
+                    util.showNone(res.data.message || '操作失败！');
+                }
+            })
+            .catch(util.hideLoad)
+            .finally(_=>setTimeout(_=>{
+                this.getInfo(order_no);
+                this.getRefundTimes(order_no);
+            }, 1200));
+        },
+        async getRefundTimes(order_no){
+            try{
+                let _refundRes = await this.$store.dispatch('getOrderRefundList', order_no);
+                let _refundLs = _refundRes?.data?.data?.list || [];
+                this.refundList = _refundLs;
+            }catch(err){
+                console.warn('getRefundTimes err', err);
+            }
+        },
         getInfo(order_no){
+            util.showLoad();
             server.get({
                 url: ORDER_API.venueCourse_orderInfo,
                 data: { order_no },
                 failMsg: '加载失败！'
             })
             .then(res=>{
+                util.hideLoad();
                 this.orderInfo = res || {};
             })
+            .catch(util.hideLoad)
         },
         getPayType: util.order_pay_type_txt,
-        // getPayType(type){
-        //     // [0微信支付，1支付宝支付，2会员换卡支付, 3商家主动]    
-        //     let _obj = {
-        //         0: '微信支付',
-        //         1: '支付宝支付',
-        //         2: '会员换卡支付',
-        //         3: '商家主动',
-        //     }
-        //     return _obj[type] || '-'
-        // }
     }
 }
 </script>
diff --git a/src/subpackage/order/pages/retail/detail/detail.vue b/src/subpackage/order/pages/retail/detail/detail.vue
index 7860259..83b2f30 100644
--- a/src/subpackage/order/pages/retail/detail/detail.vue
+++ b/src/subpackage/order/pages/retail/detail/detail.vue
@@ -2,36 +2,36 @@
     <view class="retail-container">
         <view class="rc-header">
             <view class="ra-header">
-							<image mode="aspectFit" src="/static/images/icon/retail/storeIcon.png"></image>
-							<text>{{ orderInfo.stadium_name || '-' }}</text>
-							<view></view>
-						</view>
-						<view class="rh-name">
-								<view class="rh-name-line">
-									<view>
-										<view>微信昵称：</view>
-										<text>{{ orderInfo.nickname || '-' }}</text>
-									</view>
-									<view :style="{color:getStatus(orderInfo.pay_status)==='已退款'?'#EA5061':'#9C9C9F'}">{{ getStatus(orderInfo.pay_status) }}</view>
-								</view>
-								<view class="rh-name-line">
-									<view>
-										<view>手机号码：</view>
-										<text>{{ orderInfo.mobile || '-' }}</text>
-									</view>
-								</view>
-								<!-- <view class="rh-name-line">
-									<view>
-										<view>身份：</view>
-										<text>{{ orderInfo.sys_optuname || '-' }}</text>
-									</view>
-								</view> -->
-								<view class="rh-name-line">
-									<view>
-										<view>下单途径：</view>
-										<text>{{ orderInfo.retail_source || '-' }}</text>
-									</view>
-								</view>
+				<image mode="aspectFit" src="/static/images/icon/retail/storeIcon.png"></image>
+				<text>{{ orderInfo.stadium_name || '-' }}</text>
+				<view></view>
+			</view>
+			<view class="rh-name">
+				<view class="rh-name-line">
+					<view>
+						<view>微信昵称：</view>
+						<text>{{ orderInfo.nickname || '-' }}</text>
+					</view>
+					<view :style="{color:getStatus(orderInfo.pay_status)==='已退款'?'#EA5061':'#9C9C9F'}">{{ getStatus(orderInfo.pay_status) }}</view>
+				</view>
+				<view class="rh-name-line">
+					<view>
+						<view>手机号码：</view>
+						<text>{{ orderInfo.mobile || '-' }}</text>
+					</view>
+				</view>
+				<!-- <view class="rh-name-line">
+					<view>
+						<view>身份：</view>
+						<text>{{ orderInfo.sys_optuname || '-' }}</text>
+					</view>
+				</view> -->
+				<view class="rh-name-line">
+					<view>
+						<view>下单途径：</view>
+						<text>{{ orderInfo.retail_source || '-' }}</text>
+					</view>
+				</view>
             </view>
         </view>
         <view class="rc-goods-info" v-if="orderInfo.retail_order_goods&&orderInfo.retail_order_goods.length">
@@ -39,37 +39,37 @@
             <view class="rgi-goods-ls">
                 <view class="rgl-item" v-for="(e, i) in orderInfo.retail_order_goods" :key="i">
                     <view class="rgl-item-desc">
-											<view>{{ e.erp_retail_goods ? (e.erp_retail_goods.goods_name || '-') : (e.name || '-') }}</view>
-											<view>￥{{ e.price || 0 }}</view>
-										</view>
-										<view class="rgl-item-sku">sku：{{ e.erp_retail_goods ? (e.erp_retail_goods.erp_goods ? e.erp_retail_goods.erp_goods.erp_goods_sku : '-') : '-' }}</view>
-										<view class="rgl-item-type-spec">
-											<view>型号：{{ e.erp_retail_goods ? (e.erp_retail_goods.erp_goods ? e.erp_retail_goods.erp_goods.erp_goods_type : '-') : '-' }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;规格：{{ e.spec || '-' }}</view>
-											<text>x{{ e.nums || 0 }}</text>
-										</view>
-										<view v-if="orderInfo.retail_order_goods.length - 1 == i ? false : true" class="rgl-item-bottom-line"></view>
+						<view>{{ e.erp_retail_goods ? (e.erp_retail_goods.goods_name || '-') : (e.name || '-') }}</view>
+						<view>￥{{ e.price || 0 }}</view>
+					</view>
+					<view class="rgl-item-sku">sku：{{ e.erp_retail_goods ? (e.erp_retail_goods.erp_goods ? e.erp_retail_goods.erp_goods.erp_goods_sku : '-') : '-' }}</view>
+					<view class="rgl-item-type-spec">
+						<view>型号：{{ e.erp_retail_goods ? (e.erp_retail_goods.erp_goods ? e.erp_retail_goods.erp_goods.erp_goods_type : '-') : '-' }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;规格：{{ e.spec || '-' }}</view>
+						<text>x{{ e.nums || 0 }}</text>
+					</view>
+					<view v-if="orderInfo.retail_order_goods.length - 1 == i ? false : true" class="rgl-item-bottom-line"></view>
                 </view>
             </view>
         </view>
-				<view class="rc-total-amount-info">
-				    <view class="rc-total-amount-line">
-							<view>金额小计</view>
-							<text>￥{{ orderInfo.amount || 0 }}</text>
-						</view>
-						<view class="rc-total-amount-line">
-							<view>积分抵扣</view>
-							<text>￥{{ orderInfo.deduction_amount || 0 }}</text>
-						</view>
-						<view class="rc-total-amount-line">
-							<view>折扣金额</view>
-							<text>-￥{{ orderInfo.discount_amount || 0 }}</text>
-						</view>
-						<view class="rc-total-amount-line">
-							<view>优惠券优惠</view>
-							<text>-￥{{ orderInfo.coupons_amount || 0 }}</text>
-						</view>
-				    <view class="rgi-total"><text>合计支付：</text>￥{{ orderInfo.pay_amount || 0 }}</view>
+		<view class="rc-total-amount-info">
+			<view class="rc-total-amount-line">
+					<view>金额小计</view>
+					<text>￥{{ orderInfo.amount || 0 }}</text>
+				</view>
+				<view class="rc-total-amount-line">
+					<view>积分抵扣</view>
+					<text>￥{{ orderInfo.deduction_amount || 0 }}</text>
+				</view>
+				<view class="rc-total-amount-line">
+					<view>折扣金额</view>
+					<text>-￥{{ orderInfo.discount_amount || 0 }}</text>
+				</view>
+				<view class="rc-total-amount-line">
+					<view>优惠券优惠</view>
+					<text>-￥{{ orderInfo.coupons_amount || 0 }}</text>
 				</view>
+			<view class="rgi-total"><text>合计支付：</text>￥{{ orderInfo.pay_amount || 0 }}</view>
+		</view>
         <view class="rc-pay-info">
             <!-- 订单编号   -->
             <view class="rpi-tit">支付详情</view>
@@ -78,33 +78,28 @@
 						<p-line :keyname="'支付方式'" :value="orderInfo.extension ? orderInfo.extension.pay_type_text || '-' : '-'"></p-line>
             <p-line :keyname="'支付时间'" :value="orderInfo.pay_time || '-'"></p-line>
         </view>
-				<!-- <view v-if="orderInfo.refunds&&orderInfo.refunds.length">
-					<view class="rc-refund-info" v-for="(item, index) in orderInfo.refunds" :key="index">
-							<view class="rpi-tit">退款信息{{ index + 1 }}</view>
-							<p-line :keyname="'退款金额：'" :value="item.refund_amount ? '￥' + item.refund_amount : '￥0'"></p-line>
-							<p-line :keyname="'退款单号：'" :value="item.refund_no || '-'"></p-line>
-							<p-line :keyname="'退款时间：'" :value="item.refund_time || '-'"></p-line>
-							<p-line :keyname="'退款原因：'" :value="item.refund_reason || '-'"></p-line>
-					</view>
-				</view> -->
-				<!-- <view v-if="orderInfo.refund_no">
-					<view class="rc-refund-info">
-							<view class="rpi-tit">退款信息</view>
-							<p-line :keyname="'退款金额：'" :value="orderInfo.refund_amount ? '￥' + orderInfo.refund_amount : '￥0'"></p-line>
-							<p-line :keyname="'退款单号：'" :value="orderInfo.refund_no || '-'"></p-line>
-							<p-line :keyname="'退款时间：'" :value="orderInfo.refund_time || '-'"></p-line>
-							<p-line :keyname="'退款原因：'" :value="orderInfo.refund_reason || '商家主动退款'"></p-line>
-					</view>
-				</view> -->
-				<view v-if="refundList.length">
-					<view class="rc-refund-info" v-for="(item, index) in refundList" :key="index">
-							<view class="rpi-tit">退款信息{{ index + 1 }}</view>
-							<p-line :keyname="'退款金额：'" :value="`￥${item.amount}`"></p-line>
-							<p-line :keyname="'退款单号：'" :value="item.refund_no || '-'"></p-line>
-							<p-line :keyname="'退款时间：'" :value="item.refund_time || '-'"></p-line>
-							<p-line :keyname="'退款原因：'" :value="item.reason || '商家主动退款'"></p-line>
-					</view>
-				</view>
+		
+		<!-- 退款列表 -->
+		<view v-for="(e, i) in refundList" :key="i" style="padding: 24rpx 0 0;">
+			<order-refund-info
+				:refund_price="e.amount || 0"
+				:refund_no="e.refund_no || '-'"
+				:refund_time="e.refund_time || '-'"
+				:refund_reason="e.reason || '-'"
+				:nameKey="i + 1"
+			></order-refund-info>
+		</view>
+
+		<order-refund-fixed
+			:pay_amount="orderInfo.pay_amount || 0"
+			:refund_amount="orderInfo.refund_amount || 0"
+			:refund_times="refundList&&refundList.length"
+            @click:button="refunndBtn"
+		></order-refund-fixed>
+
+		<order-refund-modal
+			ref="orderRefundModal"
+		></order-refund-modal>
     </view>
 </template>
 
@@ -114,16 +109,22 @@ import server from '../../../js/server';
 import util from '../../../../../utils/util';
 import s_line from '../../../components/s_line/s_line.vue';
 import p_line from '../../../components/p_line/p_line.vue';
+import orderRefundFixed from '@/components/order_refund/fixed.vue'
+import orderRefundModal from '@/components/order_refund/modal.vue';
+import orderRefundInfo from '@/components/order_refund/info.vue';
 import { mapState } from 'vuex';
 export default {
     components: {
         's-line': s_line,
         'p-line': p_line,
+		'order-refund-fixed': orderRefundFixed,
+        'order-refund-modal': orderRefundModal,
+		'order-refund-info': orderRefundInfo
     },
     data(){
         return {
             orderInfo: {},
-						refundList: []
+			refundList: []
         }
     },
 		computed:{
@@ -131,19 +132,74 @@ export default {
 		},
     onLoad(options){
         this.getOrderInfo(options.order_no);
+		this.retailOrderInfoRefundList({
+			order_no: options.order_no,
+			brand_id: this.brandInfo.brand.id
+		})
     },
     methods: {
+		refunndBtn(){
+			let { orderInfo, refundList } = this;
+            this.$refs.orderRefundModal.show({
+                stadium_name: orderInfo?.stadium_name ?? '',
+                order_no: orderInfo?.order_no ?? '',
+                mobile: orderInfo?.mobile ?? '',
+                refundable_amount: orderInfo?.extension?.refundable_amount ?? 0,
+                refundable_integral: orderInfo?.extension?.refundable_integral ?? 0,
+                refund_times: refundList?.length || 0,
+                confirm: e => {
+					console.log('refund' , e)
+                    // this.venueCourseOrderRefund({
+                    //     order_no: orderInfo?.order_no ?? '',
+                    //     amount: e.refund_amount || 0,
+                    //     integral: e.refund_integral || 0
+                    // })  
+					this.confirmRefundReq({
+						order_no: orderInfo?.order_no || '',
+						amount: e.refund_amount || 0,
+						integral: e.refund_integral || 0
+					})
+                }
+            });
+		},
+		confirmRefundReq({ order_no = '', amount = 0, integral = 0}){
+			util.showLoad();
+				server.get({
+				    url: ORDER_API.orderRefund,
+				    data: { order_no, amount, integral },
+					isDefaultGet: false
+				})
+				.then(res=>{
+					util.hideLoad();
+					if(res.data.code == 0){
+						util.showNone(res.data.message || '操作成功！');
+					}else{
+						util.showNone(res.data.message || '操作失败！');
+					}
+				})
+				.then(_=>{
+					setTimeout(_=>{
+						let { orderInfo } = this;
+						this.getOrderInfo(orderInfo?.order_no || '');
+						this.retailOrderInfoRefundList({
+							order_no: orderInfo?.order_no || '',
+							brand_id: orderInfo?.brand_id || ''
+						})
+					}, 1200);
+				})
+				.catch(util.hideLoad)
+		},
         // payTypeTxt: util.order_pay_type_txt,
-				payTypeTxt(payType, cardNo) {
-					let _obj = {
-					    0: '微信支付',
-					    1: '支付宝支付',
-					    2: `储值卡支付 ${cardNo ? '(' + cardNo + ')' : ''}`,
-					    3: '现金支付',
-							4: '其他'
-					};
-					return _obj[payType] || '-'
-				},
+		payTypeTxt(payType, cardNo) {
+			let _obj = {
+				0: '微信支付',
+				1: '支付宝支付',
+				2: `储值卡支付 ${cardNo ? '(' + cardNo + ')' : ''}`,
+				3: '现金支付',
+					4: '其他'
+			};
+			return _obj[payType] || '-'
+		},
         getStatus(status){
             let _obj = {
                 1: '交易成功',
@@ -160,21 +216,24 @@ export default {
             })
             .then(res=>{
                 this.orderInfo = res || {};
-								// this.orderInfo.refunds = [
-								// 	{ refund_amount: this.orderInfo.refund_amount, refund_no: this.orderInfo.refund_no, refund_time: this.orderInfo.refund_time, refund_reason: this.orderInfo.refund_reason },
-								// 	{ refund_amount: this.orderInfo.refund_amount, refund_no: this.orderInfo.refund_no, refund_time: this.orderInfo.refund_time, refund_reason: this.orderInfo.refund_reason }
-								// ];
-								server.get({
-								    url: ORDER_API.retailOrderInfoRefundList,
-								    data: { order_no, brand_id: this.brandInfo.brand.id },
-								    failMsg: '加载失败！'
-								})
-								.then(res=>{
-								    util.hideLoad();
-										this.refundList = res.list;
-								});
+				// this.orderInfo.refunds = [
+				// 	{ refund_amount: this.orderInfo.refund_amount, refund_no: this.orderInfo.refund_no, refund_time: this.orderInfo.refund_time, refund_reason: this.orderInfo.refund_reason },
+				// 	{ refund_amount: this.orderInfo.refund_amount, refund_no: this.orderInfo.refund_no, refund_time: this.orderInfo.refund_time, refund_reason: this.orderInfo.refund_reason }
+				// ];
+				
             });
         },
+		retailOrderInfoRefundList({ order_no, brand_id }){
+			server.get({
+				url: ORDER_API.retailOrderInfoRefundList,
+				data: { order_no, brand_id },
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+					this.refundList = res?.list || [];
+			});
+		}
 
     }
 }
@@ -189,57 +248,57 @@ export default {
         margin-bottom: 26upx;
         padding: 0 24upx;
         background-color: #fff;
-				.ra-header {
-					position: relative;
-					padding: 30upx 0;
-					@include centerFlex(flex-start);
-					>image {
-						width: 32upx;
-						height: 30upx;
-						margin-right: 14upx;
-					}
-					>text {
-						font-size: 28upx;
-						font-weight: 500;
-						color: #1A1A1A;
+		.ra-header {
+			position: relative;
+			padding: 30upx 0;
+			@include centerFlex(flex-start);
+			>image {
+				width: 32upx;
+				height: 30upx;
+				margin-right: 14upx;
+			}
+			>text {
+				font-size: 28upx;
+				font-weight: 500;
+				color: #1A1A1A;
+			}
+			>view {
+				position: absolute;
+				bottom: 0%;
+				width: 100%;
+				height: 2upx;
+				background-color: #D8D8D8;
+			}
+		}
+        .rh-name{
+			padding: 18upx 0;
+			.rh-name-line {
+				@include centerFlex(space-between);
+				font-size: 28upx;
+				font-weight: 400;
+				margin-bottom: 10upx;
+				
+				>view {
+					&:first-child {
+						color: #9C9C9F;
+						@include centerFlex(flex-start);
+						flex-grow: 1;
+						
+						>view {
+							width: 152upx;
+							flex-shrink: 0;
+						}
+						>text {
+							color: #1A1A1A;
+							@include textHide(1);
+						}
 					}
-					>view {
-						position: absolute;
-						bottom: 0%;
-						width: 100%;
-						height: 2upx;
-						background-color: #D8D8D8;
+					
+					&:nth-child(2) {
+						flex-shrink: 0;
 					}
 				}
-        .rh-name{
-						padding: 18upx 0;
-						.rh-name-line {
-							@include centerFlex(space-between);
-							font-size: 28upx;
-							font-weight: 400;
-							margin-bottom: 10upx;
-							
-							>view {
-								&:first-child {
-									color: #9C9C9F;
-									@include centerFlex(flex-start);
-									flex-grow: 1;
-									
-									>view {
-										width: 152upx;
-										flex-shrink: 0;
-									}
-									>text {
-										color: #1A1A1A;
-										@include textHide(1);
-									}
-								}
-								
-								&:nth-child(2) {
-									flex-shrink: 0;
-								}
-							}
-						}
+			}
         }
     }
     .rc-goods-info{
@@ -256,32 +315,32 @@ export default {
             .rgl-item{
                 padding-top: 30upx;
                 // border-bottom: 2upx solid #D8D8D8;
-								color: #9C9C9F;
-								font-size: 28upx;
-								
-								.rgl-item-desc {
-									display: flex;
-									justify-content: space-between;
-									margin-bottom: 20upx;
-									color: #1A1A1A;
-								}
-								.rgl-item-sku {
-									margin-bottom: 10upx;
-								}
-								.rgl-item-type-spec {
-									display: flex;
-									justify-content: space-between;
-									align-items: flex-end;
-									>text {
-										color: #1A1A1A;
-									}
-								}
-								.rgl-item-bottom-line {
-									width: 100%;
-									height: 2upx;
-									background-color: #D8D8D8;
-									margin-top: 18upx;
-								}
+				color: #9C9C9F;
+				font-size: 28upx;
+				
+				.rgl-item-desc {
+					display: flex;
+					justify-content: space-between;
+					margin-bottom: 20upx;
+					color: #1A1A1A;
+				}
+				.rgl-item-sku {
+					margin-bottom: 10upx;
+				}
+				.rgl-item-type-spec {
+					display: flex;
+					justify-content: space-between;
+					align-items: flex-end;
+					>text {
+						color: #1A1A1A;
+					}
+				}
+				.rgl-item-bottom-line {
+					width: 100%;
+					height: 2upx;
+					background-color: #D8D8D8;
+					margin-top: 18upx;
+				}
             }
         }
     }
@@ -324,15 +383,4 @@ export default {
             color: #1A1A1A;
         }
     }
-		.rc-refund-info{
-		    padding: 30upx;
-				margin-top: 24upx;
-		    background-color: #fff;
-				.rpi-tit{
-				    margin-bottom: 16upx;
-				    line-height: 44upx;
-				    font-size: 28upx;
-				    color: #9C9C9F;
-				}
-		}
 </style>
\ No newline at end of file
diff --git a/src/subpackage/order/pages/stored_value_card/detail/detail.vue b/src/subpackage/order/pages/stored_value_card/detail/detail.vue
index f7b9a58..59ec707 100644
--- a/src/subpackage/order/pages/stored_value_card/detail/detail.vue
+++ b/src/subpackage/order/pages/stored_value_card/detail/detail.vue
@@ -65,24 +65,27 @@
             </view>
         </view>
 
-        <view class="svc-box" v-for="(e, i) in orderInfo.refunds" :key="i">
-            <view class="svc-line">
-                <view class="sl-txt" style="margin-bottom: 20rpx;"><text>退款信息{{i+1}}</text></view>
-            </view>
-            
-            <view class="svc-line">
-                <view class="sl-txt"><text>退款金额：</text>{{ e.amount || 0 }}</view>
-            </view>
-            <view class="svc-line">
-                <view class="sl-txt"><text>退款单号：</text>{{ e.refund_no || '-' }}</view>
-            </view>
-            <view class="svc-line">
-                <view class="sl-txt"><text>退款时间：</text>{{ e.refund_time || '-' }}</view>
-            </view>
-            <view class="svc-line">
-                <view class="sl-txt"><text>退款原因：</text>{{ e.reason || '-' }}</view>
-            </view>
-        </view>
+        <!-- 退款列表 -->
+		<view v-for="(e, i) in orderInfo.refunds" :key="i" style="padding: 24upx 0upx 0upx;">
+			<order-refund-info
+				:refund_price="e.amount || 0"
+				:refund_no="e.refund_no || '-'"
+				:refund_time="e.refund_time || '-'"
+				:refund_reason="e.reason || '-'"
+				:nameKey="i + 1"
+			></order-refund-info>
+		</view>
+        
+        <order-refund-fixed
+            :pay_amount="orderInfo.pay_amount || 0"
+			:refund_amount="orderInfo.refund_amount || 0"
+			:refund_times="(orderInfo.refunds && orderInfo.refunds.length) || 0"
+            @click:button="refunndBtn"
+		></order-refund-fixed>
+
+        <order-refund-modal
+			ref="orderRefundModal"
+		></order-refund-modal>
     </view>
 </template>
 
@@ -91,9 +94,15 @@ import s_line from '../../../components/s_line/s_line.vue';
 import { ORDER_API } from '../../../js/api';
 import server from '../../../js/server';
 import util from '../../../../../utils/util';
+import orderRefundFixed from '@/components/order_refund/fixed.vue'
+import orderRefundModal from '@/components/order_refund/modal.vue';
+import orderRefundInfo from '@/components/order_refund/info.vue';
 export default {
     components: {
         's-line': s_line,
+        'order-refund-fixed': orderRefundFixed,
+        'order-refund-modal': orderRefundModal,
+        'order-refund-info': orderRefundInfo
     },
     computed: {
         cardInfo(){
@@ -116,6 +125,46 @@ export default {
         this.getOrderInfo({ order_no: options.order_no });
     },
     methods: {
+        refunndBtn(){
+            let { orderInfo } = this;
+            let _pay_amount = +orderInfo?.pay_amount || 0;
+            let _refund_amount = +orderInfo?.refund_amount || 0;
+            let _deduction_integral = +orderInfo?.deduction_integral || 0;
+            let _refund_integral = +orderInfo?.refund_integral || 0;
+            this.$refs.orderRefundModal.show({
+                stadium_name: orderInfo?.stadium?.stadium_name ?? '',
+                order_no: orderInfo?.order_no ?? '',
+                mobile: orderInfo?.mobile ?? '',
+                refundable_amount: _pay_amount - _refund_amount,
+                refundable_integral: _deduction_integral - _refund_integral,
+                refund_times: orderInfo?.refunds?.length || 0,
+                confirm: e => {
+                    this.userValueCardRefundFixed({
+                        order_no: orderInfo?.order_no ?? '',
+                        amount: e.refund_amount || 0,
+                        integral: e.refund_integral || 0
+                    })  
+                }
+            });
+        },
+        userValueCardRefundFixed({ order_no = '', amount = 0, integral = 0}){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.userValueCardRefundFixed,
+                data: { order_no, amount, integral },
+                isDefaultGet: false
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '操作成功！');
+                }else{
+                    util.showNone(res.data.message || '操作失败！');
+                }
+            })
+            .catch(util.hideLoad)
+            .finally(_=>setTimeout(_=>this.getOrderInfo({ order_no }), 1200));
+        },
         payStatus(status){
             if(status == 1)return  '已付款';
             if(status == 4)return  '已退款';
diff --git a/src/subpackage/order/pages/timing/detail.vue b/src/subpackage/order/pages/timing/detail.vue
new file mode 100644
index 0000000..da4dddd
--- /dev/null
+++ b/src/subpackage/order/pages/timing/detail.vue
@@ -0,0 +1,379 @@
+<template>
+	<view class="timing-details">
+		<view class="td-head">
+			<view class="th-store">
+				<image :src="orderInfo.stadium_logo || ''"></image>
+				<view>{{orderInfo.stadium_name || '-'}}</view>
+			</view>
+			<view class="th-line">
+				<view>订单编号：<text>{{orderInfo.order_no || '-'}}</text></view>
+				<view><text :class="[orderInfo.pay_status == 0?'tl-active':'']">{{zh_order_status(orderInfo.pay_status)}}</text></view>
+			</view>
+			<view class="th-line">
+				<view>创建时间：<text>{{orderInfo.model.created_at || '-'}}</text></view>
+			</view>
+			<view class="th-line">
+				<view>用户昵称：<text>{{orderInfo.nickname || '-'}}</text></view>
+			</view>
+		</view>
+		<view class="td-box">
+			<view class="tb-title">计时信息</view>
+			<view class="tb-line">
+				<!-- 项目 场时有 人时没有  order_type: 1场时  2人时  -->
+				<view v-if="orderInfo.order_type==1">项目：<text>{{orderInfo.project_name || '-'}}({{orderInfo.venue_name || '-'}})</text></view>
+				<view>进场时间：<text>{{orderInfo.start_time || '-'}}</text></view>
+				<!-- 离场时间 已完成显示 -->
+				<view v-if="orderInfo.pay_status != 0">离场时间：<text>{{orderInfo.end_time || '-'}}</text></view>
+				<view>时长合计：<text>{{orderInfo.extension.duration || '-'}}</text></view>
+			</view>
+			<view class="tb-section" v-if="!(orderInfo.pay_status== 0&&orderInfo.early_end_timing==false)">
+				<view class="ts-line">
+					<view>金额小计</view>
+					<view>¥{{orderInfo.amount || 0}}</view>
+				</view>
+				<view class="ts-line">
+					<view>积分抵扣</view>
+					<view>-¥{{orderInfo.deduction_amount ||0}}</view>
+				</view>
+				<view class="ts-line">
+					<view>折扣金额</view>
+					<view>-¥{{orderInfo.discount_amount||0}}</view>
+				</view>
+				<view class="ts-line">
+					<view>优惠券优惠</view>
+					<view>-¥{{orderInfo.coupons_amount || 0}}</view>
+				</view>
+				<view class="ts-total">
+					<view>合计支付：<text>￥</text><text>{{orderInfo.pay_amount ||0}}</text></view>
+				</view>
+			</view>
+		</view>
+		<view class="td-box" v-if="orderInfo.pay_status != 0">
+			<view class="tb-title">支付信息</view>
+			<view class="tb-line">
+				<view>支付方式：<text>{{zh_pay_type(orderInfo.pay_type)}}</text></view>
+				<view>支付时间：<text>{{orderInfo.pay_time || '-'}}</text></view>
+				<view v-if="orderInfo.pay_type==0">微信交易号：<text>{{orderInfo.trade_no || ''}}</text></view>
+				<view v-if="orderInfo.pay_type==3">操作人：<text>{{orderInfo.end_bill_operator_name || ''}}</text></view>
+			</view>
+		</view>
+		
+		
+		<!-- 退款列表 -->
+		<view v-for="(e, i) in refundList" :key="i" style="padding: 24rpx 24rpx 0;">
+			<order-refund-info
+				:refund_price="e.amount || 0"
+				:refund_no="e.refund_no || '-'"
+				:refund_time="e.refund_time || '-'"
+				:refund_reason="e.reason || '-'"
+				:nameKey="i + 1"
+			></order-refund-info>
+		</view>
+
+		<view class="td-btn" @click="isEndBill = true" v-if="orderInfo.pay_status == 0&&orderInfo.early_end_timing==false">结束计费</view>
+		<view class="td-btn" @click="completeBtn"  v-if="orderInfo.pay_status == 0&&orderInfo.early_end_timing==true">完结订单</view>
+
+        <!-- 退款按钮拦 -->
+        <order-refund-fixed
+			:pay_amount="orderInfo.pay_amount || 0"
+			:refund_amount="orderInfo.refund_amount || 0"
+			:refund_times="(refundList&&refundList.length) || 0"
+            @click:button="refunndBtn"
+		></order-refund-fixed>
+		
+		<!-- 结束计费弹框 -->
+		<end-billing-modal 
+			v-if="isEndBill==true"
+			@close="isEndBill=false"
+			@timeEndBtn="timeEndBtn"
+			:orderInfo="orderInfo"
+		></end-billing-modal>
+		<!-- 退款弹窗 -->
+        <order-refund-modal
+			ref="orderRefundModal"
+		></order-refund-modal>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import { ORDER_API } from '../../js/api';
+import server from '../../js/server';
+import { mapState } from 'vuex';
+import end_billing_modal from '@/components/end_billing_modal/end_billing_modal.vue';
+import orderRefundFixed from '@/components/order_refund/fixed.vue'
+import orderRefundModal from '@/components/order_refund/modal.vue';
+import orderRefundInfo from '@/components/order_refund/info.vue';
+export default {
+	components: {
+		'end-billing-modal': end_billing_modal,
+        'order-refund-fixed': orderRefundFixed,
+        'order-refund-modal': orderRefundModal,
+		'order-refund-info': orderRefundInfo
+	},
+	computed: {
+		...mapState(['brandInfo']),
+		zh_order_status(){
+			// 订单状态 0计费中1已完成
+			let { orderInfo } = this
+			return status =>{
+				const _obj = {
+					'0': orderInfo.early_end_timing==true?'待支付':'计费中',
+					'1': '已完成',
+					'4': '已退款',
+				}
+				return _obj[`${status}`] || '-'
+			}
+		},
+	},
+	data() {
+		return {
+			isEndBill: false,
+            orderInfo: {},
+			refundList: [], // 退款列表
+		}
+	},
+    onLoad(options){
+        this.getOrderInfo({
+            order_no: options?.order_no || '',
+            stadium_id: options?.stadium_id || ''
+        })
+        this.getRefundTimes(options?.order_no || '');
+    },
+	methods: {
+        refunndBtn(){
+            let { orderInfo,  refundList } = this;
+            this.$refs.orderRefundModal.show({
+                stadium_name: orderInfo?.stadium_name ?? '',
+                order_no: orderInfo?.order_no ?? '',
+                mobile: orderInfo?.mobile ?? '',
+                refundable_amount: orderInfo?.extension?.refundable_amount ?? 0,
+                refundable_integral: orderInfo?.extension?.refundable_integral ?? 0,
+                refund_times: refundList?.length || -1,
+                confirm: e => {
+                    this.orderRefund({
+                        order_no: orderInfo?.order_no || '',
+                        amount: e.refund_amount || 0,
+                        integral: e.refund_integral || 0,
+                        stadium_id: orderInfo?.stadium_id || ''
+                    })
+                }
+            });
+        },
+        orderRefund({ order_no = '', amount = 0, integral = 0, stadium_id = ''}){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.orderRefund,
+                data: { order_no, amount, integral },
+                isDefaultGet: false
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '操作成功！');
+                }else{
+                    util.showNone(res.data.message || '操作失败！');
+                }
+            })
+            .catch(util.hideLoad)
+            .finally(_=>setTimeout(_=>{
+                this.getOrderInfo({ order_no, stadium_id });
+                this.getRefundTimes(order_no);
+            }, 1200));
+        },
+        async getRefundTimes(order_no){
+            try{
+                let _refundRes = await this.$store.dispatch('getOrderRefundList', order_no);
+                let _refundLs = _refundRes?.data?.data?.list || [];
+				this.refundList = _refundLs;
+            }catch(err){
+                console.warn('getRefundTimes err', err);
+            }
+        },
+        getOrderInfo({ order_no, stadium_id }){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.timeOrderDetail,
+                data: { order_no, stadium_id },
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                util.hideLoad()
+                this.orderInfo = res || {}
+            })
+            .catch(util.hideLoad)
+        },
+        zh_pay_type: util.order_pay_type_txt,
+		completeBtn(){
+			this.$emit('completeBtn');
+		},
+		
+		timeEndBtn(){
+            let { orderInfo } = this;
+            this.getOrderInfo({
+                order_no: orderInfo?.order_no || '',
+                stadium_id: orderInfo?.stadium_id || ''
+            })
+		},
+        // 计时订单-完结订单
+        completeBtn(){
+            let { orderInfo } = this
+            util.showModal({
+                title: '提示',
+                content: '是否确认完结订单？',
+                showCancel: true,
+                success: modalRes=>{
+                    if(modalRes.confirm)this.timeOrderComplete({
+                        brand_id: orderInfo?.brand_id || '',
+                        order_no: orderInfo?.order_no || '',
+                        stadium_id: orderInfo?.stadium_id || ''
+                    })
+                }
+            })
+        },
+        //计时订单完结 请求
+        timeOrderComplete({ brand_id, order_no, stadium_id }){
+            util.showLoad();
+            server.get({
+                url: ORDER_API.timeOrderComplete,  //计时订单完结
+                data: { brand_id, order_no },
+                failMsg: '请求失败！'
+            })
+            .then(res=>{
+                util.hideLoad();
+                util.showNone('操作成功！');
+
+                setTimeout(_=>{
+                    this.getOrderInfo({ order_no, stadium_id });
+                    util.previousPageFunction({
+                        fnName: 'refreshList',
+                        query: { isLoad: false},
+                    });
+                }, 1200)
+            })
+            .catch(util.hideLoad)
+        }
+	}
+}
+</script>
+
+<style lang="scss" >
+.timing-details{
+	margin-bottom: 24rpx;
+	.td-head{
+		margin: 24rpx 24rpx 0rpx;
+		padding: 30rpx;
+		background-color: #FFF;
+		border-radius: 10rpx 10rpx 0px 0px;
+		.th-store{
+			padding-bottom: 26rpx;
+			margin-bottom: 18rpx;
+			border-bottom: 2rpx solid #D8D8D8;
+			display: flex;
+			justify-content: flex-start;
+			>image{
+				flex-shrink: 0;
+				width: 40rpx;
+				height: 40rpx;
+			}
+			>view{
+				flex-grow: 1;
+				margin-left: 14rpx;
+				color: #333333;
+				font-size: 28rpx;
+			}
+		}
+		.th-line{
+			margin-top: 8rpx;
+			@include ctf(space-between);
+			>view{
+				line-height: 40rpx;
+				font-size: 28rpx;
+				&:first-child{
+					color: #9A9A9D;
+					>text{
+						color: #333333;
+					}
+				}
+				&:nth-child(2){
+					>text{
+						color: #9A9A9D;
+					}
+					.tl-active{
+						color: $mColor;
+					}
+				}
+			}
+		}
+	}
+	.td-box{
+		margin: 24rpx 24rpx 0rpx;
+		padding: 30rpx;
+		background-color: #FFF;
+		border-radius: 10rpx;
+		.tb-title{
+			color: #9A9A9D;
+			font-size: 28rpx;
+			margin-bottom: 20rpx;
+		}
+		.tb-line{
+			>view{
+				line-height: 52rpx;
+				font-size: 28rpx;
+				color: #9A9A9D;
+				>text{
+					color: #333333;
+				}
+			}
+			
+		}
+		.tb-section{
+			margin-top: 30rpx;
+			border-top: 2rpx solid #D8D8D8;
+			.ts-line{
+				margin-top: 26rpx;
+				@include ctf(space-between);
+				>view{
+					color: #333333;
+					&:first-child{
+						font-size: 28rpx;
+					}
+					&:nth-child(2){
+						font-size: 24rpx;
+						margin-right: 8rpx;
+					}
+				}
+			}
+			.ts-total{
+				margin-top: 22rpx;
+				@include ctf(flex-end);
+				>view{
+					color: #333333;
+					font-size: 28rpx;
+					>text{
+						color: #FF873D;
+						&:first-child{
+							font-size: 28rpx;
+						}
+						&:nth-child(2){
+							font-size: 36rpx;
+							margin-right: 8rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+	.td-btn{
+		height: 112rpx;
+		margin: 80rpx 24rpx 10upx;
+		border-radius: 10rpx;
+		background-color: $mColor;
+		color: #FFF;
+		font-size: 32rpx;
+		line-height: 112rpx;
+		text-align: center;
+	}
+	
+}
+</style>
diff --git a/src/subpackage/order/pages/ym_card/detail/detail.vue b/src/subpackage/order/pages/ym_card/detail/detail.vue
index 13ffcbe..204b2d6 100644
--- a/src/subpackage/order/pages/ym_card/detail/detail.vue
+++ b/src/subpackage/order/pages/ym_card/detail/detail.vue
@@ -53,7 +53,30 @@
                 <p-line :keyname="'创建途径'" :value="orderInfo.source || '-'" ></p-line>
             </view>
 
+            <!-- 退款列表 -->
+            <view v-for="(e, i) in refundList" :key="i">
+                <order-refund-info
+                    :refund_price="e.amount || 0"
+                    :refund_no="e.refund_no || '-'"
+                    :refund_time="e.refund_time || '-'"
+                    :refund_reason="e.reason || '-'"
+                    :nameKey="i + 1"
+                ></order-refund-info>
+            </view>
         </view>
+
+        
+
+        <order-refund-fixed
+			:pay_amount="_extension.refundable_amount || 0"
+			:refund_amount="0"
+			:refund_times="(refundList&&refundList.length) || 0"
+            @click:button="refunndBtn"
+		></order-refund-fixed>
+
+        <order-refund-modal
+			ref="orderRefundModal"
+		></order-refund-modal>
     </view>
 </template>
 
@@ -67,6 +90,9 @@
 import a_line from '../../../../../components/order_list/a_line/a_line.vue';
 import s_line from '../../../components/s_line/s_line.vue';
 import p_line from '../../../components/p_line/p_line.vue';
+import orderRefundFixed from '@/components/order_refund/fixed.vue'
+import orderRefundModal from '@/components/order_refund/modal.vue';
+import orderRefundInfo from '@/components/order_refund/info.vue';
 import util from '../../../../../utils/util';
 import { ORDER_API } from '../../../js/api';
 import server from '../../../js/server';
@@ -75,7 +101,14 @@ export default {
         'a-line': a_line,
         's-line': s_line,
         'p-line': p_line,
-        
+        'order-refund-fixed': orderRefundFixed,
+        'order-refund-modal': orderRefundModal,
+        'order-refund-info': orderRefundInfo
+    },
+    computed: {
+        _extension(){
+            return this.orderInfo?.extension || {}
+        }
     },
     data(){
         return {
@@ -84,16 +117,79 @@ export default {
                 extension: {}
             },
             optionsQuery: {},
+            refundInfo: {},
+            refundList: []
         }
     },
     onLoad(options){
         this.getCardInfo({
             id: options.id,
             card_no: options.card_no
-        });
-        this.optionsQuery = options || {};
+        })
+        .then(res=>{
+            if(res.order_no)this.getRefundInfo(res.order_no || '');
+        })
+        this.optionsQuery = options;
     },
     methods: {
+        refunndBtn(){
+            let { orderInfo, _extension, refundList } = this;
+            this.$refs.orderRefundModal.show({
+                stadium_name: _extension?.name ?? '',
+                order_no: orderInfo?.order_no ?? '',
+                mobile: orderInfo?.mobile ?? '',
+                refundable_amount:  +_extension?.refundable_amount || 0,
+                refundable_integral:  0,
+                refund_times: refundList?.length || 0,
+                confirm: e => {
+                    this.userMonthlyCardRefundFixed({
+                        order_no: orderInfo?.order_no || '',
+                        amount: +e.refund_amount || 0,
+                        integral: +e.refund_integral || 0
+                    });
+                }
+            });
+        },
+        async getRefundInfo(order_no){
+            try{
+                let _refundRes = await this.$store.dispatch('getOrderRefundList', order_no);
+                let _ls = _refundRes?.data?.data?.list || [];
+                this.refundList = _ls;
+                console.log('refundRes', _refundRes);
+            }catch(err){
+                console.warn('getRefundTimes err', err);
+            }
+        },
+        // 年月卡订单-订单退款
+        userMonthlyCardRefundFixed({ order_no = '', amount = 0, integral = 0 }){
+            util.showLoad();
+            server.post({
+                url: ORDER_API.userMonthlyCardRefundFixed,
+                data: { order_no, amount, deduction_integral: integral },
+                isDefaultGet: false
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '操作成功！');
+                }else{
+                    util.showNone(res.data.message || '操作失败！');
+                }
+            })
+            .catch(util.hideLoad)
+            .finally(_=>
+                setTimeout(_=>{
+                    this.getCardInfo({
+                        id: this.optionsQuery?.id,
+                        card_no: this.optionsQuery?.card_no
+                    
+                    })
+                    .then(res=>{
+                        if(res.order_no)this.getRefundInfo(res.order_no || '');
+                    })
+                }, 1200)
+            );
+        },
         previewImg(url){
             if(!url)return
             uni.previewImage({ urls: [ url ] });
@@ -166,14 +262,18 @@ export default {
         },
         getCardInfo({id, card_no}){
             util.showLoad();
-            server.get({
+            return server.get({
                 url: ORDER_API.userMonthlyCardInfo,
                 data: { id, card_no },
                 failMsg: '加载失败！'
             })
             .then(res=>{
                 util.hideLoad();
-                this.orderInfo = res || {};
+                return this.orderInfo = res || {};
+            })
+            .catch(err=>{
+                util.hideLoad();
+                console.warn('getCardInfo err', err);
             })
         },
         toRecord(){
@@ -187,7 +287,7 @@ export default {
 <style lang="scss">
     @import '~style/public.scss';
     .ym-card-info{
-        
+        @include isPd;
     }
     .yci-box{
         padding: 30upx;
diff --git a/src/utils/util.js b/src/utils/util.js
index 553db8c..c38a21b 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -186,7 +186,7 @@ function previousPageFunction({fnName,query}){
 }
 
 // 获取节点信息
-function getNodeMes(selector,_this=null){
+export function getNodeMes(selector,_this=null){
 	return new Promise(rs=>{
     let query = _this ? uni.createSelectorQuery().in(_this) : uni.createSelectorQuery();
 		query.select(selector).boundingClientRect(res=>{
@@ -395,7 +395,7 @@ function order_pay_type_txt(status = ''){
       0: '微信支付',
       1: '支付宝支付',
       2: '会员卡支付',
-      3: '商家主动',
+      3: '商家主动结束计费',
   };
   return _obj[status] || '-'
 }