From e7ce4124d0a02769ceea12beff061a60ab7cc60d Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 19 Aug 2023 09:24:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaMy/oaMy.vue | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index aa0a005..7b6e51c 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -75,8 +75,10 @@
         </view>
       </block>
     </view>
-    <view class="log_out" v-if="$store.state.app.token" @click="logout">退出登录</view>
+    <view class="log_out" v-if="$store.state.app.token" @click="modelShow=true">退出登录</view>
     <view class="log_out" v-else @click="login">登录账号</view>
+    
+    <u-modal :show="modelShow" title="警告" content='确定要退出登录吗' closeOnClickOverlay showCancelButton @close="modelShow=false" @cancel="modelShow=false" @confirm="logout"></u-modal>
     <!-- <tabbar></tabbar> -->
   </view>
 </template>
@@ -96,6 +98,7 @@
       return {
         myOaData: myOaData,
         src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+        modelShow: false
       }
     },
     onReady() {
@@ -107,6 +110,9 @@
     onShow() {
       this.getOaUserInfo();
     },
+    onHide() {
+      this.modelShow = false;
+    },
     computed: {
       eyeType() {
         return this.$store.state.config.eyeType;
@@ -124,19 +130,19 @@
       },
       logout() {
         let that = this;
-        uni.showModal({
-          content: '确定要退出登录吗',
-          success: (e) => {
-            if (e.confirm) {
+        // uni.showModal({
+        //   content: '确定要退出登录吗',
+        //   success: (e) => {
+        //     if (e.confirm) {
               uni.navigateTo({
                 url: '/pages/oaLogin/oaLogin?clear='+true,
                 success() {
                   that.$store.commit('CLEAR');
                 }
               })
-            }
-          }
-        })
+        //     }
+        //   }
+        // })
       },
       async getOaUserInfo() {
         const res = await userInfo();