From 730c66b6af522c9ed59cdb37e5c4fee059f4a046 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 20 Jul 2023 18:13:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue                  | 17 +++++++++++------
 subpkg/contractDetail/contractDetail.vue | 12 ++++++------
 subpkg/finance/finance.vue               |  4 ++--
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 0d6e7e1..80baabc 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,10 +1,11 @@
 <template>
   <view class="oa_home" style="oaColor">
-    <image class="header_bg" src="../../static/img/home/head-bg.png"></image>
-    <!-- #ifdef APP-PLUS||H5 -->
-    <view style="height: var(--status-bar-height);"></view>
-    <!-- #endif -->
+    <!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
+    
     <view class="home_header">
+      <!-- #ifdef APP-PLUS||H5 -->
+      <view style="height: var(--status-bar-height);"></view>
+      <!-- #endif -->
       <view class="my_info flex_a_c">
         <view class="">
           <u--image :showLoading="true" :src="myOaInfo.avatar||''" width="64px" height="64px" shape="circle"></u--image>
@@ -243,10 +244,13 @@
     position: relative;
     padding: 28.07rpx;
     // height: 607.02rpx;
-    height: 440.02rpx;
+    // height: 480.02rpx;
     width: 100%;
     // background-color: $theme-oa-color;
     margin-bottom: 133.33rpx;
+    background-image: url('../../static/img/home/head-bg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
 
     .my_info {
       .mesg_box {
@@ -266,6 +270,7 @@
       flex-wrap: wrap;
       align-content: space-between;
       text-align: center;
+      padding-bottom: 110rpx;
 
       .task_item {
         margin-top: 42.11rpx;
@@ -281,7 +286,7 @@
     .backlog {
       position: absolute;
       left: 50%;
-      bottom: -101.75rpx;
+      bottom: -121.75rpx;
       transform: translate(-50%);
       width: 694.74rpx;
       min-height: 221.05rpx;
diff --git a/subpkg/contractDetail/contractDetail.vue b/subpkg/contractDetail/contractDetail.vue
index 9bc70ac..fe312d6 100644
--- a/subpkg/contractDetail/contractDetail.vue
+++ b/subpkg/contractDetail/contractDetail.vue
@@ -11,9 +11,9 @@
               <view class="code">社会代码{{company.organization_code}}</view>
             </view>
           </view>
-          <view class="right">公司类型</view>
+          <view class="right">{{company.company_type_name}}</view>
         </view>
-        <view class="bottom"><uni-icons type="location"></uni-icons><text class="location">负责区域:泸州市江阳区通滩镇</text></view>
+        <view class="bottom"><uni-icons type="location"></uni-icons><text class="location">负责区域:</text></view>
       </view>
     </view>
     <view class="item">
@@ -54,10 +54,10 @@
       <view class="title">电子合同</view>
       <view class="card">
         <view class="one">
-          <view class="linkman">公司名称</view>
+          <view class="linkman">{{contract.party_a_name}}</view>
           <view class="info">
-            <view class="info_item">签约对象：被签约对象名称</view>
-            <view class="info_item">合同类型：{{contract.type}}</view>
+            <view class="info_item">签约对象：{{contract.party_b_name}}</view>
+            <view class="info_item">合同类型：{{contract.contract_type_name}}</view>
             <view class="info_item">合同编号：{{contract.contract_no}}</view>
           </view>
         </view>
@@ -123,7 +123,7 @@
         this.company = res.data.company;
         this.user = res.data.user;
         this.contract = res.data.contract;
-        console.log(res.data);
+        // console.log(res.data);
       },
       //查看图片
       priview(url){
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index f4fdfba..a96cbd2 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -15,10 +15,10 @@
         <view class="title">
           <text style="margin-right: 20rpx;">账户总金额(元)</text><uni-icons type="eye" color="#fff"></uni-icons>
         </view>
-        <view class="price">1338.96</view>
+        <view class="price">{{userInfo.user_money||0.00}}元</view>
         <view class="bubble">
           <!-- <image src="../../static/img/contract/bubble.png"></image> -->
-          <view class="text">可提现金额100.00元</view>
+          <view class="text">可提现金额0.00元</view>
         </view>
       </view>
     </view>