upup

pages/index/index.vue

@@ -16,6 +16,9 @@
 			</view>
 
 			<view class="box-body">
+				<view class="box-notice">
+					<u-notice-bar @click="openInfo" :text="list" direction="column" color="#cf995a"></u-notice-bar>
+				</view>
 				<view>
 					<view class="box-row">
 						<view class="box-col" @click="handleBook(1)">
@@ -180,6 +183,20 @@
 				</view>
 			</u-popup>
 			
+			<u-popup :show="showInfo" mode="center" @close="closeInfo" :round="10" closeable :customStyle="{margin:'40rpx'}">
+				<view class="mpopup">
+					<view class="mpopup-title">
+						{{currentNotice.name}}
+					</view>
+					<view class="mpopup-content" style="padding: 40rpx;">
+						<view v-html="currentNotice.content" style="font-size:28rpx;line-height: 2.3;text-indent: 2em;">
+			
+						</view>
+						<!-- <rich-text :nodes="currentNotice.content"></rich-text> -->
+					</view>
+				</view>
+			</u-popup>
+
 		</view>
 		<tabbar  :current-page="0"></tabbar>
 	</view>
@@ -208,6 +225,10 @@
 				maxDate: `${year}-${month}-${date + 7}`,
 				showCalendar: false,
 				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() {
@@ -249,6 +271,35 @@
 					}
 				})
 			},
+			openInfo(e) {
+				this.currentNotice = this.listNotice[e];
+				this.currentNotice.content = this.currentNotice.content.replace(/\<p/gi, "<p class='richp'");
+				this.showInfo = true;
+			},
+			closeInfo() {
+				this.showInfo = false;
+			},
+			loadNotice() {
+				var that = this;
+				this.util.request({
+					api: '/api/mobile/other/notice-index',
+					utilSuccess: function(res) {
+						if(res.data.length>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
 			},
@@ -635,14 +686,18 @@
 	.u-notice-bar {
 		border-top-left-radius: 15rpx !important;
 		border-top-right-radius: 15rpx !important;
+		background-color: ##fbf3ea !important;
 	}
 
 	.box-body {
 		width: 100%;
 		padding: 40rpx 0;
 		background-color: #f6f6f6;
+		padding-top:0
+	}
+	.box-notice{
+		margin-bottom:40rpx;
 	}
-
 	.box-row {
 		display: flex;
 		padding: 0 50rpx;

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() {
@@ -42,11 +49,12 @@
 						res.latitude = parseFloat(res.latitude);
 						res.longitude = parseFloat(res.longitude);
 						that.info = res;
+						that.covers = []
 						that.covers.push({
 							latitude: res.latitude,
 							longitude: res.longitude,
-							width: 70,
+							width: 30,
-							height: 70,
+							height: 30,
 							iconPath: '/static/img/location.png'
 						});
 						cb(res);

pages/order/parkorder.vue

@@ -7,10 +7,10 @@
 		<u-empty mode="list" :marginTop="100" v-if="isloading&&listOrder.length==0" />
 		<view class="orderBoxList" v-else>
 			<block v-for="(item,index) in listOrder" :key="index">
-				<view class="orderBox" :class="{'cancelBox':item.status==0}" @click="toinfo(item.id)">
+				<view class="orderBox" :class="{'cancelBox':item.status!=1}" @click="toinfo(item.id)">
 					<view class="orderBoxTitle flex-row">
 						<text class="orderBoxTitleTxt">{{item.plate}}</text>
-						<view class="orderBoxStatus" :class="{'cancelStatus':item.status==0}">{{item.status_name}}
+						<view class="orderBoxStatus" :class="{'cancelStatus':item.status!=1}">{{item.status_name}}
 						</view>
 					</view>
 

pages/order/parkorderinfo.vue

@@ -58,7 +58,7 @@
 					<text class="orderBoxTitleTxt">停车须知</text>
 				</view>
 				
-				<view class=" flex-row" style="margin-top: 20rpx;">
+				<view class=" flex-row" style="margin-top: 20rpx;line-height: 2.3;">
 					<rich-text :nodes="notice.value" class="orderBoxInfoRowTxt"></rich-text>
 				</view>
 			</view>

pages/park/index.vue

@@ -4,6 +4,13 @@
 			<view class="page-section page-section-gap">
 				<map id='map' ref='map' style="width: 100%; height: 100vh;position: relative;" :latitude="latitude"
 					:longitude="longitude" :markers="covers">
+					<!-- <cover-view slot='callout' style='position: relative;'>
+						<cover-view style='height:200px'>
+							<cover-image style="position: absolute;width:70px;height:70px" :src='covers[0].iconPath' :animation='animationData'>
+							</cover-image>
+						</cover-view>
+
+					</cover-view> -->
 					<view class="book-box">
 						<view class="activityBox-content flex-col">
 							<view class="activityBox-row" style="margin-bottom: 56rpx;">
@@ -162,8 +169,8 @@
 				covers: [{
 					latitude: 31.297241,
 					longitude: 120.580792,
-					width: 50,
+					width: 30,
-					height: 50,
+					height: 30,
 					iconPath: '/static/img/location.png',
 					id: 1
 				}],
@@ -182,9 +189,26 @@
 				remain_big_park: 0,
 				remain_small_park: 0,
 				remain_special_park: 0,
-				remain_big_park2: 0
+				remain_big_park2: 0,
+				animationData:null
 			}
 		},
+		onshow(){
+			var animation = uni.createAnimation({
+				duration:200,
+				timingFunction:'linear'
+			})
+			var next = true
+			setInterval(()=>{
+				if(next){
+					animation.translateY(-2).step()
+				}else{
+					animation.translateY(0).step()
+				}
+				next = !next
+				this.animationData = animation.export()
+			},800)
+		},
 		onLoad() {
 			var that = this;
 
@@ -199,7 +223,7 @@
 					that.loadOrder(function(res) {
 						that.loadactivityOrder(function(r) {
 							if (res.length + r.length == 0) {
-								that.util.toast("您需要预约参观或者预约活动才可以停车");
+								that.util.toast("您需要“参观预约”或“活动预约”成功后才能进行停车位预约。");
 								that.btnDisabled = true;
 							} else {
 								that.btnDisabled = false;
@@ -328,8 +352,8 @@
 						var mod = {
 							latitude: that.info.latitude,
 							longitude: that.info.longitude,
-							width: 50,
+							width: 30,
-							height: 50,
+							height: 30,
 							iconPath: '/static/img/location.png',
 							id: 1
 						}