Merge branch 'dev' into feature-zyw

src/pages/consumptionDetails/consumptionDetails.js

@@ -37,7 +37,8 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    const options = this.options
+    console.log('options',options.memberid)
   },
 
   initOrderDetail(){

src/pages/integralWater/integralWater.js

@@ -11,7 +11,8 @@ wxService.page({
   data: {
     integralNum: 1246,
     pageNo: 1,
-    pageSize: 30
+    pageSize: 30,
+    integralList: []
   },
   /**
    * 生命周期函数--监听页面加载
@@ -32,19 +33,21 @@ wxService.page({
   },
 
   getIntegralList() {
-    // wx.showLoading({
-    //   title: '加载中'
-    // })
-
+    wx.showLoading({
+      title: '加载中'
+    })
     const params = {
       pageNo: this.data.pageNo,
       pageSize: this.data.pageSize
     }
     wxService.post(`/member/memberPointLog/findPage?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`, params).then(res=> {
-      // const {code,data} = res.data
-      // if(code == 200){
-        //  wx.hideLoading()
-      // }
+      const {result,data} = res.data
+      if(result == 0){
+         wx.hideLoading()
+         this.setData({
+           integralList: data.content.slice(0,30)
+         })
+      }
     })
   },
   // 点击跳转至会员规则页
@@ -56,8 +59,9 @@ wxService.page({
     wxService.router(`/pages/IntegralMall/IntegralMall`)
   },
   // 消费详情
-  handleGoDetail() {
-    wxService.router(`/pages/consumptionDetails/consumptionDetails`)
+  handleGoDetail(e) {
+    const {memberid} = e.currentTarget.dataset
+    wxService.router(`/pages/consumptionDetails/consumptionDetails`).search({memberid})
   },
   /**
    * 生命周期函数--监听页面隐藏

src/pages/integralWater/integralWater.wxml

@@ -8,24 +8,24 @@
       <view class="integral-vip-rules" bindtap="handleGoMemberRulesRules">会员规则</view>
   </view>
 
-  <view class="detail-list-no">还没有任何积分记录</view>
-  <view>
+  <view wx:if="{{!integralList.length}}" class="detail-list-no">还没有任何积分记录</view>
+  <view wx:if="{{integralList.length}}">
     <view class="integral-tips">
       <view class="tips-detail">显示你最近30笔变动明细</view>
       <span class="tips-much">这么多积分</span><span class="tips-gomall" bindtap="handleGoIntegralMall"> 去积分商城看看>>> </span>
     </view>
     <!--积分列表-->
     <view>
-      <view class="detail-integral" bindtap="handleGoDetail">
+      <view class="detail-integral" wx:for="{{integralList}}" wx:for-item="item" data-memberId = "{{item.memberId}}" wx:for-index="k" wx:key="{{k}}" bindtap="handleGoDetail">
         <view>
-          <view class="detail-title">购物送积分</view>
-          <view class="detail-time">2019-01-01</view>
-        </view>
-        <view class="detail-num">+10</view>
+          <view class="detail-title">{{item.changeChannel}}</view>
+          <view class="detail-time">{{item.createTime}}</view>
         </view>
+        <view class="detail-num" wx:if="{{item.operation}}">+ {{item.changeValue}}</view>
+        <view class="detail-num minus" wx:if="{{!item.operation}}">- {{item.changeValue}}</view>
       </view>
 
       <view class="detail-list-bottom">-已经到底啦-</view>
-
+    </view>
   </view>
 </view>

src/pages/integralWater/integralWater.wxss

 /* pages/integralWater.wxss */
 .integral{
   margin: 30rpx;
+  padding-bottom: 50rpx;
 }
 .integral-detail{
   border-radius: 10rpx;
@@ -59,6 +60,7 @@
 .detail-title {
   font-size: 25rpx;
   color: #666;
+  line-height: 50rpx;
 }
 .detail-time{
   font-size: 25rpx;
@@ -67,19 +69,23 @@
 .detail-num{
   font-size: 25rpx;
   color: #fc921e;
+  text-align: left;
+  width:130rpx;
 }
 .detail-integral{
   display: flex;
   justify-content: space-between;
   padding: 0 60rpx 0 30rpx;
+  margin-bottom: 20rpx;
 }
 .detail-list-bottom {
   text-align: center;
   font-size: 21rpx;
   color: #bfbfbf;
-  position: absolute;
-  bottom: 28rpx;
-  left: 45%;
+  margin-top: 45rpx;
+  /* position: absolute; */
+  /* bottom: 28rpx; */
+  /* left: 45%; */
 }
 .detail-list-no {
   font-size: 24rpx;
@@ -87,3 +93,7 @@
   padding-top: 200rpx;
   text-align: center;
 }
+
+.minus {
+  color: #000
+}
\ No newline at end of file

src/utils/Http.js

@@ -85,7 +85,7 @@ class Http {
       method: 'GET',
       header: {
         // 'buyer-token': this.getToken()
-        'buyer-token': '2e72711cc202bb9c5dd7c277ee4f2b59'
+        // 'buyer-token': '2e72711cc202bb9c5dd7c277ee4f2b59'
       },
       data: parmas
     })
@@ -97,7 +97,7 @@ class Http {
       method: 'POST',
       header: {
         // 'buyer-token': wx.getStorageSync('token')
-        'buyer-token':'2e72711cc202bb9c5dd7c277ee4f2b59'
+        // 'buyer-token':'2e72711cc202bb9c5dd7c277ee4f2b59'
       },
       data: parmas,
       channel: channel