首页适配

components/ls-swiper/ls-swiper.vue

@@ -132,7 +132,7 @@
 	.wrap {
 	.wrap {
 		position: relative;
 		position: relative;
 		border-radius: 30rpx;
 		border-radius: 30rpx;
-		margin: -60rpx 30rpx 0 30rpx;
+		margin: 62px 30rpx 0 30rpx;
 		background-color: #3B73FE;
 		background-color: #3B73FE;
 
 
 		.swiper {
 		.swiper {

components/navbar/navbar.vue

@@ -11,7 +11,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<view :style="{height:statusBarHeight + titlebarHeight +'px'}"></view>
+		<!-- <view :style="{height:statusBarHeight + titlebarHeight +'px'}"></view> -->
 	</view>
 	</view>
 
 
 </template>
 </template>
@@ -50,7 +50,7 @@
 			console.log(menu.bottom);
 			console.log(menu.bottom);
 			this.screenWidth = menu.left
 			this.screenWidth = menu.left
 			//#endif
 			//#endif
-			console.log(this.titlebarHeight);
+			console.log("标题高度", this.titlebarHeight);
 		},
 		},
 		methods: {
 		methods: {
 			// 返回app列表页
 			// 返回app列表页

pages/gallery/gallery.vue

@@ -36,7 +36,9 @@
 			</view>
 			</view>
 		</view>
 		</view>
 		<view class="app-content" :style="{'top':statusBarHeight+250+'px'}">
 		<view class="app-content" :style="{'top':statusBarHeight+250+'px'}">
+			<view class="menu-content">
 				<v-tabs :tabs="tabs" :scroll="true" :value="current" @change="tabChange"></v-tabs>
 				<v-tabs :tabs="tabs" :scroll="true" :value="current" @change="tabChange"></v-tabs>
+			</view>
 			<view class="app-group-content">
 			<view class="app-group-content">
 				<view class="app-group-item" v-for="(item,index) in getMenuApps()" :key="index">
 				<view class="app-group-item" v-for="(item,index) in getMenuApps()" :key="index">
 					<view class="title">{{item.group_name||"其他"}}</view>
 					<view class="title">{{item.group_name||"其他"}}</view>
@@ -430,7 +432,7 @@
 <style lang="scss">
 <style lang="scss">
 	.content {
 	.content {
 		display: flex;
 		display: flex;
-		padding-bottom: 130rpx;
+		margin-bottom: 130rpx;
 		flex-direction: column;
 		flex-direction: column;
 
 
 		.header-content {
 		.header-content {
@@ -593,6 +595,10 @@
 			display: flex;
 			display: flex;
 			flex-direction: column;
 			flex-direction: column;
 
 
+			.menu-content {
+				display: flex;
+			}
+
 			.app-group-content {
 			.app-group-content {
 				display: flex;
 				display: flex;
 				flex-direction: column;
 				flex-direction: column;

pages/index/index.vue

@@ -4,7 +4,7 @@
 			<image src="../../static/home-head.png" class="header-image"></image>
 			<image src="../../static/home-head.png" class="header-image"></image>
 			<navbar :title="title" :showBack="false"></navbar>
 			<navbar :title="title" :showBack="false"></navbar>
 			<!-- 天气 -->
 			<!-- 天气 -->
-			<view class="weather-content" :style="{top:statusBarHeight+36+'px'}"
+			<view class="weather-content" :style="{top:statusBarHeight+36*heightScale+'px'}"
 				v-if="isCompShow('onepoint-weather','ydt-tq')">
 				v-if="isCompShow('onepoint-weather','ydt-tq')">
 				<view class="temp-content" @click="toLinkOther">
 				<view class="temp-content" @click="toLinkOther">
 					<view class="temp">{{weather.temp}}℃</view>
 					<view class="temp">{{weather.temp}}℃</view>
@@ -20,10 +20,8 @@
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-			<!-- <view class="banner-content" :style="{top:statusBarHeight+116+'px'}"> -->
 			<ls-swiper :list="banners" imgKey="coverImg" :loop="true" :dots='true' :autoplay='true' height='142'
 			<ls-swiper :list="banners" imgKey="coverImg" :loop="true" :dots='true' :autoplay='true' height='142'
 				@clickItem="clickItem()" v-if="isCompShow('OnePointBanner','ydt-lbt')" />
 				@clickItem="clickItem()" v-if="isCompShow('OnePointBanner','ydt-lbt')" />
-			<!-- </view> -->
 		</view>
 		</view>
 		<!-- 工地头条 -->
 		<!-- 工地头条 -->
 		<view class=" top-new-content" @click="toLinkNew" v-if="isCompShow('OnePointNews','ydt-gdtt')&&role!='VISITOR'">
 		<view class=" top-new-content" @click="toLinkNew" v-if="isCompShow('OnePointNews','ydt-gdtt')&&role!='VISITOR'">
@@ -157,7 +155,8 @@
 				project: {},
 				project: {},
 				project_id: "",
 				project_id: "",
 				changeRecords: [],
 				changeRecords: [],
-				menus: []
+				menus: [],
+				heightScale: 1
 			}
 			}
 		},
 		},
 		onLoad() {
 		onLoad() {
@@ -168,6 +167,7 @@
 			} else {
 			} else {
 				this.statusBarHeight = info.statusBarHeight
 				this.statusBarHeight = info.statusBarHeight
 			}
 			}
+			this.heightScale = info.windowHeight / 730
 			let nowDate = new Date()
 			let nowDate = new Date()
 			this.nowTime =
 			this.nowTime =
 				`${nowDate.getFullYear()}/${this.add0(nowDate.getMonth()+1)}/${this.add0(nowDate.getDate())}`
 				`${nowDate.getFullYear()}/${this.add0(nowDate.getMonth()+1)}/${this.add0(nowDate.getDate())}`
@@ -848,7 +848,7 @@
 				display: flex;
 				display: flex;
 				top: 120rpx;
 				top: 120rpx;
 				align-items: center;
 				align-items: center;
-				padding: 32rpx 32rpx;
+				padding: 32rpx 32rpx 0 32rpx;
 				left: 0;
 				left: 0;
 				flex-direction: row;
 				flex-direction: row;