From d26d3955826137960823ada503a86819601c0b5b Mon Sep 17 00:00:00 2001
From: KevinRuan <578281588@qq.com>
Date: Tue, 21 Dec 2021 20:51:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Du-switch=E7=BB=84=E4=BB=B6v-m?=
 =?UTF-8?q?odel=E7=BB=91=E5=AE=9A=E9=9D=9E=E5=B8=83=E5=B0=94=E5=80=BC?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uview-ui/components/u-switch/u-switch.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/uview-ui/components/u-switch/u-switch.vue b/uview-ui/components/u-switch/u-switch.vue
index dd8e4bb1..daebbd90 100644
--- a/uview-ui/components/u-switch/u-switch.vue
+++ b/uview-ui/components/u-switch/u-switch.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="u-switch" :class="[value == true ? 'u-switch--on' : '', disabled ? 'u-switch--disabled' : '']" @tap="onClick"
+	<view class="u-switch" :class="[checked ? 'u-switch--on' : '', disabled ? 'u-switch--disabled' : '']" @tap="onClick"
 	 :style="[switchStyle]">
 		<view class="u-switch__node node-class" :style="{
 			width: $u.addUnit(this.size),
@@ -55,7 +55,7 @@
 			},
 			// 通过v-model双向绑定的值
 			value: {
-				type: Boolean,
+				type: [Number, String, Boolean],
 				default: false
 			},
 			// 是否使手机发生短促震动，目前只在iOS的微信小程序有效(2020-05-06)
@@ -83,11 +83,14 @@
 			switchStyle() {
 				let style = {};
 				style.fontSize = this.size + 'rpx';
-				style.backgroundColor = this.value ? this.activeColor : this.inactiveColor;
+				style.backgroundColor = this.checked ? this.activeColor : this.inactiveColor;
 				return style;
 			},
 			loadingColor() {
-				return this.value ? this.activeColor : null;
+				return this.checked ? this.activeColor : null;
+			},
+			checked() {
+			    return this.value === this.activeValue;
 			}
 		},
 		methods: {
@@ -95,10 +98,11 @@
 				if (!this.disabled && !this.loading) {
 					// 使手机产生短促震动，微信小程序有效，APP(HX 2.6.8)和H5无效
 					if(this.vibrateShort) uni.vibrateShort();
-					this.$emit('input', !this.value);
+					const val = this.checked ? this.inactiveValue : this.activeValue;
+					this.$emit('input', val);
 					// 放到下一个生命周期，因为双向绑定的value修改父组件状态需要时间，且是异步的
 					this.$nextTick(() => {
-						this.$emit('change', this.value ? this.activeValue : this.inactiveValue);
+						this.$emit('change', val);
 					})
 				}
 			}