del modal source && vtest 1.1.37

src/components/site/order_modal/order_modal.vue

@@ -39,7 +39,7 @@
 				</view>
 			</view>
 
-			<block v-if="orderInfo.type == 'take_up_venue'" >
+			<block v-if="orderInfo.type == 'take_up_venue' || orderInfo.type == 'take_up_venue_bboc'" >
 				<view class="om-info-line">
 					<view class="oil-view">是否联动开灯：</view>
 					<view class="oil-view">
@@ -61,7 +61,7 @@
 				<view class="om-info-line">
 					<view class="oil-view">操作人：</view>
 					<view class="oil-view">
-						<view class="ov-view">{{ orderInfo.operator || ' ' }}</view>
+						<view class="ov-view">{{ orderInfo.operator || '-' }}</view>
 					</view>
 				</view>
 			</block>
@@ -126,9 +126,13 @@
 			</view>
 			<!-- 挂账 -->
 			<view class="om-btns" v-if="orderInfo.type == 'take_up_venue_bboc'">
-				<view class="ob-view" @click="toShare" v-if="orderInfo.is_take_up_can_share">分享给朋友</view>
-				<view class="ob-view red" @click="cancelOccupy">取消占用</view>
+				<block v-if="!isOverTime">
+					<view class="ob-view" @click="toShare" v-if="orderInfo.is_take_up_can_share">分享给朋友</view>
+					<view class="ob-view red" @click="cancelOccupy">取消占用</view>
+				</block>
+				
 				<view class="ob-view red2" v-if="!orderInfo.take_up_use_bboc_pay" @click="toCollections">收款</view>
+				<view class="ob-view gray" v-else>已收款</view>
 			</view>
 		</view>
 	</view>
@@ -151,6 +155,14 @@ export default {
 			let { orderInfo } = this;
 
 			return orderInfo.type == 'mini_program' || orderInfo.type == 'course_venue' || orderInfo.type == 'fixed_venue' 
+		},
+		isOverTime(){
+			let { orderInfo } = this;
+			let endTime = orderInfo?.stadium_order?.end_time || new Date().getTime();
+			let nowTimeStamp = new Date().getTime();
+			let endTimeStamp = new Date(endTime.toString().replace(/\-/g, '/')).getTime();
+			return nowTimeStamp > endTimeStamp;
+			
 		}
 	},
 	props: {
@@ -487,6 +499,10 @@ export default {
 					border-color: #EA5061;
 					color: #fff;
 				}
+				&.gray{
+					border-color: #D8D8D8;
+					color: #D8D8D8;
+				}
 			}
 		}
     }