+
+
+
@@ -178,6 +181,20 @@
+
+
+
+
@@ -207,7 +224,11 @@
minDate: `${year}-${month}-${date + 1}`,
maxDate: `${year}-${month}-${date + 7}`,
showCalendar: false,
- info: {},
+ info: {},
+ list: ["暂无通知通告"],
+ listNotice: [],
+ currentNotice: {},
+ showInfo: false,
listDatePrice: [],
currentDate: {},
currentTime: {},
@@ -226,6 +247,7 @@
this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
this.navBarBoxHeight = 80 + this.statusBarHeight*2
this.loadInfo();
+ this.loadNotice();
this.getExhibit()
},
onReady() {
@@ -248,6 +270,35 @@
// 打开成功
}
})
+ },
+ openInfo(e) {
+ this.currentNotice = this.listNotice[e];
+ this.currentNotice.content = this.currentNotice.content.replace(/\0){
+ let arr = [];
+ for (var m of res.data) {
+ arr.push(m.name)
+ }
+ that.listNotice = res.data;
+ that.list = arr;
+ }
+
+ },
+ utilFail: function(res) {
+
+ }
+ })
+
},
closePhone() {
this.showAuthorization = false
@@ -634,15 +685,19 @@
.u-notice-bar {
border-top-left-radius: 15rpx !important;
- border-top-right-radius: 15rpx !important;
+ border-top-right-radius: 15rpx !important;
+ background-color: ##fbf3ea !important;
}
.box-body {
width: 100%;
padding: 40rpx 0;
- background-color: #f6f6f6;
+ background-color: #f6f6f6;
+ padding-top:0
+ }
+ .box-notice{
+ margin-bottom:40rpx;
}
-
.box-row {
display: flex;
padding: 0 50rpx;
diff --git a/pages/map/map.vue b/pages/map/map.vue
index db8f28e..cdcda96 100644
--- a/pages/map/map.vue
+++ b/pages/map/map.vue
@@ -10,7 +10,14 @@
data() {
return {
info: {},
- covers: [],
+ covers: [{
+ latitude: 31.297241,
+ longitude: 120.580792,
+ width: 30,
+ height: 30,
+ iconPath: '/static/img/location.png',
+ id: 1
+ }],
}
},
onLoad() {
@@ -41,12 +48,13 @@
utilSuccess: function(res) {
res.latitude = parseFloat(res.latitude);
res.longitude = parseFloat(res.longitude);
- that.info = res;
+ that.info = res;
+ that.covers = []
that.covers.push({
latitude: res.latitude,
longitude: res.longitude,
- width: 70,
- height: 70,
+ width: 30,
+ height: 30,
iconPath: '/static/img/location.png'
});
cb(res);
diff --git a/pages/order/parkorder.vue b/pages/order/parkorder.vue
index d594b4f..2b63044 100644
--- a/pages/order/parkorder.vue
+++ b/pages/order/parkorder.vue
@@ -7,10 +7,10 @@
-
+
{{item.plate}}
- {{item.status_name}}
+ {{item.status_name}}
diff --git a/pages/order/parkorderinfo.vue b/pages/order/parkorderinfo.vue
index 54a31c1..5314205 100644
--- a/pages/order/parkorderinfo.vue
+++ b/pages/order/parkorderinfo.vue
@@ -58,7 +58,7 @@
停车须知
-
+
diff --git a/pages/park/index.vue b/pages/park/index.vue
index ffd3265..af397dd 100644
--- a/pages/park/index.vue
+++ b/pages/park/index.vue
@@ -3,7 +3,14 @@