modify: 优惠券接口

src/pages/coupons/coupons.js

@@ -22,10 +22,9 @@ wxService.page({
     pageNo: 1,
     pageSize: 10,
     queryData:{
-        //"brandId": 1002,
-        //"couponSettingId": 0,
-        //"status": 0,
-        //"title": ""
+        //"couponId": 0,
+        //"memberId": 0,
+        //"status": ""
     },
     totalPages: 0,
     totalElements: 0,
@@ -87,7 +86,7 @@ wxService.page({
     })
     // const params = this.data.queryData
     const params = {}
-    wxService.post(`/coupon/coupon/setting/list?pageNo=${pageNo}&pageSize=${pageSize}`, params).then(res => {
+    wxService.post(`/coupon/coupon/listWithMember?number=${pageNo}&size=${pageSize}`, params).then(res => {
       const {result,data} = res.data
       if(result == 0){
          wx.hideLoading()

src/pages/coupons/coupons.wxml

@@ -29,9 +29,9 @@
 								<image src='/assets/imgs/qr-code.png' />
 							</view>
 							<view class='coupon-info'>
-								<view class='coupon-name fs-28'>{{item.couponSetting.typeDesc}}</view>
-								<view class='coupon-time fs-24'>{{item.couponSetting.startTime}} 至 {{item.couponSetting.endTime}}</view>
-								<view class='coupon-desc fs-24'>{{item.couponSetting.typeDesc}}</view>
+								<view class='coupon-name fs-28'>{{item.title}}</view>
+								<view class='coupon-time fs-24'>{{item.startTime}} 至 {{item.endTime}}</view>
+								<view class='coupon-desc fs-24'>{{item.getChannelDesc}}</view>
 							</view>
 							<view class='coupon-code fs-24'>出示劵码</view>
 						</navigator>
@@ -63,9 +63,9 @@
 							<image src='/assets/imgs/qr-code.png' />
 						</view>
 						<view class='coupon-info'>
-							<view class='coupon-name fs-28'>{{item.couponSetting.typeDesc}}</view>
-							<view class='coupon-time fs-24'>{{item.couponSetting.startTime}} 至 {{item.couponSetting.endTime}}</view>
-							<view class='coupon-desc fs-24'>{{item.couponSetting.typeDesc}}</view>
+							<view class='coupon-name fs-28'>{{item.typeDesc}}</view>
+							<view class='coupon-time fs-24'>{{item.startTime}} 至 {{item.endTime}}</view>
+							<view class='coupon-desc fs-24'>{{item.typeDesc}}</view>
 						</view>
 						<view class='coupon-code fs-24'>出示劵码</view>
 					</view>

src/pages/coupons/coupons.wxss

 /* pages/userCenter.wxss */
 @import './../../base/base.wxss';
+scroll-view{
+  height: 100%;
+}
 .page-coupons{
   position: relative;
 }