Accueil Explorer Aide
S'inscrire Connexion
tangdehang
/
android-cloud-H5
Suivre 1
Voter 0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

Merge branch 'dev-5.3' of Software/android-cloud-H5 into uat

heyang il y a 3 ans
Parent
61f4089959 3710601019
commit
9269d0a7c1
2 fichiers modifiés avec 13 ajouts et 26 suppressions
Vue séparée Afficher les stats Diff
  1. 7 7
      microserviceUserH5/static/css/anniversaryCelebrate.css
  2. 6 19
      microserviceUserH5/vcloud/anniversaryCelebrate.html

+ 7 - 7
microserviceUserH5/static/css/anniversaryCelebrate.css
Voir le fichier 

@@ -660,8 +660,8 @@ ul, li {
 
 }
 
 
 .one-card{
 
-  width: 1.66rem;
 
-  height: 1.18rem;
 
+  width: 100%;
 
+  height: 100%;
 
   animation: mymoves 0.8s;
 
 }
 
 
@@ -671,14 +671,14 @@ ul, li {
 
   position: absolute;
 
   left: 50%;
 
   transform: translateX(-50%);
 
-  bottom: 0.1rem;
 
+  bottom: 0.01rem;
 
   /* animation: mymoves 0.8s; */
 
 }
 
 
 .card-item-wrap{
 
   margin-top: 0.7rem;
 
-  width: 1.66rem;
 
-  height: 1.18rem;
 
+  width: 1.55rem;
 
+  height: 1.13rem;
 
   position: relative;
 
 }
 
 
@@ -692,8 +692,8 @@ ul, li {
 
 }
 
 
 .many-card{
 
-  width: 1.48rem;
 
-  height: 1.1rem;
 
+  width: 100%;
 
+  height: 100%;
 
   animation: mymoves 0.8s;
 
 }

+ 6 - 19
microserviceUserH5/vcloud/anniversaryCelebrate.html
Voir le fichier 

@@ -82,6 +82,7 @@
 
 <body>
 
 	<div class="container">
 
 		<div class="rule-wrap">
 
+			<div class="ipt"></div>
 
 			<img class="rule" src="../static/img/anniversaryCelebrate/rule.png" />
 
 		</div>
 
 		<div class="activity-text-wrap">
 
@@ -469,13 +470,7 @@
 
 		},false);
 
 		function handleAward(times,type) {
 
 			if(!id){
 
-				if (window.__wxjs_environment === 'miniprogram') { // 小程序
 
-					wx.miniProgram.navigateTo({
 
-						url: '/pages/index/index'
 
-					})
 
-				} else {
 
-					download();
 
-				}
 
+				download();
 
 				return
 
 			}
 
 			awardTimes = times;
 
@@ -799,13 +794,7 @@
 
 		$('.get-times')[0].addEventListener('click',getTimeHandle,false);
 
 		function getTimeHandle() {
 
 			if(!id){
 
-				if (window.__wxjs_environment === 'miniprogram') { // 小程序
 
-					wx.miniProgram.navigateTo({
 
-						url: '/pages/index/index'
 
-					})
 
-				} else {
 
-					download();
 
-				}
 
+				download();
 
 				return
 
 			}
 
 		    operate('znq_2022_h5_获取次数按钮');
 
@@ -819,7 +808,7 @@
 
 						wx.miniProgram.navigateTo({
 
 							url: '/packageA/order/renew/index?record=' + userCardId
 
 						})
 
-					}
 
+					}web
 
 				} else if (isAndroid && window.native) { // 安卓
 
 					if(phoneRemainQuantity > 0){
 
 						window.native.startPurchase('SVIP', 365);
 
@@ -1282,9 +1271,7 @@
 
 			operate('znq_2022_h5_下载');
 
             let ua = navigator.userAgent.toLowerCase();
 
             if(ua.match(/MicroMessenger/i)=="micromessenger"){
 
-				wx.miniProgram.navigateTo({
 
-					url: '/pages/home/home'
 
-				})
 
+				location.href = 'http://f.mpay8.cn/l/cmK4MSiolegJcfl';
 
 			} else if (isAndroid) {
 
 				window.location.href = 'http://www.androidscloud.com/suanchou?timestamp=' + Math.random();
 
             } else if (isiOS) {
 
@@ -1298,7 +1285,7 @@
 
             oInput.setAttribute("readonly", "readonly"); //设置只读，否则移动端使用复制功能时可能会造成软件盘弹出
 
             setTimeout(() => {
 
                 oInput.value = window.location.href;
 
-                document.body.appendChild(oInput)
 
+                $('.ipt')[0].appendChild(oInput)
 
                 selectText(oInput, 0, oInput.value.length);
 
                 document.execCommand("Copy"); // 执行浏览器复制命令
 
                 toastr.error(`复制成功`);