Merge remote-tracking branch 'origin/master' into dev

api/request.js

@@ -15,10 +15,7 @@ var request = function(config) {
 			},
 			success(res) {
 				if (res.data.code == 9999) {
-					uni.removeStorageSync('token');
+					uni.clearStorageSync();
-					uni.removeStorageSync('patientId');
-					uni.removeStorageSync('openid');
-					uni.removeStorageSync('phone');
 					let pages = getCurrentPages();
 					let path = pages[pages.length - 1].$page.fullPath
 					let paths = path.split('?')

api/store/index.js

@@ -1,9 +0,0 @@
-import request from "../request.js"
-
-export function insertSubscribeMessageRecord(data) {
-	return request({
-		url: `/nurseApplet/patientInfo/insertSubscribeMessageRecord`,
-		method: 'POST',
-		data
-	})
-}

pages.json

@@ -259,7 +259,8 @@
 			"path": "pages/Healthknowledge/Healthknowledge",
 			"style": {
 				"navigationBarTitleText": "健康常识",
-				"enablePullDownRefresh": false
+				"onReachBottomDistance": 50, //距离底部多远时触发 单位为px
+				"enablePullDownRefresh": true //设置参数为true
 			}
 		}, {
 			"path": "pages/Healthitem/Healthitem",
@@ -288,7 +289,7 @@
 		}, {
 			"path": "pages/Healthrecords/Healthrecords",
 			"style": {
-				"navigationBarTitleText": "健康档案",
+				"navigationBarTitleText": "泉医到家",
 				"enablePullDownRefresh": false
 			}
 		}, {
@@ -303,6 +304,13 @@
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
+		}, {
+			"path": "pages/Moreoptions/Moreoptions",
+			"style": {
+				"navigationBarTitleText": "护理机构",
+				"enablePullDownRefresh": false
+			}
+
 		}
 	],
 	"globalStyle": {

pages/CommodityDetails/CommodityDetails.vue

@@ -704,7 +704,7 @@
 			},
 			//跳转到全部收货地址
 			upaddress() {
-				if (this.updata.receiver) {
+				if (this.loginFlag) {
 					uni.navigateTo({
 						url: `/pages/modifyAddress/modifyAddress?updata=${JSON.stringify(this.updata)}`
 					})
@@ -766,6 +766,7 @@
 			var that = this
 			this.baseurl = baseurl;
 			this.usershow = false;
+			this.loginFlag = false
 			const value = uni.getStorageSync('patientId');
 			if (value) {
 				AppIdentification(value).then(res => {
@@ -816,6 +817,7 @@
 					that.updata.receiveAddress = useritem.areaName + useritem.receiveAddress
 					that.userid = useritem.id
 				}
+				uni.$off('updata')
 			})
 		},
 		//1.分享给朋友

pages/Moreoptions/Moreoptions.vue

@@ -0,0 +1,92 @@
+<template>
+	<view class="app">
+		<view class="Classificationlist">
+			<view v-for="(item,index) in nurseItemClassifyInfoList" :key="index" @tap='tapitemclass(item)'
+				class="itemclass">
+				<image :src="item.classifyPictureUrl" mode=""></image>
+				<view class="title">
+					{{item.classifyName}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getNurseClassifyList
+	} from '@/api/site/site.js';
+	import baseurl from '@/api/baseurl.js'
+	export default {
+		data() {
+			return {
+				nurseItemClassifyInfoList: undefined,
+			};
+		},
+		methods: {
+			//点击分类
+			tapitemclass(item) {
+				uni.$emit('moreoptionitem', {
+					item: JSON.stringify(item)
+				})
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+			//护理站和护理项目分类
+			getNurseClassifyinfo() {
+				getNurseClassifyList().then(res => {
+					res.data.nurseItemClassifyInfoList.forEach(e => {
+						e.classifyPictureUrl = baseurl + e.classifyPictureUrl
+					})
+					this.nurseItemClassifyInfoList = res.data.nurseItemClassifyInfoList
+				})
+			},
+		},
+		onLoad() {
+			this.getNurseClassifyinfo();
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {}
+
+	.app {
+		padding: 10rpx 0;
+
+		.Classificationlist {
+			background-color: #fff;
+			width: 98%;
+			margin: 0 auto;
+			padding: 40rpx 0;
+			display: flex;
+			justify-content: flex-start;
+			flex-wrap: wrap;
+			text-align: center;
+
+			.itemclass {
+				width: 25%;
+				height: 230rpx;
+				padding: 20rpx 0;
+
+				image {
+					display: block;
+					margin: 0 auto;
+					width: 100rpx;
+					height: 100rpx;
+				}
+
+				.title {
+					padding: 0 10rpx;
+					width: 100%;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					font-size: 30rpx;
+					line-height: 70rpx;
+				}
+			}
+		}
+	}
+</style>

pages/Personal/Personal.vue

@@ -146,6 +146,9 @@
 	import {
 		existPatientInfo
 	} from '@/api/startup/index.js'
+	import {
+		createMobileToken
+	} from '@/api/login/index.js'
 	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
@@ -166,7 +169,7 @@
 			if (value) {} else {
 				that.appPersonallist = null
 				that.$refs.uToast.show({
-					title: '请先登录',
+					title: '您未登录,请先登录',
 					type: 'error',
 					duration: '1000',
 				})
@@ -183,14 +186,15 @@
 						content: '确认要退出此账号吗',
 						success: function(res) {
 							if (res.confirm) {
-								uni.removeStorageSync('patientId');
+								uni.clearStorageSync();
-								uni.removeStorageSync('openid');
-								uni.removeStorageSync('phone');
 								that.$refs.uToast.show({
 									title: '退出账号成功',
 									type: 'success',
 									duration: '1000'
 								})
+								createMobileToken().then(res => {
+									uni.setStorageSync("token", res.data.token)
+								})
 								if (that.timer) {
 									clearTimeout(that.timer)
 								}
@@ -204,7 +208,7 @@
 					});
 				} else {
 					that.$refs.uToast.show({
-						title: '您未登录',
+						title: '您未登录,请先登录',
 						type: 'error',
 						duration: '1000'
 					})

pages/appointmenttime/appointmenttime.vue

@@ -200,6 +200,7 @@
 					that.personInfo.phone = that.useritem.receivePhone
 					that.personInfo.address = that.useritem.address
 				} else {}
+				uni.$off('updata')
 			})
 		},
 		onLoad(options) {
@@ -303,6 +304,7 @@
 					this.orderlist.morningOpenStartTime = this.orderlist.morningOpenStartTime.slice(0, 5)
 					this.orderlist.patientId = this.patientId
 					this.orderlist.serviceAddress = this.personInfo.address
+					this.orderlist.disablingCondition = this.disablingCondition
 					if (this.orderlist.disablingCondition == 'NOT_DISABLED') {
 						this.orderlist.disablingReason = null
 					}

pages/confirmOrder/confirmOrder.vue

@@ -202,6 +202,7 @@
 					that.updata.phone = useritem.receivePhone
 					that.updata.receiveAddress = useritem.address
 				}
+				uni.$off('updata')
 			})
 		}
 	}

pages/diseasemanagement/diseasemanagement.vue

@@ -38,7 +38,7 @@
 				if (phone) {
 					uni.navigateToMiniProgram({
 						appId: 'wxa690d053c34ceebd',
-						path: '/pages/index/index',
+						path: 'pages/index/index',
 						extraData: {
 							'from': 'qy',
 							'phone': phone

pages/homepage/homepage.vue

@@ -55,10 +55,16 @@
 			</view>
 		</view>
 		<view class="Welfarecustomerservice">
-			<image src="../../static/pzyh.png" mode="" @tap='gopzyh'></image>
+			<view class="topimgs">
-			<image src="../../static/fuli.png" mode="" @tap='gomaterialbenefits'></image>
+				<image src="../../static/ynph.png" mode="" @tap='gopzyh'></image>
-			<image src="../../static/kefu.png" mode="" @tap='gocustomerservice'></image>
+				<image src="../../static/jypz.png" mode="" @tap='goseekmedicaladvice'></image>
-			<image src="../../static/96558.png" mode="" @tap='gonight'></image>
+				<image src="../../static/qyzq.png" mode="" @tap='gosuyu'></image>
+			</view>
+			<image class="night" src="../../static/96558.png" mode="" @tap='gonight'></image>
+			<view class="rightimg">
+				<image src="../../static/fuli.png" mode="" @tap='gomaterialbenefits'></image>
+				<image src="../../static/kefu.png" mode="" @tap='gocustomerservice'></image>
+			</view>
 			<image class="shopping" src="../../static/shoping.png" mode="" @tap='goshopping'></image>
 		</view>
 		<view class="Healthknowledge">
@@ -137,7 +143,7 @@
 							if (phone) {
 								uni.navigateToMiniProgram({
 									appId: 'wxa690d053c34ceebd',
-									path: '/pages/index/index',
+									path: 'pages/index/index',
 									extraData: {
 										'from': 'qy',
 										'phone': phone
@@ -302,17 +308,36 @@
 					})
 				}, 0)
 			},
+			//跳转新意象
 			goycjc() {
 				uni.navigateToMiniProgram({
 					appId: 'wxa2335d45fb25ee50',
 					success(res) {}
 				})
 			},
+			//跳转疏于
+			gosuyu() {
+				uni.navigateToMiniProgram({
+					appId: 'wxa0e41e29dd9e540b',
+					path: 'pages/index/index?source=ad_app_yryl-qydjtzwx',
+					success(res) {}
+				})
+			},
+			//跳转就医
+			goseekmedicaladvice() {
+				uni.navigateToMiniProgram({
+					appId: 'wx4f1d77226064cfc1',
+					path: 'pages/index/index',
+					success(res) {}
+				})
+			},
+			//跳转
 			gopzyh() {
 				uni.navigateTo({
 					url: `/pages/nursestation/nursestation?nurseStationId=${13}`
 				})
 			},
+			//跳转贴心智养
 			gonight() {
 				uni.navigateTo({
 					url: '/pages/night/night'
@@ -496,24 +521,42 @@
 			flex-wrap: wrap;
 			background-color: #fff;
 			width: 100%;
-			padding: 30rpx 3%;
+			padding: 30rpx 2%;
 			margin-bottom: 20rpx;
 
+			.topimgs {
+				display: flex;
+				justify-content: space-around;
+				width: 100%;
+				margin-bottom: 30rpx;
+
+				image {
+					width: 30%;
+					height: 170rpx;
+				}
+			}
 
 			.shopping {
-				margin-top: 15rpx;
+				margin-top: 5rpx;
 				width: 98%;
 				height: 170rpx;
 			}
 
-			image {
+			.rightimg {
-				display: block;
+				display: inline-block;
 				width: 48%;
-				height: 165rpx;
+
+				image {
+					display: block;
+					margin-bottom: 10rpx;
+					width: 100%;
+					height: 165rpx;
+				}
 			}
 
-			image:nth-child(1) {
+			.night {
-				margin-bottom: 14rpx;
+				width: 48%;
+				height: 340rpx;
 			}
 		}
 

pages/information/information.vue

@@ -113,6 +113,9 @@
 </template>
 
 <script>
+	import {
+		AppIdentification
+	} from '@/api/AppIdentification/index.js'
 	import {
 		getRegionAndStreetInfo,
 		getNurseType,
@@ -202,27 +205,47 @@
 									type: 'error'
 								})
 							} else {
-								information(that.query).then(res => {
+								const patientId = uni.getStorageSync('patientId');
-									if (res.code == 200) {
+								AppIdentification(patientId).then(resp => {
-										uni.removeStorageSync('invitationPatientId');
+									if (resp.code == 200) {
-										that.$refs.uToast.show({
+										if (resp.data.loginFlag) {
-											title: '完善信息成功',
+											that.$refs.uToast.show({
-											type: 'success',
+												title: '您已完善',
-											duration: '1500'
+												type: 'success',
-										})
-										if (that.timer) {
-											clearTimeout(that.timer)
-										}
-										that.timer = setTimeout(e => {
-											uni.navigateBack({
-												delta: 1
 											})
-										}, 1500)
+											if (that.timer) {
-									} else if (res.code == 500) {
+												clearTimeout(that.timer)
-										that.$refs.uToast.show({
+											}
-											title: res.msg,
+											that.timer = setTimeout(e => {
-											type: 'error',
+												uni.navigateBack({
-										})
+													delta: 1
+												})
+											}, 1500)
+										} else {
+											information(that.query).then(res => {
+												if (res.code == 200) {
+													uni.removeStorageSync('invitationPatientId');
+													that.$refs.uToast.show({
+														title: '完善信息成功',
+														type: 'success',
+														duration: '1500'
+													})
+													if (that.timer) {
+														clearTimeout(that.timer)
+													}
+													that.timer = setTimeout(e => {
+														uni.navigateBack({
+															delta: 1
+														})
+													}, 1500)
+												} else if (res.code == 500) {
+													that.$refs.uToast.show({
+														title: res.msg,
+														type: 'error',
+													})
+												}
+											})
+										}
 									}
 								})
 							}
@@ -294,20 +317,16 @@
 			},
 			// 三级地址联动回调
 			getpickerParentValue(e) {
+				e = e.filter(ele => ele.localName != '暂不选择')
+				e = e.filter(ele => ele.localName != '暂无需选择')
 				this.addresslength = e
-				if (e.length == 4) {
+				this.address = ''
-					this.address = e[0].localName + e[1].localName + e[2].localName + e[3]
+				this.query.areaCode = ''
-						.localName
+				if (e && e.length >= 1) {
-					this.query.areaCode = e[3].id
+					e.forEach(el => {
-				} else if (e.length == 3) {
+						this.address = this.address + el.localName
-					this.address = e[0].localName + e[1].localName + e[2].localName
+					})
-					this.query.areaCode = e[2].id
+					this.query.areaCode = e[e.length - 1].id
-				} else if (e.length == 2) {
-					this.address = e[0].localName + e[1].localName
-					this.query.areaCode = e[1].id
-				} else if (e.length == 1) {
-					this.address = e[0].localName
-					this.query.areaCode = e[0].id
 				} else {
 					this.address = ''
 					this.query.areaCode = ''
@@ -387,6 +406,7 @@
 						that.query.nurseTypeIdList = that.query.nurseTypeIdList.filter(el => el != e.id)
 					})
 				}
+				uni.$off('disease')
 			})
 		},
 	}

pages/integral/integral.vue

@@ -312,6 +312,7 @@
 					that.updata.receiveAddress = useritem.areaName + useritem.receiveAddress
 					that.userid = useritem.id
 				}
+				uni.$off('updata')
 			})
 		},
 		methods: {

pages/login/login.vue

@@ -21,33 +21,14 @@
 	export default {
 		data() {
 			return {
-				phonecode: '',
+				phonecode: undefined,
-				logincode: '',
+				logincode: undefined,
-				timer: null,
+				timer: undefined,
 			};
 		},
 		onShow() {
-			uni.removeStorageSync('openid');
+			this.phonecode = undefined
-			uni.removeStorageSync('patientId');
+			this.logincode = undefined
-			uni.removeStorageSync('phone');
-		},
-		//1.分享给朋友
-		onShareAppMessage(res) {
-			let pages = getCurrentPages();
-			let url = pages[pages.length - 1].$page.fullPath
-			return {
-				title: '泉医到家',
-				path: url,
-			}
-		},
-		//2.分享到朋友圈
-		onShareTimeline(res) {
-			let pages = getCurrentPages();
-			let url = pages[pages.length - 1].$page.fullPath
-			return {
-				title: '泉医到家',
-				path: url,
-			}
 		},
 		methods: {
 			getPhoneNumberp(val) {
@@ -74,6 +55,8 @@
 							type: 'success',
 							duration: '1500'
 						})
+						this.phonecode = undefined
+						this.logincode = undefined
 						uni.setStorageSync("Refresh", 'Refresh')
 						if (this.timer) {
 							clearTimeout(this.timer)
@@ -93,13 +76,30 @@
 				})
 			},
 			pwdlogin() {
-				uni.removeStorageSync('token');
 				var that = this
+				uni.clearStorageSync();
 				createMobileToken().then(res => {
 					uni.setStorageSync("token", res.data.token)
 					that.login()
 				})
 			},
+		}, //1.分享给朋友
+		onShareAppMessage(res) {
+			let pages = getCurrentPages();
+			let url = pages[pages.length - 1].$page.fullPath
+			return {
+				title: '泉医到家',
+				path: url,
+			}
+		},
+		//2.分享到朋友圈
+		onShareTimeline(res) {
+			let pages = getCurrentPages();
+			let url = pages[pages.length - 1].$page.fullPath
+			return {
+				title: '泉医到家',
+				path: url,
+			}
 		},
 	}
 </script>

pages/m-city/m-city.vue

@@ -82,9 +82,7 @@
 			};
 		},
 		onShow() {},
-		onLoad() {
+		onLoad() {},
-
-		},
 		onUnload() {},
 		methods: {
 			goemit() {

pages/modify/modify.vue

@@ -424,6 +424,7 @@
 			// }
 			uni.$on('disease', function(data) {
 				that.patientDiseaseInfoList = JSON.parse(data.disease)
+				uni.$off('disease')
 			})
 		},
 	}

pages/modifyAddress/modifyAddress.vue

@@ -167,6 +167,7 @@
 			// 三级地址联动回调
 			getpickerParentValue(e) {
 				e = e.filter(ele => ele.localName != '暂不选择')
+				e = e.filter(ele => ele.localName != '暂无需选择')
 				this.addresslength = e
 				this.infolist.address = ''
 				this.infolist.areaCode = ''

pages/site/site.vue

@@ -12,18 +12,12 @@
 					{{item.classifyName}}
 				</view>
 			</view>
-			<view class="item" v-if='nurseItemClassifyInfoList.length==7&&lengthlistshow' @tap='lengthlist(true)'>
+			<view class="item" v-if='nurseItemClassifyInfoList.length==7&&lengthlistshow' @tap='lengthlist'>
 				<image src="../../static/gd.png" mode=""></image>
 				<view class="title">
 					更多
 				</view>
 			</view>
-			<view class="item" v-if='nurseItemClassifyInfoList.length>7&&!lengthlistshow' @tap='lengthlist(false)'>
-				<image src="../../static/gd.png" mode=""></image>
-				<view class="title">
-					收起
-				</view>
-			</view>
 		</view>
 		<u-swiper :list="lbinfo" height='200' interval='3000' duration='1500' mode='none' @click='goswiper'></u-swiper>
 		<view class="conNew">
@@ -113,20 +107,23 @@
 					})
 				}
 			},
-			lengthlist(item) {
+			lengthlist() {
-				uni.showLoading({
+				uni.navigateTo({
-					title: '',
+					url: "/pages/Moreoptions/Moreoptions"
-					duration: 500
+				})
-				});
+				// uni.showLoading({
-				setTimeout((e) => {
+				// 	title: '',
-					this.lengthlistshow = !this.lengthlistshow
+				// 	duration: 500
-					if (item) {
+				// });
-						this.nurseItemClassifyInfoList = this.nurseItemClassifyInfolistlength
+				// setTimeout((e) => {
-					} else {
+				// 	this.lengthlistshow = !this.lengthlistshow
-						this.nurseItemClassifyInfoList = this.nurseItemClassifyInfolistlength.slice(0, 7)
+				// 	if (item) {
-					}
+				// 		this.nurseItemClassifyInfoList = this.nurseItemClassifyInfolistlength
-					uni.hideLoading();
+				// 	} else {
-				}, 500)
+				// 		this.nurseItemClassifyInfoList = this.nurseItemClassifyInfolistlength.slice(0, 7)
+				// 	}
+				// 	uni.hideLoading();
+				// }, 500)
 			},
 			//点击护理项目分类
 			tapitemclass(item) {
@@ -243,10 +240,23 @@
 			},
 		},
 		onShow() {
+			var that = this
+			uni.$on('moreoptionitem', function(data) {
+				if (data.item) {
+					that.tapitemclass(JSON.parse(data.item))
+				}
+				uni.$off('moreoptionitem')
+			})
+		},
+		onHide() {
 			this.nurseClassId = ''
 			this.itemClassId = ''
 			this.conNewcurrent = 0
+			this.requestinfo();
+		},
+		onLoad() {
 			var that = this
+			this.getNurseClassifyinfo();
 			const value = uni.getStorageSync('patientId');
 			if (value) {
 				getPatientInfo(value).then(res => {
@@ -289,9 +299,6 @@
 				// });
 			}
 		},
-		onLoad() {
-			this.getNurseClassifyinfo();
-		},
 		//1.分享给朋友
 		onShareAppMessage(res) {
 			let pages = getCurrentPages();