From deefa54bdabd329b2e7a7e68c0ee4db9cd4fda4d 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: Wed, 10 Aug 2022 21:19:26 +0800
Subject: [PATCH] up

---
 pages/activity/book.vue  | 11 +++++++----
 pages/activity/index.vue | 30 ++++++++++++++++++------------
 pages/activity/info.vue  |  7 +++++--
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 719b61a..2f37f04 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -15,7 +15,7 @@
 
 					<view class="activityBox-row">
 						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{getHm(list.start_time)}}-{{getHm(list.end_time)}}</text>
+						<text>活动时间：{{timeFormat(list.start_time,"yyyy年MM月DD日")}} {{getHm(list.start_time)}}-{{getHm(list.end_time)}}</text>
 
 					</view>
 					<!-- <view class="activityBox-row">
@@ -45,10 +45,10 @@
 			<u--form labelPosition="left" :model="form" :rules="rules" ref="form">
 				<view class="box-card">
 					<view class="box-card-title">
-						参与人数
+						参观人数
 					</view>
 					<view class="box-card-content">
-						<u-form-item label="参观人数" labelWidth="120" prop="total" ref="total">
+						<u-form-item label="人数" labelWidth="120" prop="total" ref="total">
 							<u-number-box slot="right" v-model="form.total" inputWidth="44" color="#EF9525"
 								bgColor="#FCF6E3" :min="(type=='user'?1:list.team_min_count)"
 								:max="(type=='user'?list.person_max_count:list.team_max_count)" class="plus">
@@ -352,8 +352,11 @@
 		methods: {
 			getHm(val) {
 				if (val) {
-					return this.$moment(val).format("HH:mm:ss")
+					return this.$moment(val).format("HH:mm")
 				} else return "";
+			},
+			timeFormat(val, format) {
+				return this.$moment(val).format(format)
 			},
 			confirmCards(e){
 				this.card_type_names = e.value[0].label
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index ab0a14d..e44af05 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -20,22 +20,25 @@
 					<view class="activityBox-row flex-row justify-between">
 						<view class="tag tag_green activityBox_btn">
 							<text>{{isUnde(item.type_name)}}</text>
-						</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>
+						</view>
+						<block v-if="item.orders_count==item.total">
+							<view class="tag" v-if="item.isCanBook">
+								<text>已约满</text>
+							</view>
+							<view class="tag" v-else>
+								<text>{{item.rate_name}}</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">
 						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{getHm(item.start_time)}}-{{getHm(item.end_time)}}</text>
+						<text>活动时间：{{timeFormat(item.start_time,"yyyy年MM月DD日")}} {{getHm(item.start_time)}}-{{getHm(item.end_time)}}</text>
 
 					</view>
 					<!-- <view class="activityBox-row">
@@ -139,8 +142,11 @@
 			},
 			getHm(val) {
 				if (val) {
-					return this.$moment(val).format("HH:mm:ss")
+					return this.$moment(val).format("HH:mm")
 				} else return "";
+			},
+			timeFormat(val, format) {
+				return this.$moment(val).format(format)
 			}
 		}
 	}
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 0912f03..d25cbe3 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -24,7 +24,7 @@
 
 					<view class="activityBox-row">
 						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{getHm(list.start_time)}}-{{getHm(list.end_time)}}</text>
+						<text>活动时间：{{timeFormat(list.start_time,"yyyy年MM月DD日")}} {{getHm(list.start_time)}}-{{getHm(list.end_time)}}</text>
 
 					</view>
 					<!-- <view class="activityBox-row">
@@ -100,6 +100,9 @@
 
 		},
 		methods: {
+			timeFormat(val, format) {
+				return this.$moment(val).format(format)
+			},
 			tothere() {
 				uni.openLocation({
 					latitude: parseFloat(this.list.latitude),
@@ -153,7 +156,7 @@
 			},
 			getHm(val) {
 				if (val) {
-					return this.$moment(val).format("HH:mm:ss")
+					return this.$moment(val).format("HH:mm")
 				} else return "";
 			}
 		}