heyang 3 éve%!(EXTRA string=óta)
szülő
commit
d9da6b6ae6

+ 3 - 1
microserviceUserH5/static/css/springFestivalActivity.css

@@ -221,6 +221,7 @@ ul, li {
   padding: 0.04rem 0.12rem;
   color: #FFFFFF;
   margin-left: 0.1rem;
+  display: none;
 }
 
 .activity-time{
@@ -356,6 +357,7 @@ ul, li {
 .data-row{
   display: flex;
   justify-content: space-between;
+  align-items: center;
   margin-bottom: 0.24rem;
   font-size: 0.28rem;
   color: #FFE4BD;
@@ -607,7 +609,7 @@ ul, li {
 }
 
 .no-award{
-  height: 5.22rem;
+  /* height: 5.22rem; */
   line-height: 4.62rem;
   text-align: center;
   font-size: 0.28rem;

BIN
microserviceUserH5/static/img/icon-copy.png


BIN
microserviceUserH5/static/img/point1.png


BIN
microserviceUserH5/static/img/point2.png


+ 93 - 29
microserviceUserH5/vcloud/actFissionShare.html

@@ -274,11 +274,12 @@
 
         .dialog {
             width: 6.22rem;
-            height: 5.44rem;
+            height: 8.56rem;
             background: #FFFFFF;
             border-radius: 0.2rem;
             position: absolute;
             left: 0.72rem;
+            padding: 0 0.4rem;
             top: -6.96rem;
             /* overflow: hidden; */
         }
@@ -287,26 +288,55 @@
             width: 100%;
             display: flex;
             justify-content: center;
+            align-items: center;
             position: relative;
             margin-top: 0.5rem;
         }
 
+        .copy-tip{
+            display: flex;
+            justify-content: center;
+            font-size: 0.28rem;
+            margin-top: 0.32rem;
+            color: #333333;
+        }
+        
+        .my{
+            color: #000000;
+            font-weight: 600;
+        }
+
+        .point1{
+            font-size: 0.26rem;
+            margin-top: 0.16rem;
+            color: #666666;
+        }
+
+        .point-img{
+            width: 5.42rem;
+            height: 1.7rem;
+            margin: auto;
+            margin-top: 0.2rem;
+        }
+
+        .point2{
+            margin-top: 0.32rem;
+        }
+
         .imgs{
-            width: 3.08rem;
-            height: 2.82rem;
+            width: 0.38rem;
+            height: 0.38rem;
         }
 
         .imgs-text{
-            position: absolute;
-            bottom: 0;
-            font-size: 0.32rem;
-            color: #333333;
+            font-size: 0.36rem;
+            color: #3B7FFF;
         }
 
         .get-success-block{
             display: flex;
             justify-content: center;
-            margin-top: 0.6rem;
+            margin-top: 0.3rem;
         }
 
         .get-success{
@@ -422,11 +452,18 @@
     <div class="mask">
         <div class="dialog">
             <div class="imgs-block">
-                <img class="imgs" src="img/success.png" />
-                <div class="imgs-text">图形校验成功</div>
+                <img class="imgs" src="../static/img/icon-copy.png" />
+                <div class="imgs-text">复制成功</div>
+                <img class="imgs" src="../static/img/icon-copy.png" />
             </div>
+            <div class="copy-tip">温馨提示:激活码使用教程</div>
+            <div class="point1">1、在双子星APP的工具栏,点击 <span class="my">[我的]</span></div>
+            <img class="point-img" src="../static/img/point1.png" />
+            <div class="point1 point2">2、找到 我的工具 -  <span class="my">[激活码] </span>,点击激活码
+                即可兑换使用激活码啦。</div>
+            <img class="point-img" src="../static/img/point2.png" />
             <div class="get-success-block">
-                <div class="get-success">复制激活码</div>
+                <div class="get-success">下载APP</div>
             </div>
             <img class="close" src="img/close.png" />
         </div>
@@ -466,8 +503,26 @@
             document.documentElement.style.overflow='auto';
 		});
         $('.get-success-block')[0].addEventListener('click', (e) => {
-            copyUrl();
+            if(isIOS){
+                copyUrl();
+            }else{
+                download();
+            }
 		});
+        function download() {
+            if (isAndroid) {
+                if (baseUrl == 'https://per.cs.se.androidscloud.com') {
+                    window.location.href = 'http://per.cs.se.androidscloud.com:8888/suanchou'
+                } else {
+                    window.location.href = 'http://www.androidscloud.com/suanchou?timestamp=' + Math.random();
+                }
+
+            } else if (isIOS) {
+                document.location.href = 'https://www.pgyer.com/gemini6?timestamp=' + Math.random();
+            } else {
+                document.location.href = 'https://www.androidscloud.com?timestamp=' + Math.random();
+            }
+        }
         function copyUrl() {
             var oInput = document.createElement('input'); //创建一个input
             oInput.setAttribute("readonly", "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
@@ -478,7 +533,7 @@
                 document.body.appendChild(oInput)
                 selectText(oInput, 0, oInput.value.length);
                 document.execCommand("Copy"); // 执行浏览器复制命令
-                toastr.error(`复制成功`);
+                // toastr.error(`复制成功`);
                 $('.dialog').animate({top: '-6.96rem'},"fast");
                 $('.mask').hide();
                 document.documentElement.style.overflow='auto';
@@ -605,18 +660,20 @@
                         getActivationCode(this.username, this.tagId, this.uuid, captchaVerification).then(res => {
                             this.$toast.clear();
                             if (res.status === 0) {
-                                if(isAndroid){
-                                    this.code = res.data;
-                                    this.copyUrl();
-                                }else if(isIOS){
-                                    $('.dialog').animate({top: '3.36rem'},"fast");
-                                    $('.mask').show();
-                                    document.documentElement.style.overflow='hidden';
-                                    code = res.data;
-                                } else {
-                                    this.code = res.data;
-                                    this.copyUrl();
-                                }
+                                this.code = res.data;
+                                this.copyUrl();
+                                // if(isAndroid){
+                                //     this.code = res.data;
+                                //     this.copyUrl();
+                                // }else if(isIOS){
+                                //     $('.dialog').animate({top: '3.36rem'},"fast");
+                                //     $('.mask').show();
+                                //     document.documentElement.style.overflow='hidden';
+                                //     code = res.data;
+                                // } else {
+                                //     this.code = res.data;
+                                //     this.copyUrl();
+                                // }
                             } else {
                                 this.$dialog.alert({
                                     message: res.msg
@@ -719,6 +776,12 @@
                 handTouch(e){
                     e.preventDefault();
                 },
+                //下载指引弹窗
+                downloadTip(){
+                    $('.dialog').animate({top: '3.36rem'},"fast");
+                    $('.mask').show();
+                    document.documentElement.style.overflow='hidden';
+                },
                 copyUrl() {
                     var oInput = document.createElement('input'); //创建一个input
                     oInput.setAttribute("readonly", "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
@@ -729,15 +792,16 @@
                         document.body.appendChild(oInput)
                         this.selectText(oInput, 0, oInput.value.length);
                         document.execCommand("Copy"); // 执行浏览器复制命令
-                        this.$dialog.alert({
-                            message: `复制成功`
-                        })
+                        // this.$dialog.alert({
+                        //     message: `复制成功`
+                        // })
                         oInput.style.display = 'none'; // 将input隐藏
                         oInput.blur();
                         oInput.remove(); // 将input销毁
                         setTimeout(() => {
                             this.$dialog.close();
-                            this.download();
+                            this.downloadTip();
+                            // this.download();
                         }, 2000)
                     }, 400)
 

+ 45 - 33
microserviceUserH5/vcloud/springFestivalActivity.html

@@ -184,7 +184,7 @@
 				success: function (res) {
 					if(res.status === 0){
 			            $('.card-wrap').eq(0).text('');
-						let time = `${res.data.startTime.substr(0,4)}年${res.data.startTime.substring(5,7)}月${res.data.startTime.substring(8,10)}日-${res.data.endTime.substring(5,7)}月${res.data.endTime.substring(8,10)}日`;
+						let time = `活动时间 :${res.data.startTime.substr(0,4)}年${res.data.startTime.substring(5,7)}月${res.data.startTime.substring(8,10)}日-${res.data.endTime.substring(5,7)}月${res.data.endTime.substring(8,10)}日`;
 						$('.activity-time').eq(0).text(time);
 						let str = '',
 							cardData = [{name: '天',imgName: 'day'},{name: '周',imgName: 'week'},{name: '月',imgName: 'mouth'},
@@ -213,7 +213,7 @@
 						}
 						if(notReceive > 0){
 			                receive = 0;
-							notReceive = notReceive > 99 ? 99 : notReceive;
+							notReceive = notReceive > 99 ? '99+' : notReceive;
 				            $('.tab-wrap').eq(0).css('display', 'flex');
 				            $('.record-wrap').eq(0).css('marginTop', '0.2rem');
 				            $('.record-wrap').eq(0).css('height', '5.38rem');
@@ -282,6 +282,9 @@
 		},false);
 		//点击领取按钮
 		$('.tab-wrap')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'tab-wrap'){
+				return
+			}
 			receive = e.target.dataset.index;
 			if(receive == 1){
 				$('.award-change-btn')[0].className = 'award-change-btn'
@@ -322,13 +325,13 @@
 				handleAward(5)
 			}
 		},false);
-		//点击再抽 获取次数
+		//点击再抽
 		$('.left-btn')[0].addEventListener('click',() => {
 			let val = $('.report-times').eq(0).text();
 			handleAward(val,'report')
 		},false);
 		function handleAward(times,type) {
-			if(surplus === 0 || (times === 5 && surplus < 5)){
+			if(surplus === 0 || (times == 5 && surplus < 5)){
 				$('.have-times-wrap').eq(0).css('display', 'none');
 				$('.no-times-wrap').eq(0).css('display', 'block');
 				$('.award-result-dialog').animate({top: '1.86rem'},"fast");
@@ -368,14 +371,12 @@
 							},
 							list = res.data.list;
 						if(list.length === 1){
-						    $('.report-times').eq(0).text(1);
 							$('.award-result-wrap')[0].className = 'card-wrap award-result-wrap one-result';
 							str = `<div class="card-item">
 										<img class="one-card" src="../static/img/springFestivalActivity/${cardObj[list[0].duration]}.png" />
 										<div class="card-text">星曜${list[0].duration}卡</div>
 									</div> `
 						}else{
-						    $('.report-times').eq(0).text(5);
 							$('.award-result-wrap')[0].className = 'card-wrap award-result-wrap'
 							for (var i = 0; i < list.length; i++) {
 								str += `<div class="card-item">
@@ -384,6 +385,7 @@
 										</div>`
 							}
 						}
+						$('.report-times').eq(0).text(times);
 						if(notReceive > 0){
 				            $('.join-result-tip').eq(0).css('opacity', '0');
 						}
@@ -488,37 +490,42 @@
 		},false);
 		//点击获取次数
 		$('.get-times')[0].addEventListener('click',() => {
-			if(activityState === 2){
+			if(activityState === 1){
+				stopManyClick(() =>{
+					if (isMiniprogram) { // 小程序
+						if(phoneRemainQuantity > 0){
+							wx.miniProgram.navigateTo({
+								url: '/packageA/order/buy/index?type=activity'
+							})
+						} else {
+							wx.miniProgram.navigateTo({
+								url: '/packageA/order/renew/index?type=activity'
+							})
+						}
+					} else if (isAndroid) { // 安卓
+						if(phoneRemainQuantity > 0){
+							window.native.startPurchase(1, 365);
+						} else {
+							window.native.startRenew();
+						}
+					} else if (isiOS) {
+						if(phoneRemainQuantity > 0){
+							window.webkit.messageHandlers.startPurchase.postMessage({ type: 1, day: 365 });
+						} else {
+							window.webkit.messageHandlers.startRenew.postMessage({ type: 1, day: 365 });
+						}
+					}
+				})
+			}else if(activityState === 0) {
+				stopManyClick(() =>{
+					toastr.error('该活动暂未开启,请稍安勿躁');
+				})
+			} else {
 				stopManyClick(() =>{
 					toastr.error('活动已结束,期待下次的见面');
 				})
-				return
 			}
-			stopManyClick(() =>{
-				if (isMiniprogram) { // 小程序
-					if(phoneRemainQuantity > 0){
-						wx.miniProgram.navigateTo({
-							url: '/packageA/order/buy/index?type=activity'
-						})
-					} else {
-						wx.miniProgram.navigateTo({
-							url: '/packageA/order/renew/index?type=activity'
-						})
-					}
-				} else if (isAndroid) { // 安卓
-					if(phoneRemainQuantity > 0){
-						window.native.startPurchase(1, 365);
-					} else {
-						window.native.startRenew();
-					}
-				} else if (isiOS) {
-					if(phoneRemainQuantity > 0){
-						window.webkit.messageHandlers.startPurchase.postMessage({ type: 1, day: 365 });
-					} else {
-						window.webkit.messageHandlers.startRenew.postMessage({ type: 1, day: 365 });
-					}
-				}
-			})
+			
 		},false);
 		// 点击查看
 		$('.look-btn')[0].addEventListener('click',() => {
@@ -547,6 +554,8 @@
 			$('.dialog').animate({top: '2.24rem'},"fast");
 			$('.award-record-mask').show();
 			document.documentElement.style.overflow='hidden';
+			$('.award-change-btn')[1].className = 'award-change-btn'
+			$('.award-change-btn')[0].className = 'award-change-btn active'
 			receive = 0;
 			pageNum = 1;
 			pages = 0;
@@ -593,7 +602,10 @@
 						    records = res.data.records;
 							pages = res.data.pages;
 							if(records.length === 0){
+				                $('.title-row').eq(0).css('display', 'none');
 								str = '<div class="no-award">没有抽奖记录,我都替你着急</div>'
+							}else{
+				                $('.title-row').eq(0).css('display', 'flex');
 							}
 						for (var i = 0; i < records.length; i++) {
 							str += `<div class="data-row">