Przeglądaj źródła

Merge branch 'master' of http://test.wefanbot.com:3000/wfg/lottery

liangzhaozhou 7 miesięcy temu
rodzic
commit
09bf343a3f
2 zmienionych plików z 15 dodań i 17 usunięć
  1. BIN
      lottery.zip
  2. 15 17
      lottery/index.html

BIN
lottery.zip


+ 15 - 17
lottery/index.html

@@ -2,7 +2,7 @@
 <html>
 <head>
 		<meta charset="utf-8">
-		<title>幸运大抽奖</title>
+		<title></title>
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<link href="css/mui.css" rel="stylesheet" />
 		<link href="css/mui.picker.css" rel="stylesheet" />
@@ -503,7 +503,7 @@
 	.show_box{
 		position: absolute;
 		top: 198rem;
-		//background: #FFFFFF;
+		/* background: #FFFFFF; */
 		left: 15rem;
 		right: 15rem;
 		height: 290rem;
@@ -898,8 +898,7 @@
 		</div>
 	</div>
 	<script>
-		let h5Type = 20
-		let mpClientId = ''
+		let h5Type = null
 		let credentials = {
 			bucket: '',
 			Authorization: '',
@@ -958,17 +957,18 @@
 		    }
 		}
 		window.onload = function() {
+			document.getElementById('collectPage').style.display = "none"
+			document.getElementById('lotteryPage').style.display = "none"
 			if (getQueryParam('openId')) {
 				if(!getQueryParam('externalUserid')) {
 					mui.alert('无权限访问', '提示', '确定');
 				} else {
+					h5Type = getQueryParam('h5Type')
 					if (h5Type == 19) {
 						showCityLevel();
 						raffleInfo();
 						raffleRecord();
 					} else if (h5Type == 20) {
-						// 获取腾讯COS对象存储的实例对象
-						getCosObj();
 						findCollectList()
 					}
 				}
@@ -996,19 +996,16 @@
 						if (h5Type == 19) {
 							document.getElementById('collectPage').style.display = "none"
 							document.getElementById('lotteryPage').style.display = "block"
-							if (res.data.externalUserid) {
-								showCityLevel();
-							} else {
+							// if (!res.data.externalUserid) {
 								// 进行下一步企微授权
 								gerQwAuth(bId, res.data.openId);
-							}
+							// }
 						} else if (h5Type == 20){
 							document.getElementById('collectPage').style.display = "block"
 							document.getElementById('lotteryPage').style.display = "none"
-							mpClientId = res.data.mpClientId
 							// if (!res.data.externalUserid) {
-							// 	// 进行下一步企微授权
-							// 	gerQwAuth(bId, res.data.openId);
+								// 进行下一步企微授权
+								gerQwAuth(bId, res.data.openId);
 							// }
 						}
 					},
@@ -1066,11 +1063,12 @@
 		};
 		// 发送祝福
 		function handleSendText() {
-			let openId = getQueryParam('openId')
+			let bId = getQueryParam('bId')
+			// let openId = getQueryParam('openId')
 			let textareaResult = document.getElementById("textarea").value;
 			mui.ajax('http://test.wefanbot.com:18993/scrm/v1/mp-collect/p/add', {
 				data:{
-					mpClientId: mpClientId,
+					bId: bId,
 					openId: openId,
 					content: textareaResult,
 					imgList: imgList,
@@ -1096,8 +1094,6 @@
 		};
 		// 获取用户故事收集列表
 		function findCollectList() {
-			let openId = getQueryParam('openId')
-			let textareaResult = document.getElementById("textarea").value;
 			mui.ajax('http://test.wefanbot.com:18993/scrm/v1/mp-collect/p/findCollectList', {
 				data:{
 				},
@@ -1165,6 +1161,8 @@
 				clearTimeout(itemTimer)
 				itemTimer = null
 			}
+			// 获取腾讯COS对象存储的实例对象
+			getCosObj();
 		});
 		document.getElementById('closeText').addEventListener('click', function() {
 			document.getElementById('dialogText').style.display = 'none';