lilei %!s(int64=4) %!d(string=hai) anos
pai
achega
2560f88298

+ 51 - 14
hybrid/html/css/styles.less

@@ -10,6 +10,20 @@ body{
     height: calc(100vh);
     display: flex;
     flex-direction: column;
+	// 进度条
+	.loading{
+		background: #fff;
+		height: 100%;
+		width: 100%;
+		text-align: center;
+		position: fixed;
+		z-index: 10000;
+		left:0;
+		top:0;
+		.ant-spin{
+			margin-top: 50%;
+		}
+	}
     // 工作区域
     .checkWork{
       flex-grow: 1;
@@ -62,12 +76,27 @@ body{
           width: 26%;
           padding: 1px 0;
           overflow-y: scroll;
-          background: #fff;
           box-shadow: 1px 1px 3px #eee;
           .tabs-items{
             text-align: center;
             padding:8px 5px;
-            border-bottom: 1px solid #f8f8f8;
+			position: relative;
+			margin: 5px;
+			background: #fff;
+			.edit{
+				font-size: 14px;
+				color: #ff0000;
+			}
+			.aicon{
+				color: #fff;
+				position: absolute;
+				font-size: 12px;
+				left: -5px;
+				top: -6px;
+				background: #ff0000;
+				padding: 3px;
+				border-radius: 100%;
+			}
           }
           .tabs-items.active{
             background: #91D5FF;
@@ -180,16 +209,21 @@ body{
   // 拍照弹框
   .pzPopus{
 	  .pz-pinglun{
-		  position: relative;
+		  display: flex;
+		  align-items: center;
+		  .remarks{
+			  flex-grow: 1;
+			  padding-right: 15px;
+		  }
 		  .icons{
-			  position: absolute;
-			  right: 15px;
-			  top: 50%;
-			  margin-top: -26px;
-			  z-index: 1000;
-			  border: 1px solid #eee;
+			  border: 1px solid #aaa;
 			  padding: 10px;
 			  border-radius: 100%;
+			  width: 60px;
+			  height: 60px;
+			  display: flex;
+			  align-items: center;
+			  justify-content: center;
 			  .aicon{
 				  font-size: 30px;
 				  color: #999;
@@ -200,7 +234,7 @@ body{
 		  display: flex;
 		  align-items: center;
 		  flex-wrap: wrap;
-		  padding: 30px 0;
+		  padding: 30px 0 20px;
 		  > div{
 			  position: relative;
 			  padding: 3px;
@@ -212,15 +246,18 @@ body{
 				  height: 45px;
 			  }
 			  .aicon{
+				  color: #fff;
 				  position: absolute;
-				  right: -8px;
+				  font-size: 12px;
+				  right: -6px;
 				  top: -8px;
-				  color: red;
-				  font-size: 16px;
+				  background: #FF0000;
+				  padding: 2px;
+				  border-radius: 100%;
 			  }
 		  }
 	  }
 	  .f-btns{
-		  padding: 10px 20px;
+		  padding: 10px 0;
 	  }
   }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hybrid/html/imgEdit/ped.min.js


BIN=BIN
hybrid/html/static/imgEdit/empty.png


BIN=BIN
hybrid/html/static/imgEdit/painting.png


BIN=BIN
hybrid/html/static/imgEdit/painting1.png


BIN=BIN
hybrid/html/static/imgEdit/text.png


BIN=BIN
hybrid/html/static/imgEdit/withdraw.png


+ 58 - 16
hybrid/html/video.html

@@ -11,6 +11,8 @@
 <script type="text/javascript" charset="utf-8" src="js/moment-with-locales.min.js"></script>
 <link rel="stylesheet" href="antd/antd.min.css" />
 <script type="text/javascript" charset="utf-8" src="antd/antd.min.js"></script>
+<!-- 编辑图片 -->
+<script type="text/javascript" charset="utf-8" src="imgEdit/ped.min.js"></script>
 <!-- 播放器 -->
 <link rel="stylesheet" href="aliplayer/aliplayer-min.css" />
 <script type="text/javascript" charset="utf-8" src="aliplayer/aliplayer-h5-min.js"></script>
@@ -50,7 +52,7 @@
                   <a-menu-item key="5"> 客户休息区 </a-menu-item>
                 </a-menu>
 				<a class="ant-dropdown-link" @click="e => e.preventDefault()">
-				  收银台 <a-icon type="right" />
+				  收银台 <a-icon type="down" />
 				</a>
               </a-dropdown>
             </div>
@@ -87,37 +89,49 @@
       <div class="checkWork-body">
         <div class="checkWork-body-tabs">
           <div class="tabs-items active">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
+		  <div class="tabs-items">
+		    <div class="edit" v-if="!isDelItem" @click="isDelItem=true">编辑</div>
+			<div class="edit" @click="isDelItem=false" v-else>取消编辑</div>
+		  </div>
         </div>
         <div class="checkWork-body-tabCons">
           <div class="tabCons-items">
@@ -128,8 +142,8 @@
             </div>
 			<!-- 拍照图片 -->
 			<div class="photos">
-				<div><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
-				<div><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
+				<div @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')"><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
+				<div @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')"><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
 			</div>
 			<!-- 评分 -->
             <div>
@@ -163,20 +177,22 @@
 	  <div class="pzPopus">
 		  <!-- 评论 -->
 		  <div class="pz-pinglun">
-			  <div><a-textarea placeholder="请填写备注内容(选填)" :rows="4" /></div>
-			  <span class="icons">
+			  <div class="remarks">
+				  <a-textarea placeholder="请填写备注内容(选填)" :rows="4" />
+			  </div>
+			  <div class="icons">
 				  <a-icon class="aicon" type="camera" />
-			  </span>
+			  </div>
 		  </div>
 		  <!-- 图片列表 -->
 		  <div class="imglist">
 			  <div>
 				  <img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
-				  <a-icon class="aicon" type="close-circle" />
+				  <a-icon class="aicon" type="close" />
 			  </div>
 			  <div>
 				  <img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
-				  <a-icon class="aicon" type="close-circle" />
+				  <a-icon class="aicon" type="close" />
 			  </div>
 		  </div>
 		  <!-- 提交 -->
@@ -185,8 +201,18 @@
 		  </div>
 	  </div>
 	</a-drawer>
+	
+	<!-- 加载条 -->
+	<div v-if="showLoading" class="loading">
+	    <a-spin />
+	</div>
   </div>
 <script>
+	window.onload = function(){
+		vm.showLoading = false
+	}
+	
+	// 初始化vm 实例
 	var vm = new Vue({
 	  el: '#app',
 	  data: {
@@ -194,6 +220,10 @@
 		  showYt: false, // 显示云台控制
 		  showYtbtns: false,
 		  showPz: false,// 显示拍照弹框
+		  isDelItem: false, // 是否显示考评项删除按钮
+		  showLoading: true, // 页面加载条
+		  isEditImg: false, // 是否编辑图片
+		  PED: null, // 图片编辑对象
 		},
 		mounted () {
 		  this.videoInit()
@@ -207,7 +237,7 @@
 			  // 初始化播放器
 			  _this.player = new Aliplayer({
 			    'id': 'player-con',
-			    'source': 'https://play.zyucgj.com/live/34020000001320000001.m3u8?auth_key=1599027535-0-0-621dab70e039a552649ccd535d1cc3f9',
+			    'source': 'https://player.alicdn.com/video/aliyunmedia.mp4',
 			    'width': '100%',
 			    'height': '240px',
 			    'autoplay': false,
@@ -253,10 +283,10 @@
 			            'y': 8
 			          },
 			          {
-			            'name': 'snapshot',
+			            'name': 'liveDisplay',
 			            'align': 'tl',
 			            'x': 15,
-			            'y': 8
+			            'y': 2
 			          }
 			        ]
 			      }
@@ -265,11 +295,6 @@
 			    _this.sendMsg('message','The player is created')
 			  }
 			  )
-			  /* h5截图按钮, 截图成功回调 */
-			  _this.player.on('snapshoted', function (data) {
-			    const pictureData = data.paramData.base64
-			    _this.sendMsg('snapshoted','截图成功回调')
-			  })
 			  // 控制栏
 			  _this.player.on('playing', function () {
 			    _this.showYt = true
@@ -299,10 +324,27 @@
 		  // 打开拍照
 		  openCamera(){
 			 this.showPz = true
+			 this.sendMsg('getWinStatus',JSON.stringify({key:'showPz',val: true}))
 		  },
 		  // 关闭拍照弹框
 		  onClosePz(){
 			  this.showPz = false
+			  this.sendMsg('getWinStatus',JSON.stringify({key:'showPz',val: false}))
+		  },
+		  // 预览图片
+		  previewImgs(url){
+			   let _this = this
+			   _this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: true}))
+			   this.PED = new window.PED.imageInfo(url,function(data){
+				   console.log(data)
+				   _this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: false}))
+			   })
+		  },
+		  // 关闭图片编辑
+		  closeImgsEdit(){
+			  console.log('0000000000000000')
+			  this.PED.hidePED()
+			  this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: false}))
 		  }
 		}
 	})

+ 1 - 1
pages/login/login.vue

@@ -86,7 +86,7 @@ export default {
 		AndroidCheckUpdate(){
 			let _this = this
 			getSysVersion().then(ret => {
-				console.log(JSON.stringify(ret))
+				// console.log(JSON.stringify(ret))
 				if(ret.status == 200){
 					this.$store.state.vuex_versionInfo = ret.data
 					let currTimeStamp = new Date(ret.data.publicDate).getTime();

+ 53 - 1
pages/shopTour/shopTour.vue

@@ -5,16 +5,68 @@
 </template>
 
 <script>
+	import { clzConfirm } from '@/libs/tools.js'
 	export default {
 		data() {
 			return {
 				wv: null,
+				isClose: false, // 是否关闭当前窗口
+				isEditImg: false, // 是否正在编辑图片
+				showPz: false, // 是否正在拍照
 			};
 		},
 		methods: {
 			onmessage(event) {
-				console.log(event.detail.data, 'event');
 				let data = event.detail.data[0]
+				console.log(data)
+				// webview 窗口传过来的页面状态
+				if(data.action == 'getWinStatus'){
+					let d = JSON.parse(data.msg)
+					this[d.key] = d.val
+				}
+			}
+		},
+		onReady() {
+			let _this = this
+			// #ifdef APP-PLUS
+			 //获取当前页面的webview对象
+			 var currentWebview = this.$mp.page.$getAppWebview()
+			 //如果是页面初始化调用时,需要延时一下
+			 setTimeout(function() {
+				_this.wv = currentWebview.children()[0]
+			 }, 500);
+			// #endif
+		},
+		// 监听返回键
+		onBackPress() {
+			console.log(this.isEditImg,'onBackPress')
+			let _this = this
+			if(!_this.isClose){
+				// 正在编辑图片
+				if(this.isEditImg){
+					// 关闭编辑图片
+					_this.wv.evalJS("vm.closeImgsEdit()")
+				}
+				// 正在拍照
+				else if(this.showPz){
+					// 关闭拍照弹框
+					_this.wv.evalJS("vm.onClosePz()")
+				}else{
+					clzConfirm({
+						title: '提示',
+						content: '巡店还未完成,确定退出吗?',
+						success: function(res) {
+							if (res.confirm || res.index == 0) {
+								_this.isClose = true
+								uni.navigateBack({
+									delta: 1
+								});
+							}
+						}
+					});
+				}
+				
+				return true
 			}
 		},
 		onNavigationBarButtonTap(e) {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


+ 51 - 14
unpackage/dist/dev/app-plus/hybrid/html/css/styles.less

@@ -10,6 +10,20 @@ body{
     height: calc(100vh);
     display: flex;
     flex-direction: column;
+	// 进度条
+	.loading{
+		background: #fff;
+		height: 100%;
+		width: 100%;
+		text-align: center;
+		position: fixed;
+		z-index: 10000;
+		left:0;
+		top:0;
+		.ant-spin{
+			margin-top: 50%;
+		}
+	}
     // 工作区域
     .checkWork{
       flex-grow: 1;
@@ -62,12 +76,27 @@ body{
           width: 26%;
           padding: 1px 0;
           overflow-y: scroll;
-          background: #fff;
           box-shadow: 1px 1px 3px #eee;
           .tabs-items{
             text-align: center;
             padding:8px 5px;
-            border-bottom: 1px solid #f8f8f8;
+			position: relative;
+			margin: 5px;
+			background: #fff;
+			.edit{
+				font-size: 14px;
+				color: #ff0000;
+			}
+			.aicon{
+				color: #fff;
+				position: absolute;
+				font-size: 12px;
+				left: -5px;
+				top: -6px;
+				background: #ff0000;
+				padding: 3px;
+				border-radius: 100%;
+			}
           }
           .tabs-items.active{
             background: #91D5FF;
@@ -180,16 +209,21 @@ body{
   // 拍照弹框
   .pzPopus{
 	  .pz-pinglun{
-		  position: relative;
+		  display: flex;
+		  align-items: center;
+		  .remarks{
+			  flex-grow: 1;
+			  padding-right: 15px;
+		  }
 		  .icons{
-			  position: absolute;
-			  right: 15px;
-			  top: 50%;
-			  margin-top: -26px;
-			  z-index: 1000;
-			  border: 1px solid #eee;
+			  border: 1px solid #aaa;
 			  padding: 10px;
 			  border-radius: 100%;
+			  width: 60px;
+			  height: 60px;
+			  display: flex;
+			  align-items: center;
+			  justify-content: center;
 			  .aicon{
 				  font-size: 30px;
 				  color: #999;
@@ -200,7 +234,7 @@ body{
 		  display: flex;
 		  align-items: center;
 		  flex-wrap: wrap;
-		  padding: 30px 0;
+		  padding: 30px 0 20px;
 		  > div{
 			  position: relative;
 			  padding: 3px;
@@ -212,15 +246,18 @@ body{
 				  height: 45px;
 			  }
 			  .aicon{
+				  color: #fff;
 				  position: absolute;
-				  right: -8px;
+				  font-size: 12px;
+				  right: -6px;
 				  top: -8px;
-				  color: red;
-				  font-size: 16px;
+				  background: #FF0000;
+				  padding: 2px;
+				  border-radius: 100%;
 			  }
 		  }
 	  }
 	  .f-btns{
-		  padding: 10px 20px;
+		  padding: 10px 0;
 	  }
   }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/app-plus/hybrid/html/imgEdit/ped.min.js


BIN=BIN
unpackage/dist/dev/app-plus/hybrid/html/static/imgEdit/empty.png


BIN=BIN
unpackage/dist/dev/app-plus/hybrid/html/static/imgEdit/painting.png


BIN=BIN
unpackage/dist/dev/app-plus/hybrid/html/static/imgEdit/painting1.png


BIN=BIN
unpackage/dist/dev/app-plus/hybrid/html/static/imgEdit/text.png


BIN=BIN
unpackage/dist/dev/app-plus/hybrid/html/static/imgEdit/withdraw.png


+ 58 - 16
unpackage/dist/dev/app-plus/hybrid/html/video.html

@@ -11,6 +11,8 @@
 <script type="text/javascript" charset="utf-8" src="js/moment-with-locales.min.js"></script>
 <link rel="stylesheet" href="antd/antd.min.css" />
 <script type="text/javascript" charset="utf-8" src="antd/antd.min.js"></script>
+<!-- 编辑图片 -->
+<script type="text/javascript" charset="utf-8" src="imgEdit/ped.min.js"></script>
 <!-- 播放器 -->
 <link rel="stylesheet" href="aliplayer/aliplayer-min.css" />
 <script type="text/javascript" charset="utf-8" src="aliplayer/aliplayer-h5-min.js"></script>
@@ -50,7 +52,7 @@
                   <a-menu-item key="5"> 客户休息区 </a-menu-item>
                 </a-menu>
 				<a class="ant-dropdown-link" @click="e => e.preventDefault()">
-				  收银台 <a-icon type="right" />
+				  收银台 <a-icon type="down" />
 				</a>
               </a-dropdown>
             </div>
@@ -87,37 +89,49 @@
       <div class="checkWork-body">
         <div class="checkWork-body-tabs">
           <div class="tabs-items active">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
           <div class="tabs-items">
+			<div v-if="isDelItem"><a-icon class="aicon" type="close" /></div>
             <div>正常营业</div>
             <div>0/4</div>
           </div>
+		  <div class="tabs-items">
+		    <div class="edit" v-if="!isDelItem" @click="isDelItem=true">编辑</div>
+			<div class="edit" @click="isDelItem=false" v-else>取消编辑</div>
+		  </div>
         </div>
         <div class="checkWork-body-tabCons">
           <div class="tabCons-items">
@@ -128,8 +142,8 @@
             </div>
 			<!-- 拍照图片 -->
 			<div class="photos">
-				<div><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
-				<div><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
+				<div @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')"><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
+				<div @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')"><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
 			</div>
 			<!-- 评分 -->
             <div>
@@ -163,20 +177,22 @@
 	  <div class="pzPopus">
 		  <!-- 评论 -->
 		  <div class="pz-pinglun">
-			  <div><a-textarea placeholder="请填写备注内容(选填)" :rows="4" /></div>
-			  <span class="icons">
+			  <div class="remarks">
+				  <a-textarea placeholder="请填写备注内容(选填)" :rows="4" />
+			  </div>
+			  <div class="icons">
 				  <a-icon class="aicon" type="camera" />
-			  </span>
+			  </div>
 		  </div>
 		  <!-- 图片列表 -->
 		  <div class="imglist">
 			  <div>
 				  <img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
-				  <a-icon class="aicon" type="close-circle" />
+				  <a-icon class="aicon" type="close" />
 			  </div>
 			  <div>
 				  <img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
-				  <a-icon class="aicon" type="close-circle" />
+				  <a-icon class="aicon" type="close" />
 			  </div>
 		  </div>
 		  <!-- 提交 -->
@@ -185,8 +201,18 @@
 		  </div>
 	  </div>
 	</a-drawer>
+	
+	<!-- 加载条 -->
+	<div v-if="showLoading" class="loading">
+	    <a-spin />
+	</div>
   </div>
 <script>
+	window.onload = function(){
+		vm.showLoading = false
+	}
+	
+	// 初始化vm 实例
 	var vm = new Vue({
 	  el: '#app',
 	  data: {
@@ -194,6 +220,10 @@
 		  showYt: false, // 显示云台控制
 		  showYtbtns: false,
 		  showPz: false,// 显示拍照弹框
+		  isDelItem: false, // 是否显示考评项删除按钮
+		  showLoading: true, // 页面加载条
+		  isEditImg: false, // 是否编辑图片
+		  PED: null, // 图片编辑对象
 		},
 		mounted () {
 		  this.videoInit()
@@ -207,7 +237,7 @@
 			  // 初始化播放器
 			  _this.player = new Aliplayer({
 			    'id': 'player-con',
-			    'source': 'https://play.zyucgj.com/live/34020000001320000001.m3u8?auth_key=1599027535-0-0-621dab70e039a552649ccd535d1cc3f9',
+			    'source': 'https://player.alicdn.com/video/aliyunmedia.mp4',
 			    'width': '100%',
 			    'height': '240px',
 			    'autoplay': false,
@@ -253,10 +283,10 @@
 			            'y': 8
 			          },
 			          {
-			            'name': 'snapshot',
+			            'name': 'liveDisplay',
 			            'align': 'tl',
 			            'x': 15,
-			            'y': 8
+			            'y': 2
 			          }
 			        ]
 			      }
@@ -265,11 +295,6 @@
 			    _this.sendMsg('message','The player is created')
 			  }
 			  )
-			  /* h5截图按钮, 截图成功回调 */
-			  _this.player.on('snapshoted', function (data) {
-			    const pictureData = data.paramData.base64
-			    _this.sendMsg('snapshoted','截图成功回调')
-			  })
 			  // 控制栏
 			  _this.player.on('playing', function () {
 			    _this.showYt = true
@@ -299,10 +324,27 @@
 		  // 打开拍照
 		  openCamera(){
 			 this.showPz = true
+			 this.sendMsg('getWinStatus',JSON.stringify({key:'showPz',val: true}))
 		  },
 		  // 关闭拍照弹框
 		  onClosePz(){
 			  this.showPz = false
+			  this.sendMsg('getWinStatus',JSON.stringify({key:'showPz',val: false}))
+		  },
+		  // 预览图片
+		  previewImgs(url){
+			   let _this = this
+			   _this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: true}))
+			   this.PED = new window.PED.imageInfo(url,function(data){
+				   console.log(data)
+				   _this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: false}))
+			   })
+		  },
+		  // 关闭图片编辑
+		  closeImgsEdit(){
+			  console.log('0000000000000000')
+			  this.PED.hidePED()
+			  this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: false}))
 		  }
 		}
 	})

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio