diff --git a/src/components/order_list/mall/mall.vue b/src/components/order_list/mall/mall.vue
index 58bebb9..63ac4c5 100644
--- a/src/components/order_list/mall/mall.vue
+++ b/src/components/order_list/mall/mall.vue
@@ -4,6 +4,7 @@
             <view class="mn-view">订单号：{{ orderInfo.order_no || '-' }}</view>
             <view class="mn-view">{{ orderInfo.status_text || '-' }}</view>
         </view>
+        <view class="mo-after-sale-tip" v-if="orderInfo.after_sale_status == 1">{{ orderInfo.after_sale_status_text || '-' }}</view>
         <view class="mo-goods-ls">
             <view class="rgi-single" v-if="orderInfo.goods_nums == 1">
                 <image class="rs-img"  mode="aspectFill"  :src="orderInfo.goods[0].product_imgs"></image>
@@ -22,8 +23,8 @@
         </view>
         <view class="mo-total"><text class="mt-txt">商品金额合计：</text>¥{{ orderInfo.pay_amount || 0 }}</view>
         <view class="mo-bot">
-            <view class="mb-express">配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
-            <view class="mb-btn" v-if="orderInfo.status == 1" @click.stop="toSendOut">发货</view>
+            <view class="mb-express" v-if="orderInfo.status == 2">配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
+            <view class="mb-btn" v-if="orderInfo.status == 1&&orderInfo.after_sale_status == 0" @click.stop="toSendOut">发货</view>
         </view>
     </view>
 </template>
@@ -87,6 +88,13 @@ export default {
             }
         }
     }
+    .mo-after-sale-tip{
+        margin-bottom: 12upx;
+        text-align: right;
+        font-size: 24upx;
+        line-height: 30upx;
+        color: #EA5061;
+    }
     .mo-goods-ls{
         margin-bottom: 30upx;
         @include centerFlex(space-between);
diff --git a/src/components/organize_order/organize_order.vue b/src/components/organize_order/organize_order.vue
index b57dfd6..74dda8a 100644
--- a/src/components/organize_order/organize_order.vue
+++ b/src/components/organize_order/organize_order.vue
@@ -30,12 +30,12 @@
 			         <view class="rv-view">{{orderInfo.label.Date+" "+ orderInfo.label.StartTime+" "+orderInfo.label.EndTime || '-'}}</view>
 			    </view>
 			</view>
-			<view class="rs-line" v-if="orderInfo.status=='End'">
+			<!-- <view class="rs-line" v-if="orderInfo.status=='End'">
 			    <view class="rl-view">未发放：</view>
 			    <view class="rl-view">
 			         <view class="rv-view">{{orderInfo.un_amount_already_amount || '-'}}</view>
 			    </view>
-			</view>
+			</view> -->
 
 		</view>
 		<view class="ro-bot" v-if="orderInfo.original_order&&orderInfo.original_order.pay_status != 0">
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index aa31185..4f20478 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -575,7 +575,7 @@
             case 14:  // 赛事订单列表 订单状态  全部1,2,4   1=进行中   4=已退款     2=已完成 
                 return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'}];
             case 2:  // 商城订单  0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款  商家助手全部1,2,3,6  // 测试： 不显示全部分组
-                return [ {id: 'assistant_all', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 5, name: '申请售后中'}, {id: 6, name: '退款完成'}];
+                return [ {id: 'assistant_all', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 'after_sale', name: '申请售后中'}, {id: 6, name: '退款完成'}];
             case 8:  // 租售柜 筛选的 status   全部 1,2,4    租用中 1   已完成 2    已退款4    已购买5
                 return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}];
             default:  
diff --git a/src/subpackage/device/components/order/organize_detail/organize_detail.vue b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
index b67e180..d6aea86 100644
--- a/src/subpackage/device/components/order/organize_detail/organize_detail.vue
+++ b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
@@ -44,8 +44,8 @@
 							</view>
 						</view>
 					</view>
-					<view>订场费用：<text>￥{{ orderInfo.original_order.pay_amount || 0 }}</text></view>
 				</block>
+				<view v-if="orderInfo.type == 'Main'">订场费用：<text>￥{{ orderInfo.original_order.pay_amount || 0 }}</text></view>
 				
 				<view v-if="orderInfo.type == 'Sub'">报名费用：<text>￥{{orderInfo.price_per_person || 0}}</text></view>
 			</view>
@@ -268,7 +268,6 @@ export default {
 				flex-shrink: 0;
 				width: 40rpx;
 				height: 40rpx;
-				background-color: skyblue;
 				
 			}
 			>view{
diff --git a/src/subpackage/order/pages/mall/detail/detail.vue b/src/subpackage/order/pages/mall/detail/detail.vue
index fa67c1f..ad7aeff 100644
--- a/src/subpackage/order/pages/mall/detail/detail.vue
+++ b/src/subpackage/order/pages/mall/detail/detail.vue
@@ -82,7 +82,7 @@
                 <view class="mfb-btns">
                     <!-- <view>查看退款</view> -->
                     <view v-if="isRufundBtn" class="red" @click="toRefund">主动退款</view>
-                    <view v-if="orderInfo.status == 1" class="green" @click="toSendOut">发货</view>
+                    <view v-if="orderInfo.status == 1&&orderInfo.after_sale_status == 0" class="green" @click="toSendOut">发货</view>
                 </view>
             </view>
         </view>
@@ -100,7 +100,7 @@ export default {
     computed: {
         isRufundBtn(){
             let { orderInfo } = this;
-            return (orderInfo.status!=6 || orderInfo.status != 7)
+            return (orderInfo.status!=6 || orderInfo.status != 7) && orderInfo.after_sale_status == 0
         },
         order_custom(){
             let { orderInfo } = this;