更改 工作台模块

pages/mine/index.wxml

@@ -101,7 +101,7 @@
       </view>
     </view>
   </view>
-  <view class="balanceBox bgcf" wx:if="{{(userInfo.user.agencyRole == 1 || userInfo.user.agencyRole == 2 || userInfo.hasBill)  && configInfo.bill}}">
+  <view class="balanceBox bgcf" wx:if="{{(userInfo.user.agencyRole == 1 || userInfo.user.agencyRole == 2 || userInfo.hasBill)  && configInfo.bill && false}}">
     <view class="userbalance br_8">
       <navigator url="../wodeBill/index?state=20" hover-class="thover" class="br1">
         <view class="balanceinfo f14">
@@ -127,7 +127,7 @@
       </view>
     </navigator>
   </view>
-  <view class="bgf br8 container bgcf mt10" style="padding: 0;overflow:hidden;" wx:if="{{configInfo.record}}">
+  <view class="bgf br8 container bgcf mt10" style="padding: 0;overflow:hidden;" wx:if="{{configInfo.record && false}}">
     <view hover-class="thover" class="pl16 pr10 fsa" style="line-height:44px;" bindtap="toTodayData">
       <view class="f16 c3 fwb fl wdgd">今日数据</view>
       <view class="iconfont icon-gengduo11 c9 f12"></view>
@@ -156,7 +156,7 @@
     </view>
   </view>
   <!-- 报名工单 -->
-  <view class="mt10 myBill">
+  <view class="mt10 myBill" wx:if="{{false}}">
     <view class="bgf br8 container bgcf" style="padding: 0;">
       <view hover-class="thover" class="pl16 pr10" style="line-height:44px;" bindtap="goList">
         <view class="f16 c3 fwb fl wdgd" style>报名工单</view>

pages/workBench/index.js

@@ -16,7 +16,8 @@ Page({
     underReviewNum: -1,
     underReviewList: [],
     searchParam: {},
-    recordBillType: ''
+    recordBillType: '',
+    configInfo: {},
   },
   // 事件处理函数
   bindViewTap () {
@@ -33,6 +34,18 @@ Page({
         selected: 1,
       });
     }
+
+    setTimeout(() => {
+      this.setData({
+        
+        userInfo: app.globalData.loginUserInfo,
+      
+      });
+      if (app.globalData.isLogin) {
+        this.getTeamList()
+
+      }
+    }, 100);
   },
   onUnload () {
     wx.removeStorage({
@@ -50,7 +63,12 @@ Page({
     //   });
     //   return
     // }
-
+    if (wx.getStorageSync("configInfo")) {
+      this.setData({
+        configInfo: { ...wx.getStorageSync("configInfo"), biao: false },
+      });
+      console.log('configInfo',this.data.configInfo);
+    }
     this.setData({
       isLogin: app.globalData.isLogin,
     });
@@ -69,6 +87,22 @@ Page({
     this.getBillNum();
     this.getDataNum();
     // }
+    setTimeout(() => {
+      if (app.globalData.isLogin) {
+        that.setData({
+          userInfo: app.globalData.loginUserInfo,
+        });
+      } else {
+        setTimeout(() => {
+          that.setData({
+            userInfo: app.globalData.loginUserInfo,
+          });
+        }, 100);
+        // };
+      }
+      console.log(that.data.serviceInfo);
+      // this.watch();
+    }, 100);
   },
   getUserProfile (e) {
     // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
@@ -446,10 +480,27 @@ Page({
 
     }, 200);
   },
+  toTodayData () {
+    if (!app.globalData.isLogin) {
+      wx.navigateTo({
+        url: "/pages/login/index",
+      });
+    } else {
+      wx.navigateTo({
+        url: "/subPage/todayData/index",
+      });
+    }
+  },
   goList () {
-    wx.navigateTo({
+    if (!app.globalData.isLogin) {
-      url: '../myBill/index?status=0',
+      wx.navigateTo({
-    })
+        url: "/pages/login/index",
+      });
+    } else {
+      wx.switchTab({
+        url: "../myBill/index?status=0",
+      });
+    }
   },
   getList: function (under) {
     var that = this;

pages/workBench/index.wxml

@@ -161,7 +161,110 @@
       </view>
     </view>
   </view>-->
-  <view class="p010 mt10 friendBar">
+  <!-- 统计 -->
+  <view class="balanceBox bgcf" 
+        wx:if="{{(userInfo.user.agencyRole == 1 || userInfo.user.agencyRole == 2 || userInfo.hasBill)  && configInfo.bill}}"
+         style="width:calc(100% - 20px);margin:10px auto 0;overflow:hidden;border-radius:8px !important;"
+  >
+    <view class="userbalance br_8" style="display:flex;">
+      <navigator url="../wodeBill/index?state=20" hover-class="thover" class="br1">
+        <view class="balanceinfo f14" style="width:100%;">
+          <view class="c3 mb12" style="line-height:1">待结算（元）</view>
+          <view class hover-class="none" hover-stop-propagation="false"></view>
+        </view>
+        <view class="ysd-base-f40 fw500 f26" style="line-height:1">{{map.billStatus20Salary || '0'}}</view>
+      </navigator>
+      <navigator url="../wodeBill/index?state=30" hover-class="thover">
+        <view class="balanceinfo f14" style="width:100%;">
+          <view class="c3 mb12" style="line-height:1">累计结算（元）</view>
+          <view class hover-class="none" hover-stop-propagation="false"></view>
+        </view>
+        <view class="c3 fw500 f26" style="line-height:1">{{map.billStatus30Salary}}</view>
+      </navigator>
+    </view>
+    <navigator url="../wodeBill/index?state=10" hover-class="thover" class="myaBill bt1">
+      <view class="fw500">待核对</view>
+      <view class="f14">
+        <span wx:if="{{map.billStatus10Num}}" class="f12 ysd-basebg-color ml4 mr4" style="border-radius:10px;padding:0px 4.5px;color:#fff;line-height:16px">{{ map.billStatus10Num }}</span>
+        <p wx:else class="f14 mr8 c9">暂无待核对账单</p>
+        <i class="iconfont icon-gengduo11"></i>
+      </view>
+    </navigator>
+  </view>
+  <!-- 今日数据 -->
+  <view class="bgf br8 container bgcf mt10" 
+        style="width:calc(100% - 20px);margin:10px auto 0;padding:0;overflow:hidden;border-radius:8px !important;" 
+        wx:if="{{configInfo.record}}"
+  >
+    <view hover-class="thover" class="pl16 pr10 fsa" style="line-height:44px;" bindtap="toTodayData">
+      <view class="f16 c3 fwb fl wdgd">今日数据</view>
+      <view class="iconfont icon-gengduo11 c9 f12"></view>
+    </view>
+    <view class="bt1 bgcfa">
+      <view class="weui-grid5 bgcf gbr" hover-class="none" hover-stop-propagation="false">
+        <view class="fw500 f20" hover-class="none" hover-stop-propagation="false">{{map.agencyData.signUps || '0'}}</view>
+        <view class="f14 c6" hover-class="none" hover-stop-propagation="false">报名</view>
+      </view>
+      <view class="weui-grid5 bgcf gbr" hover-class="none" hover-stop-propagation="false">
+        <view class="fw500 f20" hover-class="none" hover-stop-propagation="false">{{map.agencyData.arrived || '0'}}</view>
+        <view class="f14 c6" hover-class="none" hover-stop-propagation="false">到面</view>
+      </view>
+      <view class="weui-grid5 bgcf gbr" hover-class="none" hover-stop-propagation="false">
+        <view class="fw500 f20" hover-class="none" hover-stop-propagation="false">{{map.agencyData.passed || '0'}}</view>
+        <view class="f14 c6" hover-class="none" hover-stop-propagation="false">通过</view>
+      </view>
+      <view class="weui-grid5 bgcf gbr" hover-class="none" hover-stop-propagation="false">
+        <view class="fw500 f20" hover-class="none" hover-stop-propagation="false">{{map.agencyData.entry || '0'}}</view>
+        <view class="f14 c6" hover-class="none" hover-stop-propagation="false">入职</view>
+      </view>
+      <view class="weui-grid5 gbr" hover-class="none" hover-stop-propagation="false">
+        <view class="fw500 f20" hover-class="none" hover-stop-propagation="false">{{map.agencyData.obJob || '0'}}</view>
+        <view class="f14 c6" hover-class="none" hover-stop-propagation="false">在职</view>
+      </view>
+    </view>
+  </view>
+  <!-- 报名工单 -->
+  <view class="mt10 myBill" style="width:calc(100% - 20px);margin:10px auto 0;overflow:hidden;border-radius:8px !important;">
+    <view class="bgf br8 container bgcf" style="padding: 0;">
+      <view hover-class="thover" class="pl16 pr10" style="line-height:44px;" bindtap="goList">
+        <view class="f16 c3 fwb fl wdgd" style>报名工单</view>
+        <view class="fr f14 c3" style>
+          全部
+          <i class="iconfont icon-gengduo11 dib f12 pr c9" style="top:-1px"></i>
+        </view>
+        <view class="clb"></view>
+      </view>
+      <view class="bt1" style="overflow:hidden">
+        <navigator url="{{isLogin? '../myBill/index?status=1': '/pages/login/index'}}" class="weui-grid5 bgcf gbr" hover-class="thover">
+          <view class="f20 c3 fwb">{{map.num10 || '0'}}</view>
+          <view class="weui-grid__label c6 f14">审核中</view>
+        </navigator>
+        <navigator url="../myBill/index?status=2" class="weui-grid5 gbr" hover-class="thover" wx:if="{{isLogin}}">
+          <view class="f20 c3 fwb">{{map.num20 || '0'}}</view>
+          <view class="weui-grid__label c6 f14">待接待</view>
+        </navigator>
+        <navigator url="{{isLogin? '../myBill/index?status=3': '/pages/login/index'}}" class="weui-grid5 gbr" hover-class="thover">
+          <view class="f20 c3 fwb">{{map.num25 || '0'}}</view>
+          <view class="weui-grid__label c6 f14">待面试</view>
+        </navigator>
+        <navigator url="{{isLogin? '../myBill/index?status=4': '/pages/login/index'}}" class="weui-grid5 gbr" hover-class="thover">
+          <view class="f20 c3 fwb">{{map.num30 || '0'}}</view>
+          <view class="weui-grid__label c6 f14">待入职</view>
+        </navigator>
+        <!-- <view style="clear:both;height:1px;width:100%;background-color:var(--weui-FG-3);transform: scaleY(0.5);position: relative;"></view> -->
+        <navigator url="{{isLogin? '../myBill/index?status=5': '/pages/login/index'}}" class="weui-grid5 gbr {{isLogin?'':''}}" hover-class="thover">
+          <view class="f20 c3 fwb">{{map.num40 || '0'}}</view>
+          <view class="weui-grid__label c6 f14">在职中</view>
+        </navigator>
+        <!-- <navigator url="../myBill/index?status=6" class="weui-grid4" hover-class="none">
+          <view class="f22 c3 fwb">{{map.num999 || '0'}}</view>
+          <view class="weui-grid__label">已完成</view>
+        </navigator>-->
+      </view>
+    </view>
+  </view>
+
+  <view class="p010 mt10 friendBar" wx:if="{{false}}">
     <view class="bgf br8 container">
       <navigator url="../friendHelper/index?status=1" class='sub' hover-class="none">
         <view class="t-icon t-icon-pengyouquanzhushou" style="width:24px;height:24px"></view>
@@ -179,7 +282,7 @@
       </view>
     </view>
   </view>
-  <view class="p010 mt10">
+  <view class="p010 mt10" wx:if="{{false}}">
     <view class="bgf br8 container" style="padding: 0;">
       <view hover-class="hcb" bindtap="goList">
         <view class="ml10 f16 c6 fwb fl wdgd" style="line-height:44px;">报名工单</view>
@@ -218,7 +321,7 @@
       </view>
     </view>
   </view>
-  <view class="p10">
+  <view class="p10" wx:if="{{false}}">
     <view class="bgf br8 container" style="padding: 0;">
       <view hover-class="hcb">
         <view class="ml10 f16 c6 fwb fl" style="line-height:44px;">我的老乡</view>
@@ -244,7 +347,7 @@
       </view>
     </view>
   </view>
-  <view class="p10" style="padding-top:0">
+  <view class="p10" style="padding-top:0" wx:if="{{false}}">
     <view class="bgf br8 container" style="padding: 0;">
       <view hover-class="hcb">
         <view class="ml10 f16 c6 fwb fl" style="line-height:44px;">我的账单</view>

pages/workBench/index.wxss

@@ -202,3 +202,80 @@ page {
 .friendBar .container .sub view {
   line-height: 1;
 }
+
+.balanceBox {
+	border-radius: 8px;
+	margin-bottom: 10px;
+	overflow: hidden;
+	margin-top: 10px;
+}
+.balanceBox .myaBill {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	height: 48px;
+	padding: 0 10px 0 16px;
+	background-color: #fff;
+}
+.balanceBox .myaBill .icon-gengduo11 {
+	color: #999;
+	font-size: 12px;
+}
+.container .userbalance {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	/* padding: 16px; */
+	border-radius: 8px 8px 0 0;
+	/* width: 355px; */
+	/* height: 96px; */
+	box-sizing: border-box;
+	color: #fff;
+	background-color: #fff;
+}
+.container .userbalance > navigator {
+	height: 100%;
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	justify-content: space-around;
+	padding: 16px 0 16px 16px;
+}
+.container .userbalance > view > view:last-child {
+	font-size: 26px;
+}
+.balanceinfo {
+	display: flex;
+	justify-content: start;
+	flex-direction: row;
+	align-items: center;
+}
+.balanceinfo > view:last-child {
+	width: 20px;
+	height: 20px;
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+}
+.rightbox {
+	display: flex;
+	justify-content: space-between;
+	flex-direction: column;
+	align-items: center;
+}
+.rightbox > view:last-child {
+	width: 12px;
+	height: 12px;
+	/* margin-left: 8px; */
+}
+
+.userbalance > navigator {
+	height: 100%;
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	justify-content: space-around;
+	padding: 16px 0 16px 16px;
+}
+.gbr{
+	border-right: 0.1px solid #eee;
+}