From ffb349cc9f1c237addbe7938af6757bab80965a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 1 Dec 2022 16:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/ProductList/ProductList.js                |   4 +-
 api/ProjectDetails/index.js                   |   8 +
 manifest.json                                 |  14 +-
 pages.json                                    |   8 +
 .../Nursingstationserviceorder.vue            |  11 +-
 pages/ProductList/ProductList.vue             |  59 ++++-
 pages/ProjectDetails/ProjectDetails.scss      | 171 +++++++++++++
 pages/ProjectDetails/ProjectDetails.vue       | 160 ++++++++++++
 pages/appointmenttime/appointmenttime.scss    | 228 ++++++++++--------
 pages/appointmenttime/appointmenttime.vue     |  28 ++-
 pages/information/information.scss            |   7 +-
 pages/login/login.vue                         |   6 +
 pages/modify/modify.scss                      |   7 +-
 pages/modifyAddress/modifyAddress.vue         |   4 +-
 pages/nursestation/nursestation.scss          |   4 +
 pages/nursestation/nursestation.vue           |  37 ++-
 pages/shopping/shopping.vue                   |  11 +-
 pages/user/user.vue                           |  16 +-
 18 files changed, 631 insertions(+), 152 deletions(-)
 create mode 100644 api/ProjectDetails/index.js
 create mode 100644 pages/ProjectDetails/ProjectDetails.scss
 create mode 100644 pages/ProjectDetails/ProjectDetails.vue

diff --git a/api/ProductList/ProductList.js b/api/ProductList/ProductList.js
index ed4c62a..b750720 100644
--- a/api/ProductList/ProductList.js
+++ b/api/ProductList/ProductList.js
@@ -1,8 +1,8 @@
 import request from "../request.js"
 
-export function goodsList(pageSize,pageNum,goodsCategoryId) {
+export function goodsList(pageSize,pageNum,goodsCategoryId,goodsName) {
 	return request({
-		url: `/nurseApplet/nursingStationGoods/goodsList?pageSize=${pageSize}&pageNum=${pageNum}&goodsCategoryId=${goodsCategoryId}`,
+		url: `/nurseApplet/nursingStationGoods/goodsList?pageSize=${pageSize}&pageNum=${pageNum}&goodsCategoryId=${goodsCategoryId}&goodsName=${goodsName}`,
 		method: 'GET'
 	})
 }
\ No newline at end of file
diff --git a/api/ProjectDetails/index.js b/api/ProjectDetails/index.js
new file mode 100644
index 0000000..bf08060
--- /dev/null
+++ b/api/ProjectDetails/index.js
@@ -0,0 +1,8 @@
+import request from "../request.js"
+
+export function getAppStationItemInfo(stationId, stationItemId, stationItemPriceId) {
+	return request({
+		url: `/nurseApp/login/getAppStationItemInfo?stationId=${stationId}&stationItemId=${stationItemId}&stationItemPriceId=${stationItemPriceId}`,
+		method: 'GET'
+	})
+}
diff --git a/manifest.json b/manifest.json
index b0dbda3..3770334 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "NurseStationAppletUI",
+    "name" : "nurseWeChatAppletUI",
     "appid" : "__UNI__1200110",
     "description" : "",
     "versionName" : "1.0.0",
@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Geolocation" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -43,7 +45,13 @@
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
-            "sdkConfigs" : {},
+            "sdkConfigs" : {
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                }
+            },
             "splashscreen" : {
                 "androidStyle" : "common"
             }
diff --git a/pages.json b/pages.json
index 92408f5..7a64d21 100644
--- a/pages.json
+++ b/pages.json
@@ -17,6 +17,14 @@
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 
 			}
+		}, {
+			"path": "pages/ProjectDetails/ProjectDetails",
+			"style": {
+				"navigationBarTitleText": "护理项目详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
+
 		}, {
 			"path": "pages/goodsorderRate/goodsorderRate",
 			"style": {
diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
index d0591ab..a163cb8 100644
--- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
+++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
@@ -8,7 +8,7 @@
 						{{item.orderStatus=='PAY'?'已付款':''}}
 						{{item.orderStatus=='WAIT_DISPATCH'?'待服务':''}}
 						{{item.orderStatus=='NOT_FINISH'?'待完成':''}}
-						{{item.orderStatus=='COMPLETE'?'未评价':''}}
+						{{item.orderStatus=='COMPLETE'?'待评价':''}}
 						{{item.orderStatus=='EVALUATED'?'服务完成':''}}
 						{{item.orderStatus=='WAIT_REFUND'?'退款中':''}}
 						{{item.orderStatus=='REFUNDED'?'已退款':''}}
@@ -64,7 +64,7 @@
 				openid: null,
 				patientId: null,
 				pageNum: 1,
-				total:0,
+				total: 0,
 				pageSize: 10,
 				list: [],
 			}
@@ -87,13 +87,12 @@
 				}
 			} catch (e) {}
 		},
-		onLoad() {
-		},
+		onLoad() {},
 		methods: {
 			//去评价
 			// gorate(){
 			// 	uni.navigateTo({
-					
+
 			// 	})
 			// },
 			//支付
@@ -107,7 +106,7 @@
 					payType: "WECHAT_PAY",
 					buySource: "NURSE_STATION",
 				}
-				var that =this
+				var that = this
 				appletAppointmentOrderPay(obj).then(response => {
 					if (response.code == 200) {
 						uni.requestPayment({
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index 7dbd560..7f058c7 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -1,5 +1,9 @@
 <template>
 	<view class="app">
+		<view class="inputs">
+			<i class="icon"></i>
+			<input v-model="goodsName" type="text" name="" id="" class="input" placeholder="请输入商品名称">
+		</view>
 		<view class="productlist">
 			<view class="item" @tap='goCommodityDetails(item)' v-for="(item,index) in goodsList" :key="index">
 				<image :src="baseurl+item.goodsPictureUrl" mode=""></image>
@@ -31,18 +35,28 @@
 				goodsCategoryId: '', //请求值
 				goodsList: [], //商品列表list
 				total: 0, //list总长度
+				goodsName: '',
 			};
 		},
+		watch: { //监听
+			goodsName() {
+				this.pageNum = 1;
+				goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => {
+					this.goodsList = res.rows
+					this.total = res.total
+				})
+			},
+		},
 		onLoad(options) { //获取传值
 			this.title = options.title //导航栏标题
 			this.goodsCategoryId = options.goodsCategoryId //请求id
 			this.baseurl = baseurl;
-			this.goodsListinfo(this.pageSize, this.pageNum, options.goodsCategoryId)
+			this.goodsListinfo()
 		},
 		methods: {
 			// 查询商品列表
-			goodsListinfo(pageSize, pageNum, goodsCategoryId) {
-				goodsList(pageSize, pageNum, goodsCategoryId).then(res => {
+			goodsListinfo() {
+				goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => {
 					res.rows.forEach(e => {
 						this.goodsList.push(e)
 					})
@@ -64,12 +78,12 @@
 		onReachBottom() { //下滑加载
 			if (this.goodsList.length >= this.total) {} else {
 				this.pageNum++;
-				this.goodsListinfo(this.pageSize, this.pageNum, this.goodsCategoryId)
+				this.goodsListinfo(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName)
 			}
 		},
 		onPullDownRefresh() { //下拉刷新
 			this.pageNum = 1;
-			goodsList(this.pageSize, this.pageNum, this.goodsCategoryId).then(res => {
+			goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => {
 				this.goodsList = res.rows
 				this.total = res.total
 			})
@@ -84,10 +98,43 @@
 	.app {
 		padding: 0;
 
+		.inputs {
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border: 1px solid #f0f0f0;
+			width: 90%;
+			height: 65rpx;
+			margin: 10rpx 0 10rpx 50%;
+			transform: translateX(-50%);
+			border-radius: 20rpx;
+			background-color: #Ffffff;
+			z-index: 999;
+
+			.input {
+				margin: 0 auto;
+				position: absolute;
+				height: 65rpx;
+				// top: 8%;
+				left: 10%;
+				width: 90%;
+				font-size: 26rpx;
+				color: #000000;
+			}
+
+			.icon {
+				background: url(@/static/sousuo.png) no-repeat;
+				width: 30rpx;
+				height: 28rpx;
+				background-size: cover;
+				position: absolute;
+				top: 30%;
+				left: 3%;
+			}
+		}
+
 		.productlist {
 			width: 100%;
 			margin: 0 auto;
-			padding: 40rpx 0 0 0;
+			padding: 20rpx 0 0 0;
 			display: flex;
 			flex-wrap: wrap;
 			justify-content: space-evenly;
diff --git a/pages/ProjectDetails/ProjectDetails.scss b/pages/ProjectDetails/ProjectDetails.scss
new file mode 100644
index 0000000..f2ad8a6
--- /dev/null
+++ b/pages/ProjectDetails/ProjectDetails.scss
@@ -0,0 +1,171 @@
+	.app {
+		height: 100%;
+		padding: 2% 2% 150rpx 2%;
+		padding-top: 10rpx;
+		font-size: 34rpx;
+		.mask {
+			.information {
+				width: 70%;
+				height: 400rpx;
+				margin: 50% auto;
+				background: #FFFFFF;
+				border-radius: 30rpx;
+				text-align: center;
+				color: #FFFFFF;
+				position: relative;
+		
+				.determine,
+				.cancel {
+					width: 200rpx;
+					height: 70rpx;
+					border-radius: 26rpx;
+					font-size: 34rpx;
+					line-height: 70rpx;
+					position: absolute;
+					top: 74%;
+				}
+		
+				.determine {
+					background: #4C7BC9;
+					right: 36rpx;
+				}
+		
+				.cancel {
+					background: #C5BFBF;
+					left: 36rpx;
+				}
+		
+				.title {
+					font-size: 42rpx;
+					margin-top: 40rpx;
+					color: #000000;
+				}
+		
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					margin: 10% 0 0 0;
+				}
+			}
+		}
+		.appointment {
+			width: 120rpx;
+			height: 70rpx;
+			background: #4C7BC9;
+			border-radius: 26rpx;
+			color: #ffffff;
+			text-align: center;
+			line-height: 70rpx;
+			position: absolute;
+			bottom:20rpx;
+			right:5%;
+		}
+		.detail {
+			position: relative;
+			width: 94%;
+			height: 100%;
+			margin: 0 auto;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			margin-top: 3%;
+			font-size: 31rpx;
+			padding: 3%;
+			padding-bottom: 50rpx;
+			.textInfo {
+				word-break:break-all;
+				font-size: 29rpx;
+				text-indent: 2rem;
+				line-height: 42rpx;
+				color: #666666;
+				padding-top: 30rpx;
+				/deep/ .richPic {
+					width: 100% !important;
+					height: 100% !important;
+				}
+			}
+			.Introduction {
+				font-size: 31rpx;
+				color: #333333;
+				line-height: 12rpx;
+				margin-left: -3%;
+				padding: 3%;
+			}
+		}
+		.item {
+			width: 95%;
+			height: 100%;
+			background: #FFFFFF;
+			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 20rpx;
+			margin: 20rpx auto 0;
+			padding: 3% 3% 40rpx 3%;
+			line-height: 60rpx;
+			position: relative;
+
+			image {
+				width: 170rpx;
+				height: 170rpx;
+				margin-left: 3%;
+			}
+
+			.servicetime {
+				color: #999999;
+				line-height: 37rpx;
+				font-size: 30rpx;
+				position: absolute;
+				top: 35%;
+				left: 35%;
+			}
+
+			.price {
+				color: red;
+				font-size: 32rpx;
+				position: absolute;
+				top: 65%;
+				left: 35%;
+			}
+
+			.product {
+				color: #000000;
+				width: 60%;
+				position: absolute;
+				top: 14%;
+				left: 32%;
+				font-size: 28rpx;
+			}
+
+			.huanyao {
+				color: #000000;
+				position: absolute;
+				top: 10%;
+				left: 35%;
+				width: 60%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+		}
+
+		/* 耗材包 */
+		.Consumablespackage {
+			width: 95%;
+			height: 100%;
+			background: #FFFFFF;
+			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 20rpx;
+			margin: 20rpx auto 0;
+			padding: 3% 3% 40rpx 3%;
+			line-height: 60rpx;
+			font-size: 32rpx;
+
+			.detail {
+				font-size: 30rpx;
+				color: #000000;
+			}
+
+			span {
+				color: red;
+				float: right;
+			}
+		}
+	}
\ No newline at end of file
diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue
new file mode 100644
index 0000000..1519212
--- /dev/null
+++ b/pages/ProjectDetails/ProjectDetails.vue
@@ -0,0 +1,160 @@
+<template>
+	<view class="app">
+		<view class="item">
+			<image :src="list.itemPictureUrl"></image>
+			<view class="huanyao">{{list.nurseItemName}}
+			</view>
+			<!-- <view class="pingfen">
+			<u-rate :count="5" value="2"></u-rate>
+		</view> -->
+			<view class="servicetime">服务时长:{{list.serveDurationUnit?list.serveDurationUnit:'0'}}</view>
+			<view class="price">￥{{list.nurseItemPrice==null?'0':list.nurseItemPrice}}</view>
+		</view>
+		<view class="Consumablespackage" v-if='list.itemConsumableList'>耗材包详情:
+			<span>￥{{list.consumableTotalPrice==null?'0':list.consumableTotalPrice}}</span>
+			<view class="detail" v-for='(item,index) in list.itemConsumableList' :key="index">
+				·{{item.consumableDetail}}
+			</view>
+		</view>
+		<view class="detail">
+			<view class="Introduction">服务详情:</view>
+			<view class="textInfo" v-html="list.nurseItemContent">
+			</view>
+		</view>
+		<view class="appointment" @tap.stop='goappointments(item)'>预约</view>
+		<u-toast ref="uToast" />
+		<u-mask :show="usershow" class='mask'>
+			<view class="information">
+				<image src="../../static/information.png" mode=""></image>
+				<view class="title">
+					请完善个人信息
+				</view>
+				<view class="cancel" @tap='usershow=false'>
+					取消
+				</view>
+				<view class="determine" @tap='goinformation'>
+					去完善
+				</view>
+			</view>
+		</u-mask>
+	</view>
+</template>
+<script>
+	import {
+		AppIdentification
+	} from '@/api/AppIdentification/index.js'
+	import baseurl from '@/api/baseurl.js'
+	import {
+		getAppStationItemInfo
+	} from '@/api/ProjectDetails/index.js'
+	export default {
+		data() {
+			return {
+				baseurl: '',
+				list: {},
+				orderNo: '',
+				usershow: false, //完善信息开关
+				list: [], //护理站list
+				timer: null,
+			}
+		},
+		onLoad(options) {
+			// 耗材包详情方法调用
+			this.getlist(options.stationId, options.stationItemId, options.stationItemPriceId)
+		},
+		onShow() {
+			this.usershow = false
+		},
+		methods: {
+			//预约
+			goappointments() {
+				let that = this
+				try {
+					const value = uni.getStorageSync('openid');
+					if (value) {
+						const value2 = uni.getStorageSync('patientId');
+						if (value2) {
+							AppIdentification(value2).then(res => {
+								if (res.code == 200) {
+									if (res.data.loginFlag) {
+										that.usershow = false
+										uni.navigateTo({
+											url: `/pages/appointmenttime/appointmenttime?stationId=${this.list.stationId}&stationItemId=${this.list.stationItemId}&stationItemPriceId=${this.list.stationItemPriceId}`,
+										})
+									} else {
+										that.usershow = true
+									}
+								} else {
+									that.$refs.uToast.show({
+										title: res.msg,
+										type: 'error'
+									})
+									if (that.timer) {
+										clearTimeout(that.timer)
+									}
+									that.timer = setTimeout(e => {
+										uni.navigateTo({
+											url: '/pages/login/login'
+										})
+									}, 1500)
+								}
+							})
+						} else {
+							that.$refs.uToast.show({
+								title: '未登录,请先登录',
+								type: 'error'
+							})
+							if (that.timer) {
+								clearTimeout(that.timer)
+							}
+							that.timer = setTimeout(e => {
+								uni.navigateTo({
+									url: '/pages/login/login'
+								})
+							}, 1500)
+						}
+					} else {
+						that.$refs.uToast.show({
+							title: '未登录,请先登录',
+							type: 'error'
+						})
+						if (that.timer) {
+							clearTimeout(that.timer)
+						}
+						that.timer = setTimeout(e => {
+							uni.navigateTo({
+								url: '/pages/login/login'
+							})
+						}, 1500)
+					}
+				} catch (e) {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				}
+			},
+			//跳转完善页面
+			goinformation() {
+				this.usershow = false
+				uni.navigateTo({
+					url: '/pages/information/information'
+				})
+			},
+			// 信息
+			getlist(stationId, stationItemId, stationItemPriceId) {
+				getAppStationItemInfo(stationId, stationItemId, stationItemPriceId).then(res => {
+					res.data.nurseItemContent = res.data.nurseItemContent.replace(/\<img/gi,
+						"<img class='richPic'")
+					// res.data.nurseItemContent = res.data.nurseItemContent.replace(/\<img/,
+					// 	"<br/> <img class='richPic'")
+					res.data.itemPictureUrl = baseurl + res.data.itemPictureUrl
+					this.list = res.data
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import './ProjectDetails.scss';
+</style>
diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss
index 785e187..ea5525c 100644
--- a/pages/appointmenttime/appointmenttime.scss
+++ b/pages/appointmenttime/appointmenttime.scss
@@ -1,87 +1,95 @@
 .app {
-	font-size: 34rpx;
-	padding-top: 10rpx;
-	height: 100%;
-	.mask{
-		.Agreement{
-			width: 100%;
-		background-color: #F4F5F7;
-			text-align: center;
-			height: 1000rpx;
-			position: absolute;
-			top:5%;
-			width:94%;
-			left:3%;
-			font-size: 30rpx;
-			.title{
-				height: 100rpx;
-				line-height: 100rpx;
-				border-bottom: 1px solid #eeeeee;
-				font-size: 34rpx;
-				margin: 0px auto;
-				width: 100%;
-				text-align: center;
-			}
-			.scroll-Y{
-				width: 98%;
-				margin: 0 auto;
-					height:830rpx ;
-				overflow-y:scroll;
-				text-align: left;
-				text-indent: 2em;
-			}
-			.cancel {
-				height:70rpx;
-				line-height: 70rpx;
-				font-size: 32rpx;
-				background-color: #F4F5F7;
-				position: absolute;
-				border-top: 1rpx solid #000000;
-				bottom:0;
-				right:0;
-				width: 50%;
-				color: #000000;
-			}
-				
-			.determine {
-				height:70rpx;
-				line-height: 70rpx;
-				font-size: 32rpx;
-				width: 50%;
-				color: #F4F5F7;
-				background: #4C7BC9;
-				position: absolute;
-				bottom:0;
-				left:0;
-			}
-		}
-	}
-	.addressitem{
-		width: 97%;
-		border-bottom: 1rpx solid #D8D4D4;
-		margin-left: 3%;
+		font-size: 34rpx;
+		padding-top: 10rpx;
 		height: 100%;
-		.leftaddress{
-			width:15%;
+
+		.mask {
+			.Agreement {
+				width: 100%;
+				background-color: #F4F5F7;
+				text-align: center;
+				height: 1000rpx;
+				position: absolute;
+				top: 5%;
+				width: 94%;
+				left: 3%;
+				font-size: 30rpx;
+
+				.title {
+					height: 100rpx;
+					line-height: 100rpx;
+					border-bottom: 1px solid #eeeeee;
+					font-size: 34rpx;
+					margin: 0px auto;
+					width: 100%;
+					text-align: center;
+				}
+
+				.scroll-Y {
+					width: 98%;
+					margin: 0 auto;
+					height: 830rpx;
+					overflow-y: scroll;
+					text-align: left;
+					text-indent: 2em;
+				}
+
+				.cancel {
+					height: 70rpx;
+					line-height: 70rpx;
+					font-size: 32rpx;
+					background-color: #F4F5F7;
+					position: absolute;
+					border-top: 1rpx solid #000000;
+					bottom: 0;
+					right: 0;
+					width: 50%;
+					color: #000000;
+				}
+
+				.determine {
+					height: 70rpx;
+					line-height: 70rpx;
+					font-size: 32rpx;
+					width: 50%;
+					color: #F4F5F7;
+					background: #4C7BC9;
+					position: absolute;
+					bottom: 0;
+					left: 0;
+				}
+			}
+		}
+
+		.addressitem {
+			width: 97%;
+			border-bottom: 1rpx solid #D8D4D4;
+			margin-left: 3%;
 			height: 100%;
-			display: flex;
-			display: inline-block;
+
+			.leftaddress {
+				width: 15%;
+				height: 100%;
+				display: flex;
+				display: inline-block;
+			}
+
+			.addition {
+				color: #666666;
+				display: inline-block;
+				line-height: 50rpx;
+				font-size: 28rpx;
+			}
 		}
-		.addition{
-			color: #666666;
-			display: inline-block;
-			line-height: 50rpx;
-			font-size: 28rpx;
-		}
-	}
 
 		.money {
 			font-size: 32rpx;
 			color: #D43953;
 			position: absolute;
-			right:5%;
-			top:20%;
+			right: 5%;
+			top: 20%;
 		}
+
 		.user {
 			background: #FFFFFF;
 			width: 94%;
@@ -89,39 +97,46 @@
 			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border-radius: 20rpx;
 			line-height: 93rpx;
+
 			.selecttime {
 				height: 93rpx;
 				margin-left: 3%;
 				position: relative;
+
 				text {
 					font-size: 34rpx;
 					color: #878987;
 				}
+
 				image {
 					width: 18rpx;
 					height: 27rpx;
 					position: absolute;
-					right:5%;
-					top:50%;
+					right: 5%;
+					top: 50%;
 					transform: translateY(-50%);
 				}
-				.addition{
+
+				.addition {
 					color: #666666;
 					line-height: 30rpx;
 					font-size: 28rpx;
 				}
 			}
+
 			.item {
 				width: 97%;
 				border-bottom: 1rpx solid #D8D4D4;
 				margin-left: 3%;
-				.addition{
+
+				.addition {
 					color: #666666;
 					line-height: 30rpx;
 					font-size: 28rpx;
 				}
 			}
 		}
+
 		.remarks {
 			width: 94%;
 			height: 382rpx;
@@ -133,32 +148,37 @@
 			border-radius: 20rpx;
 			margin-top: 20rpx;
 			position: relative;
-			span{
+
+			span {
 				display: inline-block;
 				width: 20%;
 			}
+
 			input {
 				position: absolute;
-				top:50%;
-				left:23%;
+				top: 50%;
+				left: 23%;
 				width: 77%;
 				transform: translateY(-50%);
 			}
 		}
+
 		.priceback {
 			width: 99%;
 			background: #FFFFFF;
 			height: 100rpx;
-			position:fixed;
-			bottom:0;
+			position: fixed;
+			bottom: 0;
 			padding-bottom: 20rpx;
 			display: flex;
 			justify-content: space-around;
+
 			.prices {
 				font-size: 48rpx;
 				color: #D43953;
 				line-height: 100rpx;
 			}
+
 			.xiugai {
 				width: 200rpx;
 				height: 70rpx;
@@ -170,6 +190,7 @@
 				text-align: center;
 				color: #ffffff;
 			}
+
 			.queren {
 				width: 200rpx;
 				height: 70rpx;
@@ -181,22 +202,26 @@
 				color: #ffffff;
 			}
 		}
+
 		.radio-content {
 			margin: 50rpx auto;
 			width: 70%;
 			text-align: center;
 			font-size: 28rpx;
 			position: relative;
+
 			.agreement {
 				position: absolute;
-				top:50%;
-				left:20%;
+				top: 50%;
+				left: 20%;
 				transform: translateY(-50%);
 				color: #878987;
-				}
+			}
+
 			.radio-right {
 				height: 100rpx;
 				width: 100rpx;
+
 				.radio {
 					display: inline-block;
 					width: 35rpx;
@@ -204,21 +229,25 @@
 					border-radius: 70%;
 					border: 2rpx solid #178ffb;
 					position: absolute;
-					top:50%;
-					left:5%;
+					top: 50%;
+					left: 5%;
 					transform: translateY(-50%);
+
 					.radio-active {
 						width: 16rpx;
 						height: 16rpx;
 						border-radius: 50%;
 						background-color: #178ffb;
-						margin-left: 26%;
-						margin-top: 22%;
+						position: absolute;
+						top: 50%;
+						left: 50%;
+						transform: translate(-50%, -50%);
 						// margin: 0 auto;
 					}
 				}
 			}
 		}
+
 		/* 耗材包 */
 		.Consumablespackage {
 			width: 94%;
@@ -230,15 +259,14 @@
 			margin-top: 20rpx;
 			position: relative;
 			padding-bottom: 40rpx;
+
 			.detail {
-				width: 301rpx;
-				height: 31rpx;
-				font-size: 32rpx;
-				color: #666666;
-				line-height: 31rpx;
+				width: 100%;
+				line-height: 60rpx;
 				margin: 20rpx 0 0 40rpx;
 			}
 		}
+
 		/* 套餐 */
 		.Package {
 			width: 94%;
@@ -248,18 +276,20 @@
 			font-size: 34rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx;
-			margin-top:20rpx;
+			margin-top: 20rpx;
 			position: relative;
+
 			.detail {
 				line-height: 31rpx;
 				font-size: 32rpx;
 				color: #666666;
 				line-height: 31rpx;
 				position: absolute;
-				left:10%;
-				top:60%;
+				left: 10%;
+				top: 60%;
 			}
 		}
+
 		.message {
 			width: 94%;
 			background: white;
@@ -268,4 +298,4 @@
 			text-align: center;
 			line-height: 96rpx;
 		}
-	}
+	}
\ No newline at end of file
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index ac9c005..4f77b09 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -46,8 +46,14 @@
 		</view>
 		<view class="Consumablespackage">耗材包详情：
 			<text class="money">￥{{orderlist.consumableTotalPrice}}</text>
-			<view class="detail" v-for="(item,index) in orderlist.itemConsumableList">
-				·{{item.consumableDetail}}
+			<view class="detail">
+				<u-checkbox-group @change="checkboxGroupChange" wrap='true'>
+					<u-checkbox @change="checkboxChange" v-model="item.radio"
+						v-for="(item, index) in orderlist.itemConsumableList" :key="index"
+						:name="item.consumableDetail">
+						{{item.consumableDetail}}
+					</u-checkbox>
+				</u-checkbox-group>
 			</view>
 		</view>
 		<view class="remarks">
@@ -62,7 +68,6 @@
 			</view>
 			<view class="agreement">我已阅读并同意<text @tap='maskshow=true'
 					style="color: #000000;border-bottom: 1rpx solid #000000;">《用户协议》</text></view>
-
 		</view>
 		<view class="priceback">
 			<view class="prices">￥{{orderlist.totalPrice}}</view>
@@ -214,6 +219,11 @@
 			getPatientInfo(stationId, stationItemId, stationItemPriceId) {
 				getAppStationItemInfo(stationId, stationItemId, stationItemPriceId).then(res => {
 					if (res.code == 200) {
+						if (res.data.itemConsumableList) {
+							res.data.itemConsumableList.forEach(e => {
+								e.radio = true
+							})
+						}
 						this.orderlist = res.data
 					}
 				})
@@ -229,7 +239,12 @@
 					})
 				} else {
 					this.orderlist.orderCount = 1;
-					this.orderlist.orderConsumableList = this.orderlist.itemConsumableList
+					this.orderlist.orderConsumableList = []
+					this.orderlist.itemConsumableList.forEach(e => {
+						if (e.radio) {
+							this.orderlist.orderConsumableList.push(e)
+						}
+					})
 					submitAppointment(this.orderlist).then(res => {
 						if (res.code == 500) {
 							that.$refs.uToast.show({
@@ -295,6 +310,11 @@
 				this.radio = 2;
 				this.maskshow = false
 			},
+			checkboxChange(e) {},
+			// 选中任一checkbox时，由checkbox-group触发
+			checkboxGroupChange(e) {},
+			// 全选
+			checkedAll() {},
 			//获取时间
 			timeconfirm(e) {
 				this.orderlist.serviceStartTime = e.hour + ":" + e.minute
diff --git a/pages/information/information.scss b/pages/information/information.scss
index 1c384ad..3716c8c 100644
--- a/pages/information/information.scss
+++ b/pages/information/information.scss
@@ -79,9 +79,10 @@
 					height: 16rpx;
 					border-radius: 50%;
 					background-color: #178ffb;
-					margin-left: 26%;
-					margin-top: 22%;
-					// margin: 0 auto;
+				position: absolute;
+				top:50%;
+				left:50%;
+				transform: translate(-50%,-50%);
 				}
 			}
 		}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index bc64b0a..8efaf67 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -54,6 +54,12 @@
 								delta: 1
 							})
 						}, 1500)
+					}else{
+						this.$refs.uToast.show({
+							title: '登录失败',
+							type: 'error',
+							duration: '1500'
+						})
 					}
 				})
 			},
diff --git a/pages/modify/modify.scss b/pages/modify/modify.scss
index dda2b3b..01f9cb3 100644
--- a/pages/modify/modify.scss
+++ b/pages/modify/modify.scss
@@ -81,9 +81,10 @@
 						height: 16rpx;
 						border-radius: 50%;
 						background-color: #178ffb;
-						margin-left: 26%;
-						margin-top: 22%;
-						// margin: 0 auto;
+					position: absolute;
+					top:50%;
+					left:50%;
+					transform: translate(-50%,-50%);
 					}
 				}
 			}
diff --git a/pages/modifyAddress/modifyAddress.vue b/pages/modifyAddress/modifyAddress.vue
index 7b44277..4edca31 100644
--- a/pages/modifyAddress/modifyAddress.vue
+++ b/pages/modifyAddress/modifyAddress.vue
@@ -22,7 +22,7 @@
 		<view class="ADDress" @tap='add()'>
 			<image src="../../static/add.png" mode=""></image>
 			<span class="ADDtext">
-				添加收货地址
+				添加地址
 			</span>
 		</view>
 		<!-- 弹框 -->
@@ -161,7 +161,7 @@
 			},
 			// 修改按钮
 			updataxg(item) {
-				this.shipAddress = '修改收货地址'
+				this.shipAddress = '修改地址'
 				this.isedit = false
 				nursingStationGoodsinfo(item.id).then(res => {
 					this.infolist = res.data
diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss
index 78c2e03..9ea5a86 100644
--- a/pages/nursestation/nursestation.scss
+++ b/pages/nursestation/nursestation.scss
@@ -208,6 +208,10 @@
 				line-height: 42rpx;
 				color: #666666;
 				padding-top: 30rpx;
+				/deep/ .richPic {
+					width: 94% !important;
+					height: 94% !important;
+				}
 			}
 			.Introduction {
 				font-size: 31rpx;
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index 4b2c199..a7cb8fe 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -19,8 +19,7 @@
 			</view>
 			<view class="detail">
 				<view class="Introduction">机构简介</view>
-				<view class="textInfo">
-					{{list.agencyIntroduce}}
+				<view class="textInfo" v-html="list.agencyIntroduce">
 				</view>
 			</view>
 			<view class="Nursestationconfiguration">
@@ -41,7 +40,8 @@
 					</view>
 				</view>
 				<view class="" v-if="servelist.length>0&&choicetab==false">
-					<view class="item" v-for="item in servelist" :key="" v-show='choicetab==false'>
+					<view class="item" v-for="item in servelist" :key="" v-show='choicetab==false'
+						@click.stop='goProjectDetails(item)'>
 						<image :src="item.itemPictureUrl"></image>
 						<view class="huanyao">{{item.nurseItemName}}
 						</view>
@@ -49,7 +49,7 @@
 						<u-rate :count="5" value="2"></u-rate>
 					</view> -->
 						<view class="servicetime">服务时长:{{item.serveDurationUnit?item.serveDurationUnit:'0'}}</view>
-						<view class="appointment" @tap='goappointments(item)'>预约</view>
+						<view class="appointment" @tap.stop='goappointments(item)'>预约</view>
 						<view class="price">￥{{item.nurseItemPrice==null?'0':item.nurseItemPrice}}</view>
 					</view>
 				</view>
@@ -106,7 +106,6 @@
 	export default {
 		data() {
 			return {
-				patientId: '', //
 				usershow: false, //完善信息开关
 				choicetab: false, //切换
 				list: [], //护理站list
@@ -121,6 +120,7 @@
 				pageNum: 1,
 				pageSize: 10,
 				tabIndex: 0,
+				timer: null,
 				tabList: [{
 					name: "服务项目"
 				}, {
@@ -145,8 +145,7 @@
 					if (value) {
 						const value2 = uni.getStorageSync('patientId');
 						if (value2) {
-							that.patientId = value2
-							AppIdentification(that.patientId).then(res => {
+							AppIdentification(value2).then(res => {
 								if (res.code == 200) {
 									if (res.data.loginFlag) {
 										that.usershow = false
@@ -161,7 +160,10 @@
 										title: res.msg,
 										type: 'error'
 									})
-									setTimeout(e => {
+									if (that.timer) {
+										clearTimeout(that.timer)
+									}
+									that.timer = setTimeout(e => {
 										uni.navigateTo({
 											url: '/pages/login/login'
 										})
@@ -173,7 +175,10 @@
 								title: '未登录,请先登录',
 								type: 'error'
 							})
-							setTimeout(e => {
+							if (that.timer) {
+								clearTimeout(that.timer)
+							}
+							that.timer = setTimeout(e => {
 								uni.navigateTo({
 									url: '/pages/login/login'
 								})
@@ -184,7 +189,10 @@
 							title: '未登录,请先登录',
 							type: 'error'
 						})
-						setTimeout(e => {
+						if (that.timer) {
+							clearTimeout(that.timer)
+						}
+						that.timer = setTimeout(e => {
 							uni.navigateTo({
 								url: '/pages/login/login'
 							})
@@ -199,6 +207,9 @@
 			getInfo() {
 				introductionList(this.nurseStationId).then(res => {
 					res.data.stationIntroducePcitureUrl = baseurl + res.data.stationIntroducePcitureUrl
+					res.data.agencyIntroduce = res.data.agencyIntroduce.replace(/\<img/gi, "<img class='richPic'")
+					// res.data.agencyIntroduce = res.data.agencyIntroduce.replace(/\<img/,
+					// 	"<br/> <img class='richPic'")
 					this.list = res.data
 					if (res.data.nurseStationLabelList) {
 						this.nurseStationLabelList = res.data.nurseStationLabelList
@@ -240,6 +251,11 @@
 					url: '/pages/information/information'
 				})
 			},
+			goProjectDetails(item) {
+				uni.navigateTo({
+					url: `/pages/ProjectDetails/ProjectDetails?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`,
+				})
+			},
 			gophone() {
 				var that = this
 				uni.getSystemInfo({
@@ -265,7 +281,6 @@
 				});
 			}
 		},
-
 		onReachBottom() { //下滑加载
 			if (this.choicetab == 0) {
 				if (this.servelist.length >= this.servetotal) {} else {
diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue
index 9047730..b9d7699 100644
--- a/pages/shopping/shopping.vue
+++ b/pages/shopping/shopping.vue
@@ -3,9 +3,8 @@
 		<view class="cards">
 			<view class="item" :style="{background:listcolor[index]}" @tap='goProductList(item)'
 				v-for="(item,index) in goodsCategoryList" :key="index">
-				<image :style="index==4?'top:0;border-radius: 20rpx;width:100%;height: 300rpx;':''"
-					:src="item.goodsCategoryPicture" mode=""></image>
-				<view class="title" style="font-size:42rpx" v-if="index!=4">
+				<image :src="item.goodsCategoryPicture" mode=""></image>
+				<view class="title" style="font-size:42rpx">
 					{{item.goodsCategoryName}}
 				</view>
 			</view>
@@ -89,7 +88,9 @@
 </script>
 
 <style lang="scss">
-	.item:nth-child(0) {
-		image {}
+	.app {
+		.cards {
+			padding: 22px 0 20px 0;
+		}
 	}
 </style>
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 0de26cd..fd5f7aa 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -117,10 +117,9 @@
 		},
 		onShow() {
 			this.baseurl = baseurl
-			this.myInfo()
 		},
 		onLoad(options) {
-			//获取传值
+			this.myInfo()
 		},
 		methods: {
 			remove() {
@@ -129,6 +128,7 @@
 					title: '提示',
 					content: '确认要退出此账号吗',
 					success: function(res) {
+						console.log(res)
 						if (res.confirm) {
 							uni.removeStorageSync('patientId');
 							uni.removeStorageSync('openid');
@@ -142,8 +142,8 @@
 								clearTimeout(that.timer)
 							}
 							that.timer = setTimeout(e => {
-								uni.reLaunch({
-									url: '/pages/homepage/homepage'
+								uni.navigateBack({
+									delta: 1
 								})
 							}, 1000)
 						} else if (res.cancel) {
@@ -171,8 +171,8 @@
 										if (Response.code == 200) {
 											that.appPersonallist = Response.data
 										} else {
-											uni.navigateTo({
-												url: '/pages/login/login'
+											uni.navigateBack({
+												delta: 1
 											})
 										}
 									})
@@ -192,8 +192,8 @@
 				uni.removeStorageSync('patientId');
 				uni.removeStorageSync('openid');
 				uni.removeStorageSync('phone');
-				uni.navigateTo({
-					url: '/pages/login/login'
+				uni.navigateBack({
+					delta: 1
 				})
 			},
 			updatainfo() {