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

pages.json

@@ -61,7 +61,15 @@
 	],
 	"subPackages": [{
 		"root": "pagesB",
-			"pages": [{
+		"pages": [
+
+			{
+				"path": "PointsMall/PointsMall",
+				"style": {
+					"navigationBarTitleText": "积分商城",
+					"enablePullDownRefresh": false
+				}
+			},{
 				"path": "Behaviorpoints/Behaviorpoints",
 				"style": {
 					"navigationBarTitleText": "行为积分",
@@ -285,6 +293,12 @@
 					"navigationBarTitleText": "新人福利",
 					"enablePullDownRefresh": false
 				}
+			}, {
+				"path": "ConsultationDetails/ConsultationDetails",
+				"style": {
+					"navigationBarTitleText": "齐鲁名医",
+					"enablePullDownRefresh": false
+				}
 			}, {
 				"path": "Moreoptions/Moreoptions",
 				"style": {
@@ -303,32 +317,6 @@
 					"navigationBarTitleText": "家庭成员详情",
 					"enablePullDownRefresh": false
 				}
-				}, {
-					"path": "consultationplatform/consultationplatform",
-					"style": {
-						"navigationBarTitleText": "问诊平台",
-						"enablePullDownRefresh": false
-					}
-				}
-			    ,{
-                    "path" : "doctordetails/doctordetails",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "医生详情",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-            ]
-		},
-		{
-			"root": "pagesC",
-			"pages": [{
-				"path": "login/login",
-				"style": {
-					"navigationBarTitleText": "问诊平台",
-					"enablePullDownRefresh": false
-				}
 			}]
 		}
 	],

pagesB/Behaviorpoints/Behaviorpoints.vue

@@ -65,7 +65,10 @@
 						})
 					}, 0)
 				} else {
-					this.gologin();
+					uni.navigateTo({
+						url: '/pagesB/PointsMall/PointsMall'
+					})
+					// this.gologin();
 				}
 			},
 		},

pagesB/CommodityOrder/CommodityOrder.vue

@@ -168,6 +168,7 @@
 		methods: {
 			//点击tabs
 			tabschange(index) {
+				console.log(this.tabslist)
 				this.tabscurrent = index;
 				this.orderStatus = this.tabslist[index].orderStatus
 				this.goodsOrderinfo();

pagesB/PointsMall/PointsMall.vue

@@ -0,0 +1,110 @@
+<template>
+	<view class="app">
+		<view class="content">
+			<view class="imageitem">
+				<image src="/static/pagesB/Behave.png" mode=""></image>
+			</view>
+			<view class="servename">
+				服务名称
+			</view>
+			<view class="PointsRecord">
+				200000
+			</view>
+			<view class="button" @tap="goexchange">
+				兑换
+			</view>
+		</view>
+	
+
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+
+		methods: {
+			goexchange() {
+				uni.navigateTo({
+					url: '/pagesB/exchangerecords/exchangerecords'
+				});
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		background-color: #F7F5F5;
+		padding-top: 30rpx;
+		height: 100vh;
+		display: flex;
+		width: 100%;
+		flex-wrap: wrap;
+		justify-content: flex-start;
+
+		.content {
+			width: 352rpx;
+			height: 514rpx;
+			background: #fff;
+			width: 45%;
+			position: relative;
+			border-radius: 5rpx;
+			left: 18rpx;
+			margin: 0 0 20rpx 15rpx;
+
+			.button {
+				width: 100rpx;
+				height: 44rpx;
+				line-height: 44rpx;
+				position: absolute;
+				text-align: center;
+				font-size: 22rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #fff;
+				right: 3%;
+				bottom: 5%;
+				background: #26A888;
+				border-radius: 5rpx;
+			}
+
+			.PointsRecord {
+				// width: 83px;
+				// height: 19px;
+				font-size: 20rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #26A888;
+				line-height: 33rpx;
+				padding-left: 3%;
+			}
+
+			.servename {
+				// width: 102px;
+				// height: 24px;
+				font-size: 26rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #000000;
+				line-height: 33rpx;
+				padding-left: 3%;
+			}
+
+			.imageitem {
+				image {
+					width: 100%;
+					height: 355rpx;
+					background: red;
+					border-radius: 5rpx;
+				}
+			}
+		}
+
+
+	}
+</style>

pagesB/ServiceDetails/ServiceDetails.vue

@@ -88,7 +88,7 @@
 			<view class="cancelorder" style="background: #60c5f1;" @tap='rateshowtrue'
 				v-if="list.orderStatus=='COMPLETE'">立即评价
 			</view>
-			<view class="cancelorder" @tap='buy' style="background-color: darkorange;"
+			<view class="cancelorder" @tap='buy' style="background-color: #26A888;"
 				v-if="list.orderStatus=='WAIT_PAY'">
 				去支付
 			</view>

pagesB/appointmenttime/appointmenttime.scss

@@ -1,8 +1,8 @@
 .app {
-		font-size: 34rpx;
+	::v-deep .u-checkbox__icon-wrap--checked.data-v-532d01c7{
-		padding-top: 10rpx;
+		background:#26A888 !important;
-		height: 100%;
+		border: 1rpx solid #26A888 !important;
-		-webkit-overflow-scrolling: touch;
+	}
 		.mask {
 			.Agreement {
 				width: 100%;
@@ -115,17 +115,18 @@
 					border-radius: 5rpx;
 					font-size: 28rpx;
 					line-height: 86rpx;
-					border: 2rpx solid #DADADA;
+					border: 2rpx solid #26A888;
 				}
 				.timeitemtap{
 					width: 21%;
 					margin: 0 2% 20rpx;
 					height: 86rpx;
-					border: 2rpx solid #F44B2F;
+					border: 2rpx solid #26A888;
 					border-radius: 5rpx;
 					font-size: 28rpx;
-					color: #F44B2F;
+					color: #26A888;
 					line-height: 86rpx;
+					    background: #E6F8F3;
 				}
 			}
 		}
@@ -146,7 +147,7 @@
 			}
 			.Soonerorlaterclass{
 				font-size: 36rpx;
-				color: #F44B2F;
+				color: #26A888;
 				width: 200rpx;
 				height: 50rpx;
 			}

pagesB/appointmenttime/appointmenttime.vue

@@ -17,7 +17,7 @@
 				<span>上门时间：</span>
 				<span class='addition'>请您选择希望护理员到达的时间</span>
 			</view>
-			<tabs :list="orderlist.appointmentTimeList" :current="timecurrent" @change="timechange">
+			<tabs :list="orderlist.appointmentTimeList" :current="timecurrent" @change="timechange" active-color="#26A888">
 			</tabs>
 			<view class="timeyear">
 				<view class="toptext">

pagesB/confirmation/confirmation.vue

@@ -15,7 +15,7 @@
 			</view>
 			<view class="worditem">
 				<view class="today" @tap='taptoday(item,index)'
-					:style="todayindex==index?'background: #FEF9F8;border: 1px solid #F44B2F;color: #F44B2F;':''"
+					:style="todayindex==index?'background: #E6F8F3;border: 1px solid #26A888;color: #26A888;':''"
 					v-for="(item,index) in userlist.appointmentTimeList" :key="index">
 					<span class="todaytime">
 						{{item.week}}
@@ -339,7 +339,7 @@
 			.submit {
 				width: 186rpx;
 				height: 70rpx;
-				background: #F44B2F;
+				background: #26A888;
 				color: #FFFFFF;
 				border-radius: 30rpx;
 				line-height: 70rpx;
@@ -384,7 +384,7 @@
 		}
 
 		.submits {
-			background: #F44B2F;
+			background: #26A888;
 			width: 501rpx;
 			height: 71rpx;
 			line-height: 71rpx;

pagesB/exchangerecords/exchangerecords.vue

@@ -1,6 +1,22 @@
 <template>
 	<view class="app">
-
+		<view class="content">
+			<view class="time">
+				2023-08-13 23:43:49
+				<span class="">
+					2000积分
+				</span>
+			</view>
+			<view class="imageitem">
+				<image src="../../static/pagesB/ynph.png" mode=""></image>
+			</view>
+			<view class="servename">
+				服务名称
+			</view>
+			<view class="servetime">
+				服务时间：2023-12-12  08:30
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -15,5 +31,77 @@
 </script>
 
 <style lang="scss">
+	.app {
+		width: 100%;
+		height: 100vh;
+		text-align: justify;
+		background-color: #F7F5F5;
+		padding: 25rpx 0 30rpx 0;
 
+		.content {
+			width: 90%;
+			height: 321rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 5rpx;
+			margin: 20rpx auto;
+			position: relative;
+
+			.servetime {
+
+				font-size: 28rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #959595;
+				line-height: 38rpx;
+				position: absolute;
+			bottom: 23%;
+				left: 35%;
+			}
+
+			.servename {
+
+				font-size: 32rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 500;
+				color: #333333;
+				line-height: 38rpx;
+				position: absolute;
+				top: 38%;
+				left: 35%;
+			}
+
+			.imageitem {
+				position: absolute;
+				left: 3%;
+				top: 28%;
+
+				image {
+					width: 180rpx;
+					height: 180rpx;
+				}
+			}
+
+			.time {
+				padding: 25rpx 0 0 20rpx;
+				font-size: 28rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #000000;
+				line-height: 38rpx;
+				position: relative;
+
+				span {
+					font-size: 28rpx;
+					position: absolute;
+					font-family: Source Han Sans CN;
+					font-weight: 500;
+					color: #26A888;
+					line-height: 38rpx;
+					right: 3%;
+				}
+			}
+
+		}
+	}
 </style>

pagesB/nursestation/nursestation.scss

@@ -111,7 +111,7 @@
 					height: 52rpx;
 					border-radius: 26rpx;
 					color: #ffffff;
-					background: #F44B2F;
+					background: #26A888;
 					text-align: center;
 					line-height: 52rpx;
 					position: absolute;
@@ -184,7 +184,7 @@
 						border-radius: 4rpx;
 					}
 					&.active {
-						color: #2979ff;
+						color: #26A888;
 						&::after {
 							content: '';
 							width: 50%;

pagesB/nursestation/nursestation.vue

@@ -77,7 +77,7 @@
 						{{item.name}}
 					</view>
 				</view>
-				<u-tabs v-if="choicetab==false" :list="tabList" :current="classifycurrent" @change="change">
+				<u-tabs v-if="choicetab==false" :list="tabList" :current="classifycurrent" @change="change" active-color="#26A888">
 				</u-tabs>
 				<view class="" v-if="servelist.length>0&&choicetab==false" style="margin:0">
 					<view class="item" v-for="item in servelist" :key="" v-show='choicetab==false'