From 1b41c0bc2264d011002e6272ebf1651e58c9334f Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 4 Sep 2023 09:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue | 13 ++++++++-----
 pages/oaMy/oaMy.vue     | 13 ++++++++-----
 utils/request.js        |  2 ++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index e96124f..05fc457 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,9 +1,9 @@
 <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" bgColor="rgba(0,0,0,0)"
+    <!-- <u-navbar @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
         leftIconColor=" #fff" :autoBack="false">
-    </u-navbar>
+    </u-navbar> -->
     <view class="home_header" :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''">
       <view style="
           position: absolute;
@@ -20,9 +20,12 @@
           " />
       </view>
       <!-- #ifdef APP-PLUS||H5 -->
-      <view v-if="!uniMP" style="height: var(--status-bar-height)"></view>
-      <view style="height: 30rpx"></view>
-      <view v-if="uniMP" style="height: 44px"></view>
+      <view style="height: var(--status-bar-height)"></view>
+      <view v-if="uniMP" style="height: 44px;">
+        <u-icon name="arrow-left" color="#fff" size="20" @click="leftClick"></u-icon>
+      </view>
+      <!-- <view style="height: 30rpx"></view> -->
+      <!-- <view v-if="uniMP" style="height: 44px;"></view> -->
       <!-- #endif -->
       <view class="my_info">
         <view v-if="!$store.state.app.token" @click="login" class="mesg_box">
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index a11522e..5552c83 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -5,14 +5,17 @@
       <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)"
+      <!-- <u-navbar v-if="uniMP" @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
           leftIconColor=" #fff" :autoBack="false">
-      </u-navbar>
+      </u-navbar> -->
 			<!-- #ifdef APP-PLUS||H5 -->
-      <view v-if="!uniMP" style="height: var(--status-bar-height)"></view>
-      <view style="height: 30rpx"></view>
+      <view style="height: var(--status-bar-height)"></view>
+      <view v-if="uniMP" style="height: 44px;">
+        <u-icon name="arrow-left" color="#fff" size="20" @click="leftClick"></u-icon>
+      </view>
+      <!-- <view style="height: 30rpx"></view> -->
 			<!-- <view style="height: 100rpx"></view> -->
-      <view v-if="uniMP" style="height: 44px"></view>
+      <!-- <view v-if="uniMP" style="height: 44px"></view> -->
 			<!-- #endif -->
 			<view class="personage">
 				<view class="my_msg flex_a_c_j_sb">
diff --git a/utils/request.js b/utils/request.js
index d5f7fa7..dc49f11 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,6 +1,7 @@
 import { HTTP_REQUEST_URL, HEADER, TOKENNAME, } from '@/config/app';
 // import { checkLogin } from '../libs/login';
 import store from '../store';
+import props from '../uni_modules/uview-ui/libs/config/props';
 
 
 function toLogin() {
@@ -19,6 +20,7 @@ function baseRequest(url, method, data, {
   noAuth = false,
   noVerify = false
 }) {
+  console.log('当前环境', process.env.NODE_ENV);
   let Url = HTTP_REQUEST_URL,
     header = HEADER;