Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-basic-data/pages/sign-share-detail/integral-detail.js

@@ -68,7 +68,6 @@ Page({
     let params = {}
     let service = app.globalData['integralService']
     this.excute(service, app.globalData.company.cpId, params).then(res => {
-      console.log(res.data, 'getIntegral');
       if (res.data.code == Constants.SUCESS_CODE) {
         if (res.data && res.data.data) {
           this.setData({

package-basic-data/pages/sign-share-detail/integral-detail.wxml

@@ -45,8 +45,7 @@
       <view class="list-item" wx:for="{{itemList}}" wx:for-index="index" wx:for-item="item">
         <view>
           <view class="item-type">{{item.integralTypeName}}</view>
-          <view class="item-info" wx:if="{{saleStatus === '' || saleStatus === '收入'}}">{{item.accDate}}/{{item.staffName?item.staffName:''}}</view>
-          <view class="item-info" wx:if="{{saleStatus === '使用'}}">{{item.accDate}}</view>
+          <view class="item-info">{{item.accDate}}/{{item.staffName?item.staffName:''}}</view>
         </view>
         <view class="integral-value">
           {{item.integral > 0 ?'+' + item.integral:item.integral}}