From b11a35be7003fbd409862b1433163f2e0d48e38f Mon Sep 17 00:00:00 2001
From: "guangchao.xu" <guangchao.xu@supwisdom.com>
Date: Fri, 17 Jul 2020 16:56:37 +0800
Subject: [PATCH] =?utf8?q?=E6=8E=A8=E9=80=81=E9=93=BE=E6=8E=A5=E6=9B=B4?=
 =?utf8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 platforms/android/app/src/main/assets/www/main.html | 5 -----
 www/js/mainmenu.js                                  | 2 +-
 www/js/more.js                                      | 6 +++---
 www/main.html                                       | 5 -----
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/platforms/android/app/src/main/assets/www/main.html b/platforms/android/app/src/main/assets/www/main.html
index da00a53..db80468 100644
--- a/platforms/android/app/src/main/assets/www/main.html
+++ b/platforms/android/app/src/main/assets/www/main.html
@@ -204,7 +204,6 @@
 		var shareqq = document.getElementById("shareqq");
 		var sharewx = document.getElementById("sharewx");
 		shareqq.onclick = function() {
-			alert("qq分享")
 			var args = {};
 			args.client = QQSDK.ClientType.QQ; //QQSDK.ClientType.QQ,QQSDK.ClientType.TIM;
 			args.scene = QQSDK.Scene.QQ; //QQSDK.Scene.QQZone,QQSDK.Scene.Favorite
@@ -219,15 +218,11 @@
 			}, args);
 		}
 		sharewx.onclick = function() {
-			alert("wx分享")
 			Wechat.share({
 			    message: {
 			        title: "大理App分享",
 			        description: "访客二维码",
 			        thumb: "www/img/thumbnail.png",
-			        mediaTagName: "TEST-TAG-001",
-			        messageExt: "这是第三方带的测试字段",
-			        messageAction: "<action>dotalist</action>",
 			        media: {
 			                    type: Wechat.Type.LINK,
 			                    webpageUrl: "http://www.jason-z.com"
diff --git a/www/js/mainmenu.js b/www/js/mainmenu.js
index a8a5e2d..2996fb1 100644
--- a/www/js/mainmenu.js
+++ b/www/js/mainmenu.js
@@ -15,7 +15,7 @@ var app = {
           if(device.platform == "Android") {
 			msgtype = event.extras.msgtype
 			if (msgtype ==="conference"){
-				window.location= baseUrl + "/conference/signupconference?custid="+userid;
+				window.location= baseUrl + "/conference/signupconference?userId="+userid;
 			}else if(msgtype ==="atte1"){
 				window.location= baseUrl + "/atte/reviewindex?custid="+userid;
 			}else if(msgtype ==="atte2"){
diff --git a/www/js/more.js b/www/js/more.js
index 6c41713..7c6e8f8 100644
--- a/www/js/more.js
+++ b/www/js/more.js
@@ -42,12 +42,12 @@ var app = {
 		$("#moreBtn9").click(function(){ //会议记录
 		    //window.location = "more.html";
 		    //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
-		    showRet("https://yy.dlsmk.cn/wisdompolice/app/conference/conferencedtl?custid="+userid);
+		    showRet("https://yy.dlsmk.cn/wisdompolice/app/conference/conferencedtl?userId="+userid);
 		})
-        $("#moreBtn2").click(function(){
+        $("#moreBtn2").click(function(){ //会议
             //window.location = "more.html";
             //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
-            showRet("https://yy.dlsmk.cn/wisdompolice/app/conference/attendconference?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/conference/signupconference?userId="+userid);
         })
 
     },
diff --git a/www/main.html b/www/main.html
index da00a53..db80468 100644
--- a/www/main.html
+++ b/www/main.html
@@ -204,7 +204,6 @@
 		var shareqq = document.getElementById("shareqq");
 		var sharewx = document.getElementById("sharewx");
 		shareqq.onclick = function() {
-			alert("qq分享")
 			var args = {};
 			args.client = QQSDK.ClientType.QQ; //QQSDK.ClientType.QQ,QQSDK.ClientType.TIM;
 			args.scene = QQSDK.Scene.QQ; //QQSDK.Scene.QQZone,QQSDK.Scene.Favorite
@@ -219,15 +218,11 @@
 			}, args);
 		}
 		sharewx.onclick = function() {
-			alert("wx分享")
 			Wechat.share({
 			    message: {
 			        title: "大理App分享",
 			        description: "访客二维码",
 			        thumb: "www/img/thumbnail.png",
-			        mediaTagName: "TEST-TAG-001",
-			        messageExt: "这是第三方带的测试字段",
-			        messageAction: "<action>dotalist</action>",
 			        media: {
 			                    type: Wechat.Type.LINK,
 			                    webpageUrl: "http://www.jason-z.com"
-- 
2.17.1