lilei 4 yıl önce
ebeveyn
işleme
3572fe9e04

+ 1 - 1
components/uni-check-list/uni-check-list.vue

@@ -10,7 +10,7 @@
 					</view>
 					<view v-if="checkIconPositon=='left'" class="title">{{ item[titleKeys] }}</view>
 				</view>
-				<view class="details" @click="rightClick(item)">
+				<view class="details" :style="showArrow && types != 'views'?'padding-right:20upx':''" @click="rightClick(item)">
 					<slot name="right"></slot>
 					<u-icon v-if="showArrow && types != 'views'" name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888"></u-icon>
 				</view>

+ 6 - 0
hybrid/html/css/styles.css

@@ -167,6 +167,12 @@ body {
   position: relative;
   height: 240px;
 }
+.errorVideo{
+	background: #000;
+	color: #fff;
+	line-height: 240px;
+	text-align: center;
+}
 .videoPlay .control-yt, .videoPlay .control-yt-close {
   position: absolute;
   right: 15px;

+ 10 - 1
hybrid/html/ddvideo.html

@@ -22,7 +22,7 @@
 	<body>
 		<div class="storeCheck" id="app">
 			<!-- 播放器 -->
-			<div class="videoPlay" v-if="xdType=='video'&&videoList.length">
+			<div class="videoPlay" v-if="xdType=='video'&&videoList.length&&videoStatus">
 				<!-- 云台控制 -->
 				<div class="control-yt" v-show="showYt&&!showYtbtns" @click="openYt"></div>
 				<div class="control-yt-close" v-show="showYtbtns" @click="openYt"></div>
@@ -33,6 +33,9 @@
 				<!-- 播放器 -->
 				<div class="prism-player" id="player-con"></div>
 			</div>
+			<div class="videoPlay" v-else>
+				<div @click='getVideoUrl'>点击重新加载视频</div>
+			</div>
 			<!-- 工作区 -->
 			<div class="checkWork">
 				<!-- 统计及摄像头切换 -->
@@ -158,6 +161,7 @@
 				data: {
 					xdType: 'video', // 巡店类型
 					player: null, // 播放器对象
+					videoStatus: false, // 获取视频失败
 					videoPlayerStatus: '', // 视频播放状态
 					videoList: [], // 播放通道
 					curVideo: null, // 当前播放的视频
@@ -233,9 +237,14 @@
 						}
 						this.videoInit(url)
 					},
+					// 获取视频地址失败
+					getVideoUrlError(err){
+						this.videoStatus = true
+					},
 					// 初始化播放器
 					videoInit(videoSrc) {
 						const _this = this
+						_this.videoStatus = false
 						// 初始化播放器
 						_this.player = new Aliplayer({
 							'id': 'player-con',

+ 13 - 4
hybrid/html/video.html

@@ -22,7 +22,7 @@
 	<body>
 		<div class="storeCheck" id="app">
 			<!-- 播放器 -->
-			<div class="videoPlay" v-if="xdType=='video'">
+			<div class="videoPlay" v-if="xdType=='video'&&!videoStatus">
 				<!-- 云台控制 -->
 				<div class="control-yt" v-show="showYt&&!showYtbtns" @click="openYt"></div>
 				<div class="control-yt-close" v-show="showYtbtns" @click="openYt"></div>
@@ -33,6 +33,9 @@
 				<!-- 播放器 -->
 				<div class="prism-player" id="player-con"></div>
 			</div>
+			<div class="videoPlay errorVideo" v-if="xdType=='video'&&videoStatus">
+				<div @click='getVideoUrl'>点击重新加载视频</div>
+			</div>
 			<!-- 工作区 -->
 			<div class="checkWork">
 				<!-- 统计及摄像头切换 -->
@@ -127,15 +130,15 @@
 								</div>
 								<div>
 									<!-- 不适用 -->
-									<a-icon @click="selZbResult(0,zb)" theme="filled" type="minus-circle" :class="zb.result=='NOT_WORK'?'choose-bsy':''" />
+									<a-icon @click="selZbResult(0,zb)" :theme="zb.result=='NOT_WORK'?'filled':''" type="minus-circle" :class="zb.result=='NOT_WORK'?'choose-bsy':''" />
 								</div>
 								<div>
 									<!-- 不合格 -->
-									<a-icon @click="selZbResult(1,zb)" theme="filled" type="close-circle" :class="zb.result=='NOT_PASS'?'choose-bhg':''" />
+									<a-icon @click="selZbResult(1,zb)" :theme="zb.result=='NOT_PASS'?'filled':''" type="close-circle" :class="zb.result=='NOT_PASS'?'choose-bhg':''" />
 								</div>
 								<div>
 									<!-- 合格 -->
-									<a-icon @click="selZbResult(2,zb)" theme="filled" type="check-circle" :class="zb.result=='PASS'?'choose-hg':''" />
+									<a-icon @click="selZbResult(2,zb)" :theme="zb.result=='PASS'?'filled':''" type="check-circle" :class="zb.result=='PASS'?'choose-hg':''" />
 								</div>
 							</div>
 						</div>
@@ -191,6 +194,7 @@
 				el: '#app',
 				data: {
 					xdType: 'video', // 巡店类型
+					videoStatus: false, // 获取视频失败
 					player: null, // 播放器对象
 					videoPlayerStatus:'',// 视频播放状态
 					videoList: [], // 播放通道
@@ -289,9 +293,14 @@
 						}
 						this.videoInit(url)
 					},
+					// 获取视频地址失败
+					getVideoUrlError(err){
+						this.videoStatus = true
+					},
 					// 初始化播放器
 					videoInit(videoSrc) {
 						const _this = this
+						_this.videoStatus = false
 						// 初始化播放器
 						_this.player = new Aliplayer({
 							'id': 'player-con',

+ 1 - 1
libs/axios.js

@@ -38,7 +38,7 @@ const request = (opts, hasToken) => {
 				if(ret.status == '200'){
 					resolve(ret)
 				}else{
-					if(ret.status == 1099 && loginTimeOut == 'NO'){  //  未登录或登录过期
+					if(['1001', '1002', '1006', '1099', '1100', '9000'].indexOf(ret.status) >=0 && loginTimeOut == 'NO'){  //  未登录或登录过期
 						uni.showToast({
 							icon:'none',
 							title: ret.message,

+ 5 - 9
pages/shopTour/shopTour.vue

@@ -313,15 +313,11 @@ export default {
 				if (res.status == 200 && res.data) {
 					this.wv.evalJS("vm.getVideoUrlSuccess('" + res.data.url + "')");
 				} else {
-					clzConfirm({
-						title: '提示',
-						content: '获取视频地址失败,点击确定重试?',
-						showCancel: false,
-						buttons:['确定'],
-						success: function(res){
-							_this.getStoreVideoUrl(item)
-						}
-					})
+					this.wv.evalJS("vm.getVideoUrlError('error')");
+					uni.showToast({
+						icon: 'none',
+						title: '加载视频失败'
+					});
 				}
 			});
 		},

+ 4 - 3
pages/spotCheck/spotCheck.vue

@@ -168,10 +168,11 @@
 					if(res.status == 200&&res.data){
 						this.wv.evalJS("vm.getVideoUrlSuccess('"+res.data.url+"')")
 					}else{
+						this.wv.evalJS("vm.getVideoUrlError('error')");
 						uni.showToast({
-							icon:'none',
-							title: "获取视频地址失败,请返回重试"
-						})
+							icon: 'none',
+							title: '加载视频失败'
+						});
 					}
 				})
 			},

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


+ 1 - 0
unpackage/dist/dev/app-plus/app-view.js

@@ -7071,6 +7071,7 @@ var render = function() {
                   "v-uni-view",
                   {
                     staticClass: _vm._$g("9-" + $30, "sc"),
+                    style: _vm._$g("9-" + $30, "s"),
                     attrs: { _i: "9-" + $30 },
                     on: {
                       click: function($event) {

+ 13 - 4
unpackage/dist/dev/app-plus/hybrid/html/video.html

@@ -22,7 +22,7 @@
 	<body>
 		<div class="storeCheck" id="app">
 			<!-- 播放器 -->
-			<div class="videoPlay" v-if="xdType=='video'">
+			<div class="videoPlay" v-if="xdType=='video'&&!videoStatus">
 				<!-- 云台控制 -->
 				<div class="control-yt" v-show="showYt&&!showYtbtns" @click="openYt"></div>
 				<div class="control-yt-close" v-show="showYtbtns" @click="openYt"></div>
@@ -33,6 +33,9 @@
 				<!-- 播放器 -->
 				<div class="prism-player" id="player-con"></div>
 			</div>
+			<div class="videoPlay errorVideo" v-if="xdType=='video'&&videoStatus">
+				<div @click='getVideoUrl'>点击重新加载视频</div>
+			</div>
 			<!-- 工作区 -->
 			<div class="checkWork">
 				<!-- 统计及摄像头切换 -->
@@ -127,15 +130,15 @@
 								</div>
 								<div>
 									<!-- 不适用 -->
-									<a-icon @click="selZbResult(0,zb)" theme="filled" type="minus-circle" :class="zb.result=='NOT_WORK'?'choose-bsy':''" />
+									<a-icon @click="selZbResult(0,zb)" :theme="zb.result=='NOT_WORK'?'filled':''" type="minus-circle" :class="zb.result=='NOT_WORK'?'choose-bsy':''" />
 								</div>
 								<div>
 									<!-- 不合格 -->
-									<a-icon @click="selZbResult(1,zb)" theme="filled" type="close-circle" :class="zb.result=='NOT_PASS'?'choose-bhg':''" />
+									<a-icon @click="selZbResult(1,zb)" :theme="zb.result=='NOT_PASS'?'filled':''" type="close-circle" :class="zb.result=='NOT_PASS'?'choose-bhg':''" />
 								</div>
 								<div>
 									<!-- 合格 -->
-									<a-icon @click="selZbResult(2,zb)" theme="filled" type="check-circle" :class="zb.result=='PASS'?'choose-hg':''" />
+									<a-icon @click="selZbResult(2,zb)" :theme="zb.result=='PASS'?'filled':''" type="check-circle" :class="zb.result=='PASS'?'choose-hg':''" />
 								</div>
 							</div>
 						</div>
@@ -191,6 +194,7 @@
 				el: '#app',
 				data: {
 					xdType: 'video', // 巡店类型
+					videoStatus: false, // 获取视频失败
 					player: null, // 播放器对象
 					videoPlayerStatus:'',// 视频播放状态
 					videoList: [], // 播放通道
@@ -289,9 +293,14 @@
 						}
 						this.videoInit(url)
 					},
+					// 获取视频地址失败
+					getVideoUrlError(err){
+						this.videoStatus = true
+					},
 					// 初始化播放器
 					videoInit(videoSrc) {
 						const _this = this
+						_this.videoStatus = false
 						// 初始化播放器
 						_this.player = new Aliplayer({
 							'id': 'player-con',

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor