其他OK 缺少预约

pages/index/index.js

@@ -32,6 +32,8 @@ Page({
 			"https://api.zhumi.tech/MiniProgram/mkt/l9.jpg"
 		],
 		mktImgage: "https://api.zhumi.tech/MiniProgram/mkt/l1.jpg",
+		bookingShow: false,
+		mask: false
 	},
 	onLoad: function(options) {
 		this.init(options)
@@ -102,4 +104,16 @@ Page({
 			}
 		})
 	},
+	hrefoBooking () {
+		this.setData({
+			mask: true,
+			bookingShow: true
+		})
+	},
+	hideAllBox() {
+    this.setData({
+      //遮罩层隐藏
+      mask: false
+    })
+	},
 })

pages/index/index.wxml

@@ -18,8 +18,8 @@
 						<image src="https://api.zhumi.tech/MiniProgram/image/index_m_left.png" class = "index_middle_l"></image>
 					</view>	
 					<view class="hot-box-temp"></view>
-					<view class="hot-box">
-						<image src="https://api.zhumi.tech/MiniProgram/image/index_m_right.png" class = "index_middle_l"></image>
+					<view class="hot-box" >
+						<image src="https://api.zhumi.tech/MiniProgram/image/index_m_right.png" class = "index_middle_l" bindtap = 'hrefoBooking'></image>
 					</view>
 				</view>
 				<view class = "cont">
@@ -37,10 +37,10 @@
 								<view class = "teache_con">
 									<view class = "teahcer_name_box">
 										<view class = "teacher_name">{{mktarr[index].mi_mktname}}</view>
-										<view class = "teacher_name_con">注释文字</view>
+										<view class = "teacher_name_con">{{mktarr[index].mi_mktaddress}}</view>
 									</view>
-									<view class = "t_conntext">注释文字第二行</view>
-									<view class = "t_conntext">注释文字第二行</view>
+									<view class = "t_conntext">{{mktarr[index].mi_latitude}}</view>
+									<view class = "t_conntext">{{mktarr[index].mi_longitude}}</view>
 								</view>
 							</view>
 							<view class="viewright" wx:if="{{index == mktarr.length -1}}"></view>
@@ -74,6 +74,14 @@
 				<view class = "endbottomm" ></view>
 				</view>
 			</view>
+			<view class='mask' wx:if="{{mask}}" bindtap='hideAllBox'></view>
+			<view class = "trolley-show-box" wx:if="{{mask}}">
+				<view>1</view>
+				<view>2</view>
+				<view>3</view>
+				<view>4</view>
+				<view>5</view>
+			</view>
 			<tabbar _tabBarInd="{{0}}"></tabbar>
 		</view>
 	</view>

pages/index/index.wxss

@@ -328,4 +328,25 @@ scroll-view-teacher {
 	height: 512rpx;
 	margin-left: 32rpx;
 }
+.mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  z-index: 5;
+  background: rgba(0, 0, 0, 0.5);
+}
+.trolley-show-box {
+	display: flex;
+	flex-direction: column;
+	width: 540rpx;
+	height: 606rpx;
+	border-radius: 32rpx;
+	background: #ffffff;
+	position: fixed;
+	z-index: 99;
+	left: 110rpx;
+	top: 330rpx;
+}
 

pages/mine/mine.js

@@ -28,7 +28,9 @@ Page({
 		nickName: '登录',
 		avatarUrl: 'https://api.zhumi.tech/MiniProgram/image/head.png',
 		hasUserInfo: false,
-		canIUse: wx.canIUse('button.open-type.getUserInfo')
+		canIUse: wx.canIUse('button.open-type.getUserInfo'),
+		phoneShow: false,
+		mask: false
 	},
 	//事件处理函数
 	bindViewTap: function() {
@@ -227,4 +229,34 @@ Page({
 			})
 		});
 	},
+	hrefTest () {
+		wx.showToast({
+			title: '功能正在建设中……',
+			icon: 'none',
+			duration: 1500
+		})
+	},
+	hrefCall () {
+		this.setData({
+			mask: true,
+			phoneShow: true
+
+		})
+	},
+	hideAllBox() {
+    this.setData({
+      //遮罩层隐藏
+      mask: false
+    })
+	},
+	callPhone1 () {
+		wx.makePhoneCall({
+			phoneNumber: '024-25689988'
+		})
+	},
+	callPhone2 () {
+		wx.makePhoneCall({
+			phoneNumber: '17609810980'
+		})
+	}
 })

pages/mine/mine.wxml

@@ -2,6 +2,7 @@
 	<view class="container">
 		<view class="head_page">
 			<view class="my_userinfo" >
+				
 				<view class="avatar">
 					<image src="{{avatarUrl}}"></image>
 				</view>
@@ -12,43 +13,49 @@
 		</view>
 		<view class = "v_show">
 			<view class = "show_lef">
-				<view class = "show_title">88</view>
-				<view class = "show_content">注释文字</view>
+				<view class = "show_title">0</view>
+				<view class = "show_content">积分</view>
 			</view>
 			<view class = "show_line"></view>
 			<view class = "show_lef">
-				<view class = "show_title">88</view>
-				<view class = "show_content">注释文字</view>
+				<view class = "show_title">0</view>
+				<view class = "show_content">优惠券</view>
 			</view>
 			<view class = "show_line"></view>
 			<view class = "show_lef">
-				<view class = "show_title">88</view>
-				<view class = "show_content">注释文字</view>
+				<view class = "show_title">0</view>
+				<view class = "show_content">收益</view>
 			</view>
 		</view>
 		<view class = "mine_items">
-			<view class = "mitem">
+			<!-- <view class = "mitem">
 				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/principal.png"/>
-				<view class="item_title">正文突出显示</view>
+				<view class="item_title">我要当校长</view>
 				<view class="item_context">查看收益</view>
 				<image class="item_right" src="https://api.zhumi.tech/MiniProgram/image/next.png"/>
-			</view>
-			<view class = "mitem">
+			</view> -->
+			<view class = "mitem" bindtap="hrefTest" >
 				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/coupon.png"/>
-				<view class="item_title">正文突出显示</view>
+				<view class="item_title">我要当校长</view>
 				<image class="item_right2" src="https://api.zhumi.tech/MiniProgram/image/next.png"/>
 			</view>
-			<view class = "mitem">
-				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/present.png"/>
-				<view class="item_title">正文突出显示</view>
+			<view class = "mitem" bindtap="hrefTest">
+				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/coupon.png"/>
+				<view class="item_title">我的优惠券</view>
 				<image class="item_right2" src="https://api.zhumi.tech/MiniProgram/image/next.png"/>
 			</view>
-			<view class = "mitem">
-				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/site.png"/>
-				<view class="item_title">正文突出显示</view>
+			<view class = "mitem" bindtap="hrefCall">
+				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/present.png"/>
+				<view class="item_title">联系我们</view>
 				<image class="item_right2" src="https://api.zhumi.tech/MiniProgram/image/next.png"/>
 			</view>
 		</view> 
+		<view class='mask' wx:if="{{mask}}" bindtap='hideAllBox'></view>
+		<view class = "trolley-show-box" wx:if="{{mask}}">
+				<view class = "phone1" bindtap="callPhone1">024-25689988</view>
+				<view class="link-top"></view>
+				<view class = "phone1" bindtap="callPhone2">17609810980</view>
+		</view>
 		<tabbar _tabBarInd="{{4}}"></tabbar>
 	</view>
 </view>

pages/mine/mine.wxss

@@ -380,4 +380,40 @@ page {
 	height: 28rpx;
 	margin-left: 370rpx;
 	margin-top: 8rpx;
-}
+}
+.mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  z-index: 5;
+  background: rgba(0, 0, 0, 0.5);
+}
+.trolley-show-box {
+	display: flex;
+	flex-direction: column;
+	border-radius: 32rpx;
+	background: #ffffff;
+	height: 200rpx;
+	width: 92%;
+	position: fixed;
+	z-index: 99;
+	left: 32rpx;
+	margin-top: 480rpx;
+}
+.link-top {
+	margin-left: 4%;
+	width: 90%;
+	height: 1px;
+	border-top: solid #ACC0D8 1px;
+}
+.phone1 {
+	margin-left: 30rpx;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 40rpx;
+	height: 90rpx;
+	color: #33333F;
+	line-height: 94rpx;
+}

pages/promotion/promotion.wxml

@@ -27,8 +27,8 @@
 				</view>
 				<view class="pmtextdiv">
 					<view class="pmtext_left">
-						<view class="pmdescription">二级标题</view>
-						<view class="pmddate">注释文字</view>
+						<view class="pmdescription">{{arr[index].wp_desc}}</view>
+						<view class="pmddate">{{arr[index].wp_startdate}} -- {{arr[index].wp_enddate}}</view>
 					</view>
 					<view class="pmtext_right">
 						<view class="button_overdue">活动结束</view>

pages/promotion/promotion.wxss

@@ -54,7 +54,7 @@ page {
 }
 
 .pmdescription {
-	width: 128rpx;
+	width: 328rpx;
 	margin-left: 32rpx;
 	margin-top: 24rpx;
 	height: 32rpx;
@@ -62,7 +62,7 @@ page {
 	font-weight: bold;
 	font-size: 32rpx;
 	line-height: 32rpx;
-	text-align: center;
+	text-align: left;
 }
 
 
@@ -88,13 +88,13 @@ page {
 .pmddate {
 	margin-top: 16rpx;
 	margin-left: 32rpx;
-	width: 96rpx;
+	width: 396rpx;
 	height: 24rpx;
 	font-style: normal;
 	font-weight: normal;
 	font-size: 24rpx;
 	line-height: 24rpx;
-	text-align: center;
+	text-align: left;
 	color: #999999;
 }