From 4d4810122f1f429fc0a6332993e19e66c0f7281e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
<153298343@qq.com>
Date: Sun, 26 Jun 2022 18:28:57 +0800
Subject: [PATCH] up
---
pages/activity/index.vue | 10 +-
pages/guide/index.vue | 3 +
pages/index/index.vue | 3 +
pages/map/map.vue | 3 +
pages/mine/recommend.vue | 2 +-
pages/park/book.vue | 206 ++++++++++++++++++++-------------------
6 files changed, 124 insertions(+), 103 deletions(-)
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 64ea568..71de652 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -1,6 +1,7 @@
+
@@ -20,7 +21,7 @@
{{isUnde(item.target_name)}}
-
+
{{item.isCanBook?"立即报名":"不可报名"}}
@@ -67,6 +68,7 @@
list: [],
latitude: "",
longitude: "",
+ isloading: false
}
},
onLoad() {
@@ -79,6 +81,9 @@
that.loadActivity()
}
})
+ },
+ onShareAppMessage() {
+
},
methods: {
tothere(item) {
@@ -98,6 +103,7 @@
loadActivity() {
var that = this;
var nt = new Date();
+ that.isloading = true;
this.util.request({
api: '/api/mobile/activity/index',
data: {
@@ -106,7 +112,7 @@
page_size: 100
},
utilSuccess: function(res) {
-
+ that.isloading = false;
for (var mod of res.data) {
mod.isCanBook = that.$moment(nt).isBefore(mod.end_plan);
}
diff --git a/pages/guide/index.vue b/pages/guide/index.vue
index 3427291..c9496be 100644
--- a/pages/guide/index.vue
+++ b/pages/guide/index.vue
@@ -70,6 +70,9 @@
var that = this;
that.loadList(1, 1)
//that.loadList(1, 4)
+ },
+ onShareAppMessage() {
+
},
methods: {
showwhat(type) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e96d146..0b5c042 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -176,6 +176,9 @@
showAuthorization: false,
openType: 1
}
+ },
+ onShareAppMessage() {
+
},
onLoad() {
this.loadInfo();
diff --git a/pages/map/map.vue b/pages/map/map.vue
index 174fd13..091d48f 100644
--- a/pages/map/map.vue
+++ b/pages/map/map.vue
@@ -15,6 +15,9 @@
},
onLoad() {
this.openlocation();
+ },
+ onShareAppMessage() {
+
},
methods: {
markertap() {
diff --git a/pages/mine/recommend.vue b/pages/mine/recommend.vue
index 932e521..4bf27c6 100644
--- a/pages/mine/recommend.vue
+++ b/pages/mine/recommend.vue
@@ -3,7 +3,7 @@
- 扫描二维码即可预约体验
+ 扫描二维码即可预约参观
您也可以点击右上角分享给好友
diff --git a/pages/park/book.vue b/pages/park/book.vue
index 93ed25d..e108e55 100644
--- a/pages/park/book.vue
+++ b/pages/park/book.vue
@@ -9,7 +9,7 @@
- {{(form.time?$u.timeFormat(new Date(form.time), 'yyyy年mm月dd日 hh:MM'):'请选择入场时间>')}}
+ {{(form.time?$u.timeFormat(_formTime, 'yyyy年mm月dd日 hh:MM'):'请选择入场时间>')}}
@@ -19,7 +19,8 @@
-
+
+
@@ -40,11 +41,12 @@
-
-
-
-
-
-
-
- 您已经预约成功
- 即将跳转到车位预约 {{time}} s
-
- 返回首页
-
+
+
+
+
+
+
+ 您已经预约成功
+ 即将跳转到车位预约 {{time}} s
+
+ 返回首页
+
@@ -118,18 +121,18 @@
plate
},
data() {
- return {
- successshow: false,
- time:3,
+ return {
+ successshow: false,
+ time: 3,
showInfo: false,
- showSelectorder: false,
- maxheight:"",
- scrollheight:"",
+ showSelectorder: false,
+ maxheight: "",
+ scrollheight: "",
selectInfo: "--",
showSelecttime: false,
- plateNumber: ['苏', 'E', '', '', '', '', ''],
- t:null,
- timer:null,
+ plateNumber: ['苏', 'E', '', '', '', '', ''],
+ t: null,
+ timer: null,
form: {
plate: "",
mobile: "",
@@ -142,6 +145,7 @@
activity_order_id: "",
visit_order_id: ""
},
+ _formTime: new Date(),
listOrder: [],
listActivtyOrder: [],
orderType: 1,
@@ -151,7 +155,7 @@
}
},
onLoad(options) {
- let that = this;
+ let that = this;
that.showInfo = true;
if (!that.util.isNull(options.id)) {
this.form.car_park_id = parseInt(options.id);
@@ -163,10 +167,10 @@
if (!that.util.isNull(options.bookinfo)) {
let bookinfo = JSON.parse(unescape(options.bookinfo));
this.bookinfo = bookinfo;
- this.form.time = bookinfo.time;
+ this.form.time = bookinfo.time;
+ this._formTime = bookinfo.time;
this.orderType = bookinfo.orderType;
this.selectInfo = bookinfo.info;
- console.log(bookinfo)
if (this.orderType == 2)
this.form.activity_order_id = bookinfo.orderid
else
@@ -177,28 +181,28 @@
that.util.getUserInfo(function(r) {
that.form.mobile = r.mobile;
- }, true);
-
- that.maxheight = wx.getSystemInfoSync().windowHeight*0.6 + "px"
- that.scrollheight = wx.getSystemInfoSync().windowHeight*0.6*0.7 + "px"
+ }, true);
+
+ that.maxheight = wx.getSystemInfoSync().windowHeight * 0.6 + "px"
+ that.scrollheight = wx.getSystemInfoSync().windowHeight * 0.6 * 0.7 + "px"
},
onShow() {
- },
- onHide() {
- clearInterval(this.t)
- clearTimeout(this.timer)
- },
-
- onUnload() {
- clearInterval(this.t)
- clearTimeout(this.timer)
},
- methods: {
- goHome(){
- uni.switchTab({
- url: "/pages/index/index"
- })
+ onHide() {
+ clearInterval(this.t)
+ clearTimeout(this.timer)
+ },
+
+ onUnload() {
+ clearInterval(this.t)
+ clearTimeout(this.timer)
+ },
+ methods: {
+ goHome() {
+ uni.switchTab({
+ url: "/pages/index/index"
+ })
},
loadConfigInfo() {
var that = this;
@@ -208,10 +212,10 @@
tag: "car_park_notice"
},
utilSuccess: function(res) {
- that.notice = res;
- that.notice.value = that.notice.value.replace(/\ 0)
- that.time = that.time - 1;
- }, 1000)
- that.timer = setTimeout(function() {
- uni.redirectTo({
- url: '/pages/order/parkorder'
- })
- clearInterval(that.t);
- clearTimeout(that.timer)
+ utilSuccess: function(res) {
+ that.successshow = true;
+ that.t = setInterval(function() {
+ if (that.time > 0)
+ that.time = that.time - 1;
+ }, 1000)
+ that.timer = setTimeout(function() {
+ uni.redirectTo({
+ url: '/pages/order/parkorder'
+ })
+ clearInterval(that.t);
+ clearTimeout(that.timer)
}, 3000)
// uni.showToast({
// icon: "none",
@@ -436,42 +440,44 @@
padding: 15rpx 25rpx;
box-sizing: border-box;
z-index: 10;
- }
- .successBox {
-
- .iconfont {
- color: #00CCB9;
- font-size: 180rpx;
- }
-
- .h3 {
- font-size: 40rpx;
- font-weight: 500;
- color: #333333;
- margin-top: 40rpx;
- }
-
- .p {
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- margin-top: 24rpx;
- }
-
- }
-
- .pinkBtn {
- width: 50%;
- background-image: linear-gradient(45deg, #EF9525 0%, #EF9525 100%);
- border-radius: 44rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #FFFFFF;
- text-align: center;
- line-height: 70rpx;
- margin:30rpx auto;
- }
- .richp{
- margin-bottom:10rpx
+ }
+
+ .successBox {
+
+ .iconfont {
+ color: #00CCB9;
+ font-size: 180rpx;
+ }
+
+ .h3 {
+ font-size: 40rpx;
+ font-weight: 500;
+ color: #333333;
+ margin-top: 40rpx;
+ }
+
+ .p {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #333333;
+ margin-top: 24rpx;
+ }
+
+ }
+
+ .pinkBtn {
+ width: 50%;
+ background-image: linear-gradient(45deg, #EF9525 0%, #EF9525 100%);
+ border-radius: 44rpx;
+ font-size: 30rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ text-align: center;
+ line-height: 70rpx;
+ margin: 30rpx auto;
+ }
+
+ .richp {
+ margin-bottom: 10rpx
}