diff --git a/pages/mine/recommend.vue b/pages/mine/recommend.vue index 46d13ab..932e521 100644 --- a/pages/mine/recommend.vue +++ b/pages/mine/recommend.vue @@ -22,7 +22,11 @@ }, methods: { - + goBack(){ + uni.switchTab({ + url: "/pages/index/index" + }) + } } } diff --git a/pages/order/activityorderinfo.vue b/pages/order/activityorderinfo.vue index 9a4a255..5336934 100644 --- a/pages/order/activityorderinfo.vue +++ b/pages/order/activityorderinfo.vue @@ -32,8 +32,12 @@ - - + + + + + + @@ -44,8 +48,15 @@ - - + + + + + + + + + {{item.name}} @@ -99,14 +110,32 @@ data() { return { info: {}, - detailsinfo:[] + detailsinfo:[], + showview:false, + optionid:"", + timers:"" } }, onLoad(options) { - if (!this.util.isNull(options.id)) { + if (!this.util.isNull(options.id)) { + this.optionid = options.id this.loadInfo(options.id); } + }, + onShow() { + var that = this + this.timers = setInterval(function(){ + that.loadInfo(that.optionid); + },15000) + }, + + onHide() { + clearInterval(this.timers) + }, + + onUnload() { + clearInterval(this.timers) }, methods: { qrFun: function(text,qrcode) { @@ -141,11 +170,19 @@ that.detailsinfo = res.details; if(res.type==1){ that.qrFun(res.code+"-"+"0"); + setTimeout(function(){ + that.showview = true + },500) + } if(res.type==2){ for(var i=0;i {{item.type==1?"团队预约":"个人预约"}} - {{item.status_name}} + {{item.status_name}} diff --git a/pages/order/visitorderinfo.vue b/pages/order/visitorderinfo.vue index f9d4524..6182d87 100644 --- a/pages/order/visitorderinfo.vue +++ b/pages/order/visitorderinfo.vue @@ -37,8 +37,13 @@ - - + + + + + + + @@ -49,8 +54,13 @@ - - + + + + + + + {{item.name}} @@ -117,15 +127,36 @@ return { info: {}, vinfo: {}, - detailsinfo:[] + detailsinfo:[], + showview:false, + timer:null, + optionid:"", + timer:null } }, onLoad(options) { this.loadIntroduce(); - if (!this.util.isNull(options.id)) { + if (!this.util.isNull(options.id)) { + this.optionid = options.id this.loadInfo(options.id); } - }, + }, + + onShow() { + var that = this + this.timer = setInterval(function(){ + that.loadInfo(that.optionid); + },15000) + }, + + onHide() { + clearInterval(this.timer) + }, + + onUnload() { + clearInterval(this.timer) + }, + methods: { qrFun: function(text,qrcode) { var id = "qrcode"; @@ -175,11 +206,18 @@ that.detailsinfo = res.details; if(res.type==1){ that.qrFun(res.code+"-"+"0"); + setTimeout(function(){ + that.showview = true + },500) + } if(res.type==2){ for(var i=0;i - 您已经预约成功 + 您已经{{option}}成功 即将跳转到{{tips}} {{time}} s 返回首页 @@ -15,7 +15,8 @@ data() { return { tips: "参观预约", - time: 3 + time: 3, + option:"预约" } }, onLoad(options) { @@ -32,7 +33,8 @@ this.tips = "车位预约"; url = "/pages/order/parkorderinfo?id=" + options.id } else if (options.from == "feed") { - this.tips = "首页"; + this.tips = "首页"; + this.option = "提交" url = "" } diff --git a/pages/visit/book.vue b/pages/visit/book.vue index fd7599b..3a34f8d 100644 --- a/pages/visit/book.vue +++ b/pages/visit/book.vue @@ -92,7 +92,6 @@ -