From 5bf5a5fd0a34ceb448b76189077a65eb0e2fcc78 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 13 Dec 2023 10:27:58 +0800
Subject: [PATCH] uu

---
 pages.json             |   6 --
 pages/address/list.vue |  16 +++--
 pages/bill/detail.vue  |  27 ++++----
 pages/bill/list.vue    | 138 ++++++++++++++++++++---------------------
 pages/service/list.vue |  18 +++---
 5 files changed, 105 insertions(+), 100 deletions(-)

diff --git a/pages.json b/pages.json
index 8463690..664fd44 100644
--- a/pages.json
+++ b/pages.json
@@ -47,8 +47,6 @@
 		{
 			"path": "pages/address/list",
 			"style": {
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#B12D29",
 				"navigationBarTitleText": "地址管理"
 			}
 		},
@@ -73,8 +71,6 @@
 		{
 			"path": "pages/service/list",
 			"style": {
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#B12D29",
 				"navigationBarTitleText": "网点查询"
 			}
 		},
@@ -99,8 +95,6 @@
 		{
 			"path": "pages/bill/list",
 			"style": {
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#B12D29",
 				"navigationBarTitleText": "我的账单"
 			}
 		},
diff --git a/pages/address/list.vue b/pages/address/list.vue
index f52fc46..60a5e4e 100644
--- a/pages/address/list.vue
+++ b/pages/address/list.vue
@@ -1,6 +1,6 @@
 <template>
 	<tpx-layout>
-		
+		<template v-slot:header> </template>
 		<template v-slot:body>
 			<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" class="pos-abt-all"
 			>
@@ -13,7 +13,7 @@
 					<view class="com-jianju" style="padding-top: 40rpx;">
 						<u-row justify="between" align="top">
 							<u-col span="12">
-								<tpx-tabs :list="tabList" v-model:value="searchParam.tabType" mode="info"
+								<tpx-tabs :list="tabList" v-model:value="searchParam.tabType" 
 									@tabchange="(val)=> { handleSearchParamChange() }" v-slot="curTab"
 								>
 									<text slot>
@@ -72,7 +72,14 @@
 			<view class="blcok-white-noradius">
 				<u-button @click="handleEditItem()" type="primary" size="large" shape="circle" 
 					custom-style="height:80rpx;font-size: 30rpx;"
-				>新增地址</u-button>
+				>
+					<u-row>
+						<u-icon size="34" color="#fff" name="plus"></u-icon>
+						<text class="pl-10">新增地址</text>
+						
+						<u-icon size="34" color="#fff" ></u-icon>
+					</u-row>
+				</u-button>
 			</view>
 		</template>
 	</tpx-layout>
@@ -195,8 +202,7 @@
 	.pgb-header {
 		// padding-top: --status-bar-height;
 		padding-top: 30rpx;
-		// background-color: #FFF;
-		background-color:#B12D29;
+		background-color: #FFF;
 		position: relative;
 	}
 	.pgb-cont{
diff --git a/pages/bill/detail.vue b/pages/bill/detail.vue
index 672181c..c767e70 100644
--- a/pages/bill/detail.vue
+++ b/pages/bill/detail.vue
@@ -37,21 +37,27 @@
 			</view>
 			
 			<view class="dt-item mt-30">
-				<view class="lb1">支付给</view>
+				<view class="lb1">收款账户</view>
 				<view class="lb2">
-					<view class="zhfxin">
-						<!-- <u-avatar size="100"></u-avatar> -->
-						<u-text  :text="'江苏探路者国际物流有限公司'" size="28" :bold="true" align="center"></u-text>
-					</view>
+					<u-row >
+						<u-avatar size="80" shape="square"></u-avatar>
+						<view class="pl-10">
+							<u-text :text="'江苏探路者国际物流有限公司'" size="28" :bold="true" ></u-text>
+							<u-text :text="'介绍'" size="26" color="#666" margin="10rpx 0 0 0"></u-text>
+						</view>
+					</u-row>
 				</view>
 			</view>
 			<view class="dt-item mt-30">
 				<view class="lb1">支付金额</view>
 				<view class="zhfxin">
-					<u-image height="300" width="300"></u-image>
-					<view class=""></view>
-					<u-text  margin="20rpx 0 0 0" :text="'￥1225.00'" size="32" :bold="true" color="#B12D29" align="center"></u-text>
-					<u-text margin="20rpx 0 0 0" :text="'请使用微信或支付宝扫以上码支付'" size="28" :bold="true" align="center"></u-text>
+					<view style="text-align: center;width: 300rpx;">
+						<u-image height="300" width="300" radius="10"></u-image>
+						<view class="mt-10" style="display: inline-block;">
+							<u-text :text="'￥1225.00'" size="32" :bold="true" color="#B12D29" align="center"></u-text>
+						</view>
+					</view>
+					<u-text margin="20rpx 0 0 0" :text="'请使用微信或支付宝扫以上码支付'" size="28" :bold="true"></u-text>
 				</view>
 			</view>
 			
@@ -159,9 +165,6 @@
 		}
 	}
 	.zhfxin{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
 	}
 	.yditem{
 		padding: 20rpx 20rpx;
diff --git a/pages/bill/list.vue b/pages/bill/list.vue
index ad7f247..e7ea24a 100644
--- a/pages/bill/list.vue
+++ b/pages/bill/list.vue
@@ -1,77 +1,79 @@
 <template>
 	<tpx-layout>
-		<template v-slot:body>
-			<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" class="pos-abt-all"
-			>
-				<view class="customer_nav_bar">
-					<view class="com-jianju" >
-						<!-- 关键字搜索框 -->
-						<tpx-search placeholder="请输入运单号/订单号" v-model:value="searchParam.keyword" @change="handleSearchParamChange()" bgColor="#FFF" :timelyTrigger="false"></tpx-search>					
-					</view>
-					
-					<view class="com-jianju" style="padding-top: 40rpx;">
-						<u-row justify="between" align="top">
-							<u-col span="9">
-								<!-- 订单状态 -->
-								<tpx-tabs :list="payStatusList" v-model:value="searchParam.payStatus" mode="info" 
-									@tabchange="(val)=> { handleSearchParamChange() }" v-slot="curOrdTab"
-								>
-									<text slot>
-										(<text>{{curOrdTab.item.val}}</text>)
-									</text>
-								</tpx-tabs>
-							</u-col>
-							<u-col span="2">
-								<!-- 更多查询条件 -->
-								<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
-									<u-row justify="center">
-										<view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">
-											{{hasExtSchParam?'已':''}}筛选
-										</view>
-										<u-icon :name="showSearchMore?'arrow-up-fill':'arrow-down-fill'" 
-											:color="(hasExtSchParam?'#B12D29':'color: #666')" size="18" custom-style="margin-top: 2rpx;"
-										></u-icon>
-									</u-row>
-								</u-button>
-							</u-col>
-						</u-row>
-					</view>
-					
-					<!-- 状态搜索 -->
-					<view v-if="showSearchMore" class="search-more-panel">
-						<view class="smp-body slideInDown animated fast">
-							<view class="smp-content">
-								<view class="pos-abt-all" style="overflow-y: auto;">
-									<view style="padding: 0 0 30rpx 0">
-										<view>
-											<u-text text="快递状态" size="28" :bold="true" margin="0 0 20rpx 0"></u-text>
-											<tpx-tags :list="dlvTypeList" v-model:value="tmpSearchParam.postStatus" ></tpx-tags>
-										</view>
-										
-										<view>
-											<u-text text="付款方式" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>	
-											<tpx-tags :list="payTypeList" v-model:value="tmpSearchParam.payType" ></tpx-tags>
-										</view>
-										
-										<view>
-											<u-text text="时间范围" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>
-											<tpx-tags type="single" :list="dateTypeList" v-model:value="tmpSearchParam.dateType" @onItemClick="handleCheckDate"></tpx-tags>
-											<tpx-tags v-if="tmpSearchParam.date" type='' :list="[{title: tmpSearchParam.date}]" @onItemClick="handleSwitchCladar()" mode="primary"></tpx-tags>
-										</view>
+		<template v-slot:header>
+			<view class="customer_nav_bar">
+				<view class="com-jianju" >
+					<!-- 关键字搜索框 -->
+					<tpx-search placeholder="请输入运单号/订单号" v-model:value="searchParam.keyword" @change="handleSearchParamChange()" bgColor="#FFF" :timelyTrigger="false"></tpx-search>					
+				</view>
+				
+				<view class="com-jianju" style="padding-top: 30rpx;">
+					<u-row justify="between" align="top">
+						<u-col span="9">
+							<!-- 订单状态 -->
+							<tpx-tabs :list="payStatusList" v-model:value="searchParam.payStatus" 
+								@tabchange="(val)=> { handleSearchParamChange() }" v-slot="curOrdTab"
+							>
+								<text slot>
+									(<text>{{curOrdTab.item.val}}</text>)
+								</text>
+							</tpx-tabs>
+						</u-col>
+						<u-col span="2">
+							<!-- 更多查询条件 -->
+							<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
+								<u-row justify="center">
+									<view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">
+										{{hasExtSchParam?'已':''}}筛选
+									</view>
+									<u-icon :name="showSearchMore?'arrow-up-fill':'arrow-down-fill'" 
+										:color="(hasExtSchParam?'#B12D29':'color: #666')" size="18" custom-style="margin-top: 2rpx;"
+									></u-icon>
+								</u-row>
+							</u-button>
+						</u-col>
+					</u-row>
+				</view>
+				
+				<!-- 状态搜索 -->
+				<view v-if="showSearchMore" class="search-more-panel">
+					<view class="smp-body slideInDown animated fast">
+						<view class="smp-content">
+							<view class="pos-abt-all" style="overflow-y: auto;">
+								<view style="padding: 0 0 30rpx 0">
+									<view>
+										<u-text text="快递状态" size="28" :bold="true" margin="0 0 20rpx 0"></u-text>
+										<tpx-tags :list="dlvTypeList" v-model:value="tmpSearchParam.postStatus" ></tpx-tags>
+									</view>
+									
+									<view>
+										<u-text text="付款方式" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>	
+										<tpx-tags :list="payTypeList" v-model:value="tmpSearchParam.payType" ></tpx-tags>
+									</view>
+									
+									<view>
+										<u-text text="时间范围" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>
+										<tpx-tags type="single" :list="dateTypeList" v-model:value="tmpSearchParam.dateType" @onItemClick="handleCheckDate"></tpx-tags>
+										<tpx-tags v-if="tmpSearchParam.date" type='' :list="[{title: tmpSearchParam.date}]" @onItemClick="handleSwitchCladar()" mode="primary"></tpx-tags>
 									</view>
 								</view>
 							</view>
-							<view class="smp-foot">
-								<u-row gutter="20" justify="between">
-									<u-button @click="handleResetTempSearch()" shape="circle">重置</u-button>
-									<view style="width: 40rpx;"></view>
-									<u-button @click="handleConfirmTempSearch()" shape="circle" type="primary">确认</u-button>
-								</u-row>
-							</view>
+						</view>
+						<view class="smp-foot">
+							<u-row gutter="20" justify="between">
+								<u-button @click="handleResetTempSearch()" shape="circle">重置</u-button>
+								<view style="width: 40rpx;"></view>
+								<u-button @click="handleConfirmTempSearch()" shape="circle" type="primary">确认</u-button>
+							</u-row>
 						</view>
 					</view>
 				</view>
-				
+			</view>
+		</template>
+		
+		<template v-slot:body>
+			<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" class="pos-abt-all"
+			>
 				<view class="pgb-cont">
 					<!-- 列表数据 -->
 					<view v-for="(orItem) in dataList" class="ord-list-item" >
@@ -278,9 +280,7 @@
 	}
 	.customer_nav_bar {
 		padding-top: 30rpx;
-		// background-color: #FFF;
-		background-color: #B12D29;
-		;
+		background-color: #FFF;
 		position: relative;
 	}
 </style>
diff --git a/pages/service/list.vue b/pages/service/list.vue
index 620ecb9..1cfd00b 100644
--- a/pages/service/list.vue
+++ b/pages/service/list.vue
@@ -1,14 +1,17 @@
 <template>
 	<tpx-layout>
+		<template v-slot:header>
+			<view class="pgb-header">
+				<view class="com-jianju">
+					<!-- 关键字搜索框 -->
+					<tpx-search placeholder="选择省市区" v-model:value="searchParam.keyword" @change="handleSearchParamChange()" ></tpx-search>												
+				</view>
+			</view>
+		</template>
 		<template v-slot:body>
 			<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" class="pos-abt-all"
 			>
-				<view class="pgb-header">
-					<view class="com-jianju">
-						<!-- 关键字搜索框 -->
-						<tpx-search placeholder="选择省市区" v-model:value="searchParam.keyword" @change="handleSearchParamChange()" ></tpx-search>												
-					</view>
-				</view>
+				
 				<view class="pgb-cont">
 					<!-- 列表数据 -->
 					 <!--  -->
@@ -126,8 +129,7 @@
 		// padding-top: --status-bar-height;
 		padding-top: 30rpx;
 		padding-bottom: 30rpx;
-		// background-color: #FFF;
-		background-color:#B12D29;
+		background-color: #FFF;
 		position: relative;
 	}
 	.pgb-cont{