Merge branch 'f-dev' into 'main'

fix:DEFECT-389 修改摄像头能同时播放多个问题和fix:移除意见反馈底部tabbar

See merge request huang/thingskit-app!53

@@ -30,13 +30,13 @@ export default {
 @import './style/iconfont.scss';
 @import './style/common.scss';
 page {
-	background-color: #f5f5f5;
-}
-::-webkit-scrollbar {  
-    display: none;  
-    width: 0 !important;  
-    height: 0 !important;  
-    -webkit-appearance: none;  
-    background: transparent;  
+	background: #ffffff;
+}
+::-webkit-scrollbar {
+	display: none;
+	width: 0 !important;
+	height: 0 !important;
+	-webkit-appearance: none;
+	background: transparent;
 }
 </style>

@@ -29,17 +29,17 @@
 			<u-line length="90%" margin="0 auto" v-if="commandDetail.additionalInfo.cmdType"></u-line>
 			<view class="detail-item">
 				<view class="detail-label">响应类型</view>
-				<view class="detail-value">{{commandDetail.request.oneway?'oneway':'towway'}}</view>
+				<view class="detail-value">{{ commandDetail.request.oneway ? 'oneway' : 'towway' }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
 				<view class="detail-label">下发结果</view>
-				<view class="detail-value">{{commandDetail.status==='SUCCESSFUL'?'成功':'失败'}}</view>
+				<view class="detail-value">{{ commandDetail.status === 'SUCCESSFUL' ? '成功' : '失败' }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
 				<view class="detail-label">响应结果</view>
-				<view class="detail-value">{{commandDetail.response?'成功':'失败'}}</view>
+				<view class="detail-value">{{ commandDetail.response ? '成功' : '失败' }}</view>
 			</view>
 		</view>
 		<view class="command">命令内容</view>
@@ -70,14 +70,13 @@ export default {
 		format(date) {
 			return formatToDate(date, 'YYYY-MM-DD HH:mm:ss');
 		},
-		formatValue(value){
-			return JSON.stringify(value)
+		formatValue(value) {
+			return JSON.stringify(value);
 		}
 	},
 	onLoad(options) {
 		const { data } = options;
 		this.commandDetail = JSON.parse(data);
-		console.log(this.commandDetail, '---------');
 	}
 };
 </script>

@@ -19,7 +19,25 @@
 					</view>
 					<view v-if="item.statusName">
 						命令状态:
-						<text style="margin-left: 16rpx;">{{ item.statusName }}</text>
+						<text
+							:style="{
+								color:
+									item.status == 'EXPIRED'
+										? 'red'
+										: item.status == 'DELIVERED'
+										? 'blue'
+										: item.status == 'QUEUED'
+										? '#00C9A7'
+										: item.status == 'TIMEOUT'
+										? 'red'
+										: item.status == 'SENT'
+										? '#00C9A7'
+										: ''
+							}"
+							style="margin-left: 16rpx;"
+						>
+							{{ item.statusName }}
+						</text>
 					</view>
 					<view class="time">{{ format(item.createTime) }}</view>
 				</view>
@@ -141,7 +159,6 @@ export default {
 				.then(res => {
 					this.total = res.total;
 					uni.stopPullDownRefresh();
-					console.log('获取后端数据', res);
 					//方法一(推荐): 后台接口有返回列表的总页数 totalPage
 					this.mescroll.endByPage(res.items.length, res.total); //必传参数(当前页的数据个数, 总页数)
 					if (pageNo == 1) {
@@ -225,6 +242,9 @@ export default {
 	margin: 20rpx auto;
 	color: #333;
 	.item {
+		.delivered-color {
+			color: blue;
+		}
 		padding: 30rpx;
 		view {
 			font-size: 14px;
@@ -257,7 +277,7 @@ export default {
 			.item.success {
 				color: #00c9a7;
 				background-color: #00c9a725;
-							}
+			}
 		}
 	}
 }
@@ -279,4 +299,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

@@ -39,7 +39,15 @@
 								}"
 							>
 								{{
-									item.severity === 'CRITICAL' ? '危险' : item.severity === 'MAJOR' ? '重要' : item.severity === 'MINOR' ? '次要' : item.severity === 'WARNING' ? '警告' : '不确定'
+									item.severity === 'CRITICAL'
+										? '危险'
+										: item.severity === 'MAJOR'
+										? '重要'
+										: item.severity === 'MINOR'
+										? '次要'
+										: item.severity === 'WARNING'
+										? '警告'
+										: '不确定'
 								}}
 							</text>
 						</view>
@@ -50,7 +58,13 @@
 					</view>
 					<view v-if="item.status">
 						告警状态:{{
-							item.status === 'CLEARED_UNACK' ? '清除未确认' : item.status === 'CLEARED_ACK' ? '清除已确认' : item.status === 'ACTIVE_UNACK' ? '激活未确认' : '激活已确认'
+							item.status === 'CLEARED_UNACK'
+								? '清除未确认'
+								: item.status === 'CLEARED_ACK'
+								? '清除已确认'
+								: item.status === 'ACTIVE_UNACK'
+								? '激活未确认'
+								: '激活已确认'
 						}}
 					</view>
 					<view class="time">{{ item.createdTime }}</view>
@@ -261,7 +275,6 @@ export default {
 				.then(res => {
 					this.total = res.total;
 					uni.stopPullDownRefresh();
-					console.log('获取后端数据', res);
 					//方法一(推荐): 后台接口有返回列表的总页数 totalPage
 					this.mescroll.endByPage(res.items.length, res.total); //必传参数(当前页的数据个数, 总页数)
 					if (pageNo == 1) {

@@ -116,9 +116,7 @@ export default {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
 	},
-	mounted() {
-		console.log(this.deviceDetail);
-	},
+	mounted() {},
 	methods: {
 		showModal() {
 			this.showModel = true;

@@ -22,7 +22,7 @@
 					</u-form-item>
 					<view class="info">
 						<view class="info-contain">
-							<u-form-item label="反馈" prop="feedbackInfo.message" borderBottom ref="item1">
+							<u-form-item  required label="反馈" prop="feedbackInfo.message" borderBottom ref="item1">
 								<u--textarea placeholder="请输入反馈信息" v-model="feedbackData.feedbackInfo.message" count></u--textarea>
 							</u-form-item>
 						</view>
@@ -48,20 +48,15 @@
 				<!-- #endif -->
 			</view>
 			<view style="height: 20rpx;"></view>
-			<f-tabbar></f-tabbar>
 		</view>
 	</view>
 </template>
 
 <script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import baseUrl from '@/config/baseUrl.js';
 import { mapState } from 'vuex';
 
 export default {
-	components: {
-		fTabbar
-	},
 	data() {
 		return {
 			feedbackData: {
@@ -77,105 +72,45 @@ export default {
 			},
 			fileList1: [],
 			rules: {
-				'feedbackInfo.title': [
-					{
-						type: 'string',
-						required: true,
-						message: '请填写主题',
-						trigger: ['blur', 'change']
-					},
-					{
-						validator: (rule, value, callback) => {
-							return uni.$u.test.chinese(value);
-						},
-						message: '主题必须为中文',
-						trigger: ['change', 'blur']
-					}
-				],
-				'feedbackInfo.name': [
-					{
-						type: 'string',
-						required: true,
-						message: '请填写姓名',
-						trigger: ['blur', 'change']
-					},
-					{
-						validator: (rule, value, callback) => {
-							return uni.$u.test.chinese(value);
-						},
-						message: '姓名必须为中文',
-						trigger: ['change', 'blur']
-					}
-				],
-				'feedbackInfo.phone': [
-					{
-						type: 'number',
-						required: true,
-						message: '请填写手机号码',
-						trigger: ['blur', 'change']
-					},
-					{
-						validator: (rule, value, callback) => {
-							const pattern=/^[0-11]*$/g
-							if(pattern.test(value)){
-							}else{
-								return uni.$u.toast('手机号只能是数字且为11位数')
-							}
-						},
-						message: '手机号码不正确',
-						trigger: ['change', 'blur']
-					}
-				],
-				'feedbackInfo.qq': [
-					{
-						type: 'number',
-						required: true,
-						message: '请填写qq号码',
-						trigger: ['blur', 'change']
-					},
-					{
-						validator: (rule, value, callback) => {
-							const pattern=/^[0-10]*$/g
-							if(pattern.test(value)){
-							}else{
-								return uni.$u.toast('qq号只能是数字')
-							}
-						},
-						message: 'qq号码不正确',
-						trigger: ['change', 'blur']
-					}
-				],
-				'feedbackInfo.email': [
-					{
-						type: 'string',
-						required: true,
-						message: '请填写邮箱',
-						trigger: ['blur', 'change']
-					},
-					{
-						validator: (rule, value, callback) => {
-								return uni.$u.test.email(value);
-						},
-						message: '邮箱不正确',
-						trigger: ['change', 'blur']
-					}
-				],
-				'feedbackInfo.message': [
-					{
-						type: 'string',
-						required: true,
-						message: '请填写意见反馈',
-						trigger: ['blur', 'change']
-					},
-					{
-						validator: (rule, value, callback) => {
-							return uni.$u.test.chinese(value);
-						},
-						message: '意见反馈必须为中文',
-						trigger: ['change', 'blur']
-					}
-				]
-			}
+							'feedbackInfo.title': {
+								type: 'string',
+								required: true,
+								message: '请填写主题或者主题格式错误',
+								pattern:/^[\u4e00-\u9fa5]+$/,
+								trigger: ['blur', 'change']
+							},
+							'feedbackInfo.name': {
+								type: 'string',
+								required: true,
+								pattern:/^[\u4e00-\u9fa5]+$/,
+								message: '请填写姓名或者姓名格式错误',
+								trigger: ['blur', 'change']
+							},
+							'feedbackInfo.phone': {
+								type: 'number',
+								min: 11,
+								message: '请填写手机或者手机格式错误',
+								trigger: ['blur', 'change']
+							},
+							'feedbackInfo.qq': {
+								type: 'number',
+								min: 8,
+								message: '请填写qq或者qq格式错误',
+								trigger: ['blur', 'change']
+							},
+							'feedbackInfo.email': {
+								type: 'email',
+								message: '请填写邮箱或者邮箱格式错误',
+								trigger: ['blur', 'change']
+							},
+							'feedbackInfo.message': {
+								type: 'string',
+								required: true,
+								message: '请填写意见反馈或者意见反馈格式错误',
+								trigger: ['blur', 'change']
+							},
+							
+		},
 		};
 	},
 	onReady() {
@@ -255,37 +190,39 @@ export default {
 			this.$refs.myfeedBackFormRef
 				.validate()
 				.then(res => {
-					let contactInfo = {
-						qq: this.feedbackData.feedbackInfo?.qq,
-						email: this.feedbackData.feedbackInfo?.email,
-						phone: this.feedbackData.feedbackInfo?.phone
-					};
-					let httpData = {
-						title: this.feedbackData.feedbackInfo.title,
-						name: this.feedbackData.feedbackInfo.name,
-						contact: JSON.stringify(contactInfo),
-						images: this.feedbackData.feedbackInfo.images.length == 0 ? '' : JSON.stringify(this.feedbackData.feedbackInfo.images),
-						message: this.feedbackData.feedbackInfo.message
-					};
-					uni.$u.http
-						.post('/yt/opinion', httpData)
-						.then(res => {
-							if (res) {
-								uni.showToast({
-									title: '意见反馈提交成功~',
-									icon: 'none'
-								});
-								setTimeout(() => {
-									uni.navigateBack();
-								}, 500);
-							}
-						})
-						.catch(e => {
-							uni.$u.toast(e.data?.message);
-						});
+					if(res){
+						let contactInfo = {
+							qq: this.feedbackData.feedbackInfo?.qq,
+							email: this.feedbackData.feedbackInfo?.email,
+							phone: this.feedbackData.feedbackInfo?.phone
+						};
+						let httpData = {
+							title: this.feedbackData.feedbackInfo.title,
+							name: this.feedbackData.feedbackInfo.name,
+							contact: JSON.stringify(contactInfo),
+							images: this.feedbackData.feedbackInfo.images.length == 0 ? '' : JSON.stringify(this.feedbackData.feedbackInfo.images),
+							message: this.feedbackData.feedbackInfo.message
+						};
+						uni.$u.http
+							.post('/yt/opinion', httpData)
+							.then(res => {
+								if (res) {
+									uni.showToast({
+										title: '意见反馈提交成功~',
+										icon: 'none'
+									});
+									setTimeout(() => {
+										uni.navigateBack();
+									}, 500);
+								}
+							})
+							.catch(e => {
+								uni.$u.toast(e.data?.message);
+							});
+					}
 				})
 				.catch(errors => {
-					uni.$u.toast('校验失败');
+					uni.$u.toast('请填写或者请填写正确格式的数据');
 				});
 		}
 	}

@@ -17,16 +17,24 @@
 		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
 			<view class="camera-container">
 				<view class="container-item">
-					<view @click="openCameraDetail(item.url)" v-for="(item, index) in list" :key="index" class="item">
-						<video class="video" :src="item.videoUrl" controls></video>
+					<view v-for="(item, index) in list" :key="index" class="item">
+						<video
+							:data-id="item.id"
+							:key="item.id"
+							:id="'video' + item.id"
+							class="video"
+							:src="item.videoUrl"
+							controls
+							webkit-playsinline
+							x5-video-player-type="h5"
+							x5-video-orientation="portraint"
+							show-mute-btn
+							:poster="item.avatar"
+							@play="playVideo"
+						></video>
 						<view class="bottom-text">
 							<text class="text">{{ item.name }}</text>
 						</view>
-						<!-- #ifdef MP -->
-						<view @click="hideImageUrl(item, index)" :style="[index == current ? { display: 'none' } : { display: 'block' }]" class="avatar-cover">
-							<image class="image" :src="item.avatar"></image>
-						</view>
-						<!-- #endif -->
 					</view>
 				</view>
 			</view>
@@ -56,7 +64,8 @@ export default {
 			current: 0,
 			cameraTotal: 0,
 			list: [],
-			ordId: ''
+			ordId: '',
+			videoContext: null
 		};
 	},
 	onShow() {
@@ -65,6 +74,9 @@ export default {
 			this.loadData(1, this.ordId);
 		}
 	},
+	onReady() {
+		this.videoContext = uni.createVideoContext('myVideo', this);
+	},
 	onHide() {
 		this.ordId = '';
 		this.loadData(1, null);
@@ -72,7 +84,6 @@ export default {
 	onLoad() {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
-		this.getcameraTotalData();
 	},
 	methods: {
 		/*下拉刷新的回调 */
@@ -113,8 +124,23 @@ export default {
 		hideImageUrl(item, index) {
 			this.current = index;
 		},
-		openCameraDetail(e) {
-			console.log(e);
+		playVideo(e) {
+			/**
+			 * 播放当前视频，暂停其余视频
+			 */
+			let currentId = 'video' + e.currentTarget.dataset.id;
+			this.videoContent = uni.createVideoContext(currentId, this);
+			this.videoContext.requestFullScreen({ direction: 90 });
+			// 获取视频列表
+			let trailer = this.list;
+			trailer.forEach((item, index) => {
+				if (item.videoUrl != null && item.videoUrl != '') {
+					let temp = 'video' + item.id;
+					if (temp != currentId) {
+						uni.createVideoContext(temp, this).pause();
+					}
+				}
+			});
 		},
 		openOrg() {
 			uni.navigateTo({

@@ -17,7 +17,7 @@
 				<view class="form-row u-flex">
 					<u-input v-model="loginForm.password" :password="showPassword" placeholder="请输入登录密码" border="bottom">
 						<template slot="suffix" @click="showPasswordMode">
-							<view style="padding:10rpx"><u-icon :name="showPassword ? '/static/eye-hide.png' : '/static/eye.png'"></u-icon></view>
+							<view style="padding:10rpx"><u-icon width="18" height="14" :name="showPassword ? '/static/eye-hide.png' : '/static/eye.png'"></u-icon></view>
 						</template>
 					</u-input>
 				</view>
@@ -211,7 +211,7 @@ export default {
 							token: true, //token用于判断是否登录
 
 							isThirdLogin: false,
-							isThirdLoginAndNoDind:false
+							isThirdLoginAndNoDind: false
 						};
 
 						if (userInfo.token) {
@@ -259,4 +259,4 @@ export default {
 /deep/ button {
 	background: rgba(0, 0, 0, 0);
 }
-</style>
+</style>

@@ -3,12 +3,12 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<view style="width: 750rpx;height:53rpx;background-color: #f8f9fa;position:fixed;top:0;z-index: 99999;">
-			<view @click="openTypeClick" style="background-color: #f8f9fa;width: 700rpx;position: relative;top: 16rpx;">
+			<view @click="openTypeClick" style="background-color: #f8f9fa;width: 700rpx;position: relative;top: 35rpx;">
 				<u--input suffixIcon="arrow-down" shape="circle" disabled v-model="model1.userInfo.type" placeholder="请选择类型" border="surround"></u--input>
 				<u-action-sheet :show="showType" :actions="actions" title="请选择类型" @close="showType = false" @select="typeSelect"></u-action-sheet>
 			</view>
 		</view>
-		<view style="height: 76rpx;"></view>
+		<view style="height: 110rpx;"></view>
 		<view class="notify-main">
 			<!-- 无数据图片 -->
 			<view v-if="list.length == 0" style="position: relative;top: 100rpx;flex-direction: column;" class="u-flex">