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 7 additions and 5 deletions
@@ -17,21 +17,21 @@ @@ -17,21 +17,21 @@
17 <ExchangeBox v-model="inputCouponCode" @click="onSubmitCode"></ExchangeBox> 17 <ExchangeBox v-model="inputCouponCode" @click="onSubmitCode"></ExchangeBox>
18 18
19 <ScrollView class="scroll-view1" ref="notuse" :data="getNotUseList" :options="scrollOptions" v-if="getNotUseList.length" :reach-bottom="reachBottom"> 19 <ScrollView class="scroll-view1" ref="notuse" :data="getNotUseList" :options="scrollOptions" v-if="getNotUseList.length" :reach-bottom="reachBottom">
20 - <CouponItem :item="item" v-for="(item, index) in getNotUseList" :key="index"></CouponItem> 20 + <CouponItem :item="item" v-for="(item, index) in getNotUseList" :key="index + '' + item.coupon_id"></CouponItem>
21 </ScrollView> 21 </ScrollView>
22 <Empty v-else></Empty> 22 <Empty v-else></Empty>
23 </SlideItem> 23 </SlideItem>
24 24
25 <SlideItem style="background-color: #f0f0f0;"> 25 <SlideItem style="background-color: #f0f0f0;">
26 <ScrollView class="scroll-view2" ref="use" :data="getUseList" :options="scrollOptions" v-if="getUseList.length" :reach-bottom="reachBottom"> 26 <ScrollView class="scroll-view2" ref="use" :data="getUseList" :options="scrollOptions" v-if="getUseList.length" :reach-bottom="reachBottom">
27 - <CouponItem :item="item" v-for="(item, index) in getUseList" :key="index"></CouponItem> 27 + <CouponItem :item="item" v-for="(item, index) in getUseList" :key="index + '' + item.coupon_id"></CouponItem>
28 </ScrollView> 28 </ScrollView>
29 <Empty v-else></Empty> 29 <Empty v-else></Empty>
30 </SlideItem> 30 </SlideItem>
31 31
32 <SlideItem style="background-color: #f0f0f0;"> 32 <SlideItem style="background-color: #f0f0f0;">
33 <ScrollView class="scroll-view2" ref="overtime" :data="getOvertimeList" :options="scrollOptions" v-if="getOvertimeList.length" :reach-bottom="reachBottom"> 33 <ScrollView class="scroll-view2" ref="overtime" :data="getOvertimeList" :options="scrollOptions" v-if="getOvertimeList.length" :reach-bottom="reachBottom">
34 - <CouponItem :item="item" v-for="(item, index) in getOvertimeList" :key="index"></CouponItem> 34 + <CouponItem :item="item" v-for="(item, index) in getOvertimeList" :key="index + '' + item.coupon_id"></CouponItem>
35 </ScrollView> 35 </ScrollView>
36 <Empty v-else></Empty> 36 <Empty v-else></Empty>
37 </SlideItem> 37 </SlideItem>
@@ -161,8 +161,10 @@ export default { @@ -161,8 +161,10 @@ export default {
161 type: this.selectType, 161 type: this.selectType,
162 filter: this.tabLabels[this.selectIndex].selectFilterId, 162 filter: this.tabLabels[this.selectIndex].selectFilterId,
163 refresh 163 refresh
164 - }).then(() => {  
165 - this.$refs[this.selectType] && this.$refs[this.selectType].forceUpdate(); 164 + }).then((result) => {
  165 + if (!result) {
  166 + this.$refs[this.selectType] && this.$refs[this.selectType].forceUpdate();
  167 + }
166 }); 168 });
167 } 169 }
168 }, 170 },