修改

pages/CommodityDetails/CommodityDetails.vue

@@ -320,7 +320,11 @@
 					this.updata.goodsName = this.goodsDetailslist.goodsName
 					this.updata.nurseStationId = this.goodsDetailslist.nurseStationId
 					this.updata.img = res.data[0].goodsPictureUrl
-
+					this.updata.goodsAttributeName = ''
+					this.updata.goodsPrice = 0
+					this.updata.attributeDetailsId = ''
+					this.updata.goodsStock = 0
+					this.updata.img = this.image
 					// res.data[0].goodDetailsLists.forEach(e => {
 					// 	e.goodAttributeDetailsLists.forEach(el => {
 					// 		el.isActive = false
@@ -350,7 +354,7 @@
 		onLoad(options) { //获取传值
 			this.updata.buySource = options.buySource
 			this.goodsPrice = options.goodsPrice //页面价格
-			this.goodsDetailsinfo(options.goodsInfoId)
+			uni.setStorageSync("goodsInfoId", options.goodsInfoId)
 		},
 		onShow() {
 			this.baseurl = baseurl
@@ -367,6 +371,14 @@
 			} catch (e) {
 				// error
 			}
+			try {
+				const value = uni.getStorageSync('goodsInfoId');
+				if (value) {
+					this.goodsDetailsinfo(value)
+				} else {}
+			} catch (e) {
+				// error
+			}
 		},
 	}
 </script>

pages/appointmenttime/appointmenttime.scss

@@ -73,11 +73,18 @@
 			height: 96rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx;
-			margin-top: 2%;
+			margin-top: 20rpx;
-
+			position: relative;
+			span{
+				display: inline-block;
+				width: 20%;
+			}
 			input {
-				margin-top: -6%;
+				position: absolute;
-				margin-left: 15%;
+				top:50%;
+				left:23%;
+				width: 77%;
+				transform: translateY(-50%);
 			}
 		}
 		.priceback {
@@ -158,13 +165,12 @@
 			font-size: 34rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx;
-			margin-top: 2%;
+			margin-top: 20rpx;
 			position: relative;
 			padding-bottom: 40rpx;
 			.detail {
 				width: 301rpx;
 				height: 31rpx;
-				line-height: 31rpx;
 				font-size: 32rpx;
 				color: #666666;
 				line-height: 31rpx;
@@ -180,7 +186,7 @@
 			font-size: 34rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx;
-			margin-top:2%;
+			margin-top:20rpx;
 			position: relative;
 			.detail {
 				line-height: 31rpx;

pages/homepage/homepage.vue

@@ -13,19 +13,19 @@
 					就医
 				</view>
 			</view>
-			<view class="elderly item">
+			<view class="elderly item" @tap='gono'>
 				<image src="../../static/ylfw.png" mode=""></image>
 				<view class="title" style="font-size: 40rpx;">
 					国家老年病中心
 				</view>
 			</view>
-			<view class="item Bodyguard">
+			<view class="item Bodyguard" @tap='gono'>
 				<image src="../../static/pb.png" mode=""></image>
 				<view class="title">
 					体卫融合
 				</view>
 			</view>
-			<view class="item knowledge">
+			<view class="item knowledge" @tap='gono'>
 				<image src="../../static/zs.png" mode=""></image>
 				<view class="title">
 					专病管理
@@ -38,6 +38,7 @@
 				</view>
 			</view>
 		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -47,6 +48,14 @@
 			return {};
 		},
 		methods: {
+			//暂未开放
+			gono() {
+				this.$refs.uToast.show({
+					title: '暂未开放',
+					type: 'error',
+					duration: '1000'
+				})
+			},
 			//跳转护理站页面
 			gosite() {
 				uni.navigateTo({
@@ -61,9 +70,14 @@
 			},
 			//跳转就医页面
 			gomedicine() {
-				uni.navigateTo({
+				this.$refs.uToast.show({
-					url: '/pages/medicine/medicine'
+					title: '暂未开放',
+					type: 'error',
+					duration: '1000'
 				})
+				// uni.navigateTo({
+				// 	url: '/pages/medicine/medicine'
+				// })
 			},
 		}
 	}
@@ -73,6 +87,7 @@
 	.app {
 		.cards {
 			padding: 22px 0 20px 0;
+
 			.shopping {
 				background: #F58540;
 			}

pages/information/information.scss

@@ -67,7 +67,7 @@
 				line-height: 120rpx;
 				border-bottom: 1rpx solid #D8D4D4;
 				position: relative;
-				view {
+				.address {
 					position: absolute;
 					left:25%;
 					top:50%;
@@ -102,6 +102,7 @@
 					position: absolute;
 					left:25%;
 					top:50%;
+					width: 75%;
 					transform: translateY(-50%);
 				}
 			}

pages/information/information.vue

@@ -17,7 +17,7 @@
 			</view>
 			<view class="item" @tap='areashow=true'>
 				<span>所属区域:</span>
-				<view>{{address}}</view>
+				<view class="address">{{address}}</view>
 			</view>
 			<view class="item">
 				<span>详细地址:</span>
@@ -26,7 +26,8 @@
 			</view>
 			<view class="item" @tap='getAddress()'>
 				<span>所在位置:</span>
-				<view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{chooseLocation}}11</view>
+				<view class="address" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
+					{{chooseLocation}}</view>
 			</view>
 		</view>
 		<u-select v-model="areashow" mode="mutil-column-auto" label-name='areaName' value-name='areaCode'
@@ -64,7 +65,7 @@
 	export default {
 		data() {
 			return {
-				timer:null,
+				timer: null,
 				arealist: [], //区街道list
 				areashow: false, //经纬度开关
 				getNurseTypelist: [], //护理类型数组
@@ -114,6 +115,7 @@
 				var that = this;
 				uni.chooseLocation({
 					success: function(res) {
+						that.appPersonallist.locationName = res.name
 						that.chooseLocation = res.name
 						that.query.homeLongitude = res.longitude;
 						that.query.homeLatitude = res.latitude;

pages/modify/modify.scss

@@ -64,7 +64,7 @@
 					top:50%;
 					transform: translateY(-50%);
 				}
-				view {
+				.address {
 					position: absolute;
 					left:25%;
 					top:50%;
@@ -99,6 +99,7 @@
 					position: absolute;
 					left:25%;
 					top:50%;
+					width: 75%;
 					transform: translateY(-50%);
 				}
 			}

pages/modify/modify.vue

@@ -20,7 +20,7 @@
 			</view>
 			<view class="item" @tap='areashow=true'>
 				<span>所属区域:</span>
-				<view>{{address}}</view>
+				<view class="address">{{address}}</view>
 			</view>
 			<view class="item">
 				<span>详细地址:</span>
@@ -28,7 +28,7 @@
 			</view>
 			<view class="item" @tap='getAddress()'>
 				<span>所在位置:</span>
-				<view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{chooseLocation}}</view>
+				<view class="address" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{chooseLocation}}</view>
 			</view>
 			<view class="disease" style="border: none;" @tap="godisease">
 				<view style="display: block;line-height: 120rpx;">疾病类型:</view>
@@ -76,6 +76,7 @@
 					nurseTypeIdList: [],
 					diseaseInfoList: [],
 					headPictureUrl: '',
+					locationName: '',
 				},
 				patientDiseaseInfoList: [], //获取个人信息
 			}
@@ -92,9 +93,8 @@
 			this.patientDiseaseInfoList.forEach(e => {
 				e.id = e.diseaseId
 			})
-			if (this.appPersonallist.homeLongitude && this.appPersonallist.homeLatitude) {
+			if (this.appPersonallist.locationName) {
-				this.chooseLocation = '东经:' + this.appPersonallist.homeLongitude + ' 北纬:' + this.appPersonallist
+				this.chooseLocation = this.appPersonallist.locationName
-					.homeLatitude
 			}
 		},
 		methods: {
@@ -185,6 +185,7 @@
 				var that = this;
 				uni.chooseLocation({
 					success: function(res) {
+						that.appPersonallist.locationName = res.address
 						that.chooseLocation = res.name
 						that.appPersonallist.homeLongitude = res.longitude;
 						that.appPersonallist.homeLatitude = res.latitude;

pages/paysuccess/paysuccess.vue

@@ -38,7 +38,7 @@
 <style lang="scss">
 	.app {
 		font-size: 30rpx;
-
+		height: 100vh;
 		.goshopping,
 		.gohomepage {
 			padding: 0 30rpx;

pages/user/user.vue

@@ -43,10 +43,13 @@
 			<view class="item" v-else>
 				区域：
 			</view>
-			<view class="item" style="height:100%">
+			<view class="item" style="height:100%" v-if="appPersonallist.address">
 				地址:
 				{{appPersonallist.address}}
 			</view>
+			<view class="item" style="height:100%" v-else>
+				地址:
+			</view>
 			<!-- <view class="item" style="height:100%">
 				<view class="" style="display: inline-block;">
 					位置:
@@ -122,23 +125,24 @@
 					content: '确认要退出此账号吗',
 					success: function(res) {
 						if (res.confirm) {
-							try {
+							uni.removeStorageSync('patientId');
-								uni.removeStorageSync('patientId');
+							that.$refs.uToast.show({
-								const value = uni.getStorageSync('patientId');
+								title: '退出账号成功',
-								if (value) {} else {
+								type: 'success',
-									this.$refs.uToast.show({
+								duration: '1000'
-										title: '退出账号成功',
+							})
-										type: 'success',
+							setTimeout(e => {
-										duration: '1000'
+								uni.reLaunch({
-									})
+									url: '/pages/login/login'
-									setTimeout(e => {
+								})
-										uni.reLaunch({
+							}, 1000)
-											url: '/pages/login/login'
+						} else if (res.cancel) {
-										})
+							that.$refs.uToast.show({
-									}, 1000)
+								title: '退出账号失败',
-								}
+								type: 'error',
-							} catch (e) {}
+								duration: '1000'
-						} else if (res.cancel) {}
+							})
+						}
 					}
 				});
 			},