diff --git a/api/materialbenefits/index.js b/api/materialbenefits/index.js
index 3674ab3..992f4ca 100644
--- a/api/materialbenefits/index.js
+++ b/api/materialbenefits/index.js
@@ -8,3 +8,11 @@ export function couponByUseStatus(pageNum, pageSize, patientId) {
 		method: 'get'
 	})
 }
+
+//领取
+export function insertCouponReceive(patientId, couponId) {
+	return request({
+		url: `/nurseApplet/patientInfo/insertCouponReceive?patientId=${patientId}&couponId=${couponId}`,
+		method: 'post'
+	})
+}
diff --git a/pages.json b/pages.json
index dc5d149..487c989 100644
--- a/pages.json
+++ b/pages.json
@@ -25,7 +25,7 @@
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},{
-			"path" : "pages/Informationconfirmation/Informationconfirmation",
+			"path" : "pages/confirmation/confirmation",
 			"style" :
 			{
 				"navigationBarTitleText": "",
diff --git a/pages/Applforrefund/Applforrefund.scss b/pages/Applforrefund/Applforrefund.scss
index f3a8871..53b6d85 100644
--- a/pages/Applforrefund/Applforrefund.scss
+++ b/pages/Applforrefund/Applforrefund.scss
@@ -2,14 +2,6 @@
 		padding: 3%;
 
 		.frame {
-			.image {
-				position: absolute;
-				right: 30rpx;
-				top: 40rpx;
-				width: 31rpx;
-				height: 31rpx;
-			}
-
 			.payment {
 				width: 95%;
 				font-size: 42rpx;
diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue
index 1f8d6c4..7a70e9c 100644
--- a/pages/Applforrefund/Applforrefund.vue
+++ b/pages/Applforrefund/Applforrefund.vue
@@ -31,8 +31,7 @@
 		<view class="Submit" @tap='refundinfo'>提交</view>
 		<!-- 弹框 -->
 		<view class="frame">
-			<u-popup v-model="show" mode="bottom" length="48%" border-radius="20">
-				<image class="image" @tap="show = false" src="../../static/gb.png" mode=""></image>
+			<u-popup v-model="show" mode="bottom" length="48%" border-radius="20" :closeable='true'>
 				<view class="payment">
 					请选择退款原因
 				</view>
diff --git a/pages/CommodityOrder/CommodityOrder.scss b/pages/CommodityOrder/CommodityOrder.scss
index daa0839..a5a0793 100644
--- a/pages/CommodityOrder/CommodityOrder.scss
+++ b/pages/CommodityOrder/CommodityOrder.scss
@@ -4,18 +4,6 @@
 		padding: 3%;
 		.noorder{
 			margin-top: 20%;
-			image{
-				display: block;
-				margin: 0 auto;
-				width: 200rpx;
-				height: 240rpx;
-			}
-			view{
-				margin-top: 100rpx;
-				text-align: center;
-				font-size: 36rpx;
-				color: #BFBFBF;
-			}
 		}
 		.submits {
 			width: 501rpx;
diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue
index dd8a183..ab3df69 100644
--- a/pages/CommodityOrder/CommodityOrder.vue
+++ b/pages/CommodityOrder/CommodityOrder.vue
@@ -64,10 +64,7 @@
 			</view>
 		</view>
 		<view class="noorder" v-else>
-			<image src="../../static/noorder.png" mode=""></image>
-			<view class="">
-				暂无商品订单
-			</view>
+			<u-empty mode="order" icon-size='220'></u-empty>
 		</view>
 		<!-- 弹框 -->
 		<view class="frame">
diff --git a/pages/Healthitem/Healthitem.vue b/pages/Healthitem/Healthitem.vue
index 53c9817..b45525e 100644
--- a/pages/Healthitem/Healthitem.vue
+++ b/pages/Healthitem/Healthitem.vue
@@ -3,15 +3,14 @@
 		<view class="title">
 			{{item.informationTitle}}
 		</view>
-		<view class="text" v-html="item.informationContent">
-		</view>
+		<u-parse :html="item.informationContent"></u-parse>
 	</view>
 </template>
 <script>
 	export default {
 		data() {
 			return {
-				item: null,
+				item: '',
 			};
 		},
 		onLoad(options) { //获取传值
diff --git a/pages/Healthknowledge/Healthknowledge.vue b/pages/Healthknowledge/Healthknowledge.vue
index 3d357e9..86a25ae 100644
--- a/pages/Healthknowledge/Healthknowledge.vue
+++ b/pages/Healthknowledge/Healthknowledge.vue
@@ -17,10 +17,7 @@
 			</view>
 		</view>
 		<view class="noorder" v-else>
-			<image src="../../static/noorder.png" mode=""></image>
-			<view class="">
-				暂无内容
-			</view>
+			<u-empty mode="data" icon-size='220' text='暂无内容'></u-empty>
 		</view>
 		<u-back-top :scroll-top="scrollTop"></u-back-top>
 	</view>
@@ -118,20 +115,6 @@
 
 		.noorder {
 			margin-top: 20%;
-
-			image {
-				display: block;
-				margin: 0 auto;
-				width: 200rpx;
-				height: 240rpx;
-			}
-
-			view {
-				margin-top: 100rpx;
-				text-align: center;
-				font-size: 36rpx;
-				color: #BFBFBF;
-			}
 		}
 
 		.Healthknowledge {
diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss b/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss
index 94de75d..591225a 100644
--- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss
+++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss
@@ -56,18 +56,6 @@
 		
 		.noorder{
 			margin-top: 20%;
-			image{
-				display: block;
-				margin: 0 auto;
-				width: 200rpx;
-				height: 240rpx;
-			}
-			view{
-				margin-top: 100rpx;
-				text-align: center;
-				font-size: 36rpx;
-				color: #BFBFBF;
-			}
 		}
 		.item {
 			width: 99%;
diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
index 236ddb9..3808697 100644
--- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
+++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
@@ -38,10 +38,7 @@
 			</view>
 		</view>
 		<view class="noorder" v-else>
-			<image src="../../static/noorder.png" mode=""></image>
-			<view class="">
-				暂无服务订单
-			</view>
+			<u-empty mode="list" icon-size='220' text='暂无服务订单'></u-empty>
 		</view>
 		<u-toast ref="uToast" />
 		<u-mask :show="rateshow" @tap="rateshow = false" class='masks'>
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index 1d4b44c..f9efa59 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -28,11 +28,8 @@
 			<view style="width: 45%;" v-if="goodsList.length%2!=0">
 			</view>
 		</view>
-		<view class="noorder" v-if='goodsList.length==0'>
-			<image src="../../static/noorder.png" mode=""></image>
-			<view class="">
-				暂无商品
-			</view>
+		<view style='margin-top:90rpx' v-else>
+			<u-empty mode="list" icon-size='220' text='暂无商品'></u-empty>
 		</view>
 		<u-back-top :scroll-top="scrollTop"></u-back-top>
 	</view>
@@ -245,21 +242,6 @@
 			}
 		}
 
-		.noorder {
-			view {
-				text-align: center;
-				font-size: 40rpx;
-				color: #BFBFBF;
-			}
-
-			image {
-				display: block;
-				margin: 20% auto 50rpx;
-				width: 160rpx;
-				height: 200rpx;
-			}
-		}
-
 		.inputs {
 			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border: 1px solid #f0f0f0;
diff --git a/pages/classification/classification.vue b/pages/classification/classification.vue
index ea79309..556bdd5 100644
--- a/pages/classification/classification.vue
+++ b/pages/classification/classification.vue
@@ -38,11 +38,8 @@
 						用力上滑加载更多
 					</view>
 				</view>
-				<view class="noorder" v-if='goodsList.length==0'>
-					<image src="../../static/noorder.png" mode=""></image>
-					<view class="">
-						暂无商品
-					</view>
+				<view v-if='goodsList.length==0' style='margin-top: 100rpx;'>
+					<u-empty text="暂无商品" mode="data" icon-size='220'></u-empty>
 				</view>
 			</view>
 		</view>
@@ -416,23 +413,6 @@
 					width: 100%;
 				}
 			}
-
-		}
-
-
-		.noorder {
-			view {
-				text-align: center;
-				font-size: 40rpx;
-				color: #BFBFBF;
-			}
-
-			image {
-				display: block;
-				margin: 20% auto 50rpx;
-				width: 160rpx;
-				height: 200rpx;
-			}
 		}
 	}
 </style>
diff --git a/pages/Informationconfirmation/Informationconfirmation.vue b/pages/confirmation/confirmation.vue
similarity index 84%
rename from pages/Informationconfirmation/Informationconfirmation.vue
rename to pages/confirmation/confirmation.vue
index fc58859..1c7e47a 100644
--- a/pages/Informationconfirmation/Informationconfirmation.vue
+++ b/pages/confirmation/confirmation.vue
@@ -14,7 +14,7 @@
 				<span class='addition'>请选择</span>
 			</view>
 			<view class="worditem">
-				<view class="today" @tap='todayindex=index'
+				<view class="today" @tap='taptoday(item,index)'
 					:style="todayindex==index?'background: #FEF9F8;border: 1px solid #F44B2F;color: #F44B2F;':''"
 					v-for="(item,index) in userlist.appointmentTimeList" :key="index">
 					<span class="todaytime">
@@ -77,55 +77,57 @@
 			}
 		},
 		methods: {
+			taptoday(item, index) {
+				this.todayindex = index
+				this.updata.healthAppointDate = item.date
+			},
 			buy() {
+				var that = this
 				addHealthConsultationOrder(this.updata).then(res => {
 					res.data.payType = "WECHAT_PAY"
 					res.data.paymentPrice = res.data.totalPrice
 					res.data.openid = this.openid
-					appletGoodsOrderPay(res.data).then(Response => {
-						// if (response.code == 200) {
-						// 	uni.requestPayment({
-						// 		timeStamp: response.data.timeStamp,
-						// 		nonceStr: response.data.nonceStr,
-						// 		package: response.data.prepayId,
-						// 		signType: response.data.signType,
-						// 		paySign: response.data.paySign,
-						// 		success: function(res) {
-						// 			that.$refs.uToast.show({
-						// 				title: '支付成功',
-						// 				type: 'success',
-						// 				duration: 1500,
-						// 				url: `/pages/paysuccess/paysuccess`
-						// 			})
-						// 		},
-						// 		fail: function(err) {
-						// 			that.$refs.uToast.show({
-						// 				title: '取消支付',
-						// 				type: 'error',
-						// 				duration: 1500,
-						// 			})
-						// 		}
-						// 	});
-						// } else {
-						// 	that.$refs.uToast.show({
-						// 		title: response.msg,
-						// 		type: 'error',
-						// 		duration: 2000
-						// 	})
-						// }
+					appletGoodsOrderPay(res.data).then(response => {
+						if (response.code == 200) {
+							uni.requestPayment({
+								timeStamp: response.data.timeStamp,
+								nonceStr: response.data.nonceStr,
+								package: response.data.prepayId,
+								signType: response.data.signType,
+								paySign: response.data.paySign,
+								success: function(res) {
+									that.$refs.uToast.show({
+										title: '支付成功',
+										type: 'success',
+										duration: 1500,
+										url: `/pages/paysuccess/paysuccess`
+									})
+								},
+								fail: function(err) {
+									that.$refs.uToast.show({
+										title: '取消支付',
+										type: 'error',
+										duration: 1500,
+									})
+								}
+							});
+						} else {
+							that.$refs.uToast.show({
+								title: response.msg,
+								type: 'error',
+								duration: 2000
+							})
+						}
 					})
 				})
 			},
 		},
-		onShow() {},
-		onLoad(options) {
+		onShow() {
 			var that = this
-			this.updata.totalPrice = Number(options.price)
-			this.updata.hospitalPersonId = Number(options.hospitalPersonId)
 			const value = uni.getStorageSync('patientId');
 			const value2 = uni.getStorageSync('openid');
 			if (value2) {
-				this.openid = value2
+				that.openid = value2
 			}
 			if (value) {
 				that.updata.patientId = value
@@ -136,6 +138,11 @@
 					that.updata.healthAppointDate = res.data.appointmentTimeList[0].date
 				})
 			}
+		},
+		onLoad(options) {
+			var that = this
+			this.updata.totalPrice = Number(options.price)
+			this.updata.hospitalPersonId = Number(options.hospitalPersonId)
 		}
 	}
 </script>
diff --git a/pages/coupon/coupon.scss b/pages/coupon/coupon.scss
index 055159e..0f18619 100644
--- a/pages/coupon/coupon.scss
+++ b/pages/coupon/coupon.scss
@@ -3,20 +3,6 @@
 
 		.noorder {
 			margin-top: 20%;
-
-			image {
-				display: block;
-				margin: 0 auto;
-				width: 200rpx;
-				height: 240rpx;
-			}
-
-			view {
-				margin-top: 100rpx;
-				text-align: center;
-				font-size: 36rpx;
-				color: #BFBFBF;
-			}
 		}
 		.content {
 			width: 96%;
diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue
index fbfd3d7..df9e235 100644
--- a/pages/coupon/coupon.vue
+++ b/pages/coupon/coupon.vue
@@ -68,10 +68,7 @@
 				</view>
 			</view>
 			<view class="noorder" v-else>
-				<image src="../../static/noorder.png" mode=""></image>
-				<view class="">
-					暂无优惠券
-				</view>
+				<u-empty mode="coupon" icon-size='220'></u-empty>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
diff --git a/pages/integral/integral.scss b/pages/integral/integral.scss
index b3bfdfb..917c572 100644
--- a/pages/integral/integral.scss
+++ b/pages/integral/integral.scss
@@ -5,20 +5,6 @@
 		}
 .noorder {
 			margin-top: 20%;
-
-			image {
-				display: block;
-				margin: 0 auto;
-				width: 200rpx;
-				height: 240rpx;
-			}
-
-			view {
-				margin-top: 100rpx;
-				text-align: center;
-				font-size: 36rpx;
-				color: #BFBFBF;
-			}
 		}
 		.information {
 			width: 70%;
diff --git a/pages/integral/integral.vue b/pages/integral/integral.vue
index 9064a14..d66fe60 100644
--- a/pages/integral/integral.vue
+++ b/pages/integral/integral.vue
@@ -44,10 +44,7 @@
 			</view>
 		</view>
 		<view class="noorder" v-else>
-			<image src="../../static/noorder.png" mode=""></image>
-			<view class="">
-				暂无可兑换商品
-			</view>
+			<u-empty mode="list" icon-size='220' text='暂无可兑换商品'></u-empty>
 		</view>
 		<u-mask :show="gainshow" @click="gainshow = false">
 			<view class="mask" @click.stop="">
diff --git a/pages/materialbenefits/materialbenefits.vue b/pages/materialbenefits/materialbenefits.vue
index 86a935b..3eca50c 100644
--- a/pages/materialbenefits/materialbenefits.vue
+++ b/pages/materialbenefits/materialbenefits.vue
@@ -55,7 +55,7 @@
 						<view class="time" v-if="item.useStatus!='RECEIVE'">
 							有效期至{{item.expirationEndTime}}
 						</view>
-						<view class="btn" v-if="item.useStatus=='RECEIVE'" @tap='logininfo'>
+						<view class="btn" v-if="item.useStatus=='RECEIVE'" @tap='logininfo(item)'>
 							{{item.useStatus=='RECEIVE'?'领取':''}}
 						</view>
 						<view class="btngq" v-if="item.useStatus!='NOT_USED'&&item.useStatus!='RECEIVE'">
@@ -74,10 +74,7 @@
 				</view>
 			</view>
 			<view class="noorder" v-else>
-				<image src="../../static/noorder.png" mode=""></image>
-				<view class="">
-					暂无
-				</view>
+				<u-empty mode="coupon" icon-size='220'></u-empty>
 			</view>
 		</view>
 		<u-mask :show="usershow" class='mask'>
@@ -99,7 +96,8 @@
 </template>
 <script>
 	import {
-		couponByUseStatus
+		couponByUseStatus,
+		insertCouponReceive
 	} from '@/api/materialbenefits/index.js'
 	import {
 		AppIdentification
@@ -129,14 +127,20 @@
 			}
 		},
 		methods: {
-			logininfo() {
+			logininfo(item) {
+				console.log(item)
 				var that = this
 				const value = uni.getStorageSync('patientId');
 				const value2 = uni.getStorageSync('openid');
 				if (value && value2) {
 					AppIdentification(value).then(res => {
 						if (res.code == 200) {
-							if (res.data.loginFlag) {} else {
+							if (res.data.loginFlag) {
+								insertCouponReceive(value, item.id).then(res => {
+									that.getlist();
+									console.log(res)
+								})
+							} else {
 								this.usershow = true
 							}
 						} else {
@@ -158,6 +162,7 @@
 				}
 			},
 			getlist() {
+				this.pageNum = 1
 				couponByUseStatus(this.pageNum, this.pageSize, this.patientId).then(res => {
 					this.couponlist = res.rows
 					this.total = res.total
@@ -209,21 +214,7 @@
 		padding: 0;
 
 		.noorder {
-			margin-top: 20%;
-
-			image {
-				display: block;
-				margin: 0 auto;
-				width: 200rpx;
-				height: 240rpx;
-			}
-
-			view {
-				margin-top: 100rpx;
-				text-align: center;
-				font-size: 36rpx;
-				color: #BFBFBF;
-			}
+			margin-top: 100rpx;
 		}
 
 		.mask {
diff --git a/pages/medicine/medicine.scss b/pages/medicine/medicine.scss
index 4cba9d8..88eea7f 100644
--- a/pages/medicine/medicine.scss
+++ b/pages/medicine/medicine.scss
@@ -155,9 +155,9 @@
 					background-color: #ffffff;
 	
 					.content {
+						height: 500rpx;
 						position: relative;
 						width: 100%;
-						height: 450rpx;
 						border-bottom: 1rpx solid #D8D4D4;
 	
 						.hospitalimage {
@@ -185,13 +185,19 @@
 						}
 	
 						.words {
-							position: absolute;
-							left: 41rpx;
+							    white-space: normal;
+							    word-break: break-all;
+							margin-left: 41rpx;
 							width: 85%;
-							top: 190rpx;
+							margin-top: 190rpx;
 							text-indent: 2em;
 							font-size: 30rpx;
 							line-height: 55rpx;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 4;
 						}
 	
 						.appointment {
diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue
index 0b932db..e99c577 100644
--- a/pages/medicine/medicine.vue
+++ b/pages/medicine/medicine.vue
@@ -30,7 +30,9 @@
 				<view class="righttabbar">
 					<view class="productlist" @touchstart="start" @touchend="end" @touchmove="move">
 						<view class="content" v-for="(item,index) in HospitalPersonlist" :key="item.id">
-							<image class="hospitalimage" :src="baseurl+personPictureUrl" mode=""></image>
+							<image class="hospitalimage" v-if="item.personPictureUrl"
+								:src="baseurl+item.personPictureUrl" mode=""></image>
+							<image class="hospitalimage" v-else src="@/static/yis.png" mode=""></image>
 							<view class="hospitalteacher">{{item.personName}}</view>
 							<view class="physician">
 								{{ item.academicTitle=='CHIEF_PHYSICIAN'?'主任医师':''}}
@@ -162,6 +164,10 @@
 					})
 					this.departmentId = this.hospitalDepartmentList[0].departmentId
 					this.selectHospitalPersonInfo();
+					if (this.swiperImgUrls.length == 0) {
+						var img = baseurl + '/profile/appletPicture/healthy.png'
+						this.swiperImgUrls.push(img)
+					}
 				})
 			},
 			swiperChange(e) {
@@ -210,7 +216,7 @@
 							if (res.data.loginFlag) {
 								that.usershow = false
 								uni.navigateTo({
-									url: `/pages/Informationconfirmation/Informationconfirmation?price=${item.consultingFee}&&hospitalPersonId=${item.id}`
+									url: `/pages/confirmation/confirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}`
 								})
 							} else {
 								that.usershow = true
diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss
index 07e2a5f..aac5c20 100644
--- a/pages/nursestation/nursestation.scss
+++ b/pages/nursestation/nursestation.scss
@@ -82,17 +82,6 @@
 			padding-bottom: 60rpx;
 			.noorder{
 				margin-top: 90rpx;
-				image{
-					display: block;
-					margin: 0 auto;
-					width: 100rpx;
-					height: 120rpx;
-				}
-				view{
-					text-align: center;
-					font-size: 36rpx;
-					color: #BFBFBF;
-				}
 			}
 			.item {
 				width: 100%;
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index a7f7a94..d90a6d9 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -116,10 +116,7 @@
 					</view>
 				</view>
 				<view class="noorder" v-if='servelist.length==0&&choicetab==false'>
-					<image src="../../static/noorder.png" mode=""></image>
-					<view class="">
-						暂无服务项目
-					</view>
+					<u-empty mode="list" icon-size='220' text='暂无服务项目'></u-empty>
 				</view>
 				<view class="" v-if="productlist.length>0&&choicetab">
 					<view class="item" v-show='choicetab' v-for="(item,index) in productlist" :key="index">
@@ -133,10 +130,7 @@
 					</view>
 				</view>
 				<view class="noorder" v-if="productlist.length==0&&choicetab">
-					<image src="../../static/noorder.png" mode=""></image>
-					<view class="">
-						暂无产品
-					</view>
+					<u-empty mode="list" icon-size='220' text='暂无产品'></u-empty>
 				</view>
 			</view>
 		</view>
diff --git a/pages/site/site.scss b/pages/site/site.scss
index b3cfd7e..face2c4 100644
--- a/pages/site/site.scss
+++ b/pages/site/site.scss
@@ -99,17 +99,6 @@
 		height: 100%;
 		.noorder{
 			margin-top: 90rpx;
-			image{
-				display: block;
-				margin: 0 auto;
-				width: 100rpx;
-				height: 120rpx;
-			}
-			view{
-				text-align: center;
-				font-size: 36rpx;
-				color: #BFBFBF;
-			}
 		}
 		.title{
 			font-size: 32rpx;
diff --git a/pages/site/site.vue b/pages/site/site.vue
index 4e555d1..788001e 100644
--- a/pages/site/site.vue
+++ b/pages/site/site.vue
@@ -48,10 +48,7 @@
 				</view>
 			</view>
 			<view class="noorder" v-else>
-				<image src="../../static/noorder.png" mode=""></image>
-				<view class="">
-					暂无护理站
-				</view>
+				<u-empty mode="list" icon-size='220' text='暂无护理站'></u-empty>
 			</view>
 		</view>
 		<view class="masks" style="" v-if="mask">
diff --git a/static/noorder.png b/static/noorder.png
deleted file mode 100644
index 66be356..0000000
Binary files a/static/noorder.png and /dev/null differ
diff --git a/static/yis.png b/static/yis.png
new file mode 100644
index 0000000..03a781f
Binary files /dev/null and b/static/yis.png differ