diff --git a/pages/Aftersalesdetails/Aftersalesdetails.vue b/pages/Aftersalesdetails/Aftersalesdetails.vue
index fbb2c53..3b6cd49 100644
--- a/pages/Aftersalesdetails/Aftersalesdetails.vue
+++ b/pages/Aftersalesdetails/Aftersalesdetails.vue
@@ -14,10 +14,11 @@
 					<image :src="baseurl+Aftersalesorder.attributePitureUrl" mode=""></image>
 					<view class="model">
 						<view class="top">
-							<span>{{Aftersalesorder.goodsName}}</span>
-							<span>￥{{Aftersalesorder.goodsPrice}}</span>
+							<span v-if="Aftersalesorder.orderType =='HEALTH_CONSULTATION'">健康咨询</span>
+							<span v-else>{{Aftersalesorder.goodsName}}</span>
+							<span v-if="Aftersalesorder.orderType=='DIRECT_BUY'">￥{{Aftersalesorder.goodsPrice}}</span>
 						</view>
-						<view class="bottom">
+						<view class="bottom" v-if="Aftersalesorder.orderType !='HEALTH_CONSULTATION'">
 							<span class="box">型号：{{Aftersalesorder.goodsAttributeName}}</span>
 							<span class="box">×1</span>
 						</view>
@@ -27,7 +28,7 @@
 			<view class="info">
 				<view>订单编号：{{Aftersalesorder.goOrderNo}}</view>
 				<view>申请金额：￥{{Aftersalesorder.totalPrice}}</view>
-				<view>退款原因：{{Aftersalesorder.dictLabel}}</view>
+				<view v-if="Aftersalesorder.orderType !='HEALTH_CONSULTATION'">退款原因：{{Aftersalesorder.dictLabel}}</view>
 				<view v-if="Aftersalesorder.appleTime">申请时间：{{Aftersalesorder.appleTime}}</view>
 			</view>
 		</view>
diff --git a/pages/Applforrefund/Applforrefund.scss b/pages/Applforrefund/Applforrefund.scss
index 53b6d85..ad44fc9 100644
--- a/pages/Applforrefund/Applforrefund.scss
+++ b/pages/Applforrefund/Applforrefund.scss
@@ -34,14 +34,13 @@
 		}
 
 		.discribe {
-			margin-top: 3%;
 			width: 99%;
 			height: 342rpx;
 			background: #FFFFFF;
 			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border-radius: 20rpx;
 			padding: 3%;
-
+			margin: 3% auto 0;
 			.supplement input {
 				margin-top: 3%;
 				margin-left: 5%;
diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue
index 126217d..afd0c34 100644
--- a/pages/CommodityOrder/CommodityOrder.vue
+++ b/pages/CommodityOrder/CommodityOrder.vue
@@ -79,17 +79,19 @@
 		</view>
 		<!-- 弹框 -->
 		<view class="frame">
-			<u-popup v-model="show" mode="bottom" length="45%" border-radius="30">
+			<u-popup v-model="show" mode="bottom" length="45%" border-radius="30"  :closeable='true'>
 				<view class="payment">
-					<span>确认收到货了吗</span>
-					<image src="../../static/gb.png" mode="" @tap="show = false"></image>
+					<span v-if="orderNoitem.orderType =='HEALTH_CONSULTATION'">确认咨询完成了吗</span>
+					<span v-else>确认收到货了吗</span>
 				</view>
 				<view class="chat">
-					<view class="image">
-						<image :src="baseurl+img" mode=""></image>
-						<view class="blackground">共1件</view>
+					<view class="image" style="height:182rpx">
+						<image :src="baseurl+img" mode="" v-if="orderNoitem.orderType !='HEALTH_CONSULTATION'"></image>
+						<view class="blackground" v-if="orderNoitem.orderType !='HEALTH_CONSULTATION'">共1件</view>
 					</view>
-					<view class="word">为了保证您的售后权益，请收到商品确认无误后再确认收货</view>
+					<view class="word" v-if="orderNoitem.orderType =='HEALTH_CONSULTATION'">为了保证您的售后权益，请确认健康咨询无误后再确认完成
+					</view>
+					<view class="word" v-else>为了保证您的售后权益，请收到商品确认无误后再确认收货</view>
 				</view>
 				<view class="submits" @tap='Receipts'>确定</view>
 			</u-popup>
diff --git a/pages/confirmation/confirmation.vue b/pages/confirmation/confirmation.vue
index 1c7e47a..428baf0 100644
--- a/pages/confirmation/confirmation.vue
+++ b/pages/confirmation/confirmation.vue
@@ -73,6 +73,7 @@
 					"totalPrice": null,
 					"hospitalPersonId": null,
 					"healthConsultationContent": '',
+					"hospitalPersonName": null,
 				},
 			}
 		},
@@ -141,6 +142,7 @@
 		},
 		onLoad(options) {
 			var that = this
+			this.updata.hospitalPersonName = options.personName
 			this.updata.totalPrice = Number(options.price)
 			this.updata.hospitalPersonId = Number(options.hospitalPersonId)
 		}
diff --git a/pages/lookrate/lookrate.vue b/pages/lookrate/lookrate.vue
index fcd451b..23fdb15 100644
--- a/pages/lookrate/lookrate.vue
+++ b/pages/lookrate/lookrate.vue
@@ -5,10 +5,11 @@
 				<image :src="baseurl+order.attributePitureUrl" mode=""></image>
 				<view class="model">
 					<view class="top">
-						<span>{{order.goodsName}}</span>
-						<span>￥{{order.goodsPrice}}</span>
+						<span v-if="order.orderType =='HEALTH_CONSULTATION'">健康咨询</span>
+						<span v-else>{{order.goodsName}}</span>
+						<span v-if="order.orderType=='DIRECT_BUY'">￥{{order.goodsPrice}}</span>
 					</view>
-					<view class="bottom">
+					<view class="bottom" v-if="order.orderType !='HEALTH_CONSULTATION'">
 						<span class="box">型号：{{order.goodsAttributeName}}</span>
 						<span class="box">X{{order.goodsCount}}</span>
 					</view>
@@ -54,6 +55,7 @@
 		onLoad(options) {
 			this.baseurl = baseurl
 			this.order = JSON.parse(options.item)
+			console.log(this.order)
 			lookrate(this.order.goOrderNo).then(res => {
 				this.ratelist = res.data
 			})
diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue
index 8baa9b8..d92cf50 100644
--- a/pages/medicine/medicine.vue
+++ b/pages/medicine/medicine.vue
@@ -18,7 +18,7 @@
 		</view>
 		<view class="hospital">
 			<view class="appointmenthospital">预约医生</view>
-			<view class="tabbar" v-if="hospitalDepartmentList.length>0&&HospitalPersonlist.length>0">
+			<view class="tabbar" v-if="hospitalDepartmentList.length>0">
 				<view class="lefttabbar" @touchstart="start" @touchend="end" @touchmove="move">
 					<view class="lefttabbarlist">
 						<view v-for="(item,index) in hospitalDepartmentList" :key="index"
@@ -223,7 +223,7 @@
 							if (res.data.loginFlag) {
 								that.usershow = false
 								uni.navigateTo({
-									url: `/pages/confirmation/confirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}`
+									url: `/pages/confirmation/confirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}&&personName=${item.personName}`
 								})
 							} else {
 								that.usershow = true
diff --git a/pages/orderDetails/orderDetails.scss b/pages/orderDetails/orderDetails.scss
index 7ef8e22..2efea1e 100644
--- a/pages/orderDetails/orderDetails.scss
+++ b/pages/orderDetails/orderDetails.scss
@@ -194,22 +194,25 @@
 								font-size: 30rpx;
 							}
 						}
-
-
-
 						.refund {
 							width: 159rpx;
 							height: 54rpx;
 							line-height: 54rpx;
 							text-align: center;
 							background: #FFFFFF;
-							border: 1rpx solid #969394;
-							border-radius: 26rpx;
 							font-size: 26rpx;
 							color: #969394;
 							position: absolute;
 							right: 20rpx;
 							bottom: 100rpx;
+							border-radius: 26rpx;
+							text{
+								border-radius: 26rpx;
+								display: block;
+								width: 100%;
+								height: 100%;
+								border: 1rpx solid #969394;
+							}
 						}
 					}
 				}
diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue
index 1dece9a..ddae06c 100644
--- a/pages/orderDetails/orderDetails.vue
+++ b/pages/orderDetails/orderDetails.vue
@@ -31,25 +31,28 @@
 							<span class="box" style='width:40%'>优惠金额：</span>
 							<span class="box">-￥{{order.discountPrice}}</span>
 						</view>
-						<view class="refund" @tap='gorefundType'
+						<view class="refund"
 							v-if="order.orderStatus != 'WAIT_PAY'&& order.orderStatus!='CANCEL'&&order.orderStatus!='WAIT_REFUND'&&order.orderStatus!='REFUNDED'&&order.orderStatus!='RETURNED_GOODS'&&order.orderStatus!='WAIT_RETURNED_GOODS'">
-							<text v-if="order.orderType=='INTEGRAL_EXCHANGE'">取消兑换</text>
-							<text v-if="order.orderType=='DIRECT_BUY'">申请退款</text>
-							<text v-if="order.orderType=='HEALTH_CONSULTATION'">取消咨询</text>
+							<text @tap='gorefundType' v-if="order.orderType=='INTEGRAL_EXCHANGE'">取消兑换</text>
+							<text @tap='gorefundType' v-if="order.orderType=='DIRECT_BUY'">申请退款</text>
+							<text @tap='gorefundType'
+								v-if="order.orderType=='HEALTH_CONSULTATION'&&order.orderStatus=='WAIT_RECEIVED_GOODS'">取消咨询</text>
 						</view>
-						<view class="refund" v-if="order.orderStatus=='WAIT_REFUND'" @tap='goAftersalesdetails(order)'>
+						<view class="refund" style="border: 1rpx solid #969394;" v-if="order.orderStatus=='WAIT_REFUND'"
+							@tap='goAftersalesdetails(order)'>
 							退款中
 						</view>
-						<view class="refund" v-if="order.orderStatus=='REFUNDED'">
+						<view class="refund" style="border: 1rpx solid #969394;" v-if="order.orderStatus=='REFUNDED'">
 							退款成功
 						</view>
 						<!-- <view class="refund" v-if="order.orderStatus=='RETURNED_GOODS'">
 							退货中
 						</view> -->
-						<view class="refund" v-if="order.orderStatus=='WAIT_RETURNED_GOODS'">
+						<view class="refund" style="border: 1rpx solid #969394;"
+							v-if="order.orderStatus=='WAIT_RETURNED_GOODS'">
 							待退货
 						</view>
-						<view class="refund" v-if="order.orderStatus=='CANCEL'">
+						<view class="refund" style="border: 1rpx solid #969394;" v-if="order.orderStatus=='CANCEL'">
 							已取消
 						</view>
 					</view>
@@ -60,7 +63,8 @@
 				</view> -->
 				<view class="payinfo">
 					<text class="pay">实付款</text>
-					<text class="price" v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">￥{{order.totalPrice}}</text>
+					<text class="price"
+						v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">￥{{order.totalPrice}}</text>
 					<text class="price"
 						v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分</text>
 				</view>
@@ -69,6 +73,8 @@
 		<view class="info">
 			<span>收货人：<text>{{order.receiver}}</text></span>
 			<span>联系电话：<text>{{order.phone}}</text></span>
+			<span v-if="order.orderType =='HEALTH_CONSULTATION'">咨询医生：<text>{{order.hospitalPersonName}}</text></span>
+			<span v-if="order.orderType =='HEALTH_CONSULTATION'">咨询时间：<text>{{order.healthAppointDate}}</text></span>
 			<span v-if="order.orderType !='HEALTH_CONSULTATION'">收货地址：<text>{{order.receiveAddress}}</text></span>
 			<span>订单编号：<text>{{order.goOrderNo}}</text></span>
 			<!-- <span>获得积分：<text>30点积分</text></span> -->
@@ -101,7 +107,7 @@
 				确认收货
 			</view>
 		</view>
-		<view class="buy" v-if="order.orderType =='HEALTH_CONSULTATION'">
+		<view class="buy" v-if="order.orderStatus == 'WAIT_RECEIVED_GOODS'&&order.orderType =='HEALTH_CONSULTATION'">
 			<view class="pay" style="background-color: #4C7BC9;" @tap='Receipt'>
 				咨询完成
 			</view>
@@ -109,17 +115,20 @@
 		<u-toast ref="uToast" />
 		<!-- //收货 -->
 		<view class="frame">
-			<u-popup v-model="show" mode="bottom" length="45%" border-radius="30">
+			<u-popup v-model="show" mode="bottom" length="45%" border-radius="30" :closeable='true'>
 				<view class="payment">
-					<span>确认收到货了吗</span>
-					<image src="../../static/gb.png" mode="" @tap="show = false"></image>
+					<span v-if="order.orderType =='HEALTH_CONSULTATION'">确认咨询完成了吗</span>
+					<span v-else>确认收到货了吗</span>
 				</view>
 				<view class="chat">
-					<view class="image">
-						<image :src="baseurl+order.attributePitureUrl" mode=""></image>
-						<view class="blackground">共1件</view>
+					<view class="image" style="height:182rpx">
+						<image :src="baseurl+order.attributePitureUrl" mode=""
+							v-if="order.orderType !='HEALTH_CONSULTATION'"></image>
+						<view class="blackground" v-if="order.orderType !='HEALTH_CONSULTATION'">共1件</view>
 					</view>
-					<view class="word">为了保证你的售后权益，请收到商品确认无误后再确认收货</view>
+					<view class="word" v-if="order.orderType =='HEALTH_CONSULTATION'">为了保证您的售后权益，请确认健康咨询无误后再确认完成
+					</view>
+					<view class="word" v-else>为了保证您的售后权益，请收到商品确认无误后再确认收货</view>
 				</view>
 				<view class="submits" @tap='Receipts'>确定</view>
 			</u-popup>
diff --git a/pages/refundType/refundType.scss b/pages/refundType/refundType.scss
index c1e4dc5..e56838c 100644
--- a/pages/refundType/refundType.scss
+++ b/pages/refundType/refundType.scss
@@ -1,5 +1,37 @@
 .app {
 
+	.Submit {
+			width: 217rpx;
+			height: 68rpx;
+			background: #4C7BC9;
+			border-radius: 26rpx;
+			text-align: center;
+			line-height: 68rpx;
+			color: #FFFFFF;
+			margin-left: 65%;
+			margin-top: 45%;
+		}
+		.discribe {
+			width: 95%;
+			height: 342rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 20rpx;
+			padding: 3%;
+			margin: 30rpx auto;
+			.supplement input {
+				margin-top: 3%;
+				margin-left: 5%;
+				font-size: 26rpx;
+				color: #BAB7B8;
+				line-height: 67rpx;
+			}
+
+			.voucher {
+				height: 70rpx;
+				border-bottom: 1rpx solid #D8D4D4;
+			}
+		}
 		.content {
 			width: 95%;
 			// hheight: 302rpx;
diff --git a/pages/refundType/refundType.vue b/pages/refundType/refundType.vue
index 4ebbab1..c948421 100644
--- a/pages/refundType/refundType.vue
+++ b/pages/refundType/refundType.vue
@@ -20,14 +20,15 @@
 					</view>
 					<view class="payinfo">
 						<text class="pay">实付款</text>
-						<text class="price" v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">￥{{order.totalPrice}}</text>
+						<text class="price"
+							v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">￥{{order.totalPrice}}</text>
 						<text class="price"
 							v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分</text>
 					</view>
 				</view>
 			</view>
 		</view>
-		<view class="refundinfo">
+		<view class="refundinfo" v-if="order.orderType !='HEALTH_CONSULTATION'">
 			<view class="refund">
 				选择退款类型
 			</view>
@@ -49,19 +50,63 @@
 				<image class="picture" src="../../static/huijiantou.png" mode=""></image>
 			</view>
 		</view>
+		<view class="" v-else>
+			<view class="discribe">
+				<view class="voucher">退款原因</view>
+				<view class="supplement">
+					<u-input v-model="order.refundReasonRemark" type="textarea" height="100" :auto-height="true"
+						placeholder="请输入退款原因" />
+				</view>
+			</view>
+			<view class="Submit" @tap='refundinfo'>提交</view>
+		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
 <script>
+	import {
+		refund
+	} from '@/api/Applforrefund/index.js'
 	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
 			return {
 				baseurl: '', //url
-				order: {},
+				order: {
+					refundReasonRemark: '',
+				},
 			}
 		},
 		methods: {
+			//退款
+			refundinfo() {
+				this.order.updateTime = null
+				refund(this.order).then(
+					res => {
+						if (res.code == 500) {
+							this.$refs.uToast.show({
+								title: res.msg,
+								type: 'error'
+							})
+						} else {
+							uni.setStorageSync("Refresh", 'Refresh')
+							this.$refs.uToast.show({
+								title: '退款申请提交成功',
+								type: 'success',
+								duration: '1500'
+							})
+							if (this.timer) {
+								clearTimeout(this.timer)
+							}
+							this.timer = setTimeout(e => {
+								uni.navigateBack({
+									delta: 2
+								})
+							}, 1500)
+						}
+					})
+			},
 			//退款页面
 			goApplforrefund(e) {
 				if (e == 1) {
@@ -78,6 +123,7 @@
 		onLoad(options) {
 			this.baseurl = baseurl
 			this.order = JSON.parse(options.order)
+			this.order.id = this.order.goodsOrderId
 		}
 	}
 </script>