no message

components/en-utils/en-nav/en-nav.vue

@@ -7,10 +7,11 @@
 		  'align-items-center':!customNav,
 		  }" :style="[{'height': customBarH + 'px', 'padding-top': statusBarH + 'px','background':bgckgroundBox}]">
 				<view @tap="goBack" v-if="leftShow">
-					<uni-icons type="left" :color="leftColor" size="18"  ></uni-icons>
+					<uni-icons type="left" :color="leftColor" size="18"></uni-icons>
 					<!-- <image class="toLeft" src="@/static/img/toLeft.png" mode=""></image> -->
 				</view>
-				<view v-if="!customNav" :style="[{'color': titleColor}]" class="title-text text-overflow-ellipsis-one">{{title}}</view>
+				<view v-if="!customNav" :style="[{'color': titleColor}]" class="title-text text-overflow-ellipsis-one">
+					{{title}}</view>
 				<view v-else class="">
 					<slot name="custom"></slot>
 				</view>
@@ -61,6 +62,10 @@
 				type: Boolean,
 				default: true
 			},
+			letTap: {
+				type: Boolean,
+				default: false
+			},
 			bgckgroundBox: {
 				type: String,
 				default: '#fff'
@@ -107,7 +112,11 @@
 				if (!this.leftShow) {
 					return;
 				}
-				tools.leftClick()
+				if (this.letTap) {
+					this.$emit('goBack')
+				} else {
+					tools.leftClick()
+				}
 			}
 		},
 		created() {

pages-buy/group-pay-page.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="flex-common-css iPhone-bottom flex-common-css box-border-box">
-		<Nav title="订单支付" bgckgroundBox='transparent'></Nav>
+		<Nav title="订单支付" bgckgroundBox='transparent' :letTap='true' @goBack='goBack'></Nav>
 		<scroll-view :scroll-y="true" class="box-sizing-border scroll-view-css plr-30 box-border-box">
 			<view class="fs-28 fc-121212 mb-20 p-t-40 text-align-center">
 				剩余时间 {{time.m}}:{{time.s}}
@@ -137,6 +137,14 @@
 					this.butType = 1
 				}
 			},
+			goBack() {
+				uni.setStorageSync('orderPayType', 3)
+				setTimeout(() => {
+					uni.switchTab({
+						url: "/pages/order/index"
+					})
+				}, 1000)
+			},
 			paySure() {
 				if (this.butType === 2) {
 					return

pages-takeout/pay-page.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="flex-common-css iPhone-bottom flex-common-css box-border-box">
-		<Nav title="订单支付" bgckgroundBox='transparent'></Nav>
+		<Nav title="订单支付" bgckgroundBox='transparent' :letTap='true' @goBack='goBack'></Nav>
 		<scroll-view :scroll-y="true" class="box-sizing-border scroll-view-css plr-30 box-border-box">
 			<view class="fs-28 fc-121212 mb-20 p-t-40 text-align-center">
 				剩余时间 {{time.m}}:{{time.s}}
@@ -98,6 +98,14 @@
 					}
 				})
 			},
+			goBack() {
+				setTimeout(() => {
+					uni.switchTab({
+						url: '/pages/order/index'
+					})
+					uni.setStorageSync('orderPayType', 1)
+				}, 1000)
+			},
 			setCountDown(sTime) {
 				let end = new Date(sTime).getTime();
 				let now = new Date().getTime();

pages-takeout/pick-up-pay.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="flex-common-css iPhone-bottom flex-common-css box-border-box">
-		<Nav title="订单支付" bgckgroundBox='transparent'></Nav>
+		<Nav title="订单支付" bgckgroundBox='transparent' :letTap='true' @goBack='goBack'></Nav>
 		<scroll-view :scroll-y="true" class="box-sizing-border scroll-view-css plr-30 box-border-box">
 			<view class="fs-28 fc-121212 mb-20 p-t-40 text-align-center">
 				剩余时间 {{time.m}}:{{time.s}}
@@ -96,6 +96,15 @@
 					}
 				})
 			},
+			goBack() {
+				setTimeout(() => {
+					uni.switchTab({
+						url: "/pages/order/index"
+					})
+					uni.setStorageSync('orderPayType', 2)
+					uni.setStorageSync('saveData', false)
+				}, 1000)
+			},
 			setCountDown(sTime) {
 				let end = new Date(sTime).getTime();
 				let now = new Date().getTime();

pages-takeout/run-errands-mod/pay-page.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="flex-common-css iPhone-bottom flex-common-css box-border-box" v-if="isShow">
-		<Nav title="订单支付" bgckgroundBox='transparent'></Nav>
+		<Nav title="订单支付" bgckgroundBox='transparent' :letTap='true' @goBack='goBack'></Nav>
 		<scroll-view :scroll-y="true" class="box-sizing-border scroll-view-css plr-30 box-border-box">
 			<view class="fs-28 fc-121212 mb-20 p-t-40 text-align-center">
 				剩余时间 {{time.m}}:{{time.s}}
@@ -149,6 +149,14 @@
 					this.butType = 1
 				}
 			},
+			goBack() {
+				setTimeout(() => {
+					uni.switchTab({
+						url: '/pages/order/index'
+					})
+					uni.setStorageSync('orderPayType', 4)
+				}, 1000)
+			},
 			paySure() {
 				if (this.butType === 2) {
 					return

pages/index/index.vue

@@ -441,7 +441,8 @@
 					content: '' // 公告通知
 				},
 				popType: true,
-				shopHomeData: {}
+				shopHomeData: {},
+				typeListTop: ''
 			}
 		},
 
@@ -523,7 +524,7 @@
 				this.bgckgroundSearch = '';
 				// this.bgckgroundType = '';
 			}
-			if (e.scrollTop > 1180) {
+			if (e.scrollTop > (this.BarH+this.typeListTop+this.indexSearchHeight+45)) {
 				this.bgckgroundType = '#fff';
 			} else {
 				this.bgckgroundType = 'transparent';
@@ -645,8 +646,16 @@
 					// data是选中元素的大小及位置信息
 					if (data) {
 						// 元素的高度
+						// console.log(data, 'e.scrollTop');
 						this.indexSearchHeight = data.height;
-						console.log('元素的高度:', this.indexSearchHeight);
+						// console.log('元素的高度:', this.indexSearchHeight);
+					}
+				}).exec(); // 执行选择器查询
+				query.select('.type-list-box').boundingClientRect(data => {
+					// data是选中元素的大小及位置信息
+					if (data) {
+						// 元素的高度
+						this.typeListTop = data.top + data.height
 					}
 				}).exec(); // 执行选择器查询
 			},