From fd1e3f5686de3b1ceb95546df578bbe6f5408990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Sat, 23 Jul 2022 10:10:06 +0800
Subject: [PATCH] up

---
 pages/activity/index.vue          | 15 +++++++++++----
 pages/activity/info.vue           |  2 +-
 pages/order/activityorder.vue     | 12 ++++++++----
 pages/order/activityorderinfo.vue |  4 ++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 4ebc2f9..ab0a14d 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -20,10 +20,17 @@
 					<view class="activityBox-row flex-row justify-between">
 						<view class="tag tag_green activityBox_btn">
 							<text>{{isUnde(item.type_name)}}</text>
-						</view>
-						<view class="tag" :class="{activityBox_btn:item.isCanBook}">
-							<text>{{item.isCanBook?"立即报名":"不可报名"}}</text>
-						</view>
+						</view>
+						<block v-if="item.orders_count==item.total">
+							<view class="tag">
+								<text>已约满</text>
+							</view>
+						</block>
+						<block v-else>
+							<view class="tag" :class="{activityBox_btn:item.isCanBook}">
+								<text>{{item.isCanBook?"立即报名":"不可报名"}}</text>
+							</view>
+						</block>
 					</view>
 
 					<view class="activityBox-row">
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 09821ac..0912f03 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -63,7 +63,7 @@
 					<rich-text  style="text-indent: 2em;font-size: 28rpx;" :nodes="list.content"></rich-text>
 				</view>
 			</view>
-			<view class="infofooter flex-row" v-if="list.isCanBook">
+			<view class="infofooter flex-row" v-if="list.isCanBook&&list.total!=list.orders_total">
 				<view style="margin-right: 14rpx;flex: 1;">
 					<u-button type="primary" @click="tobook('team')">团体预约</u-button>
 				</view>
diff --git a/pages/order/activityorder.vue b/pages/order/activityorder.vue
index 23bcc13..dd4b729 100644
--- a/pages/order/activityorder.vue
+++ b/pages/order/activityorder.vue
@@ -9,14 +9,18 @@
 			<block v-for="(item,index) in listOrder" :key="index">
 				<view class="orderBox" :class="{'cancelBox':item.status==0}" @click="toinfo(item.id)">
 					<view class="orderBoxTitle flex-row">
-						<text class="orderBoxTitleTxt">{{item.type==1?"团队预约":"个人预约"}}</text>
-						<view
-							:class="item.status!=1?'cancelStatus orderBoxStatus':'orderBoxStatus'">{{item.status_name}}
+						<text class="orderBoxTitleTxt">{{item.type==1?"团队预约":"个人预约"}}</text>
+						<view :class="item.status!=1?'cancelStatus orderBoxStatus':'orderBoxStatus'">
+							{{item.status_name}}
 						</view>
 					</view>
 
 					<view class="orderBoxInfo flex-col">
 						<view class="orderBoxInfoRow flex-row">
+							<text class="iconfont icon-youkexuzhi"></text>
+							<text class="orderBoxInfoRowTxt">活动名称：{{item.activity.name||"加载中..."}}</text>
+						</view>
+						<view class="orderBoxInfoRow flex-row" style="margin-top: 20rpx;">
 							<text class="iconfont icon-youkexuzhi"></text>
 							<text class="orderBoxInfoRowTxt">
 								订单信息：{{timeFormat(item.activity.created_at, 'MM月DD日')}}{{getHm(item.activity.start_time)}}-{{getHm(item.activity.end_time)}}丨{{item.total}}位观众</text>
@@ -138,7 +142,7 @@
 			},
 			getHm(val) {
 				if (val) {
-					return this.$moment(val).format("hh:MM")
+					return this.$moment(val).format("HH:mm")
 				} else return "";
 			},
 			timeFormat(val, format) {
diff --git a/pages/order/activityorderinfo.vue b/pages/order/activityorderinfo.vue
index 481db4a..970ca09 100644
--- a/pages/order/activityorderinfo.vue
+++ b/pages/order/activityorderinfo.vue
@@ -66,10 +66,10 @@
 							<view class="imgsname">
 								<text class="orderBoxTitleTxt">{{item.name}}</text>
 								<text class="orderBoxTitleTxt" style="font-size: 28rpx;" v-if="item.is_open==1">
-									可使用身份证
+									可凭身份证参加活动
 								</text>
 								<text style="font-size: 28rpx;" class="orderBoxTitleTxt" v-if="item.is_open==0">
-									不可使用身份证
+									可凭二维码参加活动
 								</text>
 							</view>