瀏覽代碼

Merge branch 'master' of http://192.168.32.253:3000/Software/android-cloud-H5

huangxiaojing 3 年之前
父節點
當前提交
c739cbf8c0
共有 54 個文件被更改,包括 1017 次插入61 次删除
  1. 29 21
      microserviceUserH5/static/css/maJiaBaoGoApp.css
  2. 二進制
      microserviceUserH5/static/img/border-btn.png
  3. 二進制
      microserviceUserH5/static/img/border-close.png
  4. 二進制
      microserviceUserH5/static/img/border-text.png
  5. 二進制
      microserviceUserH5/static/img/border.png
  6. 二進制
      microserviceUserH5/static/img/btn-text.png
  7. 二進制
      microserviceUserH5/static/img/downLoadText.png
  8. 二進制
      microserviceUserH5/static/img/fullAttendAssistant/bg.png
  9. 二進制
      microserviceUserH5/static/img/fullAttendAssistant/border.png
  10. 二進制
      microserviceUserH5/static/img/fullAttendAssistant/btn.png
  11. 二進制
      microserviceUserH5/static/img/fullAttendAssistant/close.png
  12. 二進制
      microserviceUserH5/static/img/fullAttendAssistant/download-bg.png
  13. 二進制
      microserviceUserH5/static/img/fullAttendAssistant/download-text.png
  14. 二進制
      microserviceUserH5/static/img/fullAttendAssistant/fullAttend.png
  15. 二進制
      microserviceUserH5/static/img/homeAttence/bg.png
  16. 二進制
      microserviceUserH5/static/img/homeAttence/border.png
  17. 二進制
      microserviceUserH5/static/img/homeAttence/btn.png
  18. 二進制
      microserviceUserH5/static/img/homeAttence/close.png
  19. 二進制
      microserviceUserH5/static/img/homeAttence/download-bg.png
  20. 二進制
      microserviceUserH5/static/img/homeAttence/download-text.png
  21. 二進制
      microserviceUserH5/static/img/homeAttence/home.png
  22. 二進制
      microserviceUserH5/static/img/ios-text.png
  23. 二進制
      microserviceUserH5/static/img/ios-title.png
  24. 二進制
      microserviceUserH5/static/img/maJiaBaoGoAppBag.png
  25. 二進制
      microserviceUserH5/static/img/pangda/bg.png
  26. 二進制
      microserviceUserH5/static/img/pangda/border.png
  27. 二進制
      microserviceUserH5/static/img/pangda/btn.png
  28. 二進制
      microserviceUserH5/static/img/pangda/close.png
  29. 二進制
      microserviceUserH5/static/img/pangda/download-bg.png
  30. 二進制
      microserviceUserH5/static/img/pangda/download-text.png
  31. 二進制
      microserviceUserH5/static/img/pangda/pangda.png
  32. 二進制
      microserviceUserH5/static/img/procedure.png
  33. 二進制
      microserviceUserH5/static/img/shuangzixing/bg.png
  34. 二進制
      microserviceUserH5/static/img/shuangzixing/btn.png
  35. 二進制
      microserviceUserH5/static/img/shuangzixing/下载双子星云手机APP@2x.png
  36. 二進制
      microserviceUserH5/static/img/snail.png
  37. 二進制
      microserviceUserH5/static/img/zhenxiangAttence/bg.png
  38. 二進制
      microserviceUserH5/static/img/zhenxiangAttence/border.png
  39. 二進制
      microserviceUserH5/static/img/zhenxiangAttence/btn.png
  40. 二進制
      microserviceUserH5/static/img/zhenxiangAttence/close.png
  41. 二進制
      microserviceUserH5/static/img/zhenxiangAttence/download-bg.png
  42. 二進制
      microserviceUserH5/static/img/zhenxiangAttence/download-text.png
  43. 二進制
      microserviceUserH5/static/img/zhenxiangAttence/zhenxiang.png
  44. 104 0
      microserviceUserH5/vcloud/courseGoApp.html
  45. 168 0
      microserviceUserH5/vcloud/fullAttendAssistant.html
  46. 168 0
      microserviceUserH5/vcloud/homeAttence.html
  47. 49 14
      microserviceUserH5/vcloud/maJiaBaoGoApp.html
  48. 168 0
      microserviceUserH5/vcloud/pangdaAttence.html
  49. 133 0
      microserviceUserH5/vcloud/shuangzixingGoApp.html
  50. 172 0
      microserviceUserH5/vcloud/zhenxiangAttence.html
  51. 11 11
      screenAndroid/WXtrialInterface.html
  52. 2 2
      screenAndroid/css/WXtrialInterface.css
  53. 11 11
      screenIos/WXtrialInterface.html
  54. 2 2
      screenIos/css/WXtrialInterface.css

+ 29 - 21
microserviceUserH5/static/css/maJiaBaoGoApp.css

@@ -24,14 +24,14 @@ ul, li {
   width: 7.5rem;
   height: 100vh;
   margin: 0 auto;
-  background: url(../img/maJiaBaoGoAppBag.png);
+  /* background: url(../img/maJiaBaoGoAppBag.png);
   background-repeat: no-repeat;
-  background-size: 7.5rem 100vh;
+  background-size: 7.5rem 100vh; */
 }
 
 .btn-content{
   position: absolute;
-  bottom: 2rem;
+  bottom: 3rem;
   left: 1.12rem;
 }
 
@@ -87,36 +87,44 @@ ul, li {
 }
 
 .border-close{
-  width: 0.44rem;
-  height: 0.44rem;
+  width: 1.8rem;
+  height: 0.52rem;
   position: absolute;
-  right: 2.32rem;
-  bottom: 0.06rem;
+  right: 1.62rem;
+  bottom: -0.52rem;
 }
 
 .border-text {
-  width: 4.20rem;
-  height: 1.26rem;
+  width: 3.40rem;
+  height: 0.35rem;
+  position: absolute;
+  right: 0.74rem;
+  top: 1.01rem;
+}
+
+.border-btn {
+  width: 4rem;
+  height: 0.54rem;
   position: absolute;
-  right: 0.32rem;
-  top: 0.61rem;
+  right: 0.53rem;
+  bottom: 0.53rem;
 }
 
-.ios-text {
-  width: 2.56rem;
-  height: 0.42rem;
+.btn-text{
+  width: 3.67rem;
+  height: 0.31rem;
   position: absolute;
-  right: 1.28rem;
-  top: -0.21rem;
+  right: 0.7rem;
+  bottom: 0.64rem;
   z-index: 99;
 }
 
-.ios-title{
-  width: 3.46rem;
-  height: 0.76rem;
+.small-routine{
+  width: 3.02rem;
+  height: 3.02rem;
   position: absolute;
-  right: 0.8rem;
-  top: -0.4rem;
+  right: 1.02rem;
+  top: 1.83rem;
 }
 
 .head-list{

二進制
microserviceUserH5/static/img/border-btn.png


二進制
microserviceUserH5/static/img/border-close.png


二進制
microserviceUserH5/static/img/border-text.png


二進制
microserviceUserH5/static/img/border.png


二進制
microserviceUserH5/static/img/btn-text.png


二進制
microserviceUserH5/static/img/downLoadText.png


二進制
microserviceUserH5/static/img/fullAttendAssistant/bg.png


二進制
microserviceUserH5/static/img/fullAttendAssistant/border.png


二進制
microserviceUserH5/static/img/fullAttendAssistant/btn.png


二進制
microserviceUserH5/static/img/fullAttendAssistant/close.png


二進制
microserviceUserH5/static/img/fullAttendAssistant/download-bg.png


二進制
microserviceUserH5/static/img/fullAttendAssistant/download-text.png


二進制
microserviceUserH5/static/img/fullAttendAssistant/fullAttend.png


二進制
microserviceUserH5/static/img/homeAttence/bg.png


二進制
microserviceUserH5/static/img/homeAttence/border.png


二進制
microserviceUserH5/static/img/homeAttence/btn.png


二進制
microserviceUserH5/static/img/homeAttence/close.png


二進制
microserviceUserH5/static/img/homeAttence/download-bg.png


二進制
microserviceUserH5/static/img/homeAttence/download-text.png


二進制
microserviceUserH5/static/img/homeAttence/home.png


二進制
microserviceUserH5/static/img/ios-text.png


二進制
microserviceUserH5/static/img/ios-title.png


二進制
microserviceUserH5/static/img/maJiaBaoGoAppBag.png


二進制
microserviceUserH5/static/img/pangda/bg.png


二進制
microserviceUserH5/static/img/pangda/border.png


二進制
microserviceUserH5/static/img/pangda/btn.png


二進制
microserviceUserH5/static/img/pangda/close.png


二進制
microserviceUserH5/static/img/pangda/download-bg.png


二進制
microserviceUserH5/static/img/pangda/download-text.png


二進制
microserviceUserH5/static/img/pangda/pangda.png


二進制
microserviceUserH5/static/img/procedure.png


二進制
microserviceUserH5/static/img/shuangzixing/bg.png


二進制
microserviceUserH5/static/img/shuangzixing/btn.png


二進制
microserviceUserH5/static/img/shuangzixing/下载双子星云手机APP@2x.png


二進制
microserviceUserH5/static/img/snail.png


二進制
microserviceUserH5/static/img/zhenxiangAttence/bg.png


二進制
microserviceUserH5/static/img/zhenxiangAttence/border.png


二進制
microserviceUserH5/static/img/zhenxiangAttence/btn.png


二進制
microserviceUserH5/static/img/zhenxiangAttence/close.png


二進制
microserviceUserH5/static/img/zhenxiangAttence/download-bg.png


二進制
microserviceUserH5/static/img/zhenxiangAttence/download-text.png


二進制
microserviceUserH5/static/img/zhenxiangAttence/zhenxiang.png


+ 104 - 0
microserviceUserH5/vcloud/courseGoApp.html

@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<title>下载APP</title>
+	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
+	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
+	<script src="../static/js/vender/jquery-3.4.1.min.js"></script>
+	<script src="../static/js/vender/toastr/toastr.min.js"></script>
+	<script src="../static/js/vender/config.js"></script>
+	<style>
+		@media screen and (max-width: 750px) {
+		html {
+			font-size: calc(100vw / 7.5);
+		}
+		}
+
+		@media screen and (min-width: 750px) {
+		html {
+			font-size: calc(450px / 7.5);
+		}
+		}
+
+		html, body, div, ul, li, p {
+		padding: 0;
+		margin: 0;
+		}
+
+		ul, li {
+		list-style: none;
+		}
+
+		.code-container{
+			margin: 0;
+			padding: 0;
+		}
+		.img{
+			width: 7.5rem;
+			min-height: 100vh;
+		}
+	</style>
+</head>
+
+<body>
+	<div class="code-container">
+		<image class="img" src="../static/img/procedure.png"></image>
+	</div>
+	<script>
+		toastr.options.positionClass = 'toast-center-center';
+		toastr.options.timeOut = '1500';
+	</script>
+	<script type="text/javascript">
+	    let timer,flag = true;
+		var url = window.location.href;
+		url = url.split('/')
+		var loc = window.location.search,
+		    n1 = loc.length,//地址的总长度
+		    n2 = loc.indexOf("="),//取得=号的位置
+		    id = loc.substr(n2 + 1, n1 - n2),//从=号后面的内容
+			u = navigator.userAgent,
+			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
+			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+		//埋点
+		if(isAndroid){
+			operate(id);
+		}
+		if(isiOS){
+			const pointName = id + '_IOS'
+			operate(pointName);
+		}
+		function operate(pointName,type){
+			$.ajax({
+				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
+				type: 'post',
+				data:JSON.stringify({
+					pointName: pointName
+				}),
+				contentType:"application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status !== 0){
+						stopManyClick(() =>{
+							toastr.error(res.msg)
+						})
+					}
+				},
+			})
+		}
+		//防止提示一秒内重复显示
+		function stopManyClick(fn) {
+			if (flag) {
+				fn();
+			}
+			flag = false;
+			if(timer){clearTimeout(timer);}
+			timer = setTimeout(() => {flag = true}, 1500);
+		}
+	</script>
+</body>
+
+</html>

+ 168 - 0
microserviceUserH5/vcloud/fullAttendAssistant.html

@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<title>下载APP</title>
+	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
+	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
+	<link rel="stylesheet" href="../static/css/maJiaBaoGoApp.css">
+	<script src="../static/js/vender/jquery-3.4.1.min.js"></script>
+	<script src="../static/js/vender/toastr/toastr.min.js"></script>
+	<script src="../static/js/vender/config.js"></script>
+	<style>
+		.code-container {
+			background: url(../static/img/fullAttendAssistant/bg.png);
+			background-repeat: no-repeat;
+			background-size: 7.5rem 100vh;
+		}
+	</style>
+</head>
+
+<body>
+	<div class="code-container">
+		<div class="btn-content">
+			<img class="download-app" src="../static/img/fullAttendAssistant/download-bg.png" />
+			<img class="download-text" src="../static/img/fullAttendAssistant/download-text.png" />
+		</div>
+		<div class="mask">
+			<div class="point">
+				<img class="point-img" src="../static/img/point.png" />
+			</div>
+			<div class="dialog">
+			    <img class="border" src="../static/img/fullAttendAssistant/border.png" />
+			    <img class="border-close" src="../static/img/fullAttendAssistant/close.png" />
+			    <img class="border-text" src="../static/img/border-text.png" />
+			    <img class="border-btn" src="../static/img/fullAttendAssistant/btn.png" />
+			    <img class="small-routine" src="../static/img/fullAttendAssistant/fullAttend.png" id="picurl" />
+			    <img class="btn-text" src="../static/img/btn-text.png" />
+			</div>
+		</div>
+	</div>
+	<script>
+		toastr.options.positionClass = 'toast-center-center';
+		toastr.options.timeOut = '1500';
+	</script>
+	<script type="text/javascript">
+        // var baseUrl = 'http://14.215.128.96/'
+	    let timer,flag = true;
+		var url = window.location.href;
+		url = url.split('/')
+		var loc = window.location.search,
+		    n1 = loc.length,//地址的总长度
+		    n2 = loc.indexOf("="),//取得=号的位置
+		    id = loc.substr(n2 + 1, n1 - n2),//从=号后面的内容
+			u = navigator.userAgent,
+			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
+			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+		//埋点
+		if(isAndroid){
+			operate(id);
+		}
+		if(isiOS){
+			const pointName = id + '_IOS'
+			operate(pointName);
+		}
+		function operate(pointName,type){
+			$.ajax({
+				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
+				type: 'post',
+				data:JSON.stringify({
+					pointName: pointName
+				}),
+				contentType:"application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(isAndroid && type === 'click'){
+						getAppDownload();
+					}
+				},
+			})
+		}
+		//点击下载APP
+	    $('.btn-content')[0].addEventListener('click',()=>{
+			var ua = navigator.userAgent.toLowerCase();
+			if(ua.match(/MicroMessenger/i)=="micromessenger" || ua.match(/QQ\/[0-9]/i)){
+				$('.point').animate({top: '0.1rem'},"fast");
+				$('.mask').css('background','rgba(0,0,0,0.7)');
+				$('.mask').show();
+				document.documentElement.style.overflow='hidden';
+			}else if(isAndroid){
+				const pointName = id + '_click'
+		        operate(pointName,'click');
+			}else if(isiOS){
+				const pointName = id + '_IOS_click'
+				operate(pointName);
+				$('.dialog').animate({top: '4.36rem'},"fast");
+				$('.mask').show();
+				document.documentElement.style.overflow='hidden';
+			}
+		},false);
+		//关闭
+	    $('.border-close')[0].addEventListener('click',handleClose,false);
+		function handleClose() {
+			$('.dialog').animate({top: '-6.96rem'},"fast");
+			$('.mask').hide();
+			document.documentElement.style.overflow='auto';
+		}
+		//调用下载接口
+		function getAppDownload(){
+			$.ajax({
+				url: baseUrl + '/api/user/v1/ditchClient/addChannelAppDownload',
+				type: 'post',
+				data:JSON.stringify({
+					code:"ZWwP6rQ47mGm",
+					type: "5",
+					platform:"1",
+					version:""
+				}),
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status === 0){
+						window.location.href = baseUrl + '/file-center/fileOperate/downloadFile?id=173771';
+					}else{
+						stopManyClick(() =>{
+							toastr.error(res.msg)
+						})
+					}
+				},
+			})
+		}
+		//保存到相册
+	    $('.btn-text')[0].addEventListener('click',savePic,false);
+		function savePic(){         
+			var picurl= $("#picurl").attr("src");
+			savePicture(picurl);
+		}
+		//保存图片
+		function savePicture(Url){
+			var blob=new Blob([''], {type:'application/octet-stream'});
+			var url = URL.createObjectURL(blob);
+			var a = document.createElement('a');
+			a.href = Url;
+			a.download = Url.replace(/(.*\/)*([^.]+.*)/ig,"$2").split("?")[0];
+			var e = document.createEvent('MouseEvents');
+			e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			a.dispatchEvent(e);
+			URL.revokeObjectURL(url);
+			stopManyClick(() =>{
+				toastr.error('保存成功!')
+			})
+		}
+		//防止提示一秒内重复显示
+		function stopManyClick(fn) {
+			if (flag) {
+				fn();
+			}
+			flag = false;
+			if(timer){clearTimeout(timer);}
+			timer = setTimeout(() => {flag = true}, 1500);
+		}
+	</script>
+</body>
+
+</html>

+ 168 - 0
microserviceUserH5/vcloud/homeAttence.html

@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<title>下载APP</title>
+	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
+	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
+	<link rel="stylesheet" href="../static/css/maJiaBaoGoApp.css">
+	<script src="../static/js/vender/jquery-3.4.1.min.js"></script>
+	<script src="../static/js/vender/toastr/toastr.min.js"></script>
+	<script src="../static/js/vender/config.js"></script>
+	<style>
+		.code-container {
+			background: url(../static/img/homeAttence/bg.png);
+			background-repeat: no-repeat;
+			background-size: 7.5rem 100vh;
+		}
+	</style>
+</head>
+
+<body>
+	<div class="code-container">
+		<div class="btn-content">
+			<img class="download-app" src="../static/img/homeAttence/download-bg.png" />
+			<img class="download-text" src="../static/img/homeAttence/download-text.png" />
+		</div>
+		<div class="mask">
+			<div class="point">
+				<img class="point-img" src="../static/img/point.png" />
+			</div>
+			<div class="dialog">
+			    <img class="border" src="../static/img/homeAttence/border.png" />
+			    <img class="border-close" src="../static/img/homeAttence/close.png" />
+			    <img class="border-text" src="../static/img/border-text.png" />
+			    <img class="border-btn" src="../static/img/homeAttence/btn.png" />
+			    <img class="small-routine" src="../static/img/homeAttence/home.png" id="picurl" />
+			    <img class="btn-text" src="../static/img/btn-text.png" />
+			</div>
+		</div>
+	</div>
+	<script>
+		toastr.options.positionClass = 'toast-center-center';
+		toastr.options.timeOut = '1500';
+	</script>
+	<script type="text/javascript">
+        // var baseUrl = 'http://14.215.128.96/'
+	    let timer,flag = true;
+		var url = window.location.href;
+		url = url.split('/')
+		var loc = window.location.search,
+		    n1 = loc.length,//地址的总长度
+		    n2 = loc.indexOf("="),//取得=号的位置
+		    id = loc.substr(n2 + 1, n1 - n2),//从=号后面的内容
+			u = navigator.userAgent,
+			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
+			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+		//埋点
+		if(isAndroid){
+			operate(id);
+		}
+		if(isiOS){
+			const pointName = id + '_IOS'
+			operate(pointName);
+		}
+		function operate(pointName,type){
+			$.ajax({
+				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
+				type: 'post',
+				data:JSON.stringify({
+					pointName: pointName
+				}),
+				contentType:"application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(isAndroid && type === 'click'){
+						getAppDownload();
+					}
+				},
+			})
+		}
+		//点击下载APP
+	    $('.btn-content')[0].addEventListener('click',()=>{
+			var ua = navigator.userAgent.toLowerCase();
+			if(ua.match(/MicroMessenger/i)=="micromessenger" || ua.match(/QQ\/[0-9]/i)){
+				$('.point').animate({top: '0.1rem'},"fast");
+				$('.mask').css('background','rgba(0,0,0,0.7)');
+				$('.mask').show();
+				document.documentElement.style.overflow='hidden';
+			}else if(isAndroid){
+				const pointName = id + '_click'
+		        operate(pointName,'click');
+			}else if(isiOS){
+				const pointName = id + '_IOS_click'
+				operate(pointName);
+				$('.dialog').animate({top: '4.36rem'},"fast");
+				$('.mask').show();
+				document.documentElement.style.overflow='hidden';
+			}
+		},false);
+		//关闭
+	    $('.border-close')[0].addEventListener('click',handleClose,false);
+		function handleClose() {
+			$('.dialog').animate({top: '-6.96rem'},"fast");
+			$('.mask').hide();
+			document.documentElement.style.overflow='auto';
+		}
+		//调用下载接口
+		function getAppDownload(){
+			$.ajax({
+				url: baseUrl + '/api/user/v1/ditchClient/addChannelAppDownload',
+				type: 'post',
+				data:JSON.stringify({
+					code:"IvM92GZoWHvs",
+					type: "5",
+					platform:"1",
+					version:""
+				}),
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status === 0){
+						window.location.href = baseUrl + '/file-center/fileOperate/downloadFile?id=173773';
+					}else{
+						stopManyClick(() =>{
+							toastr.error(res.msg)
+						})
+					}
+				},
+			})
+		}
+		//保存到相册
+	    $('.btn-text')[0].addEventListener('click',savePic,false);
+		function savePic(){         
+			var picurl= $("#picurl").attr("src");
+			savePicture(picurl);
+		}
+		//保存图片
+		function savePicture(Url){
+			var blob=new Blob([''], {type:'application/octet-stream'});
+			var url = URL.createObjectURL(blob);
+			var a = document.createElement('a');
+			a.href = Url;
+			a.download = Url.replace(/(.*\/)*([^.]+.*)/ig,"$2").split("?")[0];
+			var e = document.createEvent('MouseEvents');
+			e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			a.dispatchEvent(e);
+			URL.revokeObjectURL(url);
+			stopManyClick(() =>{
+				toastr.error('保存成功!')
+			})
+		}
+		//防止提示一秒内重复显示
+		function stopManyClick(fn) {
+			if (flag) {
+				fn();
+			}
+			flag = false;
+			if(timer){clearTimeout(timer);}
+			timer = setTimeout(() => {flag = true}, 1500);
+		}
+	</script>
+</body>
+
+</html>

+ 49 - 14
microserviceUserH5/vcloud/maJiaBaoGoApp.html

@@ -11,6 +11,13 @@
 	<script src="../static/js/vender/jquery-3.4.1.min.js"></script>
 	<script src="../static/js/vender/toastr/toastr.min.js"></script>
 	<script src="../static/js/vender/config.js"></script>
+	<style>
+		.code-container {
+			background: url(../static/img/maJiaBaoGoAppBag.png);
+			background-repeat: no-repeat;
+			background-size: 7.5rem 100vh;
+		}
+	</style>
 </head>
 
 <body>
@@ -27,8 +34,9 @@
 			    <img class="border" src="../static/img/border.png" />
 			    <img class="border-close" src="../static/img/border-close.png" />
 			    <img class="border-text" src="../static/img/border-text.png" />
-			    <img class="ios-text" src="../static/img/ios-text.png" />
-			    <img class="ios-title" src="../static/img/ios-title.png" />
+			    <img class="border-btn" src="../static/img/border-btn.png" />
+			    <img class="small-routine" src="../static/img/snail.png" id="picurl" />
+			    <img class="btn-text" src="../static/img/btn-text.png" />
 			</div>
 		</div>
 	</div>
@@ -37,7 +45,6 @@
 		toastr.options.timeOut = '1500';
 	</script>
 	<script type="text/javascript">
-        var baseUrl = 'http://client.androidscloud.com'
 	    let timer,flag = true;
 		var url = window.location.href;
 		url = url.split('/')
@@ -49,21 +56,25 @@
 			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
 		//埋点
-		operate(3);
-		function operate(accessType){
+		if(isAndroid){
+			operate(id);
+		}
+		if(isiOS){
+			const pointName = id + '_IOS'
+			operate(pointName);
+		}
+		function operate(pointName,type){
 			$.ajax({
-				url: baseUrl + '/api/public/v1/game/user/operate',
+				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
 				type: 'post',
 				data:JSON.stringify({
-					accessType: accessType,
-					entrance: id,
-					url: window.location.href
+					pointName: pointName
 				}),
 				contentType:"application/json",
 				dataType: 'json',
 				cache: false,
 				success: function (res) {
-					if(accessType === 1 && isAndroid){
+					if(isAndroid && type === 'click'){
 						getAppDownload();
 					}
 				},
@@ -78,9 +89,11 @@
 				$('.mask').show();
 				document.documentElement.style.overflow='hidden';
 			}else if(isAndroid){
-		        operate(1);
+				const pointName = id + '_click'
+		        operate(pointName,'click');
 			}else if(isiOS){
-				operate(1);
+				const pointName = id + '_IOS_click'
+				operate(pointName);
 				$('.dialog').animate({top: '4.36rem'},"fast");
 				$('.mask').show();
 				document.documentElement.style.overflow='hidden';
@@ -100,15 +113,16 @@
 				type: 'post',
 				data:JSON.stringify({
 					code:"Q4796f4k26ST",
+					type: "5",
 					platform:"1",
-					version:"pD7J72l6TpN7"
+					version:""
 				}),
 				contentType: "application/json",
 				dataType: 'json',
 				cache: false,
 				success: function (res) {
 					if(res.status === 0){
-						window.location.href = baseUrl + '/file-center/fileOperate/downloadFile?id=169403';
+						window.location.href = baseUrl + '/file-center/fileOperate/downloadFile?id=173767';
 					}else{
 						stopManyClick(() =>{
 							toastr.error(res.msg)
@@ -117,6 +131,27 @@
 				},
 			})
 		}
+		//保存到相册
+	    $('.btn-text')[0].addEventListener('click',savePic,false);
+		function savePic(){         
+			var picurl= $("#picurl").attr("src");
+			savePicture(picurl);
+		}
+		//保存图片
+		function savePicture(Url){
+			var blob=new Blob([''], {type:'application/octet-stream'});
+			var url = URL.createObjectURL(blob);
+			var a = document.createElement('a');
+			a.href = Url;
+			a.download = Url.replace(/(.*\/)*([^.]+.*)/ig,"$2").split("?")[0];
+			var e = document.createEvent('MouseEvents');
+			e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			a.dispatchEvent(e);
+			URL.revokeObjectURL(url);
+			stopManyClick(() =>{
+				toastr.error('保存成功!')
+			})
+		}
 		//防止提示一秒内重复显示
 		function stopManyClick(fn) {
 			if (flag) {

+ 168 - 0
microserviceUserH5/vcloud/pangdaAttence.html

@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<title>下载APP</title>
+	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
+	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
+	<link rel="stylesheet" href="../static/css/maJiaBaoGoApp.css">
+	<script src="../static/js/vender/jquery-3.4.1.min.js"></script>
+	<script src="../static/js/vender/toastr/toastr.min.js"></script>
+	<script src="../static/js/vender/config.js"></script>
+	<style>
+		.code-container {
+			background: url(../static/img/pangda/bg.png);
+			background-repeat: no-repeat;
+			background-size: 7.5rem 100vh;
+		}
+	</style>
+</head>
+
+<body>
+	<div class="code-container">
+		<div class="btn-content">
+			<img class="download-app" src="../static/img/pangda/download-bg.png" />
+			<img class="download-text" src="../static/img/pangda/download-text.png" />
+		</div>
+		<div class="mask">
+			<div class="point">
+				<img class="point-img" src="../static/img/point.png" />
+			</div>
+			<div class="dialog">
+			    <img class="border" src="../static/img/pangda/border.png" />
+			    <img class="border-close" src="../static/img/pangda/close.png" />
+			    <img class="border-text" src="../static/img/border-text.png" />
+			    <img class="border-btn" src="../static/img/pangda/btn.png" />
+			    <img class="small-routine" src="../static/img/pangda/pangda.png" id="picurl" />
+			    <img class="btn-text" src="../static/img/btn-text.png" />
+			</div>
+		</div>
+	</div>
+	<script>
+		toastr.options.positionClass = 'toast-center-center';
+		toastr.options.timeOut = '1500';
+	</script>
+	<script type="text/javascript">
+        // var baseUrl = 'http://14.215.128.96/'
+	    let timer,flag = true;
+		var url = window.location.href;
+		url = url.split('/')
+		var loc = window.location.search,
+		    n1 = loc.length,//地址的总长度
+		    n2 = loc.indexOf("="),//取得=号的位置
+		    id = loc.substr(n2 + 1, n1 - n2),//从=号后面的内容
+			u = navigator.userAgent,
+			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
+			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+		//埋点
+		if(isAndroid){
+			operate(id);
+		}
+		if(isiOS){
+			const pointName = id + '_IOS'
+			operate(pointName);
+		}
+		function operate(pointName,type){
+			$.ajax({
+				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
+				type: 'post',
+				data:JSON.stringify({
+					pointName: pointName
+				}),
+				contentType:"application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(isAndroid && type === 'click'){
+						getAppDownload();
+					}
+				},
+			})
+		}
+		//点击下载APP
+	    $('.btn-content')[0].addEventListener('click',()=>{
+			var ua = navigator.userAgent.toLowerCase();
+			if(ua.match(/MicroMessenger/i)=="micromessenger" || ua.match(/QQ\/[0-9]/i)){
+				$('.point').animate({top: '0.1rem'},"fast");
+				$('.mask').css('background','rgba(0,0,0,0.7)');
+				$('.mask').show();
+				document.documentElement.style.overflow='hidden';
+			}else if(isAndroid){
+				const pointName = id + '_click'
+		        operate(pointName,'click');
+			}else if(isiOS){
+				const pointName = id + '_IOS_click'
+				operate(pointName);
+				$('.dialog').animate({top: '4.36rem'},"fast");
+				$('.mask').show();
+				document.documentElement.style.overflow='hidden';
+			}
+		},false);
+		//关闭
+	    $('.border-close')[0].addEventListener('click',handleClose,false);
+		function handleClose() {
+			$('.dialog').animate({top: '-6.96rem'},"fast");
+			$('.mask').hide();
+			document.documentElement.style.overflow='auto';
+		}
+		//调用下载接口
+		function getAppDownload(){
+			$.ajax({
+				url: baseUrl + '/api/user/v1/ditchClient/addChannelAppDownload',
+				type: 'post',
+				data:JSON.stringify({
+					code:"j2Di592n8374",
+					type: "5",
+					platform:"1",
+					version:""
+				}),
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status === 0){
+						window.location.href = baseUrl + '/file-center/fileOperate/downloadFile?id=173775';
+					}else{
+						stopManyClick(() =>{
+							toastr.error(res.msg)
+						})
+					}
+				},
+			})
+		}
+		//保存到相册
+	    $('.btn-text')[0].addEventListener('click',savePic,false);
+		function savePic(){         
+			var picurl= $("#picurl").attr("src");
+			savePicture(picurl);
+		}
+		//保存图片
+		function savePicture(Url){
+			var blob=new Blob([''], {type:'application/octet-stream'});
+			var url = URL.createObjectURL(blob);
+			var a = document.createElement('a');
+			a.href = Url;
+			a.download = Url.replace(/(.*\/)*([^.]+.*)/ig,"$2").split("?")[0];
+			var e = document.createEvent('MouseEvents');
+			e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			a.dispatchEvent(e);
+			URL.revokeObjectURL(url);
+			stopManyClick(() =>{
+				toastr.error('保存成功!')
+			})
+		}
+		//防止提示一秒内重复显示
+		function stopManyClick(fn) {
+			if (flag) {
+				fn();
+			}
+			flag = false;
+			if(timer){clearTimeout(timer);}
+			timer = setTimeout(() => {flag = true}, 1500);
+		}
+	</script>
+</body>
+
+</html>

+ 133 - 0
microserviceUserH5/vcloud/shuangzixingGoApp.html

@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<title>下载APP</title>
+	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
+	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
+	<link rel="stylesheet" href="../static/css/maJiaBaoGoApp.css">
+	<script src="../static/js/vender/jquery-3.4.1.min.js"></script>
+	<script src="../static/js/vender/toastr/toastr.min.js"></script>
+	<script src="../static/js/vender/config.js"></script>
+	<style>
+		.code-container {
+			background: url(../static/img/shuangzixing/bg.png);
+			background-repeat: no-repeat;
+			background-size: 7.5rem 100vh;
+		}
+		.download-app{
+			width: 5.39rem;
+		}
+		.download-text{
+			width: 4.04rem;
+			left: 0.59rem;
+		}
+	</style>
+</head>
+
+<body>
+	<div class="code-container">
+		<div class="btn-content">
+			<img class="download-app" src="../static/img/shuangzixing/btn.png" />
+			<img class="download-text" src="../static/img/shuangzixing/down_text.png" />
+		</div>
+		<div class="mask">
+			<div class="point">
+				<img class="point-img" src="../static/img/point.png" />
+			</div>
+		</div>
+	</div>
+	<script>
+		toastr.options.positionClass = 'toast-center-center';
+		toastr.options.timeOut = '1500';
+	</script>
+	<script type="text/javascript">
+	    let timer,flag = true;
+		var url = window.location.href;
+		url = url.split('/')
+		var loc = window.location.search,
+		    n1 = loc.length,//地址的总长度
+		    n2 = loc.indexOf("="),//取得=号的位置
+		    id = loc.substr(n2 + 1, n1 - n2),//从=号后面的内容
+			u = navigator.userAgent,
+			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
+			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+		//埋点
+		if(isAndroid){
+			operate('dt_znyj_android_page');
+		}
+		if(isiOS){
+			operate('dt_znyj_ios­­_page');
+		}
+		function operate(pointName,type){
+			$.ajax({
+				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
+				type: 'post',
+				data:JSON.stringify({
+					pointName: pointName
+				}),
+				contentType:"application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(isAndroid && type === 'click'){
+						getAppDownload();
+					}
+				},
+			})
+		}
+		//点击下载APP
+	    $('.btn-content')[0].addEventListener('click',()=>{
+			var ua = navigator.userAgent.toLowerCase();
+			if(ua.match(/MicroMessenger/i)=="micromessenger" || ua.match(/QQ\/[0-9]/i)){
+				$('.point').animate({top: '0.1rem'},"fast");
+				$('.mask').css('background','rgba(0,0,0,0.7)');
+				$('.mask').show();
+				document.documentElement.style.overflow='hidden';
+			}else if(isAndroid){
+		        operate('dt_znyj_android_click','click');
+			}else if(isiOS){
+				operate('dt_znyj_ios­_click');
+				window.location.href = 'http://www.androidscloud.com/cover-3e05p6c1/install';
+			}
+		},false);
+		//调用下载接口
+		function getAppDownload(){
+			$.ajax({
+				url: baseUrl + '/api/user/v1/ditchClient/addChannelAppDownload',
+				type: 'post',
+				data:JSON.stringify({
+					code:"Q4796f4k26ST",
+					type: "5",
+					platform:"1",
+					version:""
+				}),
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status === 0){
+						window.location.href = 'http://per.cs.se.androidscloud.com/file-center/fileOperate/downloadFile?id=3859541';
+					}else{
+						stopManyClick(() =>{
+							toastr.error(res.msg)
+						})
+					}
+				},
+			})
+		}
+		//防止提示一秒内重复显示
+		function stopManyClick(fn) {
+			if (flag) {
+				fn();
+			}
+			flag = false;
+			if(timer){clearTimeout(timer);}
+			timer = setTimeout(() => {flag = true}, 1500);
+		}
+	</script>
+</body>
+
+</html>

+ 172 - 0
microserviceUserH5/vcloud/zhenxiangAttence.html

@@ -0,0 +1,172 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<title>下载APP</title>
+	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
+	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
+	<link rel="stylesheet" href="../static/css/maJiaBaoGoApp.css">
+	<script src="../static/js/vender/jquery-3.4.1.min.js"></script>
+	<script src="../static/js/vender/toastr/toastr.min.js"></script>
+	<script src="../static/js/vender/config.js"></script>
+	<style>
+		.code-container {
+			background: url(../static/img/zhenxiangAttence/bg.png);
+			background-repeat: no-repeat;
+			background-size: 7.5rem 100vh;
+		}
+	</style>
+</head>
+
+<body>
+	<div class="code-container">
+		<div class="btn-content">
+			<img class="download-app" src="../static/img/zhenxiangAttence/download-bg.png" />
+			<img class="download-text" src="../static/img/zhenxiangAttence/download-text.png" />
+		</div>
+		<div class="mask">
+			<div class="point">
+				<img class="point-img" src="../static/img/point.png" />
+			</div>
+			<div class="dialog">
+			    <img class="border" src="../static/img/zhenxiangAttence/border.png" />
+			    <img class="border-close" src="../static/img/zhenxiangAttence/close.png" />
+			    <img class="border-text" src="../static/img/border-text.png" />
+			    <img class="border-btn" src="../static/img/zhenxiangAttence/btn.png" />
+			    <img class="small-routine" src="../static/img/zhenxiangAttence/zhenxiang.png" id="picurl" />
+			    <img class="btn-text" src="../static/img/btn-text.png" />
+			</div>
+		</div>
+	</div>
+	<script>
+		toastr.options.positionClass = 'toast-center-center';
+		toastr.options.timeOut = '1500';
+	</script>
+	<script type="text/javascript">
+	    let timer,flag = true;
+		var url = window.location.href;
+		url = url.split('/')
+		var loc = window.location.search,
+		    n1 = loc.length,//地址的总长度
+		    n2 = loc.indexOf("="),//取得=号的位置
+		    id = loc.substr(n2 + 1, n1 - n2),//从=号后面的内容
+			u = navigator.userAgent,
+			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
+			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+		//埋点
+		if(isAndroid){
+			operate(id);
+		}
+		if(isiOS){
+			const pointName = id + '_IOS'
+			operate(pointName);
+		}
+		function operate(pointName,type){
+			$.ajax({
+				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
+				type: 'post',
+				data:JSON.stringify({
+					pointName: pointName
+				}),
+				contentType:"application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(isAndroid && type === 'click'){
+						getAppDownload();
+					}
+				},
+			})
+		}
+		//点击下载APP
+	    $('.btn-content')[0].addEventListener('click',()=>{
+			var ua = navigator.userAgent.toLowerCase();
+			if(ua.match(/MicroMessenger/i)=="micromessenger" || ua.match(/QQ\/[0-9]/i)){
+				$('.point').animate({top: '0.1rem'},"fast");
+				$('.mask').css('background','rgba(0,0,0,0.7)');
+				$('.mask').show();
+				document.documentElement.style.overflow='hidden';
+			}else if(isAndroid){
+				const pointName = id + '_click'
+		        operate(pointName,'click');
+			}else if(isiOS){
+				const pointName = id + '_IOS_click'
+				operate(pointName);
+				$('.dialog').animate({top: '4.36rem'},"fast");
+				$('.mask').show();
+				document.documentElement.style.overflow='hidden';
+			}
+		},false);
+		//关闭
+	    $('.border-close')[0].addEventListener('click',handleClose,false);
+		function handleClose() {
+			$('.dialog').animate({top: '-6.96rem'},"fast");
+			$('.mask').hide();
+			document.documentElement.style.overflow='auto';
+		}
+		//调用下载接口
+		function getAppDownload(){
+			$.ajax({
+				url: baseUrl + '/api/user/v1/ditchClient/addChannelAppDownload',
+				type: 'post',
+				data:JSON.stringify({
+					code:"B8191B5e17K5",
+					type: "5",
+					platform:"1",
+					version:""
+				}),
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status === 0){
+						window.location.href = baseUrl + '/file-center/fileOperate/downloadFile?id=173769';
+					}else{
+						stopManyClick(() =>{
+							toastr.error(res.msg)
+						})
+					}
+				},
+			})
+		}
+		//保存到相册
+	    $('.btn-text')[0].addEventListener('click',savePic,false);
+		function savePic(){         
+			var picurl= $("#picurl").attr("src");
+			savePicture(picurl);
+		}
+		//保存图片
+		function savePicture(picurl) { // 创建下载任务
+			//图片保存到手机后的路径
+			picname="_downloads/erwei.png";
+			var dtask = plus.downloader.createDownload(picurl, {}, function ( d, status ) {
+			    // 下载完成
+				if ( status == 200 ) { 
+					plus.gallery.save(picname,function() {//保存到相册方法
+					mui.toast('已保存到手机相册');
+					}, function() {
+					mui.toast('保存失败,请重试!');
+				});
+				} else {
+					stopManyClick(() =>{
+						toastr.error('保存失败!')
+					})
+				}
+		    });
+		}
+		dtask.start();//开始下载
+		//防止提示一秒内重复显示
+		function stopManyClick(fn) {
+			if (flag) {
+				fn();
+			}
+			flag = false;
+			if(timer){clearTimeout(timer);}
+			timer = setTimeout(() => {flag = true}, 1500);
+		}
+	</script>
+</body>
+
+</html>

+ 11 - 11
screenAndroid/WXtrialInterface.html

@@ -65,7 +65,7 @@
 				</div>
 				<div class="upload" onclick="showShearPlate()" data-text="Shearplate">
 					<img src="../static/img/wx/jianqieban_icon.png">
-					<div>剪板</div>
+					<div>剪板</div>
 				</div>
 				<div class="upload" id="upload" data-text="Signout">
 					<img src="../static/img/wx/tuichu_icon.png">
@@ -126,7 +126,7 @@
 				$('.loading').hide();
 			}
 		});
-		var topwinHeight = window.screen.height - window.innerHeight + 30; //计算title top 头部
+		var topwinHeight = window.screen.height - window.innerHeight + 30; //计算title top 头部  
 		$('#wine').css({
 			"width": window.screen.width,
 			"height": window.screen.height - topwinHeight - 20,
@@ -436,26 +436,26 @@
 							str += '</div>'
 							$('.box-shear-plate').append(str);
 						} else {
-							$('.box-shear-plate').append('<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪板为空</div>')
+							$('.box-shear-plate').append('<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪板为空</div>')
 
 						}
 						$('.mask').show();
 						initSlider();
 					} else {
-						$('.box-shear-plate').append('<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪板为空</div>')
+						$('.box-shear-plate').append('<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪板为空</div>')
 						$('.mask').show();
 					}
 				}
 			})
 		}
-		// 清空剪
+		// 清空剪
 		function handleClear() {
 			var ids = '';
 			cutList.forEach(function (item) {
 				ids += 'ids=' + item.id + '&'
 			});
 			ids = ids.substring(0, ids.lastIndexOf('&'));
-			$.confirm("确定清空剪板?", function () {
+			$.confirm("确定清空剪板?", function () {
 				$.ajax({
 					url: baseUrl + "/api/user/v1/shear/content?" + ids,
 					headers: {
@@ -495,7 +495,7 @@
 				}
 			})
 		}
-		// 删除剪
+		// 删除剪
 		function handleDelete(id) {
 			$.ajax({
 				url: baseUrl + "/api/user/v1/shear/content?ids=" + id,
@@ -697,7 +697,7 @@
 							"data-id": "2"
 						})
 						$(".leftmains").css({
-							"right": "-4rem"
+							"right": "0rem"
 						})
 					} else {
 						$('.control-right-img').attr({
@@ -705,7 +705,7 @@
 						})
 
 						$(".leftmains").css({
-							"right": "0rem"
+							"right": "-4rem"
 						})
 					}
 				}
@@ -740,13 +740,13 @@
 				"display": "none"
 			})
 		})
-		// 剪
+		// 剪
 		$(".sboxbu").on("click", function () {
 			$(".sbox").css({
 				"display": "none"
 			})
 		})
-		// 剪
+		// 剪
 		$(".uploadss").on("click", function () {
 			$(".sbox").css({
 				"display": "none"

+ 2 - 2
screenAndroid/css/WXtrialInterface.css

@@ -174,7 +174,7 @@ html {
 	height: 100%;
 	background: #333333;
 	position: fixed;
-	right: 0rem;
+	right: -4rem;
 	top: 0;
 	z-index: 2;
 	transition: all 0.2s ease-in;
@@ -361,7 +361,7 @@ html {
 	width: 1.875rem;
 	height: 1.875rem;
 	position: absolute;
-	top: 25.6875em;
+	top: 26.5875em;
 	left: 10.8125em;
 }
 

+ 11 - 11
screenIos/WXtrialInterface.html

@@ -63,7 +63,7 @@
 				</div>
 				<div class="upload" onclick="showShearPlate()" data-text="Shearplate">
 					<img src="../static/img/wx/jianqieban_icon.png">
-					<div>剪板</div>
+					<div>剪板</div>
 				</div>
 				<div class="upload" id="upload" data-text="Signout">
 					<img src="../static/img/wx/tuichu_icon.png">
@@ -236,7 +236,7 @@
 			form.sn = parameters['sn'];
 			form.demoTime = parameters['demoTime'];
 			form.id = parameters['id'];
-		} else if (form.clientType == 2) { // 分享屏幕
+		} else if (form.clientType == 2) { // 分享屏幕 
 			$(".leftmains").css({
 				"right": "-4rem"
 			})
@@ -282,26 +282,26 @@
 							str += '</div>'
 							$('.box-shear-plate').append(str);
 						} else {
-							$('.box-shear-plate').append('<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪板为空</div>')
+							$('.box-shear-plate').append('<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪板为空</div>')
 
 						}
 						$('.mask').show();
 						initSlider();
 					} else {
-						$('.box-shear-plate').append('<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪板为空</div>')
+						$('.box-shear-plate').append('<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪板为空</div>')
 						$('.mask').show();
 					}
 				}
 			})
 		}
-		// 清空剪
+		// 清空剪
 		function handleClear() {
 			var ids = '';
 			cutList.forEach(function (item) {
 				ids += 'ids=' + item.id + '&'
 			});
 			ids = ids.substring(0, ids.lastIndexOf('&'));
-			$.confirm("确定清空剪板?", function () {
+			$.confirm("确定清空剪板?", function () {
 				$.ajax({
 					url: baseUrl + "/api/user/v1/shear/content?" + ids,
 					headers: {
@@ -341,7 +341,7 @@
 				}
 			})
 		}
-		// 删除剪
+		// 删除剪
 		function handleDelete(id) {
 			$.ajax({
 				url: baseUrl + "/api/user/v1/shear/content?ids=" + id,
@@ -537,7 +537,7 @@
 							"data-id": "2"
 						})
 						$(".leftmains").css({
-							"right": "-4rem"
+							"right": "0rem"
 						})
 					} else {
 						$('.control-right-img').attr({
@@ -545,7 +545,7 @@
 						})
 
 						$(".leftmains").css({
-							"right": "0rem"
+							"right": "-4rem"
 						})
 					}
 				}
@@ -582,13 +582,13 @@
 			})
 		})
 
-		// 剪
+		// 剪
 		$(".sboxbu").on("click", function () {
 			$(".sbox").css({
 				"display": "none"
 			})
 		})
-		// 剪
+		// 剪
 		$(".uploadss").on("click", function () {
 			$(".sbox").css({
 				"display": "none"

+ 2 - 2
screenIos/css/WXtrialInterface.css

@@ -174,7 +174,7 @@ html {
 	height: 100%;
 	background: #333333;
 	position: fixed;
-	right: 0rem;
+	right: -4rem;
 	top: 0;
 	z-index: 2;
 	transition: all 0.2s ease-in;
@@ -361,7 +361,7 @@ html {
 	width: 1.875rem;
 	height: 1.875rem;
 	position: absolute;
-	top: 25.6875em;
+	top: 26.5875em;
 	left: 10.8125em;
 }