Merge remote-tracking branch 'origin/dev' into dev

pages.json

@@ -366,6 +366,22 @@
 					"navigationBarTitleText": "问诊平台",
 					"enablePullDownRefresh": false
 				}
+			},
+			{
+				"path": "ServiceAppointmenttime/ServiceAppointmenttime",
+				"style": {
+					"navigationBarTitleText": "服务预约",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "ServiceAppointment/ServiceAppointment",
+				"style": {
+					"navigationStyle": "custom", // 隐藏系统导航栏
+					"navigationBarTitleText": "商品订单",
+					"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
+					"enablePullDownRefresh": true //设置参数为true
+				}
 			}]
 		}
 	],

pages/homepage/homepage.vue

@@ -20,7 +20,7 @@
 					健康档案
 				</view>
 			</view>
-			<view class="home">
+			<view class="home"  @tap="goappoint">
 				<image src="/static/pageC/serveappoint.png" mode=""></image>
 				<view class="name">
 					服务预约
@@ -75,6 +75,11 @@
 			this.login()
 		},
 		methods: {
+			goappoint() {
+				uni.navigateTo({
+					url: '/pagesC/ServiceAppointment/ServiceAppointment'
+				})
+			},
 			login() {
 				const _this = this
 				uni.login({

pagesC/ServiceAppointment/ServiceAppointment.vue

@@ -0,0 +1,171 @@
+<template>
+	<view class="app">
+		<u-navbar :is-back="false" :background="background" class="u-navbar">
+			<image src="@/static/pagesB/fanhui.png" mode="" @tap="goprevious"></image>
+			<view class="title" @tap="goprevious">
+				服务预约
+			</view>
+			<view class="inputs">
+				<i class="icon"></i>
+				<input v-model="goodsName" type="text" name="" id="" class="input" placeholder="搜索服务"
+					placeholder-class="placeholder">
+			</view>
+		</u-navbar>
+		<view class="content">
+			<view class="big">大生化
+
+			</view>
+			<view class="servename">
+				高血压个性服务包
+			</view>
+			<view class="appoint" @tap="goapponint">
+				预约
+			</view>
+		</view>
+		<view class="content">
+			<view class="big">大生化
+
+			</view>
+			<view class="servename">
+				高血压个性服务包
+			</view>
+			<view class="appoint" @tap="goapponint">
+				预约
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				background: {
+					backgroundColor: '#26A888',
+				},
+			};
+		},
+		methods: {
+			goprevious() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			goapponint() {
+				uni.navigateTo({
+					url: '/pagesC/ServiceAppointmenttime/ServiceAppointmenttime'
+				})
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		height: 100vh;
+		background-color: #F7F5F5;
+		padding: 30rpx 0 0 0;
+
+		::v-deep .u-navbar-placeholder {
+			background-color: #F7F5F5;
+			z-index: 999;
+		}
+
+		.u-navbar {
+			display: block;
+			height: 200rpx;
+
+			image {
+				margin: 0 4% 0 4%;
+				width: 20rpx;
+				height: 30rpx;
+			}
+
+			.title {
+				width: 31%;
+				font-size: 34rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.inputs {
+				position: relative;
+				// margin-left: 4%;
+				box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+				width: 60%;
+				height: 65rpx;
+				border-radius: 31rpx;
+				z-index: 999;
+				background: #65c0a9;
+				color: #FFFFFF;
+
+				.placeholder {
+					color: #FFFFFF;
+				}
+
+				.input {
+					margin: 0 auto;
+					position: absolute;
+					height: 65rpx;
+					// top: 8%;
+					left: 18%;
+					width: 80%;
+					font-size: 26rpx;
+					color: #FFFFFF;
+				}
+
+				.icon {
+					background: url(@/static/pagesB/sousuo.png) no-repeat;
+					width: 30rpx;
+					height: 28rpx;
+					background-size: cover;
+					position: absolute;
+					top: 28%;
+					left: 4%;
+				}
+			}
+		}
+
+		.content {
+			position: relative;
+			width: 95%;
+			height: 183rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 5rpx;
+			margin: 15rpx auto;
+
+			.servename {
+				padding: 0 50rpx 0 50rpx;
+				font-size: 28rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #868585;
+				line-height: 38rpx;
+			}
+
+			.appoint {
+				position: absolute;
+				right: 5%;
+				top: 50%;
+				transform: translateY(-50%);
+				width: 169rpx;
+				height: 61rpx;
+				background: #26A888;
+				border-radius: 5rpx;
+				line-height: 61rpx;
+				text-align: center;
+				color: #fff;
+			}
+
+			.big {
+				padding: 35rpx 50rpx 30rpx 50rpx;
+				font-size: 32rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 500;
+				color: #000000;
+				line-height: 38rpx;
+			}
+		}
+	}
+</style>

pagesC/ServiceAppointmenttime/ServiceAppointmenttime.vue

@@ -0,0 +1,89 @@
+<template>
+	<view class="app">
+		<view class="content">
+			<view class="appointtime">预约时间
+			</view>
+			<u-calendar v-model="show" :mode="mode" @change="change"></u-calendar>
+			<view class="time" @tap="show=true">
+				<image src="/static/pageC/time.png" mode=""></image>
+			</view>
+			<view class="submit">
+				提交
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				mode: 'date'
+			};
+		},
+
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		height: 100vh;
+		background-color: #F7F5F5;
+		padding: 30rpx 0 0 0;
+
+		.content {
+			width: 95%;
+			height: 100%;
+			background: #FFFFFF;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 5rpx;
+			margin: 0 auto;
+
+			.submit {
+				width: 496rpx;
+				height: 61rpx;
+				background: #26A888;
+				border-radius: 5rpx;
+				line-height: 61rpx;
+				color: #FFFFFF;
+				text-align: center;
+				position: absolute;
+				left: 50%;
+				transform: translateX(-50%);
+				position: fixed;
+				bottom: 5%;
+
+			}
+
+			.appointtime {
+				font-size: 30rpx;
+				padding: 30rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #333333;
+				line-height: 38rpx;
+			}
+
+			.time {
+				margin: 0 auto;
+				width: 80%;
+				height: 63rpx;
+				background: #F6F6F6;
+				border-radius: 5rpx;
+				position: relative;
+
+				image {
+					width: 36rpx;
+					height: 34rpx;
+					position: absolute;
+					right: 3%;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+			}
+
+		}
+	}
+</style>