From 10d104aef84ddd3819ac643d8c8a059932b9c96f Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 25 Jul 2023 10:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=87=E5=8C=BA=E7=BB=8F?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue |  5 +++++
 pages/oaMy/oaMy.vue     | 19 ++++++-------------
 static/server/server.js |  4 ++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 10e52e0..5ba2d35 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -235,6 +235,11 @@
         url ?
           uni.navigateTo({
             url: url,
+            fail() {
+              uni.switchTab({
+                url: url
+              })
+            }
           }) : Toast('暂未开放')
       },
       navTwo(url,key) {
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 66c5f07..0c4b02e 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -77,13 +77,6 @@
           </view>
           <uni-icons type="forward"></uni-icons>
         </view>
-		<view class="other_item flex_a_c_j_sb" @click="naviTwo('/pages/oaManager/oaManager')">
-		  <view class="flex_a_c">
-		    <view class="iconfont2" ></view>
-		    <view class="text">片区经理</view>
-		  </view>
-		  <view class="iconfont icon-you"></view>
-		</view>
       </block>
     </view>
     <view class="log_out" v-if="$store.state.app.token" @click="logout">退出登录</view>
@@ -159,14 +152,14 @@
       naviTo(url) {
         url ?
           uni.navigateTo({
-            url: url
+            url: url,
+            fail(e) {
+              uni.switchTab({
+                url: url
+              })
+            }
           }) : Toast('暂未开放')
       },
-	  naviTwo(url){
-		  uni.switchTab({ 
-			  url: url
-		  })
-	  },
       alterMyInfo() {
         uni.navigateTo({
           url: '/pages/views/personal_center'
diff --git a/static/server/server.js b/static/server/server.js
index 73e7791..0ff59dc 100644
--- a/static/server/server.js
+++ b/static/server/server.js
@@ -214,7 +214,7 @@ export const oaHomeData = [
   {
     text: '片区经理',
     icon: prefix + 'oa/yzsq@2x.png',
-    url: '/subpkg/manager/manager'
+    url: '/pages/oaManager/oaManager'
   },
   {
     text: '财务管理',
@@ -367,7 +367,7 @@ export const myOaData = [
   {
     name: '片区经理',
     icon: '../../static/icons/manager.png',
-    url: '/subpkg/manager/manager'
+    url: '/pages/oaManager/oaManager'
   },
   // {
   //   name: '管理后台',