update

lottery/index.html

@@ -885,8 +885,7 @@
 		</div>
 	</div>
 	<script>
-		let h5Type = 20
-		let mpClientId = ''
+		let h5Type = null
 		let credentials = {
 			bucket: '',
 			Authorization: '',
@@ -944,17 +943,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()
 					}
 				}
@@ -982,19 +982,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);
 							// }
 						}
 					},
@@ -1052,11 +1049,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,
@@ -1081,8 +1079,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:{
 				},
@@ -1143,6 +1139,8 @@
 		}
 		document.getElementById('sendBtn').addEventListener('click', function() {
 			document.getElementById('dialogText').style.display = 'block';
+			// 获取腾讯COS对象存储的实例对象
+			getCosObj();
 		});
 		document.getElementById('closeText').addEventListener('click', function() {
 			document.getElementById('dialogText').style.display = 'none';