diff --git a/src/apps/AppMarryAndDie/Add.vue b/src/apps/AppMarryAndDie/Add.vue index e7a56bfc..b7109f4e 100644 --- a/src/apps/AppMarryAndDie/Add.vue +++ b/src/apps/AppMarryAndDie/Add.vue @@ -82,7 +82,6 @@ export default { }, computed: { ...mapState(['user']) }, onLoad() { - console.log(this.user.id) this.$dict.load('marriageType', 'modeType') this.forms.areaId = this.user.areaId }, @@ -147,12 +146,10 @@ export default { selectStatus(e) { if (this.showStstus == true) { - console.log(e) this.forms.type = e[0].label this.forms.typeValue = e[0].value } if (this.showModeType == true) { - console.log(e) this.forms.modeType = e[0].label this.forms.modeTypeValue = e[0].value } diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue index 150eafd8..173e8468 100644 --- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue +++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue @@ -143,10 +143,10 @@ export default { onLoad(o) { if (o.indexTabs) { this.currentTabs = o.indexTabs + this.getList() } this.$dict.load('marriageType', 'modeType').then(() => { - this.getList() this.getEchart() }) }, @@ -262,27 +262,27 @@ export default { toList(num) { if (num == 0) { - console.log('全部') uni.navigateTo({ url: `./AllActiveList` }) } if (num == 1) { - console.log('干部') uni.navigateTo({ url: `./CadreList` }) } if (num == 2) { - console.log('婚礼') uni.navigateTo({ url: `./MarryList` }) } if (num == 3) { - console.log('丧礼') uni.navigateTo({ url: `./FuneralList` }) } }, change(index) { this.currentTabs = index - this.getList() - this.getEchart() + if (this.currentTabs == 0) { + this.getEchart() + } + if (this.currentTabs == 1) { + this.getList() + } }, }, onReachBottom() {