Merge branch 'fix/scroll-bug' into 'main_dev'

fix: 修复下拉刷新组件的出现问题

See merge request yunteng/thingskit-app!128

@@ -73,7 +73,7 @@
 		data() {
 		data() {
 			return {
 			return {
 				handleText: ['ACTIVE_UNACK', 'CLEARED_UNACK'],
 				handleText: ['ACTIVE_UNACK', 'CLEARED_UNACK'],
-				clearText: ['ACTIVE_UNACK', 'ACTIVE_ACK'],
+				clearText: [ 'ACTIVE_ACK'],
 				hasColor: ['告警级别：', '告警状态：'],
 				hasColor: ['告警级别：', '告警状态：'],
 				alarmSeverity,
 				alarmSeverity,
 				alarmStatus,
 				alarmStatus,

@@ -9,6 +9,8 @@
 				@clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></query-item>
 				@clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></query-item>
 			<query-item :filterList="typeStatus" title="设备类型"
 			<query-item :filterList="typeStatus" title="设备类型"
 				@clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></query-item>
 				@clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></query-item>
+			<query-item :filterList="collectStatus" title="设备是否收藏"
+				@clickTag="currentIndex => handleClickTag(currentIndex, collectStatus)"></query-item>
 			<view class="button-group">
 			<view class="button-group">
 				<view>
 				<view>
 					<u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="重置"
 					<u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="重置"
@@ -27,7 +29,8 @@
 	import {
 	import {
 		deviceStatus,
 		deviceStatus,
 		alarmStatus,
 		alarmStatus,
-		typeStatus
+		typeStatus,
+		collectStatus
 	} from '../config/data.js'
 	} from '../config/data.js'
 
 
 	export default {
 	export default {
@@ -41,7 +44,8 @@
 			return {
 			return {
 				deviceStatus,
 				deviceStatus,
 				alarmStatus,
 				alarmStatus,
-				typeStatus
+				typeStatus,
+				collectStatus
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
@@ -61,9 +65,11 @@
 				const deviceState = this.deviceStatus.find(item => item.checked);
 				const deviceState = this.deviceStatus.find(item => item.checked);
 				const alarmStatus = this.alarmStatus.find(item => item.checked);
 				const alarmStatus = this.alarmStatus.find(item => item.checked);
 				const deviceType = this.typeStatus.find(item => item.checked);
 				const deviceType = this.typeStatus.find(item => item.checked);
+				const isCollect = this.collectStatus.find(item => item.checked)
 				this.$emit('queryCondition', {
 				this.$emit('queryCondition', {
 					deviceState: deviceState.type ? deviceState.type : undefined,
 					deviceState: deviceState.type ? deviceState.type : undefined,
 					deviceType: deviceType.type ? deviceType.type : undefined,
 					deviceType: deviceType.type ? deviceType.type : undefined,
+					isCollect:isCollect.type?isCollect.type:undefined,
 					alarmStatus: alarmStatus.type === 0 || alarmStatus.type === 1 ? alarmStatus.type : undefined
 					alarmStatus: alarmStatus.type === 0 || alarmStatus.type === 1 ? alarmStatus.type : undefined
 				})
 				})
 			},
 			},
@@ -92,4 +98,4 @@
 			}
 			}
 		}
 		}
 	}
 	}
-</style>
+</style>

@@ -57,9 +57,27 @@ const typeStatus = [{
 		type: 'SENSOR'
 		type: 'SENSOR'
 	}
 	}
 ]
 ]
+const collectStatus = [
+	{
+		checked: true,
+		name: '全部',
+		type: ''
+	},
+	{
+		checked: false,
+		name: '是',
+		type: '1'
+	},
+	{
+		checked: false,
+		name: '否',
+		type: '0'
+	},
+]
 
 
 export {
 export {
 	deviceStatus,
 	deviceStatus,
 	alarmStatus,
 	alarmStatus,
-	typeStatus
-}
+	typeStatus,
+	collectStatus
+}

@@ -3,7 +3,7 @@
 		<!-- 设备头部 -->
 		<!-- 设备头部 -->
 		<header-search @openOrg="openOrg" @openSearchDialog="openSearchDialog" :total="total" :totalText="totalText">
 		<header-search @openOrg="openOrg" @openSearchDialog="openSearchDialog" :total="total" :totalText="totalText">
 			<!-- 不能写在封装组件里传placeholder，mp-wenxin端编译要报错 -->
 			<!-- 不能写在封装组件里传placeholder，mp-wenxin端编译要报错 -->
-			<u--input prefixIcon="search" placeholder="请输入设备SN或名称搜索" shape="circle" @change="inputChanged">
+			<u--input prefixIcon="search" placeholder="请输入设备名称或别名搜索" shape="circle" @change="inputChanged">
 			</u--input>
 			</u--input>
 		</header-search>
 		</header-search>
 		<!-- 设备分页 -->
 		<!-- 设备分页 -->
@@ -220,4 +220,4 @@
 			}
 			}
 		}
 		}
 	}
 	}
-</style>
+</style>

@@ -5,11 +5,12 @@
 		<header-org @openOrg="openOrg" :total="cameraTotal" title="摄像头数：" :imageSrc="imageSrc"></header-org>
 		<header-org @openOrg="openOrg" :total="cameraTotal" title="摄像头数：" :imageSrc="imageSrc"></header-org>
 		<view style="height: 150rpx;"></view>
 		<view style="height: 150rpx;"></view>
 		<!-- 自带分页组件 -->
 		<!-- 自带分页组件 -->
-		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
+		<mescroll-body height="80%" ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
 			@up="upCallback">
 			@up="upCallback">
 			<view class="camera-container">
 			<view class="camera-container">
 				<view class="container-item">
 				<view class="container-item">
-					<view v-for="(item, index) in list" :key="item.id" class="item">
+					<!-- #ifdef MP-WEIXIN -->
+					<view v-for="(item, index) in list" :key="item.id" class="item" >
 						<video :data-id="item.id" :data-accessMode="item.accessMode" :key="item.id" preload="none"
 						<video :data-id="item.id" :data-accessMode="item.accessMode" :key="item.id" preload="none"
 							:id="'video' + item.id" class="video" :src="item.videoUrl" controls :title="item.name"
 							:id="'video' + item.id" class="video" :src="item.videoUrl" controls :title="item.name"
 							x5-video-player-type="h5" x5-video-orientation="portraint" show-mute-btn
 							x5-video-player-type="h5" x5-video-orientation="portraint" show-mute-btn
@@ -18,9 +19,21 @@
 							<text class="text">{{ item.name }}</text>
 							<text class="text">{{ item.name }}</text>
 						</view>
 						</view>
 					</view>
 					</view>
+					<!-- #endif -->
+					<!-- #ifdef APP-PLUS -->
+					<cover-view v-for="(item, index) in list" :key="item.id" class="item" style="overflow: hidden;">
+						<video :data-id="item.id" :data-accessMode="item.accessMode" :key="item.id" preload="none"
+							:id="'video' + item.id" class="video" :src="item.videoUrl" controls :title="item.name"
+							x5-video-player-type="h5" x5-video-orientation="portraint" show-mute-btn
+							:poster="item.avatar" @play="playVideo"></video>
+						<cover-view  class="bottom-text text-clip w-300">
+							<cover-view class="text">{{ item.name }}</cover-view>
+						</cover-view>
+					</cover-view>
+					<!-- #endif -->
 				</view>
 				</view>
 			</view>
 			</view>
-			<mescroll-empty v-if="!list.length" />
+			<!-- <mescroll-empty v-if="!list.length" /> -->
 		</mescroll-body>
 		</mescroll-body>
 		<!-- 自带分页组件 -->
 		<!-- 自带分页组件 -->
 		<view style="height: 60rpx;"></view>
 		<view style="height: 60rpx;"></view>
@@ -98,8 +111,14 @@
 				})
 				})
 				if (res) {
 				if (res) {
 					uni.stopPullDownRefresh();
 					uni.stopPullDownRefresh();
-					this.mescroll.endByPage(res.items.length, res.total);
+					this.mescroll.endBySize(res.items.length, res.total);
 					this.cameraTotal = res.total;
 					this.cameraTotal = res.total;
+					if(!res.items.length && res.total==0){
+						this.mescroll.showEmpty()
+					}else{
+						this.mescroll.removeEmpty()
+					}
+
 					if (pageNo == 1) {
 					if (pageNo == 1) {
 						this.list = res.items;
 						this.list = res.items;
 					} else {
 					} else {

@@ -14,9 +14,9 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<public-module></public-module>
 		<!-- 自带分页组件 -->
 		<!-- 自带分页组件 -->
-		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
+		<mescroll-body height="80%" :page="page" ref="mescrollRef" :empty="{use:false}" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
 			@up="upCallback">
 			@up="upCallback">
-			<view class="configuation-container" v-if="list.length">
+			<view class="configuation-container" >
 				<view class="configuation-item">
 				<view class="configuation-item">
 					<view @click="openConfigDetail(item)" v-for="(item, index) in list" :key="index" class="item">
 					<view @click="openConfigDetail(item)" v-for="(item, index) in list" :key="index" class="item">
 						<image class="image" :src="item.icon || defaultConfigImage"></image>
 						<image class="image" :src="item.icon || defaultConfigImage"></image>
@@ -59,7 +59,7 @@
 					auto: true //是否在初始化后,自动执行downCallback; 默认true
 					auto: true //是否在初始化后,自动执行downCallback; 默认true
 				},
 				},
 				upOption: {
 				upOption: {
-					auto: false // 不自动加载
+					auto: false, // 不自动加载
 				},
 				},
 				list: [],
 				list: [],
 				total:0,
 				total:0,
@@ -75,6 +75,7 @@
 		},
 		},
 		onShow() {
 		onShow() {
 			if (this.ordId) {
 			if (this.ordId) {
+				this.page.num = 1
 				this.loadData(1,null, this.ordId);
 				this.loadData(1,null, this.ordId);
 			}
 			}
 		},
 		},
@@ -127,8 +128,13 @@
 				})
 				})
 				if (res) {
 				if (res) {
 					uni.stopPullDownRefresh();
 					uni.stopPullDownRefresh();
-					this.mescroll.endByPage(res.items.length, res.total);
+					this.mescroll.endBySize(res.items.length, res.total);
 					this.total = res.total;
 					this.total = res.total;
+					if(!res.items.length && res.total==0){
+						this.mescroll.showEmpty()
+					}else{
+						this.mescroll.removeEmpty()
+					}
 					if (pageNo == 1) {
 					if (pageNo == 1) {
 						this.list = res.items;
 						this.list = res.items;
 					} else {
 					} else {

@@ -14,7 +14,7 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<public-module></public-module>
 		<!-- 自带分页组件 -->
 		<!-- 自带分页组件 -->
-		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
+		<mescroll-body height="80%" ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
 			@up="upCallback">
 			@up="upCallback">
 			<view class="configuation-container">
 			<view class="configuation-container">
 				<view class="configuation-item">
 				<view class="configuation-item">
@@ -24,7 +24,7 @@
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-			<mescroll-empty v-if="!list.length" />
+			<!-- <mescroll-empty v-if="!list.length" /> -->
 		</mescroll-body>
 		</mescroll-body>
 		<!-- 自带分页组件 -->
 		<!-- 自带分页组件 -->
 		<view style="height: 60rpx;"></view>
 		<view style="height: 60rpx;"></view>
@@ -122,8 +122,13 @@
 				})
 				})
 				if (res) {
 				if (res) {
 					uni.stopPullDownRefresh();
 					uni.stopPullDownRefresh();
-					this.mescroll.endByPage(res.items.length, res.total);
+					this.mescroll.endBySize(res.items.length, res.total);
 					this.total = res.total;
 					this.total = res.total;
+					if(!res.items.length && res.total==0){
+						this.mescroll.showEmpty()
+					}else{
+						this.mescroll.removeEmpty()
+					}
 					if (pageNo == 1) {
 					if (pageNo == 1) {
 						this.list = res.items;
 						this.list = res.items;
 					} else {
 					} else {

@@ -17,8 +17,8 @@
 		.item {
 		.item {
 			margin-top: 80rpx;
 			margin-top: 80rpx;
 			width: 330rpx;
 			width: 330rpx;
-			height: 200rpx;
-			background-color: #fff;
+			height: 206rpx;
+			// background-color: #fff;
 			border-radius: 10px;
 			border-radius: 10px;
 			margin-left: 25rpx;
 			margin-left: 25rpx;
 			margin-right: 21rpx;
 			margin-right: 21rpx;
@@ -28,9 +28,8 @@
 				height: 200rpx;
 				height: 200rpx;
 			}
 			}
 			.bottom-text {
 			.bottom-text {
-				position: relative;
-				top: 8rpx;
 				text-align: center;
 				text-align: center;
+				height:50rpx;
 				.text {
 				.text {
 					color: #333333;
 					color: #333333;
 					font-size: 13px;
 					font-size: 13px;