修改

api/request.js

@@ -48,7 +48,8 @@ var request = function(config) {
 			success(res) {
 				uni.hideLoading();
 				if (witch == '1') {
-					if (config.url != '/applet/score/prizeExchange/approvalList') {
+					if (config.url != '/applet/score/prizeExchange/approvalList' && urls !=
+						'/nurseApplet/nearbyNursingStation/getHeathHousingList') {
 						res.data = decrypt(res.data)
 						res.data = JSON.parse(res.data)
 					}

pages/myinformation/myinformation.vue

@@ -173,14 +173,14 @@
 				<image src="@/static/huijiantou.png" mode=""></image>
 			</view>
 		</view>
-		<!-- <view class="myorder titles" @tap="remove()">
+		<view class="myorder titles" @tap="remove()">
 			<view class="title">
 				退出登录
 			</view>
 			<view class="righttitle">
 				<image src="@/static/huijiantou.png" mode=""></image>
 			</view>
-		</view> -->
+		</view>
 		<view class="mask" @click.stop='showhome = false' v-if="showhome">
 			<view class="masktext" @click.stop=''>
 				<view class="maskcontent" v-if="familyList">
@@ -310,7 +310,8 @@
 			// 切换成员
 			changeFamilyInfo(e) {
 				const value = uni.getStorageSync('openid');
-				if (value) {
+				const value2 = uni.getStorageSync('patientId');
+				if (value && value2) {
 					switchResident(value, e.patientCode).then(res => {
 						if (res.code == 200) {
 							this.appPersonallist = res.data
@@ -339,7 +340,7 @@
 			removes() {
 				this.appPersonallist = null
 				uni.removeStorageSync('patientId');
-				uni.removeStorageSync('openid');
+				// uni.removeStorageSync('openid');
 				uni.removeStorageSync('phone');
 				uni.removeStorageSync('userinfo');
 			},
@@ -363,8 +364,6 @@
 							that.removes();
 						}
 					})
-				} else {
-					that.removes();
 				}
 				// })
 				// } else {
@@ -432,77 +431,85 @@
 						url: `/pagesB/modify/modify`
 					})
 				} else {
-					if (!uni.getStorageSync('location') || !uni.getStorageSync('region')) {
+					if (!uni.getStorageSync('openid') && !value2) {
-						that.getAddress()
+						if (!uni.getStorageSync('location') || !uni.getStorageSync('region')) {
-					}
+							that.getAddress()
-					that.sportinfo();
-					wx.login({
-						provider: 'weixin',
-						success: function(loginRes) {
-							login(loginRes.code).then(resp => {
-								if (!resp.data) {
-									that.$refs.uToast.show({
-										title: '登录失败',
-										type: 'error',
-									})
-									return
-								}
-								if (resp.data.openid) {
-									uni.setStorageSync("openid", resp.data.openid)
-								}
-								if (resp.data.code == '0') {
-									that.$refs.uToast.show({
-										title: '未注册,请先注册',
-										type: 'error',
-										duration: '1500',
-									})
-									if (that.timer) {
-										clearTimeout(that.timer)
-									}
-									that.timer = setTimeout(() => {
-										uni.navigateTo({
-											url: '/pagesB/register/register',
-										})
-									}, 1500)
-								} else if (resp.data.code == '2') {
-									that.$refs.uToast.show({
-										title: '已被其他人注册',
-										type: 'error',
-										duration: '1500',
-									})
-								} else if (resp.data.code == '1') {
-									logingetCurrentUser(resp.data.openid).then(res => {
-										if (res.code == 200) {
-											if (res.data) {
-												that.appPersonallist = res.data
-												uni.setStorageSync('patientId', res.data.id);
-												uni.setStorageSync('userinfo', res.data);
-												uni.setStorageSync('phone', res.data.phone);
-												that.scoket();
-											}
-											that.$refs.uToast.show({
-												title: '登录成功',
-												type: 'success',
-												back: 1
-											})
-										} else {
-											that.$refs.uToast.show({
-												title: '登录失败',
-												type: 'error',
-											})
-										}
-									})
-								} else {
-									that.$refs.uToast.show({
-										title: '登录失败',
-										type: 'error',
-									})
-								}
-							})
 						}
-					});
+						that.sportinfo();
+						wx.login({
+							provider: 'weixin',
+							success: function(loginRes) {
+								login(loginRes.code).then(resp => {
+									if (!resp.data) {
+										that.$refs.uToast.show({
+											title: '登录失败',
+											type: 'error',
+										})
+										return
+									}
+									if (resp.data.openid) {
+										uni.setStorageSync("openid", resp.data.openid)
+									}
+									if (resp.data.code == '0') {
+										that.$refs.uToast.show({
+											title: '未注册,请先注册',
+											type: 'error',
+											duration: '1500',
+										})
+										if (that.timer) {
+											clearTimeout(that.timer)
+										}
+										that.timer = setTimeout(() => {
+											uni.navigateTo({
+												url: '/pagesB/register/register',
+											})
+										}, 1500)
+									} else if (resp.data.code == '2') {
+										that.$refs.uToast.show({
+											title: '已被其他人注册',
+											type: 'error',
+											duration: '1500',
+										})
+									} else if (resp.data.code == '1') {
+										that.outlogin(that, resp.data.openid)
+									} else {
+										that.$refs.uToast.show({
+											title: '登录失败',
+											type: 'error',
+										})
+									}
+								})
+							}
+						});
+					} else {
+						that.outlogin(that, uni.getStorageSync('openid'))
+					}
 				}
 			},
+			outlogin(that, openid) {
+				logingetCurrentUser(openid).then(res => {
+					if (res.code == 200) {
+						if (res.data) {
+							that.appPersonallist = res.data
+							uni.setStorageSync('patientId', res.data.id);
+							uni.setStorageSync('userinfo', res.data);
+							uni.setStorageSync('phone', res.data
+								.phone);
+							that.scoket();
+						}
+						that.$refs.uToast.show({
+							title: '登录成功',
+							type: 'success',
+							back: 1
+						})
+					} else {
+						that.$refs.uToast.show({
+							title: '登录失败',
+							type: 'error',
+						})
+					}
+				})
+			},
 			//护理站服务订单
 			gonursestation() {
 				const value = uni.getStorageSync('userinfo');

pagesB/AddMembers/AddMembers.vue

@@ -693,7 +693,6 @@
 				that.userinfo = uni.getStorageSync('userinfo');
 				that.form.openid = uni.getStorageSync('openid');
 				that.form.cityCode = uni.getStorageSync('region');
-				console.log(that.form.cityCode, 'that.form.cityCode')
 				if (that.form.cityCode == "") {
 					that.form.cityCode = 2
 				}
@@ -702,7 +701,6 @@
 				} else if (that.form.sexname == '女') {
 					that.form.sex = 'FEMALE';
 				}
-				console.log(that.form)
 				if (that.form.sex == "") {
 					that.$refs.uToast.show({
 						title: '请选择性别',

pagesB/Serviceevaluation/Serviceevaluation.vue

@@ -8,9 +8,7 @@
 			<view class="righttitle">
 				<image  :src="require('@/pagesC/images/huijiantou.png')" mode=""></image>
 			</view>
-
 		</view>
-
 		<view class="" v-if="total >0">
 			<view class="orderitem" v-for="(item,index) in evaluatedata">
 				<view class="tiemitem">
@@ -96,7 +94,6 @@
 		insertGoodsEvaluate,
 	} from '@/api/pagesB/Serviceevaluation/Serviceevaluation.js'
 	import {
-
 		add
 	} from '@/api/pagesC/servicerecord/servicerecord.js'
 	import baseurl from '@/api/baseurl.js'
@@ -122,14 +119,11 @@
 					patientId: '',
 					openId: '',
 					orderNo: '',
-
 					evaluateChannel: 'WE_CHAT_APPLET',
 				},
 				openId: '',
 				orderType: '',
 				orderSource: '',
-
-
 			}
 		},
 		onShow() {
@@ -138,26 +132,17 @@
 			this.parentId = this.userinfo.id;
 			this.region = uni.getStorageSync('region');
 			this.openId = uni.getStorageSync('openid');
-			// console.log(this.openId, '999')
-
 			// this.cardNo = '371402199404167019';
 			// this.cardNo = '372926199812187720';
 			// this.parentId = '83';
-
-
 			this.getlist();
-
 		},
 		onLoad(options) {
 			// this.list.patientId = uni.getStorageSync('patientId');
-
 			this.baseurl = baseurl;
-
 		},
 		onReachBottom() { //下滑加载
-
 			if (this.evaluatedata.length >= this.total) {
-
 			} else {
 				this.pageNum++
 				getAppletOrderList(this.parentId, this.orderStatus, this.cardNo, this.region, this.pageNum, this
@@ -167,12 +152,8 @@
 							this.evaluatedata.push(e)
 							this.total = res.total
 						})
-
 					}
-
-
 				})
-
 			}
 		},
 		watch: { //监听
@@ -200,8 +181,6 @@
 			// 护理站评价
 			ratenurse() {
 				this.evaluatenurse = true;
-
-
 			},
 			// 未评价
 			healthratenurse(item) {
@@ -214,12 +193,10 @@
 				// 家医模块立即评价
 				if (item.orderType == "FAMILY_DOCTOR") {
 					this.evaluateshow = true;
-
 				}
 				// 健康咨询、护理服务满意度
 				if (item.orderType == "HEALTH_CONSULTATION" || item.orderType == "APPOINTMENT_ORDER") {
 					this.evaluatenurse = true;
-
 				}
 				// 商品积分兑换、直接购买
 				if (item.orderType == "INTEGRAL_EXCHANGE" || item.orderType == "DIRECT_BUY") {
@@ -227,20 +204,15 @@
 						url: `/pagesB/evaluate/evaluate?item=${JSON.stringify(item)}&delta=${1}`
 						// url: `/pagesB/goodsorderRate/goodsorderRate?item=${JSON.stringify(item)}&delta=${1}`
 					})
-
 				}
 				this.orderType = item.orderType
 				this.list.orderNo = item.orderNo
-
-
 				// this.list.evaluateChanne = 'WE_CHAT_APPLET'
-
 			},
 			// 提交评价
 			submit() {
 				this.list.patientId = this.parentId
 				this.list.openId = uni.getStorageSync('openid')
-				console.log(this.list, '45')
 				if (this.orderType == "HEALTH_CONSULTATION" || this.orderType == "INTEGRAL_EXCHANGE" || this.orderType ==
 					"DIRECT_BUY" || this.orderType == "FAMILY_DOCTOR") {
 					// this.list.evaluateSatisfaction=this.evaluateSatisfaction
@@ -292,15 +264,12 @@
 							})
 						}
 					})
-
 				}
-
 			},
 			// 取消
 			cancel() {
 				this.evaluateshow = false;
 				this.evaluatenurse = false;
-
 			},
 			// 列表
 			getlist() {
@@ -308,22 +277,15 @@
 					.pageSize).then(res => {
 					this.evaluatedata = res.rows
 					this.total = res.total
-
 				})
-
 			},
-
 			// 跳转我的评价
 			expertOrder() {
 				uni.navigateTo({
 					url: '/pagesB/myevaluation/myevaluation'
 				})
-
-
 			},
-
 		},
-
 	}
 </script>
 

pagesB/familymemberdetail/familymemberdetail.vue

@@ -76,7 +76,7 @@
 								duration: 1000
 							});
 							uni.removeStorageSync('patientId');
-							uni.removeStorageSync('openid');
+							// uni.removeStorageSync('openid');
 							uni.removeStorageSync('phone');
 							uni.removeStorageSync('userinfo');
 							setTimeout(function() {

pagesB/nursestation/nursestation.vue

@@ -242,7 +242,6 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options)
 			let that = this
 			this.nurseStationId = options.nurseStationId
 			// scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
@@ -332,7 +331,6 @@
 				let that = this
 				const value = uni.getStorageSync('openid');
 				const userinfo = uni.getStorageSync('userinfo');
-
 				const patientId = userinfo.id
 				if (value && userinfo) {
 					// const scenenurseStationId = uni.getStorageSync('scenenurseStationId');
@@ -341,7 +339,6 @@
 					// 		url: `/pagesB/hospitalcare/hospitalcare?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`,
 					// 	})
 					// } else {
-					console.log(item, '5656')
 					AppIdentification(patientId).then(res => {
 						if (res.code == 200) {
 							if (res.data.loginFlag) {

pagesB/register/register.vue

@@ -17,7 +17,7 @@
 				</u-form-item>
 				<span>手机号</span>
 				<u-form-item prop="phone" :border-bottom="false">
-					<u-input v-model="query.phone" placeholder="请输入手机号" :disabled="true" />
+					<u-input v-model="query.phone" placeholder="请输入手机号" />
 				</u-form-item>
 				<view class="name">
 					性别
@@ -490,7 +490,7 @@
 											uni.setStorageSync('patientId', res.data.id);
 											uni.setStorageSync('phone', res.data.phone);
 											uni.setStorageSync('patientName', res.data
-											.patientName);
+												.patientName);
 											uni.setStorageSync("userinfo", res.data)
 											that.scoket();
 											that.$refs.uToast.show({

pagesC/servicerecord/servicerecord.vue

@@ -247,7 +247,6 @@
 			},
 			// 立即评价
 			evaluatetime(item) {
-				console.log(item, '58')
 				this.evaluateshow = true;
 				this.list = item
 				this.list.orderNo = item.performanceNo