From f412d880cfce86c7a0a00caa6f39a2b4ab2418f3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 27 Nov 2021 15:19:12 +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

---
 api/owner/ownerApi.js | 7 +++++++
 pages/index/index.vue | 2 ++
 pages/my/my.vue       | 7 ++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/api/owner/ownerApi.js b/api/owner/ownerApi.js
index b6b8e56..5ad3129 100755
--- a/api/owner/ownerApi.js
+++ b/api/owner/ownerApi.js
@@ -203,6 +203,13 @@ export function deleteOwnerMember(_data){
  * 
  */
 export function hasOwner(){
+	let loginFlag = wx.getStorageSync(mapping.LOGIN_FLAG);
+	let nowDate = new Date();
+	//判断如果是APP
+
+	if (!loginFlag || loginFlag.expireTime < nowDate.getTime()) {
+		return ;
+	}
 	let _ownerInfo = wx.getStorageSync(mapping.OWNER_INFO);
 	if(_ownerInfo){
 		uni.showToast({
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2320d19..135d851 100755
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -266,6 +266,7 @@
 					});
 					return;
 				}
+				hasOwner();
 				uni.getStorage({
 					key: 'ownerInfo',
 					success: function (res) {
@@ -276,6 +277,7 @@
 				});
 			},
 			_doCall: function() {
+			
 				let _that = this;
 				uni.makePhoneCall({
 					// 手机号
diff --git a/pages/my/my.vue b/pages/my/my.vue
index e667753..c337a54 100755
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -30,7 +30,7 @@
 					<text class="text-grey">切换小区</text>
 				</view>
 				<view class="action">
-					<text class="text-grey text-sm">{{currentCommunityName}}</text>
+					<text class="text-grey text-sm">{{communityName}}</text>
 				</view>
 			</view>
 			<view class="cu-item arrow" @click="myAssets()">
@@ -87,12 +87,14 @@
 	} from '../../utils/StorageUtil.js'
 
 	import mapping from '../../constant/MappingConstant.js'
+	import {hasOwner} from '../../api/owner/ownerApi.js'
 	export default {
 		data() {
 			return {
 				userInfo: {},
 				headerImg: '',
 				userName: '',
+				communityName:'',
 				// 用户信息
 				ownerFlag: false, // 是否有业主信息 标记 如果有为 true  没有为false
 				login: true
@@ -158,6 +160,7 @@
 						"&fileTypeCd=10000";
 					_that.headerImg = _headerImg;
 					_that.userName = _owner.appUserName;
+					_that.communityName = _owner.communityName;
 				});
 			},
 			showLongModel: function() {
@@ -196,6 +199,7 @@
 					});
 					return;
 				}
+				hasOwner();
 				this.vc.navigateTo({
 					url: '/pages/my/myMenu?pageSign=myAssets'
 				});
@@ -210,6 +214,7 @@
 					});
 					return;
 				}
+				hasOwner();
 				this.vc.navigateTo({
 					url: '/pages/my/myMenu?pageSign=myServices'
 				});