From 9390b9143499136843d04a103b10d82845ff8360 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Fri, 23 Feb 2024 15:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E7=82=B9=E5=87=BB=E5=BC=80?=
 =?UTF-8?q?=E9=97=A8=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/app.json                          |  5 +-
 miniprogram/pages/index/index.js              | 14 ++--
 .../meeting/accessControl/accessControl.js    | 66 +++++++++++++++++++
 .../meeting/accessControl/accessControl.json  |  3 +
 .../meeting/accessControl/accessControl.wxml  |  2 +
 .../meeting/accessControl/accessControl.wxss  |  1 +
 miniprogram/pages/my/my.js                    | 18 +++--
 7 files changed, 96 insertions(+), 13 deletions(-)
 create mode 100644 miniprogram/pages/meeting/accessControl/accessControl.js
 create mode 100644 miniprogram/pages/meeting/accessControl/accessControl.json
 create mode 100644 miniprogram/pages/meeting/accessControl/accessControl.wxml
 create mode 100644 miniprogram/pages/meeting/accessControl/accessControl.wxss

diff --git a/miniprogram/app.json b/miniprogram/app.json
index 8ff6540..8572195 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -46,7 +46,8 @@
     "pages/applyType/moveInApply/moveInApply",
     "pages/my/serviceApply/serviceApply",
     "pages/complaint/complaintDetail/complaintDetail",
-    "pages/outer/outer"
+    "pages/outer/outer",
+    "pages/meeting/accessControl/accessControl"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -76,8 +77,6 @@
     ]
   },
   "usingComponents": {},
-   
-
   "sitemapLocation": "sitemap.json",
   "permission": {
     "scope.userLocation": {
diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js
index e1cdca9..6a8fb4f 100644
--- a/miniprogram/pages/index/index.js
+++ b/miniprogram/pages/index/index.js
@@ -17,7 +17,7 @@ Page({
                 "text": "首页"
             },
             {
-                "pagePath": "pages/parkRepair/parkRepair",
+                "pagePath": "pages/meeting/accessControl/accessControl",
                 "iconPath": "/images/tabbar/openDoor.png",
                 "selectedIconPath": "/images/tabbar/openDoor.png",
                 "text": "开门",
@@ -152,9 +152,15 @@ Page({
         const data = e.currentTarget.dataset
         console.log('switchTab', data)
         const url = data.path
-        wx.switchTab({
-            url: '/' + url
-        })
+        if(url == 'pages/meeting/accessControl/accessControl'){
+            wx.navigateTo({
+                url: '/' + url
+            })
+        }else{
+            wx.switchTab({
+                url: '/' + url
+            })
+        }
     },
 
     onShow() {
diff --git a/miniprogram/pages/meeting/accessControl/accessControl.js b/miniprogram/pages/meeting/accessControl/accessControl.js
new file mode 100644
index 0000000..ebe2069
--- /dev/null
+++ b/miniprogram/pages/meeting/accessControl/accessControl.js
@@ -0,0 +1,66 @@
+// pages/meeting/accessControl.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/accessControl/accessControl.json b/miniprogram/pages/meeting/accessControl/accessControl.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pages/meeting/accessControl/accessControl.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/accessControl/accessControl.wxml b/miniprogram/pages/meeting/accessControl/accessControl.wxml
new file mode 100644
index 0000000..4f3358a
--- /dev/null
+++ b/miniprogram/pages/meeting/accessControl/accessControl.wxml
@@ -0,0 +1,2 @@
+<!--pages/meeting/accessControl.wxml-->
+<text>pages/meeting/accessControl.wxml</text>
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/accessControl/accessControl.wxss b/miniprogram/pages/meeting/accessControl/accessControl.wxss
new file mode 100644
index 0000000..917d40d
--- /dev/null
+++ b/miniprogram/pages/meeting/accessControl/accessControl.wxss
@@ -0,0 +1 @@
+/* pages/meeting/accessControl.wxss */
\ No newline at end of file
diff --git a/miniprogram/pages/my/my.js b/miniprogram/pages/my/my.js
index b265173..19c64fa 100644
--- a/miniprogram/pages/my/my.js
+++ b/miniprogram/pages/my/my.js
@@ -20,7 +20,7 @@ Page({
                 "text": "首页"
             },
             {
-                "pagePath": "pages/parkRepair/parkRepair",
+                "pagePath": "pages/meeting/accessControl/accessControl",
                 "iconPath": "/images/tabbar/openDoor.png",
                 "selectedIconPath": "/images/tabbar/openDoor.png",
                 "text": "开门",
@@ -75,14 +75,20 @@ Page({
         memberInfo: {}
     },
 
-    // 切换tabbar
-    switchTab(e) {
+     // 切换tabbar
+     switchTab(e) {
         const data = e.currentTarget.dataset
         console.log('switchTab', data)
         const url = data.path
-        wx.switchTab({
-            url: '/' + url
-        })
+        if(url == 'pages/meeting/accessControl/accessControl'){
+            wx.navigateTo({
+                url: '/' + url
+            })
+        }else{
+            wx.switchTab({
+                url: '/' + url
+            })
+        }
     },
 
     /**