From 554f7b12c11f010c658d298374ac3acd76c38e70 Mon Sep 17 00:00:00 2001 From: wanglei <1336977847@qq.com> Date: Wed, 9 Feb 2022 15:58:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppConflictMediation/AppConflictMediation.vue | 9 +-------- src/saas/AppConflictMediation/Content.vue | 4 ++-- src/saas/AppConflictMediation/List.vue | 7 +++---- src/saas/AppConflictMediation/add.vue | 12 +++++++++--- src/saas/AppConflictMediation/detail.vue | 8 ++++---- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/saas/AppConflictMediation/AppConflictMediation.vue b/src/saas/AppConflictMediation/AppConflictMediation.vue index 1c226e2e..c254c59e 100644 --- a/src/saas/AppConflictMediation/AppConflictMediation.vue +++ b/src/saas/AppConflictMediation/AppConflictMediation.vue @@ -35,14 +35,7 @@ export default { this.params = e.params this.component = e.type }, - // tabClick(index, component) { - // this.tabIndex = index - // this.component = component - // this.refresh = false - // this.$nextTick(() => { - // this.refresh = true - // }) - // }, + isGirdUser() { this.isAdmin = false this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => { diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue index ff78031b..c64abad0 100644 --- a/src/saas/AppConflictMediation/Content.vue +++ b/src/saas/AppConflictMediation/Content.vue @@ -29,9 +29,9 @@ 转交事件 - +
我已办结 diff --git a/src/saas/AppConflictMediation/List.vue b/src/saas/AppConflictMediation/List.vue index 3401dcb9..c967c2a7 100644 --- a/src/saas/AppConflictMediation/List.vue +++ b/src/saas/AppConflictMediation/List.vue @@ -142,10 +142,9 @@ export default { }) }, getStaticList() { - this.$http.post('/app/appclapeventgroup/list').then((res) => { - console.log(111); - console.log(res); - }) + // this.$http.post('/app/appclapeventgroup/list').then((res) => { + // console.log(res); + // }) }, // 切换类型 changeType(e) { diff --git a/src/saas/AppConflictMediation/add.vue b/src/saas/AppConflictMediation/add.vue index 9a27f4ea..7f260965 100644 --- a/src/saas/AppConflictMediation/add.vue +++ b/src/saas/AppConflictMediation/add.vue @@ -137,8 +137,6 @@ girdName: '', flow: '', girdId: '', - lat: '114.138292', - lng: '30.623843', flag: false, result: '', resultFiles: [], @@ -165,7 +163,15 @@ methods: { chooseAddress () { - uni.navigateTo({ url: './map' }) + uni.chooseLocation({ + success: function (res) { + this.form.address = res.address + // console.log('位置名称：' + res.name); + // console.log('详细地址：' + res.address); + // console.log('纬度：' + res.latitude); + // console.log('经度：' + res.longitude); + } + }); }, confirmSelect(e) { diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue index c2f777b7..3c1ef47d 100644 --- a/src/saas/AppConflictMediation/detail.vue +++ b/src/saas/AppConflictMediation/detail.vue @@ -106,10 +106,10 @@ 转交事件
-
+
我来受理
@@ -410,7 +410,7 @@ uni-page-body { display: flex; flex-direction: column; align-items: center; - width: 22%; + width: 40%; padding: 16px 0; border-top: 1px solid #ddd; img { @@ -427,7 +427,7 @@ uni-page-body { border-right: 1px solid #ddd; } .doIt { - width: 56%; + width: 60%; background: #3975c6; text-align: center; line-height: 112px; From b5981a375d03502fd9f9c6659ce59ee73dde319a Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 9 Feb 2022 16:15:00 +0800 Subject: [PATCH 2/2] bug --- src/saas/AppHealthUp/AppHealthUp.vue | 3 ++- src/saas/AppHealthUp/OtherStatistics.vue | 2 +- src/saas/AppMailList/add.vue | 15 +-------------- src/saas/AppMailList/myAddList.vue | 2 +- src/saas/AppWalkask/add.vue | 5 ----- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/saas/AppHealthUp/AppHealthUp.vue b/src/saas/AppHealthUp/AppHealthUp.vue index a2c9de19..6a706194 100644 --- a/src/saas/AppHealthUp/AppHealthUp.vue +++ b/src/saas/AppHealthUp/AppHealthUp.vue @@ -124,7 +124,7 @@
- ;{{$dict.getLabel('epidemicRecentHealth', item)}} + ;{{$dict.getLabel('epidemicRecentHealth', item)}}
@@ -172,6 +172,7 @@ export default { this.month = date.getMonth() + 1 this.getStatis() this.getCheckTodayReport() + this.isGirdUser() }, onShow() { document.title = '健康上报' diff --git a/src/saas/AppHealthUp/OtherStatistics.vue b/src/saas/AppHealthUp/OtherStatistics.vue index b4d227a9..bfd7739d 100644 --- a/src/saas/AppHealthUp/OtherStatistics.vue +++ b/src/saas/AppHealthUp/OtherStatistics.vue @@ -52,7 +52,7 @@
- ;{{$dict.getLabel('epidemicRecentHealth', item)}} + ;{{$dict.getLabel('epidemicRecentHealth', item)}}
diff --git a/src/saas/AppMailList/add.vue b/src/saas/AppMailList/add.vue index c058353c..17629234 100644 --- a/src/saas/AppMailList/add.vue +++ b/src/saas/AppMailList/add.vue @@ -27,16 +27,6 @@ -
- *地区 -
- - {{ userInfo.areaName }} - 请选择 - - -
-
@@ -60,7 +50,7 @@ export default { name: '', phone: '', type: '', - isPublic: '', + isPublic: '1', areaId: '', areaName: '' }, @@ -110,9 +100,6 @@ export default { if(this.userInfo.isPublic === '') { return this.$u.toast('请选择是否公开') } - if(!this.userInfo.areaId) { - return this.$u.toast('请选择地区') - } if(!this.flag) return this.$http.post(`/app/appconvenientaddressbook/addOrUpdate`, this.userInfo).then(res => { if (res.code == 0) { diff --git a/src/saas/AppMailList/myAddList.vue b/src/saas/AppMailList/myAddList.vue index a4e87924..3355b007 100644 --- a/src/saas/AppMailList/myAddList.vue +++ b/src/saas/AppMailList/myAddList.vue @@ -39,7 +39,7 @@ export default { }) }, onShow() { - document.title = "便民通讯录" + document.title = "通讯录" }, methods: { diff --git a/src/saas/AppWalkask/add.vue b/src/saas/AppWalkask/add.vue index 8a586755..58e8a2a8 100644 --- a/src/saas/AppWalkask/add.vue +++ b/src/saas/AppWalkask/add.vue @@ -3,12 +3,7 @@
- - - - -