From a678a325ce0fcd3f5cd3333836f559ffff565b01 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 7 Dec 2023 02:53:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buns-country-sheet/buns-country-sheet.vue |  39 ++++
 components/tpx-dialog/tpx-dialog.vue          | 173 ++++++++++++++++++
 .../tpx-scroll-view/tpx-scroll-view.vue       |  53 ++++++
 components/tpx-search/tpx-search.vue          |   2 +-
 components/tpx-tabs/tpx-tabs.vue              |   2 +-
 pages/address/list.vue                        |   6 +-
 pages/post/post.vue                           |   9 +-
 pages/tabBar/search/search.vue                |  18 +-
 pages/tabBar/sending/sending.vue              |   2 +-
 static/test.txt                               |   2 +-
 10 files changed, 294 insertions(+), 12 deletions(-)
 create mode 100644 components/buns-country-sheet/buns-country-sheet.vue
 create mode 100644 components/tpx-dialog/tpx-dialog.vue
 create mode 100644 components/tpx-scroll-view/tpx-scroll-view.vue

diff --git a/components/buns-country-sheet/buns-country-sheet.vue b/components/buns-country-sheet/buns-country-sheet.vue
new file mode 100644
index 0000000..f95fa26
--- /dev/null
+++ b/components/buns-country-sheet/buns-country-sheet.vue
@@ -0,0 +1,39 @@
+<template>
+	<tpx-dialog :show="show" title="选择国家" @onClose="handleCloseModal()">
+		<view style="height: 600rpx;">哈哈哈哈</view>
+	</tpx-dialog>
+</template>
+
+<script>
+	export default {
+		props: {
+			show: {
+				default () {
+					return false
+				}
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		created() {
+
+		},
+		onHide() {
+
+		},
+		destroyed() {},
+
+		methods: {
+			handleCloseModal() {
+				this.$emit('update:show', false)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	
+</style>
\ No newline at end of file
diff --git a/components/tpx-dialog/tpx-dialog.vue b/components/tpx-dialog/tpx-dialog.vue
new file mode 100644
index 0000000..267767e
--- /dev/null
+++ b/components/tpx-dialog/tpx-dialog.vue
@@ -0,0 +1,173 @@
+<template>
+	<view :class="`dialog ${show ? 'delog-show' :'delog-hidden'} `" :style="`z-index:${zIndex}`"
+		mut-bind:touchmove="true">
+		<view @touchmove.stop="" class="dialog-mask" @click="handleClose()"></view>
+		<view :class="`dialog-content ${type} pos-${closePosType}`"
+			:style="`padding: 30rpx;background-color:${bgColor};${contentStyle};`">
+			<u-row v-if="title" @touchmove.stop="" justify="between" style="margin-bottom: 30rpx;">
+				<u-col v-if="title" span="9" style="font-size: 32rpx;font-weight: 600;">{{title}}</u-col>
+				<view span="3" align="right" @click="handleClose()">
+					<u-icon name="close" size="32" color="#999"></u-icon>
+				</view>
+			</u-row>
+			<view class="lgd-body">
+				<slot></slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			show: {
+				default () {
+					return false
+				}
+			},
+			closePosType: {
+				default () {
+					return 'right'
+				}
+			},
+			title: {
+				default () {
+					return ''
+				}
+			},
+			maskClosable: {
+				default () {
+					return true
+				}
+			},
+			type: {
+				default () {
+					return 'type-sheet' // type-dialog | type-sheet
+				}
+			},
+			bgColor: {
+				default () {
+					return '#fff'
+				}
+			},
+			contentStyle: {
+				default () {
+					return ''
+				}
+			},
+			zIndex: {
+				default () {
+					return 1000
+				}
+			},
+		},
+		data() {
+			return {
+
+			}
+		},
+		created() {
+
+		},
+		onHide() {
+
+		},
+		destroyed() {},
+
+		methods: {
+			handleClose() {
+				this.$emit('update:show', false)
+				this.$emit('onClose')
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.dialog {
+		z-index: 1000;
+		position: fixed;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+	}
+
+	.dialog-mask {
+		background-color: #3e3e3e;
+		opacity: 0.6;
+		height: 100%;
+		transition: all .3s;
+	}
+
+	.dialog-content {
+		position: fixed;
+		transition: all .3s;
+	}
+
+	.type-dialog {
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		transform-origin: center center !important;
+		transform-origin: 0 0 !important;
+	}
+
+	.type-sheet {
+		z-index: 5000;
+		line-height: 1.4;
+		background-color: #fff;
+		border-top-left-radius: 30rpx;
+		border-top-right-radius: 30rpx;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		max-height: 75%;
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.type-sheet .lgd-body {
+		position: relative;
+		flex: 1;
+		overflow: auto;
+		overflow-x: hidden;
+	}
+
+	.type-sheet .lgd-body::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
+
+	.type-sheet.pos-right {}
+
+	.delog-hidden {
+		visibility: hidden;
+		opacity: 0;
+	}
+
+	.delog-show {
+		opacity: 1;
+		visibility: visible;
+	}
+
+	.delog-hidden .type-dialog {
+		transform: scale(0) translate(-50%, -50%);
+	}
+
+	.delog-show .type-dialog {
+		transform: scale(1) translate(-50%, -50%);
+	}
+
+	.delog-hidden .type-sheet {
+		transform: translateY(100%);
+	}
+
+	.delog-show .type-sheet {
+		transform: translateY(0%);
+	}
+
+</style>
\ No newline at end of file
diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue
new file mode 100644
index 0000000..8f29ddf
--- /dev/null
+++ b/components/tpx-scroll-view/tpx-scroll-view.vue
@@ -0,0 +1,53 @@
+<template>
+	<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" style="height: 100%;"
+	>
+		<slot></slot>
+		
+		<!-- 加载更多 -->
+		<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>
+	</scroll-view>
+</template>
+
+<script>
+	export default {
+		props: {
+			dataList: {
+				default () {
+					return []
+				}
+			}
+		},
+		data() {
+			return {
+				showLoadMore: false,
+				loadedAll: false,
+			}
+		},
+		created() {
+
+		},
+		onHide() {
+
+		},
+		destroyed() {},
+		
+		methods: {
+			onScrollBottom(){
+				this.$emit('onScrollBottom')
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.sch-cont{
+		position: relative;
+	}
+</style>
\ No newline at end of file
diff --git a/components/tpx-search/tpx-search.vue b/components/tpx-search/tpx-search.vue
index 19b698e..9075116 100644
--- a/components/tpx-search/tpx-search.vue
+++ b/components/tpx-search/tpx-search.vue
@@ -43,7 +43,7 @@
 			},
 			height: {
 				default () {
-					return 50
+					return 38
 				}
 			},
 			value: {
diff --git a/components/tpx-tabs/tpx-tabs.vue b/components/tpx-tabs/tpx-tabs.vue
index d5a29c9..5634ab2 100644
--- a/components/tpx-tabs/tpx-tabs.vue
+++ b/components/tpx-tabs/tpx-tabs.vue
@@ -59,7 +59,7 @@
 		padding: 0 0 30rpx 0;
 		margin-right: 30rpx;
 		position: relative;
-		font-size: 28rpx;
+		font-size: 30rpx;
 		color: #FFF;
 		opacity: 0.8;
 		.stai-text {
diff --git a/pages/address/list.vue b/pages/address/list.vue
index b4eec93..aeb2d9d 100644
--- a/pages/address/list.vue
+++ b/pages/address/list.vue
@@ -45,11 +45,11 @@
 						<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-switch v-model="item.morenTODO" @change="handleDefaultSwitch(item)" active-color="#B12D29" size="34"></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-text @click="handleEditItem(item)" text="编辑" prefixIcon="edit-pen" size="26"></u-text>
+								<u-text @click="handleDelItem(item)" text="删除" prefixIcon="trash" size="26" margin="0 0 0 20rpx"></u-text>
 							</u-row>
 						</u-row>
 					</view>
diff --git a/pages/post/post.vue b/pages/post/post.vue
index bc16921..9efa902 100644
--- a/pages/post/post.vue
+++ b/pages/post/post.vue
@@ -68,7 +68,7 @@
 					</view>
 			
 					<view>
-						<view class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;">
+						<view class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;" @click="handleDialogClick(countryModal)">
 							<u-row>
 								<view>
 									<u-text text="目的国" size="28" :bold="true"></u-text>
@@ -225,6 +225,7 @@
 			</view>
 		</template>
 	</tpx-layout>
+	<buns-country-sheet v-model:show="countryModal.show"></buns-country-sheet>
 </template>
 
 <script>
@@ -265,6 +266,9 @@
 				],
 				showCladar: false,
 				agreePrivateRule: false,
+				countryModal: {
+					show: false
+				},
 				submitParam: {
 					tips: [],
 					type: 1,
@@ -307,6 +311,9 @@
 			handleCheckBoxClick(item, key) {
 				item.checked = !item.checked
 			},
+			handleDialogClick(curModal){
+				curModal.show = true
+			}
 		}
 	}
 </script>
diff --git a/pages/tabBar/search/search.vue b/pages/tabBar/search/search.vue
index 22daf35..14d5576 100644
--- a/pages/tabBar/search/search.vue
+++ b/pages/tabBar/search/search.vue
@@ -19,7 +19,7 @@
 						</u-col>
 						<u-col span="2">
 							<!-- 更多查询条件 -->
-							<u-button @click="handleSearchMoreBtn()" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;">
+							<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?'已':''}}筛选
@@ -161,7 +161,16 @@
 		},
 		computed: {
 			hasExtSchParam() {
-				return Object.values(this.tmpSearchParam).filter(v=> !!v).length > 0
+				let hasExt = false
+				const searchParam = this.searchParam
+				if(
+					(searchParam.postStatus && searchParam.postStatus.length > 0)
+					|| (searchParam.payType && searchParam.payType.length > 0)
+					|| (searchParam.date || (searchParam.dateType && searchParam.dateType != dateTypeEnum.custom) )
+				) {
+					hasExt = true
+				}
+				return hasExt
 			},
 		},
 		data() {
@@ -177,7 +186,8 @@
 					
 				},
 				ordList: [
-					{},{},{},{},{},{},{},{}
+					{}
+					// ,{},{},{},{},{},{},{}
 				],
 				showLoadMore: false,
 				loadedAll: false
@@ -208,7 +218,7 @@
 				this.tmpSearchParam = {
 					postStatus: [], // 快递状态
 					payType: [], // 支付类型
-					dateType: [], // 日期类型
+					dateType: '', // 日期类型
 					date: '' // 日期
 				}
 			},
diff --git a/pages/tabBar/sending/sending.vue b/pages/tabBar/sending/sending.vue
index 8883718..feba411 100644
--- a/pages/tabBar/sending/sending.vue
+++ b/pages/tabBar/sending/sending.vue
@@ -47,7 +47,7 @@
 			<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-button type="primary" custom-style="width: 100rpx;border-radius: 30rpx;margin: 0;" size="mini">去登录</u-button>
 				</u-row>
 			</view>
 		</view>
diff --git a/static/test.txt b/static/test.txt
index 2abd080..a0f202d 100644
--- a/static/test.txt
+++ b/static/test.txt
@@ -1 +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
+http://2212.qrcode.n.yunjie.com.cn/bos/qrcode/705301687/6016388900687/12963318687/onecode/getcode?codeId=127974&bosId=4021899060687
\ No newline at end of file