Merge branch 'master' of http://git.ringzle.com:3000/htcwl/hotelHomestayWx

pagesHouse/HotelMerchandise/index.vue

@@ -35,7 +35,7 @@
 			<view class="contented" :style="{'height':(h-mt)+'px'}" v-show="areaShow">
 				<view class="custom_popup">
 					<view class="types">
-						<view class="pricequjian" style="height: 240rpx;">
+						<view class="pricequjian" >
 							<view class="jiage" v-for="(item, index) in list1" :key="index"
 								@click="clickareaShow(item, index)">
 								<view class="contentpeice">
@@ -793,18 +793,18 @@
 
 		.types {
 			width: 100%;
-			padding: 30rpx 30rpx 56rpx;
+			padding: 20rpx 30rpx;
 			box-sizing: border-box;
 			background: #FFFFFF;
 
 			.pricequjian {
 				width: 100%;
-
+min-height: 240rpx;
 				.contentpeice {
 					width: 100%;
 					display: flex;
 					justify-content: space-between;
-					margin: 15rpx 0;
+					margin: 30rpx 0;
 
 					.title {
 						font-weight: Regular;

pagesHouse/Verification/details.vue

@@ -165,9 +165,12 @@
 				}).then(res => {
 					console.log(res.data);
 					if (res.data.code == 0) {
-						uni.navigateTo({
-							url: '/pagesHouse/Mine/ordersList/outcome'
-						})
+						this.$showToast('核销成功');
+						setTimeout(()=>{
+							uni.navigateTo({
+								url: '/pagesHouse/Mine/ordersList/outcome'
+							})
+						},1500)
 					}
 				})
 			},

pagesHouse/Verification/detailsewm.vue

@@ -198,14 +198,16 @@ this.hexiaodata=JSON.parse(option.list);
 				this.$api.post('/api/merchant/food/scenic/merchant/order/verifyOrderQrCode?writeOffCode',this.hexiaodata)
 					.then(res => {
 						if (res.data.code == 0) {
-							uni.showToast({
-							title:'核销成功',
-							icon:'none',
-							duration:1500
-							})
-							uni.navigateBack({
-								delta: 1
-							});
+							this.$showToast('核销成功');
+							uni.setStorageSync('list',{totalPrice:this.getalllist.realityPay});
+							setTimeout(()=>{
+								uni.navigateTo({
+									url: '/pagesHouse/Mine/ordersList/outcome'
+								})
+							},1500)
+							// uni.navigateBack({
+							// 	delta: 1
+							// });
 						} else {
 							this.$showToast(res.data.msg)
 						}