视频格式修改

api/mine/order.js

@@ -149,6 +149,13 @@ export function getCameraVideo(data) {
     'method': 'get',
   })
 }
+// 设备列表接口
+export function getappCameraVideo(data) {
+  return request({
+    'url': '/camera/app/video/'+data,
+    'method': 'get',
+  })
+}
 // APP首页统计预约和订餐
 export function getYydcCont(data) {
   return request({

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧园区",
     "appid" : "__UNI__9ACE566",
     "description" : "",
-    "versionName" : "1.1.2",
-    "versionCode" : 112,
+    "versionName" : "1.1.3",
+    "versionCode" : 113,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/index/index.vue

@@ -245,7 +245,7 @@
 	import yList from "@/components/order/list.vue"
 	import notice from "@/components/swiper/notice.vue"
 	let { calendar } = require("@/components/lunc-calendar/calendar.js");
-	import {getReservatcountl,getReservatList,getReservatDel,getReservatSh,getYydcCont,getCameraVideo,getCameraList,getVideoOpenDz,getVideoCloseDz,} from "@/api/mine/order.js"
+	import {getReservatcountl,getReservatList,getReservatDel,getReservatSh,getYydcCont,getCameraVideo,getappCameraVideo,getCameraList,getVideoOpenDz,getVideoCloseDz,} from "@/api/mine/order.js"
 	import {getDictionaryFn} from "@/api/mine/register.js"
 	import {getNoticeList} from "@/api/common.js"
 	import {getRecordDayList} from "@/api/work/check.js"
@@ -527,20 +527,34 @@
 			if(this.tabval==2){
 				indexCode=this.indexCode
 			}
-			getCameraVideo(indexCode).then(res=>{
-				if(res.code==200){
-					var data=res.data.data;
-					if(data){
-						this.videourl=data.url;
-						// #ifdef H5
-						this.flv_destroy()
-						this.getLivePlayer()
-						// #endif	
+			// #ifdef H5
+				getCameraVideo(indexCode).then(res=>{
+					if(res.code==200){
+						var data=res.data.data;
+						if(data){
+							this.videourl=data.url;
+							// #ifdef H5
+							this.flv_destroy()
+							this.getLivePlayer()
+							// #endif	
+						}
+					}else{
+						this.$toast(res.msg)
 					}
-				}else{
-					this.$toast(res.msg)
-				}
-			}) 
+				})
+			// #endif
+			 // #ifdef APP-PLUS
+				getappCameraVideo(indexCode).then(res=>{
+					if(res.code==200){
+						var data=res.data.data;
+						if(data){
+							this.videourl=data.url;
+						}
+					}else{
+						this.$toast(res.msg)
+					}
+				}) 
+			 // #endif
 		},
 		getCodeFn(ite){
 			this.dzaddress=ite.name;

pages/login.vue

@@ -130,7 +130,7 @@
 			},
 			voList:[],
 			voindex:0,
-			jzflag:false
+			jzflag:true
 		}
 	},
 	

pages/video/index.vue

@@ -136,7 +136,7 @@
 	import self from '@/utils/location.js';
 	import yList from "@/components/order/list.vue"
 	let { calendar } = require("@/components/lunc-calendar/calendar.js");
-	import {getCameraList,getCameraVideo,getVideoOpenDz,getVideoCloseDz,getDoorList} from "@/api/mine/order.js"
+	import {getCameraList,getCameraVideo,getVideoOpenDz,getVideoCloseDz,getDoorList,getappCameraVideo} from "@/api/mine/order.js"
 	import {column1} from '@/components/zb-table/all.js'
 	import {getDictionaryFn} from "@/api/mine/register.js"
 	import footers from '@/components/footer/footer.vue'
@@ -482,20 +482,35 @@
 			if(this.tabval==2){
 				indexCode=this.indexCode
 			}
-			getCameraVideo(indexCode).then(res=>{
-				if(res.code==200){
-					var data=res.data.data;
-					if(data){
-						this.videourl=data.url;
-						// #ifdef H5
-						this.flv_destroy()
-						this.getLivePlayer()
-						// #endif	
+			// #ifdef H5
+				getCameraVideo(indexCode).then(res=>{
+					if(res.code==200){
+						var data=res.data.data;
+						if(data){
+							this.videourl=data.url;
+							// #ifdef H5
+							this.flv_destroy()
+							this.getLivePlayer()
+							// #endif	
+						}
+					}else{
+						this.$toast(res.msg)
 					}
-				}else{
-					this.$toast(res.msg)
-				}
-			}) 
+				}) 
+			// #endif
+			// #ifdef APP-PLUS
+				getappCameraVideo(indexCode).then(res=>{
+					if(res.code==200){
+						var data=res.data.data;
+						if(data){
+							this.videourl=data.url;
+						}
+					}else{
+						this.$toast(res.msg)
+					}
+				}) 
+			// #endif
+			
 		},
 		getResetFn(){
 			// 重置