From 709eb09bdc3d3597a2b79686fc53304e946296e8 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 2 Sep 2023 13:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue   |  4 ++--
 pages/oaLogin/oaLogin.vue | 13 +++++++++++++
 pages/oaMy/oaMy.vue       | 18 +++++++++++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 27755f0..e96124f 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,8 +1,8 @@
 <template>
   <view class="oa_home" style="oaColor">
     <!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
-    <u-navbar v-if="uniMP" @leftClick="leftClick" :autoBack="true" bgColor="rgba(0,0,0,0)"
-        leftIconColor=" #fff">
+    <u-navbar v-if="uniMP" @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
+        leftIconColor=" #fff" :autoBack="false">
     </u-navbar>
     <view class="home_header" :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''">
       <view style="
diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index b4ca7fd..c8059dc 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -2,6 +2,9 @@
 	<view class="login">
 		<!-- <image class="bg-iamge" src="../../static/img/login/login_back_img.png"></image> -->
     <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 100vh;transform: scale(1.3);background-color: #0122c7;"/>
+    <u-navbar v-if="uniMP" @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
+        leftIconColor=" #fff" :autoBack="false">
+    </u-navbar>
 		<!-- #ifdef APP-PLUS||H5 -->
 		<!-- <view style="height: var(--status-bar-height)"></view> -->
 		<!-- #endif -->
@@ -56,6 +59,7 @@
         options: {
           data: '',
         },
+        uniMP: false,
 				tabList: [{
 						name: '账号登录'
 					},
@@ -79,12 +83,21 @@
       this.options.data = bj;
       // this.$refs.lottie.call('play');
       this.initTerminal();
+    },
+    onShow() {
+      if(uni.getStorageSync('uniMP'))this.uniMP = true;
     },
 		methods: {
 			changeTabs(e) {
 				this.current = e.index;
 				this.formData.scene = e.index + 1;
 			},
+      leftClick(e) {
+        uni.sendHostEvent('closeApp', e, (ret) => {
+          //发送消息成功回调
+          console.log('关闭应用'+JSON.stringify(ret));
+        });
+      },
 			// 获取设备id
 			getId() {
 				// #ifdef APP-PLUS
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 921d6f7..a11522e 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -5,10 +5,14 @@
       <view style="position: absolute;bottom: 0;left: 0;overflow: hidden;border-radius: 0;">
         <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 460rpx;transform: scale(1.2);background-color: #0122c7;"/>
       </view>
+      <u-navbar v-if="uniMP" @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
+          leftIconColor=" #fff" :autoBack="false">
+      </u-navbar>
 			<!-- #ifdef APP-PLUS||H5 -->
-			<view style="height: var(--status-bar-height);"></view>
-      <!-- <view style="height: 30rpx"></view> -->
-			<view style="height: 100rpx"></view>
+      <view v-if="!uniMP" style="height: var(--status-bar-height)"></view>
+      <view style="height: 30rpx"></view>
+			<!-- <view style="height: 100rpx"></view> -->
+      <view v-if="uniMP" style="height: 44px"></view>
 			<!-- #endif -->
 			<view class="personage">
 				<view class="my_msg flex_a_c_j_sb">
@@ -96,6 +100,7 @@
         options: {
           data: '',
         },
+        uniMP: false,
 				// myOaData: [],
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				modelShow: false
@@ -105,6 +110,7 @@
       this.options.data = bj;
     },
 		onShow() {
+      if(uni.getStorageSync('uniMP'))this.uniMP = true;
 			this.getOaUserInfo();
 		},
 		onHide() {
@@ -142,6 +148,12 @@
     },
 		methods: {
 			...mapActions(['getWxLogin']),
+      leftClick(e) {
+        uni.sendHostEvent('closeApp', e, (ret) => {
+          //发送消息成功回调
+          console.log('关闭应用'+JSON.stringify(ret));
+        });
+      },
 			login() {
 				uni.reLaunch({
 					url: '/pages/oaLogin/oaLogin'