Merge branch 'feature-zyw' into 'dev'

Feature zyw

See merge request !9

src/pages/consumptionDetails/consumptionDetails.wxml

@@ -3,9 +3,9 @@
   <view class="consumption-top">
     <view class="top-ract"></view>
     <view class="top-order">
-      <view>订单编号:<span>{{no}}</span></view>
-      <view>消费时间:<span>{{time}}</span></view>
-      <view>消费门店:<span>{{store}}</span><span class="top-statsu">{{status}}</span></view>
+      <view>订单编号:<span>{{orderDetail.orderId}}</span></view>
+      <view>消费时间:<span>{{orderDetail.payTime}}</span></view>
+      <view>消费门店:<span>{{orderDetail.storeName}}</span><span class="top-statsu">{{orderDetail.status}}</span></view>
     </view>
   </view>
 

src/pages/coupons/coupons.js

@@ -24,12 +24,10 @@ wxService.page({
       pageSize:10
     },
     queryData:{
-      query:{
         "brandId": 0,
         "couponSettingId": 0,
         "status": 0,
         "title": ""
-      }
     },
     totalPages:''
   },
@@ -46,8 +44,8 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.queryData.setData({
-      'query.status': this.data.navIndex
+    this.setData({
+      'queryData.status': this.data.navIndex
     })
     this.getCouponList()
   },
@@ -56,7 +54,7 @@ wxService.page({
   switchTab(e){
     this.setData({
       navIndex: e.currentTarget.dataset.index,
-      'query.status': e.currentTarget.dataset.index
+      'queryData.status': e.currentTarget.dataset.index
     })
     this.getCouponList()
   },
@@ -66,8 +64,8 @@ wxService.page({
     wx.showLoading({
       title: '加载中'
     })
-    this.queryData.setData({
-      'query.status': this.data.navIndex
+    this.setData({
+      'queryData.status': this.data.navIndex
     })
     wxService.post(`/coupon/coupon/setting/list?pageNo=${this.data.params.pageNo}&pageSize=${this.data.params.pageSize}`, this.queryData).then(res => {
       let couponList = [];

src/pages/mySpend/mySpend.js

@@ -35,9 +35,11 @@ wxService.page({
     wx.showLoading({
       title: '加载中'
     })
-    wxService.post(`/sale/order/list?pageNo=${this.data.params.pageNo}&pageSize=${this.data.params.pageSize}`,{}).then(res => {
+    wxService.post(`/sale/order/list?pageNo=${this.data.params.pageNo}&pageSize=${this.data.params.pageSize}`,{
+      memberId:546456
+    }).then(res => {
       let orderList = [];
-      orderList = this.data.params.pageNo == 1 ? res.data.data : this.data.orderList.concat(res.data.data);
+      orderList = this.data.params.pageNo == 1 ? res.data.data.content : this.data.orderList.concat(res.data.data.content);
       this.setData({
         orderList,
         totalPages: res.data.data.totalPages,