From f5d67b69142c78be1ee996f53b6bb8e4c954761c Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 15 十一月 2023 10:06:38 +0800
Subject: [PATCH] 页面跳转修改
---
pages/tabBar/notice/measures.vue | 15 ++++---
pages/tabBar/current/current.vue | 1
pages/tabBar/information/information.vue | 1
pages/tabBar/notice/detail.vue | 34 ++++++++++++++--
pages/tabBar/notice/notice.vue | 2 +
pages/tabBar/responsivity/showMeasures.vue | 18 ++++++--
manifest.json | 2
pages/tabBar/responsivity/countyResponsivity.vue | 1
common/constant.js | 3 +
pages/tabBar/examine/examine.vue | 2 +
pages/tabBar/response/response.vue | 1
11 files changed, 61 insertions(+), 19 deletions(-)
diff --git a/common/constant.js b/common/constant.js
index 2399a22..eb73fd7 100644
--- a/common/constant.js
+++ b/common/constant.js
@@ -1,9 +1,10 @@
let VUE_APP_BASE_URL= null;
if (process.env.NODE_ENV == 'development') {
- // VUE_APP_BASE_URL = 'http://192.168.0.38:8086'
+ // VUE_APP_BASE_URL = 'http://192.168.0.47:8086'
VUE_APP_BASE_URL = 'http://121.239.169.30:13001'
}else {
+ // VUE_APP_BASE_URL = 'http://192.168.0.47:8086'
VUE_APP_BASE_URL = 'http://121.239.169.30:13001'
}
diff --git a/manifest.json b/manifest.json
index a3870ef..3135f8e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "应急响应",
"appid" : "__UNI__843A1A3",
"description" : "",
- "versionName" : "1.0.1",
+ "versionName" : "1.1.0",
"versionCode" : 2,
"transformPx" : false,
"app-plus" : {
diff --git a/pages/tabBar/current/current.vue b/pages/tabBar/current/current.vue
index f6015aa..a7db491 100644
--- a/pages/tabBar/current/current.vue
+++ b/pages/tabBar/current/current.vue
@@ -179,6 +179,7 @@
},
toDetail(item) {
item.responsesRate = item.responsesRate.replace(/%/g, '%25');
+ uni.setStorageSync('backFlag','current');
uni.navigateTo({
url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(item))
})
diff --git a/pages/tabBar/examine/examine.vue b/pages/tabBar/examine/examine.vue
index a9c222f..18f7f79 100644
--- a/pages/tabBar/examine/examine.vue
+++ b/pages/tabBar/examine/examine.vue
@@ -196,6 +196,8 @@
},
toDetail(item) {
console.log("item",item)
+ uni.setStorageSync('backFlag','examine');
+ console.log("uunget",uni.getStorageSync('backFlag'))
uni.navigateTo({
url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(item))
})
diff --git a/pages/tabBar/information/information.vue b/pages/tabBar/information/information.vue
index d9ad834..e8d4a91 100644
--- a/pages/tabBar/information/information.vue
+++ b/pages/tabBar/information/information.vue
@@ -137,6 +137,7 @@
},
toDetail(item) {
console.log("item",item)
+ uni.setStorageSync('backFlag','info');
uni.navigateTo({
url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(item))
})
diff --git a/pages/tabBar/notice/detail.vue b/pages/tabBar/notice/detail.vue
index 45b62ed..83bc644 100644
--- a/pages/tabBar/notice/detail.vue
+++ b/pages/tabBar/notice/detail.vue
@@ -159,7 +159,8 @@
directViewUrl: '',
cityMessage: '响应措施反馈',
measureData: {},
- urls: []
+ urls: [],
+ backFlag: ''
}
},
onLoad:function(options){
@@ -231,13 +232,33 @@
if(this.unitType == 4 && this.role == '工作人员'){
this.getMeasures();
}
-
+ // this.backFlag = uni.getStorageSync('backFlag')
+ // console.log(this.backFlag,'1111')
},
methods: {
goBack() {
- uni.navigateBack({
- url:'./notice/notice'
- });
+ console.log(uni.getStorageSync('backFlag'),'1111')
+ if(uni.getStorageSync('backFlag') == 'notice'){
+ uni.switchTab({
+ url: '/pages/tabBar/notice/notice'
+ })
+ }else if (uni.getStorageSync('backFlag') == 'info') {
+ uni.switchTab({
+ url: '/pages/tabBar/information/information'
+ })
+ }else if (uni.getStorageSync('backFlag') == 'examine') {
+ uni.switchTab({
+ url: '/pages/tabBar/examine/examine'
+ })
+ }else if (uni.getStorageSync('backFlag') == 'current') {
+ uni.switchTab({
+ url: '/pages/tabBar/current/current'
+ })
+ }else if ( uni.getStorageSync('backFlag') == 'response'){
+ uni.switchTab({
+ url: '/pages/tabBar/response/response'
+ })
+ }
},
loginOut() {
uni.clearStorageSync();
@@ -262,6 +283,8 @@
},
goMeasures() {
if(this.cityMessage == '查看措施反馈' ){
+ uni.setStorageSync('backMeasures','detail')
+ this.measureData.id = this.detailData.id
uni.navigateTo({
url: `/pages/tabBar/responsivity/showMeasures?data=` + encodeURIComponent(JSON.stringify(this.measureData))
})
@@ -374,6 +397,7 @@
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
}
.barText{
+ margin-left: -20px;
flex: 1;
/* margin-left: 20px; */
text-align: center;
diff --git a/pages/tabBar/notice/measures.vue b/pages/tabBar/notice/measures.vue
index b12f0ba..9ed6f14 100644
--- a/pages/tabBar/notice/measures.vue
+++ b/pages/tabBar/notice/measures.vue
@@ -6,7 +6,7 @@
<view class="statusBar" :style="{ paddingTop: statusBarHeight + 'px' }"></view>
<!-- 真正的导航栏内容 -->
<view class="navBar">
- <u-icon name="arrow-left" color="black" size="17" @click="goBack" />
+ <u-icon name="arrow-left" color="black" size="17" style="margin-left: 10px;" @click="goBack" />
<view class="barText">响应措施反馈</view>
</view>
</view>
@@ -105,9 +105,9 @@
}).catch(err=>{})
},
goBack() {
- uni.navigateBack({
- url:'./detail/detail'
- });
+ uni.navigateTo({
+ url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(uni.getStorageSync("fdetailData")))
+ })
},
checkboxChange(n) {
@@ -136,12 +136,13 @@
icon: "none",
title: '提交成功'
});
- this.goBack();
+ uni.navigateTo({
+ url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(this.detailData))
+ })
}else{
uni.$u.toast(res.msg)
}
})
-
},
// 删除图片
deletePic(event) {
@@ -208,7 +209,7 @@
height: 50px;
display: flex;
flex-direction: row;
- justify-content: center;
+ /* justify-content: center; */
align-items: center;
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
}
diff --git a/pages/tabBar/notice/notice.vue b/pages/tabBar/notice/notice.vue
index 3c0d15a..5be8b37 100644
--- a/pages/tabBar/notice/notice.vue
+++ b/pages/tabBar/notice/notice.vue
@@ -239,6 +239,8 @@
if (item.responseStatus === 1) {
this.updateResponseStatus(item);
}
+ uni.setStorageSync('fdetailData', item);
+ uni.setStorageSync('backFlag','notice');
uni.navigateTo({
url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(item))
})
diff --git a/pages/tabBar/response/response.vue b/pages/tabBar/response/response.vue
index 0d1fe8b..b067fdc 100644
--- a/pages/tabBar/response/response.vue
+++ b/pages/tabBar/response/response.vue
@@ -112,6 +112,7 @@
getDetail({id: item.id}).then(res => {
console.log("response",res)
if(res.code == 100) {
+ uni.setStorageSync('backFlag','response');
uni.navigateTo({
url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(res.data))
})
diff --git a/pages/tabBar/responsivity/countyResponsivity.vue b/pages/tabBar/responsivity/countyResponsivity.vue
index 735e428..ce1a066 100644
--- a/pages/tabBar/responsivity/countyResponsivity.vue
+++ b/pages/tabBar/responsivity/countyResponsivity.vue
@@ -122,6 +122,7 @@
getMeasureDetail({id: item.id}).then(res => {
if(res.code == 100){
if(res.data.baseMeasures && res.data.baseMeasures.length>0 ){
+ uni.setStorageSync('backMeasures','county')
uni.navigateTo({
url: `/pages/tabBar/responsivity/showMeasures?data=` + encodeURIComponent(JSON.stringify(res.data))
})
diff --git a/pages/tabBar/responsivity/showMeasures.vue b/pages/tabBar/responsivity/showMeasures.vue
index bf5eb51..73eabe1 100644
--- a/pages/tabBar/responsivity/showMeasures.vue
+++ b/pages/tabBar/responsivity/showMeasures.vue
@@ -6,7 +6,7 @@
<view class="statusBar" :style="{ paddingTop: statusBarHeight + 'px' }"></view>
<!-- 真正的导航栏内容 -->
<view class="navBar">
- <u-icon name="arrow-left" color="black" size="17" @click="goBack" />
+ <u-icon name="arrow-left" color="black" style="margin-left: 10px;" size="17" @click="goBack" />
<view class="barText">响应措施反馈</view>
</view>
</view>
@@ -80,9 +80,17 @@
},
methods: {
goBack() {
- uni.navigateBack({
- url:'/pages/tabBar/responsivity/villageResponsivity'
- });
+ console.log(uni.getStorageSync('backMeasures'),'222222')
+ if(uni.getStorageSync('backMeasures') == 'detail'){
+ uni.navigateTo({
+ url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(uni.getStorageSync("fdetailData")))
+ })
+ }else if (uni.getStorageSync('backMeasures') == 'county'){
+ uni.navigateTo({
+ url: '/pages/tabBar/responsivity/countyResponsivity'
+ })
+ }
+
},
//预览图片
previewSqs(item,index) {
@@ -109,7 +117,7 @@
height: 50px;
display: flex;
flex-direction: row;
- justify-content: center;
+ /* justify-content: center; */
align-items: center;
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
}
--
Gitblit v1.9.2