From f807598bc068639ae37d38603e23085527112344 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 12 Apr 2024 16:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/account/account.vue                 | 2 +-
 components/charge/charge.vue                   | 2 +-
 components/my/my-person.vue                    | 4 ++--
 components/vc-user-account/vc-user-account.vue | 2 +-
 pages/complaint/viewComplaint.vue              | 2 +-
 pages/machine/chargeCard.vue                   | 4 ++--
 pages/my/myHouse.vue                           | 2 +-
 pages/my/myHouseDetail.vue                     | 7 ++-----
 pages/reserve/reserveOrder.vue                 | 2 +-
 pages/viewBindOwner/viewBindOwner.vue          | 2 +-
 10 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/components/account/account.vue b/components/account/account.vue
index 0677c9a..24b1611 100644
--- a/components/account/account.vue
+++ b/components/account/account.vue
@@ -48,7 +48,7 @@
 							page: 1,
 							row: 20,
 							idCard: _ownerInfo.idCard,
-							link: _ownerInfo.link,
+							link: _ownerInfo.ownerTel,
 							communityId: _communityId,
 							acctType:'2003'
 						}).then((data) => {
diff --git a/components/charge/charge.vue b/components/charge/charge.vue
index 6519492..ae54238 100644
--- a/components/charge/charge.vue
+++ b/components/charge/charge.vue
@@ -48,7 +48,7 @@
 						getChargeMonthOrder({
 							page: 1,
 							row: 20,
-							personTel: _ownerInfo.link,
+							personTel: _ownerInfo.ownerTel,
 							communityId: _communityId,
 							queryTime:formatDate(new Date())
 						}).then((data) => {
diff --git a/components/my/my-person.vue b/components/my/my-person.vue
index f04a38d..c30d40c 100644
--- a/components/my/my-person.vue
+++ b/components/my/my-person.vue
@@ -152,7 +152,7 @@
 							page: 1,
 							row: 20,
 							idCard: _ownerInfo.idCard,
-							link: _ownerInfo.link,
+							link: _ownerInfo.ownerTel,
 							communityId: _ownerInfo.communityId
 						}).then((data) => {
 							if (!data) {
@@ -192,7 +192,7 @@
 						getCouponUsers({
 							page: 1,
 							row: 100,
-							tel: _ownerInfo.link,
+							tel: _ownerInfo.ownerTel,
 							communityId: _ownerInfo.communityId,
 							state: '1001'
 						}, null)
diff --git a/components/vc-user-account/vc-user-account.vue b/components/vc-user-account/vc-user-account.vue
index b227dfd..7851a24 100644
--- a/components/vc-user-account/vc-user-account.vue
+++ b/components/vc-user-account/vc-user-account.vue
@@ -97,7 +97,7 @@
 							page: 1,
 							row: 99,
 							idCard: _ownerInfo.idCard,
-							link: _ownerInfo.link,
+							link: _ownerInfo.ownerTel,
 							communityId: _communityId,
 							// acctType:'2003',
 							acctTypes: '2003,2004'
diff --git a/pages/complaint/viewComplaint.vue b/pages/complaint/viewComplaint.vue
index 482f5c9..603ea95 100644
--- a/pages/complaint/viewComplaint.vue
+++ b/pages/complaint/viewComplaint.vue
@@ -140,7 +140,7 @@
 						_that.appUserName = _ownerInfo.appUserName;
 						_that.appUserId = _ownerInfo.appUserId;
 						_that.idCard = _ownerInfo.idCard;
-						_that.link = _ownerInfo.link;
+						_that.link = _ownerInfo.ownerTel;
 						_that.active = _active;
 					}
 				});
diff --git a/pages/machine/chargeCard.vue b/pages/machine/chargeCard.vue
index fda8c1d..6029050 100644
--- a/pages/machine/chargeCard.vue
+++ b/pages/machine/chargeCard.vue
@@ -66,11 +66,11 @@
 				let _that = this;
 				context.getOwner(function(_ownerInfo) {
 					if (_ownerInfo) {
-						_that.personTel = _ownerInfo.link;
+						_that.personTel = _ownerInfo.ownerTel;
 						getChargeMonthOrder({
 							page: 1,
 							row: 20,
-							personTel: _ownerInfo.link,
+							personTel: _ownerInfo.ownerTel,
 							communityId: _that.communityId,
 							queryTime:formatDate(new Date())
 						}).then((data) => {
diff --git a/pages/my/myHouse.vue b/pages/my/myHouse.vue
index a0ab4c4..fd73925 100644
--- a/pages/my/myHouse.vue
+++ b/pages/my/myHouse.vue
@@ -4,7 +4,7 @@
 			<view class="cu-item arrow" v-if="rooms.length > 0" v-for="(item, key) in rooms" :key="key" :data-item="item" @click="myHouseDetail(item)">
 				<view class="content padding-tb-sm">
 					<view>
-						<text class="cuIcon-homefill text-green margin-right-xs"></text> {{item.floorNum}}号楼{{item.unitNum}}单元{{item.roomNum}}室</view>
+						<text class="cuIcon-homefill text-green margin-right-xs"></text> {{item.floorNum}}-{{item.unitNum}}-{{item.roomNum}}</view>
 					<view class="text-gray text-sm">
 						<text class="cuIcon-right margin-right-xs"></text> {{item.roomId}}</view>
 				</view>
diff --git a/pages/my/myHouseDetail.vue b/pages/my/myHouseDetail.vue
index b697ec4..916285f 100644
--- a/pages/my/myHouseDetail.vue
+++ b/pages/my/myHouseDetail.vue
@@ -39,6 +39,7 @@
 <script>
 	// pages/my/myHouseDetail.js
 	import context from '../../lib/java110/Java110Context.js';
+	import {hasLogin} from '@/api/user/sessionApi.js';
 	const factory = context.factory;
 
 	export default {
@@ -65,11 +66,7 @@
 			context.onLoad(options);
 			_that.roomDetail = JSON.parse(options.room);
 
-			factory.login.checkLoginStatus(function() {
-				_that.userInfo = context.getUserInfo();
-				//_that.roomDetail = wx.getStorageSync('roomDetail');
-			}); //查询用户信息
-
+		
 			_that.loadOwenrInfo();
 		},
 
diff --git a/pages/reserve/reserveOrder.vue b/pages/reserve/reserveOrder.vue
index 06f6b45..d2a8c0d 100644
--- a/pages/reserve/reserveOrder.vue
+++ b/pages/reserve/reserveOrder.vue
@@ -118,7 +118,7 @@
 			getCurOwner()
 			.then(_ownerInfo=>{
 				//_that.personName = _ownerInfo.appUserName;
-				// _that.personTel = _ownerInfo.link;
+				// _that.personTel = _ownerInfo.ownerTel;
 				_that.communityId = _ownerInfo.communityId;
 			});
 			this.todayDate = formatDate(new Date());
diff --git a/pages/viewBindOwner/viewBindOwner.vue b/pages/viewBindOwner/viewBindOwner.vue
index b6f709f..9c8d920 100644
--- a/pages/viewBindOwner/viewBindOwner.vue
+++ b/pages/viewBindOwner/viewBindOwner.vue
@@ -97,7 +97,7 @@
 						_that.areaName = _ownerInfo.parentAreaName + _ownerInfo.areaName;
 						_that.communityId = _ownerInfo.communityId;
 						_that.appUserName = _ownerInfo.name;
-						_that.link = _ownerInfo.link;
+						_that.link = _ownerInfo.ownerTel;
 					}
 				});
 			},