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 00000000..0716af1f
Binary files /dev/null and b/大唐会议前台1/imgs/back.png differ
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 @@
{{item.richtext}}
-
+
@@ -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 @@
-
+
+
@@ -8,7 +9,7 @@
{{listData.title}}
-
+
@@ -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 @@
+
@@ -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 @@
-
+
+
@@ -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 @@