|  | @@ -1,12 +1,13 @@
 | 
											
												
													
														|  |  <template>
 |  |  <template>
 | 
											
												
													
														|  |  	<view class="">
 |  |  	<view class="">
 | 
											
												
													
														|  | -		<u-navbar
 |  | 
 | 
											
												
													
														|  | 
 |  | +		<view class="" :style="{height: navHeight+'px' }"></view>
 | 
											
												
													
														|  | 
 |  | +	<!-- 	<u-navbar
 | 
											
												
													
														|  |  			:placeholder="true"
 |  |  			:placeholder="true"
 | 
											
												
													
														|  |  			title="产品"
 |  |  			title="产品"
 | 
											
												
													
														|  |  			:autoBack="true"
 |  |  			:autoBack="true"
 | 
											
												
													
														|  |  			 :safeAreaInsetTop="true"
 |  |  			 :safeAreaInsetTop="true"
 | 
											
												
													
														|  |  		>
 |  |  		>
 | 
											
												
													
														|  | -		</u-navbar>
 |  | 
 | 
											
												
													
														|  | 
 |  | +		</u-navbar> -->
 | 
											
												
													
														|  |  		<view class="search-wrap">
 |  |  		<view class="search-wrap">
 | 
											
												
													
														|  |  			<u-search
 |  |  			<u-search
 | 
											
												
													
														|  |  				placeholder="请输入搜索的商品" 
 |  |  				placeholder="请输入搜索的商品" 
 | 
											
										
											
												
													
														|  | @@ -89,19 +90,20 @@
 | 
											
												
													
														|  |  				</mescroll-body>
 |  |  				</mescroll-body>
 | 
											
												
													
														|  |  			</view>
 |  |  			</view>
 | 
											
												
													
														|  |  		</view>
 |  |  		</view>
 | 
											
												
													
														|  | -		<!-- <tabbar :tabbarIndexProps="Number(1)" /> -->
 |  | 
 | 
											
												
													
														|  | 
 |  | +		<tabbar :tabbarIndexProps="Number(1)" />
 | 
											
												
													
														|  |  		<cartfixed ref="cartfixed" @getCartList="getCartList" />
 |  |  		<cartfixed ref="cartfixed" @getCartList="getCartList" />
 | 
											
												
													
														|  |  		<u-toast ref="uToast"></u-toast>
 |  |  		<u-toast ref="uToast"></u-toast>
 | 
											
												
													
														|  |  	</view>
 |  |  	</view>
 | 
											
												
													
														|  |  </template>
 |  |  </template>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  <script>
 |  |  <script>
 | 
											
												
													
														|  | 
 |  | +	import { systemInfo } from "@/mixin.js";
 | 
											
												
													
														|  |  	// 引入mescroll-mixins.js
 |  |  	// 引入mescroll-mixins.js
 | 
											
												
													
														|  |  	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 |  |  	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 | 
											
												
													
														|  |  	import tabbar from "../components/tabbar.vue";
 |  |  	import tabbar from "../components/tabbar.vue";
 | 
											
												
													
														|  |  	import cartfixed from "../components/cartfixed.vue"
 |  |  	import cartfixed from "../components/cartfixed.vue"
 | 
											
												
													
														|  |  	export default {
 |  |  	export default {
 | 
											
												
													
														|  | -		mixins: [MescrollMixin], // 使用mixin
 |  | 
 | 
											
												
													
														|  | 
 |  | +		mixins: [MescrollMixin,systemInfo], // 使用mixin
 | 
											
												
													
														|  |  		components: {
 |  |  		components: {
 | 
											
												
													
														|  |  			tabbar,
 |  |  			tabbar,
 | 
											
												
													
														|  |  			cartfixed
 |  |  			cartfixed
 | 
											
										
											
												
													
														|  | @@ -154,6 +156,9 @@
 | 
											
												
													
														|  |  				immediate:false
 |  |  				immediate:false
 | 
											
												
													
														|  |  			}
 |  |  			}
 | 
											
												
													
														|  |  		},
 |  |  		},
 | 
											
												
													
														|  | 
 |  | +		onLoad() {
 | 
											
												
													
														|  | 
 |  | +			this.getSystemInfo();
 | 
											
												
													
														|  | 
 |  | +		},
 | 
											
												
													
														|  |  		onShow() {
 |  |  		onShow() {
 | 
											
												
													
														|  |  			this.getgoodsTypeTree();
 |  |  			this.getgoodsTypeTree();
 | 
											
												
													
														|  |  			this.$refs.cartfixed.getCartList();
 |  |  			this.$refs.cartfixed.getCartList();
 |