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/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.serveDurationUnit}}
-							{{item.advanceAppointDuration=='ONE_DAY'?'提前预约时长:一天':''}}
 						</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不返回