修改

pages.json

@@ -9,7 +9,15 @@
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
-		}, {
+		},
+		{
+			"path": "pages/forgotPassword/forgotPassword",
+			"style": {
+				"navigationBarTitleText": "忘记密码",
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},
+		{
 			"path": "pages/register/register",
 			"style": {
 				"navigationBarTitleText": "注册账号",
@@ -255,6 +263,14 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
+		}, {
+			"path": "pages/paysuccess/paysuccess",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
 		}
 	],
 	"globalStyle": {

pages/Aftersalesdetails/Aftersalesdetails.vue

@@ -67,13 +67,23 @@
 			this.goodsOrderId = options.goodsOrderId
 			this.baseurl = baseurl
 			let that = this
-			uni.getStorage({
+			try {
-				key: 'patientId',
+				const value = uni.getStorageSync('patientId');
-				success: function(res) {
+				if (value) {
-					that.patientId = res.data
+					that.patientId = value
 					that.goodsOrderinfo();
 				}
-			});
+			} catch (e) {
+				// error
+			}
+			
+			// uni.getStorage({
+			// 	key: 'patientId',
+			// 	success: function(res) {
+			// 		that.patientId = res.data
+			// 		that.goodsOrderinfo();
+			// 	}
+			// });
 		}
 	}
 </script>

pages/Applforrefund/Applforrefund.vue

@@ -59,6 +59,7 @@
 		methods: {
 			//退款
 			refundinfo() {
+				this.order.updateTime = null
 				refund(this.order).then(
 					res => {
 						console.log(res)
@@ -73,14 +74,11 @@
 								type: 'success',
 								duration: '1500'
 							})
-							setTimeout(() => {
+							setTimeout(e => {
-								// uni.navigateTo({
+								uni.navigateBack({
-								// 	url: '/pages/Aftersalesdetails/Aftersalesdetails'
+									delta: 3
-								// })
+								});
-								uni.navigateTo({
+							}, 1500)
-									url: '/pages/CommodityOrder/CommodityOrder'
-								})
-							}, 1500);
 						}
 					})
 			},

pages/CommodityDetails/CommodityDetails.vue

@@ -124,6 +124,9 @@
 	import {
 		AppIdentification
 	} from '@/api/AppIdentification/index.js'
+	import {
+		goodPatientInfo
+	} from '@/api/modifyAddress/modifyAddress.js';
 	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
@@ -164,43 +167,61 @@
 		methods: {
 			//跳转完善页面
 			goinformation() {
+				this.usershow = false
 				uni.navigateTo({
 					url: '/pages/information/information'
 				})
 			},
 			//立即购买跳转确认订单页面
 			tapbuy() {
-				AppIdentification(this.updata.patientId).then(res => {
+				this.buyshow = false
-					console.log(res)
+				let that = this
+				try {
+					const value = uni.getStorageSync('patientId');
+					if (value) {
+						if (!that.updata.patientId) {
+							that.goodsList()
+						}
+						that.updata.patientId = value
+						AppIdentification(value).then(res => {
 							if (res.data.loginFlag) {
-						if (this.goodshow == true) {
+								if (that.goodshow == true) {
-							if (this.updata.goodsAttributeName == '') {
+									if (that.updata.goodsAttributeName == '') {
-								this.$refs.uToast.show({
+										that.$refs.uToast.show({
 											title: '未选择商品',
 											type: 'error'
 										})
-							} else if (this.updata.goodsStock == 0) {
+									} else if (that.updata.goodsStock == 0) {
-								this.$refs.uToast.show({
+										that.$refs.uToast.show({
 											title: '库存数量不足,无法购买',
 											type: 'error'
 										})
 									} else {
-								this.updata.totalPrice = (this.updata.goodsPrice * this.updata.goodsCount).toFixed(
+										that.updata.totalPrice = (that.updata.goodsPrice * that.updata
+											.goodsCount).toFixed(
 											2)
 										uni.navigateTo({
-									url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(this.updata)}`
+											url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
 										})
 									}
 								} else {
 									uni.navigateTo({
-								url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(this.updata)}`
+										url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
 									})
 								}
 							} else {
-						this.buyshow = false
+								that.buyshow = false
-						this.usershow = true
+								that.usershow = true
 							}
 						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+					}
+				} catch (e) {
+					// error
+				}
 			},
 			// tapbuy() {
 			// 	this.goodsDetailslist.goodDetailsLists.forEach(e => {
@@ -237,7 +258,6 @@
 					this.updata.goodsStock = item.goodsStock
 					this.updata.goodsAttributeId = item.goodsAttributeId
 					this.updata.goodsAttributeDetailsId = item.attributeDetailsId
-					this.updata.img = this.baseurl + item.attributePitureUrl
 				}
 			},
 
@@ -287,6 +307,7 @@
 					this.goodsDetailslist = res.data[0]
 					this.updata.goodsName = this.goodsDetailslist.goodsName
 					this.updata.nurseStationId = this.goodsDetailslist.nurseStationId
+					this.updata.img = res.data[0].goodsPictureUrl
 					this.goodDetailsLists = res.data[0].goodDetailsLists
 					// res.data[0].goodDetailsLists.forEach(e => {
 					// 	e.goodAttributeDetailsLists.forEach(el => {
@@ -301,22 +322,40 @@
 					// this.goodDetailsLists = res.data[0].goodDetailsLists
 				})
 			},
+			// 收件人
+			goodsList() {
+				goodPatientInfo(this.updata.patientId).then(res => {
+					res.data.forEach(e => {
+						e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e
+							.receiveAddress
+					})
+					this.updata.receiver = res.data[0].receiveName
+					this.updata.receiveAddress = res.data[0].address
+					this.updata.phone = res.data[0].receivePhone
+				})
+			},
 		},
 		onLoad(options) { //获取传值
 			this.updata.buySource = options.buySource
-			this.usershow = false
-			let that = this
-			uni.getStorage({
-				key: 'patientId',
-				success: function(res) {
-					that.updata.patientId = res.data
-					console.log(that.updata)
-				}
-			});
 			this.goodsPrice = options.goodsPrice //页面价格
-			this.baseurl = baseurl;
 			this.goodsDetailsinfo(options.goodsInfoId)
 		},
+		onShow() {
+			this.baseurl = baseurl
+			this.usershow = false
+			this.baseurl = baseurl;
+			let that = this
+			try {
+				const value = uni.getStorageSync('patientId');
+				if (value) {
+					that.updata.patientId = value
+					console.log(that.updata.patientId)
+					that.goodsList()
+				} else {}
+			} catch (e) {
+				// error
+			}
+		},
 	}
 </script>
 

pages/CommodityOrder/CommodityOrder.vue

@@ -127,7 +127,18 @@
 				title: this.title,
 			});
 		},
+		onShow() {
+			let that = this
+			try {
+				const value = uni.getStorageSync('patientId');
+				if (value) {
+					that.patientId = value
+					that.goodsOrderinfo();
+				}
+			} catch (e) {}
+		},
 		onLoad(options) { //开局调用
+			this.baseurl = baseurl;
 			if (options.orderStatus) {
 				this.orderStatus = options.orderStatus
 				if (options.orderStatus == 'WAIT_PAY') {
@@ -138,15 +149,6 @@
 					this.title = '已完成'
 				}
 			}
-			let that = this
-			uni.getStorage({
-				key: 'patientId',
-				success: function(res) {
-					that.patientId = res.data
-					that.goodsOrderinfo();
-				}
-			});
-			this.baseurl = baseurl;
 		},
 		onReachBottom() { //下滑加载
 			if (this.orderlist.length >= this.total) {} else {

pages/Nursingstationserviceorder/Nursingstationserviceorder.vue

@@ -52,17 +52,18 @@
 				list: [],
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.baseurl = baseurl
 			let that = this
-			uni.getStorage({
+			try {
-				key: 'patientId',
+				const value = uni.getStorageSync('patientId');
-				success: function(res) {
+				if (value) {
-					that.patientId = res.data
+					that.patientId = value
 					that.getinfo()
 				}
-			});
+			} catch (e) {}
 		},
+		onLoad() {},
 		methods: {
 			//支付
 			buy(item) {

pages/ServiceDetails/ServiceDetails.scss

@@ -176,7 +176,7 @@
 					.model {
 						position: absolute;
 						left:35%;
-						top:20%;
+						top:8%;
 						width: 65%;
 						.top,.bottom{
 							view {
@@ -186,6 +186,7 @@
 								overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
+								word-break:break-all;
 							}
 						}
 					

pages/ServiceDetails/ServiceDetails.vue

@@ -51,7 +51,7 @@
 		</view>
 		<view class="remarks">
 			<view>备注：</view>
-			<input placeholder="" v-model='userinfo.remark'>
+			<input placeholder="请输入" v-model='userinfo.remark'>
 		</view>
 		<view class="evaluate">
 			<view class="cancelorder" @tap="cancelorderment()"
@@ -93,6 +93,9 @@
 			this.getinfo()
 			this.getlist()
 			this.getPatientInfo()
+		},
+		onShow(){
+			
 		},
 		methods: {
 			gophone() {
@@ -129,7 +132,8 @@
 			// 护理站信息列表
 			getlist() {
 				introductionList(this.stationId).then(res => {
-					this.nursestationlist = res[0];
+					this.nursestationlist = res.data;
+					console.log(this.nursestationlist)
 				})
 			},
 			//获取耗材包详情

pages/appointmenttime/appointmenttime.vue

@@ -105,23 +105,32 @@
 					consumableTotalPrice: '',
 					totalPrice: '',
 					remark: "",
-					orderConsumableList: []
+					orderConsumableList: [],
 				},
 			}
 		},
+		onShow() {
+			let that = this
+			uni.$on('updata', function(data) {
+				if (data.updata) {
+					that.orderlist = JSON.parse(data.updata)
+				}
+				if (data.useritem) {
+					that.useritem = JSON.parse(data.useritem)
+					that.orderlist.serviceAddress = that.useritem.address
+					that.personInfo.patientName = that.useritem.receiveName
+					that.personInfo.phone = that.useritem.receivePhone
+					that.personInfo.address = that.useritem.address
+				} else {}
+			})
+			setTimeout(e => {
+				if (!that.useritem) {
+					that.userinfo();
+				}
+			}, 500)
+		},
+
 		onLoad(options) {
-			if (options.updata) {
-				this.orderlist = JSON.parse(options.updata)
-			}
-			if (options.useritem) {
-				let useritem = JSON.parse(options.useritem)
-				this.orderlist.serviceAddress = useritem.address
-				this.personInfo.patientName = useritem.receiveName
-				this.personInfo.phone = useritem.receivePhone
-				this.personInfo.address = useritem.address
-			} else {
-				this.userinfo();
-			}
 			//耗材包详情方法调用
 			this.getPatientInfo(options.stationId, options.stationItemId, options.stationItemPriceId)
 		},
@@ -129,13 +138,12 @@
 			userinfo() {
 				//取出patientId
 				var that = this
-				uni.getStorage({
+				try {
-					key: 'patientId',
+					const value = uni.getStorageSync('patientId');
-					success: function(res) {
+					if (value) {
-						that.patientId = res.data
+						that.patientId = value
-						console.log(that.patientId)
 						//被护理人信息
-						getAppPatientList(that.patientId).then(response => {
+						getAppPatientList(value).then(response => {
 							that.personInfo = response.data
 							that.personInfo.address = response.data.provinceName + response.data
 								.cityName + response.data.regionName + response.data.streetName +
@@ -145,8 +153,29 @@
 								.cityName + response.data.regionName + response.data.streetName +
 								response.data.address
 						})
+						console.log(that.orderlist)
 					}
-				});
+				} catch (e) {
+					// error
+				}
+
+				// uni.getStorage({
+				// 	key: 'patientId',
+				// 	success: function(res) {
+				// 		that.patientId = res.data
+				// 		//被护理人信息
+				// 		getAppPatientList(that.patientId).then(response => {
+				// 			that.personInfo = response.data
+				// 			that.personInfo.address = response.data.provinceName + response.data
+				// 				.cityName + response.data.regionName + response.data.streetName +
+				// 				response.data.address
+				// 			that.orderlist.patientId = response.data.patientId
+				// 			that.orderlist.serviceAddress = response.data.provinceName + response.data
+				// 				.cityName + response.data.regionName + response.data.streetName +
+				// 				response.data.address
+				// 		})
+				// 	}
+				// });
 			},
 			//获取耗材包详情
 			getPatientInfo(stationId, stationItemId, stationItemPriceId) {
@@ -165,7 +194,10 @@
 						type: 'error',
 					})
 				} else {
+					this.orderlist.orderChannel = "MOBILE_APP"
+					this.orderlist.buySource = "NURSE_STATION"
 					this.orderlist.orderCount = 1;
+					console.log(this.orderlist)
 					submitAppointment(this.orderlist).then(res => {
 						if (res.code == 500) {
 							this.$refs.uToast.show({
@@ -176,17 +208,12 @@
 							this.$refs.uToast.show({
 								title: '预约成功',
 								type: 'success',
+								url:'/pages/paysuccess/paysuccess',
 								toast: 1500
 							})
-							setTimeout(() => {
-								uni.reLaunch({
-									url: `/pages/Personal/Personal`
-								})
-							}, 1500)
 						}
 					})
 				}
-
 			},
 			changeRadio() {
 				if (this.radio == 1) {

pages/cancelorder/cancelorder.vue

@@ -42,9 +42,13 @@
 					} else if (res.code == 200) {
 						this.$refs.uToast.show({
 							title: '取消成功',
-							type: 'success',
+							type: 'success'
-							url: '/pages/Nursingstationserviceorder/Nursingstationserviceorder'
 						})
+						setTimeout(e => {
+							uni.navigateBack({
+								delta: 2
+							});
+						}, 1500)
 					}
 				})
 			}

pages/confirmOrder/confirmOrder.vue

@@ -126,6 +126,10 @@
 							title: res.msg,
 							type: 'error'
 						})
+					} else {
+						uni.navigateTo({
+							url: `/pages/paysuccess/paysuccess`
+						})
 					}
 				})
 			},
@@ -144,7 +148,8 @@
 			goodsList() {
 				goodPatientInfo(this.updata.patientId).then(res => {
 					res.data.forEach(e => {
-						e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e.receiveAddress
+						e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e
+							.receiveAddress
 					})
 					this.updata.receiver = res.data[0].receiveName
 					this.updata.receiveAddress = res.data[0].address
@@ -154,16 +159,20 @@
 		},
 		onLoad(options) {
 			this.updata = JSON.parse(options.updata)
-			if (options.useritem) {
+		},
-				let useritem = JSON.parse(options.useritem)
+		onShow() {
-				this.updata.receiver = useritem.receiveName
+			var that = this
-				this.updata.phone = useritem.receivePhone
+			let useritem = null
-				this.updata.receiveAddress = useritem.address
+			uni.$on('updata', function(data) {
-			} else {
+				that.updata = JSON.parse(data.updata)
-				this.goodsList()
+				if (data.useritem) {
-			}
+					useritem = JSON.parse(data.useritem)
-			console.log(this.updata)
+					that.updata.receiver = useritem.receiveName
+					that.updata.phone = useritem.receivePhone
+					that.updata.receiveAddress = useritem.address
 				}
+			})
+		},
 	}
 </script>
 

pages/detail/detail.vue

@@ -3,7 +3,7 @@
 	<view class="app">
 		<view class="concent">
 			<view class="background">
-				<image src="/static/启动页.png" mode=""></image>
+				<image src="/static/logo.png" mode=""></image>
 				<view>
 					<view class="detailed">
 						<view>护理站是以维护社区人群健康、满足社区 人群基本医疗护理需求为宗旨，以护士为核心 的各类护理人员组成的团队，在一定社区范围 内，为长期卧床老人、患者、残疾人、临终患

pages/forgotPassword/forgotPassword.vue

@@ -52,7 +52,6 @@
 		},
 		methods: {
 			pwdlogin() {
-				ForgotPassword(this.phone, this.password, this.verification).then(res => {
 				if (this.password !== this.newpassword) {
 					this.$refs.uToast.show({
 						title: '密码输入不一致，请重新输入',
@@ -60,14 +59,23 @@
 						duration: '1500'
 					})
 				} else {
+					ForgotPassword(this.phone, this.password, this.verification).then(res => {
+						if (res.code == 200) {
 							this.$refs.uToast.show({
 								title: '密码修改成功',
 								type: 'success',
 								url: '/pages/login/login',
 								duration: '1500'
 							})
+						} else {
+							this.$refs.uToast.show({
+								title: res.msg,
+								type: 'error',
+								duration: '1500'
+							})
 						}
 					})
+				}
 			},
 			//点击获取验证码
 			getCode() {

pages/information/information.scss

@@ -21,17 +21,25 @@
 					height: 70rpx;
 					border-radius: 26rpx;
 					margin: 0 20rpx  20rpx 0;
+					padding: 0 10rpx ;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
 				}
 				
 				.choice {
 					display: inline-block;
 					text-align: center;
 					line-height: 70rpx;
+					padding: 0 10rpx ;
 					width: 190rpx;
 					height: 70rpx;
 					background: #BFBFBF;
 					border-radius: 26rpx;
 					margin: 0 20rpx 20rpx 0;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
 				}
 			}
 

pages/information/information.vue

@@ -163,12 +163,21 @@
 		//进入界面加载
 		onLoad() {
 			let that = this
-			uni.getStorage({
+			try {
-				key: 'patientId',
+				const value = uni.getStorageSync('patientId');
-				success: function(res) {
+				if (value) {
-					that.query.patientId = res.data
+					that.query.patientId = value
 				}
-			});
+			} catch (e) {
+				// error
+			}
+
+			// uni.getStorage({
+			// 	key: 'patientId',
+			// 	success: function(res) {
+			// 		that.query.patientId = res.data
+			// 	}
+			// });
 			this.areaInfo()
 			this.getNurseTypeInfo();
 		},

pages/login/login.scss

@@ -8,8 +8,7 @@
 			height: 100rpx;
 			color: #46ABD7;
 			position: absolute;
-			top: 67%;
+			top: 70%;
-			left: 10%;
 		}
 
 		.loginbtn {

pages/login/login.vue

@@ -13,7 +13,10 @@
 		<view class="loginbtn" @tap='pwdlogin'>
 			登录
 		</view>
-		<view class="switch" @tap='goregister' style="left:55%">
+		<view class="switch" @tap='goforgotPassword' style="left:10%">
+			忘记密码
+		</view>
+		<view class="switch" @tap='goregister' style="right:10%">
 			没有账号,请先注册
 		</view>
 		<u-toast ref="uToast" />
@@ -38,13 +41,14 @@
 				appLoginpwd(this.phone, this.password).then(res => {
 					if (res.code == 200) {
 						if (res.data.registerFlag == false) {
-							uni.setStorage({
+							uni.setStorageSync("patientId", res.data.patientId)
-								key: 'patientId',
+							// uni.setStorage({
-								data: res.data.patientId,
+							// 	key: 'patientId',
-								success: function() {
+							// 	data: res.data.patientId,
-									console.log('patientId保存成功');
+							// 	success: function() {
-								}
+							// 		console.log('patientId保存成功');
-							});
+							// 	}
+							// });
 							this.$refs.uToast.show({
 								title: res.data.message,
 								type: 'success',
@@ -75,6 +79,12 @@
 					url: '/pages/register/register'
 				})
 			},
+			//跳转忘记密码页面
+			goforgotPassword() {
+				uni.navigateTo({
+					url: "/pages/forgotPassword/forgotPassword"
+				})
+			},
 		},
 		toLogin() {
 			// uni.hideKeyboard() //隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。

pages/modify/modify.vue

@@ -63,6 +63,7 @@
 				arealist: [],
 				areashow: false,
 				chooseLocation: '',
+				img: null,
 				appPersonallist: {
 					patientName: "",
 					cardNo: "",
@@ -88,14 +89,15 @@
 			this.patientDiseaseInfoList.forEach(e => {
 				e.id = e.diseaseId
 			})
-			this.chooseLocation = '东经:' + this.appPersonallist.homeLongitude + '度' + ' 北纬:' + this.appPersonallist
+			this.chooseLocation = '东经:' + this.appPersonallist.homeLongitude + ' 北纬:' + this.appPersonallist
-				.homeLatitude + '度';
+				.homeLatitude
 		},
 		methods: {
 			//上传图片+提交信息
 			informationinfo() {
 				//上传图片
 				var that = this
+				if (this.img) {
 					uni.uploadFile({
 						url: baseurl + '/nurseApplet/uploadFile/uploadHeadPictureUrl',
 						filePath: that.appPersonallist.headPictureUrl,
@@ -106,11 +108,7 @@
 						timeout: 5000,
 						success(res) {
 							that.appPersonallist.headPictureUrl = JSON.parse(res.data).imgUrl
-						//提交
-						// that.appPersonallist.homeLongitude = '1'
-						// that.appPersonallist.homeLatitude = '1'
 							that.appPersonallist.diseaseInfoList = that.patientDiseaseInfoList
-						console.log(that.appPersonallist)
 							information(that.appPersonallist).then(res => {
 								if (res.code == 200) {
 									that.$refs.uToast.show({
@@ -129,6 +127,25 @@
 							})
 						}
 					})
+				} else {
+					that.appPersonallist.diseaseInfoList = that.patientDiseaseInfoList
+					information(that.appPersonallist).then(res => {
+						if (res.code == 200) {
+							that.$refs.uToast.show({
+								title: '修改信息成功',
+								type: 'success',
+								url: '/pages/user/user',
+								duration: '1500'
+							})
+						} else if (res.code == 500) {
+							that.$refs.uToast.show({
+								title: res.msg,
+								type: 'error',
+								url: ''
+							})
+						}
+					})
+				}
 			},
 			//上传头像
 			uploadImag() {
@@ -139,7 +156,7 @@
 					sourceType: ['album'],
 					success(res) {
 						that.appPersonallist.headPictureUrl = res.tempFilePaths[0]
-						console.log(that.appPersonallist.headPictureUrl)
+						that.img = res.tempFilePaths[0]
 					}
 				})
 			},

pages/modifyAddress/modifyAddress.scss

@@ -3,7 +3,7 @@
 		background-color: #F4F5F7;
 		width: 100%;
 		position: relative;
-		height: 100vh;
+		height: 100%;
 		padding: 4%;
 		padding-bottom: 100rpx;
 		background-image: linear-gradient(to bottom, #F4F5F7, #ffffff);

pages/modifyAddress/modifyAddress.vue

@@ -96,7 +96,6 @@
 		},
 		onLoad(options) {
 			let that = this
-			console.log(options)
 			this.url = options.url
 			this.updata = JSON.parse(options.updata)
 			//获取传值
@@ -106,24 +105,31 @@
 		methods: {
 			//将信息携带至订单页面
 			goorder(item) {
-				if (this.url == "appointmenttime") {
+				// if (this.url == "appointmenttime") {
-					uni.navigateTo({
+				uni.$emit('updata', {
-						url: `/pages/appointmenttime/appointmenttime?updata=${JSON.stringify(this.updata)}&useritem=${JSON.stringify(item)}`
+					updata: JSON.stringify(this.updata),
+					useritem: JSON.stringify(item)
 				})
-				} else {
+				uni.navigateBack({
-					uni.navigateTo({
+					delta: 1
-						url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(this.updata)}&useritem=${JSON.stringify(item)}`
+				});
-					})
+				// uni.navigateTo({
-				}
+				// 	url: `/pages/appointmenttime/appointmenttime?updata=${JSON.stringify(this.updata)}&useritem=${JSON.stringify(item)}`
+				// })
+				// } else {
+				// uni.navigateTo({
+				// url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(this.updata)}&useritem=${JSON.stringify(item)}`
+				// })
+				// }
 			},
 			// 查询地址信息
 			goodsList() {
 				let that = this
-				uni.getStorage({
+				try {
-					key: 'patientId',
+					const value = uni.getStorageSync('patientId');
-					success: function(res) {
+					if (value) {
-						that.patientId = res.data
+						that.patientId = value
-						that.infolist.patientId = res.data
+						that.infolist.patientId = value
 						goodPatientInfo(that.patientId).then(res => {
 							res.data.forEach(e => {
 								e.address = e.provinceName + e.cityName + e.regionName + e
@@ -132,7 +138,21 @@
 							that.goodPatient = res.data
 						})
 					}
-				});
+				} catch (e) {}
+				// uni.getStorage({
+				// 	key: 'patientId',
+				// 	success: function(res) {
+				// 		that.patientId = res.data
+				// 		that.infolist.patientId = res.data
+				// 		goodPatientInfo(that.patientId).then(res => {
+				// 			res.data.forEach(e => {
+				// 				e.address = e.provinceName + e.cityName + e.regionName + e
+				// 					.streetName + e.receiveAddress
+				// 			})
+				// 			that.goodPatient = res.data
+				// 		})
+				// 	}
+				// });
 			},
 			// 保存按钮
 			submit() {
@@ -160,7 +180,6 @@
 						setTimeout(e => {
 							that.goodsList()
 						}, 1500)
-
 					})
 				}
 			},

pages/nursestation/nursestation.scss

@@ -1,6 +1,6 @@
 	.app{
-			height: 100vh;
+		height: 100%;
-			padding:0;
+		padding:10rpx 0 0 0;
 		background-image: linear-gradient(to bottom, #F4F5F7, #ffffff);
 	}
 		.mask {
@@ -58,7 +58,7 @@
 			margin: 0 auto;
 			margin-top: 20rpx;
 			border-radius: 11px;
-			// padding-bottom: 60rpx;
+			padding-bottom: 60rpx;
 			.item {
 				width: 100%;
 				height: 100%;
@@ -153,6 +153,7 @@
 		}
 		.Nursestationconfiguration {
 			width: 94%;
+			height: 100%;
 			background: #FFFFFF;
 			border-radius: 20rpx;
 			padding-bottom: 30rpx;
@@ -162,11 +163,11 @@
 				color: #333333;
 				padding: 3%;
 				.text {
-					margin-top: 32rpx;
+					margin-top: 10rpx;
-					display: inline;
+					display: inline-block;
 					padding: 10rpx 20rpx;
-					margin-right: 28rpx;
+					margin-right: 18rpx;
-					line-height: 50rpx;
+					line-height: 40rpx;
 					background-color: #f6f6f6;
 					border-radius: 34rpx;
 					font-size: 24rpx;
@@ -177,6 +178,7 @@
 		.detail {
 			position: relative;
 			width: 94%;
+			height: 100%;
 			margin: 0 auto;
 			background: #FFFFFF;
 			border-radius: 20rpx;
@@ -185,6 +187,7 @@
 			padding: 3%;
 			padding-bottom: 50rpx;
 			.textInfo {
+				word-break:break-all;
 				font-size: 29rpx;
 				text-indent: 2rem;
 				line-height: 42rpx;
@@ -202,10 +205,10 @@
 		.righttext {
 			position: relative;
 			width: 94%;
-			height: 252rpx;
 			background-color: #ffffff;
 			border-radius: 20rpx;
 			margin: 10px auto;
+			padding-bottom: 20rpx;
 			.picture {
 				position: absolute;
 				width: 170rpx;
@@ -217,6 +220,9 @@
 				margin-left: 35%;
 				line-height: 49px;
 				font-size: 33rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
 			}
 			.call {
 				// display: flex;
@@ -268,6 +274,10 @@
 				margin-left: 35%;
 				color: #999999;
 				line-height: 37rpx;
+				word-break:break-all;
+				// overflow: hidden;
+				// text-overflow: ellipsis;
+				// white-space: nowrap;
 			}
 		}
 	}

pages/nursestation/nursestation.vue

@@ -113,12 +113,14 @@
 		onLoad(options) {
 			this.usershow = false
 			let that = this
-			uni.getStorage({
+			try {
-				key: 'patientId',
+				const value = uni.getStorageSync('patientId');
-				success: function(res) {
+				if (value) {
-					that.patientId = res.data
+					that.patientId = value
+				}
+			} catch (e) {
+				// error
 			}
-			});
 			this.nurseStationId = options.nurseStationId
 			this.getInfo()
 			this.serveinfo()

pages/orderDetails/orderDetails.vue

@@ -45,7 +45,8 @@
 			<span>收货信息：<text>{{order.receiver}},{{order.phone}},{{order.receiveAddress}}</text></span>
 			<span>订单编号：<text>{{order.goOrderNo}}</text></span>
 			<!-- <span>获得积分：<text>30点积分</text></span> -->
-			<span>付款时间：<text>{{order.orderTime}}</text></span>
+			<span>下单时间：<text>{{order.orderTime}}</text></span>
+			<span v-if="order.orderStatus=='REFUNDED'">退款时间：<text>{{order.updateTime}}</text></span>
 			<!-- <span>发货时间：<text>2022-10-28 11：31：26</text></span> -->
 			<!-- <span>成交时间：<text>2022-10-28 11：31：26</text></span> -->
 		</view>
@@ -95,13 +96,23 @@
 		onLoad(options) {
 			this.baseurl = baseurl
 			let that = this
-			uni.getStorage({
+			try {
+				const value = uni.getStorageSync('patientId');
+				if (value) {
+					that.patientId = value
+					that.goodsOrderinfo(options.goodsOrderId)
+				}
+			} catch (e) {
+				// error
+			}
+
+			/* 	uni.getStorage({
 					key: 'patientId',
 					success: function(res) {
 						that.patientId = res.data
 						that.goodsOrderinfo(options.goodsOrderId)
 					}
-			});
+				}); */
 		}
 	}
 </script>

pages/paysuccess/paysuccess.vue

@@ -0,0 +1,81 @@
+<template>
+	<view class="app">
+		<image src="../../static/paysuccess.png" mode=""></image>
+		<view class="success">
+			支付成功
+		</view>
+		<view class="goshopping" @tap='gos'>
+			返回上一页
+		</view>
+		<view class="gohomepage" @tap='gohome'>
+			去首页
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			gos() {
+				uni.navigateBack({
+					delta: 2
+				});
+			},
+			gohome() {
+				uni.switchTab({
+					url: '/pages/homepage/homepage'
+				});
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		height: 100vh;
+		font-size: 30rpx;
+
+		.goshopping,
+		.gohomepage {
+			padding: 0 30rpx;
+			height: 70rpx;
+			line-height: 65rpx;
+			text-align: center;
+			position: absolute;
+			top: 50%;
+			color: #4C7BC9;
+			border: 1rpx solid #4C7BC9;
+			border-radius: 30rpx;
+		}
+
+		.goshopping {
+			left: 10%;
+		}
+
+		.gohomepage {
+			right: 10%;
+		}
+
+		.success {
+			font-size: 42rpx;
+			position: absolute;
+			top: 35%;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+
+		image {
+			width: 230rpx;
+			height: 230rpx;
+			position: absolute;
+			top: 8%;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+	}
+</style>

pages/register/register.scss

@@ -50,16 +50,18 @@
 			}
 		}
 		.radio-content {
+			margin: 0 auto;
+			width: 70%;
+			text-align: center;
 			padding-top: 50rpx;
 			height: 80rpx;
 			line-height: 11rpx;
 			font-size: 28rpx;
 			.agreement {
 				color: #878987;
-				margin-left: 25%;
 				}
 			.radio-right {
-				margin-left: 20%;
+				margin-left: 30rpx;
 				.radio-default {
 					border: 2rpx solid #0fbda6;
 				}

pages/register/register.vue

@@ -17,7 +17,7 @@
 			<view class="lefttext">
 				重复密码
 			</view>
-			<u-input class='righttext' style='left:30%' placeholder="请再次输入密码" maxlength="10" v-model="password"
+			<u-input class='righttext' style='left:30%' placeholder="请再次输入密码" maxlength="10" v-model="newpassword"
 				type="password" :border="false" :password-icon="true" />
 		</view>
 		<view class="item">
@@ -64,6 +64,7 @@
 				patientName: '',
 				phone: '13645678913',
 				password: '123456',
+				newpassword: '123456',
 				verification: '111111',
 				getCodeText: '获取验证码', //获取验证码的文字
 				getCodeBtnColor: "#4C7BC9", //获取验证码的color
@@ -73,7 +74,13 @@
 		methods: {
 			//注册功能
 			register() {
-				console.log(this.patientName)
+				if (this.password !== this.newpassword) {
+					this.$refs.uToast.show({
+						title: '密码输入不一致，请重新输入',
+						type: 'error',
+						duration: '1500'
+					})
+				} else {
 					appRegister(this.patientName, this.phone, this.password, this.verification).then(res => {
 						console.log(res)
 						if (res.code == 200) {
@@ -90,6 +97,7 @@
 							})
 						}
 					})
+				}
 			},
 			//跳转登录页
 			gologin() {

pages/site/site.vue

@@ -6,8 +6,7 @@
 		</view>
 		<view class="map" style="height:35vh;">
 			<map style="width:100%; height:100%" scale="17" :latitude="latitude" :longitude="longitude"
-				:markers="markers"
+				:markers="markers"></map>
-				></map>
 		</view>
 		<view class="conNew">
 			<view class="addressContent" v-for="(item,index) in nursestationlist" :key="index">

pages/startup/startup.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="app">
-		<image src="../../static/启动页.png" mode=""></image>
+		<image src="../../static/logo.png" mode=""></image>
 		<view class="title">
 			泉医到家
 		</view>
@@ -16,23 +16,45 @@
 		},
 		onLoad() {
 			let that = this
-			uni.getStorage({
+			try {
-				key: 'patientId',
+				const value = uni.getStorageSync('patientId');
-				success: function(res) {
+				if (value) {
 					setTimeout(() => {
 						uni.reLaunch({
 							url: '/pages/homepage/homepage'
 						});
 					}, 2000);
-				},
+				} else {
-				fail() {
 					setTimeout(() => {
 						uni.reLaunch({
 							url: '/pages/login/login'
 						});
 					}, 2000);
 				}
+			} catch (e) {
+				setTimeout(() => {
+					uni.reLaunch({
+						url: '/pages/login/login'
 					});
+				}, 2000);
+			}
+			// uni.getStorage({
+			// 	key: 'patientId',
+			// 	success: function(res) {
+			// 		setTimeout(() => {
+			// 			uni.reLaunch({
+			// 				url: '/pages/homepage/homepage'
+			// 			});
+			// 		}, 2000);
+			// 	},
+			// 	fail() {
+			// 		setTimeout(() => {
+			// 			uni.reLaunch({
+			// 				url: '/pages/login/login'
+			// 			});
+			// 		}, 2000);
+			// 	}
+			// });
 		},
 		methods: {},
 	}

pages/user/user.scss

@@ -48,7 +48,7 @@
 			color: #000000;
 			padding:0 0 50rpx  5%;
 			overflow: hidden;
-			font-size: 35rpx;
+			font-size: 32rpx;
 			.disease{
 				line-height: 60rpx;
 			}

pages/user/user.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="app">
 		<view class="user">
-			<view class="img" v-if="appPersonallist.headPictureUrl">
+			<view v-if="appPersonallist.headPictureUrl">
-				<image :src="baseurl+appPersonallist.headPictureUrl" mode=""></image>
+				<image class="img" :src="baseurl+appPersonallist.headPictureUrl" mode=""></image>
 			</view>
 			<view class="img" v-else>
 				<image src="../../static/users.png" mode=""></image>
@@ -56,7 +56,7 @@
 					位置:
 				</view>
 				<view class="address" v-if="appPersonallist.homeLatitude&&appPersonallist.homeLongitude">
-					东经:{{appPersonallist.homeLongitude}}度--北纬:{{ appPersonallist.homeLatitude}}度
+					东经:{{appPersonallist.homeLongitude}}--北纬:{{ appPersonallist.homeLatitude}}
 				</view>
 			</view>
 			<view class="disease" style="border:none;">
@@ -117,21 +117,39 @@
 			//获取个人信息
 			myInfo() {
 				var that = this
-				uni.getStorage({
+				try {
-					key: 'patientId',
+					const value = uni.getStorageSync('patientId');
-					success: function(res) {
+					if (value) {
-						appPersonal(res.data).then(res => {
+						appPersonal(value).then(res => {
 							that.appPersonallist = res.data
 						})
 					}
-				});
+				} catch (e) {
+					// error
+				}
+				// uni.getStorage({
+				// 	key: 'patientId',
+				// 	success: function(res) {
+				// 		appPersonal(res.data).then(res => {
+				// 			that.appPersonallist = res.data
+				// 		})
+				// 	}
+				// });
 			},
 			updatainfo() {
 				uni.navigateTo({
 					url: `/pages/modify/modify?appPersonallist=${JSON.stringify(this.appPersonallist)}`
 				})
 			}
-		}
+		},
+		onBackPress(options) {
+			console.log(options)
+			// if (options.from === 'navigateBack') {
+			// return false;
+			// }
+			// this.back();
+			// return true;
+		},
 	}
 </script>
 <style lang="scss">