From 4c29a20fe3dda02e32c683a10ea7e3bbc310c32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 13 Mar 2024 09:15:38 +0800
Subject: [PATCH] xg

---
 App.vue                                       |  9 ++-
 pages.json                                    | 22 ++++--
 pages/homepage/homepage.scss                  | 11 ++-
 pages/homepage/homepage.vue                   | 76 ++++++++-----------
 pagesB/Behaviorpoints/Behaviorpoints.vue      |  6 +-
 .../threeHighsAndSixDiseases.vue              | 44 +++++++++++
 6 files changed, 111 insertions(+), 57 deletions(-)
 create mode 100644 pagesB/threeHighsAndSixDiseases/threeHighsAndSixDiseases.vue

diff --git a/App.vue b/App.vue
index c0f94d7..6305afb 100644
--- a/App.vue
+++ b/App.vue
@@ -2,12 +2,19 @@
 	import {
 		mapMutations
 	} from "vuex";
+	import {
+		createMobileToken
+	} from '@/api/pages/login/index.js'
 	export default {
 		onLaunch: function() {},
 		methods: {
 			...mapMutations(['socketOpenfalse']),
 		},
-		onShow: function() {},
+		onShow: function() {
+			createMobileToken().then(res => {
+				uni.setStorageSync("token", res.data.token)
+			})
+		},
 		onHide: function() {
 			this.socketOpenfalse();
 			uni.closeSocket();
diff --git a/pages.json b/pages.json
index ad87721..86bde8c 100644
--- a/pages.json
+++ b/pages.json
@@ -4,6 +4,12 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/homepage/homepage",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		}, {
 			"path": "pages/startup/startup",
 			"style": {
 				"navigationStyle": "custom",
@@ -16,12 +22,6 @@
 				"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
 				"enablePullDownRefresh": true //设置参数为true
 			}
-		}, {
-			"path": "pages/homepage/homepage",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
 		}, {
 			"path": "pages/myinformation/myinformation",
 			"style": {
@@ -440,13 +440,21 @@
 						"navigationBarTitleText": "我的评价",
 						"enablePullDownRefresh": false
 					}
-				},{
+				}, {
 					"path": "behavior/behavior",
 					"style": {
 						"navigationBarTitleText": "健康行为",
 						"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
 						"enablePullDownRefresh": true //设置参数为true
 					}
+				},
+				{
+					"path" : "threeHighsAndSixDiseases/threeHighsAndSixDiseases",
+					"style" : 
+					{
+						"navigationBarTitleText" : "三高六病",
+						"enablePullDownRefresh" : false
+					}
 				}
 			]
 		}, {
diff --git a/pages/homepage/homepage.scss b/pages/homepage/homepage.scss
index f9ab6cd..5d15769 100644
--- a/pages/homepage/homepage.scss
+++ b/pages/homepage/homepage.scss
@@ -14,7 +14,16 @@
 
 			.item {
 				display: flex;
-
+				.notwo{
+					display: flex !important;
+					justify-content: space-around !important;
+					width: 94% !important;
+					margin: 0 auto !important;
+					image{
+						width:48% !important;
+						height: 132rpx !important;
+					}
+				}
 				.signmyself {
 					display: inline-block;
 					width: 48%;
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index a05db55..7dc2f1e 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -10,7 +10,7 @@
 				</text>
 			</view>
 		</view>
-		<view class="contentcenter" :style="Number(region)==2?'':'height:500rpx'">
+		<view class="contentcenter" :style="Number(region)==2?'height:450rpx':'height:500rpx'">
 			<view class="home" @tap="goonline">
 				<image src="@/static/qianyue.png" mode=""></image>
 				<view class="name">
@@ -23,7 +23,7 @@
 					健康档案
 				</view>
 			</view>
-			<view class="home" @tap="goappoint">
+			<view class="home" @tap="goappoint" v-if="Number(region)!=2">
 				<image src="@/static/serveappoint.png" mode=""></image>
 				<view class="name">
 					服务预约
@@ -41,42 +41,42 @@
 					积分兑换
 				</view>
 			</view>
-			<view class="home" @tap="myappointment">
+			<view class="home" @tap="myappointment" v-if="Number(region)!=2">
 				<image src="@/static/appointmen.png" mode=""></image>
 				<view class="name">
 					我的预约
 				</view>
 			</view>
-			<view class="home" @tap="servicerecord">
+			<view class="home" @tap="servicerecord" v-if="Number(region)!=2">
 				<image src="@/static/SERVERECOD.png" mode=""></image>
 				<view class="name">
 					服务记录
 				</view>
 			</view>
-			<view class="home" @tap='gointegration' v-if="Number(region)==2">
-				<image src="@/static/zhaohufangan.png" mode=""></image>
-				<view class="name">
-					一体化照护方案
-				</view>
-			</view>
-			<view class="home" @tap='gonurseRecord' v-if="Number(region)==2">
+			<view class="home" @tap='gothreeHighsAndSixDiseases' v-if="Number(region)==2">
 				<image src="@/static/zhaohujilu.png" mode=""></image>
 				<view class="name">
-					照护记录
+					三高六病
+				</view>
+			</view>
+			<view class="home" v-if="Number(region)==2">
+				<image src="@/static/zhaohujilu.png" mode=""></image>
+				<view class="name">
+					自主检测
 				</view>
 			</view>
 			<view class="home" v-if="Number(region)==2">
 			</view>
 		</view>
-		<view class="contentbottom">
+		<view class="contentbottom" :style="Number(region)==2?'height:350rpx':''">
 			<view class="health">
 				健康管理
 			</view>
 			<view class="item">
-				<view class="signmyself" @tap="sign">
+				<view class="signmyself" @tap="sign" v-if="Number(region)!=2">
 					<image src="@/static/tizheng.png" mode=""></image>
 				</view>
-				<view class="sign">
+				<view class="sign" :class="Number(region)==2?'notwo':''">
 					<image @tap="healthtest" src="@/static/healthmyself.png" mode=""></image>
 					<image @tap="gorecords" src="@/static/records.png" mode=""></image>
 				</view>
@@ -207,26 +207,6 @@
 					url: "/pagesB/login/login"
 				})
 			},
-			//照护方案
-			gointegration() {
-				if (!this.userinfo) {
-					this.gologin();
-				} else {
-					uni.navigateTo({
-						url: '/pagesC/integration/integration'
-					})
-				}
-			},
-			// 照护记录
-			gonurseRecord() {
-				if (!this.userinfo) {
-					this.gologin();
-				} else {
-					uni.navigateTo({
-						url: '/pagesC/nurseRecord/nurseRecord'
-					})
-				}
-			},
 			gologin() {
 				this.$refs.uToast.show({
 					title: '您未登录,请先登录',
@@ -357,16 +337,13 @@
 			},
 			// 体征检测
 			sign() {
-				uni.navigateTo({
-					url: "/pagesC/Physicalexamination/Physicalexamination"
-				})
-				// if (!this.userinfo) {
-				// 	this.gologin();
-				// } else {
-				// 	uni.navigateTo({
-				// 		url: "/pagesC/Physicalexamination/Physicalexamination"
-				// 	})
-				// }
+				if (!this.userinfo) {
+					this.gologin();
+				} else {
+					uni.navigateTo({
+						url: "/pagesC/Physicalexamination/Physicalexamination"
+					})
+				}
 			},
 			// 服务预约
 			goappoint() {
@@ -479,6 +456,15 @@
 					}
 				}
 			},
+			gothreeHighsAndSixDiseases() {
+				if (!this.userinfo) {
+					this.gologin();
+				} else {
+					uni.navigateTo({
+						url: "/pagesB/threeHighsAndSixDiseases/threeHighsAndSixDiseases"
+					})
+				}
+			},
 		}
 	}
 </script>
diff --git a/pagesB/Behaviorpoints/Behaviorpoints.vue b/pagesB/Behaviorpoints/Behaviorpoints.vue
index 8d959e7..d558d48 100644
--- a/pagesB/Behaviorpoints/Behaviorpoints.vue
+++ b/pagesB/Behaviorpoints/Behaviorpoints.vue
@@ -85,17 +85,17 @@
 			};
 		},
 		onLoad() {
-
 			this.info();
 			this.scoretotalinfo();
 		},
 		onReady() { //更改导航栏文字
 			if (uni.getStorageSync('region') == 2) {
 				detail(this.query.identity).then(res => {
-					this.title = '东营健康银行' + res.data.countyName + '分行'
+					let name = res.data.countyName.split('区')[0].split('县')
+					this.title = '东营健康银行' + name + '分行'
 					this.orgNo = res.data.orgNo
 					uni.setNavigationBarTitle({
-						title: '东营健康银行' + res.data.countyName + '分行'
+						title: '东营健康银行' + name + '分行'
 					});
 				})
 			} else {
diff --git a/pagesB/threeHighsAndSixDiseases/threeHighsAndSixDiseases.vue b/pagesB/threeHighsAndSixDiseases/threeHighsAndSixDiseases.vue
new file mode 100644
index 0000000..a8901f5
--- /dev/null
+++ b/pagesB/threeHighsAndSixDiseases/threeHighsAndSixDiseases.vue
@@ -0,0 +1,44 @@
+<template>
+	<view>
+		<view class="home" @tap='gointegration'>
+			<image src="@/static/zhaohufangan.png" mode=""></image>
+			<view class="name">
+				一体化照护方案
+			</view>
+		</view>
+		<view class="home" @tap='gonurseRecord'>
+			<image src="@/static/zhaohujilu.png" mode=""></image>
+			<view class="name">
+				照护记录
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			//照护方案
+			gointegration() {
+				uni.navigateTo({
+					url: '/pagesC/integration/integration'
+				})
+			},
+			// 照护记录
+			gonurseRecord() {
+				uni.navigateTo({
+					url: '/pagesC/nurseRecord/nurseRecord'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
\ No newline at end of file