Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

components/nomore.vue

@@ -0,0 +1,88 @@
+<template>
+	<view class="page-box">
+		<view class="centre">
+			<image :class="size" src="../static/images/nomore.svg" mode="widthFix"></image>
+			<view class="tips">
+				{{content}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			content: {
+				type: String,
+				default: '因你看见，才有底线'
+			},
+			size:{
+				type: String,
+				default: 'medium'
+			},
+			isShow:{
+				type:Boolean,
+				default:true
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-box {
+		position: relative;
+		left: 0;
+		// height: 50vh;
+		
+	}
+
+	.centre {
+		padding: 80rpx 0;
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: space-around;
+		align-items: center;
+		image {
+			// width: 387rpx;
+			// height: 341rpx;
+			display: block;
+			width:200rpx;
+			height: auto;
+			// margin-bottom: 20rpx;
+			// border: 1px dotted #000000;
+		}
+		.large{
+			width:200rpx;
+			height: auto;
+		}
+		.medium{
+			width:100rpx;
+			height: auto;
+		}
+		.mini{
+			width:50rpx;
+			height: auto;
+		}
+
+		.tips {
+			margin-top: 30rpx;
+			color: rgba(200, 201, 204, 1);
+			font-family: DM Sans;
+			font-size: 28rpx;
+			font-weight: 400;
+			line-height: 20px;
+			letter-spacing: 0px;
+			text-align: center;
+		}
+
+		.btn {
+			margin: 80rpx auto;
+			width: 600rpx;
+			border-radius: 32rpx;
+			line-height: 90rpx;
+			color: #ffffff;
+			font-size: 34rpx;
+			background: #5074FF;
+		}
+	}
+</style>

pages/index/index.vue

@@ -226,6 +226,7 @@
 										</view>
 									</view>
 								</view>
+								<nomore v-if="page >= totlo"></nomore>
 							</scroll-view>
 						</view>
 					</view>
@@ -446,6 +447,7 @@
 								</view>
 							</view>
 						</view>
+						<nomore v-if="page >= totlo"></nomore>
 						</scroll-view>
 						<empty :isShow="false" v-if="datasList.length == 0" />
 					</view>
@@ -467,12 +469,14 @@
 
 <script>
 import empty from '../../components/empty.vue'
+import nomore from '../../components/nomore.vue'
 import permision from '@/js_sdk/wa-permission/permission.js'
 import companyListIndex from '@/components/companyListIndex/companyListIndex.vue'
 export default {
 	components: {
 		empty,
-		companyListIndex
+		companyListIndex,
+		nomore
 	},
 	data() {
 		return {
@@ -1347,6 +1351,7 @@ export default {
 					} else {
 						this.datasList = [...this.datasList, ...list]
 					}
+					this.totlo = res.data.pages
 				} else {
 					// 5. 异常情况：仅第一页清空列表，避免翻页时丢失数据
 					if (this.page === 1) {
@@ -1822,7 +1827,10 @@ export default {
 .page-container {
 	display: flex;
 	flex-direction: column;
-	height: calc(100vh - 50px);
+	height:100vh;
+	//#ifdef H5
+	height: calc(100vh - var(--window-bottom));
+	//#endif
 	// margin-bottom: 60px;
 }
 
@@ -2395,8 +2403,6 @@ page {
 	width: 100%;
 	flex: 1;
 	overflow: auto;
-	margin-bottom: 10rpx;
-
 	.gwList-box {
 		width: 710rpx;
 		height: 100%;

pages/my/index.vue

@@ -2032,8 +2032,9 @@ page {
 	box-sizing: border-box;
 
 	image {
-		width: 32rpx;
-		height: 32rpx;
+		width: 50rpx;
+		height: 50rpx;
+		padding:9rpx;
 	}
 }