Merge branch 'master-new' into dev-5.3.1

static/microserviceUserH5/static/css/anniversaryCelebrate.css

@@ -23,7 +23,7 @@ ul, li {
   width: 7.5rem;
   min-height: 100vh;
   background-color: rgba(22, 12, 31, 1);
-  padding-bottom: 0.34rem;
+  padding-bottom: 1rem;
   background-image: url('../img/anniversaryCelebrate/all-bg.png');
   background-repeat: repeat-y;
   background-size: cover;
@@ -575,8 +575,6 @@ ul, li {
 .award-result-dialog{
   width: 5.52rem;
   height: 9.21rem;
-  background: url(../../static/img/anniversaryCelebrate/result-bg.png) no-repeat;
-  background-size: 100% 100%;
   border-radius: 0.2rem;
   position: absolute;
   left: 50%;
@@ -584,6 +582,15 @@ ul, li {
   transform: translateX(-50%);
 }
 
+.result-bg{
+  width: 5.52rem;
+  height: 9.21rem;
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: none;
+}
+
 .law-result-dialog{
   width: 5.52rem;
   height: 7.16rem;
@@ -611,8 +618,6 @@ ul, li {
 .award-result-one-dialog{
   width: 5.52rem;
   height: 8.11rem;
-  background: url(../../static/img/anniversaryCelebrate/result-once-bg.png) no-repeat;
-  background-size: 100% 100%;
   border-radius: 0.2rem;
   position: absolute;
   left: 50%;
@@ -620,6 +625,15 @@ ul, li {
   transform: translateX(-50%);
 }
 
+.result-once-bg{
+  width: 5.52rem;
+  height: 8.11rem;
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: none;
+}
+
 .distribution-time-dialog{
   width: 6.48rem;
   height: 6.56rem;
@@ -717,7 +731,7 @@ ul, li {
 
 .many-one-card{
   padding-top: 0.35rem;
-  margin-left: 0.4rem;
+  /* margin-left: 0.4rem; */
 }
 
 .many-two-card{
@@ -726,7 +740,7 @@ ul, li {
 
 .line{
   position: absolute;
-  bottom: 3.2rem;
+  bottom: 3.24rem;
   left: 0.6rem;
   width: 4.35rem;
   height: 0.01rem;
@@ -783,6 +797,7 @@ ul, li {
   justify-content: center;
   flex-wrap: wrap;
   margin-bottom: 1.2rem;
+  margin-left: 0;
 }
 
 .one-card-item{

static/microserviceUserH5/vcloud/anniversaryCelebrate.html

@@ -176,6 +176,8 @@
 		</div>
 		<div class="award-result-mask">
 			<div class="award-result-dialog-sure">
+				<img class="result-bg" src="../static/img/anniversaryCelebrate/result-bg.png" />
+				<img class="result-once-bg" src="../static/img/anniversaryCelebrate/result-once-bg.png" />
 				<div class="have-times-wrap">
 					<div class="award-result-tip"></div>
 					<div class="line"></div>
@@ -344,13 +346,36 @@
 			userCardId = '',
 		    sliderNumber = 0,//滑块是数量，控制溢出不能滑动
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+			// imgs = ['../static/img/anniversaryCelebrate/result-bg.png','../static/img/anniversaryCelebrate/result-once-bg.png'];
+		//异步加载图片
+		// async function loadAsync() {
+		// 	let promise = function(url) {
+		// 		return new Promise((resolve, reject) => {
+		// 		const image = new Image();
+		// 		image.src = url;
+		// 		if(image.src.includes('result-bg')){
+		// 			image.className = 'result-bg';
+		// 		}else{
+		// 			image.className = 'result-once-bg';
+		// 		}
+		// 		image.onload = function() {
+		// 			$('.award-result-dialog-sure')[0].insertBefore(image, $('.have-times-wrap')[0]);
+		// 			resolve('ok');
+		// 		}        
+		// 		})      
+		// 	}
+		// 	for(let url of imgs) {
+		// 		await promise(url);
+		// 	}
+		// }
+        // loadAsync();
 		// 初始化数据
 		init();
 		if(id){
 			getPhoneNumber();
 			getUserCard();
 		}
-		function init() {
+		function init(type) {
 			$.ajax({
 				url: baseUrl + '/api/activity/v1/anniversary/getAnniversary',
 				type: 'get',
@@ -400,6 +425,9 @@
 							$('.no-start-mask').show();
 							document.documentElement.style.overflow='hidden';
 						}
+						if(type == 'report') {
+							$('.point-wrap').eq(0).empty();
+						}
 						if(result == '' || !lighten){
 							return
 						}
@@ -516,6 +544,12 @@
 						$('.award-result-wrap').eq(0).text('');
 						if(times === 1){
 							$('.award-result-dialog-sure')[0].className = 'award-result-dialog-sure award-result-one-dialog';
+							$(".result-bg").css({
+								"display": "none"
+							})
+							$(".result-once-bg").css({
+								"display": "block"
+							})
 							$('.award-result-tip').eq(0).text('换个姿势，再抽一次');
 							$('.award-result-wrap')[0].className = 'card-wrap award-result-wrap one-result';
 							for (let i = 0; i < list.length; i++) {
@@ -540,30 +574,30 @@
 														<div class="card-text">星曜${list[2].awardDurations}天卡</div>
 													</div>
 												</div>`
-									}else if(list[i].awardType == 2){//外环
-										str += `<div class="card-item many-two-card">
+									}else if(list[i].awardType == 2){//外环188
+										str += `<div class="card-item many-one-card">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
-														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜88天卡</div>
 													</div>
 												</div>
-												<div class="card-item many-one-card">
+												<div class="card-item many-two-card">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-														<div class="card-text">星曜188天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
+														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
 													</div>
 												</div>`
-									} else if(list[i].awardType == 1) {//内环
-										str += `<div class="card-item many-two-card">
+									} else if(list[i].awardType == 1) {//内环88
+										str += `<div class="card-item many-one-card">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-														<div class="card-text">星曜88天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
+														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
 													</div>
 												</div>
-												<div class="card-item many-one-card">
+												<div class="card-item many-two-card">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
-														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜188天卡</div>
 													</div>
 												</div>`
 									}
@@ -588,6 +622,12 @@
 							},1000);
 						} else {
 							$('.award-result-dialog-sure')[0].className = 'award-result-dialog-sure award-result-dialog';
+							$(".result-once-bg").css({
+								"display": "none"
+							})
+							$(".result-bg").css({
+								"display": "block"
+							})
 							$('.award-result-tip').eq(0).text('善良的人，好运气最终是会眷顾你');
 							$('.award-result-wrap')[0].className = 'card-wrap award-result-wrap many-card-wrap'
 							for (let i = 0; i < list.length; i++) {
@@ -603,7 +643,7 @@
 										if(i == 5) {
 											str += `<div class="card-item many-card-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
+														<img class="many-card" src="../static/img/anniversaryCelebrate/${list[i].awardType==1 ? 'first' : 'second'}.png" />
 														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
 													</div>
 												</div>`
@@ -611,35 +651,35 @@
 										if(i == 6) {
 											str += `<div class="card-item many-card-item two-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
+														<img class="many-card" src="../static/img/anniversaryCelebrate/${list[i].awardType==1 ? 'first' : 'second'}.png" />
 														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
 													</div>
 												</div>`
 										}
-									} else if(list[i].awardType == 2){
+									} else if(list[i].awardType == 2){//外环188
 										str += `<div class="card-item many-card-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
-														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜88天卡</div>
 													</div>
 												</div>
 												<div class="card-item many-card-item two-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-														<div class="card-text">星曜188天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
+														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
 													</div>
 												</div>`
-									} else if(list[i].awardType == 1) {
+									} else if(list[i].awardType == 1) {//内环88
 										str += `<div class="card-item many-card-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-														<div class="card-text">星曜88天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
+														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
 													</div>
 												</div>
 												<div class="card-item many-card-item two-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
-														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜188天卡</div>
 													</div>
 												</div>`
 									}
@@ -670,7 +710,7 @@
 						}
 						$('.times-text-number').eq(0).text(residueDegree - times);
 						$('.award-result-wrap').eq(0).append(str);
-						init();
+						init(type);
 					}else{
 						animationFlag = true;
 						stopManyClick(() =>{

static/microserviceUserH5/vcloud/share.html

@@ -76,6 +76,7 @@
 
 		.topic-info {
 			padding-bottom: 1.6rem;
+			display: none;
 
 		}
 
@@ -153,7 +154,6 @@
 			position: absolute;
 			right: 15px;
 			top: 6px;
-
 		}
 	</style>
 </head>
@@ -171,7 +171,7 @@
 			<p class="title">{{topic.title}}</p>
 			<p class="createTime"> 发布日期:{{topic.createTime}}</p>
 			<p class="line"></p>
-			<div v-html="topic.content" class="topic-info"></div>
+			<div v-html="topic.content" class="topic-info" id="topic-info"></div>
 
 		</div>
 		<div class="footer">
@@ -242,6 +242,47 @@
 							if (res.data) {
 								this.isshow = false;
 								this.topic = res.data;
+								var u = navigator.userAgent,
+									app = navigator.appVersion;
+								var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //g
+								var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+								// if (isAndroid && !window.native) {
+									setTimeout(() => {
+										let node = document.getElementById('topic-info');
+										let span = document.getElementsByTagName('span');
+										node.firstChild.style.backgroundColor = '#FFFFFF';
+										node.style.display = 'block';
+										for(var o in span){
+											if(span[o].style){
+												span[o].style.color = '#333333';
+											}
+										}
+									},100)
+								// }
+								if (isAndroid && !window.native) {
+									setTimeout(() => {
+										let node = document.getElementById('topic-info');
+										node.firstChild.style.backgroundColor = '#FFFFFF';
+										node.style.display = 'block';
+									},100)
+								}
+								if(isIOS) {
+									try {
+										window.webkit.messageHandlers.share.postMessage();
+									} catch(error) {
+										setTimeout(() => {
+											let node = document.getElementById('topic-info');
+											let span = document.getElementsByTagName('span');
+											node.firstChild.style.backgroundColor = '#FFFFFF';
+											node.style.display = 'block';
+											for(var o in span){
+												if(span[o].style){
+													span[o].style.color = '#333333';
+												}
+											}
+										},100)
+									}
+								}
 							} else {
 								this.isshow = true;
 							}

static/screenAndroid/WXdraw.js

@@ -63,7 +63,9 @@ function doConnectDirectives() {
     }
   };
   wsss.onmessage = function (res) {
+    console.log('res', res)
     var result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
+    console.log('result.type', result.type)
     if (result.type === 'cutting') {
       if (result.data.status === 0) {
         $.toast('复制成功', "text");
@@ -103,9 +105,36 @@ function doConnectDirectives() {
       }
       return
     }
+    if (result.type === 'payInitiateEvent') {
+      var url = window.location.href;
+      url = url.split('/');
+      var baseUrl = url[0] + '//' + url[2];
+      $.ajax({
+        url: baseUrl + '/api/pay/third/order',
+        data: JSON.stringify({
+          orderNum: result.data.orderNum,
+          orderAmount: result.data.orderAmount,
+          appKey: result.data.appKey,
+        }),
+        type: 'POST',
+        dataType: 'json',
+        contentType: 'application/json;charset=UTF-8',
+        success: function (res) {
+          if(result.data.payType === 1) { // 微信
+            if (window.__wxjs_environment === 'miniprogram') { // 小程序
+              // copyUrl(result.data.payUrl);
+            } else {
+              window.location.href = result.data.payUrl
+            }
+          } else {
+            window.location.href = result.data.payUrl
+          }
+        },
+      });
+      return
+    }
   }
 }
-
 $('body').on("click", function () {
   draw_graph('pencil');
 })

static/screenIos/WXdraw.js

@@ -113,6 +113,34 @@ function doConnectDirectives() {
       }
       return
     }
+    if (result.type === 'payInitiateEvent') {
+      var url = window.location.href;
+      url = url.split('/');
+      var baseUrl = url[0] + '//' + url[2];
+      $.ajax({
+        url: baseUrl + '/api/pay/third/order',
+        data: JSON.stringify({
+          orderNum: result.data.orderNum,
+          orderAmount: result.data.orderAmount,
+          appKey: result.data.appKey,
+        }),
+        type: 'POST',
+        dataType: 'json',
+        contentType: 'application/json;charset=UTF-8',
+        success: function (res) {
+          if(result.data.payType === 1) { // 微信
+            if (window.__wxjs_environment === 'miniprogram') { // 小程序
+              // copyUrl(result.data.payUrl);
+            } else {
+              window.location.href = result.data.payUrl
+            }
+          } else {
+            window.location.href = result.data.payUrl
+          }
+        },
+      });
+      return
+    }
   }
 }
 $('body').on("click", function () {