From ce6f0ef230c5b00a90e2663f167385fba4e9d32f Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 16 Oct 2024 14:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/my-components/edit-discount.vue | 13 +++++++++----
 components/my-components/my-button.vue     |  5 +++++
 components/my-components/my-tabs.vue       |  5 +++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/components/my-components/edit-discount.vue b/components/my-components/edit-discount.vue
index 5ca910e..4497bf5 100644
--- a/components/my-components/edit-discount.vue
+++ b/components/my-components/edit-discount.vue
@@ -10,7 +10,7 @@
 				</view>
 				<view class="u-m-t-40 u-flex ">
 					<view>实收金额</view>
-					<view class="u-m-l-32 border-bottom u-flex-1">
+					<view class="u-m-l-32 border u-p-l-10 u-p-r-10 u-flex-1">
 						<uni-easyinput style="digit" @input="currentPriceInput" @change="currentPriceChange" paddingNone :inputBorder="false" 
 						v-model="form.currentPrice"
 							placeholder="输入实际金额"></uni-easyinput>
@@ -18,7 +18,7 @@
 				</view>
 				<view class="u-m-t-54 u-flex ">
 					<view>优惠折扣</view>
-					<view class="u-m-l-32 u-flex-1 u-flex border-bottom">
+					<view class="u-m-l-32 u-flex-1 u-flex border u-p-l-10 u-p-r-10">
 						<view class="u-flex-1">
 							<uni-easyinput @input="discountInput"  @change="discountChange" style="digit" paddingNone :inputBorder="false" 
 							v-model="form.discount"
@@ -33,7 +33,7 @@
 		<template #btn>
 			<view class="u-p-30">
 				<view class="u-m-t-10">
-					<my-button @tap="confirm" shape="circle" >修改</my-button>
+					<my-button @tap="confirm" shape="circle" fontWeight="700" >修改</my-button>
 					<view class="">
 						<my-button @tap="close" type="cancel" bgColor="#fff" >取消</my-button>
 					</view>
@@ -146,7 +146,12 @@
 	})
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	.border{
+		border-radius: 8rpx;
+		overflow: hidden;
+		border-color: #999;
+	}
 	.lh34 {
 		line-height: 34rpx;
 	}
diff --git a/components/my-components/my-button.vue b/components/my-components/my-button.vue
index 6004a5b..95364a3 100644
--- a/components/my-components/my-button.vue
+++ b/components/my-components/my-button.vue
@@ -57,6 +57,10 @@ import { computed } from 'vue';
 			type:[String,Number],
 			default:'28'
 		},
+		fontWeight:{
+			type:[String,Number],
+			default:'500'
+		},
 		showShadow:{
 			type:Boolean,
 			default:false
@@ -92,6 +96,7 @@ import { computed } from 'vue';
 		${props.width>=0?('width:'+props.width+'rpx;'):''}
 		${props.plain?('background-color:transparent;'):''}
 		font-size:${props.fontSize}rpx;
+		font-weight:${props.fontWeight};
 		${props.color?('color:'+props.color+';'):''}
 		${props.bgColor?('background-color:'+props.bgColor+';'):''}
 		${props.bgColor?('border-color:'+props.bgColor+';'):''}
diff --git a/components/my-components/my-tabs.vue b/components/my-components/my-tabs.vue
index 378770e..b17befe 100644
--- a/components/my-components/my-tabs.vue
+++ b/components/my-components/my-tabs.vue
@@ -84,7 +84,7 @@
 
 	.bg {
 		background: #E6F0FF;
-		padding: 4rpx 10rpx;
+		padding: 7rpx 10rpx;
 	}
 
 	.border-r-16 {
@@ -124,7 +124,7 @@
 		}
 
 		.item {
-			padding: 8rpx 0;
+			padding: 9rpx 0;
 			transition: all .2s ease-in-out;
 			position: relative;
 			background-color: transparent;
@@ -138,6 +138,7 @@
 			border-radius: 8rpx;
 			// background-color: $my-main-color;
 			color: #fff;
+			font-weight: bold;
 		}
 	}
 </style>
\ No newline at end of file