kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2021-12-14 11:46:29 +08:00
parent acbf61af5c aa29b01624
commit 7881ba0611
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/AppMeetingNotice/AppMeetingNotice.vue
View File

@@ -101,7 +101,7 @@ export default {
}, },
handleDetail({id}){ handleDetail({id}){
uni.navigateTo({ uni.navigateTo({
url:"/apps/meetingNotice/detail?id=" + id url:"/apps/AppMeetingNotice/detail?id=" + id
}) })
}, },
getData() { getData() {

2
src/apps/AppMeetingNotice/belongToMe.vue
View File

@@ -101,7 +101,7 @@ export default {
}, },
handleClick({id}) { handleClick({id}) {
uni.navigateTo({ uni.navigateTo({
url: "/apps/meetingNotice/detail?id=" + id url: "/apps/AppMeetingNotice/detail?id=" + id
}) })
}, },
change(e) { change(e) {

4
src/apps/AppMeetingNotice/meetingList.vue
View File

@@ -65,9 +65,9 @@
detail({id}) { detail({id}) {
let url let url
if (this.index == 2) { if (this.index == 2) {
url = "/apps/meetingNotice/addMeeting?id=" + id url = "/apps/AppMeetingNotice/addMeeting?id=" + id
} else { } else {
url = "/apps/meetingNotice/detail?id=" + id url = "/apps/AppMeetingNotice/detail?id=" + id
} }
uni.navigateTo({url}) uni.navigateTo({url})
}, },

12
src/apps/AppNotification/AppNotification.vue
View File

@@ -46,7 +46,7 @@
<AiEmpty v-else/> <AiEmpty v-else/>
<u-loadmore :status="status" v-if="dataList.length"/> <u-loadmore :status="status" v-if="dataList.length"/>
<AiAdd @add="add"/> <AiAdd @add="handleAdd"/>
<u-popup v-model="show" mode="bottom"> <u-popup v-model="show" mode="bottom">
<div class="popup-wrap"> <div class="popup-wrap">
<u-row justify="between"> <u-row justify="between">
@@ -178,7 +178,7 @@ export default {
if (item.val == 0) { if (item.val == 0) {
this.show = false; this.show = false;
return uni.navigateTo({ return uni.navigateTo({
url: "/apps/notification/detail?id=" + this.detail.id url: "/apps/AppNotification/detail?id=" + this.detail.id
}); });
} }
@@ -189,7 +189,7 @@ export default {
if(item.val==3){ if(item.val==3){
this.show = false; this.show = false;
return uni.navigateTo({ return uni.navigateTo({
url:"/apps/notification/add?id=" + this.detail.id + "&flag=" + false url:"/apps/AppNotification/add?id=" + this.detail.id + "&flag=" + false
}); });
} }
}, },
@@ -207,13 +207,13 @@ export default {
this.show = true; this.show = true;
}else { }else {
uni.navigateTo({ uni.navigateTo({
url: "/apps/notification/detail?id=" + this.detail.id + "&flag=" + true url: "/apps/AppNotification/detail?id=" + this.detail.id + "&flag=" + true
}) })
} }
}, },
add(){ handleAdd(){
uni.navigateTo({ uni.navigateTo({
url: "/apps/notification/add" url: "/apps/AppNotification/add"
}) })
}, },
change(val) { change(val) {