修改

api/pagesB/SelectItem/SelectItem.js

@@ -3,6 +3,9 @@ import request from "../../request.js"
 export function projectTypedata(projectType) {
 	return request({
 		url: `/nurseApplet/screening/project/list?projectType=${projectType}`,
-		method: 'GET'
+		method: 'GET',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }

api/pagesB/ServiceDetails/ServiceDetails.js

@@ -4,7 +4,10 @@ import request from "../../request.js"
 export function getAppointmentDetailsInfo(orderNo) {
 	return request({
 		url: `/nurseApplet/nursingOrder/getAppointmentDetailsInfo?orderNo=${orderNo}`,
-		method: 'GET'
+		method: 'GET',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }
 //评价
@@ -12,12 +15,18 @@ export function addAppointmentEvaluate(data) {
 	return request({
 		url: `/nurseApp/orderEvaluate/addAppointmentEvaluate`,
 		method: 'POST',
-		data
+		data,
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }
 export function handCloseOrder() {
 	return request({
 		url: `/monitor/payTask/handCloseOrder`,
-		method: 'GET'
+		method: 'GET',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
 }

pages.json

@@ -666,25 +666,21 @@
 				"navigationBarTitleText": "健康处方",
 				"enablePullDownRefresh": false
 			}
-		}    ,{
+		}, {
-                    "path" : "History/History",
+			"path": "History/History",
-                    "style" :                                                                                    
+			"style": {
-                {
+				"navigationBarTitleText": "健康自评历史记录",
-                    "navigationBarTitleText": "健康自评历史记录",
+				"enablePullDownRefresh": false
-                    "enablePullDownRefresh": false
+			}
-                }
 
-                }
+		}, {
-                ,{
+			"path": "HistoryQuestionnaire/HistoryQuestionnaire",
-                    "path" : "HistoryQuestionnaire/HistoryQuestionnaire",
+			"style": {
-                    "style" :                                                                                    
+				"navigationBarTitleText": "历史记录评估问卷",
-                {
+				"enablePullDownRefresh": false
-                    "navigationBarTitleText": "历史记录评估问卷",
+			}
-                    "enablePullDownRefresh": false
-                }
 
-                }
+		}]
-            ]
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

pages/homepage/homepage.vue

@@ -105,7 +105,7 @@
 			} else if (this.address == '东营市') {
 				uni.setStorageSync("region", 2)
 			} else if (this.address == '济南市') {
-				uni.setStorageSync("region", 1)
+				uni.setStorageSync("region", 3)
 			}
 			this.userinfo = uni.getStorageSync('userinfo');
 			if (this.userinfo) {

pages/myinformation/myinformation.vue

@@ -155,14 +155,11 @@
 				<image src="../../static/huijiantou.png" mode=""></image>
 			</view>
 		</view>
-		<u-toast ref="uToast" />
+		<view class="mask" @click.stop='showhome = false' v-if="showhome">
-
-		<view class="mask" v-show="showhome" @click.stop='showhome = false'>
 			<view class="masktext" @click.stop=''>
-				<view class="maskcontent">
+				<view class="maskcontent" v-if="familyList">
-					<!-- <text>{{familyList.patientName}}</text> -->
 					<template v-for="item in familyList">
-						<view :class="item.cardNo === userinfo.cardNo ? 'p1' : 'p2'"
+						<view :class="item.cardNo == userinfo.cardNo ? 'p1' : 'p2'"
 							@click.stop="changeFamilyInfo(item)">
 							<text>{{item.patientName}}</text>
 							<text
@@ -197,9 +194,6 @@
 		createMobileToken
 	} from '@/api/pages/login/index.js'
 	import baseurl from '@/api/baseurl.js'
-	// import {
-	// 	,
-	// } from '@/api/pages/homepage/homepage.js'
 	export default {
 		data() {
 			return {
@@ -208,30 +202,25 @@
 				timer: null,
 				list: {},
 				showhome: false, //切换
-				familyList: {}, //切换列表
+				familyList: null, //切换列表
 				userinfo: {}, //用户信息
 				valueopenid: '',
-				cityCode:'',
+				cityCode: '',
-
-
 			};
 		},
 		onShow() {
 			// this.bjimg = baseurl + '/profile/appletPicture/inviteFriendsOne.png'
 			let that = this
-			that.userinfo = uni.getStorageSync('userinfo')
+			this.userinfo = uni.getStorageSync('userinfo')
-			console.log(that.userinfo)
+			this.baseurl = baseurl
-			that.baseurl = baseurl
-			const value = uni.getStorageSync('patientId');
 			this.valueopenid = uni.getStorageSync('openid');
-			this.cityCode=uni.getStorageSync('region');
+			this.cityCode = uni.getStorageSync('region');
-			if (value) {
+			if (that.userinfo) {
 				that.myInfo()
 			} else {
 				that.appPersonallist = null
 			}
 			this.getpersnoal()
-
 		},
 		methods: {
 			// 退出登录
@@ -268,15 +257,12 @@
 			},
 			// 获取成员
 			getpersnoal() {
-				getCurrentUser(this.valueopenid,this.cityCode).then(res => {
+				getCurrentUser(this.valueopenid, this.cityCode).then(res => {
-					console.log(res)
 					this.familyList = res.data
-
 				})
 			},
 			// 切换成员
 			changeFamilyInfo(e) {
-				console.log(e, '000')
 				switchResident(this.valueopenid, e.patientCode).then(res => {
 					if (res.code == 200) {
 						this.$refs.uToast.show({
@@ -287,24 +273,22 @@
 						uni.setStorageSync('userinfo', res.data);
 						uni.setStorageSync('patientId', res.data.id);
 						this.myInfo()
-
 					} else {
 						this.$refs.uToast.show({
 							title: res.msg,
 							type: 'error',
 							duration: '1000',
 						})
-
 					}
 				})
 				this.showhome = false
 			},
 			removes() {
 				this.appPersonallist = null
-				// uni.removeStorageSync('patientId');
+				uni.removeStorageSync('patientId');
-				// uni.removeStorageSync('openid');
+				uni.removeStorageSync('openid');
-				// uni.removeStorageSync('phone');
+				uni.removeStorageSync('phone');
-				// uni.removeStorageSync('Refresh');
+				uni.removeStorageSync('userinfo');
 			},
 			//获取个人信息
 			myInfo() {
@@ -395,26 +379,21 @@
 			},
 			//全部订单
 			goorder(index, item) {
-				// console.log(index, item)
+				const value = uni.getStorageSync('openid');
-				// const value = uni.getStorageSync('openid');
+				const value2 = uni.getStorageSync('patientId');
-				// const value2 = uni.getStorageSync('patientId');
+				if (value && value2) {
-				// if (value && value2) {
+					uni.navigateTo({
-				uni.navigateTo({
+						url: `/pagesB/CommodityOrder/CommodityOrder?toindex=${index}&&orderStatus=${item}`
-					url: '/pagesB/CommodityOrder/CommodityOrder'
+					})
-				})
+				} else {
-				// uni.navigateTo({
+					this.gologin();
-				// 	url: `/pagesB/CommodityOrder/CommodityOrder?toindex=${index}&&orderStatus=${item}`
+				}
-				// })
-				// } else {
-				// 	this.gologin();
-				// }
 			},
 			//去登陆
 			gologin() {
 				this.$refs.uToast.show({
 					title: '您未登录,请先登录',
 					type: 'error',
-					duration: '1000',
 					url: '/pages/login/login'
 				})
 			},
@@ -440,7 +419,6 @@
 			homeshow() {
 				// this.getSetting()
 				// this.listquery.bindingCity = uni.getStorageSync('userinfo').bindingCity
-
 				var patientCode = this.userinfo.patientCode
 				var openid = uni.getStorageSync('openid')
 				// getFamilyList(openid, patientCode).then(res => {
@@ -499,39 +477,12 @@
 					this.gologin();
 				}
 			},
-			//修改信息
-			// updatainfo() {
-			// 	const value = uni.getStorageSync('openid');
-			// 	const value2 = uni.getStorageSync('patientId');
-			// 	if (value && value2) {
-			// 		uni.navigateTo({
-			// 			url: `/pagesB/modify/modify`
-			// 		})
-			// 	} else {
-			// 		this.gologin();
-			// 	}
-			// },
 			// 专家咨询订单
 			expertOrder() {
 				uni.navigateTo({
 					url: "/pagesB/ExpertlookOrder/ExpertlookOrder"
 				})
 			},
-			// getSetting() {
-			//   uni.getSetting({
-			//     withSubscriptions: true,
-			//     success(res) {
-			//       // console.log(res.subscriptionsSetting.itemSettings);
-			//       let itemSettings = res.subscriptionsSetting.itemSettings
-			//       if (!itemSettings || itemSettings['8InV9jXDT5sMj9OWfXEvlLQGlw2UaWfZ9OBMFxufmfk'] != 'accept') {
-			//         uni.requestSubscribeMessage({
-			//           tmplIds: ['8InV9jXDT5sMj9OWfXEvlLQGlw2UaWfZ9OBMFxufmfk']
-			//         })
-			//         return
-			//       }
-			//     }
-			//   })
-			// }
 		}
 	}
 </script>