diff --git a/pages/declaration/list.vue b/pages/declaration/list.vue index 1f7c392..311541a 100644 --- a/pages/declaration/list.vue +++ b/pages/declaration/list.vue @@ -32,7 +32,7 @@ - 地名命名申报 + 地名备案 @@ -57,7 +57,7 @@ - 我的任务 + 巡检任务 diff --git a/pages/funeralreport/funeralreport.vue b/pages/funeralreport/funeralreport.vue index a807d93..ce26d11 100644 --- a/pages/funeralreport/funeralreport.vue +++ b/pages/funeralreport/funeralreport.vue @@ -160,7 +160,7 @@ - + 联系电话 @@ -264,6 +264,19 @@ }, methods:{ + lxdh(){ + uni.showModal({ + title: '联系电话', + content: '028-36241643', + success: function(res) { + if (res.confirm) { + console.log('点击了确认') + } else { + console.log('点击了取消') + } + } + }) + }, // xztime(value){ this.timeshow1 = false diff --git a/pages/funeralreservation/funeralreservation.vue b/pages/funeralreservation/funeralreservation.vue index 866b357..aca4bb9 100644 --- a/pages/funeralreservation/funeralreservation.vue +++ b/pages/funeralreservation/funeralreservation.vue @@ -106,7 +106,7 @@ this.$refs.uToast.show({ type: 'error', title: '成功主题(带图标)', - message: "请先去线上报丧", + message: "请先进行线上报丧", iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png' }) } diff --git a/pages/home/home.vue b/pages/home/home.vue index fc98887..7e5b3fb 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -61,15 +61,15 @@ - + - 文化宣传 + 线上报丧 - + - 普法宣传 + 线上预约 @@ -116,7 +116,7 @@ - 地名命名申报 + 地名备案 @@ -126,6 +126,12 @@ 地名查询服务 + + + + + 巡检任务 + @@ -193,13 +199,14 @@ methods: { // funeralculture() { + uni.setStorageSync('dh',1) uni.navigateTo({ - url: '/pages/funeralculture/funeralculture' + url: '/pages/funeralreport/funeralreport' }) }, funerallaw() { uni.navigateTo({ - url: '/pages/funerallaw/funerallaw' + url: '/pages/funeralreservation/funeralreservation' }) }, funeralguide() { diff --git a/pages/maptask/maptask.vue b/pages/maptask/maptask.vue index a27bc6e..141f3de 100644 --- a/pages/maptask/maptask.vue +++ b/pages/maptask/maptask.vue @@ -41,7 +41,7 @@ return { TabShow: 0, nvConfig: { - title: "我的任务", + title: "巡检任务", bgColor: "#ffffff", color: "#000000", fixedAssist: { diff --git a/pages/mydeath/mydeath.vue b/pages/mydeath/mydeath.vue index d2455b6..bbd5713 100644 --- a/pages/mydeath/mydeath.vue +++ b/pages/mydeath/mydeath.vue @@ -11,9 +11,9 @@ 逝者编号：{{item.orderNumber}} - + @@ -56,8 +56,10 @@ pageNum:1, pageSize:10, userId:"", + filingStatus:"0" }, list:[], + total:0, }; }, onPageScroll(e) { @@ -80,16 +82,37 @@ }) }, getinfo(){ - this.info.userId = uni.getStorageSync("USERS_KEY").userId + if(uni.getStorageSync('userjs') == '调度员'){ + this.info.userId = '' + }else{ + this.info.userId = uni.getStorageSync("USERS_KEY").userId + } console.log("user",uni.getStorageSync("USERS_KEY")); this.API.getwsyy(this.info).then(res=>{ console.log("获取网上报丧信息",res); + this.total = res.total for(let i = 0;i < res.rows.length;i++){ this.list.push(res.rows[i]) } }) }, - } + }, + onReachBottom() { + var page = parseInt(this.total / 10 ); + var s = parseInt(this.total % 10 ); + console.log(page,s); + if(s > 0){ + page = page + 1 + } + if(page > 0){ + if(this.info.pageNum < page){ + this.info.pageNum = this.info.pageNum + 1 + this.getinfo(); + }else{ + console.log("没有了"); + } + } + }, } diff --git a/pages/mydeathdetail/mydeathdetail.vue b/pages/mydeathdetail/mydeathdetail.vue index 098a971..a93f3dc 100644 --- a/pages/mydeathdetail/mydeathdetail.vue +++ b/pages/mydeathdetail/mydeathdetail.vue @@ -54,16 +54,6 @@ 预约人电话 - @@ -85,25 +75,24 @@ - - - @@ -171,7 +160,6 @@ } } }) - }, /** * 返回点击