From 63297ce9aac4a4ff8c1a653ec74535bc45371938 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 22 Jul 2024 11:07:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=AF=A6=E6=83=85=E4=B8=8B?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/resiAndHouse/resiAndHouse.js | 1 -
.../pages/housePortrait/housePortrait.js | 58 +++++++++++++++++--
.../pages/housePortrait/housePortrait.wxml | 7 +++
.../pages/housePortrait/housePortrait.wxss | 35 ++++++++++-
.../searchResult/pages/resiInfo/resiInfo.js | 2 -
.../searchResult/pages/resiInfo/resiInfo.wxml | 1 -
6 files changed, 93 insertions(+), 11 deletions(-)
diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js
index 0ba3d3d..51f35d9 100644
--- a/pages/resiAndHouse/resiAndHouse.js
+++ b/pages/resiAndHouse/resiAndHouse.js
@@ -486,7 +486,6 @@ Page({
})
},
onClickJump(e) {
- console.log(e)
wx.navigateTo({
url: `/subpages/house/pages/housePortrait/housePortrait?resiId=${e.currentTarget.dataset.resiid}`,
})
diff --git a/subpages/house/pages/housePortrait/housePortrait.js b/subpages/house/pages/housePortrait/housePortrait.js
index ec6a903..1417f1a 100644
--- a/subpages/house/pages/housePortrait/housePortrait.js
+++ b/subpages/house/pages/housePortrait/housePortrait.js
@@ -1,6 +1,7 @@
// subpages/house/pages/housePortrait/housePortrait.js
import api from "../../../../utils/api"
import { getComplainList, getShengList, getPunchRecord, getShequList, getshijianList, getxuqiuList, getfuwuList, getMultiLogList } from "../../../../utils/businessRecords.js";
+const app = getApp()
Page({
/**
@@ -8,7 +9,7 @@ Page({
*/
data: {
houseId: '',
- detail: {},
+ detail: null,
logs: [],
residIds: [],
ywData: {},
@@ -20,10 +21,13 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- this.setData({
- houseId: options.resiId,
- })
- this.getData()
+ if( options.resiId){
+ this.setData({
+ houseId: options.resiId,
+ agencyLevel: app.globalData.user.level
+ })
+ this.getData()
+ }
},
getData() {
api.getClearHouseDeatilById(this.data.houseId).then((res) => {
@@ -47,8 +51,51 @@ Page({
this.setData({
detail: null,
});
+ if(error.code != 0){
+ wx.showToast({
+ title: error.msg,
+ icon:'none',
+ duration:3000,
+ success:function(){
+ setTimeout(()=>{
+ wx.navigateBack({
+ delta: 1
+ })
+ },3000)
+ }
+ })
+ }
+
});
},
+ toEvent() {
+ let obj = {
+ resiId: this.data.detail.residentId,
+ resiMobile: this.data.detail.ownerPhone,
+ resiName: this.data.detail.ownerName
+ }
+ wx.setStorageSync('resiDetail', obj)
+ wx.navigateTo({
+ url: '/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck',
+ })
+ },
+ handelTopunchCard(){
+ wx.navigateTo({
+ url: '/subpages/searchResult/pages/punchCard/punchCard?resiId=' + this.data.detail.residentId,
+ })
+ },
+ toWebView() {
+ if (app.globalData.questionnaireUrl) {
+ wx.navigateTo({
+ url: '/pages/webView/webView?url=' + app.globalData.questionnaireUrl,
+ })
+ } else {
+ wx.showToast({
+ icon: "none",
+ title: '未创建满意度调查问卷',
+ })
+ }
+ },
handelClickAddResi(){
wx.navigateTo({
url: `/subpages/addResi/pages/addResi/addResi?type=add&grid=${this.data.detail.gridId}&neighborHoodId=${this.data.detail.neighborHoodId}&buildingId=${this.data.detail.buildingId}&buildingUnitId=${this.data.detail.buildingUnitId}&doorId=${this.data.detail.id}`,
@@ -271,7 +318,6 @@ Page({
})
}
})
-
this.setData({
ywVisible: true
})
diff --git a/subpages/house/pages/housePortrait/housePortrait.wxml b/subpages/house/pages/housePortrait/housePortrait.wxml
index 2080854..5aefa1d 100644
--- a/subpages/house/pages/housePortrait/housePortrait.wxml
+++ b/subpages/house/pages/housePortrait/housePortrait.wxml
@@ -81,4 +81,11 @@
+
+
+ 上报诉求
+
+ 满意度调查
+
+ 走访打卡
\ No newline at end of file
diff --git a/subpages/house/pages/housePortrait/housePortrait.wxss b/subpages/house/pages/housePortrait/housePortrait.wxss
index 7a8f19e..77bd36d 100644
--- a/subpages/house/pages/housePortrait/housePortrait.wxss
+++ b/subpages/house/pages/housePortrait/housePortrait.wxss
@@ -148,4 +148,37 @@
height: 18rpx;
background: #3A80E7;
border-radius: 50%;
-}
\ No newline at end of file
+}
+.bto_btn{
+ position: fixed;
+ bottom: 0;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ left: 0;
+ right: 0;
+ padding:0 20rpx;
+ box-sizing: border-box;
+ background: #fff;
+ padding-bottom: constant(safe-area-inset-bottom);
+ padding-bottom: env(safe-area-inset-bottom);
+ }
+ .btn {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ box-sizing: border-box;
+ text-align: center;
+ height: 76rpx;
+ border-radius: 39rpx;
+ margin: 30rpx 0;
+ border-radius: 76rpx;
+ border: 1rpx solid #999999;
+ width: 226rpx;
+ text-align: center;
+ }
+ .blue{
+ background-color:#3974f6;
+ color: #fff;
+ border-color: #3974f6;
+ }
\ No newline at end of file
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.js b/subpages/searchResult/pages/resiInfo/resiInfo.js
index 65a8655..e6cce99 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.js
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.js
@@ -993,9 +993,7 @@ Page({
})
},
toWebView() {
- console.log(app.globalData);
if (app.globalData.questionnaireUrl) {
-
wx.navigateTo({
url: '/pages/webView/webView?url=' + app.globalData.questionnaireUrl,
})
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxml b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
index b36ce60..8d2e990 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.wxml
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
@@ -379,7 +379,6 @@
上报诉求
满意度调查
-
走访打卡