修改

pages.json

@@ -31,7 +31,7 @@
 		}, {
 			"path": "pages/medicine/medicine",
 			"style": {
-				"navigationBarTitleText": "健康咨询",
+				"navigationBarTitleText": "齐鲁名医",
 				"enablePullDownRefresh": false,
 				"disableScroll": true
 			}
@@ -41,6 +41,12 @@
 				"navigationBarTitleText": "积分",
 				"enablePullDownRefresh": false
 			}
+		}, {
+			"path": "pages/confirmation/confirmation",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "预约时间"
+			}
 		}, {
 			"path": "pages/CommodityDetails/CommodityDetails",
 			"style": {
@@ -51,7 +57,6 @@
 			"path": "pages/coupon/coupon",
 			"style": {
 				"navigationBarTitleText": "优惠券",
-				"enablePullDownRefresh": false,
 				"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
 				"enablePullDownRefresh": true //设置参数为true
 			}
@@ -226,7 +231,6 @@
 			"path": "pages/site/site",
 			"style": {
 				"navigationBarTitleText": "护理机构",
-				"enablePullDownRefresh": false,
 				"onReachBottomDistance": 100, //距离底部多远时触发 单位为px
 				"enablePullDownRefresh": true //设置参数为true
 			}
@@ -293,17 +297,14 @@
 				"navigationBarTitleText": "齐鲁名医",
 				"enablePullDownRefresh": false
 			}
+		}, {
+			"path": "pages/night/night",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
 		}
-	    ,{
+	],
-            "path" : "pages/night/night",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",

pages/ServiceDetails/ServiceDetails.scss

@@ -246,7 +246,7 @@
 						top:10%;
 						width: 65%;
 						.top,.bottom{
-							height: 30rpx;
+							height: 60rpx;
 							view {
 								width: 100%;
 								font-size: 32rpx;
@@ -259,7 +259,6 @@
 						}
 					
 						.bottom {
-							height: 60rpx;
 							view {
 								font-size: 25rpx;
 								color: #969394;

pages/diagnosis/diagnosis.vue

@@ -1,169 +0,0 @@
-<template>
-	<view class="app">
-		<view class="advice">
-			<view class="doctor">
-				<text>医生建议</text>
-				<input type="text">
-			</view>
-			
-		</view>
-		<view class="evaluate" @tap="show=true">
-			<text>评价</text>
-		</view>
-		
-		<!-- 弹框 -->
-		<view class="frame">
-			<u-popup v-model="show" mode="bottom" length="65%"  border-radius="30">
-
-					<view class="cencel" @tap="show = false">
-						<image src="../../static/gb.png" mode=""></image>
-					</view>
-					<view class="satisfied">
-						<view class="satisfieds">
-							满意
-						</view>
-						<view class="commonly">
-							一般
-						</view>
-						<view class="commonly">
-							不满意
-						</view>
-					</view>
-					<view class="submit">
-						提交
-					</view>
-			</u-popup>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				show:false
-			}
-		},
-		methods: {
-
-		},
-		//1.分享给朋友
-		onShareAppMessage(res) {
-			let pages = getCurrentPages();
-			let url = pages[pages.length - 1].$page.fullPath
-			return {
-				title: '泉医到家',
-				path: url,
-			}
-		},
-		//2.分享到朋友圈
-		onShareTimeline(res) {
-			let pages = getCurrentPages();
-			let url = pages[pages.length - 1].$page.fullPath
-			return {
-				title: '泉医到家',
-				path: url,
-			}
-		},
-	}
-</script>
-
-<style lang="scss">
-	.app {
-
-		padding: 3%;
-		.advice {
-			width: 95%;
-			margin: 0 auto;
-			height: 931rpx;
-			background: #FFFFFF;
-			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
-			border-radius: 20rpx;
-			// margin-top: 5%;
-			.doctor{
-				margin: 0 auto;
-				height: 130rpx;
-				width: 95%;
-				// background-color: red;
-				border-bottom: 1rpx solid #D8D4D4;
-				font-size: 45px;
-				color: #000000;
-				line-height: 110rpx;
-			}
-			
-			text{
-				
-				font-size: 45rpx;
-				color: #000000;
-				
-			}
-		}
-		.evaluate{
-			width: 217rpx;
-			height: 68rpx;
-			line-height: 68rpx;
-			background: #4C7BC9;
-			border-radius: 26rpx;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			text-align: center;
-			float: right;
-			margin-top: 12%;
-			// margin-bottom: 30rpx;
-			margin-right: 30rpx;
-		}
-		
-		// 弹框
-		
-		.cencel image {
-			width: 31rpx;
-			height: 31rpx;
-			// float: right;
-			margin: 53rpx 53rpx 0rpx 90%;
-
-		}
-		.satisfied{
-			// width: 217px;
-			display: flex;
-			justify-content: space-around; 
-			border-radius: 25rpx;
-			margin-top: 15%;
-			  
-				// padding-right: 5rpx;
-			.satisfieds{
-				width: 217rpx;
-				height: 222rpx;
-				line-height: 222rpx;
-				background: #4C7BC9;
-				border-radius: 25rpx;
-				text-align: center;
-				font-size: 50rpx;
-				color: #FCFCFC;
-			}
-			
-			.commonly{
-				width: 217rpx;
-				height: 222rpx;
-				line-height: 222rpx;
-				background: #BFBFBF;
-				border-radius: 25rpx;
-				text-align: center;
-				font-size: 50rpx;
-				color: #FCFCFC;
-			}
-		}
-		.submit{
-			margin: 0 auto;
-			width: 501rpx;
-			height: 71rpx;
-			line-height: 71rpx;
-			background: #4C7BC9;
-			border-radius: 26rpx;
-			font-size: 34rpx;
-			color: #FFFFFF;
-			text-align: center;
-			margin-top: 20%;
-		}
-	}
-</style>

pages/night/night.vue

@@ -14,6 +14,9 @@
 							截止目前，平台在网用户已达30余万人，活跃用户4万余人，平台日呼入量近600人次，累计完成紧急援助近6000人次，累计提供各种服务近200万次，居民对服务的满意率达到99%。
 							2017年11月，公司被山东省质监局、山东省发改委正式授予“山东省服务标准化示范单位”称号。同时，先后多次被中国服务贸易协会授予
 							“健康养老最佳商业模式机构”、“最具成长型服务企业”、“健康养老品牌服务机构”、“服务贸易创新型企业”等荣誉称号。
+							<view class="btn" @tap='phone'>
+								立即呼叫
+							</view>
 						</view>
 					</view>
 				</view>
@@ -28,6 +31,33 @@
 			return {
 
 			};
+		},
+		methods: {
+			phone() {
+				var that = this
+				uni.getSystemInfo({
+					success: function(res) {
+						console.log(res)
+						if (res.platform == 'ios') {
+							uni.makePhoneCall({
+								phoneNumber: '053196558' //仅为示例
+							});
+						} else {
+							uni.showActionSheet({
+								itemList: ['呼叫'],
+								success: function(res) {
+									if (res.tapIndex + 1 == 1) {
+										uni.makePhoneCall({
+											phoneNumber: '053196558' //仅为示例
+										});
+									}
+								},
+								fail: function(res) {}
+							});
+						}
+					}
+				});
+			}
 		}
 	}
 </script>
@@ -36,9 +66,21 @@
 	.app {
 		padding-top: 10rpx;
 
+		.btn {
+			background-color: #4C7BC9;
+			text-align: center;
+			color: #FFFFFF;
+			width: 70%;
+			height: 80rpx;
+			line-height: 80rpx;
+			margin: 80rpx auto;
+			text-indent: 0em;
+			border-radius: 10rpx;
+		}
+
 		.concent {
 			width: 701rpx;
-			height: 1500rpx;
+			height: 1700rpx;
 			background: #4C7BC9;
 			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border-radius: 20rpx;
@@ -47,7 +89,7 @@
 			.background {
 				position: relative;
 				width: 657rpx;
-				height: 1450rpx;
+				height: 1650rpx;
 				background: #FFFFFF;
 				border-radius: 25rpx;
 				background-color: white;

pages/nursestation/nursestation.vue

@@ -416,7 +416,7 @@
 							});
 						} else {
 							uni.showActionSheet({
-								itemList: ['呼叫', ],
+								itemList: ['呼叫'],
 								success: function(res) {
 									if (res.tapIndex + 1 == 1) {
 										uni.makePhoneCall({