From a25b521cda4f85db9deb8b298d57e293bebd72a3 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sat, 9 Dec 2023 14:33:40 +0800
Subject: [PATCH] uu

---
 components/buns-country-sheet/buns-country-sheet.vue     | 5 ++---
 components/buns-paytype-sheet/buns-paytype-sheet.vue     | 8 +++-----
 components/buns-stockroom-sheet/buns-stockroom-sheet.vue | 5 ++---
 components/tpx-dialog/tpx-dialog.vue                     | 7 ++++---
 components/tpx-tabs/tpx-tabs.vue                         | 6 ++++--
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/components/buns-country-sheet/buns-country-sheet.vue b/components/buns-country-sheet/buns-country-sheet.vue
index 8871e9a..e8c0d4c 100644
--- a/components/buns-country-sheet/buns-country-sheet.vue
+++ b/components/buns-country-sheet/buns-country-sheet.vue
@@ -13,7 +13,7 @@
 				<tpx-checkitems :list="dataList.filter(v=> !keyword || (v.title.indexOf(keyword) > -1))" :value="value" v-slot="dlCurrent" min-checked="1" type="single" 
 					@onChange="handleDataItemChange"
 				>
-					<view slot style="margin-top: 10rpx;">
+					<view slot class="mt-20">
 						<u-row justify="between">
 							<u-col span="10">
 								<u-text size="28" :text="dlCurrent.item.title"></u-text>
@@ -22,7 +22,7 @@
 								<u-checkbox :checked="dlCurrent.checked" shape="circle" size="32" activeColor="#B12D29"></u-checkbox>
 							</view>
 						</u-row>
-						<u-line margin="10rpx 0 0 0"></u-line>
+						<u-line margin="20rpx 0 0 0"></u-line>
 					</view>
 				</tpx-checkitems>
 			</view>
@@ -95,7 +95,6 @@
 
 <style scoped lang="scss">
 	.shet-cont{
-		min-height: 500rpx;
 		padding: 10rpx 0 30rpx 0;
 	}
 	.chk-icon{
diff --git a/components/buns-paytype-sheet/buns-paytype-sheet.vue b/components/buns-paytype-sheet/buns-paytype-sheet.vue
index 9a8257a..2f418a2 100644
--- a/components/buns-paytype-sheet/buns-paytype-sheet.vue
+++ b/components/buns-paytype-sheet/buns-paytype-sheet.vue
@@ -21,7 +21,7 @@
 									<u-text v-if="dlCurrent.item.desc" size="28" :text="dlCurrent.item.desc" color="#999"></u-text>
 									
 									<view v-if="dlCurrent.item.val == payTypeEnum.other" class="pb-20">
-										<u-textarea v-model="model.otherDesc" border="surround" height="160" placeholder="请填写"
+										<u-textarea v-model="model.otherDesc" border="surround" height="120" placeholder="请填写"
 											maxlength="50" count></u-textarea>
 									</view>
 									
@@ -56,7 +56,7 @@
 				</template>
 				
 				<template v-slot:footer>
-					<view class="blcok-white-noradius">
+					<view class="blcok-white-noradius" style="margin-top: 0;margin-bottom: 0;">
 						<u-button @click="handleEditItem()" type="primary" size="large" shape="circle" 
 							custom-style="height:80rpx;font-size: 30rpx;"
 						>确认</u-button>
@@ -137,12 +137,11 @@
 				
 			},
 			handleEditItem() {
-				const { value, cardId } = this.model.value
+				const { value, cardId, otherDesc } = this.model
 				this.$emit('onChange', this.model)
 				this.$emit('update:value', value)
 				this.$emit('update:cardId', cardId)
 				this.$emit('update:otherDesc', otherDesc)
-				debugger
 				this.handleCloseModal()
 			}
 		}
@@ -151,7 +150,6 @@
 
 <style scoped lang="scss">
 	.shet-cont{
-		min-height: 300rpx;
 		padding: 10rpx 0 30rpx 0;
 	}
 	.chk-icon{
diff --git a/components/buns-stockroom-sheet/buns-stockroom-sheet.vue b/components/buns-stockroom-sheet/buns-stockroom-sheet.vue
index b65077b..46748f5 100644
--- a/components/buns-stockroom-sheet/buns-stockroom-sheet.vue
+++ b/components/buns-stockroom-sheet/buns-stockroom-sheet.vue
@@ -13,7 +13,7 @@
 				<tpx-checkitems :list="dataList.filter(v=> !keyword || (v.title.indexOf(keyword) > -1))" :value="value" v-slot="dlCurrent" min-checked="1" type="single" 
 					@onChange="handleDataItemChange"
 				>
-					<view slot style="margin-top: 10rpx;">
+					<view slot class="mt-20">
 						<u-row justify="between">
 							<u-col span="10">
 								<u-text size="28" :text="dlCurrent.item.title"></u-text>
@@ -22,7 +22,7 @@
 								<u-checkbox :checked="dlCurrent.checked" shape="circle" size="32" activeColor="#B12D29"></u-checkbox>
 							</view>
 						</u-row>
-						<u-line margin="10rpx 0 0 0"></u-line>
+						<u-line margin="20rpx 0 0 0"></u-line>
 					</view>
 				</tpx-checkitems>
 			</view>
@@ -100,7 +100,6 @@
 
 <style scoped lang="scss">
 	.shet-cont{
-		min-height: 500rpx;
 		padding: 10rpx 0 30rpx 0;
 	}
 	.chk-icon{
diff --git a/components/tpx-dialog/tpx-dialog.vue b/components/tpx-dialog/tpx-dialog.vue
index 267767e..24518ba 100644
--- a/components/tpx-dialog/tpx-dialog.vue
+++ b/components/tpx-dialog/tpx-dialog.vue
@@ -4,8 +4,8 @@
 		<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>
+			<u-row v-if="title" @touchmove.stop="" justify="between" custom-style="margin-bottom: 30rpx;">
+				<u-col v-if="title" span="9" custom-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>
@@ -122,7 +122,8 @@
 		left: 0;
 		right: 0;
 		bottom: 0;
-		max-height: 75%;
+		max-height: 85%;
+		min-height: 60%;
 		width: 100%;
 		box-sizing: border-box;
 		display: flex;
diff --git a/components/tpx-tabs/tpx-tabs.vue b/components/tpx-tabs/tpx-tabs.vue
index a90f546..878adb3 100644
--- a/components/tpx-tabs/tpx-tabs.vue
+++ b/components/tpx-tabs/tpx-tabs.vue
@@ -4,8 +4,10 @@
 			<view v-for="(item) in list" @click="handleChangeTab(item)"
 				:class="`sta-item ${value == item.val?'active':''} stai-${mode}`">
 				<view class="stai-text">
-					{{item.title}}
-					<slot :item="item"></slot>
+					<u-row>
+						{{item.title}}
+						<slot :item="item"></slot>
+					</u-row>
 					<view class="stai-chk-line"></view>
 				</view>
 			</view>