Merge remote-tracking branch 'origin/master'

nnzwminiapp/pages/web/web.js

@@ -5,7 +5,10 @@ Page({
 	 * 页面的初始数据
 	 */
 	data: {
-		url: ''
+		url: '',
+		type:'',
+		siteId:'',
+		id : '',
 	},
 
 	/**
@@ -19,7 +22,8 @@ Page({
 		if (options.se && options.se != '') {
 			// 有se就是地图搜索
 			this.setData({
-				url: options.url + '?se=' + options.se
+				url: options.url + '?se=' + options.se,
+				type:"se"
 			})
 		} else if (options.wxUrl && options.wxUrl != '') {
 			let siteId = options.wxUrl;
@@ -27,16 +31,21 @@ Page({
 			
 			let url = "https://www.cqna.gov.cn/personalCenter/answerSheet/answerSheet.html?siteId="+siteId+"&metadataId="+id;
 			this.setData({
-				url: url
+				url: url,
+				type:"wxUrl",
+				siteId:options.wxUrl,
+				id:options.metadataId
 			})
 		} else if(options.gzUrl && options.gzUrl != ''){
 			this.setData({
-				url:decodeURIComponent(options.gzUrl)
+				url:decodeURIComponent(options.gzUrl),
+				type:"gzUrl"
 			})
 		}else if(options.sxUrl && options.sxUrl != ''){
 			
 			this.setData({
-				url:decodeURIComponent(options.sxUrl)
+				url:decodeURIComponent(options.sxUrl),
+				type:"sxUrl"
 			}) 
 		}
 		else {
@@ -46,7 +55,8 @@ Page({
 			data = data.replace(')','=')
 			// console.log(data);
 			this.setData({
-				url: data
+				url: data,
+				type:"url"
 			})
 		}
 		console.log(this.data.url);
@@ -104,8 +114,46 @@ Page({
 	 * 用户点击右上角分享
 	 */
 	onShareAppMessage(options) {
-		return {
-			title: ' '
+		switch (this.data.type) {
+			case "url":
+				return {
+					title: ' ',
+					path: '/pages/web/web?url=' + this.data.url
+				}
+			case "sxUrl":
+			case "gzUrl":
+				return {
+					title: ' ',
+					path: '/pages/web/web?'+this.data.type+'=' + encodeURIComponent(this.data.url)
+				}
+			case "wxUrl":
+				return {
+					title: ' ',
+					path: '/pages/web/web?wxUrl='+this.data.siteId+'&metadataId='+this.data.id ,
+				}
+					
+		}
+
+	},
+	onShareTimeline(options){
+		switch (this.data.type) {
+			case "url":
+				return {
+					title: '1',
+					path: '/pages/web/web?url=' + this.data.url
+				}
+			case "sxUrl":
+			case "gzUrl":
+				return {
+					title: ' 1',
+					path: '/pages/web/web?'+this.data.type+'=' + encodeURIComponent(this.data.url)
+				}
+			case "wxUrl":
+				return {
+					title: ' 1',
+					path: '/pages/web/web?wxUrl='+this.data.siteId+'&metadataId='+this.data.id ,
+				}
+					
 		}
 	},
 	getMessage(e){