From 28715d736b4540aa94d8dced101bdc18b23a68ff Mon Sep 17 00:00:00 2001
From: "1747191978@qq.com" <1942943850@qq.com>
Date: Fri, 14 Feb 2025 19:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=A1=B5=E9=9D=A2=EF=BC=88=E5=9B=BA=E5=AE=9A=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=B8=8A=E7=BA=A7=E5=9C=B0=E5=9D=80=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 大唐会议前台1/App.vue                         |  11 +++++++--
 大唐会议前台1/imgs/back.png                   | Bin 0 -> 2995 bytes
 .../pages/components/MeetingList.vue          |   6 ++---
 大唐会议前台1/pages/index/details.vue         |  23 ++++++++++--------
 大唐会议前台1/pages/index/index.vue           |  10 ++++++++
 大唐会议前台1/pages/index/pdf.vue             |  17 +++++++++++--
 大唐会议前台1/pages/user/login.vue            |   3 +--
 7 files changed, 51 insertions(+), 19 deletions(-)
 create mode 100644 大唐会议前台1/imgs/back.png

diff --git a/大唐会议前台1/App.vue b/大唐会议前台1/App.vue
index 2c2f7fe1..57c3a9e8 100644
--- a/大唐会议前台1/App.vue
+++ b/大唐会议前台1/App.vue
@@ -87,12 +87,19 @@
 	/deep/.u-toast__content__text--success {
 		max-width: 500px !important;
 	}
-
+.back{
+	width:40px;
+	position: fixed !important;
+	top: 16px;
+	left: 16px;
+}
 	.logo {
 		width: 500px;
 		position: fixed !important;
+		top:16px;
 		left: 16px;
-		top: 16px;
+		right: 16px;
+		margin: auto;
 	}
 
 	// 状态颜色
diff --git a/大唐会议前台1/imgs/back.png b/大唐会议前台1/imgs/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..0716af1f22d91a23556f01abd5e5f96aa05bea79
GIT binary patch
literal 2995
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
E8&YCP!2kdN

literal 0
HcmV?d00001

diff --git a/大唐会议前台1/pages/components/MeetingList.vue b/大唐会议前台1/pages/components/MeetingList.vue
index bf7e9437..a7eb4c18 100644
--- a/大唐会议前台1/pages/components/MeetingList.vue
+++ b/大唐会议前台1/pages/components/MeetingList.vue
@@ -13,7 +13,7 @@
 				<view class="li-text">{{item.richtext}}</view>
 			</view>
 			<view class="view-ul" v-if="item.infos && item.infos.length">
-				<MeetingList :infos='item.infos'></MeetingList>
+				<MeetingList :detailsId='detailsId' :infos='item.infos'></MeetingList>
 			</view>
 		</view>
 		<u-popup :show="show" @close="handleClose" mode="center">
@@ -46,7 +46,7 @@
 	import pdf from 'vue-pdf'
 	export default {
 		name: 'MeetingList',
-		props: ['infos'],
+		props: ['infos','detailsId'],
 		components: {
 			pdf
 		},
@@ -97,7 +97,7 @@
 				// this.filePdfUrl = _item.filePdfUrl
 				// this.show = true
 				uni.navigateTo({
-					url: `/pages/index/pdf?filePdfUrl=${_item.filePdfUrl}`,
+					url: `/pages/index/pdf?filePdfUrl=${_item.filePdfUrl}&detailsId=${this.detailsId}`,
 				});
 			},
 		},
diff --git a/大唐会议前台1/pages/index/details.vue b/大唐会议前台1/pages/index/details.vue
index 697aa378..7a99b96f 100644
--- a/大唐会议前台1/pages/index/details.vue
+++ b/大唐会议前台1/pages/index/details.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="box">
-		<image class="logo" src='../../imgs/logo.png' alt="" mode="widthFix" @click="handleLogo"></image>
+		<image class="back" src='../../imgs/back.png' mode="widthFix" @click="handleBack"></image>
+		<image class="logo" src='../../imgs/logo.png' alt="" mode="widthFix" ></image>
 		<view class="box-cent">
 			<view class="box-cent1">
 				<view class="view-box">
@@ -8,7 +9,7 @@
 						<span class="view-title"> {{listData.title}}</span>
 					</view>
 					<view class="view-ul">
-						<MeetingList :infos='listData.infos'></MeetingList>
+						<MeetingList :detailsId='detailsId' :infos='listData.infos'></MeetingList>
 					</view>
 				</view>
 			</view>
@@ -47,14 +48,16 @@
 				listData: [],
 				data: [],
 				userName: uni.getStorageSync("userName"),
-				show: false
+				show: false,
+				detailsId:'',
 			};
 		},
 
 		created() {
 			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 			let curParam = routes[routes.length - 1].options; //获取路由参数
-			console.log('curParam', curParam)
+			this.detailsId = curParam.id
+			console.log('curParam', this.detailsId)
 			this.getMeetingDetails(curParam.id) //获取会议列表
 		},
 		methods: {
@@ -66,13 +69,13 @@
 				});
 			},
 			// logo 回到首页
-			handleLogo() {
-				// uni.navigateTo({
-				// 	url: `/pages/index/index`,
-				// });
-				uni.navigateBack({
-					delta: 2
+			handleBack() {
+				uni.navigateTo({
+					url: `/pages/index/index`,
 				});
+				// uni.navigateBack({
+				// 	delta: 1
+				// });
 			},
 			// 查看详情
 			handleItemClaick(_item) {
diff --git a/大唐会议前台1/pages/index/index.vue b/大唐会议前台1/pages/index/index.vue
index b00381a2..f8261a14 100644
--- a/大唐会议前台1/pages/index/index.vue
+++ b/大唐会议前台1/pages/index/index.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="box">
+		<image class="back" src='../../imgs/back.png' mode="widthFix" @click='handleBack'></image>
 		<image class="logo" src='../../imgs/logo.png' mode="widthFix" ></image>
 		<view class="box-cent">
 			<view class="box-cent1">
@@ -54,6 +55,15 @@
 			this.getQueryMeeting() //获取会议列表
 		},
 		methods: {
+			// logo 回到首页
+			handleBack() {
+				// uni.navigateTo({
+				// 	url: `/pages/user/login`,
+				// });
+				uni.navigateBack({
+					delta: 1
+				});
+			},
 			// 退出登录
 			handleOut(){
 				uni.clearStorage();
diff --git a/大唐会议前台1/pages/index/pdf.vue b/大唐会议前台1/pages/index/pdf.vue
index f620dd52..d2752944 100644
--- a/大唐会议前台1/pages/index/pdf.vue
+++ b/大唐会议前台1/pages/index/pdf.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="box" style="position: relative;">
-		<image class="logo" src='../../imgs/logo.png' mode="widthFix" @click="handleLogo"></image>
+		<image class="back" src='../../imgs/back.png' mode="widthFix" @click="handleBack"></image>
+		<image class="logo" src='../../imgs/logo.png' mode="widthFix" ></image>
 		<view class="box-cent">
 			<view class="box-cent1">
 				<view class="view-pdf">
@@ -54,15 +55,27 @@
 				curPageNum: 0,
 				filePdfUrl: '',
 				userName: uni.getStorageSync("userName"),
-				show: false
+				show: false,
+				detailsId:'',
 			};
 		},
 		created() {
 			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 			let curParam = routes[routes.length - 1].options; //获取路由参数
+			this.detailsId = curParam.detailsId
+			console.log('this.detailsId ',this.detailsId)
 			this.filePdfUrl = curParam.filePdfUrl
 		},
 		methods: {
+			// logo 回到首页
+			handleBack() {
+				uni.navigateTo({
+					url: `/pages/index/details?id=${this.detailsId}`,
+				});
+				// uni.navigateBack({
+				// 	delta: 1
+				// });
+			},
 			// 退出登录
 			handleOut() {
 				uni.clearStorage();
diff --git a/大唐会议前台1/pages/user/login.vue b/大唐会议前台1/pages/user/login.vue
index b5e0f85d..e1b3e777 100644
--- a/大唐会议前台1/pages/user/login.vue
+++ b/大唐会议前台1/pages/user/login.vue
@@ -143,7 +143,7 @@
 					if (code === 200) {
 						uni.setStorageSync("userToken", res.token);
 						uni.setStorageSync("userName", this.form.username);
-						uni.reLaunch({
+						uni.navigateTo({
 							url: "/pages/index/index",
 						});
 						this.handleSuccess("登录成功");
@@ -174,7 +174,6 @@
 </script>
 
 <style lang="scss" scoped>
-	
 	.view-form {
 		width: 80%
 	}