From ea32948cf348cc2763257635b5e91e9c61d1bc22 Mon Sep 17 00:00:00 2001
From: yxt_njy <119782786@qq.com>
Date: Thu, 8 Feb 2024 17:52:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                       | 12 ++++++------
 pages/find/ActivityDetail.vue | 31 +++++++++++++++++++++++--------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/App.vue b/App.vue
index 49c1bd6..0e03107 100644
--- a/App.vue
+++ b/App.vue
@@ -2,12 +2,12 @@
 	export default {
 		globalData: {
 			
-			// baseURL: "http://127.0.0.1:8111/",
-			// wxSilentLoginURL: "http://127.0.0.1:8111/portal/v1/sysUser/wxSilentLogin",
-			// wxAuthLoginURL: "http://127.0.0.1:8111/portal/v1/sysUser/wxAuthLogin",
-			baseURL: "https://gateway.yyundong.com/",
-			wxSilentLoginURL: "https://gateway.yyundong.com/portal/v1/sysUser/wxSilentLogin",
-			wxAuthLoginURL: "https://gateway.yyundong.com/portal/v1/sysUser/wxAuthLogin",
+			baseURL: "http://127.0.0.1:8111/",
+			wxSilentLoginURL: "http://127.0.0.1:8111/portal/v1/sysUser/wxSilentLogin",
+			wxAuthLoginURL: "http://127.0.0.1:8111/portal/v1/sysUser/wxAuthLogin",
+			// baseURL: "https://gateway.yyundong.com/",
+			// wxSilentLoginURL: "https://gateway.yyundong.com/portal/v1/sysUser/wxSilentLogin",
+			// wxAuthLoginURL: "https://gateway.yyundong.com/portal/v1/sysUser/wxAuthLogin",
 			isDebug: true,
 			token: "",
 			isLogin: false,
diff --git a/pages/find/ActivityDetail.vue b/pages/find/ActivityDetail.vue
index c118c63..8a60510 100644
--- a/pages/find/ActivityDetail.vue
+++ b/pages/find/ActivityDetail.vue
@@ -212,22 +212,37 @@
 		},
 		methods: {
 			// 分享给好友
-			onShareAppMessage: function() {
-				wx.showShareMenu(
-				{
-					withShareTicket:true,
-					menu:['111','222']
+			onShareAppMessage: function(res) {
+				let _this = this
+				let activityName = _this.page.activityDetails.name;
+				let imageUrl =  _this.page.activityDetails.listActivityImage[0].imageUrl;
+				let activitySid = _this.parameter.activitySid;
+				return{
+					title:activityName,
+					imageUrl:imageUrl,
+					path:'/pages/find/ActivityDetail?activitySid=' + activitySid,
 				}
-				)
+			// 	wx.showShareMenu(
+			// 	{
+			// 		withShareTicket:true,
+			// 		menu:['111','222']
+			// 	}
+			// 	)
+			
+			
+
 			
 			
 			},
 			// 分享到朋友圈
 			onShareTimeline() {
+				let _this = this
+				let activityName = _this.page.activityDetails.name;
+				let imageUrl =  _this.page.activityDetails.listActivityImage[0].imageUrl
 				return {
-					title: '公司团建', // 分享出的卡片标题
+					title: activityName, // 分享出的卡片标题
 					path: '/pages/home/cloudCard2', // 他人通过卡片进入小程序的路径，可以在后面拼接URL的形式带参数
-					imageUrl: '/static/logo_icon.png', // 分享出去的图片，默认为当前页面的截图。图片路径可以是本地文件路径或者网络图片路径。支持PNG及JPG。
+					imageUrl: imageUrl, // 分享出去的图片，默认为当前页面的截图。图片路径可以是本地文件路径或者网络图片路径。支持PNG及JPG。
 				};
 			},
 			setEnrollRequiredName(){