Merge pull request '优惠券增加新人优惠券' (#287) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/287
This commit is contained in:
		
						commit
						1d8cd6512f
					
				@ -2,8 +2,8 @@
 | 
			
		||||
	<view class="c-coupon">
 | 
			
		||||
		<view class="coupon-usable">
 | 
			
		||||
			<view class="info-type" :style="{ backgroundImage: 'url(' + '/static/image/mine/30.png' + ')', backgroundSize:'contain', backgroundRepeat: 'no-repeat' }">
 | 
			
		||||
				<div class="wrap_left_top"></div>
 | 
			
		||||
				{{ couponInfo.type == 2 ? '店铺优惠券' : '平台优惠券' }}
 | 
			
		||||
				<div class="wrap_left_top" v-if="couponInfo.type == 1">{{ couponInfo.vouchertemplate_id == 1 ? '新人专享' : '平台优惠券' }}</div>
 | 
			
		||||
				<div class="wrap_left_top" v-else-if="couponInfo.type == 2">店铺优惠券</div>
 | 
			
		||||
			</view>
 | 
			
		||||
			<view class="coupon-info">
 | 
			
		||||
				<view class="info-usable">
 | 
			
		||||
 | 
			
		||||
@ -2,8 +2,8 @@
 | 
			
		||||
	<view class="c-coupon" v-if="goodsClass.length">
 | 
			
		||||
		<view :class="couponInfo.voucher_state != 1 ? 'coupon-unable' : 'coupon-usable'">
 | 
			
		||||
			<view class="info-type" :style="{ backgroundImage: 'url(' + (couponInfo.voucher_state == 1 ? '/static/image/mine/30.png' : '/static/image/mine/31.png') + ')', backgroundSize:'contain', backgroundRepeat: 'no-repeat' }">
 | 
			
		||||
				<div class="wrap_left_top"></div>
 | 
			
		||||
				{{ couponInfo.type == 2 ? '店铺优惠券' : '平台优惠券' }}
 | 
			
		||||
				<div class="wrap_left_top" v-if="couponInfo.type == 1">{{ couponInfo.vouchertemplate_id == 1 ? '新人专享' : '平台优惠券' }}</div>
 | 
			
		||||
				<div class="wrap_left_top" v-else-if="couponInfo.type == 2">店铺优惠券</div>
 | 
			
		||||
			</view>
 | 
			
		||||
			<view class="coupon-info">
 | 
			
		||||
				<view class="info-usable">
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user