修改

pages/CommodityDetails/CommodityDetails.vue

@@ -64,7 +64,7 @@
 						<image :src="updata.img" mode=""></image>
 					</view>
 					<view class="title">
-						<span>{{goodsDetailslist.goodsName}}</span>
+						{{goodsDetailslist.goodsName}}
 					</view>
 					<view class="price">
 						￥{{updata.goodsPrice}}
@@ -216,17 +216,21 @@
 												})
 											}
 										} else {
-											that.buyshow = false
+											that.$refs.uToast.show({
-											uni.navigateTo({
+												title: '未选择商品',
-												url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
+												type: 'error'
 											})
+											// that.buyshow = false
+											// uni.navigateTo({
+											// 	url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
+											// })
 										}
 									} else {
 										that.buyshow = false
 										that.usershow = true
 									}
-								} else if(res.code==9999){
+								} else if (res.code == 9999) {
-									
+
 								} else {
 									that.$refs.uToast.show({
 										title: res.msg,
@@ -365,8 +369,13 @@
 			},
 		},
 		onLoad(options) { //获取传值
+			console.log(options)
 			this.updata.buySource = options.buySource
-			this.goodsPrice = options.goodsPrice //页面价格
+			if (options.goodsPrice == 'null' || !options.goodsPrice) {
+				this.goodsPrice = 0 //页面价格
+			} else {
+				this.goodsPrice = options.goodsPrice //页面价格
+			}
 			this.goodsInfoId = options.goodsInfoId
 		},
 		onShow() {

pages/CommodityDetails/CommodityDetailsstyle.scss

@@ -90,7 +90,13 @@
 						left: 38%;
 						font-weight: 600;
 						width: 58%;
-						height: 85rpx;
+						// height: 85rpx;
+						      overflow: hidden;
+						      text-overflow: ellipsis;
+						      display: -webkit-box;
+						      -webkit-box-orient: vertical;
+						      -webkit-line-clamp: 3;
+						      word-break: break-all;
 					}
 
 					.image {
@@ -289,6 +295,7 @@
 
 			.name,
 			.number {
+				word-break: break-all;
 				width: 100%;
 				display: inline-block;
 				line-height: 50rpx;

pages/CommodityOrder/CommodityOrder.scss

@@ -150,6 +150,7 @@
 								-webkit-box-orient: vertical;
 								-webkit-line-clamp: 2;
 								overflow: hidden;
+								
 							}
 
 							span:nth-child(2) {
@@ -167,12 +168,19 @@
 							top: 45%;
 							width: 68%;
 
-							.box {
+							.box:nth-child(1) {
+								width: 70%;
+								display: inline-block;
 								font-size: 30rpx;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
 							}
 
 							.box:nth-child(2) {
+								width: 30%;
 								position: absolute;
+								text-align: center;
 								right: 0%;
 							}
 						}

pages/CommodityOrder/CommodityOrder.vue

@@ -254,6 +254,14 @@
 			this.pageNum = 1;
 			this.baseurl = baseurl;
 			let that = this
+			try {
+				const value = uni.getStorageSync('openid');
+				if (value) {} else {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				}
+			} catch (e) {}
 			try {
 				const value3 = uni.getStorageSync('Refresh');
 				if (value3) {

pages/Nursingstationserviceorder/Nursingstationserviceorder.vue

@@ -123,6 +123,14 @@
 					that.getinfo();
 				}
 			} catch (e) {}
+			try {
+				const value = uni.getStorageSync('openid');
+				if (value) {} else {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				}
+			} catch (e) {}
 		},
 		onLoad() {
 			let that = this

pages/ProductList/ProductList.vue

@@ -4,7 +4,7 @@
 			<i class="icon"></i>
 			<input v-model="goodsName" type="text" name="" id="" class="input" placeholder="请输入商品名称">
 		</view>
-		<view class="productlist">
+		<view class="productlist" v-if='goodsList.length>0'>
 			<view class="item" @tap='goCommodityDetails(item)' v-for="(item,index) in goodsList" :key="index">
 				<image :src="baseurl+item.goodsPictureUrl" mode=""></image>
 				<view class="title">
@@ -17,6 +17,12 @@
 			<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>
 	</view>
 </template>
 
@@ -49,6 +55,14 @@
 		},
 		onShow() {
 			var that = this
+			try {
+				const value = uni.getStorageSync('openid');
+				if (value) {} else {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				}
+			} catch (e) {}
 			try {
 				const value3 = uni.getStorageSync('Refresh');
 				if (value3) {
@@ -117,6 +131,21 @@
 	.app {
 		padding: 0;
 
+		.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;

pages/ServiceDetails/ServiceDetails.scss

@@ -1,6 +1,6 @@
 	.app {
 		height: 100%;
-		padding: 2%;
+		padding: 0 2% 2%;
 		font-size: 36rpx;
 		padding-top: 10rpx;
 		font-size: 34rpx;
@@ -10,7 +10,7 @@
 			text-align: center;
 			line-height: 80rpx;
 			background-color: #fff;
-			margin: 0 auto 10rpx;
+			margin: 20rpx auto 0rpx;
 			border-radius: 20rpx;
 		}
 		.mask{
@@ -37,7 +37,7 @@
 			text-align: center;
 			width: 300rpx;
 			height: 70rpx;
-			margin: 0 auto;
+			margin: 10rpx auto  0;
 			line-height: 70rpx;
 			background-color:#4C7BC9 ;
 			border-radius: 50rpx;

pages/ServiceDetails/ServiceDetails.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="app">
+	<view class="app" v-if="list">
 		<view class="time" style="" v-if="list.orderStatus=='WAIT_PAY'&&timestamp>0">
 			剩余付款时间：
 			<u-count-down style='' :timestamp="timestamp">
@@ -112,12 +112,15 @@
 				baseurl: '',
 				patientId: '', //id
 				openid: '', //id
-				list: {},
+				list: null,
 				orderNo: '',
 				timer: null,
 				timestamp: 0,
 			}
 		},
+		onShow() {
+			this.getlist()
+		},
 		onLoad(options) {
 			this.baseurl = baseurl
 			this.orderNo = options.orderNo

pages/confirmOrder/confirmOrder.scss

@@ -98,6 +98,9 @@
 					font-size: 33rpx;
 					color: #969394;
 					line-height: 67rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
 				}
 			}
 

pages/confirmOrder/confirmOrder.vue

@@ -183,6 +183,9 @@
 		},
 		onLoad(options) {
 			this.updata = JSON.parse(options.updata)
+			if (this.updata.totalPrice == 'null' || !this.updata.totalPrice) {
+				this.updata.totalPrice = 0
+			}
 		},
 		onShow() {
 			var that = this

pages/detail/detail.scss

@@ -1,115 +0,0 @@
-.app {
-		// font-size: 36rpx;
-		padding-top: 10rpx;
-
-		.concent {
-			width: 701rpx;
-			height: 811rpx;
-			background: #4C7BC9;
-			box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
-			border-radius: 20rpx;
-			margin-top: 5%;
-			// left: 50%;
-			// transform: translateX(-50%);
-			margin: 0 auto;
-			margin-bottom: 20px;
-
-			.background {
-				position: relative;
-				// display: flex;
-				width: 657rpx;
-				height: 727rpx;
-				background: #FFFFFF;
-				border-radius: 25rpx;
-				background-color: white;
-				margin: 0 auto;
-				top: 50%;
-				transform: translateY(-50%);
-
-				image {
-					width: 178rpx;
-					height: 84rpx;
-					background: #FFFFFF;
-					border-radius: 25px;
-					// float: right;
-					margin-left: 68%;
-					margin-top: 5%;
-				}
-
-
-				// text-align:center;
-
-
-
-			}
-		}
-	}
-
-	.life {
-		// margin: 0 auto;
-		width: 162rpx;
-		height: 40rpx;
-		font-size: 42rpx;
-		margin-left: 35%;
-		color: #ffffff;
-
-
-
-	}
-
-
-
-	.lifeserve image {
-		width: 639rpx;
-		height: 739rpx;
-		margin-left: 5%;
-
-		padding-bottom: 20rpx;
-		// height: rpx;
-		// background: #E1AE3C;
-		// box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03);
-		// border-radius: 20px;
-	}
-
-	.concenta {
-
-		margin: 0 auto;
-		margin-bottom: 20px;
-		// position: absolute;
-		width: 701rpx;
-		height: 811rpx;
-		background: #E1AE3C;
-		// margin-top: 118%;
-		// margin-left: 2.55%;
-		border-radius: 25rpx;
-		// margin-bottom: 30rpx;
-	}
-
-	.concentb {
-		margin: 0 auto;
-		margin-bottom: 20px;
-		// position: absolute;
-		width: 701rpx;
-		height: 811rpx;
-		background: #00C176;
-		// margin-top: 118%;
-		// margin-left: 2.55%;
-		border-radius: 25rpx;
-		// margin-bottom: 30rpx;
-	}
-
-
-
-
-	.detailed {
-		// font-size: 29rpx;
-		width: 657rpx;
-		height: 727rpx;
-		padding: 0 42rpx;
-		line-height: 56rpx;
-	}
-
-	.detailed view {
-		// height: 100%;
-		text-indent: 2em;
-	}

pages/detail/detail.vue

@@ -13,16 +13,12 @@
 			</view>
 		</view>
 		<view class="concenta">
-			<text class="life">生活护理 </text>
+			<view class="life">生活护理 </view>
-			<view class="lifeserve">
+			<image src="/static/lifeserve.png" mode=""></image>
-				<image src="/static/lifeserve.png" mode=""></image>
-			</view>
 		</view>
 		<view class="concentb">
-			<text class="life">医疗护理 </text>
+			<view class="life">医疗护理 </view>
-			<view class="lifeserve">
+			<image src="/static/yiliaohuli.png" mode=""></image>
-				<image src="/static/yiliaohuli.png" mode=""></image>
-			</view>
 		</view>
 	</view>
 </template>
@@ -39,15 +35,14 @@
 <style lang="scss">
 	.app {
 		padding-top: 10rpx;
+
 		.concent {
-			width: 701rpx;
+			width: 98%;
 			height: 811rpx;
 			background: #4C7BC9;
 			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border-radius: 20rpx;
-			margin-top: 5%;
+			margin: 10rpx auto 10rpx;
-			margin: 0 auto;
-			margin-bottom: 20px;
 
 			.background {
 				position: relative;
@@ -71,43 +66,45 @@
 			}
 		}
 	}
-	.life {
+
-		// margin: 0 auto;
+	.concenta,
-		width: 162rpx;
+	.concentb {
-		height: 40rpx;
+		margin: 0 auto 10rpx;
-		font-size: 42rpx;
+		width: 98%;
-		margin-left: 35%;
+		height: 900rpx;
-		color: #ffffff;
+		padding-bottom: 40rpx;
-	}
+		border-radius: 25rpx;
-	.lifeserve image {
+
-		width: 639rpx;
+		.life {
-		height: 739rpx;
+			padding: 15rpx 0;
-		margin-left: 5%;
+			font-size: 38rpx;
-		padding-bottom: 20rpx;
+			text-align: center;
+			color: #ffffff;
+		}
+
+		image {
+			margin: 0 auto;
+			width: 89%;
+			display: block;
+			height: 91%;
+			// margin-left: 3%;
+		}
 	}
 
 	.concenta {
-		margin: 0 auto;
-		margin-bottom: 20px;
-		width: 701rpx;
-		height: 811rpx;
 		background: #E1AE3C;
-		border-radius: 25rpx;
 	}
 
 	.concentb {
-		margin: 0 auto;
-		margin-bottom: 20px;
-		width: 701rpx;
-		height: 811rpx;
 		background: #00C176;
-		border-radius: 25rpx;
 	}
+
 	.detailed {
 		width: 657rpx;
 		padding: 0 42rpx;
 		line-height: 56rpx;
 	}
+
 	.detailed view {
 		text-indent: 2em;
 	}

pages/login/login.vue

@@ -26,6 +26,12 @@
 				timer: null,
 			};
 		},
+		onShow() {
+			uni.removeStorageSync('openid');
+			uni.removeStorageSync('patientId');
+			uni.removeStorageSync('token');
+			uni.removeStorageSync('phone');
+		},
 		methods: {
 			getPhoneNumberp(val) {
 				let that = this;
@@ -62,6 +68,7 @@
 							})
 						}, 1500)
 					} else {
+						uni.removeStorageSync('token');
 						this.$refs.uToast.show({
 							title: '登录失败',
 							type: 'error',
@@ -78,7 +85,6 @@
 				})
 			},
 		},
-		toLogin() {}
 	}
 </script>
 

pages/menttimeorder/menttimeorder.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="app">
+	<view class="app" v-if="list">
 		<view class="time" style="" v-if="list.orderStatus=='WAIT_PAY'&&timestamp>0">
 			剩余付款时间：
 			<u-count-down style='' :timestamp="timestamp">
@@ -89,14 +89,18 @@
 				baseurl: '',
 				patientId: '', //id
 				openid: '', //id
-				list: {},
+				list: null,
 				orderNo: '',
 				timestamp: 0,
 			}
 		},
+		onShow() {
+			this.getlist()
+		},
 		onLoad(options) {
 			var that = this
 			this.baseurl = baseurl
+			this.orderNo = JSON.parse(options.list).orderNo
 			try {
 				const value = uni.getStorageSync('patientId');
 				if (value) {
@@ -109,7 +113,6 @@
 					that.openid = value
 				}
 			} catch (e) {}
-			this.getlist(JSON.parse(options.list).orderNo)
 		},
 		methods: {
 			//支付
@@ -183,8 +186,8 @@
 				});
 			},
 			// 信息
-			getlist(orderNo) {
+			getlist() {
-				getAppointmentDetailsInfo(orderNo).then(res => {
+				getAppointmentDetailsInfo(this.orderNo).then(res => {
 					this.list = res.data
 					var time = new Date(this.list.createTime).getTime() / 1000 + (60 * 60 * 24)
 					var times = new Date().getTime() / 1000

pages/modify/modify.vue

@@ -33,7 +33,7 @@
 			<view class="item" @tap='getAddress()'>
 				<span>所在位置:</span>
 				<view class="address" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-					{{chooseLocation}}
+					{{appPersonallist.locationName}}
 				</view>
 			</view>
 			<view class="disease" style="border: none;" @tap="godisease">
@@ -88,6 +88,9 @@
 	} from '@/api/information/index.js'
 	import contenttext from '../information/text.vue'
 	import baseurl from '@/api/baseurl.js'
+	import {
+		appPersonal,
+	} from '@/api/user/user.js';
 	export default {
 		components: {
 			contenttext
@@ -99,8 +102,7 @@
 				address: '',
 				arealist: [],
 				areashow: false,
-				maskshow:false,//用户协议
+				maskshow: false, //用户协议
-				chooseLocation: '',
 				img: null,
 				image: null,
 				timer: null,
@@ -123,18 +125,25 @@
 		onLoad(options) {
 			this.areaInfo();
 			this.baseurl = baseurl
-			this.appPersonallist = JSON.parse(options.appPersonallist)
+			var that = this
-			this.img = baseurl + this.appPersonallist.headPictureUrl
+			const value = uni.getStorageSync('patientId');
-			if (this.appPersonallist.regionName && this.appPersonallist.streetName) {
+			if (value) {
-				this.address = this.appPersonallist.regionName + '-' + this.appPersonallist.streetName
+				appPersonal(value).then(Response => {
-			}
+					if (Response.code == 200) {
-			this.patientDiseaseInfoList = this.appPersonallist.patientDiseaseInfoList
+						that.appPersonallist = Response.data
-			this.patientDiseaseInfoList.forEach(e => {
+						that.appPersonallist.homeLatitude = Number(that.appPersonallist.homeLatitude)
-				e.id = e.diseaseId
+						that.appPersonallist.homeLongitude = Number(that.appPersonallist.homeLongitude)
-			})
+						that.img = baseurl + that.appPersonallist.headPictureUrl
-			if (this.appPersonallist.locationName) {
+						if (that.appPersonallist.regionName && that.appPersonallist.streetName) {
-				this.chooseLocation = this.appPersonallist.locationName
+							that.address = that.appPersonallist.regionName + '-' + that.appPersonallist.streetName
-			}
+						}
+						that.patientDiseaseInfoList = that.appPersonallist.patientDiseaseInfoList
+						that.patientDiseaseInfoList.forEach(e => {
+							e.id = e.diseaseId
+						})
+					} else if (Response.code == 9999) {} else {}
+				})
+			} else {}
 		},
 		methods: {
 			//上传图片+提交信息
@@ -289,23 +298,19 @@
 		},
 		//带参返回
 		onShow() {
+			let that = this
 			const chooseLocation = requirePlugin('chooseLocation');
 			const location = chooseLocation.getLocation(); // 如果点击确认选点按钮，则返回选点结果对象，否则返回null
 			if (location) {
-				this.appPersonallist.locationName = location.address
+				console.log(location)
-				this.chooseLocation = location.address;
+				that.appPersonallist.locationName = location.address
-				this.appPersonallist.homeLongitude = location.longitude;
+				that.appPersonallist.homeLongitude = location.longitude;
-				this.appPersonallist.homeLatitude = location.latitude;
+				that.appPersonallist.homeLatitude = location.latitude;
 			}
-			let that = this
 			uni.$on('disease', function(data) {
 				that.patientDiseaseInfoList = JSON.parse(data.disease)
 			})
 		},
-		onUnload() {
-			// 页面卸载时设置插件选点数据为null，防止再次进入页面，geLocation返回的是上次选点结果
-			chooseLocation.setLocation(null);
-		},
 	}
 </script>
 

pages/orderDetails/orderDetails.scss

@@ -74,14 +74,14 @@
 			text-align: center;
 			line-height: 80rpx;
 			background-color: #fff;
-			margin: 0 auto 10rpx;
+			margin: 30rpx auto 0;
 			border-radius: 20rpx;
 		}
 		.OrderStatus{
 			text-align: center;
 			width: 300rpx;
 			height: 70rpx;
-			margin: 0 auto;
+			margin: 30rpx auto 0;
 			line-height: 70rpx;
 			background-color:#4C7BC9 ;
 			border-radius: 50rpx;

pages/payorderDetails/payorderDetails.vue

@@ -92,6 +92,7 @@
 				pageSize: 10,
 				pageNum: 1,
 				timestamp: 0,
+				goodsOrderId:null,
 			}
 		},
 		methods: {
@@ -160,12 +161,12 @@
 		},
 		onLoad(options) {
 			this.baseurl = baseurl
+			this.goodsOrderId = options.goodsOrderId
 			let that = this
 			try {
 				const value = uni.getStorageSync('patientId');
 				if (value) {
 					that.patientId = value
-					that.goodsOrderinfo(options.goodsOrderId)
 				}
 			} catch (e) {}
 			try {
@@ -175,6 +176,9 @@
 				} else {}
 			} catch (e) {}
 		},
+		onShow() {
+			this.goodsOrderinfo(this.goodsOrderId)
+		},
 		onUnload() {},
 	}
 </script>

pages/shopping/shopping.vue

@@ -44,8 +44,8 @@
 				], //颜色随动
 			};
 		},
-		onLoad(options) { //初始化加载
+		//初始化加载
-		},
+		onLoad(options) {},
 		onShow() {
 			this.goodsCategory()
 		},
@@ -60,11 +60,13 @@
 			goodsCategory() {
 				goodsCategoryList(this.pageSize, this.pageNum).then(res => {
 					uni.removeStorageSync('Refresh');
-					res.rows.forEach(e => {
+					if (res.code == 200) {
-						e.goodsCategoryPicture = baseurl + e.goodsCategoryPicture
+						res.rows.forEach(e => {
-					})
+							e.goodsCategoryPicture = baseurl + e.goodsCategoryPicture
-					this.goodsCategoryList = res.rows
+						})
-					this.total = res.total
+						this.goodsCategoryList = res.rows
+						this.total = res.total
+					}
 				})
 			}
 		},

pages/user/user.vue

@@ -62,7 +62,7 @@
 				<view class="" style="line-height: 110rpx;">
 					疾病类型:
 				</view>
-				<span style="padding-right: 15rpx;font-size: 32rpx;"
+				<span style="padding-right: 15rpx;font-size: 30rpx;"
 					v-for="(item,index) in appPersonallist.patientDiseaseInfoList"
 					:key="index">{{item.diseaseName}}</span>
 			</view>
@@ -176,6 +176,10 @@
 							appPersonal(value2).then(Response => {
 								if (Response.code == 200) {
 									that.appPersonallist = Response.data
+									that.appPersonallist.homeLatitude = Number(that.appPersonallist
+										.homeLatitude)
+									that.appPersonallist.homeLongitude = Number(that.appPersonallist
+										.homeLongitude)
 								} else if (Response.code == 9999) {} else {
 									that.removes();
 								}
@@ -190,7 +194,8 @@
 			},
 			updatainfo() {
 				uni.navigateTo({
-					url: `/pages/modify/modify?appPersonallist=${JSON.stringify(this.appPersonallist)}`
+					// url: `/pages/modify/modify?appPersonallist=${JSON.stringify(this.appPersonallist)}`
+					url: `/pages/modify/modify`
 				})
 			}
 		},

share.js

@@ -4,7 +4,7 @@ export default {
 			// 默认的全局分享内容
 			share: {
 				title: '泉医到家',
-				path: '/pages/homepage/homepage', // 全局分享的路径，比如 首页
+				path: '/pages/startup/startup', // 全局分享的路径，比如 首页
 				// imageUrl: , // 全局分享的图片(可本地可网络)
 			}
 		}