From 5530d134c1ae107a05581cec079c8c6a9455afda Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 4 Mar 2025 17:11:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BEbug=E3=80=81=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E9=A1=B5=E9=9D=A2=E6=A0=87=E9=A2=98=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E3=80=81=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E3=80=81=E9=97=AE=E5=8D=B7=E5=8E=BB=E6=8E=89=E5=B8=A6=E5=85=A5?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=BC=93=E5=AD=98=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/pages.json                                |  2 +-
 h5/pages/components/goHome.vue               |  2 +-
 h5/pages/main/index/index.vue                | 18 +++++++++++++-----
 h5/pages/main/order/order.vue                |  4 +++-
 h5/pages/main/question/question/question.vue |  6 +++++-
 h5/pages/premarital/form/form.vue            |  2 ++
 h5/pages/premarital/readme/readme.vue        |  2 ++
 7 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/h5/pages.json b/h5/pages.json
index 57513f8..4fe0f12 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -2,7 +2,7 @@
 	"pages": [{
 			"path": "pages/main/index/index",
 			"style": {
-				"navigationBarTitleText": "海南现代妇女儿童医院",
+				"navigationBarTitleText": "健康管理中心",
 				"navigationStyle": "custom"
 			}
 		},
diff --git a/h5/pages/components/goHome.vue b/h5/pages/components/goHome.vue
index a7c9d81..f914210 100644
--- a/h5/pages/components/goHome.vue
+++ b/h5/pages/components/goHome.vue
@@ -25,7 +25,7 @@ const goHome = () => {
 };
 onShow(()=>{
 	setTimeout(()=>{
-				 document.title = '海南现代妇女儿童医院';
+				 document.title = '健康管理中心';
 	},300)
 })
  
diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue
index 63960ba..88d8986 100644
--- a/h5/pages/main/index/index.vue
+++ b/h5/pages/main/index/index.vue
@@ -287,7 +287,8 @@
 								{{ Number($store.user.sex) === 1 ? '先生' : '女士' }}
 							</view>
 						</view>
-						<view class="content_tip_wrapper">{{ $store.config.tip }}</view>
+						<!--25-03-04 欢迎词让隐藏 -->
+						<!-- <view class="content_tip_wrapper">{{ $store.config.tip }}</view> -->
 					</view>
 					<view v-if="Number($store.user.count) > 1" @click="toChooseUser()" class="button_wrapper">切换</view>
 				</view>
@@ -313,7 +314,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="botm_blank_wrapper" style="font-size: 18rpx;color: #ccc;">03032121</view>
+			<view class="botm_blank_wrapper" style="font-size: 18rpx;color: #ccc;">03041658</view>
 		</view>
 	</view>
 </template>
@@ -469,7 +470,7 @@
 		line-height: 54rpx;
 		position: absolute;
 		right: 10rpx;
-		bottom: 68rpx;
+		bottom: 50rpx;
 	}
 
 	.content_tip_wrapper {
@@ -482,7 +483,7 @@
 
 	.user_name_wrapper {
 		font-weight: 500;
-		font-size: 26rpx;
+		font-size: 35rpx;
 		color: #323232;
 		line-height: 1;
 	}
@@ -492,11 +493,13 @@
 		color: #939393;
 		line-height: 1;
 		margin-left: 20rpx;
+		margin-top: 16rpx;
 	}
 
 	.user_info_wrapper {
 		display: flex;
 		align-items: center;
+		 
 	}
 
 	.logo_wrapper {
@@ -506,7 +509,12 @@
 	}
 
 	.content_wrapper {
-		margin-left: 25rpx;
+		 
+	 
+		
+		display: flex;
+		margin-left: 30rpx;
+		 
 	}
 
 	.logo_wrapper image {
diff --git a/h5/pages/main/order/order.vue b/h5/pages/main/order/order.vue
index 8b4bcbc..d87f4b8 100644
--- a/h5/pages/main/order/order.vue
+++ b/h5/pages/main/order/order.vue
@@ -110,7 +110,9 @@ import DraggableButton from "@/pages/components/goHome.vue";
 	const ReLoadOrderList = (newValue) => {
 		if (newValue == "orderUpdate") {
 			setTimeout(() => { 
-			    router.go(0);
+			   uni.redirectTo({
+			   	url: "/pages/main/order/order"
+			   }); 
 			  }, 1000);
 		  
 		}
diff --git a/h5/pages/main/question/question/question.vue b/h5/pages/main/question/question/question.vue
index 5befb59..9b7268b 100644
--- a/h5/pages/main/question/question/question.vue
+++ b/h5/pages/main/question/question/question.vue
@@ -20,6 +20,7 @@
 	} from '@/store'
 	import QuestionComponent from '../src/question.vue'
 	import Question2Component from '../src2/question.vue'
+	import DraggableButton from "@/pages/components/goHome.vue";
 	const $store = useStore()
 	const $props = defineProps({
 		id: {
@@ -55,7 +56,9 @@
 			question_active.value = 0
 			start_time.value = new Date() / 1000
 			nextTick(() => {
-				localGet()
+				//之前是 带入上传未填写完成的信息
+				//2025-03-04 又改为不带入上次填写的信息
+				//localGet()
 			})
 		})
 	}
@@ -309,6 +312,7 @@
 	}
 </script>
 <template>
+	<DraggableButton />
 	<view style="background-color:#d8eef3 ;">
 		<view v-if="!!$store.config">
 			<view :ref="configRef"></view>
diff --git a/h5/pages/premarital/form/form.vue b/h5/pages/premarital/form/form.vue
index 9f67fd0..c5fffa0 100644
--- a/h5/pages/premarital/form/form.vue
+++ b/h5/pages/premarital/form/form.vue
@@ -20,6 +20,7 @@
 	} from '@/store'
 	const $store = useStore()
 	import TitleComponent from '../src/title.vue'
+	import DraggableButton from "@/pages/components/goHome.vue";
 	const address_data = ref([])
 	const getAddressData = async () => {
 		const response = await $api('AddressData')
@@ -327,6 +328,7 @@
 	})
 </script>
 <template>
+	<DraggableButton />
 	<view>
 		<view v-if="!!$store.config">
 			<view :ref="configRef"></view>
diff --git a/h5/pages/premarital/readme/readme.vue b/h5/pages/premarital/readme/readme.vue
index 1756694..3788ca3 100644
--- a/h5/pages/premarital/readme/readme.vue
+++ b/h5/pages/premarital/readme/readme.vue
@@ -19,6 +19,7 @@
 	} from '@/store'
 	const $store = useStore()
 	import TitleComponent from '../src/title.vue'
+	import DraggableButton from "@/pages/components/goHome.vue";
 
 	const tip_content = ref('')
 	const getTipContent = async () => {
@@ -57,6 +58,7 @@
 	})
 </script>
 <template>
+	<DraggableButton />
 	<view>
 		<view v-if="!!$store.config">
 			<view :ref="configRef"></view>