预约8-16

pages/index/index.vue

@@ -161,7 +161,7 @@
 				<view class="an_box_2">
 					<view class="an_t" @click="goToPages('line')">
 						<view class="an_t_1">活动风采</view>
-						<view class="an_t_2">珍贵的历史见证</view>
+						<view class="an_t_2">酿造美好生活</view>
 					</view>
 					<view class="amt_30">
 						<view class="anx_ls_1" @click="goToDetail('line', lineOneList.guid)" v-if="lineOneList">

pages/sirendingzhi/sirendingzhilist/sirendingzhilist.vue

@@ -499,10 +499,11 @@ export default {
 <style>
 /* @import url("../../../static/css/common.css");*/
 @import url('sirendingzhilist.css');
+.v-page{padding-bottom: 100rpx;}
 .list-item {
 	padding: 0;
 }
-.sort-page{ top:200rpx}
+.sort-page{ top:200rpx;}
 .filter-page {
 	top: 200rpx;
 }

sunPackIndex/scenic/scenicdetial/scenicdetial.vue

@@ -108,12 +108,12 @@
 					<text class="cot_adr">{{ info.businesstime }}</text>
 				</view>
 				<view class="secdt_adr dly_flex">
-					<!-- <image class="adr_pic" src="../../../static/images/icon_time.png"></image> -->
+					 <image class="adr_pic" src="../../../static/images/icn_ticket.png"></image>
 					<text class="w_adr">门票价格</text>
 					<text class="cot_adr">免费</text>
 				</view>
 				<view class="secdt_adr dly_flex">
-					<!-- <image class="adr_pic" src="../../../static/images/icon_time.png"></image> -->
+					<image class="adr_pic" src="../../../static/images/icon_max.png"></image> 
 					<text class="w_adr">最大承载量</text>
 					<text class="cot_adr">1000人</text>
 				</view>

sunPackIndex/scenic/subscribe/yuyue/yue_detail_js.vue

@@ -99,8 +99,15 @@
 							appointmentSlot: res.data.appointmentSlot,
 							appointmentCount: res.data.appointmentCount
 						}
-						this.detailist = res.data.list
-						const result = this.detailist.filter(item => {
+						let newDate= res.data.list
+						let newDate0 = newDate.filter(item =>{
+						    return item.reservationPerson == '0';
+						})
+						let newDate1 = newDate.filter(item =>{
+						    return item.reservationPerson == '1';
+						})
+						this.detailist =[...newDate0,...newDate1]
+						const result = newDate.filter(item => {
 							return item.writeOff == '0'
 						})
 						if (result.length > 0) {
@@ -108,6 +115,9 @@
 						} else {
 							this.state = false
 						}
+						
+						
+						console.log(newDate)
 					}
 				})
 			},
@@ -155,10 +165,12 @@
 			},
 			//时间格式化
 			formatTime(time) {
-				var hour = time.split(":")[0];
-				var min = time.split(":")[1];
-				var second = time.split(":")[0];
-				return hour + ':' + min+ ':' + second;
+				console.log(time.split(" "))
+				var year=time.split(" ")[0]
+				var newData=time.split(" ")[1]
+				var time = newData.split(".")[0];
+				
+				return year + ' ' + time
 			},
 			//获取取消预约
 			cancelReserve: function() {

sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue

@@ -50,11 +50,12 @@
 					<view class="yue_xuzhi">
 						<radio-group>
 							<label class="radio">
-								<radio  :checked="agreementChecked"  @click="radioChange"/>
+								<radio :checked="agreementChecked" @click="radioChange" />
 							</label>我已阅读并同意<text @click="gotoNotice">《游客须知》</text>
-							</radio-group>
+						</radio-group>
 					</view>
-					<button form-type="submit" class="yue_fm_btn yue_e_bun" :class="agreementChecked?'active':''" @click="saveReserve('dynamicForm')">
+					<button form-type="submit" class="yue_fm_btn yue_e_bun" :class="agreementChecked?'active':''"
+						@click="saveReserve('dynamicForm')">
 						预约
 					</button>
 				</view>
@@ -70,6 +71,7 @@
 		data() {
 			return {
 				agreementChecked: false,
+
 				formData: {
 					name: {},
 					phone: {},
@@ -151,12 +153,13 @@
 		},
 		methods: {
 			radioChange: function(e) {
-				this.agreementChecked = !this.agreementChecked;},
-				gotoNotice: function() {
-					uni.navigateTo({
-						url: '/sunPackIndex/scenic/subscribe/yuyue/yue-notice'
-					});
-				},
+				this.agreementChecked = !this.agreementChecked;
+			},
+			gotoNotice: function() {
+				uni.navigateTo({
+					url: '/sunPackIndex/scenic/subscribe/yuyue/yue-notice'
+				});
+			},
 			//创建预约人
 			addReserve: function() {
 				if (this.isAdd) {
@@ -184,21 +187,33 @@
 			},
 			//预约按钮
 			saveReserve: function() {
-				if(this.agreementChecked){
-					let errList = []
-					const promises = this.dynamicLists.map((item, index) => {
-						return new Promise(resolve => {
-							this.$refs.form[index].validate(err => {
-								errList = err
-							})
+				let that = this
+				let promise = new Promise(function(resolve, reject) {
+					let state = []
+					that.dynamicLists.map((item, index) => {
+						that.$refs.form[index].validate().then(res => {
+							state[index] = '1'
+						}).catch(err => {
+							state[index] = '0'
 						})
 					})
-					setTimeout(() => {
-						if (errList == null) {
-							this.postReserve()
+					setTimeout(function() {
+						let reState = state.every((item, index) => {
+							return item == '1'
+						})
+						if (reState) {
+							resolve('success');
 						}
-					}, 500)
-				}
+					}, 1000);
+
+				})
+
+				promise.then(value => {
+					if (value == 'success') {
+						this.postReserve()
+					}
+				})
+
 			},
 			//传输数据
 			postReserve: function() {
@@ -298,4 +313,4 @@
 	.yue_xuzhi text {
 		color: rgb(22, 119, 255);
 	}
-</style>
+</style>