20:22

app.json

@@ -1,9 +1,9 @@
 {
   "pages": [
+    "pages/point/point",
     "pages/home/home",
     "pages/register/register",
     "pages/approval/approval",
-    "pages/point/point",
     "pages/applyjoinapprovel/applyjoinapprovel",
     "pages/corporateInfo/corporateInfo",
     "pages/minusapply/minusapply",
@@ -12,7 +12,8 @@
     "pages/selectnorm/selectnorm",
     "pages/perinfo/perinfo",
     "pages/bindphone/bindphone",
-    "pages/mine/mine"
+    "pages/mine/mine",
+    "pages/WebView/WebView"
   ],
   "window": {
     "backgroundTextStyle": "light",

pages/WebView/WebView.js

@@ -0,0 +1,26 @@
+// pages/WebView/WebView.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    comUrl:''
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    // console.log('options', options)
+    var url = options.getUrl
+    var title = options.getTitle
+    var that = this
+    if (url.trim().length > 0){
+      that.setData({
+        comUrl: url
+      })
+
+    }
+  }
+})

pages/WebView/WebView.json

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

pages/WebView/WebView.wxml

@@ -0,0 +1 @@
+<web-view src="{{comUrl}}"> </web-view>

pages/WebView/WebView.wxss

@@ -0,0 +1 @@
+/* pages/WebView/WebView.wxss */

pages/applyjoinapprovel/applyjoinapprovel.js

@@ -50,7 +50,8 @@ Page({
         approvelStatus: approvelStatus,
         invoicesId: invoicesId,
         fromType: fromType,
-        isISend: isISend
+        isISend: isISend,
+        applyStatus: approvelStatus == 1 ? '待审批' : (approvelStatus == 2 ? '已审批' : '未通过')
         // applyStatus: approvelStatus == 
       })
 
@@ -78,7 +79,7 @@ Page({
           applyReason: res.data.data.reasons,
           applyPoint: res.data.data.score,
           adviceName: res.data.data.adviceName,
-
+          auditName: res.data.data.auditName
         })
       }
     }, function (res) {

pages/applyjoinapprovel/applyjoinapprovel.wxml

@@ -96,9 +96,10 @@
     </view>
     <view class='commonhline' style='height:3rpx;'></view>
 
-    <view class='commonHview' >
-      <view class='left_sty'>待审批人</view>
-      <view class='right_sty'>{{adviceName}}</view>
+    <view class='commonHview' wx:if='{{auditName}}' >
+      <view class='left_sty' wx:if='{{approvelStatus == 1}}'>待审批人</view>
+      <view class='left_sty' wx:else>审批人</view>
+      <view class='right_sty'>{{auditName}}</view>
     </view>
     <view class='commonhline' style='height:3rpx;'></view>
 

pages/approval/approval.wxml

@@ -65,7 +65,8 @@
         <view><image src='../../img/common_header_boy.png' class='img1'></image></view>
         <view class='commonVview itemMsg'>
           <view style='font-size:30rpx;margin-top:10rpx;'>{{fillName}}的积分申报</view>
-          <view style='color:#999999;font-size:24rpx;margin-top:20rpx;'>等待{{adviceName}}审批</view>
+          <view style='color:#999999;font-size:24rpx;margin-top:20rpx;' wx:if='{{invoicesStatus == 1}}'>待审批</view>
+          <view style='color:#999999;font-size:24rpx;margin-top:20rpx;' wx:else>已审批</view>
         </view>
         <view class='itemStatue_finish'>{{invoicesDate}}</view>
         </view>

pages/bindphone/bindphone.js

@@ -53,7 +53,8 @@ Page({
           icon: 'none',
           duration: 2000
         })
-        wx.setStorageSync('accountphone', phone)
+        // wx.setStorageSync('accountphone', phone)
+        wx.setStorageSync('isregistered', true)
         // var pages = getCurrentPages()
         // var prevPage = pages[pages.length - 1]  //当前界面
         // var prevPage = pages[pages.length - 2]  //上一个页面

pages/home/home.js

@@ -27,7 +27,8 @@ Page({
     interval: 5000,
     duration: 500,
     homedata:{},
-    noticeContent:'这是公告'
+    noticeContent:'这是公告',
+    baseUrl: baseUrl
   },
 
   /**
@@ -73,10 +74,9 @@ Page({
   onShow: function () {
     var that = this
     isregistered = wx.getStorageSync('isregistered')
-    if (isregistered){
-      baseutils.getPersonlEmp()
-      baseutils.judgeisReg()
-    }else{
+    var wxnickName = wx.getStorageSync('wxnickName')
+    console.log('wxnickName', wxnickName)
+    if (!wxnickName){
       wx.showModal({
         title: '提示',
         content: '您当前尚未进行微信授权登录，是否立即前往?',
@@ -90,12 +90,37 @@ Page({
           }
         }
       })
+    } else if (!isregistered){
+      wx.showModal({
+        title: '提示',
+        content: '您当前尚未与企业关联绑定，是否立即去绑定?',
+        success: function (res) {
+          if (res.confirm) {
+          wx.navigateTo({
+            url: '../bindphone/bindphone',
+          })
+          } else if (res.cancel) {
+            return
+          }
+        }
+      })
+    }else{
+      baseutils.getPersonlEmp()
+      baseutils.judgeisReg()
     }
-   
-
     that.getAddata()   //获取home广告信息
   },
-
+  newsItemClick:function(event){
+    var that = this
+    var cid = event.currentTarget.dataset.newsid
+    var title = event.currentTarget.dataset.newstitle
+    // cid = 128
+    var url = baseUrl + '/integral/blog/open/post/' + cid
+    console.log('newsItemClick', url)
+    wx.navigateTo({
+      url: '../WebView/WebView?getUrl=' + url + '&getTitle=' + title
+    })
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */

pages/home/home.wxml

@@ -24,17 +24,17 @@
     <view><image style='width:30rpx;height:30rpx;margin-top:10rpx;line-height:30rpx;' src='../../img/speaker.png'></image></view>
     <view style='font-size:26rpx;color:#000;margin-left:10rpx;margin-top:8rpx;'>最新资讯</view>
     </view>
-    <view class='commonVview' wx:for='{{homedata.newsData}}' bindtap='newsItemClick' data-newsid='{{item.cid}}'>
+    <view class='commonVview' wx:for='{{homedata.newsData}}' bindtap='newsItemClick' data-newsid='{{item.cid}}' data-newstitle='{{item.newstitle}}'>
      <view class='commonhline' style='height:3rpx;'></view>
      <view class='commonHview' style='margin:10rpx;height:156rpx;'>
-       <view wx:if='{{item.newsimgurl}}'><image src='{{item.newsimgurl}}' class='newsimgs'></image></view>
+       <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.content}}</view>
+        <view class='newContextSty'>{{item.filell}}</view>
         </view>
      </view>
     

pages/mine/mine.js

@@ -18,6 +18,7 @@ Page({
     idCompanyInfo: 'idCompanyInfo',
     idAbout: 'idAbout',
     idgoBind:'idgoBind',
+    idWxlogin:'idWxlogin',
     pointdata:{},//本月、上月积分及排名
 
     "curmonth_points": 520, //本月当前积分
@@ -44,19 +45,20 @@ Page({
     var id = event.currentTarget.id
     isregistered = wx.getStorageSync('isregistered')
     console.log('isregistered', isregistered)
-    if (!isregistered) {
-      if (wx.getStorageSync('wxnickName')) {
-        if (id == that.data.idgoBind) {
-          wx.navigateTo({
-            url: '../bindphone/bindphone',
-          })
-          return
-        }
-      }else{
-        that.comToast('您当前尚未进行微信授权登录')
-        return
-      }
+    if (id == that.data.idWxlogin){
+      return
+    }
+    if (!wx.getStorageSync('wxnickName')) {
+      that.comToast('您当前尚未进行微信授权登录')
+      return
+    }
+    if (id == that.data.idgoBind) {
+      wx.navigateTo({
+        url: '../bindphone/bindphone',
+      })
+      return
     }
+   
     if (!isregistered) {
       wx.showModal({
         title: '提示',

pages/mine/mine.wxml

@@ -2,7 +2,7 @@
 
  <view wx:if='{{!isLogin}}' class='beforeLoginview' bindtap='btnClick' id='{{idBLV}}'>
     <view><image src='../../img/common_header_boy.png' class='headerImg'></image></view>
-    <view class='menuText2' style='width:auto;' wx:if="{{canIUse}}"><button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" style='height:60rpx;text-align:center;font-size:25rpx;margin:30rpx 0 0 10rpx;'>微信授权登录</button></view>
+    <view class='menuText2' style='width:auto;' wx:if="{{canIUse}}"><button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" style='height:60rpx;text-align:center;font-size:25rpx;margin:30rpx 0 0 10rpx;' bindtap='btnClick' id='{{idWxlogin}}'>微信授权登录</button></view>
     <view wx:else>请升级微信版本</view>
   </view>
   

pages/minusapply/minusapply.js

@@ -13,14 +13,17 @@ Page({
    */
   data: {
     isDetails: false, //减分申请详情时状态
-    minusPerson:'吴彦祖',
-    minusTime:'2018-09-20',
-    minusName:'',
-    minusPoints:50,
-    itemPerson:{},
+    minusPerson:'吴彦祖', //扣分人
+    minusTime:'2018-09-20', //日期
+    minusName:'', //被扣人
+    minusPoints:'', //扣得积分
+    minusNorm:'请选择',
+    itemPerson:{}, 
     itemNorm: { normItem: '请选择', normScore:'' },//所选规则数据
     CotegoryArray: [],
     Cotegory: [],
+
+    detailsData: {},  
   },
 
   /**
@@ -29,13 +32,16 @@ Page({
   onLoad: function (options) {
     var that = this
     var isDetails = options.getisDetails
-    that.setData({
-      isDetails: isDetails
-    })
-    that.changeTitle()
-    that.initView()
+    var itemdata 
 
-    that.getCotegory()//获得分类列表
+    if (options.getItemdata) {
+      itemdata = JSON.parse(options.getItemdata)
+      that.setData({
+        isDetails: isDetails
+      })
+    }
+    console.log('itemdata', itemdata)
+    that.initView(itemdata)
   },
   minusSubmit: function (event){
     var that = this
@@ -142,12 +148,71 @@ Page({
       title: that.data.mername
     })
   },
-  initView: function () {
+  /**
+ * 根据invoicesId 获取加分单据详情数据
+ */
+  initDetailsView: function (invoicesId) {
     var that = this
-    var nowTime = dateutil.getComDate(new Date, 'yy-mm-dd')
-    that.setData({
-      minusTime: nowTime
+    var data = { invoicesId: invoicesId }
+    var url = baseUrl + BASEURL.getUrl.getInvoices
+    netUtil.requestLoading(url, data, '正在加载数据...', 'GET', function (res) {
+      if (res.data.success && res.data.data) {
+        that.setData({
+          detailsData: res.data.data,
+          minusTime: res.data.data.invoicesDate,
+          minusName: res.data.data.adviceName,
+          minusNorm: res.data.data.normName,
+          minusPoints: res.data.data.score,
+          minusReason: res.data.data.reasons,
+          // applyJob: res.data.data.fillStation
+        })
+      }
+    }, function (res) {
+      wx.showToast({
+        title: '加载数据失败',
+        icon: 'none',
+        duration: 2000
+      })
+    })
+  },
+  initView: function (itemdata) {
+    var that = this;
+    var isDetails = that.data.isDetails
+    var title
+    if (isDetails) {
+      title = '减分详情'
+      title = '加分申请详情'
+      if (itemdata && itemdata.invoicesId) {
+        // var invoicesStatus = itemdata.invoicesStatus
+        // var applyStatus
+
+        // if (invoicesStatus == 0) {
+        //   applyStatus = '待审批'
+        // } else if (invoicesStatus == 1) {
+        //   applyStatus = '已审批'
+        // } else {
+        //   applyStatus = '未通过'
+        // }
+        // that.setData({
+        //   applyStatus: applyStatus,
+        //   invoicesStatus: invoicesStatus,
+        // })
+        that.initDetailsView(itemdata.invoicesId)
+      }
+
+    } else {
+      title = '减分申请'
+      var nowTime = dateutil.getComDate(new Date, 'yy-mm-dd')
+      that.setData({
+        minusTime: nowTime
+      })
+      that.getCotegory()//获得分类列表
+    }
+    wx.setNavigationBarTitle({
+      title: title
     })
+
+    
     // console.log('nowTime', nowTime)
   },
 
@@ -163,9 +228,11 @@ Page({
    * 选择被扣人对象
    */
   selctMinusPerson:function(){
-    wx.navigateTo({
-      url: '../selectStaff/selectStaff',
-    })
+    if (!this.data.isDetails){
+      wx.navigateTo({
+        url: '../selectStaff/selectStaff',
+      })
+    }
     // return
     // var that = this
     // var data = {  }
@@ -201,7 +268,19 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    var that = this
+    if (that.data.itemPerson){
+      that.setData({
+        minusName: that.data.itemPerson.empName
+      })
+    }
 
+    if (that.data.itemNorm){
+      that.setData({
+        minusNorm: that.data.itemNorm.normItem,
+        minusPoints: that.data.itemNorm.normScore
+      })
+    }
   },
 
   /**

pages/minusapply/minusapply.wxml

@@ -20,7 +20,7 @@
 <view class='commonHview'>
   <view class='left_sty'>被扣人</view>
    <view class='right_sty' style='display: flex;flex-direction: row;margin-right:0rpx;'>
-      <view><input class='input_sty' disabled='true' value='{{itemPerson.empName}}' placeholder='请选择' type='text' name='minusName' bindtap='selctMinusPerson' placeholder-style='color:#666666;'></input></view>
+      <view><input disabled='true' class='input_sty' value='{{minusName}}' placeholder='请选择' type='text' name='minusName' bindtap='selctMinusPerson' placeholder-style='color:#666666;' ></input></view>
     </view>
     <view ><image class='nextImg' src='../../img/next.png'> </image></view>
 </view>
@@ -34,8 +34,8 @@
     </view> -->
 
      <view class='right_sty1' >
-        <picker bindchange="bindPickerChange" value="{{CotegoryArray[index].name}}" range="{{CotegoryArray}}" >
-          <view>{{itemNorm.normItem}}</view>
+        <picker bindchange="bindPickerChange" value="{{CotegoryArray[index].name}}" range="{{CotegoryArray}}"   disabled='{{isDetails}}'>
+          <view>{{minusNorm}}</view>
         </picker>
     </view>
     <view><image class='nextImg'src='../../img/next.png'> </image></view>
@@ -45,7 +45,7 @@
 <view class='commonHview'>
   <view class='left_sty'>扣分数值</view>
    <view class='right_sty' style='display: flex;flex-direction: row;'>
-      <view><input class='input_sty' disabled='true' value='{{itemNorm.normScore}}'  type='text' name='minusPoints' ></input></view>
+      <view><input class='input_sty' disabled='true' value='{{minusPoints}}'  type='text' name='minusPoints' ></input></view>
     </view>
 </view>
 <view class='commonhline' style='height:3rpx;'></view>
@@ -53,7 +53,7 @@
 <view class='commonHview'>
   <view class='left_sty'  style='width: 20%;'>扣分原由</view>
    <view class='righttextarea' >
-        <textarea placeholder='请输入...' name='minusReason' maxlength='200' disabled='{{isDetails}}'> </textarea>
+        <textarea placeholder='请输入...' name='minusReason' maxlength='200' disabled='{{isDetails}}' value='{{minusReason}}'> </textarea>
     </view>
 </view>
 <view class='commonhline' style='height:20rpx;'></view>

pages/perinfo/perinfo.wxml

@@ -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/point/point.js

@@ -15,6 +15,8 @@ Page({
     // tab切换  
     currentTab: 0,
     clientHeight: '',
+    idAddPoint:'idAddPoint',
+    idMinusPoint:'idMinusPoint',
 
     /** 
       * 页面配置 
@@ -98,23 +100,54 @@ Page({
 
 
   },
-  enterAddPoint:function(){
-    if (!isregistered) {
-      this.gotoWxlogin()
+
+  btnClick: function (event) {
+    var that = this
+    var id = event.currentTarget.id
+    var wxnickName = wx.getStorageSync('wxnickName')
+    console.log('wxnickName', wxnickName)
+    if (!wxnickName) {
+      wx.showModal({
+        title: '提示',
+        content: '您当前尚未进行微信授权登录，是否立即前往?',
+        success: function (res) {
+          if (res.confirm) {
+            wx.switchTab({
+              url: '../mine/mine',
+            })
+          } else if (res.cancel) {
+            return
+          }
+        }
+      })
       return
-    } 
-    wx.navigateTo({
-      url: '../pointapply/pointapply',
-    })
-  },
-  enterMinusPoint:function(){
-    if (!isregistered) {
-      this.gotoWxlogin()
+    } else if (!isregistered) {
+      wx.showModal({
+        title: '提示',
+        content: '您当前尚未与企业关联绑定，是否立即去绑定?',
+        success: function (res) {
+          if (res.confirm) {
+            wx.navigateTo({
+              url: '../bindphone/bindphone',
+            })
+          } else if (res.cancel) {
+            return
+          }
+        }
+      })
       return
     }
-    wx.navigateTo({
-      url: '../minusapply/minusapply',
-    })
+
+    if (id == that.data.idAddPoint){
+      wx.navigateTo({
+        url: '../pointapply/pointapply',
+      })
+    } else if (id == that.data.idMinusPoint){
+      wx.navigateTo({
+        url: '../minusapply/minusapply',
+      })
+    }
+
   },
   addListClick:function(event){
     // console.log("点击了", event.currentTarget.dataset.item)
@@ -123,9 +156,10 @@ Page({
       url: '../pointapply/pointapply?getisDetails=' + true + '&getItemdata=' + JSON.stringify(itemdata),
     })
   },
-  minusListClick:function(){
+  minusListClick: function (event){
+    var itemdata = event.currentTarget.dataset.item
     wx.navigateTo({
-      url: '../minusapply/minusapply?getisDetails=' + true,
+      url: '../minusapply/minusapply?getisDetails=' + true + '&getItemdata=' + JSON.stringify(itemdata),
     })
   },
   /** 

pages/point/point.wxml

@@ -1,10 +1,10 @@
    <view class='commonHview'   >
-      <view class='header_left_view' bindtap='enterAddPoint'>
+      <view class='header_left_view'  bindtap='btnClick' id='{{idAddPoint}}'>
         <image src='../../img/add_point.png' class='im_sty1'></image>
         <text class='add_text_sty'>加分单</text>
       </view>
       <view style='width:6rpx;height:50rpx;background-color:#F2F2F2;margin-top:10rpx;'></view>
-      <view class='header_left_view' bindtap='enterMinusPoint'>
+      <view class='header_left_view'  bindtap='btnClick' id='{{idMinusPoint}}' >
         <image src='../../img/minus_point.png' class='im_sty1'></image>
         <text class='minus_text_sty'>减分单</text>
       </view>
@@ -33,15 +33,15 @@
 
       <swiper-item>  
       <scroll-view  scroll-y="true" style="height:100%;">
-      <block wx:for='{{minusList}}' bindtap='minusListClick' data-item='{{item}}' >
+      <view wx:for='{{minusList}}' bindtap='minusListClick' data-item='{{item}}' >
          <template is='minusPointTem' data='{{...item}}'/> 
-      </block>
+      </view>
      </scroll-view> 
     </swiper-item> 
 
       <swiper-item >  
       <scroll-view  scroll-y="true" style="height:100%;">
-        <view class='commonHview' style='background-color:#B1F4AE;height:100rpx;'>
+        <view class='commonHview' style='background-color:#B1F4AE;height:100rpx;' wx:if='{{points_rank.my_rank}}'>
           <view style='color:#333333;font-size:30rpx;text-align:left;margin:25rpx;width:50%;'>当前排名：{{points_rank.my_rank.rank}}</view>
           <view style='color:#666666;font-size:30rpx;text-align:right;margin:25rpx;width:50%;'>{{points_rank.my_rank.point}} 积分</view>
         </view>
@@ -81,11 +81,11 @@
     <view class='commonHview'  >
         <view class='add_item_left_sty'>
           <view style='color:#333333;font-size:30rpx;'>扣分标准</view>
-          <view style='color:#CB0404;font-size:30rpx;margin-top:20rpx;'>-250</view>
+          <view style='color:#CB0404;font-size:30rpx;margin-top:20rpx;'>{{score}}</view>
         </view>
         <view class='add_item_right_sty'>
-          <view style='color:#666666;font-size:26rpx;'>扣分人：吴彦祖</view>
-          <view style='color:#666666;font-size:26rpx;margin-top:20rpx;'>2018-09-19</view>
+          <view style='color:#666666;font-size:26rpx;'>扣分人：{{fillName}}</view>
+          <view style='color:#666666;font-size:26rpx;margin-top:20rpx;'>{{invoicesDate}}</view>
         </view>
     </view>
      <view class='commonhline' style='height:3rpx;'></view>

pages/pointapply/pointapply.js

@@ -40,7 +40,6 @@ Page({
     }
     console.log('itemdata', itemdata)
     that.initView(itemdata) //修改标题
-    that.getCotegory()//获得分类列表
     // that.getDept()//获取公司部门列表
 
   },
@@ -120,6 +119,7 @@ Page({
         that.initDetailsView(itemdata.invoicesId)
       }
     } else {
+      that.getCotegory()//获得分类列表
       title = '积分申请'
       that.setData({
         applyJob: myInfoData.station,
@@ -210,6 +210,7 @@ Page({
           applyName: res.data.data.fillName,
           applyNorm: res.data.data.normName,
           applyReason: res.data.data.reasons,
+          applyJob: res.data.data.fillStation
         })
       }
     }, function (res) {

utils/wxconstant.js

@@ -1,37 +1,42 @@
 function BaseUrl(){
-  var baseUrl = 'http://192.168.253.130:8080/integral/'
+  var baseUrl = 'http://192.168.253.130:8080'
   return baseUrl
 }
 function getTXMapApiKay(){
   return 'HPYBZ-IFY2J-E5KFY-K24IF-Q3UMS-GJFBV'
 }
+function isTest(){
+  var isTest = true  //判断是否是测试版本，是则打印日志
+  return isTest
+}
 const getUrl = {
-  getOpenid:'inte/employee/getOpenid', //获取Openid
-  Binding: 'inte/employee/binding', //关联用户
-  sendCode: 'inte/employee/sendCode', //获取验证码
-  getAd: 'inte/ad/getAd', //获取首页轮播图等
-  getRank: 'inte/score/getRank', //根据当前总积分取月排名
-  regist: 'inte/employee/regist', //员工注册
-  getDept: 'inte/department/getDept',  //获取公司部门列表
-  getCotegory: 'inte/category/getCotegory', //获得分类列表
-  getNorm: 'inte/norm/getNorm', //获取相应的规章制度详情
-  getAllApproval: 'inte/invoices/getAllApproval', //获取审批相关（待审批，已审批，发起）
-  saveMinusInvoices: 'inte/invoices/saveMinusInvoices', //保存扣积分
-  getAllRank: 'inte/invoices/getAllRank', //获取所有排名及加减分记录
+  getOpenid:'/integral/inte/employee/getOpenid/', //获取Openid
+  Binding: '/integral/inte/employee/binding/', //关联用户
+  sendCode: '/integral/inte/employee/sendCode/', //获取验证码
+  getAd: '/integral/inte/ad/getAd/', //获取首页轮播图等
+  getRank: '/integral/inte/score/getRank/', //根据当前总积分取月排名
+  regist: '/integral/inte/employee/regist/', //员工注册
+  getDept: '/integral/inte/department/getDept/',  //获取公司部门列表
+  getCotegory: '/integral/inte/category/getCotegory/', //获得分类列表
+  getNorm: '/integral/inte/norm/getNorm/', //获取相应的规章制度详情
+  getAllApproval: '/integral/inte/invoices/getAllApproval/', //获取审批相关（待审批，已审批，发起）
+  saveMinusInvoices: '/integral/inte/invoices/saveMinusInvoices/', //保存扣积分
+  getAllRank: '/integral/inte/invoices/getAllRank/', //获取所有排名及加减分记录
 
-  getAllEmp: 'inte/employee/getAllEmp', //获取所有员工
-  getEmp: 'inte/employee/getEmp', //保存扣积分
-  getAllRank: 'inte/invoices/getAllRank', //获取所有排名及加减分记录
-  saveAddInvoices: 'inte/invoices/saveAddInvoices', //保存加积分
-  saveMinusInvoices: 'inte/invoices/saveMinusInvoices', //保存扣积分 
-  getNormByCategoryId: 'inte/norm/getNormByCategoryId', //获取分类下相应的规章制度
-  getInvoices: 'inte/invoices/getInvoices', //获取提交的单据详情  
-  withdrawInvoices: 'inte/invoices/withdrawInvoices', //撤回未审批的  
-  approval: 'inte/invoices/approval', //审批  
-  regist:'inte/employee/regist',//员工注册
+  getAllEmp: '/integral/inte/employee/getAllEmp/', //获取所有员工
+  getEmp: '/integral/inte/employee/getEmp/', //保存扣积分
+  getAllRank: '/integral/inte/invoices/getAllRank/', //获取所有排名及加减分记录
+  saveAddInvoices: '/integral/inte/invoices/saveAddInvoices/', //保存加积分
+  saveMinusInvoices: '/integral/inte/invoices/saveMinusInvoices/', //保存扣积分 
+  getNormByCategoryId: '/integral/inte/norm/getNormByCategoryId/', //获取分类下相应的规章制度
+  getInvoices: '/integral/inte/invoices/getInvoices/', //获取提交的单据详情  
+  withdrawInvoices: '/integral/inte/invoices/withdrawInvoices/', //撤回未审批的  
+  approval: '/integral/inte/invoices/approval/', //审批  
+  regist:'/integral/inte/employee/regist/',//员工注册
 }
 module.exports = {
   BaseUrl: BaseUrl,
   getTXMapApiKay: getTXMapApiKay,
-  getUrl: getUrl
+  getUrl: getUrl,
+  isTest: isTest
 }