From 39b21258a36933e1a92e1377c910ab2fdd5d61e9 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 6 Dec 2023 00:35:57 +0800
Subject: [PATCH] uu

---
 common/custom.scss     |  20 ++
 pages/address/edit.vue | 448 +++++++++++++++++++++++++++++------------
 pages/address/list.vue | 329 ++++++++++++++++++------------
 pages/post/post.vue    |   2 +-
 static/test.txt        |   1 +
 5 files changed, 537 insertions(+), 263 deletions(-)
 create mode 100644 static/test.txt

diff --git a/common/custom.scss b/common/custom.scss
index e8e3571..e53623a 100644
--- a/common/custom.scss
+++ b/common/custom.scss
@@ -117,6 +117,11 @@
 	@extend %blcok;
 	background-color: #fff;
 }
+.blcok-white-noradius{
+	@extend %blcok;
+	background-color: #fff;
+	border-radius: 0;
+}
 .com-radius {
 	border-radius: 20rpx;
 }
@@ -128,6 +133,21 @@
 	right: 0;
 	bottom: 0;
 }
+.font-22 {
+	font-size: 22rpx;
+}
+.font-24 {
+	font-size: 24rpx;
+}
+.font-26 {
+	font-size: 26rpx;
+}
+.font-28 {
+	font-size: 28rpx;
+}
+.clr-sub{
+	color: #999;
+}
 
 page{
 	// font-size: 22rpx;
diff --git a/pages/address/edit.vue b/pages/address/edit.vue
index 8883718..ee9dca2 100644
--- a/pages/address/edit.vue
+++ b/pages/address/edit.vue
@@ -1,171 +1,363 @@
 <template>
-	 
-	<view style="position: relative;background-color: #fff;">		
-		<view class="customer_nav_bar">
-		   <!-- 这里是状态栏 -->
-		</view>
-		<image class="hdbg" :src="getCdnUrl(`sdg/hdbg.png`)"/>
-		<view class="pg-container">
-			<view class="header" >
-				<u-text size="40" :bold="true" text="探路物流 速运全球" color="#fff"></u-text>
-				<u-text margin="22rpx 0 0 0" size="24" :bold="true" text="省钱，省时，省力" color="#fff"></u-text>
-				<button class="btn-ljyy" type="primary">立即预约</button>
-				<view class="btnlist1">
-					<u-row>
-						<u-col v-for="(mbItem, mIndex) in mainBtnlist" span="6" align="center" @click="goto(mbItem.url)">
-							<view :class="'mb-item ' + (mIndex+1 == mainBtnlist.length ?'noborder': '') ">
-								<u-row align="center" justify="center">
-									<image class="tb1" style="width: 92rpx;height: 73rpx;" :src="mbItem.icon"/>
-									<view class="neirong">
-										<u-text size="32" :bold="true" color="#fff" :text="mbItem.title"></u-text>
-										<u-text size="22" margin="15rpx 0 0 0" color="#999" :text="mbItem.subTitle"></u-text>
+	<tpx-layout>
+		<template v-slot:header>
+			<view class="customer_nav_bar">
+				<view class="com-jianju" style="width: 490rpx;">
+					<!-- 关键字搜索框 -->
+					<u-search placeholder="请输入运单号/订单号" v-model="searchParam.keyword" height="56" search-icon-size="40"
+						:clearabled="true" @change="(e)=> { handleSearchParamChange() }" :show-action="false"></u-search>
+				</view>
+				
+				<view class="com-jianju" style="padding-top: 40rpx;">
+					<u-row justify="between" align="top">
+						<u-col span="9">
+							<!-- 订单状态 -->
+							<tpx-tabs :list="ordStatusList" v-model:value="searchParam.ordStatus"
+								@tabchange="(val)=> { handleSearchParamChange() }" mode="info"
+							>
+								(<text>0</text>)
+							</tpx-tabs>
+						</u-col>
+						<u-col span="2">
+							<!-- 更多查询条件 -->
+							<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;">
+								<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>
-							</view>
+							</u-button>
 						</u-col>
 					</u-row>
 				</view>
-			</view>
-			
-			<view class="pbody">
-				<view class="btnlist2">
-					<u-row gutter="20" custom-style="flex-wrap: wrap;">
-						<u-col v-for="tlItem in toolBtnlist" span="6">
-							<view style="margin: 0 0 20rpx 0;background: #F6F6F6;padding: 30rpx 28rpx;border-radius: 20rpx;position: relative;">
-								<u-row justify="between" >
-									<view class="neirong">
-										<u-text size="28" :bold="true" color="#0E0708" :text="tlItem.title"></u-text>
-										<u-text size="22" margin="15rpx 0 0 0" color="#999" :text="tlItem.subTitle"></u-text>
+				
+				<!-- 状态搜索 -->
+				<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>
+										<view class="smp-tag" v-for="(dItem, dIndex) in dlvTypeList">
+											<u-tag :text="`${dItem.title}`" :plain="!dItem.checked" type="info" shape="circle" :bg-color="`${dItem.checked?'#de524e':''}`" :name="dIndex"
+												@click="handleCheckBoxClick(dItem)">
+											</u-tag>
+										</view>
 									</view>
-									<image :src="tlItem.icon" style="height: 50rpx; width: 50rpx;" mode="aspectFit"/>
-								</u-row>
+									
+									<view>
+										<u-text text="付款方式" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>	
+										<view class="smp-tag" v-for="(pItem, pIndex) in payTypeList">
+											<u-tag :text="`${pItem.title}`" :plain="!pItem.checked" type="info" shape="circle" :bg-color="`${pItem.checked?'#de524e':''}`" :name="pIndex"
+												@click="handleCheckBoxClick(pItem)">
+											</u-tag>
+										</view>
+									</view>
+									
+									<view>
+										<u-text text="时间范围" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>
+										<view class="smp-tag" v-for="(daItem, daIndex) in dateTypeList" 
+											v-show="!(tmpSearchParam.date && dateTypeEnum.custom == daItem.val)" 
+										>
+											<u-tag 
+												:text="`${daItem.title}`" :plain="!(daItem.val == tmpSearchParam.dateType)" type="info" shape="circle" :bg-color="`${daItem.val == tmpSearchParam.dateType?'#de524e':''}`"
+												@click="handleCheckDate(daItem)">
+											</u-tag>
+										</view>
+										<view v-if="tmpSearchParam.date" class="smp-tag" style="display: block;">
+											<view style="display: inline-block;">
+												<u-tag :text="`${tmpSearchParam.date}`" :plain="false" type="info" shape="circle" :bg-color="`#de524e`"
+													@click="handleSwitchCladar()">
+												</u-tag>
+											</view>
+										</view>
+									</view>
+								</view>
 							</view>
-						</u-col>
-					</u-row>
+						</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>
-			<view class="pfoot" >
-				<u-row justify="between">
-					<u-text size="24" color="#fff" text="关注探路者官方公众号，实时接收物流信息"></u-text>
-					<u-button type="primary" custom-style="width: 130rpx;border-radius: 30rpx;margin: 0;" size="mini">去登录</u-button>
-				</u-row>
-			</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 ordList" class="ord-list-item">
+						<u-row justify="between">
+							<u-col span="11">
+								<u-row @click="handleDealItem(orItem, { type: 2 })">
+									<u-text :text="'运单号：'+ 'T7080304038'" size="26"></u-text>
+									<view style="flex:1;">
+										<u-icon name="file-text" size="32" custom-style=""></u-icon>
+									</view>
+								</u-row>
+							</u-col>
+							<u-icon @click="handleDealItem(orItem, { type: 3 })" name="trash"></u-icon>
+						</u-row>
+				
+						<u-row custom-style="margin-top: 30rpx;" justify="center">
+							<u-col span="4">
+								<u-text :text="'中国上海'" size="30" :bold="true" align="center"></u-text>
+								<u-text :text="'张三'" size="26" color="#999" margin="20rpx 0 0 0"
+									align="center"></u-text>
+							</u-col>
+							<u-col span="4" justify="center" align="center" custom-style="text-align: center;">
+								<image style="width: 70rpx;height: 14rpx;" :src="getCdnUrl('search/toline.png')">
+								</image>
+								<!-- getCdnUrl('search/toline-grey.png') -->
+								<u-text :text="'待付款'" align="center" size="22" margin="10rpx 0 0 0"></u-text>
+							</u-col>
+							<u-col span="4">
+								<u-text :text="'越南'" size="30" :bold="true" align="center"></u-text>
+								<u-text :text="'李四'" size="26" color="#999" margin="20rpx 0 0 0"
+									align="center"></u-text>
+							</u-col>
+						</u-row>
+				
+						<u-text :text="'签收时间：' + '2022-04-30 15:25'" color="#999" size="22"
+							margin="30rpx 0 0 0"></u-text>
+				
+						<u-line color="#DEDEDE" margin="30rpx 0 0 0"></u-line>
+				
+						<u-row justify="end" custom-style="margin-top:20rpx;">
+							<view style="display: inline-block;">
+								<u-row>
+									<u-button shape="circle" type="primary" :plain="true"
+										custom-style="height: 54rpx;margin-left: 12rpx;white-space: nowrap;">进仓确认</u-button>
+									<u-button shape="circle" type="primary"
+										custom-style="height: 54rpx;margin-left: 12rpx;white-space: nowrap;">再来一单</u-button>
+									<!-- <u-button shape="circle" type="primary" :plain="true" custom-style="height: 54rpx;margin-left: 16rpx;">单据</u-button> -->
+									<u-button @click="handleDealItem(orItem, { type: 4 })" shape="circle" type="primary"
+										:plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">取消</u-button>
+									<u-button shape="circle" type="primary" :plain="true"
+										custom-style="height: 54rpx;margin-left: 12rpx;">去付款</u-button>
+								</u-row>
+							</view>
+				
+						</u-row>
+				
+					</view>
+				
+					<!-- 加载更多 -->
+					<u-loadmore icon-size="28" font-size="28" margin-top="30" v-if="showLoadMore || loadedAll"
+						:status="loadedAll ? 'nomore' : 'loading'" />
+				
+					<!-- 空数据页 -->
+					<view v-if="ordList.length == 0" style="padding-top: 100rpx;">
+						<u-empty text="无数据" :icon="getCdnUrl('kong.png')" textSize="28" width="86" height="97">
+						</u-empty>
+					</view>
+				</view>
+			</scroll-view>
+		</template>
+	</tpx-layout>
+	
+	<!-- 日历 -->
+	<!-- @close="handleSwitchCladar()" -->
+	<u-calendar title="请选择日期范围" color="#B12D29" mode="range" rowHeight="90" closeOnClickOverlay :show="showCladar" :defaultDate="tmpSearchParam.date.split('~')" @confirm="handleClaOk" @close="handleSwitchCladar"
+	></u-calendar>
+	
 </template>
 <script>
 	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto } from "@/common/untool"
+	import { ordStaEnum, ordStatusList, payTypeEnum, payTypeList, dlvTypeEnum, dlvTypeList, dateTypeEnum, dateTypeList } from "@/common/enum"
+	import { goto, setClipboardData, confirmModal, showLoading } from "@/common/untool"
 	export default {
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
 			// }
 		},
+		computed: {
+			hasExtSchParam() {
+				return Object.values(this.tmpSearchParam).filter(v=> !!v).length > 0
+			},
+		},
 		data() {
 			return {
-				mainBtnlist: [
-					{  title: '下单寄件', subTitle: "上门揽件/寄仓库", icon: getCdnUrl(`sdg/btn-send.png`), url: 'post/post' },
-					{  title: '专属小哥', subTitle: "下单给专属业务员", icon: getCdnUrl(`sdg/btn-bindbr.png`), url: '' }
+				...JSON.parse(JSON.stringify({ ordStaEnum, ordStatusList, payTypeEnum, payTypeList, dlvTypeEnum, dlvTypeList, dateTypeEnum, dateTypeList })),
+				searchParam: {
+					keyword: '',
+					ordStatus: ordStatusList[0].val // 订单状态， 1：寄件； 2：收件； 3：待付款；
+				},
+				showSearchMore: false,
+				showCladar: false,
+				tmpSearchParam: {
+					postStatus: '', // 快递状态
+					payType: '', // 支付类型
+					dateType: '', // 日期类型
+					date: '' // 日期
+				},
+				ordList: [
+					{},{},{},{},{},{},{},{}
 				],
-				toolBtnlist: [
-					{  title: '进仓单', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-jcd.png`), url: '' },
-					{  title: '时效预估', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-sxyg.png`), url: '' },
-					{  title: '运费试算', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-shisuan.png`), url: '' },
-					{  title: '我的订单', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-dingdan.png`), url: '' },
-					{  title: '运单查询', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-yundan.png`), url: '' },
-					{  title: '地址簿', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-dizhi.png`), url: '' },
-					{  title: '网点查询', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-wangdain.png`), url: '' },
-					{  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: '' },
-					{  title: '寄件须知', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-xuzhi.png`), url: '' },
-				]
+				showLoadMore: false,
+				loadedAll: false
 			}
 		},
 		onShareAppMessage() {
 			return {
-				title: '探路物流 速运全球',
+				// title: '',
 				// path: 'TODO'
 			}
 		},
+		onLoad() {
+			this.initData();
+		},
+		onUnload() {
+		},
 		methods: {
 			getCdnUrl,
-			goto
+			
+			initData(){
+				// showLoading()
+				setTimeout(() => {
+					uni.stopPullDownRefresh();
+				}, 300);
+			},
+			setListData() {
+				
+			},
+			
+			onScrollBottom() {
+				console.log("onScrollBottom");
+				if (this.loadedAll) {
+					return;
+				}
+				this.showLoadMore = true;
+				setTimeout(() => {
+					this.setListData();
+				}, 300);
+			},
+			handleSearchMoreBtn(){
+				if(!this.showLoadMore) {
+					// 回显更多条件
+					Object.keys(this.tmpSearchParam).map(t=> {
+						this.tmpSearchParam[t] = this.searchParam[t] || ''
+					})
+				}
+				this.showSearchMore = !this.showSearchMore
+			},
+			handleSearchParamChange(key, val) {
+				if(key) {
+					this.searchParam[key] = val
+				}
+				
+			},
+			async handleDealItem(item, deal = { type: '1' }) {
+				switch (deal.type){
+					case 1: // 跳转
+						break;
+					case 2: // 复制订单号
+						setClipboardData('xxxxxxx')
+						break;
+					case 3: // 删除
+						await confirmModal('确认要删除吗?')
+						break;
+					case 4: // 取消
+						await confirmModal('确认要取消吗?')
+						break;
+					default:
+						break;
+				}
+			},
+			handleResetTempSearch(){
+				Object.keys(this.tmpSearchParam).map(t=> {
+					this.tmpSearchParam[t] = ''
+				})
+			},
+			handleConfirmTempSearch(){
+				Object.assign(this.searchParam, this.tmpSearchParam)
+				// Object.keys(this.tmpSearchParam).map(t=> {
+				// 	this.searchParam[t] = this.tmpSearchParam[t]
+				// })
+			},
+			handleCheckBoxClick(item, key){
+				item.checked = !item.checked
+			},
+			handleCheckDate(item) {
+				let newVal = item.val
+				if(newVal == dateTypeEnum.custom) {
+					this.handleSwitchCladar()
+				} else {
+					newVal == this.tmpSearchParam.dateType && (newVal = '')
+					this.tmpSearchParam.date = ''
+				}
+				this.tmpSearchParam.dateType = newVal
+			},
+			handleClaOk(res){
+				const ary = Object.values(res)
+				const val = [ary[0], ary[ary.length-1]].join("~")
+				this.handleSwitchCladar()
+				this.tmpSearchParam.date = val 
+			},
+			handleSwitchCladar() {
+				this.showCladar = !this.showCladar
+				if(!this.showCladar) {
+					!this.tmpSearchParam.date && (this.tmpSearchParam.dateType = '')
+				}
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
 	@import '@/common/uni-nvue.scss';
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+	.customer_nav_bar {
+		// padding-top: --status-bar-height;
+		padding-top: 80rpx;
+		background-color: #B12D29;
+		position: relative;
+	}
 </style>
 <style scoped lang="scss">
-	.hdbg{
+	.pgb-cont{
+		padding: 30rpx;
+	}
+	
+	.ord-list-item{
+		box-shadow: 0rpx 3rpx 12rpx 0rpx rgba(139,139,139,0.06);
+		border-radius: 20rpx;
+		padding: 22rpx 30rpx;
+		background-color: #fff;
+		margin-bottom: 30rpx;
+	}
+	.search-more-panel{
+		overflow: hidden;
 		position: absolute;
-		top: 0;
-		z-index: 1;
-		width: 100%;
-		height: 720rpx;
+		left: 0;
+		right: 0;
+		height: calc(70vh);
+		z-index: 200;
 	}
-	.pg-container{
+	.smp-body{
+		padding: 30rpx;
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		background-color: #FFF;
+		border-radius: 0 0 30rpx 30rpx;
+		box-sizing: border-box;
+	}
+	.smp-content{
+		flex: 1;
 		position: relative;
-		z-index: 2;
-		overflow-x: hidden;
 	}
-	.header{
-		padding: 0 28rpx;
-		.btn-ljyy{
-			margin-left: 0;
-			width: 144rpx;
-			margin-top: 40rpx;
-			box-sizing: content-box;
-			background: #FFF;
-			border-radius: 21rpx;
-			font-size: 24rpx;
-			color: #B12D29;
-			padding: 8rpx 0;
-			text-align: center;
-			line-height: normal;
-			border: 0;
-			&::after{
-				border: 0;
-			}
-		}
-		
-		.btnlist1 {
-			margin-top: 38rpx;
-			background: linear-gradient(0deg, #1D1818 0%, #0E0708 100%);
-			border-radius: 30rpx 30rpx 0rpx 0rpx;
-			padding: 36rpx 24rpx 22rpx 24rpx;
-			
-		}
-	}
-	.mb-item{
-		width: 100%;
-		position: relative;
-		border-right: 2rpx solid rgba(255,255,255,0.5);
-		&.noborder{
-			border-right: 0;
-		}
-	}
-	.pbody{
-		background: #FFFFFF;
-		border-radius: 30rpx;
-		padding: 40rpx 28rpx 100rpx 28rpx;
-		.btnlist2{
-			
-			.neirong{
-				margin-left: 22rpx;
-			}
-		}
-	}
-	.pfoot {
-		position: fixed;
-		bottom: 20rpx;
-		left: 28rpx;
-		right: 28rpx;
-		padding: 20rpx 8rpx 20rpx 26rpx;
-		background: #0E0708;
-		border-radius: 36rpx;
-	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/address/list.vue b/pages/address/list.vue
index 8883718..b4eec93 100644
--- a/pages/address/list.vue
+++ b/pages/address/list.vue
@@ -1,171 +1,232 @@
 <template>
-	 
-	<view style="position: relative;background-color: #fff;">		
-		<view class="customer_nav_bar">
-		   <!-- 这里是状态栏 -->
-		</view>
-		<image class="hdbg" :src="getCdnUrl(`sdg/hdbg.png`)"/>
-		<view class="pg-container">
-			<view class="header" >
-				<u-text size="40" :bold="true" text="探路物流 速运全球" color="#fff"></u-text>
-				<u-text margin="22rpx 0 0 0" size="24" :bold="true" text="省钱，省时，省力" color="#fff"></u-text>
-				<button class="btn-ljyy" type="primary">立即预约</button>
-				<view class="btnlist1">
-					<u-row>
-						<u-col v-for="(mbItem, mIndex) in mainBtnlist" span="6" align="center" @click="goto(mbItem.url)">
-							<view :class="'mb-item ' + (mIndex+1 == mainBtnlist.length ?'noborder': '') ">
-								<u-row align="center" justify="center">
-									<image class="tb1" style="width: 92rpx;height: 73rpx;" :src="mbItem.icon"/>
-									<view class="neirong">
-										<u-text size="32" :bold="true" color="#fff" :text="mbItem.title"></u-text>
-										<u-text size="22" margin="15rpx 0 0 0" color="#999" :text="mbItem.subTitle"></u-text>
-									</view>
-								</u-row>
-							</view>
-						</u-col>
-					</u-row>
+	<tpx-layout>
+		
+		<template v-slot:body>
+			<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" class="pos-abt-all"
+			>
+				<view class="pgb-header">
+					<view class="com-jianju">
+						<!-- 关键字搜索框 -->
+						<u-search placeholder="请输入姓名/电话/地址关键字" v-model="searchParam.keyword" height="64" search-icon-size="40"
+							:clearabled="true" @change="(e)=> { handleSearchParamChange() }" :show-action="false"></u-search>
+					</view>
+					
+					<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"
+									@tabchange="(val)=> { handleSearchParamChange() }" 
+								>
+									(<text>0</text>)
+								</tpx-tabs>
+							</u-col>
+							
+						</u-row>
+					</view>
 				</view>
-			</view>
-			
-			<view class="pbody">
-				<view class="btnlist2">
-					<u-row gutter="20" custom-style="flex-wrap: wrap;">
-						<u-col v-for="tlItem in toolBtnlist" span="6">
-							<view style="margin: 0 0 20rpx 0;background: #F6F6F6;padding: 30rpx 28rpx;border-radius: 20rpx;position: relative;">
-								<u-row justify="between" >
-									<view class="neirong">
-										<u-text size="28" :bold="true" color="#0E0708" :text="tlItem.title"></u-text>
-										<u-text size="22" margin="15rpx 0 0 0" color="#999" :text="tlItem.subTitle"></u-text>
-									</view>
-									<image :src="tlItem.icon" style="height: 50rpx; width: 50rpx;" mode="aspectFit"/>
-								</u-row>
-							</view>
-						</u-col>
-					</u-row>
+				<view class="pgb-cont">
+					<!-- 列表数据 -->
+					<view v-for="(item) in dataList" class="data-list-item">
+						<view @click="handleItemClick(item)">
+							<u-row>
+								<view class="pr-20">
+									<u-text :text="'李先生'" size="30" :bold="true"></u-text>
+								</view>
+								<view>
+									<u-text :text="'18627068352'" size="28" mode="phone" color="#999"></u-text>
+								</view>
+							</u-row>
+							<u-text :text="'上海市大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界'" 
+								size="24" margin="20rpx 0 0 0" color="#999" 
+							></u-text>
+						</view>
+						<u-line color="#DEDEDE" margin="30rpx 0 0 0"></u-line>
+				
+						<u-row custom-style="margin-top:20rpx;" justify="between">
+							<u-row>
+								<text class="pr-20 clr-sub">默认地址</text>
+								<u-switch v-model="item.morenTODO" @change="handleDefaultSwitch(item)" active-color="#B12D29"></u-switch>
+							</u-row>
+							<u-row>
+								<u-text @click="handleEditItem(item)" text="编辑" prefixIcon="edit-pen" size="24"></u-text>
+								<u-text @click="handleDelItem(item)" text="删除" prefixIcon="trash" size="24" margin="0 0 0 20rpx"></u-text>
+							</u-row>
+						</u-row>
+					</view>
+				
+					<!-- 加载更多 -->
+					<u-loadmore icon-size="28" font-size="28" margin-top="30" v-if="showLoadMore || loadedAll"
+						:status="loadedAll ? 'nomore' : 'loading'" />
+				
+					<!-- 空数据页 -->
+					<view v-if="dataList.length == 0" style="padding-top: 100rpx;">
+						<u-empty text="无数据" :icon="getCdnUrl('kong.png')" textSize="28" width="86" height="97">
+						</u-empty>
+					</view>
 				</view>
+			</scroll-view>
+		</template>
+		
+		<template v-slot:footer>
+			<view class="blcok-white-noradius">
+				<u-button @click="handleEditItem()" type="primary" size="large" shape="circle" 
+					custom-style="height:80rpx;font-size: 30rpx;"
+				>新增地址</u-button>
 			</view>
-			<view class="pfoot" >
-				<u-row justify="between">
-					<u-text size="24" color="#fff" text="关注探路者官方公众号，实时接收物流信息"></u-text>
-					<u-button type="primary" custom-style="width: 130rpx;border-radius: 30rpx;margin: 0;" size="mini">去登录</u-button>
-				</u-row>
-			</view>
-		</view>
-	</view>
+		</template>
+	</tpx-layout>
+	
 </template>
+
 <script>
 	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto } from "@/common/untool"
+	import { ordStaEnum, ordStatusList, payTypeEnum, payTypeList, dlvTypeEnum, dlvTypeList, dateTypeEnum, dateTypeList } from "@/common/enum"
+	import { goto, goBack, setClipboardData, confirmModal, showLoading } from "@/common/untool"
+	const tabList = [
+		{ title: '收件地址', val: 1 },
+		{ title: '寄件地址',  val: 2 },
+		{ title: '其他', val: 3 }
+	]
 	export default {
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
 			// }
 		},
+		computed: {
+			hasExtSchParam() {
+				return Object.values(this.tmpSearchParam).filter(v=> !!v).length > 0
+			},
+		},
 		data() {
 			return {
-				mainBtnlist: [
-					{  title: '下单寄件', subTitle: "上门揽件/寄仓库", icon: getCdnUrl(`sdg/btn-send.png`), url: 'post/post' },
-					{  title: '专属小哥', subTitle: "下单给专属业务员", icon: getCdnUrl(`sdg/btn-bindbr.png`), url: '' }
+				...JSON.parse(JSON.stringify({ ordStaEnum, ordStatusList, payTypeEnum, payTypeList, dlvTypeEnum, dlvTypeList, dateTypeEnum, dateTypeList })),
+				tabList ,
+				searchParam: {
+					keyword: '',
+					tabType: tabList[0].val
+				},
+				queryOption: {},
+				dataList: [
+					{},{},{},{},{},{},{},{}
 				],
-				toolBtnlist: [
-					{  title: '进仓单', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-jcd.png`), url: '' },
-					{  title: '时效预估', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-sxyg.png`), url: '' },
-					{  title: '运费试算', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-shisuan.png`), url: '' },
-					{  title: '我的订单', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-dingdan.png`), url: '' },
-					{  title: '运单查询', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-yundan.png`), url: '' },
-					{  title: '地址簿', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-dizhi.png`), url: '' },
-					{  title: '网点查询', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-wangdain.png`), url: '' },
-					{  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: '' },
-					{  title: '寄件须知', subTitle: "这里是短语简介", icon: getCdnUrl(`sdg/t-xuzhi.png`), url: '' },
-				]
+				showLoadMore: false,
+				loadedAll: false
 			}
 		},
 		onShareAppMessage() {
 			return {
-				title: '探路物流 速运全球',
+				// title: '',
 				// path: 'TODO'
 			}
 		},
+		onLoad(queryOption) {
+			this.queryOption = queryOption
+			this.searchParam.tabType = queryOption.tab || tabList[0].val
+			this.initData();
+		},
+		onUnload() {
+		},
 		methods: {
 			getCdnUrl,
-			goto
+			initData(){
+				// showLoading()
+				setTimeout(() => {
+					uni.stopPullDownRefresh();
+				}, 300);
+			},
+			setListData() {
+				
+			},
+			
+			onScrollBottom() {
+				console.log("onScrollBottom");
+				if (this.loadedAll) {
+					return;
+				}
+				this.showLoadMore = true;
+				setTimeout(() => {
+					this.setListData();
+				}, 300);
+			},
+			handleSearchMoreBtn(){
+				if(!this.showLoadMore) {
+					// 回显更多条件
+					Object.keys(this.tmpSearchParam).map(t=> {
+						this.tmpSearchParam[t] = this.searchParam[t] || ''
+					})
+				}
+				this.showSearchMore = !this.showSearchMore
+			},
+			handleSearchParamChange(key, val) {
+				if(key) {
+					this.searchParam[key] = val
+				}
+				
+			},
+			handleItemClick(item){
+				if(this.queryOption.type == "choose") {
+					goBack()
+				}
+			},
+			handleEditItem(item={}) {
+				goto(`address/edit?id=${item.id}`)
+			},
+			async handleDelItem(item) {
+				await confirmModal('确认要删除吗？')
+			},
+			handleDefaultSwitch(item) {
+				
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
 	@import '@/common/uni-nvue.scss';
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+	
 </style>
 <style scoped lang="scss">
-	.hdbg{
+	.pgb-header {
+		// padding-top: --status-bar-height;
+		padding-top: 30rpx;
+		background-color: #FFF;
+		position: relative;
+	}
+	.pgb-cont{
+		padding: 30rpx;
+	}
+	
+	.data-list-item{
+		box-shadow: 0rpx 3rpx 12rpx 0rpx rgba(139,139,139,0.06);
+		border-radius: 20rpx;
+		padding: 22rpx 30rpx;
+		background-color: #fff;
+		margin-bottom: 30rpx;
+	}
+	.search-more-panel{
+		overflow: hidden;
 		position: absolute;
-		top: 0;
-		z-index: 1;
-		width: 100%;
-		height: 720rpx;
+		left: 0;
+		right: 0;
+		height: calc(70vh);
+		z-index: 200;
 	}
-	.pg-container{
+	.smp-body{
+		padding: 30rpx;
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		background-color: #FFF;
+		border-radius: 0 0 30rpx 30rpx;
+		box-sizing: border-box;
+	}
+	.smp-content{
+		flex: 1;
 		position: relative;
-		z-index: 2;
-		overflow-x: hidden;
 	}
-	.header{
-		padding: 0 28rpx;
-		.btn-ljyy{
-			margin-left: 0;
-			width: 144rpx;
-			margin-top: 40rpx;
-			box-sizing: content-box;
-			background: #FFF;
-			border-radius: 21rpx;
-			font-size: 24rpx;
-			color: #B12D29;
-			padding: 8rpx 0;
-			text-align: center;
-			line-height: normal;
-			border: 0;
-			&::after{
-				border: 0;
-			}
-		}
-		
-		.btnlist1 {
-			margin-top: 38rpx;
-			background: linear-gradient(0deg, #1D1818 0%, #0E0708 100%);
-			border-radius: 30rpx 30rpx 0rpx 0rpx;
-			padding: 36rpx 24rpx 22rpx 24rpx;
-			
-		}
-	}
-	.mb-item{
-		width: 100%;
-		position: relative;
-		border-right: 2rpx solid rgba(255,255,255,0.5);
-		&.noborder{
-			border-right: 0;
-		}
-	}
-	.pbody{
-		background: #FFFFFF;
-		border-radius: 30rpx;
-		padding: 40rpx 28rpx 100rpx 28rpx;
-		.btnlist2{
-			
-			.neirong{
-				margin-left: 22rpx;
-			}
-		}
-	}
-	.pfoot {
-		position: fixed;
-		bottom: 20rpx;
-		left: 28rpx;
-		right: 28rpx;
-		padding: 20rpx 8rpx 20rpx 26rpx;
-		background: #0E0708;
-		border-radius: 36rpx;
-	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/post/post.vue b/pages/post/post.vue
index 4c2cf29..41628d1 100644
--- a/pages/post/post.vue
+++ b/pages/post/post.vue
@@ -310,7 +310,7 @@
 				// });
 			},
 			handleAddressChoose(type) { // 1 寄件地址 2收件地址
-				goto(`address/list?tab=${type}`)
+				goto(`address/list?tab=${type}&type=choose`)
 			},
 			handleSwitchCladar() {
 				this.showCladar = !this.showCladar
diff --git a/static/test.txt b/static/test.txt
new file mode 100644
index 0000000..2abd080
--- /dev/null
+++ b/static/test.txt
@@ -0,0 +1 @@
+http://705301687.qrcode.n.yunjie.com.cn/bos/qrcode/705301687/6016388900687/12963318687/onecode/getcode?codeId=127974&bosId=4021899060687
\ No newline at end of file