From 63cce0bf6ee64fc4bbd77df9e3290b7a7019df1f Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Thu, 14 May 2020 17:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=A9=E4=B8=9A=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E5=8A=A0=E5=85=A5=E7=89=A9=E4=B8=9A?=
 =?UTF-8?q?=E7=BE=A4=E9=A6=96=E5=85=88=E8=A6=81=E5=AE=8C=E5=96=84=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E3=80=91=20-=E5=88=98=E7=BB=8D=E6=96=87=20-2020/5/14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-resident-mp-yushan/pages/property/property.js   | 9 ++++++++-
 epdc-resident-mp-yushan/pages/property/property.json | 3 ++-
 epdc-resident-mp-yushan/pages/property/property.wxml | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/epdc-resident-mp-yushan/pages/property/property.js b/epdc-resident-mp-yushan/pages/property/property.js
index 0be4223..2316f1b 100644
--- a/epdc-resident-mp-yushan/pages/property/property.js
+++ b/epdc-resident-mp-yushan/pages/property/property.js
@@ -17,7 +17,8 @@ Page({
     pageSize: 10, // 新闻列表-分页页长
     isLoading: true,
     timeStamp:'',
-    refreshFlag:true
+    refreshFlag:true,
+    completeInfoDialogVisible:false
   },
   onHide:function(){
     if(this.data.refreshFlag){
@@ -131,6 +132,12 @@ Page({
     }
   },
   joinGroup(e){
+    if (app.globalData.infoCompleted == 0) {
+      this.setData({
+        completeInfoDialogVisible: !this.data.completeInfoDialogVisible
+      })
+      return false
+    }
     const { joinstatus, groupid, groupname,state } = e.currentTarget.dataset
     if(joinstatus == '0'){
       wx.showModal({
diff --git a/epdc-resident-mp-yushan/pages/property/property.json b/epdc-resident-mp-yushan/pages/property/property.json
index 15525eb..99a5dea 100644
--- a/epdc-resident-mp-yushan/pages/property/property.json
+++ b/epdc-resident-mp-yushan/pages/property/property.json
@@ -4,6 +4,7 @@
   "navigationBarTextStyle": "white",
   "usingComponents": {
     "load-more": "../../components/loadMore/loadMore",
-    "pulldown-refresh": "/components/pullDownRefresh/pullDownRefresh"
+    "pulldown-refresh": "/components/pullDownRefresh/pullDownRefresh",
+    "complete-info-dialog": "../../components/completeInfoDialog/completeInfoDialog"
   }
 }
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/pages/property/property.wxml b/epdc-resident-mp-yushan/pages/property/property.wxml
index 54b1039..a5d0ee1 100644
--- a/epdc-resident-mp-yushan/pages/property/property.wxml
+++ b/epdc-resident-mp-yushan/pages/property/property.wxml
@@ -102,6 +102,6 @@
     </view> -->
   <!--加载更多提示-->
   <!-- <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more> -->
-
 </view>
+<complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>