From db2aef8968bf5a8e75c9d46e074d1dd4060712d7 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: Fri, 11 Nov 2022 10:49:56 +0800
Subject: [PATCH] up

---
 pages/activity/book.vue | 472 ++++++++++++++++++++--------------------
 pages/activity/info.vue |   7 +
 pages/index/index.vue   |  39 ++--
 pages/mine/index.vue    |   2 +-
 pages/visit/book.vue    |  10 +-
 5 files changed, 276 insertions(+), 254 deletions(-)

diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 2f37f04..f07a67f 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -15,7 +15,8 @@
 
 					<view class="activityBox-row">
 						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{timeFormat(list.start_time,"yyyy年MM月DD日")}} {{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">
@@ -59,35 +60,38 @@
 								v-if="type=='user'">每单限购{{list.person_max_count}}张，同一身份证当天限购1张</text>
 							<text class="box-tips-txt"
 								v-if="type=='team'">{{list.team_min_count}}人以上可团体预约，一个团体最多{{list.team_max_count}}人</text>
-						</view>
-						<view>
-							<view class="box-card-content">
-								<view class="book-box" style="padding-top: 20rpx;">
-									<view class="book-box-card">
-										<view class="book-box-title">
-											常用人
-										</view>
-										<view class="">
-											<view class="book-box-timerow">
-												<block v-for="(item,index) in common_user" :key="index">
-													<view class="book-box-row-timeitem" :class="{'book-box-row-timeitem-on':item.checked}" @click="handleCommonUser(item)">
-														<view v-if="item.checked" class="book-box-row-timeitem-status">
-															<u-icon name="checkmark" color="#fff" size="20rpx" v-if="item.checked">
-															</u-icon>
-														</view>
-														<view>{{item.name}}</view>
-														<!-- <view>{{item.datef}}</view> -->
-													</view>
-												</block>
-											</view>
-							
-										</view>
-									</view>
-									
-								</view>
-							
-							</view>
-							
+						</view>
+						<view>
+							<view class="box-card-content">
+								<view class="book-box" style="padding-top: 20rpx;">
+									<view class="book-box-card">
+										<view class="book-box-title">
+											常用人
+										</view>
+										<view class="">
+											<view class="book-box-timerow">
+												<block v-for="(item,index) in common_user" :key="index">
+													<view class="book-box-row-timeitem"
+														:class="{'book-box-row-timeitem-on':item.checked}"
+														@click="handleCommonUser(item)">
+														<view v-if="item.checked" class="book-box-row-timeitem-status">
+															<u-icon name="checkmark" color="#fff" size="20rpx"
+																v-if="item.checked">
+															</u-icon>
+														</view>
+														<view>{{item.name}}</view>
+														<!-- <view>{{item.datef}}</view> -->
+													</view>
+												</block>
+											</view>
+
+										</view>
+									</view>
+
+								</view>
+
+							</view>
+
 						</view>
 						<view class="box-visitor">
 							<block v-for="(item,index) in form.details_list" :key="index">
@@ -149,9 +153,10 @@
 									<u-radio width="50%" activeColor="#EF9525" v-for="(item, index) in cardType"
 										:key="index" :name=item.id :label="item.name">
 									</u-radio>
-								</u-radio-group> -->
-								<u-cell-group :border="false">
-									<u-cell @click="showCards" :title="card_type_names" :isLink="true" arrow-direction="down"></u-cell>
+								</u-radio-group> -->
+								<u-cell-group :border="false">
+									<u-cell @click="showCards" :title="card_type_names" :isLink="true"
+										arrow-direction="down"></u-cell>
 								</u-cell-group>
 							</u-form-item>
 							<u-form-item label="证件号码" labelWidth="80" prop="from.idcard" required>
@@ -184,9 +189,10 @@
 								<u-radio width="50%" activeColor="#EF9525" v-for="(item, index) in cardType"
 									:key="index" :name=item.id :label="item.name">
 								</u-radio>
-							</u-radio-group> -->
-							<u-cell-group :border="false">
-								<u-cell @click="showCard" :title="card_type_name" :isLink="true" arrow-direction="down"></u-cell>
+							</u-radio-group> -->
+							<u-cell-group :border="false">
+								<u-cell @click="showCard" :title="card_type_name" :isLink="true" arrow-direction="down">
+								</u-cell>
 							</u-cell-group>
 						</u-form-item>
 						<u-form-item label="证件号码" labelWidth="80" prop="formUser.idcard" ref="formUser.idcard" required>
@@ -199,11 +205,13 @@
 					<u-button type="primary" @click="handleAddUser">确定</u-button>
 				</view>
 			</view>
-		</u-popup>
-		
-		<u-picker :show="cardshow" @cancel="cancel" @confirm="confirmCard" ref="uPicker" :columns="cardLists" keyName="label"></u-picker>
-		<u-picker :show="cardshows" @cancel="cancels"  @confirm="confirmCards" ref="uPickers" :columns="cardLists" keyName="label"></u-picker>
-		
+		</u-popup>
+
+		<u-picker :show="cardshow" @cancel="cancel" @confirm="confirmCard" ref="uPicker" :columns="cardLists"
+			keyName="label"></u-picker>
+		<u-picker :show="cardshows" @cancel="cancels" @confirm="confirmCards" ref="uPickers" :columns="cardLists"
+			keyName="label"></u-picker>
+
 
 		<u-popup :show="showInfo" mode="bottom" @close="closeInfo" :round="10" closeable>
 			<view class="mpopup">
@@ -216,18 +224,20 @@
 					<u-button type="primary" @click="closeInfo">知道了</u-button>
 				</view>
 			</view>
-		</u-popup>
-		
-		
-		<u-popup :show="successshow" customStyle="width:600rpx;height:300rpx;text-align:center" :round="10" mode="center" width="600rpx" height="150rpx">
-			<view class="">
-				<view class="successBox">
-					<!-- <u-icon name="checkmark-circle" size="90" color="#EF9525"></u-icon> -->
-					<view class="h3">您已经预约成功</view>
-					<view class="p">即将跳转到活动预约 {{time}} s</view>
-				</view>
-				<view class="pinkBtn" @click="goHome">返回首页</view>
-			</view>
+		</u-popup>
+
+
+		<u-popup :show="successshow" customStyle="width:600rpx;height:300rpx;text-align:center" :round="10"
+			mode="center" width="600rpx" height="150rpx">
+			<view class="">
+				<view class="successBox">
+					<!-- <u-icon name="checkmark-circle" size="90" color="#EF9525"></u-icon> -->
+					<view class="h3">您已经预约成功</view>
+					<view class="p">报名成功后具体事宜请联系：金老师，65166121</view>
+					<view class="p">即将跳转到活动预约 {{time}} s</view>
+				</view>
+				<view class="pinkBtn" @click="goHome">返回首页</view>
+			</view>
 		</u-popup>
 	</view>
 </template>
@@ -235,15 +245,15 @@
 <script>
 	export default {
 		data() {
-			return {
-				successshow: false,
-				time:3,
+			return {
+				successshow: false,
+				time: 3,
 				showAdd: false,
 				isEdit: false,
 				isEditIndex: 0,
 				showInfo: false,
-				list: {},
-				common_user:[],
+				list: {},
+				common_user: [],
 				form: {
 					unit: "",
 					leader: "",
@@ -261,9 +271,9 @@
 					mobile: ""
 				},
 				type: "user",
-				rules: [],
-				t:null,
-				timer:null,
+				rules: [],
+				t: null,
+				timer: null,
 				details_rule: {
 					name: [{
 						required: true,
@@ -281,32 +291,34 @@
 						trigger: 'change'
 					}]
 				},
-				cardshow:false,
-				cardshows:false,
-				card_type_name:"身份证",
-				card_type_names:"身份证",
-				// cardLists:['身份证','港澳台居民居住证','护照','台胞证','港澳证'],
-				cardLists: [[{
-						value: 1,
-						label: '身份证'
-					},
-					{
-						value: 2,
-						label: '港澳台居民居住证'
-					},
-					{
-						value: 3,
-						label: '护照'
-					},
-					{
-						value: 4,
-						label: '台胞证'
-					},
-					{
-						value: 5,
-						label: '港澳证'
-					}
-				]],
+				cardshow: false,
+				cardshows: false,
+				card_type_name: "身份证",
+				card_type_names: "身份证",
+				// cardLists:['身份证','港澳台居民居住证','护照','台胞证','港澳证'],
+				cardLists: [
+					[{
+							value: 1,
+							label: '身份证'
+						},
+						{
+							value: 2,
+							label: '港澳台居民居住证'
+						},
+						{
+							value: 3,
+							label: '护照'
+						},
+						{
+							value: 4,
+							label: '台胞证'
+						},
+						{
+							value: 5,
+							label: '港澳证'
+						}
+					]
+				],
 				currentNotice: {},
 				notice: [{
 					title: "预约须知",
@@ -325,29 +337,29 @@
 			wx.getStorage({
 				key: 'activityinfo',
 				success(res) {
-					that.list = res.data;
-					if(that.form.type==2){
-						that.form.total = 1
-					}else if(that.form.type==1){
-						that.form.total = res.data.team_min_count;
+					that.list = res.data;
+					if (that.form.type == 2) {
+						that.form.total = 1
+					} else if (that.form.type == 1) {
+						that.form.total = res.data.team_min_count;
 					}
 				}
 			})
-			
+
 
 			that.util.getUserInfo(function(r) {
 				that.form.mobile = r.mobile;
-			}, true);
+			}, true);
 			that.loadCommonUser()
-		},
-		onHide() {
-			clearInterval(this.t)
-			clearTimeout(this.timer)
-		},
-		
-		onUnload() {
-			clearInterval(this.t)
-			clearTimeout(this.timer)
+		},
+		onHide() {
+			clearInterval(this.t)
+			clearTimeout(this.timer)
+		},
+
+		onUnload() {
+			clearInterval(this.t)
+			clearTimeout(this.timer)
 		},
 		methods: {
 			getHm(val) {
@@ -357,64 +369,64 @@
 			},
 			timeFormat(val, format) {
 				return this.$moment(val).format(format)
-			},
-			confirmCards(e){
-				this.card_type_names = e.value[0].label
-				this.form.card_type =  e.value[0].value
-				this.cardshows = false
-			},
-			cancel(){
-				this.cardshow = false
-			},
-			cancels(){
-				this.cardshows = false
-			},
-			showCards(){
-				this.cardshows = true
-			},
-			confirmCard(e){
-				this.card_type_name = e.value[0].label
-				this.formUser.card_type =  e.value[0].value
-				this.cardshow = false
-			},
-			showCard(){
-				this.cardshow = true
-			},
-			goHome(){
-				uni.switchTab({
-					url: "/pages/index/index"
-				})
-			},
-			loadCommonUser(){
-				var that = this;
-				this.util.request({
-					api: '/api/mobile/activity/address-book',
-					utilSuccess: function(res) {
-						
-						for(var m of res){
-							m.checked = false
-						}
-						that.common_user = res;
-					},
-					utilFail: function(res) {
-				
-					}
-				})
-			},
-			handleCommonUser(obj){
-				obj.checked = !obj.checked
-				if(obj.checked){
-					this.form.details_list.push(obj)
-				}else{
-					for(var i=0;i<this.form.details_list.length;i++){
-						if(this.form.details_list[i].name==obj.name){
-							this.form.details_list.splice(i,1)
-						}
-					}
-					
-				}
-				
-				
+			},
+			confirmCards(e) {
+				this.card_type_names = e.value[0].label
+				this.form.card_type = e.value[0].value
+				this.cardshows = false
+			},
+			cancel() {
+				this.cardshow = false
+			},
+			cancels() {
+				this.cardshows = false
+			},
+			showCards() {
+				this.cardshows = true
+			},
+			confirmCard(e) {
+				this.card_type_name = e.value[0].label
+				this.formUser.card_type = e.value[0].value
+				this.cardshow = false
+			},
+			showCard() {
+				this.cardshow = true
+			},
+			goHome() {
+				uni.switchTab({
+					url: "/pages/index/index"
+				})
+			},
+			loadCommonUser() {
+				var that = this;
+				this.util.request({
+					api: '/api/mobile/activity/address-book',
+					utilSuccess: function(res) {
+
+						for (var m of res) {
+							m.checked = false
+						}
+						that.common_user = res;
+					},
+					utilFail: function(res) {
+
+					}
+				})
+			},
+			handleCommonUser(obj) {
+				obj.checked = !obj.checked
+				if (obj.checked) {
+					this.form.details_list.push(obj)
+				} else {
+					for (var i = 0; i < this.form.details_list.length; i++) {
+						if (this.form.details_list[i].name == obj.name) {
+							this.form.details_list.splice(i, 1)
+						}
+					}
+
+				}
+
+
 			},
 			tothere() {
 				uni.openLocation({
@@ -438,11 +450,11 @@
 				}
 				this.showAdd = true
 			},
-			delUser(index) {
-				for(var i=0;i<this.common_user.length;i++){
-					if(this.form.details_list[index].name == this.common_user[i].name){
-						this.common_user[i].checked = false;
-					}
+			delUser(index) {
+				for (var i = 0; i < this.common_user.length; i++) {
+					if (this.form.details_list[index].name == this.common_user[i].name) {
+						this.common_user[i].checked = false;
+					}
 				}
 				this.form.details_list.splice(index, 1);
 			},
@@ -612,29 +624,19 @@
 					api: '/api/mobile/activity/order',
 					method: "POST",
 					data: this.form,
-					utilSuccess: function(res) {
-						that.successshow = true;
-						 that.t = setInterval(function() {
-							if (that.time > 0)
-								that.time = that.time - 1;
-						}, 1000)
-						that.timer = setTimeout(function() {
-							uni.redirectTo({
-								url: '/pages/order/activityorder'
-							})
-							clearInterval(that.t);
-							clearTimeout(that.timer)
+					utilSuccess: function(res) {
+						that.successshow = true;
+						that.t = setInterval(function() {
+							if (that.time > 0)
+								that.time = that.time - 1;
+						}, 1000)
+						that.timer = setTimeout(function() {
+							uni.redirectTo({
+								url: '/pages/order/activityorder'
+							})
+							clearInterval(that.t);
+							clearTimeout(that.timer)
 						}, 3000)
-						// uni.showToast({
-						// 	icon: "none",
-						// 	title: "下单成功",
-						// 	complete() {
-								
-						// 		uni.redirectTo({
-						// 			url: "/pages/success/success?from=activity&id=" + res.id
-						// 		})
-						// 	}
-						// })
 					},
 					utilFail: function(res) {
 						uni.showToast({
@@ -754,52 +756,56 @@
 		color: #351C1B;
 		padding-bottom: 25rpx;
 		border-bottom: 2px solid #F7F6F4;
-	}
-	.book-box-row-timeitem {
-		width:160rpx;
-		text-align: center;
 	}
 
-	.box-card-content {}
-	.successBox {
-	
-		.iconfont {
-			color: #00CCB9;
-			font-size: 180rpx;
-		}
-	
-		.h3 {
-			font-size: 40rpx;
-			font-weight: 500;
-			color: #333333;
-			margin-top: 40rpx;
-		}
-	
-		.p {
-			font-size: 28rpx;
-			font-weight: 400;
-			color: #333333;
-			margin-top: 24rpx;
-		}
-	
-	}
-	
-	.pinkBtn {
-	    width: 50%;
-	    background-image: linear-gradient(45deg, #EF9525 0%, #EF9525 100%);
-	    border-radius: 44rpx;
-	    font-size: 30rpx;
-	    font-weight: 500;
-	    color: #FFFFFF;
-	    text-align: center;
-	    line-height: 70rpx;
-		margin:30rpx auto;
-	}
-	.u-radio-group{
-		flex-wrap: wrap;
-	}
-	.u-radio-group .u-radio{
-		margin-bottom:10rpx;
-		margin-right:10rpx
+	.book-box-row-timeitem {
+		width: 160rpx;
+		text-align: center;
+	}
+
+	.box-card-content {}
+
+	.successBox {
+
+		.iconfont {
+			color: #00CCB9;
+			font-size: 180rpx;
+		}
+
+		.h3 {
+			font-size: 40rpx;
+			font-weight: 500;
+			color: #333333;
+			margin-top: 40rpx;
+		}
+
+		.p {
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #333333;
+			margin-top: 24rpx;
+		}
+
+	}
+
+	.pinkBtn {
+		width: 50%;
+		background-image: linear-gradient(45deg, #EF9525 0%, #EF9525 100%);
+		border-radius: 44rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 70rpx;
+		margin: 30rpx auto;
+	}
+
+	.u-radio-group {
+		flex-wrap: wrap;
+	}
+
+	.u-radio-group .u-radio {
+		margin-bottom: 10rpx;
+		margin-right: 10rpx
 	}
 </style>
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 15d979f..83e4376 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -100,6 +100,13 @@
 			})
 
 		},
+		onShareAppMessage() {
+			return {
+				title: this.list.name,
+				path: "/pages/activity/info?id=" + this.list.id,
+				imageUrl: this.list.cover_upload.url
+			}
+		},
 		methods: {
 			timeFormat(val, format) {
 				return this.$moment(val).format(format)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 74ed40e..d3aecd1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -88,13 +88,17 @@
 									<view class="book-box-row-timeitem-txt">{{item.start_time+'-'+item.end_time}}</view>
 
 									<block v-if="item.isCanbook">
-										<view class="book-box-row-timeitem-txt" v-if="item.remain_count>0">
+										<view class="book-box-row-timeitem-txt"
+											v-if="item.remain_count>0&&item.remain_count<=50">
 											{{item.remain_count}}张
 										</view>
+										<view class="book-box-row-timeitem-txt" v-else-if="item.remain_count>50">
+											余票充足
+										</view>
 										<view class="book-box-row-timeitem-txt" v-else>已约满</view>
 									</block>
 									<block v-else>
-										<view class="book-box-row-timeitem-txt" >不可预约</view>
+										<view class="book-box-row-timeitem-txt">不可预约</view>
 									</block>
 								</view>
 							</view>
@@ -126,9 +130,9 @@
 				<view class="mpopup-title">
 					{{currentNotice.name}}
 				</view>
-				<view class="mpopup-content" style="padding: 40rpx 20rpx;">
-					<view v-html="currentNotice.content" style="font-size:32rpx;line-height: 50rpx;text-indent: 2em;">
-						
+				<view class="mpopup-content" style="padding: 40rpx 20rpx;">
+					<view v-html="currentNotice.content" style="font-size:32rpx;line-height: 50rpx;text-indent: 2em;">
+
 					</view>
 					<!-- <rich-text :nodes="currentNotice.content"></rich-text> -->
 				</view>
@@ -176,9 +180,9 @@
 				showAuthorization: false,
 				openType: 1
 			}
-		},
-		onShareAppMessage() {
-			return this.util.shareInfo
+		},
+		onShareAppMessage() {
+			return this.util.shareInfo
 		},
 		onLoad() {
 			this.loadInfo();
@@ -187,9 +191,9 @@
 		onReady() {
 			// 如果需要兼容微信小程序的话，需要用此写法
 			this.$refs.calendar.setFormatter(this.formatter)
-		},
-		onHide() {
-		   this.showBook=false;	
+		},
+		onHide() {
+			this.showBook = false;
 		},
 		methods: {
 			closePhone() {
@@ -296,7 +300,7 @@
 				this.$forceUpdate();
 			},
 			handleSelectTime(index) {
-				var mod = this.currentDate.rules[index];
+				var mod = this.currentDate.rules[index];
 				if (!mod.isCanbook) {
 					return false
 				}
@@ -322,8 +326,8 @@
 				})
 			},
 			openInfo(e) {
-				this.currentNotice = this.listNotice[e];
-				this.currentNotice.content = this.currentNotice.content.replace(/\<p/gi,"<p class='richp'");
+				this.currentNotice = this.listNotice[e];
+				this.currentNotice.content = this.currentNotice.content.replace(/\<p/gi, "<p class='richp'");
 				this.showInfo = true;
 			},
 			closeInfo() {
@@ -583,8 +587,9 @@
 	.footer-img {
 		width: 421rpx;
 		height: 364rpx;
-	}
-	.richp{
-		margin-bottom:10rpx;
+	}
+
+	.richp {
+		margin-bottom: 10rpx;
 	}
 </style>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index c5bce5b..019bf70 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -25,7 +25,7 @@
 			</view>
 			<view class="mine-box-nav">
 				<view class="mine-box-navtitle">
-					我的预约
+					预约记录
 				</view>
 				<view class="mine-box-navlist">
 					<view class="mine-box-navitem" @click="toPage(1)">
diff --git a/pages/visit/book.vue b/pages/visit/book.vue
index c47c2d1..000f39d 100644
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@@ -54,9 +54,13 @@
 										<u-icon name="checkmark" color="#fff" size="20rpx"></u-icon>
 									</view>
 									<view class="book-box-row-timeitem-txt">{{item.start_time+'-'+item.end_time}}</view>
-									<view class="book-box-row-timeitem-txt" v-if="item.remain_count>0">
+									<view class="book-box-row-timeitem-txt"
+										v-if="item.remain_count>0&&item.remain_count<=50">
 										{{item.remain_count}}张
 									</view>
+									<view class="book-box-row-timeitem-txt" v-else-if="item.remain_count>50">
+										余票充足
+									</view>
 									<view class="book-box-row-timeitem-txt" v-else>已约满</view>
 								</view>
 							</view>
@@ -744,9 +748,9 @@
 										var jsonlist = JSON.parse(res.data);
 
 										console.log(jsonlist);
-										_that.form.total = jsonlist.length||6;
+										_that.form.total = jsonlist.length || 6;
 										for (var m of jsonlist) {
-										console.log("m",m);
+											console.log("m", m);
 											_that.form.details_list.push({
 												name: m.name,
 												idcard: m.idcard,