LiFei 6 år sedan
förälder
incheckning
83b35ebbf0
5 ändrade filer med 35 tillägg och 51 borttagningar
  1. 1 0
      pages/check-iphone/index.js
  2. 1 1
      pages/mine/index.wxml
  3. 1 1
      pages/result/index.wxml
  4. 7 6
      pages/wages/index.js
  5. 25 43
      pages/wages/index.wxml

+ 1 - 0
pages/check-iphone/index.js

@@ -64,6 +64,7 @@ Page({
     }
     Object.assign(paramsObj);
     getPayrollId(paramsObj).then(data => {
+      console.log(data)
       wx.redirectTo({
         url: '../wages/index?idNum=' + data.data.hpUser.idCardNumber + "&realName=" + data.data.hpUser.realName,
       })

+ 1 - 1
pages/mine/index.wxml

@@ -50,7 +50,7 @@
   <view class='jltb'>
     <image src='{{imgServerUrl}}/images/happyjob/jianli.png'></image>
     <view class='wenzi'>
-      <text class='wenzi1' wx:if="{{approveStatus==3}}">假面骑士X的简历</text>
+      <text class='wenzi1' wx:if="{{approveStatus==3}}">{{userResume.realName}}的简历</text>
       <text class='wenzi1' wx:if="{{approveStatus!=3}}">简历</text>
       <text class='wenzi2' wx:if="{{approveStatus==3}}">100%完成度!点击可以继续改唷</text>
       <text class='wenzi2' wx:if="{{approveStatus!=3}}">只要简历多写点,高薪工作早出现</text>

+ 1 - 1
pages/result/index.wxml

@@ -17,7 +17,7 @@
 <view class='shz' wx:if="{{type=='auth'&& status==0}}">
   <text class='sfshz'>审核未通过</text>
   <view class='shwtg'>
-    <text>重拍靓照</text>
+    <text bindtap='toAuth'>重拍靓照</text>
   </view>
 </view>
 

+ 7 - 6
pages/wages/index.js

@@ -22,10 +22,12 @@ Page({
     show : true,
   },
   onLoad: function(options) {
-    this.setData({
-      realName: this.options.realName,
-      idNum: this.options.idNum,
-    })
+    // this.setData({
+    //   realName: options.realName,
+    //   idNum: options.idNum,
+    // })
+    console.log(options)
+    this.fetchData(options)
   },
   // 页面数据加载
   fetchData(options) {
@@ -33,9 +35,8 @@ Page({
     this.setData({
       realName: this.options.realName,
       idNum: this.options.idNum,
-      detailFlag: true,
     })
-    this.toGetPayroll(null)
+    // this.toGetPayroll(null)
   },
 
   // 工资条查询

+ 25 - 43
pages/wages/index.wxml

@@ -3,13 +3,13 @@
     <view class='list'>
       <text class='listinfo'>姓名:</text>
       <view class='info'>
-        <view class='infodetail' value="{{realName}}"></view>
+        <view class='infodetail'>{{realName}}</view>
       </view>
     </view>
     <view class='list'>
       <text class='listinfo'>身份证号码:</text>
       <view class='info'>
-        <view class='infodetail' value="{{ idNum }}"></view>
+        <view class='infodetail'>{{idNum}}</view>
       </view>
     </view>
     <view class='list'>
@@ -35,34 +35,38 @@
 
   <view class='detail2' wx:if='{{detailFlag==3}}'>
     <view class='list'>
-      <text class='listinfo1'>公司名称:</text>
+      <text class='listinfo1'>姓名:</text>
       <view class='info'>
-        <view class='infodetail'>{{data.companyName}}</view>
+        <view class='infodetail'>{{data.name}}</view>
       </view>
     </view>
+
     <view class='list'>
-      <text class='listinfo1'>员工号码:</text>
+      <text class='listinfo1'>身份证号</text>
       <view class='info'>
-        <view class='infodetail'>{{data.workNumber}}</view>
+        <view class='infodetail'>{{data.idCardNumber}}</view>
       </view>
     </view>
 
+
+
+
     <view class='list2'>
-      <text class='listinfo1'>底薪:</text>
+      <text class='listinfo1'>公司名称:</text>
       <view class='info'>
-        <view class='infodetail'>{{realName}}</view>
+        <view class='infodetail'>{{data.companyName}}</view>
       </view>
     </view>
     <view class='list'>
-      <text class='listinfo1'>缺勤扣款:</text>
+      <text class='listinfo1'>员工号码:</text>
       <view class='info'>
-        <view class='infodetail'>{{realName}}</view>
+        <view class='infodetail'>{{data.workNumber}}</view>
       </view>
     </view>
     <view class='list'>
-      <text class='listinfo1'>平加工资:</text>
+      <text class='listinfo1'>工资月份</text>
       <view class='info'>
-        <view class='infodetail'>{{realName}}</view>
+        <view class='infodetail'>{{data.payrollDate}}</view>
       </view>
     </view>
     <view class='list'>
@@ -71,53 +75,31 @@
         <view class='infodetail'>{{realName}}</view>
       </view>
     </view>
-    <view class='list'>
-      <text class='listinfo1'>满勤:</text>
+    <view class='list' wx:for="{{payDetailArr}}" wx:for-index="idx" wx:for-item="item" wx:key='*this'>
+      <view class='listinfo1'>{{item.key}}</view>
       <view class='info'>
-        <view class='infodetail'>{{realName}}</view>
-      </view>
-    </view>
-    <view class='list'>
-      <text class='listinfo1'>绩效:</text>
-      <view class='info'>
-        <view class='infodetail'>{{realName}}</view>
-      </view>
-    </view>
-    <view class='list'>
-      <text class='listinfo1'>交通补贴:</text>
-      <view class='info'>
-        <view class='infodetail'>{{realName}}</view>
-      </view>
-    </view>
-    <view class='list'>
-      <text class='listinfo1'>夜班天数:</text>
-      <view class='info'>
-        <view class='infodetail'>{{realName}}</view>
-      </view>
-    </view>
-    <view class='list'>
-      <text class='listinfo1'>夜班费:</text>
-      <view class='info'>
-        <view class='infodetail'>{{realName}}</view>
+        <view class='infodetail'>{{item.value}}</view>
       </view>
     </view>
 
+
+
     <view class='line'></view>
 
     <view class='list3'>
       <text class='rightinfo'>应发合计:</text>
-      <text class='rightinfo1'>{{realName}}</text>
+      <text class='rightinfo1'>{{data.grossPayment}}</text>
     </view>
 
     <view class='list4'>
       <text class='rightinfo'>扣款合计:</text>
-      <text class='rightinfo1'>{{realName}}</text>
+      <text class='rightinfo1'>{{data.totalChargeback}}</text>
     </view>
 
     <view class='list5'>
       <text class='rightinfo2'>实发工资:</text>
-      <text class='rightinfo3'>{{realName}}</text>
+      <text class='rightinfo3'>{{data.netPayment}}</text>
     </view>
-    
+
   </view>
 </view>