修改

pages.json

@@ -9,6 +9,13 @@
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
+		},{
+			"path": "pages/Nursingstationserviceorder/Nursingstationserviceorder",
+			"style": {
+				"navigationBarTitleText": "护理机构服务订单",
+				"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
+				"enablePullDownRefresh": true //设置参数为true
+			}
 		}, {
 			"path": "pages/appointmenttime/appointmenttime",
 			"style": {
@@ -106,8 +113,7 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-		},
+		}, {
-		{
 			"path": "pages/ratesuccess/ratesuccess",
 			"style": {
 				"navigationBarTitleText": "",
@@ -128,87 +134,68 @@
 				"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
 				"enablePullDownRefresh": true //设置参数为true
 			}
-		},
+		}, {
-		{
 			"path": "pages/orderDetails/orderDetails",
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/payorderDetails/payorderDetails",
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "登录",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/cancelorder/cancelorder",
 			"style": {
 				"navigationBarTitleText": "取消订单",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
-			"path": "pages/Nursingstationserviceorder/Nursingstationserviceorder",
-			"style": {
-				"navigationBarTitleText": "护理机构服务订单",
-				"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
-				"enablePullDownRefresh": true //设置参数为true
-			}
-		},
-		{
 			"path": "pages/logistics/logistics",
 			"style": {
 				"navigationBarTitleText": "查看物流",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/Aftersalesdetails/Aftersalesdetails",
 			"style": {
 				"navigationBarTitleText": "售后详情",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/Applforrefund/Applforrefund",
 			"style": {
 				"navigationBarTitleText": "申请退款",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/refundType/refundType",
 			"style": {
 				"navigationBarTitleText": "选择退款类型",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/menttimeorder/menttimeorder",
 			"style": {
 				"navigationBarTitleText": "预约详情",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/homepage/homepage",
 			"style": {
 				"navigationBarTitleText": "泉医到家",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/confirmOrder/confirmOrder",
 			"style": {
 				"navigationBarTitleText": "确认订单",
@@ -216,38 +203,33 @@
 				"navigationBarBackgroundColor": "#4C7BC9", //背景颜色
 				"navigationBarTextStyle": "white"
 			}
-		},
+		}, {
-		{
 			"path": "pages/disease/disease",
 			"style": {
 				"navigationBarTitleText": "疾病类型选择",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/doctorslist/doctorslist",
 			"style": {
 				"navigationBarTitleText": "预约医生",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/ProductList/ProductList", //商品列表
 			"style": {
 				"navigationBarTitleText": "医路优品",
 				"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
 				"enablePullDownRefresh": true //设置参数为true
 			}
-		},
+		}, {
-		{
 			"path": "pages/nursestation/nursestation",
 			"style": {
 				"navigationBarTitleText": "护理机构详情",
 				"onReachBottomDistance": 100, //距离底部多远时触发 单位为px
 				"enablePullDownRefresh": true //设置参数为true
 			}
-		},
+		}, {
-		{
 			"path": "pages/site/site",
 			"style": {
 				"navigationBarTitleText": "护理机构",
@@ -255,22 +237,19 @@
 				"onReachBottomDistance": 100, //距离底部多远时触发 单位为px
 				"enablePullDownRefresh": true //设置参数为true
 			}
-		},
+		}, {
-		{
 			"path": "pages/diseasemanagement/diseasemanagement",
 			"style": {
 				"navigationBarTitleText": "专病管理",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/utabs/u-tabs",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/classification/classification",
 			"style": {
 				"navigationBarTitleText": "分类",
@@ -291,8 +270,7 @@
 				"navigationBarTitleText": "健康常识",
 				"enablePullDownRefresh": false
 			}
-		},
+		}, {
-		{
 			"path": "pages/customerservice/customerservice",
 			"style": {
 				"navigationBarTitleText": "在线客服",

pages/Nursingstationserviceorder/Nursingstationserviceorder.scss

@@ -3,7 +3,7 @@
 	.masks{
 		image{
 			position: absolute;
-			bottom:380rpx;
+			top:50rpx;
 			left:50%;
 			transform: translateX(-50%);
 			z-index: 999;
@@ -14,43 +14,43 @@
 		.ratetitle{
 			font-size: 34rpx;
 			position: absolute;
-			bottom:320rpx;
+			top:320rpx;
 			left:50%;
 			transform: translateX(-50%);
 			z-index: 999;
 		}
+		.title{
+			position: absolute;
+			top:40rpx;
+			left:50%;
+			transform: translateX(-50%);
+			font-size: 42rpx;
+		}
+		::v-deep .u-star-wrap{
+			padding-right:10rpx;
+		}
 		.mask{
 			position: absolute;
-			bottom:0;
+			top:200rpx;
-			width: 750rpx;
+			left: 70rpx;
-			height: 703rpx;
+		}
-			background: #FFFFFF;
+		.btn{
-			border-radius: 30rpx 30rpx 0px 0px;
+			width: 70%;
-			display: flex;
+			height: 71rpx;
-			justify-content: space-around;
+			background: #4C7BC9;
+			border-radius: 26rpx;
+			position: absolute;
+			top:530rpx;
+			left: 15%;
+			text-align: center;
+			line-height: 71rpx;
+			color: #fff;
+		}
 		.rateitem{
-				margin-top:200rpx;
+			position: absolute;
-				width: 217rpx;
+			top:350rpx;
-				height: 222rpx;
+			left: 80rpx;
-				line-height: 222rpx;
+			font-size: 42rpx;
-				text-align: center;
-				color: #ffffff;
-				background: #BFBFBF;
-				font-size: 40rpx;
-				border-radius: 25rpx;
-			}
-			
-			.lookrateitem{
-				font-size: 32rpx;
-				margin-top:440rpx;
-				width: 200rpx;
-				height: 200rpx;
-				line-height: 200rpx;
-				text-align: center;
-				color: #ffffff;
-				background: #BFBFBF;
-				border-radius: 25rpx;
-			}
 		}
 	}
 		

pages/Nursingstationserviceorder/Nursingstationserviceorder.vue

@@ -41,35 +41,38 @@
 			<u-empty mode="list" icon-size='220' text='暂无服务订单'></u-empty>
 		</view>
 		<u-toast ref="uToast" />
-		<u-popup v-model="rateshow" mode="bottom" length="48%" border-radius="20" :closeable='true' class='masks'>
+		<u-popup v-model="rateshow" mode="bottom" length="50%" border-radius="20" :closeable='true' class='masks'>
+			<view class="title">
+				综合评价
+			</view>
 			<view class="mask">
-				<view class="rateitem" @tap="taprate('SATISFIED')">
+				<u-rate :count="5" v-model="rateval" :size='70' active-color='#F4EA2A'></u-rate>
-					满意
 			</view>
-				<view class="rateitem" @tap="taprate('COMMONLY')">
+			<view class="rateitem">
-					一般
+				{{rateval==5?'非常满意':''}}
-				</view>
+				{{rateval==4?'满意':''}}
-				<view class="rateitem" @tap="taprate('DISSATISFIED')">
+				{{rateval==3?'一般':''}}
-					不满意
+				{{rateval==2?'差':''}}
+				{{rateval==1?'非常差':''}}
 			</view>
+			<view class="btn" @tap='taprate'>
+				确认
 			</view>
 		</u-popup>
-		<u-popup v-model="lookrateshow" mode="bottom" length="48%" border-radius="20" :closeable='true' class='masks'>
+		<u-popup v-model="lookrateshow" mode="bottom" length="60%" border-radius="20" :closeable='true' class='masks'>
 			<image :src="baseurl+rateimgtitle.img" mode=""></image>
 			<view class="ratetitle">
 				{{rateimgtitle.title}}
 			</view>
-			<view class="mask">
+			<view class="mask" style="top: 450rpx;">
-				<view class="lookrateitem" :style="ratelist.evaluateSatisfaction=='SATISFIED'?'background: #4C7BC9':''">
+				<u-rate :count="5" v-model="rateval" :size='70' active-color='#F4EA2A'></u-rate>
-					满意
-				</view>
-				<view class="lookrateitem" :style="ratelist.evaluateSatisfaction=='COMMONLY'?'background: #4C7BC9':''">
-					一般
-				</view>
-				<view class="lookrateitem"
-					:style="ratelist.evaluateSatisfaction=='DISSATISFIED'?'background: #4C7BC9':''">
-					不满意
 			</view>
+			<view class="rateitem" style="top: 580rpx;">
+				{{rateval==5?'非常满意':''}}
+				{{rateval==4?'满意':''}}
+				{{rateval==3?'一般':''}}
+				{{rateval==2?'差':''}}
+				{{rateval==1?'非常差':''}}
 			</view>
 		</u-popup>
 	</view>
@@ -91,21 +94,24 @@
 	export default {
 		data() {
 			return {
-				rateimgtitle: {
+				timer: null, //time
+				baseurl: null,
+				rateimgtitle: { //评价mask
 					img: null,
 					title: null,
 				},
 				ratelist: null, //评价list
 				rateshow: false, //评价
 				lookrateshow: false, //查看评价
-				baseurl: '',
+				openid: null, //opedn
-				openid: null,
+				patientId: null, //patientId
-				patientId: null,
+				rateval: 0, //评价星棵树
+				evaluateSatisfaction: null, //非常差/差/一般/满意/非常满意
 				pageNum: 1,
 				total: 0,
 				pageSize: 15,
-				list: [],
+				list: [], //循环list
-				orderNo: null,
+				orderNo: null, //订单编号
 			}
 		},
 		onShow() {
@@ -133,40 +139,70 @@
 				})
 			}
 		},
+		watch: { //监听
+			rateval() {
+				if (this.rateval == 5) {
+					this.evaluateSatisfaction = 'VERYSATISFIED'
+				} else if (this.rateval == 4) {
+					this.evaluateSatisfaction = 'SATISFIED'
+				} else if (this.rateval == 3) {
+					this.evaluateSatisfaction = 'COMMONLY'
+				} else if (this.rateval == 2) {
+					this.evaluateSatisfaction = 'DISSATISFIED'
+				} else if (this.rateval == 1) {
+					this.evaluateSatisfaction = 'VERYDISSATISFIED'
+				}
+			},
+		},
 		methods: {
 			//查看评价
 			lookrate(item) {
+				this.rateval = 0
+				this.evaluateSatisfaction = null
 				this.rateimgtitle.img = item.itemPictureUrl
 				this.rateimgtitle.title = item.nurseItemName
-				this.lookrateshow = true
 				lookrate(item.orderNo).then(res => {
 					this.ratelist = res.data
+					this.rateval = res.data.compositeScore
+					this.lookrateshow = true
 				})
 			},
 			//去评价
 			gorate(item) {
+				this.rateval = 0
+				this.evaluateSatisfaction = null
 				this.orderNo = item.orderNo
 				this.rateshow = true
 			},
 			//评价
-			taprate(item) {
+			taprate() {
 				var obj = {
 					"patientId": this.patientId,
 					"openid": this.openid,
 					"orderNo": this.orderNo,
 					"evaluateChannel": "WE_CHAT_APPLET",
-					"evaluateSatisfaction": item,
+					"evaluateSatisfaction": this.evaluateSatisfaction,
+					"compositeScore": this.rateval
 				}
 				addAppointmentEvaluate(obj).then(res => {
-					if (res.code == 200) {
 					uni.setStorageSync("Refresh", 'Refresh')
+					if (res.code == 200) {
+						this.getinfo();
 						this.orderNo = null
+						this.rateshow = false
 						this.$refs.uToast.show({
 							title: '评价成功',
 							type: 'success',
-							duration: '1500',
+							duration: '1500'
-							url: '/pages/ratesuccess/ratesuccess'
 						})
+						if (this.timer) {
+							clearTimeout(this.timer)
+						}
+						this.timer = setTimeout(e => {
+							uni.navigateTo({
+								url: `/pages/ratesuccess/ratesuccess?delta=${1}`
+							})
+						}, 1500)
 					}
 				})
 			},

pages/ServiceDetails/ServiceDetails.scss

@@ -7,7 +7,7 @@
 	.masks{
 		image{
 			position: absolute;
-				bottom:380rpx;
+			top:50rpx;
 			left:50%;
 			transform: translateX(-50%);
 			z-index: 999;
@@ -18,43 +18,43 @@
 		.ratetitle{
 			font-size: 34rpx;
 			position: absolute;
-				bottom:320rpx;
+			top:320rpx;
 			left:50%;
 			transform: translateX(-50%);
 			z-index: 999;
 		}
+		.title{
+			position: absolute;
+			top:40rpx;
+			left:50%;
+			transform: translateX(-50%);
+			font-size: 42rpx;
+		}
+		::v-deep .u-star-wrap{
+			padding-right:10rpx;
+		}
 		.mask{
 			position: absolute;
-				bottom:0;
+			top:200rpx;
-				width: 750rpx;
+			left: 70rpx;
-				height: 703rpx;
+		}
-				background: #FFFFFF;
+		.btn{
-				border-radius: 30rpx 30rpx 0px 0px;
+			width: 70%;
-				display: flex;
+			height: 71rpx;
-				justify-content: space-around;
+			background: #4C7BC9;
+			border-radius: 26rpx;
+			position: absolute;
+			top:530rpx;
+			left: 15%;
+			text-align: center;
+			line-height: 71rpx;
+			color: #fff;
+		}
 		.rateitem{
-					margin-top:200rpx;
+			position: absolute;
-					width: 217rpx;
+			top:350rpx;
-					height: 222rpx;
+			left: 80rpx;
-					line-height: 222rpx;
+			font-size: 42rpx;
-					text-align: center;
-					color: #ffffff;
-					background: #BFBFBF;
-					font-size: 40rpx;
-					border-radius: 25rpx;
-				}
-				
-				.lookrateitem{
-					font-size: 32rpx;
-					margin-top:440rpx;
-					width: 200rpx;
-					height: 200rpx;
-					line-height: 200rpx;
-					text-align: center;
-					color: #ffffff;
-					background: #BFBFBF;
-					border-radius: 25rpx;
-				}
 		}
 	}
 		.time{
@@ -66,26 +66,6 @@
 			margin: 20rpx auto 0rpx;
 			border-radius: 20rpx;
 		}
-		.mask{
-			position: absolute;
-			bottom:0;
-			width: 750rpx;
-			height: 703rpx;
-			background: #FFFFFF;
-			border-radius: 30rpx 30rpx 0px 0px;
-			display: flex;
-			justify-content: space-around;
-			.rateitem{
-				margin-top:200rpx;
-				width: 217rpx;
-				height: 222rpx;
-				line-height: 222rpx;
-				text-align: center;
-				color: #ffffff;
-				background: #BFBFBF;
-				border-radius: 25rpx;
-			}
-		}
 		.OrderStatus{
 			text-align: center;
 			width: 300rpx;

pages/ServiceDetails/ServiceDetails.vue

@@ -69,7 +69,7 @@
 			<view class="cancelorder" @tap="cancelorderment()"
 				v-if="list.orderStatus=='PAY'||list.orderStatus=='WAIT_DISPATCH'||list.orderStatus=='NOT_FINISH'">取消订单
 			</view>
-			<view class="cancelorder" style="background: #60c5f1;" @tap='rateshow= true'
+			<view class="cancelorder" style="background: #60c5f1;" @tap='rateshowtrue'
 				v-if="list.orderStatus=='COMPLETE'">立即评价
 			</view>
 			<view class="cancelorder" @tap='buy' style="background-color: darkorange;"
@@ -79,8 +79,24 @@
 			<view class="cancelorder" style="background: #4C7BC9;" v-if="list.orderStatus=='EVALUATED'"
 				@tap='lookrate(list)'>查看评价</view>
 		</view>
-		<u-popup v-model="rateshow" mode="bottom" length="48%" border-radius="20" :closeable='true'>
+		<u-popup v-model="rateshow" mode="bottom" length="50%" border-radius="20" :closeable='true' class='masks'>
+			<view class="title">
+				综合评价
+			</view>
 			<view class="mask">
+				<u-rate :count="5" v-model="rateval" :size='70' active-color='#F4EA2A'></u-rate>
+			</view>
+			<view class="rateitem">
+				{{rateval==5?'非常满意':''}}
+				{{rateval==4?'满意':''}}
+				{{rateval==3?'一般':''}}
+				{{rateval==2?'差':''}}
+				{{rateval==1?'非常差':''}}
+			</view>
+			<view class="btn" @tap='taprate'>
+				确认
+			</view>
+			<!-- 			<view class="mask">
 				<view class="rateitem" @tap="taprate('SATISFIED')">
 					满意
 				</view>
@@ -90,24 +106,22 @@
 				<view class="rateitem" @tap="taprate('DISSATISFIED')">
 					不满意
 				</view>
-			</view>
+			</view> -->
 		</u-popup>
-		<u-popup v-model="lookrateshow" mode="bottom" length="48%" border-radius="20" :closeable='true' class='masks'>
+		<u-popup v-model="lookrateshow" mode="bottom" length="60%" border-radius="20" :closeable='true' class='masks'>
 			<image :src="baseurl+rateimgtitle.img" mode=""></image>
 			<view class="ratetitle">
 				{{rateimgtitle.title}}
 			</view>
-			<view class="mask">
+			<view class="mask" style="top: 450rpx;">
-				<view class="lookrateitem" :style="ratelist.evaluateSatisfaction=='SATISFIED'?'background: #4C7BC9':''">
+				<u-rate :count="5" v-model="rateval" :size='70' active-color='#F4EA2A'></u-rate>
-					满意
-				</view>
-				<view class="lookrateitem" :style="ratelist.evaluateSatisfaction=='COMMONLY'?'background: #4C7BC9':''">
-					一般
-				</view>
-				<view class="lookrateitem"
-					:style="ratelist.evaluateSatisfaction=='DISSATISFIED'?'background: #4C7BC9':''">
-					不满意
 			</view>
+			<view class="rateitem" style="top: 580rpx;">
+				{{rateval==5?'非常满意':''}}
+				{{rateval==4?'满意':''}}
+				{{rateval==3?'一般':''}}
+				{{rateval==2?'差':''}}
+				{{rateval==1?'非常差':''}}
 			</view>
 		</u-popup>
 		<u-toast ref="uToast" />
@@ -129,6 +143,8 @@
 		data() {
 			return {
 				rateshow: false, //评价
+				rateval: 0, //评价星数
+				evaluateSatisfaction: null, //非常差/差/一般/满意/非常满意
 				baseurl: '',
 				patientId: '', //id
 				openid: '', //id
@@ -159,13 +175,37 @@
 			}
 			this.getlist()
 		},
+		watch: { //监听
+			rateval() {
+				if (this.rateval == 5) {
+					this.evaluateSatisfaction = 'VERYSATISFIED'
+				} else if (this.rateval == 4) {
+					this.evaluateSatisfaction = 'SATISFIED'
+				} else if (this.rateval == 3) {
+					this.evaluateSatisfaction = 'COMMONLY'
+				} else if (this.rateval == 2) {
+					this.evaluateSatisfaction = 'DISSATISFIED'
+				} else if (this.rateval == 1) {
+					this.evaluateSatisfaction = 'VERYDISSATISFIED'
+				}
+			},
+		},
 		methods: {
+			//去评价
+			rateshowtrue() {
+				this.rateval = 0
+				this.evaluateSatisfaction = null
+				this.rateshow = true
+			},
 			//查看评价
 			lookrate(item) {
+				this.rateval = 0
+				this.evaluateSatisfaction = null
 				this.rateimgtitle.img = item.itemPictureUrl
 				this.rateimgtitle.title = item.nurseItemName
 				lookrate(item.orderNo).then(res => {
 					this.ratelist = res.data
+					this.rateval = res.data.compositeScore
 					this.lookrateshow = true
 				})
 			},
@@ -217,29 +257,31 @@
 				})
 			},
 			//评价
-			taprate(item) {
+			taprate() {
 				var obj = {
 					"patientId": this.patientId,
 					"openid": this.openid,
 					"orderNo": this.orderNo,
 					"evaluateChannel": "WE_CHAT_APPLET",
-					"evaluateSatisfaction": item,
+					"evaluateSatisfaction": this.evaluateSatisfaction,
+					"compositeScore": this.rateval
 				}
 				addAppointmentEvaluate(obj).then(res => {
 					if (res.code == 200) {
+						this.getlist();
 						this.$refs.uToast.show({
 							title: '评价成功',
 							type: 'success',
 							duration: '1500'
 						})
+						this.rateshow = false
 						uni.setStorageSync("Refresh", 'Refresh')
-						this.getlist();
 						if (this.timer) {
 							clearTimeout(this.timer)
 						}
 						this.timer = setTimeout(e => {
 							uni.navigateTo({
-								url: `/pages/ratesuccess/ratesuccess?delta=${3}`
+								url: `/pages/ratesuccess/ratesuccess?delta=${1}`
 							})
 						}, 1500)
 					} else {

pages/ratesuccess/ratesuccess.vue

@@ -27,6 +27,7 @@
 			gos() {
 				var that = this
 				this.delta = Number(this.delta)
+				console.log(this.delta)
 				if (this.delta == 4) {
 					uni.navigateBack({
 						delta: 4
@@ -39,6 +40,10 @@
 					uni.navigateBack({
 						delta: 2
 					});
+				} else if (this.delta == 1) {
+					uni.navigateBack({
+						delta: 1
+					});
 				} else {
 					uni.navigateBack({
 						delta: 2