diff --git a/pages/index/index.vue b/pages/index/index.vue index c028023..8fc3e5a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -903,7 +903,6 @@ if (this.loadEndFlag) { this.getUserInfo(); this.codelist(); - console.log('wcnmonshow') } else { this.isNewUser() console.log('1111111111') @@ -1404,7 +1403,6 @@ this.userid = res.data.uid this.userInfoData = res.data; this.$store.commit('SET_USERINFO', res.data); - console.log('resdata', res.data) this.isNewUser(res.data) this.merchantData.phone = res.data.phone; if (res.data.mer_info.is_company == 0) !this.merchantData.company_name ? this.merchantData diff --git a/pages/product/addGood/addGood.vue b/pages/product/addGood/addGood.vue index b7034a8..d9b9709 100644 --- a/pages/product/addGood/addGood.vue +++ b/pages/product/addGood/addGood.vue @@ -445,9 +445,13 @@ Modal('提交成功', '点击确定,前往商品列表页面').then(() => { if (this.import == 1) { uni.$emit('importAttrValueOK', this.setFormData.import_id); - uni.navigateBack(); + uni.redirectTo({ + url: `/pages/product/list/index?mer_id=${this.mer_id}&type=6` + }) } else { - uni.navigateBack(); + uni.redirectTo({ + url: `/pages/product/list/index?mer_id=${this.mer_id}&type=6` + }) } }).catch(() => { uni.navigateBack(); diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index 6c83b74..dbd921a 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -333,9 +333,16 @@ this.loading = false this.loaded = false this.productList = [] + this.getProductTitle() this.getList(this.mer_id, false); uni.stopPullDownRefresh() }, + onBackPress: function(e) { + uni.switchTab({ + url: '/pages/index/index' + }) + return true + }, onReachBottom() { if (this.status == 'nomore') return; this.status = 'loading';