1

components/discount/index.vue

@@ -3,16 +3,23 @@
 		<view class="pre_one">优惠劵({{couponList.length}}张)</view>
 		<view class="pre_two" v-for="(item,index) in couponList" :key="index">
 			<view class="left">
-				<view class="money">￥{{item.money||'0'}}</view>
-				<view class="man">满{{item.discount_money||'0'}}可以</view>
+				<view v-if="item.discount_config.limit=='nolimit'" class="money">不限</view>
+				<view v-else class="money">￥{{item.discount_config.limit||'0'}}</view>
+				<view class="man">满{{item.discount_config.min||'0'}}可用</view>
 			</view>
 			<view class="right">
 				<view class="other">
 					<view class="type"><text>{{item.discount_type_label||'暂无'}}</text>
 						{{item.name||'暂无'}}
 					</view>
-					<view class="date">{{item.expire_time||'暂无'}}</view>
-					<view class="date">{{item.use_limit_label||'暂无'}}-{{item.get_limit_label||'暂无'}}</view>
+					<view v-if="item.expire_type=='days'" class="date">{{item.expire_time||'暂无'}}天内有效</view>
+					<view v-if="item.expire_type=='fixed'" class="date">{{item.expire_time||'暂无'}}</view>
+					<view v-if="item.get_limit=='max'" class="date">
+						{{item.use_limit_label||'暂无'}}-{{item.expire_type_label}}-{{item.get_limit_label||'暂无'}}领取{{item.get_limit_config.max}}张
+					</view>
+					<view v-if="item.get_limit=='nolimit'" class="date">
+						{{item.use_limit_label||'暂无'}}-{{item.expire_type_label}}-{{item.get_limit_label||'暂无'}}
+					</view>
 				</view>
 				<view class="btn">
 					<button v-if="Style&&Style.btn||false" type="default" size="mini"
@@ -102,7 +109,7 @@
 				.other {
 					display: flex;
 					flex-direction: column;
-					width: 50vw;
+					width: 46vw;
 
 					.type {
 						overflow: hidden;

pagesMy/discount/index.vue

@@ -59,8 +59,8 @@
 				const that = this;
 				let user = that.user;
 				let info = {
-					skip: that.skip,
-					limit: that.limit,
+					// skip: that.skip,
+					// limit: that.limit,
 					customer: user._id
 				}
 				const res = await that.$api(`/userCoupon`, 'GET', {