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

api/store/index.js

@@ -0,0 +1,9 @@
+import request from "../request.js"
+
+export function insertSubscribeMessageRecord(data) {
+	return request({
+		url: `/nurseApplet/patientInfo/insertSubscribeMessageRecord`,
+		method: 'POST',
+		data
+	})
+}

pages.json

@@ -31,7 +31,7 @@
 		}, {
 			"path": "pages/medicine/medicine",
 			"style": {
-				"navigationBarTitleText": "齐鲁名医",
+				"navigationBarTitleText": "健康咨询",
 				"enablePullDownRefresh": false,
 				"disableScroll": true
 			}
@@ -41,13 +41,6 @@
 				"navigationBarTitleText": "积分",
 				"enablePullDownRefresh": false
 			}
-		}, {
-			"path": "pages/confirmation/confirmation",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "预约时间"
-			}
 		}, {
 			"path": "pages/CommodityDetails/CommodityDetails",
 			"style": {

pages/ServiceDetails/ServiceDetails.scss

@@ -246,6 +246,7 @@
 						top:10%;
 						width: 65%;
 						.top,.bottom{
+							height: 30rpx;
 							view {
 								width: 100%;
 								font-size: 32rpx;

pages/classification/classification.vue

@@ -327,6 +327,7 @@
 					flex-wrap: wrap;
 					justify-content: space-evenly;
 					background-color: #ffffff;
+					align-content: flex-start;
 
 					.item {
 						width: 45%;

pages/medicine/medicine.scss

@@ -11,7 +11,7 @@
 			text-align: center;
 			color: #FFFFFF;
 			position: relative;
-	
+
 			.determine,
 			.cancel {
 				width: 200rpx;
@@ -22,23 +22,23 @@
 				position: absolute;
 				top: 74%;
 			}
-	
+
 			.determine {
 				background: #4C7BC9;
 				right: 36rpx;
 			}
-	
+
 			.cancel {
 				background: #C5BFBF;
 				left: 36rpx;
 			}
-	
+
 			.title {
 				font-size: 42rpx;
 				margin-top: 40rpx;
 				color: #000000;
 			}
-	
+
 			image {
 				width: 100rpx;
 				height: 100rpx;
@@ -53,35 +53,35 @@
 		width: 96%;
 		height: 380rpx;
 		z-index: 999;
-	
+
 		.swiper-box {
 			width: 100%;
 			height: 380rpx;
 		}
-	
+
 		.swiper-item {
 			height: 380rpx;
 			text-align: center;
-	
+
 			image {
 				width: 100%;
 				height: 380rpx !important;
 				z-index: 999;
 			}
 		}
-	
+
 		video {
 			height: 100%;
 			width: 100%;
 		}
 	}
-	
+
 	.hospital {
 		width: 96%;
 		margin: 0 auto;
 		height: 100%;
 		background-color: #fff;
-	
+
 		.appointmenthospital {
 			height: 90rpx;
 			font-size: 35rpx;
@@ -91,24 +91,24 @@
 			margin: 0 auto;
 			font-weight: 600;
 		}
-	
+
 		.tabbar {
 			display: flex;
 			height: calc(100vh - 470rpx);
 			width: 100%;
-	
-	
+
+
 			.lefttabbar {
 				width: 30%;
 				// display: inline-block;
 				height: 100%;
 				padding-top: 20rpx;
-	
+
 				.lefttabbarlist {
 					overflow: scroll;
 					-webkit-overflow-scrolling: touch;
 					height: 100%;
-	
+
 					.actives {
 						width: 80%;
 						color: red;
@@ -123,7 +123,7 @@
 						font-size: 30rpx;
 						// border-radius: 25rpx 0 0 25rpx;
 					}
-	
+
 					.active {
 						text-align: center;
 						overflow: hidden;
@@ -137,11 +137,11 @@
 					}
 				}
 			}
-	
+
 			.righttabbar {
 				width: 70%;
 				height: 100%;
-	
+
 				.productlist {
 					padding-bottom: 40rpx;
 					overflow: scroll;
@@ -154,13 +154,13 @@
 					flex-wrap: wrap;
 					justify-content: space-evenly;
 					background-color: #ffffff;
-	
+
 					.content {
 						height: 500rpx;
 						position: relative;
 						width: 100%;
 						border-bottom: 1rpx solid #D8D4D4;
-	
+
 						.hospitalimage {
 							position: absolute;
 							width: 120rpx;
@@ -168,23 +168,23 @@
 							top: 30rpx;
 							left: 30rpx;
 						}
-	
+
 						.hospitalteacher {
 							font-size: 36rpx;
 							position: absolute;
 							top: 60rpx;
 							left: 180rpx;
 						}
-	
+
 						.physician {
 							font-size: 24rpx;
 							color: #666666;
 							position: absolute;
 							top: 120rpx;
 							left: 183rpx;
-	
+
 						}
-	
+
 						.words {
 							    white-space: normal;
 							    word-break: break-all;
@@ -201,7 +201,7 @@
 							-webkit-line-clamp: 4;
 							    text-align: justify;
 						}
-	
+
 						.appointment {
 							position: absolute;
 							bottom: 25rpx;
@@ -219,4 +219,4 @@
 			}
 		}
 	}
-}
+}

pages/nursestation/nursestation.vue

@@ -103,9 +103,12 @@
 						<image :src="item.itemPictureUrl"></image>
 						<view class="huanyao">{{item.nurseItemName}}
 						</view>
+						<span class="advanceAppointDuration">
+							{{item.advanceAppointDuration=='HALF_DAY'?'（半天）':''}}
+							{{item.advanceAppointDuration=='ONE_DAY'?'（一天）':''}}
+						</span>
 						<view class="day">
-							{{item.advanceAppointDuration=='HALF_DAY'?'提前预约时长:半天':''}}
-							{{item.advanceAppointDuration=='ONE_DAY'?'提前预约时长:一天':''}}
+							服务时长：{{item.serveDurationUnit}}
 						</view>
 						<!-- <view class="pingfen">
 						<u-rate :count="5" value="2"></u-rate>

store/index.js

@@ -34,8 +34,6 @@ const store = new Vuex.Store({
 	actions: {
 		//相当于异步的操作,不能直接改变state的值，只能通过触发mutations的方法才能改变
 		integralopenPopup(contxt) {
-			const openids = uni.getStorageSync('openid');
-			const patientIds = uni.getStorageSync('patientId');
 			// 获取用户的当前设置，判断是否点击了“总是保持以上，不在询问”
 			wx.getSetting({
 				withSubscriptions: true, // 是否获取用户订阅消息的订阅状态，默认false不返回
@@ -49,8 +47,6 @@ const store = new Vuex.Store({
 		},
 		// 是否设置过授权
 		openPopup(contxt) {
-			const openids = uni.getStorageSync('openid');
-			const patientIds = uni.getStorageSync('patientId');
 			// 获取用户的当前设置，判断是否点击了“总是保持以上，不在询问”
 			wx.getSetting({
 				withSubscriptions: true, // 是否获取用户订阅消息的订阅状态，默认false不返回