From fe68eea739739895c2e8f609fbbaade106807df8 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 26 Jul 2023 09:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug,=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue        | 8 +++++---
 subpkg/finance/finance.vue     | 4 ++--
 subpkg/personnel/personnel.vue | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 496292c..237a49e 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -111,8 +111,8 @@
       </block> -->
     </view>
     
-    <view class="no_login" v-if="!$store.state.app.token">
-      <view class="view" @click="login()">
+    <view class="no_login" @click="login" v-if="!$store.state.app.token">
+      <view class="view">
         <view class="text">登录里海OA,开启线上便捷办公</view>
         <button class="btn">立即登录</button>
       </view>
@@ -277,6 +277,7 @@
         }
       },
       login() {
+        console.log('ss');
         uni.navigateTo({
           url:'/pages/oaLogin/oaLogin'
         })
@@ -567,12 +568,13 @@
     width: 100vw;
     height: 112rpx;
     /* #ifdef H5 */
-    height: 200rpx;
+    height: 212rpx;
     /* #endif */
     background: rgba(#333333, 0.4);
     border-radius: 14rpx 14rpx 0rpx 0rpx;
     padding: 28rpx 28rpx;
     .view{
+      width: 100%;
       display: flex;
       justify-content: space-between;
       align-items: center;
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index 68c6b11..d9eefb1 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -7,9 +7,9 @@
           <view class="name">{{userInfo.nickname}}</view>
           <image src="../../static/img/contract/setting.png"></image>
         </view>
-        <view class="right" @click="naviTo('/subpkg/topUp/topUp')">
+        <!-- <view class="right" @click="naviTo('/subpkg/topUp/topUp')">
           账户充值
-        </view>
+        </view> -->
       </view>
       <view class="center">
         <view class="title">
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index 6143bca..2eed411 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -88,7 +88,7 @@ export default {
       let res = await companyUser({
         page: this.loadConfig.page,
         limit: this.loadConfig.limit,
-		company_id:this.$store.state.app.userInfo.admin.company_id
+        company_id: this.$store.state.app.userInfo.admin.company_id
       })
       this.loadConfig.status="loadmore"
       if(res.data.data.length<this.loadConfig.limit){