From 01cad72ebe66d53971cd142b8921fb096b997f94 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Fri, 19 Jul 2024 00:45:11 +0800
Subject: [PATCH] uu

---
 .../tpx-navigation-height.vue                 | 54 +++++++++++++++++++
 pages/tabBar/search/search.vue                | 12 ++---
 pages/tabBar/sending/sending.vue              | 20 +++----
 3 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 components/tpx-navigation-height/tpx-navigation-height.vue

diff --git a/components/tpx-navigation-height/tpx-navigation-height.vue b/components/tpx-navigation-height/tpx-navigation-height.vue
new file mode 100644
index 0000000..8c53fe0
--- /dev/null
+++ b/components/tpx-navigation-height/tpx-navigation-height.vue
@@ -0,0 +1,54 @@
+<template>
+	<view class="" :style="contStyle">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		computed: {
+			contStyle(){
+				let sty = ``
+				sty += `padding-top: ${this.menuTop}rpx;`
+				if(typeof this.menuHeight != 'undefined') {
+					sty += `min-height:${this.menuHeight}rpx;`
+				}
+				return sty
+			}
+		},
+		props: {
+		},
+		data() {
+			return {
+				menuTop: 60, // 默认60
+				menuHeight: undefined, // 
+			}
+		},
+		created() {
+			this.getMenuButton()
+		},
+		onHide() {
+
+		},
+		unmounted() {},
+
+		methods: {
+			getMenuButton(){
+				const that = this;
+				// 获取系统信息
+				const systemInfo = wx.getSystemInfoSync();
+				if(uni.getMenuButtonBoundingClientRect) {
+					// 小程序 胶囊按钮位置信息
+					const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+					this.menuTop = menuButtonInfo.top + systemInfo.statusBarHeight;
+					this.menuHeight = menuButtonInfo.height; 
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabBar/search/search.vue b/pages/tabBar/search/search.vue
index ccc5933..ee7c2e5 100644
--- a/pages/tabBar/search/search.vue
+++ b/pages/tabBar/search/search.vue
@@ -2,10 +2,12 @@
 	<tpx-page>
 		<tpx-layout>
 			<template v-slot:header>
-				<view class="customer_nav_bar">
+				<view class="search_nav_bar">
 					<view class="com-jianju" style="width: 490rpx;">
-						<!-- 关键字搜索框 -->
-						<tpx-search placeholder="请输入运单号/订单号" v-model:value="searchParam.billCode" @change="handleSearch" bgColor="#FFF" :timelyTrigger="false"></tpx-search>					
+						<tpx-navigation-height>
+							<!-- 关键字搜索框 -->
+							<tpx-search placeholder="请输入运单号/订单号" v-model:value="searchParam.billCode" @change="handleSearch" bgColor="#FFF" :timelyTrigger="false"></tpx-search>					
+						</tpx-navigation-height>
 					</view>
 					
 					<view class="com-jianju" style="padding-top: 40rpx;">
@@ -263,9 +265,7 @@
 		background-color: #F6F6F6;
 		height: 100% !important;
 	}
-	.customer_nav_bar {
-		// padding-top: --status-bar-height;
-		padding-top: 80rpx;
+	.search_nav_bar {
 		background-color: #B12D29;
 		position: relative;
 	}
diff --git a/pages/tabBar/sending/sending.vue b/pages/tabBar/sending/sending.vue
index fd0e772..7824a66 100644
--- a/pages/tabBar/sending/sending.vue
+++ b/pages/tabBar/sending/sending.vue
@@ -72,16 +72,16 @@
 					{  title: '专属小哥', subTitle: "下单给专属业务员", icon: getCdnUrl(`sdg/btn-bindbr.png`), url: 'user/exclusiveCourier' }
 				],
 				toolBtnlist: [
-					{  title: '进仓单', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-jcd.png`), url: 'warehousing/list' },
-					{  title: '运费时效', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-shisuan.png`), url: 'post/freightCalculate' },
-					{  title: '运单列表', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-dingdan.png`), url: 'tabBar/search/search' },
-					{  title: '网点查询', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-wangdain.png`), url: 'service/list' },
-					{  title: '地址簿', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-dizhi.png`), url: 'address/list' },
-					{  title: '信息速递', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-xuzhi.png`), url: 'service/articlelist' },
-					// {  title: 'HSCODE', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-HS.png`), url: '' },
-					// {  title: 'RECP', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-RE.png`), url: '' },
-					{  title: '扫码寄件', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-saoma.png`), url: 'action:smjj' },
-					{  title: '快递查询', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-yundan.png`), url: 'post/query' },
+					{  title: '进仓单', subTitle: "货物进仓信息", icon: getCdnUrl(`sdg/t-jcd.png`), url: 'warehousing/list' },
+					{  title: '运费时效', subTitle: "运费预估，时效查看", icon: getCdnUrl(`sdg/t-shisuan.png`), url: 'post/freightCalculate' },
+					{  title: '运单列表', subTitle: "寄件，收件运单", icon: getCdnUrl(`sdg/t-dingdan.png`), url: 'tabBar/search/search' },
+					{  title: '网点查询', subTitle: "查看收寄件网点", icon: getCdnUrl(`sdg/t-wangdain.png`), url: 'service/list' },
+					{  title: '地址簿', subTitle: "收件 寄件地址管理", icon: getCdnUrl(`sdg/t-dizhi.png`), url: 'address/list' },
+					{  title: '信息速递', subTitle: "快递信息列表", icon: getCdnUrl(`sdg/t-xuzhi.png`), url: 'service/articlelist' },
+					// {  title: 'HSCODE', subTitle: "海关归类信息", icon: getCdnUrl(`sdg/t-HS.png`), url: '' },
+					// {  title: 'RECP', subTitle: "优惠税率安排查询", icon: getCdnUrl(`sdg/t-RE.png`), url: '' },
+					{  title: '扫码寄件', subTitle: "扫描条码发货", icon: getCdnUrl(`sdg/t-saoma.png`), url: 'action:smjj' },
+					{  title: '快递查询', subTitle: "快递单跟踪查询", icon: getCdnUrl(`sdg/t-yundan.png`), url: 'post/query' },
 				]
 			}
 		},