From c227e83911f063fbf99b6d3a641767c848c5bba5 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 17 Jun 2022 16:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/mine/recommend.vue | 6 +++-
pages/order/activityorderinfo.vue | 58 +++++++++++++++++++++++++-----
pages/order/visitorder.vue | 2 +-
pages/order/visitorderinfo.vue | 60 +++++++++++++++++++++++++------
pages/success/success.vue | 8 +++--
pages/visit/book.vue | 1 -
6 files changed, 110 insertions(+), 25 deletions(-)
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 @@
-