|
|
@ -243,7 +243,7 @@ |
|
|
<de-livery ref="deLiveryPage" @tabbar-visible-change="setTabBarVisible"></de-livery> |
|
|
<de-livery ref="deLiveryPage" @tabbar-visible-change="setTabBarVisible"></de-livery> |
|
|
</view> |
|
|
</view> |
|
|
<view class="swiper-page" v-show="currentIndex == 2"> |
|
|
<view class="swiper-page" v-show="currentIndex == 2"> |
|
|
<my-center ref="myCenter"></my-center> |
|
|
<my-center ref="myCenterPage"></my-center> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<!-- 弹出区域选择 --> |
|
|
<!-- 弹出区域选择 --> |
|
|
@ -500,33 +500,35 @@ |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
onShow() { |
|
|
onShow() { |
|
|
this.indexInit() |
|
|
let that = this; |
|
|
if (this.pendingTabIndex !== null) { |
|
|
that.indexInit() |
|
|
const tabIndex = this.pendingTabIndex |
|
|
if (that.pendingTabIndex !== null) { |
|
|
const shouldShowDeliveryRuleConfirm = this.pendingDeliveryRuleConfirm && tabIndex == 1 |
|
|
const tabIndex = that.pendingTabIndex |
|
|
this.pendingTabIndex = null |
|
|
const shouldShowDeliveryRuleConfirm = that.pendingDeliveryRuleConfirm && tabIndex == 1 |
|
|
this.pendingDeliveryRuleConfirm = false |
|
|
that.pendingTabIndex = null |
|
|
this.$nextTick(() => { |
|
|
that.pendingDeliveryRuleConfirm = false |
|
|
Promise.resolve(this.refreshTabCounts()).then(() => { |
|
|
that.$nextTick(() => { |
|
|
this.changeIndex(tabIndex) |
|
|
Promise.resolve(that.refreshTabCounts()).then(() => { |
|
|
|
|
|
that.changeIndex(tabIndex) |
|
|
if (shouldShowDeliveryRuleConfirm) { |
|
|
if (shouldShowDeliveryRuleConfirm) { |
|
|
this.showDeliveryRuleEditedConfirm() |
|
|
that.showDeliveryRuleEditedConfirm() |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
this.$nextTick(() => { |
|
|
that.$nextTick(() => { |
|
|
Promise.resolve(this.refreshTabCounts()).then(() => { |
|
|
Promise.resolve(that.refreshTabCounts()).then(() => { |
|
|
if (this.currentIndex == 4 && this.$refs.myCenterPage) { |
|
|
if (that.currentIndex == 4 && that.$refs.myCenterPage) { |
|
|
this.$refs.myCenterPage.init() |
|
|
that.$refs.myCenterPage.init() |
|
|
} |
|
|
} |
|
|
if (this.pendingDeliveryRuleConfirm && this.currentIndex == 1) { |
|
|
if (that.pendingDeliveryRuleConfirm && that.currentIndex == 1) { |
|
|
this.pendingDeliveryRuleConfirm = false |
|
|
that.pendingDeliveryRuleConfirm = false |
|
|
this.showDeliveryRuleEditedConfirm() |
|
|
that.showDeliveryRuleEditedConfirm() |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
|
|
|
that.$refs.myCenterPage.init() |
|
|
}, |
|
|
}, |
|
|
onHide() { |
|
|
onHide() { |
|
|
this.closeProductPopup() |
|
|
this.closeProductPopup() |
|
|
@ -549,10 +551,11 @@ |
|
|
return Promise.resolve() |
|
|
return Promise.resolve() |
|
|
}, |
|
|
}, |
|
|
showDeliveryRuleEditedConfirm() { |
|
|
showDeliveryRuleEditedConfirm() { |
|
|
|
|
|
let that = this; |
|
|
this.$nextTick(() => { |
|
|
this.$nextTick(() => { |
|
|
setTimeout(() => { |
|
|
setTimeout(() => { |
|
|
if (this.$refs.deLiveryPage && this.$refs.deLiveryPage.showRuleEditedConfirm) { |
|
|
if (that.$refs.deLiveryPage && that.$refs.deLiveryPage.showRuleEditedConfirm) { |
|
|
this.$refs.deLiveryPage.showRuleEditedConfirm() |
|
|
that.$refs.deLiveryPage.showRuleEditedConfirm() |
|
|
} |
|
|
} |
|
|
}, 300) |
|
|
}, 300) |
|
|
}) |
|
|
}) |
|
|
@ -1053,17 +1056,17 @@ |
|
|
//底部tab切换组件状态改变 |
|
|
//底部tab切换组件状态改变 |
|
|
changeIndex(index, type) { |
|
|
changeIndex(index, type) { |
|
|
let that = this; |
|
|
let that = this; |
|
|
this.lastIndex = this.currentIndex |
|
|
that.lastIndex = that.currentIndex |
|
|
this.currentIndex = index |
|
|
that.currentIndex = index |
|
|
switch (index) { |
|
|
switch (index) { |
|
|
case 0: |
|
|
case 0: |
|
|
this.indexInit() |
|
|
that.indexInit() |
|
|
break; |
|
|
break; |
|
|
case 1: |
|
|
case 1: |
|
|
that.$refs.deLiveryPage.init(type) |
|
|
that.$refs.deLiveryPage.init(type) |
|
|
break; |
|
|
break; |
|
|
case 2: |
|
|
case 2: |
|
|
that.$refs.myCenter.init() |
|
|
that.$refs.myCenterPage.init() |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
