Merge branch 'dev' of http://gitlab2.dui88.com/fh/20250528_FHQ1 into dev

mock/home.json

@@ -616,6 +616,6 @@
         "maintitle": "专家团",
         "etConUrl2": "homepage/et_con2.png",
         "etConUrl3": "homepage/et_con3.png",
-        "etConUrl1": "homepage/et_con1.png"
+        "etConUrl1": "homepage/et_con11.png"
     }
 }
\ No newline at end of file

pages/expertTeamPage/expertTeamPage.vue

 <template>
 	<view class="expertTeamPage">
-		<image :class="['bg', 'bg_1']" v-show="curTabIndex==1"
-			:src="$baseUrl + 'homepage/et_bg_sj1.jpg'" 
-			mode="aspectFit">
+		<image :class="['bg', 'bg_1']" v-show="curTabIndex==1" :src="$baseUrl + 'homepage/et_bg_sj1.jpg'"
+			mode="aspectFit">
 		</image>
-		<image :class="['bg', 'bg_2']" v-show="curTabIndex==2"
-			:src="$baseUrl + 'homepage/et_bg_zj1.jpg'" 
-			mode="aspectFit">
+		<image :class="['bg', 'bg_2']" v-show="curTabIndex==2" :src="$baseUrl + 'homepage/et_bg_zj1.jpg'"
+			mode="aspectFit">
 		</image>
-		<image :class="['bg', 'bg_3']" v-show="curTabIndex==3"
-			:src="$baseUrl + 'homepage/et_bg_jg1.jpg'" 
-			mode="aspectFit">
+		<image :class="['bg', 'bg_3']" v-show="curTabIndex==3" :src="$baseUrl + 'homepage/et_bg_jg1.jpg'"
+			mode="aspectFit">
 		</image>
 		<view class="tab_box">
 			<view class="tab tab_1" @tap="onSelTab(1)"></view>
 			<view class="tab tab_2" @tap="onSelTab(2)"></view>
 			<view class="tab tab_3" @tap="onSelTab(3)"></view>
 		</view>
+		<view class="bottom_btn_box">
+			<image class="et_bottom_btn" :src="$baseUrl + 'homepage/et_bottom_btn.png'" mode="aspectFit" @tap="onLink">
+			</image>
+		</view>
 	</view>
 </template>
 
@@ -26,17 +27,61 @@
 	} from 'vue';
 	import {
 		onLoad
-	} from '@dcloudio/uni-app'
-	
-	const curTabIndex = ref(1);
-	
-	onLoad((options) => {
-		curTabIndex.value = options.tab
-		console.log('接收到的参数:', curTabIndex.value)
+	} from '@dcloudio/uni-app'
+	import {
+		jump,
+		JumpType
+	} from '@/utils';
+
+	import {
+		getHealthField
+	} from "@/api/common";
+
+	const curTabIndex = ref(1);
+
+	onLoad((options) => {
+		curTabIndex.value = options.tab
+		console.log('接收到的参数:', curTabIndex.value)
 	});
 	const onSelTab = (index) => {
 		curTabIndex.value = index;
 	}
+	//跳转到医生问诊页面
+	const onLink = async () => {
+		const res = await getHealthField();
+
+		if (!res.success) {
+			uni.showToast({
+				title: "获取健康字段失败",
+				icon: "none",
+			});
+			return;
+		}
+
+		const {
+			sign,
+			timestamp,
+			appId,
+			partnerUserId,
+			env
+		} = res.data;
+
+		jump({
+			type: JumpType.MINI,
+			url: "/pages/partner/redirect",
+			extra: {
+				appId: "wx81ecfb5aa3fb512f",
+				envVersion: env,
+				extraData: {
+					sign, // 参考 4.请求参数
+					timestamp, // 参考 4.请求参数
+					appId, // 参考 4.请求参数
+					partnerUserId, // 参考 4.请求参数
+					targetApp: "/h5/partner/shining-like-a-start/landing-free-consult?sysType=CRF",
+				},
+			},
+		});
+	}
 </script>
 
 <style lang="less" scoped>
@@ -63,34 +108,54 @@
 
 		.bg_3 {
 			height: 2503rpx;
-		}
-		.tab_box{
-			position: absolute;
-			top: 505rpx;
-			z-index: 100;
-			width: 100%;
-			height: 100rpx;
-			display: flex;
-			justify-content: center;
-			gap: 0rpx;
-			opacity: 0;
-			.tab {
-				// position: absolute;
-				width: 230rpx;
-				height: 60rpx;
-			}
-			.tab_1{
-				// left: 45rpx;
-				background-color: red;
-			}
-			.tab_2{
-				// left: 290rpx;
-				background-color: #00ff00;
-			}
-			.tab_3{
-				// left: 510rpx;
-				background-color: #0f0f0f;
-			}
+		}
+
+		.tab_box {
+			position: absolute;
+			top: 505rpx;
+			z-index: 100;
+			width: 100%;
+			height: 100rpx;
+			display: flex;
+			justify-content: center;
+			gap: 0rpx;
+			opacity: 0;
+
+			.tab {
+				// position: absolute;
+				width: 230rpx;
+				height: 60rpx;
+			}
+
+			.tab_1 {
+				// left: 45rpx;
+				background-color: red;
+			}
+
+			.tab_2 {
+				// left: 290rpx;
+				background-color: #00ff00;
+			}
+
+			.tab_3 {
+				// left: 510rpx;
+				background-color: #0f0f0f;
+			}
+		}
+
+		.bottom_btn_box {
+			position: fixed;
+			width: 750rpx;
+			height: 118rpx;
+			bottom: 0rpx;
+
+			.et_bottom_btn {
+				position: absolute;
+				width: 681rpx;
+				height: 98rpx;
+				top: 10rpx;
+				left: 35rpx;
+			}
 		}
 	}
 </style>
\ No newline at end of file

views/Home.vue

@@ -95,10 +95,10 @@
 						<view class="et_tab_box">
 							<view class="tab_box" @tap="onSelEtTap(0)">
 								<image class="et_tab" v-show="etTabSelIndex == 0"
-									:src="$baseUrl + 'homepage/et_sel_tab1.png'">
+									:src="$baseUrl + 'homepage/et_sel_tab11.png'">
 								</image>
 								<image class="et_tab" v-show="etTabSelIndex != 0"
-									:src="$baseUrl + 'homepage/et_tab1.png'">
+									:src="$baseUrl + 'homepage/et_tab11.png'">
 								</image>
 							</view>
 							<view class="tab_box" @tap="onSelEtTap(1)">
@@ -1090,7 +1090,7 @@ export default {
 
 				.et_con_bg {
 					margin-left: 3rpx;
-					width: 652rpx;
+					width: 651rpx;
 					height: 562rpx;
 					background-color: #ffffff;
 					border-radius: 38rpx;