fe / yoho-app-web · Commits

Go to a project

Authored by 陈峰
Commit 0faf0bfd70fff01ad6f1292778cb3a6266e45c53 2 parents 1b468395 07ea8038

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-app-web into release/1.0

Inline Side-by-side
Showing 1 changed file with 6 additions and 4 deletions
... ... @@ -17,21 +17,21 @@
<ExchangeBox v-model="inputCouponCode" @click="onSubmitCode"></ExchangeBox>
<ScrollView class="scroll-view1" ref="notuse" :data="getNotUseList" :options="scrollOptions" v-if="getNotUseList.length" :reach-bottom="reachBottom">
<CouponItem :item="item" v-for="(item, index) in getNotUseList" :key="index"></CouponItem>
<CouponItem :item="item" v-for="(item, index) in getNotUseList" :key="index + '' + item.coupon_id"></CouponItem>
</ScrollView>
<Empty v-else></Empty>
</SlideItem>
<SlideItem style="background-color: #f0f0f0;">
<ScrollView class="scroll-view2" ref="use" :data="getUseList" :options="scrollOptions" v-if="getUseList.length" :reach-bottom="reachBottom">
<CouponItem :item="item" v-for="(item, index) in getUseList" :key="index"></CouponItem>
<CouponItem :item="item" v-for="(item, index) in getUseList" :key="index + '' + item.coupon_id"></CouponItem>
</ScrollView>
<Empty v-else></Empty>
</SlideItem>
<SlideItem style="background-color: #f0f0f0;">
<ScrollView class="scroll-view2" ref="overtime" :data="getOvertimeList" :options="scrollOptions" v-if="getOvertimeList.length" :reach-bottom="reachBottom">
<CouponItem :item="item" v-for="(item, index) in getOvertimeList" :key="index"></CouponItem>
<CouponItem :item="item" v-for="(item, index) in getOvertimeList" :key="index + '' + item.coupon_id"></CouponItem>
</ScrollView>
<Empty v-else></Empty>
</SlideItem>
... ... @@ -161,8 +161,10 @@ export default {
type: this.selectType,
filter: this.tabLabels[this.selectIndex].selectFilterId,
refresh
}).then(() => {
}).then((result) => {
if (!result) {
this.$refs[this.selectType] && this.$refs[this.selectType].forceUpdate();
}
});
}
},
... ...