From 866d9ae781311564ad7375789de509aaa0956452 Mon Sep 17 00:00:00 2001
From: "358665514@qq.com" <358665514@qq.com>
Date: Wed, 15 May 2024 11:39:38 +0800
Subject: [PATCH 01/21] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81=E6=94=B9=E5=8F=98?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uv-calendars/uv-calendars.vue  | 144 ++++++++----------
 1 file changed, 63 insertions(+), 81 deletions(-)

diff --git a/uni_modules/uv-calendars/components/uv-calendars/uv-calendars.vue b/uni_modules/uv-calendars/components/uv-calendars/uv-calendars.vue
index 8d5b377..80cd1c3 100644
--- a/uni_modules/uv-calendars/components/uv-calendars/uv-calendars.vue
+++ b/uni_modules/uv-calendars/components/uv-calendars/uv-calendars.vue
@@ -1,58 +1,22 @@
 <template>
 	<view class="uv-calendar">
 		<view class="uv-calendar__content" v-if="insert">
-			<calendar-body
-				:date="date"
-				:nowDate="nowDate"
-				:weeks="weeks"
-				:calendar="calendar"
-				:selected="selected"
-				:lunar="lunar"
-				:showMonth="showMonth"
-				:color="color"
-				:startText="startText"
-				:endText="endText"
-				:range="range"
-				:multiple="multiple"
-				:allowSameDay="allowSameDay"
-				@bindDateChange="bindDateChange"
-				@pre="pre"
-				@next="next"
-				@backToday="backToday"
-				@choiceDate="choiceDate"
-			></calendar-body>
+			<calendar-body :date="date" :nowDate="nowDate" :weeks="weeks" :calendar="calendar" :selected="selected"
+				:lunar="lunar" :showMonth="showMonth" :color="color" :startText="startText" :endText="endText"
+				:range="range" :multiple="multiple" :allowSameDay="allowSameDay" @bindDateChange="bindDateChange"
+				@pre="pre" @next="next" @backToday="backToday" @choiceDate="choiceDate"></calendar-body>
 		</view>
-		<uv-popup ref="popup" mode="bottom" v-else :round="round" z-index="998" :close-on-click-overlay="closeOnClickOverlay" @maskClick="maskClick">
+		<uv-popup ref="popup" mode="bottom" v-else :round="round" z-index="998"
+			:close-on-click-overlay="closeOnClickOverlay" @maskClick="maskClick">
 			<view style="min-height: 100px;">
-				<uv-toolbar
-					:show="true"
-					:cancelColor="cancelColor"
-					:confirmColor="getConfirmColor"
-					:cancelText="cancelText"
-					:confirmText="confirmText"
-					:title="title"
-					@cancel="close"
+				<uv-toolbar :show="true" :cancelColor="cancelColor" :confirmColor="getConfirmColor"
+					:cancelText="cancelText" :confirmText="confirmText" :title="title" @cancel="close"
 					@confirm="confirm"></uv-toolbar>
 				<view class="line"></view>
-				<calendar-body
-					:nowDate="nowDate"
-					:weeks="weeks"
-					:calendar="calendar"
-					:selected="selected"
-					:lunar="lunar"
-					:showMonth="showMonth"
-					:color="color"
-					:startText="startText"
-					:endText="endText"
-					:range="range"
-					:multiple="multiple"
-					:allowSameDay="allowSameDay"
-					@bindDateChange="bindDateChange"
-					@pre="pre"
-					@next="next"
-					@backToday="backToday"
-					@choiceDate="choiceDate"
-				></calendar-body>
+				<calendar-body :nowDate="nowDate" :weeks="weeks" :calendar="calendar" :selected="selected"
+					:lunar="lunar" :showMonth="showMonth" :color="color" :startText="startText" :endText="endText"
+					:range="range" :multiple="multiple" :allowSameDay="allowSameDay" @bindDateChange="bindDateChange"
+					@pre="pre" @next="next" @backToday="backToday" @choiceDate="choiceDate"></calendar-body>
 			</view>
 		</uv-popup>
 	</view>
@@ -92,10 +56,15 @@
 	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js';
 	import Calendar from './util.js';
 	import calendarBody from './calendar-body.vue';
-	import { initVueI18n } from '@dcloudio/uni-i18n';
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n';
 	import i18nMessages from './i18n/index.js';
-	const { t } = initVueI18n(i18nMessages);
+	const {
+		t
+	} = initVueI18n(i18nMessages);
 	export default {
+		name: 'uv-calendars',
 		components: {
 			calendarBody
 		},
@@ -124,7 +93,7 @@
 			},
 			// 默认显示日期
 			date: {
-				type: [String,Array],
+				type: [String, Array],
 				default: ''
 			},
 			// 打点等设置
@@ -171,7 +140,7 @@
 			},
 			// 弹窗圆角
 			round: {
-				type: [Number,String],
+				type: [Number, String],
 				default: 8
 			},
 			// 点击遮罩是否关闭弹窗
@@ -201,7 +170,7 @@
 			},
 			...uni.$uv?.props?.calendars
 		},
-		data(){
+		data() {
 			return {
 				weeks: [],
 				calendar: {},
@@ -211,7 +180,7 @@
 				range: false
 			}
 		},
-		computed:{
+		computed: {
 			/**
 			 * for i18n
 			 */
@@ -222,9 +191,9 @@
 				return t("uv-calender.cancel")
 			},
 			getConfirmColor() {
-				if(this.range || this.multiple || this.readonly) {
-					return this.allowConfirm? this.confirmColor: '#999'
-				}else {
+				if (this.range || this.multiple || this.readonly) {
+					return this.allowConfirm ? this.confirmColor : '#999'
+				} else {
 					return this.confirmColor;
 				}
 			}
@@ -246,23 +215,31 @@
 			selected(newVal) {
 				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
 				this.weeks = this.cale.weeks
-			}
+			},
+			mode() {
+				this.initCreated()
+			},
 		},
 		created() {
-			this.setMode();
-			this.cale = new Calendar({
-				selected: this.selected,
-				startDate: this.startDate,
-				endDate: this.endDate,
-				range: this.range,
-				multiple: this.multiple,
-				allowSameDay: this.allowSameDay
-			})
-			this.init(this.date)
+			this.initCreated()
 		},
 		methods: {
+			initCreated() {
+				this.setMode();
+				this.cale = new Calendar({
+					selected: this.selected,
+					startDate: this.startDate,
+					endDate: this.endDate,
+					range: this.range,
+					multiple: this.multiple,
+					allowSameDay: this.allowSameDay
+				})
+				this.init(this.date)
+			},
 			setMode() {
-				switch (this.mode){
+				this.range = false
+				this.multiple = false
+				switch (this.mode) {
 					case 'range':
 						this.range = true;
 						break;
@@ -277,7 +254,7 @@
 					this.cale.cleanRangeStatus()
 					this.init(this.date)
 				}
-				if(!this.insert){
+				if (!this.insert) {
 					this.$refs.popup.open();
 				}
 			},
@@ -286,26 +263,29 @@
 				this.$emit('close');
 			},
 			confirm() {
-				if(this.readonly) {
+				if (this.readonly) {
 					return;
-				} else if(this.range && !this.cale.rangeStatus.after) {
+				} else if (this.range && !this.cale.rangeStatus.after) {
 					return;
-				} else if(this.multiple && this.cale.multipleStatus.data.length == 0){
+				} else if (this.multiple && this.cale.multipleStatus.data.length == 0) {
 					return;
 				}
 				this.setEmit('confirm');
 				this.close()
 			},
 			maskClick() {
-				if(this.closeOnClickOverlay) {
+				if (this.closeOnClickOverlay) {
 					this.$emit('close');
 				}
 			},
 			bindDateChange(e) {
 				const value = e.detail.value + '-1'
 				this.setDate(value)
-		
-				const { year, month } = this.cale.getDate(value)
+
+				const {
+					year,
+					month
+				} = this.cale.getDate(value)
 				this.$emit('monthSwitch', {
 					year,
 					month
@@ -316,14 +296,14 @@
 			 * @param {Object} date
 			 */
 			init(date) {
-				if(this.range) {
+				if (this.range) {
 					// 重置范围选择状态
 					this.cale.cleanRangeStatus();
-				}else if(this.multiple){
+				} else if (this.multiple) {
 					// 重置多选状态
 					this.cale.cleanMultipleStatus();
 				}
-				this.cale.setDate(date,'init')
+				this.cale.setDate(date, 'init')
 				this.weeks = this.cale.weeks
 				this.nowDate = this.calendar = this.cale.getInfo(date)
 				this.changeConfirmStatus();
@@ -337,11 +317,11 @@
 				this.setEmit('change')
 			},
 			changeConfirmStatus() {
-				if(this.readonly) {
+				if (this.readonly) {
 					this.allowConfirm = false;
 				} else if (this.range) {
 					this.allowConfirm = this.cale.rangeStatus.after ? true : false;
-				} else if(this.multiple) {
+				} else if (this.multiple) {
 					this.allowConfirm = this.cale.multipleStatus.data.length > 0 ? true : false;
 				}
 			},
@@ -439,9 +419,11 @@
 </script>
 <style scoped lang="scss">
 	$uv-border-color: #EDEDED !default;
+
 	.uv-calendar__content {
 		background-color: #fff;
 	}
+
 	.line {
 		width: 750rpx;
 		height: 1px;
-- 
Gitee


From 04a25d666b81e35eb137204679bc69035de3ae56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Thu, 23 May 2024 10:13:33 +0800
Subject: [PATCH 02/21] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84margin=EF=BC=8C=E6=9B=B4=E6=94=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84icon=E6=94=B9=E4=B8=BAname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uni_modules/uv-list/components/uv-list-item/uv-list-item.vue | 2 +-
 uni_modules/uv-search/components/uv-search/uv-search.vue     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/uni_modules/uv-list/components/uv-list-item/uv-list-item.vue b/uni_modules/uv-list/components/uv-list-item/uv-list-item.vue
index 193b48d..a721369 100644
--- a/uni_modules/uv-list/components/uv-list-item/uv-list-item.vue
+++ b/uni_modules/uv-list/components/uv-list-item/uv-list-item.vue
@@ -19,7 +19,7 @@
 									<image :src="thumb" class="uv-list-item__icon-img" :class="['uv-list--' + thumbSize]" />
 								</view>
 								<view v-else-if="showExtraIcon" class="uv-list-item__icon">
-									<uv-icon :name="extraIcon.icon" :customPrefix="extraIcon.customPrefix" :color="extraIcon.color" :size="extraIcon.size" />
+									<uv-icon :name="extraIcon.name" :customPrefix="extraIcon.customPrefix" :color="extraIcon.color" :size="extraIcon.size" />
 								</view>
 							</view>
 						</slot>
diff --git a/uni_modules/uv-search/components/uv-search/uv-search.vue b/uni_modules/uv-search/components/uv-search/uv-search.vue
index 216f4e1..b8efebb 100644
--- a/uni_modules/uv-search/components/uv-search/uv-search.vue
+++ b/uni_modules/uv-search/components/uv-search/uv-search.vue
@@ -2,9 +2,7 @@
 	<view
 	  class="uv-search"
 	  @tap="clickHandler"
-	  :style="[{
-			margin: margin,
-		}, $uv.addStyle(customStyle)]"
+	  :style="[$uv.addStyle(customStyle)]"
 	>
 		<view
 		  class="uv-search__content"
-- 
Gitee


From f36328cd7d1a9d6b23c4dbacf919e5accc16aae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sat, 25 May 2024 16:30:51 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=20=E5=A2=9E=E5=8A=A0=20=E9=A2=9D=E5=A4=96=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=8E=A7=E5=88=B6=E5=86=85=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/demo/test.nvue                          | 50 ++++++++-----------
 .../components/uv-count-down/props.js         | 12 +++++
 .../uv-count-down/uv-count-down.vue           | 15 ++++--
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/pages/demo/test.nvue b/pages/demo/test.nvue
index b7d7316..fb6cb53 100644
--- a/pages/demo/test.nvue
+++ b/pages/demo/test.nvue
@@ -1,42 +1,36 @@
 <template>
-	<view>
-		<uv-picker ref="picker" :columns="columns" keyName="name" @confirm="confirm"></uv-picker>
-		<button @click="openPicker">打开</button>
+	<view class="wrap">
+		<!-- <uv-toast ref="toast"></uv-toast> -->
+		<uv-code :seconds="seconds" @end="end" @start="start" ref="code" changeText='X秒重获取' @change="codeChange"></uv-code>
+		<uv-button type="success" size="small" style="width: 100px;" @tap="getCode" :text="tips"></uv-button>
 	</view>
 </template>
 <script>
 	export default {
 		data() {
 			return {
-				columns: [
-					[{
-						name: '中国'
-					},{
-						name: '美国'
-					},{
-						name: '日本'
-					}]
-				]
+				tips: '',
+				seconds: 60
 			}
 		},
-		onReady() {
-			setTimeout(()=>{
-				this.columns = [[{
-						name: '中国1'
-					},{
-						name: '美国1'
-					},{
-						name: '日本1'
-					}]]
-			},3000)
-		},
 		methods: {
-			openPicker() {
-				this.$refs.picker.open();
+			codeChange(text) {	
+				this.tips = text;
+			},
+			getCode() {
+				this.$refs.code.start();
 			},
-			confirm(e) {
-				console.log('confirm', e);
+			end() {
+				// uni.$uv.toast('倒计时结束');
+			},
+			start() {
+				// uni.$uv.toast('倒计时开始');
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>
+<style lang="scss">
+	.wrap {
+		padding: 24rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uv-count-down/components/uv-count-down/props.js b/uni_modules/uv-count-down/components/uv-count-down/props.js
index c5b5461..acbd468 100644
--- a/uni_modules/uv-count-down/components/uv-count-down/props.js
+++ b/uni_modules/uv-count-down/components/uv-count-down/props.js
@@ -1,5 +1,17 @@
 export default {
 	props: {
+		isStartTime: {
+			type: Boolean,
+			default: false
+		},
+		isStopTime: {
+			type: Boolean,
+			default: false
+		},
+		isResetTime: {
+			type: Boolean,
+			default: false
+		},
 		// 倒计时时长，单位ms
 		time: {
 			type: [String, Number],
diff --git a/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.vue b/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.vue
index a758d31..d415312 100644
--- a/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.vue
+++ b/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.vue
@@ -1,7 +1,5 @@
 <template>
-	<view 
-		class="uv-count-down"
-		:style="[$uv.addStyle(customStyle)]">
+	<view class="uv-count-down" :style="[$uv.addStyle(customStyle)]">
 		<slot>
 			<text class="uv-count-down__text">{{ formattedTime }}</text>
 		</slot>
@@ -48,6 +46,16 @@
 			}
 		},
 		watch: {
+			isStartTime(bool) {
+				this.start()
+			},
+			isStopTime(bool) {
+				this.pause()
+			},
+			isResetTime() {
+				this.reset()
+			},
+
 			time(n) {
 				this.reset()
 			}
@@ -159,6 +167,7 @@
 	$uv-count-down-text-color: $uv-content-color !default;
 	$uv-count-down-text-font-size: 15px !default;
 	$uv-count-down-text-line-height: 22px !default;
+
 	.uv-count-down {
 		&__text {
 			color: $uv-count-down-text-color;
-- 
Gitee


From 5335600bdabc3bf5ab534796f006ef6c8f7deb5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Tue, 28 May 2024 09:22:11 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20margin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uni_modules/uv-text/components/uv-text/props.js    | 5 -----
 uni_modules/uv-text/components/uv-text/uv-text.vue | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/uni_modules/uv-text/components/uv-text/props.js b/uni_modules/uv-text/components/uv-text/props.js
index e533c66..a00bf24 100644
--- a/uni_modules/uv-text/components/uv-text/props.js
+++ b/uni_modules/uv-text/components/uv-text/props.js
@@ -88,11 +88,6 @@ export default {
 			type: String,
 			default: 'none'
 		},
-		// 外边距，对象、字符串，数值形式均可
-		margin: {
-			type: [Object, String, Number],
-			default: 0
-		},
 		// 文本行高
 		lineHeight: {
 			type: [String, Number],
diff --git a/uni_modules/uv-text/components/uv-text/uv-text.vue b/uni_modules/uv-text/components/uv-text/uv-text.vue
index 973eebe..36fc6bd 100644
--- a/uni_modules/uv-text/components/uv-text/uv-text.vue
+++ b/uni_modules/uv-text/components/uv-text/uv-text.vue
@@ -4,7 +4,7 @@
       :class="[]"
       v-if="show"
       :style="{
-        margin: margin,
+     
 				justifyContent: align === 'left' ? 'flex-start' : align === 'center' ? 'center' : 'flex-end'
       }"
       @tap="clickHandler"
@@ -95,7 +95,6 @@
 	 * @property {String | Number} 			size		字体大小（默认 15 ）
 	 * @property {Object | String} 			iconStyle	图标的样式 （默认 {fontSize: '15px'} ）
 	 * @property {String} 					decoration	文字装饰，下划线，中划线等，可选值 none|underline|line-through（默认 'none' ）
-	 * @property {Object | String | Number}	margin		外边距，对象、字符串，数值形式均可（默认 0 ）
 	 * @property {String | Number} 			lineHeight	文本行高
 	 * @property {String} 					align		文本对齐方式，可选值left|center|right（默认 'left' ）
 	 * @property {String} 					wordWrap	文字换行，可选值break-word|normal|anywhere（默认 'normal' ）
-- 
Gitee


From bdb01ee60651b0508eef3fa501c8ad6f1fc5bf9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Fri, 7 Jun 2024 16:35:09 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=94=A8=E6=88=B7icon=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uv-icon/components/uv-icon/uv-icon.vue    |  69 ++++++------
 .../uv-line/components/uv-line/uv-line.vue    |   2 +-
 .../components/uv-navbar/uv-navbar.vue        | 103 ++++++------------
 3 files changed, 74 insertions(+), 100 deletions(-)

diff --git a/uni_modules/uv-icon/components/uv-icon/uv-icon.vue b/uni_modules/uv-icon/components/uv-icon/uv-icon.vue
index d61c9e5..4742ec0 100644
--- a/uni_modules/uv-icon/components/uv-icon/uv-icon.vue
+++ b/uni_modules/uv-icon/components/uv-icon/uv-icon.vue
@@ -1,36 +1,18 @@
 <template>
-	<view
-	  class="uv-icon"
-	  @tap="clickHandler"
-	  :class="['uv-icon--' + labelPos]"
-	>
-		<image
-		  class="uv-icon__img"
-		  v-if="isImg"
-		  :src="name"
-		  :mode="imgMode"
-		  :style="[imgStyle, $uv.addStyle(customStyle)]"
-		></image>
-		<text
-		  v-else
-		  class="uv-icon__icon"
-		  :class="uClasses"
-		  :style="[iconStyle, $uv.addStyle(customStyle)]"
-		  :hover-class="hoverClass"
-		>{{icon}}</text>
+	<view class="uv-icon" @tap="clickHandler" :class="['uv-icon--' + labelPos]">
+		<image class="uv-icon__img" v-if="isImg" :src="name" :mode="imgMode"
+			:style="[imgStyle, $uv.addStyle(customStyle)]"></image>
+		<text v-else class="uv-icon__icon" :class="uClasses" :style="[iconStyle, $uv.addStyle(customStyle)]"
+			:hover-class="hoverClass">{{ isCustomIcon ? '' : icon}}</text>
 		<!-- 这里进行空字符串判断，如果仅仅是v-if="label"，可能会出现传递0的时候，结果也无法显示 -->
-		<text
-		  v-if="label !== ''" 
-		  class="uv-icon__label"
-		  :style="{
+		<text v-if="label !== ''" class="uv-icon__label" :style="{
 			color: labelColor,
 			fontSize: $uv.addUnit(labelSize),
 			marginLeft: labelPos == 'right' ? $uv.addUnit(space) : 0,
 			marginTop: labelPos == 'bottom' ? $uv.addUnit(space) : 0,
 			marginRight: labelPos == 'left' ? $uv.addUnit(space) : 0,
 			marginBottom: labelPos == 'top' ? $uv.addUnit(space) : 0
-		}"
-		>{{ label }}</text>
+		}">{{ label }}</text>
 	</view>
 </template>
 
@@ -82,6 +64,7 @@
 		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
+				isCustomIcon: false,
 				colorType: [
 					'primary',
 					'success',
@@ -94,10 +77,19 @@
 		computed: {
 			uClasses() {
 				let classes = []
-				classes.push(this.customPrefix)
-				classes.push(this.customPrefix + '-' + this.name)
-				// 主题色，通过类配置
-				if (this.color && this.colorType.includes(this.color)) classes.push('uv-icon__icon--' + this.color)
+
+				const nameLit = this.name.split(' ') || []
+				const prefix = nameLit.length === 2 ? nameLit[1].split('-')[0] : ''
+
+				if (this.customPrefix === 'uvicon' && prefix === nameLit[0]) {
+					classes.push(nameLit[0], nameLit[1])
+					this.isCustomIcon = true
+				} else {
+					classes.push(this.customPrefix)
+					classes.push(this.customPrefix + '-' + this.name)
+					// 主题色，通过类配置
+					if (this.color && this.colorType.includes(this.color)) classes.push('uv-icon__icon--' + this.color)
+				}
 				// 阿里，头条，百度小程序通过数组绑定类名时，无法直接使用[a, b, c]的形式，否则无法识别
 				// 故需将其拆成一个字符串的形式，通过空格隔开各个类名
 				//#ifdef MP-ALIPAY || MP-TOUTIAO || MP-BAIDU
@@ -135,8 +127,9 @@
 				// 如果内置的图标中找不到对应的图标，就直接返回name值，因为用户可能传入的是unicode代码
 				const code = icons['uvicon-' + this.name];
 				// #ifdef APP-NVUE
-				if(!code) {
-					return code ? unescape(`%u${code}`) : ['uvicon'].indexOf(this.customPrefix) > -1 ? unescape(`%u${this.name}`) : '';
+				if (!code) {
+					return code ? unescape(`%u${code}`) : ['uvicon'].indexOf(this.customPrefix) > -1 ? unescape(
+						`%u${this.name}`) : '';
 				}
 				// #endif
 				return code ? unescape(`%u${code}`) : ['uvicon'].indexOf(this.customPrefix) > -1 ? this.name : '';
@@ -162,61 +155,75 @@
 	$uv-icon-warning: $uv-warning !default;
 	$uv-icon-error: $uv-error !default;
 	$uv-icon-label-line-height: 1 !default;
+
 	/* #ifndef APP-NVUE */
 	// 非nvue下加载字体
 	@font-face {
 		font-family: 'uvicon-iconfont';
 		src: url('./uvicons.ttf') format('truetype');
 	}
+
 	/* #endif */
 	.uv-icon {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
 		align-items: center;
+
 		&--left {
 			flex-direction: row-reverse;
 			align-items: center;
 		}
+
 		&--right {
 			flex-direction: row;
 			align-items: center;
 		}
+
 		&--top {
 			flex-direction: column-reverse;
 			justify-content: center;
 		}
+
 		&--bottom {
 			flex-direction: column;
 			justify-content: center;
 		}
+
 		&__icon {
 			font-family: uvicon-iconfont;
 			position: relative;
 			@include flex;
 			align-items: center;
+
 			&--primary {
 				color: $uv-icon-primary;
 			}
+
 			&--success {
 				color: $uv-icon-success;
 			}
+
 			&--error {
 				color: $uv-icon-error;
 			}
+
 			&--warning {
 				color: $uv-icon-warning;
 			}
+
 			&--info {
 				color: $uv-icon-info;
 			}
 		}
+
 		&__img {
 			/* #ifndef APP-NVUE */
 			height: auto;
 			will-change: transform;
 			/* #endif */
 		}
+
 		&__label {
 			/* #ifndef APP-NVUE */
 			line-height: $uv-icon-label-line-height;
diff --git a/uni_modules/uv-line/components/uv-line/uv-line.vue b/uni_modules/uv-line/components/uv-line/uv-line.vue
index 866c507..9174813 100644
--- a/uni_modules/uv-line/components/uv-line/uv-line.vue
+++ b/uni_modules/uv-line/components/uv-line/uv-line.vue
@@ -29,7 +29,7 @@
 		computed: {
 			lineStyle() {
 				const style = {}
-				style.margin = this.margin
+				// style.margin = this.margin
 				// 如果是水平线条，边框高度为1px，再通过transform缩小一半，就是0.5px了
 				if (this.direction === 'row') {
 					// 此处采用兼容分开写，兼容nvue的写法
diff --git a/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue b/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
index a46ad7a..0564df8 100644
--- a/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
+++ b/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
@@ -1,70 +1,33 @@
 <template>
 	<view class="uv-navbar">
-		<view
-			class="uv-navbar__placeholder"
-			v-if="fixed && placeholder"
-			:style="{
+		<view class="uv-navbar__placeholder" v-if="fixed && placeholder" :style="{
 				height: $uv.addUnit($uv.getPx(height) + $uv.sys().statusBarHeight,'px'),
-			}"
-		></view>
+			}"></view>
 		<view :class="[fixed && 'uv-navbar--fixed']">
 			<image class="uv-navbar--bgimg" :src="bgColor" :mode="imgMode" v-if="isImg" :style="[bgImgStyle]"></image>
-			<uv-status-bar
-				v-if="safeAreaInsetTop"
-				:bgColor="getStatusbgColor"
-			></uv-status-bar>
-			<view
-				class="uv-navbar__content"
-				:class="[border && 'uv-border-bottom']"
-				:style="[{
+			<uv-status-bar v-if="safeAreaInsetTop" :bgColor="getStatusbgColor"></uv-status-bar>
+			<view class="uv-navbar__content" :class="[border && 'uv-border-bottom']" :style="[{
 					height: $uv.addUnit(height)
-				},getBgColor]"
-			>
-				<view
-					class="uv-navbar__content__left"
-					hover-class="uv-navbar__content__left--hover"
-					hover-start-time="150"
-					@tap="leftClick"
-				>
+				},getBgColor]">
+				<view class="uv-navbar__content__left" hover-class="uv-navbar__content__left--hover"
+					hover-start-time="150" @tap="leftClick">
 					<slot name="left">
-						<uv-icon
-							v-if="leftIcon"
-							:name="leftIcon"
-							:size="leftIconSize"
-							:color="leftIconColor"
-						></uv-icon>
-						<text
-							v-if="leftText"
-							:style="{
+						<uv-icon v-if="leftIcon" :name="leftIcon" :size="leftIconSize" :color="leftIconColor"></uv-icon>
+						<text v-if="leftText" :style="{
 								color: leftIconColor
-							}"
-							class="uv-navbar__content__left__text"
-						>{{ leftText }}</text>
+							}" class="uv-navbar__content__left__text">{{ leftText }}</text>
 					</slot>
 				</view>
 				<slot name="center">
-					<text
-						class="uv-line-1 uv-navbar__content__title"
-						:style="[{
+					<text class="uv-line-1 uv-navbar__content__title" :style="[{
 							width: $uv.addUnit(titleWidth),
 							flex: '0 1 auto'
-						}, $uv.addStyle(titleStyle)]"
-					>{{ title }}</text>
+						}, $uv.addStyle(titleStyle)]">{{ title }}</text>
 				</slot>
-				<view
-					class="uv-navbar__content__right"
-					@tap="rightClick"
-				>
+				<view class="uv-navbar__content__right" @tap="rightClick">
 					<slot name="right">
-						<uv-icon
-							v-if="rightIcon"
-							:name="rightIcon"
-							size="20"
-						></uv-icon>
-						<text
-							v-if="rightText"
-							class="uv-navbar__content__right__text"
-						>{{ rightText }}</text>
+						<uv-icon v-if="rightIcon" :name="rightIcon" size="20"></uv-icon>
+						<text v-if="rightText" class="uv-navbar__content__right__text">{{ rightText }}</text>
 					</slot>
 				</view>
 			</view>
@@ -109,24 +72,24 @@
 			}
 		},
 		computed: {
-			getBgColor(){
+			getBgColor() {
 				const style = {};
-				if(this.bgColor){
-					if (this.bgColor.indexOf("gradient") > -1) {// 渐变色
+				if (this.bgColor) {
+					if (this.bgColor.indexOf("gradient") > -1) { // 渐变色
 						style.backgroundImage = this.bgColor;
-					}else if(this.isImg){
+					} else if (this.isImg) {
 						style.background = 'transparent';
-					}else {
+					} else {
 						style.background = this.bgColor;
 					}
 				}
 				return style;
 			},
 			getStatusbgColor() {
-				if(this.bgColor){
-					if(this.isImg){
+				if (this.bgColor) {
+					if (this.isImg) {
 						return 'transparent';
-					}else {
+					} else {
 						return this.bgColor;
 					}
 				}
@@ -138,10 +101,12 @@
 			},
 			bgImgStyle() {
 				const style = {};
-				if(this.safeAreaInsetTop) {
-					style.height = this.$uv.addUnit(this.$uv.sys().statusBarHeight + 44, 'px');
+				const height = uni.$uv.getPx(height)
+
+				if (this.safeAreaInsetTop) {
+					style.height = this.$uv.addUnit(this.$uv.sys().statusBarHeight + height, 'px');
 				} else {
-					style.height = '44px';
+					style.height = `${height}px`;
 				}
 				return style;
 			}
@@ -151,7 +116,7 @@
 			leftClick() {
 				// 如果配置了autoBack，自动返回上一页
 				this.$emit('leftClick')
-				if(this.autoBack) {
+				if (this.autoBack) {
 					uni.navigateBack()
 				}
 			},
@@ -164,14 +129,16 @@
 </script>
 
 <style lang="scss" scoped>
- 	$show-border: 1;
+	$show-border: 1;
 	$show-border-bottom: 1;
 	$show-lines: 1;
 	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+
 	.uv-navbar {
 		position: relative;
+
 		&--fixed {
 			position: fixed;
 			left: 0;
@@ -179,7 +146,7 @@
 			top: 0;
 			z-index: 11;
 		}
-		
+
 		&--bgimg {
 			position: absolute;
 			left: 0;
@@ -215,7 +182,7 @@
 
 			&__left {
 				left: 0;
-				
+
 				&--hover {
 					opacity: 0.7;
 				}
@@ -242,4 +209,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
-- 
Gitee


From 68a442582cd527e4dd3d8fb4ea8c614e78c05a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Fri, 7 Jun 2024 17:06:29 +0800
Subject: [PATCH 06/21] Update uv-icon.vue

---
 uni_modules/uv-icon/components/uv-icon/uv-icon.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/uni_modules/uv-icon/components/uv-icon/uv-icon.vue b/uni_modules/uv-icon/components/uv-icon/uv-icon.vue
index 4742ec0..38f2431 100644
--- a/uni_modules/uv-icon/components/uv-icon/uv-icon.vue
+++ b/uni_modules/uv-icon/components/uv-icon/uv-icon.vue
@@ -85,6 +85,7 @@
 					classes.push(nameLit[0], nameLit[1])
 					this.isCustomIcon = true
 				} else {
+					this.isCustomIcon = false
 					classes.push(this.customPrefix)
 					classes.push(this.customPrefix + '-' + this.name)
 					// 主题色，通过类配置
-- 
Gitee


From e74cb4fad9b8f4bd9fbd231d6e7f5679a922270e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sat, 27 Jul 2024 18:46:47 +0800
Subject: [PATCH 07/21] =?UTF-8?q?uv-code-input=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E9=BD=90=E4=BD=8D=E7=BD=AE=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=EF=BC=8C=E5=85=A8=E5=B1=8Floading=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E9=80=8F=E6=98=8E=E8=AE=BE=E7=BD=AE=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uv-code-input/props.js         |   4 +
 .../uv-code-input/uv-code-input.vue           |   2 +-
 .../uv-input/components/uv-input/uv-input.vue | 133 ++++++++----------
 .../uv-loading-page/uv-loading-page.vue       |   3 +-
 .../uv-notify/components/uv-notify/props.js   |   4 +
 .../components/uv-notify/uv-notify.vue        |  78 +++++-----
 6 files changed, 104 insertions(+), 120 deletions(-)

diff --git a/uni_modules/uv-code-input/components/uv-code-input/props.js b/uni_modules/uv-code-input/components/uv-code-input/props.js
index 4a5e460..941004b 100644
--- a/uni_modules/uv-code-input/components/uv-code-input/props.js
+++ b/uni_modules/uv-code-input/components/uv-code-input/props.js
@@ -1,5 +1,9 @@
 export default {
 	props: {
+		justifyContent: {
+			type: String,
+			default: ''
+		},
 		value: {
 			type: [String, Number],
 			default: ''
diff --git a/uni_modules/uv-code-input/components/uv-code-input/uv-code-input.vue b/uni_modules/uv-code-input/components/uv-code-input/uv-code-input.vue
index 14ad8a2..90bb263 100644
--- a/uni_modules/uv-code-input/components/uv-code-input/uv-code-input.vue
+++ b/uni_modules/uv-code-input/components/uv-code-input/uv-code-input.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="uv-code-input">
+	<view class="uv-code-input" :style="{justifyContent:justifyContent}">
 		<view
 			class="uv-code-input__item"
 			:style="[itemStyle(index)]"
diff --git a/uni_modules/uv-input/components/uv-input/uv-input.vue b/uni_modules/uv-input/components/uv-input/uv-input.vue
index 20c1801..320cdef 100644
--- a/uni_modules/uv-input/components/uv-input/uv-input.vue
+++ b/uni_modules/uv-input/components/uv-input/uv-input.vue
@@ -1,73 +1,35 @@
 <template>
-    <view class="uv-input" :class="inputClass" :style="[wrapperStyle]">
-      <view class="uv-input__content">
-        <view class="uv-input__content__prefix-icon">
-          <slot name="prefix">
-            <uv-icon
-							v-if="prefixIcon"
-              :name="prefixIcon"
-              size="18"
-              :customStyle="prefixIconStyle"
-            ></uv-icon>
-          </slot>
-        </view>
-        <view class="uv-input__content__field-wrapper" @click="clickHandler">
+	<view class="uv-input" :class="inputClass" :style="[wrapperStyle]">
+		<view class="uv-input__content">
+			<view class="uv-input__content__prefix-icon">
+				<slot name="prefix">
+					<uv-icon v-if="prefixIcon" :name="prefixIcon" size="18" :customStyle="prefixIconStyle"></uv-icon>
+				</slot>
+			</view>
+			<view class="uv-input__content__field-wrapper" @click="clickHandler">
 				<!-- 根据uni-app的input组件文档，H5和APP中只要声明了password参数(无论true还是false)，type均失效，此时
 				为了防止type=number时，又存在password属性，type无效，此时需要设置password为undefined
 			 -->
-        	<input
-        	  class="uv-input__content__field-wrapper__field"
-        	  :style="[inputStyle]"
-        	  :type="type"
-        	  :focus="focus"
-        	  :cursor="cursor"
-        	  :value="innerValue"
-        	  :auto-blur="autoBlur"
-        	  :disabled="disabled || readonly"
-        	  :maxlength="maxlength"
-        	  :placeholder="placeholder"
-        	  :placeholder-style="placeholderStyle"
-        	  :placeholder-class="placeholderClass"
-        	  :confirm-type="confirmType"
-        	  :confirm-hold="confirmHold"
-        	  :hold-keyboard="holdKeyboard"
-        	  :cursor-spacing="cursorSpacing"
-        	  :adjust-position="adjustPosition"
-        	  :selection-end="selectionEnd"
-        	  :selection-start="selectionStart"
-        	  :password="password || type === 'password' || undefined"
-            :ignoreCompositionEvent="ignoreCompositionEvent"
-        	  @input="onInput"
-        	  @blur="onBlur"
-        	  @focus="onFocus"
-        	  @confirm="onConfirm"
-        	  @keyboardheightchange="onkeyboardheightchange"
-        	/>
-        </view>
-        <view
-          class="uv-input__content__clear"
-          v-if="isShowClear"
-          @tap="onClear"
-        >
-          <uv-icon
-            name="close"
-            size="11"
-            color="#ffffff"
-            customStyle="line-height: 12px"
-          ></uv-icon>
-        </view>
-        <view class="uv-input__content__subfix-icon">
-          <slot name="suffix">
-            <uv-icon
-							v-if="suffixIcon"
-              :name="suffixIcon"
-              size="18"
-              :customStyle="suffixIconStyle"
-            ></uv-icon>
-          </slot>
-        </view>
-      </view>
-    </view>
+				<input class="uv-input__content__field-wrapper__field" :style="[inputStyle]" :type="type" :focus="focus"
+					:cursor="cursor" :value="innerValue" :auto-blur="autoBlur" :disabled="disabled || readonly"
+					:maxlength="maxlength" :placeholder="placeholder"
+					:placeholder-style="$uv.addStyle(placeholderStyle,'string')" :placeholder-class="placeholderClass"
+					:confirm-type="confirmType" :confirm-hold="confirmHold" :hold-keyboard="holdKeyboard"
+					:cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" :selection-end="selectionEnd"
+					:selection-start="selectionStart" :password="password || type === 'password' || undefined"
+					:ignoreCompositionEvent="ignoreCompositionEvent" @input="onInput" @blur="onBlur" @focus="onFocus"
+					@confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange" />
+			</view>
+			<view class="uv-input__content__clear" v-if="isShowClear" @tap="onClear">
+				<uv-icon name="close" size="11" color="#ffffff" customStyle="line-height: 12px"></uv-icon>
+			</view>
+			<view class="uv-input__content__subfix-icon">
+				<slot name="suffix">
+					<uv-icon v-if="suffixIcon" :name="suffixIcon" size="18" :customStyle="suffixIconStyle"></uv-icon>
+				</slot>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
@@ -138,23 +100,32 @@
 			// #endif
 		},
 		watch: {
-			value(newVal){
+			value(newVal) {
 				this.innerValue = newVal;
 			},
-			modelValue(newVal){
+			modelValue(newVal) {
 				this.innerValue = newVal;
 			}
 		},
 		computed: {
 			// 是否显示清除控件
 			isShowClear() {
-				const { clearable, readonly, focused, innerValue } = this;
+				const {
+					clearable,
+					readonly,
+					focused,
+					innerValue
+				} = this;
 				return !!clearable && !readonly && !!focused && innerValue !== "";
 			},
 			// 组件的类名
 			inputClass() {
 				let classes = [],
-					{ border, disabled, shape } = this;
+					{
+						border,
+						disabled,
+						shape
+					} = this;
 				border === "surround" &&
 					(classes = classes.concat(["uv-border", "uv-input--radius"]));
 				classes.push(`uv-input--${shape}`);
@@ -192,7 +163,7 @@
 					textAlign: this.inputAlign
 				};
 				// #ifndef APP-NVUE
-				if(this.disabled || this.readonly) {
+				if (this.disabled || this.readonly) {
 					style['pointer-events'] = 'none';
 				}
 				// #endif
@@ -206,7 +177,9 @@
 			},
 			// 当键盘输入时，触发input事件
 			onInput(e) {
-				let { value = "" } = e.detail || {};
+				let {
+					value = ""
+				} = e.detail || {};
 				// 格式化过滤方法
 				const formatter = this.formatter || this.innerFormatter
 				const formatValue = formatter(value)
@@ -240,11 +213,11 @@
 			// 键盘高度发生变化的时候触发此事件
 			// 兼容性：微信小程序2.7.0+、App 3.1.0+
 			onkeyboardheightchange(e) {
-				this.$emit("keyboardheightchange",e);
+				this.$emit("keyboardheightchange", e);
 			},
 			// 内容发生变化，进行处理
 			valueChange() {
-				if(this.isClear) this.innerValue = '';
+				if (this.isClear) this.innerValue = '';
 				const value = this.innerValue;
 				this.$nextTick(() => {
 					this.$emit("input", value);
@@ -258,7 +231,7 @@
 			onClear() {
 				this.innerValue = "";
 				this.isClear = true;
-				this.$uv.sleep(200).then(res=>{
+				this.$uv.sleep(200).then(res => {
 					this.isClear = false;
 				})
 				this.$nextTick(() => {
@@ -292,31 +265,38 @@
 	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+
 	.uv-input {
 		@include flex(row);
 		align-items: center;
 		justify-content: space-between;
 		flex: 1;
+
 		&--radius,
 		&--square {
 			border-radius: 4px;
 		}
+
 		&--no-radius {
 			border-radius: 0;
 		}
+
 		&--circle {
 			border-radius: 100px;
 		}
+
 		&__content {
 			flex: 1;
 			@include flex(row);
 			align-items: center;
 			justify-content: space-between;
+
 			&__field-wrapper {
 				position: relative;
 				@include flex(row);
 				margin: 0;
 				flex: 1;
+
 				&__field {
 					line-height: 26px;
 					text-align: left;
@@ -326,6 +306,7 @@
 					flex: 1;
 				}
 			}
+
 			&__clear {
 				width: 20px;
 				height: 20px;
@@ -337,9 +318,11 @@
 				transform: scale(0.82);
 				margin-left: 15px;
 			}
+
 			&__subfix-icon {
 				margin-left: 4px;
 			}
+
 			&__prefix-icon {
 				margin-right: 4px;
 			}
diff --git a/uni_modules/uv-loading-page/components/uv-loading-page/uv-loading-page.vue b/uni_modules/uv-loading-page/components/uv-loading-page/uv-loading-page.vue
index 8fb26d1..6a32246 100644
--- a/uni_modules/uv-loading-page/components/uv-loading-page/uv-loading-page.vue
+++ b/uni_modules/uv-loading-page/components/uv-loading-page/uv-loading-page.vue
@@ -72,8 +72,7 @@
 					'bottom': '0',
 					'zIndex': '999',
 					'background-color': this.bgColor,
-					'transition-duration': `${this.duration}ms`,
-					'opacity': this.opacity
+					'transition-duration': `${this.duration}ms`
 				}
 				return this.$uv.deepMerge(style, this.$uv.addStyle(this.customStyle))
 			}
diff --git a/uni_modules/uv-notify/components/uv-notify/props.js b/uni_modules/uv-notify/components/uv-notify/props.js
index 5728276..b948f6b 100644
--- a/uni_modules/uv-notify/components/uv-notify/props.js
+++ b/uni_modules/uv-notify/components/uv-notify/props.js
@@ -1,5 +1,9 @@
 export default {
 	props: {
+		showNotify: {
+			type: Boolean,
+			default: false
+		},
 		// 到顶部的距离
 		top: {
 			type: [String, Number],
diff --git a/uni_modules/uv-notify/components/uv-notify/uv-notify.vue b/uni_modules/uv-notify/components/uv-notify/uv-notify.vue
index 96c1566..b73fb37 100644
--- a/uni_modules/uv-notify/components/uv-notify/uv-notify.vue
+++ b/uni_modules/uv-notify/components/uv-notify/uv-notify.vue
@@ -1,32 +1,18 @@
 <template>
-	<uv-transition
-		mode="slide-top"
-		:customStyle="containerStyle"
-		:show="open"
-	>
-		<view
-			class="uv-notify"
-			:class="[`uv-notify--${tmpConfig.type}`]"
-			:style="[backgroundColor, $uv.addStyle(customStyle)]"
-		>
+	<uv-transition mode="slide-top" :customStyle="containerStyle" :show="open">
+		<view class="uv-notify" :class="[`uv-notify--${tmpConfig.type}`]"
+			:style="[backgroundColor, $uv.addStyle(customStyle)]">
 			<uv-status-bar v-if="tmpConfig.safeAreaInsetTop"></uv-status-bar>
 			<view class="uv-notify__warpper">
 				<slot name="icon">
-					<uv-icon
-						v-if="['success', 'warning', 'error'].includes(tmpConfig.type)"
-						:name="tmpConfig.icon"
-						:color="tmpConfig.color"
-						:size="1.3 * tmpConfig.fontSize"
-						:customStyle="{marginRight: '4px'}"
-					></uv-icon>
+					<uv-icon v-if="['success', 'warning', 'error'].includes(tmpConfig.type)" :name="tmpConfig.icon"
+						:color="tmpConfig.color" :size="1.3 * tmpConfig.fontSize"
+						:customStyle="{marginRight: '4px'}"></uv-icon>
 				</slot>
-				<text
-					class="uv-notify__warpper__text"
-					:style="{
+				<text class="uv-notify__warpper__text" :style="{
 						fontSize: $uv.addUnit(tmpConfig.fontSize),
 						color: tmpConfig.color
-					}"
-				>{{ tmpConfig.message }}</text>
+					}">{{ tmpConfig.message }}</text>
 			</view>
 		</view>
 	</uv-transition>
@@ -61,28 +47,19 @@
 				// 是否展示组件
 				open: false,
 				timer: null,
-				config: {
-					// 到顶部的距离
-					top: this.top,
-					// type主题，primary，success，warning，error
-					type: this.type,
-					// 字体颜色
-					color: this.color,
-					// 背景颜色
-					bgColor: this.bgColor,
-					// 展示的文字内容
-					message: this.message,
-					// 展示时长，为0时不消失，单位ms
-					duration: this.duration,
-					// 字体大小
-					fontSize: this.fontSize,
-					// 是否留出顶部安全距离（状态栏高度）
-					safeAreaInsetTop: this.safeAreaInsetTop
-				},
 				// 合并后的配置，避免多次调用组件后，可能会复用之前使用的配置参数
 				tmpConfig: {}
 			}
 		},
+		watch: {
+			showNotify: function(bool) {
+				if (bool) {
+					this.show({})
+				} else {
+					this.close()
+				}
+			}
+		},
 		computed: {
 			containerStyle() {
 				let top = 0
@@ -137,7 +114,24 @@
 		methods: {
 			show(options) {
 				// 不将结果合并到this.config变量，避免多次调用uv-toast，前后的配置造成混乱
-				this.tmpConfig = this.$uv.deepMerge(this.config, options)
+				this.tmpConfig = this.$uv.deepMerge({
+					// 到顶部的距离
+					top: this.top,
+					// type主题，primary，success，warning，error
+					type: this.type,
+					// 字体颜色
+					color: this.color,
+					// 背景颜色
+					bgColor: this.bgColor,
+					// 展示的文字内容
+					message: this.message,
+					// 展示时长，为0时不消失，单位ms
+					duration: this.duration,
+					// 字体大小
+					fontSize: this.fontSize,
+					// 是否留出顶部安全距离（状态栏高度）
+					safeAreaInsetTop: this.safeAreaInsetTop
+				}, options)
 				// 任何定时器初始化之前，都要执行清除操作，否则可能会造成混乱
 				this.clearTimer()
 				this.open = true
@@ -217,4 +211,4 @@
 			background-color: $uv-notify-warning-bgColor;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
-- 
Gitee


From db952bfde3feaa128ee45ccd30552b4c40575bdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sat, 3 Aug 2024 15:30:11 +0800
Subject: [PATCH 08/21] =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=92=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/componentsA/text/text.nvue              |   8 ++
 .../uv-text/components/uv-text/props.js       |  22 +++
 .../uv-text/components/uv-text/uv-text.vue    | 135 +++++++++---------
 3 files changed, 97 insertions(+), 68 deletions(-)

diff --git a/pages/componentsA/text/text.nvue b/pages/componentsA/text/text.nvue
index 9d41724..246dcdf 100644
--- a/pages/componentsA/text/text.nvue
+++ b/pages/componentsA/text/text.nvue
@@ -1,5 +1,13 @@
 <template>
 	<view class="uv-page">
+		<view class="uv-demo-block">
+			<text class="uv-demo-block__title">设置标题装饰</text>
+			<view class="uv-demo-block__content">
+				<view class="uv-page__text-item">
+					<uv-text dividerFlexDirection="row" dividerAlign="center"  showDivider text="我用十年青春,赴你最后之约"></uv-text>
+				</view>
+			</view>
+		</view>
 		<view class="uv-demo-block">
 			<text class="uv-demo-block__title">基础功能</text>
 			<view class="uv-demo-block__content">
diff --git a/uni_modules/uv-text/components/uv-text/props.js b/uni_modules/uv-text/components/uv-text/props.js
index a00bf24..0894fee 100644
--- a/uni_modules/uv-text/components/uv-text/props.js
+++ b/uni_modules/uv-text/components/uv-text/props.js
@@ -1,5 +1,27 @@
 export default {
 	props: {
+		// 显示划线
+		showDivider:{
+			type: Boolean,
+			default: false
+		},
+		// 划线位置
+		dividerFlexDirection: {
+			type: String,
+			default: ''
+		},
+		// 划线对齐方式
+		dividerAlign: {
+			type: String,
+			default: ''
+		},
+		// 划线样式
+		dividerStyle:{
+			type: [Object, String],
+			default: () => ({
+				
+			})
+		},
 		// 主题颜色
 		type: {
 			type: String,
diff --git a/uni_modules/uv-text/components/uv-text/uv-text.vue b/uni_modules/uv-text/components/uv-text/uv-text.vue
index 36fc6bd..b66e966 100644
--- a/uni_modules/uv-text/components/uv-text/uv-text.vue
+++ b/uni_modules/uv-text/components/uv-text/uv-text.vue
@@ -1,71 +1,41 @@
 <template>
-    <view
-      class="uv-text"
-      :class="[]"
-      v-if="show"
-      :style="{
+	<view class="uv-text" :class="[]" v-if="show" :style="{
      
 				justifyContent: align === 'left' ? 'flex-start' : align === 'center' ? 'center' : 'flex-end'
-      }"
-      @tap="clickHandler"
-    >
-      <text
-        :class="['uv-text__price', type && `uv-text__value--${type}`]"
-        v-if="mode === 'price'"
-        :style="[valueStyle]"
-        >￥</text
-      >
-      <view class="uv-text__prefix-icon" v-if="prefixIcon">
-        <uv-icon
-          :name="prefixIcon"
-          :customStyle="$uv.addStyle(iconStyle)"
-        ></uv-icon>
-      </view>
-      <uv-link
-        v-if="mode === 'link'"
-        :text="value"
-        :href="href"
-        underLine
-      ></uv-link>
-      <template v-else-if="openType && isMp">
-        <button
-          class="uv-reset-button uv-text__value"
-          :style="[valueStyle]"
-          :openType="openType"
-          @getuserinfo="onGetUserInfo"
-          @contact="onContact"
-          @getphonenumber="onGetPhoneNumber"
-          @error="onError"
-          @launchapp="onLaunchApp"
-          @opensetting="onOpenSetting"
-          :lang="lang"
-          :session-from="sessionFrom"
-          :send-message-title="sendMessageTitle"
-          :send-message-path="sendMessagePath"
-          :send-message-img="sendMessageImg"
-          :show-message-card="showMessageCard"
-          :app-parameter="appParameter"
-        >
-          {{ value }}
-        </button>
-      </template>
-      <text
-        v-else
-        class="uv-text__value"
-        :style="[valueStyle]"
-        :class="[
-          type && `uv-text__value--${type}`,
-          lines && `uv-line-${lines}`
-        ]"
-        >{{ value }}</text
-      >
-      <view class="uv-text__suffix-icon" v-if="suffixIcon">
-        <uv-icon
-          :name="suffixIcon"
-          :customStyle="$uv.addStyle(iconStyle)"
-        ></uv-icon>
-      </view>
-    </view>
+      }" @tap="clickHandler">
+
+		<view class="divider-wrap" :style="dividerWrap">
+			<view v-if="showDivider" :style="dividerStyleFun"></view>
+
+			<view>
+				<text :class="['uv-text__price', type && `uv-text__value--${type}`]" v-if="mode === 'price'"
+					:style="[valueStyle]">￥</text>
+				<view class="uv-text__prefix-icon" v-if="prefixIcon">
+					<uv-icon :name="prefixIcon" :customStyle="$uv.addStyle(iconStyle)"></uv-icon>
+				</view>
+				<uv-link v-if="mode === 'link'" :text="value" :href="href" underLine></uv-link>
+				<template v-else-if="openType && isMp">
+					<button class="uv-reset-button uv-text__value" :style="[valueStyle]" :openType="openType"
+						@getuserinfo="onGetUserInfo" @contact="onContact" @getphonenumber="onGetPhoneNumber"
+						@error="onError" @launchapp="onLaunchApp" @opensetting="onOpenSetting" :lang="lang"
+						:session-from="sessionFrom" :send-message-title="sendMessageTitle"
+						:send-message-path="sendMessagePath" :send-message-img="sendMessageImg"
+						:show-message-card="showMessageCard" :app-parameter="appParameter">
+						{{ value }}
+					</button>
+				</template>
+				<text v-else class="uv-text__value" :style="[valueStyle]" :class="[
+			    type && `uv-text__value--${type}`,
+			    lines && `uv-line-${lines}`
+			  ]">{{ value }}</text>
+				<view class="uv-text__suffix-icon" v-if="suffixIcon">
+					<uv-icon :name="suffixIcon" :customStyle="$uv.addStyle(iconStyle)"></uv-icon>
+				</view>
+
+			</view>
+
+		</view>
+	</view>
 </template>
 <script>
 	import value from './value.js'
@@ -111,6 +81,23 @@
 		mixins: [mpMixin, mixin, value, props],
 		// #endif
 		computed: {
+			dividerStyleFun() {
+				const dividerStyle = this.dividerStyle || {}
+				return {
+					width: '5px',
+					height: '15px',
+					background: '#3c9cff',
+					marginRight: '5px',
+					...dividerStyle,
+				}
+			},
+			dividerWrap() {
+				return {
+					display: 'flex',
+					flexDirection: this.dividerFlexDirection,
+					alignItems: this.dividerAlign
+				}
+			},
 			valueStyle() {
 				const style = {
 					textDecoration: this.decoration,
@@ -120,9 +107,9 @@
 				};
 				!this.type && (style.color = this.color);
 				this.isNvue && this.lines && (style.lines = this.lines);
-				if(this.isNvue && this.mode != 'price' && !this.prefixIcon && !this.suffixIcon) {
-					 style.flex = 1;
-					 style.textAlign = this.align === 'left' ? 'flex-start' : this.align === 'center' ? 'center' : 'right';
+				if (this.isNvue && this.mode != 'price' && !this.prefixIcon && !this.suffixIcon) {
+					style.flex = 1;
+					style.textAlign = this.align === 'left' ? 'flex-start' : this.align === 'center' ? 'center' : 'right';
 				}
 				this.lineHeight && (style.lineHeight = this.$uv.addUnit(this.lineHeight));
 				!this.isNvue && this.block && (style.display = 'block');
@@ -165,6 +152,7 @@
 	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+
 	.uv-text {
 		@include flex(row);
 		align-items: center;
@@ -172,11 +160,13 @@
 		flex: 1;
 		/* #ifndef APP-NVUE */
 		width: 100%;
+
 		/* #endif */
 		&__price {
 			font-size: 14px;
 			color: $uv-content-color;
 		}
+
 		&__value {
 			font-size: 14px;
 			@include flex;
@@ -185,30 +175,39 @@
 			// flex: 1;
 			text-overflow: ellipsis;
 			align-items: center;
+
 			&--primary {
 				color: $uv-primary;
 			}
+
 			&--warning {
 				color: $uv-warning;
 			}
+
 			&--success {
 				color: $uv-success;
 			}
+
 			&--info {
 				color: $uv-info;
 			}
+
 			&--error {
 				color: $uv-error;
 			}
+
 			&--main {
 				color: $uv-main-color;
 			}
+
 			&--content {
 				color: $uv-content-color;
 			}
+
 			&--tips {
 				color: $uv-tips-color;
 			}
+
 			&--light {
 				color: $uv-light-color;
 			}
-- 
Gitee


From 7965988a506a185ae433f3b20bd17f5683ee390a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sat, 3 Aug 2024 15:34:07 +0800
Subject: [PATCH 09/21] Update uv-text.vue

---
 uni_modules/uv-text/components/uv-text/uv-text.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/uni_modules/uv-text/components/uv-text/uv-text.vue b/uni_modules/uv-text/components/uv-text/uv-text.vue
index b66e966..404a4ef 100644
--- a/uni_modules/uv-text/components/uv-text/uv-text.vue
+++ b/uni_modules/uv-text/components/uv-text/uv-text.vue
@@ -35,6 +35,7 @@
 			</view>
 
 		</view>
+		
 	</view>
 </template>
 <script>
-- 
Gitee


From 8533a4aa470fcdcf4c0b956c8f5d2d371fe8617d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sat, 3 Aug 2024 16:21:12 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/componentsA/text/text.nvue              | 107 ++++++------------
 .../uv-text/components/uv-text/props.js       |   4 +-
 .../uv-text/components/uv-text/uv-text.vue    |   9 +-
 3 files changed, 40 insertions(+), 80 deletions(-)

diff --git a/pages/componentsA/text/text.nvue b/pages/componentsA/text/text.nvue
index 246dcdf..064fd39 100644
--- a/pages/componentsA/text/text.nvue
+++ b/pages/componentsA/text/text.nvue
@@ -4,7 +4,12 @@
 			<text class="uv-demo-block__title">设置标题装饰</text>
 			<view class="uv-demo-block__content">
 				<view class="uv-page__text-item">
-					<uv-text dividerFlexDirection="row" dividerAlign="center"  showDivider text="我用十年青春,赴你最后之约"></uv-text>
+					<!-- <image src="../../../static/1.jpg"></image> -->
+					<uv-text showDivider text="我用十年青春,赴你最后之约" :customStyle="{
+						background:`url(/static/1.jpg)`,
+					}">
+					<!-- <image src="../../../static/1.jpg"></image> -->
+					</uv-text>
 				</view>
 			</view>
 		</view>
@@ -20,34 +25,19 @@
 			<text class="uv-demo-block__title">设置主题</text>
 			<view class="uv-demo-block__content">
 				<view class="uv-page__text-item">
-					<uv-text
-					    text="主色"
-					    type="primary"
-					></uv-text>
+					<uv-text text="主色" type="primary"></uv-text>
 				</view>
 				<view class="uv-page__text-item">
-					<uv-text
-					    type="error"
-					    text="错误"
-					></uv-text>
+					<uv-text type="error" text="错误"></uv-text>
 				</view>
 				<view class="uv-page__text-item">
-					<uv-text
-					    type="success"
-					    text="成功"
-					></uv-text>
+					<uv-text type="success" text="成功"></uv-text>
 				</view>
 				<view class="uv-page__text-item">
-					<uv-text
-					    type="warning"
-					    text="警告"
-					></uv-text>
+					<uv-text type="warning" text="警告"></uv-text>
 				</view>
 				<view class="uv-page__text-item">
-					<uv-text
-					    type="info"
-					    text="信息"
-					></uv-text>
+					<uv-text type="info" text="信息"></uv-text>
 				</view>
 			</view>
 		</view>
@@ -55,15 +45,8 @@
 			<text class="uv-demo-block__title">拨打电话</text>
 			<view class="uv-demo-block__content">
 				<view class="uv-page__text-item">
-					<uv-text
-					    mode="phone"
-					    text="15019479320"
-					></uv-text>
-					<uv-text
-					    mode="phone"
-					    text="15019479320"
-							format="encrypt"
-					></uv-text>
+					<uv-text mode="phone" text="15019479320"></uv-text>
+					<uv-text mode="phone" text="15019479320" format="encrypt"></uv-text>
 				</view>
 			</view>
 		</view>
@@ -71,10 +54,7 @@
 			<text class="uv-demo-block__title">日期格式化</text>
 			<view class="uv-demo-block__content">
 				<view class="uv-page__text-item">
-					<uv-text
-					    mode="date"
-					    text="1612959739"
-					></uv-text>
+					<uv-text mode="date" text="1612959739"></uv-text>
 				</view>
 			</view>
 		</view>
@@ -82,11 +62,7 @@
 			<text class="uv-demo-block__title">姓名脱敏</text>
 			<view class="uv-demo-block__content">
 				<view class="uv-page__text-item">
-					<uv-text
-					    mode="name"
-					    text="张三三"
-						format="encrypt"
-					></uv-text>
+					<uv-text mode="name" text="张三三" format="encrypt"></uv-text>
 				</view>
 			</view>
 		</view>
@@ -94,11 +70,7 @@
 			<text class="uv-demo-block__title">超链接</text>
 			<view class="uv-demo-block__content">
 				<view class="uv-page__text-item">
-					<uv-text
-					    mode="link"
-					    text="Go to uv docs"
-					    href="https://www.uviewui.com"
-					></uv-text>
+					<uv-text mode="link" text="Go to uv docs" href="https://www.uviewui.com"></uv-text>
 				</view>
 			</view>
 		</view>
@@ -106,61 +78,47 @@
 			<text class="uv-demo-block__title">显示金额</text>
 			<view class="uv-demo-block__content">
 				<view class="uv-page__text-item">
-					<uv-text
-					    mode="price"
-					    text="728732.32"
-					></uv-text>
+					<uv-text mode="price" text="728732.32"></uv-text>
 				</view>
 			</view>
 		</view>
 		<view class="uv-demo-block">
 			<text class="uv-demo-block__title">前后图标</text>
 			<view class="uv-demo-block__content">
-				<view
-				    class="uv-page__text-item"
-				    style="margin-right: 50px;"
-				>
-					<uv-text
-					    prefixIcon="photo"
-					    iconStyle="font-size: 19px"
-					    text="百度一下"
-					></uv-text>
+				<view class="uv-page__text-item" style="margin-right: 50px;">
+					<uv-text prefixIcon="photo" iconStyle="font-size: 19px" text="百度一下"></uv-text>
 				</view>
 				<view class="uv-page__text-item">
-					<uv-text
-					    suffixIcon="arrow-leftward"
-					    iconStyle="font-size: 18px"
-					    text="查看更多"
-					></uv-text>
+					<uv-text suffixIcon="arrow-leftward" iconStyle="font-size: 18px" text="查看更多"></uv-text>
 				</view>
 			</view>
 		</view>
 		<view class="uv-demo-block">
 			<text class="uv-demo-block__title">超出隐藏</text>
 			<view class="uv-demo-block__content">
-				<uv-text
-				    :lines="2"
-				    text="关于uv-ui的取名来由，首字母u来自于uni-app首字母，uni-app是基于Vue.js，Vue和View(延伸为UI、视图之意)同音，故取名uv-ui，表达源于uni-app和Vue和uView之意，同时在此也对它们表示感谢。"
-				></uv-text>
+				<uv-text :lines="2"
+					text="关于uv-ui的取名来由，首字母u来自于uni-app首字母，uni-app是基于Vue.js，Vue和View(延伸为UI、视图之意)同音，故取名uv-ui，表达源于uni-app和Vue和uView之意，同时在此也对它们表示感谢。"></uv-text>
 			</view>
 		</view>
 		<view class="uv-demo-block">
 			<text class="uv-demo-block__title">小程序开放能力</text>
 			<view class="uv-demo-block__content">
-				<uv-text
-				    text="分享到微信"
-				    openType="share"
-				    type="success"
-					@click="clickHandler"
-				></uv-text>
+				<uv-text text="分享到微信" openType="share" type="success" @click="clickHandler"></uv-text>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import { toast } from '@/uni_modules/uv-ui-tools/libs/function/index.js'
+	import {
+		toast
+	} from '@/uni_modules/uv-ui-tools/libs/function/index.js'
 	export default {
+		data() {
+			return {
+				img: '@/static/1.jpg'
+			}
+		},
 		onLoad() {},
 		methods: {
 			clickHandler() {
@@ -174,6 +132,7 @@
 
 <style lang="scss">
 	@import '@/common/demo.scss';
+
 	.uv-page__text-item {
 		margin-right: 10px;
 		flex: 1;
@@ -185,4 +144,4 @@
 		flex-wrap: wrap;
 		align-items: center;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/uni_modules/uv-text/components/uv-text/props.js b/uni_modules/uv-text/components/uv-text/props.js
index 0894fee..cb77b5e 100644
--- a/uni_modules/uv-text/components/uv-text/props.js
+++ b/uni_modules/uv-text/components/uv-text/props.js
@@ -8,12 +8,12 @@ export default {
 		// 划线位置
 		dividerFlexDirection: {
 			type: String,
-			default: ''
+			default: 'row'
 		},
 		// 划线对齐方式
 		dividerAlign: {
 			type: String,
-			default: ''
+			default: 'center'
 		},
 		// 划线样式
 		dividerStyle:{
diff --git a/uni_modules/uv-text/components/uv-text/uv-text.vue b/uni_modules/uv-text/components/uv-text/uv-text.vue
index 404a4ef..a300119 100644
--- a/uni_modules/uv-text/components/uv-text/uv-text.vue
+++ b/uni_modules/uv-text/components/uv-text/uv-text.vue
@@ -5,7 +5,9 @@
       }" @tap="clickHandler">
 
 		<view class="divider-wrap" :style="dividerWrap">
-			<view v-if="showDivider" :style="dividerStyleFun"></view>
+			<view v-if="showDivider" :style="dividerStyleFun">
+				<slot></slot>
+			</view>
 
 			<view>
 				<text :class="['uv-text__price', type && `uv-text__value--${type}`]" v-if="mode === 'price'"
@@ -84,13 +86,12 @@
 		computed: {
 			dividerStyleFun() {
 				const dividerStyle = this.dividerStyle || {}
-				return {
+				return this.$uv.addStyle({
 					width: '5px',
 					height: '15px',
 					background: '#3c9cff',
-					marginRight: '5px',
 					...dividerStyle,
-				}
+				})
 			},
 			dividerWrap() {
 				return {
-- 
Gitee


From dc7ce08ef9db4b05674ce44f2e8a5a5f4ff82038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Tue, 6 Aug 2024 20:44:38 +0800
Subject: [PATCH 11/21] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F=20=E5=A2=9E=E5=8A=A0bgImg=20=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uni_modules/uv-navbar/components/uv-navbar/props.js      | 4 ++++
 uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/uni_modules/uv-navbar/components/uv-navbar/props.js b/uni_modules/uv-navbar/components/uv-navbar/props.js
index 47fe150..6a016b9 100644
--- a/uni_modules/uv-navbar/components/uv-navbar/props.js
+++ b/uni_modules/uv-navbar/components/uv-navbar/props.js
@@ -1,5 +1,9 @@
 export default {
 	props: {
+		bgImg: {
+			type: String,
+			default: ''
+		},
 		// 是否开启顶部安全区适配
 		safeAreaInsetTop: {
 			type: Boolean,
diff --git a/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue b/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
index 0564df8..6a24db0 100644
--- a/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
+++ b/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
@@ -4,7 +4,7 @@
 				height: $uv.addUnit($uv.getPx(height) + $uv.sys().statusBarHeight,'px'),
 			}"></view>
 		<view :class="[fixed && 'uv-navbar--fixed']">
-			<image class="uv-navbar--bgimg" :src="bgColor" :mode="imgMode" v-if="isImg" :style="[bgImgStyle]"></image>
+			<image class="uv-navbar--bgimg" :src="bgImg" :mode="imgMode" v-if="bgImg" :style="[bgImgStyle]"></image>
 			<uv-status-bar v-if="safeAreaInsetTop" :bgColor="getStatusbgColor"></uv-status-bar>
 			<view class="uv-navbar__content" :class="[border && 'uv-border-bottom']" :style="[{
 					height: $uv.addUnit(height)
@@ -77,7 +77,7 @@
 				if (this.bgColor) {
 					if (this.bgColor.indexOf("gradient") > -1) { // 渐变色
 						style.backgroundImage = this.bgColor;
-					} else if (this.isImg) {
+					} else if (this.bgImg) {
 						style.background = 'transparent';
 					} else {
 						style.background = this.bgColor;
@@ -87,7 +87,7 @@
 			},
 			getStatusbgColor() {
 				if (this.bgColor) {
-					if (this.isImg) {
+					if (this.bgImg) {
 						return 'transparent';
 					} else {
 						return this.bgColor;
-- 
Gitee


From 8215d3521960882bc1cb61edee44fb4849cda12c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sat, 24 Aug 2024 08:50:53 +0800
Subject: [PATCH 12/21] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=86=E6=AE=B5?=
 =?UTF-8?q?=E5=99=A8=E7=BB=84=E4=BB=B6=E9=BB=98=E8=AE=A4=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uv-subsection/uv-subsection.vue           |   2 +-
 .../uv-vtabs/components/uv-vtabs/props.js     |   4 +
 .../uv-vtabs/components/uv-vtabs/uv-vtabs.vue | 173 +++++++-----------
 3 files changed, 75 insertions(+), 104 deletions(-)

diff --git a/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue b/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue
index 64338ae..ad2c0c8 100644
--- a/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue
+++ b/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue
@@ -210,7 +210,7 @@
 			}
 		}
 		&--subsection {
-			height: 30px;
+			// height: 30px;
 		}
 		&__bar {
 			position: absolute;
diff --git a/uni_modules/uv-vtabs/components/uv-vtabs/props.js b/uni_modules/uv-vtabs/components/uv-vtabs/props.js
index a64dce8..897691e 100644
--- a/uni_modules/uv-vtabs/components/uv-vtabs/props.js
+++ b/uni_modules/uv-vtabs/components/uv-vtabs/props.js
@@ -1,5 +1,9 @@
 export default {
 	props: {
+		reduceHeight:{
+			type: [Number, String],
+			default: 0
+		},
 		// 列表数据
 		list: {
 			type: Array,
diff --git a/uni_modules/uv-vtabs/components/uv-vtabs/uv-vtabs.vue b/uni_modules/uv-vtabs/components/uv-vtabs/uv-vtabs.vue
index cd23320..b886b33 100644
--- a/uni_modules/uv-vtabs/components/uv-vtabs/uv-vtabs.vue
+++ b/uni_modules/uv-vtabs/components/uv-vtabs/uv-vtabs.vue
@@ -1,51 +1,23 @@
 <template>
-	<view
-		class="uv-vtabs"
-		:style="[vtabsStyle]"
-	>
-		<scroll-view
-			class="uv-vtabs__bar"
-			ref="uv-vtabs__bar"
-			:style="[getBarStyle]"
-			:scroll-y="barScrollable" 
-			:scroll-x="scrollX"
-			:show-scrollbar="false"
-			:scroll-with-animation="true"
-			:scroll-top="barScrollTop"
-			:scroll-into-view="barScrollToView"
-		>
-			<view
-				:class="[
+	<view class="uv-vtabs" :style="[vtabsStyle]">
+		<scroll-view class="uv-vtabs__bar" ref="uv-vtabs__bar" :style="[getBarStyle]" :scroll-y="barScrollable"
+			:scroll-x="scrollX" :show-scrollbar="false" :scroll-with-animation="true" :scroll-top="barScrollTop"
+			:scroll-into-view="barScrollToView">
+			<view :class="[
 					'uv-vtabs__bar-item',
 					`uv-vtabs__bar-item--${index}`,
 					index == activeIndex && 'uv-vtabs__bar-item-active'
-				]"
-				:ref="`uv-vtabs__bar-item--${index}`"
-				v-for="(item,index) in list"
-				:key="index"
-				:id="`bar_${index}`"
-				:style="[itemStyle(index)]"
-				@tap.stop="clickHandler(index)"
-			>
-				<view 
-					class="uv-vtabs__bar-item--line"
-					v-if="index == activeIndex"
-					:style="[$uv.addStyle(barItemActiveLineStyle)]"
-				></view>
-				<text 
-					:class="[
+				]" :ref="`uv-vtabs__bar-item--${index}`" v-for="(item,index) in list" :key="index" :id="`bar_${index}`"
+				:style="[itemStyle(index)]" @tap.stop="clickHandler(index)">
+				<view class="uv-vtabs__bar-item--line" v-if="index == activeIndex"
+					:style="[$uv.addStyle(barItemActiveLineStyle)]"></view>
+				<text :class="[
 						'uv-vtabs__bar-item--value',
 						index == activeIndex && 'uv-vtabs__bar-item-active--value'
-					]"
-					:style="[itemStyle(index),textStyle(index)]"
-				>{{item[keyName]}}</text>
-				<view 
-					class="uv-vtabs__bar-item--badge"
-					:style="[$uv.addStyle(barItemBadgeStyle)]"
-					v-if="!!(item.badge && (item.badge.show || item.badge.isDot || item.badge.value))"
-				>
-					<uv-badge
-						:show="!!(item.badge && (item.badge.show || item.badge.isDot || item.badge.value))"
+					]" :style="[itemStyle(index),textStyle(index)]">{{item[keyName]}}</text>
+				<view class="uv-vtabs__bar-item--badge" :style="[$uv.addStyle(barItemBadgeStyle)]"
+					v-if="!!(item.badge && (item.badge.show || item.badge.isDot || item.badge.value))">
+					<uv-badge :show="!!(item.badge && (item.badge.show || item.badge.isDot || item.badge.value))"
 						:isDot="item.badge && item.badge.isDot || propsBadge.isDot"
 						:value="item.badge && item.badge.value || propsBadge.value"
 						:max="item.badge && item.badge.max || propsBadge.max"
@@ -55,36 +27,19 @@
 						:color="item.badge && item.badge.color || propsBadge.color"
 						:shape="item.badge && item.badge.shape || propsBadge.shape"
 						:numberType="item.badge && item.badge.numberType || propsBadge.numberType"
-						:inverted="item.badge && item.badge.inverted || propsBadge.inverted"
-					></uv-badge>
+						:inverted="item.badge && item.badge.inverted || propsBadge.inverted"></uv-badge>
 				</view>
 			</view>
 		</scroll-view>
-		<scroll-view
-			class="uv-vtabs__content"
-			:style="[getContentStyle,$uv.addStyle(contentStyle)]"
-			:scroll-y="true" 
-			:scroll-x="scrollX"
-			:show-scrollbar="false"
-			:scroll-top="contentScrollTop"
-			:scroll-into-view="contentScrollTo"
-			:scroll-with-animation="true"
-			@scroll="scrollHandler"
-			@scrolltolower="scrolltolower"
-			v-if="chain"
-		>
+		<scroll-view class="uv-vtabs__content" :style="[getContentStyle,$uv.addStyle(contentStyle)]" :scroll-y="true"
+			:scroll-x="scrollX" :show-scrollbar="false" :scroll-top="contentScrollTop"
+			:scroll-into-view="contentScrollTo" :scroll-with-animation="true" @scroll="scrollHandler"
+			@scrolltolower="scrolltolower" v-if="chain">
 			<slot />
 		</scroll-view>
-		<scroll-view 
-			v-else
-			class="uv-vtabs__content"
-			:style="[getContentStyle,$uv.addStyle(contentStyle)]"
-			:scroll-y="true" 
-			:scroll-x="scrollX"
-			:show-scrollbar="false"
-			:scroll-top="contentScrollTop2"
-			@scrolltolower="scrolltolower"
-		>
+		<scroll-view v-else class="uv-vtabs__content" :style="[getContentStyle,$uv.addStyle(contentStyle)]"
+			:scroll-y="true" :scroll-x="scrollX" :show-scrollbar="false" :scroll-top="contentScrollTop2"
+			@scrolltolower="scrolltolower">
 			<slot />
 		</scroll-view>
 	</view>
@@ -127,7 +82,7 @@
 			this.children = []
 		},
 		mounted() {
-			this.$nextTick(()=>{
+			this.$nextTick(() => {
 				this.init(this.current);
 			})
 		},
@@ -136,7 +91,7 @@
 				activeIndex: 0,
 				// 微信小程序下，scroll-view的scroll-into-view属性无法对slot中的内容的id生效，只能通过设置scrollTop的形式去移动滚动条
 				contentScrollTop: 0,
-				contentScrollTop2: 0,//针对非联动
+				contentScrollTop2: 0, //针对非联动
 				contentScrollTo: '',
 				scrolling: false,
 				barScrolling: false,
@@ -149,7 +104,7 @@
 			}
 		},
 		computed: {
-			scrollX(){
+			scrollX() {
 				// #ifdef APP-NVUE
 				return true;
 				// #endif
@@ -167,25 +122,26 @@
 				style.height = this.getHeight();
 				return this.$uv.deepMerge(style, this.$uv.addStyle(this.barStyle));
 			},
-			itemStyle(){
-				return index =>{
+			itemStyle() {
+				return index => {
 					const style = {};
 					let barItemInitStyle = this.barItemStyle;
 					// 避免在nvue模式下，切换时候上一个选中颜色不变
-					if(this.barItemStyle && !this.barItemStyle?.background) {
+					if (this.barItemStyle && !this.barItemStyle?.background) {
 						barItemInitStyle.background = 'transparent';
 					}
 					// 是否激活的样式
-					const customeStyle = index === this.activeIndex ? this.$uv.addStyle(this.barItemActiveStyle) : this.$uv.addStyle(barItemInitStyle);
+					const customeStyle = index === this.activeIndex ? this.$uv.addStyle(this.barItemActiveStyle) : this
+						.$uv.addStyle(barItemInitStyle);
 					if (this.list[index].disabled) {
 						style.color = '#c8c9cc'
 					}
 					return this.$uv.deepMerge(style, customeStyle);
-				} 
+				}
 			},
 			// nvue设置字体样式必须要text标签上进行
-			textStyle(){
-				return index=>{
+			textStyle() {
+				return index => {
 					const style = {};
 					style.width = this.$uv.getPx(this.barWidth, true);
 					return style;
@@ -201,10 +157,10 @@
 			}
 		},
 		watch: {
-			current(newVal){
-				if(!this.touching) 
-					this.$nextTick(()=>{
-						this.init(newVal?newVal:0);
+			current(newVal) {
+				if (!this.touching)
+					this.$nextTick(() => {
+						this.init(newVal ? newVal : 0);
 					})
 			},
 			list(newVal) {
@@ -214,30 +170,30 @@
 					})
 				}
 			},
-			activeIndex(newVal){
-				if(!this.chain) {// 解决：非联动，内容过多的情况，滚动一段距离，再切换未滚动到顶部的BUG
+			activeIndex(newVal) {
+				if (!this.chain) { // 解决：非联动，内容过多的情况，滚动一段距离，再切换未滚动到顶部的BUG
 					this.contentScrollTop2 = 0 - Math.random() * 4 - 4;
 				}
-				this.$emit('change',newVal);
+				this.$emit('change', newVal);
 			}
 		},
 		methods: {
-			init(index){
+			init(index) {
 				let num = 0;
 				clearInterval(this.timer2);
-				this.timer2 = setInterval(async ()=>{
+				this.timer2 = setInterval(async () => {
 					num++;
-					if(num>50) clearInterval(this.timer2);
-					if(this.children.length) {
+					if (num > 50) clearInterval(this.timer2);
+					if (this.children.length) {
 						clearInterval(this.timer2);
 						await this.$uv.sleep(300);
 						this.clickHandler(index);
 					}
-				},100)
+				}, 100)
 			},
 			// 内容滚动到底部触发
-			scrolltolower(){
-				this.$emit('scrolltolower',this.activeIndex);
+			scrolltolower() {
+				this.$emit('scrolltolower', this.activeIndex);
 			},
 			async resize() {
 				// 如果list数组长度为0就不处理 || 选中目标未变则不处理
@@ -267,11 +223,11 @@
 				barScrollTop = Math.min(barScrollTop, this.scrollViewHeight - this.tabsRect.height);
 				this.barScrollTop = Math.max(0, barScrollTop);
 				// 已经不能滚动的时候，就使用scroll-into-view的方式进行定位，避免失效
-				if(barScrollTop>=(this.scrollViewHeight - this.tabsRect.height)) {
+				if (barScrollTop >= (this.scrollViewHeight - this.tabsRect.height)) {
 					this.timer && clearTimeout(this.timer);
-					this.timer = setTimeout(()=>{
+					this.timer = setTimeout(() => {
 						this.barScrollToView = `bar_${this.activeIndex}`;
-					},400)
+					}, 400)
 				}
 			},
 			// 左边菜单点击
@@ -279,17 +235,18 @@
 				if (currentIndex == this.activeIndex) return;
 				this.touching = true;
 				this.activeIndex = currentIndex;
-				if(this.chain) {
+				if (this.chain) {
 					// 给一点随机值，避免出现不能滚动的BUG。微信端必须用此方法
-					this.contentScrollTop = this.children[currentIndex].top - this.$uv.getPx(this.hdHeight) - Math.random() * 4 - 4;
+					this.contentScrollTop = this.children[currentIndex].top - this.$uv.getPx(this.hdHeight) - Math
+						.random() * 4 - 4;
 					// #ifndef MP-WEIXIN
 					this.contentScrollTo = `content_${currentIndex}`;
 					// #endif
 				}
 				this.timer && clearTimeout(this.timer);
-				throttle(()=>{
+				throttle(() => {
 					this.resize();
-				},300,false)
+				}, 300, false)
 				debounce(() => {
 					this.touching = false;
 				}, 900)
@@ -336,17 +293,18 @@
 				}
 				this.activeIndex = activeIndex;
 				// 当前选中项索引必然来源于前后两个索引，满足才执行，避免闪烁的bug
-					this.timer4 && clearTimeout(this.timer4);
-				this.timer4 = setTimeout(()=>{
+				this.timer4 && clearTimeout(this.timer4);
+				this.timer4 = setTimeout(() => {
 					this.resize();
-				},100)
+				}, 100)
 			},
 			// 设置高度
 			getHeight() {
 				let height = 0;
 				const isEmpty = this.$uv.test.empty(this.height);
-				if (isEmpty || this.height=='auto') height = this.$uv.addUnit(this.$uv.sys().windowHeight);
-				else height = this.$uv.getPx(this.height, true);
+				if (isEmpty || this.height == 'auto') {
+					height = this.$uv.addUnit(this.$uv.sys().windowHeight - this.reduceHeight);
+				} else height = this.$uv.getPx(this.height, true);
 				return height;
 			},
 			// 获取导航菜单的尺寸
@@ -390,16 +348,20 @@
 <style scoped lang="scss">
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+
 	.uv-vtabs {
 		@include flex;
+
 		&__bar {
 			background: $uv-bg-color;
+
 			&-item {
 				position: relative;
 				@include flex;
 				align-items: center;
 				justify-content: center;
 				padding: 35rpx 12rpx 35rpx 20rpx;
+
 				&--value {
 					/* #ifdef APP-NVUE */
 					padding: 0 12rpx;
@@ -407,12 +369,15 @@
 					font-size: 14px;
 					color: $uv-content-color;
 				}
+
 				&-active {
 					background: #fff;
+
 					&--value {
 						color: $uv-primary;
 					}
 				}
+
 				&--line {
 					position: absolute;
 					width: 2px;
@@ -422,6 +387,7 @@
 					z-index: 1;
 					background-color: $uv-primary;
 				}
+
 				&--badge {
 					position: absolute;
 					top: 4px;
@@ -430,6 +396,7 @@
 				}
 			}
 		}
+
 		&__content {
 			flex: 1;
 			background: #fff;
-- 
Gitee


From d15d76e56ae1641201e09c3d31116ec76fce487d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sat, 24 Aug 2024 13:39:26 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uv-navbar/components/uv-navbar/uv-navbar.vue     |  2 +-
 .../components/uv-subsection/uv-subsection.vue       |  2 +-
 .../uv-vtabs/components/uv-vtabs/uv-vtabs.vue        | 12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue b/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
index 6a24db0..cf633b5 100644
--- a/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
+++ b/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
@@ -144,7 +144,7 @@
 			left: 0;
 			right: 0;
 			top: 0;
-			z-index: 11;
+			z-index: 20;
 		}
 
 		&--bgimg {
diff --git a/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue b/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue
index ad2c0c8..f02467e 100644
--- a/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue
+++ b/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue
@@ -210,7 +210,7 @@
 			}
 		}
 		&--subsection {
-			// height: 30px;
+			height: 100%;
 		}
 		&__bar {
 			position: absolute;
diff --git a/uni_modules/uv-vtabs/components/uv-vtabs/uv-vtabs.vue b/uni_modules/uv-vtabs/components/uv-vtabs/uv-vtabs.vue
index b886b33..01f18d7 100644
--- a/uni_modules/uv-vtabs/components/uv-vtabs/uv-vtabs.vue
+++ b/uni_modules/uv-vtabs/components/uv-vtabs/uv-vtabs.vue
@@ -301,10 +301,16 @@
 			// 设置高度
 			getHeight() {
 				let height = 0;
-				const isEmpty = this.$uv.test.empty(this.height);
-				if (isEmpty || this.height == 'auto') {
+				let defaultHeight = this.height
+
+				if (defaultHeight === true) {
+					defaultHeight = 'auto'
+				}
+				const isEmpty = this.$uv.test.empty(defaultHeight);
+				if (isEmpty || defaultHeight == 'auto') {
 					height = this.$uv.addUnit(this.$uv.sys().windowHeight - this.reduceHeight);
-				} else height = this.$uv.getPx(this.height, true);
+				} else height = this.$uv.getPx(defaultHeight, true);
+
 				return height;
 			},
 			// 获取导航菜单的尺寸
-- 
Gitee


From b2bb10e0b17ddfa310eef63af9b9e9b7ba722ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sun, 25 Aug 2024 20:13:32 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E5=AF=B9=E6=93=8D=E4=BD=9C=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=BC=B9=E5=87=BA=E5=B1=82=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8F=8C=E5=90=91?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uv-action-sheet/uv-action-sheet.vue       | 148 ++----
 .../components/uv-calendars/uv-calendars.vue  |   5 +-
 .../uv-datetime-picker/uv-datetime-picker.vue |  84 ++--
 .../uv-modal/components/uv-modal/uv-modal.vue |   7 +-
 .../uv-pick-color/uv-pick-color.vue           | 335 ++++++-------
 .../components/uv-picker/uv-picker.vue        | 470 ++++++++----------
 .../uv-popup/components/uv-popup/uv-popup.vue | 145 +++---
 uni_modules/uv-ui-tools/libs/mixin/popup.js   |  35 ++
 8 files changed, 577 insertions(+), 652 deletions(-)
 create mode 100644 uni_modules/uv-ui-tools/libs/mixin/popup.js

diff --git a/uni_modules/uv-action-sheet/components/uv-action-sheet/uv-action-sheet.vue b/uni_modules/uv-action-sheet/components/uv-action-sheet/uv-action-sheet.vue
index edca089..acdefa1 100644
--- a/uni_modules/uv-action-sheet/components/uv-action-sheet/uv-action-sheet.vue
+++ b/uni_modules/uv-action-sheet/components/uv-action-sheet/uv-action-sheet.vue
@@ -1,106 +1,53 @@
-
 <template>
-	<uv-popup
-	  ref="popup"
-	  mode="bottom"
-	  :safeAreaInsetBottom="safeAreaInsetBottom"
-	  :round="round"
-		:close-on-click-overlay="closeOnClickOverlay"
-		@change="popupChange"
-	>
+	<uv-popup ref="popup" mode="bottom" :safeAreaInsetBottom="safeAreaInsetBottom" :round="round"
+		:close-on-click-overlay="closeOnClickOverlay" @change="popupChange">
 		<view class="uv-action-sheet">
-			<view
-			  class="uv-action-sheet__header"
-			  v-if="title"
-			>
+			<view class="uv-action-sheet__header" v-if="title">
 				<text class="uv-action-sheet__header__title uv-line-1">{{title}}</text>
-				<view
-				  class="uv-action-sheet__header__icon-wrap"
-				  @tap.stop="cancel"
-				>
-					<uv-icon
-					  name="close"
-					  size="17"
-					  color="#c8c9cc"
-					  bold
-					></uv-icon>
+				<view class="uv-action-sheet__header__icon-wrap" @tap.stop="cancel">
+					<uv-icon name="close" size="17" color="#c8c9cc" bold></uv-icon>
 				</view>
 			</view>
-			<text
-			  class="uv-action-sheet__description"
-				:style="[{
+			<text class="uv-action-sheet__description" :style="[{
 					marginTop: `${title && description ? 0 : '18px'}`
-				}]"
-			  v-if="description"
-			>{{description}}</text>
+				}]" v-if="description">{{description}}</text>
 			<slot>
 				<uv-line v-if="description"></uv-line>
 				<view class="uv-action-sheet__item-wrap">
 					<view v-for="(item, index) in actions" :key="index">
 						<!-- #ifdef MP -->
-						<button
-						  class="uv-reset-button"
-						  :openType="item.openType"
-						  @getuserinfo="onGetUserInfo"
-						  @contact="onContact"
-						  @getphonenumber="onGetPhoneNumber"
-						  @error="onError"
-						  @launchapp="onLaunchApp"
-						  @opensetting="onOpenSetting"
-						  :lang="lang"
-						  :session-from="sessionFrom"
-						  :send-message-title="sendMessageTitle"
-						  :send-message-path="sendMessagePath"
-						  :send-message-img="sendMessageImg"
-						  :show-message-card="showMessageCard"
-						  :app-parameter="appParameter"
-						  @tap="selectHandler(index)"
-						  :hover-class="!item.disabled && !item.loading ? 'uv-action-sheet--hover' : ''"
-						>
-							<!-- #endif -->
-							<view
-							  class="uv-action-sheet__item-wrap__item"
-							  @tap.stop="selectHandler(index)"
-							  :hover-class="!item.disabled && !item.loading ? 'uv-action-sheet--hover' : ''"
-							  :hover-stay-time="150"
-							>
+						<button class="uv-reset-button" :openType="item.openType" @getuserinfo="onGetUserInfo"
+							@contact="onContact" @getphonenumber="onGetPhoneNumber" @error="onError"
+							@launchapp="onLaunchApp" @opensetting="onOpenSetting" :lang="lang"
+							:session-from="sessionFrom" :send-message-title="sendMessageTitle"
+							:send-message-path="sendMessagePath" :send-message-img="sendMessageImg"
+							:show-message-card="showMessageCard" :app-parameter="appParameter"
+							@tap="selectHandler(index)"
+							:hover-class="!item.disabled && !item.loading ? 'uv-action-sheet--hover' : ''">
+						<!-- #endif -->
+							<view class="uv-action-sheet__item-wrap__item" @tap.stop="selectHandler(index)"
+								:hover-class="!item.disabled && !item.loading ? 'uv-action-sheet--hover' : ''"
+								:hover-stay-time="150">
 								<template v-if="!item.loading">
-									<text
-									  class="uv-action-sheet__item-wrap__item__name"
-									  :style="[itemStyle(index)]"
-									>{{ item.name }}</text>
-									<text
-									  v-if="item.subname"
-									  class="uv-action-sheet__item-wrap__item__subname"
-									>{{ item.subname }}</text>
+									<text class="uv-action-sheet__item-wrap__item__name"
+										:style="[itemStyle(index)]">{{ item.name }}</text>
+									<text v-if="item.subname"
+										class="uv-action-sheet__item-wrap__item__subname">{{ item.subname }}</text>
 								</template>
-								<uv-loading-icon
-								  v-else
-								  custom-class="van-action-sheet__loading"
-								  size="18"
-								  mode="circle"
-								/>
+								<uv-loading-icon v-else custom-class="van-action-sheet__loading" size="18"
+									mode="circle" />
 							</view>
-							<!-- #ifdef MP -->
+						<!-- #ifdef MP -->
 						</button>
 						<!-- #endif -->
 						<uv-line v-if="index !== actions.length - 1"></uv-line>
 					</view>
 				</view>
 			</slot>
-			<uv-gap
-			  bgColor="#eaeaec"
-			  height="6"
-			  v-if="cancelText"
-			></uv-gap>
+			<uv-gap bgColor="#eaeaec" height="6" v-if="cancelText"></uv-gap>
 			<view hover-class="uv-action-sheet--hover">
-				<text
-				  @touchmove.stop.prevent
-				  :hover-stay-time="150"
-				  v-if="cancelText"
-				  class="uv-action-sheet__cancel-text"
-				  @tap="cancel"
-				>{{cancelText}}</text>
+				<text @touchmove.stop.prevent :hover-stay-time="150" v-if="cancelText"
+					class="uv-action-sheet__cancel-text" @tap="cancel">{{cancelText}}</text>
 			</view>
 		</view>
 	</uv-popup>
@@ -143,9 +90,11 @@
 	 * @event {Function} opensetting	在打开授权设置页后回调，openType="openSetting"时有效
 	 * @example <uv-action-sheet ref="actionSheet" :actions="list" :title="title" ></uv-action-sheet>
 	 */
+
+	import popup from '@/uni_modules/uv-ui-tools/libs/mixin/popup.js'
 	export default {
 		name: "uv-action-sheet",
-		mixins: [openType, button, mpMixin , mixin, props],
+		mixins: [openType, button, mpMixin, mixin, props, popup()],
 		emits: ['close', 'select'],
 		computed: {
 			// 操作项目的样式
@@ -167,9 +116,6 @@
 			close() {
 				this.$refs.popup.close();
 			},
-			popupChange(e) {
-				if(!e.show) this.$emit('close');
-			},
 			// 点击取消按钮
 			cancel() {
 				this.close();
@@ -193,24 +139,24 @@
 	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
-	$uv-action-sheet-reset-button-width:100% !default;
+	$uv-action-sheet-reset-button-width: 100% !default;
 	$uv-action-sheet-title-font-size: 16px !default;
 	$uv-action-sheet-title-padding: 12px 30px !default;
 	$uv-action-sheet-title-color: $uv-main-color !default;
-	$uv-action-sheet-header-icon-wrap-right:15px !default;
-	$uv-action-sheet-header-icon-wrap-top:15px !default;
-	$uv-action-sheet-description-font-size:13px !default;
-	$uv-action-sheet-description-color:14px !default;
+	$uv-action-sheet-header-icon-wrap-right: 15px !default;
+	$uv-action-sheet-header-icon-wrap-top: 15px !default;
+	$uv-action-sheet-description-font-size: 13px !default;
+	$uv-action-sheet-description-color: 14px !default;
 	$uv-action-sheet-description-margin: 18px 15px !default;
-	$uv-action-sheet-item-wrap-item-padding:15px !default;
-	$uv-action-sheet-item-wrap-name-font-size:16px !default;
-	$uv-action-sheet-item-wrap-subname-font-size:13px !default;
+	$uv-action-sheet-item-wrap-item-padding: 15px !default;
+	$uv-action-sheet-item-wrap-name-font-size: 16px !default;
+	$uv-action-sheet-item-wrap-subname-font-size: 13px !default;
 	$uv-action-sheet-item-wrap-subname-color: #c0c4cc !default;
-	$uv-action-sheet-item-wrap-subname-margin-top:10px !default;
-	$uv-action-sheet-cancel-text-font-size:16px !default;
-	$uv-action-sheet-cancel-text-color:$uv-content-color !default;
-	$uv-action-sheet-cancel-text-font-size:15px !default;
-	$uv-action-sheet-cancel-text-hover-background-color:rgb(242, 243, 245) !default;
+	$uv-action-sheet-item-wrap-subname-margin-top: 10px !default;
+	$uv-action-sheet-cancel-text-font-size: 16px !default;
+	$uv-action-sheet-cancel-text-color: $uv-content-color !default;
+	$uv-action-sheet-cancel-text-font-size: 15px !default;
+	$uv-action-sheet-cancel-text-hover-background-color: rgb(242, 243, 245) !default;
 
 	.uv-reset-button {
 		width: $uv-action-sheet-reset-button-width;
@@ -218,9 +164,11 @@
 
 	.uv-action-sheet {
 		text-align: center;
+
 		&__header {
 			position: relative;
 			padding: $uv-action-sheet-title-padding;
+
 			&__title {
 				font-size: $uv-action-sheet-title-font-size;
 				color: $uv-action-sheet-title-color;
@@ -277,4 +225,4 @@
 			background-color: $uv-action-sheet-cancel-text-hover-background-color;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/uni_modules/uv-calendars/components/uv-calendars/uv-calendars.vue b/uni_modules/uv-calendars/components/uv-calendars/uv-calendars.vue
index 80cd1c3..2ee3001 100644
--- a/uni_modules/uv-calendars/components/uv-calendars/uv-calendars.vue
+++ b/uni_modules/uv-calendars/components/uv-calendars/uv-calendars.vue
@@ -56,6 +56,9 @@
 	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js';
 	import Calendar from './util.js';
 	import calendarBody from './calendar-body.vue';
+	import popup from '@/uni_modules/uv-ui-tools/libs/mixin/popup.js'
+
+
 	import {
 		initVueI18n
 	} from '@dcloudio/uni-i18n';
@@ -68,7 +71,7 @@
 		components: {
 			calendarBody
 		},
-		mixins: [mpMixin, mixin],
+		mixins: [mpMixin, mixin,popup()],
 		emits: ['close', 'confirm', 'change', 'monthSwitch'],
 		props: {
 			// 取消按钮颜色
diff --git a/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue b/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue
index 61b4381..4c4d930 100644
--- a/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue
+++ b/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue
@@ -1,24 +1,9 @@
 <template>
-	<uv-picker
-		ref="picker"
-		:closeOnClickOverlay="closeOnClickOverlay"
-		:closeOnClickConfirm="closeOnClickConfirm"
-		:columns="columns"
-		:title="title"
-		:itemHeight="itemHeight"
-		:showToolbar="showToolbar"
-		:visibleItemCount="visibleItemCount"
-		:defaultIndex="innerDefaultIndex"
-		:cancelText="cancelText"
-		:confirmText="confirmText"
-		:cancelColor="cancelColor"
-		:confirmColor="confirmColor"
-		:round="round"
-		@close="close"
-		@cancel="cancel"
-		@confirm="confirm"
-		@change="change"
-	>
+	<uv-picker ref="picker" :closeOnClickOverlay="closeOnClickOverlay" :closeOnClickConfirm="closeOnClickConfirm"
+		:columns="columns" :title="title" :itemHeight="itemHeight" :showToolbar="showToolbar"
+		:visibleItemCount="visibleItemCount" :defaultIndex="innerDefaultIndex" :cancelText="cancelText"
+		:confirmText="confirmText" :cancelColor="cancelColor" :confirmColor="confirmColor" :round="round" @close="close"
+		@cancel="cancel" @confirm="confirm" @change="change">
 	</uv-picker>
 </template>
 <script>
@@ -65,10 +50,13 @@
 	 * @event {Function} cancel 点击取消按钮
 	 * @example  <uv-datetime-picker ref="datetimepicker" :value="value1"  mode="datetime" ></uv-datetime-picker>
 	 */
+	import popup from '@/uni_modules/uv-ui-tools/libs/mixin/popup.js'
+
+
 	export default {
 		name: 'uv-datetime-picker',
 		emits: ['close', 'cancel', 'confirm', 'input', 'change', 'update:modelValue'],
-		mixins: [mpMixin, mixin, props],
+		mixins: [mpMixin, mixin, props, popup()],
 		data() {
 			return {
 				columns: [],
@@ -85,7 +73,9 @@
 			// 如果以下这些变量发生了变化，意味着需要重新初始化各列的值
 			propsChange() {
 				const propsValue = this.value || this.modelValue;
-				return [this.mode, this.maxDate, this.minDate, this.minHour, this.maxHour, this.minMinute, this.maxMinute, this.filter, propsValue]
+				return [this.mode, this.maxDate, this.minDate, this.minHour, this.maxHour, this.minMinute, this.maxMinute,
+					this.filter, propsValue
+				]
 			}
 		},
 		mounted() {
@@ -107,10 +97,10 @@
 			open() {
 				this.$refs.picker.open();
 				// 解决打开的前一次和当前日期错乱的BUG
-				setTimeout(()=>{
+				setTimeout(() => {
 					this.getValue();
 					this.updateColumnValue(this.innerValue);
-				},10)
+				}, 10)
 			},
 			close() {
 				this.$emit('close');
@@ -125,7 +115,7 @@
 					value: this.innerValue,
 					mode: this.mode
 				})
-				if(!this.clearDate) {
+				if (!this.clearDate) {
 					this.$emit('input', this.innerValue)
 					this.$emit('update:modelValue', this.innerValue)
 				}
@@ -148,7 +138,10 @@
 			},
 			// 列发生变化时触发
 			change(e) {
-				const { indexs, values } = e
+				const {
+					indexs,
+					values
+				} = e
 				let selectValue = ''
 				if (this.mode === 'time') {
 					// 根据value各列索引，从各列数组中，取出当前时间的选中值
@@ -216,7 +209,9 @@
 					}
 					if (this.mode === 'datetime') {
 						// 数组的push方法，可以写入多个参数
-						values.push(formatter('day', this.$uv.padZero(dayjs(value).date())), formatter('hour', this.$uv.padZero(dayjs(value).hour())), formatter('minute', this.$uv.padZero(dayjs(value).minute())))
+						values.push(formatter('day', this.$uv.padZero(dayjs(value).date())), formatter('hour', this.$uv
+							.padZero(dayjs(value).hour())), formatter('minute', this.$uv.padZero(dayjs(value)
+							.minute())))
 					}
 				}
 				// 根据当前各列的所有值，从各列默认值中找到默认值在各列中的索引
@@ -224,9 +219,9 @@
 					// 通过取大值，可以保证不会出现找不到索引的-1情况
 					return Math.max(0, column.findIndex(item => item === values[index]))
 				})
-				this.$nextTick(()=>{
-					this.$uv.sleep(100).then(res=>{
-						this.$refs.picker.setIndexs(indexs,true);
+				this.$nextTick(() => {
+					this.$uv.sleep(100).then(res => {
+						this.$refs.picker.setIndexs(indexs, true);
 					})
 				})
 			},
@@ -234,12 +229,16 @@
 			updateColumns() {
 				const formatter = this.formatter || this.innerFormatter
 				// 获取各列的值，并且map后，对各列的具体值进行补0操作
-				const results = this.getOriginColumns().map((column) => column.values.map((value) => formatter(column.type, value)))
+				const results = this.getOriginColumns().map((column) => column.values.map((value) => formatter(column.type,
+					value)))
 				this.columns = results
 			},
 			getOriginColumns() {
 				// 生成各列的值
-				const results = this.getRanges().map(({ type, range }) => {
+				const results = this.getRanges().map(({
+					type,
+					range
+				}) => {
 					let values = times(range[1] - range[0] + 1, (index) => {
 						let value = range[0] + index
 						value = type === 'year' ? `${value}` : this.$uv.padZero(value)
@@ -249,7 +248,10 @@
 					if (this.filter) {
 						values = this.filter(type, values)
 					}
-					return { type, values }
+					return {
+						type,
+						values
+					}
 				})
 				return results
 			},
@@ -293,8 +295,20 @@
 						range: [this.minMinute, this.maxMinute],
 					}, ];
 				}
-				const { maxYear, maxDate, maxMonth, maxHour, maxMinute, } = this.getBoundary('max', this.innerValue);
-				const { minYear, minDate, minMonth, minHour, minMinute, } = this.getBoundary('min', this.innerValue);
+				const {
+					maxYear,
+					maxDate,
+					maxMonth,
+					maxHour,
+					maxMinute,
+				} = this.getBoundary('max', this.innerValue);
+				const {
+					minYear,
+					minDate,
+					minMonth,
+					minHour,
+					minMinute,
+				} = this.getBoundary('min', this.innerValue);
 				const result = [{
 					type: 'year',
 					range: [minYear, maxYear],
diff --git a/uni_modules/uv-modal/components/uv-modal/uv-modal.vue b/uni_modules/uv-modal/components/uv-modal/uv-modal.vue
index 4577b99..5e373f3 100644
--- a/uni_modules/uv-modal/components/uv-modal/uv-modal.vue
+++ b/uni_modules/uv-modal/components/uv-modal/uv-modal.vue
@@ -123,9 +123,10 @@
 	 * @event {Function} close		点击遮罩关闭出发，closeOnClickOverlay为true有效
 	 * @example <uv-modal ref="modalPopup" title="title" content="content"></uv-modal>
 	 */
+	import popup from '@/uni_modules/uv-ui-tools/libs/mixin/popup.js'
 	export default {
 		name: 'uv-modal',
-		mixins: [mpMixin, mixin, props],
+		mixins: [mpMixin, mixin, props,popup()],
 		data() {
 			return {
 				loading: false
@@ -149,9 +150,7 @@
 			close() {
 				this.$refs.modalPopup.close();
 			},
-			popupChange(e) {
-				if(!e.show) this.$emit('close');
-			},
+	
 			// 点击确定按钮
 			confirmHandler() {
 				if(!this.loading) {
diff --git a/uni_modules/uv-pick-color/components/uv-pick-color/uv-pick-color.vue b/uni_modules/uv-pick-color/components/uv-pick-color/uv-pick-color.vue
index f283a92..c9b8ebb 100644
--- a/uni_modules/uv-pick-color/components/uv-pick-color/uv-pick-color.vue
+++ b/uni_modules/uv-pick-color/components/uv-pick-color/uv-pick-color.vue
@@ -1,181 +1,125 @@
 <template>
 	<!-- #ifndef APP-NVUE -->
-	<uv-popup 
-		ref="pickerColorPopup"
-		mode="bottom"
-		:close-on-click-overlay="closeOnClickOverlay"
-		@change="popupChange">
+	<uv-popup ref="pickerColorPopup" mode="bottom" :close-on-click-overlay="closeOnClickOverlay" @change="popupChange">
 		<view class="uv-pick-color">
-			<uv-toolbar
-				:show="showToolbar"
-				:cancelColor="cancelColor"
-				:confirmColor="confirmColor"
-				:cancelText="cancelText"
-				:confirmText="confirmText"
-				:title="title"
-				:show-border="true"
-				@cancel="cancelHandler"
-				@confirm="confirmHandler"></uv-toolbar>
-			<view 
-				class="uv-pick-color__box"
-				:style="{
+			<uv-toolbar :show="showToolbar" :cancelColor="cancelColor" :confirmColor="confirmColor"
+				:cancelText="cancelText" :confirmText="confirmText" :title="title" :show-border="true"
+				@cancel="cancelHandler" @confirm="confirmHandler"></uv-toolbar>
+			<view class="uv-pick-color__box" :style="{
 					background:`rgb(${bgcolor.r},${bgcolor.g},${bgcolor.b})`
-				}"
-			>
+				}">
 				<!-- #ifdef H5 -->
-				<view
-					class="uv-pick-color__box__bg drag-box"
-					@tap.stop.prevent="touchstart($event, 0)"
-					@touchstart.stop.prevent="touchstart($event, 0)"
-					@touchmove.stop.prevent="touchmove($event, 0)"
-					@touchend.stop.prevent="touchend($event, 0)"
-				>
+				<view class="uv-pick-color__box__bg drag-box" @tap.stop.prevent="touchstart($event, 0)"
+					@touchstart.stop.prevent="touchstart($event, 0)" @touchmove.stop.prevent="touchmove($event, 0)"
+					@touchend.stop.prevent="touchend($event, 0)">
 				<!-- #endif -->
-				<!-- #ifndef H5 -->
-				<view
-					class="uv-pick-color__box__bg drag-box"
-					@touchstart.stop.prevent="touchstart($event, 0)"
-					@touchmove.stop.prevent="touchmove($event, 0)"
-					@touchend.stop.prevent="touchend($event, 0)"
-				>
-				<!-- #endif -->
-					<view class="uv-pick-color__box__bg-mask"></view>
-					<view 
-						class="uv-pick-color__box__bg-pointer"
-						:style="[pointerStyle]"
-					>
-					</view>
-				</view>
-			</view>
-			<view class="uv-pick-color__control">
-				<view class="uv-pick-color__control__alpha">
-					<view 
-						class="uv-pick-color__control__alpha--color"
-						:style="{ background:`rgba(${rgba.r},${rgba.g},${rgba.b},${rgba.a})` }"
-					></view>
-				</view>
-				<view class="uv-pick-color__control__item">
-					<!-- #ifdef H5 -->
-					<view
-						class="uv-pick-color__control__item__drag drag-box"
-						@tap.stop="touchstart($event, 1)"
-						@touchstart.stop="touchstart($event, 1)"
-						@touchmove.stop="touchmove($event, 1)"
-						@touchend.stop="touchend($event, 1)"
-					>
-					<!-- #endif -->
 					<!-- #ifndef H5 -->
-					<view
-						class="uv-pick-color__control__item__drag drag-box"
-						@touchstart.stop="touchstart($event, 1)"
-						@touchmove.stop="touchmove($event, 1)"
-						@touchend.stop="touchend($event, 1)"
-					>
-					<!-- #endif -->
-						<view class="uv-pick-color__control__item__drag--hue"></view>
-						<view 
-							class="uv-pick-color__control__item__drag--circle"
-							:style="{ 
-								left: $uv.getPx(site[1].left - 10,true)
-							}"
-						></view>
-					</view>
-					<!-- #ifdef H5 -->
-					<view
-						class="uv-pick-color__control__item__drag drag-box"
-						@tap.stop="touchstart($event, 2)"
-						@touchstart.stop="touchstart($event, 2)"
-						@touchmove.stop="touchmove($event, 2)"
-						@touchend.stop="touchend($event, 2)"
-					>
+					<view class="uv-pick-color__box__bg drag-box" @touchstart.stop.prevent="touchstart($event, 0)"
+						@touchmove.stop.prevent="touchmove($event, 0)" @touchend.stop.prevent="touchend($event, 0)">
 					<!-- #endif -->
-					<!-- #ifndef H5 -->
-					<view
-						class="uv-pick-color__control__item__drag drag-box"
-						@touchstart.stop="touchstart($event, 2)"
-						@touchmove.stop="touchmove($event, 2)"
-						@touchend.stop="touchend($event, 2)"
-					>
-					<!-- #endif -->
-						<view class="uv-pick-color__control__item__drag--alpha"></view>
-						<view 
-							class="uv-pick-color__control__item__drag--circle"
-							:style="{ 
-								left: $uv.getPx(site[2].left - 10,true)
-							}"
-						></view>
-					</view>
-				</view>
-			</view>
-			<view class="uv-pick-color__result">
-				<view 
-					class="uv-pick-color__result__select"
-					hover-class="uv-hover-class"
-					@click.stop="select"
-				>
-					<text class="text">切换</text>
-					<text class="text">模式</text>
-				</view>
-				<view class="uv-pick-color__result__item" v-if="mode">
-					<view class="uv-pick-color__result__item--value uv-border">
-						<text>{{hex}}</text>
-					</view>
-					<view class="uv-pick-color__result__item--hex">
-						<text>HEX</text>
-					</view>
-				</view>
-				<template v-else>
-					<view class="uv-pick-color__result__item">
-						<view class="uv-pick-color__result__item--value uv-border">
-							<text>{{rgba.r}}</text>
-						</view>
-						<view class="uv-pick-color__result__item--rgba">
-							<text>R</text>
+						<view class="uv-pick-color__box__bg-mask"></view>
+						<view class="uv-pick-color__box__bg-pointer" :style="[pointerStyle]">
 						</view>
 					</view>
-					<view class="uv-pick-color__result__gap"></view>
-					<view class="uv-pick-color__result__item">
-						<view class="uv-pick-color__result__item--value uv-border">
-							<text>{{rgba.g}}</text>
-						</view>
-						<view class="uv-pick-color__result__item--rgba">
-							<text>G</text>
-						</view>
+				</view>
+				<view class="uv-pick-color__control">
+					<view class="uv-pick-color__control__alpha">
+						<view class="uv-pick-color__control__alpha--color"
+							:style="{ background:`rgba(${rgba.r},${rgba.g},${rgba.b},${rgba.a})` }"></view>
 					</view>
-					<view class="uv-pick-color__result__gap"></view>
-					<view class="uv-pick-color__result__item">
-						<view class="uv-pick-color__result__item--value uv-border">
-							<text>{{rgba.b}}</text>
-						</view>
-						<view class="uv-pick-color__result__item--rgba">
-							<text>B</text>
+					<view class="uv-pick-color__control__item">
+						<!-- #ifdef H5 -->
+						<view class="uv-pick-color__control__item__drag drag-box" @tap.stop="touchstart($event, 1)"
+							@touchstart.stop="touchstart($event, 1)" @touchmove.stop="touchmove($event, 1)"
+							@touchend.stop="touchend($event, 1)">
+						<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<view class="uv-pick-color__control__item__drag drag-box"
+								@touchstart.stop="touchstart($event, 1)" @touchmove.stop="touchmove($event, 1)"
+								@touchend.stop="touchend($event, 1)">
+							<!-- #endif -->
+								<view class="uv-pick-color__control__item__drag--hue"></view>
+								<view class="uv-pick-color__control__item__drag--circle" :style="{ 
+								left: $uv.getPx(site[1].left - 10,true)
+							}"></view>
+							</view>
+							<!-- #ifdef H5 -->
+							<view class="uv-pick-color__control__item__drag drag-box" @tap.stop="touchstart($event, 2)"
+								@touchstart.stop="touchstart($event, 2)" @touchmove.stop="touchmove($event, 2)"
+								@touchend.stop="touchend($event, 2)">
+							<!-- #endif -->
+								<!-- #ifndef H5 -->
+								<view class="uv-pick-color__control__item__drag drag-box"
+									@touchstart.stop="touchstart($event, 2)" @touchmove.stop="touchmove($event, 2)"
+									@touchend.stop="touchend($event, 2)">
+								<!-- #endif -->
+									<view class="uv-pick-color__control__item__drag--alpha"></view>
+									<view class="uv-pick-color__control__item__drag--circle" :style="{ 
+								left: $uv.getPx(site[2].left - 10,true)
+							}"></view>
+								</view>
+							</view>
 						</view>
-					</view>
-					<view class="uv-pick-color__result__gap"></view>
-					<view class="uv-pick-color__result__item">
-						<view class="uv-pick-color__result__item--value uv-border">
-							<text>{{rgba.a}}</text>
+						<view class="uv-pick-color__result">
+							<view class="uv-pick-color__result__select" hover-class="uv-hover-class"
+								@click.stop="select">
+								<text class="text">切换</text>
+								<text class="text">模式</text>
+							</view>
+							<view class="uv-pick-color__result__item" v-if="mode">
+								<view class="uv-pick-color__result__item--value uv-border">
+									<text>{{hex}}</text>
+								</view>
+								<view class="uv-pick-color__result__item--hex">
+									<text>HEX</text>
+								</view>
+							</view>
+							<template v-else>
+								<view class="uv-pick-color__result__item">
+									<view class="uv-pick-color__result__item--value uv-border">
+										<text>{{rgba.r}}</text>
+									</view>
+									<view class="uv-pick-color__result__item--rgba">
+										<text>R</text>
+									</view>
+								</view>
+								<view class="uv-pick-color__result__gap"></view>
+								<view class="uv-pick-color__result__item">
+									<view class="uv-pick-color__result__item--value uv-border">
+										<text>{{rgba.g}}</text>
+									</view>
+									<view class="uv-pick-color__result__item--rgba">
+										<text>G</text>
+									</view>
+								</view>
+								<view class="uv-pick-color__result__gap"></view>
+								<view class="uv-pick-color__result__item">
+									<view class="uv-pick-color__result__item--value uv-border">
+										<text>{{rgba.b}}</text>
+									</view>
+									<view class="uv-pick-color__result__item--rgba">
+										<text>B</text>
+									</view>
+								</view>
+								<view class="uv-pick-color__result__gap"></view>
+								<view class="uv-pick-color__result__item">
+									<view class="uv-pick-color__result__item--value uv-border">
+										<text>{{rgba.a}}</text>
+									</view>
+									<view class="uv-pick-color__result__item--rgba">
+										<text>A</text>
+									</view>
+								</view>
+							</template>
 						</view>
-						<view class="uv-pick-color__result__item--rgba">
-							<text>A</text>
+						<view class="uv-pick-color__prefab">
+							<view class="uv-pick-color__prefab__item" v-for="(item,index) in colorList" :key="index">
+								<view class="uv-pick-color__prefab__item--color"
+									:style="{ background:`rgba(${item.r},${item.g},${item.b},${item.a})` }"
+									@click.stop="setColorBySelect(item)"></view>
+							</view>
 						</view>
 					</view>
-				</template>
-			</view>
-			<view class="uv-pick-color__prefab">
-				<view 
-					class="uv-pick-color__prefab__item"
-					v-for="(item,index) in colorList"
-					:key="index"
-				>
-					<view 
-						class="uv-pick-color__prefab__item--color"
-						:style="{ background:`rgba(${item.r},${item.g},${item.b},${item.a})` }"
-						@click.stop="setColorBySelect(item)"
-					></view>
-				</view>
-			</view>
-		</view>
 	</uv-popup>
 	<!-- #endif -->
 	<!-- #ifdef APP-NVUE -->
@@ -187,12 +131,18 @@
 <script>
 	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js';
 	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js';
-	import { rgbToHsb, hsbToRgb, rgbToHex, colorList } from './colors.js';
+	import {
+		rgbToHsb,
+		hsbToRgb,
+		rgbToHex,
+		colorList
+	} from './colors.js';
 	import props from './props.js';
+	import popup from '@/uni_modules/uv-ui-tools/libs/mixin/popup.js'
 	export default {
 		name: 'uv-pick-color',
 		emits: ['confirm', 'cancel', 'close', 'change'],
-		mixins: [mpMixin, mixin, props],
+		mixins: [mpMixin, mixin, props, popup()],
 		computed: {
 			pointerStyle() {
 				const style = {};
@@ -261,9 +211,6 @@
 			close() {
 				this.$refs.pickerColorPopup.close();
 			},
-			popupChange(e) {
-				if(!e.show) this.$emit('close');
-			},
 			// 点击工具栏的取消按钮
 			cancelHandler() {
 				this.$emit('cancel');
@@ -284,7 +231,7 @@
 				this.setValue(this.rgba);
 			},
 			async getSelectorQuery() {
-				const data = await this.$uvGetRect('.drag-box',true);
+				const data = await this.$uvGetRect('.drag-box', true);
 				this.position = data;
 				this.setColorBySelect(this.rgba);
 			},
@@ -293,13 +240,19 @@
 				this.mode = !this.mode;
 			},
 			touchstart(e, index) {
-				const { clientX, clientY } = e.touches[0];
+				const {
+					clientX,
+					clientY
+				} = e.touches[0];
 				this.pageX = clientX;
 				this.pageY = clientY;
 				this.setPosition(clientX, clientY, index);
 			},
 			touchmove(e, index) {
-				const { clientX, clientY } = e.touches[0];
+				const {
+					clientX,
+					clientY
+				} = e.touches[0];
 				this.moveX = clientX;
 				this.moveY = clientY;
 				this.setPosition(clientX, clientY, index);
@@ -310,7 +263,12 @@
 			 */
 			setPosition(x, y, index) {
 				this.index = index;
-				const { top, left, width, height } = this.position[index];
+				const {
+					top,
+					left,
+					width,
+					height
+				} = this.position[index];
 				// 设置最大最小值
 				this.site[index].left = Math.max(0, Math.min(parseInt(x - left), width));
 				if (index === 0) {
@@ -362,7 +320,12 @@
 				this.setValue(this.rgba);
 			},
 			setColorBySelect(getrgb) {
-				const { r, g, b, a } = getrgb;
+				const {
+					r,
+					g,
+					b,
+					a
+				} = getrgb;
 				let rgb = {};
 				rgb = {
 					r: r ? parseInt(r) : 0,
@@ -396,6 +359,7 @@
 	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
 	$height: 400rpx;
+
 	/* #ifndef APP-NVUE */
 	.uv-pick-color {
 		&__box {
@@ -403,6 +367,7 @@
 			height: $height;
 			background: rgb(255, 0, 0);
 			margin: 20rpx;
+
 			&__bg {
 				position: absolute;
 				top: 0;
@@ -410,6 +375,7 @@
 				right: 0;
 				bottom: 0;
 				background: linear-gradient(to right, #fff, rgba(255, 255, 255, 0));
+
 				&-mask {
 					position: absolute;
 					top: 0;
@@ -419,6 +385,7 @@
 					height: $height;
 					background: linear-gradient(to top, #000, rgba(0, 0, 0, 0));
 				}
+
 				&-pointer {
 					position: absolute;
 					top: -8px;
@@ -431,24 +398,28 @@
 				}
 			}
 		}
+
 		&__control {
 			@include flex;
 			padding: 10rpx 20rpx;
+
 			&__alpha {
 				width: 100rpx;
 				height: 100rpx;
 				border-radius: 50rpx;
 				background-color: #fff;
-				background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+				background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee), linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
 				background-size: 36rpx 36rpx;
 				background-position: 0 0, 18rpx 18rpx;
 				border: 1px #eee solid;
 				overflow: hidden;
+
 				&--color {
 					width: 100%;
 					height: 100%;
 				}
 			}
+
 			&__item {
 				flex: 1;
 				@include flex(column);
@@ -456,24 +427,28 @@
 				height: 100rpx;
 				padding: 6rpx 0 6rpx 30rpx;
 			}
+
 			&__item__drag {
 				position: relative;
 				height: 16px;
 				background-color: #fff;
 				background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),
-				linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+					linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
 				background-size: 32rpx 32rpx;
 				background-position: 0 0, 16rpx 16rpx;
+
 				&--hue {
 					width: 100%;
 					height: 100%;
 					background: linear-gradient(to right, #f00 0%, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%);
 				}
+
 				&--alpha {
 					width: 100%;
 					height: 100%;
 					background: linear-gradient(to right, rgba(0, 0, 0, 0) 0%, rgb(0, 0, 0));
 				}
+
 				&--circle {
 					position: absolute;
 					top: -2px;
@@ -486,10 +461,12 @@
 				}
 			}
 		}
+
 		&__result {
 			@include flex;
 			padding: 20rpx;
 			text-align: center;
+
 			&__select {
 				@include flex(column);
 				justify-content: center;
@@ -501,9 +478,11 @@
 				font-size: 14px;
 				color: #999;
 			}
+
 			&__item {
 				flex: 1;
 				height: 100rpx;
+
 				&--value {
 					height: 50rpx;
 					line-height: 50rpx;
@@ -511,6 +490,7 @@
 					font-size: 28rpx;
 					color: #999;
 				}
+
 				&--hex,
 				&--rgba {
 					height: 50rpx;
@@ -518,16 +498,19 @@
 					font-size: 30rpx;
 				}
 			}
+
 			&__gap {
 				width: 10px;
 				height: 10px;
 			}
 		}
+
 		&__prefab {
 			@include flex;
 			margin: 0 -8rpx;
 			padding: 0 20rpx 20rpx;
 			flex-wrap: wrap;
+
 			&__item {
 				width: 50rpx;
 				height: 50rpx;
@@ -539,6 +522,7 @@
 				background-size: 36rpx 36rpx;
 				background-position: 0 0, 18rpx 18rpx;
 				border: 1px #eee solid;
+
 				&--color {
 					width: 100%;
 					height: 100%;
@@ -547,5 +531,6 @@
 			}
 		}
 	}
+
 	/* #endif */
 </style>
\ No newline at end of file
diff --git a/uni_modules/uv-picker/components/uv-picker/uv-picker.vue b/uni_modules/uv-picker/components/uv-picker/uv-picker.vue
index c5e7c8a..8a68096 100644
--- a/uni_modules/uv-picker/components/uv-picker/uv-picker.vue
+++ b/uni_modules/uv-picker/components/uv-picker/uv-picker.vue
@@ -1,281 +1,244 @@
 <template>
-	<uv-popup
-		ref="pickerPopup"
-		mode="bottom"
-		:round="round"
-		:close-on-click-overlay="closeOnClickOverlay"
-		@change="popupChange"
-	>
+	<uv-popup ref="pickerPopup" mode="bottom" :round="round" :close-on-click-overlay="closeOnClickOverlay"
+		@change="popupChange">
 		<view class="uv-picker">
-			<uv-toolbar
-				v-if="showToolbar"
-				:cancelColor="cancelColor"
-				:confirmColor="confirmColor"
-				:cancelText="cancelText"
-				:confirmText="confirmText"
-				:title="title"
-				@cancel="cancel"
-				@confirm="confirm"
-			></uv-toolbar>
+			<uv-toolbar v-if="showToolbar" :cancelColor="cancelColor" :confirmColor="confirmColor"
+				:cancelText="cancelText" :confirmText="confirmText" :title="title" @cancel="cancel"
+				@confirm="confirm"></uv-toolbar>
 			<!-- #ifdef MP-TOUTIAO -->
-			<picker-view
-				class="uv-picker__view"
-				:indicatorStyle="`height: ${$uv.addUnit(itemHeight)}`"
-				:value="innerIndex"
-				:immediateChange="immediateChange"
-				:style="{
+			<picker-view class="uv-picker__view" :indicatorStyle="`height: ${$uv.addUnit(itemHeight)}`"
+				:value="innerIndex" :immediateChange="immediateChange" :style="{
 					height: `${$uv.addUnit(visibleItemCount * itemHeight)}`
-				}"
-				@pickend="changeHandler"
-			>
+				}" @pickend="changeHandler">
 			<!-- #endif -->
-			<!-- #ifndef MP-TOUTIAO -->
-			<picker-view
-				class="uv-picker__view"
-				:indicatorStyle="`height: ${$uv.addUnit(itemHeight)}`"
-				:value="innerIndex"
-				:immediateChange="immediateChange"
-				:style="{
+				<!-- #ifndef MP-TOUTIAO -->
+				<picker-view class="uv-picker__view" :indicatorStyle="`height: ${$uv.addUnit(itemHeight)}`"
+					:value="innerIndex" :immediateChange="immediateChange" :style="{
 					height: `${$uv.addUnit(visibleItemCount * itemHeight)}`
-				}"
-				@change="changeHandler"
-			>
-			<!-- #endif -->
-			<!-- @pickend在这里为了解决抖音等滚到底不触发change兼容性问题 -->
-				<picker-view-column
-					v-for="(item, index) in innerColumns"
-					:key="index"
-					class="uv-picker__view__column"
-				>
-					<text
-						v-if="$uv.test.array(item)"
-						class="uv-picker__view__column__item uv-line-1"
-						v-for="(item1, index1) in item"
-						:key="index1"
-						:style="[{
+				}" @change="changeHandler">
+				<!-- #endif -->
+					<!-- @pickend在这里为了解决抖音等滚到底不触发change兼容性问题 -->
+					<picker-view-column v-for="(item, index) in innerColumns" :key="index"
+						class="uv-picker__view__column">
+						<text v-if="$uv.test.array(item)" class="uv-picker__view__column__item uv-line-1"
+							v-for="(item1, index1) in item" :key="index1" :style="[{
 								height: $uv.addUnit(itemHeight),
 								lineHeight: $uv.addUnit(itemHeight),
 								fontWeight: index1 === innerIndex[index] ? 'bold' : 'normal'
-							},textStyle(index,index1)]"
-					>{{ getItemText(item1) }}</text>
-				</picker-view-column>
-			</picker-view>
-			<view
-				v-if="loading"
-				class="uv-picker--loading"
-			>
-				<uv-loading-icon mode="circle"></uv-loading-icon>
-			</view>
+							},textStyle(index,index1)]">{{ getItemText(item1) }}</text>
+					</picker-view-column>
+				</picker-view>
+				<view v-if="loading" class="uv-picker--loading">
+					<uv-loading-icon mode="circle"></uv-loading-icon>
+				</view>
 		</view>
 	</uv-popup>
 </template>
 
 <script>
-/**
- * uv-picker
- * @description 选择器
- * @property {Boolean}			showToolbar			是否显示顶部的操作栏（默认 true ）
- * @property {String}			title				顶部标题
- * @property {Array}			columns				对象数组，设置每一列的数据
- * @property {Boolean}			loading				是否显示加载中状态（默认 false ）
- * @property {String | Number}	itemHeight			各列中，单个选项的高度（默认 44 ）
- * @property {String}			cancelText			取消按钮的文字（默认 '取消' ）
- * @property {String}			confirmText			确认按钮的文字（默认 '确定' ）
- * @property {String}			cancelColor			取消按钮的颜色（默认 '#909193' ）
- * @property {String}			confirmColor		确认按钮的颜色（默认 '#3c9cff' ）
- * @property {String}			color		文字颜色（默认 '' ）
- * @property {String}			activeColor		选中文字的颜色（默认 '' ）
- * @property {String | Number}	visibleItemCount	每列中可见选项的数量（默认 5 ）
- * @property {String}			keyName				选项对象中，需要展示的属性键名（默认 'text' ）
- * @property {Boolean}			closeOnClickOverlay	是否允许点击遮罩关闭选择器（默认 false ）
- * @property {Array}			defaultIndex		各列的默认索引
- * @property {Boolean}			immediateChange		是否在手指松开时立即触发change事件（默认 false ）
- * @event {Function} close		关闭选择器时触发
- * @event {Function} cancel		点击取消按钮触发
- * @event {Function} change		当选择值变化时触发
- * @event {Function} confirm	点击确定按钮，返回当前选择的值
- */
-import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
-import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
-import props from './props.js';
-export default {
-	name: 'uv-picker',
-	emits: ['confirm','cancel','close','change'],
-	mixins: [mpMixin, mixin, props],
-	computed: {
-		// 为了解决支付宝不生效
-		textStyle(){
-			return (index,index1) => {
-				const style = {};
-				// #ifndef APP-NVUE 
-				style.display = 'block';
-				// #endif
-				if(this.color) {
-					style.color = this.color;
-				}
-				if(this.activeColor && index1 === this.innerIndex[index]) {
-					style.color = this.activeColor;
+	/**
+	 * uv-picker
+	 * @description 选择器
+	 * @property {Boolean}			showToolbar			是否显示顶部的操作栏（默认 true ）
+	 * @property {String}			title				顶部标题
+	 * @property {Array}			columns				对象数组，设置每一列的数据
+	 * @property {Boolean}			loading				是否显示加载中状态（默认 false ）
+	 * @property {String | Number}	itemHeight			各列中，单个选项的高度（默认 44 ）
+	 * @property {String}			cancelText			取消按钮的文字（默认 '取消' ）
+	 * @property {String}			confirmText			确认按钮的文字（默认 '确定' ）
+	 * @property {String}			cancelColor			取消按钮的颜色（默认 '#909193' ）
+	 * @property {String}			confirmColor		确认按钮的颜色（默认 '#3c9cff' ）
+	 * @property {String}			color		文字颜色（默认 '' ）
+	 * @property {String}			activeColor		选中文字的颜色（默认 '' ）
+	 * @property {String | Number}	visibleItemCount	每列中可见选项的数量（默认 5 ）
+	 * @property {String}			keyName				选项对象中，需要展示的属性键名（默认 'text' ）
+	 * @property {Boolean}			closeOnClickOverlay	是否允许点击遮罩关闭选择器（默认 false ）
+	 * @property {Array}			defaultIndex		各列的默认索引
+	 * @property {Boolean}			immediateChange		是否在手指松开时立即触发change事件（默认 false ）
+	 * @event {Function} close		关闭选择器时触发
+	 * @event {Function} cancel		点击取消按钮触发
+	 * @event {Function} change		当选择值变化时触发
+	 * @event {Function} confirm	点击确定按钮，返回当前选择的值
+	 */
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	import props from './props.js';
+	import popup from '@/uni_modules/uv-ui-tools/libs/mixin/popup.js'
+	export default {
+		name: 'uv-picker',
+		emits: ['confirm', 'cancel', 'close', 'change'],
+		mixins: [mpMixin, mixin, props, popup()],
+		computed: {
+			// 为了解决支付宝不生效
+			textStyle() {
+				return (index, index1) => {
+					const style = {};
+					// #ifndef APP-NVUE 
+					style.display = 'block';
+					// #endif
+					if (this.color) {
+						style.color = this.color;
+					}
+					if (this.activeColor && index1 === this.innerIndex[index]) {
+						style.color = this.activeColor;
+					}
+					return style;
 				}
-				return style;
-			}
-		}
-	},
-	data() {
-		return {
-			// 上一次选择的列索引
-			lastIndex: [],
-			// 索引值 ，对应picker-view的value
-			innerIndex: [],
-			// 各列的值
-			innerColumns: [],
-			// 上一次的变化列索引
-			columnIndex: 0,
-		}
-	},
-	watch: {
-		// 监听默认索引的变化，重新设置对应的值
-		defaultIndex: {
-			immediate: true,
-			handler(n) {
-				this.setIndexs(n, true)
 			}
 		},
-		// 监听columns参数的变化
-		columns: {
-			deep: true,
-			immediate: true,
-			handler(n) {
-				this.setColumns(n)
+		data() {
+			return {
+				// 上一次选择的列索引
+				lastIndex: [],
+				// 索引值 ，对应picker-view的value
+				innerIndex: [],
+				// 各列的值
+				innerColumns: [],
+				// 上一次的变化列索引
+				columnIndex: 0,
 			}
 		},
-	},
-	methods: {
-		open() {
-			this.$refs.pickerPopup.open();
-		},
-		close() {
-			this.$refs.pickerPopup.close();
-		},
-		popupChange(e) {
-			if(!e.show) this.$emit('close');
-		},
-		// 获取item需要显示的文字，判别为对象还是文本
-		getItemText(item) {
-			if (this.$uv.test.object(item)) {
-				return item[this.keyName]
-			} else {
-				return item
-			}
-		},
-		// 点击工具栏的取消按钮
-		cancel() {
-			this.$emit('cancel');
-			this.close();
+		watch: {
+			// 监听默认索引的变化，重新设置对应的值
+			defaultIndex: {
+				immediate: true,
+				handler(n) {
+					this.setIndexs(n, true)
+				}
+			},
+			// 监听columns参数的变化
+			columns: {
+				deep: true,
+				immediate: true,
+				handler(n) {
+					this.setColumns(n)
+				}
+			},
 		},
-		// 点击工具栏的确定按钮
-		confirm() {
-			// 在这里使用deepClone拷贝后，vue3会自动转换成原始对象，这样处理是因为cli项目可能出现不返回值的情况
-			this.$emit('confirm', this.$uv.deepClone({
-				indexs: this.innerIndex,
-				value: this.innerColumns.map((item, index) => item[this.innerIndex[index]]),
-				values: this.innerColumns
-			}));
-			if(this.closeOnClickConfirm) {
+		methods: {
+			open() {
+				this.$refs.pickerPopup.open();
+			},
+			close() {
+				this.$refs.pickerPopup.close();
+			},
+			// 获取item需要显示的文字，判别为对象还是文本
+			getItemText(item) {
+				if (this.$uv.test.object(item)) {
+					return item[this.keyName]
+				} else {
+					return item
+				}
+			},
+			// 点击工具栏的取消按钮
+			cancel() {
+				this.$emit('cancel');
 				this.close();
-			}
-		},
-		// 选择器某一列的数据发生变化时触发
-		changeHandler(e) {
-			const {
-				value
-			} = e.detail
-			let index = 0,
-				columnIndex = 0
-			// 通过对比前后两次的列索引，得出当前变化的是哪一列
-			for (let i = 0; i < value.length; i++) {
-				let item = value[i]
-				if (item !== (this.lastIndex[i] || 0)) { // 把undefined转为合法假值0
-					// 设置columnIndex为当前变化列的索引
-					columnIndex = i
-					// index则为变化列中的变化项的索引
-					index = item
-					break // 终止循环，即使少一次循环，也是性能的提升
+			},
+			// 点击工具栏的确定按钮
+			confirm() {
+				// 在这里使用deepClone拷贝后，vue3会自动转换成原始对象，这样处理是因为cli项目可能出现不返回值的情况
+				this.$emit('confirm', this.$uv.deepClone({
+					indexs: this.innerIndex,
+					value: this.innerColumns.map((item, index) => item[this.innerIndex[index]]),
+					values: this.innerColumns
+				}));
+				if (this.closeOnClickConfirm) {
+					this.close();
 				}
-			}
-			this.columnIndex = columnIndex
-			const values = this.innerColumns
-			// 将当前的各项变化索引，设置为"上一次"的索引变化值
-			this.setLastIndex(value)
-			this.setIndexs(value)
+			},
+			// 选择器某一列的数据发生变化时触发
+			changeHandler(e) {
+				const {
+					value
+				} = e.detail
+				let index = 0,
+					columnIndex = 0
+				// 通过对比前后两次的列索引，得出当前变化的是哪一列
+				for (let i = 0; i < value.length; i++) {
+					let item = value[i]
+					if (item !== (this.lastIndex[i] || 0)) { // 把undefined转为合法假值0
+						// 设置columnIndex为当前变化列的索引
+						columnIndex = i
+						// index则为变化列中的变化项的索引
+						index = item
+						break // 终止循环，即使少一次循环，也是性能的提升
+					}
+				}
+				this.columnIndex = columnIndex
+				const values = this.innerColumns
+				// 将当前的各项变化索引，设置为"上一次"的索引变化值
+				this.setLastIndex(value)
+				this.setIndexs(value)
 
-			this.$emit('change', {
-				value: this.innerColumns.map((item, index) => item[value[index]]),
-				index,
-				indexs: value,
-				// values为当前变化列的数组内容
-				values,
-				columnIndex
-			})
-		},
-		// 设置index索引，此方法可被外部调用设置
-		setIndexs(index, setLastIndex) {
-			this.innerIndex = this.$uv.deepClone(index)
-			if (setLastIndex) {
-				this.setLastIndex(index)
-			}
-		},
-		// 记录上一次的各列索引位置
-		setLastIndex(index) {
-			// 当能进入此方法，意味着当前设置的各列默认索引，即为“上一次”的选中值，需要记录，是因为changeHandler中
-			// 需要拿前后的变化值进行对比，得出当前发生改变的是哪一列
-			this.lastIndex = this.$uv.deepClone(index)
-		},
-		// 设置对应列选项的所有值
-		setColumnValues(columnIndex, values) {
-			// 替换innerColumns数组中columnIndex索引的值为values，使用的是数组的splice方法
-			this.innerColumns.splice(columnIndex, 1, values)
-			// 拷贝一份原有的innerIndex做临时变量，将大于当前变化列的所有的列的默认索引设置为0
-			let tmpIndex = this.$uv.deepClone(this.innerIndex)
-			for (let i = 0; i < this.innerColumns.length; i++) {
-				if (i > this.columnIndex) {
-					tmpIndex[i] = 0
+				this.$emit('change', {
+					value: this.innerColumns.map((item, index) => item[value[index]]),
+					index,
+					indexs: value,
+					// values为当前变化列的数组内容
+					values,
+					columnIndex
+				})
+			},
+			// 设置index索引，此方法可被外部调用设置
+			setIndexs(index, setLastIndex) {
+				this.innerIndex = this.$uv.deepClone(index)
+				if (setLastIndex) {
+					this.setLastIndex(index)
 				}
-			}
-			// 一次性赋值，不能单个修改，否则无效
-			this.setIndexs(tmpIndex)
-		},
-		// 获取对应列的所有选项
-		getColumnValues(columnIndex) {
-			// 进行同步阻塞，因为外部得到change事件之后，可能需要执行setColumnValues更新列的值
-			// 索引如果在外部change的回调中调用getColumnValues的话，可能无法得到变更后的列值，这里进行一定延时，保证值的准确性
-			(async () => {
-				await this.$uv.sleep()
-			})()
-			return this.innerColumns[columnIndex]
-		},
-		// 设置整体各列的columns的值
-		setColumns(columns) {
-			this.innerColumns = this.$uv.deepClone(columns)
-			// 如果在设置各列数据时，没有被设置默认的各列索引defaultIndex，那么用0去填充它，数组长度为列的数量
-			if (this.innerIndex.length === 0) {
-				this.innerIndex = new Array(columns.length).fill(0)
+			},
+			// 记录上一次的各列索引位置
+			setLastIndex(index) {
+				// 当能进入此方法，意味着当前设置的各列默认索引，即为“上一次”的选中值，需要记录，是因为changeHandler中
+				// 需要拿前后的变化值进行对比，得出当前发生改变的是哪一列
+				this.lastIndex = this.$uv.deepClone(index)
+			},
+			// 设置对应列选项的所有值
+			setColumnValues(columnIndex, values) {
+				// 替换innerColumns数组中columnIndex索引的值为values，使用的是数组的splice方法
+				this.innerColumns.splice(columnIndex, 1, values)
+				// 拷贝一份原有的innerIndex做临时变量，将大于当前变化列的所有的列的默认索引设置为0
+				let tmpIndex = this.$uv.deepClone(this.innerIndex)
+				for (let i = 0; i < this.innerColumns.length; i++) {
+					if (i > this.columnIndex) {
+						tmpIndex[i] = 0
+					}
+				}
+				// 一次性赋值，不能单个修改，否则无效
+				this.setIndexs(tmpIndex)
+			},
+			// 获取对应列的所有选项
+			getColumnValues(columnIndex) {
+				// 进行同步阻塞，因为外部得到change事件之后，可能需要执行setColumnValues更新列的值
+				// 索引如果在外部change的回调中调用getColumnValues的话，可能无法得到变更后的列值，这里进行一定延时，保证值的准确性
+				(async () => {
+					await this.$uv.sleep()
+				})()
+				return this.innerColumns[columnIndex]
+			},
+			// 设置整体各列的columns的值
+			setColumns(columns) {
+				this.innerColumns = this.$uv.deepClone(columns)
+				// 如果在设置各列数据时，没有被设置默认的各列索引defaultIndex，那么用0去填充它，数组长度为列的数量
+				if (this.innerIndex.length === 0) {
+					this.innerIndex = new Array(columns.length).fill(0)
+				}
+			},
+			// 获取各列选中值对应的索引
+			getIndexs() {
+				return this.innerIndex
+			},
+			// 获取各列选中的值
+			getValues() {
+				// 进行同步阻塞，因为外部得到change事件之后，可能需要执行setColumnValues更新列的值
+				// 索引如果在外部change的回调中调用getValues的话，可能无法得到变更后的列值，这里进行一定延时，保证值的准确性
+				(async () => {
+					await this.$uv.sleep()
+				})()
+				return this.innerColumns.map((item, index) => item[this.innerIndex[index]])
 			}
 		},
-		// 获取各列选中值对应的索引
-		getIndexs() {
-			return this.innerIndex
-		},
-		// 获取各列选中的值
-		getValues() {
-			// 进行同步阻塞，因为外部得到change事件之后，可能需要执行setColumnValues更新列的值
-			// 索引如果在外部change的回调中调用getValues的话，可能无法得到变更后的列值，这里进行一定延时，保证值的准确性
-			(async () => {
-				await this.$uv.sleep()
-			})()
-			return this.innerColumns.map((item, index) => item[this.innerIndex[index]])
-		}
-	},
-}
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -283,6 +246,7 @@ export default {
 	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+
 	.uv-picker {
 		position: relative;
 
@@ -327,4 +291,4 @@ export default {
 			z-index: 1000;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/uni_modules/uv-popup/components/uv-popup/uv-popup.vue b/uni_modules/uv-popup/components/uv-popup/uv-popup.vue
index a63ff9d..ee18598 100644
--- a/uni_modules/uv-popup/components/uv-popup/uv-popup.vue
+++ b/uni_modules/uv-popup/components/uv-popup/uv-popup.vue
@@ -1,54 +1,20 @@
 <template>
-	<view 
-		v-if="showPopup" 
-		class="uv-popup" 
-		:class="[popupClass, isDesktop ? 'fixforpc-z-index' : '']"
-		:style="[{zIndex: zIndex}]"
-	>
+	<view v-if="showPopup" class="uv-popup" :class="[popupClass, isDesktop ? 'fixforpc-z-index' : '']"
+		:style="[{zIndex: zIndex}]">
 		<view @touchstart="touchstart">
 			<!-- 遮罩层 -->
-			<uv-overlay
-				key="1"
-				v-if="maskShow && overlay"
-				:show="showTrans"
-				:duration="duration"
-				:custom-style="overlayStyle"
-				:opacity="overlayOpacity"
-			  :zIndex="zIndex"
-				@click="onTap"
-			></uv-overlay>
-			<uv-transition 
-				key="2" 
-				:mode="ani" 
-				name="content" 
-				:custom-style="transitionStyle" 
-				:duration="duration"
-				:show="showTrans" 
-				@click="onTap"
-			>
-				<view 
-					class="uv-popup__content" 
-					:style="[contentStyle]" 
-					:class="[popupClass]" 
-					@click="clear"
-				>
+			<uv-overlay key="1" v-if="maskShow && overlay" :show="showTrans" :duration="duration"
+				:custom-style="overlayStyle" :opacity="overlayOpacity" :zIndex="zIndex" @click="onTap"></uv-overlay>
+			<uv-transition key="2" :mode="ani" name="content" :custom-style="transitionStyle" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uv-popup__content" :style="[contentStyle]" :class="[popupClass]" @click="clear">
 					<uv-status-bar v-if="safeAreaInsetTop"></uv-status-bar>
 					<slot />
 					<uv-safe-bottom v-if="safeAreaInsetBottom"></uv-safe-bottom>
-					<view
-						v-if="closeable"
-						@tap.stop="close"
-						class="uv-popup__content__close"
+					<view v-if="closeable" @tap.stop="close" class="uv-popup__content__close"
 						:class="['uv-popup__content__close--' + closeIconPos]"
-						hover-class="uv-popup__content__close--hover"
-						hover-stay-time="150"
-					>
-						<uv-icon
-							name="close"
-							color="#909399"
-							size="18"
-							bold
-						></uv-icon>
+						hover-class="uv-popup__content__close--hover" hover-stay-time="150">
+						<uv-icon name="close" color="#909399" size="18" bold></uv-icon>
 					</view>
 				</view>
 			</uv-transition>
@@ -66,31 +32,32 @@
 	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
 	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
 	/**
-	* PopUp 弹出层
-	* @description 弹出层组件，为了解决遮罩弹层的问题
-	* @tutorial https://www.uvui.cn/components/popup.html
-	* @property {String} mode = [top|center|bottom|left|right] 弹出方式
-	* 	@value top 顶部弹出
-	* 	@value center 中间弹出
-	* 	@value bottom 底部弹出
-	* 	@value left		左侧弹出
-	* 	@value right  右侧弹出
-	* @property {Number} duration 动画时长，默认300
-	* @property {Boolean} overlay 是否显示遮罩，默认true
-	* @property {Boolean} overlayOpacity 遮罩透明度，默认0.5 
-	* @property {Object} overlayStyle 遮罩自定义样式
-	* @property {Boolean} closeOnClickOverlay = [true|false] 蒙版点击是否关闭弹窗，默认true
-	* @property {Number | String} zIndex 弹出层的层级
-	* @property {Boolean} safeAreaInsetTop 是否留出顶部安全区（状态栏高度），默认false
-	* @property {Boolean} safeAreaInsetBottom 是否为留出底部安全区适配，默认true
-	* @property {Boolean} closeable 是否显示关闭图标，默认false
-	* @property {Boolean} closeIconPos 自定义关闭图标位置，`top-left`-左上角，`top-right`-右上角，`bottom-left`-左下角，`bottom-right`-右下角，默认top-right
-	* @property {String}  bgColor 主窗口背景色
-	* @property {String}  maskBackgroundColor 蒙版颜色
-	* @property {Boolean} customStyle 自定义样式
-	* @event {Function} change 打开关闭弹窗触发，e={show: false}
-	* @event {Function} maskClick 点击遮罩触发
-	*/
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://www.uvui.cn/components/popup.html
+	 * @property {String} mode = [top|center|bottom|left|right] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * @property {Number} duration 动画时长，默认300
+	 * @property {Boolean} overlay 是否显示遮罩，默认true
+	 * @property {Boolean} overlayOpacity 遮罩透明度，默认0.5 
+	 * @property {Object} overlayStyle 遮罩自定义样式
+	 * @property {Boolean} closeOnClickOverlay = [true|false] 蒙版点击是否关闭弹窗，默认true
+	 * @property {Number | String} zIndex 弹出层的层级
+	 * @property {Boolean} safeAreaInsetTop 是否留出顶部安全区（状态栏高度），默认false
+	 * @property {Boolean} safeAreaInsetBottom 是否为留出底部安全区适配，默认true
+	 * @property {Boolean} closeable 是否显示关闭图标，默认false
+	 * @property {Boolean} closeIconPos 自定义关闭图标位置，`top-left`-左上角，`top-right`-右上角，`bottom-left`-左下角，`bottom-right`-右下角，默认top-right
+	 * @property {String}  bgColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {Boolean} customStyle 自定义样式
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+	import popup from '@/uni_modules/uv-ui-tools/libs/mixin/popup.js'
 	export default {
 		name: 'uv-popup',
 		components: {
@@ -98,7 +65,7 @@
 			keypress
 			// #endif
 		},
-		mixins: [mpMixin, mixin],
+		mixins: [mpMixin, mixin, popup('popup')],
 		emits: ['change', 'maskClick'],
 		props: {
 			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
@@ -179,8 +146,17 @@
 				type: [Number, String],
 				default: 0
 			},
+			slef: {
+				typeof: Boolean,
+				default: false,
+			},
 			...uni.$uv?.props?.popup
 		},
+		mounted() {
+			if (this.slef) {
+				this.handlerShow()
+			}
+		},
 		watch: {
 			/**
 			 * 监听type类型
@@ -240,7 +216,7 @@
 				return this.popupWidth >= 500 && this.popupHeight >= 500
 			},
 			bg() {
-				if (this.bgColor === '' || this.bgColor === 'none' || this.$uv.getPx(this.round)>0) {
+				if (this.bgColor === '' || this.bgColor === 'none' || this.$uv.getPx(this.round) > 0) {
 					return 'transparent'
 				}
 				return this.bgColor
@@ -250,19 +226,19 @@
 				if (this.bgColor) {
 					style.backgroundColor = this.bg
 				}
-				if(this.round) {
+				if (this.round) {
 					const value = this.$uv.addUnit(this.round)
-					const mode = this.direction?this.direction:this.mode
+					const mode = this.direction ? this.direction : this.mode
 					style.backgroundColor = this.bgColor
-					if(mode === 'top') {
+					if (mode === 'top') {
 						style.borderBottomLeftRadius = value
 						style.borderBottomRightRadius = value
-					} else if(mode === 'bottom') {
+					} else if (mode === 'bottom') {
 						style.borderTopLeftRadius = value
 						style.borderTopRightRadius = value
-					} else if(mode === 'center') {
+					} else if (mode === 'center') {
 						style.borderRadius = value
-					} 
+					}
 				}
 				return this.$uv.deepMerge(style, this.$uv.addStyle(this.customStyle))
 			}
@@ -314,7 +290,7 @@
 				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
 				if (!(direction && innerType.indexOf(direction) !== -1)) {
 					direction = this.mode
-				}else {
+				} else {
 					this.direction = direction;
 				}
 				if (!this.config[direction]) {
@@ -399,7 +375,7 @@
 			 */
 			center(type) {
 				this.popupClass = 'center'
-				this.ani = this.zoom?['zoom-in', 'fade']:['fade'];
+				this.ani = this.zoom ? ['zoom-in', 'fade'] : ['fade'];
 				this.transitionStyle = {
 					position: 'fixed',
 					zIndex: this.zIndex,
@@ -497,6 +473,7 @@
 				/* #endif */
 				flex: 1;
 			}
+
 			&__close {
 				position: absolute;
 
@@ -504,22 +481,22 @@
 					opacity: 0.4;
 				}
 			}
-			
+
 			&__close--top-left {
 				top: 15px;
 				left: 15px;
 			}
-			
+
 			&__close--top-right {
 				top: 15px;
 				right: 15px;
 			}
-			
+
 			&__close--bottom-left {
 				bottom: 15px;
 				left: 15px;
 			}
-			
+
 			&__close--bottom-right {
 				right: 15px;
 				bottom: 15px;
@@ -536,4 +513,4 @@
 	.fixforpc-top {
 		top: 0;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/mixin/popup.js b/uni_modules/uv-ui-tools/libs/mixin/popup.js
new file mode 100644
index 0000000..f30ecba
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/popup.js
@@ -0,0 +1,35 @@
+export default function(name) {
+return {
+		props: {
+			show: Boolean,
+		},
+		emits: ["update:show"],
+		mounted() {
+			if (name === 'popup') return
+			this.handlerShow()
+		},
+		watch: {
+			show: {
+				handler() {
+					this.handlerShow()
+				}
+			},
+		},
+		methods: {
+			handlerShow() {
+				if (this.show) {
+					this.open()
+				} else {
+					this.close()
+				}
+			},
+			popupChange(e) {
+				if (!e.show) {
+					this.$emit('update:show', false)
+					this.$emit('close');
+				}
+			},
+		}
+
+	}
+}
\ No newline at end of file
-- 
Gitee


From 7d5ed26ed7333557cec7ce3dca92cfa58da86f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sat, 7 Sep 2024 21:11:39 +0800
Subject: [PATCH 15/21] Update uv-list-item.vue

---
 .../components/uv-list-item/uv-list-item.vue  | 88 +++++++++----------
 1 file changed, 41 insertions(+), 47 deletions(-)

diff --git a/uni_modules/uv-list/components/uv-list-item/uv-list-item.vue b/uni_modules/uv-list/components/uv-list-item/uv-list-item.vue
index a721369..d4006e8 100644
--- a/uni_modules/uv-list/components/uv-list-item/uv-list-item.vue
+++ b/uni_modules/uv-list/components/uv-list-item/uv-list-item.vue
@@ -1,9 +1,8 @@
 <template>
 	<!-- #ifdef APP-NVUE -->
 	<cell :keep-scroll-position="keepScrollPosition">
-		<!-- #endif -->
-		<view 
-			:class="{ 'uv-list-item--disabled': disabled }" 
+	<!-- #endif -->
+		<view :class="{ 'uv-list-item--disabled': disabled }"
 			:style="[$uv.addStyle(customStyle),{'background-color':customStyle.backgroundColor?customStyle.backgroundColor:'#fff'}]"
 			:hover-class="(!clickable && !link) || disabled || showSwitch ? '' : 'uv-list-item--hover'"
 			class="uv-list-item" @click="onClick">
@@ -16,10 +15,12 @@
 						<slot name="header">
 							<view class="uv-list-item__header">
 								<view v-if="thumb" class="uv-list-item__icon">
-									<image :src="thumb" class="uv-list-item__icon-img" :class="['uv-list--' + thumbSize]" />
+									<image :src="thumb" class="uv-list-item__icon-img"
+										:class="['uv-list--' + thumbSize]" />
 								</view>
 								<view v-else-if="showExtraIcon" class="uv-list-item__icon">
-									<uv-icon :name="extraIcon.name" :customPrefix="extraIcon.customPrefix" :color="extraIcon.color" :size="extraIcon.size" />
+									<uv-icon :name="extraIcon.name" :customPrefix="extraIcon.customPrefix"
+										:color="extraIcon.color" :size="extraIcon.size" />
 								</view>
 							</view>
 						</slot>
@@ -35,30 +36,23 @@
 							<view v-if="rightText || showBadge || showSwitch" class="uv-list-item__extra"
 								:class="{ 'flex--justify': directionData === 'column' }">
 								<text v-if="rightText" class="uv-list-item__extra-text">{{ rightText }}</text>
-								<uv-badge
-									v-if="showBadge"
-									:show="!!(badge.show || badge.isDot || badge.value)"
-									:isDot="badge.isDot"
-									:value="badge.value"
-									:max="badge.max"
-									:type="badge.type"
-									:showZero="badge.showZero"
-									:bgColor="badge.bgColor"
-									:color="badge.color"
-									:shape="badge.shape"
-									:numberType="badge.numberType"
-									:inverted="badge.inverted"
-									customStyle="margin-left: 4px;"
-								></uv-badge>
-								<uv-switch v-if="showSwitch" :value="switchChecked" :disabled="disabled" @change="onSwitchChange"></uv-switch>
+								<uv-badge v-if="showBadge" :show="!!(badge.show || badge.isDot || badge.value)"
+									:isDot="badge.isDot" :value="badge.value" :max="badge.max" :type="badge.type"
+									:showZero="badge.showZero" :bgColor="badge.bgColor" :color="badge.color"
+									:shape="badge.shape" :numberType="badge.numberType" :inverted="badge.inverted"
+									customStyle="margin-left: 4px;"></uv-badge>
+								<uv-switch v-if="showSwitch" :value="switchChecked" :disabled="disabled"
+									@change="onSwitchChange"></uv-switch>
 							</view>
 						</slot>
 					</view>
 				</slot>
 			</view>
-			<uv-icon v-if="showArrow || link" size="34rpx" class="uv-icon-wrapper" color="#bbb" name="arrow-right" />
+			<view v-if="showArrow || link" class="uv-icon-wrapper">
+				<uv-icon size="34rpx" color="#bbb" name="arrow-right" />
+			</view>
 		</view>
-		<!-- #ifdef APP-NVUE -->
+	<!-- #ifdef APP-NVUE -->
 	</cell>
 	<!-- #endif -->
 </template>
@@ -203,14 +197,14 @@
 			}
 		},
 		computed: {
-			directionData(){
+			directionData() {
 				return this.direction ? this.direction : (this.parentData.direction ? this.parentData.direction : 'row');
 			}
 		},
 		watch: {
 			'customStyle.padding': {
 				handler(padding) {
-					if(padding) this.setPadding(padding);
+					if (padding) this.setPadding(padding);
 				},
 				immediate: true
 			}
@@ -245,12 +239,12 @@
 			}
 		},
 		methods: {
-			init(){
+			init() {
 				if (!this.parent) {
 					this.$uv.error('uv-list-item必须搭配uv-list组件使用');
 				}
-				this.$nextTick(()=>{
-					if(!(this.padding.top || this.padding.right|| this.padding.bottom|| this.padding.left)){
+				this.$nextTick(() => {
+					if (!(this.padding.top || this.padding.right || this.padding.bottom || this.padding.left)) {
 						this.setPadding(this.parentData.padding);
 					}
 				})
@@ -258,8 +252,8 @@
 			updateParentData() {
 				this.getParentData('uv-list');
 			},
-			setPadding(padding){
-				if(typeof padding == 'number'){
+			setPadding(padding) {
+				if (typeof padding == 'number') {
 					padding += ''
 				}
 				let paddingArr = padding.split(' ')
@@ -280,13 +274,13 @@
 						"left": horizontalPadding
 					}
 				} else if (paddingArr.length === 4) {
-						const [topPadding, rightPadding, bottomPadding, leftPadding] = paddingArr;
-						this.padding = {
-							"top": topPadding,
-							"right": rightPadding,
-							"bottom": bottomPadding,
-							"left": leftPadding
-						}
+					const [topPadding, rightPadding, bottomPadding, leftPadding] = paddingArr;
+					this.padding = {
+						"top": topPadding,
+						"right": rightPadding,
+						"bottom": bottomPadding,
+						"left": leftPadding
+					}
 				}
 			},
 			/**
@@ -362,17 +356,17 @@
 	$show-lines: 1;
 	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
-	$uv-font-size-sm:12px;
-	$uv-font-size-base:14px;
-	$uv-font-size-lg:16px;
+	$uv-font-size-sm: 12px;
+	$uv-font-size-base: 14px;
+	$uv-font-size-lg: 16px;
 	$uv-spacing-col-lg: 12px;
 	$uv-spacing-row-lg: 15px;
-	$uv-img-size-sm:20px;
-	$uv-img-size-base:26px;
-	$uv-img-size-lg:40px;
-	$uv-border-color:#e5e5e5;
-	$uv-bg-color-hover:#f1f1f1;
-	$uv-text-color-grey:#999;
+	$uv-img-size-sm: 20px;
+	$uv-img-size-base: 26px;
+	$uv-img-size-lg: 40px;
+	$uv-border-color: #e5e5e5;
+	$uv-bg-color-hover: #f1f1f1;
+	$uv-text-color-grey: #999;
 	$list-item-pd: $uv-spacing-col-lg $uv-spacing-row-lg;
 
 	.uv-list-item {
@@ -394,7 +388,7 @@
 	.uv-list-item--hover {
 		background-color: $uv-bg-color-hover !important;
 	}
-	
+
 	.uv-list-item__wrapper {
 		@include flex(column);
 		flex: 1;
-- 
Gitee


From d71e7fa87a8aa50b10539106b56aedcfb3ff3d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sun, 8 Sep 2024 14:43:39 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=EF=BC=8C=E5=80=BC=E5=8F=8C=E5=90=91?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=B7=9F=E6=98=BE=E7=A4=BA=E5=8F=8C=E5=90=91?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uv-datetime-picker/props.js    | 24 +++++----
 .../uv-datetime-picker/uv-datetime-picker.vue | 50 +++++++++++++++----
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/uni_modules/uv-datetime-picker/components/uv-datetime-picker/props.js b/uni_modules/uv-datetime-picker/components/uv-datetime-picker/props.js
index 6031d84..3a0fed5 100644
--- a/uni_modules/uv-datetime-picker/components/uv-datetime-picker/props.js
+++ b/uni_modules/uv-datetime-picker/components/uv-datetime-picker/props.js
@@ -1,18 +1,22 @@
 export default {
 	props: {
-		value: {
+		// value: {
+		// 	type: [String, Number],
+		// 	default: ''
+		// },
+		// modelValue: {
+		// 	type: [String, Number],
+		// 	default: ''
+		// },
+		// // 是否打开组件
+		// show: {
+		// 	type: Boolean,
+		// 	default: false
+		// },
+		dateValue: {
 			type: [String, Number],
 			default: ''
 		},
-		modelValue: {
-			type: [String, Number],
-			default: ''
-		},
-		// 是否打开组件
-		show: {
-			type: Boolean,
-			default: false
-		},
 		// 是否展示顶部的操作栏
 		showToolbar: {
 			type: Boolean,
diff --git a/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue b/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue
index 4c4d930..0398a2b 100644
--- a/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue
+++ b/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue
@@ -2,8 +2,8 @@
 	<uv-picker ref="picker" :closeOnClickOverlay="closeOnClickOverlay" :closeOnClickConfirm="closeOnClickConfirm"
 		:columns="columns" :title="title" :itemHeight="itemHeight" :showToolbar="showToolbar"
 		:visibleItemCount="visibleItemCount" :defaultIndex="innerDefaultIndex" :cancelText="cancelText"
-		:confirmText="confirmText" :cancelColor="cancelColor" :confirmColor="confirmColor" :round="round" @close="close"
-		@cancel="cancel" @confirm="confirm" @change="change">
+		:confirmText="confirmText" :cancelColor="cancelColor" :confirmColor="confirmColor" :round="round"
+		@cancel="cancel" @confirm="confirm" @change="change" @close="closeDateTimePopup">
 	</uv-picker>
 </template>
 <script>
@@ -72,7 +72,7 @@
 		computed: {
 			// 如果以下这些变量发生了变化，意味着需要重新初始化各列的值
 			propsChange() {
-				const propsValue = this.value || this.modelValue;
+				const propsValue = this.dateValue
 				return [this.mode, this.maxDate, this.minDate, this.minHour, this.maxHour, this.minMinute, this.maxMinute,
 					this.filter, propsValue
 				]
@@ -87,7 +87,13 @@
 				this.updateColumnValue(this.innerValue)
 			},
 			getValue() {
-				const propsValue = this.value || this.modelValue;
+				let propsValue = this.innerValue
+				if (typeof propsValue === 'undefined' || this.clearDate) {
+					propsValue = Number(this.dateValue)
+				}
+				if (isNaN(propsValue)) {
+					propsValue = this.dateValue
+				}
 				this.innerValue = this.correctValue(propsValue)
 			},
 			// 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
@@ -102,23 +108,29 @@
 					this.updateColumnValue(this.innerValue);
 				}, 10)
 			},
+			closeDateTimePopup() {
+				this.$emit('update:show', false)
+				this.$emit('close');
+			},
 			close() {
+				this.$refs.picker.close();
+				this.$emit('update:show', false)
 				this.$emit('close');
 			},
 			// 点击工具栏的取消按钮
 			cancel() {
 				this.$emit('cancel')
+				this.$emit('update:show', false)
 			},
 			// 点击工具栏的确定按钮
 			confirm() {
+				this.$emit('update:show', false)
 				this.$emit('confirm', {
 					value: this.innerValue,
-					mode: this.mode
+					mode: this.mode,
+					date: this.hanlderTimeStamp(this.innerValue),
 				})
-				if (!this.clearDate) {
-					this.$emit('input', this.innerValue)
-					this.$emit('update:modelValue', this.innerValue)
-				}
+
 			},
 			//用正则截取输出值,当出现多组数字时,抛出错误
 			intercept(e, type) {
@@ -178,9 +190,29 @@
 				// 发出change时间，value为当前选中的时间戳
 				this.$emit('change', {
 					value: selectValue,
+					date: this.hanlderTimeStamp(selectValue),
 					mode: this.mode
 				})
 			},
+			hanlderTimeStamp(num) {
+				let format = 'yyyy-mm-dd hh:MM'
+				switch (this.mode) {
+					case 'date':
+						format = 'yyyy-mm-dd'
+						break
+					case 'time':
+						format = 'hh:MM'
+						break
+					case 'year-month':
+						format = 'yyyy-mm'
+						break
+					case 'year':
+						format = 'yyyy'
+						break
+				}
+				// console.log('hanlderTimeStamp', uni.$uv.date(num, format))
+				return uni.$uv.date(num, format)
+			},
 			// 更新各列的值，进行补0、格式化等操作
 			updateColumnValue(value) {
 				this.innerValue = value
-- 
Gitee


From 75ff585a5610492f3db6176d8b33eaa08e276808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Sun, 8 Sep 2024 17:17:24 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E5=88=86=E6=AE=B5=E5=99=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=8C=E5=90=91=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uv-subsection/props.js         |  6 ++-
 .../uv-subsection/uv-subsection.vue           | 51 ++++++++++---------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/uni_modules/uv-subsection/components/uv-subsection/props.js b/uni_modules/uv-subsection/components/uv-subsection/props.js
index ef5568e..a16124f 100644
--- a/uni_modules/uv-subsection/components/uv-subsection/props.js
+++ b/uni_modules/uv-subsection/components/uv-subsection/props.js
@@ -6,7 +6,11 @@ export default {
 			default: () => []
 		},
 		// 当前活动的tab的index
-		current: {
+		value: {
+			type: [String, Number],
+			default: 0
+		},
+		modelValue: {
 			type: [String, Number],
 			default: 0
 		},
diff --git a/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue b/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue
index f02467e..618ccd3 100644
--- a/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue
+++ b/uni_modules/uv-subsection/components/uv-subsection/uv-subsection.vue
@@ -1,36 +1,20 @@
 <template>
-	<view 
-		class="uv-subsection"
-		ref="uv-subsection"
-		:class="[`uv-subsection--${mode}`]"
+	<view class="uv-subsection" ref="uv-subsection" :class="[`uv-subsection--${mode}`]"
 		:style="[$uv.addStyle(customStyle), wrapperStyle]">
-		<view 
-			class="uv-subsection__bar"
-			ref="uv-subsection__bar"
-			:style="[barStyle]"
-			:class="[
+		<view class="uv-subsection__bar" ref="uv-subsection__bar" :style="[barStyle]" :class="[
         mode === 'button' && 'uv-subsection--button__bar',
         current === 0 && mode === 'subsection' && 'uv-subsection__bar--first',
         current > 0 && current < list.length - 1 && mode === 'subsection' && 'uv-subsection__bar--center',
         current === list.length - 1 && mode === 'subsection' && 'uv-subsection__bar--last'
-      ]"
-		></view>
-		<view class="uv-subsection__item"
-			:class="[
+      ]"></view>
+		<view class="uv-subsection__item" :class="[
         `uv-subsection__item--${index}`,
         index < list.length - 1 && 'uv-subsection__item--no-border-right',
         index === 0 && 'uv-subsection__item--first',
         index === list.length - 1 && 'uv-subsection__item--last'
-      ]"
-			:ref="`uv-subsection__item--${index}`"
-			:style="[itemStyle(index)]"
-			@tap="clickHandler(index)"
-			v-for="(item, index) in list"
-			:key="index"
-		>
-			<text 
-				class="uv-subsection__item__text"
-				:style="[textStyle(index)]">{{ getText(item) }}
+      ]" :ref="`uv-subsection__item--${index}`" :style="[itemStyle(index)]" @tap="clickHandler(index)"
+			v-for="(item, index) in list" :key="index">
+			<text class="uv-subsection__item__text" :style="[textStyle(index)]">{{ getText(item) }}
 			</text>
 		</view>
 	</view>
@@ -65,6 +49,7 @@
 	export default {
 		name: "uv-subsection",
 		mixins: [mpMixin, mixin, props],
+		emits: ['input', 'change', 'update:modelValue'],
 		data() {
 			return {
 				// 组件尺寸
@@ -77,7 +62,7 @@
 		watch: {
 			list: {
 				deep: true,
-				handler(){
+				handler() {
 					this.init();
 				}
 			},
@@ -103,6 +88,9 @@
 			}
 		},
 		computed: {
+			current() {
+				return this.value || this.modelValue
+			},
 			wrapperStyle() {
 				const style = {};
 				// button模式时，设置背景色
@@ -183,6 +171,8 @@
 				// #endif
 			},
 			clickHandler(index) {
+				this.$emit('input', index)
+				this.$emit('update:modelValue', index)
 				this.$emit("change", index);
 			}
 		}
@@ -191,6 +181,7 @@
 
 <style lang="scss" scoped>
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
+
 	.uv-subsection {
 		@include flex;
 		position: relative;
@@ -198,6 +189,7 @@
 		/* #ifndef APP-NVUE */
 		width: 100%;
 		box-sizing: border-box;
+
 		/* #endif */
 		&--button {
 			height: 32px;
@@ -205,19 +197,23 @@
 			padding: 3px;
 			border-radius: 3px;
 			align-items: stretch;
+
 			&__bar {
 				background-color: #ffffff;
 			}
 		}
+
 		&--subsection {
 			height: 100%;
 		}
+
 		&__bar {
 			position: absolute;
 			/* #ifndef APP-NVUE */
 			transition-property: transform, color;
 			transition-duration: 0.3s;
 			transition-timing-function: ease-in-out;
+
 			/* #endif */
 			&--first {
 				border-top-left-radius: 3px;
@@ -225,12 +221,14 @@
 				border-top-right-radius: 0px;
 				border-bottom-right-radius: 0px;
 			}
+
 			&--center {
 				border-top-left-radius: 0px;
 				border-bottom-left-radius: 0px;
 				border-top-right-radius: 0px;
 				border-bottom-right-radius: 0px;
 			}
+
 			&--last {
 				border-top-left-radius: 0px;
 				border-bottom-left-radius: 0px;
@@ -238,6 +236,7 @@
 				border-bottom-right-radius: 3px;
 			}
 		}
+
 		&__item {
 			@include flex;
 			flex: 1;
@@ -245,17 +244,21 @@
 			align-items: center;
 			// vue环境下，需要设置相对定位，因为滑块为绝对定位，item需要在滑块的上面
 			position: relative;
+
 			&--no-border-right {
 				border-right-width: 0 !important;
 			}
+
 			&--first {
 				border-top-left-radius: 3px;
 				border-bottom-left-radius: 3px;
 			}
+
 			&--last {
 				border-top-right-radius: 3px;
 				border-bottom-right-radius: 3px;
 			}
+
 			&__text {
 				font-size: 12px;
 				line-height: 12px;
-- 
Gitee


From 41bd6b81ecc556cb52ce8510493e78512fb88d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Mon, 9 Sep 2024 22:56:25 +0800
Subject: [PATCH 18/21] Update uv-text.vue

---
 uni_modules/uv-text/components/uv-text/uv-text.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uni_modules/uv-text/components/uv-text/uv-text.vue b/uni_modules/uv-text/components/uv-text/uv-text.vue
index a300119..b0182a2 100644
--- a/uni_modules/uv-text/components/uv-text/uv-text.vue
+++ b/uni_modules/uv-text/components/uv-text/uv-text.vue
@@ -4,8 +4,8 @@
 				justifyContent: align === 'left' ? 'flex-start' : align === 'center' ? 'center' : 'flex-end'
       }" @tap="clickHandler">
 
-		<view class="divider-wrap" :style="dividerWrap">
-			<view v-if="showDivider" :style="dividerStyleFun">
+		<view class="divider-wrap" :style="[dividerWrap]">
+			<view v-if="showDivider" :style="[dividerStyleFun]">
 				<slot></slot>
 			</view>
 
@@ -37,7 +37,7 @@
 			</view>
 
 		</view>
-		
+
 	</view>
 </template>
 <script>
-- 
Gitee


From de5dc4a4898b8a61b4c69822af9c0cf77a0ad497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Tue, 10 Sep 2024 15:36:46 +0800
Subject: [PATCH 19/21] Update uv-navbar.vue

---
 uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue b/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
index cf633b5..99d34bc 100644
--- a/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
+++ b/uni_modules/uv-navbar/components/uv-navbar/uv-navbar.vue
@@ -166,7 +166,7 @@
 			@include flex(row);
 			align-items: center;
 			height: 44px;
-			background-color: #9acafc;
+			background-color: #fff;
 			position: relative;
 			justify-content: center;
 
-- 
Gitee


From eddb3acf29109c86872b393f4d02e2e9964151f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Thu, 12 Sep 2024 20:19:22 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A1=8C=E6=95=B0=E6=B2=A1=E7=94=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E6=95=B0=E8=BF=87=E5=A4=9A=E4=B8=8D=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vite/deps_temp_76ad3e3e/package.json              |  1 +
 .vite/deps_temp_b9315225/package.json              |  1 +
 uni_modules/uv-text/components/uv-text/uv-text.vue | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 .vite/deps_temp_76ad3e3e/package.json
 create mode 100644 .vite/deps_temp_b9315225/package.json

diff --git a/.vite/deps_temp_76ad3e3e/package.json b/.vite/deps_temp_76ad3e3e/package.json
new file mode 100644
index 0000000..7c34deb
--- /dev/null
+++ b/.vite/deps_temp_76ad3e3e/package.json
@@ -0,0 +1 @@
+{"type":"module"}
\ No newline at end of file
diff --git a/.vite/deps_temp_b9315225/package.json b/.vite/deps_temp_b9315225/package.json
new file mode 100644
index 0000000..7c34deb
--- /dev/null
+++ b/.vite/deps_temp_b9315225/package.json
@@ -0,0 +1 @@
+{"type":"module"}
\ No newline at end of file
diff --git a/uni_modules/uv-text/components/uv-text/uv-text.vue b/uni_modules/uv-text/components/uv-text/uv-text.vue
index b0182a2..f014a2c 100644
--- a/uni_modules/uv-text/components/uv-text/uv-text.vue
+++ b/uni_modules/uv-text/components/uv-text/uv-text.vue
@@ -9,7 +9,7 @@
 				<slot></slot>
 			</view>
 
-			<view>
+			<view class="uv-text-mian">
 				<text :class="['uv-text__price', type && `uv-text__value--${type}`]" v-if="mode === 'price'"
 					:style="[valueStyle]">￥</text>
 				<view class="uv-text__prefix-icon" v-if="prefixIcon">
@@ -155,6 +155,17 @@
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
 
+	.divider-wrap {
+		width: 100%;
+	}
+
+	.uv-text-mian {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		width: 100%;
+	}
+
 	.uv-text {
 		@include flex(row);
 		align-items: center;
-- 
Gitee


From 531210adc4019ed24b8dff05791917a175158886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=BB=E4=B9=90=E5=A4=9A?= <358665514@qq.com>
Date: Mon, 16 Sep 2024 11:58:24 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uni_modules/uv-text/components/uv-text/props.js    | 8 +++++---
 uni_modules/uv-text/components/uv-text/uv-text.vue | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/uni_modules/uv-text/components/uv-text/props.js b/uni_modules/uv-text/components/uv-text/props.js
index cb77b5e..37c326b 100644
--- a/uni_modules/uv-text/components/uv-text/props.js
+++ b/uni_modules/uv-text/components/uv-text/props.js
@@ -1,7 +1,7 @@
 export default {
 	props: {
 		// 显示划线
-		showDivider:{
+		showDivider: {
 			type: Boolean,
 			default: false
 		},
@@ -16,10 +16,12 @@ export default {
 			default: 'center'
 		},
 		// 划线样式
-		dividerStyle:{
+		dividerStyle: {
 			type: [Object, String],
 			default: () => ({
-				
+				width: "5px",
+				height: "15px",
+				background: "#3c9cff",
 			})
 		},
 		// 主题颜色
diff --git a/uni_modules/uv-text/components/uv-text/uv-text.vue b/uni_modules/uv-text/components/uv-text/uv-text.vue
index f014a2c..23dd2c5 100644
--- a/uni_modules/uv-text/components/uv-text/uv-text.vue
+++ b/uni_modules/uv-text/components/uv-text/uv-text.vue
@@ -156,7 +156,7 @@
 	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
 
 	.divider-wrap {
-		width: 100%;
+		// width: 100%;
 	}
 
 	.uv-text-mian {
-- 
Gitee