diff --git a/pages/face/face.vue b/pages/face/face.vue index 5314cc7..17a88f0 100644 --- a/pages/face/face.vue +++ b/pages/face/face.vue @@ -45,11 +45,13 @@ path: "", yrenlianlist:[], jqrllist:[], - userxixin:{} + userxixin:{}, + type: "" } }, - onLoad() { + onLoad(o) { this.top = uni.getSystemInfoSync().statusBarHeight + this.type = o.type this.memberInfo() }, methods: { @@ -74,7 +76,7 @@ qudbtn(){ // this.$refs.popup.close('center') // var tjlist=[...this.yrenlianlist,...this.jqrllist] - + const that = this; uni.uploadFile({ url: that.ymurl+'/api/uploadFile', filePath: that.path, @@ -98,9 +100,13 @@ }); setTimeout(function(){ - uni.switchTab({ - url:'/pages/user/index' - }) + if(that.type == 'order'){ + uni.navigateBack({delta:1}) + }else{ + uni.switchTab({ + url:'/pages/user/index' + }) + } },2000) } }) @@ -146,9 +152,13 @@ }); setTimeout(function(){ - uni.switchTab({ - url:'/pages/user/index' - }) + if(that.type == 'order'){ + uni.navigateBack({delta:1}) + }else{ + uni.switchTab({ + url:'/pages/user/index' + }) + } },2000) } }) diff --git a/pages/index/index.vue b/pages/index/index.vue index 92d9c10..bac5a0b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -22,7 +22,9 @@ - {{item.name}} + {{item.name}} + {{item.one_line_num}}人 + @@ -105,7 +107,7 @@ console.log(res) }) }, - onReady() { + onShow() { this.viplist=[] this.cardList(1) // this.storeList(1) @@ -270,7 +272,7 @@ } } -