|
|
@@ -107,9 +107,9 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <view class="prize-action" v-if="statusIndex == 1">
|
|
|
+ <view class="prize-action">
|
|
|
<!-- 实物商品提货 -->
|
|
|
- <view class="flex prize-action-goods" v-if="state == 0">
|
|
|
+ <view class="flex prize-action-goods" v-if="state == 0 && statusIndex == 1">
|
|
|
<view class="flex checkbox">
|
|
|
<u-checkbox-group>
|
|
|
<u-checkbox v-model="checkedAll" shape="circle" size="24" :checked="checkedAll"
|
|
|
@@ -120,7 +120,7 @@
|
|
|
<view class="btn" @click="toSettlement">立即提货</view>
|
|
|
</view>
|
|
|
<!-- 优惠券使用记录 -->
|
|
|
- <view class="flex prize-action-coupon" @click="toCoupon" v-else>
|
|
|
+ <view class="flex prize-action-coupon" @click="toCoupon" v-if="state == 1">
|
|
|
<view class="title">优惠券使用记录</view>
|
|
|
<u-icon name="arrow-right" size="15" color="#999"></u-icon>
|
|
|
</view>
|
|
|
@@ -271,6 +271,7 @@
|
|
|
changeTab(e) {
|
|
|
if (e.index == 0) {
|
|
|
this.state = 0
|
|
|
+ this.statusIndex = 1
|
|
|
} else if (e.index == 1) {
|
|
|
this.state = 1
|
|
|
}
|
|
|
@@ -395,7 +396,7 @@
|
|
|
if (this.total > this.pageNum * 20) {
|
|
|
setTimeout(() => {
|
|
|
++this.pageNum
|
|
|
- this.statusIndex == 3?this.getListTwo():this.getList()
|
|
|
+ this.statusIndex == 3 && this.state == 0 ? this.getListTwo():this.getList()
|
|
|
}, 500)
|
|
|
} else {
|
|
|
uni.$u.toast('已经到底了')
|
