Merge branch 'tonghao' into tmp

# Conflicts:
#	uview/components/u-alert-tips/u-alert-tips.vue
#	uview/components/u-badge/u-badge.vue
#	uview/components/u-count-down/u-count-down.vue
#	uview/components/u-count-to/u-count-to.vue
#	uview/components/u-divider/u-divider.vue
#	uview/components/u-gap/u-gap.vue
#	uview/components/u-grid/u-grid.vue
#	uview/components/u-lazy-load/u-lazy-load.vue
#	uview/components/u-loadmore/u-loadmore.vue
#	uview/components/u-message-input/u-message-input.vue
#	uview/components/u-navbar/u-navbar.vue
#	uview/components/u-notice-bar/u-notice-bar.vue
#	uview/components/u-search/u-search.vue
#	uview/components/u-section/u-section.vue

uview/components/u-action-sheet/u-action-sheet.vue

-<template>
-	<u-popup mode="bottom" :border-radius="borderRadius" 
-		:popup="false" v-model="value" :maskCloseAble="maskCloseAble" 
-		length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" 
-		@close="popupClose"
-		:z-index="uZIndex"
-	>
-		<view class="u-tips u-border-bottom" v-if="tips.text" :style="tipsStyle">
-			{{tips.text}}
-		</view>
-		<block v-for="(item, index) in list" :key="index">
-			<view @touchmove.stop.prevent @tap="itemClick(index)" :style="[itemStyle(index)]" class="u-action-sheet-item" :class="[index < list.length - 1 ? 'u-border-bottom' : '']"
-			 hover-class="u-hover-class" :hover-stay-time="150">
-				{{item.text}}
-			</view>
-		</block>
-		<view class="u-gab" v-if="cancelBtn">
-		</view>
-		<view @touchmove.stop.prevent class="u-actionsheet-cancel u-action-sheet-item" hover-class="u-hover-class" :hover-stay-time="150" v-if="cancelBtn"
-		 @tap="close">取消</view>
-	</u-popup>
-</template>
-
-<script>
-	export default {
-		props: {
-			// 点击遮罩是否可以关闭actionsheet
-			maskCloseAble: {
-				type: Boolean,
-				default: true
-			},
-			// 按钮的文字数组，可以自定义颜色和字体大小，字体单位为rpx
-			list: {
-				type: Array,
-				default () {
-					// 如下
-					// return [{
-					// 	text: '确定',
-					// 	color: '',
-					// 	fontSize: ''
-					// }]
-					return [];
-				}
-			},
-			// 顶部的提示文字
-			tips: {
-				type: Object,
-				default () {
-					return {
-						text: '',
-						color: '',
-						fontSize: '26'
-					}
-				}
-			},
-			// 底部的取消按钮
-			cancelBtn: {
-				type: Boolean,
-				default: true
-			},
-			// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
-			safeAreaInsetBottom: {
-				type: Boolean,
-				default: false
-			},
-			// 通过双向绑定控制组件的弹出与收起
-			value: {
-				type: Boolean,
-				default: false
-			},
-			// 弹出的顶部圆角值
-			borderRadius: {
-				type: [String, Number],
-				default: 0
-			},
-			// 弹出的z-index值
-			zIndex: {
-				type: [String, Number],
-				default: 0
-			}
-		},
-		computed: {
-			// 顶部提示的样式
-			tipsStyle() {
-				let style = {};
-				if (this.tips.color) style.color = this.tips.color;
-				if (this.tips.fontSize) style.fontSize = this.tips.fontSize + 'rpx';
-				return style;
-			},
-			// 操作项目的样式
-			itemStyle() {
-				return (index) => {
-					let style = {};
-					if (this.list[index].color) style.color = this.list[index].color;
-					if (this.list[index].fontSize) style.fontSize = this.list[index].fontSize + 'rpx';
-					return style;
-				}
-			},
-			uZIndex() {
-				// 如果用户有传递z-index值，优先使用
-				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
-			}
-		},
-		methods: {
-			// 点击取消按钮
-			close() {
-				// 发送input事件，并不会作用于父组件，而是要设置组件内部通过props传递的value参数
-				// 这是一个vue发送事件的特殊用法
-				this.popupClose();
-				this.$emit('close');
-			},
-			// 弹窗关闭
-			popupClose() {
-				this.$emit('input', false);
-			},
-			// 点击某一个itemif (!this.show) return;
-			itemClick(index) {
-				this.$emit('click', index);
-				this.$emit('input', false);
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.u-tips {
-		font-size: 26rpx;
-		text-align: center;
-		padding: 34rpx 0;
-		line-height: 1;
-		color: $u-tips-color;
-	}
-
-	.u-action-sheet-item {
-		display: flex;
-		line-height: 1;
-		justify-content: center;
-		align-items: center;
-		font-size: 34rpx;
-		padding: 34rpx 0;
-	}
-
-	.u-gab {
-		height: 12rpx;
-		background-color: rgb(234, 234, 236);
-	}
-
-	.u-actionsheet-cancel {
-		color: $u-main-color;
-	}
+<template>
+	<u-popup mode="bottom" :border-radius="borderRadius" :popup="false" v-model="value" :maskCloseAble="maskCloseAble"
+	 length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="popupClose" :z-index="uZIndex">
+		<view class="u-tips u-border-bottom" v-if="tips.text" :style="tipsStyle">
+			{{tips.text}}
+		</view>
+		<block v-for="(item, index) in list" :key="index">
+			<view @touchmove.stop.prevent @tap="itemClick(index)" :style="[itemStyle(index)]" class="u-action-sheet-item" :class="[index < list.length - 1 ? 'u-border-bottom' : '']"
+			 hover-class="u-hover-class" :hover-stay-time="150">
+				{{item.text}}
+			</view>
+		</block>
+		<view class="u-gab" v-if="cancelBtn">
+		</view>
+		<view @touchmove.stop.prevent class="u-actionsheet-cancel u-action-sheet-item" hover-class="u-hover-class"
+		 :hover-stay-time="150" v-if="cancelBtn" @tap="close">取消</view>
+	</u-popup>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 本组件用于从底部弹出一个操作菜单，供用户选择并返回结果。本组件功能类似于uni的uni.showActionSheetAPI，配置更加灵活，所有平台都表现一致。
+	 * @tutorial https://www.uviewui.com/components/actionSheet.html
+	 * @property {Array<Object>} list 按钮的文字数组，见官方文档示例
+	 * @property {Object} tips 顶部的提示文字，见官方文档示例
+	 * @property {Boolean} cancel-btn 是否显示底部的取消按钮（默认true）
+	 * @property {Number String} border-radius 弹出部分顶部左右的圆角值，单位rpx（默认0）
+	 * @property {Boolean} mask-close-able 点击遮罩是否可以关闭（默认true）
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+	 * @property {Number String} z-index z-index值（默认1075）
+	 * @event {Function} click 点击ActionSheet列表项时触发
+	 * @event {Function} close 点击取消按钮时触发
+	 * @example <u-action-sheet :list="list" @click="click" v-model="show"></u-action-sheet>
+	 */
+	export default {
+		name: "u-action-sheet",
+		props: {
+			// 点击遮罩是否可以关闭actionsheet
+			maskCloseAble: {
+				type: Boolean,
+				default: true
+			},
+			// 按钮的文字数组，可以自定义颜色和字体大小，字体单位为rpx
+			list: {
+				type: Array,
+				default () {
+					// 如下
+					// return [{
+					// 	text: '确定',
+					// 	color: '',
+					// 	fontSize: ''
+					// }]
+					return [];
+				}
+			},
+			// 顶部的提示文字
+			tips: {
+				type: Object,
+				default () {
+					return {
+						text: '',
+						color: '',
+						fontSize: '26'
+					}
+				}
+			},
+			// 底部的取消按钮
+			cancelBtn: {
+				type: Boolean,
+				default: true
+			},
+			// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 通过双向绑定控制组件的弹出与收起
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 弹出的顶部圆角值
+			borderRadius: {
+				type: [String, Number],
+				default: 0
+			},
+			// 弹出的z-index值
+			zIndex: {
+				type: [String, Number],
+				default: 0
+			}
+		},
+		computed: {
+			// 顶部提示的样式
+			tipsStyle() {
+				let style = {};
+				if (this.tips.color) style.color = this.tips.color;
+				if (this.tips.fontSize) style.fontSize = this.tips.fontSize + 'rpx';
+				return style;
+			},
+			// 操作项目的样式
+			itemStyle() {
+				return (index) => {
+					let style = {};
+					if (this.list[index].color) style.color = this.list[index].color;
+					if (this.list[index].fontSize) style.fontSize = this.list[index].fontSize + 'rpx';
+					return style;
+				}
+			},
+			uZIndex() {
+				// 如果用户有传递z-index值，优先使用
+				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+			}
+		},
+		methods: {
+			// 点击取消按钮
+			close() {
+				// 发送input事件，并不会作用于父组件，而是要设置组件内部通过props传递的value参数
+				// 这是一个vue发送事件的特殊用法
+				this.popupClose();
+				this.$emit('close');
+			},
+			// 弹窗关闭
+			popupClose() {
+				this.$emit('input', false);
+			},
+			// 点击某一个itemif (!this.show) return;
+			itemClick(index) {
+				this.$emit('click', index);
+				this.$emit('input', false);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-tips {
+		font-size: 26rpx;
+		text-align: center;
+		padding: 34rpx 0;
+		line-height: 1;
+		color: $u-tips-color;
+	}
+
+	.u-action-sheet-item {
+		display: flex;
+		line-height: 1;
+		justify-content: center;
+		align-items: center;
+		font-size: 34rpx;
+		padding: 34rpx 0;
+	}
+
+	.u-gab {
+		height: 12rpx;
+		background-color: rgb(234, 234, 236);
+	}
+
+	.u-actionsheet-cancel {
+		color: $u-main-color;
+	}
 </style>

uview/components/u-avatar/u-avatar.vue

@@ -7,6 +7,16 @@
 </template>
 
 <script>
+	/**
+	 * alertTips 提示
+	 * @description 该组件一般的图片裁剪需求场景，尤其适合于头像裁剪方面。
+	 * @tutorial https://www.uviewui.com/components/avatarCropper.html
+	 * @property {String Number} dest-width 输出图片宽度，高等于宽，单位px（默认200）
+	 * @property {String Number} rect-width 裁剪框宽度，高等于宽，单位px（默认200）
+	 * @property {String} file-type 输出的图片类型，如果'png'类型发现裁剪的图片太大，改成"jpg"即可（默认jpg）
+	 * @event {Function} uAvatarCropper 裁剪结束后的事件，通过uni.$on监听
+	 * @example <image class="u-avatar-demo" :src="avatar" mode="aspectFill"></image>
+	 */
 	let base64Avatar = "data:image/png;base64,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";
 	export default {
 		props: {

uview/components/u-button/u-button.vue

-<template>
-	<button id="u-wave-btn" class="u-btn u-line-1 u-fix-ios-appearance" :class="[
-		'u-size-' + size,
-		plain ? 'u-' + type + '-plain' : '',
-		loading ? 'u-loading' : '',
-		shape == 'circle' ? 'u-round-circle' : '',
-		hairLine ? showHairLineBorder : 'u-bold-border',
-	]"
-	:disabled="disabled"
-	:form-type="formType"
-	:open-type="openType"
-	:app-parameter="appParameter"
-	:hover-stop-propagation="hoverStopPropagation"
-	:send-message-title="sendMessageTitle"
-	send-message-path="sendMessagePath"
-	:lang="lang"
-	:session-from="sessionFrom"
-	:send-message-img="sendMessageImg"
-	:show-message-card="showMessageCard"
-	@getphonenumber="getphonenumber"
-	@getuserinfo="getuserinfo"
-	@error="error"
-	@opensetting="opensetting"
-	@launchapp="launchapp"
-	:style="[buttonStyle]" @tap="click($event)" :hover-class="getHoverClass" :loading="loading">
-		<slot></slot>
-		<view v-if="ripple" class="u-wave-ripple" :class="[waveActive ? 'u-wave-active' : '']" :style="{
-			'top': rippleTop + 'px',
-			'left': rippleLeft + 'px',
-			'width': fields.targetWidth + 'px',
-			'height': fields.targetWidth + 'px',
-			'background-color':  (rippleBgColor || 'rgba(0, 0, 0, 0.15)')
-		}">
-		</view>
-	</button>
-</template>
-
-<script>
+<template>
+	<button id="u-wave-btn" class="u-btn u-line-1 u-fix-ios-appearance" :class="[
+		'u-size-' + size,
+		plain ? 'u-' + type + '-plain' : '',
+		loading ? 'u-loading' : '',
+		shape == 'circle' ? 'u-round-circle' : '',
+		hairLine ? showHairLineBorder : 'u-bold-border',
+	]"
+	 :disabled="disabled" :form-type="formType" :open-type="openType" :app-parameter="appParameter"
+	 :hover-stop-propagation="hoverStopPropagation" :send-message-title="sendMessageTitle" send-message-path="sendMessagePath"
+	 :lang="lang" :session-from="sessionFrom" :send-message-img="sendMessageImg" :show-message-card="showMessageCard"
+	 @getphonenumber="getphonenumber" @getuserinfo="getuserinfo" @error="error" @opensetting="opensetting" @launchapp="launchapp"
+	 :style="[buttonStyle]" @tap="click($event)" :hover-class="getHoverClass" :loading="loading">
+		<slot></slot>
+		<view v-if="ripple" class="u-wave-ripple" :class="[waveActive ? 'u-wave-active' : '']" :style="{
+			'top': rippleTop + 'px',
+			'left': rippleLeft + 'px',
+			'width': fields.targetWidth + 'px',
+			'height': fields.targetWidth + 'px',
+			'background-color':  (rippleBgColor || 'rgba(0, 0, 0, 0.15)')
+		}">
+		</view>
+	</button>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description Button 按钮
+	 * @tutorial https://www.uviewui.com/components/button.html
+	 * @property {String} size 按钮的大小
+	 * @property {Boolean} ripple 是否开启点击水波纹效果
+	 * @property {String} ripple-bg-color 水波纹的背景色，ripple为true时有效
+	 * @property {String} type 按钮的样式类型
+	 * @property {Boolean} plain 按钮是否镂空，背景色透明
+	 * @property {Boolean} disabled 是否禁用
+	 * @property {Boolean} shape 按钮外观形状，见文档说明
+	 * @property {Boolean} loading 按钮名称前是否带 loading 图标(App-nvue 平台，在 ios 上为雪花，Android上为圆圈)
+	 * @property {String} form-type 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
+	 * @property {String} open-type 开放能力
+	 * @property {String} hover-class 指定按钮按下去的样式类。当 hover-class="none" 时，没有点击态效果(App-nvue 平台暂不支持)
+	 * @property {Number} hover-start-time 按住后多久出现点击态，单位毫秒
+	 * @property {Number} hover-stay-time 手指松开后点击态保留时间，单位毫秒
+	 * @property {Object} custom-style 对按钮的自定义样式，对象形式，见文档说明
+	 * @event {Function} click 按钮点击
+	 * @event {Function} getphonenumber open-type="getPhoneNumber"时有效
+	 * @event {Function} getuserinfo 用户点击该按钮时，会返回获取到的用户信息，从返回参数的detail中获取到的值同uni.getUserInfo
+	 * @event {Function} error 当使用开放能力时，发生错误的回调
+	 * @event {Function} opensetting 在打开授权设置页并关闭后回调
+	 * @event {Function} launchapp 打开 APP 成功的回调
+	 * @example <u-button>月落</u-button>
+	 */
 	export default {
-		props: {
-			// 是否细边框
-			hairLine: {
-				type: Boolean,
-				default: true
-			},
-			// 按钮的预置样式，default，primary，error，warning，success
-			type: {
-				type: String,
-				default: 'default'
-			},
-			// 按钮尺寸，default，medium，mini
-			size: {
-				type: String,
-				default: 'default'
-			},
-			// 按钮形状，circle（两边为半圆），square（带圆角）
-			shape: {
-				type: String,
-				default: 'square'
-			},
-			// 按钮是否镂空
-			plain: {
-				type: Boolean,
-				default: false
-			},
-			// 是否禁止状态
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			// 是否加载中
-			loading: {
-				type: Boolean,
-				default: false
-			},
-			// 开放能力，具体请看uniapp稳定关于button组件部分说明
-			// https://uniapp.dcloud.io/component/button
-			openType: {
-				type: String,
-				default: ''
-			},
-			// 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
-			// 取值为submit（提交表单），reset（重置表单）
-			formType: {
-				type: String,
-				default: ''
-			},
-			// 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效
-			// 只微信小程序、QQ小程序有效
-			appParameter: {
-				type: String,
-				default: ''
-			},
-			// 指定是否阻止本节点的祖先节点出现点击态，微信小程序有效
-			hoverStopPropagation: {
-				type: Boolean,
-				default: false
-			},
-			// 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
-			lang: {
-				type: String,
-				default: 'en'
-			},
-			// 会话来源，open-type="contact"时有效。只微信小程序有效
-			sessionFrom: {
-				type: String,
-				default: ''
-			},
-			// 会话内消息卡片标题，open-type="contact"时有效
-			// 默认当前标题，只微信小程序有效
-			sendMessageTitle: {
-				type: String,
-				default: ''
-			},
-			// 会话内消息卡片点击跳转小程序路径，open-type="contact"时有效	
-			// 默认当前分享路径，只微信小程序有效
-			sendMessagePath: {
-				type: String,
-				default: ''
-			},
-			// 会话内消息卡片图片，open-type="contact"时有效
-			// 默认当前页面截图，只微信小程序有效
-			sendMessageImg: {
-				type: String,
-				default: ''
-			},
-			// 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，
-			// 用户点击后可以快速发送小程序消息，open-type="contact"时有效
-			showMessageCard: {
-				type: Boolean,
-				default: false
-			},
-			// 手指按（触摸）按钮时按钮时的背景颜色
-			hoverBgColor: {
-				type: String,
-				default: ''
-			},
-			// 水波纹的背景颜色
-			rippleBgColor: {
-				type: String,
-				default: ''
-			},
-			// 是否开启水波纹效果
-			ripple: {
-				type: Boolean,
-				default: false
-			},
-			// 按下的类名
-			hoverClass: {
-				type: String,
-				default: ''
-			},
-			// 自定义样式，对象形式
-			customStyle: {
-				type: Object,
-				default() {
-					return {}
-				}
-			}
-		},
-		computed: {
-			// 当没有传bgColor变量时，按钮按下去的颜色类名
-			getHoverClass() {
-				// 如果开启水波纹效果，则不启用hover-class效果
-				if (this.loading || this.disabled || this.ripple || this.hoverClass) return '';
-				let hoverClass = '';
-				hoverClass = this.plain ? 'u-' + this.type + '-plain-hover' : 'u-' + this.type + '-hover';
-				return hoverClass;
-			},
-			// 按钮主题
-			buttonStyle() {
-				let style = {};
-				if (this.type == 'default') {
-					if (this.disabled) {
-						style.color = "#c0c4cc";
-						style.backgroundColor = "#ffffff";
-						style.borderColor = "#e4e7ed";
-					} else {
-						style.color = this.$u.color['contentColor'];
-						style.backgroundColor = "#ffffff";
-						style.borderColor = "#c0c4cc"; 
-					}
-				} else {
-					if (this.disabled) {
-						if(this.plain) {
-							style.color = this.$u.color[this.type + 'Disabled'];
-							style.backgroundColor = this.$u.color[this.type + 'Light'];
-							style.borderColor = this.$u.color[this.type + 'Disabled'];
-						} else {
-							style.color = "#ffffff";
-							style.backgroundColor = this.$u.color[this.type + 'Disabled'];
-							style.borderColor = this.$u.color[this.type + 'Disabled'];
-						}
-					} else {
-						if(this.plain) {
-							style.color = this.$u.color[this.type]
-							style.backgroundColor = this.$u.color[this.type + 'Light'];
-							style.borderColor = this.$u.color[this.type + 'Disabled'];
-						} else {
-							style.color = "#ffffff";
-							style.backgroundColor = this.$u.color[this.type];
-							style.borderColor = this.$u.color[this.type];
-						}
-					}
-				}
-
-				return Object.assign(style, this.customStyle);
-			},
-			// 在'primary', 'success', 'error', 'warning'类型下，不显示边框，否则会造成四角有毛刺现象
-			showHairLineBorder() {
-				if(['primary', 'success', 'error', 'warning'].indexOf(this.type) >= 0 && !this.plain) {
-					return '';
-				} else {
-					return 'u-hairline-border';
-				}
-			}
-		},
-		data() {
-			return {
-				rippleTop: 0, // 水波纹的起点Y坐标到按钮上边界的距离
-				rippleLeft: 0, // 水波纹起点X坐标到按钮左边界的距离
-				fields: {}, // 波纹按钮节点信息
-				waveActive: false, // 激活水波纹
-			}
-		},
-		methods: {
-			// 按钮点击
-			click(e) {
-				// 如果按钮时disabled和loading状态，不触发水波纹效果
-				if (this.loading === true || this.disabled === true) return;
-				// 是否开启水波纹效果
-				if (this.ripple) {
-					// 每次点击时，移除上一次的类，再次添加，才能触发动画效果
-					this.waveActive = false;
-					this.$nextTick(function() {
-						this.getWaveQuery(e);
-					});
-				}
-				this.$emit('click');
-			},
-			// 查询按钮的节点信息
-			getWaveQuery(e) {
-				this.getElQuery().then(res => {
-					// 查询返回的是一个数组节点
-					let data = res[0];
-					// 查询不到节点信息，不操作
-					if (!data.width || !data.width) return;
-					// 水波纹的最终形态是一个正方形(通过border-radius让其变为一个圆形)，这里要保证正方形的边长等于按钮的最长边
-					// 最终的方形（变换后的圆形）才能覆盖整个按钮
-					data.targetWidth = (data.height > data.width ? data.height : data.width);
-					if (!data.targetWidth) return;
-					this.fields = data;
-					let touchesX = '',
-						touchesY = '';
-					// #ifdef MP-BAIDU
-					touchesX = e.changedTouches[0].clientX;
-					touchesY = e.changedTouches[0].clientY;
-					// #endif
-					// #ifdef MP-ALIPAY
-					touchesX = e.detail.clientX;
-					touchesY = e.detail.clientY;
-					// #endif
-					// #ifndef MP-BAIDU || MP-ALIPAY
-					touchesX = e.touches[0].clientX;
-					touchesY = e.touches[0].clientY;
-					// #endif
-					// 获取触摸点相对于按钮上边和左边的x和y坐标，原理是通过屏幕的触摸点（touchesY），减去按钮的上边界data.top
-					// 但是由于`transform-origin`默认是center，所以这里再减去半径才是水波纹view应该的位置
-					// 总的来说，就是把水波纹的矩形（变换后的圆形）的中心点，移动到我们的触摸点位置
-					this.rippleTop = (touchesY - data.top - (data.targetWidth / 2));
-					this.rippleLeft = (touchesX - data.left - (data.targetWidth / 2));
-					this.$nextTick(() => {
-						this.waveActive = true;
-					})
-				})
-			},
-			// 获取节点信息
-			getElQuery() {
-				return new Promise(resolve => {
-					let queryInfo = '';
-					// 获取元素节点信息，请查看uniapp相关文档
-					// https://uniapp.dcloud.io/api/ui/nodes-info?id=nodesrefboundingclientrect
-					queryInfo = uni.createSelectorQuery().in(this);
-					queryInfo.select('.u-btn').boundingClientRect();
-					queryInfo.exec((data) => {
-						resolve(data)
-					});
-				})
-			},
-			// 下面为对接uniapp官方按钮开放能力事件回调的对接
-			getphonenumber(res) {
-				this.$emit('getphonenumber', res);
-			},
-			getuserinfo(res) {
-				this.$emit('getuserinfo', res); 
-			},
-			error(res) {
-				this.$emit('error', res);
-			},
-			opensetting(res) {
-				this.$emit('opensetting', res);
-			},
-			launchapp(res) {
-				this.$emit('launchapp', res);
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	button::after {
-		border: none;
-	}
-
-	.u-btn {
-		position: relative;
-		border: 0;
-		//border-radius: 10rpx;
-		display: inline-block;
-		overflow: hidden;
-		line-height: 1;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		cursor: pointer;
-		padding: 0 40rpx;
-		z-index: 1;
-		box-sizing: border-box;
-		transition: all 0.15s;
-	}
-	
-	.u-hairline-border:after {
-		content: ' ';
-		position: absolute;
-		pointer-events: none;
-		// 设置为border-box，意味着下面的scale缩小为0.5，实际上缩小的是伪元素的内容（border-box意味着内容不含border）
-		box-sizing: border-box;
-		// 中心点作为变形(scale())的原点
-		-webkit-transform-origin: 0 0;
-		transform-origin: 0 0;
-		left: 0;
-		top: 0;
-		width: 200%;
-		height: 200%;
-		-webkit-transform: scale(0.5, 0.5);
-		transform: scale(0.5, 0.5);
-		border: 1px solid currentColor;
-		z-index: 0;
-	}
-	
-	.u-bold-border {
-		border: 1px solid #FFFFFF;
-	}
-
-	.u-wave-ripple {
-		z-index: 0;
-		position: absolute;
-		border-radius: 100%;
-		background-clip: padding-box;
-		pointer-events: none;
-		user-select: none;
-		transform: scale(0);
-		opacity: 1;
-		transform-origin: center;
-	}
-
-	.u-wave-ripple.u-wave-active {
-		opacity: 0;
-		transform: scale(2);
-		transition: opacity 1s linear, transform 0.4s linear;
-	}
-
-	.u-round-circle {
-		border-radius: 100rpx;
-	}
-
-	.u-round-circle::after {
-		border-radius: 100rpx;
-	}
-
-	.u-loading::after {
-		background-color: hsla(0, 0%, 100%, .35);
-	}
-
-	.u-size-default {
-		font-size: 30rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-	}
-
-	.u-size-medium {
-		display: inline-flex;
-		width: auto;
-		font-size: 26rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-		padding: 0 80rpx;
-	}
-
-	.u-size-mini {
-		display: inline-flex;
-		width: auto;
-		font-size: 22rpx;
-		padding-top: 1px;
-		height: 50rpx;
-		line-height: 50rpx;
-		padding: 0 20rpx;
-	}
-
-	.u-primary-plain-hover {
-		color: #FFFFFF!important;
-		background: $u-type-primary-dark !important;
-	}
-
-	.u-default-plain-hover {
-		color: $u-type-primary-dark !important;
-		background: $u-type-primary-light !important;
-	}
-
-	.u-success-plain-hover {
-		color: #FFFFFF!important;
-		background: $u-type-success-dark!important;
-	}
-
-	.u-warning-plain-hover {
-		color: #FFFFFF!important;
-		background: $u-type-warning-dark !important;
-	}
-
-	.u-error-plain-hover {
-		color: #FFFFFF!important;
-		background: $u-type-error-dark !important;
-	}
-	
-	.u-info-plain-hover {
-		color: #FFFFFF!important;
-		background: $u-type-info-dark !important;
-	}
-
-	.u-default-hover {
-		color: $u-type-primary-dark !important;
-		border-color: $u-type-primary-dark !important;
-		background-color: $u-type-primary-light !important;;
-	}
-
-	.u-primary-hover {
-		background: $u-type-primary-dark !important;
-		color: #fff;
-	}
-
-	.u-success-hover {
-		background: $u-type-success-dark !important;
-		color: #fff;
-	}
-
-	.u-info-hover {
-		background: $u-type-info-dark !important;
-		color: #fff;
-	}
-
-	.u-warning-hover {
-		background: $u-type-warning-dark !important;
-		color: #fff;
-	}
-
-	.u-error-hover {
-		background: $u-type-error-dark !important;
-		color: #fff;
-	}
+		name:"u-button",
+		props: {
+			// 是否细边框
+			hairLine: {
+				type: Boolean,
+				default: true
+			},
+			// 按钮的预置样式，default，primary，error，warning，success
+			type: {
+				type: String,
+				default: 'default'
+			},
+			// 按钮尺寸，default，medium，mini
+			size: {
+				type: String,
+				default: 'default'
+			},
+			// 按钮形状，circle（两边为半圆），square（带圆角）
+			shape: {
+				type: String,
+				default: 'square'
+			},
+			// 按钮是否镂空
+			plain: {
+				type: Boolean,
+				default: false
+			},
+			// 是否禁止状态
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 是否加载中
+			loading: {
+				type: Boolean,
+				default: false
+			},
+			// 开放能力，具体请看uniapp稳定关于button组件部分说明
+			// https://uniapp.dcloud.io/component/button
+			openType: {
+				type: String,
+				default: ''
+			},
+			// 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
+			// 取值为submit（提交表单），reset（重置表单）
+			formType: {
+				type: String,
+				default: ''
+			},
+			// 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效
+			// 只微信小程序、QQ小程序有效
+			appParameter: {
+				type: String,
+				default: ''
+			},
+			// 指定是否阻止本节点的祖先节点出现点击态，微信小程序有效
+			hoverStopPropagation: {
+				type: Boolean,
+				default: false
+			},
+			// 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
+			lang: {
+				type: String,
+				default: 'en'
+			},
+			// 会话来源，open-type="contact"时有效。只微信小程序有效
+			sessionFrom: {
+				type: String,
+				default: ''
+			},
+			// 会话内消息卡片标题，open-type="contact"时有效
+			// 默认当前标题，只微信小程序有效
+			sendMessageTitle: {
+				type: String,
+				default: ''
+			},
+			// 会话内消息卡片点击跳转小程序路径，open-type="contact"时有效	
+			// 默认当前分享路径，只微信小程序有效
+			sendMessagePath: {
+				type: String,
+				default: ''
+			},
+			// 会话内消息卡片图片，open-type="contact"时有效
+			// 默认当前页面截图，只微信小程序有效
+			sendMessageImg: {
+				type: String,
+				default: ''
+			},
+			// 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，
+			// 用户点击后可以快速发送小程序消息，open-type="contact"时有效
+			showMessageCard: {
+				type: Boolean,
+				default: false
+			},
+			// 手指按（触摸）按钮时按钮时的背景颜色
+			hoverBgColor: {
+				type: String,
+				default: ''
+			},
+			// 水波纹的背景颜色
+			rippleBgColor: {
+				type: String,
+				default: ''
+			},
+			// 是否开启水波纹效果
+			ripple: {
+				type: Boolean,
+				default: false
+			},
+			// 按下的类名
+			hoverClass: {
+				type: String,
+				default: ''
+			},
+			// 自定义样式，对象形式
+			customStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		computed: {
+			// 当没有传bgColor变量时，按钮按下去的颜色类名
+			getHoverClass() {
+				// 如果开启水波纹效果，则不启用hover-class效果
+				if (this.loading || this.disabled || this.ripple || this.hoverClass) return '';
+				let hoverClass = '';
+				hoverClass = this.plain ? 'u-' + this.type + '-plain-hover' : 'u-' + this.type + '-hover';
+				return hoverClass;
+			},
+			// 按钮主题
+			buttonStyle() {
+				let style = {};
+				if (this.type == 'default') {
+					if (this.disabled) {
+						style.color = "#c0c4cc";
+						style.backgroundColor = "#ffffff";
+						style.borderColor = "#e4e7ed";
+					} else {
+						style.color = this.$u.color['contentColor'];
+						style.backgroundColor = "#ffffff";
+						style.borderColor = "#c0c4cc";
+					}
+				} else {
+					if (this.disabled) {
+						if (this.plain) {
+							style.color = this.$u.color[this.type + 'Disabled'];
+							style.backgroundColor = this.$u.color[this.type + 'Light'];
+							style.borderColor = this.$u.color[this.type + 'Disabled'];
+						} else {
+							style.color = "#ffffff";
+							style.backgroundColor = this.$u.color[this.type + 'Disabled'];
+							style.borderColor = this.$u.color[this.type + 'Disabled'];
+						}
+					} else {
+						if (this.plain) {
+							style.color = this.$u.color[this.type]
+							style.backgroundColor = this.$u.color[this.type + 'Light'];
+							style.borderColor = this.$u.color[this.type + 'Disabled'];
+						} else {
+							style.color = "#ffffff";
+							style.backgroundColor = this.$u.color[this.type];
+							style.borderColor = this.$u.color[this.type];
+						}
+					}
+				}
+
+				return Object.assign(style, this.customStyle);
+			},
+			// 在'primary', 'success', 'error', 'warning'类型下，不显示边框，否则会造成四角有毛刺现象
+			showHairLineBorder() {
+				if (['primary', 'success', 'error', 'warning'].indexOf(this.type) >= 0 && !this.plain) {
+					return '';
+				} else {
+					return 'u-hairline-border';
+				}
+			}
+		},
+		data() {
+			return {
+				rippleTop: 0, // 水波纹的起点Y坐标到按钮上边界的距离
+				rippleLeft: 0, // 水波纹起点X坐标到按钮左边界的距离
+				fields: {}, // 波纹按钮节点信息
+				waveActive: false, // 激活水波纹
+			}
+		},
+		methods: {
+			// 按钮点击
+			click(e) {
+				// 如果按钮时disabled和loading状态，不触发水波纹效果
+				if (this.loading === true || this.disabled === true) return;
+				// 是否开启水波纹效果
+				if (this.ripple) {
+					// 每次点击时，移除上一次的类，再次添加，才能触发动画效果
+					this.waveActive = false;
+					this.$nextTick(function() {
+						this.getWaveQuery(e);
+					});
+				}
+				this.$emit('click');
+			},
+			// 查询按钮的节点信息
+			getWaveQuery(e) {
+				this.getElQuery().then(res => {
+					// 查询返回的是一个数组节点
+					let data = res[0];
+					// 查询不到节点信息，不操作
+					if (!data.width || !data.width) return;
+					// 水波纹的最终形态是一个正方形(通过border-radius让其变为一个圆形)，这里要保证正方形的边长等于按钮的最长边
+					// 最终的方形（变换后的圆形）才能覆盖整个按钮
+					data.targetWidth = (data.height > data.width ? data.height : data.width);
+					if (!data.targetWidth) return;
+					this.fields = data;
+					let touchesX = '',
+						touchesY = '';
+					// #ifdef MP-BAIDU
+					touchesX = e.changedTouches[0].clientX;
+					touchesY = e.changedTouches[0].clientY;
+					// #endif
+					// #ifdef MP-ALIPAY
+					touchesX = e.detail.clientX;
+					touchesY = e.detail.clientY;
+					// #endif
+					// #ifndef MP-BAIDU || MP-ALIPAY
+					touchesX = e.touches[0].clientX;
+					touchesY = e.touches[0].clientY;
+					// #endif
+					// 获取触摸点相对于按钮上边和左边的x和y坐标，原理是通过屏幕的触摸点（touchesY），减去按钮的上边界data.top
+					// 但是由于`transform-origin`默认是center，所以这里再减去半径才是水波纹view应该的位置
+					// 总的来说，就是把水波纹的矩形（变换后的圆形）的中心点，移动到我们的触摸点位置
+					this.rippleTop = (touchesY - data.top - (data.targetWidth / 2));
+					this.rippleLeft = (touchesX - data.left - (data.targetWidth / 2));
+					this.$nextTick(() => {
+						this.waveActive = true;
+					})
+				})
+			},
+			// 获取节点信息
+			getElQuery() {
+				return new Promise(resolve => {
+					let queryInfo = '';
+					// 获取元素节点信息，请查看uniapp相关文档
+					// https://uniapp.dcloud.io/api/ui/nodes-info?id=nodesrefboundingclientrect
+					queryInfo = uni.createSelectorQuery().in(this);
+					queryInfo.select('.u-btn').boundingClientRect();
+					queryInfo.exec((data) => {
+						resolve(data)
+					});
+				})
+			},
+			// 下面为对接uniapp官方按钮开放能力事件回调的对接
+			getphonenumber(res) {
+				this.$emit('getphonenumber', res);
+			},
+			getuserinfo(res) {
+				this.$emit('getuserinfo', res);
+			},
+			error(res) {
+				this.$emit('error', res);
+			},
+			opensetting(res) {
+				this.$emit('opensetting', res);
+			},
+			launchapp(res) {
+				this.$emit('launchapp', res);
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	button::after {
+		border: none;
+	}
+
+	.u-btn {
+		position: relative;
+		border: 0;
+		//border-radius: 10rpx;
+		display: inline-block;
+		overflow: hidden;
+		line-height: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		cursor: pointer;
+		padding: 0 40rpx;
+		z-index: 1;
+		box-sizing: border-box;
+		transition: all 0.15s;
+	}
+
+	.u-hairline-border:after {
+		content: ' ';
+		position: absolute;
+		pointer-events: none;
+		// 设置为border-box，意味着下面的scale缩小为0.5，实际上缩小的是伪元素的内容（border-box意味着内容不含border）
+		box-sizing: border-box;
+		// 中心点作为变形(scale())的原点
+		-webkit-transform-origin: 0 0;
+		transform-origin: 0 0;
+		left: 0;
+		top: 0;
+		width: 200%;
+		height: 200%;
+		-webkit-transform: scale(0.5, 0.5);
+		transform: scale(0.5, 0.5);
+		border: 1px solid currentColor;
+		z-index: 0;
+	}
+
+	.u-bold-border {
+		border: 1px solid #FFFFFF;
+	}
+
+	.u-wave-ripple {
+		z-index: 0;
+		position: absolute;
+		border-radius: 100%;
+		background-clip: padding-box;
+		pointer-events: none;
+		user-select: none;
+		transform: scale(0);
+		opacity: 1;
+		transform-origin: center;
+	}
+
+	.u-wave-ripple.u-wave-active {
+		opacity: 0;
+		transform: scale(2);
+		transition: opacity 1s linear, transform 0.4s linear;
+	}
+
+	.u-round-circle {
+		border-radius: 100rpx;
+	}
+
+	.u-round-circle::after {
+		border-radius: 100rpx;
+	}
+
+	.u-loading::after {
+		background-color: hsla(0, 0%, 100%, .35);
+	}
+
+	.u-size-default {
+		font-size: 30rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+
+	.u-size-medium {
+		display: inline-flex;
+		width: auto;
+		font-size: 26rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		padding: 0 80rpx;
+	}
+
+	.u-size-mini {
+		display: inline-flex;
+		width: auto;
+		font-size: 22rpx;
+		padding-top: 1px;
+		height: 50rpx;
+		line-height: 50rpx;
+		padding: 0 20rpx;
+	}
+
+	.u-primary-plain-hover {
+		color: #FFFFFF !important;
+		background: $u-type-primary-dark !important;
+	}
+
+	.u-default-plain-hover {
+		color: $u-type-primary-dark !important;
+		background: $u-type-primary-light !important;
+	}
+
+	.u-success-plain-hover {
+		color: #FFFFFF !important;
+		background: $u-type-success-dark !important;
+	}
+
+	.u-warning-plain-hover {
+		color: #FFFFFF !important;
+		background: $u-type-warning-dark !important;
+	}
+
+	.u-error-plain-hover {
+		color: #FFFFFF !important;
+		background: $u-type-error-dark !important;
+	}
+
+	.u-info-plain-hover {
+		color: #FFFFFF !important;
+		background: $u-type-info-dark !important;
+	}
+
+	.u-default-hover {
+		color: $u-type-primary-dark !important;
+		border-color: $u-type-primary-dark !important;
+		background-color: $u-type-primary-light !important;
+		;
+	}
+
+	.u-primary-hover {
+		background: $u-type-primary-dark !important;
+		color: #fff;
+	}
+
+	.u-success-hover {
+		background: $u-type-success-dark !important;
+		color: #fff;
+	}
+
+	.u-info-hover {
+		background: $u-type-info-dark !important;
+		color: #fff;
+	}
+
+	.u-warning-hover {
+		background: $u-type-warning-dark !important;
+		color: #fff;
+	}
+
+	.u-error-hover {
+		background: $u-type-error-dark !important;
+		color: #fff;
+	}
 </style>

uview/components/u-car-keyboard/u-car-keyboard.vue

-<template>
-	<view class="u-keyboard" @touchmove.stop.prevent>
-		<view class="u-keyboard-grids">
-			<block>
-				<view class="u-keyboard-grids-item" v-for="(group, i) in abc ? EngKeyBoardList : areaList" :key="i">
-					<view :hover-stay-time="100" @tap="carInputClick(i, j)" hover-class="u-carinput-hover" class="u-keyboard-grids-btn" v-for="(item, j) in group" :key="j">
-						{{ item }}
-					</view>
-				</view>
-				<view @touchstart="backspaceClick" @touchend="clearTimer" :hover-stay-time="100" class="u-keyboard-back" hover-class="u-hover-class">
-					<u-icon :size="38" name="backspace" :bold="true"></u-icon>
-				</view>
-				<view :hover-stay-time="100" class="u-keyboard-change" hover-class="u-carinput-hover" @tap="changeCarInputMode">
-					<text class="zh" :class="[!abc ? 'active' : 'inactive']">中</text>
-					/
-					<text class="en" :class="[abc ? 'active' : 'inactive']">英</text>
-				</view>
-			</block>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		// 是否打乱键盘按键的顺序
-		random: {
-			type: Boolean,
-			default: false
-		}
-	},
-	data() {
-		return {
-			// 车牌输入时，abc=true为输入车牌号码，bac=false为输入省份中文简称
-			abc: false
-		};
-	},
-	computed: {
-		areaList() {
-			let data = [
-				'京',
-				'沪',
-				'粤',
-				'津',
-				'冀',
-				'豫',
-				'云',
-				'辽',
-				'黑',
-				'湘',
-				'皖',
-				'鲁',
-				'苏',
-				'浙',
-				'赣',
-				'鄂',
-				'桂',
-				'甘',
-				'晋',
-				'陕',
-				'蒙',
-				'吉',
-				'闽',
-				'贵',
-				'渝',
-				'川',
-				'青',
-				'琼',
-				'宁',
-				'挂',
-				'藏',
-				'港',
-				'澳',
-				'新',
-				'使',
-				'学'
-			];
-			let tmp = [];
-			// 打乱顺序
-			if (this.random) data = this.$u.randomArray(data);
-			// 切割成二维数组
-			tmp[0] = data.slice(0, 10);
-			tmp[1] = data.slice(10, 20);
-			tmp[2] = data.slice(20, 30);
-			tmp[3] = data.slice(30, 36);
-			return tmp;
-		},
-		EngKeyBoardList() {
-			let data = [
-				1,
-				2,
-				3,
-				4,
-				5,
-				6,
-				7,
-				8,
-				9,
-				0,
-				'Q',
-				'W',
-				'E',
-				'R',
-				'T',
-				'Y',
-				'U',
-				'I',
-				'O',
-				'P',
-				'A',
-				'S',
-				'D',
-				'F',
-				'G',
-				'H',
-				'J',
-				'K',
-				'L',
-				'Z',
-				'X',
-				'C',
-				'V',
-				'B',
-				'N',
-				'M'
-			];
-			let tmp = [];
-			if (this.random) data = this.$u.randomArray(data);
-			tmp[0] = data.slice(0, 10);
-			tmp[1] = data.slice(10, 20);
-			tmp[2] = data.slice(20, 30);
-			tmp[3] = data.slice(30, 36);
-			return tmp;
-		}
-	},
-	methods: {
-		// 点击键盘按钮
-		carInputClick(i, j) {
-			let value = '';
-			// 不同模式，获取不同数组的值
-			if (this.abc) value = this.EngKeyBoardList[i][j];
-			else value = this.areaList[i][j];
-			this.$emit('change', value);
-		},
-		// 修改汽车牌键盘的输入模式，中文|英文
-		changeCarInputMode() {
-			this.abc = !this.abc;
-		},
-		// 点击退格键
-		backspaceClick() {
-			this.$emit('backspace');
-			 clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
-		      this.timer = setInterval(() => {
-		    	  this.$emit('backspace');
-		      }, 250);
-		},
-		clearTimer() {
-			clearInterval(this.timer);
-		},
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.u-keyboard-grids {
-	background: rgb(215, 215, 217);
-	padding: 24rpx 0;
-	position: relative;
-}
-
-.u-keyboard-grids-item {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.u-keyboard-grids-btn {
-	text-decoration: none;
-	width: 62rpx;
-	flex: 0 0 64rpx;
-	height: 80rpx;
-	display: inline-block;
-	font-size: 36rpx;
-	text-align: center;
-	line-height: 80rpx;
-	background-color: #fff;
-	margin: 8rpx 5rpx;
-	border-radius: 8rpx;
-	box-shadow: 0 2rpx 0rpx #888992;
-	font-weight: 500;
-}
-
-.u-carinput-hover {
-	background-color: rgb(185, 188, 195)!important;
-}
-
-.u-keyboard-back {
-	position: absolute;
-	width: 96rpx;
-	right: 22rpx;
-	bottom: 32rpx;
-	height: 80rpx;
-	background-color: rgb(185, 188, 195);
-	display: flex;
-	align-items: center;
-	border-radius: 8rpx;
-	justify-content: center;
-	box-shadow: 0 2rpx 0rpx #888992;
-}
-
-.u-keyboard-change {
-	font-size: 24rpx;
-	box-shadow: 0 2rpx 0rpx #888992;
-	position: absolute;
-	width: 96rpx;
-	left: 22rpx;
-	line-height: 1;
-	bottom: 32rpx;
-	height: 80rpx;
-	background-color: #ffffff;
-	display: flex;
-	align-items: center;
-	border-radius: 8rpx;
-	justify-content: center;
-}
-
-.u-keyboard-change .inactive.zh {
-	transform: scale(0.85) translateY(-10rpx);
-}
-
-.u-keyboard-change .inactive.en {
-	transform: scale(0.85) translateY(10rpx);
-}
-
-.u-keyboard-change .active {
-	color: rgb(237, 112, 64);
-	font-size: 30rpx;
-}
-
-.u-keyboard-change .zh {
-	transform: translateY(-10rpx);
-}
-
-.u-keyboard-change .en {
-	transform: translateY(10rpx);
-}
+<template>
+	<view class="u-keyboard" @touchmove.stop.prevent>
+		<view class="u-keyboard-grids">
+			<block>
+				<view class="u-keyboard-grids-item" v-for="(group, i) in abc ? EngKeyBoardList : areaList" :key="i">
+					<view :hover-stay-time="100" @tap="carInputClick(i, j)" hover-class="u-carinput-hover" class="u-keyboard-grids-btn"
+					 v-for="(item, j) in group" :key="j">
+						{{ item }}
+					</view>
+				</view>
+				<view @touchstart="backspaceClick" @touchend="clearTimer" :hover-stay-time="100" class="u-keyboard-back"
+				 hover-class="u-hover-class">
+					<u-icon :size="38" name="backspace" :bold="true"></u-icon>
+				</view>
+				<view :hover-stay-time="100" class="u-keyboard-change" hover-class="u-carinput-hover" @tap="changeCarInputMode">
+					<text class="zh" :class="[!abc ? 'active' : 'inactive']">中</text>
+					/
+					<text class="en" :class="[abc ? 'active' : 'inactive']">英</text>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 此为uViw自定义的键盘面板，内含了数字键盘，车牌号键，身份证号键盘3中模式，都有可以打乱按键顺序的选项。
+	 * @tutorial https://www.uviewui.com/components/keyboard.html
+	 * @property {String} mode 键盘类型，见官网基本使用的说明（默认number）
+	 * @property {Boolean} dot-enabled 是否显示"."按键，只在mode=number时有效（默认true）
+	 * @property {Boolean} tooltip 是否显示键盘顶部工具条（默认true）
+	 * @property {String} tips 工具条中间的提示文字，见官网基本使用的说明，如不需要，请传""空字符
+	 * @property {Boolean} cancel-btn 是否显示工具条左边的"取消"按钮（默认true）
+	 * @property {Boolean} confirm-btn 是否显示工具条右边的"完成"按钮（默认true）
+	 * @property {Boolean} mask 是否显示遮罩（默认true）
+	 * @property {Number String} z-index 弹出键盘的z-index值（默认1075）
+	 * @property {Boolean} random 是否打乱键盘按键的顺序（默认false）
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+	 * @property {Boolean} mask-close-able 是否允许点击遮罩收起键盘（默认true）
+	 * @event {Function} change 按键被点击(不包含退格键被点击)
+	 * @event {Function} cancel 键盘顶部工具条左边的"取消"按钮被点击
+	 * @event {Function} confirm 键盘顶部工具条右边的"完成"按钮被点击
+	 * @event {Function} backspace 键盘退格键被点击
+	 * @example <u-keyboard ref="uKeyboard" mode="car" v-model="show"></u-keyboard>
+	 */
+	export default {
+		name: "u-keyboard",
+		props: {
+			// 是否打乱键盘按键的顺序
+			random: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				// 车牌输入时，abc=true为输入车牌号码，bac=false为输入省份中文简称
+				abc: false
+			};
+		},
+		computed: {
+			areaList() {
+				let data = [
+					'京',
+					'沪',
+					'粤',
+					'津',
+					'冀',
+					'豫',
+					'云',
+					'辽',
+					'黑',
+					'湘',
+					'皖',
+					'鲁',
+					'苏',
+					'浙',
+					'赣',
+					'鄂',
+					'桂',
+					'甘',
+					'晋',
+					'陕',
+					'蒙',
+					'吉',
+					'闽',
+					'贵',
+					'渝',
+					'川',
+					'青',
+					'琼',
+					'宁',
+					'挂',
+					'藏',
+					'港',
+					'澳',
+					'新',
+					'使',
+					'学'
+				];
+				let tmp = [];
+				// 打乱顺序
+				if (this.random) data = this.$u.randomArray(data);
+				// 切割成二维数组
+				tmp[0] = data.slice(0, 10);
+				tmp[1] = data.slice(10, 20);
+				tmp[2] = data.slice(20, 30);
+				tmp[3] = data.slice(30, 36);
+				return tmp;
+			},
+			EngKeyBoardList() {
+				let data = [
+					1,
+					2,
+					3,
+					4,
+					5,
+					6,
+					7,
+					8,
+					9,
+					0,
+					'Q',
+					'W',
+					'E',
+					'R',
+					'T',
+					'Y',
+					'U',
+					'I',
+					'O',
+					'P',
+					'A',
+					'S',
+					'D',
+					'F',
+					'G',
+					'H',
+					'J',
+					'K',
+					'L',
+					'Z',
+					'X',
+					'C',
+					'V',
+					'B',
+					'N',
+					'M'
+				];
+				let tmp = [];
+				if (this.random) data = this.$u.randomArray(data);
+				tmp[0] = data.slice(0, 10);
+				tmp[1] = data.slice(10, 20);
+				tmp[2] = data.slice(20, 30);
+				tmp[3] = data.slice(30, 36);
+				return tmp;
+			}
+		},
+		methods: {
+			// 点击键盘按钮
+			carInputClick(i, j) {
+				let value = '';
+				// 不同模式，获取不同数组的值
+				if (this.abc) value = this.EngKeyBoardList[i][j];
+				else value = this.areaList[i][j];
+				this.$emit('change', value);
+			},
+			// 修改汽车牌键盘的输入模式，中文|英文
+			changeCarInputMode() {
+				this.abc = !this.abc;
+			},
+			// 点击退格键
+			backspaceClick() {
+				this.$emit('backspace');
+				clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
+				this.timer = setInterval(() => {
+					this.$emit('backspace');
+				}, 250);
+			},
+			clearTimer() {
+				clearInterval(this.timer);
+			},
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.u-keyboard-grids {
+		background: rgb(215, 215, 217);
+		padding: 24rpx 0;
+		position: relative;
+	}
+
+	.u-keyboard-grids-item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.u-keyboard-grids-btn {
+		text-decoration: none;
+		width: 62rpx;
+		flex: 0 0 64rpx;
+		height: 80rpx;
+		display: inline-block;
+		font-size: 36rpx;
+		text-align: center;
+		line-height: 80rpx;
+		background-color: #fff;
+		margin: 8rpx 5rpx;
+		border-radius: 8rpx;
+		box-shadow: 0 2rpx 0rpx #888992;
+		font-weight: 500;
+	}
+
+	.u-carinput-hover {
+		background-color: rgb(185, 188, 195) !important;
+	}
+
+	.u-keyboard-back {
+		position: absolute;
+		width: 96rpx;
+		right: 22rpx;
+		bottom: 32rpx;
+		height: 80rpx;
+		background-color: rgb(185, 188, 195);
+		display: flex;
+		align-items: center;
+		border-radius: 8rpx;
+		justify-content: center;
+		box-shadow: 0 2rpx 0rpx #888992;
+	}
+
+	.u-keyboard-change {
+		font-size: 24rpx;
+		box-shadow: 0 2rpx 0rpx #888992;
+		position: absolute;
+		width: 96rpx;
+		left: 22rpx;
+		line-height: 1;
+		bottom: 32rpx;
+		height: 80rpx;
+		background-color: #ffffff;
+		display: flex;
+		align-items: center;
+		border-radius: 8rpx;
+		justify-content: center;
+	}
+
+	.u-keyboard-change .inactive.zh {
+		transform: scale(0.85) translateY(-10rpx);
+	}
+
+	.u-keyboard-change .inactive.en {
+		transform: scale(0.85) translateY(10rpx);
+	}
+
+	.u-keyboard-change .active {
+		color: rgb(237, 112, 64);
+		font-size: 30rpx;
+	}
+
+	.u-keyboard-change .zh {
+		transform: translateY(-10rpx);
+	}
+
+	.u-keyboard-change .en {
+		transform: translateY(10rpx);
+	}
 </style>

uview/components/u-cell-group/u-cell-group.vue

-<template>
-	<view class="u-cell-box">
-		<view class="u-cell-title" v-if="title" :style="[titleStyle]">
-			{{title}}
-		</view>
-		<view class="u-cell-item-box" :class="{'u-border-bottom u-border-top': border}">
-			<slot />
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			// 分组标题
-			title: {
-				type: String,
-				default: ''
-			},
-			// 是否显示分组list上下边框
-			border: {
-				type: Boolean,
-				default: true
-			},
-			// 分组标题的样式，对象形式，注意驼峰属性写法
-			// 类似 {'font-size': '24rpx'} 和 {'fontSize': '24rpx'}
-			titleStyle: {
-				type: Object,
-				default() {
-					return {};
-				}
-			}
-		},
-		data() {
-			return {
-				index: 0,
-			}
-		},
-		provide() {
-			return {
-				uCellGroup: this
-			}
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.u-cell-box {
-		width: 100%;
-	}
-	
-	.u-cell-title {
-		padding: 30rpx 32rpx 10rpx 32rpx;
-		font-size: 30rpx;
-		text-align: left;
-		color: $u-tips-color;
-	}
-	
-	.u-cell-item-box {
-		background-color: #FFFFFF;
-	}
+<template>
+	<view class="u-cell-box">
+		<view class="u-cell-title" v-if="title" :style="[titleStyle]">
+			{{title}}
+		</view>
+		<view class="u-cell-item-box" :class="{'u-border-bottom u-border-top': border}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description cell单元格一般用于一组列表的情况，比如个人中心页，设置页等。搭配u-cell-item
+	 * @tutorial https://www.uviewui.com/components/cell.html
+	 * @property {String} title 分组标题
+	 * @property {Boolean} border 是否显示外边框（默认true）
+	 * @property {Object} title-style 分组标题的的样式，对象形式，如{'font-size': '24rpx'} 或 {'fontSize': '24rpx'}
+	 * @example <u-cell-group title="设置喜好">
+	 */
+	export default {
+		name: "u-cell-group",
+		props: {
+			// 分组标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 是否显示分组list上下边框
+			border: {
+				type: Boolean,
+				default: true
+			},
+			// 分组标题的样式，对象形式，注意驼峰属性写法
+			// 类似 {'font-size': '24rpx'} 和 {'fontSize': '24rpx'}
+			titleStyle: {
+				type: Object,
+				default () {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				index: 0,
+			}
+		},
+		provide() {
+			return {
+				uCellGroup: this
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-cell-box {
+		width: 100%;
+	}
+
+	.u-cell-title {
+		padding: 30rpx 32rpx 10rpx 32rpx;
+		font-size: 30rpx;
+		text-align: left;
+		color: $u-tips-color;
+	}
+
+	.u-cell-item-box {
+		background-color: #FFFFFF;
+	}
 </style>

uview/components/u-cell-item/u-cell-item.vue

-<template>
-	<view @tap="click" class="u-cell-item-box" :class="{'u-cell-border': itemIndex > 0 }" hover-stay-time="150" :hover-class="hover ? 'u-hover-class' : ''" :style="{
-		backgroundColor: bgColor
-	}">
-		<view class="u-cell-content">
-			<view class="u-icon-wrap" v-if="icon">
-				<u-icon size="32" :name="icon" class="u-icon"></u-icon>
-			</view>
-			<view class="u-icon-wrap">
-				<slot name="icon"></slot>
-			</view>
-			<view class="u-cell-title" :style="[titleStyle]">
-				<text class="u-title-text" v-if="title">{{title}}</text>
-				<slot name="left"></slot>
-			</view>
-			<view class="u-cell-value" v-if="value">
-				<text class="u-value-text" :style="[valueStyle]" v-if="value">{{value}}</text>
-			</view>
-			<view v-else class="u-slot-wrap">
-				<slot name="right"></slot>
-			</view>
-			<view :style="[arrowStyle]" class="u-icon-wrap">
-				<u-icon v-if="arrow" size="26" class="u-arror-right" color="#969799" name="arrow-right"></u-icon>
-			</view>
-		</view>
-		<view class="u-cell-label" v-if="label" :style="[labelStyle]">
-			{{label}}
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			// 左侧图标名称(只能uView内置图标)，或者图标src
-			icon: {
-				type: String,
-				default: ''
-			},
-			// 左侧标题
-			title: {
-				type: String,
-				default: ''
-			},
-			// 右侧内容
-			value: {
-				type: String,
-				default: ''
-			},
-			// 标题下方的描述信息
-			label: {
-				type: String,
-				default: ''
-			},
-			// 是否显示内边框
-			border: {
-				type: Boolean,
-				default: true
-			},
-			// 是否开启点击反馈，即点击是cell背景为灰色
-			hover: {
-				type: Boolean,
-				default: true
-			},
-			// 是否显示右侧箭头
-			arrow: {
-				type: Boolean,
-				default: true
-			},
-			// 右侧箭头方向，可选值：right|up|down，默认为right
-			arrowDirection: {
-				type: String,
-				default: 'right'
-			},
-			// 控制标题的样式
-			titleStyle: {
-				type: Object,
-				default() {
-					return {};
-				}
-			},
-			// 右侧显示内容的样式
-			valueStyle: {
-				type: Object,
-				default() {
-					return {};
-				}
-			},
-			// 描述信息的样式
-			labelStyle: {
-				type: Object,
-				default() {
-					return {};
-				}
-			},
-			// 背景颜色
-			bgColor: {
-				type: String,
-				default: '#ffffff'
-			},
-			// 用于识别被点击的是第几个cell
-			index: {
-				type: [String, Number],
-				default: ''
-			}
-		},
-		inject: ['uCellGroup'],
-		data() {
-			return {
-				itemIndex: 0,
-			}
-		},
-		created() {
-			this.itemIndex = this.uCellGroup.index++;
-		},
-		computed: {
-			arrowStyle() {
-				let style = {};
-				if(this.arrowDirection == 'top') style.transform = 'rotate(-90deg)';
-				else if(this.arrowDirection == 'bottom') style.transform = 'rotate(90deg)';
-				else style.transform = 'rotate(0deg)';
-				return style;
-			}
-		},
-		methods: {
-			click() {
-				this.$emit('click', this.index);
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.u-cell-item-box {
-		padding: 28rpx 32rpx;
-		position: relative;
-	}
-	
-	.u-cell-border:after {
-		left: 32rpx!important;
-		position: absolute;
-		box-sizing: border-box;
-		content: ' ';
-		pointer-events: none;
-		right: 0;
-		top: 0;
-		border-bottom: 1px solid $u-border-color;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-	}
-	
-	.u-cell-content {
-		display: flex;
-		align-items: center;
-	}
-	
-	.u-cell-title {
-		color: #323233;
-		font-size: 30rpx;
-		flex: 1;
-		margin-left: 6rpx;
-		text-align: left;
-	}
-	
-	.u-cell-value {
-		flex: 1;
-		font-size: 26rpx;
-		color: #969799;
-		text-align: right;
-	}
-	
-	.u-cell-label {
-		color: #969799;
-		font-size: 26rpx;
-		margin-top: 10rpx;
-		text-align: left;
-	}
-	
-	.u-slot-wrap {
-		display: flex;
-		align-items: center;
-	}
-	
-	// 微信小程序需要额外处理可能通过slot传入badge和switch的问题
-	// 否则无法垂直居中
-	/* #ifdef MP-WEIXIN */
-	.u-slot-wrap /deep/ u-badge,
-	.u-slot-wrap /deep/ u-switch {
-		display: flex;
-		align-items: center;
-	}
-	/* #endif */
-	
-	.u-icon {
-		margin-right: 6rpx;
-	}
-	
-	.u-value-text {
-		margin-right: 10rpx;
-	}
-	
-	.u-title-text {
-		margin-right: 10rpx;
-	}
-</style>
+<template>
+	<view @tap="click" class="u-cell-item-box" :class="{'u-cell-border': itemIndex > 0 }" hover-stay-time="150"
+	 :hover-class="hover ? 'u-hover-class' : ''" :style="{
+		backgroundColor: bgColor
+	}">
+		<view class="u-cell-content">
+			<view class="u-icon-wrap" v-if="icon">
+				<u-icon size="32" :name="icon" class="u-icon"></u-icon>
+			</view>
+			<view class="u-icon-wrap">
+				<slot name="icon"></slot>
+			</view>
+			<view class="u-cell-title" :style="[titleStyle]">
+				<text class="u-title-text" v-if="title">{{title}}</text>
+				<slot name="left"></slot>
+			</view>
+			<view class="u-cell-value" v-if="value">
+				<text class="u-value-text" :style="[valueStyle]" v-if="value">{{value}}</text>
+			</view>
+			<view v-else class="u-slot-wrap">
+				<slot name="right"></slot>
+			</view>
+			<view :style="[arrowStyle]" class="u-icon-wrap">
+				<u-icon v-if="arrow" size="26" class="u-arror-right" color="#969799" name="arrow-right"></u-icon>
+			</view>
+		</view>
+		<view class="u-cell-label" v-if="label" :style="[labelStyle]">
+			{{label}}
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 警告提示，展现需要关注的信息。
+	 * @tutorial https://www.uviewui.com/components/cell.html
+	 * @property {String} title 左侧标题
+	 * @property {String} icon 左侧图标名，只支持uView内置图标，见Icon 图标
+	 * @property {String} value 右侧内容
+	 * @property {String} label 标题下方的描述信息
+	 * @property {Boolean} border 是否显示每个cell的下边框（默认true）
+	 * @property {Boolean} hover 是否开启点击反馈，hover-class形式，如果右侧通过slot传递switch进去的话，可以将此值设置为false（默认true）
+	 * @property {Boolean} arrow 是否显示右侧箭头（默认true）
+	 * @property {Boolean} arrow-direction 箭头方向，可选值（默认right）
+	 * @property {Object} title-style 标题样式，对象形式
+	 * @property {Object} value-style 右侧内容样式，对象形式
+	 * @property {Object} label-style 标题下方描述信息的样式，对象形式
+	 * @property {String} bg-color 背景颜色（默认#ffffff）
+	 * @property {String Number} index 用于在click事件回调中返回，标识当前是第几个Item
+	 * @example <u-cell-item icon="integral-fill" title="会员等级" value="新版本"></u-cell-item>
+	 */
+	export default {
+		name: "u-cell-item",
+		props: {
+			// 左侧图标名称(只能uView内置图标)，或者图标src
+			icon: {
+				type: String,
+				default: ''
+			},
+			// 左侧标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 右侧内容
+			value: {
+				type: String,
+				default: ''
+			},
+			// 标题下方的描述信息
+			label: {
+				type: String,
+				default: ''
+			},
+			// 是否显示内边框
+			border: {
+				type: Boolean,
+				default: true
+			},
+			// 是否开启点击反馈，即点击是cell背景为灰色
+			hover: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示右侧箭头
+			arrow: {
+				type: Boolean,
+				default: true
+			},
+			// 右侧箭头方向，可选值：right|up|down，默认为right
+			arrowDirection: {
+				type: String,
+				default: 'right'
+			},
+			// 控制标题的样式
+			titleStyle: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			// 右侧显示内容的样式
+			valueStyle: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			// 描述信息的样式
+			labelStyle: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 用于识别被点击的是第几个cell
+			index: {
+				type: [String, Number],
+				default: ''
+			}
+		},
+		inject: ['uCellGroup'],
+		data() {
+			return {
+				itemIndex: 0,
+			}
+		},
+		created() {
+			this.itemIndex = this.uCellGroup.index++;
+		},
+		computed: {
+			arrowStyle() {
+				let style = {};
+				if (this.arrowDirection == 'top') style.transform = 'rotate(-90deg)';
+				else if (this.arrowDirection == 'bottom') style.transform = 'rotate(90deg)';
+				else style.transform = 'rotate(0deg)';
+				return style;
+			}
+		},
+		methods: {
+			click() {
+				this.$emit('click', this.index);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-cell-item-box {
+		padding: 28rpx 32rpx;
+		position: relative;
+	}
+
+	.u-cell-border:after {
+		left: 32rpx !important;
+		position: absolute;
+		box-sizing: border-box;
+		content: ' ';
+		pointer-events: none;
+		right: 0;
+		top: 0;
+		border-bottom: 1px solid $u-border-color;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+
+	.u-cell-content {
+		display: flex;
+		align-items: center;
+	}
+
+	.u-cell-title {
+		color: #323233;
+		font-size: 30rpx;
+		flex: 1;
+		margin-left: 6rpx;
+		text-align: left;
+	}
+
+	.u-cell-value {
+		flex: 1;
+		font-size: 26rpx;
+		color: #969799;
+		text-align: right;
+	}
+
+	.u-cell-label {
+		color: #969799;
+		font-size: 26rpx;
+		margin-top: 10rpx;
+		text-align: left;
+	}
+
+	.u-slot-wrap {
+		display: flex;
+		align-items: center;
+	}
+
+	// 微信小程序需要额外处理可能通过slot传入badge和switch的问题
\ No newline at end of file
+	// 否则无法垂直居中
+	/* #ifdef MP-WEIXIN */
+	.u-slot-wrap /deep/ u-badge,
+	.u-slot-wrap /deep/ u-switch {
+		display: flex;
+		align-items: center;
+	}
+
+	/* #endif */
+
+	.u-icon {
+		margin-right: 6rpx;
+	}
+
+	.u-value-text {
+		margin-right: 10rpx;
+	}
+
+	.u-title-text {
+		margin-right: 10rpx;
+	}
+</style>

uview/components/u-checkbox-group/u-checkbox-group.vue

@@ -5,6 +5,16 @@
 </template>
 
 <script>
+	/**
+	 * alertTips 提示
+	 * @description 复选框组件一般用于需要多个选择的场景，该组件功能完整，使用方便
+	 * @tutorial https://www.uviewui.com/components/checkbox.html
+	 * @property {String Number} max 最多能选中多少个checkbox（默认999）
+	 * @property {Boolean} disabled 是否禁用所有checkbox（默认false）
+	 * @property {String} active-color 选中时的颜色，应用到所有子Checkbox组件（默认#2979ff）
+	 * @event {Function} change 任一个checkbox状态发生变化时触发，回调为一个对象
+	 * @example <u-checkbox-group></u-checkbox-group>
+	 */
 	export default {
 		props: {
 			// 最多能选中多少个checkbox

uview/components/u-checkbox/u-checkbox.vue

-<template>
-	<view class="u-checkbox">
-		<view class="u-checkbox__icon-wrap" @tap="toggle">
-			<u-icon :class="iconClass" name="checkbox-mark" :size="iconSize" :color="iconColor" class="u-checkbox__icon" :style="[iconStyle]" />
-		</view>
-		<view class="u-label-class u-checkbox__label" @tap="onClickLabel"><slot /></view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		// checkbox的名称
-		name: {
-			type: [String, Number],
-			default: ''
-		},
-		// 形状，square为方形，circle为原型
-		shape: {
-			type: String,
-			default: 'square'
-		},
-		// 是否为选中状态
-		value: {
-			type: Boolean,
-			default: false
-		},
-		// 是否禁用
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		// 是否禁止点击提示语选中复选框
-		labelDisabled: {
-			type: Boolean,
-			default: false
-		},
-		// 选中状态下的颜色，如设置此值，将会覆盖checkboxGroup的activeColor值
-		activeColor: {
-			type: String,
-			default: ''
-		},
-		// 图标的大小，单位rpx
-		iconSize: {
-			type: [String, Number],
-			default: 24
-		},
-	},
-	inject: ['checkboxGroup'],
-	data() {
-		return {
-			parentDisabled: false,
-		};
-	},
-	created() {
-		this.parentDisabled = this.checkboxGroup.disabled;
-		this.checkboxGroup.children.push(this);
-	},
-	computed: {
-		iconStyle() {
-			let style = {};
-			if (this.checkboxActiveColor && this.value && !this.disabled && !this.parentDisabled) {
-				style.borderColor = this.checkboxActiveColor;
-				style.backgroundColor = this.checkboxActiveColor;
-			}
-			style.width = this.checkboxGroup.size + 'rpx';
-			style.height = this.checkboxGroup.size + 'rpx';
-			return style;
-		},
-		iconColor() {
-			return this.value ? '#ffffff' : 'transparent';
-		},
-		iconClass() {
-			let classs = [];
-			classs.push('u-checkbox__icon--' + this.shape);
-			if(this.value == true) classs.push('u-checkbox__icon--checked');
-			if(this.disabled || this.parentDisabled) classs.push('u-checkbox__icon--disabled');
-			if(this.value && (this.disabled || this.parentDisabled)) classs.push('u-checkbox__icon--disabled--checked');
-			return classs;
-		},
-		// 激活的颜色，可能受checkboxGroup和本组件的activeColor影响
-		// 本组件的activeColor值优先
-		checkboxActiveColor() {
-			return this.activeColor ? this.activeColor : this.checkboxGroup.activeColor;
-		}
-	},
-	methods: {
-		onClickLabel() {
-			if (!this.disabled && !this.labelDisabled && !this.parentDisabled) {
-			    this.setValue();
-			}
-		},
-		toggle() {
-			if (!this.disabled && !this.parentDisabled) {
-				this.setValue();
-			}
-		},
-		emitEvent() {
-			this.$emit('change', {value: this.value, name: this.name})
-			this.checkboxGroup.emitEvent();
-		},
-		// 设置input的值，这里通过input事件，设置通过v-model绑定的组件的值
-		setValue() {
-			// 判断是否超过了可选的最大数量
-			let checkedNum = 0;
-			this.checkboxGroup.children.map(val => {
-				if(val.value) checkedNum ++;
-			})
-			// 如果原来为选中状态，那么可以取消
-			if(this.value == true) {
-				this.$emit('input', !this.value);
-				// 等待下一个周期再执行，因为this.$emit('input')作用于父组件，再反馈到子组件内部，需要时间
-				this.$nextTick(function(){
-					this.emitEvent();
-				})
-			} else if(checkedNum < this.checkboxGroup.max && this.value == false) {
-				// 如果原来为未选中状态，需要选中的数量少于父组件中设置的max值，才可以选中
-				this.$emit('input', !this.value);
-				// 等待下一个周期再执行，因为this.$emit('input')作用于父组件，再反馈到子组件内部，需要时间
-				this.$nextTick(function(){
-					this.emitEvent();
-				})
-			} 
-			
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.u-checkbox {
-	display: -webkit-flex;
-	display: flex;
-	-webkit-align-items: center;
-	align-items: center;
-	overflow: hidden;
-	-webkit-user-select: none;
-	user-select: none;
-}
-
-.u-checkbox__icon-wrap,
-.u-checkbox__label {
-	color: $u-content-color;
-}
-
-.u-checkbox__icon-wrap {
-	-webkit-flex: none;
-	flex: none;
-}
-
-.u-checkbox__icon {
-	display: -webkit-flex;
-	display: flex;
-	-webkit-align-items: center;
-	align-items: center;
-	-webkit-justify-content: center;
-	justify-content: center;
-	box-sizing: border-box;
-	width: 42rpx;
-	height: 42rpx;
-	color: transparent;
-	text-align: center;
-	transition-property: color, border-color, background-color;
-	font-size: 20px;
-	border: 1px solid #c8c9cc;
-	transition-duration: 0.2s;
-}
-
-.u-checkbox__icon--circle {
-	border-radius: 100%;
-}
-
-.u-checkbox__icon--square {
-	border-radius: 3px;
-}
-
-.u-checkbox__icon--checked {
-	color: #fff;
-	background-color: #2979ff;
-	border-color: #2979ff;
-}
-
-.u-checkbox__icon--disabled {
-	background-color: #ebedf0;
-	border-color: #c8c9cc;
-}
-
-.u-checkbox__icon--disabled--checked {
-	color: #c8c9cc!important;
-}
-
-.u-checkbox__label {
-	word-wrap: break-word;
-	margin-left: 10rpx;
-	margin-right: 18rpx;
-	color: $u-content-color;
-	font-size: 30rpx;
-}
-
-.u-checkbox__label--disabled {
-	color: #c8c9cc;
-}
-
-.u-checkbox__label:empty {
-	margin: 0;
-}
+<template>
+	<view class="u-checkbox">
+		<view class="u-checkbox__icon-wrap" @tap="toggle">
+			<u-icon :class="iconClass" name="checkbox-mark" :size="iconSize" :color="iconColor" class="u-checkbox__icon" :style="[iconStyle]" />
+		</view>
+		<view class="u-label-class u-checkbox__label" @tap="onClickLabel">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 该组件需要搭配checkboxGroup组件使用，以便用户进行操作时，获得当前复选框组的选中情况。
+	 * @tutorial https://www.uviewui.com/components/checkbox.html
+	 * @property {String Number} icon-size 图标大小，单位rpx（默认24）
+	 * @property {String Number} size 组件整体的大小，单位rpx（默认40）
+	 * @property {String Number} name checkbox组件的标示符
+	 * @property {String} shape 形状，见官网说明（默认circle）
+	 * @property {Boolean} disabled 是否禁用（默认false）
+	 * @property {Boolean} label-disabled 点击文本是否可以操作checkbox（默认true）
+	 * @property {String} active-color 选中时的颜色，如设置CheckboxGroup的active-color将失效
+	 * @event {Function} change 某个checkbox状态发生变化时触发，回调为一个对象
+	 * @example <u-checkbox v-model="checked" :disabled="false">天涯</u-checkbox>
+	 */
+	export default {
+		name: "u-checkbox",
+		props: {
+			// checkbox的名称
+			name: {
+				type: [String, Number],
+				default: ''
+			},
+			// 形状，square为方形，circle为原型
+			shape: {
+				type: String,
+				default: 'square'
+			},
+			// 是否为选中状态
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 是否禁止点击提示语选中复选框
+			labelDisabled: {
+				type: Boolean,
+				default: false
+			},
+			// 选中状态下的颜色，如设置此值，将会覆盖checkboxGroup的activeColor值
+			activeColor: {
+				type: String,
+				default: ''
+			},
+			// 图标的大小，单位rpx
+			iconSize: {
+				type: [String, Number],
+				default: 24
+			},
+		},
+		inject: ['checkboxGroup'],
+		data() {
+			return {
+				parentDisabled: false,
+			};
+		},
+		created() {
+			this.parentDisabled = this.checkboxGroup.disabled;
+			this.checkboxGroup.children.push(this);
+		},
+		computed: {
+			iconStyle() {
+				let style = {};
+				if (this.checkboxActiveColor && this.value && !this.disabled && !this.parentDisabled) {
+					style.borderColor = this.checkboxActiveColor;
+					style.backgroundColor = this.checkboxActiveColor;
+				}
+				style.width = this.checkboxGroup.size + 'rpx';
+				style.height = this.checkboxGroup.size + 'rpx';
+				return style;
+			},
+			iconColor() {
+				return this.value ? '#ffffff' : 'transparent';
+			},
+			iconClass() {
+				let classs = [];
+				classs.push('u-checkbox__icon--' + this.shape);
+				if (this.value == true) classs.push('u-checkbox__icon--checked');
+				if (this.disabled || this.parentDisabled) classs.push('u-checkbox__icon--disabled');
+				if (this.value && (this.disabled || this.parentDisabled)) classs.push('u-checkbox__icon--disabled--checked');
+				return classs;
+			},
+			// 激活的颜色，可能受checkboxGroup和本组件的activeColor影响
+			// 本组件的activeColor值优先
+			checkboxActiveColor() {
+				return this.activeColor ? this.activeColor : this.checkboxGroup.activeColor;
+			}
+		},
+		methods: {
+			onClickLabel() {
+				if (!this.disabled && !this.labelDisabled && !this.parentDisabled) {
+					this.setValue();
+				}
+			},
+			toggle() {
+				if (!this.disabled && !this.parentDisabled) {
+					this.setValue();
+				}
+			},
+			emitEvent() {
+				this.$emit('change', {
+					value: this.value,
+					name: this.name
+				})
+				this.checkboxGroup.emitEvent();
+			},
+			// 设置input的值，这里通过input事件，设置通过v-model绑定的组件的值
+			setValue() {
+				// 判断是否超过了可选的最大数量
+				let checkedNum = 0;
+				this.checkboxGroup.children.map(val => {
+					if (val.value) checkedNum++;
+				})
+				// 如果原来为选中状态，那么可以取消
+				if (this.value == true) {
+					this.$emit('input', !this.value);
+					// 等待下一个周期再执行，因为this.$emit('input')作用于父组件，再反馈到子组件内部，需要时间
+					this.$nextTick(function() {
+						this.emitEvent();
+					})
+				} else if (checkedNum < this.checkboxGroup.max && this.value == false) {
+					// 如果原来为未选中状态，需要选中的数量少于父组件中设置的max值，才可以选中
+					this.$emit('input', !this.value);
+					// 等待下一个周期再执行，因为this.$emit('input')作用于父组件，再反馈到子组件内部，需要时间
+					this.$nextTick(function() {
+						this.emitEvent();
+					})
+				}
+
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.u-checkbox {
+		display: -webkit-flex;
+		display: flex;
+		-webkit-align-items: center;
+		align-items: center;
+		overflow: hidden;
+		-webkit-user-select: none;
+		user-select: none;
+	}
+
+	.u-checkbox__icon-wrap,
+	.u-checkbox__label {
+		color: $u-content-color;
+	}
+
+	.u-checkbox__icon-wrap {
+		-webkit-flex: none;
+		flex: none;
+	}
+
+	.u-checkbox__icon {
+		display: -webkit-flex;
+		display: flex;
+		-webkit-align-items: center;
+		align-items: center;
+		-webkit-justify-content: center;
+		justify-content: center;
+		box-sizing: border-box;
+		width: 42rpx;
+		height: 42rpx;
+		color: transparent;
+		text-align: center;
+		transition-property: color, border-color, background-color;
+		font-size: 20px;
+		border: 1px solid #c8c9cc;
+		transition-duration: 0.2s;
+	}
+
+	.u-checkbox__icon--circle {
+		border-radius: 100%;
+	}
+
+	.u-checkbox__icon--square {
+		border-radius: 3px;
+	}
+
+	.u-checkbox__icon--checked {
+		color: #fff;
+		background-color: #2979ff;
+		border-color: #2979ff;
+	}
+
+	.u-checkbox__icon--disabled {
+		background-color: #ebedf0;
+		border-color: #c8c9cc;
+	}
+
+	.u-checkbox__icon--disabled--checked {
+		color: #c8c9cc !important;
+	}
+
+	.u-checkbox__label {
+		word-wrap: break-word;
+		margin-left: 10rpx;
+		margin-right: 18rpx;
+		color: $u-content-color;
+		font-size: 30rpx;
+	}
+
+	.u-checkbox__label--disabled {
+		color: #c8c9cc;
+	}
+
+	.u-checkbox__label:empty {
+		margin: 0;
+	}
 </style>

uview/components/u-circle-progress/u-circle-progress.vue

-<template>
-	<view class="u-circle-progress" :style="{
-		width: widthPx + 'px',
-		height: widthPx + 'px',
-		backgroundColor: bgColor
-	}">
-		<canvas class="u-canvas-bg" :canvas-id="elBgId" :style="{
-		width: widthPx + 'px',
-		height: widthPx + 'px'
-	}"></canvas>
-		<canvas class="u-canvas" :canvas-id="elId" :style="{
-		width: widthPx + 'px',
-		height: widthPx + 'px'
-	}"></canvas>
-		<slot></slot>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			// 圆环进度百分比值
-			percent: {
-				type: Number,
-				default: 0,
-				// 限制值在0到100之间
-				validator: val => {
-					return val >= 0 && val <= 100;
-				}
-			},
-			// 底部圆环的颜色（灰色的圆环）
-			inactiveColor: {
-				type: String,
-				default: "#ececec"
-			},
-			// 圆环激活部分的颜色
-			activeColor: {
-				type: String,
-				default: '#19be6b'
-			},
-			// 圆环线条的宽度，单位rpx
-			borderWidth: {
-				type: [Number, String],
-				default: 14
-			},
-			// 整个圆形的宽度，单位rpx
-			width: {
-				type: [Number, String],
-				default: 200
-			},
-			// 整个圆环执行一圈的时间，单位ms
-			duration: {
-				type: [Number, String],
-				default: 1500
-			},
-			// 主题类型
-			type: {
-				type: String,
-				default: ''
-			},
-			// 整个圆环进度区域的背景色
-			bgColor: {
-				type: String,
-				default: "#ffffff"
-			}
-		},
-		data() {
-			return {
-				elBgId: this.$u.guid(),
-				elId: this.$u.guid(),
-				ctxBg: '', // 背景canvas实例
-				ctx: '', // 前景(激活时候)canvas的实例
-				count: 0, // 计数器
-				timer: null, // 定时器
-				times: 0, // 总共要执行的动画次数，setInterval的次数
-				time: 0, // 执行整个动画的时间
-				widthPx: uni.upx2px(this.width), // 转成px后的整个组件的背景宽度
-				borderWidthPx: uni.upx2px(this.borderWidth), // 转成px后的圆环的宽度
-				mode: 'more', // more-percent增加，less-percent减少
-			}
-		},
-		watch: {
-			percent: {
-				immediate: true,
-				handler(nVal, oVal = 0) {
-					this.mode = nVal > oVal ? 'more' : 'less';
-					this.times = Math.ceil(nVal * 3.6);
-					this.time = Math.ceil(this.duration / 360 * this.times);
-					setTimeout(() => {
-						this.countInterval();
-					}, 50)
-				}
-			}
-		},
-		computed: {
-			// 有type主题时，优先起作用
-			circleColor() {
-				if(['success', 'error', 'info', 'primary', 'warning'].indexOf(this.type) >= 0) return this.$u.color[this.type];
-				else return this.activeColor;
-			}
-		},
-		mounted() {
-			this.ctxBg = uni.createCanvasContext(this.elBgId, this);
-			this.ctx = uni.createCanvasContext(this.elId, this);
-			// 在h5端，必须要做一点延时才起作用，this.$nextTick()无效(HX2.4.7)
-			setTimeout(() => {
-				this.drawProgressBg();
-			}, 50)
-		},
-		methods: {
-			drawProgressBg() {
-				this.ctxBg.setLineWidth(this.borderWidthPx); // 设置圆环宽度
-				this.ctxBg.setStrokeStyle(this.inactiveColor); // 线条颜色
-				this.ctxBg.setLineCap('round'); // 圆环端点的形状为圆形
-				this.ctxBg.beginPath(); // 开始描绘路径
-				// 设置一个原点(110,110)，半径为100的圆的路径到当前路径
-				this.ctxBg.arc(this.widthPx / 2, this.widthPx / 2, this.widthPx / 2 - this.borderWidthPx / 2 - 1, 0, 2 * Math.PI, false);
-				this.ctxBg.stroke(); // 对路径进行描绘
-				this.ctxBg.draw();
-			},
-			drawCircle(step) {
-				this.ctx.setLineWidth(this.borderWidthPx);
-				this.ctx.setStrokeStyle(this.circleColor);
-				this.ctx.setLineCap('round');
-				this.ctx.beginPath();
-				// 参数step 为绘制的圆环周长，从0到2为一周 。 -Math.PI / 2 将起始角设在12点钟位置 ，结束角 通过改变 step 的值确定
-				if(this.mode == 'more') {
-					this.ctx.arc(this.widthPx / 2, this.widthPx / 2, this.widthPx / 2 - this.borderWidthPx / 2 - 1, -Math.PI / 2, step *
-						Math.PI - Math.PI / 2, false);
-				} else {
-					this.ctx.arc(this.widthPx / 2, this.widthPx / 2, this.widthPx / 2 - this.borderWidthPx / 2 - 1, -Math.PI / 2, Math.PI / 2 - step *
-						Math.PI, false);
-				}
-				this.ctx.stroke();
-				this.ctx.draw()
-			},
-			countInterval() {
-				this.countTimer = setInterval(() => {
-					if (this.count <= this.times) {
-						// 全一个圆时候，值为2，这里求出每一份的值为2/360
-						this.drawCircle(this.count * 2 / 360);
-						this.count++;
-					} else {
-						clearInterval(this.countTimer);
-					}
-				}, Math.ceil(this.duration / 360)); // 总过渡时间分为360份，这里为每一份的时间
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.u-circle-progress {
-		position: relative;
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.u-canvas-bg {
-		position: absolute;
-	}
-
-	.u-canvas {
-		position: absolute;
-	}
+<template>
+	<view class="u-circle-progress" :style="{
+		width: widthPx + 'px',
+		height: widthPx + 'px',
+		backgroundColor: bgColor
+	}">
+		<canvas class="u-canvas-bg" :canvas-id="elBgId" :style="{
+		width: widthPx + 'px',
+		height: widthPx + 'px'
+	}"></canvas>
+		<canvas class="u-canvas" :canvas-id="elId" :style="{
+		width: widthPx + 'px',
+		height: widthPx + 'px'
+	}"></canvas>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 展示操作或任务的当前进度，比如上传文件，是一个圆形的进度条。注意：此组件的percent值只能动态增加，不能动态减少。
+	 * @tutorial https://www.uviewui.com/components/circleProgress.html
+	 * @property {String Number} percent 圆环进度百分比值，为数值类型，0-100
+	 * @property {String} inactive-color 圆环的底色，默认为灰色(该值无法动态变更)（默认#ececec）
+	 * @property {String} active-color 圆环激活部分的颜色(该值无法动态变更)（默认#19be6b）
+	 * @property {String Number} width 整个圆环组件的宽度，高度默认等于宽度值，单位rpx（默认200）
+	 * @property {String Number} border-width 圆环的边框宽度，单位rpx（默认14）
+	 * @property {String Number} duration 整个圆环执行一圈的时间，单位ms（默认呢1500）
+	 * @property {String} type 如设置，active-color值将会失效
+	 * @property {String} bg-color 整个组件背景颜色，默认为白色
+	 * @example <u-circle-progress active-color="#2979ff" :percent="80"></u-circle-progress>
+	 */
+	export default {
+		name: "u-circle-progress",
+		props: {
+			// 圆环进度百分比值
+			percent: {
+				type: Number,
+				default: 0,
+				// 限制值在0到100之间
+				validator: val => {
+					return val >= 0 && val <= 100;
+				}
+			},
+			// 底部圆环的颜色（灰色的圆环）
+			inactiveColor: {
+				type: String,
+				default: "#ececec"
+			},
+			// 圆环激活部分的颜色
+			activeColor: {
+				type: String,
+				default: '#19be6b'
+			},
+			// 圆环线条的宽度，单位rpx
+			borderWidth: {
+				type: [Number, String],
+				default: 14
+			},
+			// 整个圆形的宽度，单位rpx
+			width: {
+				type: [Number, String],
+				default: 200
+			},
+			// 整个圆环执行一圈的时间，单位ms
+			duration: {
+				type: [Number, String],
+				default: 1500
+			},
+			// 主题类型
+			type: {
+				type: String,
+				default: ''
+			},
+			// 整个圆环进度区域的背景色
+			bgColor: {
+				type: String,
+				default: "#ffffff"
+			}
+		},
+		data() {
+			return {
+				elBgId: this.$u.guid(),
+				elId: this.$u.guid(),
+				ctxBg: '', // 背景canvas实例
+				ctx: '', // 前景(激活时候)canvas的实例
+				count: 0, // 计数器
+				timer: null, // 定时器
+				times: 0, // 总共要执行的动画次数，setInterval的次数
+				time: 0, // 执行整个动画的时间
+				widthPx: uni.upx2px(this.width), // 转成px后的整个组件的背景宽度
+				borderWidthPx: uni.upx2px(this.borderWidth), // 转成px后的圆环的宽度
+				mode: 'more', // more-percent增加，less-percent减少
+			}
+		},
+		watch: {
+			percent: {
+				immediate: true,
+				handler(nVal, oVal = 0) {
+					this.mode = nVal > oVal ? 'more' : 'less';
+					this.times = Math.ceil(nVal * 3.6);
+					this.time = Math.ceil(this.duration / 360 * this.times);
+					setTimeout(() => {
+						this.countInterval();
+					}, 50)
+				}
+			}
+		},
+		computed: {
+			// 有type主题时，优先起作用
+			circleColor() {
+				if (['success', 'error', 'info', 'primary', 'warning'].indexOf(this.type) >= 0) return this.$u.color[this.type];
+				else return this.activeColor;
+			}
+		},
+		mounted() {
+			this.ctxBg = uni.createCanvasContext(this.elBgId, this);
+			this.ctx = uni.createCanvasContext(this.elId, this);
+			// 在h5端，必须要做一点延时才起作用，this.$nextTick()无效(HX2.4.7)
+			setTimeout(() => {
+				this.drawProgressBg();
+			}, 50)
+		},
+		methods: {
+			drawProgressBg() {
+				this.ctxBg.setLineWidth(this.borderWidthPx); // 设置圆环宽度
+				this.ctxBg.setStrokeStyle(this.inactiveColor); // 线条颜色
+				this.ctxBg.setLineCap('round'); // 圆环端点的形状为圆形
+				this.ctxBg.beginPath(); // 开始描绘路径
+				// 设置一个原点(110,110)，半径为100的圆的路径到当前路径
+				this.ctxBg.arc(this.widthPx / 2, this.widthPx / 2, this.widthPx / 2 - this.borderWidthPx / 2 - 1, 0, 2 * Math.PI,
+					false);
+				this.ctxBg.stroke(); // 对路径进行描绘
+				this.ctxBg.draw();
+			},
+			drawCircle(step) {
+				this.ctx.setLineWidth(this.borderWidthPx);
+				this.ctx.setStrokeStyle(this.circleColor);
+				this.ctx.setLineCap('round');
+				this.ctx.beginPath();
+				// 参数step 为绘制的圆环周长，从0到2为一周 。 -Math.PI / 2 将起始角设在12点钟位置 ，结束角 通过改变 step 的值确定
+				if (this.mode == 'more') {
+					this.ctx.arc(this.widthPx / 2, this.widthPx / 2, this.widthPx / 2 - this.borderWidthPx / 2 - 1, -Math.PI / 2, step *
+						Math.PI - Math.PI / 2, false);
+				} else {
+					this.ctx.arc(this.widthPx / 2, this.widthPx / 2, this.widthPx / 2 - this.borderWidthPx / 2 - 1, -Math.PI / 2, Math
+						.PI / 2 - step *
+						Math.PI, false);
+				}
+				this.ctx.stroke();
+				this.ctx.draw()
+			},
+			countInterval() {
+				this.countTimer = setInterval(() => {
+					if (this.count <= this.times) {
+						// 全一个圆时候，值为2，这里求出每一份的值为2/360
+						this.drawCircle(this.count * 2 / 360);
+						this.count++;
+					} else {
+						clearInterval(this.countTimer);
+					}
+				}, Math.ceil(this.duration / 360)); // 总过渡时间分为360份，这里为每一份的时间
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-circle-progress {
+		position: relative;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.u-canvas-bg {
+		position: absolute;
+	}
+
+	.u-canvas {
+		position: absolute;
+	}
 </style>

uview/components/u-collapse-item/u-collapse-item.vue

-<template>
-	<view class="u-collapse-item">
-		<view
-			class="u-collapse-head"
-			@tap.stop="headClick"
-			hover-class="u-hover-class"
-			:style="[headStyle]"
-		>
-			<view class="u-collapse-title u-line-1" 
-				:style="[{ textAlign: align ? align : 'left' }, 
-				isShow && activeStyle && !arrow ? activeStyle : '']"
-			>
-				{{ title }}
-			</view>
-			<view class="u-icon-wrap">
-				<u-icon
-					v-if="arrow"
-					:color="arrowColor ? arrowColor : $u.color.tipsColor"
-					:class="{ 'u-arrow-down-icon-active': isShow }"
-					class="u-arrow-down-icon"
-					name="arrow-down"
-				></u-icon>
-			</view>
-		</view>
-		<view
-			class="u-collapse-body"
-			:style="[{
-				height: isShow ? height + 'px' : '0'
-			}, bodyStyle]"
-		>
-			<view class="u-collapse-content" :id="elId"><slot></slot></view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		// 标题
-		title: {
-			type: String,
-			default: ''
-		},
-		// 标题的对齐方式
-		align: {
-			type: String,
-			default: 'left'
-		},
-		// 是否可以点击收起
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		// collapse显示与否
-		open: {
-			type: Boolean,
-			default: false
-		},
-		// 唯一标识符
-		name: {
-			type: [Number, String],
-			default: ''
-		},
-		//活动样式
-		activeStyle: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		// 标识当前为第几个
-		index: {
-			type: [String, Number],
-			default: ''
-		}
-	},
-	inject: ['uCollapse'],
-	data() {
-		return {
-			isShow: false,
-			elId: this.$u.guid(),
-			height: 0, // body内容的高度
-			headStyle: {}, // 头部样式，对象形式
-			bodyStyle: {}, // 主体部分样式
-			arrowColor: ''
-		};
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.queryRect();
-		});
-	},
-	watch: {
-		open(val) {
-			this.isShow = val;
-		}
-	},
-	computed: {
-		arrow() {
-			return this.uCollapse.arrow;
-		}
-	},
-	created() {
-		this.isShow = this.open;
-		this.nameSync = this.name ? this.name : this.uCollapse.childrens.length;
-		this.uCollapse.childrens.push(this);
-		this.headStyle = this.uCollapse.headStyle;
-		this.bodyStyle = this.uCollapse.bodyStyle;
-		this.arrowColor = this.uCollapse.arrowColor;
-	},
-	methods: {
-		// 点击collapsehead头部
-		headClick() {
-			if (this.disabled) return;
-			if (this.uCollapse.accordion == true) {
-				this.uCollapse.childrens.map(val => {
-					// 自身不设置为false，因为后面有this.isShow = !this.isShow;处理了
-					if (this != val) {
-						val.isShow = false;
-					}
-				});
-			}
-			
-			this.isShow = !this.isShow;
-			// 触发本组件的事件
-			this.$emit('change', {
-				index: this.index,
-				show: this.isShow
-			})
-			
-			// 只有在打开时才发出事件
-			if (this.isShow) this.uCollapse.onChange();
-			this.$forceUpdate();
-		},
-		// 查询内容高度
-		queryRect() {
-			const query = uni.createSelectorQuery().in(this);
-			query
-				.select('#' + this.elId)
-				.boundingClientRect(data => {
-					if (!data.height) {
-						setTimeout(() => {
-							this.queryRect();
-						}, 10);
-						return;
-					}
-					this.height = data.height;
-				})
-				.exec();
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.u-collapse-head {
-	position: relative;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	color: $u-main-color;
-}
-
-.u-collapse-title {
-	flex: 1;
-	overflow: hidden;
-	margin-right: 14rpx;
-	font-size: 30rpx;
-	color: $u-main-color;
-	line-height: 1;
-	padding: 24rpx 0;
-	text-align: left;
-}
-
-.u-arrow-down-icon {
-	transition: all 0.3s;
-	margin-right: 24rpx;
-}
-
-.u-arrow-down-icon-active {
-	transform: rotate(180deg);
-	transform-origin: center center;
-}
-
-.u-collapse-body {
-	overflow: hidden;
-	transition: all 0.3s;
-}
-
-.u-collapse-content {
-	overflow: hidden;
-	font-size: 28rpx;
-	color: $u-tips-color;
-	text-align: left;
-}
+<template>
+	<view class="u-collapse-item">
+		<view class="u-collapse-head" @tap.stop="headClick" hover-class="u-hover-class" :style="[headStyle]">
+			<view class="u-collapse-title u-line-1" :style="[{ textAlign: align ? align : 'left' }, 
+				isShow && activeStyle && !arrow ? activeStyle : '']">
+				{{ title }}
+			</view>
+			<view class="u-icon-wrap">
+				<u-icon v-if="arrow" :color="arrowColor ? arrowColor : $u.color.tipsColor" :class="{ 'u-arrow-down-icon-active': isShow }"
+				 class="u-arrow-down-icon" name="arrow-down"></u-icon>
+			</view>
+		</view>
+		<view class="u-collapse-body" :style="[{
+				height: isShow ? height + 'px' : '0'
+			}, bodyStyle]">
+			<view class="u-collapse-content" :id="elId">
+				<slot></slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 通过折叠面板收纳内容区域（搭配u-collapse使用）
+	 * @tutorial https://www.uviewui.com/components/collapse.html
+	 * @property {String} title 面板标题
+	 * @property {String Number} index 主要用于事件的回调，标识那个Item被点击
+	 * @property {Boolean} disabled 面板是否可以打开或收起（默认false）
+	 * @property {Boolean} open 设置某个面板的初始状态是否打开（默认false）
+	 * @property {String Number} name 唯一标识符，如不设置，默认用当前collapse-item的索引值
+	 * @property {String} align 标题的对齐方式（默认left）
+	 * @property {Object} active-style 不显示箭头时，可以添加当前选择的collapse-item活动样式，对象形式
+	 * @event {Function} change 某个item被打开或者收起时触发
+	 * @example <u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">{{item.body}}</u-collapse-item>
+	 */
+	export default {
+		name: "u-collapse-item",
+		props: {
+			// 标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 标题的对齐方式
+			align: {
+				type: String,
+				default: 'left'
+			},
+			// 是否可以点击收起
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// collapse显示与否
+			open: {
+				type: Boolean,
+				default: false
+			},
+			// 唯一标识符
+			name: {
+				type: [Number, String],
+				default: ''
+			},
+			//活动样式
+			activeStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 标识当前为第几个
+			index: {
+				type: [String, Number],
+				default: ''
+			}
+		},
+		inject: ['uCollapse'],
+		data() {
+			return {
+				isShow: false,
+				elId: this.$u.guid(),
+				height: 0, // body内容的高度
+				headStyle: {}, // 头部样式，对象形式
+				bodyStyle: {}, // 主体部分样式
+				arrowColor: ''
+			};
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.queryRect();
+			});
+		},
+		watch: {
+			open(val) {
+				this.isShow = val;
+			}
+		},
+		computed: {
+			arrow() {
+				return this.uCollapse.arrow;
+			}
+		},
+		created() {
+			this.isShow = this.open;
+			this.nameSync = this.name ? this.name : this.uCollapse.childrens.length;
+			this.uCollapse.childrens.push(this);
+			this.headStyle = this.uCollapse.headStyle;
+			this.bodyStyle = this.uCollapse.bodyStyle;
+			this.arrowColor = this.uCollapse.arrowColor;
+		},
+		methods: {
+			// 点击collapsehead头部
+			headClick() {
+				if (this.disabled) return;
+				if (this.uCollapse.accordion == true) {
+					this.uCollapse.childrens.map(val => {
+						// 自身不设置为false，因为后面有this.isShow = !this.isShow;处理了
+						if (this != val) {
+							val.isShow = false;
+						}
+					});
+				}
+
+				this.isShow = !this.isShow;
+				// 触发本组件的事件
+				this.$emit('change', {
+					index: this.index,
+					show: this.isShow
+				})
+
+				// 只有在打开时才发出事件
+				if (this.isShow) this.uCollapse.onChange();
+				this.$forceUpdate();
+			},
+			// 查询内容高度
+			queryRect() {
+				const query = uni.createSelectorQuery().in(this);
+				query
+					.select('#' + this.elId)
+					.boundingClientRect(data => {
+						if (!data.height) {
+							setTimeout(() => {
+								this.queryRect();
+							}, 10);
+							return;
+						}
+						this.height = data.height;
+					})
+					.exec();
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.u-collapse-head {
+		position: relative;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		color: $u-main-color;
+	}
+
+	.u-collapse-title {
+		flex: 1;
+		overflow: hidden;
+		margin-right: 14rpx;
+		font-size: 30rpx;
+		color: $u-main-color;
+		line-height: 1;
+		padding: 24rpx 0;
+		text-align: left;
+	}
+
+	.u-arrow-down-icon {
+		transition: all 0.3s;
+		margin-right: 24rpx;
+	}
+
+	.u-arrow-down-icon-active {
+		transform: rotate(180deg);
+		transform-origin: center center;
+	}
+
+	.u-collapse-body {
+		overflow: hidden;
+		transition: all 0.3s;
+	}
+
+	.u-collapse-content {
+		overflow: hidden;
+		font-size: 28rpx;
+		color: $u-tips-color;
+		text-align: left;
+	}
 </style>

uview/components/u-collapse/u-collapse.vue

-<template>
-	<view class="u-collapse">
-		<slot />
-	</view>
-</template>
-
-<script>
+<template>
+	<view class="u-collapse">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 通过折叠面板收纳内容区域
+	 * @tutorial https://www.uviewui.com/components/collapse.html
+	 * @property {Boolean} accordion 是否手风琴模式（默认true）
+	 * @property {Boolean} arrow 是否显示标题右侧的箭头（默认true）
+	 * @property {String} arrow-color 标题右侧箭头的颜色（默认#909399）
+	 * @property {String} head-bg-color 标题的背景颜色（默认#ffffff）
+	 * @property {String} body-bg-color 主体内容的背景颜色（默认#ffffff）
+	 * @event {Function} change 当前激活面板展开时触发(如果是手风琴模式，参数activeNames类型为String，否则为Array)
+	 * @example <u-collapse></u-collapse>
+	 */
 	export default {
-		props: {
-			// 是否手风琴模式
-			accordion: {
-				type: Boolean,
-				default: true
-			},
-			// 头部的样式
-			headStyle: {
-				type: Object,
-				default() {
-					return {}
-				}
-			},
-			// 主体的样式
-			bodyStyle: {
-				type: Object,
-				default() {
-					return {}
-				}
-			},
-			// 是否显示右侧的箭头
-			arrow: {
-				type: Boolean,
-				default: true
-			},
-			// 箭头的颜色
-			arrowColor: {
-				type: String,
-				default: ''
-			},
-		},
-		provide() {
-			return {
-				uCollapse: this
-			}
-		},
-		created() {
-			this.childrens = []
-		},
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			// collapse item被点击，由collapse item调用父组件方法
-			onChange() {
-				let activeItem = [];
-				this.childrens.forEach((vm, index) => {
-					if (vm.isShow) {
-						activeItem.push(vm.nameSync);
-					}
-				})
-				// 如果是手风琴模式，只有一个匹配结果，也即activeItem长度为1，将其转为字符串
-				if(this.accordion) activeItem = activeItem.join('');
-				this.$emit('change', activeItem);
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	
+		name:"u-collapse",
+		props: {
+			// 是否手风琴模式
+			accordion: {
+				type: Boolean,
+				default: true
+			},
+			// 头部的样式
+			headStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 主体的样式
+			bodyStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 是否显示右侧的箭头
+			arrow: {
+				type: Boolean,
+				default: true
+			},
+			// 箭头的颜色
+			arrowColor: {
+				type: String,
+				default: ''
+			},
+		},
+		provide() {
+			return {
+				uCollapse: this
+			}
+		},
+		created() {
+			this.childrens = []
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			// collapse item被点击，由collapse item调用父组件方法
+			onChange() {
+				let activeItem = [];
+				this.childrens.forEach((vm, index) => {
+					if (vm.isShow) {
+						activeItem.push(vm.nameSync);
+					}
+				})
+				// 如果是手风琴模式，只有一个匹配结果，也即activeItem长度为1，将其转为字符串
+				if (this.accordion) activeItem = activeItem.join('');
+				this.$emit('change', activeItem);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+
 </style>

uview/components/u-empty/u-empty.vue

-<template>
-	<view class="u-empty" v-if="show">
-		<image class="u-image" :src="src ? src : icons[mode].image" mode="widthFix" :style="{
-			width: imgWidth + 'rpx',
-			height: imgHeight == 'auto' ? 'auto' : imgHeight + 'rpx'
-		}"></image>
-		<text :style="{
-			color: color,
-			fontSize: fontSize + 'rpx',
-		}">
-			{{text ? text : icons[mode].text}}
-		</text>
-		<view class="u-slot-wrap">
-			<slot name="bottom"></slot>
-		</view>
-	</view>
-</template>
-
-<script>
-	import icon from "./icon.js";
-	export default {
-		props: {
-			// 图标路径
-			src: {
-				type: String,
-				default: ''
-			},
-			// 提示文字
-			text: {
-				type: String,
-				default: ''
-			},
-			// 文字颜色
-			color: {
-				type: String,
-				default: '#c0c4cc'
-			},
-			// 文字大小，单位rpx
-			fontSize: {
-				type: [String, Number],
-				default: 26
-			},
-			// 选择预置的图标类型
-			mode: {
-				type: String,
-				default: 'data'
-			},
-			//  图标宽度，单位rpx
-			imgWidth: {
-				type: [String, Number],
-				default: 240
-			},
-			// 图标高度，单位rpx
-			imgHeight: {
-				type: [String, Number],
-				default: 'auto'
-			},
-			// 是否显示组件
-			show: {
-				type: Boolean,
-				default: true
-			}
-		},
-		data() {
-			return {
-				icons: icon
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.u-empty {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		padding-top: 30%;
-	}
-	
-	.u-image {
-		margin-bottom: 20rpx;
-	}
-	
-	.u-slot-wrap {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin-top: 20rpx;
-	}
+<template>
+	<view class="u-empty" v-if="show">
+		<image class="u-image" :src="src ? src : icons[mode].image" mode="widthFix" :style="{
+			width: imgWidth + 'rpx',
+			height: imgHeight == 'auto' ? 'auto' : imgHeight + 'rpx'
+		}"></image>
+		<text :style="{
+			color: color,
+			fontSize: fontSize + 'rpx',
+		}">
+			{{text ? text : icons[mode].text}}
+		</text>
+		<view class="u-slot-wrap">
+			<slot name="bottom"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 该组件用于需要加载内容，但是加载的第一页数据就为空，提示一个"没有内容"的场景， 我们精心挑选了十几个场景的图标，方便您使用。
+	 * @tutorial https://www.uviewui.com/components/empty.html
+	 * @property {String} color 文字颜色（默认#c0c4cc）
+	 * @property {String} text 文字提示（默认“无内容”）
+	 * @property {String} src 自定义图标路径，如定义，mode参数会失效
+	 * @property {String Number} font-size 提示文字的大小，单位rpx（默认28）
+	 * @property {String} mode 内置的图标，见官网说明（默认data）
+	 * @property {String Number} img-width 图标的宽度，单位rpx（默认240）
+	 * @property {String} img-height 图标的高度，单位rpx（默认auto）
+	 * @property {Boolean} show 是否显示组件（默认true）
+	 * @event {Function} click 点击组件时触发
+	 * @event {Function} close 点击关闭按钮时触发
+	 * @example <u-empty text="所谓伊人，在水一方" mode="list"></u-empty>
+	 */
+	import icon from "./icon.js";
+	export default {
+		name: "u-empty",
+		props: {
+			// 图标路径
+			src: {
+				type: String,
+				default: ''
+			},
+			// 提示文字
+			text: {
+				type: String,
+				default: ''
+			},
+			// 文字颜色
+			color: {
+				type: String,
+				default: '#c0c4cc'
+			},
+			// 文字大小，单位rpx
+			fontSize: {
+				type: [String, Number],
+				default: 26
+			},
+			// 选择预置的图标类型
+			mode: {
+				type: String,
+				default: 'data'
+			},
+			//  图标宽度，单位rpx
+			imgWidth: {
+				type: [String, Number],
+				default: 240
+			},
+			// 图标高度，单位rpx
+			imgHeight: {
+				type: [String, Number],
+				default: 'auto'
+			},
+			// 是否显示组件
+			show: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				icons: icon
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-empty {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		padding-top: 30%;
+	}
+
+	.u-image {
+		margin-bottom: 20rpx;
+	}
+
+	.u-slot-wrap {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 20rpx;
+	}
 </style>

uview/components/u-field/u-field.vue

-<template>
-	<view class="u-field" :class="{'u-field-border': itemIndex > 0 }">
-		<view class="u-field-inner" :class="[type == 'textarea' ? 'u-textarea-inner' : '', 'u-label-postion-' + labelPostion]">
-			<view class="u-label" :class="[required ? 'u-required' : '']" 
-			:style="{
-				justifyContent: justifyContent, 
-				flex: labelPostion == 'left' ? `0 0 ${labelWidth}rpx` : '1'
-			}">
-				<view class="u-icon-wrap" v-if="icon">
-					<u-icon size="32" :name="icon" :color="iconColor" class="u-icon"></u-icon>
-				</view>
-				<slot name="icon"></slot>
-				<text class="u-label-text" :class="[this.$slots.icon || icon ? 'u-label-left-gap' : '']">{{ label }}</text>
-			</view>
-			<view class="fild-body">
-				<textarea
-					v-if="type == 'textarea'"
-					class="u-input-class u-textarea-class"
-					:style="[inputStyle]"
-					:value="value"
-					:placeholder="placeholder"
-					:placeholderStyle="placeholderStyle"
-					:disabled="disabled"
-					:maxlength="inputMaxlength"
-					:focus="focus"
-					:autoHeight="autoHeight"
-					:fixed="fixed"
-					@input="onInput"
-					@blur="onBlur"
-					@focus="onFocus"
-					@confirm="onConfirm"
-					@tap="fieldClick"
-				/>
-				<input
-					v-else
-					:style="[inputStyle]"
-					class="u-input-class"
-					:type="type"
-					:value="value"
-					:password="password || type === 'password'"
-					:placeholder="placeholder"
-					:placeholderStyle="placeholderStyle"
-					:disabled="disabled"
-					:maxlength="inputMaxlength"
-					:focus="focus"
-					:confirmType="confirmType"
-					@focus="onFocus"
-					@blur="onBlur"
-					@input="onInput"
-					@confirm="onConfirm"
-					@tap="fieldClick"
-				/>
-				<u-icon v-if="clearable && value && focused" name="close-circle-fill" color="#c0c4cc" class="u-clear-icon" @touchstart="onClear"/>
-				<view class="u-button-wrap"><slot name="button" /></view>
-				<u-icon v-if="rightIcon" @click="rightIconClick" :name="rightIcon" color="#c0c4cc" :style="[rightIconStyle]" size="26" class="u-arror-right" />
-			</view>
-		</view>
-		<view v-if="errorMessage !== false && errorMessage != ''" class="u-error-message" :style="{
-			paddingLeft: labelWidth + 'rpx'
-		}">{{ errorMessage }}</view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		icon: String,
-		rightIcon: String,
-		// arrowDirection: {
-		// 	type: String,
-		// 	default: 'right'
-		// },
-		required: Boolean,
-		label: String,
-		password: Boolean,
-		clearable: {
-			type: Boolean,
-			default: true
-		},
-		// 左边标题的宽度单位rpx
-		labelWidth: {
-			type: [Number, String],
-			default: 130
-		},
-		// 对齐方式，left|center|right
-		labelAlign: {
-			type: String,
-			default: 'left'
-		},
-		inputAlign: {
-			type: String,
-			default: 'left'
-		},
-		iconColor: {
-			type: String,
-			default: '#606266'
-		},
-		autoHeight: {
-			type: Boolean,
-			default: true
-		},
-		errorMessage: {
-			type: [String, Boolean],
-			default: ''
-		},
-		placeholder: String,
-		placeholderStyle: String,
-		focus: Boolean,
-		fixed: Boolean,
-		value: [Number, String],
-		type: {
-			type: String,
-			default: 'text'
-		},
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		maxlength: {
-			type: [Number, String],
-			default: 140
-		},
-		confirmType: {
-			type: String,
-			default: 'done'
-		},
-		// lable的位置，可选为 left-左边，top-上边
-		labelPostion: {
-			type: String,
-			default: 'left'
-		}
-	},
-	inject: ['uCellGroup'],
-	data() {
-		return {
-			focused: false,
-			itemIndex: 0,
-		};
-	},
-	created() {
-		if(this.uCellGroup) {
-			this.itemIndex = this.uCellGroup.index++;
-		}
-	},
-	computed: {
-		inputStyle() {
-			let style = {};
-			style.textAlign = this.inputAlign;
-			// 判断lable的位置，如果是left的话，让input左边两边有间隙
-			if(this.labelPostion == 'left') {
-				style.margin = `0 8rpx`;
-			} else {
-				// 如果lable是top的，input的左边就没必要有间隙了
-				style.marginRight = `8rpx`;
-			}
-			return style;
-		},
-		rightIconStyle() {
-			let style = {};
-			if (this.arrowDirection == 'top') style.transform = 'roate(-90deg)';
-			if (this.arrowDirection == 'bottom') style.transform = 'roate(90deg)';
-			else style.transform = 'roate(0deg)';
-			return style;
-		},
-		labelStyle() {
-			let style = {};
-			if(this.labelAlign == 'left') style.justifyContent = 'flext-start';
-			if(this.labelAlign == 'center') style.justifyContent = 'center';
-			if(this.labelAlign == 'right') style.justifyContent = 'flext-end';
-			return style;
-		},
-		// uni不支持在computed中写style.justifyContent = 'center'的形式，故用此方法
-		justifyContent() {
-			if(this.labelAlign == 'left') return 'flex-start';
-			if(this.labelAlign == 'center') return 'center';
-			if(this.labelAlign == 'right') return 'flex-end';
-		},
-		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
-		inputMaxlength() {
-			return Number(this.maxlength)
-		},
-		// label的位置
-		fieldInnerStyle() {
-			let style = {};
-			if(this.labelPostion == 'left') {
-				style.flexDirection = 'row';
-			} else {
-				style.flexDirection = 'column';
-			}
-			
-			return style;
-		}
-	},
-	methods: {
-		onInput(event) {
-			this.$emit('input', event.target.value);
-		},
-		onFocus(event) {
-			this.focused = true;
-			this.$emit('focus', event);
-		},
-		onBlur(event) {
-			this.focused = false;
-			this.$emit('blur', event);
-		},
-		onConfirm(e) {
-			this.$emit('confirm', e.detail.value);
-		},
-		onClear(event) {
-			this.$emit('input', '');
-		},
-		rightIconClick() {
-			this.$emit('right-icon-click');
-			this.$emit('click');
-		},
-		fieldClick() {
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.u-field {
-	font-size: 28rpx;
-	padding: 20rpx 28rpx;
-	text-align: left;
-	position: relative;
-	color: $u-main-color;
-}
-
-.u-field-inner {
-	display: flex;
-	align-items: center;
-}
-
-.u-textarea-inner {
-	align-items: flex-start;
-}
-
-.u-textarea-class {
-	min-height: 96rpx;
-}
-
-.fild-body {
-	display: flex;
-	flex: 1;
-	align-items: center;
-}
-
-.u-arror-right {
-	margin-left: 8rpx;
-}
-
-.u-label-text {
-	display: inline-block;
-}
-
-.u-label-left-gap {
-	margin-left: 6rpx;
-}
-
-.u-label-postion-top {
-	flex-direction: column;
-	align-items: flex-start;
-}
-
-.u-label {
-	width: 130rpx;
-	flex: 1 1 130rpx;
-	text-align: left;
-	position: relative;
-	display: flex;
-	align-items: center;
-}
-
-.u-required::before {
-	content: '*';
-	position: absolute;
-	left: -16rpx;
-	font-size: 14px;
-	color: $u-type-error;
-	height: 9px;
-	line-height: 1;
-}
-
-.u-input-class {
-	position: relative;
-	overflow: hidden;
-	font-size: 28rpx;
-	height: 48rpx;
-	flex: 1;
-	width: auto;
-}
-
-.u-clear-icon {
-	display: flex;
-	align-items: center;
-}
-
-.u-field-border:after {
-	left: 32rpx!important;
-	position: absolute;
-	box-sizing: border-box;
-	content: ' ';
-	pointer-events: none;
-	right: 0;
-	top: 0;
-	border-bottom: 1px solid $u-border-color;
-	-webkit-transform: scaleY(0.5);
-	transform: scaleY(0.5);
-}
-
-.u-error-message {
-	color: $u-type-error;
-	font-size: 26rpx;
-	text-align: left;
-}
-
-.placeholder-style {
-	color: rgb(150, 151, 153);
-}
+<template>
+	<view class="u-field" :class="{'u-field-border': itemIndex > 0 }">
+		<view class="u-field-inner" :class="[type == 'textarea' ? 'u-textarea-inner' : '', 'u-label-postion-' + labelPostion]">
+			<view class="u-label" :class="[required ? 'u-required' : '']" :style="{
+				justifyContent: justifyContent, 
+				flex: labelPostion == 'left' ? `0 0 ${labelWidth}rpx` : '1'
+			}">
+				<view class="u-icon-wrap" v-if="icon">
+					<u-icon size="32" :name="icon" :color="iconColor" class="u-icon"></u-icon>
+				</view>
+				<slot name="icon"></slot>
+				<text class="u-label-text" :class="[this.$slots.icon || icon ? 'u-label-left-gap' : '']">{{ label }}</text>
+			</view>
+			<view class="fild-body">
+				<textarea v-if="type == 'textarea'" class="u-input-class u-textarea-class" :style="[inputStyle]" :value="value"
+				 :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength"
+				 :focus="focus" :autoHeight="autoHeight" :fixed="fixed" @input="onInput" @blur="onBlur" @focus="onFocus" @confirm="onConfirm"
+				 @tap="fieldClick" />
+				<input
+					v-else
+					:style="[inputStyle]"
+					class="u-input-class"
+					:type="type"
+					:value="value"
+					:password="password || type === 'password'"
+					:placeholder="placeholder"
+					:placeholderStyle="placeholderStyle"
+					:disabled="disabled"
+					:maxlength="inputMaxlength"
+					:focus="focus"
+					:confirmType="confirmType"
+					@focus="onFocus"
+					@blur="onBlur"
+					@input="onInput"
+					@confirm="onConfirm"
+					@tap="fieldClick"
+				/>
+				<u-icon v-if="clearable && value && focused" name="close-circle-fill" color="#c0c4cc" class="u-clear-icon" @touchstart="onClear"/>
+				<view class="u-button-wrap"><slot name="button" /></view>
+				<u-icon v-if="rightIcon" @click="rightIconClick" :name="rightIcon" color="#c0c4cc" :style="[rightIconStyle]" size="26" class="u-arror-right" />
+			</view>
+		</view>
+		<view v-if="errorMessage !== false && errorMessage != ''" class="u-error-message" :style="{
+			paddingLeft: labelWidth + 'rpx'
+		}">{{ errorMessage }}</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 借助此组件，可以实现表单的输入， 有"text"和"textarea"类型的，此外，借助uView的picker和actionSheet组件可以快速实现上拉菜单，时间，地区选择等， 为表单解决方案的利器。
+	 * @tutorial https://www.uviewui.com/components/field.html
+	 * @property {String} type 输入框的类型（默认text）
+	 * @property {String} icon label左边的图标，限uView的图标名称
+	 * @property {Boolean} right-icon 输入框右边的（默认false）
+	 * @property {Boolean} required 是否必填，左边您显示红色"*"号（默认false）
+	 * @property {String} label 输入框左边的文字提示
+	 * @property {Boolean} password 是否密码输入方式(用点替换文字)，type为text时有效（默认false）
+	 * @property {Boolean} clearable 是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容（默认true）
+	 * @property {Number String} label-width label的宽度，单位rpx（默认130）
+	 * @property {String} label-align label的文字对齐方式（默认left）
+	 * @property {String} input-align 输入框内容对齐方式（默认left）
+	 * @property {String} icon-color 左边通过icon配置的图标的颜色（默认#606266）
+	 * @property {Boolean} auto-height 是否自动增高输入区域，type为textarea时有效（默认true）
+	 * @property {String Boolean} error-message 显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {String} placeholder-style placeholder的样式(内联样式，字符串)，如"color: #ddd"
+	 * @property {Boolean} focus 是否自动获得焦点（默认false）
+	 * @property {Boolean} fixed 如果type为textarea，且在一个"position:fixed"的区域，需要指明为true（默认false）
+	 * @property {Boolean} disabled 是否不可输入（默认false）
+	 * @property {Number String} maxlength 最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+	 * @property {String} confirm-type 设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+	 * @event {Function} input 输入框内容发生变化时触发
+	 * @event {Function} focus 输入框获得焦点时触发
+	 * @event {Function} blur 输入框失去焦点时触发
+	 * @event {Function} confirm 点击完成按钮时触发
+	 * @event {Function} right-icon-click 通过right-icon生成的图标被点击时触发
+	 * @event {Function} click 输入框被点击或者通过right-icon生成的图标被点击时触发，这样设计是考虑到传递右边的图标，一般都为需要弹出"picker"等操作时的场景，点击倒三角图标，理应发出此事件，见上方说明
+	 * @example <u-field v-model="mobile" label="手机号" required :error-message="errorMessage"></u-field>
+	 */
+export default {
+	name:"u-field",
+	props: {
+		icon: String,
+		rightIcon: String,
+		// arrowDirection: {
+		// 	type: String,
+		// 	default: 'right'
+		// },
+		required: Boolean,
+		label: String,
+		password: Boolean,
+		clearable: {
+			type: Boolean,
+			default: true
+		},
+		// 左边标题的宽度单位rpx
+		labelWidth: {
+			type: [Number, String],
+			default: 130
+		},
+		// 对齐方式，left|center|right
+		labelAlign: {
+			type: String,
+			default: 'left'
+		},
+		inputAlign: {
+			type: String,
+			default: 'left'
+		},
+		iconColor: {
+			type: String,
+			default: '#606266'
+		},
+		autoHeight: {
+			type: Boolean,
+			default: true
+		},
+		errorMessage: {
+			type: [String, Boolean],
+			default: ''
+		},
+		placeholder: String,
+		placeholderStyle: String,
+		focus: Boolean,
+		fixed: Boolean,
+		value: [Number, String],
+		type: {
+			type: String,
+			default: 'text'
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		maxlength: {
+			type: [Number, String],
+			default: 140
+		},
+		confirmType: {
+			type: String,
+			default: 'done'
+		},
+		// lable的位置，可选为 left-左边，top-上边
+		labelPostion: {
+			type: String,
+			default: 'left'
+		}
+	},
+	inject: ['uCellGroup'],
+	data() {
+		return {
+			focused: false,
+			itemIndex: 0,
+		};
+	},
+	created() {
+		if(this.uCellGroup) {
+			this.itemIndex = this.uCellGroup.index++;
+		}
+	},
+	computed: {
+		inputStyle() {
+			let style = {};
+			style.textAlign = this.inputAlign;
+			// 判断lable的位置，如果是left的话，让input左边两边有间隙
+			if(this.labelPostion == 'left') {
+				style.margin = `0 8rpx`;
+			} else {
+				// 如果lable是top的，input的左边就没必要有间隙了
+				style.marginRight = `8rpx`;
+			}
+			return style;
+		},
+		rightIconStyle() {
+			let style = {};
+			if (this.arrowDirection == 'top') style.transform = 'roate(-90deg)';
+			if (this.arrowDirection == 'bottom') style.transform = 'roate(90deg)';
+			else style.transform = 'roate(0deg)';
+			return style;
+		},
+		labelStyle() {
+			let style = {};
+			if(this.labelAlign == 'left') style.justifyContent = 'flext-start';
+			if(this.labelAlign == 'center') style.justifyContent = 'center';
+			if(this.labelAlign == 'right') style.justifyContent = 'flext-end';
+			return style;
+		},
+		// uni不支持在computed中写style.justifyContent = 'center'的形式，故用此方法
+		justifyContent() {
+			if(this.labelAlign == 'left') return 'flex-start';
+			if(this.labelAlign == 'center') return 'center';
+			if(this.labelAlign == 'right') return 'flex-end';
+		},
+		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
+		inputMaxlength() {
+			return Number(this.maxlength)
+		},
+		// label的位置
+		fieldInnerStyle() {
+			let style = {};
+			if(this.labelPostion == 'left') {
+				style.flexDirection = 'row';
+			} else {
+				style.flexDirection = 'column';
+			}
+			
+			return style;
+		}
+	},
+	methods: {
+		onInput(event) {
+			this.$emit('input', event.target.value);
+		},
+		onFocus(event) {
+			this.focused = true;
+			this.$emit('focus', event);
+		},
+		onBlur(event) {
+			this.focused = false;
+			this.$emit('blur', event);
+		},
+		onConfirm(e) {
+			this.$emit('confirm', e.detail.value);
+		},
+		onClear(event) {
+			this.$emit('input', '');
+		},
+		rightIconClick() {
+			this.$emit('right-icon-click');
+			this.$emit('click');
+		},
+		fieldClick() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.u-field {
+	font-size: 28rpx;
+	padding: 20rpx 28rpx;
+	text-align: left;
+	position: relative;
+	color: $u-main-color;
+}
+
+.u-field-inner {
+	display: flex;
+	align-items: center;
+}
+
+.u-textarea-inner {
+	align-items: flex-start;
+}
+
+.u-textarea-class {
+	min-height: 96rpx;
+}
+
+.fild-body {
+	display: flex;
+	flex: 1;
+	align-items: center;
+}
+
+.u-arror-right {
+	margin-left: 8rpx;
+}
+
+.u-label-text {
+	display: inline-block;
+}
+
+.u-label-left-gap {
+	margin-left: 6rpx;
+}
+
+.u-label-postion-top {
+	flex-direction: column;
+	align-items: flex-start;
+}
+
+.u-label {
+	width: 130rpx;
+	flex: 1 1 130rpx;
+	text-align: left;
+	position: relative;
+	display: flex;
+	align-items: center;
+}
+
+.u-required::before {
+	content: '*';
+	position: absolute;
+	left: -16rpx;
+	font-size: 14px;
+	color: $u-type-error;
+	height: 9px;
+	line-height: 1;
+}
+
+.u-input-class {
+	position: relative;
+	overflow: hidden;
+	font-size: 28rpx;
+	height: 48rpx;
+	flex: 1;
+	width: auto;
+}
+
+.u-clear-icon {
+	display: flex;
+	align-items: center;
+}
+
+.u-field-border:after {
+	left: 32rpx!important;
+	position: absolute;
+	box-sizing: border-box;
+	content: ' ';
+	pointer-events: none;
+	right: 0;
+	top: 0;
+	border-bottom: 1px solid $u-border-color;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+}
+
+.u-error-message {
+	color: $u-type-error;
+	font-size: 26rpx;
+	text-align: left;
+}
+
+.placeholder-style {
+	color: rgb(150, 151, 153);
+}
 </style>

uview/components/u-grid-item/u-grid-item.vue

-<template>
-	<view
-		class="u-grid-item"
-		:class="[showBorder ? 'u-border-right u-border-bottom' : '']"
-		:hover-class="hoverClass ? 'u-grid-item-hover' : ''"
-		:hover-stay-time="200"
-		@tap="click"
-		:style="{
-			background: bgColor,
-			width: width + 'px'
-		}"
-	>
-		<view class="u-grid-item-box">
-			<slot />
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		// 背景颜色
-		bgColor: {
-			type: String,
-			default: '#ffffff'
-		},
-		// 点击时返回的index
-		index: {
-			type: [Number, String],
-			default: ''
-		},
-	},
-	// 父组件通过provide传递过来的整个this
-	inject: ['uGrid'],
-	data() {
-		return {
-			hoverClass: '', // 按下去的时候，是否显示背景灰色
-		};
-	},
-	created() {
-		this.hoverClass = this.uGrid.hoverClass;
-	},
-	computed: {
-		// 小于2，显示2列；大于12，显示12列
-		colNum() {
-			return this.col < 2 ? 2 : this.col > 12 ? 12 : this.col;
-		},
-		// 每个grid-item的宽度
-		width() {
-			return this.uGrid.width / this.uGrid.col;
-		},
-		// 是否显示边框
-		// 为了迎合演示的需要，从created生命周期移到此，以为演示中可能需要动态修改有无边框
-		showBorder() {
-			return this.uGrid.border;
-		}
-	},
-	methods: {
-		click() {
-			this.$emit('click', this.index);
-			this.uGrid.click(this.index);
-		}
-	},
-};
-</script>
-
-<style scoped lang="scss">
-	
-.u-grid-item {
-	box-sizing: border-box;
-	background: #fff;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	position: relative;
-	flex-direction: column;
-	position: relative;
-}
-
-.u-grid-item-hover {
-	background: #f7f7f7 !important;
-}
-
-.u-grid-marker-box {
-	position: absolute;
-	display: inline-block;
-	line-height: 0;
-}
-
-.u-grid-marker-wrap {
-	position: absolute;
-}
-
-.u-grid-item-box {
-	padding: 30rpx 0;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-}
+<template>
+	<view class="u-grid-item" :class="[showBorder ? 'u-border-right u-border-bottom' : '']" :hover-class="hoverClass ? 'u-grid-item-hover' : ''"
+	 :hover-stay-time="200" @tap="click" :style="{
+			background: bgColor,
+			width: width + 'px'
+		}">
+		<view class="u-grid-item-box">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。搭配<u-grid>使用
+	 * @tutorial https://www.uviewui.com/components/grid.html
+	 * @property {String} bg-color 宫格的背景颜色（默认#ffffff）
+	 * @property {String Number} index 点击宫格时，返回的值
+	 * @event {Function} click 点击宫格触发
+	 * @example <u-grid-item></u-grid-item>
+	 */
+	export default {
+		name: "u-grid-item",
+		props: {
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 点击时返回的index
+			index: {
+				type: [Number, String],
+				default: ''
+			},
+		},
+		// 父组件通过provide传递过来的整个this
+		inject: ['uGrid'],
+		data() {
+			return {
+				hoverClass: '', // 按下去的时候，是否显示背景灰色
+			};
+		},
+		created() {
+			this.hoverClass = this.uGrid.hoverClass;
+		},
+		computed: {
+			// 小于2，显示2列；大于12，显示12列
+			colNum() {
+				return this.col < 2 ? 2 : this.col > 12 ? 12 : this.col;
+			},
+			// 每个grid-item的宽度
+			width() {
+				return this.uGrid.width / this.uGrid.col;
+			},
+			// 是否显示边框
+			// 为了迎合演示的需要，从created生命周期移到此，以为演示中可能需要动态修改有无边框
+			showBorder() {
+				return this.uGrid.border;
+			}
+		},
+		methods: {
+			click() {
+				this.$emit('click', this.index);
+				this.uGrid.click(this.index);
+			}
+		},
+	};
+</script>
+
+<style scoped lang="scss">
+	.u-grid-item {
+		box-sizing: border-box;
+		background: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		flex-direction: column;
+		position: relative;
+	}
+
+	.u-grid-item-hover {
+		background: #f7f7f7 !important;
+	}
+
+	.u-grid-marker-box {
+		position: absolute;
+		display: inline-block;
+		line-height: 0;
+	}
+
+	.u-grid-marker-wrap {
+		position: absolute;
+	}
+
+	.u-grid-item-box {
+		padding: 30rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+	}
 </style>

uview/components/u-icon/u-icon.vue

-<template>
-	<text class="uicon" :class="customClass" :style="{
-		color: color,
-		fontSize: size + 'rpx',
-		fontWeight: bold ? 'bold' :　'normal',
-	}" @tap="click" :hover-class="hoverClass" @touchstart="touchstart">
-		
-	</text>
-</template>
-
-<script>
-	export default {
-		props: {
-			// 图标类名
-			name: {
-				type: String,
-				default: ''
-			},
-			// 图标颜色
-			color: {
-				type: String,
-				default: 'inherit'
-			},
-			// 字体大小，单位rpx
-			size: {
-				type: [Number, String],
-				default: 'inherit'
-			},
-			// 是否显示粗体
-			bold: {
-				type: Boolean,
-				default: false
-			},
-			// 点击图标的时候传递事件出去的index（用于区分点击了哪一个）
-			index: {
-				type: [Number, String],
-				default: ''
-			},
-			// 触摸图标时的类名
-			hoverClass: {
-				type: String,
-				default: ''
-			},
-			// 自定义扩展前缀，方便用户扩展自己的图标库
-			customPrefix: {
-				type: String,
-				default: 'uicon'
-			}
-		},
-		data() {
-			return {
-				
-			}
-		},
-		computed: {
-			customClass() {
-				let classes = [];
-				classes.push(this.customPrefix + '-' + this.name);
-				// uView的自定义图标类名为u-iconfont
-				if(this.customPrefix == 'uicon') classes.push('u-iconfont');
-				else classes.push(this.customPrefix);
-				return classes;
-			}
-		},
-		methods: {
-			click() {
-				this.$emit('click', this.index);
-			},
-			touchstart() {
-				this.$emit('touchstart', this.index);
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import '../../../uview/iconfont.css';
-	
-	.uicon {
-		display: inline-flex;
-		align-items: center;
-	}
+<template>
+	<text class="uicon" :class="customClass" :style="{
+		color: color,
+		fontSize: size + 'rpx',
+		fontWeight: bold ? 'bold' :　'normal',
+	}"
+	 @tap="click" :hover-class="hoverClass" @touchstart="touchstart">
+
+	</text>
+</template>
+
+<script>
+	/**
+	 * alertTips 提示
+	 * @description 基于字体的图标集，包含了大多数常见场景的图标。
+	 * @tutorial https://www.uviewui.com/components/icon.html
+	 * @property {String} name 图标名称，见示例图标集
+	 * @property {String} color 图标颜色（默认inherit）
+	 * @property {String Number} size 图标字体大小，单位rpx（默认32）
+	 * @property {String} index 一个用于区分多个图标的值，点击图标时通过click事件传出
+	 * @property {String} hover-class 图标按下去的样式类，用法同uni的view组件的hover-class参数，详情见官网
+	 * @event {Function} click 点击图标时触发
+	 * @example <u-icon name="photo" color="#2979ff" size="28"></u-icon>
+	 */
+	export default {
+		name: "u-icon",
+		props: {
+			// 图标类名
+			name: {
+				type: String,
+				default: ''
+			},
+			// 图标颜色
+			color: {
+				type: String,
+				default: 'inherit'
+			},
+			// 字体大小，单位rpx
+			size: {
+				type: [Number, String],
+				default: 'inherit'
+			},
+			// 是否显示粗体
+			bold: {
+				type: Boolean,
+				default: false
+			},
+			// 点击图标的时候传递事件出去的index（用于区分点击了哪一个）
+			index: {
+				type: [Number, String],
+				default: ''
+			},
+			// 触摸图标时的类名
+			hoverClass: {
+				type: String,
+				default: ''
+			},
+			// 自定义扩展前缀，方便用户扩展自己的图标库
+			customPrefix: {
+				type: String,
+				default: 'uicon'
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			customClass() {
+				let classes = [];
+				classes.push(this.customPrefix + '-' + this.name);
+				// uView的自定义图标类名为u-iconfont
+				if (this.customPrefix == 'uicon') classes.push('u-iconfont');
+				else classes.push(this.customPrefix);
+				return classes;
+			}
+		},
+		methods: {
+			click() {
+				this.$emit('click', this.index);
+			},
+			touchstart() {
+				this.$emit('touchstart', this.index);
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import '../../../uview/iconfont.css';
+
+	.uicon {
+		display: inline-flex;
+		align-items: center;
+	}
 </style>