From 75bf2692d096f233bdc33148877fd2c237fe2150 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 20 Jul 2023 16:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=88=E5=90=8C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD,=E5=AF=B9=E6=8E=A5=E5=85=AC=E5=91=8A=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3,=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/contract.js                          |  12 +
 api/notice.js                            |   6 +
 api/pay.js                               |   4 +
 babel.config.js                          |   8 +
 manifest.json                            |   2 +-
 pages.json                               |  15 +-
 pages/oaHome/oaHome.vue                  |  27 +-
 pages/oaLogin/oaLogin.vue                |   3 +
 pages/oaMy/oaMy.vue                      |   7 +-
 subpkg/contract/contract.vue             | 277 ++++++++------
 subpkg/contractDetail/contractDetail.vue | 460 +++++++++++++----------
 subpkg/finance/finance.vue               |  10 +
 subpkg/topUp/topUp.vue                   |  16 +-
 13 files changed, 521 insertions(+), 326 deletions(-)
 create mode 100644 api/contract.js
 create mode 100644 api/notice.js
 create mode 100644 babel.config.js

diff --git a/api/contract.js b/api/contract.js
new file mode 100644
index 0000000..15245f8
--- /dev/null
+++ b/api/contract.js
@@ -0,0 +1,12 @@
+import oahttp from "@/utils/oahttp.js";
+
+/**
+ * 合同列表
+ */
+export const contractList = (data) => oahttp.get('/contract/index', data)
+
+
+/**
+ * 合同详情
+ */
+export const contractView = (data) => oahttp.get('/contract/view', data)
\ No newline at end of file
diff --git a/api/notice.js b/api/notice.js
new file mode 100644
index 0000000..73e3623
--- /dev/null
+++ b/api/notice.js
@@ -0,0 +1,6 @@
+import oahttp from "@/utils/oahttp.js";
+
+/**
+ * 鍏憡鍒楄〃
+ */
+export const noticeList = (data) => oahttp.get('/article/lists', data)
diff --git a/api/pay.js b/api/pay.js
index b6a04e4..42eebc0 100644
--- a/api/pay.js
+++ b/api/pay.js
@@ -20,3 +20,7 @@ export const payPrepay = (data) => oahttp.post('/pay/prepay', data)
  */
 export const wechatJsConfig = (data) => oahttp.get('/wechat/jsConfig', data)
 
+/**
+ * 鏀粯鐘舵��
+ */
+export const payStatus = (data) => oahttp.get('/pay/payStatus', data)
diff --git a/babel.config.js b/babel.config.js
new file mode 100644
index 0000000..aa0bba5
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset'
+  ],
+  plugins: [
+    '@babel/plugin-proposal-optional-chaining'
+  ]
+}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 7510e8c..391d1c6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,7 @@
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "android" ],
-                        "appid" : "__UNI__3A527D1",
+                        "appid" : "wx9d68c92b550ddd1e",
                         "UniversalLinks" : ""
                     }
                 },
diff --git a/pages.json b/pages.json
index 3aac9bd..e3f705b 100644
--- a/pages.json
+++ b/pages.json
@@ -5,7 +5,10 @@
       "path": "pages/oaHome/oaHome",
       "style": {
         "navigationBarTitleText": "棣栭〉",
-        "enablePullDownRefresh": true
+        "enablePullDownRefresh": true,
+        "app-plus": {
+          "titleNView": false
+        }
       }
     },
     {
@@ -29,12 +32,18 @@
     {
       "path": "pages/oaMy/oaMy",
       "style": {
-        "navigationBarTitleText": "鎴戠殑"
+        "navigationBarTitleText": "鎴戠殑",
+        "app-plus": {
+          "titleNView": false
+        }
       }
     }, {
       "path": "pages/oaLogin/oaLogin",
       "style": {
-        "navigationBarTitleText": "鐧诲綍"
+        "navigationBarTitleText": "鐧诲綍",
+        "app-plus": {
+          "titleNView": false
+        }
       }
 
     }, {
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index af15f90..0d6e7e1 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,6 +1,9 @@
 <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 -->
     <view class="home_header">
       <view class="my_info flex_a_c">
         <view class="">
@@ -37,8 +40,8 @@
           </view>
         </view>
         <block v-for="(item,index) in ApproveList.slice(0,2)" :key="index">
-          <view class="backlog_item flex_a_c_j_sb" @click="backlogDetails">
-            <view class="text">{{ item.content }}</view>
+          <view class="backlog_item flex_a_c_j_sb" @click="clickNotice(item.id)">
+            <view class="text">{{ item.title }}</view>
             <i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
           </view>
         </block>
@@ -96,6 +99,7 @@
 <script>
   import { Toast } from '@/libs/uniApi.js'
   import { oaHomeData } from '@/static/server/server.js'
+  import {noticeList} from "@/api/notice.js"
   // import tabbar from '../components/tabbar'
   import { getIndexListAPI, getTaskListAPI, getMyTaskListAPI, getApproveListAPI, getUserIndexAPI } from '@/api/oaApi.js'
   export default {
@@ -149,7 +153,7 @@
     onShow() {
       // this.getUserIndex()
       // this.getIndexList()
-      // this.getApproveList()
+      this.getApproveList()
       this.initUserInfo()
     },
     computed: {},
@@ -170,8 +174,12 @@
         this.$store.state.app.userInfo ? this.myOaInfo = this.$store.state.app.userInfo : null;
       },
       async getApproveList() {
-        const res = await getApproveListAPI({ status: 1 })
-        this.ApproveList = res.data
+        const res = await noticeList({
+          cid: 1,
+          sort: 'new',
+          keyword: '',
+        })
+        this.ApproveList = res.data.lists
       },
       async getIndexList() {
         const { project, task } = await getIndexListAPI()
@@ -204,8 +212,9 @@
             url: url,
           }) : Toast('鏆傛湭寮�鏀�')
       },
-      backlogDetails() {
-        Toast('鐐瑰嚮寰呭姙浜嬮」')
+      // 鐐瑰嚮鍏憡
+      clickNotice(){
+        Toast('鐐瑰嚮鍏憡')
       },
       async getUserIndex() {
         const res = await getUserIndexAPI()
@@ -296,6 +305,10 @@
 
         .text {
           font-size: 28.04rpx;
+          white-space: nowrap; /* 绂佹鎹㈣ */
+          overflow: hidden; /* 婧㈠嚭闅愯棌 */
+          text-overflow: ellipsis; /* 浣跨敤鐪佺暐鍙蜂唬琛ㄨ鎴柇鐨勬枃鏈� */
+          width: 580rpx; /* 璁剧疆鍏冪礌瀹藉害锛屾牴鎹渶瑕佽繘琛岃皟鏁� */
 
           &::before {
             content: '鎻愰啋';
diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index f51995c..166b280 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -1,6 +1,9 @@
 <template>
   <view class="login">
     <image class="bg-iamge" src="../../static/img/login/login_back_img.png"></image>
+    <!-- #ifdef APP-PLUS||H5 -->
+    <view style="height: var(--status-bar-height);"></view>
+    <!-- #endif -->
     <view class="body">
       <view class="title">娆㈣繋杩涘叆閲屾捣渚涢攢骞冲彴锛�</view>
       <view class="login-card">
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index b6b2e8c..dacc860 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -2,6 +2,9 @@
   <view class="my">
     <view class="head_box">
       <image class="head_img" src="../../static/img/home/head-bg.png"></image>
+      <!-- #ifdef APP-PLUS||H5 -->
+      <view style="height: var(--status-bar-height);"></view>
+      <!-- #endif -->
       <view v-if="!oaUserInfo" class="my_head">
         <view class="department flex_a_c">
           <view class="section">浜у搧鎶�鏈儴</view>
@@ -35,12 +38,12 @@
               <view class="num">1000</view>
               <view class="name">鍙彁鐜伴噾棰�</view>
             </view>
-            <view class="cent_item">
+            <view class="cent_item" @click="naviTo('/subpkg/finance/finance')">
               <!-- <view class="num">{{ oaUserInfo.department_money }}</view> -->
               <view class="num">0</view>
               <view class="name">鍐荤粨閲戦</view>
             </view>
-            <view class="cent_item">
+            <view class="cent_item" @click="naviTo('/subpkg/finance/finance')">
               <!-- <view class="num">{{ oaUserInfo.company_money }}</view> -->
               <view class="num">0</view>
               <view class="name">鍏呭�奸噾棰�</view>
diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue
index 01d83ab..588123f 100644
--- a/subpkg/contract/contract.vue
+++ b/subpkg/contract/contract.vue
@@ -2,24 +2,25 @@
   <view class="">
     <view class="tabs">
       <view class="left">
-        <view class="item active">鍚堝悓鍒楄〃</view>
-        <view class="item">宸茬璁㈠悎鍚�</view>
+        <view class="item" :class="changeType==0?'active':''" @click="changeType=0">鍚堝悓鍒楄〃</view>
+        <view class="item" :class="changeType==1?'active':''" @click="changeType=1">宸茬璁㈠悎鍚�</view>
       </view>
       <view class="right">
         <text>鏂板</text>
       </view>
     </view>
     <view class="contract_list">
-      <view class="item">
+      <view class="item" v-for="(item,index) in list" :key="item.id">
         <view class="top">
           <image src="../../static/img/contract/contract.png"></image>
           <view class="text">
             <view class="name">
-              <text class="title">鍚堝悓鍚嶇О</text>
-              <text class="number">鍚堝悓缂栧彿5464643423423</text>
+              <view class="title">鍚堝悓鍚嶇О鍚堝悓鍚嶇О鍚堝悓鍚嶇О</view>
+              <view class="number">鍚堝悓缂栧彿{{item.contract_no}}</view>
             </view>
             <view class="date">
-              <text class="time">2023-04-27 鑷� 2024-04-28 </text>
+              <!-- <text class="time">2023-04-27 鑷� 2024-04-28 </text> -->
+              <text class="time">淇敼鏃堕棿:{{item.update_time}}</text>
               <text class="expire">365澶╁悗鍒版湡</text>
             </view>
           </view>
@@ -28,7 +29,7 @@
         <view class="bottom">
           <view class="left">宸茬璁�</view>
           <!-- <view class="left red">宸插埌鏈�</view> -->
-          <button class="right" @click="naviTo('/subpkg/contractDetail/contractDetail')">璇︽儏</button>
+          <button class="right" @click="naviTo('/subpkg/contractDetail/contractDetail?id='+item.id)">璇︽儏</button>
         </view>
       </view>
     </view>
@@ -36,142 +37,182 @@
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-       
-    }
-  },
-  onLoad() {},
-  onShow() {},
-  methods: {
-    naviTo(url) {
-      url ?
-        uni.navigateTo({
-          url: url
-        }) : Toast('鏆傛湭寮�鏀�')
+  import { contractList } from "@/api/contract.js"
+  export default {
+    data() {
+      return {
+        changeType: 0,
+        list: []
+      }
     },
-  },
-  onPullDownRefresh() {
+    onLoad() {},
+    onShow() {
+      this.initContractList()
+    },
+    methods: {
+      naviTo(url) {
+        url ?
+          uni.navigateTo({
+            url: url
+          }) : Toast('鏆傛湭寮�鏀�')
+      },
+      async initContractList() {
+        let res = await contractList();
+        if (res?.data?.data.length > 0) {
+          this.list = res.data.data;
+        }
+      }
+    },
+    onPullDownRefresh() {
       uni.stopPullDownRefresh()
     }
   }
 </script>
 
 <style lang="scss">
-.tabs{
-  height: 112rpx;
-  background-color: #fff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 28rpx;
-  .left{
+  .tabs {
+    height: 112rpx;
+    background-color: #fff;
     display: flex;
-    .item{
-      margin-right: 52.5rpx;
-      width: 175rpx;
-      height: 53rpx;
-      line-height: 53rpx;
-      text-align: center;
-      background-color: #F3F4F8FF;
-      border-radius: 35rpx 35rpx 35rpx 35rpx;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 28rpx;
+
+    .left {
+      display: flex;
+
+      .item {
+        margin-right: 52.5rpx;
+        width: 175rpx;
+        height: 53rpx;
+        line-height: 53rpx;
+        text-align: center;
+        background-color: #F3F4F8FF;
+        border-radius: 35rpx 35rpx 35rpx 35rpx;
+        font-size: 28rpx;
+        font-weight: 400;
+        color: #999999;
+      }
+
+      .active {
+        background-color: #3274F9FF;
+        color: #FFFFFFFF;
+      }
+    }
+
+    .right {
       font-size: 28rpx;
       font-weight: 400;
       color: #999999;
-    }
-    .active{
-      background-color: #3274F9FF;
-      color: #FFFFFFFF;
+      line-height: 0rpx;
+      -webkit-background-clip: text;
     }
   }
-  .right{
-    font-size: 28rpx;
-    font-weight: 400;
-    color: #999999;
-    line-height: 0rpx;
-    -webkit-background-clip: text;
-  }
-}
-.contract_list{
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-  padding: 28rpx;
-  .item{
-    width: 694rpx;
-    height: 263rpx;
-    padding: 28rpx;
-    background: #FFFFFF;
-    border-radius: 14rpx 14rpx 14rpx 14rpx;
+
+  .contract_list {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    .top{
+    align-items: center;
+    padding: 28rpx;
+
+    .item {
+      width: 694rpx;
+      height: 263rpx;
+      padding: 28rpx;
+      margin-bottom: 28rpx;
+      background: #FFFFFF;
+      border-radius: 14rpx 14rpx 14rpx 14rpx;
       display: flex;
-      image{
-        width: 87.6rpx;
-        height: 87.6rpx;
-        margin-right: 28rpx;
-      }
-      .text{
-        flex: 1;
+      flex-direction: column;
+      justify-content: space-between;
+
+      .top {
         display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        .name{
-          .title{
-            font-size: 32rpx;
-            font-weight: 400;
-            color: #333333;
-            margin-right: 17.5rpx;
+
+        image {
+          width: 87.6rpx;
+          height: 87.6rpx;
+          margin-right: 28rpx;
+        }
+
+        .text {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+
+          .name {
+            display: flex;
+            justify-content: space-between;
+            align-items: flex-end;
+            .title {
+              font-size: 32rpx;
+              font-weight: 400;
+              color: #333333;
+              margin-right: 17.5rpx;
+              white-space: nowrap;
+              /* 绂佹鎹㈣ */
+              overflow: hidden;
+              /* 婧㈠嚭闅愯棌 */
+              text-overflow: ellipsis;
+              /* 浣跨敤鐪佺暐鍙蜂唬琛ㄨ鎴柇鐨勬枃鏈� */
+              // width: 100rpx;
+              flex: 1;
+              /* 璁剧疆鍏冪礌瀹藉害锛屾牴鎹渶瑕佽繘琛岃皟鏁� */
+            }
+
+            .number {
+              font-size: 25rpx;
+              font-weight: 400;
+              color: #3274F9;
+            }
           }
-          .number{
+
+          .date {
             font-size: 25rpx;
             font-weight: 400;
-            color: #3274F9;
-          }
-        }
-        .date{
-          font-size: 25rpx;
-          font-weight: 400;
-          color: #F9AA32;
-          .time{
-            color: #CCCCCCFF;
-            margin-right: 10rpx;
+            color: #F9AA32;
+
+            .time {
+              color: #CCCCCCFF;
+              margin-right: 10rpx;
+            }
           }
         }
+
       }
-      
-    }
-    .bottom{
-      display: flex;
-      justify-content: space-between;
-      .left{
-        font-size: 28rpx;
-        font-weight: 400;
-        color: #34A853;
-      }
-      .red{
-        color: #F02828FF;
-      }
-      .right{
-        width: 158rpx;
-        height: 53rpx;
+
+      .bottom {
         display: flex;
-        justify-content: center;
-        align-items: center;
-        background: #FFFFFF;
-        border-radius: 26rpx 26rpx 26rpx 26rpx;
-        opacity: 1;
-        border: 2rpx solid #3274F9;
-        font-size: 28rpx;
-        font-weight: 400;
-        color: #3274F9;
+        justify-content: space-between;
+
+        .left {
+          font-size: 28rpx;
+          font-weight: 400;
+          color: #34A853;
+        }
+
+        .red {
+          color: #F02828FF;
+        }
+
+        .right {
+          width: 158rpx;
+          height: 53rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          background: #FFFFFF;
+          border-radius: 26rpx 26rpx 26rpx 26rpx;
+          opacity: 1;
+          border: 2rpx solid #3274F9;
+          font-size: 28rpx;
+          font-weight: 400;
+          color: #3274F9;
+        }
       }
     }
+
   }
-  
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/subpkg/contractDetail/contractDetail.vue b/subpkg/contractDetail/contractDetail.vue
index d334194..9bc70ac 100644
--- a/subpkg/contractDetail/contractDetail.vue
+++ b/subpkg/contractDetail/contractDetail.vue
@@ -5,10 +5,10 @@
       <view class="card">
         <view class="top">
           <view class="left">
-            <image ></image>
+            <image></image>
             <view class="text">
-              <view class="name">鍏徃鍚嶇О</view>
-              <view class="code">绀句細浠ｇ爜000000</view>
+              <view class="name">{{company.company_name}}</view>
+              <view class="code">绀句細浠ｇ爜{{company.organization_code}}</view>
             </view>
           </view>
           <view class="right">鍏徃绫诲瀷</view>
@@ -25,20 +25,20 @@
         <view class="one">
           <view class="linkman">涓昏鑱旂郴浜�</view>
           <view class="info">
-            <view class="info_item">濮撳悕锛氬紶涓変笁</view>
-            <view class="info_item">鑱屼綅锛氬叕鍙告�荤粡鐞�</view>
-            <view class="info_item">鑱旂郴鐢佃瘽锛�0830-123456</view>
-            <view class="info_item">閭锛�123456789@qq.com</view>
+            <view class="info_item">濮撳悕锛歿{company.master_name}}</view>
+            <view class="info_item">鑱屼綅锛歿{company.master_position}}</view>
+            <view class="info_item">鑱旂郴鐢佃瘽锛歿{company.master_phone}}</view>
+            <view class="info_item">閭锛歿{company.master_email}}</view>
           </view>
         </view>
         <view style="height: 32rpx;"></view>
-        <view class="one">
+        <view class="one" v-for="(other, index) in company.other_contacts" :key="index">
           <view class="linkman">鍏朵粬鑱旂郴浜�</view>
           <view class="info">
-            <view class="info_item">濮撳悕锛氬紶涓変笁</view>
-            <view class="info_item">鑱屼綅锛氬叕鍙告�荤粡鐞�</view>
-            <view class="info_item">鑱旂郴鐢佃瘽锛�0830-123456</view>
-            <view class="info_item">閭锛�123456789@qq.com</view>
+            <view class="info_item">濮撳悕锛歿{other.name}}</view>
+            <view class="info_item">鑱屼綅锛歿{company.position}}</view>
+            <view class="info_item">鑱旂郴鐢佃瘽锛歿{other.phone}}</view>
+            <view class="info_item">閭锛歿{other.email}}</view>
           </view>
         </view>
       </view>
@@ -46,19 +46,19 @@
     <view class="item">
       <view class="title">璧勮川淇℃伅</view>
       <view class="image_box">
-        <image class="left"></image>
-        <image class="right"></image>
+        <image class="left" @click="priview(company.qualification.bank_account)" :src="company.qualification.bank_account"></image>
+        <image class="right" @click="priview(company.qualification.business_license)" :src="company.qualification.business_license"></image>
       </view>
     </view>
     <view class="item">
       <view class="title">鐢靛瓙鍚堝悓</view>
       <view class="card">
         <view class="one">
-          <view class="linkman">绛剧害鍏徃鍚嶇О</view>
+          <view class="linkman">鍏徃鍚嶇О</view>
           <view class="info">
             <view class="info_item">绛剧害瀵硅薄锛氳绛剧害瀵硅薄鍚嶇О</view>
-            <view class="info_item">鍚堝悓绫诲瀷锛氱郴缁熻幏鍙�</view>
-            <view class="info_item">鍚堝悓缂栧彿锛氱郴缁熻幏鍙�</view>
+            <view class="info_item">鍚堝悓绫诲瀷锛歿{contract.type}}</view>
+            <view class="info_item">鍚堝悓缂栧彿锛歿{contract.contract_no}}</view>
           </view>
         </view>
         <u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
@@ -66,11 +66,15 @@
           <view class="left">
             <image class="contract_img" src="../../static/img/contract/contract.png"></image>
             <view class="text">
-              <view class="name">銆婂姵鍔℃淳閬ｅ悎鍚屻��</view>
-              <view><text class="nickname">寮犻儹閮�</text><text>2023骞�01鏈�01鏃�</text></view>
+              <view class="name">鍚堝悓</view>
+              <view>
+                <!-- <text class="nickname">寮犻儹閮�</text> -->
+                <text>{{contract.create_time}}</text>
+              </view>
             </view>
           </view>
-          <view class="right" @click="naviTo('/subpkg/pdfView/pdfView?url=' + 'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230130/1.pdf')">
+          <view class="right"
+            @click="naviTo('/subpkg/pdfView/pdfView?url=' + contract.file)">
             <!-- <image class="icon"></image> -->
             <uni-icons type="paperclip" color="#3274F9"></uni-icons>
             <view>鏌ョ湅</view>
@@ -78,202 +82,280 @@
         </view>
       </view>
     </view>
-    <button class="back_btn">杩斿洖</button>
-    <button class="stop_btn">缁堟鍚堝悓</button>
+    <button class="back_btn" @click="naviBack">杩斿洖</button>
+    <!-- <button class="stop_btn">缁堟鍚堝悓</button> -->
   </view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-       
-    }
-  },
-  onLoad() {},
-  onShow() {},
-  methods: {
-    naviTo(url) {
-      url ?
-        uni.navigateTo({
-          url: url
-        }) : Toast('鏆傛湭寮�鏀�')
+  import { contractView } from "@/api/contract.js"
+  export default {
+    data() {
+      return {
+        company: {
+          qualification: { 
+            bank_account:"",
+            bank_accountB:"",
+            business_license:"",
+            business_licenseB:"",
+          },
+        },
+        contract: {},
+        users: []
+      }
     },
-  },
-  onPullDownRefresh() {
+    onLoad(options) {
+      this.initContract(options.id)
+    },
+    onShow() {},
+    methods: {
+      naviTo(url) {
+        url ?
+          uni.navigateTo({
+            url: url
+          }) : Toast('鏆傛湭寮�鏀�')
+      },
+      naviBack(){
+        uni.navigateBack()
+      },
+      async initContract(id) {
+        let res = await contractView({ id });
+        this.company = res.data.company;
+        this.user = res.data.user;
+        this.contract = res.data.contract;
+        console.log(res.data);
+      },
+      //鏌ョ湅鍥剧墖
+      priview(url){
+        uni.previewImage({
+          urls:[url],
+          longPressActions: {
+              itemList: ['淇濆瓨鍥剧墖'],
+              success: function(data) {
+                if (data.tapIndex === 0) {
+                  uni.saveImageToPhotosAlbum({
+                      filePath: url,
+                      success: function() {
+                        uni.showToast({
+                          title: '淇濆瓨鎴愬姛',
+                          icon: 'success'
+                        })
+                      },
+                      fail: function() {
+                        uni.showToast({
+                          title: '淇濆瓨澶辫触',
+                          icon: 'none'
+                        })
+                      }
+                    })
+                }
+              }
+            }
+        })
+      }
+    },
+    onPullDownRefresh() {
       uni.stopPullDownRefresh()
     }
   }
 </script>
 
 <style lang="scss">
-.item{
-  padding: 31.5rpx 28rpx;
-  .title{
-    margin-bottom: 21rpx;
-    font-size: 35rpx;
-    font-weight: 500;
-    color: #333333;
-    display: flex;
-    justify-content: space-between;
-  }
-  .card{
-    width: 694rpx;
-    // height: 231rpx;
-    padding: 28rpx;
-    background: #FFFFFF;
-    border-radius: 14rpx 14rpx 14rpx 14rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    .top{
+  .item {
+    padding: 31.5rpx 28rpx;
+
+    .title {
+      margin-bottom: 21rpx;
+      font-size: 35rpx;
+      font-weight: 500;
+      color: #333333;
       display: flex;
       justify-content: space-between;
-      .left{
-        display: flex;
-        image{
-          width: 102rpx;
-          height: 102rpx;
-          margin-right: 28rpx;
-          background: #CCCCCC;
-          border-radius: 14rpx 14rpx 14rpx 14rpx;
-          opacity: 1;
-        }
-        .text{
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
-          .name{
-            font-size: 32rpx;
-            font-weight: 500;
-            color: rgba(0,0,0,0.8);
-          }
-          .code{
-            font-size: 28rpx;
-            font-weight: 400;
-            color: #666666;
-          }
-        }
-      }
-      .right{
-        font-size: 28rpx;
-        font-weight: 500;
-        color: #3274F9;
-      }
     }
-    .bottom{
-      display: flex;
-      align-items: center;
-      color: #666666FF;
-      margin-top: 32rpx;
-      .location{
-        margin-left: 28rpx;
-      }
-    }
-    .one{
-      .linkman{
-        height: 44rpx;
-        font-size: 32rpx;
-        font-weight: 500;
-        color: #333333;
-        margin-bottom: 28rpx;
-      }
-      .info{
-        font-size: 28rpx;
-        font-weight: 400;
-        color: #666666;
-        line-height: 45rpx;
-      }
-    }
-    .contract{
+
+    .card {
+      width: 694rpx;
+      // height: 231rpx;
+      padding: 28rpx;
+      background: #FFFFFF;
+      border-radius: 14rpx 14rpx 14rpx 14rpx;
       display: flex;
+      flex-direction: column;
       justify-content: space-between;
-      .left{
+
+      .top {
         display: flex;
-        .contract_img{
-          width: 102rpx;
-          height: 102rpx;
-          background: #F5F5F5;
-          border-radius: 14rpx 14rpx 14rpx 14rpx;
-          margin-right: 21rpx;
-        }
-        .text{
+        justify-content: space-between;
+
+        .left {
           display: flex;
-          flex-direction: column;
-          justify-content: space-between;
-          .name{
-            font-size: 32rpx;;
-            font-weight: 500;
-            color: rgba(0,0,0,0.8);
-            line-height: 35rpx;
+
+          image {
+            width: 102rpx;
+            height: 102rpx;
+            margin-right: 28rpx;
+            background: #CCCCCC;
+            border-radius: 14rpx 14rpx 14rpx 14rpx;
+            opacity: 1;
           }
-          .nickname{
-            margin-right: 35rpx;
-          }
-          text{
-            height: 39rpx;
-            font-size: 28rpx;
-            font-weight: 400;
-            color: #666666;
-            line-height: 35rpx;
+
+          .text {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+
+            .name {
+              font-size: 32rpx;
+              font-weight: 500;
+              color: rgba(0, 0, 0, 0.8);
+            }
+
+            .code {
+              font-size: 28rpx;
+              font-weight: 400;
+              color: #666666;
+            }
           }
         }
+
+        .right {
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #3274F9;
+        }
       }
-      .right{
-        font-size: 28rpx;
-        font-weight: 500;
-        color: #3274F9;
-        line-height: 35rpx;
+
+      .bottom {
         display: flex;
-        justify-content: center;
         align-items: center;
-        .icon{
-          width: 35rpx;
-          height: 39rpx;
-          background-color: #3274F9;
-          opacity: 1;
-          margin-right: 10rpx
+        color: #666666FF;
+        margin-top: 32rpx;
+
+        .location {
+          margin-left: 28rpx;
+        }
+      }
+
+      .one {
+        .linkman {
+          height: 44rpx;
+          font-size: 32rpx;
+          font-weight: 500;
+          color: #333333;
+          margin-bottom: 28rpx;
+        }
+
+        .info {
+          font-size: 28rpx;
+          font-weight: 400;
+          color: #666666;
+          line-height: 45rpx;
+        }
+      }
+
+      .contract {
+        display: flex;
+        justify-content: space-between;
+
+        .left {
+          display: flex;
+
+          .contract_img {
+            width: 102rpx;
+            height: 102rpx;
+            background: #F5F5F5;
+            border-radius: 14rpx 14rpx 14rpx 14rpx;
+            margin-right: 21rpx;
+          }
+
+          .text {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+
+            .name {
+              font-size: 32rpx;
+              ;
+              font-weight: 500;
+              color: rgba(0, 0, 0, 0.8);
+              line-height: 35rpx;
+            }
+
+            .nickname {
+              margin-right: 35rpx;
+            }
+
+            text {
+              height: 39rpx;
+              font-size: 28rpx;
+              font-weight: 400;
+              color: #666666;
+              line-height: 35rpx;
+            }
+          }
+        }
+
+        .right {
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #3274F9;
+          line-height: 35rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+
+          .icon {
+            width: 35rpx;
+            height: 39rpx;
+            background-color: #3274F9;
+            opacity: 1;
+            margin-right: 10rpx
+          }
         }
       }
     }
+
+    .image_box {
+      display: flex;
+      justify-content: space-between;
+
+      .left {
+        width: 224rpx;
+        height: 319rpx;
+        background: #FFFFFF;
+        border-radius: 14rpx 14rpx 14rpx 14rpx;
+      }
+
+      .right {
+        width: 450rpx;
+        height: 318rpx;
+        background: #FFFFFF;
+        border-radius: 14rpx 14rpx 14rpx 14rpx;
+      }
+    }
   }
-  .image_box{
+
+  .back_btn {
+    width: 694rpx;
+    height: 84rpx;
+    background: #3274F9;
+    border-radius: 42rpx 42rpx 42rpx 42rpx;
     display: flex;
-    justify-content: space-between;
-    .left{
-      width: 224rpx;
-      height: 319rpx;
-      background: #FFFFFF;
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
-    }
-    .right{
-      width: 450rpx;
-      height: 318rpx;
-      background: #FFFFFF;
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
-    }
+    justify-content: center;
+    align-items: center;
+    color: #fff;
+    margin: 30rpx auto;
   }
-}
-.back_btn{
-  width: 694rpx;
-  height: 84rpx;
-  background: #3274F9;
-  border-radius: 42rpx 42rpx 42rpx 42rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  color: #fff;
-  margin: 30rpx auto;
-}
-.stop_btn{
-  width: 694rpx;
-  height: 84rpx;
-  border-radius: 42rpx 42rpx 42rpx 42rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  color: #3274F9;
-  background-color: transparent;
-  margin: 30rpx auto;
-}
-</style>
+
+  .stop_btn {
+    width: 694rpx;
+    height: 84rpx;
+    border-radius: 42rpx 42rpx 42rpx 42rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #3274F9;
+    background-color: transparent;
+    margin: 30rpx auto;
+  }
+</style>
\ No newline at end of file
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index 8f61fa2..397c7e1 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -11,6 +11,13 @@
           璐︽埛鍏呭��
         </view>
       </view>
+      <view class="center">
+        <view>
+          <text style="margin-right: 20rpx;">璐︽埛鎬婚噾棰�(鍏�)</text><uni-icons type="eye" color="#fff"></uni-icons>
+        </view>
+        <view>1338.96</view>
+        <view>鍙彁鐜伴噾棰�</view>
+      </view>
     </view>
   </view>
 </template>
@@ -65,5 +72,8 @@ export default {
       color: #FFFFFF;
     }
   }
+  .center{
+    color: #fff;
+  }
 }
 </style>
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index 5541b01..6512400 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-  import { recharge, payWay, payPrepay, wechatJsConfig } from "@/api/pay.js"
+  import { recharge, payWay, payPrepay, wechatJsConfig, payStatus } from "@/api/pay.js"
   export default {
     data() {
       return {
@@ -95,17 +95,21 @@
                   success: (e) => {
                     console.log('鎴愬姛', e);
                     uni.hideLoading();
-                    uni.showToast({
-                      icon:'success',
-                      title:'鏀粯鎴愬姛!'
+                    payStatus({
+                      order_id: data.order_id,
+                      from: data.from,
+                    }).then((status)=>{
+                      uni.showToast({
+                        icon:status.data.pay_status?'success':'error',
+                        title: status.data.pay_status?'鏀粯鎴愬姛!':'鏀粯澶辫触!'
+                      })
                     })
                   },
                   fail: (e) => {
-                    console.log('error', e);
                     uni.hideLoading();
                     uni.showToast({
                       icon:'error',
-                      title: e.errMsg
+                      title: '鏀粯澶辫触!'
                     })
                   },
                   complete: () => {},