19:20

app.json

@@ -1,18 +1,18 @@
 {
   "pages": [
-    "pages/point/point",
     "pages/home/home",
-    "pages/register/register",
+    "pages/pointapply/pointapply",
     "pages/approval/approval",
+    "pages/mine/mine",
+    "pages/perinfo/perinfo",
+    "pages/point/point",
+    "pages/register/register",
     "pages/applyjoinapprovel/applyjoinapprovel",
     "pages/corporateInfo/corporateInfo",
     "pages/minusapply/minusapply",
     "pages/selectStaff/selectStaff",
-    "pages/pointapply/pointapply",
     "pages/selectnorm/selectnorm",
-    "pages/perinfo/perinfo",
     "pages/bindphone/bindphone",
-    "pages/mine/mine",
     "pages/WebView/WebView"
   ],
   "window": {

app.wxss

@@ -49,4 +49,8 @@
 /* edn 无数据时 样式  */
 .commonclick-btn{
   background-color: #F5F5F5;
+}
+/* 公共单行末尾省略样式 */
+.com_omit{ 
+  overflow:hidden; text-overflow:ellipsis;white-space:nowrap;
 }

pages/WebView/WebView.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "资讯详情"
+  "navigationBarTitleText": ""
 }

pages/applyjoinapprovel/applyjoinapprovel.js

@@ -11,18 +11,18 @@ Page({
    */
   data: {
     approvelStatus:1,//单据账套 0：待审批，1：已审批，2：我发起的
-    applyName:'吴彦祖',
-    applyPhone:'18130506086',
-    enterDate:'2016-06-12',
-    birthDate:'2006-06-12',
-    applyMail:'18130506086@163.com',
-    companyName:'优软科技',
+    applyName:'',
+    applyPhone:'',
+    enterDate:'',
+    birthDate:'',
+    applyMail:'',
+    companyName:'',
     isapplyPoint:true, //积分审批
 
-    applyStatus:'待审批',
-    applyTime: '2018-10-14',
-    applyJob: '程序猿',
-    applyNorm: '标准1',
+    applyStatus:'',
+    applyTime: '',
+    applyJob: '',
+    applyNorm: '',
     applyPoint:'',
     fromType:1,
     isISend:false
@@ -79,7 +79,8 @@ Page({
           applyReason: res.data.data.reasons,
           applyPoint: res.data.data.score,
           adviceName: res.data.data.adviceName,
-          auditName: res.data.data.auditName
+          auditName: res.data.data.auditName,
+          beMinusPerson: res.data.data.adviceName
         })
       }
     }, function (res) {

pages/applyjoinapprovel/applyjoinapprovel.wxml

@@ -81,7 +81,7 @@
     </view>
 <view class='commonhline' style='height:20rpx;'></view>
     <view class='commonHview'>
-      <view class='left_sty'>加分数量</view>
+      <view class='left_sty'>积分数量</view>
       <view class='right_sty'>{{applyPoint}}</view>
     </view>
     <view class='commonhline' style='height:3rpx;'></view>
@@ -96,6 +96,12 @@
     </view>
     <view class='commonhline' style='height:3rpx;'></view>
 
+    <view class='commonHview' wx:if='{{applyPoint < 0}}'>
+      <view class='left_sty'>被扣分人</view>
+      <view class='right_sty'>{{beMinusPerson}}</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+
     <view class='commonHview' wx:if='{{auditName}}' >
       <view class='left_sty' wx:if='{{approvelStatus == 1}}'>待审批人</view>
       <view class='left_sty' wx:else>审批人</view>
@@ -138,7 +144,7 @@
     </view>
 <view class='commonhline' style='height:20rpx;'></view>
     <view class='commonHview'>
-      <view class='left_sty'>加分数量</view>
+      <view class='left_sty'>积分数量</view>
       <view class='right_sty'>{{applyPoint}}</view>
     </view>
     <view class='commonhline' style='height:3rpx;'></view>
@@ -146,7 +152,7 @@
 
 
 
-    <view wx:if='{{approvelStatus == 1 && fromType == 1}}' class='commonHview' style='margin-top:100rpx;'>
+    <view wx:if='{{approvelStatus == 1 && fromType == 1}}' class='commonHview' style='margin-top:50rpx;'>
       <button  class='comBtn' style='background-color: #3C85EC;color:#FFF;' formType="submit" hover-class="commonclick-btn" bindtap='agreeBtnClick'>同意</button>
       <button  class='comBtn' formType="submit" hover-class="commonclick-btn" bindtap='disagreeBtnClick'>不同意</button>
     </view>

pages/home/home.wxml

@@ -30,14 +30,11 @@
        <view wx:if='{{item.newsimgurl}}'><image src='{{baseUrl+item.newsimgurl}}' class='newsimgs'></image></view>
        <view wx:else><image src='../../img/nophoto.png' class='newsimgs'></image></view>
         <view style='text-align:left;margin-left:10rpx;'  class='commonVview'>
-          <view class='commonHview'>
-            <view style='margin-top:20rpx;font-size:30rpx;color:#000;overflow:hidden; text-overflow:ellipsis;white-space:nowrap;width:300rpx;width:50%;' >{{item.newstitle}}</view>
-          <view style='font-size:24rpx;color:#999999;margin-top:40rpx;text-align:right;width:40%;'>{{item.gtmCreate}}</view>
-          </view>
-        <view class='newContextSty'>{{item.filell}}</view>
+          <view  class='title' >{{item.newstitle}}</view>
+          <view class='newContextSty'>{{item.filell}}</view>
+          <view style='font-size:24rpx;color:#999999;text-align:left;margin-top:10rpx;'>{{item.gtmCreate}}</view>
         </view>
      </view>
-    
     </view>
   </view>
 </scroll-view>

pages/home/home.wxss

@@ -10,8 +10,11 @@
 .newsimgs{
   width: 130rpx;height: 130rpx;margin-top: 10rpx;
 }.newContextSty{
-  font-size:28rpx;color:#999999; overflow:hidden; text-overflow:ellipsis;white-space:nowrap;width:640rpx;margin-top: 20rpx;
-}.ann_right{
+  font-size:28rpx;color:#999999; overflow:hidden; text-overflow:ellipsis;white-space:nowrap;width:600rpx;margin-top: 10rpx;
+}.title{
+   font-size:30rpx;color:#000; overflow:hidden; text-overflow:ellipsis;white-space:nowrap;width:600rpx;margin-top: 10rpx;
+}
+.ann_right{
   left:50rpx;
   color: #000000;overflow:hidden; text-overflow:ellipsis;white-space:nowrap;font-size:28rpx; margin:7rpx 20rpx;
 }

pages/mine/mine.js

@@ -123,8 +123,8 @@ Page({
             pointdata: pointdata,
             "curmonth_points": pointdata.curmonth_points, //本月当前积分
             "curmonth_rank": pointdata.curmonth_rank,//本月当前排名
-            "lastmonth_points": pointdata.lastmonth_points,//上月积分
-            "lastmonth_rank": pointdata.lastmonth_rank //上月排名
+            "lastmonth_points": pointdata.lastmonth_points == null ? '0' : pointdata.lastmonth_points,//上月积分
+            "lastmonth_rank": pointdata.lastmonth_rank == null ? '-' : pointdata.lastmonth_rank //上月排名
           })
 
         }

pages/minusapply/minusapply.js

@@ -13,8 +13,8 @@ Page({
    */
   data: {
     isDetails: false, //减分申请详情时状态
-    minusPerson:'吴彦祖', //扣分人
-    minusTime:'2018-09-20', //日期
+    minusPerson:'', //扣分人
+    minusTime:'', //日期
     minusName:'', //被扣人
     minusPoints:'', //扣得积分
     minusNorm:'请选择',

pages/perinfo/perinfo.js

@@ -3,6 +3,7 @@ var BASEURL = require('../../utils/wxconstant.js')
 var baseUrl = BASEURL.BaseUrl()
 var baseutils = require('../../utils/baseUtils.js')
 var netUtil = require('../../utils/network.js')
+var dateutil = require('../../utils/DateTime.js')
 
 Page({
 
@@ -10,7 +11,9 @@ Page({
    * 页面的初始数据
    */
   data: {
-    InfoData:{}
+    InfoData:{},
+    enterDate:'',
+    birthDate:''
   },
 
   /**
@@ -28,7 +31,9 @@ Page({
     netUtil.requestLoading(url, data, '正在加载数据...', 'GET', function (res) {
       if(res.data.success && res.data.data){
         that.setData({
-          InfoData: res.data.data
+          InfoData: res.data.data,
+          enterDate: dateutil.getComDate(new Date(res.data.data.empEntry),'yy-mm-dd'),
+          birthDate: dateutil.getComDate(new Date(res.data.data.empBirth), 'yy-mm-dd'),
         })
         if (res.data.success && res.data.data) {
           wx.setStorageSync("myInfoData", res.data.data)

pages/perinfo/perinfo.wxml

@@ -33,7 +33,7 @@
      <view class='commonHview'>
         <view class='add_item_left_sty'>
           <view style='color:#333333;font-size:30rpx;'>入职日期</view>
-          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>{{InfoData.empEntry}}</view>
+          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>{{enterDate}}</view>
         </view>
         <view class='add_item_right_sty'>
           <!-- <view class='deit_sty'>编辑</view> -->
@@ -43,7 +43,7 @@
    <view class='commonHview'>
         <view class='add_item_left_sty'>
           <view style='color:#333333;font-size:30rpx;'>出生日期</view>
-          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>{{InfoData.empBirth}}</view>
+          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>{{birthDate}}</view>
         </view>
         <view class='add_item_right_sty'>
           <!-- <view class='deit_sty'>编辑</view> -->
@@ -63,7 +63,7 @@
   <view class='commonhline' style='height:3rpx;'></view>
    <view class='commonHview'>
         <view class='add_item_left_sty'>
-          <view style='color:#333333;font-size:30rpx;'>岗位</view>
+          <view style='color:#333333;font-size:30rpx;'>职位</view>
           <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>{{InfoData.station}}</view>
         </view>
         <view class='add_item_right_sty'>

pages/pointapply/pointapply.js

@@ -14,8 +14,8 @@ Page({
   data: {
     applyJob:'',
     applyName:'',
-    applyStatus:'待审批',
-    applyTime:'2018-09-20',
+    applyStatus:'',
+    applyTime:'',
     itemNorm: { normItem: '请选择' },//所选规则数据
     applyReason:'',
     CotegoryArray:[],

pages/pointapply/pointapply.wxml

@@ -39,7 +39,7 @@
   <view class='left_sty' style='width: 30%;'>申请标准</view>
    <view class='right_sty1' >
         <picker disabled='{{isDetails}}' bindchange="bindPickerChange" value="{{CotegoryArray[index].name}}" range="{{CotegoryArray}}" >
-          <view>{{applyNorm}}</view>
+          <view style='overflow:hidden; text-overflow:ellipsis;white-space:nowrap;'>{{applyNorm}}</view>
         </picker>
     </view>
     <view><image class='nextImg'src='../../img/next.png'> </image></view>
@@ -49,9 +49,12 @@
 
 <view class='commonHview'>
   <view class='left_sty' style='width: 10%;'>事由</view>
+  <scroll-view scroll-y='true'>
    <view class='righttextarea' >
         <textarea placeholder='请输入...' name='applyReason' maxlength='200' disabled='{{isDetails}}' value='{{applyReason}}'> </textarea>
     </view>
+  </scroll-view>
+    
 </view>
 <view class='commonhline' style='height:20rpx;' ></view>
 

pages/selectnorm/selectnorm.js

@@ -64,8 +64,8 @@ Page({
     var that = this
     let itemname = e.target.dataset.itemname
     var typedata = e.target.dataset.typedata
-    var rightnorm = []
-    if (isAddType == true) {
+    var rightnorm = new Array
+    if (isAddType == 'true') {
       rightnorm = typedata.addnorm
     } else {
       rightnorm = typedata.minus
@@ -74,9 +74,9 @@ Page({
       curName:itemname,
       navRightItems: rightnorm
     })
-
-    console.log('itemname', itemname)
     console.log('typedata', typedata)
+    console.log('itemname', itemname)
+    console.log('rightnorm', rightnorm)
   },
   itemClick:function(e){
     var that = this

pages/selectnorm/selectnorm.wxss

@@ -1,6 +1,6 @@
 .nav_left{
   display: inline-block;
-  width: 25%;
+  width: 30%;
   height: 100%;
   background: #f5f5f5;
   text-align: center;
@@ -20,16 +20,15 @@
   top: 0;
   right: 0;
   flex: 1;
-  width: 75%;
+  width: 70%;
   height: 100%;
   padding: 10px;
   background: #fff;
   box-sizing: border-box;
 }
 .nav_right_items{
-  min-height:40px;
-  line-height: 40px;
-  margin: 6px 0;font-size: 24rpx;background-color: #fff;text-align: center;
+  min-height:35px;
+  margin: 6px 0;font-size: 24rpx;background-color: #fff;text-align: left;
 }
 
 /* start 无数据时 样式  */