薪资查询部分

pages/check-iphone/index.js

@@ -22,7 +22,25 @@ Page({
     this.setData({
       approveState: opts.approveState
     })
-
+    if (opts.approveState == 0) {
+      wx.showModal({
+        title: '您还未进行实名认证',
+        content: '认证后即可使用查询功能',
+        cancelText: '以后再说',
+        confirmText:'立即认证',
+        success(res) {
+          if (res.confirm) {
+            wx.navigateTo({
+              url: '../identification/index',
+            })
+          } else if (res.cancel) {
+            wx.navigateBack({
+              delta: 1
+            })
+          }
+        }
+      })
+    }
   },
   //下一步提交
   next(e) {
@@ -54,13 +72,13 @@ Page({
   // 手机号输入
   bindPhoneInput(e) {
     this.setData({
-      iphone: e.detail.detail.value
+      iphone: e.detail.value
     })
   },
   // 验证码号输入
   bindCodeInput(e) {
     this.setData({
-      yzm: e.detail.detail.value
+      yzm: e.detail.value
     })
 
   },
@@ -71,13 +89,13 @@ Page({
       date: +(new Date) + 60000,
       onEnd() {
         this.setData({
-          djs: '重新获取验证码',
+          djs: '获取验证码',
         })
       },
       render(date) {
         const sec = this.leadingZeros(date.sec, 2) + ' 秒 '
         date.sec !== 0 && this.setData({
-          djs: '重新发送（' + sec + '）',
+          djs: '剩余' + sec + '',
         })
       },
     })

pages/check-iphone/index.wxml

@@ -1,21 +1,34 @@
-
 <view class='imgBox'>
-  <image class='logo' src='{{imgServerUrl}}/images/recommend/logo.png' mode='widthFix'></image>
+  <image class='logo' src='{{imgServerUrl}}/images/happyjob/querysalay.png'></image>
 </view>
 
-<view class='input-area'>
-  <view class='row'>
-    <view class='label'>+86</view>
-    <i-input class='input' value="{{ iphone }}" type="number" placeholder="请输入11位手机号码" maxlength="11" bind:change='bindPhoneInput' />
+<view class='list'>
+  <image class='phone' src='{{imgServerUrl}}/images/happyjob/phone.png'></image>
+  <view class='add'>
+    <input class='addp' value="{{ iphone }}" type="number" placeholder="请输入手机号" maxlength='11' bindchange="bindPhoneInput" />
   </view>
+</view>
+
 
-  <view class='row'>
-    <i-input class='input' value="{{ yzm }}" placeholder="请输入验证码"  type="number" maxlength="6" bind:change='bindCodeInput'/>
+<view class='list1'>
+  <image class='code' src='{{imgServerUrl}}/images/happyjob/sendCode.png'></image>
+  <view class='add1'>
+    <input class='addp' value="{{ yzm }}" placeholder="请输入验证码" type="number" maxlength="6" bindchange='bindCodeInput' />
     <view bindtap="sendCode" class='label yzm'>{{ djs || '获取验证码'}}</view>
   </view>
 </view>
 
-<i-button class="save" i-class="block-btn" bind:click="next" type="info" shape="circle">下一步</i-button>
-<navigator url="../document/salary">
-<view class='explain'>请仔细阅读说明</view>
-</navigator>
+
+<view class='list2'>
+  <view class='add2'>
+    <text class='readtip'>如有疑问请仔细阅读</text>
+    <navigator url="../document/salary">
+      <view class='readfull'>薪资查询规则</view>
+    </navigator>
+  </view>
+</view>
+
+<view class="btn-group fixed-footer" bindtap='next'>
+    <button class="distance selfBtn" form-type="submit">开始查询</button>
+</view>
+

pages/check-iphone/index.wxss

@@ -1,60 +1,141 @@
-page{
-  background: #f5f5f5;
+.imgBox {
+  display: flex;
+  justify-content: center;
+  align-items: flex-end;
+  width: 100%;
+  height: 300rpx;
 }
-.imgBox{
-  margin-top: 97rpx;
-  margin-bottom: 60rpx;
-  text-align: center;
+
+.imgBox .logo {
+  width: 179rpx;
+  height: 165rpx;
 }
-.logo{
-  width: 186rpx;
-  height: 138rpx;
+
+.list {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 48rpx;
+  padding-top: 134rpx;
+  padding-left: 140rpx;
+  padding-right: 140rpx;
 }
-.explain{
-  margin: 60rpx 0;
-  font-size: 24rpx;
-  text-align: center;
-  color: #169bd5;
+
+.phone {
+  width: 32rpx;
+  height: 47rpx;
 }
-.input-area{
-  margin: 30rpx 58rpx 60rpx;
-  background: #fff;
-  border-radius: 10rpx;
+
+.add {
+  width: 90%;
+  height: 100%;
+  border-bottom: 2rpx solid rgba(30, 98, 167, 1);
 }
-.input{
-  flex: 1;
+
+.addp {
+  width: 48%;
+  height: 32rpx;
+  text-align: left;
+  padding-left: 55rpx;
+  font-size: 30rpx;
+  font-family: ArialMT;
+  font-weight: 400;
+  color: rgba(204,204,204,1);
 }
-.save{
-  margin: 0 60px;
+
+.list1 {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 48rpx;
+  padding-top: 65rpx;
+  padding-left: 140rpx;
+  padding-right: 140rpx;
+}
+
+.code {
+  width: 46rpx;
+  height: 35rpx;
 }
-.row{
-  position: relative;
+
+.add1 {
   display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: 90%;
+  height: 100%;
+  border-bottom: 2rpx solid rgba(30, 98, 167, 1);
 }
-.row::after{
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  content: "";
-  width:100%;
-  border-bottom: 1px solid #eaeaea;
+
+.add1 view {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(30, 97, 167, 1);
+  margin-right: 26rpx;
 }
-.row .label{
+
+
+.list2 {
   display: flex;
-  flex: 0 0 aut0;
-  text-align: center;
+  flex-direction: row;
+  justify-content:flex-start;
   align-items: center;
-  font-size: 28rpx;
-  padding-left:  20rpx;
+  height: 48rpx;
+  padding-top: 39rpx;
+  margin-right: 147rpx;
+  margin-left: 147rpx;
 }
-.yzm{
-  padding: 0 20rpx;
+
+.add2 {
+  display: flex;
+  flex-direction: row;
+  padding-left: 48rpx;
+}
+
+.add2 .readtip {
   font-size: 24rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: #999;
+}
+
+.add2 .readfull {
+  font-size: 24rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: #1e61a7;
+}
+
+/* btn */
+
+.fixed-footer {
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  width: 100%;
 }
-.yzm.active{
-  background: #eaeaea;
-  color: #fff;
+
+.btn-group {
+  background: #fff;
+  padding: 20rpx;
+  box-sizing: border-box;
 }
-.block-btn{
-  margin: 0 80rpx !important;
+
+.selfBtn {
+  display: flex;
+  height: 88rpx;
+  line-height: 88rpx;
+  align-items: center;
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+  background: linear-gradient(90deg, rgba(59, 120, 207, 1), rgba(80, 166, 195, 1));
+  border-radius: 44rpx;
+  justify-content: center;
+  font-size: 38rpx;
+  font-family: SourceHanSansCN-Normal;
+  font-weight: 400;
+  color: rgba(255, 254, 254, 1);
 }

pages/document/salary.js

@@ -1,5 +1,9 @@
+import {
+  imgServerUrl
+} from '../../config/config.js'
+
 Page({
   data: {
-
+    imgServerUrl: imgServerUrl,
   },
 })

pages/document/salary.wxml

@@ -1,30 +1,5 @@
-<view class="list">
-  <view class='list-title'>1.工资单什么时间生成</view>
-  <view class='list-content'>每月中旬生成上月工资单</view>
+<view>
+<image  src='{{imgServerUrl}}/images/happyjob/gzd.png'></image>
 </view>
 
-<view class="list">
-  <view class='list-title'>2.哪些企业可以查询工资单</view>
-  <view class='list-content'></view>
-</view>
-
-<view class="list">
-  <view class='list-title'>3.为什么我所在的企业支持工资单查询但还是看不到我的工资单？</view>
-  <view class='list-content'>
-    <view class='row'>工资单查询需要确保您的身份证及手机号</view>
-    <view class='row'>与您在企业登记的信息一致。</view>
-    <view class='row'>如果无法查询：</view>
-    <view class='row'>①请确保您当前登录的账号，是您在厂内登记的</view>
-    <view class='row'>手机号；</view>
-    <view class='row'>②您可以咨询我们的客服，核实您的登记信息。</view>
-  </view>
-</view>
-
-<view class='tip'>
-  <view class='row'>温馨提示：</view>
-  <view class='row'>查询工资功能仅支持开心工作APP 、服务号、</view>
-  <view class='row'>微信小程序、订阅号。</view>
-  <view class='row'>如有疑问可致电开心工作官方电话：XXX</view>
-</view>
 
-<view class='copyright'>最终解释权归开心工作有限公司所有</view>

pages/document/salary.wxss

@@ -1,33 +1,12 @@
-page{
-  padding: 60rpx 63rpx 0 84rpx;
-  border-top: 1px solid #eaeaea;
-  box-sizing: border-box;
-}
-.list{
-  padding: 30rpx 0;
-  border-bottom: 1px solid rgba(0,0,0,.2)
-}
-.list-title{
-  font-size: 30rpx;
-  color: #2e2e2e;
-  line-height: 53rpx;
-}
-.list-content{
-  color: #7d7d7d;
-  font-size: 24rpx;
-  line-height: 54rpx;
-  min-height: 20rpx;
-}
-.tip{
-  margin-top: 30rpx;
-  margin-bottom: 36rpx;
-  font-size: 26rpx;
-	line-height: 35rpx;
-	letter-spacing: 2rpx;
-	color: #2e2e2e;
-}
-.copyright{
-  font-size: 22rpx;
-  line-height: 31rpx;
-  color: #36a0db;
+view{
+  margin-top: 80rpx;
+  margin-left: 30rpx;
+  margin-right: 30rpx;
+  width: auto;
+  height: 864rpx;
+}
+
+image{
+  width: 100%;
+  height: 100%;
 }

pages/identification/index.wxml

@@ -1,5 +1,5 @@
 <view class='db'>
-  <image src='../../images/happyjob/tishi.png'></image>
+  <image src='{{imgServerUrl}}/images/happyjob/tishi.png'></image>
   <text class="nickName">身份信息</text>
 </view>
 
@@ -13,7 +13,7 @@
 </view>
 
 <view class='db'>
-  <image src='../../images/happyjob/tishi.png'></image>
+  <image src='{{imgServerUrl}}/images/happyjob/tishi.png'></image>
   <text class="nickName">身份证件照片</text>
 </view>
 
@@ -22,14 +22,14 @@
   <view class='leftid' data-index="{{1}}" bindtap='chooseImage'>
     <image class="idCard" wx:if="{{idFrontPic}}" src="{{imgServerUrl_new}}{{idFrontPic}}" />
     <block wx:else>
-      <image class='smallicon' src='../../images/happyjob/leftid.png'></image>
+      <image class='smallicon' src='{{imgServerUrl}}/images/happyjob/leftid.png'></image>
       <text class="zmphoto">点击上传证件正面照</text>
     </block>
   </view>
   <view class='leftid' data-index="{{2}}" bindtap='chooseImage'>
     <image class="idCard" wx:if="{{idBackPic}}" src="{{imgServerUrl_new}}{{idBackPic}}" />
     <block wx:else>
-      <image class='smallicon'  src='../../images/happyjob/rightid.png'></image>
+      <image class='smallicon'  src='{{imgServerUrl}}/images/happyjob/rightid.png'></image>
       <text class="zmphoto">点击上传证件背面照</text>
     </block>
   </view>
@@ -37,18 +37,18 @@
 
 
 <view class='db'>
-  <image src='../../images/happyjob/tishi.png'></image>
+  <image src='{{imgServerUrl}}/images/happyjob/tishi.png'></image>
   <text class="nickName">手持身份证照片</text>
 </view>
 
 <view class='idphoto'>
   <view class='leftid1'>
-    <image class='display' src='../../images/happyjob/display.png'></image>
+    <image class='display' src='{{imgServerUrl}}/images/happyjob/display.png'></image>
   </view>
   <view class='shouchi' data-index="{{3}}" bindtap='chooseImage'>
     <image class="idCard" wx:if="{{idPersonPic}}" src="{{imgServerUrl_new}}{{idPersonPic}}" />
     <block wx:else>
-      <image class='othersmallicon' src='../../images/happyjob/shouchi.png'></image>
+      <image class='othersmallicon' src='{{imgServerUrl}}/images/happyjob/shouchi.png'></image>
       <text class="zmphoto">点击上传手持证件照</text>
     </block>
   </view>

pages/jianli/index.wxml

@@ -10,7 +10,7 @@
 
 <view class='basic'>
   <text class="persondetail">个人资料</text>
-  <image class="edit" src="../../images/happyjob/edit1.png" bindtap='toUserInfo' />
+  <image class="edit" src="{{imgServerUrl}}/images/happyjob/edit1.png" bindtap='toUserInfo' />
 </view>
 
 <view class='basic-info'>
@@ -35,7 +35,7 @@
 
 <view class='basic'>
   <text class="persondetail">求职意向</text>
-  <image class="edit" src="../../images/happyjob/edit1.png" bindtap='toUserJob' />
+  <image class="edit" src="{{imgServerUrl}}/images/happyjob/edit1.png" bindtap='toUserJob' />
 </view>
 
 <view class='basic-info1' wx:if="{{userResume.expectationPosition}}">
@@ -58,7 +58,7 @@
 </view>
 
 <view wx:if='{{!userResume.expectationPosition}}' class='add' bindtap='toUserJob'>
-  <image src="../../images/happyjob/addinfo.png" />
+  <image src="{{imgServerUrl}}/images/happyjob/addinfo.png" />
   <text>添加求职意向，更易筛选岗位</text>
 </view>
 
@@ -71,7 +71,7 @@
     <text class="detailinfo">企业名称：</text>
     <view class="dba">
       <text class="detail">{{item.workCompany}}</text>
-      <image class="edit1" src="../../images/happyjob/edit1.png" />
+      <image class="edit1" src="{{imgServerUrl}}/images/happyjob/edit1.png" />
     </view>
   </view>
   <view class='infoma'>
@@ -85,7 +85,7 @@
 </view>
 
 <view class='add' bindtap='toUserWorks' data-type="new">
-  <image src="../../images/happyjob/addinfo.png" />
+  <image src="{{imgServerUrl}}/images/happyjob/addinfo.png" />
   <text>添加求职意向，更易筛选岗位</text>
 </view>
 
@@ -95,7 +95,7 @@
     <text class="detailinfo">微信账号：</text>
     <view class="dba">
       <input class="detail" value='{{userResume.wechatNumber}}' bindblur='changewxname'></input>
-      <image class="edit1" src="../../images/happyjob/edit1.png" />
+      <image class="edit1" src="{{imgServerUrl}}/images/happyjob/edit1.png" />
     </view>
   </view>
 </view> -->

pages/mine/index.wxml

@@ -13,29 +13,29 @@
       <view class="enter">{{phone?phone:userResume.phone}}</view>
     </view>
     <view class='qycode'>
-      <image src='../../images/happyjob/rightjt.png' bindtap="toform"></image>
+      <image src='{{imgServerUrl}}/images/happyjob/rightjt.png' bindtap="toform"></image>
     </view>
   </view>
 </view>
 
 
 <view class='notrz' wx:if="{{approveStatus!=3}}">
-  <image src='../../images/happyjob/renzheng.png'></image>
+  <image src='{{imgServerUrl}}/images/happyjob/renzheng.png'></image>
   <text class='rz'>您还没有进行实名认证，</text>
   <text class='ly'>认证一下呗，可以优先录用哦~</text>
 </view>
 
 <view class='inter' >
   <view class='mysc' bindtap='collection'>
-    <image src='../../images/happyjob/shoucang.png'></image>
+    <image src='{{imgServerUrl}}/images/happyjob/shoucang.png'></image>
     <text class='sc'>我的收藏</text>
   </view>
   <view class='mysq' bindtap='apply'>
-    <image src='../../images/happyjob/wdsq.png'></image>
+    <image src='{{imgServerUrl}}/images/happyjob/wdsq.png'></image>
     <text class='sq'>我的申请</text>
   </view>
   <view class='mstb' bindtap='interview'>
-    <image src='../../images/happyjob/msyq.png'></image>
+    <image src='{{imgServerUrl}}/images/happyjob/msyq.png'></image>
     <text class='interview'>面试邀请</text>
   </view>
 </view>
@@ -48,7 +48,7 @@
 
 <view class='jianli' bindtap='tojianli'>
   <view class='jltb'>
-    <image src='../../images/happyjob/jianli.png'></image>
+    <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}}">简历</text>
@@ -61,7 +61,7 @@
     <text class='full' wx:if="{{approveStatus==3}}">100%</text>
     <text class='unfull' wx:if="{{approveStatus!=3}}">10%</text>
     <view class='nows' wx:if="{{approveStatus!=3}}">
-      <image src='../../images/happyjob/edit.png'></image>
+      <image src='{{imgServerUrl}}/images/happyjob/edit.png'></image>
       <text class='unwz'>继续完善</text>
     </view>
   </view>
@@ -71,33 +71,33 @@
 <navigator url="../check-iphone/index?approveState={{approveStatus}}">
   <view class='query'>
     <view class='querys'>
-      <image class='moneytb' src='../../images/happyjob/xzcx.png'></image>
+      <image class='moneytb' src='{{imgServerUrl}}/images/happyjob/xzcx.png'></image>
       <text class='queryxz'>薪资查询</text>
     </view>
-    <image class='jiantou' src='../../images/happyjob/rightwjt.png'></image>
+    <image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
   </view>
 </navigator>
 
 <view class='query'>
   <view class='querys'>
-    <image class='moneytb' src='../../images/happyjob/yjfk.png'></image>
+    <image class='moneytb' src='{{imgServerUrl}}/images/happyjob/yjfk.png'></image>
     <text class='queryxz'>意见反馈</text>
   </view>
-  <image class='jiantou' src='../../images/happyjob/rightwjt.png'></image>
+  <image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
 </view>
 
 <view class='query'>
   <view class='querys'>
-    <image class='moneytb' src='../../images/happyjob/swhz.png'></image>
+    <image class='moneytb' src='{{imgServerUrl}}/images/happyjob/swhz.png'></image>
     <text class='queryxz'>商务合作</text>
   </view>
-  <image class='jiantou' src='../../images/happyjob/rightwjt.png'></image>
+  <image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
 </view>
 
 <view class='query'>
   <view class='querys'>
-    <image class='moneytb' src='../../images/happyjob/shezhi.png'></image>
+    <image class='moneytb' src='{{imgServerUrl}}/images/happyjob/shezhi.png'></image>
     <text class='queryxz'>设置</text>
   </view>
-  <image class='jiantou' src='../../images/happyjob/rightwjt.png'></image>
+  <image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
 </view>

pages/result/index.wxml

@@ -1,7 +1,7 @@
 <view class='db'>
-  <image wx:if="{{type=='auth'&& status==2}}" src='../../images/happyjob/shcg.png'></image>
-  <image wx:if="{{type=='auth'&& status==0}}" src='../../images/happyjob/wtg.png'></image>
-  <image wx:if="{{type=='submit'&& status==2}}" src='../../images/happyjob/tosubmit.png'></image>
+  <image wx:if="{{type=='auth'&& status==2}}" src='{{imgServerUrl}}/images/happyjob/shcg.png'></image>
+  <image wx:if="{{type=='auth'&& status==0}}" src='{{imgServerUrl}}/images/happyjob/wtg.png'></image>
+  <image wx:if="{{type=='submit'&& status==2}}" src='{{imgServerUrl}}/images/happyjob/tosubmit.png'></image>
 </view>
 
 

pages/user-form/index.wxml

@@ -1,48 +1,29 @@
-<wxs src="../tools.wxs" module="globalTools" />
-<view class='group'>
-
-  <view class='list'>
-    <view class='list-title required'>姓名</view>
-    <view class='list-content'>
-      <view class='input-text'>{{hpUser.realName}}</view>
-      <image class="auth" src="{{imgServerUrl}}/images/mine/auth-has.png" mode="widthFix" />
-    </view>
-  </view>
+<view class='db'>
+   <image wx:if='{{headImgUrl}}' src='{{headImgUrl}}'></image>
+  <image wx:else src='{{imgServerUrl}}/images/happyjob/msyq.png'></image>
+  <text class='changetx'>点击修改头像</text>
+</view>
 
-  <view class='list'>
-    <view class='list-title required'>性别</view>
-    <view class='list-content'>
-      <view class='input-text'>{{hpUser.gender==1?"男":"女"}}</view>
-    </view>
+<view class='user'>
+  <text class='wz'>用户名</text>
+  <view>
+    <text class='name'>{{hpUser.realName}}</text>
+    <image src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
   </view>
+</view>
 
-  <view class='list'>
-    <view class='list-title required'>出生年月</view>
-    <view class='list-content'>
-      <view class='input-text'>{{hpUser.birthYear}}</view>
-    </view>
-  </view>
 
-  <view class='list'>
-    <view class='list-title required'>手机号码</view>
-    <view class='list-content'>
-      <view class='input-box'>
-      <view class='input-text'>{{hpUser.phone}}</view>
-        <!-- <input value="{{ phone }}" type="number" maxlength="11" placeholder="请输入您现在的手机号" bindinput="inputPhone" bindfocus="showCode"/>
-        <button wx:if="{{isShowCode}}" bindtap="sendCode" class='label yzm'>{{ djs || '获取验证码'}}</button> -->
-      </view>
-    </view>
+<view class='user'>
+  <text class='wz'>绑定手机号</text>
+  <view>
+    <text class='name'>{{hpUser.phone}}</text>
+    <image src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
   </view>
+</view>
 
-   <view class='list' wx:if="{{isShowYzm}}">
-    <view class='list-title required'>验证码</view>
-    <view class='list-content'>
-      <view class='input-box'>
-        <input value="{{ yzm }}" type="number" maxlength="4" placeholder="请输入验证码" bindinput="inputYzm"/>
-      </view>
-    </view>
+<view class='user'>
+  <text class='wz'>生成我的二维码</text>
+  <view>
+    <image src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
   </view>
-
 </view>
-
-<i-button i-class="radius distance" bind:click="save" type="info" shape="circle">保存</i-button>

pages/user-form/index.wxss

@@ -1,72 +1,60 @@
-.group {
-  padding-left: 20px;
-  box-sizing: border-box;
-}
-.group {
-  margin-bottom: 60px;
-}
-.list {
+/* 上层 */
+
+.db {
   display: flex;
-  justify-content: space-between;
+  flex-direction: column;
+  justify-content: center;
   align-items: center;
   width: 100%;
-  font-size: 14px;
-  padding: 5px 0;
-  border-bottom: 1px solid #ddd;
-}
-.list-title {
-  color: #495060;
-  min-width: 65px;
-  padding-right: 10px;
-}
-.list-title.required::after {
-  content: "*";
-  color: red;
-}
-.list-content {
-  flex: 1;
-  display: flex;
-  align-items: center;
-}
-.list-content .extra {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  margin-right: 10px;
-}
-.list-content .input-text {
-  height: 90rpx;
-  line-height: 90rpx;
-  box-sizing: border-box;
-}
-.avatar {
-  width: 100rpx;
-}
-.i-cell-group,
-.flex {
-  display: flex!important;
-}
-.input-box {
+  height: 324rpx;
+  background: rgba(250, 250, 250, 1);
+  border-bottom: 2rpx solid rgba(221, 221, 221, 1);
+}
+
+.db image {
+  width: 150rpx;
+  height: 150rpx;
+  border-radius: 50%;
+}
+
+.db .changetx {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(30, 98, 167, 1);
+  padding-top: 35rpx;
+}
+
+/* 下层 */
+
+.user {
   display: flex;
+  flex-direction: row;
+  justify-content: space-between;
   align-items: center;
-  padding: 15rpx 0;
-  flex: auto;
-}
-.auth {
-  width: 78rpx;
-  height: 37rpx;
-  margin-left: 20rpx;
-}
-.yzm {
-  height: 64rpx;
-  padding: 0 15rpx;
-  line-height: 64rpx;
-  background: #31a0db;
-  color: #fff;
-  font-size: 24rpx;
-  text-align: center;
-  border-radius: 4px;
-  box-sizing: border-box;
-  flex: 0 0 auto;
-  margin-right: 10rpx;
-}
+  width: 100%;
+  height: 79rpx;
+   border-bottom: 2rpx solid rgba(221, 221, 221, 1);
+}
+
+.user .wz {
+  font-size: 27rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(34, 34, 34, 1);
+  padding-left: 29rpx;
+}
+
+.user .name {
+  font-size: 22rpx;
+  font-family: SourceHanSansCN-Normal;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+  padding-right: 40rpx;
+}
+
+.user image {
+  width: 18rpx;
+  height: 30rpx;
+  padding-right: 30rpx;
+}

pages/user-info/user-info.wxml

@@ -1,7 +1,7 @@
 <view class='group'>
   <view class='extra'>
     <image wx:if="{{avatar}}" class='avatar' src='{{avatar}}' bindtap='changeImg'></image>
-    <image class='default' wx:else src='../../images/happyjob/photoslice.png'></image>
+    <image class='default' wx:else src='{{imgServerUrl}}/images/happyjob/photoslice.png'></image>
   </view>
   <text>靓照，一份好工作的开始</text>
 </view>

pages/wages/index.js

@@ -16,15 +16,19 @@ Page({
     realName: '',
     idNum: '',
     targetTime: '2019-01',
-    detailFlag: true,
-    multiArray: [new Date().getFullYear(), new Date().getMonth() + 1],
+    detailFlag: 1,
+    multiArray: [],
     data: '',
+    show : true,
   },
   onLoad: function(options) {
-    this.fetchData()
+    this.setData({
+      realName: this.options.realName,
+      idNum: this.options.idNum,
+    })
   },
   // 页面数据加载
-  fetchData() {
+  fetchData(options) {
     var curDate = new Date();
     this.setData({
       realName: this.options.realName,
@@ -37,7 +41,8 @@ Page({
   // 工资条查询
   toGetPayroll(e) {
     this.setData({
-      detailFlag: false
+      detailFlag: 2,
+      show: false,
     })
     var targetTime = this.data.multiArray[0] + '-' + formatNumber(this.data.multiArray[1]);
     let paramsObj = {
@@ -59,7 +64,7 @@ Page({
         this.setData({
           payDetailArr: payDetailArr,
           data: data.data.hpPayroll,
-          detailFlag: true
+          detailFlag: 3
         })
       } else {
         return;

pages/wages/index.wxml

@@ -1,66 +1,123 @@
-<view class="container">
-  <view class='row bd-bottom'>
-    <i-input class="row" i-class="self" value="{{realName}}" title="姓名：" disabled/>
+<view class='container1'>
+  <view class='list1'>
+    <view class='list'>
+      <text class='listinfo'>姓名：</text>
+      <view class='info'>
+        <view class='infodetail' value="{{realName}}"></view>
+      </view>
+    </view>
+    <view class='list'>
+      <text class='listinfo'>身份证号码：</text>
+      <view class='info'>
+        <view class='infodetail' value="{{ idNum }}"></view>
+      </view>
+    </view>
+    <view class='list'>
+      <text class='listinfo'>工资详情：</text>
+      <view class='info'>
+        <picker class="infodetail1" mode="date" fields='month' start='2000-01' end='2300-01' bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange">
+          <view wx:if='{{multiArray[0]}}'> {{multiArray[0]}}年{{multiArray[1]}}月</view>
+          <view wx:else> 点击选择时间查看该月工资明细</view>
+        </picker>
+      </view>
+    </view>
   </view>
-  <view class='row bd-bottom'>
-    <i-input class="row" i-class="self" value="{{idNum}}" title="身份证号：" disabled/>
+
+  <view class='detail' wx:if='{{show}}'>
+    <text class='tip'>请选择要查看的时间</text>
   </view>
 
-  <view class='group row'>
-    <view class='label'>工资详情：</view>
-    <view class='select'>
-      <picker mode="date" fields='month' start='2000-01' end='2300-01' bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange">
-        <view class="picker">{{multiArray[0]}}年{{multiArray[1]}}月</view>
-      </picker>
-      <i-icon type="unfold" class='select-arrow' />
-    </view>
+
+  <view class='detail1' wx:if='{{detailFlag==2}}'>
+    <text class='tip'>无法查询到该月的薪资记录</text>
+    <text class='tip'>（如果无法查询到记录，可能当月工资条未上传）</text>
   </view>
-  <view class='table-container' wx:if='{{detailFlag}}'>
-    <view class='table'>
-      <view class='table-tr'>
-        <view class='table-td'>姓名</view>
-        <view class='table-td'>{{data.name}}</view>
+
+  <view class='detail2' wx:if='{{detailFlag==3}}'>
+    <view class='list'>
+      <text class='listinfo1'>公司名称：</text>
+      <view class='info'>
+        <view class='infodetail'>{{data.companyName}}</view>
       </view>
-      <view class='table-tr'>
-        <view class='table-td'>身份证号</view>
-        <view class='table-td'>{{data.idCardNumber}}</view>
+    </view>
+    <view class='list'>
+      <text class='listinfo1'>员工号码：</text>
+      <view class='info'>
+        <view class='infodetail'>{{data.workNumber}}</view>
       </view>
-      <view class='table-tr'>
-        <view class='table-td'>工号</view>
-        <view class='table-td'>{{data.workNumber}}</view>
+    </view>
+
+    <view class='list2'>
+      <text class='listinfo1'>底薪：</text>
+      <view class='info'>
+        <view class='infodetail'>{{realName}}</view>
       </view>
-      <view class='table-tr'>
-        <view class='table-td'>公司名称</view>
-        <view class='table-td'>{{data.companyName}}</view>
+    </view>
+    <view class='list'>
+      <text class='listinfo1'>缺勤扣款：</text>
+      <view class='info'>
+        <view class='infodetail'>{{realName}}</view>
       </view>
-      <view class='table-tr'>
-        <view class='table-td'>工资月份</view>
-        <view class='table-td'>{{data.payrollDate}}</view>
+    </view>
+    <view class='list'>
+      <text class='listinfo1'>平加工资：</text>
+      <view class='info'>
+        <view class='infodetail'>{{realName}}</view>
       </view>
-      <view class='table-tr'>
-        <view class='table-td'>应发合计</view>
-        <view class='table-td'>{{data.grossPayment}}</view>
+    </view>
+    <view class='list'>
+      <text class='listinfo1'>休加工资：</text>
+      <view class='info'>
+        <view class='infodetail'>{{realName}}</view>
       </view>
-      <view class='table-tr'>
-        <view class='table-td'>扣款合计</view>
-        <view class='table-td'>{{data.totalChargeback}}</view>
+    </view>
+    <view class='list'>
+      <text class='listinfo1'>满勤：</text>
+      <view class='info'>
+        <view class='infodetail'>{{realName}}</view>
       </view>
-      <view class='table-tr'>
-        <view class='table-td'> 实发工资</view>
-        <view class='table-td'>{{data.netPayment}}</view>
+    </view>
+    <view class='list'>
+      <text class='listinfo1'>绩效：</text>
+      <view class='info'>
+        <view class='infodetail'>{{realName}}</view>
       </view>
-      <view class='table-tr' wx:for="{{payDetailArr}}" wx:for-index="idx" wx:for-item="item" wx:key='*this'>
-        <view class='table-td'>{{item.key}}</view>
-        <view class='table-td'>{{item.value}}</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>
 
-  <view class='nullpage' wx:if="{{!detailFlag}}">
-    <view class='row'>未查到您的工资条</view>
-    <view class='row'>请在发薪日2日后查询</view>
-    <view class='row'>给您带来不便，敬请谅解</view>
-  </view>
+    <view class='line'></view>
+
+    <view class='list3'>
+      <text class='rightinfo'>应发合计：</text>
+      <text class='rightinfo1'>{{realName}}</text>
+    </view>
 
-  <view class='remarks'>备注： 若未查到您的工资信息，可能工资条尚未上传</view>
+    <view class='list4'>
+      <text class='rightinfo'>扣款合计：</text>
+      <text class='rightinfo1'>{{realName}}</text>
+    </view>
+
+    <view class='list5'>
+      <text class='rightinfo2'>实发工资：</text>
+      <text class='rightinfo3'>{{realName}}</text>
+    </view>
+    
+  </view>
 </view>

pages/wages/index.wxss

@@ -1,70 +1,228 @@
-page{
-  padding: 48rpx 44rpx 0;
-  box-sizing: border-box;
-  color: #7d7d7d;
-  border-top: 1px solid #f4f4f4;
+page {
+  background: rgba(245, 245, 245, 1);
 }
-.bd-bottom{
-  border-bottom: 1px solid #eaeaea;
+
+.container1 {
+  display: flex;
+  flex-direction: column;
+  margin-top: 42rpx;
+  margin-left: 30rpx;
+  margin-right: 30rpx;
+  width: auto;
+  padding-left: 16rpx;
+  padding-right: 16rpx;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 12px;
+}
+
+.list1 {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  padding-top: 25rpx;
 }
-.row .self{
-  position: static;
+
+.list {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  padding-left: 22rpx;
+}
+
+.list  .listinfo {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(34, 34, 34, 1);
+}
+
+.list .info {
+  width: 72%;
+  height: 100%;
+}
+
+.list .info .infodetail {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  text-align: left;
+  padding-left: 26rpx;
+  font-size: 28rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(153, 153, 153, 1);
 }
-.group{
+
+.list .info .infodetail1 {
   display: flex;
-  padding:7px 15px;
-  color:#495060;
-  font-size: 14px;
-}
-.group .label{
-  flex: 0 0 atuo;
-  color:#495060;
-  min-width:65px;
-  padding-right:10px;
-}
-.select{
-  position: relative;
-  padding: 2px 20px 2px 4px;
-  border: 1px solid #ddd;
-}
-.select-arrow{
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-.table-container{
-  padding: 15px;
-}
-.table{
-  display: table;
+  align-items: center;
   width: 100%;
-  box-sizing: border-box;
+  height: 100%;
+  text-align: left;
+  padding-left: 26rpx;
+  font-size: 28rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(30, 97, 167, 1);
+}
+
+.detail {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 658rpx;
+  height: 196rpx;
+  background: rgba(250, 250, 250, 1);
+  margin-top: 48rpx;
+  margin-bottom: 46rpx;
+}
+
+.detail .tip {
   font-size: 24rpx;
-  border-collapse:collapse;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(153, 153, 153, 1);
+}
+
+.detail1 {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 658rpx;
+  height: 196rpx;
+  background: rgba(250, 250, 250, 1);
+  margin-top: 48rpx;
+  margin-bottom: 46rpx;
+}
+
+.detail1 .tip {
+  font-size: 24rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(153, 153, 153, 1);
+}
+
+.detail2 {
+  display: flex;
+  flex-direction: column;
+  width: 658rpx;
+  background: rgba(250, 250, 250, 1);
+  margin-top: 48rpx;
+  margin-bottom: 46rpx;
+  padding-top: 25rpx;
 }
-.table-tr{
-  display: table-row;
+
+.list2 {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  padding-left: 22rpx;
+  margin-top: 48rpx;
+}
+
+.list2  .listinfo1 {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
 }
-.table-td{
-  display: table-cell;
-  max-width: 25%;
-  min-width: 100rpx;
-  border: 1px solid #ddd;
-  vertical-align: middle;
-  padding:10rpx 10rpx;
+
+.list2 .info {
+  width: 72%;
+  height: 100%;
 }
-.remarks{
-  text-align: center;
+
+.list2 .info .infodetail {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  text-align: left;
+  padding-left: 26rpx;
   font-size: 28rpx;
-  margin: 40rpx;
-}
-.nullpage{
-  margin: 50rpx 0;
-  color: #7d7d7d;
-  letter-spacing: 2px;
-  font-size: 30rpx;
-  text-align:center;
-}
-.nullpage .row{
-  margin-bottom: 18rpx;
-}
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(153, 153, 153, 1);
+}
+
+.list  .listinfo1 {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+}
+
+.line {
+  margin-top: 53rpx;
+  height: 1px;
+  background: rgba(221, 221, 221, 1);
+}
+
+.list3 {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  padding-left: 22rpx;
+  margin-top: 35rpx;
+}
+
+.rightinfo {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+  margin-left: 365rpx;
+}
+
+.rightinfo1 {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+  margin-right: 50rpx;
+}
+
+.list4 {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  padding-left: 22rpx;
+  margin-top: 18rpx;
+}
+
+.list5 {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: center;
+  width: 100%;
+  padding-left: 22rpx;
+  margin-top: 33rpx;
+  margin-bottom: 43rpx;
+}
+
+.rightinfo2 {
+  font-size: 24rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(34, 34, 34, 1);
+  margin-right: 30rpx;
+}
+
+.rightinfo3 {
+  font-size: 36rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(30, 97, 167, 1);
+  margin-right: 50rpx;
+}