From cc5bc281d0f9747656afe20d7ee288d653240b0f Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Thu, 18 Apr 2024 09:19:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/app.js               | 16 +++++++++++++++
 miniprogram/pages/index/index.js | 34 +++++++++++++++++---------------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/miniprogram/app.js b/miniprogram/app.js
index 90a5ea8..6cbde29 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -278,4 +278,20 @@ App({
             }
         })
     },
+
+    selfShowMsg(content, url) {
+        wx.showModal({
+            title: '提示',
+            content: content,
+            confirmText: '确认',
+            showCancel: false,
+            success: res => {
+                if (url) {
+                    wx.navigateTo({
+                        url
+                    })
+                }
+            }
+        })
+    },
 })
\ No newline at end of file
diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js
index a0ea34a..b6cf420 100644
--- a/miniprogram/pages/index/index.js
+++ b/miniprogram/pages/index/index.js
@@ -185,22 +185,24 @@ Page({
         if (userId) {
             getUserInfoRq(userId).then(res => {
                 console.log('getUserInfoRq', res);
-                let userDetail = res.data;
-                // 存储用户信息
-                wx.setStorageSync('openid', userDetail.openid)
-                wx.setStorageSync('user', userDetail)
-                wx.setStorageSync('userId', userDetail.id)
-                _this.setData({
-                    userDetail
-                })
-                // 登录用户是否选择园区
-                _this.userIsPark()
+                if (res.code == 0) {
+                    let userDetail = res.data;
+                    // 存储用户信息
+                    wx.setStorageSync('openid', userDetail.openid)
+                    wx.setStorageSync('user', userDetail)
+                    wx.setStorageSync('userId', userDetail.id)
+                    _this.setData({
+                        userDetail
+                    })
+                    // 登录用户是否选择园区
+                    _this.userIsPark()
+                } else {
+                    app.selfShowMsg(res.msg, '/pages/login/login')
+                }
             })
         } else {
-            app.getlogin()
-            return
+            app.selfShowMsg('请登录账号', '/pages/login/login')
         }
-
     },
 
     // 登录用户是否选择园区
@@ -211,9 +213,9 @@ Page({
             _this.setData({
                 parkName: wx.getStorageSync('parkName')
             })
-            getParkRq(parkId).then(res=>{
-                console.log('getParkRq' , res);
-                let bannerList = res.bannerImages.map(item=>item.url)
+            getParkRq(parkId).then(res => {
+                console.log('getParkRq', res);
+                let bannerList = res.bannerImages.map(item => item.url)
                 _this.setData({
                     bannerList
                 })