theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

Browse Source
This commit is contained in:
luyuan
2020-08-25 14:37:35 +08:00
parent 3e87a5aaf5 2512923891
commit f4de9fe13b
17 changed files with 192 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/mine/coupon/index.vue
View File

@@ -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">

4
components/mine/coupon/mine.vue
View File

@@ -2,8 +2,8 @@
<view class="c-coupon" v-if="goodsClass.length" @click="use">
<view :class="couponInfo.voucher_state != 1 ? 'coupon-unable' : 'coupon-usable'" :style="{'width': type ? '650rpx' : '' }">
<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">

24
components/remaining/remaining.vue
View File

@@ -50,8 +50,8 @@
data() {
return {
remaining: 7,
type: true,
banner: false,
type: false,
banner: true,
protocol: false,
heightOut: '',
imgurl: [],
@@ -116,18 +116,18 @@
},
// 3秒倒计时
remaining_time() {
this.timer = setInterval(() => {
this.remaining--;
if (this.remaining <= 0) {
clearInterval(this.timer);
console.log("完了")
this.type = !this.type;
this.banner = !this.banner;
}
}, 1000);
// this.timer = setInterval(() => {
// this.remaining--;
// if (this.remaining <= 0) {
// clearInterval(this.timer);
// console.log("完了")
// // this.type = !this.type;
// // this.banner = !this.banner;
// }
// }, 1000);
},
leap_over() {
this.type = !this.type
// this.type = !this.type
this.banner = !this.banner;
clearInterval(this.timer)
// 获取屏幕高度