From bb4bd64f845b46b02a3a56f69519803672e138e9 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 3 Aug 2023 17:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/company.js                               |  9 ++++--
 components/companyFinance/companyFinance.vue | 10 ++++++-
 manifest.json                                |  2 +-
 pages.json                                   | 29 ++++++++++++++++++--
 pages/oaExamine/oaExamine.vue                |  3 +-
 pages/oaHome/oaHome.vue                      |  1 -
 pages/oaTask/oaTask.vue                      |  5 ++--
 store/modules/app.js                         |  8 ++++++
 subpkg/archives/archives.vue                 | 10 ++++++-
 subpkg/companyInfo/companyInfo.vue           | 16 +++++++----
 subpkg/newPersonnel/newPersonnel.vue         |  6 ++--
 subpkg/topUp/topUp.vue                       |  2 +-
 12 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/api/company.js b/api/company.js
index a1f397c..e690c09 100644
--- a/api/company.js
+++ b/api/company.js
@@ -37,12 +37,12 @@ export const companyUserDetail = (data) => oahttp.get('/company/user', data)
 
 
 /**
- * 人员详情
+ * 月流水
  */
 export const accountMonthList = (data) => oahttp.get('/account_log/company_year_count', data)
 
 /**
- * 人员详情
+ * 日流水
  */
 export const accountDateList = (data) => oahttp.get('/account_log/company_lists', data)
 
@@ -61,3 +61,8 @@ export const Draftingcontracts = (data) => oahttp.post('/company/Draftingcontrac
  */
 export const postsms = (data) => oahttp.post('/company/postsms', data)
 
+/**
+ * 公司财务
+ */
+export const sss = (data) => oahttp.post('/company/postsms', data)
+
diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index de22fb2..db5b281 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="c_card">
-    <view class="f_card">
+    <view class="f_card" @click="naviTo('/subpkg/topUp/topUp')">
       <view class="item">
         <view>公司账户余额(元)</view>
         <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
@@ -17,6 +17,7 @@
       <view class="right">
         <view class="btn" :class="current==0?'active':''" @click="current=0;initLoad()">日账单</view>
         <view class="btn" :class="current==1?'active':''" @click="current=1;initLoad()">月账单</view>
+        <view class="btn" @click="naviTo('/subpkg/companyFinance/companyFinance')">更多</view>
       </view>
     </view>
     <view class="f_list">
@@ -45,6 +46,7 @@
 
 <script>
   import { accountMonthList, accountDateList } from "@/api/company.js"
+import { Toast } from "../../libs/uniApi";
   export default {
     name: "companyFinance",
     data() {
@@ -70,6 +72,12 @@
       })
     },
     methods:{
+      naviTo(url) {
+        url ?
+          uni.navigateTo({
+            url: url,
+          }) : Toast('暂未开放')
+      },
       initLoad(){
         this.loadConfig.page = 1;
         this.loadConfig.status = "loadmore";
diff --git a/manifest.json b/manifest.json
index 44e9639..72e98fd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "供销综合平台",
-    "appid" : "__UNI__3A527D1",
+    "appid" : "__UNI__EA9FCAF",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/pages.json b/pages.json
index fcedf3c..add66eb 100644
--- a/pages.json
+++ b/pages.json
@@ -11,6 +11,16 @@
         }
       }
     },
+    {
+      "path": "pages/business/business",
+      "style": {
+        "navigationBarTitleText": "商机信息",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#3175f9",
+        "navigationBarTextStyle": "white"
+      }
+    
+    },
     {
       "path": "pages/index/index",
       "style": {
@@ -364,6 +374,15 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "companyFinance/companyFinance",
+      "style": {
+        "navigationBarTitleText": "公司财务",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#3175f9",
+        "navigationBarTextStyle": "white"
+      }
+
     }]
   }],
   "globalStyle": {
@@ -395,9 +414,15 @@
         "iconPath": "/static/tabs-icon/approval.png",
         "selectedIconPath": "/static/tabs-icon/approval-a.png"
       },
+      // {
+      //   "pagePath": "pages/oaManager/oaManager",
+      //   "text": "片区经理",
+      //   "iconPath": "/static/tabs-icon/manager.png",
+      //   "selectedIconPath": "/static/tabs-icon/manager-a.png"
+      // },
       {
-        "pagePath": "pages/oaManager/oaManager",
-        "text": "片区经理",
+        "pagePath": "pages/business/business",
+        "text": "商机",
         "iconPath": "/static/tabs-icon/manager.png",
         "selectedIconPath": "/static/tabs-icon/manager-a.png"
       },
diff --git a/pages/oaExamine/oaExamine.vue b/pages/oaExamine/oaExamine.vue
index dcc47da..3a816e1 100644
--- a/pages/oaExamine/oaExamine.vue
+++ b/pages/oaExamine/oaExamine.vue
@@ -24,7 +24,8 @@
         <view class="approval_time">{{item.create_time}}</view>
       </view>
     </view>
-    <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" />
+    <u-empty icon="/static/img/empty/data.png"></u-empty>
+    <!-- <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" /> -->
     <!-- <tabbar></tabbar> -->
   </view>
 </template>
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 38b9d9e..4f77b35 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -301,7 +301,6 @@
         }
       },
       login() {
-        console.log('ss');
         uni.navigateTo({
           url: '/pages/oaLogin/oaLogin'
         })
diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue
index 70cc3d4..b185b17 100644
--- a/pages/oaTask/oaTask.vue
+++ b/pages/oaTask/oaTask.vue
@@ -26,8 +26,9 @@
     <!-- 事件列表 -->
     <view class="task_list">
       <!-- <taskCard class="task_card" v-for="item in 10" :key="item"></taskCard> -->
+      <u-empty icon="/static/img/empty/data.png"></u-empty>
     </view>
-    <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" />
+    <!-- <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" /> -->
     <!-- <tabbar></tabbar> -->
   </view>
 </template>
@@ -262,7 +263,7 @@
     justify-content: space-between;
     align-items: center;
     flex-direction: column;
-    padding-top: 21rpx;
+    // padding-top: 21rpx;
     .task_card{
       margin-bottom: 21rpx;
     }
diff --git a/store/modules/app.js b/store/modules/app.js
index 0d4f99b..c0a3ddb 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -15,6 +15,14 @@ const mutations = {
   LOGOUT(state) {
     Cache.clear('USER_INFO')
     Cache.clear('TOKEN')
+    uni.showModal({
+      content: '登录已过期,是否重新登录?',
+      success(e) {
+        if(e.confirm)uni.redirectTo({
+          url:'/pages/oaLogin/oaLogin'
+        })
+      }
+    })
   },
   UPDATE_USERINFO(state, data) {
     let time = res.data.result.expires_time - Cache.time();
diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index 2d70084..16bf446 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -28,7 +28,7 @@
         <view class="bottom">
           <view class="circle"></view>
           <view class="green">所属片区</view>
-          <view>{{item.address}}</view>
+          <view class="tips">{{item.address}}</view>
         </view>
       </view>
       <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
@@ -231,6 +231,14 @@
           margin-right: 18rpx;
           -webkit-background-clip: text;
         }
+        
+        .tips{
+          width: 480rpx;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        
       }
 
 
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 5957376..d81ce8a 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -1,12 +1,14 @@
 <template>
   <view class="">
     <view class="fixed_box">
-      <view class="top_box">
-        <view class="item" :class="current==0?'active':''" @click="current=0">我的公司</view>
-        <view class="item" :class="current==1?'active':''"  @click="current=1">签约公司</view>
-        <view class="item" :class="current==2?'active':''"  @click="current=2">公司财务</view>
-        <!-- <view class="item" :class="current==3?'active':''"  @click="current=3">公司财务</view> -->
-      </view>
+      <scroll-view :scroll-x="true" style="background-color: #fff;">
+        <view class="top_box">
+          <view class="item" :class="current==0?'active':''" @click="current=0">我的公司</view>
+          <view class="item" :class="current==1?'active':''"  @click="current=1">签约公司</view>
+          <view class="item" :class="current==2?'active':''"  @click="current=2">公司财务</view>
+          <view class="item" :class="current==3?'active':''"  @click="naviTo()">任务情况</view>
+        </view> 
+      </scroll-view>
       <view class="top_box top_box2" v-if="current==1">
         <view class="item" :class="currentChild==0?'active':''"  @click="currentChild=0;initLoad()">已签约</view>
         <view class="item" :class="currentChild==1?'active':''"  @click="currentChild=1;initLoad()">未签约</view>
@@ -145,11 +147,13 @@
   left: 0;
   z-index: 999;
 }
+
 .top_box{
   background-color: #fff;
   display: flex;
   
   .item{
+    flex-shrink: 0; /* 禁止缩小 */
     width: 155rpx;
     height: 53rpx;
     background: #F5F5F5FF;
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index f1d63cb..3586486 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -225,9 +225,9 @@
               icon: "none",
               title: "添加成功",
               success: () => {
-                // setTimeout(() => {
-                //   uni.navigateBack()
-                // }, 1000)
+                setTimeout(() => {
+                  uni.navigateBack()
+                }, 1000)
               }
             })
           }
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index d3d2be5..b1ae53e 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -6,7 +6,7 @@
         <view class="title">充值信息</view>
         <view class="item">
           <text>充值账户</text>
-          <text>{{$store.state.app.userInfo.account||''}}</text>
+          <text>{{$store.state.app.userInfo.company.company_name||''}}</text>
         </view>
       </view>
     </view>