commit bd749bb6c9b8444a35fc7f963609784e74667c49
Author: liuning <807852472@qq.com>
Date:   Tue May 12 01:32:55 2026 +0800

    过滤器小程序

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..14ea590
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# Windows
+[Dd]esktop.ini
+Thumbs.db
+$RECYCLE.BIN/
+
+# macOS
+.DS_Store
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+
+# Node.js
+node_modules/
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..8c2b732
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,17 @@
+<script>
+	export default {
+		onLaunch: function() {
+			console.log('App Launch')
+		},
+		onShow: function() {
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+	}
+</script>
+
+<style>
+	/*每个页面公共css */
+</style>
diff --git a/common/js/localdata.js b/common/js/localdata.js
new file mode 100644
index 0000000..f39c1ba
--- /dev/null
+++ b/common/js/localdata.js
@@ -0,0 +1,28 @@
+export default {
+	users: {
+		yanan: {
+			pass: 'yanan123',
+			id: 1,
+			user: 'yanan',
+			name: 'yanan',
+			dept: '系统控制',
+			title: '管理员',
+			mobile: '13288888888'
+		}
+	},
+	devices: [
+		[],
+		[
+			{
+				id: 1,
+				name:'北桥沟',
+				addr:'陕西省延安市宝塔区北桥沟'
+			},
+			{
+				id: 2,
+				name:'黄蒿洼',
+				addr:'陕西省延安市宝塔区黄蒿洼路'
+			}
+		]
+	]
+}
\ No newline at end of file
diff --git a/common/js/myapp.js b/common/js/myapp.js
new file mode 100644
index 0000000..449dcdc
--- /dev/null
+++ b/common/js/myapp.js
@@ -0,0 +1,97 @@
+const API_HOST = 'https://filter.api.opmonitor.com'
+export default {
+	apiHost: API_HOST,
+	dateTimeStr: function() {
+		let d = new Date()
+		let a = []
+		a.push(''  + d.getFullYear())
+		a.push(('' + (d.getMonth() + 1)).padStart(2, '0'))
+		a.push(('' + d.getDate()).padStart(2, '0'))
+		a.push(('' + d.getHours()).padStart(2, '0'))
+		a.push(('' + d.getMinutes()).padStart(2, '0'))
+		a.push(('' + d.getSeconds()).padStart(2, '0'))
+		return `${a[0]}-${a[1]}-${a[2]} ${a[3]}:${a[4]}:${a[5]}`
+	},
+	tabBar: [
+		{
+			pagePath: '/packagePage/pages/ctrllist/ctrllist',
+			text: '医院',
+			iconPath: API_HOST + '/miniapp/static/tabnav1a.png',
+			selectedIconPath: API_HOST + '/miniapp/static/tabnav1.png'
+		},
+		{
+			pagePath: '/packagePage/pages/positionindex/positionindex',
+			text: '点位',
+			iconPath: API_HOST + '/miniapp/static/extend_gray.png',
+			selectedIconPath: API_HOST + '/miniapp/static/extend_active.png'
+		},
+		{
+			pagePath: '/packagePage/pages/record/record',
+			text: '记录',
+			iconPath: API_HOST + '/miniapp/static/code_gray.png',
+			selectedIconPath: API_HOST + '/miniapp/static/code_active.png'
+		},
+		{
+			pagePath: '/packagePage/pages/ctrldevice/ctrldevice',
+			text: '更换',
+			iconPath: API_HOST + '/miniapp/static/thor_gray.png',
+			selectedIconPath: API_HOST + '/miniapp/static/thor_active.png'
+		}
+	],	
+	// tabbar 切换
+	tabbarSwitch: function(e) {
+		uni.reLaunch({
+			url: e.pagePath
+		})
+	},
+	// check login
+	checkLogin: function() {
+		let info = uni.getStorageSync('user')
+		if (typeof(info) == 'object' && info.account != undefined) {
+			return info
+		} else {
+			uni.reLaunch({
+				url: '/packagePage/pages/auth/auth'
+			})
+		}		
+	},
+	// toast
+	showHint: function(msg = 'hello', sec = 2000) {
+		uni.showToast({
+			title: msg,
+			duration: sec,
+			icon: 'none',
+			mask: true
+		})
+	},
+	// request
+	request: function(uri, callback, reqData = {}, reqMethod = 'GET') {
+		let params = {
+			url:API_HOST + uri,
+			method: reqMethod,
+			data: reqData,
+			success: callback,
+			fail:function() {
+				uni.showToast({
+					title: '加载失败',
+					duration: 2000,
+					icon: 'none',
+					mask: true
+				})
+			},
+			complete: function() {
+				uni.hideLoading()
+			}
+		}
+		if (reqMethod == 'POST') {
+			params.header = {
+				'content-type': 'application/x-www-form-urlencoded'
+			}
+		}
+		uni.showLoading({
+			title: '加载中',
+			mask: true
+		})
+		uni.request(params)
+	}
+}
\ No newline at end of file
diff --git a/components/qiun-title-bar/qiun-title-bar.vue b/components/qiun-title-bar/qiun-title-bar.vue
new file mode 100644
index 0000000..f235f17
--- /dev/null
+++ b/components/qiun-title-bar/qiun-title-bar.vue
@@ -0,0 +1,51 @@
+<template>
+	<view class="qiun-title-bar">
+		<view class="qiun-title-dot"></view>
+		<view class="qiun-title-text">{{title}}</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: "title-bar",
+	props: {
+		title: {
+			type: String,
+			default: ''
+		},
+	},
+	mounted() {
+		
+	},
+	methods:{
+	}
+}
+</script>
+
+
+<style>
+	.qiun-title-bar{
+		display: flex;
+		flex-direction: row !important;
+		flex-wrap: nowrap;
+		align-items: center;
+		height: 40px;
+	}
+	
+	.qiun-title-dot {
+		border-radius: 10px;
+		background-color: #409EFF;
+		width: 5px;
+		height: 16px;
+		margin-left: 8px;
+	}
+	
+	.qiun-title-text {
+		font-size: 17px;
+		color: #666666;
+		margin-left: 8px;
+		line-height: 22px;
+		height: 22px;
+		font-weight: bold;
+	}
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-badge/tui-badge.vue b/components/thorui/tui-badge/tui-badge.vue
new file mode 100644
index 0000000..208aaa6
--- /dev/null
+++ b/components/thorui/tui-badge/tui-badge.vue
@@ -0,0 +1,155 @@
+<template>
+	<view :class="[dot ? 'tui-badge-dot' : 'tui-badge', 'tui-' + type, !dot ? 'tui-badge-scale' : '']" :style="{ top: top, right: right, position: absolute ? 'absolute' : 'static', transform: getStyle, margin: margin }"
+	 @tap="handleClick">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiBadge',
+		props: {
+			//primary,warning,green,danger,white，black，gray,white_red
+			type: {
+				type: String,
+				default: 'primary'
+			},
+			//是否是圆点
+			dot: {
+				type: Boolean,
+				default: false
+			},
+			margin: {
+				type: String,
+				default: '0'
+			},
+			//是否绝对定位
+			absolute: {
+				type: Boolean,
+				default: false
+			},
+			top: {
+				type: String,
+				default: '-8rpx'
+			},
+			right: {
+				type: String,
+				default: '0'
+			},
+			//缩放比例
+			scaleRatio: {
+				type: Number,
+				default: 1
+			},
+			//水平方向移动距离
+			translateX: {
+				type: String,
+				default: '0'
+			}
+		},
+		computed: {
+			getStyle() {
+				return `scale(${this.scaleRatio}) translateX(${this.translateX})`;
+			}
+		},
+		methods: {
+			handleClick() {
+				this.$emit('click', {});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	/* color start*/
+
+	.tui-primary {
+		background-color: #5677fc;
+		color: #fff;
+	}
+
+	.tui-danger {
+		background-color: #ed3f14;
+		color: #fff;
+	}
+
+	.tui-red {
+		background-color: #F74D54;
+		color: #fff;
+	}
+
+	.tui-warning {
+		background-color: #ff7900;
+		color: #fff;
+	}
+
+	.tui-green {
+		background-color: #19be6b;
+		color: #fff;
+	}
+
+	.tui-white {
+		background-color: #fff;
+		color: #333;
+	}
+
+	.tui-white_red {
+		background-color: #fff;
+		color: #F74D54;
+	}
+
+	.tui-white_primary {
+		background-color: #fff;
+		color: #5677fc;
+	}
+
+	.tui-white_green {
+		background-color: #fff;
+		color: #19be6b;
+	}
+
+	.tui-white_warning {
+		background-color: #fff;
+		color: #ff7900;
+	}
+
+	.tui-black {
+		background-color: #000;
+		color: #fff;
+	}
+
+	.tui-gray {
+		background-color: #ededed;
+		color: #999;
+	}
+
+	/* color end*/
+
+	/* badge start*/
+
+	.tui-badge-dot {
+		height: 8px;
+		width: 8px;
+		border-radius: 50%;
+	}
+
+	.tui-badge {
+		font-size: 24rpx;
+		line-height: 24rpx;
+		height: 36rpx;
+		min-width: 36rpx;
+		padding: 0 10rpx;
+		box-sizing: border-box;
+		border-radius: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 10;
+	}
+
+	.tui-badge-scale {
+		transform-origin: center center;
+	}
+
+	/* badge end*/
+</style>
diff --git a/components/thorui/tui-bottom-navigation/tui-bottom-navigation.vue b/components/thorui/tui-bottom-navigation/tui-bottom-navigation.vue
new file mode 100644
index 0000000..2e269c5
--- /dev/null
+++ b/components/thorui/tui-bottom-navigation/tui-bottom-navigation.vue
@@ -0,0 +1,388 @@
+<template>
+	<view @touchmove.stop.prevent="stop">
+		<view class="tui-bottom-navigation" :class="{ 'tui-navigation-fixed': isFixed, 'tui-remove-splitLine': unlined }">
+			<view
+				class="tui-navigation-item"
+				:class="{ 'tui-item-after_height': splitLineScale, 'tui-last-item': index == itemList.length - 1 }"
+				:style="{ backgroundColor: isDarkMode ? '#202020' : backgroundColor }"
+				v-for="(item, index) in itemList"
+				:key="index"
+			>
+				<view class="tui-item-inner" @tap="menuClick(index, item.parameter, item.type)">
+					<image
+						:src="current | getIcon(index, item)"
+						class="tui-navigation-img"
+						v-if="item.iconPath || (current == index && item.selectedIconPath && item.type == 1)"
+					></image>
+					<text
+						class="tui-navigation-text"
+						:style="{
+							color: isDarkMode ? '#fff' : current == index && item.type == 1 ? selectedColor : item.color || color,
+							fontWeight: current == index && bold && item.type == 1 ? 'bold' : 'normal',
+							fontSize: fontSize
+						}"
+					>
+						{{ item.text }}
+					</text>
+				</view>
+				<view
+					class="tui-navigation-popup"
+					:class="{ 'tui-navigation-popup_show': showMenuIndex == index }"
+					:style="{ backgroundColor: isDarkMode ? '#4c4c4c' : subMenuBgColor, left: item.popupLeft || '50%' }"
+					v-if="item.itemList"
+				>
+					<view
+						class="tui-popup-cell"
+						:class="{ 'tui-first-cell': subIndex === 0, 'tui-last-cell': subIndex === item.itemList.length - 1 }"
+						:hover-class="subMenuHover ? (isDarkMode ? 'tui-item-dark_hover' : 'tui-item-hover') : ''"
+						:hover-stay-time="150"
+						v-for="(subItem, subIndex) in item.itemList || []"
+						:key="subIndex"
+						@tap="subMenuClick(index, item.type, subIndex, subItem.parameter || '')"
+					>
+						<text class="tui-ellipsis" :style="{ color: isDarkMode ? '#fff' : subMenuColor, fontSize: subMenufontSize, lineHeight: subMenufontSize }">
+							{{ subItem.text }}
+						</text>
+					</view>
+					<view class="tui-popup-triangle" :style="{ borderTopColor: isDarkMode ? '#4c4c4c' : subMenuBgColor }"></view>
+				</view>
+			</view>
+		</view>
+		<view class="tui-navigation-mask" :class="{ 'tui-navigation-mask_show': showMenuIndex != -1 }" @tap="handleClose"></view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'tuiBottomNavigation',
+	emits: ['click'],
+	props: {
+		//当前索引
+		current: {
+			type: Number,
+			default: 0
+		},
+		/**
+		 * {
+				text: 'ThorUI',
+				iconPath: '/static/images/common/icon_menu_gray.png',
+				selectedIconPath: '/static/images/common/icon_menu_gray.png',
+				color: '#666',
+				//1-选中切换，2-跳转、请求、其他操作，3-菜单
+				type: 3,
+				//自定义参数，类型自定义
+				parameter: null,
+				//子菜单left值,不传默认50%,当菜单贴近左右两边可用此参数调整
+				popupLeft: '',
+				itemList: [
+					{
+						//不建议超过6个字，请自行控制
+						text: '自定义参',
+						//自定义参数，类型自定义
+						parameter: null
+					},
+					{
+						text: '自定义参数',
+						//自定义参数，类型自定义
+						parameter: null
+					}
+				]
+			}
+		 * 
+		 * */
+		itemList: {
+			type: Array,
+			default: () => {
+				return [];
+			}
+		},
+		//颜色
+		color: {
+			type: String,
+			default: '#666'
+		},
+		//选中颜色
+		selectedColor: {
+			type: String,
+			default: '#5677fc'
+		},
+		fontSize: {
+			type: String,
+			default: '28rpx'
+		},
+		//选中后字体是否加粗
+		bold: {
+			type: Boolean,
+			default: true
+		},
+		//导航条背景颜色
+		backgroundColor: {
+			type: String,
+			default: '#F8F8F8'
+		},
+		//item分割线高度是否缩小
+		splitLineScale: {
+			type: Boolean,
+			default: true
+		},
+		//二级菜单字体颜色
+		subMenuColor: {
+			type: String,
+			default: '#333'
+		},
+		//二级菜单字体大小
+		subMenufontSize: {
+			type: String,
+			default: '28rpx'
+		},
+		//二级菜单背景色  深色：#4c4c4c
+		subMenuBgColor: {
+			type: String,
+			default: '#fff'
+		},
+		//二级菜单是否有点击效果
+		subMenuHover: {
+			type: Boolean,
+			default: true
+		},
+		//是否固定在底部
+		isFixed: {
+			type: Boolean,
+			default: true
+		},
+		//去除导航栏顶部的线条
+		unlined: {
+			type: Boolean,
+			default: false
+		},
+		//是否暗黑模式 (true：所有设置颜色失效)
+		isDarkMode: {
+			type: Boolean,
+			default: false
+		}
+	},
+	filters: {
+		getIcon: function(current, index, item) {
+			let url = item.iconPath;
+			if (item.type == 1) {
+				url = current == index ? item.selectedIconPath || item.iconPath : item.iconPath;
+			}
+			return url;
+		}
+	},
+	data() {
+		return {
+			showMenuIndex: -1 //显示的菜单index
+		};
+	},
+	methods: {
+		stop() {
+			return false;
+		},
+		handleClose() {
+			this.showMenuIndex = -1;
+		},
+		menuClick(index, parameter, type) {
+			//type：1-选中切换，2-跳转、请求、其他操作，3-菜单
+			if (type == 3) {
+				this.showMenuIndex = this.showMenuIndex == index ? -1 : index;
+			} else {
+				this.showMenuIndex = -1;
+				this.$emit('click', {
+					menu: 'main', //main,sub 主菜单，子菜单
+					type: type,
+					index: index,
+					parameter: parameter || ''
+				});
+			}
+		},
+		subMenuClick(index, type, subIndex, parameter) {
+			this.showMenuIndex = -1;
+			this.$emit('click', {
+				menu: 'sub', //main,sub 主菜单，子菜单
+				type: type,
+				index: index,
+				subIndex: subIndex,
+				parameter: parameter || ''
+			});
+		}
+	}
+};
+</script>
+
+<style scoped>
+.tui-bottom-navigation {
+	width: 100%;
+	height: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	position: relative;
+	z-index: 999;
+}
+
+.tui-navigation-fixed {
+	position: fixed !important;
+	left: 0;
+	bottom: 0;
+	padding-bottom: env(safe-area-inset-bottom);
+}
+
+.tui-bottom-navigation::after {
+	content: '';
+	width: 100%;
+	border-top: 1rpx solid #bfbfbf;
+	position: absolute;
+	top: 0;
+	left: 0;
+	transform: scaleY(0.5) translateZ(0);
+	transform-origin: 0 0;
+	z-index: 1000;
+}
+.tui-remove-splitLine::before {
+	border-top: 0 !important;
+}
+
+.tui-navigation-item {
+	flex: 1;
+	height: 100rpx;
+	position: relative;
+	box-sizing: border-box;
+}
+
+.tui-item-inner {
+	width: 100%;
+	height: 100rpx;
+	display: flex;
+	text-align: center;
+	align-items: center;
+	justify-content: center;
+}
+
+.tui-navigation-item::after {
+	height: 100%;
+	content: '';
+	position: absolute;
+	border-right: 1rpx solid #bfbfbf;
+	transform: scaleX(0.5) translateZ(0);
+	right: 0;
+	top: 0;
+}
+
+.tui-item-after_height::after {
+	height: 40% !important;
+	top: 30% !important;
+}
+
+.tui-last-item::after {
+	border-right: 0 !important;
+}
+
+.tui-navigation-img {
+	width: 32rpx;
+	height: 32rpx;
+	margin-right: 8rpx;
+}
+
+.tui-navigation-popup {
+	max-width: 160%;
+	width: auto;
+	position: absolute;
+	border-radius: 8rpx;
+	visibility: hidden;
+	opacity: 0;
+	transform: translate3d(-50%, 0, 0);
+	transform-origin: center;
+	transition: all 0.12s ease-in-out;
+	bottom: 0;
+	z-index: -1;
+}
+
+.tui-navigation-popup_show {
+	transform: translate3d(-50%, -124rpx, 0);
+	visibility: visible;
+	opacity: 1;
+}
+
+.tui-popup-triangle {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-left: 9rpx solid transparent;
+	border-right: 9rpx solid transparent;
+	border-top: 18rpx solid;
+	left: 50%;
+	bottom: -18rpx;
+	-webkit-transform: translateX(-50%);
+	transform: translateX(-50%);
+	z-index: 997;
+}
+
+.tui-popup-cell {
+	width: 100%;
+	padding: 32rpx 20rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex: 1;
+	position: relative;
+}
+
+.tui-ellipsis {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.tui-popup-cell::after {
+	content: '';
+	position: absolute;
+	border-bottom: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	bottom: 0;
+	right: 24rpx;
+	left: 24rpx;
+}
+
+.tui-item-hover {
+	background-color: #f1f1f1;
+}
+
+.tui-item-dark_hover {
+	background-color: #555;
+}
+
+.tui-first-cell {
+	border-top-left-radius: 8rpx;
+	border-top-right-radius: 8rpx;
+}
+
+.tui-last-cell {
+	border-bottom-left-radius: 8rpx;
+	border-bottom-right-radius: 8rpx;
+}
+
+.tui-last-cell::after {
+	border-bottom: 0 !important;
+}
+
+.tui-navigation-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 995;
+	transition: all 0.3s ease-in-out;
+	opacity: 0;
+	visibility: hidden;
+	background-color: rgba(0, 0, 0, 0);
+}
+
+.tui-navigation-mask_show {
+	opacity: 1;
+	visibility: visible;
+}
+</style>
diff --git a/components/thorui/tui-bottom-popup/tui-bottom-popup.vue b/components/thorui/tui-bottom-popup/tui-bottom-popup.vue
new file mode 100644
index 0000000..97b676c
--- /dev/null
+++ b/components/thorui/tui-bottom-popup/tui-bottom-popup.vue
@@ -0,0 +1,107 @@
+<template>
+	<view @touchmove.stop.prevent>
+		<view class="tui-popup-class tui-bottom-popup" :class="{ 'tui-popup-show': show, 'tui-popup-radius': radius }" :style="{ backgroundColor: backgroundColor, height: height ? height + 'rpx' : 'auto', zIndex: zIndex,transform:`translate3d(0, ${show?translateY:'100%'}, 0)`}">
+			<slot></slot>
+		</view>
+		<view class="tui-popup-mask" :class="[show ? 'tui-mask-show' : '']" :style="{ zIndex: maskZIndex }" v-if="mask" @tap="handleClose"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiBottomPopup',
+		emits: ['close'],
+		props: {
+			//是否需要mask
+			mask: {
+				type: Boolean,
+				default: true
+			},
+			//控制显示
+			show: {
+				type: Boolean,
+				default: false
+			},
+			//背景颜色
+			backgroundColor: {
+				type: String,
+				default: '#fff'
+			},
+			//高度 rpx
+			height: {
+				type: Number,
+				default: 0
+			},
+			//设置圆角
+			radius: {
+				type: Boolean,
+				default: true
+			},
+			zIndex: {
+				type: [Number, String],
+				default: 997
+			},
+			maskZIndex: {
+				type: [Number, String],
+				default: 996
+			},
+			//弹层显示时，垂直方向移动的距离
+			translateY: {
+				type: String,
+				default: '0'
+			}
+		},
+		methods: {
+			handleClose() {
+				if (!this.show) {
+					return;
+				}
+				this.$emit('close', {});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-bottom-popup {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		opacity: 0;
+		transform: translate3d(0, 100%, 0);
+		transform-origin: center;
+		transition: all 0.3s ease-in-out;
+		min-height: 20rpx;
+	}
+
+	.tui-popup-radius {
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		padding-bottom: env(safe-area-inset-bottom);
+		overflow: hidden;
+	}
+
+	.tui-popup-show {
+		opacity: 1;
+		/* transform: translate3d(0, 0, 0); */
+	}
+
+	.tui-popup-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.6);
+		transition: all 0.3s ease-in-out;
+		opacity: 0;
+		visibility: hidden;
+	}
+
+	.tui-mask-show {
+		opacity: 1;
+		visibility: visible;
+	}
+</style>
diff --git a/components/thorui/tui-button/tui-button.vue b/components/thorui/tui-button/tui-button.vue
new file mode 100644
index 0000000..160560b
--- /dev/null
+++ b/components/thorui/tui-button/tui-button.vue
@@ -0,0 +1,520 @@
+<template>
+	<button
+		class="tui-btn"
+		:class="[
+			plain ? 'tui-' + type + '-outline' : 'tui-btn-' + (type || 'primary'),
+			getDisabledClass(disabled, type, plain),
+			getShapeClass(shape, plain),
+			getShadowClass(type, shadow, plain),
+			bold ? 'tui-text-bold' : '',
+			link ? 'tui-btn__link' : ''
+		]"
+		:hover-class="getHoverClass(disabled, type, plain)"
+		:style="{ width: width, height: height, lineHeight: height, fontSize: size + 'rpx', margin: margin }"
+		:loading="loading"
+		:form-type="formType"
+		:open-type="openType"
+		@getuserinfo="bindgetuserinfo"
+		@getphonenumber="bindgetphonenumber"
+		@contact="bindcontact"
+		@error="binderror"
+		:disabled="disabled"
+		@tap="handleClick"
+	>
+		<slot></slot>
+	</button>
+</template>
+
+<script>
+export default {
+	name: 'tuiButton',
+	emits: ['click','getuserinfo','contact','getphonenumber','error'],
+	// #ifndef MP-QQ
+	behaviors: ['wx://form-field-button'],
+	// #endif
+	props: {
+		//样式类型 primary, white, danger, warning, green,blue, gray，black,brown,gray-primary,gray-danger,gray-warning,gray-green
+		type: {
+			type: String,
+			default: 'primary'
+		},
+		//是否加阴影
+		shadow: {
+			type: Boolean,
+			default: false
+		},
+		// 宽度 rpx或 %
+		width: {
+			type: String,
+			default: '100%'
+		},
+		//高度 rpx
+		height: {
+			type: String,
+			default: '96rpx'
+		},
+		//字体大小 rpx
+		size: {
+			type: Number,
+			default: 32
+		},
+		bold: {
+			type: Boolean,
+			default: false
+		},
+		margin: {
+			type: String,
+			default: '0'
+		},
+		//形状 circle(圆角), square(默认方形)，rightAngle(平角)
+		shape: {
+			type: String,
+			default: 'square'
+		},
+		plain: {
+			type: Boolean,
+			default: false
+		},
+		//link样式，去掉边框，结合plain一起使用
+		link: {
+			type: Boolean,
+			default: false
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		//禁用后背景是否为灰色 （非空心button生效）
+		disabledGray: {
+			type: Boolean,
+			default: false
+		},
+		loading: {
+			type: Boolean,
+			default: false
+		},
+		formType: {
+			type: String,
+			default: ''
+		},
+		openType: {
+			type: String,
+			default: ''
+		},
+		index: {
+			type: [Number, String],
+			default: 0
+		},
+		//是否需要阻止重复点击【默认200ms】
+		preventClick: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			time: 0
+		};
+	},
+	methods: {
+		handleClick() {
+			if (this.disabled) return;
+			if (this.preventClick) {
+				if(new Date().getTime() - this.time <= 200) return;
+				this.time = new Date().getTime();
+				setTimeout(() => {
+					this.time = 0;
+				}, 200);
+			}
+			this.$emit('click', {
+				index: Number(this.index)
+			});
+		},
+		bindgetuserinfo({ detail = {} } = {}) {
+			this.$emit('getuserinfo', detail);
+		},
+		bindcontact({ detail = {} } = {}) {
+			this.$emit('contact', detail);
+		},
+		bindgetphonenumber({ detail = {} } = {}) {
+			this.$emit('getphonenumber', detail);
+		},
+		binderror({ detail = {} } = {}) {
+			this.$emit('error', detail);
+		},
+		getShadowClass: function(type, shadow, plain) {
+			let className = '';
+			if (shadow && type != 'white' && !plain) {
+				className = 'tui-shadow-' + type;
+			}
+			return className;
+		},
+		getDisabledClass: function(disabled, type, plain) {
+			let className = '';
+			if (disabled && type != 'white' && type.indexOf('-') == -1) {
+				let classVal = this.disabledGray ? 'tui-gray-disabled' : 'tui-dark-disabled';
+				className = plain ? 'tui-dark-disabled-outline' : classVal;
+			}
+			return className;
+		},
+		getShapeClass: function(shape, plain) {
+			let className = '';
+			if (shape == 'circle') {
+				className = plain ? 'tui-outline-fillet' : 'tui-fillet';
+			} else if (shape == 'rightAngle') {
+				className = plain ? 'tui-outline-rightAngle' : 'tui-rightAngle';
+			}
+			return className;
+		},
+		getHoverClass: function(disabled, type, plain) {
+			let className = '';
+			if (!disabled) {
+				className = plain ? 'tui-outline-hover' : 'tui-' + (type || 'primary') + '-hover';
+			}
+			return className;
+		}
+	}
+};
+</script>
+
+<style scoped>
+.tui-btn-primary {
+	background: #5677fc !important;
+	color: #fff;
+}
+
+.tui-shadow-primary {
+	box-shadow: 0 10rpx 14rpx 0 rgba(86, 119, 252, 0.2);
+}
+
+.tui-btn-danger {
+	background: #eb0909 !important;
+	color: #fff;
+}
+
+.tui-shadow-danger {
+	box-shadow: 0 10rpx 14rpx 0 rgba(235, 9, 9, 0.2);
+}
+
+.tui-btn-warning {
+	background: #fc872d !important;
+	color: #fff;
+}
+
+.tui-shadow-warning {
+	box-shadow: 0 10rpx 14rpx 0 rgba(252, 135, 45, 0.2);
+}
+
+.tui-btn-green {
+	background: #07c160 !important;
+	color: #fff;
+}
+
+.tui-shadow-green {
+	box-shadow: 0 10rpx 14rpx 0 rgba(7, 193, 96, 0.2);
+}
+
+.tui-btn-blue {
+	background: #007aff !important;
+	color: #fff;
+}
+
+.tui-shadow-blue {
+	box-shadow: 0 10rpx 14rpx 0 rgba(0, 122, 255, 0.2);
+}
+
+.tui-btn-white {
+	background: #fff !important;
+	color: #333 !important;
+}
+
+.tui-btn-gray {
+	background: #bfbfbf !important;
+	color: #fff !important;
+}
+
+.tui-btn-black {
+	background: #333 !important;
+	color: #fff !important;
+}
+.tui-btn-brown{
+	background: #ac9157 !important;
+	color: #fff !important;
+}
+
+.tui-btn-gray-black {
+	background: #f2f2f2 !important;
+	color: #333;
+}
+
+.tui-btn-gray-primary {
+	background: #f2f2f2 !important;
+	color: #5677fc !important;
+}
+
+.tui-gray-primary-hover {
+	background: #d9d9d9 !important;
+}
+
+.tui-btn-gray-green {
+	background: #f2f2f2 !important;
+	color: #07c160 !important;
+}
+
+.tui-gray-green-hover {
+	background: #d9d9d9 !important;
+}
+
+.tui-btn-gray-danger {
+	background: #f2f2f2 !important;
+	color: #eb0909 !important;
+}
+
+.tui-gray-danger-hover {
+	background: #d9d9d9 !important;
+}
+
+.tui-btn-gray-warning {
+	background: #f2f2f2 !important;
+	color: #fc872d !important;
+}
+
+.tui-gray-warning-hover {
+	background: #d9d9d9 !important;
+}
+
+.tui-shadow-gray {
+	box-shadow: 0 10rpx 14rpx 0 rgba(191, 191, 191, 0.2);
+}
+
+.tui-hover-gray {
+	background: #f7f7f9 !important;
+}
+
+.tui-black-hover {
+	background: #555 !important;
+	color: #e5e5e5 !important;
+}
+.tui-brown-hover{
+	background: #A37F49 !important;
+	color: #e5e5e5 !important;
+}
+
+/* button start*/
+
+.tui-btn {
+	width: 100%;
+	position: relative;
+	border: 0 !important;
+	border-radius: 6rpx;
+	padding-left: 0;
+	padding-right: 0;
+	overflow: visible;
+}
+
+.tui-btn::after {
+	content: '';
+	position: absolute;
+	width: 200%;
+	height: 200%;
+	transform-origin: 0 0;
+	transform: scale(0.5, 0.5) translateZ(0);
+	box-sizing: border-box;
+	left: 0;
+	top: 0;
+	border-radius: 12rpx;
+	border: 0;
+}
+
+.tui-text-bold {
+	font-weight: bold;
+}
+
+.tui-btn-white::after {
+	border: 1px solid #bfbfbf;
+}
+
+.tui-white-hover {
+	background: #e5e5e5 !important;
+	color: #2e2e2e !important;
+}
+
+.tui-dark-disabled {
+	opacity: 0.6 !important;
+	color: #fafbfc !important;
+}
+
+.tui-dark-disabled-outline {
+	opacity: 0.5 !important;
+}
+
+.tui-gray-disabled {
+	background: #f3f3f3 !important;
+	color: #919191 !important;
+	box-shadow: none;
+}
+
+.tui-outline-hover {
+	opacity: 0.5;
+}
+
+.tui-primary-hover {
+	background: #4a67d6 !important;
+	color: #e5e5e5 !important;
+}
+
+.tui-primary-outline::after {
+	border: 1px solid #5677fc !important;
+}
+
+.tui-primary-outline {
+	color: #5677fc !important;
+	background: transparent;
+}
+
+.tui-danger-hover {
+	background: #c80808 !important;
+	color: #e5e5e5 !important;
+}
+
+.tui-danger-outline {
+	color: #eb0909 !important;
+	background: transparent;
+}
+
+.tui-danger-outline::after {
+	border: 1px solid #eb0909 !important;
+}
+
+.tui-warning-hover {
+	background: #d67326 !important;
+	color: #e5e5e5 !important;
+}
+
+.tui-warning-outline {
+	color: #fc872d !important;
+	background: transparent;
+}
+
+.tui-warning-outline::after {
+	border: 1px solid #fc872d !important;
+}
+
+.tui-green-hover {
+	background: #06ad56 !important;
+	color: #e5e5e5 !important;
+}
+
+.tui-green-outline {
+	color: #07c160 !important;
+	background: transparent;
+}
+
+.tui-green-outline::after {
+	border: 1px solid #07c160 !important;
+}
+
+.tui-blue-hover {
+	background: #0062cc !important;
+	color: #e5e5e5 !important;
+}
+
+.tui-blue-outline {
+	color: #007aff !important;
+	background: transparent;
+}
+
+.tui-blue-outline::after {
+	border: 1px solid #007aff !important;
+}
+
+/* #ifndef APP-NVUE */
+.tui-btn-gradual {
+	background: linear-gradient(90deg, rgb(255, 89, 38), rgb(240, 14, 44)) !important;
+	color: #fff !important;
+}
+
+.tui-shadow-gradual {
+	box-shadow: 0 10rpx 14rpx 0 rgba(235, 9, 9, 0.15);
+}
+
+/* #endif */
+
+.tui-gray-hover {
+	background: #a3a3a3 !important;
+	color: #898989;
+}
+
+/* #ifndef APP-NVUE */
+.tui-gradual-hover {
+	background: linear-gradient(90deg, #d74620, #cd1225) !important;
+	color: #fff !important;
+}
+
+/* #endif */
+
+.tui-gray-outline {
+	color: #999 !important;
+	background: transparent !important;
+}
+
+.tui-white-outline {
+	color: #fff !important;
+	background: transparent !important;
+}
+
+.tui-black-outline {
+	background: transparent !important;
+	color: #333 !important;
+}
+
+.tui-gray-outline::after {
+	border: 1px solid #ccc !important;
+}
+
+.tui-white-outline::after {
+	border: 1px solid #fff !important;
+}
+
+.tui-black-outline::after {
+	border: 1px solid #333 !important;
+}
+
+.tui-brown-outline {
+	color: #ac9157 !important;
+	background: transparent;
+}
+.tui-brown-outline::after {
+	border: 1px solid #ac9157 !important;
+}
+
+/*圆角 */
+
+.tui-fillet {
+	border-radius: 50rpx;
+}
+
+.tui-btn-white.tui-fillet::after {
+	border-radius: 98rpx;
+}
+
+.tui-outline-fillet::after {
+	border-radius: 98rpx;
+}
+
+/*平角*/
+.tui-rightAngle {
+	border-radius: 0;
+}
+
+.tui-btn-white.tui-rightAngle::after {
+	border-radius: 0;
+}
+
+.tui-outline-rightAngle::after {
+	border-radius: 0;
+}
+.tui-btn__link::after {
+	border: 0 !important;
+}
+</style>
diff --git a/components/thorui/tui-card/tui-card.vue b/components/thorui/tui-card/tui-card.vue
new file mode 100644
index 0000000..62a4454
--- /dev/null
+++ b/components/thorui/tui-card/tui-card.vue
@@ -0,0 +1,219 @@
+<template>
+	<view class="tui-card-class tui-card" :class="[full?'tui-card-full':'',border?'tui-card-border':'']"
+		@tap="handleClick" @longtap="longTap">
+		<slot>
+			<view class="tui-card-header" :class="{'tui-header-line':header.line}"
+				:style="{background:header.bgcolor || '#fff'}">
+				<view class="tui-header-left">
+					<image :src="image.url" class="tui-header-thumb" :class="{'tui-thumb-circle':image.circle}"
+						mode="widthFix" v-if="image.url"
+						:style="{height:(image.height || 60)+'rpx',width:(image.width || 60)+'rpx'}"></image>
+					<text class="tui-header-title"
+						:style="{fontSize:(title.size || 30)+'rpx',color:(title.color || '#7A7A7A')}"
+						v-if="title.text">{{title.text}}</text>
+				</view>
+				<view class="tui-header-right" :style="{fontSize:(tag.size || 24)+'rpx',color:(tag.color || '#b2b2b2')}"
+					v-if="tag.text">
+					{{tag.text}}
+				</view>
+			</view>
+		</slot>
+		<view class="tui-card-body">
+			<slot name="body"></slot>
+		</view>
+		<view class="tui-card-footer">
+			<slot name="footer"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiCard",
+		emits: ['click', 'longclick'],
+		props: {
+			//是否铺满
+			full: {
+				type: Boolean,
+				default: false
+			},
+			image: {
+				type: Object,
+				default: function() {
+					return {
+						url: "", //图片地址
+						height: 60, //图片高度
+						width: 60, //图片宽度
+						circle: false
+					}
+				}
+			},
+			//标题
+			title: {
+				type: Object,
+				default: function() {
+					return {
+						text: "", //标题文字
+						size: 30, //字体大小
+						color: "#7A7A7A" //字体颜色
+					}
+				}
+			},
+			//标签，时间等
+			tag: {
+				type: Object,
+				default: function() {
+					return {
+						text: "", //标签文字
+						size: 24, //字体大小
+						color: "#b2b2b2" //字体颜色
+					}
+				}
+			},
+			header: {
+				type: Object,
+				default: function() {
+					return {
+						bgcolor: "#fff", //背景颜色
+						line: false //是否去掉底部线条
+					}
+				}
+			},
+			//是否设置外边框
+			border: {
+				type: Boolean,
+				default: false
+			},
+			index: {
+				type: Number,
+				default: 0
+			}
+		},
+		methods: {
+			handleClick() {
+				this.$emit('click', {
+					index: this.index
+				});
+			},
+			longTap() {
+				this.$emit('longclick', {
+					index: this.index
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-card {
+		margin: 0 30rpx;
+		font-size: 28rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+		box-shadow: 0 0 10rpx #eee;
+		box-sizing: border-box;
+		overflow: hidden;
+	}
+
+	.tui-card-full {
+		margin: 0 !important;
+		border-radius: 0 !important;
+	}
+
+	.tui-card-full::after {
+		border-radius: 0 !important;
+	}
+
+	.tui-card-border {
+		position: relative;
+		box-shadow: none !important
+	}
+
+	.tui-card-border::after {
+		content: ' ';
+		position: absolute;
+		height: 200%;
+		width: 200%;
+		border: 1px solid #ddd;
+		transform-origin: 0 0;
+		-webkit-transform-origin: 0 0;
+		-webkit-transform: scale(0.5);
+		transform: scale(0.5);
+		left: 0;
+		top: 0;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		pointer-events: none;
+	}
+
+	.tui-card-header {
+		width: 100%;
+		padding: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: relative;
+		box-sizing: border-box;
+		overflow: hidden;
+		border-top-left-radius: 10rpx;
+		border-top-right-radius: 10rpx;
+	}
+
+	.tui-card-header::after {
+		content: '';
+		position: absolute;
+		border-bottom: 1rpx solid #eaeef1;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		bottom: 0;
+		right: 0;
+		left: 0;
+		pointer-events: none;
+	}
+
+	.tui-header-line::after {
+		border-bottom: 0 !important;
+	}
+
+	.tui-header-thumb {
+		height: 60rpx;
+		width: 60rpx;
+		vertical-align: middle;
+		margin-right: 20rpx;
+		border-radius: 6rpx;
+	}
+
+	.tui-thumb-circle {
+		border-radius: 50% !important;
+	}
+
+	.tui-header-title {
+		display: inline-block;
+		font-size: 30rpx;
+		color: #7a7a7a;
+		vertical-align: middle;
+		max-width: 460rpx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.tui-header-right {
+		font-size: 24rpx;
+		color: #b2b2b2;
+	}
+
+	.tui-card-body {
+		font-size: 32rpx;
+		color: #262b3a;
+		box-sizing: border-box;
+	}
+
+	.tui-card-footer {
+		font-size: 28rpx;
+		color: #596d96;
+		border-bottom-left-radius: 10rpx;
+		border-bottom-right-radius: 10rpx;
+		box-sizing: border-box;
+	}
+</style>
diff --git a/components/thorui/tui-cascade-selection/tui-cascade-selection.vue b/components/thorui/tui-cascade-selection/tui-cascade-selection.vue
new file mode 100644
index 0000000..2f084df
--- /dev/null
+++ b/components/thorui/tui-cascade-selection/tui-cascade-selection.vue
@@ -0,0 +1,513 @@
+<template>
+	<view class="tui-cascade-selection">
+		<scroll-view scroll-x scroll-with-animation :scroll-into-view="scrollViewId"
+			:style="{ backgroundColor: headerBgColor }" class="tui-bottom-line"
+			:class="{ 'tui-btm-none': !headerLine }">
+			<view class="tui-selection-header" :style="{ height: tabsHeight, backgroundColor: backgroundColor }">
+				<view class="tui-header-item" :class="{ 'tui-font-bold': idx === currentTab && bold }"
+					:style="{ color: idx === currentTab ? activeColor : color, fontSize: size + 'rpx' }"
+					:id="`id_${idx}`" @tap.stop="swichNav" :data-current="idx" v-for="(item, idx) in selectedArr"
+					:key="idx">
+					{{ item.text }}
+					<view class="tui-active-line" :style="{ backgroundColor: lineColor }"
+						v-if="idx === currentTab && showLine"></view>
+				</view>
+			</view>
+		</scroll-view>
+		<swiper class="tui-selection-list" :current="currentTab" duration="300" @change="switchTab"
+			:style="{ height: height, backgroundColor: backgroundColor }">
+			<swiper-item v-for="(item, index) in selectedArr" :key="index">
+				<scroll-view scroll-y :scroll-into-view="item.scrollViewId" class="tui-selection-item"
+					:style="{ height: height }">
+					<view class="tui-first-item" :style="{ height: firstItemTop }"></view>
+					<view class="tui-selection-cell" :style="{ padding: padding, backgroundColor: backgroundColor }"
+						:id="`id_${subIndex}`" v-for="(subItem, subIndex) in item.list" :key="subIndex"
+						@tap="change(index, subIndex, subItem)">
+						<icon type="success_no_circle" v-if="item.index === subIndex" :color="checkMarkColor"
+							:size="checkMarkSize" class="tui-icon-success"></icon>
+						<image :src="subItem.src" v-if="subItem.src" class="tui-cell-img"
+							:style="{ width: imgWidth, height: imgHeight, borderRadius: radius }"></image>
+						<view class="tui-cell-title"
+							:class="{ 'tui-font-bold': item.index === subIndex && textBold, 'tui-flex-shrink': nowrap }"
+							:style="{ color: item.index === subIndex ? textActiveColor : textColor, fontSize: textSize + 'rpx' }">
+							{{ subItem.text }}
+						</view>
+						<view class="tui-cell-sub_title" :style="{ color: subTextColor, fontSize: subTextSize + 'rpx' }"
+							v-if="subItem.subText">{{ subItem.subText }}</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiCascadeSelection',
+		emits: ['change','complete'],
+		props: {
+			/**
+				 * 如果下一级是请求返回，则为第一级数据，否则所有数据
+				 * 数据格式
+				  [{
+					  src: "",
+					  text: "",
+					  subText: "",
+					  value: 0,
+					  children:[{
+						  text: "",
+						  subText: "",
+						  value: 0,
+						  children:[]
+				   }]
+				  }]
+				 * */
+			itemList: {
+				type: Array,
+				default: () => {
+					return [];
+				}
+			},
+			/*
+			   初始化默认选中数据
+			   [{
+				text: "",//选中text
+				subText: '',//选中subText
+				value: '',//选中value
+				src: '', //选中src，没有则传空或不传
+				index: 0, //选中数据在当前layer索引
+				list: [{src: "", text: "", subText: "", value: 101}] //当前layer下所有数据集合
+			  }];
+			    
+			   */
+			defaultItemList: {
+				type: Array,
+				value: []
+			},
+			//是否显示header底部细线
+			headerLine: {
+				type: Boolean,
+				default: true
+			},
+			//header背景颜色
+			headerBgColor: {
+				type: String,
+				default: '#FFFFFF'
+			},
+			//顶部标签栏高度
+			tabsHeight: {
+				type: String,
+				default: '88rpx'
+			},
+			//默认显示文字
+			text: {
+				type: String,
+				default: '请选择'
+			},
+			//tabs 文字大小
+			size: {
+				type: Number,
+				default: 28
+			},
+			//tabs 文字颜色
+			color: {
+				type: String,
+				default: '#555'
+			},
+			//选中颜色
+			activeColor: {
+				type: String,
+				default: '#5677fc'
+			},
+			//选中后文字加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			//选中后是否显示底部线条
+			showLine: {
+				type: Boolean,
+				default: true
+			},
+			//线条颜色
+			lineColor: {
+				type: String,
+				default: '#5677fc'
+			},
+			//icon 大小
+			checkMarkSize: {
+				type: Number,
+				default: 15
+			},
+			//icon 颜色
+			checkMarkColor: {
+				type: String,
+				default: '#5677fc'
+			},
+			//item 图片宽度
+			imgWidth: {
+				type: String,
+				default: '40rpx'
+			},
+			//item 图片高度
+			imgHeight: {
+				type: String,
+				default: '40rpx'
+			},
+			//图片圆角
+			radius: {
+				type: String,
+				default: '50%'
+			},
+			//item text颜色
+			textColor: {
+				type: String,
+				default: '#333'
+			},
+			textActiveColor: {
+				type: String,
+				default: '#333'
+			},
+			//选中后字体是否加粗
+			textBold: {
+				type: Boolean,
+				default: true
+			},
+			//item text字体大小
+			textSize: {
+				type: Number,
+				default: 28
+			},
+			//text 是否不换行
+			nowrap: {
+				type: Boolean,
+				default: false
+			},
+			//item subText颜色
+			subTextColor: {
+				type: String,
+				default: '#999'
+			},
+			//item subText字体大小
+			subTextSize: {
+				type: Number,
+				default: 24
+			},
+			// item padding
+			padding: {
+				type: String,
+				default: '20rpx 30rpx'
+			},
+			//占位高度，第一条数据距离顶部距离
+			firstItemTop: {
+				type: String,
+				default: '20rpx'
+			},
+			//swiper 高度
+			height: {
+				type: String,
+				default: '300px'
+			},
+			//item  swiper 内容部分背景颜色
+			backgroundColor: {
+				type: String,
+				default: '#FFFFFF'
+			},
+			//子集数据是否请求返回（默认false，一次性返回所有数据）
+			request: {
+				type: Boolean,
+				default: false
+			},
+			//子级数据（当有改变时，默认当前选中项新增子级数据，request=true时生效）
+			receiveData: {
+				type: Array,
+				default: () => {
+					return [];
+				}
+			},
+			//改变值则重置数据
+			reset: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		watch: {
+			itemList(val) {
+				this.initData(val, -1);
+			},
+			receiveData(val) {
+				this.subLevelData(val, this.currentTab);
+			},
+			reset() {
+				this.initData(this.itemList, -1);
+			},
+			defaultItemList(val) {
+				this.setDefaultData(val)
+			}
+		},
+		created() {
+			this.setDefaultData(this.defaultItemList)
+		},
+		data() {
+			return {
+				currentTab: 0,
+				//tab栏scrollview滚动的位置
+				scrollViewId: 'id__1',
+				selectedArr: []
+			};
+		},
+		methods: {
+			setDefaultData(val) {
+				let defaultItemList = val || [];
+				if (defaultItemList.length > 0) {
+					defaultItemList.map(item => {
+						item.scrollViewId = `id_${item.index}`;
+					});
+					this.selectedArr = defaultItemList;
+					this.currentTab = defaultItemList.length - 1;
+					this.$nextTick(() => {
+						this.checkCor();
+					});
+				} else {
+					this.initData(this.itemList, -1);
+				}
+			},
+			initData(data, layer) {
+				if (!data || data.length === 0) return;
+				if (this.request) {
+					//第一级数据
+					this.subLevelData(data, layer);
+				} else {
+					let selectedValue = this.selectedValue || {};
+					if (selectedValue.type) {
+						this.setDefaultData(selectedValue);
+					} else {
+						this.subLevelData(this.getItemList(layer, -1), layer);
+					}
+				}
+			},
+			removeChildren(data) {
+				let list = data.map(item => {
+					delete item['children'];
+					return item;
+				});
+				return list;
+			},
+			getItemList(layer, index) {
+				let list = [];
+				let arr = JSON.parse(JSON.stringify(this.itemList));
+				if (layer == -1) {
+					list = this.removeChildren(arr);
+				} else {
+					let value = this.selectedArr[0].index;
+					value = value == -1 ? index : value;
+					list = arr[value].children || [];
+					if (layer > 0) {
+						for (let i = 1; i < layer + 1; i++) {
+							let val = layer === i ? index : this.selectedArr[i].index;
+							list = list[val].children || [];
+							if (list.length === 0) break;
+						}
+					}
+					list = this.removeChildren(list);
+				}
+				return list;
+			},
+			//滚动切换
+			switchTab: function(e) {
+				this.currentTab = e.detail.current;
+				this.checkCor();
+			},
+			//点击标题切换当
+			swichNav: function(e) {
+				let cur = e.currentTarget.dataset.current;
+				if (this.currentTab != cur) {
+					this.currentTab = cur;
+				}
+			},
+			checkCor: function() {
+				let item = this.selectedArr[this.currentTab];
+				item.scrollViewId = 'id__1';
+				this.$nextTick(() => {
+					setTimeout(() => {
+						let val = item.index < 2 ? 0 : Number(item.index - 2);
+						item.scrollViewId = `id_${val}`;
+					}, 2);
+				});
+
+				if (this.currentTab > 1) {
+					this.scrollViewId = `id_${this.currentTab - 1}`;
+				} else {
+					this.scrollViewId = `id_0`;
+				}
+			},
+			change(index, subIndex, subItem) {
+				let item = this.selectedArr[index];
+				if (item.index == subIndex) return;
+				item.index = subIndex;
+				item.text = subItem.text;
+				item.value = subItem.value;
+				item.subText = subItem.subText || '';
+				item.src = subItem.src || '';
+				this.$emit('change', {
+					layer: index,
+					subIndex: subIndex, //layer=> Array index
+					...subItem
+				});
+
+				if (!this.request) {
+					let data = this.getItemList(index, subIndex);
+					this.subLevelData(data, index);
+				}
+			},
+			//新增子级数据时处理
+			subLevelData(data, layer) {
+				if (!data || data.length === 0) {
+					if (layer == -1) return;
+					//完成选择
+					let arr = this.selectedArr;
+					if (layer < arr.length - 1) {
+						let newArr = arr.slice(0, layer + 1);
+						this.selectedArr = newArr;
+					}
+					let result = JSON.parse(JSON.stringify(this.selectedArr));
+					let lastItem = result[result.length - 1] || {};
+					let text = '';
+					result.map(item => {
+						text += item.text;
+						delete item['list'];
+						//delete item['index'];
+						delete item['scrollViewId'];
+						return item;
+					});
+					this.$emit('complete', {
+						result: result,
+						value: lastItem.value,
+						text: text,
+						subText: lastItem.subText,
+						src: lastItem.src
+					});
+				} else {
+					//重置数据（ >layer层级）
+					let item = [{
+						text: this.text,
+						subText: '',
+						value: '',
+						src: '',
+						index: -1,
+						scrollViewId: 'id__1',
+						list: data
+					}];
+					if (layer == -1) {
+						this.selectedArr = item;
+					} else {
+						let retainArr = this.selectedArr.slice(0, layer + 1);
+						this.selectedArr = retainArr.concat(item);
+					}
+					this.$nextTick(() => {
+						this.currentTab = this.selectedArr.length - 1;
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-cascade-selection {
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.tui-selection-header {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		position: relative;
+		box-sizing: border-box;
+	}
+
+	.tui-bottom-line {
+		position: relative;
+	}
+
+	.tui-bottom-line::after {
+		width: 100%;
+		content: '';
+		position: absolute;
+		border-bottom: 1rpx solid #eaeef1;
+		-webkit-transform: scaleY(0.5) translateZ(0);
+		transform: scaleY(0.5) translateZ(0);
+		transform-origin: 0 100%;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+
+	.tui-btm-none::after {
+		border-bottom: 0 !important;
+	}
+
+	.tui-header-item {
+		max-width: 240rpx;
+		padding: 15rpx 30rpx;
+		box-sizing: border-box;
+		flex-shrink: 0;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		position: relative;
+	}
+
+	.tui-font-bold {
+		font-weight: bold;
+	}
+
+	.tui-active-line {
+		width: 60rpx;
+		height: 6rpx;
+		border-radius: 4rpx;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+
+	.tui-selection-cell {
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+	}
+
+	.tui-icon-success {
+		margin-right: 12rpx;
+	}
+
+	.tui-cell-img {
+		margin-right: 12rpx;
+		flex-shrink: 0;
+	}
+
+	.tui-cell-title {
+		word-break: break-all;
+	}
+
+	.tui-flex-shrink {
+		flex-shrink: 0;
+	}
+
+	.tui-font-bold {
+		font-weight: bold;
+	}
+
+	.tui-cell-sub_title {
+		margin-left: 20rpx;
+		word-break: break-all;
+	}
+
+	.tui-first-item {
+		width: 100%;
+	}
+</style>
diff --git a/components/thorui/tui-datetime/tui-datetime.vue b/components/thorui/tui-datetime/tui-datetime.vue
new file mode 100644
index 0000000..9b30017
--- /dev/null
+++ b/components/thorui/tui-datetime/tui-datetime.vue
@@ -0,0 +1,548 @@
+<template>
+	<view class="tui-datetime-picker">
+		<view class="tui-mask" :class="{ 'tui-mask-show': isShow }" @touchmove.stop.prevent="stop" catchtouchmove="stop" @tap="hide"></view>
+		<view class="tui-header" :class="{ 'tui-show': isShow }">
+			<view
+				class="tui-picker-header"
+				:class="{ 'tui-date-radius': radius }"
+				:style="{ backgroundColor: headerBackground }"
+				@touchmove.stop.prevent="stop"
+				catchtouchmove="stop"
+			>
+				<view class="tui-btn-picker" :style="{ color: cancelColor }" hover-class="tui-opacity" :hover-stay-time="150" @tap="hide">取消</view>
+				<view class="tui-btn-picker" :style="{ color: color }" hover-class="tui-opacity" :hover-stay-time="150" @tap="btnFix">确定</view>
+			</view>
+			<view class="tui-date-header" :style="{ backgroundColor: unitBackground }" v-if="unitTop">
+				<view class="tui-date-unit" v-if="type < 4 || type == 7">年</view>
+				<view class="tui-date-unit" v-if="type < 4 || type == 7">月</view>
+				<view class="tui-date-unit" v-if="type == 1 || type == 2 || type == 7">日</view>
+				<view class="tui-date-unit" v-if="type == 1 || type == 4 || type == 5 || type == 7">时</view>
+				<view class="tui-date-unit" v-if="type == 1 || type > 3">分</view>
+				<view class="tui-date-unit" v-if="type > 4">秒</view>
+			</view>
+			<view class="tui-picker-body" :style="{ backgroundColor: bodyBackground }">
+				<picker-view :value="value" @change="change" class="tui-picker-view">
+					<picker-view-column v-if="!reset && (type < 4 || type == 7)">
+						<view class="tui-column-item" :class="{ 'tui-font-size_32': !unitTop && type == 7 }" v-for="(item, index) in years" :key="index">
+							{{ item }}
+							<text class="tui-unit-text" v-if="!unitTop">年</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && (type < 4 || type == 7)">
+						<view class="tui-column-item" :class="{ 'tui-font-size_32': !unitTop && type == 7 }" v-for="(item, index) in months" :key="index">
+							{{ formatNum(item) }}
+							<text class="tui-unit-text" v-if="!unitTop">月</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && (type == 1 || type == 2 || type == 7)">
+						<view class="tui-column-item" :class="{ 'tui-font-size_32': !unitTop && type == 7 }" v-for="(item, index) in days" :key="index">
+							{{ formatNum(item) }}
+							<text class="tui-unit-text" v-if="!unitTop">日</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && (type == 1 || type == 4 || type == 5 || type == 7)">
+						<view class="tui-column-item" :class="{ 'tui-font-size_32': !unitTop && type == 7 }" v-for="(item, index) in hours" :key="index">
+							{{ formatNum(item) }}
+							<text class="tui-unit-text" v-if="!unitTop">时</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && (type == 1 || type > 3)">
+						<view class="tui-column-item" :class="{ 'tui-font-size_32': !unitTop && type == 7 }" v-for="(item, index) in minutes" :key="index">
+							{{ formatNum(item) }}
+							<text class="tui-unit-text" v-if="!unitTop">分</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && type > 4">
+						<view class="tui-column-item" :class="{ 'tui-font-size_32': !unitTop && type == 7 }" v-for="(item, index) in seconds" :key="index">
+							{{ formatNum(item) }}
+							<text class="tui-unit-text" v-if="!unitTop">秒</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'tuiDatetime',
+	props: {
+		//1-日期+时间（年月日+时分） 2-日期(年月日) 3-日期(年月) 4-时间（时分） 5-时分秒 6-分秒 7-年月日 时分秒
+		type: {
+			type: Number,
+			default: 1
+		},
+		//年份区间
+		startYear: {
+			type: Number,
+			default: 1980
+		},
+		//年份区间
+		endYear: {
+			type: Number,
+			default: 2050
+		},
+		//"取消"字体颜色
+		cancelColor: {
+			type: String,
+			default: '#888'
+		},
+		//"确定"字体颜色
+		color: {
+			type: String,
+			default: '#5677fc'
+		},
+		//设置默认显示日期 2019-08-01 || 2019-08-01 17:01 || 2019/08/01
+		setDateTime: {
+			type: String,
+			default: ''
+		},
+		//单位置顶
+		unitTop: {
+			type: Boolean,
+			default: false
+		},
+		//圆角设置
+		radius: {
+			type: Boolean,
+			default: false
+		},
+		//头部背景色
+		headerBackground: {
+			type: String,
+			default: '#fff'
+		},
+		//根据实际调整，不建议使用深颜色
+		bodyBackground: {
+			type: String,
+			default: '#fff'
+		},
+		//单位置顶时，单位条背景色
+		unitBackground: {
+			type: String,
+			default: '#fff'
+		}
+	},
+	data() {
+		return {
+			isShow: false,
+			years: [],
+			months: [],
+			days: [],
+			hours: [],
+			minutes: [],
+			seconds: [],
+			year: 0,
+			month: 0,
+			day: 0,
+			hour: 0,
+			minute: 0,
+			second: 0,
+			startDate: '',
+			endDate: '',
+			value: [0, 0, 0, 0, 0, 0],
+			reset: false
+		};
+	},
+	mounted() {
+		this.initData();
+	},
+	computed: {
+		yearOrMonth() {
+			return `${this.year}-${this.month}`;
+		},
+		propsChange() {
+			return `${this.setDateTime}-${this.type}-${this.startYear}-${this.endYear}`;
+		}
+	},
+	watch: {
+		yearOrMonth() {
+			this.setDays();
+		},
+		propsChange() {
+			this.reset = true;
+			setTimeout(() => {
+				this.initData();
+			}, 10);
+		}
+	},
+	methods: {
+		stop() {},
+		formatNum: function(num) {
+			return num < 10 ? '0' + num : num + '';
+		},
+		generateArray: function(start, end) {
+			return Array.from(new Array(end + 1).keys()).slice(start);
+		},
+		getIndex: function(arr, val) {
+			let index = arr.indexOf(val);
+			return ~index ? index : 0;
+		},
+		//日期时间处理
+		initSelectValue() {
+			let fdate = this.setDateTime.replace(/\-/g, '/');
+			fdate = fdate && fdate.indexOf('/') == -1 ? `2020/01/01 ${fdate}` : fdate;
+			let time = null;
+			if (fdate) time = new Date(fdate);
+			else time = new Date();
+			this.year = time.getFullYear();
+			this.month = time.getMonth() + 1;
+			this.day = time.getDate();
+			this.hour = time.getHours();
+			this.minute = time.getMinutes();
+			this.second = time.getSeconds();
+		},
+		initData() {
+			this.initSelectValue();
+			this.reset = false;
+			switch (this.type) {
+				case 1:
+					this.value = [0, 0, 0, 0, 0];
+					this.setYears();
+					this.setMonths();
+					this.setDays();
+					this.setHours();
+					this.setMinutes();
+					break;
+				case 2:
+					this.value = [0, 0, 0];
+					this.setYears();
+					this.setMonths();
+					this.setDays();
+					break;
+				case 3:
+					this.value = [0, 0];
+					this.setYears();
+					this.setMonths();
+					break;
+				case 4:
+					this.value = [0, 0];
+					this.setHours();
+					this.setMinutes();
+					break;
+				case 5:
+					this.value = [0, 0, 0];
+					this.setHours();
+					this.setMinutes();
+					this.setSeconds();
+					break;
+				case 6:
+					this.value = [0, 0];
+					this.setMinutes();
+					this.setSeconds();
+					break;
+				case 7:
+					this.value = [0, 0, 0, 0, 0, 0];
+					this.setYears();
+					this.setMonths();
+					this.setDays();
+					this.setHours();
+					this.setMinutes();
+					this.setSeconds();
+					break;
+				default:
+					break;
+			}
+		},
+		setYears() {
+			this.years = this.generateArray(this.startYear, this.endYear);
+			setTimeout(() => {
+				this.$set(this.value, 0, this.getIndex(this.years, this.year));
+			}, 8);
+		},
+		setMonths() {
+			this.months = this.generateArray(1, 12);
+			setTimeout(() => {
+				this.$set(this.value, 1, this.getIndex(this.months, this.month));
+			}, 8);
+		},
+		setDays() {
+			if (this.type == 3 || this.type == 4) return;
+			let totalDays = new Date(this.year, this.month, 0).getDate();
+			this.days = this.generateArray(1, totalDays);
+			setTimeout(() => {
+				this.$set(this.value, 2, this.getIndex(this.days, this.day));
+			}, 8);
+		},
+		setHours() {
+			this.hours = this.generateArray(0, 23);
+			setTimeout(() => {
+				let index = this.type == 5 || this.type == 7 ? this.value.length - 3 : this.value.length - 2;
+				this.$set(this.value, index, this.getIndex(this.hours, this.hour));
+			}, 8);
+		},
+		setMinutes() {
+			this.minutes = this.generateArray(0, 59);
+			setTimeout(() => {
+				let index = this.type > 4 ? this.value.length - 2 : this.value.length - 1;
+				this.$set(this.value, index, this.getIndex(this.minutes, this.minute));
+			}, 8);
+		},
+		setSeconds() {
+			this.seconds = this.generateArray(0, 59);
+			setTimeout(() => {
+				this.$set(this.value, this.value.length - 1, this.getIndex(this.seconds, this.second));
+			}, 8);
+		},
+		show() {
+			setTimeout(() => {
+				this.isShow = true;
+			}, 50);
+		},
+		hide() {
+			this.isShow = false;
+			this.$emit('cancel', {});
+		},
+		change(e) {
+			this.value = e.detail.value;
+			switch (this.type) {
+				case 1:
+					this.year = this.years[this.value[0]];
+					this.month = this.months[this.value[1]];
+					this.day = this.days[this.value[2]];
+					this.hour = this.hours[this.value[3]];
+					this.minute = this.minutes[this.value[4]];
+					break;
+				case 2:
+					this.year = this.years[this.value[0]];
+					this.month = this.months[this.value[1]];
+					this.day = this.days[this.value[2]];
+					break;
+				case 3:
+					this.year = this.years[this.value[0]];
+					this.month = this.months[this.value[1]];
+					break;
+				case 4:
+					this.hour = this.hours[this.value[0]];
+					this.minute = this.minutes[this.value[1]];
+					break;
+				case 5:
+					this.hour = this.hours[this.value[0]];
+					this.minute = this.minutes[this.value[1]];
+					this.second = this.seconds[this.value[2]];
+					break;
+				case 6:
+					this.minute = this.minutes[this.value[0]];
+					this.second = this.seconds[this.value[1]];
+					break;
+				case 7:
+					this.year = this.years[this.value[0]];
+					this.month = this.months[this.value[1]];
+					this.day = this.days[this.value[2]];
+					this.hour = this.hours[this.value[3]];
+					this.minute = this.minutes[this.value[4]];
+					this.second = this.seconds[this.value[5]];
+					break;
+				default:
+					break;
+			}
+		},
+		btnFix() {
+			setTimeout(() => {
+				let result = {};
+				let year = this.year;
+				let month = this.formatNum(this.month || 0);
+				let day = this.formatNum(this.day || 0);
+				let hour = this.formatNum(this.hour || 0);
+				let minute = this.formatNum(this.minute || 0);
+				let second = this.formatNum(this.second || 0);
+				switch (this.type) {
+					case 1:
+						result = {
+							year: year,
+							month: month,
+							day: day,
+							hour: hour,
+							minute: minute,
+							result: `${year}-${month}-${day} ${hour}:${minute}`
+						};
+						break;
+					case 2:
+						result = {
+							year: year,
+							month: month,
+							day: day,
+							result: `${year}-${month}-${day}`
+						};
+						break;
+					case 3:
+						result = {
+							year: year,
+							month: month,
+							result: `${year}-${month}`
+						};
+						break;
+					case 4:
+						result = {
+							hour: hour,
+							minute: minute,
+							result: `${hour}:${minute}`
+						};
+						break;
+					case 5:
+						result = {
+							hour: hour,
+							minute: minute,
+							second: second,
+							result: `${hour}:${minute}:${second}`
+						};
+						break;
+					case 6:
+						result = {
+							minute: minute,
+							second: second,
+							result: `${minute}:${second}`
+						};
+						break;
+					case 7:
+						result = {
+							year: year,
+							month: month,
+							day: day,
+							hour: hour,
+							minute: minute,
+							second: second,
+							result: `${year}-${month}-${day} ${hour}:${minute}:${second}`
+						};
+						break;
+					default:
+						break;
+				}
+				this.$emit('confirm', result);
+				this.hide();
+			}, 80);
+		}
+	}
+};
+</script>
+
+<style scoped>
+.tui-datetime-picker {
+	position: relative;
+	z-index: 996;
+}
+
+.tui-picker-view {
+	height: 100%;
+	box-sizing: border-box;
+}
+
+.tui-mask {
+	position: fixed;
+	z-index: 997;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background-color: rgba(0, 0, 0, 0.6);
+	visibility: hidden;
+	opacity: 0;
+	transition: all 0.3s ease-in-out;
+}
+
+.tui-mask-show {
+	visibility: visible !important;
+	opacity: 1 !important;
+}
+
+.tui-header {
+	z-index: 998;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	transition: all 0.3s ease-in-out;
+	transform: translateY(100%);
+}
+
+.tui-date-header {
+	width: 100%;
+	height: 52rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-size: 26rpx;
+	line-height: 26rpx;
+	/* #ifdef MP */
+	box-shadow: 0 15rpx 10rpx -15rpx #efefef;
+	/* #endif */
+	/* #ifndef MP */
+	box-shadow: 0 15rpx 10rpx -15rpx #888;
+	/* #endif */
+	position: relative;
+	z-index: 2;
+}
+
+.tui-date-unit {
+	flex: 1;
+	text-align: center;
+}
+
+.tui-show {
+	transform: translateY(0);
+}
+
+.tui-picker-header {
+	width: 100%;
+	height: 90rpx;
+	padding: 0 40rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	box-sizing: border-box;
+	font-size: 32rpx;
+	position: relative;
+}
+
+.tui-date-radius {
+	border-top-left-radius: 20rpx;
+	border-top-right-radius: 20rpx;
+	overflow: hidden;
+}
+
+.tui-picker-header::after {
+	content: '';
+	position: absolute;
+	border-bottom: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	bottom: 0;
+	right: 0;
+	left: 0;
+}
+
+.tui-picker-body {
+	width: 100%;
+	height: 520rpx;
+	overflow: hidden;
+}
+
+.tui-column-item {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 36rpx;
+	color: #333;
+}
+
+.tui-font-size_32 {
+	font-size: 32rpx !important;
+}
+
+.tui-unit-text {
+	font-size: 24rpx !important;
+	padding-left: 8rpx;
+}
+
+.tui-btn-picker {
+	padding: 16rpx;
+	box-sizing: border-box;
+	text-align: center;
+	text-decoration: none;
+}
+
+.tui-opacity {
+	opacity: 0.5;
+}
+</style>
diff --git a/components/thorui/tui-grid-item/tui-grid-item.vue b/components/thorui/tui-grid-item/tui-grid-item.vue
new file mode 100644
index 0000000..2fdde18
--- /dev/null
+++ b/components/thorui/tui-grid-item/tui-grid-item.vue
@@ -0,0 +1,153 @@
+<template>
+	<view class="tui-grid" :class="[bottomLine?'':'tui-grid-bottom',border?'':'tui-grid__unlined','tui-grid-'+(cell<2?3:cell)]" :hover-class="hover?'tui-item-hover':''"
+	 :hover-stay-time="150" :style="{backgroundColor:backgroundColor}" @tap="handleClick">
+		<view class='tui-grid-bg'>
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiGridItem",
+		emits: ['click'],
+		props: {
+			cell: {
+				type: [Number,String],
+				default: 3
+			},
+			backgroundColor: {
+				type: String,
+				default: "#fff"
+			},
+			//是否有点击效果
+			hover: {
+				type: Boolean,
+				default: true
+			},
+			//是否需要底部线条
+			bottomLine: {
+				type: Boolean,
+				default: true
+			},
+			//是否需要纵向边框线条
+			border:{
+				type: Boolean,
+				default: true
+			},
+			index: {
+				type: Number,
+				default: 0
+			}
+		},
+		methods: {
+			handleClick() {
+				this.$emit('click', {
+					index: this.index
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-grid {
+		position: relative;
+		padding: 40rpx 20rpx;
+		box-sizing: border-box;
+		background: #fff;
+		float: left;
+	}
+	/* #ifdef MP-BAIDU */
+	.tui-grid:active{
+		background-color: #f7f7f9;
+	}
+	/* #endif */
+
+	.tui-grid-2 {
+		width: 50%;
+	}
+
+	.tui-grid-3 {
+		width: 33.333333333%;
+	}
+
+	.tui-grid-4 {
+		width: 25%;
+		padding: 30rpx 20rpx !important;
+	}
+
+	.tui-grid-5 {
+		width: 20%;
+		padding: 20rpx !important;
+	}
+
+	.tui-grid-2:nth-of-type(2n)::before {
+		width: 0;
+		border-right: 0;
+	}
+
+	.tui-grid-3:nth-of-type(3n)::before {
+		width: 0;
+		border-right: 0;
+	}
+
+	.tui-grid-4:nth-of-type(4n)::before {
+		width: 0;
+		border-right: 0;
+	}
+
+	.tui-grid-5:nth-of-type(5n)::before {
+		width: 0;
+		border-right: 0;
+	}
+
+	.tui-grid::before {
+		content: " ";
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: 1px;
+		bottom: 0;
+		border-right: 1px solid #eaeef1;
+		-webkit-transform-origin: 100% 0;
+		transform-origin: 100% 0;
+		-webkit-transform: scaleX(0.5);
+		transform: scaleX(0.5);
+	}
+	
+	.tui-grid__unlined::before{
+		width: 0 !important;
+		border-right: 0 !important;
+	}
+
+	.tui-grid::after {
+		content: " ";
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		height: 1px;
+		border-bottom: 1px solid #eaeef1;
+		-webkit-transform-origin: 0 100%;
+		transform-origin: 0 100%;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+
+	.tui-grid-bottom::after {
+		height: 0 !important;
+		border-bottom: 0 !important
+	}
+
+	.tui-grid-bg {
+		position: relative;
+		padding: 0;
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.tui-item-hover {
+		background-color: #f7f7f9 !important;
+	}
+</style>
diff --git a/components/thorui/tui-grid/tui-grid.vue b/components/thorui/tui-grid/tui-grid.vue
new file mode 100644
index 0000000..f4f189a
--- /dev/null
+++ b/components/thorui/tui-grid/tui-grid.vue
@@ -0,0 +1,44 @@
+<template>
+	<view class="tui-grids" :class="{'tui-border-top':unlined}">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"tuiGrid",
+		props: {
+			//是否去掉上线条
+			unlined: {
+				type: Boolean,
+				default: false
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-grids {
+		width: 100%;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.tui-grids::after {
+		content: " ";
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 1px;
+		border-top: 1px solid #eaeef1;
+		-webkit-transform-origin: 0 0;
+		transform-origin: 0 0;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+
+	.tui-border-top::after {
+		border-top: 0 !important;
+	}
+</style>
diff --git a/components/thorui/tui-icon/tui-icon.js b/components/thorui/tui-icon/tui-icon.js
new file mode 100644
index 0000000..36549d2
--- /dev/null
+++ b/components/thorui/tui-icon/tui-icon.js
@@ -0,0 +1,190 @@
+export default {
+	"about": "\ue772",
+	"about-fill": "\ue771",
+	"add": "\ue770",
+	"add-fill": "\ue76f",
+	"addmessage": "\ue76e",
+	"addressbook": "\ue76d",
+	"agree": "\ue76c",
+	"agree-fill": "\ue76b",
+	"alarm": "\ue76a",
+	"alarm-fill": "\ue769",
+	"alipay": "\ue768",
+	"android": "\ue767",
+	"applets": "\ue766",
+	"arrowdown": "\ue765",
+	"arrowleft": "\ue764",
+	"arrowright": "\ue763",
+	"arrowup": "\ue762",
+	"attestation": "\ue761",
+	"back": "\ue760",
+	"bag": "\ue75f",
+	"bag-fill": "\ue75e",
+	"balloon": "\ue75d",
+	"bankcard": "\ue75c",
+	"bankcard-fill": "\ue75b",
+	"bottom": "\ue75a",
+	"calendar": "\ue759",
+	"camera": "\ue758",
+	"camera-fill": "\ue757",
+	"camera-add": "\ue756",
+	"card": "\ue755",
+	"card-fill": "\ue754",
+	"cart": "\ue753",
+	"cart-fill": "\ue752",
+	"category": "\ue751",
+	"category-fill": "\ue750",
+	"check": "\ue74f",
+	"circle": "\ue74e",
+	"circle-fill": "\ue74d",
+	"circle-selected": "\ue74c",
+	"clock": "\ue74b",
+	"clock-fill": "\ue74a",
+	"close": "\ue749",
+	"close-fill": "\ue748",
+	"community": "\ue747",
+	"community-fill": "\ue746",
+	"computer": "\ue745",
+	"computer-fill": "\ue744",
+	"coupon": "\ue743",
+	"delete": "\ue742",
+	"deletekey": "\ue741",
+	"dingtalk": "\ue740",
+	"dissatisfied": "\ue73f",
+	"down": "\ue73e",
+	"download": "\ue73d",
+	"edit": "\ue73c",
+	"ellipsis": "\ue73b",
+	"enlarge": "\ue73a",
+	"evaluate": "\ue739",
+	"exchange": "\ue738",
+	"explain": "\ue737",
+	"explain-fill": "\ue736",
+	"explore": "\ue735",
+	"explore-fill": "\ue734",
+	"eye": "\ue733",
+	"feedback": "\ue732",
+	"fingerprint": "\ue730",
+	"friendadd": "\ue72f",
+	"friendadd-fill": "\ue72e",
+	"gps": "\ue72d",
+	"histogram": "\ue72c",
+	"home": "\ue72b",
+	"home-fill": "\ue72a",
+	"house": "\ue729",
+	"imface": "\ue728",
+	"imkeyboard": "\ue727",
+	"immore": "\ue726",
+	"imvoice": "\ue725",
+	"ios": "\ue724",
+	"kefu": "\ue723",
+	"label": "\ue722",
+	"label-fill": "\ue721",
+	"like": "\ue720",
+	"like-fill": "\ue71f",
+	"link": "\ue71e",
+	"listview": "\ue71d",
+	"loading": "\ue71c",
+	"location": "\ue71b",
+	"mail": "\ue71a",
+	"mail-fill": "\ue719",
+	"manage": "\ue718",
+	"manage-fill": "\ue717",
+	"member": "\ue716",
+	"member-fill": "\ue715",
+	"message": "\ue714",
+	"message-fill": "\ue713",
+	"mobile": "\ue712",
+	"moments": "\ue711",
+	"more": "\ue710",
+	"more-fill": "\ue70f",
+	"narrow": "\ue70e",
+	"news": "\ue70d",
+	"news-fill": "\ue70c",
+	"nodata": "\ue70b",
+	"notice": "\ue699",
+	"notice-fill": "\ue698",
+	"offline": "\ue697",
+	"offline-fill": "\ue696",
+	"oppose": "\ue695",
+	"oppose-fill": "\ue694",
+	"order": "\ue693",
+	"partake": "\ue692",
+	"people": "\ue691",
+	"people-fill": "\ue690",
+	"pic": "\ue68f",
+	"pic-fill": "\ue68e",
+	"picture": "\ue68d",
+	"pie": "\ue68c",
+	"plus": "\ue689",
+	"polygonal": "\ue688",
+	"position": "\ue686",
+	"pwd": "\ue685",
+	"qq": "\ue684",
+	"qrcode": "\ue682",
+	"redpacket": "\ue681",
+	"redpacket-fill": "\ue680",
+	"reduce": "\ue67f",
+	"refresh": "\ue67e",
+	"revoke": "\ue67d",
+	"satisfied": "\ue67c",
+	"screen": "\ue67b",
+	"search": "\ue67a",
+	"search-2": "\ue679",
+	"send": "\ue678",
+	"service": "\ue677",
+	"service-fill": "\ue676",
+	"setup": "\ue675",
+	"setup-fill": "\ue674",
+	"share": "\ue673",
+	"share-fill": "\ue672",
+	"shield": "\ue671",
+	"shop": "\ue670",
+	"shop-fill": "\ue66f",
+	"shut": "\ue66e",
+	"signin": "\ue66d",
+	"sina": "\ue66c",
+	"skin": "\ue66b",
+	"soso": "\ue669",
+	"square": "\ue668",
+	"square-fill": "\ue667",
+	"square-selected": "\ue666",
+	"star": "\ue665",
+	"star-fill": "\ue664",
+	"strategy": "\ue663",
+	"sweep": "\ue662",
+	"time": "\ue661",
+	"time-fill": "\ue660",
+	"todown": "\ue65f",
+	"toleft": "\ue65e",
+	"tool": "\ue65d",
+	"top": "\ue65c",
+	"toright": "\ue65b",
+	"towardsleft": "\ue65a",
+	"towardsright": "\ue659",
+	"towardsright-fill": "\ue658",
+	"transport": "\ue657",
+	"transport-fill": "\ue656",
+	"turningdown": "\ue654",
+	"turningleft": "\ue653",
+	"turningright": "\ue652",
+	"turningup": "\ue651",
+	"unreceive": "\ue650",
+	"seen": "\ue7d2",
+	"unseen": "\ue7d1",
+	"up": "\ue64e",
+	"upload": "\ue64c",
+	"video": "\ue64b",
+	"voice": "\ue649",
+	"voice-fill": "\ue648",
+	"voipphone": "\ue647",
+	"wallet": "\ue646",
+	"warning": "\ue645",
+	"wealth": "\ue644",
+	"wealth-fill": "\ue643",
+	"weather": "\ue642",
+	"wechat": "\ue641",
+	"wifi": "\ue640",
+	"play": "\ue7d5",
+	"suspend": "\ue7d4"
+}
diff --git a/components/thorui/tui-icon/tui-icon.vue b/components/thorui/tui-icon/tui-icon.vue
new file mode 100644
index 0000000..ec9c955
--- /dev/null
+++ b/components/thorui/tui-icon/tui-icon.vue
@@ -0,0 +1,81 @@
+<template>
+	<text class="tui-icon"
+		:style="{ color: color || '#999', fontSize: size + unit, fontWeight: bold ? 'bold' : 'normal',margin:margin }"
+		@tap="handleClick">{{ icons[name] }}</text>
+
+</template>
+
+<script>
+	import icons from './tui-icon.js';
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	domModule.addRule('fontFace', {
+		'fontFamily': 'thoruiFont',
+		'src': "url('data:font/truetype;charset=utf-8;base64,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AHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgAAR2VuZXJhdGVkIGJ5IHN2ZzJ0dGYgZnJvbSBGb250ZWxsbyBwcm9qZWN0LgAAaAB0AHQAcAA6AC8ALwBmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQAAaHR0cDovL2ZvbnRlbGxvLmNvbQAAAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAABAAIBAgEDAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYARkBGgEbARwBHQEeAR8BIAEhASIBIwEkASUBJgEnASgBKQEqASsBLAEtAS4BLwEwATEBMgEzATQBNQE2ATcBOAE5AToBOwE8AT0BPgE/AUABQQFCAUMBRAAOAUUBRgFHAUgBSQFKAUsBTAFNAU4BTwFQAVEBUgFTAVQBVQFWAVcBWAFZAVoBWwFcAV0BXgFfAWABYQFiAWMBZAFlAWYBZwFoAWkBagFrAWwBbQFuAW8BcAFxAXIBcwF0AXUBdgF3AXgBeQF6AXsBfAF9AX4BfwGAAYEAqwGCAYMBhAGFAYYBhwGIAYkBigGLAYwBjQGOAY8BkAGRAZIBkwGUAZUBlgGXAZgBmQGaAZsBnAGdAZ4BnwGgAaEBogGjAaQBpQGmAacBqAGpAaoBqwGsAa0BrgGvAbABsQGyAbMBtAG1AbYBtwG4AbkBugG7AbwEd2lmaQZ3ZWNoYXQHd2VhdGhlcgt3ZWFsdGgtZmlsbAZ3ZWFsdGgHd2FybmluZwZ3YWxsZXQJdm9pcHBob25lCnZvaWNlLWZpbGwFdm9pY2UFdmlkZW8GdXBsb2FkAnVwCXVucmVjZWl2ZQl0dXJuaW5ndXAMdHVybmluZ3JpZ2h0C3R1cm5pbmdsZWZ0C3R1cm5pbmdkb3duDnRyYW5zcG9ydC1maWxsCXRyYW5zcG9ydBF0b3dhcmRzcmlnaHQtZmlsbAx0b3dhcmRzcmlnaHQLdG93YXJkc2xlZnQHdG9yaWdodAN0b3AEdG9vbAZ0b2xlZnQGdG9kb3duCXRpbWUtZmlsbAR0aW1lBXN3ZWVwCHN0cmF0ZWd5CXN0YXItZmlsbARzdGFyD3NxdWFyZS1zZWxlY3RlZAtzcXVhcmUtZmlsbAZzcXVhcmUEc29zbwRza2luBHNpbmEGc2lnbmluBHNodXQJc2hvcC1maWxsBHNob3AGc2hpZWxkCnNoYXJlLWZpbGwFc2hhcmUKc2V0dXAtZmlsbAVzZXR1cAxzZXJ2aWNlLWZpbGwHc2VydmljZQRzZW5kCHNlYXJjaC0yBnNlYXJjaAZzY3JlZW4Jc2F0aXNmaWVkBnJldm9rZQdyZWZyZXNoBnJlZHVjZQ5yZWRwYWNrZXQtZmlsbAlyZWRwYWNrZXQGcXJjb2RlAnFxA3B3ZA1wb3NpdGlvbi1maWxsCHBvc2l0aW9uCXBvbHlnb25hbANwaWUHcGljdHVyZQhwaWMtZmlsbANwaWMLcGVvcGxlLWZpbGwGcGVvcGxlB3BhcnRha2UFb3JkZXILb3Bwb3NlLWZpbGwGb3Bwb3NlDG9mZmxpbmUtZmlsbAdvZmZsaW5lC25vdGljZS1maWxsBm5vdGljZQZub2RhdGEJbmV3cy1maWxsBG5ld3MGbmFycm93CW1vcmUtZmlsbARtb3JlB21vbWVudHMGbW9iaWxlDG1lc3NhZ2UtZmlsbAdtZXNzYWdlC21lbWJlci1maWxsBm1lbWJlcgttYW5hZ2UtZmlsbAZtYW5hZ2UJbWFpbC1maWxsBG1haWwIbG9jYXRpb24HbG9hZGluZwhsaXN0dmlldwRsaW5rCWxpa2UtZmlsbARsaWtlCmxhYmVsLWZpbGwFbGFiZWwEa2VmdQNpb3MHaW12b2ljZQZpbW1vcmUKaW1rZXlib2FyZAZpbWZhY2UFaG91c2UJaG9tZS1maWxsBGhvbWUJaGlzdG9ncmFtA2dwcw5mcmllbmRhZGQtZmlsbAlmcmllbmRhZGQLZmluZ2VycHJpbnQIZmVlZGJhY2sDZXllDGV4cGxvcmUtZmlsbAdleHBsb3JlDGV4cGxhaW4tZmlsbAdleHBsYWluCGV4Y2hhbmdlCGV2YWx1YXRlB2VubGFyZ2UEZWRpdAhkb3dubG9hZARkb3duDGRpc3NhdGlzZmllZAhkaW5ndGFsawlkZWxldGVrZXkGZGVsZXRlBmNvdXBvbg1jb21wdXRlci1maWxsCGNvbXB1dGVyDmNvbW11bml0eS1maWxsCWNvbW11bml0eQpjbG9zZS1maWxsBWNsb3NlCmNsb2NrLWZpbGwFY2xvY2sPY2lyY2xlLXNlbGVjdGVkC2NpcmNsZS1maWxsBmNpcmNsZQVjaGVjaw1jYXRlZ29yeS1maWxsCGNhdGVnb3J5CWNhcnQtZmlsbARjYXJ0CWNhcmQtZmlsbARjYXJkCmNhbWVyYS1hZGQLY2FtZXJhLWZpbGwGY2FtZXJhCGNhbGVuZGFyBmJvdHRvbQ1iYW5rY2FyZC1maWxsCGJhbmtjYXJkB2JhbGxvb24IYmFnLWZpbGwDYmFnBGJhY2sLYXR0ZXN0YXRpb24HYXJyb3d1cAphcnJvd3JpZ2h0CWFycm93bGVmdAlhcnJvd2Rvd24HYXBwbGV0cwdhbmRyb2lkBmFsaXBheQphbGFybS1maWxsBWFsYXJtCmFncmVlLWZpbGwFYWdyZWULYWRkcmVzc2Jvb2sKYWRkbWVzc2FnZQhhZGQtZmlsbANhZGQKYWJvdXQtZmlsbAVhYm91dAZ1bnNlZW4Ec2VlbgdzdXNwZW5kBHBsYXkAAAAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwC/AAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAAN1knXsAAAAA3WSdew==')"
+	});
+	// #endif
+	export default {
+		name: 'tuiIcon',
+		emits: ['click'],
+		props: {
+			name: {
+				type: String,
+				default: ''
+			},
+			size: {
+				type: [Number, String],
+				default: 32
+			},
+			//px或者rpx
+			unit: {
+				type: String,
+				default: 'px'
+			},
+			color: {
+				type: String,
+				default: '#999'
+			},
+			bold: {
+				type: Boolean,
+				default: false
+			},
+			margin: {
+				type: String,
+				default: "0"
+			},
+			index: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				icons: icons
+			}
+		},
+		methods: {
+			handleClick() {
+				this.$emit('click', {
+					index: this.index
+				});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	/* #ifndef APP-NVUE */
+	/* 头条小程序组件内不能引入字体，需要在父级页面引入字体文件*/
+	@font-face {
+		font-family: thoruiFont;
+		src: url(data:font/ttf;base64,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AHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgAAR2VuZXJhdGVkIGJ5IHN2ZzJ0dGYgZnJvbSBGb250ZWxsbyBwcm9qZWN0LgAAaAB0AHQAcAA6AC8ALwBmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQAAaHR0cDovL2ZvbnRlbGxvLmNvbQAAAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAABAAIBAgEDAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYARkBGgEbARwBHQEeAR8BIAEhASIBIwEkASUBJgEnASgBKQEqASsBLAEtAS4BLwEwATEBMgEzATQBNQE2ATcBOAE5AToBOwE8AT0BPgE/AUABQQFCAUMBRAAOAUUBRgFHAUgBSQFKAUsBTAFNAU4BTwFQAVEBUgFTAVQBVQFWAVcBWAFZAVoBWwFcAV0BXgFfAWABYQFiAWMBZAFlAWYBZwFoAWkBagFrAWwBbQFuAW8BcAFxAXIBcwF0AXUBdgF3AXgBeQF6AXsBfAF9AX4BfwGAAYEAqwGCAYMBhAGFAYYBhwGIAYkBigGLAYwBjQGOAY8BkAGRAZIBkwGUAZUBlgGXAZgBmQGaAZsBnAGdAZ4BnwGgAaEBogGjAaQBpQGmAacBqAGpAaoBqwGsAa0BrgGvAbABsQGyAbMBtAG1AbYBtwG4AbkBugG7AbwEd2lmaQZ3ZWNoYXQHd2VhdGhlcgt3ZWFsdGgtZmlsbAZ3ZWFsdGgHd2FybmluZwZ3YWxsZXQJdm9pcHBob25lCnZvaWNlLWZpbGwFdm9pY2UFdmlkZW8GdXBsb2FkAnVwCXVucmVjZWl2ZQl0dXJuaW5ndXAMdHVybmluZ3JpZ2h0C3R1cm5pbmdsZWZ0C3R1cm5pbmdkb3duDnRyYW5zcG9ydC1maWxsCXRyYW5zcG9ydBF0b3dhcmRzcmlnaHQtZmlsbAx0b3dhcmRzcmlnaHQLdG93YXJkc2xlZnQHdG9yaWdodAN0b3AEdG9vbAZ0b2xlZnQGdG9kb3duCXRpbWUtZmlsbAR0aW1lBXN3ZWVwCHN0cmF0ZWd5CXN0YXItZmlsbARzdGFyD3NxdWFyZS1zZWxlY3RlZAtzcXVhcmUtZmlsbAZzcXVhcmUEc29zbwRza2luBHNpbmEGc2lnbmluBHNodXQJc2hvcC1maWxsBHNob3AGc2hpZWxkCnNoYXJlLWZpbGwFc2hhcmUKc2V0dXAtZmlsbAVzZXR1cAxzZXJ2aWNlLWZpbGwHc2VydmljZQRzZW5kCHNlYXJjaC0yBnNlYXJjaAZzY3JlZW4Jc2F0aXNmaWVkBnJldm9rZQdyZWZyZXNoBnJlZHVjZQ5yZWRwYWNrZXQtZmlsbAlyZWRwYWNrZXQGcXJjb2RlAnFxA3B3ZA1wb3NpdGlvbi1maWxsCHBvc2l0aW9uCXBvbHlnb25hbANwaWUHcGljdHVyZQhwaWMtZmlsbANwaWMLcGVvcGxlLWZpbGwGcGVvcGxlB3BhcnRha2UFb3JkZXILb3Bwb3NlLWZpbGwGb3Bwb3NlDG9mZmxpbmUtZmlsbAdvZmZsaW5lC25vdGljZS1maWxsBm5vdGljZQZub2RhdGEJbmV3cy1maWxsBG5ld3MGbmFycm93CW1vcmUtZmlsbARtb3JlB21vbWVudHMGbW9iaWxlDG1lc3NhZ2UtZmlsbAdtZXNzYWdlC21lbWJlci1maWxsBm1lbWJlcgttYW5hZ2UtZmlsbAZtYW5hZ2UJbWFpbC1maWxsBG1haWwIbG9jYXRpb24HbG9hZGluZwhsaXN0dmlldwRsaW5rCWxpa2UtZmlsbARsaWtlCmxhYmVsLWZpbGwFbGFiZWwEa2VmdQNpb3MHaW12b2ljZQZpbW1vcmUKaW1rZXlib2FyZAZpbWZhY2UFaG91c2UJaG9tZS1maWxsBGhvbWUJaGlzdG9ncmFtA2dwcw5mcmllbmRhZGQtZmlsbAlmcmllbmRhZGQLZmluZ2VycHJpbnQIZmVlZGJhY2sDZXllDGV4cGxvcmUtZmlsbAdleHBsb3JlDGV4cGxhaW4tZmlsbAdleHBsYWluCGV4Y2hhbmdlCGV2YWx1YXRlB2VubGFyZ2UEZWRpdAhkb3dubG9hZARkb3duDGRpc3NhdGlzZmllZAhkaW5ndGFsawlkZWxldGVrZXkGZGVsZXRlBmNvdXBvbg1jb21wdXRlci1maWxsCGNvbXB1dGVyDmNvbW11bml0eS1maWxsCWNvbW11bml0eQpjbG9zZS1maWxsBWNsb3NlCmNsb2NrLWZpbGwFY2xvY2sPY2lyY2xlLXNlbGVjdGVkC2NpcmNsZS1maWxsBmNpcmNsZQVjaGVjaw1jYXRlZ29yeS1maWxsCGNhdGVnb3J5CWNhcnQtZmlsbARjYXJ0CWNhcmQtZmlsbARjYXJkCmNhbWVyYS1hZGQLY2FtZXJhLWZpbGwGY2FtZXJhCGNhbGVuZGFyBmJvdHRvbQ1iYW5rY2FyZC1maWxsCGJhbmtjYXJkB2JhbGxvb24IYmFnLWZpbGwDYmFnBGJhY2sLYXR0ZXN0YXRpb24HYXJyb3d1cAphcnJvd3JpZ2h0CWFycm93bGVmdAlhcnJvd2Rvd24HYXBwbGV0cwdhbmRyb2lkBmFsaXBheQphbGFybS1maWxsBWFsYXJtCmFncmVlLWZpbGwFYWdyZWULYWRkcmVzc2Jvb2sKYWRkbWVzc2FnZQhhZGQtZmlsbANhZGQKYWJvdXQtZmlsbAVhYm91dAZ1bnNlZW4Ec2VlbgdzdXNwZW5kBHBsYXkAAAAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwC/AAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAAN1knXsAAAAA3WSdew==) format("truetype");
+	}
+
+	/* #endif */
+
+	.tui-icon {
+		font-family: thoruiFont;
+		text-align: center;
+		text-decoration: none;
+	}
+</style>
diff --git a/components/thorui/tui-list-cell/tui-list-cell.vue b/components/thorui/tui-list-cell/tui-list-cell.vue
new file mode 100644
index 0000000..c2fc8b7
--- /dev/null
+++ b/components/thorui/tui-list-cell/tui-list-cell.vue
@@ -0,0 +1,178 @@
+<template>
+	<view
+		class="tui-list-class tui-list-cell"
+		:class="[
+			arrow ? 'tui-cell-arrow' : '',
+			arrow && arrowRight ? '' : 'tui-arrow-right',
+			unlined ? 'tui-cell-unlined' : '',
+			lineLeft ? 'tui-line-left' : '',
+			lineRight ? 'tui-line-right' : '',
+			arrow && arrowColor ? 'tui-arrow-' + arrowColor : '',
+			radius ? 'tui-radius' : ''
+		]"
+		:hover-class="hover ? 'tui-cell-hover' : ''"
+		:style="{ backgroundColor: backgroundColor, fontSize: size + 'rpx', color: color, padding: padding }"
+		:hover-stay-time="150"
+		@tap="handleClick"
+	>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'tuiListCell',
+	emits: ['click'],
+	props: {
+		//是否有箭头
+		arrow: {
+			type: Boolean,
+			default: false
+		},
+		//箭头颜色 传值： white，gray,warning,danger
+		arrowColor: {
+			type: String,
+			default: ''
+		},
+		//是否有点击效果
+		hover: {
+			type: Boolean,
+			default: true
+		},
+		//隐藏线条
+		unlined: {
+			type: Boolean,
+			default: false
+		},
+		//线条是否有左偏移距离
+		lineLeft: {
+			type: Boolean,
+			default: true
+		},
+		//线条是否有右偏移距离
+		lineRight: {
+			type: Boolean,
+			default: false
+		},
+		padding: {
+			type: String,
+			default: '26rpx 30rpx'
+		},
+		//背景颜色
+		backgroundColor: {
+			type: String,
+			default: '#fff'
+		},
+		//字体大小
+		size: {
+			type: Number,
+			default: 28
+		},
+		//字体颜色
+		color: {
+			type: String,
+			default: '#333'
+		},
+		//是否加圆角
+		radius: {
+			type: Boolean,
+			default: false
+		},
+		//箭头是否有偏移距离
+		arrowRight: {
+			type: Boolean,
+			default: true
+		},
+		index: {
+			type: Number,
+			default: 0
+		}
+	},
+	methods: {
+		handleClick() {
+			this.$emit('click', {
+				index: this.index
+			});
+		}
+	}
+};
+</script>
+
+<style scoped>
+.tui-list-cell {
+	position: relative;
+	width: 100%;
+	box-sizing: border-box;
+}
+.tui-radius {
+	border-radius: 6rpx;
+	overflow: hidden;
+}
+
+.tui-cell-hover {
+	background-color: #f1f1f1 !important;
+}
+/* #ifdef MP-BAIDU */
+.tui-list-cell:active {
+	background-color: #f1f1f1 !important;
+}
+/* #endif */
+
+.tui-list-cell::after {
+	content: '';
+	position: absolute;
+	border-bottom: 1px solid #eaeef1;
+	-webkit-transform: scaleY(0.5) translateZ(0);
+	transform: scaleY(0.5) translateZ(0);
+	transform-origin: 0 100%;
+	bottom: 0;
+	right: 0;
+	left: 0;
+	pointer-events: none;
+}
+
+.tui-line-left::after {
+	left: 30rpx !important;
+}
+
+.tui-line-right::after {
+	right: 30rpx !important;
+}
+
+.tui-cell-unlined::after {
+	border-bottom: 0 !important;
+}
+
+.tui-cell-arrow::before {
+	content: ' ';
+	height: 10px;
+	width: 10px;
+	border-width: 2px 2px 0 0;
+	border-color: #c0c0c0;
+	border-style: solid;
+	-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+	transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+	position: absolute;
+	top: 50%;
+	margin-top: -6px;
+	right: 30rpx;
+}
+.tui-arrow-right::before {
+	right: 0 !important;
+}
+.tui-arrow-gray::before {
+	border-color: #666666 !important;
+}
+.tui-arrow-white::before {
+	border-color: #ffffff !important;
+}
+.tui-arrow-warning::before {
+	border-color: #ff7900 !important;
+}
+.tui-arrow-success::before {
+	border-color: #19be6b !important;
+}
+.tui-arrow-danger::before {
+	border-color: #eb0909 !important;
+}
+</style>
diff --git a/components/thorui/tui-list-view/tui-list-view.vue b/components/thorui/tui-list-view/tui-list-view.vue
new file mode 100644
index 0000000..d14ebdb
--- /dev/null
+++ b/components/thorui/tui-list-view/tui-list-view.vue
@@ -0,0 +1,97 @@
+<template>
+	<view class="tui-list-view tui-view-class" :style="{backgroundColor:backgroundColor,marginTop:marginTop}">
+		<view class="tui-list-title" :style="{color:color,fontSize:size+'rpx',lineHeight:30+'rpx'}" v-if="title">{{title}}</view>
+		<view class="tui-list-content" :class="[unlined?'tui-border-'+unlined:'']">
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiListView",
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			color:{
+				type: String,
+				default: '#666'
+			},
+			//rpx
+			size:{
+				type:Number,
+				default:30
+			},
+			backgroundColor:{
+				type: String,
+				default: 'transparent'
+			},
+			unlined: {
+				type: String,
+				default: '' //top,bottom,all
+			},
+			marginTop:{
+				type:String,
+				default:'0'
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-list-title {
+		width: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.tui-list-content {
+		width: 100%;
+		position: relative;
+	}
+
+	.tui-list-content::before {
+		content: " ";
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		border-top: 1px solid #eaeef1;
+		-webkit-transform: scaleY(0.5) translateZ(0);
+		transform: scaleY(0.5) translateZ(0);
+		transform-origin: 0 0;
+		z-index: 2;
+		pointer-events: none;
+	}
+
+	.tui-list-content::after {
+		content: '';
+		width: 100%;
+		position: absolute;
+		border-bottom: 1px solid #eaeef1;
+		-webkit-transform: scaleY(0.5) translateZ(0);
+		transform: scaleY(0.5) translateZ(0);
+		transform-origin: 0 100%;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+
+	.tui-border-top::before {
+		border-top: 0;
+	}
+
+	.tui-border-bottom::after {
+		border-bottom: 0;
+	}
+
+	.tui-border-all::after {
+		border-bottom: 0;
+	}
+
+	.tui-border-all::before {
+		border-top: 0;
+	}
+</style>
diff --git a/components/thorui/tui-loadmore/tui-loadmore.vue b/components/thorui/tui-loadmore/tui-loadmore.vue
new file mode 100644
index 0000000..4c9ab65
--- /dev/null
+++ b/components/thorui/tui-loadmore/tui-loadmore.vue
@@ -0,0 +1,161 @@
+<template>
+	<view class="tui-loadmore">
+		<view :class="['tui-loading-'+index, (index==3 && type)?'tui-loading-'+type:'']"></view>
+		<view class="tui-loadmore-tips">{{text}}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiLoadmore",
+		props: {
+			//显示文本
+			text: {
+				type: String,
+				default: "正在加载..."
+			},
+			//loading 样式 ：1,2,3
+			index: {
+				type: Number,
+				default: 1
+			},
+			//颜色设置，只有index=3时生效：primary，red，orange，green
+			type: {
+				type: String,
+				default: ""
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-loadmore {
+		width: 48%;
+		margin: 1.5em auto;
+		line-height: 1.5em;
+		font-size: 24rpx;
+		text-align: center;
+	}
+
+	.tui-loading-1 {
+		margin: 0 5px;
+		width: 20px;
+		height: 20px;
+		display: inline-block;
+		vertical-align: middle;
+		-webkit-animation: a 1s steps(12) infinite;
+		animation: a 1s steps(12) infinite;
+		background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
+		background-size: 100%;
+	}
+
+	@-webkit-keyframes a {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg);
+		}
+
+		to {
+			-webkit-transform: rotate(1turn);
+			transform: rotate(1turn);
+		}
+	}
+
+	@keyframes a {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg);
+		}
+
+		to {
+			-webkit-transform: rotate(1turn);
+			transform: rotate(1turn);
+		}
+	}
+
+	.tui-loadmore-tips {
+		display: inline-block;
+		vertical-align: middle;
+	}
+
+	.tui-loading-2 {
+		width: 28rpx;
+		height: 28rpx;
+		border: 1px solid #8f8d8e;
+		border-radius: 50%;
+		margin: 0 6px;
+		display: inline-block;
+		vertical-align: middle;
+		clip-path: polygon(0% 0%,100% 0%,100% 30%,0% 30%);
+		animation: rotate 1s linear infinite;
+	}
+
+	@-webkit-keyframes rotate {
+		from {
+			transform: rotatez(0deg);
+		}
+
+		to {
+			transform: rotatez(360deg);
+		}
+	}
+
+	@keyframes rotate {
+		from {
+			transform: rotatez(0deg);
+		}
+
+		to {
+			transform: rotatez(360deg);
+		}
+	}
+
+	.tui-loading-3 {
+		display: inline-block;
+		margin: 0 6px;
+		vertical-align: middle;
+		width: 28rpx;
+		height: 28rpx;
+		background: 0 0;
+		border-radius: 50%;
+		border: 2px solid;
+		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
+		animation: tui-rotate 0.7s linear infinite;
+	}
+
+	.tui-loading-3.tui-loading-primary {
+		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #5677fc;
+	}
+
+	.tui-loading-3.tui-loading-green {
+		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #19be6b;
+	}
+
+	.tui-loading-3.tui-loading-orange {
+		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #ff7900;
+	}
+
+	.tui-loading-3.tui-loading-red {
+		border-color: #ededed #ededed #ededed #ed3f14;
+	}
+
+	@-webkit-keyframes tui-rotate {
+		0% {
+			transform: rotate(0);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes tui-rotate {
+		0% {
+			transform: rotate(0);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+</style>
diff --git a/components/thorui/tui-navigation-bar/tui-navigation-bar.vue b/components/thorui/tui-navigation-bar/tui-navigation-bar.vue
new file mode 100644
index 0000000..63f7ceb
--- /dev/null
+++ b/components/thorui/tui-navigation-bar/tui-navigation-bar.vue
@@ -0,0 +1,187 @@
+<template>
+	<view
+		class="tui-navigation-bar"
+		:class="{ 'tui-bar-line': opacity > 0.85 && splitLine, 'tui-navbar-fixed': isFixed, 'tui-backdrop__filter': backdropFilter }"
+		:style="{ height: height + 'px', backgroundColor:backgroundColor,opacity:opacity }"
+	>
+		<view class="tui-status-bar" :style="{ height: statusBarHeight + 'px' }" v-if="isImmersive"></view>
+		<view class="tui-navigation_bar-title" :style="{ opacity: opacity, color: color, paddingTop: top - statusBarHeight + 'px' }" v-if="title && !isCustom">{{ title }}</view>
+		<slot />
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'tuiNavigationBar',
+	props: {
+		//NavigationBar标题
+		title: {
+			type: String,
+			default: ''
+		},
+		//NavigationBar标题颜色
+		color: {
+			type: String,
+			default: '#333'
+		},
+		//NavigationBar背景颜色
+		backgroundColor: {
+			type: String,
+			default: '#fff'
+		},
+		//是否需要分割线
+		splitLine: {
+			type: Boolean,
+			default: false
+		},
+		//是否设置不透明度
+		isOpacity: {
+			type: Boolean,
+			default: true
+		},
+		//滚动条滚动距离
+		scrollTop: {
+			type: [Number, String],
+			default: 0
+		},
+		/*
+			 isOpacity 为true时生效
+			 opacity=scrollTop /windowWidth * scrollRatio
+			*/
+		scrollRatio: {
+			type: [Number, String],
+			default: 0.3
+		},
+		//是否自定义header内容
+		isCustom: {
+			type: Boolean,
+			default: false
+		},
+		//是否沉浸式
+		isImmersive: {
+			type: Boolean,
+			default: true
+		},
+		isFixed: {
+			type: Boolean,
+			default: true
+		},
+		//是否开启高斯模糊效果[仅在支持的浏览器有效果]
+		backdropFilter: {
+			type: Boolean,
+			default: false
+		}
+	},
+	watch: {
+		scrollTop(newValue, oldValue) {
+			if (this.isOpacity) {
+				this.opacityChange();
+			}
+		}
+	},
+	data() {
+		return {
+			width: 375, //header宽度
+			left: 375, //小程序端 左侧距胶囊按钮距离
+			height: 44, //header高度
+			top: 0,
+			scrollH: 1, //滚动总高度,计算opacity
+			opacity: 1, //0-1
+			statusBarHeight: 0 //状态栏高度
+		};
+	},
+	created() {
+		this.opacity = this.isOpacity ? 0 : 1;
+		let obj = {};
+		// #ifdef MP-WEIXIN
+		obj = wx.getMenuButtonBoundingClientRect();
+		// #endif
+		// #ifdef MP-BAIDU
+		obj = swan.getMenuButtonBoundingClientRect();
+		// #endif
+		// #ifdef MP-ALIPAY
+		my.hideAddToDesktopMenu();
+		// #endif
+		uni.getSystemInfo({
+			success: res => {
+				this.statusBarHeight = res.statusBarHeight;
+				this.width = res.windowWidth;
+				this.left = obj.left || res.windowWidth;
+				if (this.isImmersive) {
+					this.height = obj.top ? obj.top + obj.height + 8 : res.statusBarHeight + 44;
+				}
+				this.scrollH = res.windowWidth * this.scrollRatio;
+				this.top = obj.top ? obj.top + (obj.height - 32) / 2 : res.statusBarHeight + 6;
+				this.$emit('init', {
+					width: this.width,
+					height: this.height,
+					left: obj.left,
+					top: this.top,
+					statusBarHeight: this.statusBarHeight,
+					opacity: this.opacity
+				});
+			}
+		});
+	},
+	methods: {
+		opacityChange() {
+			let scroll = this.scrollTop <= 1 ? 0 : this.scrollTop;
+			let opacity = scroll / this.scrollH;
+			if ((this.opacity >= 1 && opacity >= 1) || (this.opacity == 0 && opacity == 0)) {
+				return;
+			}
+			this.opacity = opacity;
+			this.$emit('change', {
+				opacity: this.opacity
+			});
+		}
+	}
+};
+</script>
+
+<style scoped>
+.tui-navigation-bar {
+	width: 100%;
+}
+.tui-backdrop__filter {
+	/* Safari for macOS & iOS */
+	-webkit-backdrop-filter: blur(15px);
+	/* Google Chrome */
+	backdrop-filter: blur(15px);
+}
+
+.tui-navbar-fixed {
+	position: fixed;
+	left: 0;
+	top: 0;
+	z-index: 9998;
+}
+
+.tui-status-bar {
+	width: 100%;
+}
+
+.tui-navigation_bar-title {
+	width: 100%;
+	font-size: 17px;
+	line-height: 17px;
+	/* #ifndef APP-PLUS */
+	font-weight: 500;
+	/* #endif */
+	height: 32px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.tui-bar-line::after {
+	content: '';
+	position: absolute;
+	border-bottom: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	bottom: 0;
+	right: 0;
+	left: 0;
+}
+</style>
diff --git a/components/thorui/tui-nomore/tui-nomore.vue b/components/thorui/tui-nomore/tui-nomore.vue
new file mode 100644
index 0000000..cbc9d61
--- /dev/null
+++ b/components/thorui/tui-nomore/tui-nomore.vue
@@ -0,0 +1,115 @@
+<template>
+	<view class="tui-nomore-class tui-loadmore-none">
+		<view :class="[isDot?'tui-nomore-dot':'tui-nomore']">
+			<view :style="{backgroundColor:backgroundColor}" :class="[isDot?'tui-dot-text':'tui-nomore-text']">{{isDot?dotText:text}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiNomore",
+		props: {
+			//当前页面背景颜色
+			backgroundColor: {
+				type: String,
+				default: "#fafafa"
+			},
+			//是否以圆点代替 "没有更多了"
+			isDot: {
+				type: Boolean,
+				default: false
+			},
+			//isDot为false时生效
+			text: {
+				type: String,
+				default: "没有更多了"
+			}
+		},
+		data() {
+			return {
+				dotText: "●"
+			};
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-loadmore-none {
+		width: 50%;
+		margin: 1.5em auto;
+		line-height: 1.5em;
+		font-size: 24rpx;
+		display: flex;
+		justify-content: center;
+	}
+
+	.tui-nomore {
+		width: 100%;
+		height: 100%;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		margin-top: 10rpx;
+		padding-bottom: 6rpx;
+	}
+
+	.tui-nomore::before {
+		content: ' ';
+		position: absolute;
+		border-bottom: 1rpx solid #e5e5e5;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		width: 100%;
+		top: 18rpx;
+		left: 0;
+	}
+
+	.tui-nomore-text {
+		color: #999;
+		font-size: 24rpx;
+		text-align: center;
+		padding: 0 18rpx;
+		height: 36rpx;
+		line-height: 36rpx;
+		position: relative;
+		z-index: 1;
+	}
+
+	.tui-nomore-dot {
+		position: relative;
+		text-align: center;
+		-webkit-display: flex;
+		display: flex;
+		-webkit-justify-content: center;
+		justify-content: center;
+		margin-top: 10rpx;
+		padding-bottom: 6rpx;
+	}
+
+	.tui-nomore-dot::before {
+		content: '';
+		position: absolute;
+		border-bottom: 1rpx solid #e5e5e5;
+		-webkit-transform: scaleY(0.5)  translateX(-50%);
+		transform: scaleY(0.5)  translateX(-50%);
+		width: 360rpx;
+		top: 18rpx;
+		left: 50%;
+	}
+
+	.tui-dot-text {
+		position: relative;
+		color: #e5e5e5;
+		font-size: 10px;
+		text-align: center;
+		width: 50rpx;
+		height: 36rpx;
+		line-height: 36rpx;
+		-webkit-transform: scale(0.8);
+		transform: scale(0.8);
+		-webkit-transform-origin: center center;
+		transform-origin: center center;
+		z-index: 1;
+	}
+</style>
diff --git a/components/thorui/tui-section/tui-section.vue b/components/thorui/tui-section/tui-section.vue
new file mode 100644
index 0000000..ad928b8
--- /dev/null
+++ b/components/thorui/tui-section/tui-section.vue
@@ -0,0 +1,141 @@
+<template>
+	<view class="tui-section" :style="{margin:margin,background:background,padding:padding}">
+		<view class="tui-section__title" @tap="handleClick">
+			<view class="tui-section__decorate" v-if="isLine"
+				:style="{background:getLineColor,width:lineWidth+'rpx',left:`-${lineRight}rpx`,top:lineGap+'rpx',bottom:lineGap+'rpx',borderRadius:lineCap==='circle'?`${lineWidth}rpx`:0}">
+			</view>
+			<slot name="left"></slot>
+			<text :style="{fontSize:size+'rpx',color:color,fontWeight:fontWeight}" v-if="title">{{title}}</text>
+			<slot></slot>
+		</view>
+		<view class="tui-section__sub" :style="{paddingTop:descrTop+'rpx'}" v-if="descr">
+			<text class="tui-section__descr" :style="{fontSize:descrSize+'rpx',color:descrColor}"
+				>{{descr}}</text>
+		</view>
+		<slot name="descr"></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiSection",
+		emits: ['click'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			size: {
+				type: [Number, String],
+				default: 32
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			fontWeight: {
+				type: [Number, String],
+				default: 400
+			},
+			descr: {
+				type: String,
+				default: ''
+			},
+			descrSize: {
+				type: [Number, String],
+				default: 24
+			},
+			descrColor: {
+				type: String,
+				default: '#7a7a7a'
+			},
+			descrTop: {
+				type: [Number, String],
+				default: 16
+			},
+			isLine: {
+				type: Boolean,
+				default: false
+			},
+			lineWidth: {
+				type: [Number, String],
+				default: 8
+			},
+			lineColor: {
+				type: String,
+				default: ''
+			},
+			//square、circle
+			lineCap: {
+				type: String,
+				default: 'circle'
+			},
+			lineRight: {
+				type: [Number, String],
+				default: 16
+			},
+			lineGap: {
+				type: [Number, String],
+				default: 4
+			},
+			background: {
+				type: String,
+				default: 'transparent'
+			},
+			padding: {
+				type: String,
+				default: '20rpx 30rpx'
+			},
+			margin: {
+				type: String,
+				default: '0'
+			}
+		},
+		computed:{
+			getLineColor(){
+				return this.lineColor || (uni && uni.$tui && uni.$tui.color.primary) || '#5677fc';
+			}
+		},
+		methods: {
+			handleClick() {
+				this.$emit('click', {
+					title: this.title
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-section {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.tui-section__title {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		word-break: break-all;
+		flex-shrink: 0;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.tui-section__decorate {
+		position: absolute;
+	}
+
+	.tui-section__sub {
+		/* #ifndef APP-NVUE */
+		word-break: break-all;
+		/* #endif */
+	}
+
+	.tui-section__descr {
+		font-weight: 400;
+	}
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-sticky/tui-sticky.vue b/components/thorui/tui-sticky/tui-sticky.vue
new file mode 100644
index 0000000..a7e8e91
--- /dev/null
+++ b/components/thorui/tui-sticky/tui-sticky.vue
@@ -0,0 +1,155 @@
+<template>
+	<view class="tui-sticky-class">
+		<!--sticky 容器-->
+		<view :style="{height: stickyHeight,backgroundColor:backgroundColor}" v-if="isFixed"></view>
+		<view :class="{'tui-sticky-fixed':isFixed}" :style="{top:isFixed?stickyTop+'px':'auto'}">
+			<slot name="header"></slot>
+		</view>
+		<!--sticky 容器-->
+		<!--内容-->
+		<slot name="content"></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiSticky",
+		emits: ['sticky', 'change'],
+		props: {
+			scrollTop: {
+				type: Number
+			},
+			//吸顶时与顶部的距离，单位px
+			stickyTop: {
+				type: [Number, String]
+					// #ifndef H5
+					,
+				default: 0
+					// #endif
+					// #ifdef H5
+					,
+				default: 44
+				// #endif
+			},
+			//是否指定容器，即内容放置插槽content内
+			container: {
+				type: Boolean,
+				default: false
+			},
+			//是否是原生自带header
+			isNativeHeader: {
+				type: Boolean,
+				default: true
+			},
+			//吸顶容器 高度 rpx
+			stickyHeight: {
+				type: String,
+				default: "auto"
+			},
+			//占位容器背景颜色
+			backgroundColor: {
+				type: String,
+				default: "transparent"
+			},
+			//是否重新计算[有异步加载时使用,设置大于0的数]
+			recalc: {
+				type: Number,
+				default: 0
+			},
+			//列表中的索引值
+			index: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		watch: {
+			scrollTop(newValue, oldValue) {
+				if (this.initialize != 0) {
+					this.updateScrollChange(() => {
+						this.updateStickyChange();
+						this.initialize = 0
+					});
+				} else {
+					this.updateStickyChange();
+				}
+			},
+			recalc(newValue, oldValue) {
+				this.updateScrollChange(() => {
+					this.updateStickyChange();
+					this.initialize = 0;
+				});
+			}
+		},
+		created() {
+			this.initialize = this.recalc
+		},
+		mounted() {
+			setTimeout(() => {
+				this.updateScrollChange();
+			}, 20)
+		},
+		data() {
+			return {
+				timer: null,
+				top: 0,
+				height: 0,
+				isFixed: false,
+				initialize: 0 //重新初始化
+			};
+		},
+		methods: {
+			updateStickyChange() {
+				const top = this.top;
+				const height = this.height;
+				const scrollTop = this.scrollTop
+				let stickyTop = this.stickyTop
+				// #ifdef H5
+				if (this.isNativeHeader) {
+					stickyTop = stickyTop - 44
+					stickyTop = stickyTop < 0 ? 0 : stickyTop
+				}
+				// #endif
+				if (this.container) {
+					this.isFixed = (scrollTop + stickyTop >= top && scrollTop + stickyTop < top + height) ? true : false
+				} else {
+					this.isFixed = scrollTop + stickyTop >= top ? true : false
+				}
+				//是否吸顶
+				this.$emit("sticky", {
+					isFixed: this.isFixed,
+					index: this.index
+				})
+			},
+			updateScrollChange(callback) {
+				if (this.timer) {
+					clearTimeout(this.timer)
+					this.timer = null
+				}
+				this.timer = setTimeout(() => {
+					const className = '.tui-sticky-class';
+					const query = uni.createSelectorQuery().in(this);
+					query.select(className).boundingClientRect((res) => {
+						if (res) {
+							this.top = res.top + (this.scrollTop || 0);
+							this.height = res.height;
+							callback && callback();
+							this.$emit("change", {
+								index: Number(this.index),
+								top: this.top
+							})
+						}
+					}).exec()
+				}, 0)
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-sticky-fixed {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		z-index: 888;
+	}
+</style>
diff --git a/components/thorui/tui-tabbar/tui-tabbar.vue b/components/thorui/tui-tabbar/tui-tabbar.vue
new file mode 100644
index 0000000..6f7d587
--- /dev/null
+++ b/components/thorui/tui-tabbar/tui-tabbar.vue
@@ -0,0 +1,280 @@
+<template>
+	<view
+		class="tui-tabbar"
+		:class="{ 'tui-tabbar-fixed': isFixed, 'tui-unlined': unlined, 'tui-backdrop__filter': backdropFilter }"
+		:style="{ background: backgroundColor, zIndex: isFixed ? zIndex : 'auto' }"
+	>
+		<block v-for="(item, index) in tabBar" :key="index">
+			<view
+				class="tui-tabbar-item"
+				:class="{ 'tui-item-hump': item.hump }"
+				:style="{ backgroundColor: item.hump && !backdropFilter ? backgroundColor : 'none' }"
+				@tap="tabbarSwitch(index, item.hump, item.pagePath, item.verify)"
+			>
+				<view class="tui-icon-box" :class="{ 'tui-tabbar-hump': item.hump }">
+					<image :src="current == index ? item.selectedIconPath : item.iconPath" :class="[item.hump ? '' : 'tui-tabbar-icon']"></image>
+					<view :class="[item.isDot ? 'tui-badge-dot' : 'tui-badge']" :style="{ color: badgeColor, backgroundColor: badgeBgColor }" v-if="item.num">
+						{{ item.isDot ? '' : item.num }}
+					</view>
+				</view>
+				<view class="tui-text-scale" :class="{ 'tui-text-hump': item.hump }" :style="{ color: current == index ? selectedColor : color }">{{ item.text }}</view>
+			</view>
+		</block>
+		<view :style="{ background: backgroundColor }" :class="{ 'tui-hump-box': hump }" v-if="hump && !unlined && !backdropFilter"></view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'tuiTabbar',
+	emits: ['click'],
+	props: {
+		//当前索引
+		current: {
+			type: Number,
+			default: 0
+		},
+		//字体颜色
+		color: {
+			type: String,
+			default: '#666'
+		},
+		//字体选中颜色
+		selectedColor: {
+			type: String,
+			default: '#5677FC'
+		},
+		//背景颜色
+		backgroundColor: {
+			type: String,
+			default: '#FFFFFF'
+		},
+		//是否需要中间凸起按钮
+		hump: {
+			type: Boolean,
+			default: false
+		},
+		//固定在底部
+		isFixed: {
+			type: Boolean,
+			default: true
+		},
+		//tabbar
+		// "pagePath": "/pages/my/my", 页面路径
+		// "text": "thor", 标题
+		// "iconPath": "thor_gray.png", 图标地址
+		// "selectedIconPath": "thor_active.png", 选中图标地址
+		// "hump": true, 是否为凸起图标
+		// "num": 2,   角标数量
+		// "isDot": true,  角标是否为圆点
+		// "verify": true  是否验证  （如登录）
+		tabBar: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		//角标字体颜色
+		badgeColor: {
+			type: String,
+			default: '#fff'
+		},
+		//角标背景颜色
+		badgeBgColor: {
+			type: String,
+			default: '#F74D54'
+		},
+		unlined: {
+			type: Boolean,
+			default: false
+		},
+		//是否开启高斯模糊效果[仅在支持的浏览器有效果]
+		backdropFilter: {
+			type: Boolean,
+			default: false
+		},
+		//z-index
+		zIndex: {
+			type: [Number, String],
+			default: 9999
+		}
+	},
+	watch: {
+		current() {}
+	},
+	data() {
+		return {};
+	},
+	methods: {
+		tabbarSwitch(index, hump, pagePath, verify) {
+			this.$emit('click', {
+				index: index,
+				hump: hump,
+				pagePath: pagePath,
+				verify: verify
+			});
+		}
+	}
+};
+</script>
+
+<style scoped>
+.tui-tabbar {
+	width: 100%;
+	height: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	position: relative;
+}
+.tui-backdrop__filter {
+	/* Safari for macOS & iOS */
+	-webkit-backdrop-filter: blur(15px);
+	/* Google Chrome */
+	backdrop-filter: blur(15px);
+}
+.tui-tabbar-fixed {
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	box-sizing: content-box !important;
+}
+
+.tui-tabbar::before {
+	content: ' ';
+	width: 100%;
+	border-top: 1px solid #b2b2b2;
+	position: absolute;
+	top: 0;
+	left: 0;
+	transform: scaleY(0.5) translateZ(0);
+	transform-origin: 0 0;
+	display: block;
+	z-index: 3;
+}
+
+.tui-tabbar-item {
+	height: 100%;
+	flex: 1;
+	display: flex;
+	text-align: center;
+	align-items: center;
+	flex-direction: column;
+	justify-content: space-between;
+	position: relative;
+	padding: 10rpx 0;
+	box-sizing: border-box;
+	z-index: 5;
+}
+
+.tui-icon-box {
+	position: relative;
+}
+
+.tui-item-hump {
+	height: 98rpx;
+}
+
+.tui-tabbar-icon {
+	width: 52rpx;
+	height: 52rpx;
+	display: block;
+}
+
+.tui-hump-box {
+	width: 120rpx;
+	height: 120rpx;
+	position: absolute;
+	left: 50%;
+	transform: translateX(-50%);
+	top: -50rpx;
+	border-radius: 50%;
+	z-index: 4;
+}
+
+.tui-hump-box::after {
+	content: ' ';
+	height: 200%;
+	width: 200%;
+	border: 1px solid #b2b2b2;
+	position: absolute;
+	top: 0;
+	left: 0;
+	transform: scale(0.5) translateZ(0);
+	transform-origin: 0 0;
+	border-radius: 120rpx;
+	box-sizing: border-box;
+	display: block;
+}
+
+.tui-unlined::after {
+	height: 0 !important;
+}
+
+.tui-tabbar-hump {
+	width: 100rpx;
+	height: 100rpx;
+	position: absolute;
+	left: 50%;
+	-webkit-transform: translateX(-50%) rotate(0deg);
+	transform: translateX(-50%) rotate(0deg);
+	top: -40rpx;
+	-webkit-transition: all 0.2s linear;
+	transition: all 0.2s linear;
+	border-radius: 50%;
+	z-index: 5;
+}
+
+.tui-tabbar-hump image {
+	width: 100rpx;
+	height: 100rpx;
+	display: block;
+}
+
+.tui-hump-active {
+	-webkit-transform: translateX(-50%) rotate(135deg);
+	transform: translateX(-50%) rotate(135deg);
+}
+
+.tui-text-scale {
+	font-weight: bold;
+	transform: scale(0.8);
+	font-size: 25rpx;
+	line-height: 28rpx;
+	transform-origin: center 100%;
+}
+
+.tui-text-hump {
+	position: absolute;
+	left: 50%;
+	bottom: 10rpx;
+	transform: scale(0.8) translateX(-50%);
+	transform-origin: 0 100%;
+}
+
+.tui-badge {
+	position: absolute;
+	font-size: 24rpx;
+	height: 32rpx;
+	min-width: 20rpx;
+	padding: 0 6rpx;
+	border-radius: 40rpx;
+	right: 0;
+	top: -5rpx;
+	transform: translateX(70%);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.tui-badge-dot {
+	position: absolute;
+	height: 16rpx;
+	width: 16rpx;
+	border-radius: 50%;
+	right: -4rpx;
+	top: -4rpx;
+}
+</style>
diff --git a/components/thorui/tui-tabs/tui-tabs.vue b/components/thorui/tui-tabs/tui-tabs.vue
new file mode 100644
index 0000000..6f4097d
--- /dev/null
+++ b/components/thorui/tui-tabs/tui-tabs.vue
@@ -0,0 +1,319 @@
+<template>
+	<view class="tui-tabs-view"
+		:class="[isFixed ? 'tui-tabs-fixed' : 'tui-tabs-relative', unlined ? 'tui-unlined' : '']" :style="{
+			width: tabsWidth + 'px',
+			height: height + 'rpx',
+			padding: `0 ${padding}rpx`,
+			background: backgroundColor,
+			top: isFixed ? top + 'px' : 'auto',
+			zIndex: isFixed ? zIndex : 'auto'
+		}" v-if="tabsWidth>0">
+		<view v-for="(item, index) in tabs" :key="index" class="tui-tabs-item"
+			:style="{ width: itemWidth,height: height + 'rpx' }" @tap.stop="swichTabs(index)">
+			<view class="tui-tabs-title"
+				:class="{ 'tui-tabs-active': currentTab == index, 'tui-tabs-disabled': item.disabled }" :style="{
+					color: currentTab == index ? selectedColor : color,
+					fontSize: size + 'rpx',
+					fontWeight: bold && currentTab == index ? 'bold' : 'normal'
+				}">
+				{{ item.name }}
+				<view :class="[item.isDot ? 'tui-badge__dot' : 'tui-tabs__badge']"
+					:style="{ color: badgeColor, backgroundColor: badgeBgColor }" v-if="item.num || item.isDot">
+					{{ item.isDot ? '' : item.num }}
+				</view>
+			</view>
+		</view>
+		<view v-if="isSlider" class="tui-tabs-slider" :style="{
+				transform: 'translateX(' + scrollLeft + 'px)',
+				width: sliderWidth + 'rpx',
+				height: sliderHeight + 'rpx',
+				borderRadius: sliderRadius,
+				bottom: bottom,
+				background: sliderBgColor,
+				marginBottom: bottom == '50%' ? '-' + sliderHeight / 2 + 'rpx' : 0
+			}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiTabs',
+		emits: ['change'],
+		props: {
+			//标签页
+			tabs: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			//tabs宽度，不传值则默认使用windowWidth，单位px
+			width: {
+				type: Number,
+				default: 0
+			},
+			//rpx
+			height: {
+				type: Number,
+				default: 80
+			},
+			//rpx 只对左右padding起作用，上下为0
+			padding: {
+				type: Number,
+				default: 30
+			},
+			//背景色
+			backgroundColor: {
+				type: String,
+				default: '#FFFFFF'
+			},
+			//是否固定
+			isFixed: {
+				type: Boolean,
+				default: false
+			},
+			//px
+			top: {
+				type: Number,
+				// #ifndef H5
+				default: 0,
+				// #endif
+				// #ifdef H5
+				default: 44
+				// #endif
+			},
+			//是否去掉底部线条
+			unlined: {
+				type: Boolean,
+				default: false
+			},
+			//当前选项卡
+			currentTab: {
+				type: Number,
+				default: 0
+			},
+			isSlider: {
+				type: Boolean,
+				default: true
+			},
+			//滑块宽度
+			sliderWidth: {
+				type: Number,
+				default: 68
+			},
+			//滑块高度
+			sliderHeight: {
+				type: Number,
+				default: 6
+			},
+			//滑块背景颜色
+			sliderBgColor: {
+				type: String,
+				default: '#5677fc'
+			},
+			sliderRadius: {
+				type: String,
+				default: '50rpx'
+			},
+			//滑块bottom
+			bottom: {
+				type: String,
+				default: '0'
+			},
+			//标签页宽度
+			itemWidth: {
+				type: String,
+				default: '25%'
+			},
+			//字体颜色
+			color: {
+				type: String,
+				default: '#666'
+			},
+			//选中后字体颜色
+			selectedColor: {
+				type: String,
+				default: '#5677fc'
+			},
+			//字体大小
+			size: {
+				type: Number,
+				default: 28
+			},
+			//选中后 是否加粗 ，未选中则无效
+			bold: {
+				type: Boolean,
+				default: false
+			},
+			//角标字体颜色
+			badgeColor: {
+				type: String,
+				default: '#fff'
+			},
+			//角标背景颜色
+			badgeBgColor: {
+				type: String,
+				default: '#F74D54'
+			},
+			zIndex: {
+				type: [Number, String],
+				default: 996
+			}
+		},
+		watch: {
+			currentTab() {
+				this.checkCor();
+			},
+			tabs() {
+				this.checkCor();
+			},
+			width(val) {
+				this.tabsWidth = val;
+				this.checkCor();
+			}
+		},
+		created() {
+			// 高度自适应
+			setTimeout(() => {
+				uni.getSystemInfo({
+					success: res => {
+						this.winWidth = res.windowWidth;
+						this.tabsWidth = this.width == 0 ? this.winWidth : this.width;
+						this.checkCor();
+					}
+				});
+			}, 0);
+		},
+		data() {
+			return {
+				winWidth: 0,
+				tabsWidth: 0,
+				scrollLeft: 0
+			};
+		},
+		methods: {
+			checkCor: function() {
+				let tabsNum = this.tabs.length;
+				let padding = (this.winWidth / 750) * this.padding;
+				let width = this.tabsWidth - padding * 2;
+				let left = (width / tabsNum - (this.winWidth / 750) * this.sliderWidth) / 2 + padding;
+				let scrollLeft = left;
+				if (this.currentTab > 0) {
+					scrollLeft = scrollLeft + (width / tabsNum) * this.currentTab;
+				}
+				this.scrollLeft = scrollLeft;
+			},
+			// 点击标题切换当前页时改变样式
+			swichTabs: function(index) {
+				let item = this.tabs[index];
+				if (item && item.disabled) return;
+				if (this.currentTab == index) {
+					return false;
+				} else {
+					this.$emit('change', {
+						index: Number(index)
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-tabs-view {
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.tui-tabs-relative {
+		position: relative;
+	}
+
+	.tui-tabs-fixed {
+		position: fixed;
+		left: 0;
+	}
+
+	.tui-tabs-fixed::before,
+	.tui-tabs-relative::before {
+		content: '';
+		position: absolute;
+		border-bottom: 1rpx solid #eaeef1;
+		-webkit-transform: scaleY(0.5) translateZ(0);
+		transform: scaleY(0.5) translateZ(0);
+		transform-origin: 0 100%;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+
+	.tui-unlined::before {
+		border-bottom: 0 !important;
+	}
+
+	.tui-tabs-item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		overflow: visible;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.tui-tabs-disabled {
+		opacity: 0.6;
+	}
+
+	.tui-tabs-title {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		z-index: 3;
+		overflow: visible;
+	}
+
+	.tui-tabs-active {
+		transition: all 0.15s ease-in-out;
+	}
+
+	.tui-tabs-slider {
+		position: absolute;
+		left: 0;
+		transition: all 0.15s ease-in-out;
+		z-index: 1;
+		transform-style: preserve-3d;
+	}
+
+	.tui-tabs__badge {
+		position: absolute;
+		font-size: 24rpx;
+		height: 32rpx;
+		min-width: 20rpx;
+		padding: 0 6rpx;
+		border-radius: 40rpx;
+		right: 0;
+		top: 0;
+		transform: translate(88%, -50%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+		z-index: 4;
+		font-weight: normal !important;
+	}
+
+	.tui-badge__dot {
+		position: absolute;
+		height: 16rpx;
+		width: 16rpx;
+		border-radius: 50%;
+		right: -10rpx;
+		top: -10rpx;
+		z-index: 4;
+	}
+</style>
diff --git a/components/thorui/tui-tag/tui-tag.vue b/components/thorui/tui-tag/tui-tag.vue
new file mode 100644
index 0000000..2cdf38b
--- /dev/null
+++ b/components/thorui/tui-tag/tui-tag.vue
@@ -0,0 +1,355 @@
+<template>
+	<view class="tui-tag" :hover-class="hover ? 'tui-tag-opcity' : ''" :hover-stay-time="150" :class="[originLeft ? 'tui-origin-left' : '', originRight ? 'tui-origin-right' : '', getClassName(shape, plain), getTypeClass(type, plain)]"
+	 :style="{ transform: `scale(${scaleMultiple})`, padding: padding, margin: margin, fontSize: size, lineHeight: size }"
+	 @tap="handleClick">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiTag',
+		emits: ['click'],
+		props: {
+			type: {
+				type: String,
+				default: 'primary'
+			},
+			//padding
+			padding: {
+				type: String,
+				default: '16rpx 26rpx'
+			},
+			margin: {
+				type: String,
+				default: '0'
+			},
+			//文字大小 rpx
+			size: {
+				type: String,
+				default: '28rpx'
+			},
+			// circle, square，circleLeft，circleRight
+			shape: {
+				type: String,
+				default: 'square'
+			},
+			//是否空心
+			plain: {
+				type: Boolean,
+				default: false
+			},
+			//点击效果
+			hover: {
+				type: Boolean,
+				default: false
+			},
+			//缩放倍数
+			scaleMultiple: {
+				type: Number,
+				default: 1
+			},
+			originLeft: {
+				type: Boolean,
+				default: false
+			},
+			originRight: {
+				type: Boolean,
+				default: false
+			},
+			index: {
+				type: Number,
+				default: 0
+			}
+		},
+		methods: {
+			handleClick() {
+				this.$emit('click', {
+					index: this.index
+				});
+			},
+			getTypeClass: function(type, plain) {
+				return plain ? 'tui-' + type + '-outline' : 'tui-' + type;
+			},
+			getClassName: function(shape, plain) {
+				//circle, square，circleLeft，circleRight
+				var className = plain ? 'tui-tag-outline ' : '';
+				if (shape != 'square') {
+					if (shape == 'circle') {
+						className = className + (plain ? 'tui-tag-outline-fillet' : 'tui-tag-fillet');
+					} else if (shape == 'circleLeft') {
+						className = className + 'tui-tag-fillet-left';
+					} else if (shape == 'circleRight') {
+						className = className + 'tui-tag-fillet-right';
+					}
+				}
+				return className;
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	/* color start*/
+
+	.tui-primary {
+		background-color: #5677fc !important;
+		color: #fff;
+	}
+
+	.tui-light-primary {
+		background-color: #5c8dff !important;
+		color: #fff;
+	}
+
+	.tui-dark-primary {
+		background-color: #4a67d6 !important;
+		color: #fff;
+	}
+
+	.tui-dLight-primary {
+		background-color: #4e77d9 !important;
+		color: #fff;
+	}
+
+	.tui-danger {
+		background-color: #ed3f14 !important;
+		color: #fff;
+	}
+
+	.tui-red {
+		background-color: #ff201f !important;
+		color: #fff;
+	}
+
+	.tui-warning {
+		background-color: #ff7900 !important;
+		color: #fff;
+	}
+
+	.tui-green {
+		background-color: #19be6b !important;
+		color: #fff;
+	}
+
+	.tui-high-green {
+		background-color: #52dcae !important;
+		color: #52dcae;
+	}
+
+	.tui-black {
+		background-color: #000 !important;
+		color: #fff;
+	}
+
+	.tui-white {
+		background-color: #fff !important;
+		color: #333 !important;
+	}
+
+	.tui-translucent {
+		background-color: rgba(0, 0, 0, 0.7);
+	}
+
+	.tui-light-black {
+		background-color: #333 !important;
+	}
+
+	.tui-gray {
+		background-color: #ededed !important;
+	}
+
+	.tui-phcolor-gray {
+		background-color: #ccc !important;
+	}
+
+	.tui-divider-gray {
+		background-color: #eaeef1 !important;
+	}
+
+	.tui-btn-gray {
+		background-color: #ededed !important;
+		color: #999 !important;
+	}
+
+	.tui-hover-gray {
+		background-color: #f7f7f9 !important;
+	}
+
+	.tui-bg-gray {
+		background-color: #fafafa !important;
+	}
+
+	.tui-light-blue {
+		background-color: #ecf6fd;
+		color: #4dabeb !important;
+	}
+
+	.tui-light-brownish {
+		background-color: #fcebef;
+		color: #8a5966 !important;
+	}
+
+	.tui-light-orange {
+		background-color: #fef5eb;
+		color: #faa851 !important;
+	}
+
+	.tui-light-green {
+		background-color: #e8f6e8;
+		color: #44cf85 !important;
+	}
+
+	.tui-primary-outline::after {
+		border: 1px solid #5677fc !important;
+	}
+
+	.tui-primary-outline {
+		color: #5677fc !important;
+		background-color: none;
+	}
+
+	.tui-danger-outline {
+		color: #ed3f14 !important;
+		background-color: none;
+	}
+
+	.tui-danger-outline::after {
+		border: 1px solid #ed3f14 !important;
+	}
+
+	.tui-red-outline {
+		color: #ff201f !important;
+		background-color: none;
+	}
+
+	.tui-red-outline::after {
+		border: 1px solid #ff201f !important;
+	}
+
+	.tui-warning-outline {
+		color: #ff7900 !important;
+		background-color: none;
+	}
+
+	.tui-warning-outline::after {
+		border: 1px solid #ff7900 !important;
+	}
+
+	.tui-green-outline {
+		color: #44cf85 !important;
+		background-color: none;
+	}
+
+	.tui-green-outline::after {
+		border: 1px solid #44cf85 !important;
+	}
+
+	.tui-high-green-outline {
+		color: #52dcae !important;
+		background-color: none;
+	}
+
+	.tui-high-green-outline::after {
+		border: 1px solid #52dcae !important;
+	}
+
+	.tui-gray-outline {
+		color: #999 !important;
+		background-color: none;
+	}
+
+	.tui-gray-outline::after {
+		border: 1px solid #ccc !important;
+	}
+
+	.tui-black-outline {
+		color: #333 !important;
+		background-color: none;
+	}
+
+	.tui-black-outline::after {
+		border: 1px solid #333 !important;
+	}
+
+	.tui-white-outline {
+		color: #fff !important;
+		background-color: none;
+	}
+
+	.tui-white-outline::after {
+		border: 1px solid #fff !important;
+	}
+
+	/* color end*/
+
+	/* tag start*/
+
+	.tui-tag {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 6rpx;
+		flex-shrink: 0;
+	}
+
+	.tui-tag-outline {
+		position: relative;
+		background-color: none;
+		color: #5677fc;
+	}
+
+	.tui-tag-outline::after {
+		content: ' ';
+		position: absolute;
+		width: 200%;
+		height: 200%;
+		transform: scale(0.5) translateZ(0);
+		transform-origin: 0 0;
+		box-sizing: border-box;
+		left: 0;
+		top: 0;
+		border-radius: 12rpx;
+	}
+
+	.tui-tag-fillet {
+		border-radius: 50rpx;
+	}
+
+	.tui-white.tui-tag-fillet::after {
+		border-radius: 80rpx;
+	}
+
+	.tui-tag-outline-fillet::after {
+		border-radius: 80rpx;
+	}
+
+	.tui-tag-fillet-left {
+		border-radius: 50rpx 0 0 50rpx;
+	}
+
+	.tui-tag-fillet-right {
+		border-radius: 0 50rpx 50rpx 0;
+	}
+
+	.tui-tag-fillet-left.tui-tag-outline::after {
+		border-radius: 100rpx 0 0 100rpx;
+	}
+
+	.tui-tag-fillet-right.tui-tag-outline::after {
+		border-radius: 0 100rpx 100rpx 0;
+	}
+
+	/* tag end*/
+	.tui-origin-left {
+		transform-origin: 0 center;
+	}
+
+	.tui-origin-right {
+		transform-origin: 100% center;
+	}
+
+	.tui-tag-opcity {
+		opacity: 0.5;
+	}
+</style>
diff --git a/components/thorui/tui-time-axis/tui-time-axis.vue b/components/thorui/tui-time-axis/tui-time-axis.vue
new file mode 100644
index 0000000..dc346c0
--- /dev/null
+++ b/components/thorui/tui-time-axis/tui-time-axis.vue
@@ -0,0 +1,38 @@
+<template>
+	<view class="tui-timeaxis-class tui-time-axis">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"tuiTimeAxis",
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-time-axis {
+		padding-left: 20px;
+		box-sizing: border-box;
+		position: relative;
+	}
+
+	.tui-time-axis::before {
+		content: " ";
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 1px;
+		bottom: 0;
+		border-left: 1px solid #ddd;
+		-webkit-transform-origin: 0 0;
+		transform-origin: 0 0;
+		-webkit-transform: scaleX(0.5);
+		transform: scaleX(0.5);
+	}
+</style>
diff --git a/components/thorui/tui-timeaxis-item/tui-timeaxis-item.vue b/components/thorui/tui-timeaxis-item/tui-timeaxis-item.vue
new file mode 100644
index 0000000..154b8f6
--- /dev/null
+++ b/components/thorui/tui-timeaxis-item/tui-timeaxis-item.vue
@@ -0,0 +1,50 @@
+<template>
+	<view class="tui-timeaxis-item">
+		<slot name="content"></slot>
+		<view class="tui-timeaxis-node" :style="{backgroundColor:backgroundColor}">
+			<slot name="node"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiTimeaxisItem",
+		props: {
+			//节点背景色
+			backgroundColor: {
+				type: String,
+				default: "#fafafa"
+			}
+		},
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-timeaxis-item {
+		position: relative;
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		margin-bottom: 25px;
+	}
+
+	.tui-timeaxis-node {
+		position: absolute;
+		top: 0;
+		left: -20px;
+		transform-origin: 0;
+		transform: translateX(-50%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 99;
+		background-color: #fafafa;
+		font-size: 24rpx;
+	}
+</style>
diff --git a/components/thorui/tui-toast/tui-toast.vue b/components/thorui/tui-toast/tui-toast.vue
new file mode 100644
index 0000000..31b6f8f
--- /dev/null
+++ b/components/thorui/tui-toast/tui-toast.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="tui-toast" :class="[visible?'tui-toast-show':'',content?'tui-toast-padding':'',icon?'':'tui-unicon-padding']" :style="{width:getWidth(icon,content),zIndex:zIndex}">
+		<image :src="imgUrl" class="tui-toast-img" v-if="icon"></image>
+		<view class="tui-toast-text" :class="[icon?'':'tui-unicon']">{{title}}</view>
+		<view class="tui-toast-text tui-content-ptop" v-if="content && icon">{{content}}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiToast",
+		props: {
+			zIndex:{
+				type:Number,
+				default:99999
+			}
+		},
+		data() {
+			return {
+				timer: null,
+				//是否显示
+				visible: false,
+				//显示标题
+				title: "操作成功",
+				//显示内容
+				content: "",
+				//是否有icon
+				icon:false,
+				imgUrl:""
+			};
+		},
+		methods: {
+			show: function(options) {
+				let {
+					duration = 2000,
+					icon=false
+				} = options;
+				clearTimeout(this.timer);
+				this.visible = true;
+				this.title = options.title || "";
+				this.content = options.content || "";
+				this.icon=icon;
+				if(icon && options.imgUrl){
+					this.imgUrl=options.imgUrl
+				}
+				this.timer = setTimeout(() => {
+					this.visible = false;
+					clearTimeout(this.timer);
+					this.timer = null;
+				}, duration);
+			},
+			getWidth(icon,content){
+				let width="auto";
+				if(icon){
+					width=content?'420rpx':'360rpx'
+				}
+				return width
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-toast {
+		background-color: rgba(0, 0, 0, 0.75);
+		border-radius: 10rpx;
+		position: fixed;
+		visibility: hidden;
+		opacity: 0;
+		left: 50%;
+		top: 48%;
+		-webkit-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		transition:  0.3s ease-in-out;
+		transition-property:opacity,visibility;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		padding: 60rpx 20rpx 54rpx 20rpx;
+		box-sizing: border-box;
+	}
+
+	.tui-toast-padding {
+		padding-top: 50rpx !important;
+		padding-bottom: 50rpx !important;
+	}
+	.tui-unicon-padding {
+		padding: 24rpx 40rpx !important;
+		word-break: break-all;
+	}
+
+	.tui-toast-show {
+		visibility: visible;
+		opacity: 1;
+	}
+
+
+	.tui-toast-img {
+		width: 120rpx;
+		height: 120rpx;
+		display: block;
+		margin-bottom: 28rpx;
+	}
+
+	.tui-toast-text {
+		font-size: 30rpx;
+		line-height: 30rpx;
+		font-weight: 400;
+		color: #fff;
+		text-align: center;
+	}
+	.tui-unicon{
+		line-height: 40rpx !important;
+		font-size: 32rpx !important;
+	}
+	.tui-content-ptop {
+		padding-top: 10rpx;
+		font-size: 26rpx !important;
+	}
+</style>
diff --git a/components/thorui/tui-upload/tui-upload.vue b/components/thorui/tui-upload/tui-upload.vue
new file mode 100644
index 0000000..a77ec15
--- /dev/null
+++ b/components/thorui/tui-upload/tui-upload.vue
@@ -0,0 +1,609 @@
+<template>
+	<view class="tui-upload__container">
+		<view class="tui-upload-box">
+			<view class="tui-image-item" :style="{width:width+'rpx',height:height+'rpx',borderRadius:radius+'rpx'}"
+				v-for="(item,index) in imageList" :key="index">
+				<image :src="item" class="tui-item-img"
+					:style="{width:width+'rpx',height:height+'rpx',borderRadius:radius+'rpx'}"
+					@tap.stop="previewImage(index)" mode="aspectFill"></image>
+				<view v-if="!forbidDel" class="tui-img-del" :style="{background:getDelColor}"
+					@tap.stop="delImage(index)">
+				</view>
+				<view v-if="statusArr[index]!=1" class="tui-upload-mask">
+					<view class="tui-upload-loading" v-if="statusArr[index]==2"></view>
+					<text class="tui-tips">{{statusArr[index]==2?'上传中...':'上传失败'}}</text>
+					<view class="tui-mask-btn" v-if="statusArr[index]==3" @tap.stop="reUpLoad(index)"
+						hover-class="tui-btn-hover" :hover-stay-time="150">重新上传</view>
+				</view>
+			</view>
+			<view v-if="isShowAdd" class="tui-upload-add"
+				:class="[borderColor!=='transparent'?'tui-upload__border':'tui-upload__unborder']"
+				:style="{width:width+'rpx',height:height+'rpx',background:background,borderRadius:radius+'rpx',borderColor:borderColor,borderStyle:borderSytle}"
+				@tap="chooseImage">
+				<slot>
+					<view class="tui-upload-icon tui-icon-plus" :style="{color:addColor,fontSize:addSize+'rpx'}"></view>
+				</slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiUpload',
+		emits: ['remove', 'complete', 'reupload'],
+		props: {
+			//展示图片宽度
+			width: {
+				type: [Number, String],
+				default: 180
+			},
+			//展示图片高度
+			height: {
+				type: [Number, String],
+				default: 180
+			},
+			//初始化图片路径
+			value: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			//2.3.0+
+			radius: {
+				type: [Number, String],
+				default: 0
+			},
+			//2.3.0+
+			background: {
+				type: String,
+				default: '#F7F7F7'
+			},
+			//2.3.0+
+			borderColor: {
+				type: String,
+				default: 'transparent'
+			},
+			//2.3.0+
+			//solid、dashed、dotted
+			borderSytle: {
+				type: String,
+				default: 'dashed'
+			},
+			//2.3.0+
+			delColor: {
+				type: String,
+				default: ''
+			},
+			//删除图片前是否弹框确认
+			delConfirm: {
+				type: Boolean,
+				default: false
+			},
+			//禁用删除
+			forbidDel: {
+				type: Boolean,
+				default: false
+			},
+			//2.3.0+
+			addColor: {
+				type: String,
+				default: '#888'
+			},
+			//2.3.0+
+			addSize: {
+				type: [Number, String],
+				default: 68
+			},
+			//禁用添加
+			forbidAdd: {
+				type: Boolean,
+				default: false
+			},
+			//服务器接口地址。当接口地址为空时，直接返回本地图片地址
+			serverUrl: {
+				type: String,
+				default: ""
+			},
+			//限制数
+			limit: {
+				type: Number,
+				default: 9
+			},
+			//original 原图，compressed 压缩图，默认二者都有
+			sizeType: {
+				type: Array,
+				default () {
+					return ['original', 'compressed']
+				}
+			},
+			//album 从相册选图，camera 使用相机，默认二者都有。如需直接开相机或直接选相册，请只使用一个选项
+			sourceType: {
+				type: Array,
+				default () {
+					// return ['album', 'camera']
+					return ['camera']
+				}
+			},
+			//可上传图片类型，默认为空，不限制  Array<String> ['jpg','png','gif']
+			imageFormat: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			//单张图片大小限制 MB 
+			size: {
+				type: Number,
+				default: 4
+			},
+			//文件对应的key，默认为 file
+			fileKeyName: {
+				type: String,
+				default: "file"
+			},
+			//HTTP 请求 Header, header 中不能设置 Referer。
+			header: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			//HTTP 请求中其他额外的 form data
+			formData: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			//自定义参数
+			params: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		data() {
+			return {
+				//图片地址
+				imageList: [],
+				tempFiles: [],
+				//上传状态：1-上传成功 2-上传中 3-上传失败
+				statusArr: [],
+				//传入回调函数上传
+				callUpload: false
+			}
+		},
+		created() {
+			this.initImages()
+		},
+		watch: {
+			value(val) {
+				if (val) {
+					this.initImages()
+				}
+			}
+		},
+		computed: {
+			isShowAdd() {
+				let isShow = true;
+				if (this.forbidAdd || (this.limit && this.imageList.length >= this.limit)) {
+					isShow = false;
+				}
+				return isShow
+			},
+			getDelColor() {
+				return this.delColor || (uni && uni.$tui && uni.$tui.color.danger) || '#EB0909';
+			}
+		},
+		methods: {
+			initImages() {
+				this.statusArr = [];
+				this.imageList = [...this.value];
+				let tempFiles = []
+				for (let item of this.imageList) {
+					this.statusArr.push("1")
+					tempFiles.push({
+						path: item
+					})
+				}
+				this.tempFiles = tempFiles;
+			},
+			// 重新上传
+			reUpLoad(index) {
+				this.$set(this.statusArr, index, "2")
+				this.$emit('reupload', {
+					index
+				})
+				if (!this.callUpload) {
+					this.uploadImage(index, this.imageList[index]).then(() => {
+						this.change()
+					}).catch(() => {
+						this.change()
+					})
+				}
+			},
+			/**
+			 * @param manual 是否手动上传
+			 **/
+			change(manual = false) {
+				let status = ~this.statusArr.indexOf("2") ? 2 : 1
+				if (status != 2 && ~this.statusArr.indexOf("3")) {
+					// 上传失败
+					status = 3
+				}
+				this.$emit('complete', {
+					status: status,
+					imgArr: this.imageList,
+					params: this.params,
+					manual: manual
+				})
+			},
+			toast(text) {
+				text && uni.showToast({
+					title: text,
+					icon: "none"
+				});
+			},
+			chooseImage: function() {
+				let _this = this;
+				uni.chooseImage({
+					count: _this.limit - _this.imageList.length,
+					sizeType: _this.sizeType,
+					sourceType: _this.sourceType,
+					success: function(e) {
+						let imageArr = [];
+						for (let i = 0; i < e.tempFiles.length; i++) {
+							let len = _this.imageList.length;
+							if (len >= _this.limit) {
+								_this.toast(`最多可上传${_this.limit}张图片`);
+								break;
+							}
+							//过滤图片类型
+							let path = e.tempFiles[i].path;
+
+							if (_this.imageFormat.length > 0) {
+								let format = ""
+								// #ifdef H5
+								let type = e.tempFiles[i].type;
+								format = type.split('/')[1]
+								// #endif
+
+								// #ifndef H5
+								format = path.split(".")[(path.split(".")).length - 1];
+								// #endif
+
+								if (_this.imageFormat.indexOf(format) == -1) {
+									let text = `只能上传 ${_this.imageFormat.join(',')} 格式图片！`
+									_this.toast(text);
+									continue;
+								}
+							}
+
+							//过滤超出大小限制图片
+							let size = e.tempFiles[i].size;
+
+							if (_this.size * 1024 * 1024 < size) {
+								let err = `单张图片大小不能超过：${_this.size}MB`
+								_this.toast(err);
+								continue;
+							}
+							imageArr.push(path)
+							_this.imageList.push(path)
+							_this.tempFiles.push(e.tempFiles[i])
+							_this.statusArr.push("2")
+						}
+						_this.change()
+
+						let start = _this.imageList.length - imageArr.length
+						for (let j = 0; j < imageArr.length; j++) {
+							let index = start + j
+							//服务器地址
+							if (_this.serverUrl) {
+								_this.uploadImage(index, imageArr[j]).then(() => {
+									_this.change()
+								}).catch(() => {
+									_this.change()
+								})
+							} else {
+								//无服务器地址则直接返回成功
+								_this.$set(_this.statusArr, index, "1")
+								_this.change()
+							}
+						}
+					}
+				})
+			},
+			uploadImage: function(index, url, serverUrl) {
+				let _this = this;
+				return new Promise((resolve, reject) => {
+					uni.uploadFile({
+						url: this.serverUrl || serverUrl,
+						name: this.fileKeyName,
+						header: this.header,
+						formData: this.formData,
+						filePath: url,
+						success: function(res) {
+							if (res.statusCode == 200) {
+								//返回结果 此处需要按接口实际返回进行修改
+								let d = JSON.parse(res.data.replace(/\ufeff/g, "") || "{}")
+								//判断code，以实际接口规范判断
+								if (d.code % 100 === 0) {
+									// 上传成功 d.url 为上传后图片地址，以实际接口返回为准
+									d.url && (_this.imageList[index] = d.url)
+									_this.$set(_this.statusArr, index, d.url ? "1" : "3")
+								} else {
+									// 上传失败
+									_this.$set(_this.statusArr, index, "3")
+								}
+								resolve(index)
+							} else {
+								_this.$set(_this.statusArr, index, "3")
+								reject(index)
+							}
+						},
+						fail: function(res) {
+							_this.$set(_this.statusArr, index, "3")
+							reject(index)
+						}
+					})
+				})
+
+			},
+			delImage: function(index) {
+				let that = this
+				if (this.delConfirm) {
+					uni.showModal({
+						title: '提示',
+						content: '确认删除该图片吗？',
+						showCancel: true,
+						cancelColor: "#555",
+						confirmColor: "#eb0909",
+						confirmText: "确定",
+						success(res) {
+							if (res.confirm) {
+								that.imageList.splice(index, 1)
+								that.tempFiles.splice(index, 1)
+								that.statusArr.splice(index, 1)
+								that.$emit("remove", {
+									index: index,
+									params: that.params
+								})
+								that.change()
+							}
+						}
+					})
+				} else {
+					that.imageList.splice(index, 1)
+					that.tempFiles.splice(index, 1)
+					that.statusArr.splice(index, 1)
+					that.$emit("remove", {
+						index: index,
+						params: that.params
+					})
+					that.change()
+				}
+			},
+			previewImage: function(index) {
+				if (!this.imageList.length) return;
+				uni.previewImage({
+					current: this.imageList[index],
+					loop: true,
+					urls: this.imageList
+				})
+			},
+			/**
+			 * 当属性serverUrl传空时，父级调用该方法一次性上传所有图片
+			 * @param serverUrl 服务器接口地址
+			 **/
+			uploadAllImage(serverUrl) {
+				if (!serverUrl) {
+					this.toast('服务器接口地址不能为空！');
+					return;
+				}
+				let imageArr = [...this.imageList]
+				const len = imageArr.length
+				for (let i = 0; i < len; i++) {
+					//如果是服务器地址图片则无需再次上传
+					if (imageArr[i].startsWith('https')) {
+						continue;
+					} else {
+						this.$set(this.statusArr, i, "2")
+						this.uploadImage(i, imageArr[i], serverUrl).then(() => {
+							if (i === len - 1) {
+								this.change(true)
+							}
+						}).catch(() => {
+							if (i === len - 1) {
+								this.change(true)
+							}
+						})
+					}
+				}
+			},
+			upload(callback, index) {
+				// 传入一个返回Promise的文件上传的函数
+				//上传状态：1-上传成功 2-上传中 3-上传失败
+				this.callUpload = true;
+				if (index === undefined || index === null) {
+					let urls = [...this.imageList]
+					const len = urls.length
+					for (let i = 0; i < len; i++) {
+						if (urls[i].startsWith('https')) {
+							continue;
+						} else {
+							this.$set(this.statusArr, i, "2")
+							if (typeof callback === 'function') {
+								callback(this.tempFiles[i]).then(res => {
+									this.$set(this.statusArr, i, '1')
+									this.imageList[i] = res
+									this.change(true)
+								}).catch(err => {
+									this.$set(this.statusArr, i, '3')
+								})
+							}
+						}
+					}
+				} else {
+					//如果传入index，则是重新上传时调用
+					this.$set(this.statusArr, index, "2")
+					if (typeof callback === 'function') {
+						callback(this.tempFiles[index]).then(res => {
+							this.$set(this.statusArr, index, '1')
+							this.imageList[index] = res
+							this.change(true)
+						}).catch(err => {
+							this.$set(this.statusArr, index, '3')
+						})
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	@font-face {
+		font-family: 'tuiUpload';
+		src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAATcAA0AAAAAByQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAEwAAAABoAAAAciR52BUdERUYAAASgAAAAHgAAAB4AKQALT1MvMgAAAaAAAABCAAAAVjxvR/tjbWFwAAAB+AAAAEUAAAFK5ibpuGdhc3AAAASYAAAACAAAAAj//wADZ2x5ZgAAAkwAAADXAAABAAmNjcZoZWFkAAABMAAAAC8AAAA2FpiS+WhoZWEAAAFgAAAAHQAAACQH3QOFaG10eAAAAeQAAAARAAAAEgwAACBsb2NhAAACQAAAAAwAAAAMAEoAgG1heHAAAAGAAAAAHwAAACABEgA2bmFtZQAAAyQAAAFJAAACiCnmEVVwb3N0AAAEcAAAACgAAAA6OMUs4HjaY2BkYGAAYo3boY/i+W2+MnCzMIDAzb3qdQj6fwPzf+YGIJeDgQkkCgA/KAtvAHjaY2BkYGBu+N/AEMPCAALM/xkYGVABCwBZ4wNrAAAAeNpjYGRgYGBl0GJgZgABJiDmAkIGhv9gPgMADTABSQB42mNgZGFgnMDAysDA1Ml0hoGBoR9CM75mMGLkAIoysDIzYAUBaa4pDA7PGJ9xMjf8b2CIYW5gaAAKM4LkANt9C+UAAHjaY2GAABYIVmBgAAAA+gAtAAAAeNpjYGBgZoBgGQZGBhBwAfIYwXwWBg0gzQakGRmYnjE+4/z/n4EBQksxSf6GqgcCRjYGOIeRCUgwMaACRoZhDwCiLwmoAAAAAAAAAAAAAAAASgCAeNpdjkFKw0AARf/vkIR0BkPayWRKQZtYY90ohJju2kOIbtz0KD1HVm50UfEmWXoAr9ADOHFARHHzeY//Fx8Ci+FJfIgdJFa4AhgiMshbrCuIsLxhFJZVs+Vl1bT1GddtbXTC3OhohN4dg4BJ3zMJAnccyfm468ZzHXddrH9ZKbHzdf9n/vkY/xv9sPQXgGEvBrHHwst5kTbXLE+YpYVPkxepPmW94W16UbdNJd6f3SAzo5W7m1jaKd+8ZZIvk5nlKw9SK6Wle7BLS3f/bTzQLmfAF2T1NsQAeNp9kD1OAzEQhZ/zByQSQiCoXVEA2vyUKRMp9Ailo0g23pBo1155nUg5AS0VB6DlGByAGyDRcgpelkmTImvt6PObmeexAZzjGwr/3yXuhBWO8ShcwREy4Sr1F+Ea+V24jhY+hRvUf4SbuFUD4RYu1BsdVO2Eu5vSbcsKZxgIV3CKJ+Eq9ZVwjfwqXMcVPoQb1L+EmxjjV7iFa2WpDOFhMEFgnEFjig3jAjEcLJIyBtahOfRmEsxMTzd6ETubOBso71dilwMeaDnngCntPbdmvkon/mDLgdSYbh4FS7YpjS4idCgbXyyc1d2oc7D9nu22tNi/a4E1x+xRDWzU/D3bM9JIbAyvkJI18jK3pBJTj2hrrPG7ZynW814IiU68y/SIx5o0dTr3bmniwOLn8owcfbS5kj33qBw+Y1kIeb/dTsQgil2GP5PYcRkAAAB42mNgYoAALjDJyIAOWMGiTIxMjMxsKak5qSWpbFmZiRmJ+QAmgAUIAAAAAf//AAIAAQAAAAwAAAAWAAAAAgABAAMABAABAAQAAAACAAAAAHjaY2BgYGQAgqtL1DlA9M296nUwGgA+8QYgAAA=) format('woff');
+		font-weight: normal;
+		font-style: normal;
+	}
+
+	.tui-upload-icon {
+		font-family: "tuiUpload" !important;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+		padding: 10rpx;
+	}
+
+	.tui-icon-delete:before {
+		content: "\e601";
+	}
+
+	.tui-icon-plus:before {
+		content: "\e609";
+	}
+
+	.tui-upload-box {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.tui-upload-add {
+		font-weight: 100;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0;
+		overflow: hidden;
+		box-sizing: border-box;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.tui-upload__unborder {
+		border-width: 0;
+	}
+
+	.tui-upload__border {
+		border-width: 1px;
+	}
+
+	.tui-image-item {
+		position: relative;
+		margin-right: 20rpx;
+		margin-bottom: 20rpx;
+		flex-shrink: 0;
+	}
+
+	.tui-item-img {
+		display: block;
+	}
+
+	.tui-img-del {
+		width: 36rpx;
+		height: 36rpx;
+		position: absolute;
+		right: -12rpx;
+		top: -12rpx;
+		border-radius: 50%;
+		color: white;
+		font-size: 34rpx;
+		z-index: 5;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.tui-img-del::before {
+		content: '';
+		width: 16rpx;
+		height: 1px;
+		position: absolute;
+		left: 10rpx;
+		top: 18rpx;
+		background-color: #fff;
+	}
+
+	.tui-upload-mask {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 40rpx 0;
+		box-sizing: border-box;
+		background-color: rgba(0, 0, 0, 0.6);
+		z-index: 3;
+	}
+
+	.tui-upload-loading {
+		width: 28rpx;
+		height: 28rpx;
+		border-radius: 50%;
+		border: 2px solid;
+		border-color: #B2B2B2 #B2B2B2 #B2B2B2 #fff;
+		animation: tui-rotate 0.7s linear infinite;
+	}
+
+	@keyframes tui-rotate {
+		0% {
+			transform: rotate(0);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	.tui-tips {
+		font-size: 26rpx;
+		color: #fff;
+	}
+
+	.tui-mask-btn {
+		padding: 4rpx 16rpx;
+		border-radius: 40rpx;
+		text-align: center;
+		font-size: 24rpx;
+		color: #fff;
+		border: 1px solid #fff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+		margin-top: 26rpx;
+	}
+
+	.tui-btn-hover {
+		opacity: 0.8;
+	}
+</style>
\ No newline at end of file
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..c3ff205
--- /dev/null
+++ b/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title></title>
+    <!--preload-links-->
+    <!--app-context-->
+  </head>
+  <body>
+    <div id="app"><!--app-html--></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..afc6b08
--- /dev/null
+++ b/main.js
@@ -0,0 +1,21 @@
+import App from './App'
+
+// #ifndef VUE3
+import Vue from 'vue'
+Vue.config.productionTip = false
+App.mpType = 'app'
+const app = new Vue({
+    ...App
+})
+app.$mount()
+// #endif
+
+// #ifdef VUE3
+import { createSSRApp } from 'vue'
+export function createApp() {
+  const app = createSSRApp(App)
+  return {
+    app
+  }
+}
+// #endif
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..7721056
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,79 @@
+{
+    "name" : "过滤器更换系统",
+    "appid" : "__UNI__B0629EA",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wxfe4ce767203ac661",
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : true,
+            "postcss" : true,
+            "minified" : true
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
+}
diff --git a/packagePage/pages/auth/auth.vue b/packagePage/pages/auth/auth.vue
new file mode 100644
index 0000000..92f6772
--- /dev/null
+++ b/packagePage/pages/auth/auth.vue
@@ -0,0 +1,96 @@
+<template>
+	<view class="content">
+		<image class="logo" :src="apiHost+'/miniapp/static/favicon-ico.png'"></image>
+		<view class="title">过滤器更换助手</view>
+		<uni-easyinput class="forminput" prefixIcon="person" v-model="user" type="text" placeholder="请输入用户名"></uni-easyinput>
+		<view style="padding:20rpx">&nbsp;&nbsp;&nbsp;&nbsp;</view>
+		<uni-easyinput class="forminput" prefixIcon="locked" v-model="pass" type="password" placeholder="请输入用户密码"></uni-easyinput>
+		<button class="authbtn"  @tap="auth">登录</button>
+		<view style="margin-top:120rpx">
+			<view style="font-weight:bold;font-size:25rpx" @tap="phoneCall">系统账号，需联系工程师开通！</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import myapp from '@/common/js/myapp.js'
+	export default {
+		data() {
+			return {
+				apiHost: myapp.apiHost,
+				user: '',
+				pass:'',
+				useLocal: ''
+			}
+		},
+		onShow: function() {
+
+		},
+		methods: {
+			auth:function() {
+				let user = this.user.trim()
+				let pass = this.pass.trim()
+				if (user == '') {
+					myapp.showHint('请输入用户名')
+				} else if (pass == '') {
+					myapp.showHint('请输入用户密码')
+				} else {
+					// 获取登录信息
+					let that = this;
+					// 获取首页信息
+					myapp.request('/?c=login&a=postCheckLogin',function(res) {
+						that.useLocal = res.data.data
+						if (res.data.data) {
+							uni.setStorageSync('user', res.data.data)
+							uni.reLaunch({
+								url:'/packagePage/pages/ctrldevice/ctrldevice'
+							})
+						} else {
+							myapp.showHint('用户名或密码错误')
+							
+						}
+						
+					},{account:user,password:pass},'POST')
+					
+				}
+			},
+			phoneCall: function() {
+				uni.makePhoneCall({
+					phoneNumber: '18730306171' 
+				});				
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F5F6FA;
+	}
+	.content {
+		text-align: center;
+		margin-left: 40px;
+		margin-right: 40px;
+	}
+	.logo {
+		width:100rpx;
+		height:100rpx;
+		margin-top: 220rpx;
+		margin-bottom: 20rpx;
+	}
+	.title {
+		font-size: 46rpx;
+		color: #333;
+		font-weight: bold;
+		padding-bottom: 30rpx;
+	}
+	.forminput {
+		background-color: #FFF;
+		color: #000;
+	}
+	.authbtn {
+		background-color: #5767CF;
+		color: #FFF;
+		margin-top: 60rpx;
+	}
+</style>
diff --git a/packagePage/pages/ctrldevice/ctrldevice.vue b/packagePage/pages/ctrldevice/ctrldevice.vue
new file mode 100644
index 0000000..736c06b
--- /dev/null
+++ b/packagePage/pages/ctrldevice/ctrldevice.vue
@@ -0,0 +1,315 @@
+<template>
+	<view class="container">
+		<view class="tui-bg-box">
+			<view class="tui-photo"><image :src="apiHost+'/miniapp/static/scan_big.png'" class="tui-bg-img" @click="buttonClick"></image><span class="tui-title-1">扫描过滤器上二维码快速录</span></view>
+		</view>
+		<view class="header-1">
+			<view class="sub-title">需要依次上传远景照片、更换前照片、更换后照片以及其他补充照片 </view>
+		</view>
+		<view class="tui-box-upload">
+			<!-- <tui-upload :value="value" :serverUrl="serverUrl" @complete="result" @remove="remove"></tui-upload> -->
+			<!-- <tui-upload
+			  ref="upload"
+			  action="https://filter.api.opmonitor.com/?c=device&a=getPicture"
+			  @complete="result"
+			>
+			</tui-upload> -->
+			<tui-upload ref="uploadRef" @complete="complete" @reupload="reUpload"></tui-upload>
+			<view style="width: 28%;height: 36px;line-height: 36px;font-size: 14px;margin: 5px 0;">
+				<tui-button bold type="gray-primary" btn-size="medium" @click="upload">上传</tui-button>
+			</view>
+			
+		</view>
+		<view class="header-1">
+			<view class="sub-title">若无选择点位可手写输入，无需选择，示例<span style="color:red;">一部-3号楼-3层-308层流屋顶</span> </view>
+		</view>
+		<view style="padding-left: 90rpx;padding-top: 10rpx;">
+			<textarea
+				placeholder="需要补充的信息..."
+				style="width: 80%; height: 80px; background: #f5f5f5; padding-left: 20rpx; padding-top: 20rpx;font-size:12px;"
+				v-model="note"
+			></textarea>
+		</view>
+		<view style="padding-left: 90rpx;padding-top: 20rpx;" @click="selectPosition">
+			<image :src="apiHost+'/miniapp/static/map.png'" class="tui-bg-img-1"></image>
+			<span class="tui-title-2"  v-if="position==''">{{deviceInfo.position}}</span>
+			<span class="tui-title-2"  v-else>{{position}}</span>
+		</view>
+		<view style="padding-left: 90rpx;padding-top: 60rpx;">
+			<span class="tui-title-3" v-if="deviceInfo.specification == 'undefined'">#尺寸规格：</span>
+			<span class="tui-title-3" v-else>#尺寸规格：{{deviceInfo.specification}} {{deviceInfo.type}}</span>
+		</view>
+		<view style="padding-left: 58%;padding-top: 100rpx;">
+			<tui-button width="200rpx" height="80rpx" :size="28" @click="detail">保存</tui-button>
+		</view>
+		<tui-tabbar :current="tabbarCurrent"  backdropFilter :backgroundColor="tabbarBackgroundColor" :tabBar="tabBar" color="#777" selectedColor="#AC9157" @click="tabbarSwitch"></tui-tabbar>
+	</view>
+</template>
+
+<script>
+	import myapp from '@/common/js/myapp.js'
+	//实际使用需要传入上传地址，以及上传接口返回数据进行调整组件
+	export default {
+		data() {
+			return {
+				apiHost: myapp.apiHost,
+				imageData: [],
+				//上传地址
+				serverUrl: "https://filter.api.opmonitor.com/?c=device&a=getPicture",
+				value:[] ,//初始化图片
+				position: '',
+				deviceInfo: [],
+				sn: '',
+				tabBar: myapp.tabBar,
+				tabbarCurrent: 3,
+				tabbarBackgroundColor: '#FFF',
+				imageList:[],
+				serverImageList:[],
+				note:'',
+				account: ''
+			}
+		},
+		onLoad() {
+			// setTimeout(()=>{
+			// 	//实际开发中图片地址应为网络地址
+			// 	this.value=['https://filter.api.opmonitor.com/miniapp/static/hospital.png']
+			// },200)
+			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+			let curRoute = routes[routes.length - 1].route //获取当前页面路由
+			let curParam = routes[routes.length - 1].options; //获取路由参数
+			this.position = curParam.position
+			this.sn = curParam.sn
+			let that = this;
+			this.account = uni.getStorageSync('user')['account']
+			if(curParam.sn != 'undefined')
+			{
+				myapp.request('/?c=device&a=getTagSystemQrcode',function(res) {
+					that.deviceInfo = res.data.data
+				},{sn:curParam.sn})
+			}
+		},
+		methods: {
+			tabbarSwitch: myapp.tabbarSwitch,
+			
+			//以下为调用upload 方法上传示例
+			//注：上传成功或失败处理，请按照下方示例返回(resolve, reject)信息，请勿修改格式
+			uploadImg(file) {
+				//上传的文件信息
+				// 文件上传的函数，返回一个promise
+				//上传成功后返回上传后的图片地址，上传失败则返回false即可
+				let that = this;
+				return new Promise((resolve, reject) => {
+					//调用api上传，所有需要参数自行补充【上传自行实现，便于扩展】
+					uni.uploadFile({
+						//请换成真实的上传接口地址，示例接口已关闭
+						url: this.serverUrl,
+						name: 'file',
+						// header: {},
+						// formData:{},
+						filePath: file.path,
+						success: (res) => {
+							//上传成功后，将图片地址返回
+							//此处逻辑自行根据接口返回判断
+							if (true) {
+								
+								//返回上传成功后的图片地址，根据实际接口返回处理数据 
+								const data = JSON.parse(res.data.replace(/\ufeff/g, "") || "{}")
+								let url = data.data
+								//上传成功后务必返回图片地址信息
+								that.serverImageList.push(url)
+								resolve(url)
+							} else {
+								//上传失败
+								reject(false)
+							}
+						},
+						fail: (err) => {
+							//上传失败
+							console.log(err)
+							reject(false)
+						}
+					})
+				})
+			},
+			upload() {
+				if(this.imageList.length===0){
+					this.tui.toast('请选择图片！')
+					return;
+				}
+				//调用upload 方法上传，并传入函数，初始上传时勿传入索引值
+				this.$refs.uploadRef && this.$refs.uploadRef.upload(this.uploadImg)
+			},
+			//重新上传
+			reUpload(e) {
+				//当前上传按钮索引值
+				//调用upload 方法上传，并传入函数，且此时需要传入index值
+				this.$refs.uploadRef && this.$refs.uploadRef.upload(this.uploadImg, e.index)
+			},
+			complete(e) {
+				this.imageList = e.imgArr
+			},
+			selectPosition: function() {
+				uni.navigateTo({
+					url:'/packagePage/pages/position/position?sn='+this.deviceInfo.sn+'&h_id='+this.deviceInfo.h_id
+				})
+			},
+			detail: function() {
+				// console.info(this.position)
+				// console.info(this.deviceInfo.position)
+				// console.info(this.note)
+				// console.info(this.deviceInfo.type)
+				// console.info(this.deviceInfo.specification)
+				// console.info(this.serverImageList)
+				// console.info(this.deviceInfo.sn)
+				// console.info(this.account)
+				// uni.navigateTo({
+				// 	url:'/packagePage/pages/record/record'
+				// })
+				myapp.request('/?c=record&a=createdRecord',function(res) {
+					if(res.data.data=='success'){
+						uni.navigateTo({
+							url:'/packagePage/pages/record/record'
+						})
+					}
+					console.info(res.data.data)
+				},{note:this.note,type:this.deviceInfo.type,specification:this.deviceInfo.specification,serverImageList:this.serverImageList,sn:this.deviceInfo.sn,account:this.account})
+			},
+			buttonClick() {
+				let that = this;
+				uni.scanCode({
+					success: function (res) {
+						let code = res.result;
+						uni.request({
+							url: 'https://filter.api.opmonitor.com/?c=device&a=getTagSystemQrcode',
+							data: {sn: code},
+							header: {
+								'Content-type': 'application/json'
+							},
+							success: function(res){
+								that.deviceInfo = res.data.data
+								// console.info(res.data.data)
+								// if(res.data.data.name === ""){
+								// 	uni.showModal({
+								// 		title: '提示',
+								// 		content: '过滤器不存在，现在进行新增操作'
+								// 	})
+								// }else{
+								// 	uni.showModal({
+								// 		title: '提示',
+								// 		content: '过滤器已存在，现在进行更换操作'
+								// 	})
+								// }
+							},
+							fail: () => {
+								console.info('小程序域名不正确，请检查域名的正确性')
+							}
+						})
+					},
+					fail: () => {
+						console.info('调用照相功能失败！！！')
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #fff;
+	}
+
+	.container {
+		padding: 20rpx 0 120rpx 0;
+		box-sizing: border-box;
+	}
+
+	.header {
+		padding: 20rpx 90rpx 30rpx 40rpx;
+		box-sizing: border-box;
+	}
+	
+	.header-1 {
+		padding: 20rpx 90rpx 30rpx 90rpx;
+		box-sizing: border-box;
+	}
+
+	.title {
+		font-size: 36rpx;
+		color: #333;
+		font-weight: 600;
+	}
+
+	.sub-title {
+		font-size: 24rpx;
+		color: #2f2f2f;
+		padding-top: 16rpx;
+		font-weight: 600;
+	}
+
+	.tui-box-upload {
+		padding-left: 90rpx;
+		box-sizing: border-box;
+	}
+	
+	.tui-bg-box {
+		width: 100%;
+		box-sizing: border-box;
+		position: relative;
+		padding-top: 10rpx;
+	}
+	
+	.tui-photo {
+		padding-left: 90rpx;
+		padding-bottom: 30rpx;
+		z-index: 2;
+	}
+	
+	.tui-bg-img {
+		width: 100px;
+		height: 100px;
+	}
+	
+	.tui-title-1 {
+		padding-left: 20rpx;
+		font-size: 24rpx;
+		font-weight: 600;
+		color: #2f2f2f;
+		position:absolute;
+	}
+	
+	.tui-title-2 {
+		padding-left: 12rpx;
+		font-size: 12px;
+		color: #0303f5;
+		float:left;
+		position: relative;
+		padding-top: 10rpx;
+	}
+	
+	.tui-bg-img-1 {
+		width: 25px;
+		height: 25px;
+		float:left;
+		position: relative;
+	}
+	
+	.tui-bg-img-2 {
+		width: 25px;
+		height: 25px;
+		float:left;
+		position: relative;
+		padding-left: 30rpx;
+		padding-top: 5rpx;
+	}
+	
+	.tui-title-3 {
+		font-size: 12px;
+		color: #0303f5;
+		float:left;
+		position: relative;
+		padding-top: 10rpx;
+		font-weight: 600;
+		padding-top: 20rpx;
+	}
+</style>
diff --git a/packagePage/pages/ctrllist/ctrllist.vue b/packagePage/pages/ctrllist/ctrllist.vue
new file mode 100644
index 0000000..4b032c4
--- /dev/null
+++ b/packagePage/pages/ctrllist/ctrllist.vue
@@ -0,0 +1,197 @@
+<template>
+	<view class="container">
+		<tui-list-view>
+			<block v-for="(item,index) in records" :key="item.id">
+				<tui-list-cell :lineLeft="false" @tap="showDetail(item.id)">
+					<view class="tui-item-box">
+						<view class="tui-msg-box">
+							<image :src="apiHost+'/miniapp/static/hospital.png'" class="tui-msg-pic" mode="widthFix"></image>
+							<view class="tui-msg-item">
+								<view class="tui-msg-name">{{item.hospital}}</view>
+								<view class="tui-msg-content">{{item.address}}</view>
+							</view>
+						</view>
+						<view class="tui-msg-right">
+							<view class="tui-msg-time">{{item.created_at}}</view>
+							<tui-badge type="red" class="tui-badge">安装中</tui-badge>
+						</view>
+					</view>
+				</tui-list-cell>
+				<view style="height:20rpx"></view>
+			</block>
+		</tui-list-view>
+		<tui-tabbar :current="tabbarCurrent"  backdropFilter :backgroundColor="tabbarBackgroundColor" :tabBar="tabBar" color="#777" selectedColor="#AC9157" @click="tabbarSwitch"></tui-tabbar>
+	</view>
+</template>
+
+<script>
+	import myapp from '@/common/js/myapp.js'
+	export default {
+		data() {
+			return {
+				apiHost: myapp.apiHost,
+				showloadmore: false,
+				shownomore: false,
+				curId: 0,
+				records: [],
+				currentTab: 0,
+				tabBar: myapp.tabBar,
+				tabbarCurrent: 0,
+				tabbarBackgroundColor: '#FFF'
+			}
+		},
+		onShow: function() {			
+			let user = myapp.checkLogin()
+			uni.setStorageSync('lastPagePath', '/packagePage/pages/ctrllist/ctrllist')			
+			let that = this;
+			// 医院基本信息
+			myapp.request('/?c=hospital&a=getHospitalList',function(res) {
+				that.records = res.data.data
+			})
+		},
+		methods: {
+			tabbarSwitch: myapp.tabbarSwitch,
+			showDetail: function(index) {
+				uni.navigateTo({
+					url:'/packagePage/pages/ctrldevice/ctrldevice?id=' + index
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	@import '../../../static/style/thorui.css';
+	
+	page {
+		background-color: #F5F6FA;
+	}	
+	
+	.textleft, .textright {
+		color: #949494;
+		font-size: 20rpx;
+		margin-bottom: 20rpx;
+	}
+	.textleft {
+		float:left;
+	}
+	.textright {
+		float:right;
+	}
+	
+	.textleftright {
+		border-top:3px solid #F5F6FA;
+	}
+	
+	.tui-default {
+		padding: 30rpx 10rpx 40rpx 10rpx;
+	}
+	
+	.tui-item-box {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		padding-bottom: 20rpx;
+		padding-top: 20rpx;
+	}
+	
+	.tui-msg-box {
+		display: flex;
+		align-items: center;
+	}
+	
+	.tui-msg-item {
+		max-width: 500rpx;
+		min-height: 80rpx;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+	
+	.tui-msg-pic {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		display: block;
+		margin-right: 24rpx;
+		flex-shrink: 0;
+	}	
+	
+	.tui-msg-name {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		font-size: 30rpx;
+		line-height: 1;
+		color: #262b3a;
+	}
+
+	.tui-msg-content {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		font-size: 24rpx;
+		line-height: 1;
+		color: #9397a4;
+	}
+	
+	.tui-msg-right {
+		max-width: 120rpx;
+		height: 88rpx;
+		margin-left: auto;
+		text-align: right;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		align-items: flex-end;
+		margin-right:30rpx;
+	}
+	
+	.uni-tag--primary {
+		background-color:#ADDEFF !important;
+		border:none !important;
+		color:#000 !important;
+	}
+	
+	.uni-tag--success {
+		background-color:#ADFFB5 !important;
+		border:none !important;
+		color:#000 !important;
+	}
+	
+	.tui-msg-time {
+		width: 100%;
+		font-size: 20rpx;
+		line-height: 24rpx;
+		color: #9397a4;
+	}
+	
+	.tui-searchbox {
+		width: 100%;
+		height: 100rpx;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		background: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+	}
+
+	.tui-search-input {
+		width: 100%;
+		height: 72rpx;
+		background: #fafafa;
+		border-radius: 36rpx;
+		font-size: 30rpx;
+		color: #A8ABB8;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tui-search-text {
+		padding-left: 16rpx;
+	}
+</style>
diff --git a/packagePage/pages/my/my.vue b/packagePage/pages/my/my.vue
new file mode 100644
index 0000000..a597688
--- /dev/null
+++ b/packagePage/pages/my/my.vue
@@ -0,0 +1,197 @@
+<template>
+	<view class="container">
+		<view class="top-container">
+			<image class="bg-img" :src="apiHost+'/miniapp/static/mybg.png'"></image>
+			<view class="user">
+				<view class="user-info-mobile">
+					<image class="avatar-img" :src="apiHost+'/miniapp/static/def_avatar.png'"></image>
+					<view class="userinfo">
+						<view class="username">{{name}}</view>
+						<view>{{title}}</view>
+					</view>
+					<view class="exitbtn" @tap="exitauth">
+						安全退出
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="middle-container" @tap="goRecordList">
+			<view data-index="1" class="middle-item" hover-class="opcity" :hover-stay-time="150">
+				<image class="ticket-img" :src="apiHost+'/miniapp/static/myicon1.png'"></image>
+				<text class="middle-tag">安装日志</text>
+				<image class="rightarrow-img" :src="apiHost+'/miniapp/static/rightarrow.png'"></image>
+			</view>
+		</view>
+		<!-- <view class="middle-container" @tap="goFaq">
+			<view data-index="1" class="middle-item" hover-class="opcity" :hover-stay-time="150">
+				<image class="ticket-img" :src="apiHost+'/miniapp/static/myicon2.png'"></image>
+				<text class="middle-tag">常见问题</text>
+				<image class="rightarrow-img" :src="apiHost+'/miniapp/static/rightarrow.png'"></image>
+			</view>
+		</view>
+		<view class="middle-container" @tap="goDoc">
+			<view data-index="1" class="middle-item" hover-class="opcity" :hover-stay-time="150">
+				<image class="ticket-img" :src="apiHost+'/miniapp/static/myicon3.png'"></image>
+				<text class="middle-tag">国家标准</text>
+				<image class="rightarrow-img" :src="apiHost+'/miniapp/static/rightarrow.png'"></image>
+			</view>
+		</view> -->
+
+		<tui-tabbar :current="tabbarCurrent"  backdropFilter :backgroundColor="tabbarBackgroundColor" :tabBar="tabBar" color="#777" selectedColor="#AC9157" @click="tabbarSwitch"></tui-tabbar>
+	</view>
+</template>
+
+<script>
+	import myapp from '@/common/js/myapp.js'	
+	export default {
+		data() {
+			return {
+				apiHost: myapp.apiHost,
+				tabBar: myapp.tabBar,
+				tabbarCurrent: 1,
+				tabbarBackgroundColor: '#FFF',
+				name: '',
+				title: ''
+			}
+		},
+		onShow: function() {
+			let info = myapp.checkLogin()
+			this.name = info.name
+			this.title = info.title
+			uni.setStorageSync('lastPagePath', '/packagePage/pages/my/my')
+		},
+		methods: {
+			tabbarSwitch: myapp.tabbarSwitch,
+			exitauth: function() {
+				uni.removeStorageSync('user');
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			},
+			goRecordList:function() {
+				uni.navigateTo({
+					url:'/packagePage/pages/record/record'
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F5F6FA;
+	}
+	
+	.container {
+		position: relative;
+		padding-bottom: 100rpx;
+	}
+
+	.top-container {
+		height: 320rpx;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.bg-img {
+		position: absolute;
+		width: 100%;
+		height: 460rpx;
+	}
+
+	.user {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		position: relative;
+		z-index: 2;
+		margin-top: 30rpx;
+	}
+
+	.avatar-img {
+		width: 160rpx;
+		height: 160rpx;
+		border-radius: 50%;
+		align-self: center;
+	}
+	
+	.userinfo {
+		height:200rpx;
+		vertical-align:middle;
+		display:inline-block;
+		padding-left:20rpx;
+	}
+	
+	.exitbtn {
+		vertical-align:middle;
+		display:inline-block;
+		background-color: #1F1EAE;
+		color: #FFF;
+		position:absolute;
+		right: 100rpx;
+		padding:20rpx;
+		margin-top: 50rpx;
+		border-radius: 30rpx 0 0 30rpx;
+	}
+	
+	.username {
+		font-weight: bold;
+		padding-bottom: 10rpx;
+	}
+
+	.user-info-mobile {
+		margin-top: 0rpx;
+		position: relative;
+		font-size: 28rpx;
+		color: #fefefe;
+		line-height: 28rpx;
+		align-self: left;
+		padding: 0 50rpx;
+		width:100%;
+	}
+
+	.middle-container {
+		height: 90rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		border-radius: 10rpx;
+		background-color: #ffffff;
+		margin: -60rpx 30rpx 80rpx 30rpx;
+		box-shadow: 0 15rpx 10rpx -15rpx #efefef;
+		position: relative;
+		z-index: 2;
+		border-radius: 30rpx;
+	}
+
+	.middle-item {
+		height: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.ticket-img {
+		width: 40rpx;
+		height: 40rpx;
+		margin-left: 35rpx;
+	}
+	
+	.rightarrow-img {
+		width: 40rpx;
+		height: 40rpx;
+		position: absolute;
+		right: 25rpx;
+	}
+
+	.middle-tag {
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 28rpx;
+		font-weight: bold;
+		padding-left: 22rpx;
+	}
+
+</style>
diff --git a/packagePage/pages/overview/overview.vue b/packagePage/pages/overview/overview.vue
new file mode 100644
index 0000000..225250b
--- /dev/null
+++ b/packagePage/pages/overview/overview.vue
@@ -0,0 +1,306 @@
+<template>
+	<view class="container">
+		<view class="top-container">
+			<image class="bg-img" :src="apiHost+'/miniapp/static/mybg.png'"></image>
+			<view class="mybox">
+				<view class="box">
+					<view class="item">
+						<view style="color:#4652C0;font-weight:bold;">闸门调控次数</view>
+						<view style="color:#4652C0;font-weight:bold;font-size:50rpx">{{total_gate_count}}</view>
+						<hr color="#E5E5E5" size="1px"/>
+						<view style="color:#000;font-size:20rpx">
+							<text>本月 {{current_gate_count}}</text>
+							<text style="display:inline-block;margin-left:30rpx">总计 {{total_gate_count}}</text>
+						</view>
+					</view>
+					<view class="item">
+						<view style="color:#4652C0;font-weight:bold;">水泵调控次数</view>
+						<view style="color:#4652C0;font-weight:bold;font-size:50rpx">{{total_pump_count}}</view>
+						<hr color="#E5E5E5" size="1px"/>
+						<view style="color:#000;font-size:20rpx">
+							<text>本月 {{current_pump_count}}</text>
+							<text style="display:inline-block;margin-left:30rpx">总计 {{total_pump_count}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>		
+		<view class="content">
+			<tui-card class="mycard">
+				<qiun-title-bar title="闸门调控统计"/>
+				<view class="tui-flex-box">
+					<tui-tag margin="20rpx 20rpx 0 0" padding="12rpx" :type="colorM1" @click="timeRange('m1')">月</tui-tag>
+					<tui-tag margin="20rpx 20rpx 0 0" padding="12rpx" :type="colorD1" @click="timeRange('d1')">年</tui-tag>
+				</view>
+				<view class="charts-box">
+				  <qiun-data-charts type="column" :chartData="chartsDataColumn" :echartsH5="true" :opts="opts" :echartsApp="true"/>
+				</view>
+			</tui-card>
+			<tui-card class="mycard">
+				<qiun-title-bar title="水泵调控次数统计"/>
+				<view class="tui-flex-box">
+					<tui-tag margin="20rpx 20rpx 0 0" padding="12rpx" :type="colorM2" @click="timeRange('m2')">月</tui-tag>
+					<tui-tag margin="20rpx 20rpx 0 0" padding="12rpx" :type="colorD2" @click="timeRange('d2')">年</tui-tag>
+				</view>
+				<view class="charts-box">
+				  <qiun-data-charts type="demotype" :eopts="{seriesTemplate:{areaStyle:{opacity:0.2}}}" :chartData="chartsDataLine" :echartsH5="true" :echartsApp="true"/>
+				</view>	
+			</tui-card>
+		</view>
+	</view>
+</template>
+
+<script>
+	import myapp from '@/common/js/myapp.js'
+	export default {
+		data() {
+			return {
+				apiHost: myapp.apiHost,
+				total_gate_count: '',
+				current_gate_count: '',
+				total_pump_count: '',
+				current_pump_count: '',
+				chartsDataColumn:{},
+				chartsDataLine:{},
+				colorM1: 'blue',
+				colorD1: 'btn-gray',
+				colorM2: 'blue',
+				colorD2: 'btn-gray',
+				opts: {
+					legend:{
+						show: false
+					},
+					extra: {
+						column:{
+							width: 10
+						}
+					}
+				}
+			}
+		},
+		onShow: function() {
+			// 验证登录信息是否过期
+			let user = myapp.checkLogin()
+			
+			// 将 data 存储在本地缓存中指定的 key 中，会覆盖掉原来该 key 对应的内容
+			uni.setStorageSync('lastPagePath', '/packagePage/pages/overview/overview')
+			
+			let that = this;
+			// 获取总览内容中闸门总次数以及本月闸门次数
+			myapp.request('/?c=overview&a=getOverviewGateActionInfo',function(res) {
+				that.total_gate_count = res.data.data.total_gate_count
+				that.current_gate_count = res.data.data.current_gate_count
+			},{token:user.token})
+			// 获取总览内容中水泵总次数以及本月水泵次数
+			myapp.request('/?c=overview&a=getOverviewPumpActionInfo',function(res) {
+				that.total_pump_count = res.data.data.total_pump_count
+				that.current_pump_count = res.data.data.current_pump_count
+			},{token:user.token})
+			
+			setTimeout(() => {
+				let that = this;
+				// 闸门调控统计
+				myapp.request('/?c=overview&a=getOverviewGateLine',function(res) {
+					that.chartsDataColumn = {
+						"legend": {
+							"show":false
+						},
+						"categories": res.data.data.time,
+						"series": [{
+							"name": "调控次数",
+							"data": res.data.data.count,
+							"color": "#70A3FC"
+						}]
+					}
+				},{token:user.token,type:'month'})
+				
+				// 水泵调控统计
+				myapp.request('/?c=overview&a=getOverviewPumpLine',function(res) {
+					that.chartsDataLine = {
+						"categories": res.data.data.time,
+						"series": [{
+							"name": "次数",
+							"data": res.data.data.count,
+							"color": "#5087EC"
+						}]
+					}
+				},{token:user.token,type:'month'})
+				
+			}, 1000)
+		},
+		methods: {
+			timeRange: function(tagType) {
+				// 验证登录信息是否过期
+				let user = myapp.checkLogin()
+				let that = this;
+				switch (tagType) {
+					case 'm1':
+						this.colorM1 = 'blue'
+						this.colorD1 = 'btn-gray'
+						// 闸门调控统计
+						myapp.request('/?c=overview&a=getOverviewGateLine',function(res) {
+							that.chartsDataColumn = {
+								"legend": {
+									"show":false
+								},
+								"categories": res.data.data.time,
+								"series": [{
+									"name": "调控次数",
+									"data": res.data.data.count,
+									"color": "#70A3FC"
+								}]
+							}
+						},{token:user.token,type:'month'})
+						break;
+					case 'd1':
+						this.colorM1 = 'btn-gray'
+						this.colorD1 = 'blue'
+						// 闸门调控统计
+						myapp.request('/?c=overview&a=getOverviewGateLine',function(res) {
+							that.chartsDataColumn = {
+								"legend": {
+									"show":false
+								},
+								"categories": res.data.data.time,
+								"series": [{
+									"name": "调控次数",
+									"data": res.data.data.count,
+									"color": "#70A3FC"
+								}]
+							}
+						},{token:user.token,type:'year'})
+						break;
+					case 'm2':
+						this.colorM2 = 'blue'
+						this.colorD2 = 'btn-gray'
+						myapp.request('/?c=overview&a=getOverviewPumpLine',function(res) {
+							that.chartsDataLine = {
+								"categories": res.data.data.time,
+								"series": [{
+									"name": "次数",
+									"data": res.data.data.count,
+									"color": "#5087EC"
+								}]
+							}
+						},{token:user.token,type:'month'})
+						break;
+					case 'd2':
+						this.colorM2 = 'btn-gray'
+						this.colorD2 = 'blue'
+						myapp.request('/?c=overview&a=getOverviewPumpLine',function(res) {
+							that.chartsDataLine = {
+								"categories": res.data.data.time,
+								"series": [{
+									"name": "次数",
+									"data": res.data.data.count,
+									"color": "#5087EC"
+								}]
+							}
+						},{token:user.token,type:'year'})
+						break;
+				}
+			}
+		}
+	}
+</script>
+
+<style>	
+	@import '../../../static/style/thorui.css';
+
+	page {
+		background-color: #F5F6FA;
+	}
+	
+	.mybox {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		position: relative;
+		z-index: 2;
+		margin-top: 30rpx;
+        margin-bottom:20rpx;
+		margin-left:28rpx;
+		margin-right:28rpx;
+		background-color:transparent;
+	}	
+	
+	.mycard {
+		margin-bottom: 40rpx;
+	}
+	
+	.container {
+		position: relative;
+		padding-bottom: 100rpx;		
+	}
+
+	.top-container {
+		height: 320rpx;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.bg-img {
+		position: absolute;
+		width: 100%;
+		height: 460rpx;
+	}
+	
+	.content {
+	  padding-top: 150rpx;
+	  display: flex;
+	  flex-direction: column;
+	  flex: 1;
+	  position:absolute;
+	  top:90rpx;
+	  width:100%
+	}
+
+	.charts-box {
+	  width: 100%;
+	  height: 200px;
+	  background-color: #FFF;
+	}
+	
+	.box {
+		display: flex;
+		display: -webkit-flex;
+		justify-content: space-between;
+		flex-direction: row;
+		flex-wrap: wrap;
+		box-sizing: border-box;
+		border:none;
+	}
+
+	.item {
+		width: 48%;
+		padding: 20rpx 0rpx 20rpx 30rpx;
+		box-sizing: border-box;
+		border-radius: 8rpx;
+		color: #fff;
+		margin-bottom: 30rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		font-size: 30rpx;
+		margin:0;
+		background-color:#FFF;
+	}
+	
+	.mybtn {
+		padding:0;
+		width:10px;
+	}
+	
+	.tui-flex-box {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		flex-direction: row-reverse;
+		justify-content: flex-start;
+		align-items: flex-start;
+		margin-bottom: 26rpx;
+		position: relative;
+		top:-80rpx;
+	}
+</style>
diff --git a/packagePage/pages/position/position.vue b/packagePage/pages/position/position.vue
new file mode 100644
index 0000000..b3bc7ed
--- /dev/null
+++ b/packagePage/pages/position/position.vue
@@ -0,0 +1,95 @@
+<template>
+	<view class="container">
+
+		<view class="tui-title">请选择安装点位</view>
+		<tui-cascade-selection height="200px" :itemList="itemList"  @complete="complete"></tui-cascade-selection>
+	</view>
+</template>
+
+<script>
+import myapp from '@/common/js/myapp.js'
+export default {
+	data() {
+		return {
+			apiHost: myapp.apiHost,
+			itemList: [],
+			sn: '',
+			h_id: ''
+		};
+	},
+	onLoad() {
+		let that = this;
+		let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+		let curRoute = routes[routes.length - 1].route //获取当前页面路由
+		let curParam = routes[routes.length - 1].options; //获取路由参数
+		this.sn = curParam.sn
+		this.h_id = curParam.h_id
+		myapp.request('/?c=position&a=getPositionList',function(res) {
+			that.itemList = res.data.data
+		},{h_id:curParam.h_id})
+	},
+	methods: {
+		complete(e) {
+			console.log(e.text);
+			uni.navigateTo({
+				url:'/packagePage/pages/ctrldevice/ctrldevice?position='+e.text+'*&sn='+this.sn
+			})
+		}
+	}
+};
+</script>
+
+<style>
+.container {
+	padding: 20rpx 0 120rpx 0;
+	box-sizing: border-box;
+}
+
+.header {
+	padding: 80rpx 90rpx 60rpx 90rpx;
+	box-sizing: border-box;
+}
+
+.title {
+	font-size: 34rpx;
+	color: #333;
+	font-weight: 500;
+}
+
+.sub-title {
+	font-size: 24rpx;
+	color: #7a7a7a;
+	padding-top: 18rpx;
+}
+.tui-title {
+	width: 100%;
+	padding: 50rpx 30rpx 30rpx;
+	box-sizing: border-box;
+	font-size: 32rpx;
+	font-weight: bold;
+}
+.tui-btn-box {
+	width: 100%;
+	padding: 80rpx 30rpx;
+	box-sizing: border-box;
+}
+.tui-header {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 20rpx;
+	box-sizing: border-box;
+	background-color: #fff;
+	border-top-left-radius: 20rpx;
+	border-top-right-radius: 20rpx;
+	overflow: hidden;
+	position: relative;
+}
+.tui-icon-close {
+	position: absolute;
+	right: 30rpx;
+	top: 50%;
+	transform: translateY(-50%);
+}
+</style>
diff --git a/packagePage/pages/positionindex/positionindex.vue b/packagePage/pages/positionindex/positionindex.vue
new file mode 100644
index 0000000..e182145
--- /dev/null
+++ b/packagePage/pages/positionindex/positionindex.vue
@@ -0,0 +1,277 @@
+<template>
+	<view>
+		<tui-sticky :scrollTop="scrollTop" stickyHeight="104rpx" container v-for="(item,index) in position_record" :key="index">
+			<template v-slot:header>
+				<view class="sticky-item">
+					<view class="date">{{item.month}}</view>
+					<view class="amount">
+						<view>录入点位次数：&nbsp;&nbsp;<text style="color:#ff0000;font-size: 36rpx;font-weight: 600;"> {{item.count}}</text></view>
+					</view>
+				</view>
+
+			</template>
+			<template v-slot:content>
+				<!--内容 start-->
+				<view class="list-view" v-for="(it,ind) in item.details" :key="ind">
+					<view class="tui-list-item" hover-class="tui-hover" :hover-stay-time="150">
+						<view class="content-box">
+							<image :src="apiHost+'/miniapp/static/release.png'" class="logo"></image>
+							<view class="des-box">
+								<view class="tit">{{it.courtyard}}</view>
+								<view class="time">{{it.building}}({{it.layer}})</view>
+								<view class="time">安装位置：{{it.scription}}</view>
+								<view class="time">安装时间：{{it.created_at}}</view>
+							</view>
+						</view>
+						<view class="money add" >{{it.hospital}}</view>
+					</view>
+				</view>
+			</template>
+		</tui-sticky>
+		<tui-loadmore style="position:relative;top:-20rpx" v-if="showloadmore"></tui-loadmore>
+		<tui-nomore style="position:relative;top:-20rpx" v-if="shownomore"></tui-nomore>
+		<tui-tabbar :current="tabbarCurrent"  backdropFilter :backgroundColor="tabbarBackgroundColor" :tabBar="tabBar" color="#777" selectedColor="#AC9157" @click="tabbarSwitch"></tui-tabbar>
+	</view>
+</template>
+
+<script>
+	import myapp from '@/common/js/myapp.js'
+	export default {
+		data() {
+			return {
+				apiHost: myapp.apiHost,
+				scrollTop: 0,
+				showloadmore: false,
+				shownomore: false,
+				opts: {
+					legend:{
+						show: false
+					},
+					extra: {
+						column:{
+							width: 10
+						}
+					}
+				},
+				position_record: {},
+				tabBar: myapp.tabBar,
+				tabbarCurrent: 1,
+				tabbarBackgroundColor: '#FFF'
+			}
+		},
+		onLoad: function() {
+			let user = myapp.checkLogin()
+			uni.setStorageSync('lastPagePath', '/packagePage/pages/record/record')
+			
+			let that = this;
+			// 点位统计
+			myapp.request('/?c=position&a=getPositionIndexList',function(res) {
+				that.position_record = res.data.data
+			},{token:user.token})
+		},
+		methods: {
+			tabbarSwitch: myapp.tabbarSwitch,
+			showDetail: function() {
+			},
+			//页面滚动执行方式
+			onPageScroll(e) {
+				this.scrollTop = e.scrollTop
+			}
+		}
+	}
+</script>
+
+<style>
+	@import '../../../static/style/thorui.css';
+	
+	page {
+		background-color: #F5F6FA;
+	}
+	
+	.container {
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	.tui-flex-box {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		flex-direction: row-reverse;
+		justify-content: flex-start;
+		align-items: flex-start;
+		position: relative;
+		top:-80rpx;
+	}
+	
+	.charts-box {
+	  width: 100%;
+	  height: 200px;
+	  background-color: #FFF;
+	}
+	
+	.tips {
+		background: #fff;
+		padding: 30rpx 14rpx;
+		color: #555;
+		font-size: 24rpx;
+		line-height: 42rpx;
+		position: relative;
+	}
+	
+	.tips::before {
+		content: '';
+		position: absolute;
+		border-top: 1rpx solid #eaeef1;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		top: 0;
+		right: 0;
+		left: 0;
+	}
+	
+	/* sticky 容器 start */
+	.sticky-item {
+		width: 100%;
+		height: 104rpx;
+		padding: 20rpx 30rpx;
+		background-color: #fafafa;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+	}
+	
+	/* sticky 容器 end */
+	
+	.date {
+		height: 54rpx;
+		font-size: 28rpx;
+		background-color: #fff;
+		padding: 0 28rpx;
+		border-radius: 25rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		/* box-shadow: 0 0 1rpx #7A7A7A; */
+	}
+	
+	.date::after {
+		content: '';
+		position: absolute;
+		height: 200%;
+		width: 200%;
+		border: 1rpx solid #eaeef1;
+		border-radius: 60rpx;
+		-webkit-transform-origin: 0 0;
+		transform-origin: 0 0;
+		-webkit-transform: scale(0.5);
+		transform: scale(0.5);
+		left: 0;
+		top: 0;
+	}
+	
+	.amount {
+		text-align: right;
+		color: #686868;
+		font-size: 26rpx;
+	}
+	
+	.list-view {
+		position: relative;
+		width: 100%;
+		overflow: hidden;
+	}
+	
+	.list-view::after {
+		content: '';
+		position: absolute;
+		border-top: 1rpx solid #eaeef1;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		top: 0;
+		right: 0;
+		left: 0;
+	}
+	
+	.tui-list-item {
+		width: 100%;
+		padding: 30rpx 28rpx;
+		box-sizing: border-box;
+		background-color: #fff;
+		display: flex;
+		align-items: flex-start;
+		justify-content: space-between;
+	}
+	
+	.tui-list-item::after {
+		left: 120rpx
+	}
+	
+	.item-last::after {
+		left: 0 !important
+	}
+	
+	.content-box {
+		display: flex;
+		align-items: flex-start;
+		justify-content: space-between;
+	}
+	
+	.logo {
+		width: 60rpx;
+		height: 60rpx;
+		flex-grow: 1
+	}
+	
+	.des-box {
+		min-height: 130rpx;
+		padding-left: 28rpx;
+		box-sizing: border-box;
+		vertical-align: top;
+		color: #333;
+		font-size: 24rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+	
+	.tit {
+		font-size: 28rpx;
+		max-width: 420rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	
+	.source {
+		font-size: 24rpx;
+	}
+	
+	.time {
+		font-size: 24rpx;
+		margin-top: 10rpx;
+	}
+	
+	.money {
+		font-size: 30rpx;
+		font-weight: 600;
+		color: #000;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		padding-left: 20rpx;
+	}
+	
+	.add {
+		color: #5677FC !important;
+	}
+	
+	.add1 {
+		color: #ff0000 !important;
+	}
+	
+	.tui-color-primary {
+		color: #5677fc;
+	}
+</style>
diff --git a/packagePage/pages/record/record.vue b/packagePage/pages/record/record.vue
new file mode 100644
index 0000000..101b64e
--- /dev/null
+++ b/packagePage/pages/record/record.vue
@@ -0,0 +1,183 @@
+<template>
+	<view class="container">
+		<view v-for="(item,index) in card" :key="item.id">
+			<tui-card :image="item.image" :title="item.title" :full="true" :header="item.header" :border="true"  >
+				<template v-slot:body>
+					<view class="tui-content">
+						{{item.hospital}}-{{item.courtyard}}-{{item.building}}-{{item.layer}}-{{item.scription}}-{{item.type}}-{{item.specification}}-{{item.name}} 更换/新装完成！
+					</view>
+					<view class="tui-default tui-flex-pic">
+						<image :src="it" mode="widthFix" v-for="(it,ind) in item.img" :key="it.id"></image>
+					</view>
+
+				</template>
+				<template v-slot:footer>
+					<view class="tui-default tui-pleft">
+						<view>{{item.hospital}}</view>
+						<view class="tui-color-gray">{{item.time}}</view>
+					</view>
+				</template> 
+			</tui-card>
+		</view>
+		<tui-tabbar :current="tabbarCurrent"  backdropFilter :backgroundColor="tabbarBackgroundColor" :tabBar="tabBar" color="#777" selectedColor="#AC9157" @click="tabbarSwitch"></tui-tabbar>
+	</view>
+</template>
+
+<script>
+	import myapp from '@/common/js/myapp.js'
+	export default {
+		data() {
+			return {
+				apiHost: myapp.apiHost,
+				card: [],
+				tabBar: myapp.tabBar,
+				tabbarCurrent: 2,
+				tabbarBackgroundColor: '#FFF'
+				// card1: [
+				// 	{
+				// 		img: {
+				// 			url: "https://filter.api.opmonitor.com/miniapp/static/nav3.png",
+				// 			width: 80,
+				// 			height: 80,
+				// 			circle: true
+				// 		},
+				// 		title: {
+				// 			text: "实施工程师"
+				// 		},
+				// 		header: {
+				// 			line: true,
+				// 			bgcolor: "#F7F7F7"
+				// 		},
+				// 		tag: {
+				// 			text: "10分钟前",
+				// 			address: "佳木斯中心医院"
+				// 		},
+				// 		content: {
+				// 			text: '佳木斯中心医院-本院-B1楼-一层1#点位 更换/新装完成！'
+				// 		},
+				// 		picture: {
+				// 			img1: 'https://filter.api.opmonitor.com/miniapp/static/hospital.png',
+				// 			img2: 'https://filter.api.opmonitor.com/miniapp/static/2.jpg',
+				// 			img3: 'https://filter.api.opmonitor.com/miniapp/static3.jpg',
+				// 			img4: 'https://filter.api.opmonitor.com/miniapp/static/4.jpg'
+				// 		}
+				// 	}
+				// ]	
+			}
+		},
+		mounted() {
+			// 医院基本信息
+			let that = this;
+			myapp.request('/?c=record&a=getRecordList',function(res) {
+				that.card = res.data.data
+			})
+		},
+		methods: {
+			tabbarSwitch: myapp.tabbarSwitch,
+			detail: function() {
+				this.tui.toast('详情功能尚未完善~')
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background: #EDEDED;
+	}
+
+	.container {
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.tui-title {
+		width: 100%;
+		padding: 70rpx 30rpx 30rpx 30rpx;
+		box-sizing: border-box;
+		font-size: 30rpx;
+		line-height: 30rpx;
+		color: #666;
+	}
+
+	.tui-default {
+		padding: 20rpx 30rpx;
+	}
+
+	.tui-article {
+		position: relative;
+	}
+
+	.tui-article-img {
+		width: 100%;
+		height: 300rpx;
+		display: block;
+	}
+
+	.tui-article-title {
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		color: #fff;
+		font-size: 32rpx;
+		font-weight: 500;
+		box-sizing: border-box;
+		padding: 20rpx 30rpx;
+		background: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.6));
+	}
+
+	.tui-cell-title {
+		font-size: 32rpx;
+		font-weight: 500;
+		padding: 0 10rpx;
+		word-break: break-all;
+		word-wrap: break-word;
+	}
+
+	.tui-cell-img {
+		height: 160rpx;
+		width: 160rpx;
+	}
+
+	.tui-flex {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.tui-mr {
+		margin-right: 20rpx;
+	}
+
+
+	.tui-flex-pic {
+		display: flex;
+		display: -webkit-flex;
+		justify-content: space-between;
+		flex-direction: row;
+		flex-wrap: wrap;
+		box-sizing: border-box;
+		background: #fff;
+		padding: 0 120rpx;
+	}
+
+	.tui-flex-pic image {
+		width: 32%;
+		margin-bottom: 2%;
+	}
+
+	.tui-content {
+		padding: 0rpx 30rpx 20rpx 120rpx;
+		box-sizing: border-box;
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #333;
+	}
+
+	.tui-color-gray {
+		color: #ccc;
+	}
+
+	.tui-pleft {
+		padding-left: 120rpx;
+	}
+</style>
diff --git a/packagePage/pages/userinfo/userinfo.vue b/packagePage/pages/userinfo/userinfo.vue
new file mode 100644
index 0000000..160ed8f
--- /dev/null
+++ b/packagePage/pages/userinfo/userinfo.vue
@@ -0,0 +1,90 @@
+<template>
+	<view class="container">
+		<tui-list-view>
+			<tui-list-cell :arrow="false">
+				<view class="tui-item-box">
+					<tui-icon style="display:none" name="explore-fill" :size="24" color="#19be6b"></tui-icon>
+					<view class="tui-list-cell_name">账号</view>
+					<view class="tui-ml-auto">
+						{{user.account}}
+					</view>
+				</view>
+			</tui-list-cell>
+			<tui-list-cell :arrow="false">
+				<view class="tui-item-box">
+					<tui-icon style="display:none" name="explore-fill" :size="24" color="#19be6b"></tui-icon>
+					<view class="tui-list-cell_name">姓名</view>
+					<view class="tui-ml-auto">
+						{{user.name}}
+					</view>
+				</view>
+			</tui-list-cell>
+			<tui-list-cell :arrow="false">
+				<view class="tui-item-box">
+					<tui-icon style="display:none" name="explore-fill" :size="24" color="#19be6b"></tui-icon>
+					<view class="tui-list-cell_name">角色</view>
+					<view class="tui-ml-auto">
+						{{user.name}}
+					</view>
+				</view>
+			</tui-list-cell>
+			<tui-list-cell :arrow="false">
+				<view class="tui-item-box">
+					<tui-icon style="display:none" name="explore-fill" :size="24" color="#19be6b"></tui-icon>
+					<view class="tui-list-cell_name">联系电话</view>
+					<view class="tui-ml-auto">
+						{{user.mobile}}
+					</view>
+				</view>
+			</tui-list-cell>
+		</tui-list-view>
+	</view>
+</template>
+
+<script>
+	import myapp from '@/common/js/myapp.js'
+	export default {
+		data() {
+			return {
+				user: {}
+			}
+		},
+		onShow: function() {
+			let user = myapp.checkLogin()
+			this.user = user
+			uni.setStorageSync('lastPagePath', '/packagePage/pages/userinfo/userinfo')
+			console.info(user)
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F5F6FA;
+	}	
+	
+	.container {
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.tui-item-box {
+		width: 100%;
+		display: flex;
+		align-items: center;
+	}
+
+	.tui-list-cell_name {
+		padding-left: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tui-ml-auto {
+		margin-left: auto;
+	}
+	
+	.tui-list-cell {
+		margin-bottom:20rpx;
+	}
+</style>
diff --git a/packagePage/pages/wait/wait.vue b/packagePage/pages/wait/wait.vue
new file mode 100644
index 0000000..db14534
--- /dev/null
+++ b/packagePage/pages/wait/wait.vue
@@ -0,0 +1,43 @@
+<template>
+	<view class="content">
+		<image :style="imgStyle" :src="apiHost+'/miniapp/static/waitpage.png'"></image>
+		<view>等待开通...</view>
+		<button :style="btnStyle" @tap="goBack">返回</button>
+	</view>
+</template>
+
+<script>
+	import myapp from '@/common/js/myapp.js'
+	export default {
+		data() {
+			return {
+				apiHost: myapp.apiHost,
+				imgStyle: 'margin-bottom:20rpx;margin-top:220rpx',
+				btnStyle: 'color:#FFF;background-color:#5767CF;margin:60rpx 120rpx auto 120rpx'
+			}
+		},
+		onShow: function() {
+			let user = myapp.checkLogin()
+			uni.setStorageSync('lastPagePath', '/packagePage/pages/wait/wait')
+			
+			let width = 750 * 0.5;
+			let height = 750 * 0.5;
+			let setW = ';width:' + width + 'rpx';
+			let setH = ';height:' + height + 'rpx';
+			this.imgStyle = this.imgStyle + setW + setH;
+		},
+		methods: {
+			goBack: function() {
+				uni.navigateBack({
+					delta: 1
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		text-align: center;
+	}
+</style>
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..ad13f81
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,97 @@
+{
+    "pages": [
+		{
+			"path": "packagePage/pages/ctrldevice/ctrldevice",
+			"style":
+			{
+				"navigationBarTitleText": "过滤器更换助手",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "packagePage/pages/positionindex/positionindex",
+			"style":
+			{
+				"navigationBarTitleText": "过滤器更换助手",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/index/index",
+			"style":
+			{
+				"navigationBarTitleText": "过滤器更换助手"
+			}
+		},
+		{
+			"path": "packagePage/pages/position/position",
+			"style":
+			{
+				"navigationBarTitleText": "过滤器更换助手",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "packagePage/pages/record/record",
+			"style":
+			{
+				"navigationBarTitleText": "过滤器更换助手",
+				"enablePullDownRefresh": false
+			}
+		}
+		,{
+			"path": "packagePage/pages/overview/overview",
+			"style":
+			{
+				"navigationBarTitleText": "过滤器更换助手",
+				"enablePullDownRefresh": false
+			}
+		}
+		,{
+			"path": "packagePage/pages/auth/auth",
+			"style":
+			{
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		}
+    	, {
+    		"path": "packagePage/pages/my/my",
+    		"style":
+    		{
+    			"navigationBarTitleText": "我的",
+    			"navigationBarBackgroundColor": "#586ACC",
+    			"enablePullDownRefresh": false
+    		}
+    	}
+    	, {
+    		"path": "packagePage/pages/ctrllist/ctrllist",
+    		"style":
+    		{
+    			"navigationBarTitleText": "过滤器更换助手",
+    			"enablePullDownRefresh": false
+    		}
+    	}
+    	, {
+    		"path": "packagePage/pages/wait/wait",
+    		"style":
+    		{
+    			"navigationBarTitleText": "过滤器更换助手",
+    			"enablePullDownRefresh": false
+    		}
+    	}
+    ],
+	"globalStyle": {
+	"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "过滤器更换助手",
+			"navigationBarBackgroundColor": "#F8F8F8",
+				"backgroundColor": "#F8F8F8"
+	},
+	"easycom": {
+		"autoscan": true,
+			"custom": {
+			"tui-(.*)": "@/components/thorui/tui-$1/tui-$1.vue"
+		}
+	},
+	"uniIdRouter": { }
+}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..76c1ae9
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,135 @@
+<template>
+	<view class="container">
+		<view class="tui-header">
+			<view class="tui-sub-title" style="padding-bottom: 20rpx;">医院总数</view>
+			<view class="tui-title">2</view>
+			<view class="tui-sub-title" style="padding-top: 20rpx;">需更换过滤器数量：0 &nbsp;&nbsp;&nbsp;&nbsp; 已更换过滤器数量：0 </view>
+		</view>
+		<tui-grid>
+			<block v-for="(item,index) in routers" :key="index">
+				<navigator :url="item.url" hover-class='none'>
+					<tui-grid-item>
+						<view class="tui-grid-icon">
+							<image class="tui-grid-img" :src="apiHost+'/miniapp/static/wsapp/'+item.img" :style="{width:item.width+'rpx',height:item.height+'rpx'}" ></image>
+						</view>
+						<text class="tui-grid-label">{{item.name}}</text>
+					</tui-grid-item>
+				</navigator>
+			</block>
+		</tui-grid>
+		<tui-tabbar :current="tabbarCurrent"  backdropFilter :backgroundColor="tabbarBackgroundColor" :tabBar="tabBar" color="#777" selectedColor="#AC9157" @click="tabbarSwitch"></tui-tabbar>
+	</view>
+</template>
+
+<script>
+	import myapp from '@/common/js/myapp.js'
+	export default {
+		data() {
+			return {
+				apiHost: myapp.apiHost,
+				routers: [{
+						name: '总览',
+						url: '/packagePage/pages/wait/wait',
+						img: "nav1.png",
+						width: 74,
+						height: 74
+					},
+					{
+						name: '过滤器更换',
+						url: '/packagePage/pages/ctrllist/ctrllist',
+						img: "nav2.png",
+						width: 74,
+						height: 74
+					},
+					{
+						name: '数据分析',
+						url: '/packagePage/pages/wait/wait',
+						img: "nav4.png",
+						width: 74,
+						height: 74
+					}
+				],
+				tabBar: myapp.tabBar,
+				tabbarCurrent: 0,
+				tabbarBackgroundColor: '#FFF'
+			}
+		},
+		onShow: function() {
+			// 验证登录信息是否过期
+			let user = myapp.checkLogin()
+			
+			// 将 data 存储在本地缓存中指定的 key 中，会覆盖掉原来该 key 对应的内容
+			// uni.setStorageSync('lastPagePath', '/pages/index/index')
+			// let that = this;
+			// 获取场站基本信息
+			// myapp.request('/?c=overview&a=getProjectBasicInfo',function(res) {
+			// 	that.terminal_count = res.data.data.terminal_count
+			// 	that.total_gate_count = res.data.data.total_gate_count
+			// 	that.total_pump_count = res.data.data.total_pump_count
+			// },{token:user.token})
+		},
+		methods: {
+			tabbarSwitch: myapp.tabbarSwitch,
+			exitauth: function() {
+				uni.removeStorageSync('user');
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F5F6FA;
+	}
+	
+	.tui-header {
+		padding: 80rpx 60rpx;
+	}
+
+	.tui-title {
+		font-size: 46rpx;
+		color: #333;
+		font-weight: bold;
+	}
+
+	.tui-sub-title {
+		font-size: 26rpx;
+		color: #7a7a7a;
+		font-weight: 600;
+	}
+
+	.tui-grid-icon {
+		width: 100%;
+		height: 74rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tui-grid-label {
+		margin-top: 10rpx;
+		display: block;
+		text-align: center;
+		font-weight: 400;
+		color: #333;
+		font-size: 28rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	
+	.btnExit {
+		color: #FFF;
+		background-color: #5C5EC3;
+		padding-left: 10rpx;
+		padding-right: 10rpx;
+		padding-top: 5rpx;
+		padding-bottom: 5rpx;
+		position: absolute;
+		right: 40rpx;
+		border-radius: 10rpx;
+	}
+</style>
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..1aae245
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,68 @@
+{
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "bundle": false,
+    "userConfirmedBundleSwitch": false,
+    "urlCheck": true,
+    "scopeDataCheck": false,
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "autoAudits": false,
+    "newFeature": false,
+    "uglifyFileName": false,
+    "uploadWithSourceMap": true,
+    "useIsolateContext": true,
+    "nodeModules": false,
+    "enhance": true,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmManually": false,
+    "enableEngineNative": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "showES6CompileOption": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.25.3",
+  "appid": "wx7aa32eb2d4ea80e1",
+  "projectname": "%E9%97%B8%E9%97%A8%E6%99%BA%E6%8E%A7",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "scripts": {},
+  "staticServerOptions": {
+    "baseURL": "",
+    "servePath": ""
+  },
+  "isGameTourist": false,
+  "condition": {
+    "search": {
+      "list": []
+    },
+    "conversation": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "plugin": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": []
+    }
+  }
+}
\ No newline at end of file
diff --git a/static/fonts/thorui.ttf b/static/fonts/thorui.ttf
new file mode 100644
index 0000000..ec78419
Binary files /dev/null and b/static/fonts/thorui.ttf differ
diff --git a/static/style/thorui.css b/static/style/thorui.css
new file mode 100644
index 0000000..050ed25
--- /dev/null
+++ b/static/style/thorui.css
@@ -0,0 +1,2487 @@
+/* Thor UI 基础组件 样式*/
+
+/*!
+ * =====================================================
+ * Thor UI v1.5.0 (https://www.thorui.cn/)
+ * =====================================================
+ */
+@font-face {
+	font-family: 'thoruiFont';
+	src: url('~@/static/fonts/thorui.ttf') format('truetype');
+	font-weight: normal;
+	font-style: normal;
+}
+
+.tui-mask {
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 999;
+}
+
+.tui-ellipsis {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+.tui-ellipsis-2 {
+	display: -webkit-box;
+	overflow: hidden;
+	white-space: normal !important;
+	text-overflow: ellipsis;
+	word-wrap: break-word;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+.tui-opcity {
+	opacity: 0.5;
+}
+
+.tui-scale-small {
+	transform: scale(0.9);
+	transform-origin: center center;
+}
+
+.tui-height-full {
+	height: 100%;
+}
+
+.tui-width-full {
+	width: 100%;
+}
+
+.tui-ptop-zero {
+	padding-top: 0;
+}
+
+.tui-pbottom-zero {
+	padding-bottom: 0;
+}
+
+.tui-pleft-zero {
+	padding-left: 0;
+}
+
+.tui-pright-zero {
+	padding-right: 0;
+}
+
+
+/* color start*/
+
+.tui-color-primary {
+	color: #5677fc;
+}
+
+.tui-color-success {
+	color: #19be6b;
+}
+
+.tui-color-warning {
+	color: #ff7900;
+}
+
+.tui-color-error {
+	color: #EB0909;
+}
+
+.tui-color-blue {
+	color: #007AFF;
+}
+
+.tui-color-blue {
+	color: #007AFF;
+}
+
+.tui-color-white {
+	color: #ffffff;
+}
+
+.tui-color-pink {
+	color: #f74d54;
+}
+
+.tui-primary {
+	background-color: #5677fc !important;
+	color: #fff;
+}
+
+.tui-light-primary {
+	background-color: #5c8dff !important;
+	color: #fff;
+}
+
+.tui-dark-primary {
+	background-color: #4a67d6 !important;
+	color: #fff;
+}
+
+.tui-dLight-primary {
+	background-color: #4e77d9 !important;
+	color: #fff;
+}
+
+.tui-danger {
+	background-color: #ed3f14 !important;
+	color: #fff;
+}
+
+.tui-warning {
+	background-color: #ff7900 !important;
+	color: #fff;
+}
+
+.tui-blue {
+	background-color: #007AFF !important;
+	color: #fff;
+}
+
+.tui-green {
+	background-color: #19be6b !important;
+	color: #fff;
+}
+
+.tui-black {
+	background-color: #000 !important;
+	color: #fff;
+}
+
+.tui-white {
+	background-color: #fff !important;
+	color: #333 !important;
+}
+
+.tui-translucent {
+	background-color: rgba(0, 0, 0, 0.7);
+}
+
+.tui-light-black {
+	background-color: #333 !important;
+}
+
+.tui-gray {
+	background-color: #80848f;
+}
+
+.tui-phcolor-gray {
+	background-color: #ccc !important;
+}
+
+.tui-divider-gray {
+	background-color: #eaeef1 !important;
+}
+
+.tui-btn-gray {
+	background-color: #ededed !important;
+	color: #999 !important;
+}
+
+.tui-hover-gray {
+	background-color: #f7f7f9 !important;
+}
+
+.tui-bg-gray {
+	background-color: #fafafa !important;
+}
+
+.tui-light-blue {
+	background-color: #ecf6fd;
+	color: #4dabeb !important;
+}
+
+.tui-light-brownish {
+	background-color: #fcebef;
+	color: #8a5966 !important;
+}
+
+.tui-light-orange {
+	background-color: #fef5eb;
+	color: #faa851 !important;
+}
+
+.tui-light-green {
+	background-color: #e8f6e8;
+	color: #44cf85 !important;
+}
+
+/* color end*/
+
+
+/* flex start */
+
+.tui-flex {
+	display: -webkit-flex;
+	display: flex;
+}
+
+.tui-flex-1 {
+	flex: 1;
+}
+
+.tui-align-center {
+	justify-content: center;
+}
+
+.tui-align-left {
+	justify-content: flex-start !important;
+}
+
+.tui-align-right {
+	justify-content: flex-end !important;
+}
+
+.tui-align-between {
+	justify-content: space-between !important;
+}
+
+.tui-align-around {
+	justify-content: space-around !important;
+}
+
+.tui-vertical-center {
+	align-items: center;
+}
+
+.tui-vertical-top {
+	align-items: flex-start;
+}
+
+.tui-vertical-bottom {
+	align-items: flex-end;
+}
+
+.tui-center {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.tui-line-feed {
+	flex-direction: row;
+	flex-wrap: wrap;
+}
+
+.tui-col-12 {
+	width: 100%;
+}
+
+.tui-col-11 {
+	width: 91.66666667%;
+}
+
+.tui-col-10 {
+	width: 83.33333333%;
+}
+
+.tui-col-9 {
+	width: 75%;
+}
+
+.tui-col-8 {
+	width: 66.66666667%;
+}
+
+.tui-col-7 {
+	width: 58.33333333%;
+}
+
+.tui-col-6 {
+	width: 50%;
+}
+
+.tui-col-5 {
+	width: 41.66666667%;
+}
+
+.tui-col-4 {
+	width: 33.33333333%;
+}
+
+.tui-col-3 {
+	width: 25%;
+}
+
+.tui-col-2 {
+	width: 16.66666667%;
+}
+
+.tui-col-1 {
+	width: 8.33333333%;
+}
+
+/* flex end */
+
+
+/* icon start */
+.tui-icon {
+	font-family: 'thoruiFont' !important;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	text-align: center;
+	text-decoration: none;
+	font-size: 32px;
+	color: #999;
+}
+
+.tui-icon-about:before {
+	content: '\e772';
+}
+
+.tui-icon-about-fill:before {
+	content: '\e771';
+}
+
+.tui-icon-add:before {
+	content: '\e770';
+}
+
+.tui-icon-add-fill:before {
+	content: '\e76f';
+}
+
+.tui-icon-addmessage:before {
+	content: '\e76e';
+}
+
+.tui-icon-addressbook:before {
+	content: '\e76d';
+}
+
+.tui-icon-agree:before {
+	content: '\e76c';
+}
+
+.tui-icon-agree-fill:before {
+	content: '\e76b';
+}
+
+.tui-icon-alarm:before {
+	content: '\e76a';
+}
+
+.tui-icon-alarm-fill:before {
+	content: '\e769';
+}
+
+.tui-icon-alipay:before {
+	content: '\e768';
+}
+
+.tui-icon-android:before {
+	content: '\e767';
+}
+
+.tui-icon-applets:before {
+	content: '\e766';
+}
+
+.tui-icon-arrowdown:before {
+	content: '\e765';
+}
+
+.tui-icon-arrowleft:before {
+	content: '\e764';
+}
+
+.tui-icon-arrowright:before {
+	content: '\e763';
+}
+
+.tui-icon-arrowup:before {
+	content: '\e762';
+}
+
+.tui-icon-attestation:before {
+	content: '\e761';
+}
+
+.tui-icon-back:before {
+	content: '\e760';
+}
+
+.tui-icon-bag:before {
+	content: '\e75f';
+}
+
+.tui-icon-bag-fill:before {
+	content: '\e75e';
+}
+
+.tui-icon-balloon:before {
+	content: '\e75d';
+}
+
+.tui-icon-bankcard:before {
+	content: '\e75c';
+}
+
+.tui-icon-bankcard-fill:before {
+	content: '\e75b';
+}
+
+.tui-icon-bottom:before {
+	content: '\e75a';
+}
+
+.tui-icon-calendar:before {
+	content: '\e759';
+}
+
+.tui-icon-camera:before {
+	content: '\e758';
+}
+
+.tui-icon-camera-fill:before {
+	content: '\e757';
+}
+
+.tui-icon-camera-add:before {
+	content: '\e756';
+}
+
+.tui-icon-card:before {
+	content: '\e755';
+}
+
+.tui-icon-card-fill:before {
+	content: '\e754';
+}
+
+.tui-icon-cart:before {
+	content: '\e753';
+}
+
+.tui-icon-cart-fill:before {
+	content: '\e752';
+}
+
+.tui-icon-category:before {
+	content: '\e751';
+}
+
+.tui-icon-category-fill:before {
+	content: '\e750';
+}
+
+.tui-icon-check:before {
+	content: '\e74f';
+}
+
+.tui-icon-circle:before {
+	content: '\e74e';
+}
+
+.tui-icon-circle-fill:before {
+	content: '\e74d';
+}
+
+.tui-icon-circle-selected:before {
+	content: '\e74c';
+}
+
+.tui-icon-clock:before {
+	content: '\e74b';
+}
+
+.tui-icon-clock-fill:before {
+	content: '\e74a';
+}
+
+.tui-icon-close:before {
+	content: '\e749';
+}
+
+.tui-icon-close-fill:before {
+	content: '\e748';
+}
+
+.tui-icon-community:before {
+	content: '\e747';
+}
+
+.tui-icon-community-fill:before {
+	content: '\e746';
+}
+
+.tui-icon-computer:before {
+	content: '\e745';
+}
+
+.tui-icon-computer-fill:before {
+	content: '\e744';
+}
+
+.tui-icon-coupon:before {
+	content: '\e743';
+}
+
+.tui-icon-delete:before {
+	content: '\e742';
+}
+
+.tui-icon-deletekey:before {
+	content: '\e741';
+}
+
+.tui-icon-dingtalk:before {
+	content: '\e740';
+}
+
+.tui-icon-dissatisfied:before {
+	content: '\e73f';
+}
+
+.tui-icon-down:before {
+	content: '\e73e';
+}
+
+.tui-icon-download:before {
+	content: '\e73d';
+}
+
+.tui-icon-edit:before {
+	content: '\e73c';
+}
+
+.tui-icon-ellipsis:before {
+	content: '\e73b';
+}
+
+.tui-icon-enlarge:before {
+	content: '\e73a';
+}
+
+.tui-icon-evaluate:before {
+	content: '\e739';
+}
+
+.tui-icon-exchange:before {
+	content: '\e738';
+}
+
+.tui-icon-explain:before {
+	content: '\e737';
+}
+
+.tui-icon-explain-fill:before {
+	content: '\e736';
+}
+
+.tui-icon-explore:before {
+	content: '\e735';
+}
+
+.tui-icon-explore-fill:before {
+	content: '\e734';
+}
+
+.tui-icon-eye:before {
+	content: '\e733';
+}
+
+.tui-icon-feedback:before {
+	content: '\e732';
+}
+
+.tui-icon-fingerprint:before {
+	content: '\e730';
+}
+
+.tui-icon-friendadd:before {
+	content: '\e72f';
+}
+
+.tui-icon-friendadd-fill:before {
+	content: '\e72e';
+}
+
+.tui-icon-gps:before {
+	content: '\e72d';
+}
+
+.tui-icon-histogram:before {
+	content: '\e72c';
+}
+
+.tui-icon-home:before {
+	content: '\e72b';
+}
+
+.tui-icon-home-fill:before {
+	content: '\e72a';
+}
+
+.tui-icon-house:before {
+	content: '\e729';
+}
+
+.tui-icon-imface:before {
+	content: '\e728';
+}
+
+.tui-icon-imkeyboard:before {
+	content: '\e727';
+}
+
+.tui-icon-immore:before {
+	content: '\e726';
+}
+
+.tui-icon-imvoice:before {
+	content: '\e725';
+}
+
+.tui-icon-ios:before {
+	content: '\e724';
+}
+
+.tui-icon-kefu:before {
+	content: '\e723';
+}
+
+.tui-icon-label:before {
+	content: '\e722';
+}
+
+.tui-icon-label-fill:before {
+	content: '\e721';
+}
+
+.tui-icon-like:before {
+	content: '\e720';
+}
+
+.tui-icon-like-fill:before {
+	content: '\e71f';
+}
+
+.tui-icon-link:before {
+	content: '\e71e';
+}
+
+.tui-icon-listview:before {
+	content: '\e71d';
+}
+
+.tui-icon-loading:before {
+	content: '\e71c';
+}
+
+.tui-icon-location:before {
+	content: '\e71b';
+}
+
+.tui-icon-mail:before {
+	content: '\e71a';
+}
+
+.tui-icon-mail-fill:before {
+	content: '\e719';
+}
+
+.tui-icon-manage:before {
+	content: '\e718';
+}
+
+.tui-icon-manage-fill:before {
+	content: '\e717';
+}
+
+.tui-icon-member:before {
+	content: '\e716';
+}
+
+.tui-icon-member-fill:before {
+	content: '\e715';
+}
+
+.tui-icon-message:before {
+	content: '\e714';
+}
+
+.tui-icon-message-fill:before {
+	content: '\e713';
+}
+
+.tui-icon-mobile:before {
+	content: '\e712';
+}
+
+.tui-icon-moments:before {
+	content: '\e711';
+}
+
+.tui-icon-more:before {
+	content: '\e710';
+}
+
+.tui-icon-more-fill:before {
+	content: '\e70f';
+}
+
+.tui-icon-narrow:before {
+	content: '\e70e';
+}
+
+.tui-icon-news:before {
+	content: '\e70d';
+}
+
+.tui-icon-news-fill:before {
+	content: '\e70c';
+}
+
+.tui-icon-nodata:before {
+	content: '\e70b';
+}
+
+.tui-icon-notice:before {
+	content: '\e699';
+}
+
+.tui-icon-notice-fill:before {
+	content: '\e698';
+}
+
+.tui-icon-offline:before {
+	content: '\e697';
+}
+
+.tui-icon-offline-fill:before {
+	content: '\e696';
+}
+
+.tui-icon-oppose:before {
+	content: '\e695';
+}
+
+.tui-icon-oppose-fill:before {
+	content: '\e694';
+}
+
+.tui-icon-order:before {
+	content: '\e693';
+}
+
+.tui-icon-partake:before {
+	content: '\e692';
+}
+
+.tui-icon-people:before {
+	content: '\e691';
+}
+
+.tui-icon-people-fill:before {
+	content: '\e690';
+}
+
+.tui-icon-pic:before {
+	content: '\e68f';
+}
+
+.tui-icon-pic-fill:before {
+	content: '\e68e';
+}
+
+.tui-icon-picture:before {
+	content: '\e68d';
+}
+
+.tui-icon-pie:before {
+	content: '\e68c';
+}
+
+.tui-icon-play:before {
+	content: '\e68b';
+}
+
+.tui-icon-plus:before {
+	content: '\e689';
+}
+
+.tui-icon-polygonal:before {
+	content: '\e688';
+}
+
+.tui-icon-position:before {
+	content: '\e687';
+}
+
+.tui-icon-position-fill:before {
+	content: '\e686';
+}
+
+.tui-icon-pwd:before {
+	content: '\e685';
+}
+
+.tui-icon-qq:before {
+	content: '\e684';
+}
+
+.tui-icon-qrcode:before {
+	content: '\e682';
+}
+
+.tui-icon-redpacket:before {
+	content: '\e681';
+}
+
+.tui-icon-redpacket-fill:before {
+	content: '\e680';
+}
+
+.tui-icon-reduce:before {
+	content: '\e67f';
+}
+
+.tui-icon-refresh:before {
+	content: '\e67e';
+}
+
+.tui-icon-revoke:before {
+	content: '\e67d';
+}
+
+.tui-icon-satisfied:before {
+	content: '\e67c';
+}
+
+.tui-icon-screen:before {
+	content: '\e67b';
+}
+
+.tui-icon-search:before {
+	content: '\e67a';
+}
+
+.tui-icon-search-2:before {
+	content: '\e679';
+}
+
+.tui-icon-send:before {
+	content: '\e678';
+}
+
+.tui-icon-service:before {
+	content: '\e677';
+}
+
+.tui-icon-service-fill:before {
+	content: '\e676';
+}
+
+.tui-icon-setup:before {
+	content: '\e675';
+}
+
+.tui-icon-setup-fill:before {
+	content: '\e674';
+}
+
+.tui-icon-share:before {
+	content: '\e673';
+}
+
+.tui-icon-share-fill:before {
+	content: '\e672';
+}
+
+.tui-icon-shield:before {
+	content: '\e671';
+}
+
+.tui-icon-shop:before {
+	content: '\e670';
+}
+
+.tui-icon-shop-fill:before {
+	content: '\e66f';
+}
+
+.tui-icon-shut:before {
+	content: '\e66e';
+}
+
+.tui-icon-signin:before {
+	content: '\e66d';
+}
+
+.tui-icon-sina:before {
+	content: '\e66c';
+}
+
+.tui-icon-skin:before {
+	content: '\e66b';
+}
+
+.tui-icon-soso:before {
+	content: '\e669';
+}
+
+.tui-icon-square:before {
+	content: '\e668';
+}
+
+.tui-icon-square-fill:before {
+	content: '\e667';
+}
+
+.tui-icon-square-selected:before {
+	content: '\e666';
+}
+
+.tui-icon-star:before {
+	content: '\e665';
+}
+
+.tui-icon-star-fill:before {
+	content: '\e664';
+}
+
+.tui-icon-strategy:before {
+	content: '\e663';
+}
+
+.tui-icon-sweep:before {
+	content: '\e662';
+}
+
+.tui-icon-time:before {
+	content: '\e661';
+}
+
+.tui-icon-time-fill:before {
+	content: '\e660';
+}
+
+.tui-icon-todown:before {
+	content: '\e65f';
+}
+
+.tui-icon-toleft:before {
+	content: '\e65e';
+}
+
+.tui-icon-tool:before {
+	content: '\e65d';
+}
+
+.tui-icon-top:before {
+	content: '\e65c';
+}
+
+.tui-icon-toright:before {
+	content: '\e65b';
+}
+
+.tui-icon-towardsleft:before {
+	content: '\e65a';
+}
+
+.tui-icon-towardsright:before {
+	content: '\e659';
+}
+
+.tui-icon-towardsright-fill:before {
+	content: '\e658';
+}
+
+.tui-icon-transport:before {
+	content: '\e657';
+}
+
+.tui-icon-transport-fill:before {
+	content: '\e656';
+}
+
+.tui-icon-turningdown:before {
+	content: '\e654';
+}
+
+.tui-icon-turningleft:before {
+	content: '\e653';
+}
+
+.tui-icon-turningright:before {
+	content: '\e652';
+}
+
+.tui-icon-turningup:before {
+	content: '\e651';
+}
+
+.tui-icon-unreceive:before {
+	content: '\e650';
+}
+
+.tui-icon-unseen:before {
+	content: '\e64f';
+}
+
+.tui-icon-up:before {
+	content: '\e64e';
+}
+
+.tui-icon-upload:before {
+	content: '\e64c';
+}
+
+.tui-icon-video:before {
+	content: '\e64b';
+}
+
+.tui-icon-voice:before {
+	content: '\e649';
+}
+
+.tui-icon-voice-fill:before {
+	content: '\e648';
+}
+
+.tui-icon-voipphone:before {
+	content: '\e647';
+}
+
+.tui-icon-wallet:before {
+	content: '\e646';
+}
+
+.tui-icon-warning:before {
+	content: '\e645';
+}
+
+.tui-icon-wealth:before {
+	content: '\e644';
+}
+
+.tui-icon-wealth-fill:before {
+	content: '\e643';
+}
+
+.tui-icon-weather:before {
+	content: '\e642';
+}
+
+.tui-icon-wechat:before {
+	content: '\e641';
+}
+
+.tui-icon-wifi:before {
+	content: '\e640';
+}
+
+/* icon end */
+
+/*Button start*/
+.tui-btn-primary {
+	background: #5677fc !important;
+	color: #fff;
+}
+
+.tui-shadow-primary {
+	box-shadow: 0 10rpx 14rpx 0 rgba(86, 119, 252, 0.2);
+}
+
+.tui-btn-danger {
+	background: #eb0909 !important;
+	color: #fff;
+}
+
+.tui-shadow-danger {
+	box-shadow: 0 10rpx 14rpx 0 rgba(235, 9, 9, 0.2);
+}
+
+.tui-btn-warning {
+	background: #fc872d !important;
+	color: #fff;
+}
+
+.tui-shadow-warning {
+	box-shadow: 0 10rpx 14rpx 0 rgba(252, 135, 45, 0.2);
+}
+
+.tui-btn-green {
+	background: #35b06a !important;
+	color: #fff;
+}
+
+.tui-shadow-green {
+	box-shadow: 0 10rpx 14rpx 0 rgba(53, 176, 106, 0.2);
+}
+
+.tui-btn-blue {
+	background: #007AFF !important;
+	color: #fff;
+}
+
+.tui-shadow-blue {
+	box-shadow: 0 10rpx 14rpx 0 rgba(0, 122, 255, 0.2);
+}
+
+.tui-btn-white {
+	background: #fff !important;
+	color: #333 !important;
+}
+
+.tui-btn-gray {
+	background: #bfbfbf !important;
+	color: #fff !important;
+}
+
+.tui-btn-black {
+	background: #333 !important;
+	color: #fff !important;
+}
+
+.tui-shadow-gray {
+	box-shadow: 0 10rpx 14rpx 0 rgba(191, 191, 191, 0.2);
+}
+
+.tui-hover-gray {
+	background: #f7f7f9 !important;
+}
+
+.tui-black-hover {
+	background: #555 !important;
+	color: #e5e5e5 !important;
+}
+
+/* button start 
+ * 宽高通过覆盖样式改变
+**/
+
+.tui-btn {
+	width: 100%;
+	height: 96rpx;
+	line-height: 96rpx;
+	font-size: 32rpx;
+	position: relative;
+	border: 0 !important;
+	border-radius: 6rpx;
+	padding-left: 0;
+	padding-right: 0;
+	overflow: visible;
+}
+
+.tui-btn-base {
+	width: auto;
+	/* #ifdef MP-ALIPAY */
+	min-width: 200rpx;
+	/* #endif */
+	font-size: 30rpx;
+	height: 70rpx;
+	line-height: 70rpx;
+}
+
+.tui-btn-small {
+	width: auto;
+	/* #ifdef MP-ALIPAY */
+	min-width: 140rpx;
+	/* #endif */
+	font-size: 30rpx;
+	height: 60rpx;
+	line-height: 60rpx;
+}
+
+.tui-btn::after {
+	content: '';
+	position: absolute;
+	width: 200%;
+	height: 200%;
+	transform-origin: 0 0;
+	transform: scale(0.5, 0.5) translateZ(0);
+	box-sizing: border-box;
+	left: 0;
+	top: 0;
+	border-radius: 12rpx;
+	border: 0;
+}
+
+.tui-btn-white::after {
+	border: 1rpx solid #bfbfbf;
+}
+
+.tui-white-hover {
+	background: #e5e5e5 !important;
+	color: #2e2e2e !important;
+}
+
+.tui-dark-disabled {
+	opacity: 0.6 !important;
+	color: #fafbfc !important;
+}
+
+.tui-dark-disabled-outline {
+	opacity: 0.5 !important;
+}
+
+.tui-gray-disabled {
+	background: #f3f3f3 !important;
+	color: #919191 !important;
+	box-shadow: none;
+}
+
+.tui-outline-hover {
+	opacity: 0.5;
+}
+
+.tui-primary-hover {
+	background: #4a67d6 !important;
+	color: #e5e5e5 !important;
+}
+
+.tui-primary-outline::after {
+	border: 1rpx solid #5677fc !important;
+}
+
+.tui-primary-outline {
+	color: #5677fc !important;
+	background: transparent;
+}
+
+.tui-danger-hover {
+	background: #c80808 !important;
+	color: #e5e5e5 !important;
+}
+
+.tui-danger-outline {
+	color: #eb0909 !important;
+	background: transparent;
+}
+
+.tui-danger-outline::after {
+	border: 1rpx solid #eb0909 !important;
+}
+
+.tui-warning-hover {
+	background: #d67326 !important;
+	color: #e5e5e5 !important;
+}
+
+.tui-warning-outline {
+	color: #fc872d !important;
+	background: transparent;
+}
+
+.tui-warning-outline::after {
+	border: 1px solid #fc872d !important;
+}
+
+.tui-green-hover {
+	background: #2d965a !important;
+	color: #e5e5e5 !important;
+}
+
+.tui-green-outline {
+	color: #35b06a !important;
+	background: transparent;
+}
+
+.tui-green-outline::after {
+	border: 1rpx solid #35b06a !important;
+}
+
+.tui-blue-hover {
+	background: #0062CC !important;
+	color: #e5e5e5 !important;
+}
+
+.tui-blue-outline {
+	color: #007AFF !important;
+	background: transparent;
+}
+
+.tui-blue-outline::after {
+	border: 1rpx solid #007AFF !important;
+}
+
+/* #ifndef APP-NVUE */
+.tui-btn-gradual {
+	background: linear-gradient(90deg, rgb(255, 89, 38), rgb(240, 14, 44)) !important;
+	color: #fff !important;
+}
+
+.tui-shadow-gradual {
+	box-shadow: 0 10rpx 14rpx 0 rgba(235, 9, 9, 0.15);
+}
+
+/* #endif */
+
+.tui-gray-hover {
+	background: #a3a3a3 !important;
+	color: #898989;
+}
+
+/* #ifndef APP-NVUE */
+.tui-gradual-hover {
+	background: linear-gradient(90deg, #d74620, #cd1225) !important;
+	color: #fff !important;
+}
+
+/* #endif */
+
+.tui-gray-outline {
+	color: #999 !important;
+	background: transparent !important;
+}
+
+.tui-white-outline {
+	color: #fff !important;
+	background: transparent !important;
+}
+
+.tui-black-outline {
+	background: transparent !important;
+	color: #333 !important;
+}
+
+.tui-gray-outline::after {
+	border: 1rpx solid #ccc !important;
+}
+
+.tui-white-outline::after {
+	border: 1px solid #fff !important;
+}
+
+.tui-black-outline::after {
+	border: 1px solid #333 !important;
+}
+
+/*圆角 */
+
+.tui-fillet {
+	border-radius: 50rpx;
+}
+
+.tui-btn-white.tui-fillet::after {
+	border-radius: 98rpx;
+}
+
+.tui-outline-fillet::after {
+	border-radius: 98rpx;
+}
+
+/*平角*/
+.tui-rightAngle {
+	border-radius: 0;
+}
+
+.tui-btn-white.tui-rightAngle::after {
+	border-radius: 0;
+}
+
+.tui-outline-rightAngle::after {
+	border-radius: 0;
+}
+
+/*Button end*/
+
+/*Tag start*/
+
+.tui-tag {
+	padding: 16rpx 26rpx;
+	font-size: 28rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 6rpx;
+}
+
+.tui-tag-outline {
+	position: relative;
+	background-color: none;
+	color: #5677fc;
+}
+
+.tui-tag-outline::after {
+	content: '';
+	position: absolute;
+	width: 200%;
+	height: 200%;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scale(0.5, 0.5);
+	transform: scale(0.5, 0.5);
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	left: 0;
+	top: 0;
+	border-radius: 12rpx;
+}
+
+.tui-tag-fillet {
+	border-radius: 50rpx;
+}
+
+.tui-white.tui-tag-fillet::after {
+	border-radius: 80rpx;
+}
+
+.tui-tag-outline-fillet::after {
+	border-radius: 80rpx;
+}
+
+.tui-tag-fillet-left {
+	border-radius: 50rpx 0 0 50rpx;
+}
+
+.tui-tag-fillet-right {
+	border-radius: 0 50rpx 50rpx 0;
+}
+
+.tui-tag-fillet-left.tui-tag-outline::after {
+	border-radius: 100rpx 0 0 100rpx;
+}
+
+.tui-tag-fillet-right.tui-tag-outline::after {
+	border-radius: 0 100rpx 100rpx 0;
+}
+
+/*Tag end*/
+
+/*Badge start*/
+.tui-badge-dot {
+	height: 16rpx;
+	width: 16rpx;
+	border-radius: 50%;
+}
+
+.tui-badge {
+	font-size: 24rpx;
+	height: 36rpx;
+	min-width: 12rpx;
+	padding: 0 12rpx;
+	border-radius: 36rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 10;
+}
+
+.tui-badge-scale {
+	transform-origin: center center;
+}
+
+/*Badge end*/
+
+/*List start*/
+.tui-list-cell {
+	position: relative;
+	width: 100%;
+	padding: 26rpx 30rpx;
+	background-color: #fff;
+	box-sizing: border-box;
+}
+
+.tui-list-radius {
+	border-radius: 6rpx;
+	overflow: hidden;
+}
+
+.tui-cell-hover {
+	background-color: #f1f1f1 !important;
+}
+
+.tui-list-cell::after {
+	content: '';
+	position: absolute;
+	border-bottom: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5) translateZ(0);
+	transform: scaleY(0.5) translateZ(0);
+	transform-origin: 0 100%;
+	bottom: 0;
+	right: 0;
+	left: 0;
+}
+
+.tui-line-left::after {
+	left: 30rpx !important;
+}
+
+.tui-line-right::after {
+	right: 30rpx !important;
+}
+
+.tui-cell-unlined::after {
+	border-bottom: 0 !important;
+}
+
+.tui-cell-arrow::before {
+	content: ' ';
+	height: 10px;
+	width: 10px;
+	border-width: 2px 2px 0 0;
+	border-color: #c0c0c0;
+	border-style: solid;
+	-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+	transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+	position: absolute;
+	top: 50%;
+	margin-top: -6px;
+	right: 30rpx;
+}
+
+.tui-arrow-right::before {
+	right: 0 !important;
+}
+
+.tui-arrow-gray::before {
+	border-color: #666666 !important;
+}
+
+.tui-arrow-white::before {
+	border-color: #ffffff !important;
+}
+
+.tui-arrow-warning::before {
+	border-color: #ff7900 !important;
+}
+
+.tui-arrow-success::before {
+	border-color: #19be6b !important;
+}
+
+.tui-arrow-danger::before {
+	border-color: #eb0909 !important;
+}
+
+/*List end*/
+
+/*Card start*/
+.tui-card {
+	margin: 0 30rpx;
+	font-size: 28rpx;
+	background-color: #fff;
+	border-radius: 10rpx;
+	box-shadow: 0 0 10rpx #eee;
+	box-sizing: border-box;
+	overflow: hidden;
+}
+
+.tui-card-full {
+	margin: 0 !important;
+	border-radius: 0 !important;
+}
+
+.tui-card-full::after {
+	border-radius: 0 !important;
+}
+
+.tui-card-border {
+	position: relative;
+	box-shadow: none !important
+}
+
+.tui-card-border::after {
+	content: ' ';
+	position: absolute;
+	height: 200%;
+	width: 200%;
+	border: 1px solid #ddd;
+	transform-origin: 0 0;
+	-webkit-transform-origin: 0 0;
+	-webkit-transform: scale(0.5);
+	transform: scale(0.5);
+	left: 0;
+	top: 0;
+	border-radius: 20rpx;
+	box-sizing: border-box;
+	pointer-events: none;
+}
+
+.tui-card-header {
+	width: 100%;
+	padding: 20rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	position: relative;
+	box-sizing: border-box;
+	overflow: hidden;
+	border-top-left-radius: 10rpx;
+	border-top-right-radius: 10rpx;
+}
+
+.tui-card-header::after {
+	content: '';
+	position: absolute;
+	border-bottom: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	bottom: 0;
+	right: 0;
+	left: 0;
+	pointer-events: none;
+}
+
+.tui-header-line::after {
+	border-bottom: 0 !important;
+}
+
+.tui-header-thumb {
+	height: 60rpx;
+	width: 60rpx;
+	vertical-align: middle;
+	margin-right: 20rpx;
+	border-radius: 6rpx;
+}
+
+.tui-thumb-circle {
+	border-radius: 50% !important;
+}
+
+.tui-header-title {
+	display: inline-block;
+	font-size: 30rpx;
+	color: #7a7a7a;
+	vertical-align: middle;
+	max-width: 460rpx;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+.tui-header-right {
+	font-size: 24rpx;
+	color: #b2b2b2;
+}
+
+.tui-card-body {
+	font-size: 32rpx;
+	color: #262b3a;
+	box-sizing: border-box;
+}
+
+.tui-card-footer {
+	font-size: 28rpx;
+	color: #596d96;
+	border-bottom-left-radius: 10rpx;
+	border-bottom-right-radius: 10rpx;
+	box-sizing: border-box;
+}
+
+/*Card end*/
+
+/*Grid start*/
+.tui-grids {
+	width: 100%;
+	position: relative;
+	overflow: hidden;
+}
+
+.tui-grids::after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 1px;
+	border-top: 1px solid #eaeef1;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+}
+
+.tui-border-top::after {
+	border-top: 0 !important;
+}
+
+.tui-grid {
+	position: relative;
+	padding: 40rpx 20rpx;
+	box-sizing: border-box;
+	background: #fff;
+	float: left;
+}
+
+.tui-grid-2 {
+	width: 50%;
+}
+
+.tui-grid-3 {
+	width: 33.333333333%;
+}
+
+.tui-grid-4 {
+	width: 25%;
+	padding: 30rpx 20rpx !important;
+}
+
+.tui-grid-5 {
+	width: 20%;
+	padding: 20rpx !important;
+}
+
+.tui-grid-2:nth-of-type(2n)::before {
+	width: 0;
+	border-right: 0;
+}
+
+.tui-grid-3:nth-of-type(3n)::before {
+	width: 0;
+	border-right: 0;
+}
+
+.tui-grid-4:nth-of-type(4n)::before {
+	width: 0;
+	border-right: 0;
+}
+
+.tui-grid-5:nth-of-type(5n)::before {
+	width: 0;
+	border-right: 0;
+}
+
+.tui-grid::before {
+	content: " ";
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 1px;
+	bottom: 0;
+	border-right: 1px solid #eaeef1;
+	-webkit-transform-origin: 100% 0;
+	transform-origin: 100% 0;
+	-webkit-transform: scaleX(0.5);
+	transform: scaleX(0.5);
+}
+
+.tui-grid::after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	height: 1px;
+	border-bottom: 1px solid #eaeef1;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+}
+
+.tui-grid-bottom::after {
+	height: 0 !important;
+	border-bottom: 0 !important
+}
+
+.tui-grid-bg {
+	position: relative;
+	padding: 0;
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.tui-item-hover {
+	background-color: #f7f7f9 !important;
+}
+
+/*Grid end*/
+
+/*Loading start*/
+.tui-loading-init {
+	min-width: 200rpx;
+	min-height: 200rpx;
+	max-width: 500rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	z-index: 9999;
+	font-size: 26rpx;
+	color: #fff;
+	background-color: rgba(0, 0, 0, 0.7);
+	border-radius: 10rpx;
+}
+
+.tui-loading-center {
+	width: 50rpx;
+	height: 50rpx;
+	border: 3px solid #fff;
+	border-radius: 50%;
+	margin: 0 6px;
+	display: inline-block;
+	vertical-align: middle;
+	clip-path: polygon(0% 0%, 100% 0%, 100% 40%, 0% 40%);
+	animation: rotate 1s linear infinite;
+	margin-bottom: 36rpx;
+}
+
+.tui-loadmore-tips {
+	text-align: center;
+	padding: 0 20rpx;
+	box-sizing: border-box;
+}
+
+@-webkit-keyframes rotate {
+	from {
+		transform: rotatez(0deg);
+	}
+
+	to {
+		transform: rotatez(360deg);
+	}
+}
+
+@keyframes rotate {
+	from {
+		transform: rotatez(0deg);
+	}
+
+	to {
+		transform: rotatez(360deg);
+	}
+}
+
+.tui-loadmore {
+	width: 48%;
+	margin: 1.5em auto;
+	line-height: 1.5em;
+	font-size: 24rpx;
+	text-align: center;
+}
+
+.tui-loading-1 {
+	margin: 0 5px;
+	width: 20px;
+	height: 20px;
+	display: inline-block;
+	vertical-align: middle;
+	-webkit-animation: a 1s steps(12) infinite;
+	animation: a 1s steps(12) infinite;
+	background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
+	background-size: 100%;
+}
+
+@-webkit-keyframes a {
+	0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	}
+
+	to {
+		-webkit-transform: rotate(1turn);
+		transform: rotate(1turn);
+	}
+}
+
+@keyframes a {
+	0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	}
+
+	to {
+		-webkit-transform: rotate(1turn);
+		transform: rotate(1turn);
+	}
+}
+
+.tui-loadmore-tips {
+	display: inline-block;
+	vertical-align: middle;
+}
+
+.tui-loading-2 {
+	width: 28rpx;
+	height: 28rpx;
+	border: 1px solid #8f8d8e;
+	border-radius: 50%;
+	margin: 0 6px;
+	display: inline-block;
+	vertical-align: middle;
+	clip-path: polygon(0% 0%, 100% 0%, 100% 30%, 0% 30%);
+	animation: rotate 1s linear infinite;
+}
+
+@-webkit-keyframes rotate {
+	from {
+		transform: rotatez(0deg);
+	}
+
+	to {
+		transform: rotatez(360deg);
+	}
+}
+
+@keyframes rotate {
+	from {
+		transform: rotatez(0deg);
+	}
+
+	to {
+		transform: rotatez(360deg);
+	}
+}
+
+.tui-loading-3 {
+	display: inline-block;
+	margin: 0 6px;
+	vertical-align: middle;
+	width: 28rpx;
+	height: 28rpx;
+	background: 0 0;
+	border-radius: 50%;
+	border: 2px solid;
+	border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
+	animation: tui-rotate 0.7s linear infinite;
+}
+
+.tui-loading-3.tui-loading-primary {
+	border-color: #e5e5e5 #e5e5e5 #e5e5e5 #5677fc;
+}
+
+.tui-loading-3.tui-loading-green {
+	border-color: #e5e5e5 #e5e5e5 #e5e5e5 #19be6b;
+}
+
+.tui-loading-3.tui-loading-orange {
+	border-color: #e5e5e5 #e5e5e5 #e5e5e5 #ff7900;
+}
+
+.tui-loading-3.tui-loading-red {
+	border-color: #ededed #ededed #ededed #ed3f14;
+}
+
+@-webkit-keyframes tui-rotate {
+	0% {
+		transform: rotate(0);
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+}
+
+@keyframes tui-rotate {
+	0% {
+		transform: rotate(0);
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+}
+
+.tui-loadmore-none {
+	width: 50%;
+	margin: 1.5em auto;
+	line-height: 1.5em;
+	font-size: 24rpx;
+	display: flex;
+	justify-content: center;
+}
+
+.tui-nomore {
+	width: 100%;
+	height: 100%;
+	position: relative;
+	display: flex;
+	justify-content: center;
+	margin-top: 10rpx;
+	padding-bottom: 6rpx;
+}
+
+.tui-nomore::before {
+	content: ' ';
+	position: absolute;
+	border-bottom: 1rpx solid #e5e5e5;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	width: 100%;
+	top: 18rpx;
+	left: 0;
+}
+
+.tui-nomore-text {
+	color: #999;
+	font-size: 24rpx;
+	text-align: center;
+	padding: 0 18rpx;
+	height: 36rpx;
+	line-height: 36rpx;
+	position: relative;
+	z-index: 1;
+}
+
+.tui-nomore-dot {
+	position: relative;
+	text-align: center;
+	-webkit-display: flex;
+	display: flex;
+	-webkit-justify-content: center;
+	justify-content: center;
+	margin-top: 10rpx;
+	padding-bottom: 6rpx;
+}
+
+.tui-nomore-dot::before {
+	content: '';
+	position: absolute;
+	border-bottom: 1rpx solid #e5e5e5;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	width: 360rpx;
+	top: 18rpx;
+}
+
+.tui-dot-text {
+	position: relative;
+	color: #e5e5e5;
+	font-size: 10px;
+	text-align: center;
+	width: 50rpx;
+	height: 36rpx;
+	line-height: 36rpx;
+	-webkit-transform: scale(0.8);
+	transform: scale(0.8);
+	-webkit-transform-origin: center center;
+	transform-origin: center center;
+	z-index: 1;
+}
+
+/*Loading end*/
+
+/*Footer start*/
+.tui-footer {
+	width: 100%;
+	overflow: hidden;
+	padding: 30rpx 24rpx;
+	box-sizing: border-box;
+	font-size: 24rpx;
+	color: #A7A7A7;
+}
+
+.tui-fixed {
+	position: fixed;
+	z-index: 9999;
+	/* #ifdef H5 */
+	bottom: 0;
+	/* #endif */
+	/* #ifndef H5 */
+	bottom: env(safe-area-inset-bottom);
+	/* #endif */
+}
+
+.tui-footer-link {
+	color: #596d96;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 28rpx;
+}
+
+.tui-link {
+	position: relative;
+	padding: 0 18rpx;
+	line-height: 1;
+}
+
+.tui-link::before {
+	content: " ";
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 1px;
+	bottom: 0;
+	border-right: 1px solid #d3d3d3;
+	-webkit-transform-origin: 100% 0;
+	transform-origin: 100% 0;
+	-webkit-transform: scaleX(0.5);
+	transform: scaleX(0.5);
+}
+
+.tui-link:last-child::before {
+	border-right: 0 !important
+}
+
+.tui-link-hover {
+	opacity: 0.5
+}
+
+.tui-footer-copyright {
+	font-size: 24rpx;
+	color: #A7A7A7;
+	line-height: 1;
+	text-align: center;
+	padding-top: 16rpx
+}
+
+/*Footer end*/
+
+
+/*layout start*/
+
+/*形状*/
+.tui-triangle {
+	border: 16rpx solid;
+	width: 0;
+	height: 0;
+}
+
+.tui-triangle-left {
+	border-color: transparent #5c8dff transparent transparent;
+}
+
+.tui-triangle-right {
+	border-color: transparent transparent transparent #5c8dff;
+}
+
+.tui-triangle-top {
+	border-color: transparent transparent #5c8dff transparent;
+}
+
+.tui-triangle-bottom {
+	border-color: #5c8dff transparent transparent transparent;
+}
+
+
+.tui-parallelogram {
+	width: 100rpx;
+	height: 50rpx;
+	transform: skew(-10deg);
+	background: #19be6b;
+	margin-left: 10rpx;
+}
+
+.tui-crescent {
+	width: 60rpx;
+	height: 60rpx;
+	border-radius: 50%;
+	box-shadow: 12rpx 12rpx 0 0 yellowgreen;
+}
+
+/*聊天框*/
+.tui-chatbox {
+	max-width: 60%;
+	border-radius: 10rpx;
+	position: relative;
+	padding: 20rpx 26rpx;
+	font-size: 28rpx;
+	color: #fff;
+	/* word-break: break-all;
+  word-wrap: break-word; */
+}
+
+.tui-chatbox-left {
+	background: #5c8dff;
+	border: 1rpx solid #5c8dff;
+	display: inline-block;
+}
+
+.tui-chatbox-right {
+	background: #19be6b;
+	border: 1rpx solid #19be6b;
+}
+
+.tui-chatbox::before {
+	content: "";
+	position: absolute;
+	width: 0;
+	height: 0;
+	top: 20rpx;
+	border: 16rpx solid;
+}
+
+.tui-chatbox-left::before {
+	right: 100%;
+	border-color: transparent #5c8dff transparent transparent;
+}
+
+.tui-chatbox-right::before {
+	left: 100%;
+	border-color: transparent transparent transparent #19be6b;
+}
+
+/*checkbox 整体大小  */
+
+/* #ifdef MP-WEIXIN */
+.tui-checkbox .wx-checkbox-input {
+	width: 36rpx;
+	height: 36rpx;
+	border-radius: 50%;
+	margin: 0;
+}
+
+.tui-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+	background: #F82400;
+	width: 40rpx;
+	height: 40rpx;
+	border: none;
+}
+
+/* #endif */
+
+/* #ifndef MP-WEIXIN */
+>>>.tui-checkbox .uni-checkbox-input {
+	width: 36rpx;
+	height: 36rpx;
+	border-radius: 50% !important;
+	margin: 0;
+	border-color: #d1d1d1 !important;
+}
+
+>>>.tui-checkbox .uni-checkbox-input.uni-checkbox-input-checked {
+	background: #F82400;
+	width: 40rpx;
+	height: 40rpx;
+	border: none;
+}
+
+/* #endif */
+
+/*textarea*/
+
+.tui-textarea-box {
+	border-radius: 4rpx;
+	height: 280rpx;
+	box-sizing: border-box;
+	padding: 20rpx 20rpx 0 20rpx;
+	position: relative;
+}
+
+.tui-textarea-box::after {
+	content: '';
+	position: absolute;
+	height: 200%;
+	width: 200%;
+	border: 1px solid #e6e6e6;
+	transform-origin: 0 0;
+	-webkit-transform-origin: 0 0;
+	-webkit-transform: scale(0.5);
+	transform: scale(0.5);
+	left: 0;
+	top: 0;
+	border-radius: 8rpx;
+	pointer-events: none;
+}
+
+.tui-textarea {
+	height: 210rpx;
+	width: 100%;
+	color: #666;
+	font-size: 28rpx;
+	z-index: 2;
+}
+
+.tui-phcolor-color {
+	color: #ccc !important;
+}
+
+.tui-textarea-counter {
+	font-size: 24rpx;
+	color: #999;
+	text-align: right;
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-top: 4rpx;
+}
+
+/*Input输入框*/
+.tui-input-item {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	font-size: 32rpx;
+
+}
+
+.tui-input {
+	flex: 1;
+	font-size: 32rpx;
+	overflow: visible;
+}
+
+.tui-input-title {
+	min-width: 140rpx;
+	padding-right: 12rpx;
+	flex-shrink: 0;
+}
+
+.tui-phcolor {
+	color: #ccc;
+	font-size: 32rpx;
+	overflow: visible;
+}
+
+.tui-input-border {
+	/* border: 1rpx solid #eaeef1; */
+	padding: 20rpx 30rpx;
+	border-radius: 4rpx;
+	position: relative;
+	font-size: 32rpx;
+}
+
+.tui-input-border::after {
+	content: '';
+	position: absolute;
+	height: 200%;
+	width: 200%;
+	border: 1px solid #e6e6e6;
+	transform-origin: 0 0;
+	-webkit-transform-origin: 0 0;
+	-webkit-transform: scale(0.5);
+	transform: scale(0.5);
+	left: 0;
+	top: 0;
+	border-radius: 8rpx;
+	pointer-events: none;
+}
+
+.tui-text-right {
+	text-align: right;
+}
+
+/*上传*/
+.tui-upload-box {
+	width: 100%;
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.tui-upload-item {
+	width: 220rpx;
+	height: 220rpx;
+	position: relative;
+	margin-right: 20rpx;
+	margin-bottom: 20rpx;
+}
+
+.tui-upload-item:nth-of-type(3n) {
+	margin-right: 0;
+}
+
+.tui-upload-img {
+	width: 220rpx;
+	height: 220rpx;
+	display: block;
+}
+
+.tui-upload-del {
+	position: absolute;
+	right: -18rpx;
+	top: -18rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.tui-upload-add {
+	width: 220rpx;
+	height: 220rpx;
+	font-size: 68rpx;
+	font-weight: 100;
+	color: #888;
+	background-color: #F7F7F7;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 0;
+}
+
+/* 操作条*/
+.tui-operation {
+	width: 100%;
+	height: 100rpx;
+	box-sizing: border-box;
+	overflow: hidden;
+	background: rgba(255, 255, 255, 0.9);
+	position: relative;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.tui-operation::before {
+	content: '';
+	position: absolute;
+	top: 0px;
+	right: 0;
+	left: 0;
+	border-top: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+}
+
+.tui-operation-left {
+	display: flex;
+	align-items: center;
+}
+
+.tui-operation-item {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+	position: relative;
+}
+
+.tui-operation-text {
+	font-size: 22rpx;
+	color: #333;
+}
+
+.tui-operation-right {
+	flex: 1;
+	height: 100rpx;
+	box-sizing: border-box;
+	padding-top: 0;
+}
+
+.tui-relative {
+	position: relative;
+}
+
+.tui-btn-comment {
+	height: 64rpx;
+	width: 84%;
+	background: #ededed;
+	color: #999;
+	border-radius: 8rpx;
+	font-size: 28rpx;
+	display: flex;
+	align-items: center;
+	padding-left: 20rpx;
+	box-sizing: border-box;
+	padding-top: 0;
+	margin-left: 30rpx;
+}
+
+.tui-chat-operation {
+	background: #F6F6F6 !important;
+	padding-right: 18rpx;
+	box-sizing: border-box;
+}
+
+.tui-input-box {
+	width: 78%;
+	justify-content: flex-start;
+}
+
+.tui-chat-input {
+	background: #fff;
+	height: 72rpx;
+	border-radius: 6rpx;
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+	flex: 1;
+}
+
+.tui-voice-icon {
+	margin-left: 20rpx;
+	margin-right: 20rpx
+}
+
+/*layout end*/
diff --git a/static/style/thorui.min.css b/static/style/thorui.min.css
new file mode 100644
index 0000000..d29bca7
--- /dev/null
+++ b/static/style/thorui.min.css
@@ -0,0 +1,5 @@
+/*!
+ * =====================================================
+ * Thor UI v1.5.0 (https://www.thorui.cn/)
+ * =====================================================
+ */@font-face{font-family:thoruiFont;src:url(~@/static/fonts/thorui.ttf) format('truetype');font-weight:400;font-style:normal}.tui-mask{width:100%;height:100%;position:fixed;top:0;left:0;background:rgba(0,0,0,.4);z-index:999}.tui-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.tui-ellipsis-2{display:-webkit-box;overflow:hidden;white-space:normal!important;text-overflow:ellipsis;word-wrap:break-word;-webkit-line-clamp:2;-webkit-box-orient:vertical}.tui-opcity{opacity:.5}.tui-scale-small{transform:scale(.9);transform-origin:center center}.tui-height-full{height:100%}.tui-width-full{width:100%}.tui-ptop-zero{padding-top:0}.tui-pbottom-zero{padding-bottom:0}.tui-pleft-zero{padding-left:0}.tui-pright-zero{padding-right:0}.tui-color-primary{color:#5677fc}.tui-color-success{color:#19be6b}.tui-color-warning{color:#ff7900}.tui-color-error{color:#eb0909}.tui-color-blue{color:#007aff}.tui-color-blue{color:#007aff}.tui-color-white{color:#fff}.tui-color-pink{color:#f74d54}.tui-primary{background-color:#5677fc!important;color:#fff}.tui-light-primary{background-color:#5c8dff!important;color:#fff}.tui-dark-primary{background-color:#4a67d6!important;color:#fff}.tui-dLight-primary{background-color:#4e77d9!important;color:#fff}.tui-danger{background-color:#ed3f14!important;color:#fff}.tui-warning{background-color:#ff7900!important;color:#fff}.tui-blue{background-color:#007aff!important;color:#fff}.tui-green{background-color:#19be6b!important;color:#fff}.tui-black{background-color:#000!important;color:#fff}.tui-white{background-color:#fff!important;color:#333!important}.tui-translucent{background-color:rgba(0,0,0,.7)}.tui-light-black{background-color:#333!important}.tui-gray{background-color:#80848f}.tui-phcolor-gray{background-color:#ccc!important}.tui-divider-gray{background-color:#eaeef1!important}.tui-btn-gray{background-color:#ededed!important;color:#999!important}.tui-hover-gray{background-color:#f7f7f9!important}.tui-bg-gray{background-color:#fafafa!important}.tui-light-blue{background-color:#ecf6fd;color:#4dabeb!important}.tui-light-brownish{background-color:#fcebef;color:#8a5966!important}.tui-light-orange{background-color:#fef5eb;color:#faa851!important}.tui-light-green{background-color:#e8f6e8;color:#44cf85!important}.tui-flex{display:-webkit-flex;display:flex}.tui-flex-1{flex:1}.tui-align-center{justify-content:center}.tui-align-left{justify-content:flex-start!important}.tui-align-right{justify-content:flex-end!important}.tui-align-between{justify-content:space-between!important}.tui-align-around{justify-content:space-around!important}.tui-vertical-center{align-items:center}.tui-vertical-top{align-items:flex-start}.tui-vertical-top{align-items:flex-end}.tui-center{display:flex;align-items:center;justify-content:center}.tui-line-feed{flex-direction:row;flex-wrap:wrap}.tui-col-12{width:100%}.tui-col-11{width:91.66666667%}.tui-col-10{width:83.33333333%}.tui-col-9{width:75%}.tui-col-8{width:66.66666667%}.tui-col-7{width:58.33333333%}.tui-col-6{width:50%}.tui-col-5{width:41.66666667%}.tui-col-4{width:33.33333333%}.tui-col-3{width:25%}.tui-col-2{width:16.66666667%}.tui-col-1{width:8.33333333%}.tui-icon{font-family:thoruiFont!important;font-style:normal;-webkit-font-smoothing:antialiased;text-align:center;text-decoration:none;font-size:32px;color:#999}.tui-icon-about:before{content:'\e772'}.tui-icon-about-fill:before{content:'\e771'}.tui-icon-add:before{content:'\e770'}.tui-icon-add-fill:before{content:'\e76f'}.tui-icon-addmessage:before{content:'\e76e'}.tui-icon-addressbook:before{content:'\e76d'}.tui-icon-agree:before{content:'\e76c'}.tui-icon-agree-fill:before{content:'\e76b'}.tui-icon-alarm:before{content:'\e76a'}.tui-icon-alarm-fill:before{content:'\e769'}.tui-icon-alipay:before{content:'\e768'}.tui-icon-android:before{content:'\e767'}.tui-icon-applets:before{content:'\e766'}.tui-icon-arrowdown:before{content:'\e765'}.tui-icon-arrowleft:before{content:'\e764'}.tui-icon-arrowright:before{content:'\e763'}.tui-icon-arrowup:before{content:'\e762'}.tui-icon-attestation:before{content:'\e761'}.tui-icon-back:before{content:'\e760'}.tui-icon-bag:before{content:'\e75f'}.tui-icon-bag-fill:before{content:'\e75e'}.tui-icon-balloon:before{content:'\e75d'}.tui-icon-bankcard:before{content:'\e75c'}.tui-icon-bankcard-fill:before{content:'\e75b'}.tui-icon-bottom:before{content:'\e75a'}.tui-icon-calendar:before{content:'\e759'}.tui-icon-camera:before{content:'\e758'}.tui-icon-camera-fill:before{content:'\e757'}.tui-icon-camera-add:before{content:'\e756'}.tui-icon-card:before{content:'\e755'}.tui-icon-card-fill:before{content:'\e754'}.tui-icon-cart:before{content:'\e753'}.tui-icon-cart-fill:before{content:'\e752'}.tui-icon-category:before{content:'\e751'}.tui-icon-category-fill:before{content:'\e750'}.tui-icon-check:before{content:'\e74f'}.tui-icon-circle:before{content:'\e74e'}.tui-icon-circle-fill:before{content:'\e74d'}.tui-icon-circle-selected:before{content:'\e74c'}.tui-icon-clock:before{content:'\e74b'}.tui-icon-clock-fill:before{content:'\e74a'}.tui-icon-close:before{content:'\e749'}.tui-icon-close-fill:before{content:'\e748'}.tui-icon-community:before{content:'\e747'}.tui-icon-community-fill:before{content:'\e746'}.tui-icon-computer:before{content:'\e745'}.tui-icon-computer-fill:before{content:'\e744'}.tui-icon-coupon:before{content:'\e743'}.tui-icon-delete:before{content:'\e742'}.tui-icon-deletekey:before{content:'\e741'}.tui-icon-dingtalk:before{content:'\e740'}.tui-icon-dissatisfied:before{content:'\e73f'}.tui-icon-down:before{content:'\e73e'}.tui-icon-download:before{content:'\e73d'}.tui-icon-edit:before{content:'\e73c'}.tui-icon-ellipsis:before{content:'\e73b'}.tui-icon-enlarge:before{content:'\e73a'}.tui-icon-evaluate:before{content:'\e739'}.tui-icon-exchange:before{content:'\e738'}.tui-icon-explain:before{content:'\e737'}.tui-icon-explain-fill:before{content:'\e736'}.tui-icon-explore:before{content:'\e735'}.tui-icon-explore-fill:before{content:'\e734'}.tui-icon-eye:before{content:'\e733'}.tui-icon-feedback:before{content:'\e732'}.tui-icon-fingerprint:before{content:'\e730'}.tui-icon-friendadd:before{content:'\e72f'}.tui-icon-friendadd-fill:before{content:'\e72e'}.tui-icon-gps:before{content:'\e72d'}.tui-icon-histogram:before{content:'\e72c'}.tui-icon-home:before{content:'\e72b'}.tui-icon-home-fill:before{content:'\e72a'}.tui-icon-house:before{content:'\e729'}.tui-icon-imface:before{content:'\e728'}.tui-icon-imkeyboard:before{content:'\e727'}.tui-icon-immore:before{content:'\e726'}.tui-icon-imvoice:before{content:'\e725'}.tui-icon-ios:before{content:'\e724'}.tui-icon-kefu:before{content:'\e723'}.tui-icon-label:before{content:'\e722'}.tui-icon-label-fill:before{content:'\e721'}.tui-icon-like:before{content:'\e720'}.tui-icon-like-fill:before{content:'\e71f'}.tui-icon-link:before{content:'\e71e'}.tui-icon-listview:before{content:'\e71d'}.tui-icon-loading:before{content:'\e71c'}.tui-icon-location:before{content:'\e71b'}.tui-icon-mail:before{content:'\e71a'}.tui-icon-mail-fill:before{content:'\e719'}.tui-icon-manage:before{content:'\e718'}.tui-icon-manage-fill:before{content:'\e717'}.tui-icon-member:before{content:'\e716'}.tui-icon-member-fill:before{content:'\e715'}.tui-icon-message:before{content:'\e714'}.tui-icon-message-fill:before{content:'\e713'}.tui-icon-mobile:before{content:'\e712'}.tui-icon-moments:before{content:'\e711'}.tui-icon-more:before{content:'\e710'}.tui-icon-more-fill:before{content:'\e70f'}.tui-icon-narrow:before{content:'\e70e'}.tui-icon-news:before{content:'\e70d'}.tui-icon-news-fill:before{content:'\e70c'}.tui-icon-nodata:before{content:'\e70b'}.tui-icon-notice:before{content:'\e699'}.tui-icon-notice-fill:before{content:'\e698'}.tui-icon-offline:before{content:'\e697'}.tui-icon-offline-fill:before{content:'\e696'}.tui-icon-oppose:before{content:'\e695'}.tui-icon-oppose-fill:before{content:'\e694'}.tui-icon-order:before{content:'\e693'}.tui-icon-partake:before{content:'\e692'}.tui-icon-people:before{content:'\e691'}.tui-icon-people-fill:before{content:'\e690'}.tui-icon-pic:before{content:'\e68f'}.tui-icon-pic-fill:before{content:'\e68e'}.tui-icon-picture:before{content:'\e68d'}.tui-icon-pie:before{content:'\e68c'}.tui-icon-play:before{content:'\e68b'}.tui-icon-plus:before{content:'\e689'}.tui-icon-polygonal:before{content:'\e688'}.tui-icon-position:before{content:'\e687'}.tui-icon-position-fill:before{content:'\e686'}.tui-icon-pwd:before{content:'\e685'}.tui-icon-qq:before{content:'\e684'}.tui-icon-qrcode:before{content:'\e682'}.tui-icon-redpacket:before{content:'\e681'}.tui-icon-redpacket-fill:before{content:'\e680'}.tui-icon-reduce:before{content:'\e67f'}.tui-icon-refresh:before{content:'\e67e'}.tui-icon-revoke:before{content:'\e67d'}.tui-icon-satisfied:before{content:'\e67c'}.tui-icon-screen:before{content:'\e67b'}.tui-icon-search:before{content:'\e67a'}.tui-icon-search-2:before{content:'\e679'}.tui-icon-send:before{content:'\e678'}.tui-icon-service:before{content:'\e677'}.tui-icon-service-fill:before{content:'\e676'}.tui-icon-setup:before{content:'\e675'}.tui-icon-setup-fill:before{content:'\e674'}.tui-icon-share:before{content:'\e673'}.tui-icon-share-fill:before{content:'\e672'}.tui-icon-shield:before{content:'\e671'}.tui-icon-shop:before{content:'\e670'}.tui-icon-shop-fill:before{content:'\e66f'}.tui-icon-shut:before{content:'\e66e'}.tui-icon-signin:before{content:'\e66d'}.tui-icon-sina:before{content:'\e66c'}.tui-icon-skin:before{content:'\e66b'}.tui-icon-soso:before{content:'\e669'}.tui-icon-square:before{content:'\e668'}.tui-icon-square-fill:before{content:'\e667'}.tui-icon-square-selected:before{content:'\e666'}.tui-icon-star:before{content:'\e665'}.tui-icon-star-fill:before{content:'\e664'}.tui-icon-strategy:before{content:'\e663'}.tui-icon-sweep:before{content:'\e662'}.tui-icon-time:before{content:'\e661'}.tui-icon-time-fill:before{content:'\e660'}.tui-icon-todown:before{content:'\e65f'}.tui-icon-toleft:before{content:'\e65e'}.tui-icon-tool:before{content:'\e65d'}.tui-icon-top:before{content:'\e65c'}.tui-icon-toright:before{content:'\e65b'}.tui-icon-towardsleft:before{content:'\e65a'}.tui-icon-towardsright:before{content:'\e659'}.tui-icon-towardsright-fill:before{content:'\e658'}.tui-icon-transport:before{content:'\e657'}.tui-icon-transport-fill:before{content:'\e656'}.tui-icon-turningdown:before{content:'\e654'}.tui-icon-turningleft:before{content:'\e653'}.tui-icon-turningright:before{content:'\e652'}.tui-icon-turningup:before{content:'\e651'}.tui-icon-unreceive:before{content:'\e650'}.tui-icon-unseen:before{content:'\e64f'}.tui-icon-up:before{content:'\e64e'}.tui-icon-upload:before{content:'\e64c'}.tui-icon-video:before{content:'\e64b'}.tui-icon-voice:before{content:'\e649'}.tui-icon-voice-fill:before{content:'\e648'}.tui-icon-voipphone:before{content:'\e647'}.tui-icon-wallet:before{content:'\e646'}.tui-icon-warning:before{content:'\e645'}.tui-icon-wealth:before{content:'\e644'}.tui-icon-wealth-fill:before{content:'\e643'}.tui-icon-weather:before{content:'\e642'}.tui-icon-wechat:before{content:'\e641'}.tui-icon-wifi:before{content:'\e640'}.tui-btn-primary{background:#5677fc!important;color:#fff}.tui-shadow-primary{box-shadow:0 10rpx 14rpx 0 rgba(86,119,252,.2)}.tui-btn-danger{background:#eb0909!important;color:#fff}.tui-shadow-danger{box-shadow:0 10rpx 14rpx 0 rgba(235,9,9,.2)}.tui-btn-warning{background:#fc872d!important;color:#fff}.tui-shadow-warning{box-shadow:0 10rpx 14rpx 0 rgba(252,135,45,.2)}.tui-btn-green{background:#35b06a!important;color:#fff}.tui-shadow-green{box-shadow:0 10rpx 14rpx 0 rgba(53,176,106,.2)}.tui-btn-blue{background:#007aff!important;color:#fff}.tui-shadow-blue{box-shadow:0 10rpx 14rpx 0 rgba(0,122,255,.2)}.tui-btn-white{background:#fff!important;color:#333!important}.tui-btn-gray{background:#bfbfbf!important;color:#fff!important}.tui-btn-black{background:#333!important;color:#fff!important}.tui-shadow-gray{box-shadow:0 10rpx 14rpx 0 rgba(191,191,191,.2)}.tui-hover-gray{background:#f7f7f9!important}.tui-black-hover{background:#555!important;color:#e5e5e5!important}.tui-btn{width:100%;height:96rpx;line-height:96rpx;font-size:32rpx;position:relative;border:0!important;border-radius:6rpx;padding-left:0;padding-right:0;overflow:visible}.tui-btn-base{width:auto;min-width:200rpx;font-size:30rpx;height:70rpx;line-height:70rpx}.tui-btn-small{width:auto;min-width:140rpx;font-size:30rpx;height:60rpx;line-height:60rpx}.tui-btn::after{content:'';position:absolute;width:200%;height:200%;transform-origin:0 0;transform:scale(.5,.5) translateZ(0);box-sizing:border-box;left:0;top:0;border-radius:12rpx;border:0}.tui-btn-white::after{border:1rpx solid #bfbfbf}.tui-white-hover{background:#e5e5e5!important;color:#2e2e2e!important}.tui-dark-disabled{opacity:.6!important;color:#fafbfc!important}.tui-dark-disabled-outline{opacity:.5!important}.tui-gray-disabled{background:#f3f3f3!important;color:#919191!important;box-shadow:none}.tui-outline-hover{opacity:.5}.tui-primary-hover{background:#4a67d6!important;color:#e5e5e5!important}.tui-primary-outline::after{border:1rpx solid #5677fc!important}.tui-primary-outline{color:#5677fc!important;background:0 0}.tui-danger-hover{background:#c80808!important;color:#e5e5e5!important}.tui-danger-outline{color:#eb0909!important;background:0 0}.tui-danger-outline::after{border:1rpx solid #eb0909!important}.tui-warning-hover{background:#d67326!important;color:#e5e5e5!important}.tui-warning-outline{color:#fc872d!important;background:0 0}.tui-warning-outline::after{border:1px solid #fc872d!important}.tui-green-hover{background:#2d965a!important;color:#e5e5e5!important}.tui-green-outline{color:#35b06a!important;background:0 0}.tui-green-outline::after{border:1rpx solid #35b06a!important}.tui-blue-hover{background:#0062cc!important;color:#e5e5e5!important}.tui-blue-outline{color:#007aff!important;background:0 0}.tui-blue-outline::after{border:1rpx solid #007aff!important}.tui-btn-gradual{background:linear-gradient(90deg,#ff5926,#f00e2c)!important;color:#fff!important}.tui-shadow-gradual{box-shadow:0 10rpx 14rpx 0 rgba(235,9,9,.15)}.tui-gray-hover{background:#a3a3a3!important;color:#898989}.tui-gradual-hover{background:linear-gradient(90deg,#d74620,#cd1225)!important;color:#fff!important}.tui-gray-outline{color:#999!important;background:0 0!important}.tui-white-outline{color:#fff!important;background:0 0!important}.tui-black-outline{background:0 0!important;color:#333!important}.tui-gray-outline::after{border:1rpx solid #ccc!important}.tui-white-outline::after{border:1px solid #fff!important}.tui-black-outline::after{border:1px solid #333!important}.tui-fillet{border-radius:50rpx}.tui-btn-white.tui-fillet::after{border-radius:98rpx}.tui-outline-fillet::after{border-radius:98rpx}.tui-rightAngle{border-radius:0}.tui-btn-white.tui-rightAngle::after{border-radius:0}.tui-outline-rightAngle::after{border-radius:0}.tui-tag{padding:16rpx 26rpx;font-size:28rpx;display:flex;align-items:center;justify-content:center;border-radius:6rpx}.tui-tag-outline{position:relative;background-color:none;color:#5677fc}.tui-tag-outline::after{content:'';position:absolute;width:200%;height:200%;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scale(.5,.5);transform:scale(.5,.5);-webkit-box-sizing:border-box;box-sizing:border-box;left:0;top:0;border-radius:12rpx}.tui-tag-fillet{border-radius:50rpx}.tui-white.tui-tag-fillet::after{border-radius:80rpx}.tui-tag-outline-fillet::after{border-radius:80rpx}.tui-tag-fillet-left{border-radius:50rpx 0 0 50rpx}.tui-tag-fillet-right{border-radius:0 50rpx 50rpx 0}.tui-tag-fillet-left.tui-tag-outline::after{border-radius:100rpx 0 0 100rpx}.tui-tag-fillet-right.tui-tag-outline::after{border-radius:0 100rpx 100rpx 0}.tui-badge-dot{height:16rpx;width:16rpx;border-radius:50%}.tui-badge{font-size:24rpx;height:36rpx;min-width:12rpx;padding:0 12rpx;border-radius:36rpx;display:flex;align-items:center;justify-content:center;z-index:10}.tui-badge-scale{transform-origin:center center}.tui-list-cell{position:relative;width:100%;padding:26rpx 30rpx;background-color:#fff;box-sizing:border-box}.tui-list-radius{border-radius:6rpx;overflow:hidden}.tui-cell-hover{background-color:#f1f1f1!important}.tui-list-cell::after{content:'';position:absolute;border-bottom:1rpx solid #eaeef1;-webkit-transform:scaleY(.5) translateZ(0);transform:scaleY(.5) translateZ(0);transform-origin:0 100%;bottom:0;right:0;left:0}.tui-line-left::after{left:30rpx!important}.tui-line-right::after{right:30rpx!important}.tui-cell-unlined::after{border-bottom:0!important}.tui-cell-arrow::before{content:' ';height:10px;width:10px;border-width:2px 2px 0 0;border-color:silver;border-style:solid;-webkit-transform:matrix(.5,.5,-.5,.5,0,0);transform:matrix(.5,.5,-.5,.5,0,0);position:absolute;top:50%;margin-top:-6px;right:30rpx}.tui-arrow-right::before{right:0!important}.tui-arrow-gray::before{border-color:#666!important}.tui-arrow-white::before{border-color:#fff!important}.tui-arrow-warning::before{border-color:#ff7900!important}.tui-arrow-success::before{border-color:#19be6b!important}.tui-arrow-danger::before{border-color:#eb0909!important}.tui-card{margin:0 30rpx;font-size:28rpx;background-color:#fff;border-radius:10rpx;box-shadow:0 0 10rpx #eee;box-sizing:border-box;overflow:hidden}.tui-card-full{margin:0!important;border-radius:0!important}.tui-card-full::after{border-radius:0!important}.tui-card-border{position:relative;box-shadow:none!important}.tui-card-border::after{content:' ';position:absolute;height:200%;width:200%;border:1px solid #ddd;transform-origin:0 0;-webkit-transform-origin:0 0;-webkit-transform:scale(.5);transform:scale(.5);left:0;top:0;border-radius:20rpx;box-sizing:border-box;pointer-events:none}.tui-card-header{width:100%;padding:20rpx;display:flex;align-items:center;justify-content:space-between;position:relative;box-sizing:border-box;overflow:hidden;border-top-left-radius:10rpx;border-top-right-radius:10rpx}.tui-card-header::after{content:'';position:absolute;border-bottom:1rpx solid #eaeef1;-webkit-transform:scaleY(.5);transform:scaleY(.5);bottom:0;right:0;left:0;pointer-events:none}.tui-header-line::after{border-bottom:0!important}.tui-header-thumb{height:60rpx;width:60rpx;vertical-align:middle;margin-right:20rpx;border-radius:6rpx}.tui-thumb-circle{border-radius:50%!important}.tui-header-title{display:inline-block;font-size:30rpx;color:#7a7a7a;vertical-align:middle;max-width:460rpx;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.tui-header-right{font-size:24rpx;color:#b2b2b2}.tui-card-body{font-size:32rpx;color:#262b3a;box-sizing:border-box}.tui-card-footer{font-size:28rpx;color:#596d96;border-bottom-left-radius:10rpx;border-bottom-right-radius:10rpx;box-sizing:border-box}.tui-grids{width:100%;position:relative;overflow:hidden}.tui-grids::after{content:" ";position:absolute;left:0;top:0;width:100%;height:1px;border-top:1px solid #eaeef1;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.tui-border-top::after{border-top:0!important}.tui-grid{position:relative;padding:40rpx 20rpx;box-sizing:border-box;background:#fff;float:left}.tui-grid-2{width:50%}.tui-grid-3{width:33.333333333%}.tui-grid-4{width:25%;padding:30rpx 20rpx!important}.tui-grid-5{width:20%;padding:20rpx!important}.tui-grid-2:nth-of-type(2n)::before{width:0;border-right:0}.tui-grid-3:nth-of-type(3n)::before{width:0;border-right:0}.tui-grid-4:nth-of-type(4n)::before{width:0;border-right:0}.tui-grid-5:nth-of-type(5n)::before{width:0;border-right:0}.tui-grid::before{content:" ";position:absolute;right:0;top:0;width:1px;bottom:0;border-right:1px solid #eaeef1;-webkit-transform-origin:100% 0;transform-origin:100% 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.tui-grid::after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #eaeef1;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.tui-grid-bottom::after{height:0!important;border-bottom:0!important}.tui-grid-bg{position:relative;padding:0;width:100%;box-sizing:border-box}.tui-item-hover{background-color:#f7f7f9!important}.tui-loading-init{min-width:200rpx;min-height:200rpx;max-width:500rpx;display:flex;align-items:center;justify-content:center;flex-direction:column;position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);z-index:9999;font-size:26rpx;color:#fff;background-color:rgba(0,0,0,.7);border-radius:10rpx}.tui-loading-center{width:50rpx;height:50rpx;border:3px solid #fff;border-radius:50%;margin:0 6px;display:inline-block;vertical-align:middle;clip-path:polygon(0 0,100% 0,100% 40%,0 40%);animation:rotate 1s linear infinite;margin-bottom:36rpx}.tui-loadmore-tips{text-align:center;padding:0 20rpx;box-sizing:border-box}@-webkit-keyframes rotate{from{transform:rotatez(0)}to{transform:rotatez(360deg)}}@keyframes rotate{from{transform:rotatez(0)}to{transform:rotatez(360deg)}}.tui-loadmore{width:48%;margin:1.5em auto;line-height:1.5em;font-size:24rpx;text-align:center}.tui-loading-1{margin:0 5px;width:20px;height:20px;display:inline-block;vertical-align:middle;-webkit-animation:a 1s steps(12) infinite;animation:a 1s steps(12) infinite;background:transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;background-size:100%}@-webkit-keyframes a{0%{-webkit-transform:rotate(0);transform:rotate(0)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes a{0%{-webkit-transform:rotate(0);transform:rotate(0)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.tui-loadmore-tips{display:inline-block;vertical-align:middle}.tui-loading-2{width:28rpx;height:28rpx;border:1px solid #8f8d8e;border-radius:50%;margin:0 6px;display:inline-block;vertical-align:middle;clip-path:polygon(0 0,100% 0,100% 30%,0 30%);animation:rotate 1s linear infinite}@-webkit-keyframes rotate{from{transform:rotatez(0)}to{transform:rotatez(360deg)}}@keyframes rotate{from{transform:rotatez(0)}to{transform:rotatez(360deg)}}.tui-loading-3{display:inline-block;margin:0 6px;vertical-align:middle;width:28rpx;height:28rpx;background:0 0;border-radius:50%;border:2px solid;border-color:#e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;animation:tui-rotate .7s linear infinite}.tui-loading-3.tui-loading-primary{border-color:#e5e5e5 #e5e5e5 #e5e5e5 #5677fc}.tui-loading-3.tui-loading-green{border-color:#e5e5e5 #e5e5e5 #e5e5e5 #19be6b}.tui-loading-3.tui-loading-orange{border-color:#e5e5e5 #e5e5e5 #e5e5e5 #ff7900}.tui-loading-3.tui-loading-red{border-color:#ededed #ededed #ededed #ed3f14}@-webkit-keyframes tui-rotate{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}@keyframes tui-rotate{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}.tui-loadmore-none{width:50%;margin:1.5em auto;line-height:1.5em;font-size:24rpx;display:flex;justify-content:center}.tui-nomore{width:100%;height:100%;position:relative;display:flex;justify-content:center;margin-top:10rpx;padding-bottom:6rpx}.tui-nomore::before{content:' ';position:absolute;border-bottom:1rpx solid #e5e5e5;-webkit-transform:scaleY(.5);transform:scaleY(.5);width:100%;top:18rpx;left:0}.tui-nomore-text{color:#999;font-size:24rpx;text-align:center;padding:0 18rpx;height:36rpx;line-height:36rpx;position:relative;z-index:1}.tui-nomore-dot{position:relative;text-align:center;-webkit-display:flex;display:flex;-webkit-justify-content:center;justify-content:center;margin-top:10rpx;padding-bottom:6rpx}.tui-nomore-dot::before{content:'';position:absolute;border-bottom:1rpx solid #e5e5e5;-webkit-transform:scaleY(.5);transform:scaleY(.5);width:360rpx;top:18rpx}.tui-dot-text{position:relative;color:#e5e5e5;font-size:10px;text-align:center;width:50rpx;height:36rpx;line-height:36rpx;-webkit-transform:scale(.8);transform:scale(.8);-webkit-transform-origin:center center;transform-origin:center center;z-index:1}.tui-footer{width:100%;overflow:hidden;padding:30rpx 24rpx;box-sizing:border-box;font-size:24rpx;color:#a7a7a7}.tui-fixed{position:fixed;z-index:9999;bottom:0;bottom:env(safe-area-inset-bottom)}.tui-footer-link{color:#596d96;display:flex;align-items:center;justify-content:center;font-size:28rpx}.tui-link{position:relative;padding:0 18rpx;line-height:1}.tui-link::before{content:" ";position:absolute;right:0;top:0;width:1px;bottom:0;border-right:1px solid #d3d3d3;-webkit-transform-origin:100% 0;transform-origin:100% 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.tui-link:last-child::before{border-right:0!important}.tui-link-hover{opacity:.5}.tui-footer-copyright{font-size:24rpx;color:#a7a7a7;line-height:1;text-align:center;padding-top:16rpx}.tui-triangle{border:16rpx solid;width:0;height:0}.tui-triangle-left{border-color:transparent #5c8dff transparent transparent}.tui-triangle-right{border-color:transparent transparent transparent #5c8dff}.tui-triangle-top{border-color:transparent transparent #5c8dff transparent}.tui-triangle-bottom{border-color:#5c8dff transparent transparent transparent}.tui-parallelogram{width:100rpx;height:50rpx;transform:skew(-10deg);background:#19be6b;margin-left:10rpx}.tui-crescent{width:60rpx;height:60rpx;border-radius:50%;box-shadow:12rpx 12rpx 0 0 #9acd32}.tui-chatbox{max-width:60%;border-radius:10rpx;position:relative;padding:20rpx 26rpx;font-size:28rpx;color:#fff}.tui-chatbox-left{background:#5c8dff;border:1rpx solid #5c8dff;display:inline-block}.tui-chatbox-right{background:#19be6b;border:1rpx solid #19be6b}.tui-chatbox::before{content:"";position:absolute;width:0;height:0;top:20rpx;border:16rpx solid}.tui-chatbox-left::before{right:100%;border-color:transparent #5c8dff transparent transparent}.tui-chatbox-right::before{left:100%;border-color:transparent transparent transparent #19be6b}.tui-checkbox .wx-checkbox-input{width:36rpx;height:36rpx;border-radius:50%;margin:0}.tui-checkbox .wx-checkbox-input.wx-checkbox-input-checked{background:#f82400;width:40rpx;height:40rpx;border:none}.tui-textarea-box{border-radius:4rpx;height:280rpx;box-sizing:border-box;padding:20rpx 20rpx 0 20rpx;position:relative}.tui-textarea-box::after{content:'';position:absolute;height:200%;width:200%;border:1px solid #e6e6e6;transform-origin:0 0;-webkit-transform-origin:0 0;-webkit-transform:scale(.5);transform:scale(.5);left:0;top:0;border-radius:8rpx;pointer-events:none}.tui-textarea{height:210rpx;width:100%;color:#666;font-size:28rpx;z-index:2}.tui-phcolor-color{color:#ccc!important}.tui-textarea-counter{font-size:24rpx;color:#999;text-align:right;height:40rpx;line-height:40rpx;padding-top:4rpx}.tui-input-item{width:100%;display:flex;align-items:center;font-size:32rpx}.tui-input{flex:1;font-size:32rpx;overflow:visible}.tui-input-title{min-width:140rpx;padding-right:12rpx;flex-shrink:0}.tui-phcolor{color:#ccc;font-size:32rpx;overflow:visible}.tui-input-border{padding:20rpx 30rpx;border-radius:4rpx;position:relative;font-size:32rpx}.tui-input-border::after{content:'';position:absolute;height:200%;width:200%;border:1px solid #e6e6e6;transform-origin:0 0;-webkit-transform-origin:0 0;-webkit-transform:scale(.5);transform:scale(.5);left:0;top:0;border-radius:8rpx;pointer-events:none}.tui-text-right{text-align:right}.tui-upload-box{width:100%;display:flex;flex-wrap:wrap}.tui-upload-item{width:220rpx;height:220rpx;position:relative;margin-right:20rpx;margin-bottom:20rpx}.tui-upload-item:nth-of-type(3n){margin-right:0}.tui-upload-img{width:220rpx;height:220rpx;display:block}.tui-upload-del{position:absolute;right:-18rpx;top:-18rpx;display:flex;align-items:center;justify-content:center}.tui-upload-add{width:220rpx;height:220rpx;font-size:68rpx;font-weight:100;color:#888;background-color:#f7f7f7;display:flex;align-items:center;justify-content:center;padding:0}.tui-operation{width:100%;height:100rpx;box-sizing:border-box;overflow:hidden;background:rgba(255,255,255,.9);position:relative;display:flex;align-items:center;justify-content:space-between}.tui-operation::before{content:'';position:absolute;top:0;right:0;left:0;border-top:1rpx solid #eaeef1;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.tui-operation-left{display:flex;align-items:center}.tui-operation-item{flex:1;display:flex;align-items:center;justify-content:center;flex-direction:column;position:relative}.tui-operation-text{font-size:22rpx;color:#333}.tui-operation-right{flex:1;height:100rpx;box-sizing:border-box;padding-top:0}.tui-relative{position:relative}.tui-btn-comment{height:64rpx;width:84%;background:#ededed;color:#999;border-radius:8rpx;font-size:28rpx;display:flex;align-items:center;padding-left:20rpx;box-sizing:border-box;padding-top:0;margin-left:30rpx}.tui-chat-operation{background:#f6f6f6!important;padding-right:18rpx;box-sizing:border-box}.tui-input-box{width:78%;justify-content:flex-start}.tui-chat-input{background:#fff;height:72rpx;border-radius:6rpx;padding-left:20rpx;padding-right:20rpx;flex:1}.tui-voice-icon{margin-left:20rpx;margin-right:20rpx}
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..a05adb4
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,76 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color:#333;//基本色
+$uni-text-color-inverse:#fff;//反色
+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable:#c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color:#ffffff;
+$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color:#c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm:12px;
+$uni-font-size-base:14px;
+$uni-font-size-lg:16;
+
+/* 图片尺寸 */
+$uni-img-size-sm:20px;
+$uni-img-size-base:26px;
+$uni-img-size-lg:40px;
+
+/* Border Radius */
+$uni-border-radius-sm: 2px;
+$uni-border-radius-base: 3px;
+$uni-border-radius-lg: 6px;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 5px;
+$uni-spacing-row-base: 10px;
+$uni-spacing-row-lg: 15px;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 4px;
+$uni-spacing-col-base: 8px;
+$uni-spacing-col-lg: 12px;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2C405A; // 文章标题颜色
+$uni-font-size-title:20px;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle:26px;
+$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-font-size-paragraph:15px;
diff --git a/uni_modules/qiun-data-charts/changelog.md b/uni_modules/qiun-data-charts/changelog.md
new file mode 100644
index 0000000..4829f18
--- /dev/null
+++ b/uni_modules/qiun-data-charts/changelog.md
@@ -0,0 +1,246 @@
+## 2.4.3-20220505（2022-05-05）
+- 秋云图表组件 修复开启canvas2d后将series赋值为空数组显示加载图标时，再次赋值后画布闪动的bug
+- 秋云图表组件 修复升级hbx最新版后ECharts的highlight方法报错的bug
+- uCharts.js 雷达图新增参数opts.extra.radar.gridEval，数据点位网格抽希，默认1
+- uCharts.js 雷达图新增参数opts.extra.radar.axisLabel，	是否显示刻度点值，默认false
+- uCharts.js 雷达图新增参数opts.extra.radar.axisLabelTofix，刻度点值小数位数，默认0
+- uCharts.js 雷达图新增参数opts.extra.radar.labelPointShow，是否显示末端刻度圆点，默认false
+- uCharts.js 雷达图新增参数opts.extra.radar.labelPointRadius，刻度圆点的半径，默认3
+- uCharts.js 雷达图新增参数opts.extra.radar.labelPointColor，刻度圆点的颜色，默认#cccccc
+- uCharts.js 雷达图新增参数opts.extra.radar.linearType，渐变色类型，可选值"none"关闭渐变,"custom"开启渐变
+- uCharts.js 雷达图新增参数opts.extra.radar.customColor，自定义渐变颜色，数组类型对应series的数组长度以匹配不同series颜色的不同配色方案，例如["#FA7D8D", "#EB88E2"]
+- uCharts.js 雷达图优化支持series.textColor、series.textSize属性
+- uCharts.js 柱状图中温度计式图标，优化支持全圆角类型，修复边框有缝隙的bug，详见官网【演示】中的温度计图表
+- uCharts.js 柱状图新增参数opts.extra.column.activeWidth，当前点击柱状图的背景宽度，默认一个单元格单位
+- uCharts.js 混合图增加opts.extra.mix.area.gradient 区域图是否开启渐变色
+- uCharts.js 混合图增加opts.extra.mix.area.opacity 区域图透明度，默认0.2
+- uCharts.js 饼图、圆环图、玫瑰图、漏斗图，增加opts.series[0].data[i].labelText，自定义标签文字，避免formatter格式化的繁琐，详见官网【演示】中的饼图
+- uCharts.js 饼图、圆环图、玫瑰图、漏斗图，增加opts.series[0].data[i].labelShow，自定义是否显示某一个指示标签，避免因饼图类别太多导致标签重复或者居多导致图形变形的问题，详见官网【演示】中的饼图
+- uCharts.js 增加opts.series[i].legendText/opts.series[0].data[i].legendText（与series.name同级）自定义图例显示文字的方法
+- uCharts.js 优化X轴、Y轴formatter格式化方法增加形参，统一为fromatter:function(value,index,opts){}
+- uCharts.js 修复横屏模式下无法使用双指缩放方法的bug
+- uCharts.js 修复当只有一条数据或者多条数据值相等的时候Y轴自动计算的最大值错误的bug
+- 【官网模板】增加外部自定义图例与图表交互的例子，[点击跳转](https://www.ucharts.cn/v2/#/layout/info?id=2)
+
+## 注意：非unimodules 版本如因更新 hbx 至 3.4.7 导致报错如下，请到码云更新非 unimodules 版本组件，[点击跳转](https://gitee.com/uCharts/uCharts/tree/master/uni-app/uCharts-%E7%BB%84%E4%BB%B6)
+> Error in callback for immediate watcher "uchartsOpts": "SyntaxError: Unexpected token u in JSON at position 0"
+## 2.4.2-20220421（2022-04-21）
+- 秋云图表组件 修复HBX升级3.4.6.20220420版本后echarts报错的问题
+## 2.4.2-20220420（2022-04-20）
+## 重要！此版本uCharts新增了很多功能，修复了诸多已知问题
+- 秋云图表组件 新增onzoom开启双指缩放功能（仅uCharts），前提需要直角坐标系类图表类型，并且ontouch为true、opts.enableScroll为true，详见实例项目K线图
+- 秋云图表组件 新增optsWatch是否监听opts变化，关闭optsWatch后，动态修改opts不会触发图表重绘
+- 秋云图表组件 修复开启canvas2d功能后，动态更新数据后画布闪动的bug
+- 秋云图表组件 去除directory属性，改为自动获取echarts.min.js路径（升级不受影响）
+- 秋云图表组件 增加getImage()方法及@getImage事件，通过ref调用getImage()方法获，触发@getImage事件获取当前画布的base64图片文件流。
+- 秋云图表组件 支付宝、字节跳动、飞书、快手小程序支持开启canvas2d同层渲染设置。
+- 秋云图表组件 新增加【非uniCloud】版本组件，避免有些不需要uniCloud的使用组件发布至小程序需要提交隐私声明问题，请到码云[【非uniCloud版本】](https://gitee.com/uCharts/uCharts/tree/master/uni-app/uCharts-%E7%BB%84%E4%BB%B6)，或npm[【非uniCloud版本】](https://www.npmjs.com/package/@qiun/uni-ucharts)下载使用。
+- uCharts.js 新增dobuleZoom双指缩放功能
+- uCharts.js 新增山峰图type="mount"，数据格式为饼图类格式，不需要传入categories，具体详见新版官网在线演示
+- uCharts.js 修复折线图当数据中存在null时tooltip报错的bug
+- uCharts.js 修复饼图类当画布比较小时自动计算的半径是负数报错的bug
+- uCharts.js 统一各图表类型的series.formatter格式化方法的形参为(val, index, series, opts)，方便格式化时有更多参数可用
+- uCharts.js 标记线功能增加labelText自定义显示文字，增加labelAlign标签显示位置（左侧或右侧），增加标签显示位置微调labelOffsetX、labelOffsetY
+- uCharts.js 修复条状图当数值很小时开启圆角后样式错误的bug
+- uCharts.js 修复X轴开启disabled后，X轴仍占用空间的bug
+- uCharts.js 修复X轴开启滚动条并且开启rotateLabel后，X轴文字与滚动条重叠的bug
+- uCharts.js 增加X轴rotateAngle文字旋转自定义角度，取值范围(-90至90)
+- uCharts.js 修复地图文字标签层级显示不正确的bug
+- uCharts.js 修复饼图、圆环图、玫瑰图当数据全部为0的时候不显示数据标签的bug
+- uCharts.js 修复当opts.padding上边距为0时，Y轴顶部刻度标签位置不正确的bug
+
+## 另外我们还开发了各大原生小程序组件，已发布至码云和npm
+[https://gitee.com/uCharts/uCharts](https://gitee.com/uCharts/uCharts)
+[https://www.npmjs.com/~qiun](https://www.npmjs.com/~qiun)
+
+## 对于原生uCharts文档我们已上线新版官方网站，详情点击下面链接进入官网
+[https://www.uCharts.cn/v2/](https://www.ucharts.cn/v2/)
+## 2.3.7-20220122（2022-01-22）
+## 重要！使用vue3编译，请使用cli模式并升级至最新依赖，HbuilderX编译需要使用3.3.8以上版本
+- uCharts.js 修复uni-app平台组件模式使用vue3编译到小程序报错的bug。
+## 2.3.7-20220118（2022-01-18）
+## 注意，使用vue3的前提是需要3.3.8.20220114-alpha版本的HBuilder！
+## 2.3.67-20220118（2022-01-18）
+- 秋云图表组件 组件初步支持vue3，全端编译会有些问题，具体详见下面修改：
+1. 小程序端运行时，在uni_modules文件夹的qiun-data-charts.js中搜索 new uni_modules_qiunDataCharts_js_sdk_uCharts_uCharts.uCharts，将.uCharts去掉。
+2. 小程序端发行时，在uni_modules文件夹的qiun-data-charts.js中搜索 new e.uCharts，将.uCharts去掉，变为 new e。
+3. 如果觉得上述步骤比较麻烦，如果您的项目只编译到小程序端，可以修改u-charts.js最后一行导出方式，将 export default uCharts;变更为 export default { uCharts: uCharts }; 这样变更后，H5和App端的renderjs会有问题，请开发者自行选择。（此问题非组件问题，请等待DC官方修复Vue3的小程序端）
+## 2.3.6-20220111（2022-01-11）
+- 秋云图表组件 修改组件 props 属性中的 background 默认值为 rgba(0,0,0,0)
+## 2.3.6-20211201（2021-12-01）
+- uCharts.js 修复bar条状图开启圆角模式时，值很小时圆角渲染错误的bug
+## 2.3.5-20211014（2021-10-15）
+- uCharts.js 增加vue3的编译支持（仅原生uCharts，qiun-data-charts组件后续会支持，请关注更新）
+## 2.3.4-20211012（2021-10-12）
+- 秋云图表组件 修复 mac os x 系统 mouseover 事件丢失的 bug
+## 2.3.3-20210706（2021-07-06）
+- uCharts.js 增加雷达图开启数据点值（opts.dataLabel）的显示
+## 2.3.2-20210627（2021-06-27）
+- 秋云图表组件 修复tooltipCustom个别情况下传值不正确报错TypeError: Cannot read property 'name' of undefined的bug
+## 2.3.1-20210616（2021-06-16）
+- uCharts.js 修复圆角柱状图使用4角圆角时，当数值过大时不正确的bug
+## 2.3.0-20210612（2021-06-12）
+- uCharts.js 【重要】uCharts增加nvue兼容，可在nvue项目中使用gcanvas组件渲染uCharts，[详见码云uCharts-demo-nvue](https://gitee.com/uCharts/uCharts)
+- 秋云图表组件 增加tapLegend属性，是否开启图例点击交互事件
+- 秋云图表组件 getIndex事件中增加返回uCharts实例中的opts参数，以便在页面中调用参数
+- 示例项目 pages/other/other.vue增加app端自定义tooltip的方法，详见showOptsTooltip方法
+## 2.2.1-20210603（2021-06-03）
+- uCharts.js 修复饼图、圆环图、玫瑰图，当起始角度不为0时，tooltip位置不准确的bug
+- uCharts.js 增加温度计式柱状图开启顶部半圆形的配置
+## 2.2.0-20210529（2021-05-29）
+- uCharts.js 增加条状图type="bar"
+- 示例项目 pages/ucharts/ucharts.vue增加条状图的demo
+## 2.1.7-20210524（2021-05-24）
+- uCharts.js 修复大数据量模式下曲线图不平滑的bug
+## 2.1.6-20210523（2021-05-23）
+- 秋云图表组件 修复小程序端开启滚动条更新数据后滚动条位置不符合预期的bug
+## 2.1.5-2021051702（2021-05-17）
+- uCharts.js 修复自定义Y轴min和max值为0时不能正确显示的bug
+## 2.1.5-20210517（2021-05-17）
+- uCharts.js 修复Y轴自定义min和max时，未按指定的最大值最小值显示坐标轴刻度的bug
+## 2.1.4-20210516（2021-05-16）
+- 秋云图表组件 优化onWindowResize防抖方法
+- 秋云图表组件 修复APP端uCharts更新数据时，清空series显示loading图标后再显示图表，图表抖动的bug
+- uCharts.js 修复开启canvas2d后，x轴、y轴、series自定义字体大小未按比例缩放的bug
+- 示例项目 修复format-e.vue拼写错误导致app端使用uCharts渲染图表
+## 2.1.3-20210513（2021-05-13）
+- 秋云图表组件 修改uCharts变更chartData数据为updateData方法，支持带滚动条的数据动态打点
+- 秋云图表组件 增加onWindowResize防抖方法 fix by ど誓言，如尘般染指流年づ 
+- 秋云图表组件 H5或者APP变更chartData数据显示loading图表时，原数据闪现的bug
+- 秋云图表组件 props增加errorReload禁用错误点击重新加载的方法
+- uCharts.js 增加tooltip显示category（x轴对应点位）标题的功能，opts.extra.tooltip.showCategory，默认为false
+- uCharts.js 修复mix混合图只有柱状图时，tooltip的分割线显示位置不正确的bug
+- uCharts.js 修复开启滚动条，图表在拖动中动态打点，滚动条位置不正确的bug
+- uCharts.js 修复饼图类数据格式为echarts数据格式，series为空数组报错的bug
+- 示例项目 修改uCharts.js更新到v2.1.2版本后，@getIndex方法获取索引值变更为e.currentIndex.index
+- 示例项目 pages/updata/updata.vue增加滚动条拖动更新（数据动态打点）的demo
+- 示例项目 pages/other/other.vue增加errorReload禁用错误点击重新加载的demo
+## 2.1.2-20210509（2021-05-09）
+秋云图表组件 修复APP端初始化时就传入chartData或lacaldata不显示图表的bug
+## 2.1.1-20210509（2021-05-09）
+- 秋云图表组件 变更ECharts的eopts配置在renderjs内执行，支持在config-echarts.js配置文件内写function配置。
+- 秋云图表组件 修复APP端报错Prop being mutated: "onmouse"错误的bug。
+- 秋云图表组件 修复APP端报错Error: Not Found：Page[6][-1,27] at view.umd.min.js:1的bug。
+## 2.1.0-20210507（2021-05-07）
+- 秋云图表组件 修复初始化时就有数据或者数据更新的时候loading加载动画闪动的bug
+- uCharts.js 修复x轴format方法categories为字符串类型时返回NaN的bug
+- uCharts.js 修复series.textColor、legend.fontColor未执行全局默认颜色的bug
+## 2.1.0-20210506（2021-05-06）
+- 秋云图表组件 修复极个别情况下报错item.properties undefined的bug
+- 秋云图表组件 修复极个别情况下关闭加载动画reshow不起作用，无法显示图表的bug
+- 示例项目 pages/ucharts/ucharts.vue 增加时间轴折线图（type="tline"）、时间轴区域图（type="tarea"）、散点图（type="scatter"）、气泡图demo（type="bubble"）、倒三角形漏斗图（opts.extra.funnel.type="triangle"）、金字塔形漏斗图（opts.extra.funnel.type="pyramid"）
+- 示例项目 pages/format-u/format-u.vue 增加X轴format格式化示例
+- uCharts.js 升级至v2.1.0版本
+- uCharts.js 修复 玫瑰图面积模式点击tooltip位置不正确的bug
+- uCharts.js 修复 玫瑰图点击图例，只剩一个类别显示空白的bug
+- uCharts.js 修复 饼图类图点击图例，其他图表tooltip位置某些情况下不准的bug
+- uCharts.js 修复 x轴为矢量轴（时间轴）情况下，点击tooltip位置不正确的bug
+- uCharts.js 修复 词云图获取点击索引偶尔不准的bug
+- uCharts.js 增加 直角坐标系图表X轴format格式化方法（原生uCharts.js用法请使用formatter）
+- uCharts.js 增加 漏斗图扩展配置，倒三角形（opts.extra.funnel.type="triangle"），金字塔形（opts.extra.funnel.type="pyramid"）
+- uCharts.js 增加 散点图（opts.type="scatter"）、气泡图（opts.type="bubble"）
+- 后期计划 完善散点图、气泡图，增加markPoints标记点，增加横向条状图。
+## 2.0.0-20210502（2021-05-02）
+- uCharts.js 修复词云图获取点击索引不正确的bug
+## 2.0.0-20210501（2021-05-01）
+- 秋云图表组件 修复QQ小程序、百度小程序在关闭动画效果情况下，v-for循环使用图表，显示不正确的bug
+## 2.0.0-20210426（2021-04-26）
+- 秋云图表组件 修复QQ小程序不支持canvas2d的bug
+- 秋云图表组件 修复钉钉小程序某些情况点击坐标计算错误的bug
+- uCharts.js 增加 extra.column.categoryGap 参数，柱状图类每个category点位（X轴点）柱子组之间的间距
+- uCharts.js 增加 yAxis.data[i].titleOffsetY 参数，标题纵向偏移距离，负数为向上偏移，正数向下偏移
+- uCharts.js 增加 yAxis.data[i].titleOffsetX 参数，标题横向偏移距离，负数为向左偏移，正数向右偏移
+- uCharts.js 增加 extra.gauge.labelOffset 参数，仪表盘标签文字径向便宜距离，默认13px
+## 2.0.0-20210422-2（2021-04-22）
+秋云图表组件 修复 formatterAssign 未判断 args[key] == null 的情况导致栈溢出的 bug
+## 2.0.0-20210422（2021-04-22）
+- 秋云图表组件 修复H5、APP、支付宝小程序、微信小程序canvas2d模式下横屏模式的bug
+## 2.0.0-20210421（2021-04-21）
+- uCharts.js 修复多行图例的情况下，图例在上方或者下方时，图例float为左侧或者右侧时，第二行及以后的图例对齐方式不正确的bug
+## 2.0.0-20210420（2021-04-20）
+- 秋云图表组件 修复微信小程序开启canvas2d模式后，windows版微信小程序不支持canvas2d模式的bug
+- 秋云图表组件 修改非uni_modules版本为v2.0版本qiun-data-charts组件
+## 2.0.0-20210419（2021-04-19）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧绿色【使用HBuilderX导入插件】即可使用，示例项目请点击右侧蓝色按钮【使用HBuilderX导入示例项目】。
+## 初次使用如果提示未注册&lt;qiun-data-charts&gt;组件，请重启HBuilderX，如仍不好用，请重启电脑；
+## 如果是cli项目，请尝试清理node_modules，重新install，还不行就删除项目，再重新install。
+## 此问题已于DCloud官方确认，HBuilderX下个版本会修复。
+## 其他图表不显示问题详见[常见问题选项卡](https://demo.ucharts.cn)
+## <font color=#FF0000> 新手请先完整阅读帮助文档及常见问题3遍，右侧蓝色按钮示例项目请看2遍！ </font> 
+## [DEMO演示及在线生成工具（v2.0文档）https://demo.ucharts.cn](https://demo.ucharts.cn)
+## [图表组件在项目中的应用参见 UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- uCharts.js 修复混合图中柱状图单独设置颜色不生效的bug
+- uCharts.js 修复多Y轴单独设置fontSize时，开启canvas2d后，未对应放大字体的bug
+## 2.0.0-20210418（2021-04-18）
+- 秋云图表组件 增加directory配置，修复H5端history模式下如果发布到二级目录无法正确加载echarts.min.js的bug
+## 2.0.0-20210416（2021-04-16）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧绿色【使用HBuilderX导入插件】即可使用，示例项目请点击右侧蓝色按钮【使用HBuilderX导入示例项目】。
+## 初次使用如果提示未注册&lt;qiun-data-charts&gt;组件，请重启HBuilderX，如仍不好用，请重启电脑；
+## 如果是cli项目，请尝试清理node_modules，重新install，还不行就删除项目，再重新install。
+## 此问题已于DCloud官方确认，HBuilderX下个版本会修复。
+## 其他图表不显示问题详见[常见问题选项卡](https://demo.ucharts.cn)
+## <font color=#FF0000> 新手请先完整阅读帮助文档及常见问题3遍，右侧蓝色按钮示例项目请看2遍！ </font> 
+## [DEMO演示及在线生成工具（v2.0文档）https://demo.ucharts.cn](https://demo.ucharts.cn)
+## [图表组件在项目中的应用参见 UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- 秋云图表组件 修复APP端某些情况下报错`Not Found Page`的bug，fix by 高级bug开发技术员
+- 示例项目 修复APP端v-for循环某些情况下报错`Not Found Page`的bug，fix by 高级bug开发技术员
+- uCharts.js 修复非直角坐标系tooltip提示窗右侧超出未变换方向显示的bug
+## 2.0.0-20210415（2021-04-15）
+- 秋云图表组件 修复H5端发布到二级目录下echarts无法加载的bug
+- 秋云图表组件 修复某些情况下echarts.off('finished')移除监听事件报错的bug
+## 2.0.0-20210414（2021-04-14）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧绿色【使用HBuilderX导入插件】即可使用，示例项目请点击右侧蓝色按钮【使用HBuilderX导入示例项目】。
+## 初次使用如果提示未注册&lt;qiun-data-charts&gt;组件，请重启HBuilderX，如仍不好用，请重启电脑；
+## 如果是cli项目，请尝试清理node_modules，重新install，还不行就删除项目，再重新install。
+## 此问题已于DCloud官方确认，HBuilderX下个版本会修复。
+## 其他图表不显示问题详见[常见问题选项卡](https://demo.ucharts.cn)
+## <font color=#FF0000> 新手请先完整阅读帮助文档及常见问题3遍，右侧蓝色按钮示例项目请看2遍！ </font> 
+## [DEMO演示及在线生成工具（v2.0文档）https://demo.ucharts.cn](https://demo.ucharts.cn)
+## [图表组件在项目中的应用参见 UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- 秋云图表组件 修复H5端在cli项目下ECharts引用地址错误的bug
+- 示例项目 增加ECharts的formatter用法的示例(详见示例项目format-e.vue)
+- uCharts.js 增加圆环图中心背景色的配置extra.ring.centerColor
+- uCharts.js 修复微信小程序安卓端柱状图开启透明色后显示不正确的bug
+## 2.0.0-20210413（2021-04-13）
+- 秋云图表组件 修复百度小程序多个图表真机未能正确获取根元素dom尺寸的bug
+- 秋云图表组件 修复百度小程序横屏模式方向不正确的bug
+- 秋云图表组件 修改ontouch时，@getTouchStart@getTouchMove@getTouchEnd的触发条件
+- uCharts.js 修复饼图类数据格式series属性不生效的bug
+- uCharts.js 增加时序区域图 详见示例项目中ucharts.vue
+## 2.0.0-20210412-2（2021-04-12）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧绿色【使用HBuilderX导入插件】即可使用，示例项目请点击右侧蓝色按钮【使用HBuilderX导入示例项目】。
+## 初次使用如果提示未注册&lt;qiun-data-charts&gt;组件，请重启HBuilderX。如仍不好用，请重启电脑，此问题已于DCloud官方确认，HBuilderX下个版本会修复。
+## [DEMO演示及在线生成工具（v2.0文档）https://demo.ucharts.cn](https://demo.ucharts.cn)
+## [图表组件在uniCloudAdmin中的应用 UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- 秋云图表组件 修复uCharts在APP端横屏模式下不能正确渲染的bug
+- 示例项目 增加ECharts柱状图渐变色、圆角柱状图、横向柱状图（条状图）的示例
+## 2.0.0-20210412（2021-04-12）
+- 秋云图表组件 修复created中判断echarts导致APP端无法识别，改回mounted中判断echarts初始化
+- uCharts.js 修复2d模式下series.textOffset未乘像素比的bug
+## 2.0.0-20210411（2021-04-11）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧绿色【使用HBuilderX导入插件】即可使用，示例项目请点击右侧蓝色按钮【使用HBuilderX导入示例项目】。
+## 初次使用如果提示未注册<qiun-data-charts>组件，请重启HBuilderX，并清空小程序开发者工具缓存。
+## [DEMO演示及在线生成工具（v2.0文档）https://demo.ucharts.cn](https://demo.ucharts.cn)
+## [图表组件在uniCloudAdmin中的应用 UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- uCharts.js 折线图区域图增加connectNulls断点续连的功能，详见示例项目中ucharts.vue
+- 秋云图表组件 变更初始化方法为created，变更type2d默认值为true，优化2d模式下组件初始化后dom获取不到的bug
+- 秋云图表组件 修复左右布局时，右侧图表点击坐标错误的bug，修复tooltip柱状图自定义颜色显示object的bug
+## 2.0.0-20210410（2021-04-10）
+- 修复左右布局时，右侧图表点击坐标错误的bug，修复柱状图自定义颜色tooltip显示object的bug
+- 增加标记线及柱状图自定义颜色的demo
+## 2.0.0-20210409（2021-04-08）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧【使用HBuilderX导入插件】即可体验，DEMO演示及在线生成工具（v2.0文档）[https://demo.ucharts.cn](https://demo.ucharts.cn)
+## 图表组件在uniCloudAdmin中的应用 [UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+- uCharts.js 修复钉钉小程序百度小程序measureText不准确的bug，修复2d模式下饼图类activeRadius为按比例放大的bug
+- 修复组件在支付宝小程序端点击位置不准确的bug
+## 2.0.0-20210408（2021-04-07）
+- 修复组件在支付宝小程序端不能显示的bug（目前支付宝小程不能点击交互，后续修复）
+- uCharts.js 修复高分屏下柱状图类，圆弧进度条 自定义宽度不能按比例放大的bug
+## 2.0.0-20210407（2021-04-06）
+## v1.0版本已停更，建议转uni_modules版本组件方式调用，点击右侧【使用HBuilderX导入插件】即可体验，DEMO演示及在线生成工具（v2.0文档）[https://demo.ucharts.cn](https://demo.ucharts.cn)
+## 增加 通过tofix和unit快速格式化y轴的demo add by `howcode`
+## 增加 图表组件在uniCloudAdmin中的应用 [UReport数据报表](https://ext.dcloud.net.cn/plugin?id=4651) 
+## 2.0.0-20210406（2021-04-05）
+# 秋云图表组件+uCharts v2.0版本同步上线，使用方法详见https://demo.ucharts.cn帮助页
+## 2.0.0（2021-04-05）
+# 秋云图表组件+uCharts v2.0版本同步上线，使用方法详见https://demo.ucharts.cn帮助页
diff --git a/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue b/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
new file mode 100644
index 0000000..d3a2e6f
--- /dev/null
+++ b/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
@@ -0,0 +1,1607 @@
+<!-- 
+ * qiun-data-charts 秋云高性能跨全端图表组件
+ * Copyright (c) 2021 QIUN® 秋云 https://www.ucharts.cn All rights reserved.
+ * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+ * 复制使用请保留本段注释，感谢支持开源！
+ * 为方便更多开发者使用，如有更好的建议请提交码云 Pull Requests ！
+ *
+ * uCharts®官方网站
+ * https://www.uCharts.cn
+ * 
+ * 开源地址:
+ * https://gitee.com/uCharts/uCharts
+ * 
+ * uni-app插件市场地址：
+ * http://ext.dcloud.net.cn/plugin?id=271
+ * 
+ -->
+<template>
+  <view class="chartsview" :id="'ChartBoxId'+cid">
+    <view v-if="mixinDatacomLoading">
+      <!-- 自定义加载状态，请改这里 -->
+      <qiun-loading :loadingType="loadingType" />
+    </view>
+    <view v-if="mixinDatacomErrorMessage && errorShow" @tap="reloading">
+      <!-- 自定义错误提示，请改这里 -->
+      <qiun-error :errorMessage="errorMessage" />
+    </view>
+    <!-- APP和H5采用renderjs渲染图表 -->
+    <!-- #ifdef APP-VUE || H5 -->
+    <block v-if="echarts">
+      <view
+        :style="{ background: background }"
+        style="width: 100%;height: 100%;"
+        :data-directory="directory"
+        :id="'EC'+cid" 
+        :prop="echartsOpts" 
+        :change:prop="rdcharts.ecinit" 
+        :resize="echartsResize"
+        :change:resize="rdcharts.ecresize"
+        v-show="showchart"
+      />
+    </block>
+    <block v-else>
+      <view
+        v-on:tap="rdcharts.tap"
+        v-on:mousemove="rdcharts.mouseMove"
+        v-on:mousedown="rdcharts.mouseDown"
+        v-on:mouseup="rdcharts.mouseUp"
+        v-on:touchstart="rdcharts.touchStart"
+        v-on:touchmove="rdcharts.touchMove"
+        v-on:touchend="rdcharts.touchEnd"
+        :id="'UC'+cid"
+        :prop="uchartsOpts"
+        :change:prop="rdcharts.ucinit"
+      >
+        <canvas
+          :id="cid"
+          :canvasId="cid"
+          :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+          :disable-scroll="disableScroll"
+          @error="_error"
+          v-show="showchart"
+        />
+      </view>
+    </block>
+    <!-- #endif -->
+    <!-- 支付宝小程序 -->
+    <!-- #ifdef MP-ALIPAY -->
+    <block v-if="ontouch">
+      <canvas
+        :id="cid"
+        :canvasId="cid"
+        :width="cWidth * pixel"
+        :height="cHeight * pixel"
+        :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+        :disable-scroll="disScroll"
+        @tap="_tap"
+        @touchstart="_touchStart"
+        @touchmove="_touchMove"
+        @touchend="_touchEnd"
+        @error="_error"
+        v-show="showchart"
+      />
+    </block>
+    <block v-if="!ontouch">
+      <canvas
+        :id="cid"
+        :canvasId="cid"
+        :width="cWidth * pixel"
+        :height="cHeight * pixel"
+        :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+        :disable-scroll="disScroll"
+        @tap="_tap"
+        @error="_error"
+        v-show="showchart"
+      />
+    </block>
+    <!-- #endif -->
+    <!-- 其他小程序通过vue渲染图表 -->
+    <!-- #ifdef MP-360 || MP-BAIDU || MP-QQ || MP-TOUTIAO || MP-WEIXIN || MP-KUAISHOU || MP-LARK || MP-JD -->
+    <block v-if="type2d">
+      <view v-if="ontouch" @tap="_tap">
+        <canvas
+          :id="cid"
+          :canvasId="cid"
+          :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+          type="2d"
+          :disable-scroll="disScroll"
+          @touchstart="_touchStart"
+          @touchmove="_touchMove"
+          @touchend="_touchEnd"
+          @error="_error"
+          v-show="showchart"
+        />
+      </view>
+      <view v-if="!ontouch" @tap="_tap">
+        <canvas
+          :id="cid"
+          :canvasId="cid"
+          :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+          type="2d"
+          :disable-scroll="disScroll"
+          @error="_error"
+          v-show="showchart"
+        />
+      </view>
+    </block>
+    <block v-if="!type2d">
+      <view v-if="ontouch" @tap="_tap">
+        <canvas
+          :id="cid"
+          :canvasId="cid"
+          :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+          @touchstart="_touchStart"
+          @touchmove="_touchMove"
+          @touchend="_touchEnd"
+          :disable-scroll="disScroll"
+          @error="_error"
+          v-if="showchart"
+        />
+      </view>
+      <view v-if="!ontouch" >
+        <canvas
+          :id="cid"
+          :canvasId="cid"
+          :style="{ width: cWidth + 'px', height: cHeight + 'px', background: background }"
+          :disable-scroll="disScroll"
+          @tap="_tap"
+          @error="_error"
+          v-if="showchart"
+        />
+      </view>
+    </block>
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+import uCharts from '../../js_sdk/u-charts/u-charts.js';
+import cfu from '../../js_sdk/u-charts/config-ucharts.js';
+// #ifdef APP-VUE || H5
+import cfe from '../../js_sdk/u-charts/config-echarts.js';
+// #endif
+
+function deepCloneAssign(origin = {}, ...args) {
+  for (let i in args) {
+    for (let key in args[i]) {
+      if (args[i].hasOwnProperty(key)) {
+        origin[key] = args[i][key] && typeof args[i][key] === 'object' ? deepCloneAssign(Array.isArray(args[i][key]) ? [] : {}, origin[key], args[i][key]) : args[i][key];
+      }
+    }
+  }
+  return origin;
+}
+
+function formatterAssign(args,formatter) {
+  for (let key in args) {
+    if(args.hasOwnProperty(key) && args[key] !== null && typeof args[key] === 'object'){
+      formatterAssign(args[key],formatter)
+    }else if(key === 'format' && typeof args[key] === 'string'){
+      args['formatter'] = formatter[args[key]] ? formatter[args[key]] : undefined;
+    }
+  }
+  return args;
+}
+
+// 时间转换函数，为了匹配uniClinetDB读取出的时间与categories不同
+function getFormatDate(date) {
+	var seperator = "-";
+	var year = date.getFullYear();
+	var month = date.getMonth() + 1;
+	var strDate = date.getDate();
+	if (month >= 1 && month <= 9) {
+			month = "0" + month;
+	}
+	if (strDate >= 0 && strDate <= 9) {
+			strDate = "0" + strDate;
+	}
+	var currentdate = year + seperator + month + seperator + strDate;
+	return currentdate;
+}
+
+var lastMoveTime = null;
+/**
+ * 防抖
+ *
+ * @param { Function } fn 要执行的方法
+ * @param { Number } wait  防抖多少毫秒
+ *
+ * 在 vue 中使用（注意：不能使用箭头函数，否则this指向不对，并且不能再次封装如：
+ * move(){  // 错误调用方式
+ *   debounce(function () {
+ *   console.log(this.title);
+ * }, 1000)}）;
+ * 应该直接使用：// 正确调用方式
+ * move: debounce(function () {
+ *   console.log(this.title);
+ * }, 1000)
+ */
+function debounce(fn, wait) {
+  let timer = false;
+  return function() {
+    clearTimeout(timer);
+    timer && clearTimeout(timer);
+    timer = setTimeout(() => {
+      timer = false;
+      fn.apply(this, arguments); // 把参数传进去
+    }, wait);
+  };
+}
+
+export default {
+  name: 'qiun-data-charts',
+  mixins: [uniCloud.mixinDatacom],
+  props: {
+    type: {
+      type: String,
+      default: null
+    },
+    canvasId: {
+      type: String,
+      default: 'uchartsid'
+    },
+    canvas2d: {
+      type: Boolean,
+      default: false
+    },
+    background: {
+      type: String,
+      default: 'rgba(0,0,0,0)'
+    },
+    animation: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object,
+      default() {
+        return {
+          categories: [],
+          series: []
+        };
+      }
+    },
+    opts: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
+    eopts: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
+    loadingType: {
+      type: Number,
+      default: 2
+    },
+    errorShow: {
+      type: Boolean,
+      default: true
+    },
+    errorReload: {
+      type: Boolean,
+      default: true
+    },
+    errorMessage: {
+      type: String,
+      default: null
+    },
+    inScrollView: {
+      type: Boolean,
+      default: false
+    },
+    reshow: {
+      type: Boolean,
+      default: false
+    },
+    reload: {
+      type: Boolean,
+      default: false
+    },
+    disableScroll: {
+      type: Boolean,
+      default: false
+    },
+    optsWatch: {
+      type: Boolean,
+      default: true
+    },
+    onzoom: {
+      type: Boolean,
+      default: false
+    },
+    ontap: {
+      type: Boolean,
+      default: true
+    },
+    ontouch: {
+      type: Boolean,
+      default: false
+    },
+    onmouse: {
+      type: Boolean,
+      default: true
+    },
+    onmovetip: {
+      type: Boolean,
+      default: false
+    },
+    echartsH5: {
+      type: Boolean,
+      default: false
+    },
+    echartsApp: {
+      type: Boolean,
+      default: false
+    },
+    tooltipShow: {
+      type: Boolean,
+      default: true
+    },
+    tooltipFormat: {
+      type: String,
+      default: undefined
+    },
+    tooltipCustom: {
+      type: Object,
+      default: undefined
+    },
+    startDate: {
+      type: String,
+      default: undefined
+    },
+    endDate: {
+      type: String,
+      default: undefined
+    },
+    textEnum: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+    groupEnum: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+    pageScrollTop: {
+      type: Number,
+      default: 0
+    },
+    directory: {
+      type: String,
+      default: '/'
+    },
+    tapLegend: {
+      type: Boolean,
+      default: true
+    },
+    menus: {
+      type: Array,
+      default () {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      cid: 'uchartsid',
+      inWx: false,
+      inAli: false,
+      inTt: false,
+      inBd: false,
+      inH5: false,
+      inApp: false,
+      inWin: false,
+      type2d: true,
+      disScroll: false,
+      openmouse: false,
+      pixel: 1,
+      cWidth: 375,
+      cHeight: 250,
+      showchart: false,
+      echarts: false,
+      echartsResize:false,
+      uchartsOpts: {},
+      echartsOpts: {},
+      drawData:{},
+      lastDrawTime:null,
+    };
+  },
+  created(){
+    this.cid = this.canvasId
+    if (this.canvasId == 'uchartsid' || this.canvasId == '') {
+      let t = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+      let len = t.length
+      let id = ''
+      for (let i = 0; i < 32; i++) {
+        id += t.charAt(Math.floor(Math.random() * len))
+      }
+      this.cid = id
+    }
+    const systemInfo = uni.getSystemInfoSync()
+    if(systemInfo.platform === 'windows' || systemInfo.platform === 'mac'){
+      this.inWin = true;
+    }
+    // #ifdef MP-WEIXIN
+    this.inWx = true;
+    if (this.canvas2d === false || systemInfo.platform === 'windows' || systemInfo.platform === 'mac') {
+      this.type2d = false;
+    }else{
+      this.type2d = true;
+      this.pixel = systemInfo.pixelRatio;
+    }
+    // #endif
+    //非微信小程序端强制关闭canvas2d模式
+    // #ifndef MP-WEIXIN
+    this.type2d = false;
+    // #endif
+    // #ifdef  MP-TOUTIAO || MP-LARK || MP-ALIPAY
+    this.type2d = this.canvas2d;
+    // #endif
+    // #ifdef MP-ALIPAY
+    this.inAli = true;
+    this.pixel = systemInfo.pixelRatio;
+    // #endif
+    // #ifdef MP-BAIDU
+    this.inBd = true;
+    // #endif
+    // #ifdef MP-TOUTIAO
+    this.inTt = true;
+    // #endif
+    this.disScroll = this.disableScroll;
+  },
+  mounted() {
+    // #ifdef APP-VUE
+    this.inApp = true;
+    if (this.echartsApp === true) {
+      this.echarts = true;
+      this.openmouse = false;
+    }
+    // #endif
+    // #ifdef APP-NVUE
+    this.inApp = true;
+    this.mixinDatacomLoading = false
+    this.mixinDatacomErrorMessage = "暂不支持NVUE"
+    // #endif
+    // #ifdef H5
+    this.inH5 = true;
+    if(this.inWin === true){
+      this.openmouse = this.onmouse;
+    }
+    if (this.echartsH5 === true) {
+      this.echarts = true;
+    }
+    // #endif
+    this.$nextTick(()=>{
+      this.beforeInit();
+    })
+    // #ifndef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || APP-VUE
+    const time = this.inH5 ? 500 : 200;
+    const _this = this;
+    uni.onWindowResize(
+      debounce(function(res) {
+        if (_this.mixinDatacomLoading == true) {
+          return;
+        }
+        let errmsg = _this.mixinDatacomErrorMessage;
+        if (errmsg !== null && errmsg !== 'null' && errmsg !== '') {
+          return;
+        }
+        if (_this.echarts) {
+          _this.echartsResize = !_this.echartsResize;
+        } else {
+          _this.resizeHandler();
+        }
+      }, time)
+    );
+    // #endif
+  },
+  destroyed(){
+    if(this.echarts === true){
+      delete cfe.option[this.cid]
+      delete cfe.instance[this.cid]
+    }else{
+      delete cfu.option[this.cid]
+      delete cfu.instance[this.cid]
+    }
+    // #ifndef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO
+    uni.offWindowResize(()=>{})
+    // #endif
+  },
+  watch: {
+    chartDataProps: {
+      handler(val, oldval) {
+        if (typeof val === 'object') {
+          if (JSON.stringify(val) !== JSON.stringify(oldval)) {
+            this._clearChart();
+            if (val.series && val.series.length > 0) {
+              this.beforeInit();
+            }else{
+              this.mixinDatacomLoading = true;
+              this.showchart = false;
+              this.mixinDatacomErrorMessage = null;
+            }
+          }
+        } else {
+          this.mixinDatacomLoading = false;
+          this._clearChart();
+          this.showchart = false;
+          this.mixinDatacomErrorMessage = '参数错误：chartData数据类型错误';
+        }
+      },
+      immediate: false,
+      deep: true
+    },
+    localdata:{
+      handler(val, oldval) {
+        if (JSON.stringify(val) !== JSON.stringify(oldval)) {
+          if (val.length > 0) {
+            this.beforeInit();
+          }else{
+            this.mixinDatacomLoading = true;
+            this._clearChart();
+            this.showchart = false;
+            this.mixinDatacomErrorMessage = null;
+          }
+        }
+      },
+      immediate: false,
+      deep: true
+    },
+    optsProps: {
+      handler(val, oldval) {
+        if (typeof val === 'object') {
+          if (JSON.stringify(val) !== JSON.stringify(oldval) && this.echarts === false && this.optsWatch == true) {
+            this.checkData(this.drawData);
+          }
+        } else {
+          this.mixinDatacomLoading = false;
+          this._clearChart();
+          this.showchart = false;
+          this.mixinDatacomErrorMessage = '参数错误：opts数据类型错误';
+        }
+      },
+      immediate: false,
+      deep: true
+    },
+    eoptsProps: {
+      handler(val, oldval) {
+        if (typeof val === 'object') {
+          if (JSON.stringify(val) !== JSON.stringify(oldval) && this.echarts === true) {
+            this.checkData(this.drawData);
+          }
+        } else {
+          this.mixinDatacomLoading = false;
+          this.showchart = false;
+          this.mixinDatacomErrorMessage = '参数错误：eopts数据类型错误';
+        }
+      },
+      immediate: false,
+      deep: true
+    },
+    reshow(val, oldval) {
+      if (val === true && this.mixinDatacomLoading === false) {
+        setTimeout(() => {
+          this.mixinDatacomErrorMessage = null;
+          this.echartsResize = !this.echartsResize;
+          this.checkData(this.drawData);
+        }, 200);
+      }
+    },
+    reload(val, oldval) {
+      if (val === true) {
+        this.showchart = false;
+        this.mixinDatacomErrorMessage = null;
+        this.reloading();
+      }
+    },
+    mixinDatacomErrorMessage(val, oldval) {
+      if (val) {
+        this.emitMsg({name: 'error', params: {type:"error", errorShow: this.errorShow, msg: val, id: this.cid}});
+        if(this.errorShow){
+          console.log('[秋云图表组件]' + val);
+        }
+      }
+    },
+    errorMessage(val, oldval) {
+      if (val && this.errorShow && val !== null && val !== 'null' && val !== '') {
+        this.showchart = false;
+        this.mixinDatacomLoading = false;
+        this.mixinDatacomErrorMessage = val;
+      } else {
+        this.showchart = false;
+        this.mixinDatacomErrorMessage = null;
+        this.reloading();
+      }
+    }
+  },
+  computed: {
+    optsProps() {
+      return JSON.parse(JSON.stringify(this.opts));
+    },
+    eoptsProps() {
+      return JSON.parse(JSON.stringify(this.eopts));
+    },
+    chartDataProps() {
+      return JSON.parse(JSON.stringify(this.chartData));
+    },
+  },
+  methods: {
+    beforeInit(){
+      this.mixinDatacomErrorMessage = null;
+      if (typeof this.chartData === 'object' && this.chartData != null && this.chartData.series !== undefined && this.chartData.series.length > 0) {
+        //拷贝一下chartData，为了opts变更后统一数据来源
+        this.drawData = deepCloneAssign({}, this.chartData);
+        this.mixinDatacomLoading = false;
+        this.showchart = true;
+        this.checkData(this.chartData);
+      }else if(this.localdata.length>0){
+        this.mixinDatacomLoading = false;
+        this.showchart = true;
+        this.localdataInit(this.localdata);
+      }else if(this.collection !== ''){
+        this.mixinDatacomLoading = false;
+        this.getCloudData();
+      }else{
+        this.mixinDatacomLoading = true;
+      }
+    },
+    localdataInit(resdata){
+      //替换enum类型为正确的描述
+      if(this.groupEnum.length>0){
+        for (let i = 0; i < resdata.length; i++) {
+          for (let j = 0; j < this.groupEnum.length; j++) {
+            if(resdata[i].group === this.groupEnum[j].value){
+              resdata[i].group = this.groupEnum[j].text
+            }
+          }
+        }
+      }
+      if(this.textEnum.length>0){
+        for (let i = 0; i < resdata.length; i++) {
+          for (let j = 0; j < this.textEnum.length; j++) {
+            if(resdata[i].text === this.textEnum[j].value){
+              resdata[i].text = this.textEnum[j].text
+            }
+          }
+        }
+      }
+      let needCategories = false;
+      let tmpData = {categories:[], series:[]}
+      let tmpcategories = []
+      let tmpseries = [];
+      //拼接categories
+      if(this.echarts === true){
+        needCategories = cfe.categories.includes(this.type)
+      }else{
+        needCategories = cfu.categories.includes(this.type)
+      }
+      if(needCategories === true){
+        //如果props中的chartData带有categories，则优先使用chartData的categories
+        if(this.chartData && this.chartData.categories && this.chartData.categories.length>0){
+          tmpcategories = this.chartData.categories
+        }else{
+          //如果是日期类型的数据，不管是本地数据还是云数据，都按起止日期自动拼接categories
+          if(this.startDate && this.endDate){
+            let idate = new Date(this.startDate)
+            let edate = new Date(this.endDate)
+            while (idate <= edate) {
+            	tmpcategories.push(getFormatDate(idate))
+            	idate = idate.setDate(idate.getDate() + 1)
+            	idate = new Date(idate)
+            }
+          //否则从结果中去重并拼接categories
+          }else{
+            let tempckey = {};
+            resdata.map(function(item, index) {
+              if (item.text != undefined && !tempckey[item.text]) {
+                tmpcategories.push(item.text)
+                tempckey[item.text] = true
+              }
+            });
+          }
+        }
+        tmpData.categories = tmpcategories
+      }
+      //拼接series
+      let tempskey = {};
+      resdata.map(function(item, index) {
+        if (item.group != undefined && !tempskey[item.group]) {
+          tmpseries.push({ name: item.group, data: [] });
+          tempskey[item.group] = true;
+        }
+      });
+      //如果没有获取到分组名称(可能是带categories的数据，也可能是不带的饼图类)
+      if (tmpseries.length == 0) {
+        tmpseries = [{ name: '默认分组', data: [] }];
+        //如果是需要categories的图表类型
+        if(needCategories === true){
+          for (let j = 0; j < tmpcategories.length; j++) {
+            let seriesdata = 0;
+            for (let i = 0; i < resdata.length; i++) {
+              if (resdata[i].text == tmpcategories[j]) {
+                seriesdata = resdata[i].value;
+              }
+            }
+            tmpseries[0].data.push(seriesdata);
+          }
+        //如果是饼图类的图表类型
+        }else{
+          for (let i = 0; i < resdata.length; i++) {
+            tmpseries[0].data.push({"name": resdata[i].text,"value": resdata[i].value});
+          }
+        }
+      //如果有分组名
+      } else {
+        for (let k = 0; k < tmpseries.length; k++) {
+          //如果有categories
+          if (tmpcategories.length > 0) {
+            for (let j = 0; j < tmpcategories.length; j++) {
+              let seriesdata = 0;
+              for (let i = 0; i < resdata.length; i++) {
+                if (tmpseries[k].name == resdata[i].group && resdata[i].text == tmpcategories[j]) {
+                  seriesdata = resdata[i].value;
+                }
+              }
+              tmpseries[k].data.push(seriesdata);
+            }
+          //如果传了group而没有传text，即没有categories（正常情况下这种数据是不符合数据要求规范的）
+          } else {
+            for (let i = 0; i < resdata.length; i++) {
+              if (tmpseries[k].name == resdata[i].group) {
+                tmpseries[k].data.push(resdata[i].value);
+              }
+            }
+          }
+        }
+      }
+      tmpData.series = tmpseries
+      //拷贝一下chartData，为了opts变更后统一数据来源
+      this.drawData = deepCloneAssign({}, tmpData);
+      this.checkData(tmpData)
+    },
+    reloading() {
+      if(this.errorReload === false){
+        return;
+      }
+      this.showchart = false;
+      this.mixinDatacomErrorMessage = null;
+      if (this.collection !== '') {
+        this.mixinDatacomLoading = false;
+        this.onMixinDatacomPropsChange(true);
+      } else {
+        this.beforeInit();
+      }
+    },
+    checkData(anyData) {
+      let cid = this.cid
+      //复位opts或eopts
+      if(this.echarts === true){
+        cfe.option[cid] = deepCloneAssign({}, this.eopts);
+        cfe.option[cid].id = cid;
+        cfe.option[cid].type = this.type;
+      }else{
+        if (this.type && cfu.type.includes(this.type)) {
+          cfu.option[cid] = deepCloneAssign({}, cfu[this.type], this.opts);
+          cfu.option[cid].canvasId = cid;
+        } else {
+          this.mixinDatacomLoading = false;
+          this.showchart = false;
+          this.mixinDatacomErrorMessage = '参数错误：props参数中type类型不正确';
+        }
+      }
+      //挂载categories和series
+      let newData = deepCloneAssign({}, anyData);
+      if (newData.series !== undefined && newData.series.length > 0) {
+        this.mixinDatacomErrorMessage = null;
+        if (this.echarts === true) {
+          cfe.option[cid].chartData = newData;
+          this.$nextTick(()=>{
+            this.init()
+          })
+        }else{
+          cfu.option[cid].categories = newData.categories;
+          cfu.option[cid].series = newData.series;
+          this.$nextTick(()=>{
+            this.init()
+          })
+        }
+      }
+    },
+    resizeHandler() {
+      //渲染防抖
+      let currTime = Date.now();
+      let lastDrawTime = this.lastDrawTime?this.lastDrawTime:currTime-3000;
+      let duration = currTime - lastDrawTime;
+      if (duration < 1000) return;
+      let chartdom = uni
+        .createSelectorQuery()
+        // #ifndef MP-ALIPAY
+        .in(this)
+        // #endif
+        .select('#ChartBoxId'+this.cid)
+        .boundingClientRect(data => {
+          this.showchart = true;
+          if (data.width > 0 && data.height > 0) {
+            if (data.width !== this.cWidth || data.height !== this.cHeight) {
+              this.checkData(this.drawData)
+            }
+          }
+        })
+        .exec();
+    },
+    getCloudData() {
+      if (this.mixinDatacomLoading == true) {
+        return;
+      }
+      this.mixinDatacomLoading = true;
+      this.mixinDatacomGet()
+        .then(res => {
+          this.mixinDatacomResData = res.result.data;
+          this.localdataInit(this.mixinDatacomResData);
+        })
+        .catch(err => {
+          this.mixinDatacomLoading = false;
+          this.showchart = false;
+          this.mixinDatacomErrorMessage = '请求错误：' + err;
+        });
+    },
+    onMixinDatacomPropsChange(needReset, changed) {
+      if (needReset == true && this.collection !== '') {
+        this.showchart = false;
+        this.mixinDatacomErrorMessage = null;
+        this._clearChart();
+        this.getCloudData();
+      }
+    },
+    _clearChart() {
+      let cid = this.cid
+      if (this.echrts !== true && cfu.option[cid] && cfu.option[cid].context) {
+        const ctx = cfu.option[cid].context;
+        if(typeof ctx === "object" && !cfu.option[cid].update){
+          ctx.clearRect(0, 0, this.cWidth, this.cHeight);
+          ctx.draw();
+        }
+      }
+    },
+    init() {
+      let cid = this.cid
+      let chartdom = uni
+        .createSelectorQuery()
+        // #ifndef MP-ALIPAY
+        .in(this)
+        // #endif
+        .select('#ChartBoxId'+cid)
+        .boundingClientRect(data => {
+          if (data.width > 0 && data.height > 0) {
+            this.mixinDatacomLoading = false;
+            this.showchart = true;
+            this.lastDrawTime = Date.now();
+            this.cWidth = data.width;
+            this.cHeight = data.height;
+            if(this.echarts !== true){
+              cfu.option[cid].background = this.background == 'rgba(0,0,0,0)' ? '#FFFFFF' : this.background;
+              cfu.option[cid].canvas2d = this.type2d;
+              cfu.option[cid].pixelRatio = this.pixel;
+              cfu.option[cid].animation = this.animation;
+              cfu.option[cid].width = data.width * this.pixel;
+              cfu.option[cid].height = data.height * this.pixel;
+              cfu.option[cid].onzoom = this.onzoom;
+              cfu.option[cid].ontap = this.ontap;
+              cfu.option[cid].ontouch = this.ontouch;
+              cfu.option[cid].onmouse = this.openmouse;
+              cfu.option[cid].onmovetip = this.onmovetip;
+              cfu.option[cid].tooltipShow = this.tooltipShow;
+              cfu.option[cid].tooltipFormat = this.tooltipFormat;
+              cfu.option[cid].tooltipCustom = this.tooltipCustom;
+              cfu.option[cid].inScrollView = this.inScrollView;
+              cfu.option[cid].lastDrawTime = this.lastDrawTime;
+              cfu.option[cid].tapLegend = this.tapLegend;
+            }
+            //如果是H5或者App端，采用renderjs渲染图表
+            if (this.inH5 || this.inApp) {
+              if (this.echarts == true) {
+                cfe.option[cid].ontap = this.ontap;
+                cfe.option[cid].onmouse = this.openmouse;
+                cfe.option[cid].tooltipShow = this.tooltipShow;
+                cfe.option[cid].tooltipFormat = this.tooltipFormat;
+                cfe.option[cid].tooltipCustom = this.tooltipCustom;
+                cfe.option[cid].lastDrawTime = this.lastDrawTime;
+                this.echartsOpts = deepCloneAssign({}, cfe.option[cid]);
+              } else {
+                cfu.option[cid].rotateLock = cfu.option[cid].rotate;
+                this.uchartsOpts = deepCloneAssign({}, cfu.option[cid]);
+              }
+            //如果是小程序端，采用uCharts渲染
+            } else {
+              cfu.option[cid] = formatterAssign(cfu.option[cid],cfu.formatter)
+              this.mixinDatacomErrorMessage = null;
+              this.mixinDatacomLoading = false;
+              this.showchart = true;
+              this.$nextTick(()=>{
+                if (this.type2d === true) {
+                  const query = uni.createSelectorQuery().in(this)
+                  query
+                    .select('#' + cid)
+                    .fields({ node: true, size: true })
+                    .exec(res => {
+                      if (res[0]) {
+                        const canvas = res[0].node;
+                        const ctx = canvas.getContext('2d');
+                        cfu.option[cid].context = ctx;
+                        cfu.option[cid].rotateLock = cfu.option[cid].rotate;
+                        if(cfu.instance[cid] && cfu.option[cid] && cfu.option[cid].update === true){
+                          this._updataUChart(cid)
+                        }else{
+                          canvas.width = data.width * this.pixel;
+                          canvas.height = data.height * this.pixel;
+                          canvas._width = data.width * this.pixel;
+                          canvas._height = data.height * this.pixel;
+                          setTimeout(()=>{
+                            cfu.option[cid].context.restore();
+                            cfu.option[cid].context.save();
+                            this._newChart(cid)
+                          },100)
+                        }
+                      } else {
+                        this.showchart = false;
+                        this.mixinDatacomErrorMessage = '参数错误：开启2d模式后，未获取到dom节点，canvas-id:' + cid;
+                      }
+                    });
+                } else {
+                  if(this.inAli){
+                    cfu.option[cid].rotateLock = cfu.option[cid].rotate;
+                  }
+                  cfu.option[cid].context = uni.createCanvasContext(cid, this);
+                  if(cfu.instance[cid] && cfu.option[cid] && cfu.option[cid].update === true){
+                    this._updataUChart(cid)
+                  }else{
+                    setTimeout(()=>{
+                      cfu.option[cid].context.restore();
+                      cfu.option[cid].context.save();
+                      this._newChart(cid)
+                    },100)
+                  }
+                }
+              })
+            }
+          } else {
+            this.mixinDatacomLoading = false;
+            this.showchart = false;
+            if (this.reshow == true) {
+              this.mixinDatacomErrorMessage = '布局错误：未获取到父元素宽高尺寸！canvas-id:' + cid;
+            }
+          }
+        })
+        .exec();
+    },
+    saveImage(){
+    	uni.canvasToTempFilePath({
+    	  canvasId: this.cid,
+    	  success: res=>{
+    	    //#ifdef H5
+    			var a = document.createElement("a");
+    			a.href = res.tempFilePath;
+    			a.download = this.cid;
+    			a.target = '_blank'
+    			a.click();
+    	    //#endif
+    	    //#ifndef H5
+    	      uni.saveImageToPhotosAlbum({
+              filePath: res.tempFilePath,
+              success: function () {
+                uni.showToast({
+                  title: '保存成功',
+                  duration: 2000
+                });
+              }
+    	      });
+    	    //#endif
+    	  } 
+    	},this);
+    },
+    getImage(){
+      if(this.type2d == false){
+        uni.canvasToTempFilePath({
+          canvasId: this.cid,
+          success: res=>{
+            this.emitMsg({name: 'getImage', params: {type:"getImage", base64: res.tempFilePath}});
+          }
+        },this);
+      }else{
+        const query = uni.createSelectorQuery().in(this)
+        query
+          .select('#' + this.cid)
+          .fields({ node: true, size: true })
+          .exec(res => {
+            if (res[0]) {
+              const canvas = res[0].node;
+              this.emitMsg({name: 'getImage', params: {type:"getImage", base64: canvas.toDataURL('image/png')}});
+            }
+          });
+      }
+    },
+    // #ifndef APP-VUE || H5
+    _newChart(cid) {
+      if (this.mixinDatacomLoading == true) {
+        return;
+      }
+      this.showchart = true;
+      cfu.instance[cid] = new uCharts(cfu.option[cid]);
+      cfu.instance[cid].addEventListener('renderComplete', () => {
+        this.emitMsg({name: 'complete', params: {type:"complete", complete: true, id: cid}});
+        cfu.instance[cid].delEventListener('renderComplete')
+      });
+      cfu.instance[cid].addEventListener('scrollLeft', () => {
+        this.emitMsg({name: 'scrollLeft', params: {type:"scrollLeft", scrollLeft: true, id: cid}});
+      });
+      cfu.instance[cid].addEventListener('scrollRight', () => {
+        this.emitMsg({name: 'scrollRight', params: {type:"scrollRight", scrollRight: true, id: cid}});
+      });
+    },
+    _updataUChart(cid) {
+      cfu.instance[cid].updateData(cfu.option[cid])
+    },
+    _tooltipDefault(item, category, index, opts) {
+      if (category) {
+        let data = item.data
+        if(typeof item.data === "object"){
+          data = item.data.value
+        }
+        return category + ' ' + item.name + ':' + data;
+      } else {
+        if (item.properties && item.properties.name) {
+          return item.properties.name;
+        } else {
+          return item.name + ':' + item.data;
+        }
+      }
+    },
+    _showTooltip(e) {
+      let cid = this.cid
+      let tc = cfu.option[cid].tooltipCustom
+      if (tc && tc !== undefined && tc !== null) {
+        let offset = undefined;
+        if (tc.x >= 0 && tc.y >= 0) {
+          offset = { x: tc.x, y: tc.y + 10 };
+        }
+        cfu.instance[cid].showToolTip(e, {
+          index: tc.index,
+          offset: offset,
+          textList: tc.textList,
+          formatter: (item, category, index, opts) => {
+            if (typeof cfu.option[cid].tooltipFormat === 'string' && cfu.formatter[cfu.option[cid].tooltipFormat]) {
+              return cfu.formatter[cfu.option[cid].tooltipFormat](item, category, index, opts);
+            } else {
+              return this._tooltipDefault(item, category, index, opts);
+            }
+          }
+        });
+      } else {
+        cfu.instance[cid].showToolTip(e, {
+          formatter: (item, category, index, opts) => {
+            if (typeof cfu.option[cid].tooltipFormat === 'string' && cfu.formatter[cfu.option[cid].tooltipFormat]) {
+              return cfu.formatter[cfu.option[cid].tooltipFormat](item, category, index, opts);
+            } else {
+              return this._tooltipDefault(item, category, index, opts);
+            }
+          }
+        });
+      }
+    },
+    _tap(e,move) {
+      let cid = this.cid
+      let currentIndex = null;
+      let legendIndex = null;
+      if (this.inScrollView === true || this.inAli) {
+        let chartdom = uni
+          .createSelectorQuery()
+          // #ifndef MP-ALIPAY
+          .in(this)
+          .select('#ChartBoxId'+cid)
+          // #endif
+          // #ifdef MP-ALIPAY
+          .select('#'+this.cid)
+          // #endif
+          .boundingClientRect(data => {
+            e.changedTouches=[];
+            if (this.inAli) {
+              e.changedTouches.unshift({ x: e.detail.clientX - data.left, y: e.detail.clientY - data.top});
+            }else{
+              e.changedTouches.unshift({ x: e.detail.x - data.left, y: e.detail.y - data.top - this.pageScrollTop});
+            }
+            if(move){
+              if (this.tooltipShow === true) {
+                this._showTooltip(e);
+              }
+            }else{
+              currentIndex = cfu.instance[cid].getCurrentDataIndex(e);
+              legendIndex = cfu.instance[cid].getLegendDataIndex(e);
+              if(this.tapLegend === true){
+                cfu.instance[cid].touchLegend(e);
+              }
+              if (this.tooltipShow === true) {
+                this._showTooltip(e);
+              }
+              this.emitMsg({name: 'getIndex', params: { type:"getIndex", event:{ x: e.detail.x - data.left, y: e.detail.y - data.top }, currentIndex: currentIndex, legendIndex: legendIndex, id: cid, opts: cfu.instance[cid].opts}});
+            }
+          })
+          .exec();
+      } else {
+        if(move){
+          if (this.tooltipShow === true) {
+            this._showTooltip(e);
+          }
+        }else{
+          e.changedTouches=[];
+          e.changedTouches.unshift({ x: e.detail.x - e.currentTarget.offsetLeft, y: e.detail.y - e.currentTarget.offsetTop });
+          currentIndex = cfu.instance[cid].getCurrentDataIndex(e);
+          legendIndex = cfu.instance[cid].getLegendDataIndex(e);
+          if(this.tapLegend === true){
+            cfu.instance[cid].touchLegend(e);
+          }
+          if (this.tooltipShow === true) {
+            this._showTooltip(e);
+          }
+          this.emitMsg({name: 'getIndex', params: {type:"getIndex", event:{ x: e.detail.x, y: e.detail.y - e.currentTarget.offsetTop }, currentIndex: currentIndex, legendIndex: legendIndex, id: cid, opts: cfu.instance[cid].opts}});
+        }
+      }
+    },
+    _touchStart(e) {
+      let cid = this.cid
+      lastMoveTime=Date.now();
+      if(cfu.option[cid].enableScroll === true && e.touches.length == 1){
+        cfu.instance[cid].scrollStart(e);
+      }
+      this.emitMsg({name:'getTouchStart', params:{type:"touchStart", event:e.changedTouches[0], id:cid}});
+    },
+    _touchMove(e) {
+      let cid = this.cid
+      let currMoveTime = Date.now();
+      let duration = currMoveTime - lastMoveTime;
+      let touchMoveLimit = cfu.option[cid].touchMoveLimit || 24;
+      if (duration < Math.floor(1000 / touchMoveLimit)) return;//每秒60帧
+      lastMoveTime = currMoveTime;
+      if(cfu.option[cid].enableScroll === true && e.changedTouches.length == 1){
+        cfu.instance[cid].scroll(e);
+      }
+      if(this.ontap === true && cfu.option[cid].enableScroll === false && this.onmovetip === true){
+        this._tap(e,true)
+      }
+      if(this.ontouch === true && cfu.option[cid].enableScroll === true && this.onzoom === true && e.changedTouches.length == 2){
+        cfu.instance[cid].dobuleZoom(e);
+      }
+      this.emitMsg({name: 'getTouchMove', params: {type:"touchMove", event:e.changedTouches[0], id: cid}});
+    },
+    _touchEnd(e) {
+      let cid = this.cid
+      if(cfu.option[cid].enableScroll === true && e.touches.length == 0){
+        cfu.instance[cid].scrollEnd(e);
+      }
+      this.emitMsg({name:'getTouchEnd', params:{type:"touchEnd", event:e.changedTouches[0], id:cid}});
+      if(this.ontap === true && cfu.option[cid].enableScroll === false && this.onmovetip === true){
+        this._tap(e,true)
+      }
+    },
+    // #endif
+    _error(e) {
+      this.mixinDatacomErrorMessage = e.detail.errMsg;
+    },
+    emitMsg(msg) {
+      this.$emit(msg.name, msg.params);
+    },
+    getRenderType() {
+      //防止如果开启echarts且父元素为v-if的情况renderjs监听不到prop变化的问题
+      if(this.echarts===true && this.mixinDatacomLoading===false){
+        this.beforeInit()
+      }
+    },
+    toJSON(){
+      return this
+    }
+  }
+};
+</script>
+
+<!-- #ifdef APP-VUE || H5 -->
+<script module="rdcharts" lang="renderjs">
+import uChartsRD from '../../js_sdk/u-charts/u-charts.js';
+import cfu from '../../js_sdk/u-charts/config-ucharts.js';
+import cfe from '../../js_sdk/u-charts/config-echarts.js';
+
+var that = {};
+var rootdom = null;
+
+function rddeepCloneAssign(origin = {}, ...args) {
+  for (let i in args) {
+    for (let key in args[i]) {
+      if (args[i].hasOwnProperty(key)) {
+        origin[key] = args[i][key] && typeof args[i][key] === 'object' ? rddeepCloneAssign(Array.isArray(args[i][key]) ? [] : {}, origin[key], args[i][key]) : args[i][key];
+      }
+    }
+  }
+  return origin;
+}
+
+function rdformatterAssign(args,formatter) {
+  for (let key in args) {
+    if(args.hasOwnProperty(key) && args[key] !== null && typeof args[key] === 'object'){
+      rdformatterAssign(args[key],formatter)
+    }else if(key === 'format' && typeof args[key] === 'string'){
+      args['formatter'] = formatter[args[key]] ? formatter[args[key]] : undefined;
+    }
+  }
+  return args;
+}
+
+export default {
+  data() {
+    return {
+      rid:null
+    }
+  },
+  mounted() {
+    rootdom = {top:0,left:0}
+    // #ifdef H5
+    let dm = document.querySelectorAll('uni-main')[0]
+    if(dm === undefined){
+      dm = document.querySelectorAll('uni-page-wrapper')[0]
+    }
+    rootdom = {top:dm.offsetTop,left:dm.offsetLeft}
+    // #endif
+    setTimeout(()=>{
+      if(this.rid === null){
+        this.$ownerInstance && this.$ownerInstance.callMethod('getRenderType')
+      }
+    },200)
+  },
+  destroyed(){
+    delete cfu.option[this.rid]
+    delete cfu.instance[this.rid]
+    delete cfe.option[this.rid]
+    delete cfe.instance[this.rid]
+  },
+  methods: {
+    //==============以下是ECharts的方法====================
+    ecinit(newVal, oldVal, owner, instance){
+      let cid = JSON.stringify(newVal.id)
+      this.rid = cid
+      that[cid] = this.$ownerInstance || instance
+      let eopts = JSON.parse(JSON.stringify(newVal))
+      let type = eopts.type;
+      //载入并覆盖默认配置
+      if (type && cfe.type.includes(type)) {
+        cfe.option[cid] = rddeepCloneAssign({}, cfe[type], eopts);
+      }else{
+        cfe.option[cid] = rddeepCloneAssign({}, eopts);
+      }
+      let newData = eopts.chartData;
+      if(newData){
+        //挂载categories和series
+        if(cfe.option[cid].xAxis && cfe.option[cid].xAxis.type && cfe.option[cid].xAxis.type === 'category'){
+          cfe.option[cid].xAxis.data = newData.categories
+        }
+        if(cfe.option[cid].yAxis && cfe.option[cid].yAxis.type && cfe.option[cid].yAxis.type === 'category'){
+          cfe.option[cid].yAxis.data = newData.categories
+        }
+        cfe.option[cid].series = []
+        for (var i = 0; i < newData.series.length; i++) {
+          cfe.option[cid].seriesTemplate = cfe.option[cid].seriesTemplate ? cfe.option[cid].seriesTemplate : {}
+          let Template = rddeepCloneAssign({},cfe.option[cid].seriesTemplate,newData.series[i])
+          cfe.option[cid].series.push(Template)
+        }
+      }
+      
+      if (typeof window.echarts === 'object') {
+          this.newEChart()
+      }else{
+        const script = document.createElement('script')
+        // #ifdef APP-VUE
+        script.src = 'https://api.ectms.opmonitor.com/miniapp/uni_modules/qiun-data-charts/static/app-plus/echarts.min.js'
+        // #endif
+        // #ifdef H5
+        const { origin, pathname } = window.location
+        const rooturl = ''//origin + pathname
+        script.src = rooturl + 'https://api.ectms.opmonitor.com/miniapp/uni_modules/qiun-data-charts/static/h5/echarts.min.js'
+        // #endif
+        script.onload = this.newEChart
+        document.head.appendChild(script)
+      }
+    },
+    ecresize(newVal, oldVal, owner, instance){
+      if(cfe.instance[this.rid]){
+        cfe.instance[this.rid].resize()
+      }
+    },
+    newEChart(){
+      let cid = this.rid
+      if(cfe.instance[cid] === undefined){
+        cfe.instance[cid] = echarts.init(that[cid].$el.children[0])
+        //ontap开启后才触发click事件
+        if(cfe.option[cid].ontap === true){
+          cfe.instance[cid].on('click', resdata => {
+            let event = JSON.parse(JSON.stringify({
+              x:resdata.event.offsetX,y:resdata.event.offsetY
+            }))
+            that[cid].callMethod('emitMsg',{name:"getIndex", params:{type:"getIndex", event:event, currentIndex:resdata.dataIndex, value:resdata.data, seriesName: resdata.seriesName,id:cid}})
+          })
+          // 增加ECharts的highlight消息，实现按下移动返回索引功能。add by onefish 创建于 2021-12-11 09:50
+          cfe.instance[cid].on('highlight', resdata => {
+            that[cid].callMethod('emitMsg',{name:"getHighlight", params:{type:"highlight", res:resdata, id:cid}})
+          })
+        }
+        this.updataEChart(cid,cfe.option[cid])
+      }else{
+        this.updataEChart(cid,cfe.option[cid])
+      }
+    },
+    updataEChart(cid,option){
+      //替换option内format属性为formatter的预定义方法
+      option = rdformatterAssign(option,cfe.formatter)
+      if(option.tooltip){
+        option.tooltip.show = option.tooltipShow?true:false;
+        option.tooltip.position = this.tooltipPosition()
+        //tooltipFormat方法，替换组件的tooltipFormat为config-echarts.js内对应的方法
+        if (typeof option.tooltipFormat === 'string' && cfe.formatter[option.tooltipFormat]) {
+          option.tooltip.formatter = option.tooltip.formatter ? option.tooltip.formatter : cfe.formatter[option.tooltipFormat]
+        }
+      }
+      // 颜色渐变添加的方法
+      if (option.series) {
+      	for (let i in option.series) {
+      		let linearGradient = option.series[i].linearGradient
+      		if (linearGradient) {
+      			option.series[i].color = new echarts.graphic.LinearGradient(linearGradient[0],linearGradient[1],linearGradient[2],linearGradient[3],linearGradient[4])
+      		}
+      	}
+      }
+      cfe.instance[cid].setOption(option, option.notMerge)
+      cfe.instance[cid].on('finished', function(){
+        that[cid].callMethod('emitMsg',{name:"complete",params:{type:"complete",complete:true,id:cid}})
+        if(cfe.instance[cid]){
+          cfe.instance[cid].off('finished')
+        }
+      })
+    },
+    tooltipPosition(){
+      return (point, params, dom, rect, size) => {
+      	let x = point[0]
+      	let y = point[1]
+      	let viewWidth = size.viewSize[0]
+      	let viewHeight = size.viewSize[1]
+      	let boxWidth = size.contentSize[0]
+      	let boxHeight = size.contentSize[1]
+      	let posX = x + 30 
+      	let posY = y + 30 
+      	if (posX + boxWidth > viewWidth) { 
+      		posX = x - boxWidth - 30
+      	}
+      	if (posY + boxHeight > viewHeight) {
+      		posY = y - boxHeight - 30
+      	}
+      	return [posX, posY]
+      }
+    },
+    //==============以下是uCharts的方法====================
+    ucinit(newVal, oldVal, owner, instance){
+      if(JSON.stringify(newVal) == JSON.stringify(oldVal)){
+        return;
+      }
+      if(!newVal.canvasId){
+        return;
+      }
+      let cid = JSON.parse(JSON.stringify(newVal.canvasId))
+      this.rid = cid
+      that[cid] = this.$ownerInstance || instance
+      cfu.option[cid] = JSON.parse(JSON.stringify(newVal))
+      cfu.option[cid] = rdformatterAssign(cfu.option[cid],cfu.formatter)
+      let canvasdom = document.getElementById(cid)
+      if(canvasdom && canvasdom.children[0]){
+        cfu.option[cid].context = canvasdom.children[0].getContext("2d")
+        if(cfu.instance[cid] && cfu.option[cid] && cfu.option[cid].update === true){
+          this.updataUChart()
+        }else{
+          setTimeout(()=>{
+            cfu.option[cid].context.restore();
+            cfu.option[cid].context.save();
+            this.newUChart()
+          },100)
+        }
+      }
+    },
+    newUChart() {
+      let cid = this.rid
+      cfu.instance[cid] = new uChartsRD(cfu.option[cid])
+      cfu.instance[cid].addEventListener('renderComplete', () => {
+        that[cid].callMethod('emitMsg',{name:"complete",params:{type:"complete",complete:true,id:cid}})
+        cfu.instance[cid].delEventListener('renderComplete')
+      });
+      cfu.instance[cid].addEventListener('scrollLeft', () => {
+        that[cid].callMethod('emitMsg',{name:"scrollLeft",params:{type:"scrollLeft",scrollLeft:true,id:cid}})
+      });
+      cfu.instance[cid].addEventListener('scrollRight', () => {
+        that[cid].callMethod('emitMsg',{name:"scrollRight",params:{type:"scrollRight",scrollRight:true,id:cid}})
+      });
+    },
+    updataUChart() {
+      let cid = this.rid
+      cfu.instance[cid].updateData(cfu.option[cid])
+    },
+    tooltipDefault(item, category, index, opts) {
+      if (category) {
+        let data = item.data
+        if(typeof item.data === "object"){
+          data = item.data.value
+        }
+        return category + ' ' + item.name + ':' + data;
+      } else {
+        if (item.properties && item.properties.name) {
+          return item.properties.name ;
+        } else {
+          return item.name + ':' + item.data;
+        }
+      }
+    },
+    showTooltip(e,cid) {
+      let tc = cfu.option[cid].tooltipCustom
+      if (tc && tc !== undefined && tc !== null) {
+        let offset = undefined;
+        if (tc.x >= 0 && tc.y >= 0) {
+          offset = { x: tc.x, y: tc.y + 10 };
+        }
+        cfu.instance[cid].showToolTip(e, {
+          index: tc.index,
+          offset: offset,
+          textList: tc.textList,
+          formatter: (item, category, index, opts) => {
+            if (typeof cfu.option[cid].tooltipFormat === 'string' && cfu.formatter[cfu.option[cid].tooltipFormat]) {
+              return cfu.formatter[cfu.option[cid].tooltipFormat](item, category, index, opts);
+            } else {
+              return this.tooltipDefault(item, category, index, opts);
+            }
+          }
+        });
+      } else {
+        cfu.instance[cid].showToolTip(e, {
+          formatter: (item, category, index, opts) => {
+            if (typeof cfu.option[cid].tooltipFormat === 'string' && cfu.formatter[cfu.option[cid].tooltipFormat]) {
+              return cfu.formatter[cfu.option[cid].tooltipFormat](item, category, index, opts);
+            } else {
+              return this.tooltipDefault(item, category, index, opts);
+            }
+          }
+        });
+      }
+    },
+    tap(e) {
+      let cid = this.rid
+      let ontap = cfu.option[cid].ontap
+      let tooltipShow = cfu.option[cid].tooltipShow
+      let tapLegend = cfu.option[cid].tapLegend
+      if(ontap == false) return;
+      let currentIndex=null
+      let legendIndex=null
+      let rchartdom = document.getElementById('UC'+cid).getBoundingClientRect()
+      let tmpe = {}
+      if(e.detail.x){//tap或者click的事件
+        tmpe = { x: e.detail.x - rchartdom.left, y:e.detail.y - rchartdom.top + rootdom.top}
+      }else{//mouse的事件
+        tmpe = { x: e.clientX - rchartdom.left, y:e.clientY - rchartdom.top + rootdom.top}
+      }
+      e.changedTouches = [];
+      e.changedTouches.unshift(tmpe)
+      currentIndex=cfu.instance[cid].getCurrentDataIndex(e)
+      legendIndex=cfu.instance[cid].getLegendDataIndex(e)
+      if(tapLegend === true){
+        cfu.instance[cid].touchLegend(e);
+      }
+      if(tooltipShow==true){
+        this.showTooltip(e,cid)
+      }
+      that[cid].callMethod('emitMsg',{name:"getIndex",params:{type:"getIndex",event:tmpe,currentIndex:currentIndex,legendIndex:legendIndex,id:cid, opts: cfu.instance[cid].opts}})
+    },
+    touchStart(e) {
+      let cid = this.rid
+      let ontouch = cfu.option[cid].ontouch
+      if(ontouch == false) return;
+      if(cfu.option[cid].enableScroll === true && e.touches.length == 1){
+        cfu.instance[cid].scrollStart(e);
+      }
+      that[cid].callMethod('emitMsg',{name:"getTouchStart",params:{type:"touchStart",event:e.changedTouches[0],id:cid}})
+    },
+    touchMove(e) {
+      let cid = this.rid
+      let ontouch = cfu.option[cid].ontouch
+      if(ontouch == false) return;
+      if(cfu.option[cid].enableScroll === true && e.changedTouches.length == 1){
+        cfu.instance[cid].scroll(e);
+      }
+      if(cfu.option[cid].ontap === true && cfu.option[cid].enableScroll === false && cfu.option[cid].onmovetip === true){
+        let rchartdom = document.getElementById('UC'+cid).getBoundingClientRect()
+        let tmpe = { x: e.changedTouches[0].clientX - rchartdom.left, y:e.changedTouches[0].clientY - rchartdom.top + rootdom.top}
+        e.changedTouches.unshift(tmpe)
+        if(cfu.option[cid].tooltipShow === true){
+          this.showTooltip(e,cid)
+        }
+      }
+      if(ontouch === true && cfu.option[cid].enableScroll === true && cfu.option[cid].onzoom === true && e.changedTouches.length == 2){
+        cfu.instance[cid].dobuleZoom(e);
+      }
+      that[cid].callMethod('emitMsg',{name:"getTouchMove",params:{type:"touchMove",event:e.changedTouches[0],id:cid}})
+    },
+    touchEnd(e) {
+      let cid = this.rid
+      let ontouch = cfu.option[cid].ontouch
+      if(ontouch == false) return;
+      if(cfu.option[cid].enableScroll === true && e.touches.length == 0){
+        cfu.instance[cid].scrollEnd(e);
+      }
+      that[cid].callMethod('emitMsg',{name:"getTouchEnd",params:{type:"touchEnd",event:e.changedTouches[0],id:cid}})
+    },
+    mouseDown(e) {
+      let cid = this.rid
+      let onmouse = cfu.option[cid].onmouse
+      if(onmouse == false) return;
+      let rchartdom = document.getElementById('UC'+cid).getBoundingClientRect()
+      let tmpe = {}
+      tmpe = { x: e.clientX - rchartdom.left, y:e.clientY - rchartdom.top + rootdom.top}
+      e.changedTouches = [];
+      e.changedTouches.unshift(tmpe)
+      cfu.instance[cid].scrollStart(e)
+      cfu.option[cid].mousedown=true;
+      that[cid].callMethod('emitMsg',{name:"getTouchStart",params:{type:"mouseDown",event:tmpe,id:cid}})
+    },
+    mouseMove(e) {
+      let cid = this.rid
+      let onmouse = cfu.option[cid].onmouse
+      let tooltipShow = cfu.option[cid].tooltipShow
+      if(onmouse == false) return;
+      let rchartdom = document.getElementById('UC'+cid).getBoundingClientRect()
+      let tmpe = {}
+      tmpe = { x: e.clientX - rchartdom.left, y:e.clientY - rchartdom.top + rootdom.top}
+      e.changedTouches = [];
+      e.changedTouches.unshift(tmpe)
+      if(cfu.option[cid].mousedown){
+        cfu.instance[cid].scroll(e)
+        that[cid].callMethod('emitMsg',{name:"getTouchMove",params:{type:"mouseMove",event:tmpe,id:cid}})
+      }else if(cfu.instance[cid]){
+        if(tooltipShow==true){
+          this.showTooltip(e,cid)
+        }
+      }
+    },
+    mouseUp(e) {
+      let cid = this.rid
+      let onmouse = cfu.option[cid].onmouse
+      if(onmouse == false) return;
+      let rchartdom = document.getElementById('UC'+cid).getBoundingClientRect()
+      let tmpe = {}
+      tmpe = { x: e.clientX - rchartdom.left, y:e.clientY - rchartdom.top + rootdom.top}
+      e.changedTouches = [];
+      e.changedTouches.unshift(tmpe)
+      cfu.instance[cid].scrollEnd(e)
+      cfu.option[cid].mousedown=false;
+      that[cid].callMethod('emitMsg',{name:"getTouchEnd",params:{type:"mouseUp",event:tmpe,id:cid}})
+    },
+  }
+}
+</script>
+<!-- #endif -->
+
+<style scoped>
+.chartsview {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex: 1;
+  justify-content: center;
+  align-items: center;
+}
+</style>
diff --git a/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.vue b/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.vue
new file mode 100644
index 0000000..b15b19f
--- /dev/null
+++ b/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.vue
@@ -0,0 +1,46 @@
+<template>
+	<view class="chartsview">
+		<view class="charts-error"></view>
+		<view class="charts-font">{{errorMessage==null?'请点击重试':errorMessage}}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'qiun-error',
+		props: {
+			errorMessage: {
+				type: String,
+				default: null
+			},
+		},
+		data() {
+			return {
+				
+			};
+		},
+	}
+</script>
+
+<style>
+	.chartsview {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		justify-content: center;
+		align-items: center;
+	}
+	.charts-font{
+		font-size: 14px;
+		color: #CCCCCC;
+		margin-top: 10px;
+	}
+	.charts-error{
+		width: 128px;
+		height: 128px;
+		background: url("data:image/png;base64,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");
+		background-position: center;
+	}
+</style>
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue b/uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue
new file mode 100644
index 0000000..b701394
--- /dev/null
+++ b/uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue
@@ -0,0 +1,162 @@
+<template>
+	 <view class="container loading1">
+		<view class="shape shape1"></view>
+		<view class="shape shape2"></view>
+		<view class="shape shape3"></view>
+		<view class="shape shape4"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'loading1',
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style scoped="true">
+.container {
+  width: 30px;
+  height: 30px;
+  position: relative;
+}
+.container.loading1 {
+  -webkit-transform: rotate(45deg);
+          transform: rotate(45deg);
+}
+
+.container .shape {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 1px;
+}
+.container .shape.shape1 {
+  left: 0;
+  background-color: #1890FF;
+}
+.container .shape.shape2 {
+  right: 0;
+  background-color: #91CB74;
+}
+.container .shape.shape3 {
+  bottom: 0;
+  background-color: #FAC858;
+}
+.container .shape.shape4 {
+  bottom: 0;
+  right: 0;
+  background-color: #EE6666;
+}
+
+.loading1 .shape1 {
+  -webkit-animation: animation1shape1 0.5s ease 0s infinite alternate;
+          animation: animation1shape1 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation1shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(16px, 16px);
+            transform: translate(16px, 16px);
+  }
+}
+
+@keyframes animation1shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(16px, 16px);
+            transform: translate(16px, 16px);
+  }
+}
+.loading1 .shape2 {
+  -webkit-animation: animation1shape2 0.5s ease 0s infinite alternate;
+          animation: animation1shape2 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation1shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-16px, 16px);
+            transform: translate(-16px, 16px);
+  }
+}
+
+@keyframes animation1shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-16px, 16px);
+            transform: translate(-16px, 16px);
+  }
+}
+.loading1 .shape3 {
+  -webkit-animation: animation1shape3 0.5s ease 0s infinite alternate;
+          animation: animation1shape3 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation1shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(16px, -16px);
+            transform: translate(16px, -16px);
+  }
+}
+
+@keyframes animation1shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(16px, -16px);
+            transform: translate(16px, -16px);
+  }
+}
+.loading1 .shape4 {
+  -webkit-animation: animation1shape4 0.5s ease 0s infinite alternate;
+          animation: animation1shape4 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation1shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-16px, -16px);
+            transform: translate(-16px, -16px);
+  }
+}
+
+@keyframes animation1shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-16px, -16px);
+            transform: translate(-16px, -16px);
+  }
+}
+
+
+</style>
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue b/uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue
new file mode 100644
index 0000000..7541b31
--- /dev/null
+++ b/uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue
@@ -0,0 +1,170 @@
+<template>
+	 <view class="container loading2">
+		<view class="shape shape1"></view>
+		<view class="shape shape2"></view>
+		<view class="shape shape3"></view>
+		<view class="shape shape4"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'loading2',
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style scoped="true">
+.container {
+  width: 30px;
+  height: 30px;
+  position: relative;
+}
+
+.container.loading2 {
+  -webkit-transform: rotate(10deg);
+          transform: rotate(10deg);
+}
+.container.loading2 .shape {
+  border-radius: 5px;
+}
+.container.loading2{
+  -webkit-animation: rotation 1s infinite;
+          animation: rotation 1s infinite;
+}
+
+.container .shape {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 1px;
+}
+.container .shape.shape1 {
+  left: 0;
+  background-color: #1890FF;
+}
+.container .shape.shape2 {
+  right: 0;
+  background-color: #91CB74;
+}
+.container .shape.shape3 {
+  bottom: 0;
+  background-color: #FAC858;
+}
+.container .shape.shape4 {
+  bottom: 0;
+  right: 0;
+  background-color: #EE6666;
+}
+
+
+.loading2 .shape1 {
+  -webkit-animation: animation2shape1 0.5s ease 0s infinite alternate;
+          animation: animation2shape1 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation2shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(20px, 20px);
+            transform: translate(20px, 20px);
+  }
+}
+
+@keyframes animation2shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(20px, 20px);
+            transform: translate(20px, 20px);
+  }
+}
+.loading2 .shape2 {
+  -webkit-animation: animation2shape2 0.5s ease 0s infinite alternate;
+          animation: animation2shape2 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation2shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-20px, 20px);
+            transform: translate(-20px, 20px);
+  }
+}
+
+@keyframes animation2shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-20px, 20px);
+            transform: translate(-20px, 20px);
+  }
+}
+.loading2 .shape3 {
+  -webkit-animation: animation2shape3 0.5s ease 0s infinite alternate;
+          animation: animation2shape3 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation2shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(20px, -20px);
+            transform: translate(20px, -20px);
+  }
+}
+
+@keyframes animation2shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(20px, -20px);
+            transform: translate(20px, -20px);
+  }
+}
+.loading2 .shape4 {
+  -webkit-animation: animation2shape4 0.5s ease 0s infinite alternate;
+          animation: animation2shape4 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation2shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-20px, -20px);
+            transform: translate(-20px, -20px);
+  }
+}
+
+@keyframes animation2shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-20px, -20px);
+            transform: translate(-20px, -20px);
+  }
+}
+
+</style>
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue b/uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue
new file mode 100644
index 0000000..8e14db3
--- /dev/null
+++ b/uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue
@@ -0,0 +1,173 @@
+<template>
+	 <view class="container loading3">
+		<view class="shape shape1"></view>
+		<view class="shape shape2"></view>
+		<view class="shape shape3"></view>
+		<view class="shape shape4"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'loading3',
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style scoped="true">
+.container {
+  width: 30px;
+  height: 30px;
+  position: relative;
+}
+
+ .container.loading3 {
+  -webkit-animation: rotation 1s infinite;
+          animation: rotation 1s infinite;
+}
+.container.loading3 .shape1 {
+  border-top-left-radius: 10px;
+}
+.container.loading3 .shape2 {
+  border-top-right-radius: 10px;
+}
+.container.loading3 .shape3 {
+  border-bottom-left-radius: 10px;
+}
+.container.loading3 .shape4 {
+  border-bottom-right-radius: 10px;
+}
+
+.container .shape {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 1px;
+}
+.container .shape.shape1 {
+  left: 0;
+  background-color: #1890FF;
+}
+.container .shape.shape2 {
+  right: 0;
+  background-color: #91CB74;
+}
+.container .shape.shape3 {
+  bottom: 0;
+  background-color: #FAC858;
+}
+.container .shape.shape4 {
+  bottom: 0;
+  right: 0;
+  background-color: #EE6666;
+}
+
+.loading3 .shape1 {
+  -webkit-animation: animation3shape1 0.5s ease 0s infinite alternate;
+          animation: animation3shape1 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation3shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(5px, 5px);
+            transform: translate(5px, 5px);
+  }
+}
+
+@keyframes animation3shape1 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(5px, 5px);
+            transform: translate(5px, 5px);
+  }
+}
+.loading3 .shape2 {
+  -webkit-animation: animation3shape2 0.5s ease 0s infinite alternate;
+          animation: animation3shape2 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation3shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-5px, 5px);
+            transform: translate(-5px, 5px);
+  }
+}
+
+@keyframes animation3shape2 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-5px, 5px);
+            transform: translate(-5px, 5px);
+  }
+}
+.loading3 .shape3 {
+  -webkit-animation: animation3shape3 0.5s ease 0s infinite alternate;
+          animation: animation3shape3 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation3shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(5px, -5px);
+            transform: translate(5px, -5px);
+  }
+}
+
+@keyframes animation3shape3 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(5px, -5px);
+            transform: translate(5px, -5px);
+  }
+}
+.loading3 .shape4 {
+  -webkit-animation: animation3shape4 0.5s ease 0s infinite alternate;
+          animation: animation3shape4 0.5s ease 0s infinite alternate;
+}
+
+@-webkit-keyframes animation3shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-5px, -5px);
+            transform: translate(-5px, -5px);
+  }
+}
+
+@keyframes animation3shape4 {
+  from {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  to {
+    -webkit-transform: translate(-5px, -5px);
+            transform: translate(-5px, -5px);
+  }
+}
+</style>
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue b/uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue
new file mode 100644
index 0000000..77c55b7
--- /dev/null
+++ b/uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue
@@ -0,0 +1,222 @@
+<template>
+	 <view class="container loading5">
+		<view class="shape shape1"></view>
+		<view class="shape shape2"></view>
+		<view class="shape shape3"></view>
+		<view class="shape shape4"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'loading5',
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style scoped="true">
+.container {
+  width: 30px;
+  height: 30px;
+  position: relative;
+}
+
+.container.loading5 .shape {
+  width: 15px;
+  height: 15px;
+}
+
+.container .shape {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 1px;
+}
+.container .shape.shape1 {
+  left: 0;
+  background-color: #1890FF;
+}
+.container .shape.shape2 {
+  right: 0;
+  background-color: #91CB74;
+}
+.container .shape.shape3 {
+  bottom: 0;
+  background-color: #FAC858;
+}
+.container .shape.shape4 {
+  bottom: 0;
+  right: 0;
+  background-color: #EE6666;
+}
+
+.loading5 .shape1 {
+  animation: animation5shape1 2s ease 0s infinite reverse;
+}
+
+@-webkit-keyframes animation5shape1 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(0, 15px);
+            transform: translate(0, 15px);
+  }
+  50% {
+    -webkit-transform: translate(15px, 15px);
+            transform: translate(15px, 15px);
+  }
+  75% {
+    -webkit-transform: translate(15px, 0);
+            transform: translate(15px, 0);
+  }
+}
+
+@keyframes animation5shape1 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(0, 15px);
+            transform: translate(0, 15px);
+  }
+  50% {
+    -webkit-transform: translate(15px, 15px);
+            transform: translate(15px, 15px);
+  }
+  75% {
+    -webkit-transform: translate(15px, 0);
+            transform: translate(15px, 0);
+  }
+}
+.loading5 .shape2 {
+  animation: animation5shape2 2s ease 0s infinite reverse;
+}
+
+@-webkit-keyframes animation5shape2 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(-15px, 0);
+            transform: translate(-15px, 0);
+  }
+  50% {
+    -webkit-transform: translate(-15px, 15px);
+            transform: translate(-15px, 15px);
+  }
+  75% {
+    -webkit-transform: translate(0, 15px);
+            transform: translate(0, 15px);
+  }
+}
+
+@keyframes animation5shape2 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(-15px, 0);
+            transform: translate(-15px, 0);
+  }
+  50% {
+    -webkit-transform: translate(-15px, 15px);
+            transform: translate(-15px, 15px);
+  }
+  75% {
+    -webkit-transform: translate(0, 15px);
+            transform: translate(0, 15px);
+  }
+}
+.loading5 .shape3 {
+  animation: animation5shape3 2s ease 0s infinite reverse;
+}
+
+@-webkit-keyframes animation5shape3 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(15px, 0);
+            transform: translate(15px, 0);
+  }
+  50% {
+    -webkit-transform: translate(15px, -15px);
+            transform: translate(15px, -15px);
+  }
+  75% {
+    -webkit-transform: translate(0, -15px);
+            transform: translate(0, -15px);
+  }
+}
+
+@keyframes animation5shape3 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(15px, 0);
+            transform: translate(15px, 0);
+  }
+  50% {
+    -webkit-transform: translate(15px, -15px);
+            transform: translate(15px, -15px);
+  }
+  75% {
+    -webkit-transform: translate(0, -15px);
+            transform: translate(0, -15px);
+  }
+}
+.loading5 .shape4 {
+  animation: animation5shape4 2s ease 0s infinite reverse;
+}
+
+@-webkit-keyframes animation5shape4 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(0, -15px);
+            transform: translate(0, -15px);
+  }
+  50% {
+    -webkit-transform: translate(-15px, -15px);
+            transform: translate(-15px, -15px);
+  }
+  75% {
+    -webkit-transform: translate(-15px, 0);
+            transform: translate(-15px, 0);
+  }
+}
+
+@keyframes animation5shape4 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(0, -15px);
+            transform: translate(0, -15px);
+  }
+  50% {
+    -webkit-transform: translate(-15px, -15px);
+            transform: translate(-15px, -15px);
+  }
+  75% {
+    -webkit-transform: translate(-15px, 0);
+            transform: translate(-15px, 0);
+  }
+}
+
+</style>
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue b/uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue
new file mode 100644
index 0000000..cb93a55
--- /dev/null
+++ b/uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue
@@ -0,0 +1,229 @@
+<template>
+	 <view class="container loading6">
+		<view class="shape shape1"></view>
+		<view class="shape shape2"></view>
+		<view class="shape shape3"></view>
+		<view class="shape shape4"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'loading6',
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+<style scoped="true">
+.container {
+  width: 30px;
+  height: 30px;
+  position: relative;
+}
+
+.container.loading6 {
+  -webkit-animation: rotation 1s infinite;
+          animation: rotation 1s infinite;
+}
+.container.loading6 .shape {
+  width: 12px;
+  height: 12px;
+  border-radius: 2px;
+}
+.container .shape {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 1px;
+}
+.container .shape.shape1 {
+  left: 0;
+  background-color: #1890FF;
+}
+.container .shape.shape2 {
+  right: 0;
+  background-color: #91CB74;
+}
+.container .shape.shape3 {
+  bottom: 0;
+  background-color: #FAC858;
+}
+.container .shape.shape4 {
+  bottom: 0;
+  right: 0;
+  background-color: #EE6666;
+}
+
+
+.loading6 .shape1 {
+  -webkit-animation: animation6shape1 2s linear 0s infinite normal;
+          animation: animation6shape1 2s linear 0s infinite normal;
+}
+
+@-webkit-keyframes animation6shape1 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(0, 18px);
+            transform: translate(0, 18px);
+  }
+  50% {
+    -webkit-transform: translate(18px, 18px);
+            transform: translate(18px, 18px);
+  }
+  75% {
+    -webkit-transform: translate(18px, 0);
+            transform: translate(18px, 0);
+  }
+}
+
+@keyframes animation6shape1 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(0, 18px);
+            transform: translate(0, 18px);
+  }
+  50% {
+    -webkit-transform: translate(18px, 18px);
+            transform: translate(18px, 18px);
+  }
+  75% {
+    -webkit-transform: translate(18px, 0);
+            transform: translate(18px, 0);
+  }
+}
+.loading6 .shape2 {
+  -webkit-animation: animation6shape2 2s linear 0s infinite normal;
+          animation: animation6shape2 2s linear 0s infinite normal;
+}
+
+@-webkit-keyframes animation6shape2 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(-18px, 0);
+            transform: translate(-18px, 0);
+  }
+  50% {
+    -webkit-transform: translate(-18px, 18px);
+            transform: translate(-18px, 18px);
+  }
+  75% {
+    -webkit-transform: translate(0, 18px);
+            transform: translate(0, 18px);
+  }
+}
+
+@keyframes animation6shape2 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(-18px, 0);
+            transform: translate(-18px, 0);
+  }
+  50% {
+    -webkit-transform: translate(-18px, 18px);
+            transform: translate(-18px, 18px);
+  }
+  75% {
+    -webkit-transform: translate(0, 18px);
+            transform: translate(0, 18px);
+  }
+}
+.loading6 .shape3 {
+  -webkit-animation: animation6shape3 2s linear 0s infinite normal;
+          animation: animation6shape3 2s linear 0s infinite normal;
+}
+
+@-webkit-keyframes animation6shape3 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(18px, 0);
+            transform: translate(18px, 0);
+  }
+  50% {
+    -webkit-transform: translate(18px, -18px);
+            transform: translate(18px, -18px);
+  }
+  75% {
+    -webkit-transform: translate(0, -18px);
+            transform: translate(0, -18px);
+  }
+}
+
+@keyframes animation6shape3 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(18px, 0);
+            transform: translate(18px, 0);
+  }
+  50% {
+    -webkit-transform: translate(18px, -18px);
+            transform: translate(18px, -18px);
+  }
+  75% {
+    -webkit-transform: translate(0, -18px);
+            transform: translate(0, -18px);
+  }
+}
+.loading6 .shape4 {
+  -webkit-animation: animation6shape4 2s linear 0s infinite normal;
+          animation: animation6shape4 2s linear 0s infinite normal;
+}
+
+@-webkit-keyframes animation6shape4 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(0, -18px);
+            transform: translate(0, -18px);
+  }
+  50% {
+    -webkit-transform: translate(-18px, -18px);
+            transform: translate(-18px, -18px);
+  }
+  75% {
+    -webkit-transform: translate(-18px, 0);
+            transform: translate(-18px, 0);
+  }
+}
+
+@keyframes animation6shape4 {
+  0% {
+    -webkit-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  25% {
+    -webkit-transform: translate(0, -18px);
+            transform: translate(0, -18px);
+  }
+  50% {
+    -webkit-transform: translate(-18px, -18px);
+            transform: translate(-18px, -18px);
+  }
+  75% {
+    -webkit-transform: translate(-18px, 0);
+            transform: translate(-18px, 0);
+  }
+}
+</style>
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue b/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue
new file mode 100644
index 0000000..7789060
--- /dev/null
+++ b/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue
@@ -0,0 +1,36 @@
+<template>
+	<view>
+	 <Loading1 v-if="loadingType==1"/>
+	 <Loading2 v-if="loadingType==2"/>
+	 <Loading3 v-if="loadingType==3"/>
+	 <Loading4 v-if="loadingType==4"/>
+	 <Loading5 v-if="loadingType==5"/>
+	</view>
+</template>
+
+<script>
+	import Loading1 from "./loading1.vue";
+	import Loading2 from "./loading2.vue";
+	import Loading3 from "./loading3.vue";
+	import Loading4 from "./loading4.vue";
+	import Loading5 from "./loading5.vue";
+	export default {
+		components:{Loading1,Loading2,Loading3,Loading4,Loading5},
+		name: 'qiun-loading',
+		props: {
+			loadingType: {
+				type: Number,
+				default: 2
+			},
+		},
+		data() {
+			return {
+				
+			};
+		},
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
new file mode 100644
index 0000000..7b8168f
--- /dev/null
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
@@ -0,0 +1,422 @@
+/*
+ * uCharts®
+ * 高性能跨平台图表库，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360）、Vue、Taro等支持canvas的框架平台
+ * Copyright (c) 2021 QIUN®秋云 https://www.ucharts.cn All rights reserved.
+ * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+ * 复制使用请保留本段注释，感谢支持开源！
+ * 
+ * uCharts®官方网站
+ * https://www.uCharts.cn
+ * 
+ * 开源地址:
+ * https://gitee.com/uCharts/uCharts
+ * 
+ * uni-app插件市场地址：
+ * http://ext.dcloud.net.cn/plugin?id=271
+ * 
+ */
+
+// 通用配置项
+
+// 主题颜色配置：如每个图表类型需要不同主题，请在对应图表类型上更改color属性
+const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
+
+const cfe = {
+  //demotype为自定义图表类型
+	"type": ["pie", "ring", "rose", "funnel", "line", "column", "area", "radar", "gauge","candle","demotype"],
+  //增加自定义图表类型，如果需要categories，请在这里加入您的图表类型例如最后的"demotype"
+	"categories": ["line", "column", "area", "radar", "gauge", "candle","demotype"],
+  //instance为实例变量承载属性，option为eopts承载属性，不要删除
+	"instance": {},
+	"option": {},
+  //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
+  "formatter":{
+    "tooltipDemo1":function(res){
+      let result = ''
+      for (let i in res) {
+      	if (i == 0) {
+      		result += res[i].axisValueLabel + '年销售额'
+      	}
+      	let value = '--'
+      	if (res[i].data !== null) {
+      		value = res[i].data
+      	}
+      	// #ifdef H5
+      	result += '\n' + res[i].seriesName + '：' + value + ' 万元'
+      	// #endif
+      	
+      	// #ifdef APP-PLUS
+      	result += '<br/>' + res[i].marker + res[i].seriesName + '：' + value + ' 万元'
+      	// #endif
+      }
+      return result;
+    },
+    legendFormat:function(name){
+      return "自定义图例+"+name;
+    },
+    yAxisFormatDemo:function (value, index) {
+      return value + '元';
+    },
+    seriesFormatDemo:function(res){
+      return res.name + '年' + res.value + '元';
+    }
+  },
+  //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在eopts参数，会将demotype与eopts中option合并后渲染图表。
+  "demotype":{
+    "color": color,
+    //在这里填写echarts的option即可
+    
+  },
+  //下面是自定义配置，请添加项目所需的通用配置
+	"column": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'axis'
+		},
+		"grid": {
+			"top": 30,
+			"bottom": 50,
+			"right": 15,
+			"left": 40
+		},
+		"legend": {
+			"bottom": 'left',
+		},
+		"toolbox": {
+			"show": false,
+		},
+		"xAxis": {
+			"type": 'category',
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+			"boundaryGap": true,
+			"data": []
+		},
+		"yAxis": {
+			"type": 'value',
+			"axisTick": {
+				"show": false,
+			},
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'bar',
+			"data": [],
+			"barwidth": 20,
+			"label": {
+				"show": true,
+        "color": "#666666",
+				"position": 'top',
+			},
+		},
+	},
+	"line": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'axis'
+		},
+		"grid": {
+			"top": 30,
+			"bottom": 50,
+			"right": 15,
+			"left": 40
+		},
+		"legend": {
+			"bottom": 'left',
+		},
+		"toolbox": {
+			"show": false,
+		},
+		"xAxis": {
+			"type": 'category',
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+			"boundaryGap": true,
+			"data": []
+		},
+		"yAxis": {
+			"type": 'value',
+			"axisTick": {
+				"show": false,
+			},
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'line',
+			"data": [],
+			"barwidth": 20,
+			"label": {
+				"show": true,
+        "color": "#666666",
+				"position": 'top',
+			},
+		},
+	},
+	"area": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'axis'
+		},
+		"grid": {
+			"top": 30,
+			"bottom": 50,
+			"right": 15,
+			"left": 40
+		},
+		"legend": {
+			"bottom": 'left',
+		},
+		"toolbox": {
+			"show": false,
+		},
+		"xAxis": {
+			"type": 'category',
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+			"boundaryGap": true,
+			"data": []
+		},
+		"yAxis": {
+			"type": 'value',
+			"axisTick": {
+				"show": false,
+			},
+			"axisLabel": {
+				"color": '#666666'
+			},
+			"axisLine": {
+				"lineStyle": {
+					"color": '#CCCCCC'
+				}
+			},
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'line',
+			"data": [],
+			"areaStyle": {},
+			"label": {
+				"show": true,
+        "color": "#666666",
+				"position": 'top',
+			},
+		},
+	},
+	"pie": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'item'
+		},
+		"grid": {
+			"top": 40,
+			"bottom": 30,
+			"right": 15,
+			"left": 15
+		},
+		"legend": {
+			"bottom": 'left',
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'pie',
+			"data": [],
+			"radius": '50%',
+			"label": {
+				"show": true,
+        "color": "#666666",
+				"position": 'top',
+			},
+		},
+	},
+	"ring": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'item'
+		},
+		"grid": {
+			"top": 40,
+			"bottom": 30,
+			"right": 15,
+			"left": 15
+		},
+		"legend": {
+			"bottom": 'left',
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'pie',
+			"data": [],
+			"radius": ['40%', '70%'],
+			"avoidLabelOverlap": false,
+			"label": {
+				"show": true,
+        "color": "#666666",
+				"position": 'top',
+			},
+			"labelLine": {
+				"show": true
+			},
+		},
+	},
+	"rose": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'item'
+		},
+		"legend": {
+			"top": 'bottom'
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'pie',
+			"data": [],
+			"radius": "55%",
+			"center": ['50%', '50%'],
+			"roseType": 'area',
+		},
+	},
+	"funnel": {
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"tooltip": {
+			"trigger": 'item',
+			"formatter": "{b} : {c}%"
+		},
+		"legend": {
+			"top": 'bottom'
+		},
+		"seriesTemplate": {
+			"name": '',
+			"type": 'funnel',
+			"left": '10%',
+			"top": 60,
+			"bottom": 60,
+			"width": '80%',
+			"min": 0,
+			"max": 100,
+			"minSize": '0%',
+			"maxSize": '100%',
+			"sort": 'descending',
+			"gap": 2,
+			"label": {
+				"show": true,
+				"position": 'inside'
+			},
+			"labelLine": {
+				"length": 10,
+				"lineStyle": {
+					"width": 1,
+					"type": 'solid'
+				}
+			},
+			"itemStyle": {
+				"bordercolor": '#fff',
+				"borderwidth": 1
+			},
+			"emphasis": {
+				"label": {
+					"fontSize": 20
+				}
+			},
+			"data": [],
+		},
+	},
+	"gauge": {
+		"color": color,
+		"tooltip": {
+        "formatter": '{a} <br/>{b} : {c}%'
+    },
+		"seriesTemplate": {
+			"name": '业务指标',
+      "type": 'gauge',
+      "detail": {"formatter": '{value}%'},
+      "data": [{"value": 50, "name": '完成率'}]
+		},
+	},
+	"candle": {
+		"xAxis": {
+			"data": []
+		},
+		"yAxis": {},
+		"color": color,
+		"title": {
+			"text": ''
+		},
+		"dataZoom": [{
+				"type": 'inside',
+				"xAxisIndex": [0, 1],
+				"start": 10,
+				"end": 100
+			},
+			{
+				"show": true,
+				"xAxisIndex": [0, 1],
+				"type": 'slider',
+				"bottom": 10,
+				"start": 10,
+				"end": 100
+			}
+		],
+		"seriesTemplate": {
+			"name": '',
+			"type": 'k',
+			"data": [],
+		},
+	}
+}
+
+export default cfe;
\ No newline at end of file
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
new file mode 100644
index 0000000..5447a0a
--- /dev/null
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
@@ -0,0 +1,601 @@
+/*
+ * uCharts®
+ * 高性能跨平台图表库，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360）、Vue、Taro等支持canvas的框架平台
+ * Copyright (c) 2021 QIUN®秋云 https://www.ucharts.cn All rights reserved.
+ * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+ * 复制使用请保留本段注释，感谢支持开源！
+ * 
+ * uCharts®官方网站
+ * https://www.uCharts.cn
+ * 
+ * 开源地址:
+ * https://gitee.com/uCharts/uCharts
+ * 
+ * uni-app插件市场地址：
+ * http://ext.dcloud.net.cn/plugin?id=271
+ * 
+ */
+
+// 主题颜色配置：如每个图表类型需要不同主题，请在对应图表类型上更改color属性
+const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
+
+//事件转换函数，主要用作格式化x轴为时间轴，根据需求自行修改
+const formatDateTime = (timeStamp, returnType)=>{
+  var date = new Date();
+  date.setTime(timeStamp * 1000);
+  var y = date.getFullYear();
+  var m = date.getMonth() + 1;
+  m = m < 10 ? ('0' + m) : m;
+  var d = date.getDate();
+  d = d < 10 ? ('0' + d) : d;
+  var h = date.getHours();
+  h = h < 10 ? ('0' + h) : h;
+  var minute = date.getMinutes();
+  var second = date.getSeconds();
+  minute = minute < 10 ? ('0' + minute) : minute;
+  second = second < 10 ? ('0' + second) : second;
+  if(returnType == 'full'){return y + '-' + m + '-' + d + ' '+ h +':' + minute + ':' + second;}
+  if(returnType == 'y-m-d'){return y + '-' + m + '-' + d;}
+  if(returnType == 'h:m'){return  h +':' + minute;}
+  if(returnType == 'h:m:s'){return  h +':' + minute +':' + second;}
+  return [y, m, d, h, minute, second];
+}
+
+const cfu = {
+  //demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
+	"type":["pie","ring","rose","word","funnel","map","arcbar","line","column","mount","bar","area","radar","gauge","candle","mix","tline","tarea","scatter","bubble","demotype"],
+	"range":["饼状图","圆环图","玫瑰图","词云图","漏斗图","地图","圆弧进度条","折线图","柱状图","山峰图","条状图","区域图","雷达图","仪表盘","K线图","混合图","时间轴折线","时间轴区域","散点图","气泡图","自定义类型"],
+  //增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
+  //自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
+	"categories":["line","column","mount","bar","area","radar","gauge","candle","mix","demotype"],
+  //instance为实例变量承载属性，不要删除
+  "instance":{},
+  //option为opts及eopts承载属性，不要删除
+  "option":{},
+  //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
+  "formatter":{
+    "yAxisDemo1":function(val, index, opts){return val+'元'},
+    "yAxisDemo2":function(val, index, opts){return val.toFixed(2)},
+    "xAxisDemo1":function(val, index, opts){return val+'年';},
+    "xAxisDemo2":function(val, index, opts){return formatDateTime(val,'h:m')},
+    "seriesDemo1":function(val, index, series, opts){return val+'元'},
+    "tooltipDemo1":function(item, category, index, opts){
+      if(index==0){
+      	return '随便用'+item.data+'年'
+      }else{
+      	return '其他我没改'+item.data+'天'
+      }
+    },
+    "pieDemo":function(val, index, series, opts){
+      if(index !== undefined){
+        return series[index].name+'：'+series[index].data+'元'
+      }
+    },
+  },
+  //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
+  "demotype":{
+    //我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置
+    "type": "line",
+    "color": color,
+    "padding": [15,10,0,15],
+    "xAxis": {
+      "disableGrid": true,
+    },
+    "yAxis": {
+      "gridType": "dash",
+      "dashLength": 2,
+    },
+    "legend": {
+    },
+    "extra": {
+    	"line": {
+    		"type": "curve",
+    		"width": 2
+    	},
+    }
+  },
+  //下面是自定义配置，请添加项目所需的通用配置
+	"pie":{
+		"type": "pie",
+    "color": color,
+		"padding": [5,5,5,5],
+		"extra": {
+			"pie": {
+				"activeOpacity": 0.5,
+				"activeRadius": 10,
+				"offsetAngle": 0,
+				"labelWidth": 15,
+				"border": true,
+				"borderWidth": 3,
+				"borderColor": "#FFFFFF"
+			},
+		}
+	},
+	"ring":{
+		"type": "ring",
+    "color": color,
+		"padding": [5,5,5,5],
+		"rotate": false,
+		"dataLabel": true,
+		"legend": {
+			"show": true,
+			"position": "right",
+      "lineHeight": 25,
+		},
+		"title": {
+			"name": "收益率",
+			"fontSize": 15,
+			"color": "#666666"
+		},
+		"subtitle": {
+			"name": "70%",
+			"fontSize": 25,
+			"color": "#7cb5ec"
+		},
+		"extra": {
+			"ring": {
+				"ringWidth":30,
+				"activeOpacity": 0.5,
+				"activeRadius": 10,
+				"offsetAngle": 0,
+				"labelWidth": 15,
+				"border": true,
+				"borderWidth": 3,
+				"borderColor": "#FFFFFF"
+			},
+		},
+	},
+	"rose":{
+		"type": "rose",
+    "color": color,
+		"padding": [5,5,5,5],
+		"legend": {
+			"show": true,
+			"position": "left",
+      "lineHeight": 25,
+		},
+		"extra": {
+			"rose": {
+				"type": "area",
+				"minRadius": 50,
+				"activeOpacity": 0.5,
+				"activeRadius": 10,
+				"offsetAngle": 0,
+				"labelWidth": 15,
+				"border": false,
+				"borderWidth": 2,
+				"borderColor": "#FFFFFF"
+			},
+		}
+	},
+	"word":{
+		"type": "word",
+    "color": color,
+		"extra": {
+			"word": {
+				"type": "normal",
+				"autoColors": false
+			}
+		}
+	},
+	"funnel":{
+		"type": "funnel",
+    "color": color,
+		"padding": [15,15,0,15],
+		"extra": {
+			"funnel": {
+				"activeOpacity": 0.3,
+				"activeWidth": 10,
+				"border": true,
+				"borderWidth": 2,
+				"borderColor": "#FFFFFF",
+				"fillOpacity": 1,
+				"labelAlign": "right"
+			},
+		}
+	},
+	"map":{
+		"type": "map",
+    "color": color,
+		"padding": [0,0,0,0],
+    "dataLabel": true,
+		"extra": {
+			"map": {
+				"border": true,
+				"borderWidth": 1,
+				"borderColor": "#666666",
+				"fillOpacity": 0.6,
+				"activeBorderColor": "#F04864",
+				"activeFillColor": "#FACC14",
+				"activeFillOpacity": 1
+			},
+		}
+	},
+	"arcbar":{
+		"type": "arcbar",
+    "color": color,
+		"title": {
+			"name": "百分比",
+			"fontSize": 25,
+			"color": "#00FF00"
+		},
+		"subtitle": {
+			"name": "默认标题",
+			"fontSize": 15,
+			"color": "#666666"
+		},
+		"extra": {
+			"arcbar": {
+				"type": "default",
+				"width": 12,
+				"backgroundColor": "#E9E9E9",
+				"startAngle": 0.75,
+				"endAngle": 0.25,
+				"gap": 2
+			}
+		}
+	},
+	"line":{
+		"type": "line",
+    "color": color,
+		"padding": [15,10,0,15],
+		"xAxis": {
+      "disableGrid": true,
+		},
+		"yAxis": {
+      "gridType": "dash",
+      "dashLength": 2,
+		},
+		"legend": {
+		},
+		"extra": {
+			"line": {
+				"type": "straight",
+				"width": 2
+			},
+		}
+	},
+  "tline":{
+  	"type": "line",
+    "color": color,
+  	"padding": [15,10,0,15],
+  	"xAxis": {
+      "disableGrid": false,
+      "boundaryGap":"justify",
+  	},
+  	"yAxis": {
+      "gridType": "dash",
+      "dashLength": 2,
+      "data":[
+        {
+          "min":0,
+          "max":80
+        }
+      ]
+  	},
+  	"legend": {
+  	},
+  	"extra": {
+  		"line": {
+  			"type": "curve",
+  			"width": 2
+  		},
+  	}
+  },
+  "tarea":{
+  	"type": "area",
+    "color": color,
+  	"padding": [15,10,0,15],
+  	"xAxis": {
+      "disableGrid": true,
+      "boundaryGap":"justify",
+  	},
+  	"yAxis": {
+      "gridType": "dash",
+      "dashLength": 2,
+      "data":[
+        {
+          "min":0,
+          "max":80
+        }
+      ]
+  	},
+  	"legend": {
+  	},
+  	"extra": {
+  		"area": {
+  			"type": "curve",
+  			"opacity": 0.2,
+  			"addLine": true,
+  			"width": 2,
+  			"gradient": true
+  		},
+  	}
+  },
+	"column":{
+		"type": "column",
+    "color": color,
+		"padding": [15,15,0,5],
+		"xAxis": {
+      "disableGrid": true,
+		},
+		"yAxis": {
+      "data":[{"min":0}]
+		},
+		"legend": {
+		},
+		"extra": {
+			"column": {
+				"type": "group",
+				"width": 30,
+				"activeBgColor": "#000000",
+				"activeBgOpacity": 0.08
+			},
+		}
+	},
+  "mount":{
+  	"type": "mount",
+    "color": color,
+  	"padding": [15,15,0,5],
+  	"xAxis": {
+      "disableGrid": true,
+  	},
+  	"yAxis": {
+      "data":[{"min":0}]
+  	},
+  	"legend": {
+  	},
+  	"extra": {
+  		"mount": {
+  			"type": "mount",
+  			"widthRatio": 1.5,
+  		},
+  	}
+  },
+  "bar":{
+  	"type": "bar",
+    "color": color,
+  	"padding": [15,30,0,5],
+  	"xAxis": {
+      "boundaryGap":"justify",
+      "disableGrid":false,
+      "min":0,
+      "axisLine":false
+  	},
+  	"yAxis": {
+  	},
+  	"legend": {
+  	},
+  	"extra": {
+  		"bar": {
+  			"type": "group",
+  			"width": 30,
+  			"meterBorde": 1,
+  			"meterFillColor": "#FFFFFF",
+  			"activeBgColor": "#000000",
+  			"activeBgOpacity": 0.08
+  		},
+  	}
+  },
+	"area":{
+		"type": "area",
+		"color": color,
+		"padding": [15,15,0,15],
+		"xAxis": {
+      "disableGrid": true,
+		},
+		"yAxis": {
+      "gridType": "dash",
+      "dashLength": 2,
+		},
+		"legend": {
+		},
+		"extra": {
+			"area": {
+				"type": "straight",
+				"opacity": 0.2,
+				"addLine": true,
+				"width": 2,
+				"gradient": false
+			},
+		}
+	},
+	"radar":{
+		"type": "radar",
+		"color": color,
+		"padding": [5,5,5,5],
+    "dataLabel": false,
+		"legend": {
+			"show": true,
+			"position": "right",
+      "lineHeight": 25,
+		},
+		"extra": {
+			"radar": {
+				"gridType": "radar",
+				"gridColor": "#CCCCCC",
+				"gridCount": 3,
+				"opacity": 0.2,
+				"max": 200
+			},
+		}
+	},
+	"gauge":{
+		"type": "gauge",
+		"color": color,
+		"title": {
+			"name": "66Km/H",
+			"fontSize": 25,
+			"color": "#2fc25b",
+			"offsetY": 50
+		},
+		"subtitle": {
+			"name": "实时速度",
+			"fontSize": 15,
+			"color": "#1890ff",
+			"offsetY": -50
+		},
+		"extra": {
+			"gauge": {
+				"type": "default",
+				"width": 30,
+				"labelColor": "#666666",
+				"startAngle": 0.75,
+				"endAngle": 0.25,
+				"startNumber": 0,
+				"endNumber": 100,
+				"labelFormat": "",
+				"splitLine": {
+					"fixRadius": 0,
+					"splitNumber": 10,
+					"width": 30,
+					"color": "#FFFFFF",
+					"childNumber": 5,
+					"childWidth": 12
+				},
+				"pointer": {
+					"width": 24,
+					"color": "auto"
+				}
+			}
+		}
+	},
+	"candle":{
+		"type": "candle",
+		"color": color,
+		"padding": [15,15,0,15],
+		"enableScroll": true,
+		"enableMarkLine": true,
+		"dataLabel": false,
+		"xAxis": {
+			"labelCount": 4,
+			"itemCount": 40,
+			"disableGrid": true,
+			"gridColor": "#CCCCCC",
+			"gridType": "solid",
+			"dashLength": 4,
+			"scrollShow": true,
+			"scrollAlign": "left",
+			"scrollColor": "#A6A6A6",
+			"scrollBackgroundColor": "#EFEBEF"
+		},
+		"yAxis": {
+		},
+		"legend": {
+		},
+		"extra": {
+			"candle": {
+				"color": {
+					"upLine": "#f04864",
+					"upFill": "#f04864",
+					"downLine": "#2fc25b",
+					"downFill": "#2fc25b"
+				},
+				"average": {
+					"show": true,
+					"name": ["MA5","MA10","MA30"],
+					"day": [5,10,20],
+					"color": ["#1890ff","#2fc25b","#facc14"]
+				}
+			},
+			"markLine": {
+				"type": "dash",
+				"dashLength": 5,
+				"data": [
+					{
+						"value": 2150,
+						"lineColor": "#f04864",
+						"showLabel": true
+					},
+					{
+						"value": 2350,
+						"lineColor": "#f04864",
+						"showLabel": true
+					}
+				]
+			}
+		}
+	},
+	"mix":{
+		"type": "mix",
+		"color": color,
+		"padding": [15,15,0,15],
+		"xAxis": {
+      "disableGrid": true,
+		},
+		"yAxis": {
+			"disabled": false,
+			"disableGrid": false,
+			"splitNumber": 5,
+			"gridType": "dash",
+			"dashLength": 4,
+			"gridColor": "#CCCCCC",
+			"padding": 10,
+			"showTitle": true,
+			"data": []
+		},
+		"legend": {
+		},
+		"extra": {
+			"mix": {
+				"column": {
+					"width": 20
+				}
+			},
+		}
+	},
+	"scatter":{
+		"type": "scatter",
+		"color":color,
+		"padding":[15,15,0,15],
+    "dataLabel":false,
+    "xAxis": {
+      "disableGrid": false,
+      "gridType":"dash",
+      "splitNumber":5,
+      "boundaryGap":"justify",
+      "min":0
+    },
+    "yAxis": {
+      "disableGrid": false,
+      "gridType":"dash",
+    },
+    "legend": {
+    },
+    "extra": {
+    	"scatter": {
+    	},
+    }
+	},
+	"bubble":{
+		"type": "bubble",
+		"color":color,
+		"padding":[15,15,0,15],
+    "xAxis": {
+      "disableGrid": false,
+      "gridType":"dash",
+      "splitNumber":5,
+      "boundaryGap":"justify",
+      "min":0,
+      "max":250
+    },
+    "yAxis": {
+      "disableGrid": false,
+      "gridType":"dash",
+      "data":[{
+        "min":0,
+        "max":150
+      }]
+    },
+    "legend": {
+    },
+    "extra": {
+    	"bubble": {
+        "border":2,
+        "opacity": 0.5,
+    	},
+    }
+	}
+}
+
+export default cfu;
\ No newline at end of file
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/readme.md b/uni_modules/qiun-data-charts/js_sdk/u-charts/readme.md
new file mode 100644
index 0000000..d307ba3
--- /dev/null
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/readme.md
@@ -0,0 +1,5 @@
+# uCharts JSSDK说明
+1、如不使用uCharts组件，可直接引用u-charts.js，打包编译后会`自动压缩`，压缩后体积约为`120kb`。
+2、如果120kb的体积仍需压缩，请手到uCharts官网通过在线定制选择您需要的图表。
+3、config-ucharts.js为uCharts组件的用户配置文件，升级前请`自行备份config-ucharts.js`文件，以免被强制覆盖。
+4、config-echarts.js为ECharts组件的用户配置文件，升级前请`自行备份config-echarts.js`文件，以免被强制覆盖。
\ No newline at end of file
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js
new file mode 100644
index 0000000..cfeeea1
--- /dev/null
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js
@@ -0,0 +1,7297 @@
+/*
+ * uCharts (R)
+ * 高性能跨平台图表库，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360/快手）、Vue、Taro等支持canvas的框架平台
+ * Copyright (C) 2018-2022 QIUN (R) 秋云 https://www.ucharts.cn All rights reserved.
+ * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+ * 复制使用请保留本段注释，感谢支持开源！
+ * 
+ * uCharts (R) 官方网站
+ * https://www.uCharts.cn
+ * 
+ * 开源地址:
+ * https://gitee.com/uCharts/uCharts
+ * 
+ * uni-app插件市场地址：
+ * http://ext.dcloud.net.cn/plugin?id=271
+ * 
+ */
+
+'use strict';
+
+var config = {
+  version: 'v2.4.3-20220505',
+  yAxisWidth: 15,
+  xAxisHeight: 22,
+  xAxisTextPadding: 3,
+  padding: [10, 10, 10, 10],
+  pixelRatio: 1,
+  rotate: false,
+  fontSize: 13,
+  fontColor: '#666666',
+  dataPointShape: ['circle', 'circle', 'circle', 'circle'],
+  color: ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'],
+  linearColor: ['#0EE2F8', '#2BDCA8', '#FA7D8D', '#EB88E2', '#2AE3A0', '#0EE2F8', '#EB88E2', '#6773E3', '#F78A85'],
+  pieChartLinePadding: 15,
+  pieChartTextPadding: 5,
+  titleFontSize: 20,
+  subtitleFontSize: 15,
+  toolTipPadding: 3,
+  toolTipBackground: '#000000',
+  toolTipOpacity: 0.7,
+  toolTipLineHeight: 20,
+  radarLabelTextMargin: 13,
+};
+
+var assign = function(target, ...varArgs) {
+  if (target == null) {
+    throw new TypeError('[uCharts] Cannot convert undefined or null to object');
+  }
+  if (!varArgs || varArgs.length <= 0) {
+    return target;
+  }
+  // 深度合并对象
+  function deepAssign(obj1, obj2) {
+    for (let key in obj2) {
+      obj1[key] = obj1[key] && obj1[key].toString() === "[object Object]" ?
+        deepAssign(obj1[key], obj2[key]) : obj1[key] = obj2[key];
+    }
+    return obj1;
+  }
+  varArgs.forEach(val => {
+    target = deepAssign(target, val);
+  });
+  return target;
+};
+
+var util = {
+  toFixed: function toFixed(num, limit) {
+    limit = limit || 2;
+    if (this.isFloat(num)) {
+      num = num.toFixed(limit);
+    }
+    return num;
+  },
+  isFloat: function isFloat(num) {
+    return num % 1 !== 0;
+  },
+  approximatelyEqual: function approximatelyEqual(num1, num2) {
+    return Math.abs(num1 - num2) < 1e-10;
+  },
+  isSameSign: function isSameSign(num1, num2) {
+    return Math.abs(num1) === num1 && Math.abs(num2) === num2 || Math.abs(num1) !== num1 && Math.abs(num2) !== num2;
+  },
+  isSameXCoordinateArea: function isSameXCoordinateArea(p1, p2) {
+    return this.isSameSign(p1.x, p2.x);
+  },
+  isCollision: function isCollision(obj1, obj2) {
+    obj1.end = {};
+    obj1.end.x = obj1.start.x + obj1.width;
+    obj1.end.y = obj1.start.y - obj1.height;
+    obj2.end = {};
+    obj2.end.x = obj2.start.x + obj2.width;
+    obj2.end.y = obj2.start.y - obj2.height;
+    var flag = obj2.start.x > obj1.end.x || obj2.end.x < obj1.start.x || obj2.end.y > obj1.start.y || obj2.start.y < obj1.end.y;
+    return !flag;
+  }
+};
+
+//兼容H5点击事件
+function getH5Offset(e) {
+  e.mp = {
+    changedTouches: []
+  };
+  e.mp.changedTouches.push({
+    x: e.offsetX,
+    y: e.offsetY
+  });
+  return e;
+}
+
+// hex 转 rgba
+function hexToRgb(hexValue, opc) {
+  var rgx = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+  var hex = hexValue.replace(rgx, function(m, r, g, b) {
+    return r + r + g + g + b + b;
+  });
+  var rgb = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  var r = parseInt(rgb[1], 16);
+  var g = parseInt(rgb[2], 16);
+  var b = parseInt(rgb[3], 16);
+  return 'rgba(' + r + ',' + g + ',' + b + ',' + opc + ')';
+}
+
+function findRange(num, type, limit) {
+  if (isNaN(num)) {
+    throw new Error('[uCharts] series数据需为Number格式');
+  }
+  limit = limit || 10;
+  type = type ? type : 'upper';
+  var multiple = 1;
+  while (limit < 1) {
+    limit *= 10;
+    multiple *= 10;
+  }
+  if (type === 'upper') {
+    num = Math.ceil(num * multiple);
+  } else {
+    num = Math.floor(num * multiple);
+  }
+  while (num % limit !== 0) {
+    if (type === 'upper') {
+      if (num == num + 1) { //修复数据值过大num++无效的bug by 向日葵 @xrk_jy
+        break;
+      }
+      num++;
+    } else {
+      num--;
+    }
+  }
+  return num / multiple;
+}
+
+function calCandleMA(dayArr, nameArr, colorArr, kdata) {
+  let seriesTemp = [];
+  for (let k = 0; k < dayArr.length; k++) {
+    let seriesItem = {
+      data: [],
+      name: nameArr[k],
+      color: colorArr[k]
+    };
+    for (let i = 0, len = kdata.length; i < len; i++) {
+      if (i < dayArr[k]) {
+        seriesItem.data.push(null);
+        continue;
+      }
+      let sum = 0;
+      for (let j = 0; j < dayArr[k]; j++) {
+        sum += kdata[i - j][1];
+      }
+      seriesItem.data.push(+(sum / dayArr[k]).toFixed(3));
+    }
+    seriesTemp.push(seriesItem);
+  }
+  return seriesTemp;
+}
+
+function calValidDistance(self, distance, chartData, config, opts) {
+  var dataChartAreaWidth = opts.width - opts.area[1] - opts.area[3];
+  var dataChartWidth = chartData.eachSpacing * (opts.chartData.xAxisData.xAxisPoints.length - 1);
+  if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1){
+    if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
+    dataChartWidth += (opts.extra.mount.widthRatio - 1)*chartData.eachSpacing;
+  }
+  var validDistance = distance;
+  if (distance >= 0) {
+    validDistance = 0;
+    self.uevent.trigger('scrollLeft');
+    self.scrollOption.position = 'left'
+    opts.xAxis.scrollPosition = 'left';
+  } else if (Math.abs(distance) >= dataChartWidth - dataChartAreaWidth) {
+    validDistance = dataChartAreaWidth - dataChartWidth;
+    self.uevent.trigger('scrollRight');
+    self.scrollOption.position = 'right'
+    opts.xAxis.scrollPosition = 'right';
+  } else {
+    self.scrollOption.position = distance
+    opts.xAxis.scrollPosition = distance;
+  }
+  return validDistance;
+}
+
+function isInAngleRange(angle, startAngle, endAngle) {
+  function adjust(angle) {
+    while (angle < 0) {
+      angle += 2 * Math.PI;
+    }
+    while (angle > 2 * Math.PI) {
+      angle -= 2 * Math.PI;
+    }
+    return angle;
+  }
+  angle = adjust(angle);
+  startAngle = adjust(startAngle);
+  endAngle = adjust(endAngle);
+  if (startAngle > endAngle) {
+    endAngle += 2 * Math.PI;
+    if (angle < startAngle) {
+      angle += 2 * Math.PI;
+    }
+  }
+  return angle >= startAngle && angle <= endAngle;
+}
+
+function createCurveControlPoints(points, i) {
+  function isNotMiddlePoint(points, i) {
+    if (points[i - 1] && points[i + 1]) {
+      return points[i].y >= Math.max(points[i - 1].y, points[i + 1].y) || points[i].y <= Math.min(points[i - 1].y,
+        points[i + 1].y);
+    } else {
+      return false;
+    }
+  }
+  function isNotMiddlePointX(points, i) {
+    if (points[i - 1] && points[i + 1]) {
+      return points[i].x >= Math.max(points[i - 1].x, points[i + 1].x) || points[i].x <= Math.min(points[i - 1].x,
+        points[i + 1].x);
+    } else {
+      return false;
+    }
+  }
+  var a = 0.2;
+  var b = 0.2;
+  var pAx = null;
+  var pAy = null;
+  var pBx = null;
+  var pBy = null;
+  if (i < 1) {
+    pAx = points[0].x + (points[1].x - points[0].x) * a;
+    pAy = points[0].y + (points[1].y - points[0].y) * a;
+  } else {
+    pAx = points[i].x + (points[i + 1].x - points[i - 1].x) * a;
+    pAy = points[i].y + (points[i + 1].y - points[i - 1].y) * a;
+  }
+
+  if (i > points.length - 3) {
+    var last = points.length - 1;
+    pBx = points[last].x - (points[last].x - points[last - 1].x) * b;
+    pBy = points[last].y - (points[last].y - points[last - 1].y) * b;
+  } else {
+    pBx = points[i + 1].x - (points[i + 2].x - points[i].x) * b;
+    pBy = points[i + 1].y - (points[i + 2].y - points[i].y) * b;
+  }
+  if (isNotMiddlePoint(points, i + 1)) {
+    pBy = points[i + 1].y;
+  }
+  if (isNotMiddlePoint(points, i)) {
+    pAy = points[i].y;
+  }
+  if (isNotMiddlePointX(points, i + 1)) {
+    pBx = points[i + 1].x;
+  }
+  if (isNotMiddlePointX(points, i)) {
+    pAx = points[i].x;
+  }
+  if (pAy >= Math.max(points[i].y, points[i + 1].y) || pAy <= Math.min(points[i].y, points[i + 1].y)) {
+    pAy = points[i].y;
+  }
+  if (pBy >= Math.max(points[i].y, points[i + 1].y) || pBy <= Math.min(points[i].y, points[i + 1].y)) {
+    pBy = points[i + 1].y;
+  }
+  if (pAx >= Math.max(points[i].x, points[i + 1].x) || pAx <= Math.min(points[i].x, points[i + 1].x)) {
+    pAx = points[i].x;
+  }
+  if (pBx >= Math.max(points[i].x, points[i + 1].x) || pBx <= Math.min(points[i].x, points[i + 1].x)) {
+    pBx = points[i + 1].x;
+  }
+  return {
+    ctrA: {
+      x: pAx,
+      y: pAy
+    },
+    ctrB: {
+      x: pBx,
+      y: pBy
+    }
+  };
+}
+
+
+function convertCoordinateOrigin(x, y, center) {
+  return {
+    x: center.x + x,
+    y: center.y - y
+  };
+}
+
+function avoidCollision(obj, target) {
+  if (target) {
+    // is collision test
+    while (util.isCollision(obj, target)) {
+      if (obj.start.x > 0) {
+        obj.start.y--;
+      } else if (obj.start.x < 0) {
+        obj.start.y++;
+      } else {
+        if (obj.start.y > 0) {
+          obj.start.y++;
+        } else {
+          obj.start.y--;
+        }
+      }
+    }
+  }
+  return obj;
+}
+
+function fixPieSeries(series, opts, config){
+  let pieSeriesArr = [];
+  if(series.length>0 && series[0].data.constructor.toString().indexOf('Array') > -1){
+    opts._pieSeries_ = series;
+    let oldseries = series[0].data;
+    for (var i = 0; i < oldseries.length; i++) {
+      oldseries[i].formatter = series[0].formatter;
+      oldseries[i].data = oldseries[i].value;
+      pieSeriesArr.push(oldseries[i]);
+    }
+    opts.series = pieSeriesArr;
+  }else{
+    pieSeriesArr = series;
+  }
+  return pieSeriesArr;
+}
+
+function fillSeries(series, opts, config) {
+  var index = 0;
+  for (var i = 0; i < series.length; i++) {
+    let item = series[i];
+    if (!item.color) {
+      item.color = config.color[index];
+      index = (index + 1) % config.color.length;
+    }
+    if (!item.linearIndex) {
+      item.linearIndex = i;
+    }
+    if (!item.index) {
+      item.index = 0;
+    }
+    if (!item.type) {
+      item.type = opts.type;
+    }
+    if (typeof item.show == "undefined") {
+      item.show = true;
+    }
+    if (!item.type) {
+      item.type = opts.type;
+    }
+    if (!item.pointShape) {
+      item.pointShape = "circle";
+    }
+    if (!item.legendShape) {
+      switch (item.type) {
+        case 'line':
+          item.legendShape = "line";
+          break;
+        case 'column':
+        case 'bar':
+          item.legendShape = "rect";
+          break;
+        case 'area':
+        case 'mount':
+          item.legendShape = "triangle";
+          break;
+        default:
+          item.legendShape = "circle";
+      }
+    }
+  }
+  return series;
+}
+
+function fillCustomColor(linearType, customColor, series, config) {
+  var newcolor = customColor || [];
+  if (linearType == 'custom' && newcolor.length == 0 ) {
+    newcolor = config.linearColor;
+  }
+  if (linearType == 'custom' && newcolor.length < series.length) {
+    let chazhi = series.length - newcolor.length;
+    for (var i = 0; i < chazhi; i++) {
+      newcolor.push(config.linearColor[(i + 1) % config.linearColor.length]);
+    }
+  }
+  return newcolor;
+}
+
+function getDataRange(minData, maxData) {
+  var limit = 0;
+  var range = maxData - minData;
+  if (range >= 10000) {
+    limit = 1000;
+  } else if (range >= 1000) {
+    limit = 100;
+  } else if (range >= 100) {
+    limit = 10;
+  } else if (range >= 10) {
+    limit = 5;
+  } else if (range >= 1) {
+    limit = 1;
+  } else if (range >= 0.1) {
+    limit = 0.1;
+  } else if (range >= 0.01) {
+    limit = 0.01;
+  } else if (range >= 0.001) {
+    limit = 0.001;
+  } else if (range >= 0.0001) {
+    limit = 0.0001;
+  } else if (range >= 0.00001) {
+    limit = 0.00001;
+  } else {
+    limit = 0.000001;
+  }
+  return {
+    minRange: findRange(minData, 'lower', limit),
+    maxRange: findRange(maxData, 'upper', limit)
+  };
+}
+
+function measureText(text, fontSize, context) {
+  var width = 0;
+  text = String(text);
+  // #ifdef MP-ALIPAY || MP-BAIDU || APP-NVUE
+  context = false;
+  // #endif
+  if (context !== false && context !== undefined && context.setFontSize && context.measureText) {
+    context.setFontSize(fontSize);
+    return context.measureText(text).width;
+  } else {
+    var text = text.split('');
+    for (let i = 0; i < text.length; i++) {
+      let item = text[i];
+      if (/[a-zA-Z]/.test(item)) {
+        width += 7;
+      } else if (/[0-9]/.test(item)) {
+        width += 5.5;
+      } else if (/\./.test(item)) {
+        width += 2.7;
+      } else if (/-/.test(item)) {
+        width += 3.25;
+      } else if (/:/.test(item)) {
+        width += 2.5;
+      } else if (/[\u4e00-\u9fa5]/.test(item)) {
+        width += 10;
+      } else if (/\(|\)/.test(item)) {
+        width += 3.73;
+      } else if (/\s/.test(item)) {
+        width += 2.5;
+      } else if (/%/.test(item)) {
+        width += 8;
+      } else {
+        width += 10;
+      }
+    }
+    return width * fontSize / 10;
+  }
+}
+
+function dataCombine(series) {
+  return series.reduce(function(a, b) {
+    return (a.data ? a.data : a).concat(b.data);
+  }, []);
+}
+
+function dataCombineStack(series, len) {
+  var sum = new Array(len);
+  for (var j = 0; j < sum.length; j++) {
+    sum[j] = 0;
+  }
+  for (var i = 0; i < series.length; i++) {
+    for (var j = 0; j < sum.length; j++) {
+      sum[j] += series[i].data[j];
+    }
+  }
+  return series.reduce(function(a, b) {
+    return (a.data ? a.data : a).concat(b.data).concat(sum);
+  }, []);
+}
+
+function getTouches(touches, opts, e) {
+  let x, y;
+  if (touches.clientX) {
+    if (opts.rotate) {
+      y = opts.height - touches.clientX * opts.pix;
+      x = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix;
+    } else {
+      x = touches.clientX * opts.pix;
+      y = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix;
+    }
+  } else {
+    if (opts.rotate) {
+      y = opts.height - touches.x * opts.pix;
+      x = touches.y * opts.pix;
+    } else {
+      x = touches.x * opts.pix;
+      y = touches.y * opts.pix;
+    }
+  }
+  return {
+    x: x,
+    y: y
+  }
+}
+
+function getSeriesDataItem(series, index, group) {
+  var data = [];
+  var newSeries = [];
+  var indexIsArr = index.constructor.toString().indexOf('Array') > -1;
+  if(indexIsArr){
+    let tempSeries = filterSeries(series);
+    for (var i = 0; i < group.length; i++) {
+      newSeries.push(tempSeries[group[i]]);
+    }
+  }else{
+    newSeries = series;
+  };
+  for (let i = 0; i < newSeries.length; i++) {
+    let item = newSeries[i];
+    let tmpindex = -1;
+    if(indexIsArr){
+      tmpindex = index[i];
+    }else{
+      tmpindex = index;
+    }
+    if (item.data[tmpindex] !== null && typeof item.data[tmpindex] !== 'undefined' && item.show) {
+      let seriesItem = {};
+      seriesItem.color = item.color;
+      seriesItem.type = item.type;
+      seriesItem.style = item.style;
+      seriesItem.pointShape = item.pointShape;
+      seriesItem.disableLegend = item.disableLegend;
+      seriesItem.name = item.name;
+      seriesItem.show = item.show;
+      seriesItem.data = item.formatter ? item.formatter(item.data[tmpindex]) : item.data[tmpindex];
+      data.push(seriesItem);
+    }
+  }
+  return data;
+}
+
+function getMaxTextListLength(list, fontSize, context) {
+  var lengthList = list.map(function(item) {
+    return measureText(item, fontSize, context);
+  });
+  return Math.max.apply(null, lengthList);
+}
+
+function getRadarCoordinateSeries(length) {
+  var eachAngle = 2 * Math.PI / length;
+  var CoordinateSeries = [];
+  for (var i = 0; i < length; i++) {
+    CoordinateSeries.push(eachAngle * i);
+  }
+  return CoordinateSeries.map(function(item) {
+    return -1 * item + Math.PI / 2;
+  });
+}
+
+function getToolTipData(seriesData, opts, index, group, categories) {
+  var option = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
+  var calPoints = opts.chartData.calPoints?opts.chartData.calPoints:[];
+  let points = {};
+  if(group.length > 0){
+    let filterPoints = [];
+    for (let i = 0; i < group.length; i++) {
+      filterPoints.push(calPoints[group[i]])
+    }
+    points = filterPoints[0][index[0]];
+  }else{
+    for (let i = 0; i < calPoints.length; i++) {
+      if(calPoints[i][index]){
+        points = calPoints[i][index];
+        break;
+      }
+    }
+  };
+  var textList = seriesData.map(function(item) {
+    let titleText = null;
+    if (opts.categories && opts.categories.length>0) {
+      titleText = categories[index];
+    };
+    return {
+      text: option.formatter ? option.formatter(item, titleText, index, opts) : item.name + ': ' + item.data,
+      color: item.color
+    };
+  });
+  var offset = {
+    x: Math.round(points.x),
+    y: Math.round(points.y)
+  };
+  return {
+    textList: textList,
+    offset: offset
+  };
+}
+
+function getMixToolTipData(seriesData, opts, index, categories) {
+  var option = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  var points = opts.chartData.xAxisPoints[index] + opts.chartData.eachSpacing / 2;
+  var textList = seriesData.map(function(item) {
+    return {
+      text: option.formatter ? option.formatter(item, categories[index], index, opts) : item.name + ': ' + item.data,
+      color: item.color,
+      disableLegend: item.disableLegend ? true : false
+    };
+  });
+  textList = textList.filter(function(item) {
+    if (item.disableLegend !== true) {
+      return item;
+    }
+  });
+  var offset = {
+    x: Math.round(points),
+    y: 0
+  };
+  return {
+    textList: textList,
+    offset: offset
+  };
+}
+
+function getCandleToolTipData(series, seriesData, opts, index, categories, extra) {
+  var option = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
+  var calPoints = opts.chartData.calPoints;
+  let upColor = extra.color.upFill;
+  let downColor = extra.color.downFill;
+  //颜色顺序为开盘，收盘，最低，最高
+  let color = [upColor, upColor, downColor, upColor];
+  var textList = [];
+  seriesData.map(function(item) {
+    if (index == 0) {
+      if (item.data[1] - item.data[0] < 0) {
+        color[1] = downColor;
+      } else {
+        color[1] = upColor;
+      }
+    } else {
+      if (item.data[0] < series[index - 1][1]) {
+        color[0] = downColor;
+      }
+      if (item.data[1] < item.data[0]) {
+        color[1] = downColor;
+      }
+      if (item.data[2] > series[index - 1][1]) {
+        color[2] = upColor;
+      }
+      if (item.data[3] < series[index - 1][1]) {
+        color[3] = downColor;
+      }
+    }
+    let text1 = {
+      text: '开盘：' + item.data[0],
+      color: color[0]
+    };
+    let text2 = {
+      text: '收盘：' + item.data[1],
+      color: color[1]
+    };
+    let text3 = {
+      text: '最低：' + item.data[2],
+      color: color[2]
+    };
+    let text4 = {
+      text: '最高：' + item.data[3],
+      color: color[3]
+    };
+    textList.push(text1, text2, text3, text4);
+  });
+  var validCalPoints = [];
+  var offset = {
+    x: 0,
+    y: 0
+  };
+  for (let i = 0; i < calPoints.length; i++) {
+    let points = calPoints[i];
+    if (typeof points[index] !== 'undefined' && points[index] !== null) {
+      validCalPoints.push(points[index]);
+    }
+  }
+  offset.x = Math.round(validCalPoints[0][0].x);
+  return {
+    textList: textList,
+    offset: offset
+  };
+}
+
+function filterSeries(series) {
+  let tempSeries = [];
+  for (let i = 0; i < series.length; i++) {
+    if (series[i].show == true) {
+      tempSeries.push(series[i])
+    }
+  }
+  return tempSeries;
+}
+
+function findCurrentIndex(currentPoints, calPoints, opts, config) {
+  var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+  var current={ index:-1, group:[] };
+  var spacing = opts.chartData.eachSpacing / 2;
+  let xAxisPoints = [];
+  if (calPoints && calPoints.length > 0) {
+    if (!opts.categories) {
+      spacing = 0;
+    }else{
+      for (let i = 1; i < opts.chartData.xAxisPoints.length; i++) {
+        xAxisPoints.push(opts.chartData.xAxisPoints[i] - spacing);
+      }
+      if ((opts.type == 'line' || opts.type == 'area') && opts.xAxis.boundaryGap == 'justify') {
+        xAxisPoints = opts.chartData.xAxisPoints;
+      }
+    }
+    if (isInExactChartArea(currentPoints, opts, config)) {
+      if (!opts.categories) {
+        let timePoints = Array(calPoints.length);
+        for (let i = 0; i < calPoints.length; i++) {
+          timePoints[i] = Array(calPoints[i].length)
+          for (let j = 0; j < calPoints[i].length; j++) {
+            timePoints[i][j] = (Math.abs(calPoints[i][j].x - currentPoints.x));
+          }
+        };
+        let pointValue =  Array(timePoints.length);
+        let pointIndex =  Array(timePoints.length);
+        for (let i = 0; i < timePoints.length; i++) {
+          pointValue[i] = Math.min.apply(null, timePoints[i]);
+          pointIndex[i] = timePoints[i].indexOf(pointValue[i]);
+        }
+        let minValue = Math.min.apply(null, pointValue);
+        current.index = [];
+        for (let i = 0; i < pointValue.length; i++) {
+          if(pointValue[i] == minValue){
+            current.group.push(i);
+            current.index.push(pointIndex[i]);
+          }
+        };
+      }else{
+        xAxisPoints.forEach(function(item, index) {
+          if (currentPoints.x + offset + spacing > item) {
+            current.index = index;
+          }
+        });
+      }
+    }
+  }
+  return current;
+}
+
+function findBarChartCurrentIndex(currentPoints, calPoints, opts, config) {
+  var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+  var current={ index:-1, group:[] };
+  var spacing = opts.chartData.eachSpacing / 2;
+  let yAxisPoints = opts.chartData.yAxisPoints;
+  if (calPoints && calPoints.length > 0) {
+    if (isInExactChartArea(currentPoints, opts, config)) {
+      yAxisPoints.forEach(function(item, index) {
+        if (currentPoints.y + offset + spacing > item) {
+          current.index = index;
+        }
+      });
+    }
+  }
+  return current;
+}
+
+function findLegendIndex(currentPoints, legendData, opts) {
+  let currentIndex = -1;
+  let gap = 0;
+  if (isInExactLegendArea(currentPoints, legendData.area)) {
+    let points = legendData.points;
+    let index = -1;
+    for (let i = 0, len = points.length; i < len; i++) {
+      let item = points[i];
+      for (let j = 0; j < item.length; j++) {
+        index += 1;
+        let area = item[j]['area'];
+        if (area && currentPoints.x > area[0] - gap && currentPoints.x < area[2] + gap && currentPoints.y > area[1] - gap && currentPoints.y < area[3] + gap) {
+          currentIndex = index;
+          break;
+        }
+      }
+    }
+    return currentIndex;
+  }
+  return currentIndex;
+}
+
+function isInExactLegendArea(currentPoints, area) {
+  return currentPoints.x > area.start.x && currentPoints.x < area.end.x && currentPoints.y > area.start.y && currentPoints.y < area.end.y;
+}
+
+function isInExactChartArea(currentPoints, opts, config) {
+  return currentPoints.x <= opts.width - opts.area[1] + 10 && currentPoints.x >= opts.area[3] - 10 && currentPoints.y >= opts.area[0] && currentPoints.y <= opts.height - opts.area[2];
+}
+
+function findRadarChartCurrentIndex(currentPoints, radarData, count) {
+  var eachAngleArea = 2 * Math.PI / count;
+  var currentIndex = -1;
+  if (isInExactPieChartArea(currentPoints, radarData.center, radarData.radius)) {
+    var fixAngle = function fixAngle(angle) {
+      if (angle < 0) {
+        angle += 2 * Math.PI;
+      }
+      if (angle > 2 * Math.PI) {
+        angle -= 2 * Math.PI;
+      }
+      return angle;
+    };
+    var angle = Math.atan2(radarData.center.y - currentPoints.y, currentPoints.x - radarData.center.x);
+    angle = -1 * angle;
+    if (angle < 0) {
+      angle += 2 * Math.PI;
+    }
+    var angleList = radarData.angleList.map(function(item) {
+      item = fixAngle(-1 * item);
+      return item;
+    });
+    angleList.forEach(function(item, index) {
+      var rangeStart = fixAngle(item - eachAngleArea / 2);
+      var rangeEnd = fixAngle(item + eachAngleArea / 2);
+      if (rangeEnd < rangeStart) {
+        rangeEnd += 2 * Math.PI;
+      }
+      if (angle >= rangeStart && angle <= rangeEnd || angle + 2 * Math.PI >= rangeStart && angle + 2 * Math.PI <= rangeEnd) {
+        currentIndex = index;
+      }
+    });
+  }
+  return currentIndex;
+}
+
+function findFunnelChartCurrentIndex(currentPoints, funnelData) {
+  var currentIndex = -1;
+  for (var i = 0, len = funnelData.series.length; i < len; i++) {
+    var item = funnelData.series[i];
+    if (currentPoints.x > item.funnelArea[0] && currentPoints.x < item.funnelArea[2] && currentPoints.y > item.funnelArea[1] && currentPoints.y < item.funnelArea[3]) {
+      currentIndex = i;
+      break;
+    }
+  }
+  return currentIndex;
+}
+
+function findWordChartCurrentIndex(currentPoints, wordData) {
+  var currentIndex = -1;
+  for (var i = 0, len = wordData.length; i < len; i++) {
+    var item = wordData[i];
+    if (currentPoints.x > item.area[0] && currentPoints.x < item.area[2] && currentPoints.y > item.area[1] && currentPoints.y < item.area[3]) {
+      currentIndex = i;
+      break;
+    }
+  }
+  return currentIndex;
+}
+
+function findMapChartCurrentIndex(currentPoints, opts) {
+  var currentIndex = -1;
+  var cData = opts.chartData.mapData;
+  var data = opts.series;
+  var tmp = pointToCoordinate(currentPoints.y, currentPoints.x, cData.bounds, cData.scale, cData.xoffset, cData.yoffset);
+  var poi = [tmp.x, tmp.y];
+  for (var i = 0, len = data.length; i < len; i++) {
+    var item = data[i].geometry.coordinates;
+    if (isPoiWithinPoly(poi, item, opts.chartData.mapData.mercator)) {
+      currentIndex = i;
+      break;
+    }
+  }
+  return currentIndex;
+}
+
+function findRoseChartCurrentIndex(currentPoints, pieData, opts) {
+  var currentIndex = -1;
+  var series = getRoseDataPoints(opts._series_, opts.extra.rose.type, pieData.radius, pieData.radius);
+  if (pieData && pieData.center && isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)) {
+    var angle = Math.atan2(pieData.center.y - currentPoints.y, currentPoints.x - pieData.center.x);
+    angle = -angle;
+    if(opts.extra.rose && opts.extra.rose.offsetAngle){
+      angle = angle - opts.extra.rose.offsetAngle * Math.PI / 180;
+    }
+    for (var i = 0, len = series.length; i < len; i++) {
+      if (isInAngleRange(angle, series[i]._start_, series[i]._start_ + series[i]._rose_proportion_ * 2 * Math.PI)) {
+        currentIndex = i;
+        break;
+      }
+    }
+  }
+  return currentIndex;
+}
+
+function findPieChartCurrentIndex(currentPoints, pieData, opts) {
+  var currentIndex = -1;
+  var series = getPieDataPoints(pieData.series);
+  if (pieData && pieData.center && isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)) {
+    var angle = Math.atan2(pieData.center.y - currentPoints.y, currentPoints.x - pieData.center.x);
+    angle = -angle;
+    if(opts.extra.pie && opts.extra.pie.offsetAngle){
+      angle = angle - opts.extra.pie.offsetAngle * Math.PI / 180;
+    }
+    if(opts.extra.ring && opts.extra.ring.offsetAngle){
+      angle = angle - opts.extra.ring.offsetAngle * Math.PI / 180;
+    }
+    for (var i = 0, len = series.length; i < len; i++) {
+      if (isInAngleRange(angle, series[i]._start_, series[i]._start_ + series[i]._proportion_ * 2 * Math.PI)) {
+        currentIndex = i;
+        break;
+      }
+    }
+  }
+  return currentIndex;
+}
+
+function isInExactPieChartArea(currentPoints, center, radius) {
+  return Math.pow(currentPoints.x - center.x, 2) + Math.pow(currentPoints.y - center.y, 2) <= Math.pow(radius, 2);
+}
+
+
+function splitPoints(points,eachSeries) {
+  var newPoints = [];
+  var items = [];
+  points.forEach(function(item, index) {
+    if(eachSeries.connectNulls){
+      if (item !== null) {
+        items.push(item);
+      }
+    }else{
+      if (item !== null) {
+        items.push(item);
+      } else {
+        if (items.length) {
+          newPoints.push(items);
+        }
+        items = [];
+      }
+    }
+    
+  });
+  if (items.length) {
+    newPoints.push(items);
+  }
+  return newPoints;
+}
+
+
+function calLegendData(series, opts, config, chartData, context) {
+  let legendData = {
+    area: {
+      start: {
+        x: 0,
+        y: 0
+      },
+      end: {
+        x: 0,
+        y: 0
+      },
+      width: 0,
+      height: 0,
+      wholeWidth: 0,
+      wholeHeight: 0
+    },
+    points: [],
+    widthArr: [],
+    heightArr: []
+  };
+  if (opts.legend.show === false) {
+    chartData.legendData = legendData;
+    return legendData;
+  }
+  let padding = opts.legend.padding * opts.pix;
+  let margin = opts.legend.margin * opts.pix;
+  let fontSize = opts.legend.fontSize ? opts.legend.fontSize * opts.pix : config.fontSize;
+  let shapeWidth = 15 * opts.pix;
+  let shapeRight = 5 * opts.pix;
+  let lineHeight = Math.max(opts.legend.lineHeight * opts.pix, fontSize);
+  if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+    let legendList = [];
+    let widthCount = 0;
+    let widthCountArr = [];
+    let currentRow = [];
+    for (let i = 0; i < series.length; i++) {
+      let item = series[i];
+      const legendText = item.legendText ? item.legendText : item.name;
+      let itemWidth = shapeWidth + shapeRight + measureText(legendText || 'undefined', fontSize, context) + opts.legend.itemGap * opts.pix;
+      if (widthCount + itemWidth > opts.width - opts.area[1] - opts.area[3]) {
+        legendList.push(currentRow);
+        widthCountArr.push(widthCount - opts.legend.itemGap * opts.pix);
+        widthCount = itemWidth;
+        currentRow = [item];
+      } else {
+        widthCount += itemWidth;
+        currentRow.push(item);
+      }
+    }
+    if (currentRow.length) {
+      legendList.push(currentRow);
+      widthCountArr.push(widthCount - opts.legend.itemGap * opts.pix);
+      legendData.widthArr = widthCountArr;
+      let legendWidth = Math.max.apply(null, widthCountArr);
+      switch (opts.legend.float) {
+        case 'left':
+          legendData.area.start.x = opts.area[3];
+          legendData.area.end.x = opts.area[3] + legendWidth + 2 * padding;
+          break;
+        case 'right':
+          legendData.area.start.x = opts.width - opts.area[1] - legendWidth - 2 * padding;
+          legendData.area.end.x = opts.width - opts.area[1];
+          break;
+        default:
+          legendData.area.start.x = (opts.width - legendWidth) / 2 - padding;
+          legendData.area.end.x = (opts.width + legendWidth) / 2 + padding;
+      }
+      legendData.area.width = legendWidth + 2 * padding;
+      legendData.area.wholeWidth = legendWidth + 2 * padding;
+      legendData.area.height = legendList.length * lineHeight + 2 * padding;
+      legendData.area.wholeHeight = legendList.length * lineHeight + 2 * padding + 2 * margin;
+      legendData.points = legendList;
+    }
+  } else {
+    let len = series.length;
+    let maxHeight = opts.height - opts.area[0] - opts.area[2] - 2 * margin - 2 * padding;
+    let maxLength = Math.min(Math.floor(maxHeight / lineHeight), len);
+    legendData.area.height = maxLength * lineHeight + padding * 2;
+    legendData.area.wholeHeight = maxLength * lineHeight + padding * 2;
+    switch (opts.legend.float) {
+      case 'top':
+        legendData.area.start.y = opts.area[0] + margin;
+        legendData.area.end.y = opts.area[0] + margin + legendData.area.height;
+        break;
+      case 'bottom':
+        legendData.area.start.y = opts.height - opts.area[2] - margin - legendData.area.height;
+        legendData.area.end.y = opts.height - opts.area[2] - margin;
+        break;
+      default:
+        legendData.area.start.y = (opts.height - legendData.area.height) / 2;
+        legendData.area.end.y = (opts.height + legendData.area.height) / 2;
+    }
+    let lineNum = len % maxLength === 0 ? len / maxLength : Math.floor((len / maxLength) + 1);
+    let currentRow = [];
+    for (let i = 0; i < lineNum; i++) {
+      let temp = series.slice(i * maxLength, i * maxLength + maxLength);
+      currentRow.push(temp);
+    }
+    legendData.points = currentRow;
+    if (currentRow.length) {
+      for (let i = 0; i < currentRow.length; i++) {
+        let item = currentRow[i];
+        let maxWidth = 0;
+        for (let j = 0; j < item.length; j++) {
+          let itemWidth = shapeWidth + shapeRight + measureText(item[j].name || 'undefined', fontSize, context) + opts.legend.itemGap * opts.pix;
+          if (itemWidth > maxWidth) {
+            maxWidth = itemWidth;
+          }
+        }
+        legendData.widthArr.push(maxWidth);
+        legendData.heightArr.push(item.length * lineHeight + padding * 2);
+      }
+      let legendWidth = 0
+      for (let i = 0; i < legendData.widthArr.length; i++) {
+        legendWidth += legendData.widthArr[i];
+      }
+      legendData.area.width = legendWidth - opts.legend.itemGap * opts.pix + 2 * padding;
+      legendData.area.wholeWidth = legendData.area.width + padding;
+    }
+  }
+  switch (opts.legend.position) {
+    case 'top':
+      legendData.area.start.y = opts.area[0] + margin;
+      legendData.area.end.y = opts.area[0] + margin + legendData.area.height;
+      break;
+    case 'bottom':
+      legendData.area.start.y = opts.height - opts.area[2] - legendData.area.height - margin;
+      legendData.area.end.y = opts.height - opts.area[2] - margin;
+      break;
+    case 'left':
+      legendData.area.start.x = opts.area[3];
+      legendData.area.end.x = opts.area[3] + legendData.area.width;
+      break;
+    case 'right':
+      legendData.area.start.x = opts.width - opts.area[1] - legendData.area.width;
+      legendData.area.end.x = opts.width - opts.area[1];
+      break;
+  }
+  chartData.legendData = legendData;
+  return legendData;
+}
+
+function calCategoriesData(categories, opts, config, eachSpacing, context) {
+  var result = {
+    angle: 0,
+    xAxisHeight: config.xAxisHeight
+  };
+  var fontSize = opts.xAxis.fontSize * opts.pix || config.fontSize;
+  var categoriesTextLenth = categories.map(function(item,index) {
+    var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item,index,opts) : item;
+    return measureText(String(xitem), fontSize, context);
+  });
+  
+  var maxTextLength = Math.max.apply(this, categoriesTextLenth);
+  if (opts.xAxis.rotateLabel == true) {
+    result.angle = opts.xAxis.rotateAngle * Math.PI / 180;
+    let tempHeight = 2 * config.xAxisTextPadding +  Math.abs(maxTextLength * Math.sin(result.angle))
+    tempHeight = tempHeight < fontSize + 2 * config.xAxisTextPadding ? tempHeight + 2 * config.xAxisTextPadding : tempHeight;
+    if(opts.enableScroll == true && opts.xAxis.scrollShow == true){
+      tempHeight += 12 * opts.pix;
+    }
+    result.xAxisHeight = tempHeight;
+  }
+  if (opts.xAxis.disabled){
+    result.xAxisHeight = 0;
+  }
+  return result;
+}
+
+function getXAxisTextList(series, opts, config, stack) {
+  var index = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1;
+  var data;
+  if (stack == 'stack') {
+    data = dataCombineStack(series, opts.categories.length);
+  } else {
+    data = dataCombine(series);
+  }
+  var sorted = [];
+  // remove null from data
+  data = data.filter(function(item) {
+    //return item !== null;
+    if (typeof item === 'object' && item !== null) {
+      if (item.constructor.toString().indexOf('Array') > -1) {
+        return item !== null;
+      } else {
+        return item.value !== null;
+      }
+    } else {
+      return item !== null;
+    }
+  });
+  data.map(function(item) {
+    if (typeof item === 'object') {
+      if (item.constructor.toString().indexOf('Array') > -1) {
+        if (opts.type == 'candle') {
+          item.map(function(subitem) {
+            sorted.push(subitem);
+          })
+        } else {
+          sorted.push(item[0]);
+        }
+      } else {
+        sorted.push(item.value);
+      }
+    } else {
+      sorted.push(item);
+    }
+  })
+
+  var minData = 0;
+  var maxData = 0;
+  if (sorted.length > 0) {
+    minData = Math.min.apply(this, sorted);
+    maxData = Math.max.apply(this, sorted);
+  }
+  //为了兼容v1.9.0之前的项目
+  if (index > -1) {
+    if (typeof opts.xAxis.data[index].min === 'number') {
+      minData = Math.min(opts.xAxis.data[index].min, minData);
+    }
+    if (typeof opts.xAxis.data[index].max === 'number') {
+      maxData = Math.max(opts.xAxis.data[index].max, maxData);
+    }
+  } else {
+    if (typeof opts.xAxis.min === 'number') {
+      minData = Math.min(opts.xAxis.min, minData);
+    }
+    if (typeof opts.xAxis.max === 'number') {
+      maxData = Math.max(opts.xAxis.max, maxData);
+    }
+  }
+  if (minData === maxData) {
+    var rangeSpan = maxData || 10;
+    maxData += rangeSpan;
+  }
+  //var dataRange = getDataRange(minData, maxData);
+  var minRange = minData;
+  var maxRange = maxData;
+  var range = [];
+  var eachRange = (maxRange - minRange) / opts.xAxis.splitNumber;
+  for (var i = 0; i <= opts.xAxis.splitNumber; i++) {
+    range.push(minRange + eachRange * i);
+  }
+  return range;
+}
+
+function calXAxisData(series, opts, config, context) {
+  //堆叠图重算Y轴
+  var columnstyle = assign({}, {
+    type: ""
+  }, opts.extra.bar);
+  var result = {
+    angle: 0,
+    xAxisHeight: config.xAxisHeight
+  };
+  result.ranges = getXAxisTextList(series, opts, config, columnstyle.type);
+  result.rangesFormat = result.ranges.map(function(item) {
+    //item = opts.xAxis.formatter ? opts.xAxis.formatter(item) : util.toFixed(item, 2);
+    item = util.toFixed(item, 2);
+    return item;
+  });
+  var xAxisScaleValues = result.ranges.map(function(item) {
+    // 如果刻度值是浮点数,则保留两位小数
+    item = util.toFixed(item, 2);
+    // 若有自定义格式则调用自定义的格式化函数
+    //item = opts.xAxis.formatter ? opts.xAxis.formatter(Number(item)) : item;
+    return item;
+  });
+  result = Object.assign(result, getXAxisPoints(xAxisScaleValues, opts, config));
+  // 计算X轴刻度的属性譬如每个刻度的间隔,刻度的起始点\结束点以及总长
+  var eachSpacing = result.eachSpacing;
+  var textLength = xAxisScaleValues.map(function(item) {
+    return measureText(item, opts.xAxis.fontSize * opts.pix || config.fontSize, context);
+  });
+  // get max length of categories text
+  var maxTextLength = Math.max.apply(this, textLength);
+  // 如果刻度值文本内容过长,则将其逆时针旋转45°
+  if (maxTextLength + 2 * config.xAxisTextPadding > eachSpacing) {
+    result.angle = 45 * Math.PI / 180;
+    result.xAxisHeight = 2 * config.xAxisTextPadding + maxTextLength * Math.sin(result.angle);
+  }
+  if (opts.xAxis.disabled === true) {
+    result.xAxisHeight = 0;
+  }
+  return result;
+}
+
+function getRadarDataPoints(angleList, center, radius, series, opts) {
+  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+  var radarOption = opts.extra.radar || {};
+  radarOption.max = radarOption.max || 0;
+  var maxData = Math.max(radarOption.max, Math.max.apply(null, dataCombine(series)));
+  var data = [];
+  for (let i = 0; i < series.length; i++) {
+    let each = series[i];
+    let listItem = {};
+    listItem.color = each.color;
+    listItem.legendShape = each.legendShape;
+    listItem.pointShape = each.pointShape;
+    listItem.data = [];
+    each.data.forEach(function(item, index) {
+      let tmp = {};
+      tmp.angle = angleList[index];
+      tmp.proportion = item / maxData;
+      tmp.value = item;
+      tmp.position = convertCoordinateOrigin(radius * tmp.proportion * process * Math.cos(tmp.angle), radius * tmp.proportion * process * Math.sin(tmp.angle), center);
+      listItem.data.push(tmp);
+    });
+    data.push(listItem);
+  }
+  return data;
+}
+
+function getPieDataPoints(series, radius) {
+  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var count = 0;
+  var _start_ = 0;
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    count += item.data;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    if (count === 0) {
+      item._proportion_ = 1 / series.length * process;
+    } else {
+      item._proportion_ = item.data / count * process;
+    }
+    item._radius_ = radius;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item._start_ = _start_;
+    _start_ += 2 * item._proportion_ * Math.PI;
+  }
+  return series;
+}
+
+function getFunnelDataPoints(series, radius, type, eachSpacing) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  series = series.sort(function(a, b) {
+    return parseInt(b.data) - parseInt(a.data);
+  });
+  for (let i = 0; i < series.length; i++) {
+    if(type == 'funnel'){
+      series[i].radius = series[i].data / series[0].data * radius * process;
+    }else{
+      series[i].radius =  (eachSpacing * (series.length - i)) / (eachSpacing * series.length) * radius * process;
+    }
+    series[i]._proportion_ = series[i].data / series[0].data;
+  }
+  if(type !== 'pyramid'){
+    series.reverse();
+  }
+  return series;
+}
+
+function getRoseDataPoints(series, type, minRadius, radius) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var count = 0;
+  var _start_ = 0;
+  var dataArr = [];
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    count += item.data;
+    dataArr.push(item.data);
+  }
+  var minData = Math.min.apply(null, dataArr);
+  var maxData = Math.max.apply(null, dataArr);
+  var radiusLength = radius - minRadius;
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    if (count === 0) {
+      item._proportion_ = 1 / series.length * process;
+      item._rose_proportion_ = 1 / series.length * process;
+    } else {
+      item._proportion_ = item.data / count * process;
+      if(type == 'area'){
+        item._rose_proportion_ = 1 / series.length * process;
+      }else{
+        item._rose_proportion_ = item.data / count * process;
+      }
+    }
+    item._radius_ = minRadius + radiusLength * ((item.data - minData) / (maxData - minData)) || radius;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item._start_ = _start_;
+    _start_ += 2 * item._rose_proportion_ * Math.PI;
+  }
+  return series;
+}
+
+function getArcbarDataPoints(series, arcbarOption) {
+  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  if (process == 1) {
+    process = 0.999999;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    let totalAngle;
+    if (arcbarOption.type == 'circle') {
+      totalAngle = 2;
+    } else {
+      if (arcbarOption.endAngle < arcbarOption.startAngle) {
+        totalAngle = 2 + arcbarOption.endAngle - arcbarOption.startAngle;
+      } else {
+        totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
+      }
+    }
+    item._proportion_ = totalAngle * item.data * process + arcbarOption.startAngle;
+    if (item._proportion_ >= 2) {
+      item._proportion_ = item._proportion_ % 2;
+    }
+  }
+  return series;
+}
+
+function getGaugeArcbarDataPoints(series, arcbarOption) {
+  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  if (process == 1) {
+    process = 0.999999;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    let totalAngle;
+    if (arcbarOption.type == 'circle') {
+      totalAngle = 2;
+    } else {
+      if (arcbarOption.endAngle < arcbarOption.startAngle) {
+        totalAngle = 2 + arcbarOption.endAngle - arcbarOption.startAngle;
+      } else {
+        totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
+      }
+    }
+    item._proportion_ = totalAngle * item.data * process + arcbarOption.startAngle;
+    if (item._proportion_ >= 2) {
+      item._proportion_ = item._proportion_ % 2;
+    }
+  }
+  return series;
+}
+
+function getGaugeAxisPoints(categories, startAngle, endAngle) {
+  let totalAngle = startAngle - endAngle + 1;
+  let tempStartAngle = startAngle;
+  for (let i = 0; i < categories.length; i++) {
+    categories[i].value = categories[i].value === null ? 0 : categories[i].value;
+    categories[i]._startAngle_ = tempStartAngle;
+    categories[i]._endAngle_ = totalAngle * categories[i].value + startAngle;
+    if (categories[i]._endAngle_ >= 2) {
+      categories[i]._endAngle_ = categories[i]._endAngle_ % 2;
+    }
+    tempStartAngle = categories[i]._endAngle_;
+  }
+  return categories;
+}
+
+function getGaugeDataPoints(series, categories, gaugeOption) {
+  let process = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    if (gaugeOption.pointer.color == 'auto') {
+      for (let i = 0; i < categories.length; i++) {
+        if (item.data <= categories[i].value) {
+          item.color = categories[i].color;
+          break;
+        }
+      }
+    } else {
+      item.color = gaugeOption.pointer.color;
+    }
+    let totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+    item._endAngle_ = totalAngle * item.data + gaugeOption.startAngle;
+    item._oldAngle_ = gaugeOption.oldAngle;
+    if (gaugeOption.oldAngle < gaugeOption.endAngle) {
+      item._oldAngle_ += 2;
+    }
+    if (item.data >= gaugeOption.oldData) {
+      item._proportion_ = (item._endAngle_ - item._oldAngle_) * process + gaugeOption.oldAngle;
+    } else {
+      item._proportion_ = item._oldAngle_ - (item._oldAngle_ - item._endAngle_) * process;
+    }
+    if (item._proportion_ >= 2) {
+      item._proportion_ = item._proportion_ % 2;
+    }
+  }
+  return series;
+}
+
+function getPieTextMaxLength(series, config, context, opts) {
+  series = getPieDataPoints(series);
+  let maxLength = 0;
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    let text = item.formatter ? item.formatter(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_ * 100) + '%';
+    maxLength = Math.max(maxLength, measureText(text, item.textSize * opts.pix || config.fontSize, context));
+  }
+  return maxLength;
+}
+
+function fixColumeData(points, eachSpacing, columnLen, index, config, opts) {
+  return points.map(function(item) {
+    if (item === null) {
+      return null;
+    }
+    var seriesGap = 0;
+    var categoryGap = 0;
+    if (opts.type == 'mix') {
+      seriesGap = opts.extra.mix.column.seriesGap * opts.pix || 0;
+      categoryGap = opts.extra.mix.column.categoryGap * opts.pix || 0;
+    } else {
+      seriesGap = opts.extra.column.seriesGap * opts.pix || 0;
+      categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
+    }
+    seriesGap =  Math.min(seriesGap, eachSpacing / columnLen)
+    categoryGap =  Math.min(categoryGap, eachSpacing / columnLen)
+    item.width = Math.ceil((eachSpacing - 2 * categoryGap - seriesGap * (columnLen - 1)) / columnLen);
+    if (opts.extra.mix && opts.extra.mix.column.width && +opts.extra.mix.column.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.mix.column.width * opts.pix);
+    }
+    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
+    }
+    if (item.width <= 0) {
+      item.width = 1;
+    }
+    item.x += (index + 0.5 - columnLen / 2) * (item.width + seriesGap);
+    return item;
+  });
+}
+
+function fixBarData(points, eachSpacing, columnLen, index, config, opts) {
+  return points.map(function(item) {
+    if (item === null) {
+      return null;
+    }
+    var seriesGap = 0;
+    var categoryGap = 0;
+    seriesGap = opts.extra.bar.seriesGap * opts.pix || 0;
+    categoryGap = opts.extra.bar.categoryGap * opts.pix || 0;
+    seriesGap =  Math.min(seriesGap, eachSpacing / columnLen)
+    categoryGap =  Math.min(categoryGap, eachSpacing / columnLen)
+    item.width = Math.ceil((eachSpacing - 2 * categoryGap - seriesGap * (columnLen - 1)) / columnLen);
+    if (opts.extra.bar && opts.extra.bar.width && +opts.extra.bar.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.bar.width * opts.pix);
+    }
+    if (item.width <= 0) {
+      item.width = 1;
+    }
+    item.y += (index + 0.5 - columnLen / 2) * (item.width + seriesGap);
+    return item;
+  });
+}
+
+function fixColumeMeterData(points, eachSpacing, columnLen, index, config, opts, border) {
+  var categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
+  return points.map(function(item) {
+    if (item === null) {
+      return null;
+    }
+    item.width = eachSpacing - 2 * categoryGap;
+    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
+    }
+    if (index > 0) {
+      item.width -= border;
+    }
+    return item;
+  });
+}
+
+function fixColumeStackData(points, eachSpacing, columnLen, index, config, opts, series) {
+  var categoryGap = opts.extra.column.categoryGap * opts.pix || 0;
+  return points.map(function(item, indexn) {
+    if (item === null) {
+      return null;
+    }
+    item.width = Math.ceil(eachSpacing - 2 * categoryGap);
+    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.column.width * opts.pix);
+    }
+    if (item.width <= 0) {
+      item.width = 1;
+    }
+    return item;
+  });
+}
+
+function fixBarStackData(points, eachSpacing, columnLen, index, config, opts, series) {
+  var categoryGap = opts.extra.bar.categoryGap * opts.pix || 0;
+  return points.map(function(item, indexn) {
+    if (item === null) {
+      return null;
+    }
+    item.width = Math.ceil(eachSpacing - 2 * categoryGap);
+    if (opts.extra.bar && opts.extra.bar.width && +opts.extra.bar.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.bar.width * opts.pix);
+    }
+    if (item.width <= 0) {
+      item.width = 1;
+    }
+    return item;
+  });
+}
+
+function getXAxisPoints(categories, opts, config) {
+  var spacingValid = opts.width - opts.area[1] - opts.area[3];
+  var dataCount = opts.enableScroll ? Math.min(opts.xAxis.itemCount, categories.length) : categories.length;
+  if ((opts.type == 'line' || opts.type == 'area' || opts.type == 'scatter' || opts.type == 'bubble' || opts.type == 'bar') && dataCount > 1 && opts.xAxis.boundaryGap == 'justify') {
+    dataCount -= 1;
+  }
+  var widthRatio = 0;
+  if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1){
+    if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
+    widthRatio = opts.extra.mount.widthRatio - 1;
+    dataCount += widthRatio;
+  }
+  var eachSpacing = spacingValid / dataCount;
+  var xAxisPoints = [];
+  var startX = opts.area[3];
+  var endX = opts.width - opts.area[1];
+  categories.forEach(function(item, index) {
+    xAxisPoints.push(startX + widthRatio / 2 * eachSpacing + index * eachSpacing);
+  });
+  if (opts.xAxis.boundaryGap !== 'justify') {
+    if (opts.enableScroll === true) {
+      xAxisPoints.push(startX + widthRatio * eachSpacing + categories.length * eachSpacing);
+    } else {
+      xAxisPoints.push(endX);
+    }
+  }
+  return {
+    xAxisPoints: xAxisPoints,
+    startX: startX,
+    endX: endX,
+    eachSpacing: eachSpacing
+  };
+}
+
+function getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config) {
+  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var cPoints = [];
+      item.forEach(function(items, indexs) {
+        var point = {};
+        point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
+        var value = items.value || items;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        height *= process;
+        point.y = opts.height - Math.round(height) - opts.area[2];
+        cPoints.push(point);
+      });
+      points.push(cPoints);
+    }
+  });
+  return points;
+}
+
+function getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config) {
+  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+  var boundaryGap = 'center';
+  if (opts.type == 'line' || opts.type == 'area' || opts.type == 'scatter' || opts.type == 'bubble' ) {
+    boundaryGap = opts.xAxis.boundaryGap;
+  }
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+  var validWidth = opts.width - opts.area[1] - opts.area[3];
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var point = {};
+      point.color = item.color;
+      point.x = xAxisPoints[index];
+      var value = item;
+      if (typeof item === 'object' && item !== null) {
+        if (item.constructor.toString().indexOf('Array') > -1) {
+          let xranges, xminRange, xmaxRange;
+          xranges = [].concat(opts.chartData.xAxisData.ranges);
+          xminRange = xranges.shift();
+          xmaxRange = xranges.pop();
+          value = item[1];
+          point.x = opts.area[3] + validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
+          if(opts.type == 'bubble'){
+            point.r = item[2];
+            point.t = item[3];
+          }
+        } else {
+          value = item.value;
+        }
+      }
+      if (boundaryGap == 'center') {
+        point.x += eachSpacing / 2;
+      }
+      var height = validHeight * (value - minRange) / (maxRange - minRange);
+      height *= process;
+      point.y = opts.height - height - opts.area[2];
+      points.push(point);
+    }
+  });
+  return points;
+}
+
+function getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption) {
+  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+  var validWidth = opts.width - opts.area[1] - opts.area[3];
+  var mountWidth = eachSpacing * mountOption.widthRatio;
+  series.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var point = {};
+      point.color = item.color;
+      point.x = xAxisPoints[index];
+      point.x += eachSpacing / 2;
+      var value = item.data;
+      var height = validHeight * (value - minRange) / (maxRange - minRange);
+      height *= process;
+      point.y = opts.height - height - opts.area[2];
+      point.value = value;
+      point.width = mountWidth;
+      points.push(point);
+    }
+  });
+  return points;
+}
+
+function getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config) {
+  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+  var validWidth = opts.width - opts.area[1] - opts.area[3];
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var point = {};
+      point.color = item.color;
+      point.y = yAxisPoints[index];
+      var value = item;
+      if (typeof item === 'object' && item !== null) {
+        value = item.value;
+      }
+      var height = validWidth * (value - minRange) / (maxRange - minRange);
+      height *= process;
+      point.height = height;
+      point.value = value;
+      point.x = height + opts.area[3];
+      points.push(point);
+    }
+  });
+  return points;
+}
+
+function getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, stackSeries) {
+  var process = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var point = {};
+      point.color = item.color;
+      point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
+
+      if (seriesIndex > 0) {
+        var value = 0;
+        for (let i = 0; i <= seriesIndex; i++) {
+          value += stackSeries[i].data[index];
+        }
+        var value0 = value - item;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        var height0 = validHeight * (value0 - minRange) / (maxRange - minRange);
+      } else {
+        var value = item;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        var height0 = 0;
+      }
+      var heightc = height0;
+      height *= process;
+      heightc *= process;
+      point.y = opts.height - Math.round(height) - opts.area[2];
+      point.y0 = opts.height - Math.round(heightc) - opts.area[2];
+      points.push(point);
+    }
+  });
+  return points;
+}
+
+function getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, stackSeries) {
+  var process = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
+  var points = [];
+  var validHeight = opts.width - opts.area[1] - opts.area[3];
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var point = {};
+      point.color = item.color;
+      point.y = yAxisPoints[index];
+      if (seriesIndex > 0) {
+        var value = 0;
+        for (let i = 0; i <= seriesIndex; i++) {
+          value += stackSeries[i].data[index];
+        }
+        var value0 = value - item;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        var height0 = validHeight * (value0 - minRange) / (maxRange - minRange);
+      } else {
+        var value = item;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        var height0 = 0;
+      }
+      var heightc = height0;
+      height *= process;
+      heightc *= process;
+      point.height = height - heightc;
+      point.x = opts.area[3] + height;
+      point.x0 = opts.area[3] + heightc;
+      points.push(point);
+    }
+  });
+  return points;
+}
+
+function getYAxisTextList(series, opts, config, stack, yData) {
+  var index = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : -1;
+  var data;
+  if (stack == 'stack') {
+    data = dataCombineStack(series, opts.categories.length);
+  } else {
+    data = dataCombine(series);
+  }
+  var sorted = [];
+  // remove null from data
+  data = data.filter(function(item) {
+    //return item !== null;
+    if (typeof item === 'object' && item !== null) {
+      if (item.constructor.toString().indexOf('Array') > -1) {
+        return item !== null;
+      } else {
+        return item.value !== null;
+      }
+    } else {
+      return item !== null;
+    }
+  });
+  data.map(function(item) {
+    if (typeof item === 'object') {
+      if (item.constructor.toString().indexOf('Array') > -1) {
+        if (opts.type == 'candle') {
+          item.map(function(subitem) {
+            sorted.push(subitem);
+          })
+        } else {
+          sorted.push(item[1]);
+        }
+      } else {
+        sorted.push(item.value);
+      }
+    } else {
+      sorted.push(item);
+    }
+  })
+  var minData = yData.min || 0;
+  var maxData = yData.max || 0;
+  if (sorted.length > 0) {
+    minData = Math.min.apply(this, sorted);
+    maxData = Math.max.apply(this, sorted);
+  }
+  if (minData === maxData) {
+    // var rangeSpan = maxData || 10;
+    // maxData += rangeSpan;
+    if(maxData == 0){
+      maxData = 10;
+    }else{
+      minData = 0;
+    }
+  }
+  var dataRange = getDataRange(minData, maxData);
+  var minRange = (yData.min === undefined || yData.min === null) ? dataRange.minRange : yData.min;
+  var maxRange = (yData.max === undefined || yData.max === null) ? dataRange.maxRange : yData.max;
+  var range = [];
+  var eachRange = (maxRange - minRange) / opts.yAxis.splitNumber;
+  for (var i = 0; i <= opts.yAxis.splitNumber; i++) {
+    range.push(minRange + eachRange * i);
+  }
+  return range.reverse();
+}
+
+function calYAxisData(series, opts, config, context) {
+  //堆叠图重算Y轴
+  var columnstyle = assign({}, {
+    type: ""
+  }, opts.extra.column);
+  //如果是多Y轴，重新计算
+  var YLength = opts.yAxis.data.length;
+  var newSeries = new Array(YLength);
+  if (YLength > 0) {
+    for (let i = 0; i < YLength; i++) {
+      newSeries[i] = [];
+      for (let j = 0; j < series.length; j++) {
+        if (series[j].index == i) {
+          newSeries[i].push(series[j]);
+        }
+      }
+    }
+    var rangesArr = new Array(YLength);
+    var rangesFormatArr = new Array(YLength);
+    var yAxisWidthArr = new Array(YLength);
+
+    for (let i = 0; i < YLength; i++) {
+      let yData = opts.yAxis.data[i];
+      //如果总开关不显示，强制每个Y轴为不显示
+      if (opts.yAxis.disabled == true) {
+        yData.disabled = true;
+      }
+      if(yData.type === 'categories'){
+        if(!yData.formatter){
+          yData.formatter = (val,index,opts) => {return val + (yData.unit || '')};
+        }
+        yData.categories = yData.categories || opts.categories;
+        rangesArr[i] = yData.categories;
+      }else{
+        if(!yData.formatter){
+          yData.formatter = (val,index,opts) => {return val.toFixed(yData.tofix) + (yData.unit || '')};
+        }
+        rangesArr[i] = getYAxisTextList(newSeries[i], opts, config, columnstyle.type, yData, i);
+      }
+      let yAxisFontSizes = yData.fontSize * opts.pix || config.fontSize;
+      yAxisWidthArr[i] = {
+        position: yData.position ? yData.position : 'left',
+        width: 0
+      };
+      rangesFormatArr[i] = rangesArr[i].map(function(items,index) {
+        items = yData.formatter(items,index,opts);
+        yAxisWidthArr[i].width = Math.max(yAxisWidthArr[i].width, measureText(items, yAxisFontSizes, context) + 5);
+        return items;
+      });
+      let calibration = yData.calibration ? 4 * opts.pix : 0;
+      yAxisWidthArr[i].width += calibration + 3 * opts.pix;
+      if (yData.disabled === true) {
+        yAxisWidthArr[i].width = 0;
+      }
+    }
+  } else {
+    var rangesArr = new Array(1);
+    var rangesFormatArr = new Array(1);
+    var yAxisWidthArr = new Array(1);
+    if(opts.type === 'bar'){
+      rangesArr[0] = opts.categories;
+      if(!opts.yAxis.formatter){
+        opts.yAxis.formatter = (val,index,opts) => {return val + (opts.yAxis.unit || '')}
+      }
+    }else{
+      if(!opts.yAxis.formatter){
+        opts.yAxis.formatter = (val,index,opts) => {return val.toFixed(opts.yAxis.tofix ) + (opts.yAxis.unit || '')}
+      }
+      rangesArr[0] = getYAxisTextList(series, opts, config, columnstyle.type, {});
+    }
+    yAxisWidthArr[0] = {
+      position: 'left',
+      width: 0
+    };
+    var yAxisFontSize = opts.yAxis.fontSize * opts.pix || config.fontSize;
+    rangesFormatArr[0] = rangesArr[0].map(function(item,index) {
+      item = opts.yAxis.formatter(item,index,opts);
+      yAxisWidthArr[0].width = Math.max(yAxisWidthArr[0].width, measureText(item, yAxisFontSize, context) + 5);
+      return item;
+    });
+    yAxisWidthArr[0].width += 3 * opts.pix;
+    if (opts.yAxis.disabled === true) {
+      yAxisWidthArr[0] = {
+        position: 'left',
+        width: 0
+      };
+      opts.yAxis.data[0] = {
+        disabled: true
+      };
+    } else {
+      opts.yAxis.data[0] = {
+        disabled: false,
+        position: 'left',
+        max: opts.yAxis.max,
+        min: opts.yAxis.min,
+        formatter: opts.yAxis.formatter
+      };
+      if(opts.type === 'bar'){
+        opts.yAxis.data[0].categories = opts.categories;
+        opts.yAxis.data[0].type = 'categories';
+      }
+    }
+  }
+  return {
+    rangesFormat: rangesFormatArr,
+    ranges: rangesArr,
+    yAxisWidth: yAxisWidthArr
+  };
+}
+
+function calTooltipYAxisData(point, series, opts, config, eachSpacing) {
+  let ranges = [].concat(opts.chartData.yAxisData.ranges);
+  let spacingValid = opts.height - opts.area[0] - opts.area[2];
+  let minAxis = opts.area[0];
+  let items = [];
+  for (let i = 0; i < ranges.length; i++) {
+    let maxVal = ranges[i].shift();
+    let minVal = ranges[i].pop();
+    let item = maxVal - (maxVal - minVal) * (point - minAxis) / spacingValid;
+    item = opts.yAxis.data[i].formatter ? opts.yAxis.data[i].formatter(item) : item.toFixed(0);
+    items.push(String(item))
+  }
+  return items;
+}
+
+function calMarkLineData(points, opts) {
+  let minRange, maxRange;
+  let spacingValid = opts.height - opts.area[0] - opts.area[2];
+  for (let i = 0; i < points.length; i++) {
+    points[i].yAxisIndex = points[i].yAxisIndex ? points[i].yAxisIndex : 0;
+    let range = [].concat(opts.chartData.yAxisData.ranges[points[i].yAxisIndex]);
+    minRange = range.pop();
+    maxRange = range.shift();
+    let height = spacingValid * (points[i].value - minRange) / (maxRange - minRange);
+    points[i].y = opts.height - Math.round(height) - opts.area[2];
+  }
+  return points;
+}
+
+function contextRotate(context, opts) {
+  if (opts.rotateLock !== true) {
+    context.translate(opts.height, 0);
+    context.rotate(90 * Math.PI / 180);
+  } else if (opts._rotate_ !== true) {
+    context.translate(opts.height, 0);
+    context.rotate(90 * Math.PI / 180);
+    opts._rotate_ = true;
+  }
+}
+
+function drawPointShape(points, color, shape, context, opts) {
+  context.beginPath();
+  if (opts.dataPointShapeType == 'hollow') {
+    context.setStrokeStyle(color);
+    context.setFillStyle(opts.background);
+    context.setLineWidth(2 * opts.pix);
+  } else {
+    context.setStrokeStyle("#ffffff");
+    context.setFillStyle(color);
+    context.setLineWidth(1 * opts.pix);
+  }
+  if (shape === 'diamond') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x, item.y - 4.5);
+        context.lineTo(item.x - 4.5, item.y);
+        context.lineTo(item.x, item.y + 4.5);
+        context.lineTo(item.x + 4.5, item.y);
+        context.lineTo(item.x, item.y - 4.5);
+      }
+    });
+  } else if (shape === 'circle') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x + 2.5 * opts.pix, item.y);
+        context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
+      }
+    });
+  } else if (shape === 'square') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x - 3.5, item.y - 3.5);
+        context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
+      }
+    });
+  } else if (shape === 'triangle') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x, item.y - 4.5);
+        context.lineTo(item.x - 4.5, item.y + 4.5);
+        context.lineTo(item.x + 4.5, item.y + 4.5);
+        context.lineTo(item.x, item.y - 4.5);
+      }
+    });
+  } else if (shape === 'triangle') {
+    return;
+  }
+  context.closePath();
+  context.fill();
+  context.stroke();
+}
+
+function drawRingTitle(opts, config, context, center) {
+  var titlefontSize = opts.title.fontSize || config.titleFontSize;
+  var subtitlefontSize = opts.subtitle.fontSize || config.subtitleFontSize;
+  var title = opts.title.name || '';
+  var subtitle = opts.subtitle.name || '';
+  var titleFontColor = opts.title.color || opts.fontColor;
+  var subtitleFontColor = opts.subtitle.color || opts.fontColor;
+  var titleHeight = title ? titlefontSize : 0;
+  var subtitleHeight = subtitle ? subtitlefontSize : 0;
+  var margin = 5;
+  if (subtitle) {
+    var textWidth = measureText(subtitle, subtitlefontSize * opts.pix, context);
+    var startX = center.x - textWidth / 2 + (opts.subtitle.offsetX|| 0) * opts.pix ;
+    var startY = center.y + subtitlefontSize * opts.pix / 2 + (opts.subtitle.offsetY || 0) * opts.pix;
+    if (title) {
+      startY += (titleHeight * opts.pix + margin) / 2;
+    }
+    context.beginPath();
+    context.setFontSize(subtitlefontSize * opts.pix);
+    context.setFillStyle(subtitleFontColor);
+    context.fillText(subtitle, startX, startY);
+    context.closePath();
+    context.stroke();
+  }
+  if (title) {
+    var _textWidth = measureText(title, titlefontSize * opts.pix, context);
+    var _startX = center.x - _textWidth / 2 + (opts.title.offsetX || 0);
+    var _startY = center.y + titlefontSize * opts.pix / 2 + (opts.title.offsetY || 0) * opts.pix;
+    if (subtitle) {
+      _startY -= (subtitleHeight * opts.pix + margin) / 2;
+    }
+    context.beginPath();
+    context.setFontSize(titlefontSize * opts.pix);
+    context.setFillStyle(titleFontColor);
+    context.fillText(title, _startX, _startY);
+    context.closePath();
+    context.stroke();
+  }
+}
+
+function drawPointText(points, series, config, context, opts) {
+  // 绘制数据文案
+  var data = series.data;
+  var textOffset = series.textOffset ? series.textOffset : 0;
+  points.forEach(function(item, index) {
+    if (item !== null) {
+      context.beginPath();
+      var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
+      context.setFontSize(fontSize);
+      context.setFillStyle(series.textColor || opts.fontColor);
+      var value = data[index]
+      if (typeof data[index] === 'object' && data[index] !== null) {
+        if (data[index].constructor.toString().indexOf('Array')>-1) {
+          value = data[index][1];
+        } else {
+          value = data[index].value
+        }
+      }
+      var formatVal = series.formatter ? series.formatter(value,index,series,opts) : value;
+      context.setTextAlign('center');
+      context.fillText(String(formatVal), item.x, item.y - 4 + textOffset * opts.pix);
+      context.closePath();
+      context.stroke();
+      context.setTextAlign('left');
+    }
+  });
+}
+
+function drawMountPointText(points, series, config, context, opts) {
+  // 绘制数据文案
+  var data = series.data;
+  var textOffset = series.textOffset ? series.textOffset : 0;
+  points.forEach(function(item, index) {
+    if (item !== null) {
+      context.beginPath();
+      var fontSize = series[index].textSize ? series[index].textSize * opts.pix : config.fontSize;
+      context.setFontSize(fontSize);
+      context.setFillStyle(series[index].textColor || opts.fontColor);
+      var value = item.value
+      var formatVal = series[index].formatter ? series[index].formatter(value,index,series,opts) : value;
+      context.setTextAlign('center');
+      context.fillText(String(formatVal), item.x, item.y - 4 + textOffset * opts.pix);
+      context.closePath();
+      context.stroke();
+      context.setTextAlign('left');
+    }
+  });
+}
+
+function drawBarPointText(points, series, config, context, opts) {
+  // 绘制数据文案
+  var data = series.data;
+  var textOffset = series.textOffset ? series.textOffset : 0;
+  points.forEach(function(item, index) {
+    if (item !== null) {
+      context.beginPath();
+      var fontSize = series.textSize ? series.textSize * opts.pix : config.fontSize;
+      context.setFontSize(fontSize);
+      context.setFillStyle(series.textColor || opts.fontColor);
+      var value = data[index]
+      if (typeof data[index] === 'object' && data[index] !== null) {
+        value = data[index].value ;
+      }
+      var formatVal = series.formatter ? series.formatter(value,index,series,opts) : value;
+      context.setTextAlign('left');
+      context.fillText(String(formatVal), item.x + 4 * opts.pix , item.y + fontSize / 2 - 3 );
+      context.closePath();
+      context.stroke();
+    }
+  });
+}
+
+function drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context) {
+  radius -= gaugeOption.width / 2 + gaugeOption.labelOffset * opts.pix;
+  radius = radius < 10 ? 10 : radius;
+  let totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+  let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+  let totalNumber = gaugeOption.endNumber - gaugeOption.startNumber;
+  let splitNumber = totalNumber / gaugeOption.splitLine.splitNumber;
+  let nowAngle = gaugeOption.startAngle;
+  let nowNumber = gaugeOption.startNumber;
+  for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
+    var pos = {
+      x: radius * Math.cos(nowAngle * Math.PI),
+      y: radius * Math.sin(nowAngle * Math.PI)
+    };
+    var labelText = gaugeOption.formatter ? gaugeOption.formatter(nowNumber,i,opts) : nowNumber;
+    pos.x += centerPosition.x - measureText(labelText, config.fontSize, context) / 2;
+    pos.y += centerPosition.y;
+    var startX = pos.x;
+    var startY = pos.y;
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(gaugeOption.labelColor || opts.fontColor);
+    context.fillText(labelText, startX, startY + config.fontSize / 2);
+    context.closePath();
+    context.stroke();
+    nowAngle += splitAngle;
+    if (nowAngle >= 2) {
+      nowAngle = nowAngle % 2;
+    }
+    nowNumber += splitNumber;
+  }
+}
+
+function drawRadarLabel(angleList, radius, centerPosition, opts, config, context) {
+  var radarOption = opts.extra.radar || {};
+  angleList.forEach(function(angle, index) {
+    if(radarOption.labelPointShow === true && opts.categories[index] !== ''){
+      var posPoint = {
+        x: radius * Math.cos(angle),
+        y: radius * Math.sin(angle)
+      };
+      var posPointAxis = convertCoordinateOrigin(posPoint.x, posPoint.y, centerPosition);
+      context.setFillStyle(radarOption.labelPointColor);
+      context.beginPath();
+      context.arc(posPointAxis.x, posPointAxis.y, radarOption.labelPointRadius * opts.pix, 0, 2 * Math.PI, false);
+      context.closePath();
+      context.fill();
+    }
+    var pos = {
+      x: (radius + config.radarLabelTextMargin * opts.pix) * Math.cos(angle),
+      y: (radius + config.radarLabelTextMargin * opts.pix) * Math.sin(angle)
+    };
+    var posRelativeCanvas = convertCoordinateOrigin(pos.x, pos.y, centerPosition);
+    var startX = posRelativeCanvas.x;
+    var startY = posRelativeCanvas.y;
+    if (util.approximatelyEqual(pos.x, 0)) {
+      startX -= measureText(opts.categories[index] || '', config.fontSize, context) / 2;
+    } else if (pos.x < 0) {
+      startX -= measureText(opts.categories[index] || '', config.fontSize, context);
+    }
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(radarOption.labelColor || opts.fontColor);
+    context.fillText(opts.categories[index] || '', startX, startY + config.fontSize / 2);
+    context.closePath();
+    context.stroke();
+  });
+
+}
+
+function drawPieText(series, opts, config, context, radius, center) {
+  var lineRadius = config.pieChartLinePadding;
+  var textObjectCollection = [];
+  var lastTextObject = null;
+  var seriesConvert = series.map(function(item,index) {
+    var text = item.formatter ? item.formatter(item,index,series,opts) : util.toFixed(item._proportion_.toFixed(4) * 100) + '%';
+    text = item.labelText ? item.labelText : text;
+    var arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._proportion_ / 2);
+    if (item._rose_proportion_) {
+      arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._rose_proportion_ / 2);
+    }
+    var color = item.color;
+    var radius = item._radius_;
+    return {
+      arc: arc,
+      text: text,
+      color: color,
+      radius: radius,
+      textColor: item.textColor,
+      textSize: item.textSize,
+      labelShow: item.labelShow
+    };
+  });
+  for (let i = 0; i < seriesConvert.length; i++) {
+    let item = seriesConvert[i];
+    // line end
+    let orginX1 = Math.cos(item.arc) * (item.radius + lineRadius);
+    let orginY1 = Math.sin(item.arc) * (item.radius + lineRadius);
+    // line start
+    let orginX2 = Math.cos(item.arc) * item.radius;
+    let orginY2 = Math.sin(item.arc) * item.radius;
+    // text start
+    let orginX3 = orginX1 >= 0 ? orginX1 + config.pieChartTextPadding : orginX1 - config.pieChartTextPadding;
+    let orginY3 = orginY1;
+    let textWidth = measureText(item.text, item.textSize * opts.pix || config.fontSize, context);
+    let startY = orginY3;
+    if (lastTextObject && util.isSameXCoordinateArea(lastTextObject.start, {
+        x: orginX3
+      })) {
+      if (orginX3 > 0) {
+        startY = Math.min(orginY3, lastTextObject.start.y);
+      } else if (orginX1 < 0) {
+        startY = Math.max(orginY3, lastTextObject.start.y);
+      } else {
+        if (orginY3 > 0) {
+          startY = Math.max(orginY3, lastTextObject.start.y);
+        } else {
+          startY = Math.min(orginY3, lastTextObject.start.y);
+        }
+      }
+    }
+    if (orginX3 < 0) {
+      orginX3 -= textWidth;
+    }
+    let textObject = {
+      lineStart: {
+        x: orginX2,
+        y: orginY2
+      },
+      lineEnd: {
+        x: orginX1,
+        y: orginY1
+      },
+      start: {
+        x: orginX3,
+        y: startY
+      },
+      width: textWidth,
+      height: config.fontSize,
+      text: item.text,
+      color: item.color,
+      textColor: item.textColor,
+      textSize: item.textSize
+    };
+    lastTextObject = avoidCollision(textObject, lastTextObject);
+    textObjectCollection.push(lastTextObject);
+  }
+  for (let i = 0; i < textObjectCollection.length; i++) {
+    if(seriesConvert[i].labelShow === false){
+      continue;
+    }
+    let item = textObjectCollection[i];
+    let lineStartPoistion = convertCoordinateOrigin(item.lineStart.x, item.lineStart.y, center);
+    let lineEndPoistion = convertCoordinateOrigin(item.lineEnd.x, item.lineEnd.y, center);
+    let textPosition = convertCoordinateOrigin(item.start.x, item.start.y, center);
+    context.setLineWidth(1 * opts.pix);
+    context.setFontSize(item.textSize * opts.pix || config.fontSize);
+    context.beginPath();
+    context.setStrokeStyle(item.color);
+    context.setFillStyle(item.color);
+    context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
+    let curveStartX = item.start.x < 0 ? textPosition.x + item.width : textPosition.x;
+    let textStartX = item.start.x < 0 ? textPosition.x - 5 : textPosition.x + 5;
+    context.quadraticCurveTo(lineEndPoistion.x, lineEndPoistion.y, curveStartX, textPosition.y);
+    context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
+    context.stroke();
+    context.closePath();
+    context.beginPath();
+    context.moveTo(textPosition.x + item.width, textPosition.y);
+    context.arc(curveStartX, textPosition.y, 2 * opts.pix, 0, 2 * Math.PI);
+    context.closePath();
+    context.fill();
+    context.beginPath();
+    context.setFontSize(item.textSize * opts.pix || config.fontSize);
+    context.setFillStyle(item.textColor || opts.fontColor);
+    context.fillText(item.text, textStartX, textPosition.y + 3);
+    context.closePath();
+    context.stroke();
+    context.closePath();
+  }
+}
+
+function drawToolTipSplitLine(offsetX, opts, config, context) {
+  var toolTipOption = opts.extra.tooltip || {};
+  toolTipOption.gridType = toolTipOption.gridType == undefined ? 'solid' : toolTipOption.gridType;
+  toolTipOption.dashLength = toolTipOption.dashLength == undefined ? 4 : toolTipOption.dashLength;
+  var startY = opts.area[0];
+  var endY = opts.height - opts.area[2];
+  if (toolTipOption.gridType == 'dash') {
+    context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
+  }
+  context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
+  context.setLineWidth(1 * opts.pix);
+  context.beginPath();
+  context.moveTo(offsetX, startY);
+  context.lineTo(offsetX, endY);
+  context.stroke();
+  context.setLineDash([]);
+  if (toolTipOption.xAxisLabel) {
+    let labelText = opts.categories[opts.tooltip.index];
+    context.setFontSize(config.fontSize);
+    let textWidth = measureText(labelText, config.fontSize, context);
+    let textX = offsetX - 0.5 * textWidth;
+    let textY = endY;
+    context.beginPath();
+    context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption.labelBgOpacity || config.toolTipOpacity));
+    context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
+    context.setLineWidth(1 * opts.pix);
+    context.rect(textX - config.toolTipPadding, textY, textWidth + 2 * config.toolTipPadding, config.fontSize + 2 * config.toolTipPadding);
+    context.closePath();
+    context.stroke();
+    context.fill();
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(toolTipOption.labelFontColor || opts.fontColor);
+    context.fillText(String(labelText), textX, textY + config.toolTipPadding + config.fontSize);
+    context.closePath();
+    context.stroke();
+  }
+}
+
+function drawMarkLine(opts, config, context) {
+  let markLineOption = assign({}, {
+    type: 'solid',
+    dashLength: 4,
+    data: []
+  }, opts.extra.markLine);
+  let startX = opts.area[3];
+  let endX = opts.width - opts.area[1];
+  let points = calMarkLineData(markLineOption.data, opts);
+  for (let i = 0; i < points.length; i++) {
+    let item = assign({}, {
+      lineColor: '#DE4A42',
+      showLabel: false,
+      labelFontColor: '#666666',
+      labelBgColor: '#DFE8FF',
+      labelBgOpacity: 0.8,
+      labelAlign: 'left',
+      labelOffsetX: 0,
+      labelOffsetY: 0,
+    }, points[i]);
+    if (markLineOption.type == 'dash') {
+      context.setLineDash([markLineOption.dashLength, markLineOption.dashLength]);
+    }
+    context.setStrokeStyle(item.lineColor);
+    context.setLineWidth(1 * opts.pix);
+    context.beginPath();
+    context.moveTo(startX, item.y);
+    context.lineTo(endX, item.y);
+    context.stroke();
+    context.setLineDash([]);
+    if (item.showLabel) {
+      let labelText = item.labelText ? item.labelText : item.value;
+      context.setFontSize(config.fontSize);
+      let textWidth = measureText(labelText, config.fontSize, context);
+      let bgWidth = textWidth + config.toolTipPadding * 2;
+      let bgStartX = item.labelAlign == 'left' ? opts.area[3] - bgWidth : opts.width - opts.area[1];
+      bgStartX += item.labelOffsetX;
+      let bgStartY = item.y - 0.5 * config.fontSize - config.toolTipPadding;
+      bgStartY += item.labelOffsetY;
+      let textX = bgStartX + config.toolTipPadding;
+      let textY = item.y;
+      context.setFillStyle(hexToRgb(item.labelBgColor, item.labelBgOpacity));
+      context.setStrokeStyle(item.labelBgColor);
+      context.setLineWidth(1 * opts.pix);
+      context.beginPath();
+      context.rect(bgStartX, bgStartY, bgWidth, config.fontSize + 2 * config.toolTipPadding);
+      context.closePath();
+      context.stroke();
+      context.fill();
+      context.setFontSize(config.fontSize);
+      context.setTextAlign('left');
+      context.setFillStyle(item.labelFontColor);
+      context.fillText(String(labelText), textX, bgStartY + config.fontSize + config.toolTipPadding/2);
+      context.stroke();
+      context.setTextAlign('left');
+    }
+  }
+}
+
+function drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints) {
+  var toolTipOption = assign({}, {
+    gridType: 'solid',
+    dashLength: 4
+  }, opts.extra.tooltip);
+  var startX = opts.area[3];
+  var endX = opts.width - opts.area[1];
+  if (toolTipOption.gridType == 'dash') {
+    context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
+  }
+  context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
+  context.setLineWidth(1 * opts.pix);
+  context.beginPath();
+  context.moveTo(startX, opts.tooltip.offset.y);
+  context.lineTo(endX, opts.tooltip.offset.y);
+  context.stroke();
+  context.setLineDash([]);
+  if (toolTipOption.yAxisLabel) {
+    let labelText = calTooltipYAxisData(opts.tooltip.offset.y, opts.series, opts, config, eachSpacing);
+    let widthArr = opts.chartData.yAxisData.yAxisWidth;
+    let tStartLeft = opts.area[3];
+    let tStartRight = opts.width - opts.area[1];
+    for (let i = 0; i < labelText.length; i++) {
+      context.setFontSize(config.fontSize);
+      let textWidth = measureText(labelText[i], config.fontSize, context);
+      let bgStartX, bgEndX, bgWidth;
+      if (widthArr[i].position == 'left') {
+        bgStartX = tStartLeft - widthArr[i].width;
+        bgEndX = Math.max(bgStartX, bgStartX + textWidth + config.toolTipPadding * 2);
+      } else {
+        bgStartX = tStartRight;
+        bgEndX = Math.max(bgStartX + widthArr[i].width, bgStartX + textWidth + config.toolTipPadding * 2);
+      }
+      bgWidth = bgEndX - bgStartX;
+      let textX = bgStartX + (bgWidth - textWidth) / 2;
+      let textY = opts.tooltip.offset.y;
+      context.beginPath();
+      context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption.labelBgOpacity || config.toolTipOpacity));
+      context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
+      context.setLineWidth(1 * opts.pix);
+      context.rect(bgStartX, textY - 0.5 * config.fontSize - config.toolTipPadding, bgWidth, config.fontSize + 2 *
+        config.toolTipPadding);
+      context.closePath();
+      context.stroke();
+      context.fill();
+      context.beginPath();
+      context.setFontSize(config.fontSize);
+      context.setFillStyle(toolTipOption.labelFontColor || opts.fontColor);
+      context.fillText(labelText[i], textX, textY + 0.5 * config.fontSize);
+      context.closePath();
+      context.stroke();
+      if (widthArr[i].position == 'left') {
+        tStartLeft -= (widthArr[i].width + opts.yAxis.padding * opts.pix);
+      } else {
+        tStartRight += widthArr[i].width + opts.yAxis.padding * opts.pix;
+      }
+    }
+  }
+}
+
+function drawToolTipSplitArea(offsetX, opts, config, context, eachSpacing) {
+  var toolTipOption = assign({}, {
+    activeBgColor: '#000000',
+    activeBgOpacity: 0.08,
+    activeWidth: eachSpacing
+  }, opts.extra.column);
+  toolTipOption.activeWidth = toolTipOption.activeWidth > eachSpacing ? eachSpacing : toolTipOption.activeWidth;
+  var startY = opts.area[0];
+  var endY = opts.height - opts.area[2];
+  context.beginPath();
+  context.setFillStyle(hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity));
+  context.rect(offsetX - toolTipOption.activeWidth / 2, startY, toolTipOption.activeWidth, endY - startY);
+  context.closePath();
+  context.fill();
+  context.setFillStyle("#FFFFFF");
+}
+
+function drawBarToolTipSplitArea(offsetX, opts, config, context, eachSpacing) {
+  var toolTipOption = assign({}, {
+    activeBgColor: '#000000',
+    activeBgOpacity: 0.08
+  }, opts.extra.bar);
+  var startX = opts.area[3];
+  var endX = opts.width - opts.area[1];
+  context.beginPath();
+  context.setFillStyle(hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity));
+  context.rect( startX ,offsetX - eachSpacing / 2 ,  endX - startX,eachSpacing);
+  context.closePath();
+  context.fill();
+  context.setFillStyle("#FFFFFF");
+}
+
+
+function drawToolTip(textList, offset, opts, config, context, eachSpacing, xAxisPoints) {
+  var toolTipOption = assign({}, {
+    showBox: true,
+    showArrow: true,
+    showCategory: false,
+    bgColor: '#000000',
+    bgOpacity: 0.7,
+    borderColor: '#000000',
+    borderWidth: 0,
+    borderRadius: 0,
+    borderOpacity: 0.7,
+    fontColor: '#FFFFFF',
+    splitLine: true,
+  }, opts.extra.tooltip);
+  if(toolTipOption.showCategory==true && opts.categories){
+    textList.unshift({text:opts.categories[opts.tooltip.index],color:null})
+  }
+  var legendWidth = 4 * opts.pix;
+  var legendMarginRight = 5 * opts.pix;
+  var arrowWidth = toolTipOption.showArrow ? 8 * opts.pix : 0;
+  var isOverRightBorder = false;
+  if (opts.type == 'line' || opts.type == 'mount' || opts.type == 'area' || opts.type == 'candle' || opts.type == 'mix') {
+    if (toolTipOption.splitLine == true) {
+      drawToolTipSplitLine(opts.tooltip.offset.x, opts, config, context);
+    }
+  }
+  offset = assign({
+    x: 0,
+    y: 0
+  }, offset);
+  offset.y -= 8 * opts.pix;
+  var textWidth = textList.map(function(item) {
+    return measureText(item.text, config.fontSize, context);
+  });
+  var toolTipWidth = legendWidth + legendMarginRight + 4 * config.toolTipPadding + Math.max.apply(null, textWidth);
+  var toolTipHeight = 2 * config.toolTipPadding + textList.length * config.toolTipLineHeight;
+  if (toolTipOption.showBox == false) {
+    return
+  }
+  // if beyond the right border
+  if (offset.x - Math.abs(opts._scrollDistance_ || 0) + arrowWidth + toolTipWidth > opts.width) {
+    isOverRightBorder = true;
+  }
+  if (toolTipHeight + offset.y > opts.height) {
+    offset.y = opts.height - toolTipHeight;
+  }
+  // draw background rect
+  context.beginPath();
+  context.setFillStyle(hexToRgb(toolTipOption.bgColor || config.toolTipBackground, toolTipOption.bgOpacity || config.toolTipOpacity));
+  context.setLineWidth(toolTipOption.borderWidth * opts.pix);
+  context.setStrokeStyle(hexToRgb(toolTipOption.borderColor, toolTipOption.borderOpacity));
+  var radius = toolTipOption.borderRadius;
+  if (isOverRightBorder) {
+    if (toolTipOption.showArrow) {
+      context.moveTo(offset.x, offset.y + 10 * opts.pix);
+      context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pix + 5 * opts.pix);
+    }
+    context.arc(offset.x - arrowWidth - radius, offset.y + toolTipHeight - radius, radius, 0, Math.PI / 2, false);
+    context.arc(offset.x - arrowWidth - Math.round(toolTipWidth) + radius, offset.y + toolTipHeight - radius, radius,
+      Math.PI / 2, Math.PI, false);
+    context.arc(offset.x - arrowWidth - Math.round(toolTipWidth) + radius, offset.y + radius, radius, -Math.PI, -Math.PI / 2, false);
+    context.arc(offset.x - arrowWidth - radius, offset.y + radius, radius, -Math.PI / 2, 0, false);
+    if (toolTipOption.showArrow) {
+      context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pix - 5 * opts.pix);
+      context.lineTo(offset.x, offset.y + 10 * opts.pix);
+    }
+  } else {
+    if (toolTipOption.showArrow) {
+      context.moveTo(offset.x, offset.y + 10 * opts.pix);
+      context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pix - 5 * opts.pix);
+    }
+    context.arc(offset.x + arrowWidth + radius, offset.y + radius, radius, -Math.PI, -Math.PI / 2, false);
+    context.arc(offset.x + arrowWidth + Math.round(toolTipWidth) - radius, offset.y + radius, radius, -Math.PI / 2, 0,
+      false);
+    context.arc(offset.x + arrowWidth + Math.round(toolTipWidth) - radius, offset.y + toolTipHeight - radius, radius, 0,
+      Math.PI / 2, false);
+    context.arc(offset.x + arrowWidth + radius, offset.y + toolTipHeight - radius, radius, Math.PI / 2, Math.PI, false);
+    if (toolTipOption.showArrow) {
+      context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pix + 5 * opts.pix);
+      context.lineTo(offset.x, offset.y + 10 * opts.pix);
+    }
+  }
+  context.closePath();
+  context.fill();
+  if (toolTipOption.borderWidth > 0) {
+    context.stroke();
+  }
+  // draw legend
+  textList.forEach(function(item, index) {
+    if (item.color !== null) {
+      context.beginPath();
+      context.setFillStyle(item.color);
+      var startX = offset.x + arrowWidth + 2 * config.toolTipPadding;
+      var startY = offset.y + (config.toolTipLineHeight - config.fontSize) / 2 + config.toolTipLineHeight * index + config.toolTipPadding + 1;
+      if (isOverRightBorder) {
+        startX = offset.x - toolTipWidth - arrowWidth + 2 * config.toolTipPadding;
+      }
+      context.fillRect(startX, startY, legendWidth, config.fontSize);
+      context.closePath();
+    }
+  });
+  // draw text list
+  textList.forEach(function(item, index) {
+    var startX = offset.x + arrowWidth + 2 * config.toolTipPadding + legendWidth + legendMarginRight;
+    if (isOverRightBorder) {
+      startX = offset.x - toolTipWidth - arrowWidth + 2 * config.toolTipPadding + +legendWidth + legendMarginRight;
+    }
+    var startY = offset.y + (config.toolTipLineHeight - config.fontSize) / 2 + config.toolTipLineHeight * index + config.toolTipPadding;
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(toolTipOption.fontColor);
+    context.fillText(item.text, startX, startY + config.fontSize);
+    context.closePath();
+    context.stroke();
+  });
+}
+
+function drawColumnDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  let columnOption = assign({}, {
+    type: 'group',
+    width: eachSpacing / 2,
+    meterBorder: 4,
+    meterFillColor: '#FFFFFF',
+    barBorderCircle: false,
+    barBorderRadius: [],
+    seriesGap: 2,
+    linearType: 'none',
+    linearOpacity: 1,
+    customColor: [],
+    colorStop: 0,
+  }, opts.extra.column);
+  let calPoints = [];
+  context.save();
+  let leftNum = -2;
+  let rightNum = xAxisPoints.length + 2;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+    leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
+    rightNum = leftNum + opts.xAxis.itemCount + 4;
+  }
+  if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
+    drawToolTipSplitArea(opts.tooltip.offset.x, opts, config, context, eachSpacing);
+  }
+  columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges, minRange, maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    var data = eachSeries.data;
+    switch (columnOption.type) {
+      case 'group':
+        var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+        var tooltipPoints = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+        calPoints.push(tooltipPoints);
+        points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
+        for (let i = 0; i < points.length; i++) {
+          let item = points[i];
+          //fix issues/I27B1N yyoinge & Joeshu
+          if (item !== null && i > leftNum && i < rightNum) {
+            var startX = item.x - item.width / 2;
+            var height = opts.height - item.y - opts.area[2];
+            context.beginPath();
+            var fillColor = item.color || eachSeries.color
+            var strokeColor = item.color || eachSeries.color
+            if (columnOption.linearType !== 'none') {
+              var grd = context.createLinearGradient(startX, item.y, startX, opts.height - opts.area[2]);
+              //透明渐变
+              if (columnOption.linearType == 'opacity') {
+                grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              } else {
+                grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
+                grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex],columnOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              }
+              fillColor = grd
+            }
+            // 圆角边框
+            if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle === true) {
+              const left = startX;
+              const top = item.y;
+              const width = item.width;
+              const height = opts.height - opts.area[2] - item.y;
+              if (columnOption.barBorderCircle) {
+                columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+              }
+              let [r0, r1, r2, r3] = columnOption.barBorderRadius;
+              let minRadius = Math.min(width/2,height/2);
+              r0 = r0 > minRadius ? minRadius : r0;
+              r1 = r1 > minRadius ? minRadius : r1;
+              r2 = r2 > minRadius ? minRadius : r2;
+              r3 = r3 > minRadius ? minRadius : r3;
+              r0 = r0 < 0 ? 0 : r0;
+              r1 = r1 < 0 ? 0 : r1;
+              r2 = r2 < 0 ? 0 : r2;
+              r3 = r3 < 0 ? 0 : r3;
+              context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
+              context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
+              context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
+              context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+            } else {
+              context.moveTo(startX, item.y);
+              context.lineTo(startX + item.width, item.y);
+              context.lineTo(startX + item.width, opts.height - opts.area[2]);
+              context.lineTo(startX, opts.height - opts.area[2]);
+              context.lineTo(startX, item.y);
+              context.setLineWidth(1)
+              context.setStrokeStyle(strokeColor);
+            }
+            context.setFillStyle(fillColor);
+            context.closePath();
+            //context.stroke();
+            context.fill();
+          }
+        };
+        break;
+      case 'stack':
+        // 绘制堆叠数据图
+        var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+        calPoints.push(points);
+        points = fixColumeStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
+        for (let i = 0; i < points.length; i++) {
+          let item = points[i];
+          if (item !== null && i > leftNum && i < rightNum) {
+            context.beginPath();
+            var fillColor = item.color || eachSeries.color;
+            var startX = item.x - item.width / 2 + 1;
+            var height = opts.height - item.y - opts.area[2];
+            var height0 = opts.height - item.y0 - opts.area[2];
+            if (seriesIndex > 0) {
+              height -= height0;
+            }
+            context.setFillStyle(fillColor);
+            context.moveTo(startX, item.y);
+            context.fillRect(startX, item.y, item.width, height);
+            context.closePath();
+            context.fill();
+          }
+        };
+        break;
+      case 'meter':
+        // 绘制温度计数据图
+        var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+        calPoints.push(points);
+        points = fixColumeMeterData(points, eachSpacing, series.length, seriesIndex, config, opts, columnOption.meterBorder);
+          for (let i = 0; i < points.length; i++) {
+            let item = points[i];
+            if (item !== null && i > leftNum && i < rightNum) {
+              //画背景颜色
+              context.beginPath();
+              if (seriesIndex == 0 && columnOption.meterBorder > 0) {
+                context.setStrokeStyle(eachSeries.color);
+                context.setLineWidth(columnOption.meterBorder * opts.pix);
+              }
+              if(seriesIndex == 0){
+                context.setFillStyle(columnOption.meterFillColor);
+              }else{
+                context.setFillStyle(item.color || eachSeries.color);
+              }
+              var startX = item.x - item.width / 2;
+              var height = opts.height - item.y - opts.area[2];
+              if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle === true) {
+                const left = startX;
+                const top = item.y;
+                const width = item.width;
+                const height = opts.height - opts.area[2] - item.y;
+                if (columnOption.barBorderCircle) {
+                  columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+                }
+                let [r0, r1, r2, r3] = columnOption.barBorderRadius;
+                let minRadius = Math.min(width/2,height/2);
+                r0 = r0 > minRadius ? minRadius : r0;
+                r1 = r1 > minRadius ? minRadius : r1;
+                r2 = r2 > minRadius ? minRadius : r2;
+                r3 = r3 > minRadius ? minRadius : r3;
+                r0 = r0 < 0 ? 0 : r0;
+                r1 = r1 < 0 ? 0 : r1;
+                r2 = r2 < 0 ? 0 : r2;
+                r3 = r3 < 0 ? 0 : r3;
+                context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
+                context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
+                context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
+                context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+                context.fill();
+              }else{
+                context.moveTo(startX, item.y);
+                context.lineTo(startX + item.width, item.y);
+                context.lineTo(startX + item.width, opts.height - opts.area[2]);
+                context.lineTo(startX, opts.height - opts.area[2]);
+                context.lineTo(startX, item.y);
+                context.fill();
+              }
+              if (seriesIndex == 0 && columnOption.meterBorder > 0) {
+                context.closePath();
+                context.stroke();
+              }
+            }
+          }
+        break;
+    }
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      let ranges, minRange, maxRange;
+      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+      minRange = ranges.pop();
+      maxRange = ranges.shift();
+      var data = eachSeries.data;
+      switch (columnOption.type) {
+        case 'group':
+          var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+          points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
+          drawPointText(points, eachSeries, config, context, opts);
+          break;
+        case 'stack':
+          var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+          drawPointText(points, eachSeries, config, context, opts);
+          break;
+        case 'meter':
+          var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+          drawPointText(points, eachSeries, config, context, opts);
+          break;
+      }
+    });
+  }
+  context.restore();
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawMountDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  let mountOption = assign({}, {
+    type: 'mount',
+    widthRatio: 1,
+    borderWidth: 1,
+    barBorderCircle: false,
+    barBorderRadius: [],
+    linearType: 'none',
+    linearOpacity: 1,
+    customColor: [],
+    colorStop: 0,
+  }, opts.extra.mount);
+  mountOption.widthRatio = mountOption.widthRatio <= 0 ? 0 : mountOption.widthRatio;
+  mountOption.widthRatio = mountOption.widthRatio >= 2 ? 2 : mountOption.widthRatio;
+  let calPoints = [];
+  context.save();
+  let leftNum = -2;
+  let rightNum = xAxisPoints.length + 2;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+    leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
+    rightNum = leftNum + opts.xAxis.itemCount + 4;
+  }
+  mountOption.customColor = fillCustomColor(mountOption.linearType, mountOption.customColor, series, config);
+    let ranges, minRange, maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[0]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    var points = getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption, process);
+    switch (mountOption.type) {
+      case 'bar':
+        for (let i = 0; i < points.length; i++) {
+          let item = points[i];
+          if (item !== null && i > leftNum && i < rightNum) {
+            var startX = item.x - eachSpacing*mountOption.widthRatio/2;
+            var height = opts.height - item.y - opts.area[2];
+            context.beginPath();
+            var fillColor = item.color || series[i].color
+            var strokeColor = item.color || series[i].color
+            if (mountOption.linearType !== 'none') {
+              var grd = context.createLinearGradient(startX, item.y, startX, opts.height - opts.area[2]);
+              //透明渐变
+              if (mountOption.linearType == 'opacity') {
+                grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              } else {
+                grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
+                grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              }
+              fillColor = grd
+            }
+            // 圆角边框
+            if ((mountOption.barBorderRadius && mountOption.barBorderRadius.length === 4) || mountOption.barBorderCircle === true) {
+              const left = startX;
+              const top = item.y;
+              const width = item.width;
+              const height = opts.height - opts.area[2] - item.y - mountOption.borderWidth * opts.pix / 2; 
+              if (mountOption.barBorderCircle) {
+                mountOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+              }
+              let [r0, r1, r2, r3] = mountOption.barBorderRadius;
+              let minRadius = Math.min(width/2,height/2);
+              r0 = r0 > minRadius ? minRadius : r0;
+              r1 = r1 > minRadius ? minRadius : r1;
+              r2 = r2 > minRadius ? minRadius : r2;
+              r3 = r3 > minRadius ? minRadius : r3;
+              r0 = r0 < 0 ? 0 : r0;
+              r1 = r1 < 0 ? 0 : r1;
+              r2 = r2 < 0 ? 0 : r2;
+              r3 = r3 < 0 ? 0 : r3;
+              context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
+              context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
+              context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
+              context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+            } else {
+              context.moveTo(startX, item.y);
+              context.lineTo(startX + item.width, item.y);
+              context.lineTo(startX + item.width, opts.height - opts.area[2]);
+              context.lineTo(startX, opts.height - opts.area[2]);
+              context.lineTo(startX, item.y);
+            }
+            context.setStrokeStyle(strokeColor);
+            context.setFillStyle(fillColor);
+            if(mountOption.borderWidth > 0){
+              context.setLineWidth(mountOption.borderWidth * opts.pix);
+              context.closePath();
+              context.stroke();
+            }
+            context.fill();
+          }
+        };
+        break;
+      case 'triangle':
+        for (let i = 0; i < points.length; i++) {
+          let item = points[i];
+          if (item !== null && i > leftNum && i < rightNum) {
+            var startX = item.x - eachSpacing*mountOption.widthRatio/2;
+            var height = opts.height - item.y - opts.area[2];
+            context.beginPath();
+            var fillColor = item.color || series[i].color
+            var strokeColor = item.color || series[i].color
+            if (mountOption.linearType !== 'none') {
+              var grd = context.createLinearGradient(startX, item.y, startX, opts.height - opts.area[2]);
+              //透明渐变
+              if (mountOption.linearType == 'opacity') {
+                grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              } else {
+                grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
+                grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              }
+              fillColor = grd
+            }
+            context.moveTo(startX, opts.height - opts.area[2]);
+            context.lineTo(item.x, item.y);
+            context.lineTo(startX + item.width, opts.height - opts.area[2]);
+            context.setStrokeStyle(strokeColor);
+            context.setFillStyle(fillColor);
+            if(mountOption.borderWidth > 0){
+              context.setLineWidth(mountOption.borderWidth * opts.pix);
+              context.stroke();
+            }
+            context.fill();
+          }
+        };
+        break;
+      case 'mount':
+        for (let i = 0; i < points.length; i++) {
+          let item = points[i];
+          if (item !== null && i > leftNum && i < rightNum) {
+            var startX = item.x - eachSpacing*mountOption.widthRatio/2;
+            var height = opts.height - item.y - opts.area[2];
+            context.beginPath();
+            var fillColor = item.color || series[i].color
+            var strokeColor = item.color || series[i].color
+            if (mountOption.linearType !== 'none') {
+              var grd = context.createLinearGradient(startX, item.y, startX, opts.height - opts.area[2]);
+              //透明渐变
+              if (mountOption.linearType == 'opacity') {
+                grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              } else {
+                grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
+                grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              }
+              fillColor = grd
+            }
+            context.moveTo(startX, opts.height - opts.area[2]);
+            context.bezierCurveTo(item.x - item.width/4, opts.height - opts.area[2], item.x - item.width/4, item.y, item.x, item.y);
+            context.bezierCurveTo(item.x + item.width/4, item.y, item.x + item.width/4, opts.height - opts.area[2], startX + item.width, opts.height - opts.area[2]);
+            context.setStrokeStyle(strokeColor);
+            context.setFillStyle(fillColor);
+            if(mountOption.borderWidth > 0){
+              context.setLineWidth(mountOption.borderWidth * opts.pix);
+              context.stroke();
+            }
+            context.fill();
+          }
+        };
+        break;
+      case 'sharp':
+        for (let i = 0; i < points.length; i++) {
+          let item = points[i];
+          if (item !== null && i > leftNum && i < rightNum) {
+            var startX = item.x - eachSpacing*mountOption.widthRatio/2;
+            var height = opts.height - item.y - opts.area[2];
+            context.beginPath();
+            var fillColor = item.color || series[i].color
+            var strokeColor = item.color || series[i].color
+            if (mountOption.linearType !== 'none') {
+              var grd = context.createLinearGradient(startX, item.y, startX, opts.height - opts.area[2]);
+              //透明渐变
+              if (mountOption.linearType == 'opacity') {
+                grd.addColorStop(0, hexToRgb(fillColor, mountOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              } else {
+                grd.addColorStop(0, hexToRgb(mountOption.customColor[series[i].linearIndex], mountOption.linearOpacity));
+                grd.addColorStop(mountOption.colorStop, hexToRgb(mountOption.customColor[series[i].linearIndex],mountOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              }
+              fillColor = grd
+            }
+            context.moveTo(startX, opts.height - opts.area[2]);
+            context.quadraticCurveTo(item.x - 0, opts.height - opts.area[2] - height/4, item.x, item.y);
+            context.quadraticCurveTo(item.x + 0, opts.height - opts.area[2] - height/4, startX + item.width, opts.height - opts.area[2])
+            context.setStrokeStyle(strokeColor);
+            context.setFillStyle(fillColor);
+            if(mountOption.borderWidth > 0){
+              context.setLineWidth(mountOption.borderWidth * opts.pix);
+              context.stroke();
+            }
+            context.fill();
+          }
+        };
+        break;
+    }
+
+  if (opts.dataLabel !== false && process === 1) {
+    let ranges, minRange, maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[0]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    var points = getMountDataPoints(series, minRange, maxRange, xAxisPoints, eachSpacing, opts, mountOption, process);
+    drawMountPointText(points, series, config, context, opts);
+  }
+  context.restore();
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: points,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawBarDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let yAxisPoints = [];
+  let eachSpacing = (opts.height - opts.area[0] - opts.area[2])/opts.categories.length;
+  for (let i = 0; i < opts.categories.length; i++) {
+    yAxisPoints.push(opts.area[0] + eachSpacing / 2 + eachSpacing * i);
+  }
+  let columnOption = assign({}, {
+    type: 'group',
+    width: eachSpacing / 2,
+    meterBorder: 4,
+    meterFillColor: '#FFFFFF',
+    barBorderCircle: false,
+    barBorderRadius: [],
+    seriesGap: 2,
+    linearType: 'none',
+    linearOpacity: 1,
+    customColor: [],
+    colorStop: 0,
+  }, opts.extra.bar);
+  let calPoints = [];
+  context.save();
+  let leftNum = -2;
+  let rightNum = yAxisPoints.length + 2;
+  if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
+    drawBarToolTipSplitArea(opts.tooltip.offset.y, opts, config, context, eachSpacing);
+  }
+  columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges, minRange, maxRange;
+    ranges = [].concat(opts.chartData.xAxisData.ranges);
+    maxRange = ranges.pop();
+    minRange = ranges.shift();
+    var data = eachSeries.data;
+    switch (columnOption.type) {
+      case 'group':
+        var points = getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, process);
+        var tooltipPoints = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+        calPoints.push(tooltipPoints);
+        points = fixBarData(points, eachSpacing, series.length, seriesIndex, config, opts);
+        for (let i = 0; i < points.length; i++) {
+          let item = points[i];
+          //fix issues/I27B1N yyoinge & Joeshu
+          if (item !== null && i > leftNum && i < rightNum) {
+            //var startX = item.x - item.width / 2;
+            var startX = opts.area[3];
+            var startY = item.y - item.width / 2;
+            var height = item.height;
+            context.beginPath();
+            var fillColor = item.color || eachSeries.color
+            var strokeColor = item.color || eachSeries.color
+            if (columnOption.linearType !== 'none') {
+              var grd = context.createLinearGradient(startX, item.y, item.x, item.y);
+              //透明渐变
+              if (columnOption.linearType == 'opacity') {
+                grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              } else {
+                grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
+                grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex],columnOption.linearOpacity));
+                grd.addColorStop(1, hexToRgb(fillColor, 1));
+              }
+              fillColor = grd
+            }
+            // 圆角边框
+            if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle === true) {
+              const left = startX;
+              const width = item.width;
+              const top = item.y - item.width / 2;
+              const height = item.height;
+              if (columnOption.barBorderCircle) {
+                columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+              }
+              let [r0, r1, r2, r3] = columnOption.barBorderRadius;
+              let minRadius = Math.min(width/2,height/2);
+              r0 = r0 > minRadius ? minRadius : r0;
+              r1 = r1 > minRadius ? minRadius : r1;
+              r2 = r2 > minRadius ? minRadius : r2;
+              r3 = r3 > minRadius ? minRadius : r3;
+              r0 = r0 < 0 ? 0 : r0;
+              r1 = r1 < 0 ? 0 : r1;
+              r2 = r2 < 0 ? 0 : r2;
+              r3 = r3 < 0 ? 0 : r3;
+              
+              context.arc(left + r3, top + r3, r3, -Math.PI, -Math.PI / 2);
+              context.arc(item.x - r0, top + r0, r0, -Math.PI / 2, 0);
+              context.arc(item.x - r1, top + width - r1, r1, 0, Math.PI / 2);
+              context.arc(left + r2, top + width - r2, r2, Math.PI / 2, Math.PI);
+            } else {
+              context.moveTo(startX, startY);
+              context.lineTo(item.x, startY);
+              context.lineTo(item.x, startY + item.width);
+              context.lineTo(startX, startY + item.width);
+              context.lineTo(startX, startY);
+              context.setLineWidth(1)
+              context.setStrokeStyle(strokeColor);
+            }
+            context.setFillStyle(fillColor);
+            context.closePath();
+            //context.stroke();
+            context.fill();
+          }
+        };
+        break;
+      case 'stack':
+        // 绘制堆叠数据图
+        var points = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+        calPoints.push(points);
+        points = fixBarStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
+        for (let i = 0; i < points.length; i++) {
+          let item = points[i];
+          if (item !== null && i > leftNum && i < rightNum) {
+            context.beginPath();
+            var fillColor = item.color || eachSeries.color;
+            var startX = item.x0;
+            context.setFillStyle(fillColor);
+            context.moveTo(startX, item.y - item.width/2);
+            context.fillRect(startX, item.y - item.width/2, item.height , item.width);
+            context.closePath();
+            context.fill();
+          }
+        };
+        break;
+    }
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      let ranges, minRange, maxRange;
+      ranges = [].concat(opts.chartData.xAxisData.ranges);
+      maxRange = ranges.pop();
+      minRange = ranges.shift();
+      var data = eachSeries.data;
+      switch (columnOption.type) {
+        case 'group':
+          var points = getBarDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, process);
+          points = fixBarData(points, eachSpacing, series.length, seriesIndex, config, opts);
+          drawBarPointText(points, eachSeries, config, context, opts);
+          break;
+        case 'stack':
+          var points = getBarStackDataPoints(data, minRange, maxRange, yAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+          drawBarPointText(points, eachSeries, config, context, opts);
+          break;
+      }
+    });
+  }
+  return {
+    yAxisPoints: yAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawCandleDataPoints(series, seriesMA, opts, config, context) {
+  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+  var candleOption = assign({}, {
+    color: {},
+    average: {}
+  }, opts.extra.candle);
+  candleOption.color = assign({}, {
+    upLine: '#f04864',
+    upFill: '#f04864',
+    downLine: '#2fc25b',
+    downFill: '#2fc25b'
+  }, candleOption.color);
+  candleOption.average = assign({}, {
+    show: false,
+    name: [],
+    day: [],
+    color: config.color
+  }, candleOption.average);
+  opts.extra.candle = candleOption;
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  let calPoints = [];
+  context.save();
+  let leftNum = -2;
+  let rightNum = xAxisPoints.length + 2;
+  let leftSpace = 0;
+  let rightSpace = opts.width + eachSpacing;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+    leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
+    rightNum = leftNum + opts.xAxis.itemCount + 4;
+    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+  }
+  //画均线
+  if (candleOption.average.show || seriesMA) { //Merge pull request !12 from 邱贵翔
+    seriesMA.forEach(function(eachSeries, seriesIndex) {
+      let ranges, minRange, maxRange;
+      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+      minRange = ranges.pop();
+      maxRange = ranges.shift();
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      var splitPointList = splitPoints(points,eachSeries);
+      for (let i = 0; i < splitPointList.length; i++) {
+        let points = splitPointList[i];
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setLineWidth(1);
+        if (points.length === 1) {
+          context.moveTo(points[0].x, points[0].y);
+          context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+        } else {
+          context.moveTo(points[0].x, points[0].y);
+          let startPoint = 0;
+          for (let j = 0; j < points.length; j++) {
+            let item = points[j];
+            if (startPoint == 0 && item.x > leftSpace) {
+              context.moveTo(item.x, item.y);
+              startPoint = 1;
+            }
+            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              var ctrlPoint = createCurveControlPoints(points, j - 1);
+              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x,
+                item.y);
+            }
+          }
+          context.moveTo(points[0].x, points[0].y);
+        }
+        context.closePath();
+        context.stroke();
+      }
+    });
+  }
+  //画K线
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges, minRange, maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    var data = eachSeries.data;
+    var points = getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+    var splitPointList = splitPoints(points,eachSeries);
+    for (let i = 0; i < splitPointList[0].length; i++) {
+      if (i > leftNum && i < rightNum) {
+        let item = splitPointList[0][i];
+        context.beginPath();
+        //如果上涨
+        if (data[i][1] - data[i][0] > 0) {
+          context.setStrokeStyle(candleOption.color.upLine);
+          context.setFillStyle(candleOption.color.upFill);
+          context.setLineWidth(1 * opts.pix);
+          context.moveTo(item[3].x, item[3].y); //顶点
+          context.lineTo(item[1].x, item[1].y); //收盘中间点
+          context.lineTo(item[1].x - eachSpacing / 4, item[1].y); //收盘左侧点
+          context.lineTo(item[0].x - eachSpacing / 4, item[0].y); //开盘左侧点
+          context.lineTo(item[0].x, item[0].y); //开盘中间点
+          context.lineTo(item[2].x, item[2].y); //底点
+          context.lineTo(item[0].x, item[0].y); //开盘中间点
+          context.lineTo(item[0].x + eachSpacing / 4, item[0].y); //开盘右侧点
+          context.lineTo(item[1].x + eachSpacing / 4, item[1].y); //收盘右侧点
+          context.lineTo(item[1].x, item[1].y); //收盘中间点
+          context.moveTo(item[3].x, item[3].y); //顶点
+        } else {
+          context.setStrokeStyle(candleOption.color.downLine);
+          context.setFillStyle(candleOption.color.downFill);
+          context.setLineWidth(1 * opts.pix);
+          context.moveTo(item[3].x, item[3].y); //顶点
+          context.lineTo(item[0].x, item[0].y); //开盘中间点
+          context.lineTo(item[0].x - eachSpacing / 4, item[0].y); //开盘左侧点
+          context.lineTo(item[1].x - eachSpacing / 4, item[1].y); //收盘左侧点
+          context.lineTo(item[1].x, item[1].y); //收盘中间点
+          context.lineTo(item[2].x, item[2].y); //底点
+          context.lineTo(item[1].x, item[1].y); //收盘中间点
+          context.lineTo(item[1].x + eachSpacing / 4, item[1].y); //收盘右侧点
+          context.lineTo(item[0].x + eachSpacing / 4, item[0].y); //开盘右侧点
+          context.lineTo(item[0].x, item[0].y); //开盘中间点
+          context.moveTo(item[3].x, item[3].y); //顶点
+        }
+        context.closePath();
+        context.fill();
+        context.stroke();
+      }
+    }
+  });
+  context.restore();
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawAreaDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var areaOption = assign({}, {
+    type: 'straight',
+    opacity: 0.2,
+    addLine: false,
+    width: 2,
+    gradient: false
+  }, opts.extra.area);
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  let endY = opts.height - opts.area[2];
+  let calPoints = [];
+  context.save();
+  let leftSpace = 0;
+  let rightSpace = opts.width + eachSpacing;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+  }
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges, minRange, maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    let data = eachSeries.data;
+    let points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+    let splitPointList = splitPoints(points,eachSeries);
+    for (let i = 0; i < splitPointList.length; i++) {
+      let points = splitPointList[i];
+      // 绘制区域数
+      context.beginPath();
+      context.setStrokeStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+      if (areaOption.gradient) {
+        let gradient = context.createLinearGradient(0, opts.area[0], 0, opts.height - opts.area[2]);
+        gradient.addColorStop('0', hexToRgb(eachSeries.color, areaOption.opacity));
+        gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
+        context.setFillStyle(gradient);
+      } else {
+        context.setFillStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+      }
+      context.setLineWidth(areaOption.width * opts.pix);
+      if (points.length > 1) {
+        let firstPoint = points[0];
+        let lastPoint = points[points.length - 1];
+        context.moveTo(firstPoint.x, firstPoint.y);
+        let startPoint = 0;
+        if (areaOption.type === 'curve') {
+          for (let j = 0; j < points.length; j++) {
+            let item = points[j];
+            if (startPoint == 0 && item.x > leftSpace) {
+              context.moveTo(item.x, item.y);
+              startPoint = 1;
+            }
+            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              let ctrlPoint = createCurveControlPoints(points, j - 1);
+              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
+            }
+          };
+        } 
+        if (areaOption.type === 'straight') {
+          for (let j = 0; j < points.length; j++) {
+            let item = points[j];
+            if (startPoint == 0 && item.x > leftSpace) {
+              context.moveTo(item.x, item.y);
+              startPoint = 1;
+            }
+            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              context.lineTo(item.x, item.y);
+            }
+          };
+        }
+        if (areaOption.type === 'step') {
+          for (let j = 0; j < points.length; j++) {
+            let item = points[j];
+            if (startPoint == 0 && item.x > leftSpace) {
+              context.moveTo(item.x, item.y);
+              startPoint = 1;
+            }
+            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              context.lineTo(item.x, points[j - 1].y);
+              context.lineTo(item.x, item.y);
+            }
+          };
+        }
+        context.lineTo(lastPoint.x, endY);
+        context.lineTo(firstPoint.x, endY);
+        context.lineTo(firstPoint.x, firstPoint.y);
+      } else {
+        let item = points[0];
+        context.moveTo(item.x - eachSpacing / 2, item.y);
+        context.lineTo(item.x + eachSpacing / 2, item.y);
+        context.lineTo(item.x + eachSpacing / 2, endY);
+        context.lineTo(item.x - eachSpacing / 2, endY);
+        context.moveTo(item.x - eachSpacing / 2, item.y);
+      }
+      context.closePath();
+      context.fill();
+      //画连线
+      if (areaOption.addLine) {
+        if (eachSeries.lineType == 'dash') {
+          let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
+          dashLength *= opts.pix;
+          context.setLineDash([dashLength, dashLength]);
+        }
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setLineWidth(areaOption.width * opts.pix);
+        if (points.length === 1) {
+          context.moveTo(points[0].x, points[0].y);
+          context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+        } else {
+          context.moveTo(points[0].x, points[0].y);
+          let startPoint = 0;
+          if (areaOption.type === 'curve') {
+            for (let j = 0; j < points.length; j++) {
+              let item = points[j];
+              if (startPoint == 0 && item.x > leftSpace) {
+                context.moveTo(item.x, item.y);
+                startPoint = 1;
+              }
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                let ctrlPoint = createCurveControlPoints(points, j - 1);
+                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
+              }
+            };
+          }
+          if (areaOption.type === 'straight') {
+            for (let j = 0; j < points.length; j++) {
+              let item = points[j];
+              if (startPoint == 0 && item.x > leftSpace) {
+                context.moveTo(item.x, item.y);
+                startPoint = 1;
+              }
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                context.lineTo(item.x, item.y);
+              }
+            };
+          }
+          if (areaOption.type === 'step') {
+            for (let j = 0; j < points.length; j++) {
+              let item = points[j];
+              if (startPoint == 0 && item.x > leftSpace) {
+                context.moveTo(item.x, item.y);
+                startPoint = 1;
+              }
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                context.lineTo(item.x, points[j - 1].y);
+                context.lineTo(item.x, item.y);
+              }
+            };
+          }
+          context.moveTo(points[0].x, points[0].y);
+        }
+        context.stroke();
+        context.setLineDash([]);
+      }
+    }
+    //画点
+    if (opts.dataPointShape !== false) {
+      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+    }
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      let ranges, minRange, maxRange;
+      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+      minRange = ranges.pop();
+      maxRange = ranges.shift();
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      drawPointText(points, eachSeries, config, context, opts);
+    });
+  }
+  context.restore();
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawScatterDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var scatterOption = assign({}, {
+    type: 'circle'
+  }, opts.extra.scatter);
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  var calPoints = [];
+  context.save();
+  let leftSpace = 0;
+  let rightSpace = opts.width + eachSpacing;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+  }
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges, minRange, maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    var data = eachSeries.data;
+    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    context.beginPath();
+    context.setStrokeStyle(eachSeries.color);
+    context.setFillStyle(eachSeries.color);
+    context.setLineWidth(1 * opts.pix);
+    var shape = eachSeries.pointShape;
+    if (shape === 'diamond') {
+      points.forEach(function(item, index) {
+        if (item !== null) {
+          context.moveTo(item.x, item.y - 4.5);
+          context.lineTo(item.x - 4.5, item.y);
+          context.lineTo(item.x, item.y + 4.5);
+          context.lineTo(item.x + 4.5, item.y);
+          context.lineTo(item.x, item.y - 4.5);
+        }
+      });
+    } else if (shape === 'circle') {
+      points.forEach(function(item, index) {
+        if (item !== null) {
+          context.moveTo(item.x + 2.5 * opts.pix, item.y);
+          context.arc(item.x, item.y, 3 * opts.pix, 0, 2 * Math.PI, false);
+        }
+      });
+    } else if (shape === 'square') {
+      points.forEach(function(item, index) {
+        if (item !== null) {
+          context.moveTo(item.x - 3.5, item.y - 3.5);
+          context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
+        }
+      });
+    } else if (shape === 'triangle') {
+      points.forEach(function(item, index) {
+        if (item !== null) {
+          context.moveTo(item.x, item.y - 4.5);
+          context.lineTo(item.x - 4.5, item.y + 4.5);
+          context.lineTo(item.x + 4.5, item.y + 4.5);
+          context.lineTo(item.x, item.y - 4.5);
+        }
+      });
+    } else if (shape === 'triangle') {
+      return;
+    }
+    context.closePath();
+    context.fill();
+    context.stroke();
+  });
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      let ranges, minRange, maxRange;
+      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+      minRange = ranges.pop();
+      maxRange = ranges.shift();
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      drawPointText(points, eachSeries, config, context, opts);
+    });
+  }
+  context.restore();
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawBubbleDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var bubbleOption = assign({}, {
+    opacity: 1,
+    border:2
+  }, opts.extra.bubble);
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  var calPoints = [];
+  context.save();
+  let leftSpace = 0;
+  let rightSpace = opts.width + eachSpacing;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+  }
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges, minRange, maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    var data = eachSeries.data;
+    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    context.beginPath();
+    context.setStrokeStyle(eachSeries.color);
+    context.setLineWidth(bubbleOption.border * opts.pix);
+    context.setFillStyle(hexToRgb(eachSeries.color, bubbleOption.opacity));
+    points.forEach(function(item, index) {
+      context.moveTo(item.x + item.r, item.y);
+      context.arc(item.x, item.y, item.r * opts.pix, 0, 2 * Math.PI, false);
+    });
+    context.closePath();
+    context.fill();
+    context.stroke();
+    
+    if (opts.dataLabel !== false && process === 1) {
+      points.forEach(function(item, index) {
+        context.beginPath();
+        var fontSize = series.textSize * opts.pix || config.fontSize;
+        context.setFontSize(fontSize);
+        context.setFillStyle(series.textColor || "#FFFFFF");
+        context.setTextAlign('center');
+        context.fillText(String(item.t), item.x, item.y + fontSize/2);
+        context.closePath();
+        context.stroke();
+        context.setTextAlign('left');
+      });
+    }
+  });
+  context.restore();
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawLineDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var lineOption = assign({}, {
+    type: 'straight',
+    width: 2
+  }, opts.extra.line);
+  lineOption.width *= opts.pix;
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  var calPoints = [];
+  context.save();
+  let leftSpace = 0;
+  let rightSpace = opts.width + eachSpacing;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+  }
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges, minRange, maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    var data = eachSeries.data;
+    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+    var splitPointList = splitPoints(points,eachSeries);
+    if (eachSeries.lineType == 'dash') {
+      let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
+      dashLength *= opts.pix;
+      context.setLineDash([dashLength, dashLength]);
+    }
+    context.beginPath();
+    context.setStrokeStyle(eachSeries.color);
+    context.setLineWidth(lineOption.width);
+    splitPointList.forEach(function(points, index) {
+      if (points.length === 1) {
+        context.moveTo(points[0].x, points[0].y);
+        context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+      } else {
+        context.moveTo(points[0].x, points[0].y);
+        let startPoint = 0;
+        if (lineOption.type === 'curve') {
+          for (let j = 0; j < points.length; j++) {
+            let item = points[j];
+            if (startPoint == 0 && item.x > leftSpace) {
+              context.moveTo(item.x, item.y);
+              startPoint = 1;
+            }
+            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              var ctrlPoint = createCurveControlPoints(points, j - 1);
+              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
+            }
+          };
+        }
+        if (lineOption.type === 'straight') {
+          for (let j = 0; j < points.length; j++) {
+            let item = points[j];
+            if (startPoint == 0 && item.x > leftSpace) {
+              context.moveTo(item.x, item.y);
+              startPoint = 1;
+            }
+            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              context.lineTo(item.x, item.y);
+            }
+          };
+        }
+        if (lineOption.type === 'step') {
+          for (let j = 0; j < points.length; j++) {
+            let item = points[j];
+            if (startPoint == 0 && item.x > leftSpace) {
+              context.moveTo(item.x, item.y);
+              startPoint = 1;
+            }
+            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              context.lineTo(item.x, points[j - 1].y);
+              context.lineTo(item.x, item.y);
+            }
+          };
+        }
+        context.moveTo(points[0].x, points[0].y);
+      }
+    });
+    context.stroke();
+    context.setLineDash([]);
+    if (opts.dataPointShape !== false) {
+      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+    }
+  });
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      let ranges, minRange, maxRange;
+      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+      minRange = ranges.pop();
+      maxRange = ranges.shift();
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      drawPointText(points, eachSeries, config, context, opts);
+    });
+  }
+  context.restore();
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawMixDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  let columnOption = assign({}, {
+    width: eachSpacing / 2,
+    barBorderCircle: false,
+    barBorderRadius: [],
+    seriesGap: 2,
+    linearType: 'none',
+    linearOpacity: 1,
+    customColor: [],
+    colorStop: 0,
+  }, opts.extra.mix.column);
+  let areaOption = assign({}, {
+    opacity: 0.2,
+    gradient: false
+  }, opts.extra.mix.area);
+  let endY = opts.height - opts.area[2];
+  let calPoints = [];
+  var columnIndex = 0;
+  var columnLength = 0;
+  series.forEach(function(eachSeries, seriesIndex) {
+    if (eachSeries.type == 'column') {
+      columnLength += 1;
+    }
+  });
+  context.save();
+  let leftNum = -2;
+  let rightNum = xAxisPoints.length + 2;
+  let leftSpace = 0;
+  let rightSpace = opts.width + eachSpacing;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+    leftNum = Math.floor(-opts._scrollDistance_ / eachSpacing) - 2;
+    rightNum = leftNum + opts.xAxis.itemCount + 4;
+    leftSpace = -opts._scrollDistance_ - eachSpacing * 2 + opts.area[3];
+    rightSpace = leftSpace + (opts.xAxis.itemCount + 4) * eachSpacing;
+  }
+  columnOption.customColor = fillCustomColor(columnOption.linearType, columnOption.customColor, series, config);
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges, minRange, maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    var data = eachSeries.data;
+    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+    // 绘制柱状数据图
+    if (eachSeries.type == 'column') {
+      points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
+      for (let i = 0; i < points.length; i++) {
+        let item = points[i];
+        if (item !== null && i > leftNum && i < rightNum) {
+          var startX = item.x - item.width / 2;
+          var height = opts.height - item.y - opts.area[2];
+          context.beginPath();
+          var fillColor = item.color || eachSeries.color
+          var strokeColor = item.color || eachSeries.color
+          if (columnOption.linearType !== 'none') {
+            var grd = context.createLinearGradient(startX, item.y, startX, opts.height - opts.area[2]);
+            //透明渐变
+            if (columnOption.linearType == 'opacity') {
+              grd.addColorStop(0, hexToRgb(fillColor, columnOption.linearOpacity));
+              grd.addColorStop(1, hexToRgb(fillColor, 1));
+            } else {
+              grd.addColorStop(0, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
+              grd.addColorStop(columnOption.colorStop, hexToRgb(columnOption.customColor[eachSeries.linearIndex], columnOption.linearOpacity));
+              grd.addColorStop(1, hexToRgb(fillColor, 1));
+            }
+            fillColor = grd
+          }
+          // 圆角边框
+          if ((columnOption.barBorderRadius && columnOption.barBorderRadius.length === 4) || columnOption.barBorderCircle) {
+            const left = startX;
+            const top = item.y;
+            const width = item.width;
+            const height = opts.height - opts.area[2] - item.y;
+            if (columnOption.barBorderCircle) {
+              columnOption.barBorderRadius = [width / 2, width / 2, 0, 0];
+            }
+            let [r0, r1, r2, r3] = columnOption.barBorderRadius;
+            let minRadius = Math.min(width/2,height/2);
+            r0 = r0 > minRadius ? minRadius : r0;
+            r1 = r1 > minRadius ? minRadius : r1;
+            r2 = r2 > minRadius ? minRadius : r2;
+            r3 = r3 > minRadius ? minRadius : r3;
+            r0 = r0 < 0 ? 0 : r0;
+            r1 = r1 < 0 ? 0 : r1;
+            r2 = r2 < 0 ? 0 : r2;
+            r3 = r3 < 0 ? 0 : r3;
+            context.arc(left + r0, top + r0, r0, -Math.PI, -Math.PI / 2);
+            context.arc(left + width - r1, top + r1, r1, -Math.PI / 2, 0);
+            context.arc(left + width - r2, top + height - r2, r2, 0, Math.PI / 2);
+            context.arc(left + r3, top + height - r3, r3, Math.PI / 2, Math.PI);
+          } else {
+            context.moveTo(startX, item.y);
+            context.lineTo(startX + item.width, item.y);
+            context.lineTo(startX + item.width, opts.height - opts.area[2]);
+            context.lineTo(startX, opts.height - opts.area[2]);
+            context.lineTo(startX, item.y);
+            context.setLineWidth(1)
+            context.setStrokeStyle(strokeColor);
+          }
+          context.setFillStyle(fillColor);
+          context.closePath();
+          context.fill();
+        }
+      }
+      columnIndex += 1;
+    }
+    //绘制区域图数据
+    if (eachSeries.type == 'area') {
+      let splitPointList = splitPoints(points,eachSeries);
+      for (let i = 0; i < splitPointList.length; i++) {
+        let points = splitPointList[i];
+        // 绘制区域数据
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setStrokeStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+        if (areaOption.gradient) {
+          let gradient = context.createLinearGradient(0, opts.area[0], 0, opts.height - opts.area[2]);
+          gradient.addColorStop('0', hexToRgb(eachSeries.color, areaOption.opacity));
+          gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
+          context.setFillStyle(gradient);
+        } else {
+          context.setFillStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+        }
+        context.setLineWidth(2 * opts.pix);
+        if (points.length > 1) {
+          var firstPoint = points[0];
+          let lastPoint = points[points.length - 1];
+          context.moveTo(firstPoint.x, firstPoint.y);
+          let startPoint = 0;
+          if (eachSeries.style === 'curve') {
+            for (let j = 0; j < points.length; j++) {
+              let item = points[j];
+              if (startPoint == 0 && item.x > leftSpace) {
+                context.moveTo(item.x, item.y);
+                startPoint = 1;
+              }
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                var ctrlPoint = createCurveControlPoints(points, j - 1);
+                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
+              }
+            };
+          } else {
+            for (let j = 0; j < points.length; j++) {
+              let item = points[j];
+              if (startPoint == 0 && item.x > leftSpace) {
+                context.moveTo(item.x, item.y);
+                startPoint = 1;
+              }
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                context.lineTo(item.x, item.y);
+              }
+            };
+          }
+          context.lineTo(lastPoint.x, endY);
+          context.lineTo(firstPoint.x, endY);
+          context.lineTo(firstPoint.x, firstPoint.y);
+        } else {
+          let item = points[0];
+          context.moveTo(item.x - eachSpacing / 2, item.y);
+          context.lineTo(item.x + eachSpacing / 2, item.y);
+          context.lineTo(item.x + eachSpacing / 2, endY);
+          context.lineTo(item.x - eachSpacing / 2, endY);
+          context.moveTo(item.x - eachSpacing / 2, item.y);
+        }
+        context.closePath();
+        context.fill();
+      }
+    }
+    // 绘制折线数据图
+    if (eachSeries.type == 'line') {
+      var splitPointList = splitPoints(points,eachSeries);
+      splitPointList.forEach(function(points, index) {
+        if (eachSeries.lineType == 'dash') {
+          let dashLength = eachSeries.dashLength ? eachSeries.dashLength : 8;
+          dashLength *= opts.pix;
+          context.setLineDash([dashLength, dashLength]);
+        }
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setLineWidth(2 * opts.pix);
+        if (points.length === 1) {
+          context.moveTo(points[0].x, points[0].y);
+          context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+        } else {
+          context.moveTo(points[0].x, points[0].y);
+          let startPoint = 0;
+          if (eachSeries.style == 'curve') {
+            for (let j = 0; j < points.length; j++) {
+              let item = points[j];
+              if (startPoint == 0 && item.x > leftSpace) {
+                context.moveTo(item.x, item.y);
+                startPoint = 1;
+              }
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                var ctrlPoint = createCurveControlPoints(points, j - 1);
+                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,
+                  item.x, item.y);
+              }
+            }
+          } else {
+            for (let j = 0; j < points.length; j++) {
+              let item = points[j];
+              if (startPoint == 0 && item.x > leftSpace) {
+                context.moveTo(item.x, item.y);
+                startPoint = 1;
+              }
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                context.lineTo(item.x, item.y);
+              }
+            }
+          }
+          context.moveTo(points[0].x, points[0].y);
+        }
+        context.stroke();
+        context.setLineDash([]);
+      });
+    }
+    // 绘制点数据图
+    if (eachSeries.type == 'point') {
+      eachSeries.addPoint = true;
+    }
+    if (eachSeries.addPoint == true && eachSeries.type !== 'column') {
+      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+    }
+  });
+  if (opts.dataLabel !== false && process === 1) {
+    var columnIndex = 0;
+    series.forEach(function(eachSeries, seriesIndex) {
+      let ranges, minRange, maxRange;
+      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+      minRange = ranges.pop();
+      maxRange = ranges.shift();
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      if (eachSeries.type !== 'column') {
+        drawPointText(points, eachSeries, config, context, opts);
+      } else {
+        points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
+        drawPointText(points, eachSeries, config, context, opts);
+        columnIndex += 1;
+      }
+    });
+  }
+  context.restore();
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing,
+  }
+}
+
+
+function drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints) {
+  var toolTipOption = opts.extra.tooltip || {};
+  if (toolTipOption.horizentalLine && opts.tooltip && process === 1 && (opts.type == 'line' || opts.type == 'area' || opts.type == 'column' || opts.type == 'mount' || opts.type == 'candle' || opts.type == 'mix')) {
+    drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints)
+  }
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+  if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
+    drawToolTip(opts.tooltip.textList, opts.tooltip.offset, opts, config, context, eachSpacing, xAxisPoints);
+  }
+  context.restore();
+
+}
+
+function drawXAxis(categories, opts, config, context) {
+
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    startX = xAxisData.startX,
+    endX = xAxisData.endX,
+    eachSpacing = xAxisData.eachSpacing;
+  var boundaryGap = 'center';
+  if (opts.type == 'bar' || opts.type == 'line' || opts.type == 'area'|| opts.type == 'scatter' || opts.type == 'bubble') {
+    boundaryGap = opts.xAxis.boundaryGap;
+  }
+  var startY = opts.height - opts.area[2];
+  var endY = opts.area[0];
+
+  //绘制滚动条
+  if (opts.enableScroll && opts.xAxis.scrollShow) {
+    var scrollY = opts.height - opts.area[2] + config.xAxisHeight;
+    var scrollScreenWidth = endX - startX;
+    var scrollTotalWidth = eachSpacing * (xAxisPoints.length - 1);
+    if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1){
+      if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
+      scrollTotalWidth += (opts.extra.mount.widthRatio - 1)*eachSpacing;
+    }
+    var scrollWidth = scrollScreenWidth * scrollScreenWidth / scrollTotalWidth;
+    var scrollLeft = 0;
+    if (opts._scrollDistance_) {
+      scrollLeft = -opts._scrollDistance_ * (scrollScreenWidth) / scrollTotalWidth;
+    }
+    context.beginPath();
+    context.setLineCap('round');
+    context.setLineWidth(6 * opts.pix);
+    context.setStrokeStyle(opts.xAxis.scrollBackgroundColor || "#EFEBEF");
+    context.moveTo(startX, scrollY);
+    context.lineTo(endX, scrollY);
+    context.stroke();
+    context.closePath();
+    context.beginPath();
+    context.setLineCap('round');
+    context.setLineWidth(6 * opts.pix);
+    context.setStrokeStyle(opts.xAxis.scrollColor || "#A6A6A6");
+    context.moveTo(startX + scrollLeft, scrollY);
+    context.lineTo(startX + scrollLeft + scrollWidth, scrollY);
+    context.stroke();
+    context.closePath();
+    context.setLineCap('butt');
+  }
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+  //绘制X轴刻度线
+  if (opts.xAxis.calibration === true) {
+    context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
+    context.setLineCap('butt');
+    context.setLineWidth(1 * opts.pix);
+    xAxisPoints.forEach(function(item, index) {
+      if (index > 0) {
+        context.beginPath();
+        context.moveTo(item - eachSpacing / 2, startY);
+        context.lineTo(item - eachSpacing / 2, startY + 3 * opts.pix);
+        context.closePath();
+        context.stroke();
+      }
+    });
+  }
+  //绘制X轴网格
+  if (opts.xAxis.disableGrid !== true) {
+    context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
+    context.setLineCap('butt');
+    context.setLineWidth(1 * opts.pix);
+    if (opts.xAxis.gridType == 'dash') {
+      context.setLineDash([opts.xAxis.dashLength * opts.pix, opts.xAxis.dashLength * opts.pix]);
+    }
+    opts.xAxis.gridEval = opts.xAxis.gridEval || 1;
+    xAxisPoints.forEach(function(item, index) {
+      if (index % opts.xAxis.gridEval == 0) {
+        context.beginPath();
+        context.moveTo(item, startY);
+        context.lineTo(item, endY);
+        context.stroke();
+      }
+    });
+    context.setLineDash([]);
+  }
+  //绘制X轴文案
+  if (opts.xAxis.disabled !== true) {
+    // 对X轴列表做抽稀处理
+    //默认全部显示X轴标签
+    let maxXAxisListLength = categories.length;
+    //如果设置了X轴单屏数量
+    if (opts.xAxis.labelCount) {
+      //如果设置X轴密度
+      if (opts.xAxis.itemCount) {
+        maxXAxisListLength = Math.ceil(categories.length / opts.xAxis.itemCount * opts.xAxis.labelCount);
+      } else {
+        maxXAxisListLength = opts.xAxis.labelCount;
+      }
+      maxXAxisListLength -= 1;
+    }
+
+    let ratio = Math.ceil(categories.length / maxXAxisListLength);
+
+    let newCategories = [];
+    let cgLength = categories.length;
+    for (let i = 0; i < cgLength; i++) {
+      if (i % ratio !== 0) {
+        newCategories.push("");
+      } else {
+        newCategories.push(categories[i]);
+      }
+    }
+    newCategories[cgLength - 1] = categories[cgLength - 1];
+    var xAxisFontSize = opts.xAxis.fontSize * opts.pix || config.fontSize;
+    if (config._xAxisTextAngle_ === 0) {
+      newCategories.forEach(function(item, index) {
+        var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item,index,opts) : item;
+        var offset = -measureText(String(xitem), xAxisFontSize, context) / 2;
+        if (boundaryGap == 'center') {
+          offset += eachSpacing / 2;
+        }
+        var scrollHeight = 0;
+        if (opts.xAxis.scrollShow) {
+          scrollHeight = 6 * opts.pix;
+        }
+        context.beginPath();
+        context.setFontSize(xAxisFontSize);
+        context.setFillStyle(opts.xAxis.fontColor || opts.fontColor);
+        context.fillText(String(xitem), xAxisPoints[index] + offset, startY + xAxisFontSize + (config.xAxisHeight - scrollHeight - xAxisFontSize) / 2);
+        context.closePath();
+        context.stroke();
+      });
+    } else {
+      newCategories.forEach(function(item, index) {
+        var xitem = opts.xAxis.formatter ? opts.xAxis.formatter(item) : item;
+        context.save();
+        context.beginPath();
+        context.setFontSize(xAxisFontSize);
+        context.setFillStyle(opts.xAxis.fontColor || opts.fontColor);
+        var textWidth = measureText(String(xitem), xAxisFontSize, context);
+        var offsetX = xAxisPoints[index];
+        if (boundaryGap == 'center') {
+          offsetX = xAxisPoints[index] + eachSpacing / 2;
+        }
+        var scrollHeight = 0;
+        if (opts.xAxis.scrollShow) {
+          scrollHeight = 6 * opts.pix;
+        }
+        var offsetY = startY + 6 * opts.pix + xAxisFontSize - xAxisFontSize * Math.abs(Math.sin(config._xAxisTextAngle_));
+        if(opts.xAxis.rotateAngle < 0){
+          offsetX -= xAxisFontSize / 2;
+          textWidth = 0;
+        }else{
+          offsetX += xAxisFontSize / 2;
+          textWidth = -textWidth;
+        }
+        context.translate(offsetX, offsetY);
+        context.rotate(-1 * config._xAxisTextAngle_);
+        context.fillText(String(xitem), textWidth , 0 );
+        context.closePath();
+        context.stroke();
+        context.restore();
+      });
+    }
+  }
+  context.restore();
+  //绘制X轴轴线
+  if (opts.xAxis.axisLine) {
+    context.beginPath();
+    context.setStrokeStyle(opts.xAxis.axisLineColor);
+    context.setLineWidth(1 * opts.pix);
+    context.moveTo(startX, opts.height - opts.area[2]);
+    context.lineTo(endX, opts.height - opts.area[2]);
+    context.stroke();
+  }
+}
+
+function drawYAxisGrid(categories, opts, config, context) {
+  if (opts.yAxis.disableGrid === true) {
+    return;
+  }
+  let spacingValid = opts.height - opts.area[0] - opts.area[2];
+  let eachSpacing = spacingValid / opts.yAxis.splitNumber;
+  let startX = opts.area[3];
+  let xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
+    xAxiseachSpacing = opts.chartData.xAxisData.eachSpacing;
+  let TotalWidth = xAxiseachSpacing * (xAxisPoints.length - 1);
+  if(opts.type == 'mount' && opts.extra && opts.extra.mount && opts.extra.mount.widthRatio && opts.extra.mount.widthRatio > 1 ){
+    if(opts.extra.mount.widthRatio>2) opts.extra.mount.widthRatio = 2
+    TotalWidth += (opts.extra.mount.widthRatio - 1)*xAxiseachSpacing;
+  }
+  let endX = startX + TotalWidth;
+  let points = [];
+  let startY = 1
+  if (opts.xAxis.axisLine === false) {
+    startY = 0
+  }
+  for (let i = startY; i < opts.yAxis.splitNumber + 1; i++) {
+    points.push(opts.height - opts.area[2] - eachSpacing * i);
+  }
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+  if (opts.yAxis.gridType == 'dash') {
+    context.setLineDash([opts.yAxis.dashLength * opts.pix, opts.yAxis.dashLength * opts.pix]);
+  }
+  context.setStrokeStyle(opts.yAxis.gridColor);
+  context.setLineWidth(1 * opts.pix);
+  points.forEach(function(item, index) {
+    context.beginPath();
+    context.moveTo(startX, item);
+    context.lineTo(endX, item);
+    context.stroke();
+  });
+  context.setLineDash([]);
+  context.restore();
+}
+
+function drawYAxis(series, opts, config, context) {
+  if (opts.yAxis.disabled === true) {
+    return;
+  }
+  var spacingValid = opts.height - opts.area[0] - opts.area[2];
+  var eachSpacing = spacingValid / opts.yAxis.splitNumber;
+  var startX = opts.area[3];
+  var endX = opts.width - opts.area[1];
+  var endY = opts.height - opts.area[2];
+  var fillEndY = endY + config.xAxisHeight;
+  if (opts.xAxis.scrollShow) {
+    fillEndY -= 3 * opts.pix;
+  }
+  if (opts.xAxis.rotateLabel) {
+    fillEndY = opts.height - opts.area[2] + opts.fontSize * opts.pix / 2;
+  }
+  // set YAxis background
+  context.beginPath();
+  context.setFillStyle(opts.background);
+  if (opts.enableScroll == true && opts.xAxis.scrollPosition && opts.xAxis.scrollPosition !== 'left') {
+    context.fillRect(0, 0, startX, fillEndY);
+  }
+  if (opts.enableScroll == true && opts.xAxis.scrollPosition && opts.xAxis.scrollPosition !== 'right') {
+    context.fillRect(endX, 0, opts.width, fillEndY);
+  }
+  context.closePath();
+  context.stroke();
+  
+  let tStartLeft = opts.area[3];
+  let tStartRight = opts.width - opts.area[1];
+  let tStartCenter = opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2;
+  if (opts.yAxis.data) {
+    for (let i = 0; i < opts.yAxis.data.length; i++) {
+      let yData = opts.yAxis.data[i];
+      var points = [];
+      if(yData.type === 'categories'){
+        for (let i = 0; i <= yData.categories.length; i++) {
+          points.push(opts.area[0] + spacingValid / yData.categories.length / 2 + spacingValid / yData.categories.length * i);
+        }
+      }else{
+        for (let i = 0; i <= opts.yAxis.splitNumber; i++) {
+          points.push(opts.area[0] + eachSpacing * i);
+        }
+      }
+      if (yData.disabled !== true) {
+        let rangesFormat = opts.chartData.yAxisData.rangesFormat[i];
+        let yAxisFontSize = yData.fontSize ? yData.fontSize * opts.pix : config.fontSize;
+        let yAxisWidth = opts.chartData.yAxisData.yAxisWidth[i];
+        let textAlign = yData.textAlign || "right";
+        //画Y轴刻度及文案
+        rangesFormat.forEach(function(item, index) {
+          var pos = points[index];
+          context.beginPath();
+          context.setFontSize(yAxisFontSize);
+          context.setLineWidth(1 * opts.pix);
+          context.setStrokeStyle(yData.axisLineColor || '#cccccc');
+          context.setFillStyle(yData.fontColor || opts.fontColor);
+          let tmpstrat = 0;
+          let gapwidth = 4 * opts.pix;
+          if (yAxisWidth.position == 'left') {
+            //画刻度线
+            if (yData.calibration == true) {
+              context.moveTo(tStartLeft, pos);
+              context.lineTo(tStartLeft - 3 * opts.pix, pos);
+              gapwidth += 3 * opts.pix;
+            }
+            //画文字
+            switch (textAlign) {
+              case "left":
+                context.setTextAlign('left');
+                tmpstrat = tStartLeft - yAxisWidth.width
+                break;
+              case "right":
+                context.setTextAlign('right');
+                tmpstrat = tStartLeft - gapwidth
+                break;
+              default:
+                context.setTextAlign('center');
+                tmpstrat = tStartLeft - yAxisWidth.width / 2
+            }
+            context.fillText(String(item), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
+
+          } else if (yAxisWidth.position == 'right') {
+            //画刻度线
+            if (yData.calibration == true) {
+              context.moveTo(tStartRight, pos);
+              context.lineTo(tStartRight + 3 * opts.pix, pos);
+              gapwidth += 3 * opts.pix;
+            }
+            switch (textAlign) {
+              case "left":
+                context.setTextAlign('left');
+                tmpstrat = tStartRight + gapwidth
+                break;
+              case "right":
+                context.setTextAlign('right');
+                tmpstrat = tStartRight + yAxisWidth.width
+                break;
+              default:
+                context.setTextAlign('center');
+                tmpstrat = tStartRight + yAxisWidth.width / 2
+            }
+            context.fillText(String(item), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
+          } else if (yAxisWidth.position == 'center') {
+            //画刻度线
+            if (yData.calibration == true) {
+              context.moveTo(tStartCenter, pos);
+              context.lineTo(tStartCenter - 3 * opts.pix, pos);
+              gapwidth += 3 * opts.pix;
+            }
+            //画文字
+            switch (textAlign) {
+              case "left":
+                context.setTextAlign('left');
+                tmpstrat = tStartCenter - yAxisWidth.width
+                break;
+              case "right":
+                context.setTextAlign('right');
+                tmpstrat = tStartCenter - gapwidth
+                break;
+              default:
+                context.setTextAlign('center');
+                tmpstrat = tStartCenter - yAxisWidth.width / 2
+            }
+            context.fillText(String(item), tmpstrat, pos + yAxisFontSize / 2 - 3 * opts.pix);
+          }
+          context.closePath();
+          context.stroke();
+          context.setTextAlign('left');
+        });
+        //画Y轴轴线
+        if (yData.axisLine !== false) {
+          context.beginPath();
+          context.setStrokeStyle(yData.axisLineColor || '#cccccc');
+          context.setLineWidth(1 * opts.pix);
+          if (yAxisWidth.position == 'left') {
+            context.moveTo(tStartLeft, opts.height - opts.area[2]);
+            context.lineTo(tStartLeft, opts.area[0]);
+          } else if (yAxisWidth.position == 'right') {
+            context.moveTo(tStartRight, opts.height - opts.area[2]);
+            context.lineTo(tStartRight, opts.area[0]);
+          } else if (yAxisWidth.position == 'center') {
+            context.moveTo(tStartCenter, opts.height - opts.area[2]);
+            context.lineTo(tStartCenter, opts.area[0]);
+          }
+          context.stroke();
+        }
+        //画Y轴标题
+        if (opts.yAxis.showTitle) {
+          let titleFontSize = yData.titleFontSize * opts.pix || config.fontSize;
+          let title = yData.title;
+          context.beginPath();
+          context.setFontSize(titleFontSize);
+          context.setFillStyle(yData.titleFontColor || opts.fontColor);
+          if (yAxisWidth.position == 'left') {
+            context.fillText(title, tStartLeft - measureText(title, titleFontSize, context) / 2 + (yData.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
+          } else if (yAxisWidth.position == 'right') {
+            context.fillText(title, tStartRight - measureText(title, titleFontSize, context) / 2 + (yData.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
+          } else if (yAxisWidth.position == 'center') {
+            context.fillText(title, tStartCenter - measureText(title, titleFontSize, context) / 2 + (yData.titleOffsetX || 0), opts.area[0] - (10 - (yData.titleOffsetY || 0)) * opts.pix);
+          }
+          context.closePath();
+          context.stroke();
+        }
+        if (yAxisWidth.position == 'left') {
+          tStartLeft -= (yAxisWidth.width + opts.yAxis.padding * opts.pix);
+        } else {
+          tStartRight += yAxisWidth.width + opts.yAxis.padding * opts.pix;
+        }
+      }
+    }
+  }
+
+}
+
+function drawLegend(series, opts, config, context, chartData) {
+  if (opts.legend.show === false) {
+    return;
+  }
+  let legendData = chartData.legendData;
+  let legendList = legendData.points;
+  let legendArea = legendData.area;
+  let padding = opts.legend.padding * opts.pix;
+  let fontSize = opts.legend.fontSize * opts.pix;
+  let shapeWidth = 15 * opts.pix;
+  let shapeRight = 5 * opts.pix;
+  let itemGap = opts.legend.itemGap * opts.pix;
+  let lineHeight = Math.max(opts.legend.lineHeight * opts.pix, fontSize);
+  //画背景及边框
+  context.beginPath();
+  context.setLineWidth(opts.legend.borderWidth * opts.pix);
+  context.setStrokeStyle(opts.legend.borderColor);
+  context.setFillStyle(opts.legend.backgroundColor);
+  context.moveTo(legendArea.start.x, legendArea.start.y);
+  context.rect(legendArea.start.x, legendArea.start.y, legendArea.width, legendArea.height);
+  context.closePath();
+  context.fill();
+  context.stroke();
+  legendList.forEach(function(itemList, listIndex) {
+    let width = 0;
+    let height = 0;
+    width = legendData.widthArr[listIndex];
+    height = legendData.heightArr[listIndex];
+    let startX = 0;
+    let startY = 0;
+    if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+      switch (opts.legend.float) {
+        case 'left':
+          startX = legendArea.start.x + padding;
+        break;
+        case 'right':
+          startX = legendArea.start.x + legendArea.width - width;
+        break;
+        default:
+        startX = legendArea.start.x + (legendArea.width - width) / 2;
+      }
+      startY = legendArea.start.y + padding + listIndex * lineHeight;
+    } else {
+      if (listIndex == 0) {
+        width = 0;
+      } else {
+        width = legendData.widthArr[listIndex - 1];
+      }
+      startX = legendArea.start.x + padding + width;
+      startY = legendArea.start.y + padding + (legendArea.height - height) / 2;
+    }
+    context.setFontSize(config.fontSize);
+    for (let i = 0; i < itemList.length; i++) {
+      let item = itemList[i];
+      item.area = [0, 0, 0, 0];
+      item.area[0] = startX;
+      item.area[1] = startY;
+      item.area[3] = startY + lineHeight;
+      context.beginPath();
+      context.setLineWidth(1 * opts.pix);
+      context.setStrokeStyle(item.show ? item.color : opts.legend.hiddenColor);
+      context.setFillStyle(item.show ? item.color : opts.legend.hiddenColor);
+      switch (item.legendShape) {
+        case 'line':
+          context.moveTo(startX, startY + 0.5 * lineHeight - 2 * opts.pix);
+          context.fillRect(startX, startY + 0.5 * lineHeight - 2 * opts.pix, 15 * opts.pix, 4 * opts.pix);
+          break;
+        case 'triangle':
+          context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+          context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
+          context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
+          context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+          break;
+        case 'diamond':
+          context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+          context.lineTo(startX + 2.5 * opts.pix, startY + 0.5 * lineHeight);
+          context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight + 5 * opts.pix);
+          context.lineTo(startX + 12.5 * opts.pix, startY + 0.5 * lineHeight);
+          context.lineTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+          break;
+        case 'circle':
+          context.moveTo(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight);
+          context.arc(startX + 7.5 * opts.pix, startY + 0.5 * lineHeight, 5 * opts.pix, 0, 2 * Math.PI);
+          break;
+        case 'rect':
+          context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pix);
+          context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
+          break;
+        case 'square':
+          context.moveTo(startX + 5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix);
+          context.fillRect(startX + 5 * opts.pix, startY + 0.5 * lineHeight - 5 * opts.pix, 10 * opts.pix, 10 * opts.pix);
+          break;
+        case 'none':
+          break;
+        default:
+          context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pix);
+          context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pix, 15 * opts.pix, 10 * opts.pix);
+      }
+      context.closePath();
+      context.fill();
+      context.stroke();
+      startX += shapeWidth + shapeRight;
+      let fontTrans = 0.5 * lineHeight + 0.5 * fontSize - 2;
+      const legendText = item.legendText ? item.legendText : item.name;
+      context.beginPath();
+      context.setFontSize(fontSize);
+      context.setFillStyle(item.show ? opts.legend.fontColor : opts.legend.hiddenColor);
+      context.fillText(legendText, startX, startY + fontTrans);
+      context.closePath();
+      context.stroke();
+      if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+        startX += measureText(legendText, fontSize, context) + itemGap;
+        item.area[2] = startX;
+      } else {
+        item.area[2] = startX + measureText(legendText, fontSize, context) + itemGap;;
+        startX -= shapeWidth + shapeRight;
+        startY += lineHeight;
+      }
+    }
+  });
+}
+
+function drawPieDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var pieOption = assign({}, {
+    activeOpacity: 0.5,
+    activeRadius: 10,
+    offsetAngle: 0,
+    labelWidth: 15,
+    ringWidth: 30,
+    customRadius: 0,
+    border: false,
+    borderWidth: 2,
+    borderColor: '#FFFFFF',
+    centerColor: '#FFFFFF',
+    linearType: 'none',
+    customColor: [],
+  }, opts.type == "pie" ? opts.extra.pie : opts.extra.ring);
+  var centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+  };
+  if (config.pieChartLinePadding == 0) {
+    config.pieChartLinePadding = pieOption.activeRadius * opts.pix;
+  }
+
+  var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding);
+  radius = radius < 10 ? 10 : radius;
+  if (pieOption.customRadius > 0) {
+    radius = pieOption.customRadius * opts.pix;
+  }
+  series = getPieDataPoints(series, radius, process);
+  var activeRadius = pieOption.activeRadius * opts.pix;
+  pieOption.customColor = fillCustomColor(pieOption.linearType, pieOption.customColor, series, config);
+  series = series.map(function(eachSeries) {
+    eachSeries._start_ += (pieOption.offsetAngle) * Math.PI / 180;
+    return eachSeries;
+  });
+  series.forEach(function(eachSeries, seriesIndex) {
+    if (opts.tooltip) {
+      if (opts.tooltip.index == seriesIndex) {
+        context.beginPath();
+        context.setFillStyle(hexToRgb(eachSeries.color, pieOption.activeOpacity || 0.5));
+        context.moveTo(centerPosition.x, centerPosition.y);
+        context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_ + activeRadius, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI);
+        context.closePath();
+        context.fill();
+      }
+    }
+    context.beginPath();
+    context.setLineWidth(pieOption.borderWidth * opts.pix);
+    context.lineJoin = "round";
+    context.setStrokeStyle(pieOption.borderColor);
+    var fillcolor = eachSeries.color;
+    if (pieOption.linearType == 'custom') {
+      var grd;
+      if(context.createCircularGradient){
+        grd = context.createCircularGradient(centerPosition.x, centerPosition.y, eachSeries._radius_)
+      }else{
+        grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0,centerPosition.x, centerPosition.y, eachSeries._radius_)
+      }
+      grd.addColorStop(0, hexToRgb(pieOption.customColor[eachSeries.linearIndex], 1))
+      grd.addColorStop(1, hexToRgb(eachSeries.color, 1))
+      fillcolor = grd
+    }
+    context.setFillStyle(fillcolor);
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI);
+    context.closePath();
+    context.fill();
+    if (pieOption.border == true) {
+      context.stroke();
+    }
+  });
+  if (opts.type === 'ring') {
+    var innerPieWidth = radius * 0.6;
+    if (typeof pieOption.ringWidth === 'number' && pieOption.ringWidth > 0) {
+      innerPieWidth = Math.max(0, radius - pieOption.ringWidth * opts.pix);
+    }
+    context.beginPath();
+    context.setFillStyle(pieOption.centerColor);
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.arc(centerPosition.x, centerPosition.y, innerPieWidth, 0, 2 * Math.PI);
+    context.closePath();
+    context.fill();
+  }
+  if (opts.dataLabel !== false && process === 1) {
+    drawPieText(series, opts, config, context, radius, centerPosition);
+  }
+  if (process === 1 && opts.type === 'ring') {
+    drawRingTitle(opts, config, context, centerPosition);
+  }
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawRoseDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var roseOption = assign({}, {
+    type: 'area',
+    activeOpacity: 0.5,
+    activeRadius: 10,
+    offsetAngle: 0,
+    labelWidth: 15,
+    border: false,
+    borderWidth: 2,
+    borderColor: '#FFFFFF',
+    linearType: 'none',
+    customColor: [],
+  }, opts.extra.rose);
+  if (config.pieChartLinePadding == 0) {
+    config.pieChartLinePadding = roseOption.activeRadius * opts.pix;
+  }
+  var centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+  };
+  var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding);
+  radius = radius < 10 ? 10 : radius;
+  var minRadius = roseOption.minRadius || radius * 0.5;
+  series = getRoseDataPoints(series, roseOption.type, minRadius, radius, process);
+  var activeRadius = roseOption.activeRadius * opts.pix;
+  roseOption.customColor = fillCustomColor(roseOption.linearType, roseOption.customColor, series, config);
+  series = series.map(function(eachSeries) {
+    eachSeries._start_ += (roseOption.offsetAngle || 0) * Math.PI / 180;
+    return eachSeries;
+  });
+  series.forEach(function(eachSeries, seriesIndex) {
+    if (opts.tooltip) {
+      if (opts.tooltip.index == seriesIndex) {
+        context.beginPath();
+        context.setFillStyle(hexToRgb(eachSeries.color, roseOption.activeOpacity || 0.5));
+        context.moveTo(centerPosition.x, centerPosition.y);
+        context.arc(centerPosition.x, centerPosition.y, activeRadius + eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI);
+        context.closePath();
+        context.fill();
+      }
+    }
+    context.beginPath();
+    context.setLineWidth(roseOption.borderWidth * opts.pix);
+    context.lineJoin = "round";
+    context.setStrokeStyle(roseOption.borderColor);
+    var fillcolor = eachSeries.color;
+    if (roseOption.linearType == 'custom') {
+      var grd;
+      if(context.createCircularGradient){
+        grd = context.createCircularGradient(centerPosition.x, centerPosition.y, eachSeries._radius_)
+      }else{
+        grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0,centerPosition.x, centerPosition.y, eachSeries._radius_)
+      }
+      grd.addColorStop(0, hexToRgb(roseOption.customColor[eachSeries.linearIndex], 1))
+      grd.addColorStop(1, hexToRgb(eachSeries.color, 1))
+      fillcolor = grd
+    }
+    context.setFillStyle(fillcolor);
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI);
+    context.closePath();
+    context.fill();
+    if (roseOption.border == true) {
+      context.stroke();
+    }
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    drawPieText(series, opts, config, context, radius, centerPosition);
+  }
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawArcbarDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var arcbarOption = assign({}, {
+    startAngle: 0.75,
+    endAngle: 0.25,
+    type: 'default',
+    lineCap: 'round',
+    width: 12 ,
+    gap: 2 ,
+    linearType: 'none',
+    customColor: [],
+  }, opts.extra.arcbar);
+  series = getArcbarDataPoints(series, arcbarOption, process);
+  var centerPosition;
+  if (arcbarOption.centerX || arcbarOption.centerY) {
+    centerPosition = {
+      x: arcbarOption.centerX ? arcbarOption.centerX : opts.width / 2,
+      y: arcbarOption.centerY ? arcbarOption.centerY : opts.height / 2
+    };
+  } else {
+    centerPosition = {
+      x: opts.width / 2,
+      y: opts.height / 2
+    };
+  }
+  var radius;
+  if (arcbarOption.radius) {
+    radius = arcbarOption.radius;
+  } else {
+    radius = Math.min(centerPosition.x, centerPosition.y);
+    radius -= 5 * opts.pix;
+    radius -= arcbarOption.width / 2;
+  }
+  radius = radius < 10 ? 10 : radius;
+  arcbarOption.customColor = fillCustomColor(arcbarOption.linearType, arcbarOption.customColor, series, config);
+  
+  for (let i = 0; i < series.length; i++) {
+    let eachSeries = series[i];
+    //背景颜色
+    context.setLineWidth(arcbarOption.width * opts.pix);
+    context.setStrokeStyle(arcbarOption.backgroundColor || '#E9E9E9');
+    context.setLineCap(arcbarOption.lineCap);
+    context.beginPath();
+    if (arcbarOption.type == 'default') {
+      context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i, arcbarOption.startAngle * Math.PI, arcbarOption.endAngle * Math.PI, false);
+    } else {
+      context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i, 0, 2 * Math.PI, false);
+    }
+    context.stroke();
+    //进度条
+    var fillColor = eachSeries.color
+    if(arcbarOption.linearType == 'custom'){
+      var grd = context.createLinearGradient(centerPosition.x - radius, centerPosition.y, centerPosition.x + radius, centerPosition.y);
+      grd.addColorStop(1, hexToRgb(arcbarOption.customColor[eachSeries.linearIndex], 1))
+      grd.addColorStop(0, hexToRgb(eachSeries.color, 1))
+      fillColor = grd;
+    }
+    context.setLineWidth(arcbarOption.width * opts.pix);
+    context.setStrokeStyle(fillColor);
+    context.setLineCap(arcbarOption.lineCap);
+    context.beginPath();
+    context.arc(centerPosition.x, centerPosition.y, radius - (arcbarOption.width * opts.pix + arcbarOption.gap * opts.pix) * i, arcbarOption.startAngle * Math.PI, eachSeries._proportion_ * Math.PI, false);
+    context.stroke();
+  }
+  drawRingTitle(opts, config, context, centerPosition);
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawGaugeDataPoints(categories, series, opts, config, context) {
+  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+  var gaugeOption = assign({}, {
+    type: 'default',
+    startAngle: 0.75,
+    endAngle: 0.25,
+    width: 15,
+    labelOffset:13,
+    splitLine: {
+      fixRadius: 0,
+      splitNumber: 10,
+      width: 15,
+      color: '#FFFFFF',
+      childNumber: 5,
+      childWidth: 5
+    },
+    pointer: {
+      width: 15,
+      color: 'auto'
+    }
+  }, opts.extra.gauge);
+  if (gaugeOption.oldAngle == undefined) {
+    gaugeOption.oldAngle = gaugeOption.startAngle;
+  }
+  if (gaugeOption.oldData == undefined) {
+    gaugeOption.oldData = 0;
+  }
+  categories = getGaugeAxisPoints(categories, gaugeOption.startAngle, gaugeOption.endAngle);
+  var centerPosition = {
+    x: opts.width / 2,
+    y: opts.height / 2
+  };
+  var radius = Math.min(centerPosition.x, centerPosition.y);
+  radius -= 5 * opts.pix;
+  radius -= gaugeOption.width / 2;
+  radius = radius < 10 ? 10 : radius;
+  var innerRadius = radius - gaugeOption.width;
+  var totalAngle = 0;
+  //判断仪表盘的样式：default百度样式，progress新样式
+  if (gaugeOption.type == 'progress') {
+    //## 第一步画中心圆形背景和进度条背景
+    //中心圆形背景
+    var pieRadius = radius - gaugeOption.width * 3;
+    context.beginPath();
+    let gradient = context.createLinearGradient(centerPosition.x, centerPosition.y - pieRadius, centerPosition.x, centerPosition.y + pieRadius);
+    //配置渐变填充（起点：中心点向上减半径；结束点中心点向下加半径）
+    gradient.addColorStop('0', hexToRgb(series[0].color, 0.3));
+    gradient.addColorStop('1.0', hexToRgb("#FFFFFF", 0.1));
+    context.setFillStyle(gradient);
+    context.arc(centerPosition.x, centerPosition.y, pieRadius, 0, 2 * Math.PI, false);
+    context.fill();
+    //画进度条背景
+    context.setLineWidth(gaugeOption.width);
+    context.setStrokeStyle(hexToRgb(series[0].color, 0.3));
+    context.setLineCap('round');
+    context.beginPath();
+    context.arc(centerPosition.x, centerPosition.y, innerRadius, gaugeOption.startAngle * Math.PI, gaugeOption.endAngle * Math.PI, false);
+    context.stroke();
+    //## 第二步画刻度线
+    totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+    let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+    let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
+    let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
+    let endX = -radius - gaugeOption.width - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
+    context.save();
+    context.translate(centerPosition.x, centerPosition.y);
+    context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+    let len = gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1;
+    let proc = series[0].data * process;
+    for (let i = 0; i < len; i++) {
+      context.beginPath();
+      //刻度线随进度变色
+      if (proc > (i / len)) {
+        context.setStrokeStyle(hexToRgb(series[0].color, 1));
+      } else {
+        context.setStrokeStyle(hexToRgb(series[0].color, 0.3));
+      }
+      context.setLineWidth(3 * opts.pix);
+      context.moveTo(startX, 0);
+      context.lineTo(endX, 0);
+      context.stroke();
+      context.rotate(childAngle * Math.PI);
+    }
+    context.restore();
+    //## 第三步画进度条
+    series = getGaugeArcbarDataPoints(series, gaugeOption, process);
+    context.setLineWidth(gaugeOption.width);
+    context.setStrokeStyle(series[0].color);
+    context.setLineCap('round');
+    context.beginPath();
+    context.arc(centerPosition.x, centerPosition.y, innerRadius, gaugeOption.startAngle * Math.PI, series[0]._proportion_ * Math.PI, false);
+    context.stroke();
+    //## 第四步画指针
+    let pointerRadius = radius - gaugeOption.width * 2.5;
+    context.save();
+    context.translate(centerPosition.x, centerPosition.y);
+    context.rotate((series[0]._proportion_ - 1) * Math.PI);
+    context.beginPath();
+    context.setLineWidth(gaugeOption.width / 3);
+    let gradient3 = context.createLinearGradient(0, -pointerRadius * 0.6, 0, pointerRadius * 0.6);
+    gradient3.addColorStop('0', hexToRgb('#FFFFFF', 0));
+    gradient3.addColorStop('0.5', hexToRgb(series[0].color, 1));
+    gradient3.addColorStop('1.0', hexToRgb('#FFFFFF', 0));
+    context.setStrokeStyle(gradient3);
+    context.arc(0, 0, pointerRadius, 0.85 * Math.PI, 1.15 * Math.PI, false);
+    context.stroke();
+    context.beginPath();
+    context.setLineWidth(1);
+    context.setStrokeStyle(series[0].color);
+    context.setFillStyle(series[0].color);
+    context.moveTo(-pointerRadius - gaugeOption.width / 3 / 2, -4);
+    context.lineTo(-pointerRadius - gaugeOption.width / 3 / 2 - 4, 0);
+    context.lineTo(-pointerRadius - gaugeOption.width / 3 / 2, 4);
+    context.lineTo(-pointerRadius - gaugeOption.width / 3 / 2, -4);
+    context.stroke();
+    context.fill();
+    context.restore();
+    //default百度样式
+  } else {
+    //画背景
+    context.setLineWidth(gaugeOption.width);
+    context.setLineCap('butt');
+    for (let i = 0; i < categories.length; i++) {
+      let eachCategories = categories[i];
+      context.beginPath();
+      context.setStrokeStyle(eachCategories.color);
+      context.arc(centerPosition.x, centerPosition.y, radius, eachCategories._startAngle_ * Math.PI, eachCategories._endAngle_ * Math.PI, false);
+      context.stroke();
+    }
+    context.save();
+    //画刻度线
+    totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+    let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+    let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
+    let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
+    let endX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
+    let childendX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.childWidth;
+    context.translate(centerPosition.x, centerPosition.y);
+    context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+    for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
+      context.beginPath();
+      context.setStrokeStyle(gaugeOption.splitLine.color);
+      context.setLineWidth(2 * opts.pix);
+      context.moveTo(startX, 0);
+      context.lineTo(endX, 0);
+      context.stroke();
+      context.rotate(splitAngle * Math.PI);
+    }
+    context.restore();
+    context.save();
+    context.translate(centerPosition.x, centerPosition.y);
+    context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+    for (let i = 0; i < gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1; i++) {
+      context.beginPath();
+      context.setStrokeStyle(gaugeOption.splitLine.color);
+      context.setLineWidth(1 * opts.pix);
+      context.moveTo(startX, 0);
+      context.lineTo(childendX, 0);
+      context.stroke();
+      context.rotate(childAngle * Math.PI);
+    }
+    context.restore();
+    //画指针
+    series = getGaugeDataPoints(series, categories, gaugeOption, process);
+    for (let i = 0; i < series.length; i++) {
+      let eachSeries = series[i];
+      context.save();
+      context.translate(centerPosition.x, centerPosition.y);
+      context.rotate((eachSeries._proportion_ - 1) * Math.PI);
+      context.beginPath();
+      context.setFillStyle(eachSeries.color);
+      context.moveTo(gaugeOption.pointer.width, 0);
+      context.lineTo(0, -gaugeOption.pointer.width / 2);
+      context.lineTo(-innerRadius, 0);
+      context.lineTo(0, gaugeOption.pointer.width / 2);
+      context.lineTo(gaugeOption.pointer.width, 0);
+      context.closePath();
+      context.fill();
+      context.beginPath();
+      context.setFillStyle('#FFFFFF');
+      context.arc(0, 0, gaugeOption.pointer.width / 6, 0, 2 * Math.PI, false);
+      context.fill();
+      context.restore();
+    }
+    if (opts.dataLabel !== false) {
+      drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context);
+    }
+  }
+  //画仪表盘标题，副标题
+  drawRingTitle(opts, config, context, centerPosition);
+  if (process === 1 && opts.type === 'gauge') {
+    opts.extra.gauge.oldAngle = series[0]._proportion_;
+    opts.extra.gauge.oldData = series[0].data;
+  }
+  return {
+    center: centerPosition,
+    radius: radius,
+    innerRadius: innerRadius,
+    categories: categories,
+    totalAngle: totalAngle
+  };
+}
+
+function drawRadarDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var radarOption = assign({}, {
+    gridColor: '#cccccc',
+    gridType: 'radar',
+    gridEval:1,
+    axisLabel:false,
+    axisLabelTofix:0,
+    labelColor:'#666666',
+    labelPointShow:false,
+    labelPointRadius:3,
+    labelPointColor:'#cccccc',
+    opacity: 0.2,
+    gridCount: 3,
+    border:false,
+    borderWidth:2,
+    linearType: 'none',
+    customColor: [],
+  }, opts.extra.radar);
+  var coordinateAngle = getRadarCoordinateSeries(opts.categories.length);
+  var centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+  };
+  var xr = (opts.width - opts.area[1] - opts.area[3]) / 2
+  var yr = (opts.height - opts.area[0] - opts.area[2]) / 2
+  var radius = Math.min(xr - (getMaxTextListLength(opts.categories, config.fontSize, context) + config.radarLabelTextMargin), yr - config.radarLabelTextMargin);
+  radius -= config.radarLabelTextMargin * opts.pix;
+  radius = radius < 10 ? 10 : radius;
+  // 画分割线
+  context.beginPath();
+  context.setLineWidth(1 * opts.pix);
+  context.setStrokeStyle(radarOption.gridColor);
+  coordinateAngle.forEach(function(angle,index) {
+    var pos = convertCoordinateOrigin(radius * Math.cos(angle), radius * Math.sin(angle), centerPosition);
+    context.moveTo(centerPosition.x, centerPosition.y);
+    if (index % radarOption.gridEval == 0) {
+      context.lineTo(pos.x, pos.y);
+    }
+  });
+  context.stroke();
+  context.closePath();
+  
+  // 画背景网格
+  var _loop = function _loop(i) {
+    var startPos = {};
+    context.beginPath();
+    context.setLineWidth(1 * opts.pix);
+    context.setStrokeStyle(radarOption.gridColor);
+    if (radarOption.gridType == 'radar') {
+      coordinateAngle.forEach(function(angle, index) {
+        var pos = convertCoordinateOrigin(radius / radarOption.gridCount * i * Math.cos(angle), radius /
+          radarOption.gridCount * i * Math.sin(angle), centerPosition);
+        if (index === 0) {
+          startPos = pos;
+          context.moveTo(pos.x, pos.y);
+        } else {
+          context.lineTo(pos.x, pos.y);
+        }
+      });
+      context.lineTo(startPos.x, startPos.y);
+    } else {
+      var pos = convertCoordinateOrigin(radius / radarOption.gridCount * i * Math.cos(1.5), radius / radarOption.gridCount * i * Math.sin(1.5), centerPosition);
+      context.arc(centerPosition.x, centerPosition.y, centerPosition.y - pos.y, 0, 2 * Math.PI, false);
+    }
+    context.stroke();
+    context.closePath();
+  };
+  for (var i = 1; i <= radarOption.gridCount; i++) {
+    _loop(i);
+  }
+  radarOption.customColor = fillCustomColor(radarOption.linearType, radarOption.customColor, series, config);
+  var radarDataPoints = getRadarDataPoints(coordinateAngle, centerPosition, radius, series, opts, process);
+  radarDataPoints.forEach(function(eachSeries, seriesIndex) {
+    // 绘制区域数据
+    context.beginPath();
+    context.setLineWidth(radarOption.borderWidth * opts.pix);
+    context.setStrokeStyle(eachSeries.color);
+    
+    var fillcolor = hexToRgb(eachSeries.color, radarOption.opacity);
+    if (radarOption.linearType == 'custom') {
+      var grd;
+      if(context.createCircularGradient){
+        grd = context.createCircularGradient(centerPosition.x, centerPosition.y, radius)
+      }else{
+        grd = context.createRadialGradient(centerPosition.x, centerPosition.y, 0,centerPosition.x, centerPosition.y, radius)
+      }
+      grd.addColorStop(0, hexToRgb(radarOption.customColor[series[seriesIndex].linearIndex], radarOption.opacity))
+      grd.addColorStop(1, hexToRgb(eachSeries.color, radarOption.opacity))
+      fillcolor = grd
+    }
+    
+    context.setFillStyle(fillcolor);
+    eachSeries.data.forEach(function(item, index) {
+      if (index === 0) {
+        context.moveTo(item.position.x, item.position.y);
+      } else {
+        context.lineTo(item.position.x, item.position.y);
+      }
+    });
+    context.closePath();
+    context.fill();
+    if(radarOption.border === true){
+      context.stroke();
+    }
+    context.closePath();
+    if (opts.dataPointShape !== false) {
+      var points = eachSeries.data.map(function(item) {
+        return item.position;
+      });
+      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+    }
+  });
+  // 画刻度值
+  if(radarOption.axisLabel === true){
+    const maxData = Math.max(radarOption.max, Math.max.apply(null, dataCombine(series)));
+    const stepLength = radius / radarOption.gridCount;
+    const fontSize = opts.fontSize * opts.pix;
+    context.setFontSize(fontSize);
+    context.setFillStyle(opts.fontColor);
+    context.setTextAlign('left');
+    for (var i = 0; i < radarOption.gridCount + 1; i++) {
+      let label = i * maxData / radarOption.gridCount;
+      label = label.toFixed(radarOption.axisLabelTofix);
+      context.fillText(String(label), centerPosition.x + 3 * opts.pix, centerPosition.y - i * stepLength + fontSize / 2);
+    }
+  }
+  
+  // draw label text
+  drawRadarLabel(coordinateAngle, radius, centerPosition, opts, config, context);
+  
+  // draw dataLabel
+  if (opts.dataLabel !== false && process === 1) {
+    radarDataPoints.forEach(function(eachSeries, seriesIndex) {
+      context.beginPath();
+      var fontSize = eachSeries.textSize * opts.pix || config.fontSize;
+      context.setFontSize(fontSize);
+      context.setFillStyle(eachSeries.textColor || opts.fontColor);
+      eachSeries.data.forEach(function(item, index) {
+        //如果是中心点垂直的上下点位
+        if(Math.abs(item.position.x - centerPosition.x)<2){
+          //如果在上面
+          if(item.position.y < centerPosition.y){
+            context.setTextAlign('center');
+            context.fillText(item.value, item.position.x, item.position.y - 4);
+          }else{
+            context.setTextAlign('center');
+            context.fillText(item.value, item.position.x, item.position.y + fontSize + 2);
+          }
+        }else{
+          //如果在左侧
+          if(item.position.x < centerPosition.x){
+            context.setTextAlign('right');
+            context.fillText(item.value, item.position.x - 4, item.position.y + fontSize / 2 - 2);
+          }else{
+            context.setTextAlign('left');
+            context.fillText(item.value, item.position.x + 4, item.position.y + fontSize / 2 - 2);
+          }
+        }
+      });
+      context.closePath();
+      context.stroke();
+    });
+    context.setTextAlign('left');
+  }
+  
+  return {
+    center: centerPosition,
+    radius: radius,
+    angleList: coordinateAngle
+  };
+}
+
+// 经纬度转墨卡托
+function lonlat2mercator(longitude, latitude) {
+  var mercator = Array(2);
+  var x = longitude * 20037508.34 / 180;
+  var y = Math.log(Math.tan((90 + latitude) * Math.PI / 360)) / (Math.PI / 180);
+  y = y * 20037508.34 / 180;
+  mercator[0] = x;
+  mercator[1] = y;
+  return mercator;
+}
+
+// 墨卡托转经纬度
+function mercator2lonlat(longitude, latitude) {
+  var lonlat = Array(2)
+  var x = longitude / 20037508.34 * 180;
+  var y = latitude / 20037508.34 * 180;
+  y = 180 / Math.PI * (2 * Math.atan(Math.exp(y * Math.PI / 180)) - Math.PI / 2);
+  lonlat[0] = x;
+  lonlat[1] = y;
+  return lonlat;
+}
+
+function getBoundingBox(data) {
+  var bounds = {},coords;
+  bounds.xMin = 180;
+  bounds.xMax = 0;
+  bounds.yMin = 90;
+  bounds.yMax = 0
+  for (var i = 0; i < data.length; i++) {
+    var coorda = data[i].geometry.coordinates
+    for (var k = 0; k < coorda.length; k++) {
+      coords = coorda[k];
+      if (coords.length == 1) {
+        coords = coords[0]
+      }
+      for (var j = 0; j < coords.length; j++) {
+        var longitude = coords[j][0];
+        var latitude = coords[j][1];
+        var point = {
+          x: longitude,
+          y: latitude
+        }
+        bounds.xMin = bounds.xMin < point.x ? bounds.xMin : point.x;
+        bounds.xMax = bounds.xMax > point.x ? bounds.xMax : point.x;
+        bounds.yMin = bounds.yMin < point.y ? bounds.yMin : point.y;
+        bounds.yMax = bounds.yMax > point.y ? bounds.yMax : point.y;
+      }
+    }
+  }
+  return bounds;
+}
+
+function coordinateToPoint(latitude, longitude, bounds, scale, xoffset, yoffset) {
+  return {
+    x: (longitude - bounds.xMin) * scale + xoffset,
+    y: (bounds.yMax - latitude) * scale + yoffset
+  };
+}
+
+function pointToCoordinate(pointY, pointX, bounds, scale, xoffset, yoffset) {
+  return {
+    x: (pointX - xoffset) / scale + bounds.xMin,
+    y: bounds.yMax - (pointY - yoffset) / scale
+  };
+}
+
+function isRayIntersectsSegment(poi, s_poi, e_poi) {
+  if (s_poi[1] == e_poi[1]) {
+    return false;
+  }
+  if (s_poi[1] > poi[1] && e_poi[1] > poi[1]) {
+    return false;
+  }
+  if (s_poi[1] < poi[1] && e_poi[1] < poi[1]) {
+    return false;
+  }
+  if (s_poi[1] == poi[1] && e_poi[1] > poi[1]) {
+    return false;
+  }
+  if (e_poi[1] == poi[1] && s_poi[1] > poi[1]) {
+    return false;
+  }
+  if (s_poi[0] < poi[0] && e_poi[1] < poi[1]) {
+    return false;
+  }
+  let xseg = e_poi[0] - (e_poi[0] - s_poi[0]) * (e_poi[1] - poi[1]) / (e_poi[1] - s_poi[1]);
+  if (xseg < poi[0]) {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+function isPoiWithinPoly(poi, poly, mercator) {
+  let sinsc = 0;
+  for (let i = 0; i < poly.length; i++) {
+    let epoly = poly[i][0];
+    if (poly.length == 1) {
+      epoly = poly[i][0]
+    }
+    for (let j = 0; j < epoly.length - 1; j++) {
+      let s_poi = epoly[j];
+      let e_poi = epoly[j + 1];
+      if (mercator) {
+        s_poi = lonlat2mercator(epoly[j][0], epoly[j][1]);
+        e_poi = lonlat2mercator(epoly[j + 1][0], epoly[j + 1][1]);
+      }
+      if (isRayIntersectsSegment(poi, s_poi, e_poi)) {
+        sinsc += 1;
+      }
+    }
+  }
+  if (sinsc % 2 == 1) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+function drawMapDataPoints(series, opts, config, context) {
+  var mapOption = assign({}, {
+    border: true,
+    mercator: false,
+    borderWidth: 1,
+    borderColor: '#666666',
+    fillOpacity: 0.6,
+    activeBorderColor: '#f04864',
+    activeFillColor: '#facc14',
+    activeFillOpacity: 1
+  }, opts.extra.map);
+  var coords, point;
+  var data = series;
+  var bounds = getBoundingBox(data);
+  if (mapOption.mercator) {
+    var max = lonlat2mercator(bounds.xMax, bounds.yMax)
+    var min = lonlat2mercator(bounds.xMin, bounds.yMin)
+    bounds.xMax = max[0]
+    bounds.yMax = max[1]
+    bounds.xMin = min[0]
+    bounds.yMin = min[1]
+  }
+  var xScale = opts.width / Math.abs(bounds.xMax - bounds.xMin);
+  var yScale = opts.height / Math.abs(bounds.yMax - bounds.yMin);
+  var scale = xScale < yScale ? xScale : yScale;
+  var xoffset = opts.width / 2 - Math.abs(bounds.xMax - bounds.xMin) / 2 * scale;
+  var yoffset = opts.height / 2 - Math.abs(bounds.yMax - bounds.yMin) / 2 * scale;
+  for (var i = 0; i < data.length; i++) {
+    context.beginPath();
+    context.setLineWidth(mapOption.borderWidth * opts.pix);
+    context.setStrokeStyle(mapOption.borderColor);
+    context.setFillStyle(hexToRgb(series[i].color, mapOption.fillOpacity));
+    if (opts.tooltip) {
+      if (opts.tooltip.index == i) {
+        context.setStrokeStyle(mapOption.activeBorderColor);
+        context.setFillStyle(hexToRgb(mapOption.activeFillColor, mapOption.activeFillOpacity));
+      }
+    }
+    var coorda = data[i].geometry.coordinates
+    for (var k = 0; k < coorda.length; k++) {
+      coords = coorda[k];
+      if (coords.length == 1) {
+        coords = coords[0]
+      }
+      for (var j = 0; j < coords.length; j++) {
+        var gaosi = Array(2);
+        if (mapOption.mercator) {
+          gaosi = lonlat2mercator(coords[j][0], coords[j][1])
+        } else {
+          gaosi = coords[j]
+        }
+        point = coordinateToPoint(gaosi[1], gaosi[0], bounds, scale, xoffset, yoffset)
+        if (j === 0) {
+          context.beginPath();
+          context.moveTo(point.x, point.y);
+        } else {
+          context.lineTo(point.x, point.y);
+        }
+      }
+      context.fill();
+      if (mapOption.border == true) {
+        context.stroke();
+      }
+    }
+  }
+  if (opts.dataLabel == true) {
+    for (var i = 0; i < data.length; i++) {
+      var centerPoint = data[i].properties.centroid;
+      if (centerPoint) {
+        if (mapOption.mercator) {
+          centerPoint = lonlat2mercator(data[i].properties.centroid[0], data[i].properties.centroid[1])
+        }
+        point = coordinateToPoint(centerPoint[1], centerPoint[0], bounds, scale, xoffset, yoffset);
+        let fontSize = data[i].textSize * opts.pix || config.fontSize;
+        let text = data[i].properties.name;
+        context.beginPath();
+        context.setFontSize(fontSize)
+        context.setFillStyle(data[i].textColor || opts.fontColor)
+        context.fillText(text, point.x - measureText(text, fontSize, context) / 2, point.y + fontSize / 2);
+        context.closePath();
+        context.stroke();
+      }
+    }
+  }
+  opts.chartData.mapData = {
+    bounds: bounds,
+    scale: scale,
+    xoffset: xoffset,
+    yoffset: yoffset,
+    mercator: mapOption.mercator
+  }
+  drawToolTipBridge(opts, config, context, 1);
+  context.draw();
+}
+
+function normalInt(min, max, iter) {
+  iter = iter == 0 ? 1 : iter;
+  var arr = [];
+  for (var i = 0; i < iter; i++) {
+    arr[i] = Math.random();
+  };
+  return Math.floor(arr.reduce(function(i, j) {
+    return i + j
+  }) / iter * (max - min)) + min;
+};
+
+function collisionNew(area, points, width, height) {
+  var isIn = false;
+  for (let i = 0; i < points.length; i++) {
+    if (points[i].area) {
+      if (area[3] < points[i].area[1] || area[0] > points[i].area[2] || area[1] > points[i].area[3] || area[2] < points[i].area[0]) {
+        if (area[0] < 0 || area[1] < 0 || area[2] > width || area[3] > height) {
+          isIn = true;
+          break;
+        } else {
+          isIn = false;
+        }
+      } else {
+        isIn = true;
+        break;
+      }
+    }
+  }
+  return isIn;
+};
+
+function getWordCloudPoint(opts, type, context) {
+  let points = opts.series;
+  switch (type) {
+    case 'normal':
+      for (let i = 0; i < points.length; i++) {
+        let text = points[i].name;
+        let tHeight = points[i].textSize * opts.pix;
+        let tWidth = measureText(text, tHeight, context);
+        let x, y;
+        let area;
+        let breaknum = 0;
+        while (true) {
+          breaknum++;
+          x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
+          y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
+          area = [x - 5 + opts.width / 2, y - 5 - tHeight + opts.height / 2, x + tWidth + 5 + opts.width / 2, y + 5 +
+            opts.height / 2
+          ];
+          let isCollision = collisionNew(area, points, opts.width, opts.height);
+          if (!isCollision) break;
+          if (breaknum == 1000) {
+            area = [-100, -100, -100, -100];
+            break;
+          }
+        };
+        points[i].area = area;
+      }
+      break;
+    case 'vertical':
+      function Spin() {
+        //获取均匀随机值，是否旋转，旋转的概率为（1-0.5）
+        if (Math.random() > 0.7) {
+          return true;
+        } else {
+          return false
+        };
+      };
+      for (let i = 0; i < points.length; i++) {
+        let text = points[i].name;
+        let tHeight = points[i].textSize * opts.pix;
+        let tWidth = measureText(text, tHeight, context);
+        let isSpin = Spin();
+        let x, y, area, areav;
+        let breaknum = 0;
+        while (true) {
+          breaknum++;
+          let isCollision;
+          if (isSpin) {
+            x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
+            y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
+            area = [y - 5 - tWidth + opts.width / 2, (-x - 5 + opts.height / 2), y + 5 + opts.width / 2, (-x + tHeight + 5 + opts.height / 2)];
+            areav = [opts.width - (opts.width / 2 - opts.height / 2) - (-x + tHeight + 5 + opts.height / 2) - 5, (opts.height / 2 - opts.width / 2) + (y - 5 - tWidth + opts.width / 2) - 5, opts.width - (opts.width / 2 - opts.height / 2) - (-x + tHeight + 5 + opts.height / 2) + tHeight, (opts.height / 2 - opts.width / 2) + (y - 5 - tWidth + opts.width / 2) + tWidth + 5];
+            isCollision = collisionNew(areav, points, opts.height, opts.width);
+          } else {
+            x = normalInt(-opts.width / 2, opts.width / 2, 5) - tWidth / 2;
+            y = normalInt(-opts.height / 2, opts.height / 2, 5) + tHeight / 2;
+            area = [x - 5 + opts.width / 2, y - 5 - tHeight + opts.height / 2, x + tWidth + 5 + opts.width / 2, y + 5 + opts.height / 2];
+            isCollision = collisionNew(area, points, opts.width, opts.height);
+          }
+          if (!isCollision) break;
+          if (breaknum == 1000) {
+            area = [-1000, -1000, -1000, -1000];
+            break;
+          }
+        };
+        if (isSpin) {
+          points[i].area = areav;
+          points[i].areav = area;
+        } else {
+          points[i].area = area;
+        }
+        points[i].rotate = isSpin;
+      };
+      break;
+  }
+  return points;
+}
+
+function drawWordCloudDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let wordOption = assign({}, {
+    type: 'normal',
+    autoColors: true
+  }, opts.extra.word);
+  if (!opts.chartData.wordCloudData) {
+    opts.chartData.wordCloudData = getWordCloudPoint(opts, wordOption.type, context);
+  }
+  context.beginPath();
+  context.setFillStyle(opts.background);
+  context.rect(0, 0, opts.width, opts.height);
+  context.fill();
+  context.save();
+  let points = opts.chartData.wordCloudData;
+  context.translate(opts.width / 2, opts.height / 2);
+  for (let i = 0; i < points.length; i++) {
+    context.save();
+    if (points[i].rotate) {
+      context.rotate(90 * Math.PI / 180);
+    }
+    let text = points[i].name;
+    let tHeight = points[i].textSize * opts.pix;
+    let tWidth = measureText(text, tHeight, context);
+    context.beginPath();
+    context.setStrokeStyle(points[i].color);
+    context.setFillStyle(points[i].color);
+    context.setFontSize(tHeight);
+    if (points[i].rotate) {
+      if (points[i].areav[0] > 0) {
+        if (opts.tooltip) {
+          if (opts.tooltip.index == i) {
+            context.strokeText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
+          } else {
+            context.fillText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
+          }
+        } else {
+          context.fillText(text, (points[i].areav[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].areav[1] + 5 + tHeight - opts.height / 2) * process);
+        }
+      }
+    } else {
+      if (points[i].area[0] > 0) {
+        if (opts.tooltip) {
+          if (opts.tooltip.index == i) {
+            context.strokeText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
+          } else {
+            context.fillText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
+          }
+        } else {
+          context.fillText(text, (points[i].area[0] + 5 - opts.width / 2) * process - tWidth * (1 - process) / 2, (points[i].area[1] + 5 + tHeight - opts.height / 2) * process);
+        }
+      }
+    }
+    context.stroke();
+    context.restore();
+  }
+  context.restore();
+}
+
+function drawFunnelDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let funnelOption = assign({}, {
+    type:'funnel',
+    activeWidth: 10,
+    activeOpacity: 0.3,
+    border: false,
+    borderWidth: 2,
+    borderColor: '#FFFFFF',
+    fillOpacity: 1,
+    labelAlign: 'right',
+    linearType: 'none',
+    customColor: [],
+  }, opts.extra.funnel);
+  let eachSpacing = (opts.height - opts.area[0] - opts.area[2]) / series.length;
+  let centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.height - opts.area[2]
+  };
+  let activeWidth = funnelOption.activeWidth * opts.pix;
+  let radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - activeWidth, (opts.height - opts.area[0] - opts.area[2]) / 2 - activeWidth);
+  series = getFunnelDataPoints(series, radius, funnelOption.type, eachSpacing, process);
+  context.save();
+  context.translate(centerPosition.x, centerPosition.y);
+  funnelOption.customColor = fillCustomColor(funnelOption.linearType, funnelOption.customColor, series, config);
+  if(funnelOption.type == 'pyramid'){
+    for (let i = 0; i < series.length; i++) {
+      if (i == series.length -1) {
+        if (opts.tooltip) {
+          if (opts.tooltip.index == i) {
+            context.beginPath();
+            context.setFillStyle(hexToRgb(series[i].color, funnelOption.activeOpacity));
+            context.moveTo(-activeWidth, -eachSpacing);
+            context.lineTo(-series[i].radius - activeWidth, 0);
+            context.lineTo(series[i].radius + activeWidth, 0);
+            context.lineTo(activeWidth, -eachSpacing);
+            context.lineTo(-activeWidth, -eachSpacing);
+            context.closePath();
+            context.fill();
+          }
+        }
+        series[i].funnelArea = [centerPosition.x - series[i].radius, centerPosition.y - eachSpacing * (i + 1), centerPosition.x + series[i].radius, centerPosition.y - eachSpacing * i];
+        context.beginPath();
+        context.setLineWidth(funnelOption.borderWidth * opts.pix);
+        context.setStrokeStyle(funnelOption.borderColor);
+        var fillColor = hexToRgb(series[i].color, funnelOption.fillOpacity);
+        if (funnelOption.linearType == 'custom') {
+          var grd = context.createLinearGradient(series[i].radius, -eachSpacing, -series[i].radius, -eachSpacing);
+          grd.addColorStop(0, hexToRgb(series[i].color, funnelOption.fillOpacity));
+          grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[series[i].linearIndex], funnelOption.fillOpacity));
+          grd.addColorStop(1, hexToRgb(series[i].color, funnelOption.fillOpacity));
+          fillColor = grd
+        }
+        context.setFillStyle(fillColor);
+        context.moveTo(0, -eachSpacing);
+        context.lineTo(-series[i].radius, 0);
+        context.lineTo(series[i].radius, 0);
+        context.lineTo(0, -eachSpacing);
+        context.closePath();
+        context.fill();
+        if (funnelOption.border == true) {
+          context.stroke();
+        }
+      } else {
+        if (opts.tooltip) {
+          if (opts.tooltip.index == i) {
+            context.beginPath();
+            context.setFillStyle(hexToRgb(series[i].color, funnelOption.activeOpacity));
+            context.moveTo(0, 0);
+            context.lineTo(-series[i].radius - activeWidth, 0);
+            context.lineTo(-series[i + 1].radius - activeWidth, -eachSpacing);
+            context.lineTo(series[i + 1].radius + activeWidth, -eachSpacing);
+            context.lineTo(series[i].radius + activeWidth, 0);
+            context.lineTo(0, 0);
+            context.closePath();
+            context.fill();
+          }
+        }
+        series[i].funnelArea = [centerPosition.x - series[i].radius, centerPosition.y - eachSpacing * (i + 1), centerPosition.x + series[i].radius, centerPosition.y - eachSpacing * i];
+        context.beginPath();
+        context.setLineWidth(funnelOption.borderWidth * opts.pix);
+        context.setStrokeStyle(funnelOption.borderColor);
+        var fillColor = hexToRgb(series[i].color, funnelOption.fillOpacity);
+        if (funnelOption.linearType == 'custom') {
+          var grd = context.createLinearGradient(series[i].radius, -eachSpacing, -series[i].radius, -eachSpacing);
+          grd.addColorStop(0, hexToRgb(series[i].color, funnelOption.fillOpacity));
+          grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[series[i].linearIndex], funnelOption.fillOpacity));
+          grd.addColorStop(1, hexToRgb(series[i].color, funnelOption.fillOpacity));
+          fillColor = grd
+        }
+        context.setFillStyle(fillColor);
+        context.moveTo(0, 0);
+        context.lineTo(-series[i].radius, 0);
+        context.lineTo(-series[i + 1].radius, -eachSpacing);
+        context.lineTo(series[i + 1].radius, -eachSpacing);
+        context.lineTo(series[i].radius, 0);
+        context.lineTo(0, 0);
+        context.closePath();
+        context.fill();
+        if (funnelOption.border == true) {
+          context.stroke();
+        }
+      }
+      context.translate(0, -eachSpacing)
+    }
+  }else{
+    for (let i = 0; i < series.length; i++) {
+      if (i == 0) {
+        if (opts.tooltip) {
+          if (opts.tooltip.index == i) {
+            context.beginPath();
+            context.setFillStyle(hexToRgb(series[i].color, funnelOption.activeOpacity));
+            context.moveTo(-activeWidth, 0);
+            context.lineTo(-series[i].radius - activeWidth, -eachSpacing);
+            context.lineTo(series[i].radius + activeWidth, -eachSpacing);
+            context.lineTo(activeWidth, 0);
+            context.lineTo(-activeWidth, 0);
+            context.closePath();
+            context.fill();
+          }
+        }
+        series[i].funnelArea = [centerPosition.x - series[i].radius, centerPosition.y - eachSpacing, centerPosition.x + series[i].radius, centerPosition.y];
+        context.beginPath();
+        context.setLineWidth(funnelOption.borderWidth * opts.pix);
+        context.setStrokeStyle(funnelOption.borderColor);
+        var fillColor = hexToRgb(series[i].color, funnelOption.fillOpacity);
+        if (funnelOption.linearType == 'custom') {
+          var grd = context.createLinearGradient(series[i].radius, -eachSpacing, -series[i].radius, -eachSpacing);
+          grd.addColorStop(0, hexToRgb(series[i].color, funnelOption.fillOpacity));
+          grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[series[i].linearIndex], funnelOption.fillOpacity));
+          grd.addColorStop(1, hexToRgb(series[i].color, funnelOption.fillOpacity));
+          fillColor = grd
+        }
+        context.setFillStyle(fillColor);
+        context.moveTo(0, 0);
+        context.lineTo(-series[i].radius, -eachSpacing);
+        context.lineTo(series[i].radius, -eachSpacing);
+        context.lineTo(0, 0);
+        context.closePath();
+        context.fill();
+        if (funnelOption.border == true) {
+          context.stroke();
+        }
+      } else {
+        if (opts.tooltip) {
+          if (opts.tooltip.index == i) {
+            context.beginPath();
+            context.setFillStyle(hexToRgb(series[i].color, funnelOption.activeOpacity));
+            context.moveTo(0, 0);
+            context.lineTo(-series[i - 1].radius - activeWidth, 0);
+            context.lineTo(-series[i].radius - activeWidth, -eachSpacing);
+            context.lineTo(series[i].radius + activeWidth, -eachSpacing);
+            context.lineTo(series[i - 1].radius + activeWidth, 0);
+            context.lineTo(0, 0);
+            context.closePath();
+            context.fill();
+          }
+        }
+        series[i].funnelArea = [centerPosition.x - series[i].radius, centerPosition.y - eachSpacing * (i + 1), centerPosition.x + series[i].radius, centerPosition.y - eachSpacing * i];
+        context.beginPath();
+        context.setLineWidth(funnelOption.borderWidth * opts.pix);
+        context.setStrokeStyle(funnelOption.borderColor);
+        var fillColor = hexToRgb(series[i].color, funnelOption.fillOpacity);
+        if (funnelOption.linearType == 'custom') {
+          var grd = context.createLinearGradient(series[i].radius, -eachSpacing, -series[i].radius, -eachSpacing);
+          grd.addColorStop(0, hexToRgb(series[i].color, funnelOption.fillOpacity));
+          grd.addColorStop(0.5, hexToRgb(funnelOption.customColor[series[i].linearIndex], funnelOption.fillOpacity));
+          grd.addColorStop(1, hexToRgb(series[i].color, funnelOption.fillOpacity));
+          fillColor = grd
+        }
+        context.setFillStyle(fillColor);
+        context.moveTo(0, 0);
+        context.lineTo(-series[i - 1].radius, 0);
+        context.lineTo(-series[i].radius, -eachSpacing);
+        context.lineTo(series[i].radius, -eachSpacing);
+        context.lineTo(series[i - 1].radius, 0);
+        context.lineTo(0, 0);
+        context.closePath();
+        context.fill();
+        if (funnelOption.border == true) {
+          context.stroke();
+        }
+      }
+      context.translate(0, -eachSpacing)
+    }
+  }
+  
+  context.restore();
+  if (opts.dataLabel !== false && process === 1) {
+    drawFunnelText(series, opts, context, eachSpacing, funnelOption.labelAlign, activeWidth, centerPosition);
+  }
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawFunnelText(series, opts, context, eachSpacing, labelAlign, activeWidth, centerPosition) {
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    if(item.labelShow === false){
+      continue;
+    }
+    let startX, endX, startY, fontSize;
+    let text = item.formatter ? item.formatter(item,i,series,opts) : util.toFixed(item._proportion_ * 100) + '%';
+    text = item.labelText ? item.labelText : text;
+    if (labelAlign == 'right') {
+      if(opts.extra.funnel.type === 'pyramid'){
+        if (i == series.length -1) {
+          startX = (item.funnelArea[2] + centerPosition.x) / 2;
+        } else {
+          startX = (item.funnelArea[2] + series[i + 1].funnelArea[2]) / 2;
+        }
+      }else{
+        if (i == 0) {
+          startX = (item.funnelArea[2] + centerPosition.x) / 2;
+        } else {
+          startX = (item.funnelArea[2] + series[i - 1].funnelArea[2]) / 2;
+        }
+      }
+      endX = startX + activeWidth * 2;
+      startY = item.funnelArea[1] + eachSpacing / 2;
+      fontSize = item.textSize * opts.pix || opts.fontSize * opts.pix;
+      context.setLineWidth(1 * opts.pix);
+      context.setStrokeStyle(item.color);
+      context.setFillStyle(item.color);
+      context.beginPath();
+      context.moveTo(startX, startY);
+      context.lineTo(endX, startY);
+      context.stroke();
+      context.closePath();
+      context.beginPath();
+      context.moveTo(endX, startY);
+      context.arc(endX, startY, 2 * opts.pix, 0, 2 * Math.PI);
+      context.closePath();
+      context.fill();
+      context.beginPath();
+      context.setFontSize(fontSize);
+      context.setFillStyle(item.textColor || opts.fontColor);
+      context.fillText(text, endX + 5, startY + fontSize / 2 - 2);
+      context.closePath();
+      context.stroke();
+      context.closePath();
+    } else {
+      if(opts.extra.funnel.type === 'pyramid'){
+        if (i == series.length -1) {
+          startX = (item.funnelArea[0] + centerPosition.x) / 2;
+        } else {
+          startX = (item.funnelArea[0] + series[i + 1].funnelArea[0]) / 2;
+        }
+      }else{
+        if (i == 0) {
+          startX = (item.funnelArea[0] + centerPosition.x) / 2;
+        } else {
+          startX = (item.funnelArea[0] + series[i - 1].funnelArea[0]) / 2;
+        }
+      }
+      endX = startX - activeWidth * 2;
+      startY = item.funnelArea[1] + eachSpacing / 2;
+      fontSize = item.textSize * opts.pix || opts.fontSize * opts.pix;
+      context.setLineWidth(1 * opts.pix);
+      context.setStrokeStyle(item.color);
+      context.setFillStyle(item.color);
+      context.beginPath();
+      context.moveTo(startX, startY);
+      context.lineTo(endX, startY);
+      context.stroke();
+      context.closePath();
+      context.beginPath();
+      context.moveTo(endX, startY);
+      context.arc(endX, startY, 2, 0, 2 * Math.PI);
+      context.closePath();
+      context.fill();
+      context.beginPath();
+      context.setFontSize(fontSize);
+      context.setFillStyle(item.textColor || opts.fontColor);
+      context.fillText(text, endX - 5 - measureText(text, fontSize, context), startY + fontSize / 2 - 2);
+      context.closePath();
+      context.stroke();
+      context.closePath();
+    }
+
+  }
+}
+
+
+function drawCanvas(opts, context) {
+  context.draw();
+}
+
+var Timing = {
+  easeIn: function easeIn(pos) {
+    return Math.pow(pos, 3);
+  },
+  easeOut: function easeOut(pos) {
+    return Math.pow(pos - 1, 3) + 1;
+  },
+  easeInOut: function easeInOut(pos) {
+    if ((pos /= 0.5) < 1) {
+      return 0.5 * Math.pow(pos, 3);
+    } else {
+      return 0.5 * (Math.pow(pos - 2, 3) + 2);
+    }
+  },
+  linear: function linear(pos) {
+    return pos;
+  }
+};
+
+function Animation(opts) {
+  this.isStop = false;
+  opts.duration = typeof opts.duration === 'undefined' ? 1000 : opts.duration;
+  opts.timing = opts.timing || 'easeInOut';
+  var delay = 17;
+  function createAnimationFrame() {
+    if (typeof setTimeout !== 'undefined') {
+      return function(step, delay) {
+        setTimeout(function() {
+          var timeStamp = +new Date();
+          step(timeStamp);
+        }, delay);
+      };
+    } else if (typeof requestAnimationFrame !== 'undefined') {
+      return requestAnimationFrame;
+    } else {
+      return function(step) {
+        step(null);
+      };
+    }
+  };
+  var animationFrame = createAnimationFrame();
+  var startTimeStamp = null;
+  var _step = function step(timestamp) {
+    if (timestamp === null || this.isStop === true) {
+      opts.onProcess && opts.onProcess(1);
+      opts.onAnimationFinish && opts.onAnimationFinish();
+      return;
+    }
+    if (startTimeStamp === null) {
+      startTimeStamp = timestamp;
+    }
+    if (timestamp - startTimeStamp < opts.duration) {
+      var process = (timestamp - startTimeStamp) / opts.duration;
+      var timingFunction = Timing[opts.timing];
+      process = timingFunction(process);
+      opts.onProcess && opts.onProcess(process);
+      animationFrame(_step, delay);
+    } else {
+      opts.onProcess && opts.onProcess(1);
+      opts.onAnimationFinish && opts.onAnimationFinish();
+    }
+  };
+  _step = _step.bind(this);
+  animationFrame(_step, delay);
+}
+
+Animation.prototype.stop = function() {
+  this.isStop = true;
+};
+
+function drawCharts(type, opts, config, context) {
+  var _this = this;
+  var series = opts.series;
+  //兼容ECharts饼图类数据格式
+  if (type === 'pie' || type === 'ring' || type === 'mount' || type === 'rose' || type === 'funnel') {
+    series = fixPieSeries(series, opts, config);
+  }
+  var categories = opts.categories;
+  if (type === 'mount') {
+    categories = [];
+    for (let j = 0; j < series.length; j++) {
+      if(series[j].show !== false) categories.push(series[j].name)
+    }
+    opts.categories = categories;
+  }
+  series = fillSeries(series, opts, config);
+  var duration = opts.animation ? opts.duration : 0;
+  _this.animationInstance && _this.animationInstance.stop();
+  var seriesMA = null;
+  if (type == 'candle') {
+    let average = assign({}, opts.extra.candle.average);
+    if (average.show) {
+      seriesMA = calCandleMA(average.day, average.name, average.color, series[0].data);
+      seriesMA = fillSeries(seriesMA, opts, config);
+      opts.seriesMA = seriesMA;
+    } else if (opts.seriesMA) {
+      seriesMA = opts.seriesMA = fillSeries(opts.seriesMA, opts, config);
+    } else {
+      seriesMA = series;
+    }
+  } else {
+    seriesMA = series;
+  }
+  /* 过滤掉show=false的series */
+  opts._series_ = series = filterSeries(series);
+  //重新计算图表区域
+  opts.area = new Array(4);
+  //复位绘图区域
+  for (let j = 0; j < 4; j++) {
+    opts.area[j] = opts.padding[j] * opts.pix;
+  }
+  //通过计算三大区域：图例、X轴、Y轴的大小，确定绘图区域
+  var _calLegendData = calLegendData(seriesMA, opts, config, opts.chartData, context),
+    legendHeight = _calLegendData.area.wholeHeight,
+    legendWidth = _calLegendData.area.wholeWidth;
+
+  switch (opts.legend.position) {
+    case 'top':
+      opts.area[0] += legendHeight;
+      break;
+    case 'bottom':
+      opts.area[2] += legendHeight;
+      break;
+    case 'left':
+      opts.area[3] += legendWidth;
+      break;
+    case 'right':
+      opts.area[1] += legendWidth;
+      break;
+  }
+
+  let _calYAxisData = {},
+    yAxisWidth = 0;
+  if (opts.type === 'line' || opts.type === 'column'|| opts.type === 'mount' || opts.type === 'area' || opts.type === 'mix' || opts.type === 'candle' || opts.type === 'scatter'  || opts.type === 'bubble' || opts.type === 'bar') {
+      _calYAxisData = calYAxisData(series, opts, config, context);
+      yAxisWidth = _calYAxisData.yAxisWidth;
+    //如果显示Y轴标题
+    if (opts.yAxis.showTitle) {
+      let maxTitleHeight = 0;
+      for (let i = 0; i < opts.yAxis.data.length; i++) {
+        maxTitleHeight = Math.max(maxTitleHeight, opts.yAxis.data[i].titleFontSize ? opts.yAxis.data[i].titleFontSize * opts.pix : config.fontSize)
+      }
+      opts.area[0] += maxTitleHeight;
+    }
+    let rightIndex = 0,
+      leftIndex = 0;
+    //计算主绘图区域左右位置
+    for (let i = 0; i < yAxisWidth.length; i++) {
+      if (yAxisWidth[i].position == 'left') {
+        if (leftIndex > 0) {
+          opts.area[3] += yAxisWidth[i].width + opts.yAxis.padding * opts.pix;
+        } else {
+          opts.area[3] += yAxisWidth[i].width;
+        }
+        leftIndex += 1;
+      } else if (yAxisWidth[i].position == 'right') {
+        if (rightIndex > 0) {
+          opts.area[1] += yAxisWidth[i].width + opts.yAxis.padding * opts.pix;
+        } else {
+          opts.area[1] += yAxisWidth[i].width;
+        }
+        rightIndex += 1;
+      }
+    }
+  } else {
+    config.yAxisWidth = yAxisWidth;
+  }
+  opts.chartData.yAxisData = _calYAxisData;
+
+  if (opts.categories && opts.categories.length && opts.type !== 'radar' && opts.type !== 'gauge' && opts.type !== 'bar') {
+    opts.chartData.xAxisData = getXAxisPoints(opts.categories, opts, config);
+    let _calCategoriesData = calCategoriesData(opts.categories, opts, config, opts.chartData.xAxisData.eachSpacing, context),
+      xAxisHeight = _calCategoriesData.xAxisHeight,
+      angle = _calCategoriesData.angle;
+    config.xAxisHeight = xAxisHeight;
+    config._xAxisTextAngle_ = angle;
+    opts.area[2] += xAxisHeight;
+    opts.chartData.categoriesData = _calCategoriesData;
+  } else {
+    if (opts.type === 'line' || opts.type === 'area' || opts.type === 'scatter' || opts.type === 'bubble' || opts.type === 'bar') {
+      opts.chartData.xAxisData = calXAxisData(series, opts, config, context);
+      categories = opts.chartData.xAxisData.rangesFormat;
+      let _calCategoriesData = calCategoriesData(categories, opts, config, opts.chartData.xAxisData.eachSpacing, context),
+        xAxisHeight = _calCategoriesData.xAxisHeight,
+        angle = _calCategoriesData.angle;
+      config.xAxisHeight = xAxisHeight;
+      config._xAxisTextAngle_ = angle;
+      opts.area[2] += xAxisHeight;
+      opts.chartData.categoriesData = _calCategoriesData;
+    } else {
+      opts.chartData.xAxisData = {
+        xAxisPoints: []
+      };
+    }
+  }
+
+  //计算右对齐偏移距离
+  if (opts.enableScroll && opts.xAxis.scrollAlign == 'right' && opts._scrollDistance_ === undefined) {
+    let offsetLeft = 0,
+      xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
+      startX = opts.chartData.xAxisData.startX,
+      endX = opts.chartData.xAxisData.endX,
+      eachSpacing = opts.chartData.xAxisData.eachSpacing;
+    let totalWidth = eachSpacing * (xAxisPoints.length - 1);
+    let screenWidth = endX - startX;
+    offsetLeft = screenWidth - totalWidth;
+    _this.scrollOption.currentOffset = offsetLeft;
+    _this.scrollOption.startTouchX = offsetLeft;
+    _this.scrollOption.distance = 0;
+    _this.scrollOption.lastMoveTime = 0;
+    opts._scrollDistance_ = offsetLeft;
+  }
+
+  if (type === 'pie' || type === 'ring' || type === 'rose') {
+    config._pieTextMaxLength_ = opts.dataLabel === false ? 0 : getPieTextMaxLength(seriesMA, config, context, opts);
+  }
+  
+  switch (type) {
+    case 'word':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawWordCloudDataPoints(series, opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'map':
+      context.clearRect(0, 0, opts.width, opts.height);
+      drawMapDataPoints(series, opts, config, context);
+      break;
+    case 'funnel':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.funnelData = drawFunnelDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'line':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawLineDataPoints = drawLineDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawLineDataPoints.xAxisPoints,
+            calPoints = _drawLineDataPoints.calPoints,
+            eachSpacing = _drawLineDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'scatter':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawScatterDataPoints = drawScatterDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawScatterDataPoints.xAxisPoints,
+            calPoints = _drawScatterDataPoints.calPoints,
+            eachSpacing = _drawScatterDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'bubble':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawBubbleDataPoints = drawBubbleDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawBubbleDataPoints.xAxisPoints,
+            calPoints = _drawBubbleDataPoints.calPoints,
+            eachSpacing = _drawBubbleDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'mix':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawMixDataPoints = drawMixDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawMixDataPoints.xAxisPoints,
+            calPoints = _drawMixDataPoints.calPoints,
+            eachSpacing = _drawMixDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'column':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawColumnDataPoints = drawColumnDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawColumnDataPoints.xAxisPoints,
+            calPoints = _drawColumnDataPoints.calPoints,
+            eachSpacing = _drawColumnDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'mount':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawMountDataPoints = drawMountDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawMountDataPoints.xAxisPoints,
+            calPoints = _drawMountDataPoints.calPoints,
+            eachSpacing = _drawMountDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'bar':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawXAxis(categories, opts, config, context);
+          var _drawBarDataPoints = drawBarDataPoints(series, opts, config, context, process),
+            yAxisPoints = _drawBarDataPoints.yAxisPoints,
+            calPoints = _drawBarDataPoints.calPoints,
+            eachSpacing = _drawBarDataPoints.eachSpacing;
+          opts.chartData.yAxisPoints = yAxisPoints;
+          opts.chartData.xAxisPoints = opts.chartData.xAxisData.xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, yAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'area':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawAreaDataPoints = drawAreaDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawAreaDataPoints.xAxisPoints,
+            calPoints = _drawAreaDataPoints.calPoints,
+            eachSpacing = _drawAreaDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'ring':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.pieData = drawPieDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'pie':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.pieData = drawPieDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'rose':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.pieData = drawRoseDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'radar':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.radarData = drawRadarDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'arcbar':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.arcbarData = drawArcbarDataPoints(series, opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'gauge':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.gaugeData = drawGaugeDataPoints(categories, series, opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'candle':
+      this.animationInstance = new Animation({
+        timing: opts.timing,
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawCandleDataPoints = drawCandleDataPoints(series, seriesMA, opts, config, context, process),
+            xAxisPoints = _drawCandleDataPoints.xAxisPoints,
+            calPoints = _drawCandleDataPoints.calPoints,
+            eachSpacing = _drawCandleDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          if (seriesMA) {
+            drawLegend(seriesMA, opts, config, context, opts.chartData);
+          } else {
+            drawLegend(opts.series, opts, config, context, opts.chartData);
+          }
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.uevent.trigger('renderComplete');
+        }
+      });
+      break;
+  }
+}
+
+function uChartsEvent() {
+  this.events = {};
+}
+
+uChartsEvent.prototype.addEventListener = function(type, listener) {
+  this.events[type] = this.events[type] || [];
+  this.events[type].push(listener);
+};
+
+uChartsEvent.prototype.delEventListener = function(type) {
+  this.events[type] = [];
+};
+
+uChartsEvent.prototype.trigger = function() {
+  for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+  var type = args[0];
+  var params = args.slice(1);
+  if (!!this.events[type]) {
+    this.events[type].forEach(function(listener) {
+      try {
+        listener.apply(null, params);
+      } catch (e) {
+          //console.log('[uCharts] '+e);
+      }
+    });
+  }
+};
+
+var uCharts = function uCharts(opts) {
+  opts.pix = opts.pixelRatio ? opts.pixelRatio : 1;
+  opts.fontSize = opts.fontSize ? opts.fontSize : 13;
+  opts.fontColor = opts.fontColor ? opts.fontColor : config.fontColor;
+  if (opts.background == "" || opts.background == "none") {
+    opts.background = "#FFFFFF"
+  }
+  opts.title = assign({}, opts.title);
+  opts.subtitle = assign({}, opts.subtitle);
+  opts.duration = opts.duration ? opts.duration : 1000;
+  opts.yAxis = assign({}, {
+    data: [],
+    showTitle: false,
+    disabled: false,
+    disableGrid: false,
+    splitNumber: 5,
+    gridType: 'solid',
+    dashLength: 4 * opts.pix,
+    gridColor: '#cccccc',
+    padding: 10,
+    fontColor: '#666666'
+  }, opts.yAxis);
+  opts.xAxis = assign({}, {
+    rotateLabel: false,
+    rotateAngle:45,
+    disabled: false,
+    disableGrid: false,
+    splitNumber: 5,
+    calibration:false,
+    gridType: 'solid',
+    dashLength: 4,
+    scrollAlign: 'left',
+    boundaryGap: 'center',
+    axisLine: true,
+    axisLineColor: '#cccccc'
+  }, opts.xAxis);
+  opts.xAxis.scrollPosition = opts.xAxis.scrollAlign;
+  opts.legend = assign({}, {
+    show: true,
+    position: 'bottom',
+    float: 'center',
+    backgroundColor: 'rgba(0,0,0,0)',
+    borderColor: 'rgba(0,0,0,0)',
+    borderWidth: 0,
+    padding: 5,
+    margin: 5,
+    itemGap: 10,
+    fontSize: opts.fontSize,
+    lineHeight: opts.fontSize,
+    fontColor: opts.fontColor,
+    formatter: {},
+    hiddenColor: '#CECECE'
+  }, opts.legend);
+  opts.extra = assign({}, opts.extra);
+  opts.rotate = opts.rotate ? true : false;
+  opts.animation = opts.animation ? true : false;
+  opts.rotate = opts.rotate ? true : false;
+  opts.canvas2d = opts.canvas2d ? true : false;
+  
+  let config$$1 = assign({}, config);
+  config$$1.color = opts.color ? opts.color : config$$1.color;
+  if (opts.type == 'pie') {
+    config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.pie.labelWidth * opts.pix || config$$1.pieChartLinePadding * opts.pix;
+  }
+  if (opts.type == 'ring') {
+    config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.ring.labelWidth * opts.pix || config$$1.pieChartLinePadding * opts.pix;
+  }
+  if (opts.type == 'rose') {
+    config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.rose.labelWidth * opts.pix || config$$1.pieChartLinePadding * opts.pix;
+  }
+  config$$1.pieChartTextPadding = opts.dataLabel === false ? 0 : config$$1.pieChartTextPadding * opts.pix;
+
+  //屏幕旋转
+  config$$1.rotate = opts.rotate;
+  if (opts.rotate) {
+    let tempWidth = opts.width;
+    let tempHeight = opts.height;
+    opts.width = tempHeight;
+    opts.height = tempWidth;
+  }
+
+  //适配高分屏
+  opts.padding = opts.padding ? opts.padding : config$$1.padding;
+  config$$1.yAxisWidth = config.yAxisWidth * opts.pix;
+  config$$1.xAxisHeight = config.xAxisHeight * opts.pix;
+  if (opts.enableScroll && opts.xAxis.scrollShow) {
+    config$$1.xAxisHeight += 6 * opts.pix;
+  }
+  config$$1.fontSize = opts.fontSize * opts.pix;
+  config$$1.titleFontSize = config.titleFontSize * opts.pix;
+  config$$1.subtitleFontSize = config.subtitleFontSize * opts.pix;
+  config$$1.toolTipPadding = config.toolTipPadding * opts.pix;
+  config$$1.toolTipLineHeight = config.toolTipLineHeight * opts.pix;
+  if(!opts.context){
+    throw new Error('[uCharts] 未获取到context！注意：v2.0版本后，需要自行获取canvas的绘图上下文并传入opts.context！');
+  }
+  this.context = opts.context;
+  if (!this.context.setTextAlign) {
+    this.context.setStrokeStyle = function(e) {
+      return this.strokeStyle = e;
+    }
+    this.context.setLineWidth = function(e) {
+      return this.lineWidth = e;
+    }
+    this.context.setLineCap = function(e) {
+      return this.lineCap = e;
+    }
+    this.context.setFontSize = function(e) {
+      return this.font = e + "px sans-serif";
+    }
+    this.context.setFillStyle = function(e) {
+      return this.fillStyle = e;
+    }
+    this.context.setTextAlign = function(e) {
+      return this.textAlign = e;
+    }
+    this.context.draw = function() {}
+  }
+  //兼容NVUEsetLineDash
+  if(!this.context.setLineDash){
+    this.context.setLineDash = function(e) {}
+  }
+  opts.chartData = {};
+  this.uevent = new uChartsEvent();
+  this.scrollOption = {
+    currentOffset: 0,
+    startTouchX: 0,
+    distance: 0,
+    lastMoveTime: 0
+  };
+  this.opts = opts;
+  this.config = config$$1;
+  drawCharts.call(this, opts.type, opts, config$$1, this.context);
+};
+
+uCharts.prototype.updateData = function() {
+  let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  this.opts = assign({}, this.opts, data);
+  this.opts.updateData = true;
+  let scrollPosition = data.scrollPosition || 'current';
+  switch (scrollPosition) {
+    case 'current':
+      this.opts._scrollDistance_ = this.scrollOption.currentOffset;
+      break;
+    case 'left':
+      this.opts._scrollDistance_ = 0;
+      this.scrollOption = {
+        currentOffset: 0,
+        startTouchX: 0,
+        distance: 0,
+        lastMoveTime: 0
+      };
+      break;
+    case 'right':
+      let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config, this.context), yAxisWidth = _calYAxisData.yAxisWidth;
+      this.config.yAxisWidth = yAxisWidth;
+      let offsetLeft = 0;
+      let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config), xAxisPoints = _getXAxisPoints0.xAxisPoints,
+        startX = _getXAxisPoints0.startX,
+        endX = _getXAxisPoints0.endX,
+        eachSpacing = _getXAxisPoints0.eachSpacing;
+      let totalWidth = eachSpacing * (xAxisPoints.length - 1);
+      let screenWidth = endX - startX;
+      offsetLeft = screenWidth - totalWidth;
+      this.scrollOption = {
+        currentOffset: offsetLeft,
+        startTouchX: offsetLeft,
+        distance: 0,
+        lastMoveTime: 0
+      };
+      this.opts._scrollDistance_ = offsetLeft;
+      break;
+  }
+  drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+};
+
+uCharts.prototype.zoom = function() {
+  var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.opts.xAxis.itemCount;
+  if (this.opts.enableScroll !== true) {
+    console.log('[uCharts] 请启用滚动条后使用')
+    return;
+  }
+  //当前屏幕中间点
+  let centerPoint = Math.round(Math.abs(this.scrollOption.currentOffset) / this.opts.chartData.eachSpacing) + Math.round(this.opts.xAxis.itemCount / 2);
+  this.opts.animation = false;
+  this.opts.xAxis.itemCount = val.itemCount;
+  //重新计算x轴偏移距离
+  let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config, this.context),
+    yAxisWidth = _calYAxisData.yAxisWidth;
+  this.config.yAxisWidth = yAxisWidth;
+  let offsetLeft = 0;
+  let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+    xAxisPoints = _getXAxisPoints0.xAxisPoints,
+    startX = _getXAxisPoints0.startX,
+    endX = _getXAxisPoints0.endX,
+    eachSpacing = _getXAxisPoints0.eachSpacing;
+  let centerLeft = eachSpacing * centerPoint;
+  let screenWidth = endX - startX;
+  let MaxLeft = screenWidth - eachSpacing * (xAxisPoints.length - 1);
+  offsetLeft = screenWidth / 2 - centerLeft;
+  if (offsetLeft > 0) {
+    offsetLeft = 0;
+  }
+  if (offsetLeft < MaxLeft) {
+    offsetLeft = MaxLeft;
+  }
+  this.scrollOption = {
+    currentOffset: offsetLeft,
+    startTouchX: 0,
+    distance: 0,
+    lastMoveTime: 0
+  };
+  calValidDistance(this, offsetLeft, this.opts.chartData, this.config, this.opts);
+  this.opts._scrollDistance_ = offsetLeft;
+  drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+};
+
+uCharts.prototype.dobuleZoom = function(e) {
+  if (this.opts.enableScroll !== true) {
+    console.log('[uCharts] 请启用滚动条后使用')
+    return;
+  }
+  const tcs = e.changedTouches;
+  if (tcs.length < 2) {
+    return;
+  }
+  for (var i = 0; i < tcs.length; i++) {
+    tcs[i].x = tcs[i].x ? tcs[i].x : tcs[i].clientX;
+    tcs[i].y = tcs[i].y ? tcs[i].y : tcs[i].clientY;
+  }
+  const ntcs = [getTouches(tcs[0], this.opts, e),getTouches(tcs[1], this.opts, e)]; 
+  const xlength = Math.abs(ntcs[0].x - ntcs[1].x);
+  // 记录初始的两指之间的数据
+  if(!this.scrollOption.moveCount){
+    let cts0 = {changedTouches:[{x:tcs[0].x,y:this.opts.area[0] / this.opts.pix + 2}]};
+    let cts1 = {changedTouches:[{x:tcs[1].x,y:this.opts.area[0] / this.opts.pix + 2}]};
+    if(this.opts.rotate){
+      cts0 = {changedTouches:[{x:this.opts.height / this.opts.pix - this.opts.area[0] / this.opts.pix - 2,y:tcs[0].y}]};
+      cts1 = {changedTouches:[{x:this.opts.height / this.opts.pix - this.opts.area[0] / this.opts.pix - 2,y:tcs[1].y}]};
+    }
+    const moveCurrent1 = this.getCurrentDataIndex(cts0).index;
+    const moveCurrent2 = this.getCurrentDataIndex(cts1).index;
+    const moveCount = Math.abs(moveCurrent1 - moveCurrent2);
+    this.scrollOption.moveCount = moveCount;
+    this.scrollOption.moveCurrent1 = Math.min(moveCurrent1, moveCurrent2);
+    this.scrollOption.moveCurrent2 = Math.max(moveCurrent1, moveCurrent2);
+    return;
+  }
+  
+  let currentEachSpacing = xlength / this.scrollOption.moveCount;
+  let itemCount = (this.opts.width - this.opts.area[1] - this.opts.area[3]) / currentEachSpacing;
+  itemCount = itemCount <= 2 ? 2 : itemCount;
+  itemCount = itemCount >= this.opts.categories.length ? this.opts.categories.length : itemCount;
+  this.opts.animation = false;
+  this.opts.xAxis.itemCount = itemCount;
+  // 重新计算滚动条偏移距离
+  let offsetLeft = 0;
+  let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+    xAxisPoints = _getXAxisPoints0.xAxisPoints,
+    startX = _getXAxisPoints0.startX,
+    endX = _getXAxisPoints0.endX,
+    eachSpacing = _getXAxisPoints0.eachSpacing;
+  let currentLeft = eachSpacing * this.scrollOption.moveCurrent1;
+  let screenWidth = endX - startX;
+  let MaxLeft = screenWidth - eachSpacing * (xAxisPoints.length - 1);
+  offsetLeft = -currentLeft+Math.min(ntcs[0].x,ntcs[1].x)-this.opts.area[3]-eachSpacing;
+  if (offsetLeft > 0) {
+    offsetLeft = 0;
+  }
+  if (offsetLeft < MaxLeft) {
+    offsetLeft = MaxLeft;
+  }
+  this.scrollOption.currentOffset= offsetLeft;
+  this.scrollOption.startTouchX= 0;
+  this.scrollOption.distance=0;
+  calValidDistance(this, offsetLeft, this.opts.chartData, this.config, this.opts);
+  this.opts._scrollDistance_ = offsetLeft;
+  drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+}
+
+uCharts.prototype.stopAnimation = function() {
+  this.animationInstance && this.animationInstance.stop();
+};
+
+uCharts.prototype.addEventListener = function(type, listener) {
+  this.uevent.addEventListener(type, listener);
+};
+
+uCharts.prototype.delEventListener = function(type) {
+  this.uevent.delEventListener(type);
+};
+
+uCharts.prototype.getCurrentDataIndex = function(e) {
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches) {
+    let _touches$ = getTouches(touches, this.opts, e);
+    if (this.opts.type === 'pie' || this.opts.type === 'ring') {
+      return findPieChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.pieData, this.opts);
+    } else if (this.opts.type === 'rose') {
+      return findRoseChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.pieData, this.opts);
+    } else if (this.opts.type === 'radar') {
+      return findRadarChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.radarData, this.opts.categories.length);
+    } else if (this.opts.type === 'funnel') {
+      return findFunnelChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.funnelData);
+    } else if (this.opts.type === 'map') {
+      return findMapChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts);
+    } else if (this.opts.type === 'word') {
+      return findWordChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.wordCloudData);
+    } else if (this.opts.type === 'bar') {
+      return findBarChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset));
+    } else {
+      return findCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset));
+    }
+  }
+  return -1;
+};
+
+uCharts.prototype.getLegendDataIndex = function(e) {
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches) {
+    let _touches$ = getTouches(touches, this.opts, e);
+    return findLegendIndex({
+      x: _touches$.x,
+      y: _touches$.y
+    }, this.opts.chartData.legendData);
+  }
+  return -1;
+};
+
+uCharts.prototype.touchLegend = function(e) {
+  var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches) {
+    var _touches$ = getTouches(touches, this.opts, e);
+    var index = this.getLegendDataIndex(e);
+    if (index >= 0) {
+      if (this.opts.type == 'candle') {
+        this.opts.seriesMA[index].show = !this.opts.seriesMA[index].show;
+      } else {
+        this.opts.series[index].show = !this.opts.series[index].show;
+      }
+      this.opts.animation = option.animation ? true : false;
+      this.opts._scrollDistance_ = this.scrollOption.currentOffset;
+      drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+    }
+  }
+
+};
+
+uCharts.prototype.showToolTip = function(e) {
+  var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (!touches) {
+    console.log("[uCharts] 未获取到event坐标信息");
+  }
+  var _touches$ = getTouches(touches, this.opts, e);
+  var currentOffset = this.scrollOption.currentOffset;
+  var opts = assign({}, this.opts, {
+    _scrollDistance_: currentOffset,
+    animation: false
+  });
+  if (this.opts.type === 'line' || this.opts.type === 'area' || this.opts.type === 'column' || this.opts.type === 'scatter' || this.opts.type === 'bubble') {
+    var current = this.getCurrentDataIndex(e);
+    var index = option.index == undefined ? current.index : option.index;
+    if (index > -1 || index.length>0) {
+      var seriesData = getSeriesDataItem(this.opts.series, index, current.group);
+      if (seriesData.length !== 0) {
+        var _getToolTipData = getToolTipData(seriesData, this.opts, index, current.group, this.opts.categories, option),
+          textList = _getToolTipData.textList,
+          offset = _getToolTipData.offset;
+        offset.y = _touches$.y;
+        opts.tooltip = {
+          textList: option.textList !== undefined ? option.textList : textList,
+          offset: option.offset !== undefined ? option.offset : offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'mount') {
+    var index = option.index == undefined ? this.getCurrentDataIndex(e).index : option.index;
+    if (index > -1) {
+      var opts = assign({}, this.opts, {animation: false});
+      var seriesData = assign({}, opts._series_[index]);
+      var textList = [{
+        text: option.formatter ? option.formatter(seriesData, undefined, index, opts) : seriesData.name + ': ' + seriesData.data,
+        color: seriesData.color
+      }];
+      var offset = {
+        x: opts.chartData.calPoints[index].x,
+        y: _touches$.y
+      };
+      opts.tooltip = {
+        textList: option.textList ? option.textList : textList,
+        offset: option.offset !== undefined ? option.offset : offset,
+        option: option,
+        index: index
+      };
+    }
+    
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'bar') {
+    var current = this.getCurrentDataIndex(e);
+    var index = option.index == undefined ? current.index : option.index;
+    if (index > -1 || index.length>0) {
+      var seriesData = getSeriesDataItem(this.opts.series, index, current.group);
+      if (seriesData.length !== 0) {
+        var _getToolTipData = getToolTipData(seriesData, this.opts, index, current.group, this.opts.categories, option),
+          textList = _getToolTipData.textList,
+          offset = _getToolTipData.offset;
+        offset.x = _touches$.x;
+        opts.tooltip = {
+          textList: option.textList !== undefined ? option.textList : textList,
+          offset: option.offset !== undefined ? option.offset : offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'mix') {
+    var current = this.getCurrentDataIndex(e);
+    var index = option.index == undefined ? current.index : option.index;
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var _getMixToolTipData = getMixToolTipData(seriesData, this.opts, index, this.opts.categories, option),
+          textList = _getMixToolTipData.textList,
+          offset = _getMixToolTipData.offset;
+        offset.y = _touches$.y;
+        opts.tooltip = {
+          textList: option.textList ? option.textList : textList,
+          offset: option.offset !== undefined ? option.offset : offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'candle') {
+    var current = this.getCurrentDataIndex(e);
+    var index = option.index == undefined ? current.index : option.index;
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var _getToolTipData = getCandleToolTipData(this.opts.series[0].data, seriesData, this.opts, index, this.opts.categories, this.opts.extra.candle, option),
+          textList = _getToolTipData.textList,
+          offset = _getToolTipData.offset;
+        offset.y = _touches$.y;
+        opts.tooltip = {
+          textList: option.textList ? option.textList : textList,
+          offset: option.offset !== undefined ? option.offset : offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'pie' || this.opts.type === 'ring' || this.opts.type === 'rose' || this.opts.type === 'funnel') {
+    var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+    if (index > -1) {
+      var opts = assign({}, this.opts, {animation: false});
+      var seriesData = assign({}, opts._series_[index]);
+      var textList = [{
+        text: option.formatter ? option.formatter(seriesData, undefined, index, opts) : seriesData.name + ': ' + seriesData.data,
+        color: seriesData.color
+      }];
+      var offset = {
+        x: _touches$.x,
+        y: _touches$.y
+      };
+      opts.tooltip = {
+        textList: option.textList ? option.textList : textList,
+        offset: option.offset !== undefined ? option.offset : offset,
+        option: option,
+        index: index
+      };
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'map') {
+    var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+    if (index > -1) {
+      var opts = assign({}, this.opts, {animation: false});
+      var seriesData = assign({}, this.opts.series[index]);
+      seriesData.name = seriesData.properties.name
+      var textList = [{
+        text: option.formatter ? option.formatter(seriesData, undefined, index, this.opts) : seriesData.name,
+        color: seriesData.color
+      }];
+      var offset = {
+        x: _touches$.x,
+        y: _touches$.y
+      };
+      opts.tooltip = {
+        textList: option.textList ? option.textList : textList,
+        offset: option.offset !== undefined ? option.offset : offset,
+        option: option,
+        index: index
+      };
+    }
+    opts.updateData = false;
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'word') {
+    var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+    if (index > -1) {
+      var opts = assign({}, this.opts, {animation: false});
+      var seriesData = assign({}, this.opts.series[index]);
+      var textList = [{
+        text: option.formatter ? option.formatter(seriesData, undefined, index, this.opts) : seriesData.name,
+        color: seriesData.color
+      }];
+      var offset = {
+        x: _touches$.x,
+        y: _touches$.y
+      };
+      opts.tooltip = {
+        textList: option.textList ? option.textList : textList,
+        offset: option.offset !== undefined ? option.offset : offset,
+        option: option,
+        index: index
+      };
+    }
+    opts.updateData = false;
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'radar') {
+    var index = option.index == undefined ? this.getCurrentDataIndex(e) : option.index;
+    if (index > -1) {
+      var opts = assign({}, this.opts, {animation: false});
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var textList = seriesData.map((item) => {
+          return {
+            text: option.formatter ? option.formatter(item, this.opts.categories[index], index, this.opts) : item.name + ': ' + item.data,
+            color: item.color
+          };
+        });
+        var offset = {
+          x: _touches$.x,
+          y: _touches$.y
+        };
+        opts.tooltip = {
+          textList: option.textList ? option.textList : textList,
+          offset: option.offset !== undefined ? option.offset : offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+};
+
+uCharts.prototype.translate = function(distance) {
+  this.scrollOption = {
+    currentOffset: distance,
+    startTouchX: distance,
+    distance: 0,
+    lastMoveTime: 0
+  };
+  let opts = assign({}, this.opts, {
+    _scrollDistance_: distance,
+    animation: false
+  });
+  drawCharts.call(this, this.opts.type, opts, this.config, this.context);
+};
+
+uCharts.prototype.scrollStart = function(e) {
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  var _touches$ = getTouches(touches, this.opts, e);
+  if (touches && this.opts.enableScroll === true) {
+    this.scrollOption.startTouchX = _touches$.x;
+  }
+};
+
+uCharts.prototype.scroll = function(e) {
+  if (this.scrollOption.lastMoveTime === 0) {
+    this.scrollOption.lastMoveTime = Date.now();
+  }
+  let Limit = this.opts.touchMoveLimit || 60;
+  let currMoveTime = Date.now();
+  let duration = currMoveTime - this.scrollOption.lastMoveTime;
+  if (duration < Math.floor(1000 / Limit)) return;
+  if (this.scrollOption.startTouchX == 0) return;
+  this.scrollOption.lastMoveTime = currMoveTime;
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches && this.opts.enableScroll === true) {
+    var _touches$ = getTouches(touches, this.opts, e);
+    var _distance;
+    _distance = _touches$.x - this.scrollOption.startTouchX;
+    var currentOffset = this.scrollOption.currentOffset;
+    var validDistance = calValidDistance(this, currentOffset + _distance, this.opts.chartData, this.config, this.opts);
+    this.scrollOption.distance = _distance = validDistance - currentOffset;
+    var opts = assign({}, this.opts, {
+      _scrollDistance_: currentOffset + _distance,
+      animation: false
+    });
+		this.opts = opts;
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+    return currentOffset + _distance;
+  }
+};
+
+uCharts.prototype.scrollEnd = function(e) {
+  if (this.opts.enableScroll === true) {
+    var _scrollOption = this.scrollOption,
+      currentOffset = _scrollOption.currentOffset,
+      distance = _scrollOption.distance;
+    this.scrollOption.currentOffset = currentOffset + distance;
+    this.scrollOption.distance = 0;
+    this.scrollOption.moveCount = 0;
+  }
+};
+
+export default uCharts;
\ No newline at end of file
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.min.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.min.js
new file mode 100644
index 0000000..7a24728
--- /dev/null
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.min.js
@@ -0,0 +1,18 @@
+/*
+ * uCharts (R)
+ * 高性能跨平台图表库，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360/快手）、Vue、Taro等支持canvas的框架平台
+ * Copyright (C) 2021 QIUN (R) 秋云 https://www.ucharts.cn All rights reserved.
+ * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+ * 复制使用请保留本段注释，感谢支持开源！
+ * 
+ * uCharts (R) 官方网站
+ * https://www.uCharts.cn
+ * 
+ * 开源地址:
+ * https://gitee.com/uCharts/uCharts
+ * 
+ * uni-app插件市场地址：
+ * http://ext.dcloud.net.cn/plugin?id=271
+ * 
+ */
+"use strict";var config={version:"v2.4.3-20220505",yAxisWidth:15,xAxisHeight:22,xAxisTextPadding:3,padding:[10,10,10,10],pixelRatio:1,rotate:false,fontSize:13,fontColor:"#666666",dataPointShape:["circle","circle","circle","circle"],color:["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],linearColor:["#0EE2F8","#2BDCA8","#FA7D8D","#EB88E2","#2AE3A0","#0EE2F8","#EB88E2","#6773E3","#F78A85"],pieChartLinePadding:15,pieChartTextPadding:5,titleFontSize:20,subtitleFontSize:15,toolTipPadding:3,toolTipBackground:"#000000",toolTipOpacity:.7,toolTipLineHeight:20,radarLabelTextMargin:13};var assign=function(e,...t){if(e==null){throw new TypeError("[uCharts] Cannot convert undefined or null to object")}if(!t||t.length<=0){return e}function i(e,a){for(let t in a){e[t]=e[t]&&e[t].toString()==="[object Object]"?i(e[t],a[t]):e[t]=a[t]}return e}t.forEach(t=>{e=i(e,t)});return e};var util={toFixed:function t(e,a){a=a||2;if(this.isFloat(e)){e=e.toFixed(a)}return e},isFloat:function t(e){return e%1!==0},approximatelyEqual:function t(e,a){return Math.abs(e-a)<1e-10},isSameSign:function t(e,a){return Math.abs(e)===e&&Math.abs(a)===a||Math.abs(e)!==e&&Math.abs(a)!==a},isSameXCoordinateArea:function t(e,a){return this.isSameSign(e.x,a.x)},isCollision:function t(e,a){e.end={};e.end.x=e.start.x+e.width;e.end.y=e.start.y-e.height;a.end={};a.end.x=a.start.x+a.width;a.end.y=a.start.y-a.height;var i=a.start.x>e.end.x||a.end.x<e.start.x||a.end.y>e.start.y||a.start.y<e.end.y;return!i}};function getH5Offset(t){t.mp={changedTouches:[]};t.mp.changedTouches.push({x:t.offsetX,y:t.offsetY});return t}function hexToRgb(t,e){var a=/^#?([a-f\d])([a-f\d])([a-f\d])$/i;var i=t.replace(a,function(t,e,a,i){return e+e+a+a+i+i});var r=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(i);var o=parseInt(r[1],16);var n=parseInt(r[2],16);var l=parseInt(r[3],16);return"rgba("+o+","+n+","+l+","+e+")"}function findRange(t,e,a){if(isNaN(t)){throw new Error("[uCharts] series数据需为Number格式")}a=a||10;e=e?e:"upper";var i=1;while(a<1){a*=10;i*=10}if(e==="upper"){t=Math.ceil(t*i)}else{t=Math.floor(t*i)}while(t%a!==0){if(e==="upper"){if(t==t+1){break}t++}else{t--}}return t/i}function calCandleMA(o,t,e,n){let a=[];for(let r=0;r<o.length;r++){let i={data:[],name:t[r],color:e[r]};for(let a=0,t=n.length;a<t;a++){if(a<o[r]){i.data.push(null);continue}let e=0;for(let t=0;t<o[r];t++){e+=n[a-t][1]}i.data.push(+(e/o[r]).toFixed(3))}a.push(i)}return a}function calValidDistance(t,e,a,i,r){var o=r.width-r.area[1]-r.area[3];var n=a.eachSpacing*(r.chartData.xAxisData.xAxisPoints.length-1);if(r.type=="mount"&&r.extra&&r.extra.mount&&r.extra.mount.widthRatio&&r.extra.mount.widthRatio>1){if(r.extra.mount.widthRatio>2)r.extra.mount.widthRatio=2;n+=(r.extra.mount.widthRatio-1)*a.eachSpacing}var l=e;if(e>=0){l=0;t.uevent.trigger("scrollLeft");t.scrollOption.position="left";r.xAxis.scrollPosition="left"}else if(Math.abs(e)>=n-o){l=o-n;t.uevent.trigger("scrollRight");t.scrollOption.position="right";r.xAxis.scrollPosition="right"}else{t.scrollOption.position=e;r.xAxis.scrollPosition=e}return l}function isInAngleRange(t,e,a){function i(t){while(t<0){t+=2*Math.PI}while(t>2*Math.PI){t-=2*Math.PI}return t}t=i(t);e=i(e);a=i(a);if(e>a){a+=2*Math.PI;if(t<e){t+=2*Math.PI}}return t>=e&&t<=a}function createCurveControlPoints(t,e){function a(t,e){if(t[e-1]&&t[e+1]){return t[e].y>=Math.max(t[e-1].y,t[e+1].y)||t[e].y<=Math.min(t[e-1].y,t[e+1].y)}else{return false}}function c(t,e){if(t[e-1]&&t[e+1]){return t[e].x>=Math.max(t[e-1].x,t[e+1].x)||t[e].x<=Math.min(t[e-1].x,t[e+1].x)}else{return false}}var i=.2;var r=.2;var o=null;var n=null;var l=null;var s=null;if(e<1){o=t[0].x+(t[1].x-t[0].x)*i;n=t[0].y+(t[1].y-t[0].y)*i}else{o=t[e].x+(t[e+1].x-t[e-1].x)*i;n=t[e].y+(t[e+1].y-t[e-1].y)*i}if(e>t.length-3){var h=t.length-1;l=t[h].x-(t[h].x-t[h-1].x)*r;s=t[h].y-(t[h].y-t[h-1].y)*r}else{l=t[e+1].x-(t[e+2].x-t[e].x)*r;s=t[e+1].y-(t[e+2].y-t[e].y)*r}if(a(t,e+1)){s=t[e+1].y}if(a(t,e)){n=t[e].y}if(c(t,e+1)){l=t[e+1].x}if(c(t,e)){o=t[e].x}if(n>=Math.max(t[e].y,t[e+1].y)||n<=Math.min(t[e].y,t[e+1].y)){n=t[e].y}if(s>=Math.max(t[e].y,t[e+1].y)||s<=Math.min(t[e].y,t[e+1].y)){s=t[e+1].y}if(o>=Math.max(t[e].x,t[e+1].x)||o<=Math.min(t[e].x,t[e+1].x)){o=t[e].x}if(l>=Math.max(t[e].x,t[e+1].x)||l<=Math.min(t[e].x,t[e+1].x)){l=t[e+1].x}return{ctrA:{x:o,y:n},ctrB:{x:l,y:s}}}function convertCoordinateOrigin(t,e,a){return{x:a.x+t,y:a.y-e}}function avoidCollision(t,e){if(e){while(util.isCollision(t,e)){if(t.start.x>0){t.start.y--}else if(t.start.x<0){t.start.y++}else{if(t.start.y>0){t.start.y++}else{t.start.y--}}}}return t}function fixPieSeries(e,a,t){let i=[];if(e.length>0&&e[0].data.constructor.toString().indexOf("Array")>-1){a._pieSeries_=e;let t=e[0].data;for(var r=0;r<t.length;r++){t[r].formatter=e[0].formatter;t[r].data=t[r].value;i.push(t[r])}a.series=i}else{i=e}return i}function fillSeries(e,a,i){var r=0;for(var o=0;o<e.length;o++){let t=e[o];if(!t.color){t.color=i.color[r];r=(r+1)%i.color.length}if(!t.linearIndex){t.linearIndex=o}if(!t.index){t.index=0}if(!t.type){t.type=a.type}if(typeof t.show=="undefined"){t.show=true}if(!t.type){t.type=a.type}if(!t.pointShape){t.pointShape="circle"}if(!t.legendShape){switch(t.type){case"line":t.legendShape="line";break;case"column":case"bar":t.legendShape="rect";break;case"area":case"mount":t.legendShape="triangle";break;default:t.legendShape="circle"}}}return e}function fillCustomColor(t,e,a,i){var r=e||[];if(t=="custom"&&r.length==0){r=i.linearColor}if(t=="custom"&&r.length<a.length){let t=a.length-r.length;for(var o=0;o<t;o++){r.push(i.linearColor[(o+1)%i.linearColor.length])}}return r}function getDataRange(t,e){var a=0;var i=e-t;if(i>=1e4){a=1e3}else if(i>=1e3){a=100}else if(i>=100){a=10}else if(i>=10){a=5}else if(i>=1){a=1}else if(i>=.1){a=.1}else if(i>=.01){a=.01}else if(i>=.001){a=.001}else if(i>=1e-4){a=1e-4}else if(i>=1e-5){a=1e-5}else{a=1e-6}return{minRange:findRange(t,"lower",a),maxRange:findRange(e,"upper",a)}}function measureText(a,t,e){var i=0;a=String(a);e=false;if(e!==false&&e!==undefined&&e.setFontSize&&e.measureText){e.setFontSize(t);return e.measureText(a).width}else{var a=a.split("");for(let e=0;e<a.length;e++){let t=a[e];if(/[a-zA-Z]/.test(t)){i+=7}else if(/[0-9]/.test(t)){i+=5.5}else if(/\./.test(t)){i+=2.7}else if(/-/.test(t)){i+=3.25}else if(/:/.test(t)){i+=2.5}else if(/[\u4e00-\u9fa5]/.test(t)){i+=10}else if(/\(|\)/.test(t)){i+=3.73}else if(/\s/.test(t)){i+=2.5}else if(/%/.test(t)){i+=8}else{i+=10}}return i*t/10}}function dataCombine(t){return t.reduce(function(t,e){return(t.data?t.data:t).concat(e.data)},[])}function dataCombineStack(t,e){var a=new Array(e);for(var i=0;i<a.length;i++){a[i]=0}for(var r=0;r<t.length;r++){for(var i=0;i<a.length;i++){a[i]+=t[r].data[i]}}return t.reduce(function(t,e){return(t.data?t.data:t).concat(e.data).concat(a)},[])}function getTouches(t,e,a){let i,r;if(t.clientX){if(e.rotate){r=e.height-t.clientX*e.pix;i=(t.pageY-a.currentTarget.offsetTop-e.height/e.pix/2*(e.pix-1))*e.pix}else{i=t.clientX*e.pix;r=(t.pageY-a.currentTarget.offsetTop-e.height/e.pix/2*(e.pix-1))*e.pix}}else{if(e.rotate){r=e.height-t.x*e.pix;i=t.y*e.pix}else{i=t.x*e.pix;r=t.y*e.pix}}return{x:i,y:r}}function getSeriesDataItem(e,i,a){var r=[];var o=[];var n=i.constructor.toString().indexOf("Array")>-1;if(n){let t=filterSeries(e);for(var l=0;l<a.length;l++){o.push(t[a[l]])}}else{o=e}for(let t=0;t<o.length;t++){let e=o[t];let a=-1;if(n){a=i[t]}else{a=i}if(e.data[a]!==null&&typeof e.data[a]!=="undefined"&&e.show){let t={};t.color=e.color;t.type=e.type;t.style=e.style;t.pointShape=e.pointShape;t.disableLegend=e.disableLegend;t.name=e.name;t.show=e.show;t.data=e.formatter?e.formatter(e.data[a]):e.data[a];r.push(t)}}return r}function getMaxTextListLength(t,e,a){var i=t.map(function(t){return measureText(t,e,a)});return Math.max.apply(null,i)}function getRadarCoordinateSeries(t){var e=2*Math.PI/t;var a=[];for(var i=0;i<t;i++){a.push(e*i)}return a.map(function(t){return-1*t+Math.PI/2})}function getToolTipData(t,a,i,r,o){var n=arguments.length>5&&arguments[5]!==undefined?arguments[5]:{};var l=a.chartData.calPoints?a.chartData.calPoints:[];let s={};if(r.length>0){let e=[];for(let t=0;t<r.length;t++){e.push(l[r[t]])}s=e[0][i[0]]}else{for(let t=0;t<l.length;t++){if(l[t][i]){s=l[t][i];break}}}var e=t.map(function(t){let e=null;if(a.categories&&a.categories.length>0){e=o[i]}return{text:n.formatter?n.formatter(t,e,i,a):t.name+": "+t.data,color:t.color}});var h={x:Math.round(s.x),y:Math.round(s.y)};return{textList:e,offset:h}}function getMixToolTipData(t,e,a,i){var r=arguments.length>4&&arguments[4]!==undefined?arguments[4]:{};var o=e.chartData.xAxisPoints[a]+e.chartData.eachSpacing/2;var n=t.map(function(t){return{text:r.formatter?r.formatter(t,i[a],a,e):t.name+": "+t.data,color:t.color,disableLegend:t.disableLegend?true:false}});n=n.filter(function(t){if(t.disableLegend!==true){return t}});var l={x:Math.round(o),y:0};return{textList:n,offset:l}}function getCandleToolTipData(o,e,r,n,d,t){var x=arguments.length>6&&arguments[6]!==undefined?arguments[6]:{};var a=r.chartData.calPoints;let l=t.color.upFill;let s=t.color.downFill;let h=[l,l,s,l];var c=[];e.map(function(t){if(n==0){if(t.data[1]-t.data[0]<0){h[1]=s}else{h[1]=l}}else{if(t.data[0]<o[n-1][1]){h[0]=s}if(t.data[1]<t.data[0]){h[1]=s}if(t.data[2]>o[n-1][1]){h[2]=l}if(t.data[3]<o[n-1][1]){h[3]=s}}let e={text:"开盘："+t.data[0],color:h[0]};let a={text:"收盘："+t.data[1],color:h[1]};let i={text:"最低："+t.data[2],color:h[2]};let r={text:"最高："+t.data[3],color:h[3]};c.push(e,a,i,r)});var i=[];var f={x:0,y:0};for(let e=0;e<a.length;e++){let t=a[e];if(typeof t[n]!=="undefined"&&t[n]!==null){i.push(t[n])}}f.x=Math.round(i[0][0].x);return{textList:c,offset:f}}function filterSeries(e){let a=[];for(let t=0;t<e.length;t++){if(e[t].show==true){a.push(e[t])}}return a}function findCurrentIndex(o,n,e,t){var a=arguments.length>4&&arguments[4]!==undefined?arguments[4]:0;var l={index:-1,group:[]};var i=e.chartData.eachSpacing/2;let r=[];if(n&&n.length>0){if(!e.categories){i=0}else{for(let t=1;t<e.chartData.xAxisPoints.length;t++){r.push(e.chartData.xAxisPoints[t]-i)}if((e.type=="line"||e.type=="area")&&e.xAxis.boundaryGap=="justify"){r=e.chartData.xAxisPoints}}if(isInExactChartArea(o,e,t)){if(!e.categories){let a=Array(n.length);for(let e=0;e<n.length;e++){a[e]=Array(n[e].length);for(let t=0;t<n[e].length;t++){a[e][t]=Math.abs(n[e][t].x-o.x)}}let e=Array(a.length);let i=Array(a.length);for(let t=0;t<a.length;t++){e[t]=Math.min.apply(null,a[t]);i[t]=a[t].indexOf(e[t])}let r=Math.min.apply(null,e);l.index=[];for(let t=0;t<e.length;t++){if(e[t]==r){l.group.push(t);l.index.push(i[t])}}}else{r.forEach(function(t,e){if(o.x+a+i>t){l.index=e}})}}}return l}function findBarChartCurrentIndex(a,t,e,i){var r=arguments.length>4&&arguments[4]!==undefined?arguments[4]:0;var o={index:-1,group:[]};var n=e.chartData.eachSpacing/2;let l=e.chartData.yAxisPoints;if(t&&t.length>0){if(isInExactChartArea(a,e,i)){l.forEach(function(t,e){if(a.y+r+n>t){o.index=e}})}}return o}function findLegendIndex(o,t,e){let n=-1;let l=0;if(isInExactLegendArea(o,t.area)){let i=t.points;let r=-1;for(let t=0,e=i.length;t<e;t++){let a=i[t];for(let e=0;e<a.length;e++){r+=1;let t=a[e]["area"];if(t&&o.x>t[0]-l&&o.x<t[2]+l&&o.y>t[1]-l&&o.y<t[3]+l){n=r;break}}}return n}return n}function isInExactLegendArea(t,e){return t.x>e.start.x&&t.x<e.end.x&&t.y>e.start.y&&t.y<e.end.y}function isInExactChartArea(t,e,a){return t.x<=e.width-e.area[1]+10&&t.x>=e.area[3]-10&&t.y>=e.area[0]&&t.y<=e.height-e.area[2]}function findRadarChartCurrentIndex(t,e,a){var r=2*Math.PI/a;var o=-1;if(isInExactPieChartArea(t,e.center,e.radius)){var n=function t(e){if(e<0){e+=2*Math.PI}if(e>2*Math.PI){e-=2*Math.PI}return e};var l=Math.atan2(e.center.y-t.y,t.x-e.center.x);l=-1*l;if(l<0){l+=2*Math.PI}var i=e.angleList.map(function(t){t=n(-1*t);return t});i.forEach(function(t,e){var a=n(t-r/2);var i=n(t+r/2);if(i<a){i+=2*Math.PI}if(l>=a&&l<=i||l+2*Math.PI>=a&&l+2*Math.PI<=i){o=e}})}return o}function findFunnelChartCurrentIndex(t,e){var a=-1;for(var i=0,r=e.series.length;i<r;i++){var o=e.series[i];if(t.x>o.funnelArea[0]&&t.x<o.funnelArea[2]&&t.y>o.funnelArea[1]&&t.y<o.funnelArea[3]){a=i;break}}return a}function findWordChartCurrentIndex(t,e){var a=-1;for(var i=0,r=e.length;i<r;i++){var o=e[i];if(t.x>o.area[0]&&t.x<o.area[2]&&t.y>o.area[1]&&t.y<o.area[3]){a=i;break}}return a}function findMapChartCurrentIndex(t,e){var a=-1;var i=e.chartData.mapData;var r=e.series;var o=pointToCoordinate(t.y,t.x,i.bounds,i.scale,i.xoffset,i.yoffset);var n=[o.x,o.y];for(var l=0,s=r.length;l<s;l++){var h=r[l].geometry.coordinates;if(isPoiWithinPoly(n,h,e.chartData.mapData.mercator)){a=l;break}}return a}function findRoseChartCurrentIndex(t,e,a){var i=-1;var r=getRoseDataPoints(a._series_,a.extra.rose.type,e.radius,e.radius);if(e&&e.center&&isInExactPieChartArea(t,e.center,e.radius)){var o=Math.atan2(e.center.y-t.y,t.x-e.center.x);o=-o;if(a.extra.rose&&a.extra.rose.offsetAngle){o=o-a.extra.rose.offsetAngle*Math.PI/180}for(var n=0,l=r.length;n<l;n++){if(isInAngleRange(o,r[n]._start_,r[n]._start_+r[n]._rose_proportion_*2*Math.PI)){i=n;break}}}return i}function findPieChartCurrentIndex(t,e,a){var i=-1;var r=getPieDataPoints(e.series);if(e&&e.center&&isInExactPieChartArea(t,e.center,e.radius)){var o=Math.atan2(e.center.y-t.y,t.x-e.center.x);o=-o;if(a.extra.pie&&a.extra.pie.offsetAngle){o=o-a.extra.pie.offsetAngle*Math.PI/180}if(a.extra.ring&&a.extra.ring.offsetAngle){o=o-a.extra.ring.offsetAngle*Math.PI/180}for(var n=0,l=r.length;n<l;n++){if(isInAngleRange(o,r[n]._start_,r[n]._start_+r[n]._proportion_*2*Math.PI)){i=n;break}}}return i}function isInExactPieChartArea(t,e,a){return Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2)<=Math.pow(a,2)}function splitPoints(t,a){var i=[];var r=[];t.forEach(function(t,e){if(a.connectNulls){if(t!==null){r.push(t)}}else{if(t!==null){r.push(t)}else{if(r.length){i.push(r)}r=[]}}});if(r.length){i.push(r)}return i}function calLegendData(l,s,e,t,h){let c={area:{start:{x:0,y:0},end:{x:0,y:0},width:0,height:0,wholeWidth:0,wholeHeight:0},points:[],widthArr:[],heightArr:[]};if(s.legend.show===false){t.legendData=c;return c}let d=s.legend.padding*s.pix;let x=s.legend.margin*s.pix;let f=s.legend.fontSize?s.legend.fontSize*s.pix:e.fontSize;let p=15*s.pix;let u=5*s.pix;let g=Math.max(s.legend.lineHeight*s.pix,f);if(s.legend.position=="top"||s.legend.position=="bottom"){let i=[];let r=0;let o=[];let n=[];for(let a=0;a<l.length;a++){let t=l[a];const y=t.legendText?t.legendText:t.name;let e=p+u+measureText(y||"undefined",f,h)+s.legend.itemGap*s.pix;if(r+e>s.width-s.area[1]-s.area[3]){i.push(n);o.push(r-s.legend.itemGap*s.pix);r=e;n=[t]}else{r+=e;n.push(t)}}if(n.length){i.push(n);o.push(r-s.legend.itemGap*s.pix);c.widthArr=o;let t=Math.max.apply(null,o);switch(s.legend.float){case"left":c.area.start.x=s.area[3];c.area.end.x=s.area[3]+t+2*d;break;case"right":c.area.start.x=s.width-s.area[1]-t-2*d;c.area.end.x=s.width-s.area[1];break;default:c.area.start.x=(s.width-t)/2-d;c.area.end.x=(s.width+t)/2+d}c.area.width=t+2*d;c.area.wholeWidth=t+2*d;c.area.height=i.length*g+2*d;c.area.wholeHeight=i.length*g+2*d+2*x;c.points=i}}else{let t=l.length;let e=s.height-s.area[0]-s.area[2]-2*x-2*d;let a=Math.min(Math.floor(e/g),t);c.area.height=a*g+d*2;c.area.wholeHeight=a*g+d*2;switch(s.legend.float){case"top":c.area.start.y=s.area[0]+x;c.area.end.y=s.area[0]+x+c.area.height;break;case"bottom":c.area.start.y=s.height-s.area[2]-x-c.area.height;c.area.end.y=s.height-s.area[2]-x;break;default:c.area.start.y=(s.height-c.area.height)/2;c.area.end.y=(s.height+c.area.height)/2}let i=t%a===0?t/a:Math.floor(t/a+1);let r=[];for(let e=0;e<i;e++){let t=l.slice(e*a,e*a+a);r.push(t)}c.points=r;if(r.length){for(let t=0;t<r.length;t++){let a=r[t];let i=0;for(let e=0;e<a.length;e++){let t=p+u+measureText(a[e].name||"undefined",f,h)+s.legend.itemGap*s.pix;if(t>i){i=t}}c.widthArr.push(i);c.heightArr.push(a.length*g+d*2)}let e=0;for(let t=0;t<c.widthArr.length;t++){e+=c.widthArr[t]}c.area.width=e-s.legend.itemGap*s.pix+2*d;c.area.wholeWidth=c.area.width+d}}switch(s.legend.position){case"top":c.area.start.y=s.area[0]+x;c.area.end.y=s.area[0]+x+c.area.height;break;case"bottom":c.area.start.y=s.height-s.area[2]-c.area.height-x;c.area.end.y=s.height-s.area[2]-x;break;case"left":c.area.start.x=s.area[3];c.area.end.x=s.area[3]+c.area.width;break;case"right":c.area.start.x=s.width-s.area[1]-c.area.width;c.area.end.x=s.width-s.area[1];break}t.legendData=c;return c}function calCategoriesData(t,i,e,a,r){var o={angle:0,xAxisHeight:e.xAxisHeight};var n=i.xAxis.fontSize*i.pix||e.fontSize;var l=t.map(function(t,e){var a=i.xAxis.formatter?i.xAxis.formatter(t,e,i):t;return measureText(String(a),n,r)});var s=Math.max.apply(this,l);if(i.xAxis.rotateLabel==true){o.angle=i.xAxis.rotateAngle*Math.PI/180;let t=2*e.xAxisTextPadding+Math.abs(s*Math.sin(o.angle));t=t<n+2*e.xAxisTextPadding?t+2*e.xAxisTextPadding:t;if(i.enableScroll==true&&i.xAxis.scrollShow==true){t+=12*i.pix}o.xAxisHeight=t}if(i.xAxis.disabled){o.xAxisHeight=0}return o}function getXAxisTextList(t,e,h,c){var a=arguments.length>4&&arguments[4]!==undefined?arguments[4]:-1;var i;if(c=="stack"){i=dataCombineStack(t,e.categories.length)}else{i=dataCombine(t)}var r=[];i=i.filter(function(t){if(typeof t==="object"&&t!==null){if(t.constructor.toString().indexOf("Array")>-1){return t!==null}else{return t.value!==null}}else{return t!==null}});i.map(function(t){if(typeof t==="object"){if(t.constructor.toString().indexOf("Array")>-1){if(e.type=="candle"){t.map(function(t){r.push(t)})}else{r.push(t[0])}}else{r.push(t.value)}}else{r.push(t)}});var o=0;var n=0;if(r.length>0){o=Math.min.apply(this,r);n=Math.max.apply(this,r)}if(a>-1){if(typeof e.xAxis.data[a].min==="number"){o=Math.min(e.xAxis.data[a].min,o)}if(typeof e.xAxis.data[a].max==="number"){n=Math.max(e.xAxis.data[a].max,n)}}else{if(typeof e.xAxis.min==="number"){o=Math.min(e.xAxis.min,o)}if(typeof e.xAxis.max==="number"){n=Math.max(e.xAxis.max,n)}}if(o===n){var d=n||10;n+=d}var l=o;var x=n;var f=[];var p=(x-l)/e.xAxis.splitNumber;for(var s=0;s<=e.xAxis.splitNumber;s++){f.push(l+p*s)}return f}function calXAxisData(t,e,a,i){var r=assign({},{type:""},e.extra.bar);var o={angle:0,xAxisHeight:a.xAxisHeight};o.ranges=getXAxisTextList(t,e,a,r.type);o.rangesFormat=o.ranges.map(function(t){t=util.toFixed(t,2);return t});var n=o.ranges.map(function(t){t=util.toFixed(t,2);return t});o=Object.assign(o,getXAxisPoints(n,e,a));var l=o.eachSpacing;var s=n.map(function(t){return measureText(t,e.xAxis.fontSize*e.pix||a.fontSize,i)});var h=Math.max.apply(this,s);if(h+2*a.xAxisTextPadding>l){o.angle=45*Math.PI/180;o.xAxisHeight=2*a.xAxisTextPadding+h*Math.sin(o.angle)}if(e.xAxis.disabled===true){o.xAxisHeight=0}return o}function getRadarDataPoints(r,o,n,a,t){var l=arguments.length>5&&arguments[5]!==undefined?arguments[5]:1;var e=t.extra.radar||{};e.max=e.max||0;var s=Math.max(e.max,Math.max.apply(null,dataCombine(a)));var h=[];for(let e=0;e<a.length;e++){let t=a[e];let i={};i.color=t.color;i.legendShape=t.legendShape;i.pointShape=t.pointShape;i.data=[];t.data.forEach(function(t,e){let a={};a.angle=r[e];a.proportion=t/s;a.value=t;a.position=convertCoordinateOrigin(n*a.proportion*l*Math.cos(a.angle),n*a.proportion*l*Math.sin(a.angle),o);i.data.push(a)});h.push(i)}return h}function getPieDataPoints(a,i){var r=arguments.length>2&&arguments[2]!==undefined?arguments[2]:1;var o=0;var n=0;for(let e=0;e<a.length;e++){let t=a[e];t.data=t.data===null?0:t.data;o+=t.data}for(let e=0;e<a.length;e++){let t=a[e];t.data=t.data===null?0:t.data;if(o===0){t._proportion_=1/a.length*r}else{t._proportion_=t.data/o*r}t._radius_=i}for(let e=0;e<a.length;e++){let t=a[e];t._start_=n;n+=2*t._proportion_*Math.PI}return a}function getFunnelDataPoints(e,a,i,r){var o=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;e=e.sort(function(t,e){return parseInt(e.data)-parseInt(t.data)});for(let t=0;t<e.length;t++){if(i=="funnel"){e[t].radius=e[t].data/e[0].data*a*o}else{e[t].radius=r*(e.length-t)/(r*e.length)*a*o}e[t]._proportion_=e[t].data/e[0].data}if(i!=="pyramid"){e.reverse()}return e}function getRoseDataPoints(a,i,r,o){var n=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var l=0;var s=0;var h=[];for(let e=0;e<a.length;e++){let t=a[e];t.data=t.data===null?0:t.data;l+=t.data;h.push(t.data)}var c=Math.min.apply(null,h);var d=Math.max.apply(null,h);var x=o-r;for(let e=0;e<a.length;e++){let t=a[e];t.data=t.data===null?0:t.data;if(l===0){t._proportion_=1/a.length*n;t._rose_proportion_=1/a.length*n}else{t._proportion_=t.data/l*n;if(i=="area"){t._rose_proportion_=1/a.length*n}else{t._rose_proportion_=t.data/l*n}}t._radius_=r+x*((t.data-c)/(d-c))||o}for(let e=0;e<a.length;e++){let t=a[e];t._start_=s;s+=2*t._rose_proportion_*Math.PI}return a}function getArcbarDataPoints(i,r){var o=arguments.length>2&&arguments[2]!==undefined?arguments[2]:1;if(o==1){o=.999999}for(let a=0;a<i.length;a++){let t=i[a];t.data=t.data===null?0:t.data;let e;if(r.type=="circle"){e=2}else{if(r.endAngle<r.startAngle){e=2+r.endAngle-r.startAngle}else{e=r.startAngle-r.endAngle}}t._proportion_=e*t.data*o+r.startAngle;if(t._proportion_>=2){t._proportion_=t._proportion_%2}}return i}function getGaugeArcbarDataPoints(i,r){var o=arguments.length>2&&arguments[2]!==undefined?arguments[2]:1;if(o==1){o=.999999}for(let a=0;a<i.length;a++){let t=i[a];t.data=t.data===null?0:t.data;let e;if(r.type=="circle"){e=2}else{if(r.endAngle<r.startAngle){e=2+r.endAngle-r.startAngle}else{e=r.startAngle-r.endAngle}}t._proportion_=e*t.data*o+r.startAngle;if(t._proportion_>=2){t._proportion_=t._proportion_%2}}return i}function getGaugeAxisPoints(e,a,t){let i=a-t+1;let r=a;for(let t=0;t<e.length;t++){e[t].value=e[t].value===null?0:e[t].value;e[t]._startAngle_=r;e[t]._endAngle_=i*e[t].value+a;if(e[t]._endAngle_>=2){e[t]._endAngle_=e[t]._endAngle_%2}r=e[t]._endAngle_}return e}function getGaugeDataPoints(i,r,o){let n=arguments.length>3&&arguments[3]!==undefined?arguments[3]:1;for(let a=0;a<i.length;a++){let e=i[a];e.data=e.data===null?0:e.data;if(o.pointer.color=="auto"){for(let t=0;t<r.length;t++){if(e.data<=r[t].value){e.color=r[t].color;break}}}else{e.color=o.pointer.color}let t=o.startAngle-o.endAngle+1;e._endAngle_=t*e.data+o.startAngle;e._oldAngle_=o.oldAngle;if(o.oldAngle<o.endAngle){e._oldAngle_+=2}if(e.data>=o.oldData){e._proportion_=(e._endAngle_-e._oldAngle_)*n+o.oldAngle}else{e._proportion_=e._oldAngle_-(e._oldAngle_-e._endAngle_)*n}if(e._proportion_>=2){e._proportion_=e._proportion_%2}}return i}function getPieTextMaxLength(i,r,o,n){i=getPieDataPoints(i);let l=0;for(let a=0;a<i.length;a++){let t=i[a];let e=t.formatter?t.formatter(+t._proportion_.toFixed(2)):util.toFixed(t._proportion_*100)+"%";l=Math.max(l,measureText(e,t.textSize*n.pix||r.fontSize,o))}return l}function fixColumeData(t,i,r,o,e,n){return t.map(function(t){if(t===null){return null}var e=0;var a=0;if(n.type=="mix"){e=n.extra.mix.column.seriesGap*n.pix||0;a=n.extra.mix.column.categoryGap*n.pix||0}else{e=n.extra.column.seriesGap*n.pix||0;a=n.extra.column.categoryGap*n.pix||0}e=Math.min(e,i/r);a=Math.min(a,i/r);t.width=Math.ceil((i-2*a-e*(r-1))/r);if(n.extra.mix&&n.extra.mix.column.width&&+n.extra.mix.column.width>0){t.width=Math.min(t.width,+n.extra.mix.column.width*n.pix)}if(n.extra.column&&n.extra.column.width&&+n.extra.column.width>0){t.width=Math.min(t.width,+n.extra.column.width*n.pix)}if(t.width<=0){t.width=1}t.x+=(o+.5-r/2)*(t.width+e);return t})}function fixBarData(t,i,r,o,e,n){return t.map(function(t){if(t===null){return null}var e=0;var a=0;e=n.extra.bar.seriesGap*n.pix||0;a=n.extra.bar.categoryGap*n.pix||0;e=Math.min(e,i/r);a=Math.min(a,i/r);t.width=Math.ceil((i-2*a-e*(r-1))/r);if(n.extra.bar&&n.extra.bar.width&&+n.extra.bar.width>0){t.width=Math.min(t.width,+n.extra.bar.width*n.pix)}if(t.width<=0){t.width=1}t.y+=(o+.5-r/2)*(t.width+e);return t})}function fixColumeMeterData(t,e,a,i,r,o,n){var l=o.extra.column.categoryGap*o.pix||0;return t.map(function(t){if(t===null){return null}t.width=e-2*l;if(o.extra.column&&o.extra.column.width&&+o.extra.column.width>0){t.width=Math.min(t.width,+o.extra.column.width*o.pix)}if(i>0){t.width-=n}return t})}function fixColumeStackData(t,a,e,i,r,o,n){var l=o.extra.column.categoryGap*o.pix||0;return t.map(function(t,e){if(t===null){return null}t.width=Math.ceil(a-2*l);if(o.extra.column&&o.extra.column.width&&+o.extra.column.width>0){t.width=Math.min(t.width,+o.extra.column.width*o.pix)}if(t.width<=0){t.width=1}return t})}function fixBarStackData(t,a,e,i,r,o,n){var l=o.extra.bar.categoryGap*o.pix||0;return t.map(function(t,e){if(t===null){return null}t.width=Math.ceil(a-2*l);if(o.extra.bar&&o.extra.bar.width&&+o.extra.bar.width>0){t.width=Math.min(t.width,+o.extra.bar.width*o.pix)}if(t.width<=0){t.width=1}return t})}function getXAxisPoints(t,e,h){var a=e.width-e.area[1]-e.area[3];var i=e.enableScroll?Math.min(e.xAxis.itemCount,t.length):t.length;if((e.type=="line"||e.type=="area"||e.type=="scatter"||e.type=="bubble"||e.type=="bar")&&i>1&&e.xAxis.boundaryGap=="justify"){i-=1}var r=0;if(e.type=="mount"&&e.extra&&e.extra.mount&&e.extra.mount.widthRatio&&e.extra.mount.widthRatio>1){if(e.extra.mount.widthRatio>2)e.extra.mount.widthRatio=2;r=e.extra.mount.widthRatio-1;i+=r}var o=a/i;var n=[];var l=e.area[3];var s=e.width-e.area[1];t.forEach(function(t,e){n.push(l+r/2*o+e*o)});if(e.xAxis.boundaryGap!=="justify"){if(e.enableScroll===true){n.push(l+r*o+t.length*o)}else{n.push(s)}}return{xAxisPoints:n,startX:l,endX:s,eachSpacing:o}}function getCandleDataPoints(t,l,s,h,c,d,a){var x=arguments.length>7&&arguments[7]!==undefined?arguments[7]:1;var e=[];var f=d.height-d.area[0]-d.area[2];t.forEach(function(t,o){if(t===null){e.push(null)}else{var n=[];t.forEach(function(t,e){var a={};a.x=h[o]+Math.round(c/2);var i=t.value||t;var r=f*(i-l)/(s-l);r*=x;a.y=d.height-Math.round(r)-d.area[2];n.push(a)});e.push(n)}});return e}function getDataPoints(t,a,n,l,s,h,e){var c=arguments.length>7&&arguments[7]!==undefined?arguments[7]:1;var d="center";if(h.type=="line"||h.type=="area"||h.type=="scatter"||h.type=="bubble"){d=h.xAxis.boundaryGap}var x=[];var f=h.height-h.area[0]-h.area[2];var p=h.width-h.area[1]-h.area[3];t.forEach(function(i,t){if(i===null){x.push(null)}else{var r={};r.color=i.color;r.x=l[t];var o=i;if(typeof i==="object"&&i!==null){if(i.constructor.toString().indexOf("Array")>-1){let t,e,a;t=[].concat(h.chartData.xAxisData.ranges);e=t.shift();a=t.pop();o=i[1];r.x=h.area[3]+p*(i[0]-e)/(a-e);if(h.type=="bubble"){r.r=i[2];r.t=i[3]}}else{o=i.value}}if(d=="center"){r.x+=s/2}var e=f*(o-a)/(n-a);e*=c;r.y=h.height-e-h.area[2];x.push(r)}});return x}function getMountDataPoints(t,o,n,l,s,h,e){var c=arguments.length>7&&arguments[7]!==undefined?arguments[7]:1;var d=[];var x=h.height-h.area[0]-h.area[2];var a=h.width-h.area[1]-h.area[3];var f=s*e.widthRatio;t.forEach(function(t,e){if(t===null){d.push(null)}else{var a={};a.color=t.color;a.x=l[e];a.x+=s/2;var i=t.data;var r=x*(i-o)/(n-o);r*=c;a.y=h.height-r-h.area[2];a.value=i;a.width=f;d.push(a)}});return d}function getBarDataPoints(t,o,n,l,e,s,a){var h=arguments.length>7&&arguments[7]!==undefined?arguments[7]:1;var c=[];var i=s.height-s.area[0]-s.area[2];var d=s.width-s.area[1]-s.area[3];t.forEach(function(t,e){if(t===null){c.push(null)}else{var a={};a.color=t.color;a.y=l[e];var i=t;if(typeof t==="object"&&t!==null){i=t.value}var r=d*(i-o)/(n-o);r*=h;a.height=r;a.value=i;a.x=r+s.area[3];c.push(a)}});return c}function getStackDataPoints(t,s,h,c,u,d,e,x,y){var f=arguments.length>9&&arguments[9]!==undefined?arguments[9]:1;var p=[];var g=d.height-d.area[0]-d.area[2];t.forEach(function(t,e){if(t===null){p.push(null)}else{var a={};a.color=t.color;a.x=c[e]+Math.round(u/2);if(x>0){var i=0;for(let t=0;t<=x;t++){i+=y[t].data[e]}var r=i-t;var o=g*(i-s)/(h-s);var n=g*(r-s)/(h-s)}else{var i=t;var o=g*(i-s)/(h-s);var n=0}var l=n;o*=f;l*=f;a.y=d.height-Math.round(o)-d.area[2];a.y0=d.height-Math.round(l)-d.area[2];p.push(a)}});return p}function getBarStackDataPoints(t,s,h,c,e,d,a,x,u){var f=arguments.length>9&&arguments[9]!==undefined?arguments[9]:1;var p=[];var g=d.width-d.area[1]-d.area[3];t.forEach(function(t,e){if(t===null){p.push(null)}else{var a={};a.color=t.color;a.y=c[e];if(x>0){var i=0;for(let t=0;t<=x;t++){i+=u[t].data[e]}var r=i-t;var o=g*(i-s)/(h-s);var n=g*(r-s)/(h-s)}else{var i=t;var o=g*(i-s)/(h-s);var n=0}var l=n;o*=f;l*=f;a.height=o-l;a.x=d.area[3]+o;a.x0=d.area[3]+l;p.push(a)}});return p}function getYAxisTextList(t,e,h,c,a){var d=arguments.length>5&&arguments[5]!==undefined?arguments[5]:-1;var i;if(c=="stack"){i=dataCombineStack(t,e.categories.length)}else{i=dataCombine(t)}var r=[];i=i.filter(function(t){if(typeof t==="object"&&t!==null){if(t.constructor.toString().indexOf("Array")>-1){return t!==null}else{return t.value!==null}}else{return t!==null}});i.map(function(t){if(typeof t==="object"){if(t.constructor.toString().indexOf("Array")>-1){if(e.type=="candle"){t.map(function(t){r.push(t)})}else{r.push(t[1])}}else{r.push(t.value)}}else{r.push(t)}});var o=a.min||0;var n=a.max||0;if(r.length>0){o=Math.min.apply(this,r);n=Math.max.apply(this,r)}if(o===n){if(n==0){n=10}else{o=0}}var l=getDataRange(o,n);var x=a.min===undefined||a.min===null?l.minRange:a.min;var f=a.max===undefined||a.max===null?l.maxRange:a.max;var p=[];var g=(f-x)/e.yAxis.splitNumber;for(var s=0;s<=e.yAxis.splitNumber;s++){p.push(x+g*s)}return p.reverse()}function calYAxisData(a,o,e,n){var l=assign({},{type:""},o.extra.column);var t=o.yAxis.data.length;var s=new Array(t);if(t>0){for(let e=0;e<t;e++){s[e]=[];for(let t=0;t<a.length;t++){if(a[t].index==e){s[e].push(a[t])}}}var h=new Array(t);var c=new Array(t);var d=new Array(t);for(let r=0;r<t;r++){let i=o.yAxis.data[r];if(o.yAxis.disabled==true){i.disabled=true}if(i.type==="categories"){if(!i.formatter){i.formatter=(t,e,a)=>{return t+(i.unit||"")}}i.categories=i.categories||o.categories;h[r]=i.categories}else{if(!i.formatter){i.formatter=(t,e,a)=>{return t.toFixed(i.tofix)+(i.unit||"")}}h[r]=getYAxisTextList(s[r],o,e,l.type,i,r)}let a=i.fontSize*o.pix||e.fontSize;d[r]={position:i.position?i.position:"left",width:0};c[r]=h[r].map(function(t,e){t=i.formatter(t,e,o);d[r].width=Math.max(d[r].width,measureText(t,a,n)+5);return t});let t=i.calibration?4*o.pix:0;d[r].width+=t+3*o.pix;if(i.disabled===true){d[r].width=0}}}else{var h=new Array(1);var c=new Array(1);var d=new Array(1);if(o.type==="bar"){h[0]=o.categories;if(!o.yAxis.formatter){o.yAxis.formatter=(t,e,a)=>{return t+(a.yAxis.unit||"")}}}else{if(!o.yAxis.formatter){o.yAxis.formatter=(t,e,a)=>{return t.toFixed(a.yAxis.tofix)+(a.yAxis.unit||"")}}h[0]=getYAxisTextList(a,o,e,l.type,{})}d[0]={position:"left",width:0};var i=o.yAxis.fontSize*o.pix||e.fontSize;c[0]=h[0].map(function(t,e){t=o.yAxis.formatter(t,e,o);d[0].width=Math.max(d[0].width,measureText(t,i,n)+5);return t});d[0].width+=3*o.pix;if(o.yAxis.disabled===true){d[0]={position:"left",width:0};o.yAxis.data[0]={disabled:true}}else{o.yAxis.data[0]={disabled:false,position:"left",max:o.yAxis.max,min:o.yAxis.min,formatter:o.yAxis.formatter};if(o.type==="bar"){o.yAxis.data[0].categories=o.categories;o.yAxis.data[0].type="categories"}}}return{rangesFormat:c,ranges:h,yAxisWidth:d}}function calTooltipYAxisData(r,t,o,e,a){let n=[].concat(o.chartData.yAxisData.ranges);let l=o.height-o.area[0]-o.area[2];let s=o.area[0];let h=[];for(let i=0;i<n.length;i++){let t=n[i].shift();let e=n[i].pop();let a=t-(t-e)*(r-s)/l;a=o.yAxis.data[i].formatter?o.yAxis.data[i].formatter(a):a.toFixed(0);h.push(String(a))}return h}function calMarkLineData(i,r){let o,n;let l=r.height-r.area[0]-r.area[2];for(let a=0;a<i.length;a++){i[a].yAxisIndex=i[a].yAxisIndex?i[a].yAxisIndex:0;let t=[].concat(r.chartData.yAxisData.ranges[i[a].yAxisIndex]);o=t.pop();n=t.shift();let e=l*(i[a].value-o)/(n-o);i[a].y=r.height-Math.round(e)-r.area[2]}return i}function contextRotate(t,e){if(e.rotateLock!==true){t.translate(e.height,0);t.rotate(90*Math.PI/180)}else if(e._rotate_!==true){t.translate(e.height,0);t.rotate(90*Math.PI/180);e._rotate_=true}}function drawPointShape(t,e,a,i,r){i.beginPath();if(r.dataPointShapeType=="hollow"){i.setStrokeStyle(e);i.setFillStyle(r.background);i.setLineWidth(2*r.pix)}else{i.setStrokeStyle("#ffffff");i.setFillStyle(e);i.setLineWidth(1*r.pix)}if(a==="diamond"){t.forEach(function(t,e){if(t!==null){i.moveTo(t.x,t.y-4.5);i.lineTo(t.x-4.5,t.y);i.lineTo(t.x,t.y+4.5);i.lineTo(t.x+4.5,t.y);i.lineTo(t.x,t.y-4.5)}})}else if(a==="circle"){t.forEach(function(t,e){if(t!==null){i.moveTo(t.x+2.5*r.pix,t.y);i.arc(t.x,t.y,3*r.pix,0,2*Math.PI,false)}})}else if(a==="square"){t.forEach(function(t,e){if(t!==null){i.moveTo(t.x-3.5,t.y-3.5);i.rect(t.x-3.5,t.y-3.5,7,7)}})}else if(a==="triangle"){t.forEach(function(t,e){if(t!==null){i.moveTo(t.x,t.y-4.5);i.lineTo(t.x-4.5,t.y+4.5);i.lineTo(t.x+4.5,t.y+4.5);i.lineTo(t.x,t.y-4.5)}})}else if(a==="triangle"){return}i.closePath();i.fill();i.stroke()}function drawRingTitle(t,e,a,i){var r=t.title.fontSize||e.titleFontSize;var o=t.subtitle.fontSize||e.subtitleFontSize;var n=t.title.name||"";var l=t.subtitle.name||"";var c=t.title.color||t.fontColor;var d=t.subtitle.color||t.fontColor;var x=n?r:0;var f=l?o:0;var s=5;if(l){var p=measureText(l,o*t.pix,a);var g=i.x-p/2+(t.subtitle.offsetX||0)*t.pix;var h=i.y+o*t.pix/2+(t.subtitle.offsetY||0)*t.pix;if(n){h+=(x*t.pix+s)/2}a.beginPath();a.setFontSize(o*t.pix);a.setFillStyle(d);a.fillText(l,g,h);a.closePath();a.stroke()}if(n){var u=measureText(n,r*t.pix,a);var y=i.x-u/2+(t.title.offsetX||0);var v=i.y+r*t.pix/2+(t.title.offsetY||0)*t.pix;if(l){v-=(f*t.pix+s)/2}a.beginPath();a.setFontSize(r*t.pix);a.setFillStyle(c);a.fillText(n,y,v);a.closePath();a.stroke()}}function drawPointText(t,o,n,l,s){var h=o.data;var c=o.textOffset?o.textOffset:0;t.forEach(function(t,e){if(t!==null){l.beginPath();var a=o.textSize?o.textSize*s.pix:n.fontSize;l.setFontSize(a);l.setFillStyle(o.textColor||s.fontColor);var i=h[e];if(typeof h[e]==="object"&&h[e]!==null){if(h[e].constructor.toString().indexOf("Array")>-1){i=h[e][1]}else{i=h[e].value}}var r=o.formatter?o.formatter(i,e,o,s):i;l.setTextAlign("center");l.fillText(String(r),t.x,t.y-4+c*s.pix);l.closePath();l.stroke();l.setTextAlign("left")}})}function drawMountPointText(t,o,n,l,s){var e=o.data;var h=o.textOffset?o.textOffset:0;t.forEach(function(t,e){if(t!==null){l.beginPath();var a=o[e].textSize?o[e].textSize*s.pix:n.fontSize;l.setFontSize(a);l.setFillStyle(o[e].textColor||s.fontColor);var i=t.value;var r=o[e].formatter?o[e].formatter(i,e,o,s):i;l.setTextAlign("center");l.fillText(String(r),t.x,t.y-4+h*s.pix);l.closePath();l.stroke();l.setTextAlign("left")}})}function drawBarPointText(t,o,n,l,s){var h=o.data;var e=o.textOffset?o.textOffset:0;t.forEach(function(t,e){if(t!==null){l.beginPath();var a=o.textSize?o.textSize*s.pix:n.fontSize;l.setFontSize(a);l.setFillStyle(o.textColor||s.fontColor);var i=h[e];if(typeof h[e]==="object"&&h[e]!==null){i=h[e].value}var r=o.formatter?o.formatter(i,e,o,s):i;l.setTextAlign("left");l.fillText(String(r),t.x+4*s.pix,t.y+a/2-3);l.closePath();l.stroke()}})}function drawGaugeLabel(e,a,i,r,o,n){a-=e.width/2+e.labelOffset*r.pix;a=a<10?10:a;let t=e.startAngle-e.endAngle+1;let d=t/e.splitLine.splitNumber;let x=e.endNumber-e.startNumber;let f=x/e.splitLine.splitNumber;let l=e.startAngle;let s=e.startNumber;for(let t=0;t<e.splitLine.splitNumber+1;t++){var h={x:a*Math.cos(l*Math.PI),y:a*Math.sin(l*Math.PI)};var c=e.formatter?e.formatter(s,t,r):s;h.x+=i.x-measureText(c,o.fontSize,n)/2;h.y+=i.y;var p=h.x;var g=h.y;n.beginPath();n.setFontSize(o.fontSize);n.setFillStyle(e.labelColor||r.fontColor);n.fillText(c,p,g+o.fontSize/2);n.closePath();n.stroke();l+=d;if(l>=2){l=l%2}s+=f}}function drawRadarLabel(t,s,h,c,d,x){var f=c.extra.radar||{};t.forEach(function(t,e){if(f.labelPointShow===true&&c.categories[e]!==""){var a={x:s*Math.cos(t),y:s*Math.sin(t)};var i=convertCoordinateOrigin(a.x,a.y,h);x.setFillStyle(f.labelPointColor);x.beginPath();x.arc(i.x,i.y,f.labelPointRadius*c.pix,0,2*Math.PI,false);x.closePath();x.fill()}var r={x:(s+d.radarLabelTextMargin*c.pix)*Math.cos(t),y:(s+d.radarLabelTextMargin*c.pix)*Math.sin(t)};var o=convertCoordinateOrigin(r.x,r.y,h);var n=o.x;var l=o.y;if(util.approximatelyEqual(r.x,0)){n-=measureText(c.categories[e]||"",d.fontSize,x)/2}else if(r.x<0){n-=measureText(c.categories[e]||"",d.fontSize,x)}x.beginPath();x.setFontSize(d.fontSize);x.setFillStyle(f.labelColor||c.fontColor);x.fillText(c.categories[e]||"",n,l+d.fontSize/2);x.closePath();x.stroke()})}function drawPieText(n,d,x,f,t,l){var p=x.pieChartLinePadding;var g=[];var u=null;var y=n.map(function(t,e){var a=t.formatter?t.formatter(t,e,n,d):util.toFixed(t._proportion_.toFixed(4)*100)+"%";a=t.labelText?t.labelText:a;var i=2*Math.PI-(t._start_+2*Math.PI*t._proportion_/2);if(t._rose_proportion_){i=2*Math.PI-(t._start_+2*Math.PI*t._rose_proportion_/2)}var r=t.color;var o=t._radius_;return{arc:i,text:a,color:r,radius:o,textColor:t.textColor,textSize:t.textSize,labelShow:t.labelShow}});for(let c=0;c<y.length;c++){let t=y[c];let e=Math.cos(t.arc)*(t.radius+p);let a=Math.sin(t.arc)*(t.radius+p);let i=Math.cos(t.arc)*t.radius;let r=Math.sin(t.arc)*t.radius;let o=e>=0?e+x.pieChartTextPadding:e-x.pieChartTextPadding;let n=a;let l=measureText(t.text,t.textSize*d.pix||x.fontSize,f);let s=n;if(u&&util.isSameXCoordinateArea(u.start,{x:o})){if(o>0){s=Math.min(n,u.start.y)}else if(e<0){s=Math.max(n,u.start.y)}else{if(n>0){s=Math.max(n,u.start.y)}else{s=Math.min(n,u.start.y)}}}if(o<0){o-=l}let h={lineStart:{x:i,y:r},lineEnd:{x:e,y:a},start:{x:o,y:s},width:l,height:x.fontSize,text:t.text,color:t.color,textColor:t.textColor,textSize:t.textSize};u=avoidCollision(h,u);g.push(u)}for(let n=0;n<g.length;n++){if(y[n].labelShow===false){continue}let t=g[n];let e=convertCoordinateOrigin(t.lineStart.x,t.lineStart.y,l);let a=convertCoordinateOrigin(t.lineEnd.x,t.lineEnd.y,l);let i=convertCoordinateOrigin(t.start.x,t.start.y,l);f.setLineWidth(1*d.pix);f.setFontSize(t.textSize*d.pix||x.fontSize);f.beginPath();f.setStrokeStyle(t.color);f.setFillStyle(t.color);f.moveTo(e.x,e.y);let r=t.start.x<0?i.x+t.width:i.x;let o=t.start.x<0?i.x-5:i.x+5;f.quadraticCurveTo(a.x,a.y,r,i.y);f.moveTo(e.x,e.y);f.stroke();f.closePath();f.beginPath();f.moveTo(i.x+t.width,i.y);f.arc(r,i.y,2*d.pix,0,2*Math.PI);f.closePath();f.fill();f.beginPath();f.setFontSize(t.textSize*d.pix||x.fontSize);f.setFillStyle(t.textColor||d.fontColor);f.fillText(t.text,o,i.y+3);f.closePath();f.stroke();f.closePath()}}function drawToolTipSplitLine(r,o,n,l){var s=o.extra.tooltip||{};s.gridType=s.gridType==undefined?"solid":s.gridType;s.dashLength=s.dashLength==undefined?4:s.dashLength;var t=o.area[0];var h=o.height-o.area[2];if(s.gridType=="dash"){l.setLineDash([s.dashLength,s.dashLength])}l.setStrokeStyle(s.gridColor||"#cccccc");l.setLineWidth(1*o.pix);l.beginPath();l.moveTo(r,t);l.lineTo(r,h);l.stroke();l.setLineDash([]);if(s.xAxisLabel){let t=o.categories[o.tooltip.index];l.setFontSize(n.fontSize);let e=measureText(t,n.fontSize,l);let a=r-.5*e;let i=h;l.beginPath();l.setFillStyle(hexToRgb(s.labelBgColor||n.toolTipBackground,s.labelBgOpacity||n.toolTipOpacity));l.setStrokeStyle(s.labelBgColor||n.toolTipBackground);l.setLineWidth(1*o.pix);l.rect(a-n.toolTipPadding,i,e+2*n.toolTipPadding,n.fontSize+2*n.toolTipPadding);l.closePath();l.stroke();l.fill();l.beginPath();l.setFontSize(n.fontSize);l.setFillStyle(s.labelFontColor||o.fontColor);l.fillText(String(t),a,i+n.toolTipPadding+n.fontSize);l.closePath();l.stroke()}}function drawMarkLine(s,h,c){let e=assign({},{type:"solid",dashLength:4,data:[]},s.extra.markLine);let a=s.area[3];let i=s.width-s.area[1];let r=calMarkLineData(e.data,s);for(let t=0;t<r.length;t++){let l=assign({},{lineColor:"#DE4A42",showLabel:false,labelFontColor:"#666666",labelBgColor:"#DFE8FF",labelBgOpacity:.8,labelAlign:"left",labelOffsetX:0,labelOffsetY:0},r[t]);if(e.type=="dash"){c.setLineDash([e.dashLength,e.dashLength])}c.setStrokeStyle(l.lineColor);c.setLineWidth(1*s.pix);c.beginPath();c.moveTo(a,l.y);c.lineTo(i,l.y);c.stroke();c.setLineDash([]);if(l.showLabel){let t=l.labelText?l.labelText:l.value;c.setFontSize(h.fontSize);let e=measureText(t,h.fontSize,c);let a=e+h.toolTipPadding*2;let i=l.labelAlign=="left"?s.area[3]-a:s.width-s.area[1];i+=l.labelOffsetX;let r=l.y-.5*h.fontSize-h.toolTipPadding;r+=l.labelOffsetY;let o=i+h.toolTipPadding;let n=l.y;c.setFillStyle(hexToRgb(l.labelBgColor,l.labelBgOpacity));c.setStrokeStyle(l.labelBgColor);c.setLineWidth(1*s.pix);c.beginPath();c.rect(i,r,a,h.fontSize+2*h.toolTipPadding);c.closePath();c.stroke();c.fill();c.setFontSize(h.fontSize);c.setTextAlign("left");c.setFillStyle(l.labelFontColor);c.fillText(String(t),o,r+h.fontSize+h.toolTipPadding/2);c.stroke();c.setTextAlign("left")}}}function drawToolTipHorizentalLine(d,x,f,t,e){var p=assign({},{gridType:"solid",dashLength:4},d.extra.tooltip);var a=d.area[3];var i=d.width-d.area[1];if(p.gridType=="dash"){f.setLineDash([p.dashLength,p.dashLength])}f.setStrokeStyle(p.gridColor||"#cccccc");f.setLineWidth(1*d.pix);f.beginPath();f.moveTo(a,d.tooltip.offset.y);f.lineTo(i,d.tooltip.offset.y);f.stroke();f.setLineDash([]);if(p.yAxisLabel){let l=calTooltipYAxisData(d.tooltip.offset.y,d.series,d,x,t);let s=d.chartData.yAxisData.yAxisWidth;let h=d.area[3];let c=d.width-d.area[1];for(let n=0;n<l.length;n++){f.setFontSize(x.fontSize);let t=measureText(l[n],x.fontSize,f);let e,a,i;if(s[n].position=="left"){e=h-s[n].width;a=Math.max(e,e+t+x.toolTipPadding*2)}else{e=c;a=Math.max(e+s[n].width,e+t+x.toolTipPadding*2)}i=a-e;let r=e+(i-t)/2;let o=d.tooltip.offset.y;f.beginPath();f.setFillStyle(hexToRgb(p.labelBgColor||x.toolTipBackground,p.labelBgOpacity||x.toolTipOpacity));f.setStrokeStyle(p.labelBgColor||x.toolTipBackground);f.setLineWidth(1*d.pix);f.rect(e,o-.5*x.fontSize-x.toolTipPadding,i,x.fontSize+2*x.toolTipPadding);f.closePath();f.stroke();f.fill();f.beginPath();f.setFontSize(x.fontSize);f.setFillStyle(p.labelFontColor||d.fontColor);f.fillText(l[n],r,o+.5*x.fontSize);f.closePath();f.stroke();if(s[n].position=="left"){h-=s[n].width+d.yAxis.padding*d.pix}else{c+=s[n].width+d.yAxis.padding*d.pix}}}}function drawToolTipSplitArea(t,e,a,i,r){var o=assign({},{activeBgColor:"#000000",activeBgOpacity:.08,activeWidth:r},e.extra.column);o.activeWidth=o.activeWidth>r?r:o.activeWidth;var n=e.area[0];var l=e.height-e.area[2];i.beginPath();i.setFillStyle(hexToRgb(o.activeBgColor,o.activeBgOpacity));i.rect(t-o.activeWidth/2,n,o.activeWidth,l-n);i.closePath();i.fill();i.setFillStyle("#FFFFFF")}function drawBarToolTipSplitArea(t,e,a,i,r){var o=assign({},{activeBgColor:"#000000",activeBgOpacity:.08},e.extra.bar);var n=e.area[3];var l=e.width-e.area[1];i.beginPath();i.setFillStyle(hexToRgb(o.activeBgColor,o.activeBgOpacity));i.rect(n,t-r/2,l-n,r);i.closePath();i.fill();i.setFillStyle("#FFFFFF")}function drawToolTip(t,r,e,o,n,c,d){var l=assign({},{showBox:true,showArrow:true,showCategory:false,bgColor:"#000000",bgOpacity:.7,borderColor:"#000000",borderWidth:0,borderRadius:0,borderOpacity:.7,fontColor:"#FFFFFF",splitLine:true},e.extra.tooltip);if(l.showCategory==true&&e.categories){t.unshift({text:e.categories[e.tooltip.index],color:null})}var x=4*e.pix;var f=5*e.pix;var s=l.showArrow?8*e.pix:0;var p=false;if(e.type=="line"||e.type=="mount"||e.type=="area"||e.type=="candle"||e.type=="mix"){if(l.splitLine==true){drawToolTipSplitLine(e.tooltip.offset.x,e,o,n)}}r=assign({x:0,y:0},r);r.y-=8*e.pix;var g=t.map(function(t){return measureText(t.text,o.fontSize,n)});var h=x+f+4*o.toolTipPadding+Math.max.apply(null,g);var a=2*o.toolTipPadding+t.length*o.toolTipLineHeight;if(l.showBox==false){return}if(r.x-Math.abs(e._scrollDistance_||0)+s+h>e.width){p=true}if(a+r.y>e.height){r.y=e.height-a}n.beginPath();n.setFillStyle(hexToRgb(l.bgColor||o.toolTipBackground,l.bgOpacity||o.toolTipOpacity));n.setLineWidth(l.borderWidth*e.pix);n.setStrokeStyle(hexToRgb(l.borderColor,l.borderOpacity));var i=l.borderRadius;if(p){if(l.showArrow){n.moveTo(r.x,r.y+10*e.pix);n.lineTo(r.x-s,r.y+10*e.pix+5*e.pix)}n.arc(r.x-s-i,r.y+a-i,i,0,Math.PI/2,false);n.arc(r.x-s-Math.round(h)+i,r.y+a-i,i,Math.PI/2,Math.PI,false);n.arc(r.x-s-Math.round(h)+i,r.y+i,i,-Math.PI,-Math.PI/2,false);n.arc(r.x-s-i,r.y+i,i,-Math.PI/2,0,false);if(l.showArrow){n.lineTo(r.x-s,r.y+10*e.pix-5*e.pix);n.lineTo(r.x,r.y+10*e.pix)}}else{if(l.showArrow){n.moveTo(r.x,r.y+10*e.pix);n.lineTo(r.x+s,r.y+10*e.pix-5*e.pix)}n.arc(r.x+s+i,r.y+i,i,-Math.PI,-Math.PI/2,false);n.arc(r.x+s+Math.round(h)-i,r.y+i,i,-Math.PI/2,0,false);n.arc(r.x+s+Math.round(h)-i,r.y+a-i,i,0,Math.PI/2,false);n.arc(r.x+s+i,r.y+a-i,i,Math.PI/2,Math.PI,false);if(l.showArrow){n.lineTo(r.x+s,r.y+10*e.pix+5*e.pix);n.lineTo(r.x,r.y+10*e.pix)}}n.closePath();n.fill();if(l.borderWidth>0){n.stroke()}t.forEach(function(t,e){if(t.color!==null){n.beginPath();n.setFillStyle(t.color);var a=r.x+s+2*o.toolTipPadding;var i=r.y+(o.toolTipLineHeight-o.fontSize)/2+o.toolTipLineHeight*e+o.toolTipPadding+1;if(p){a=r.x-h-s+2*o.toolTipPadding}n.fillRect(a,i,x,o.fontSize);n.closePath()}});t.forEach(function(t,e){var a=r.x+s+2*o.toolTipPadding+x+f;if(p){a=r.x-h-s+2*o.toolTipPadding+ +x+f}var i=r.y+(o.toolTipLineHeight-o.fontSize)/2+o.toolTipLineHeight*e+o.toolTipPadding;n.beginPath();n.setFontSize(o.fontSize);n.setFillStyle(l.fontColor);n.fillText(t.text,a,i+o.fontSize);n.closePath();n.stroke()})}function drawColumnDataPoints(y,v,m,T){let b=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let t=v.chartData.xAxisData,P=t.xAxisPoints,w=t.eachSpacing;let S=assign({},{type:"group",width:w/2,meterBorder:4,meterFillColor:"#FFFFFF",barBorderCircle:false,barBorderRadius:[],seriesGap:2,linearType:"none",linearOpacity:1,customColor:[],colorStop:0},v.extra.column);let A=[];T.save();let C=-2;let D=P.length+2;if(v._scrollDistance_&&v._scrollDistance_!==0&&v.enableScroll===true){T.translate(v._scrollDistance_,0);C=Math.floor(-v._scrollDistance_/w)-2;D=C+v.xAxis.itemCount+4}if(v.tooltip&&v.tooltip.textList&&v.tooltip.textList.length&&b===1){drawToolTipSplitArea(v.tooltip.offset.x,v,m,T,w)}S.customColor=fillCustomColor(S.linearType,S.customColor,y,m);y.forEach(function(a,i){let t,o,x;t=[].concat(v.chartData.yAxisData.ranges[a.index]);o=t.pop();x=t.shift();var f=a.data;switch(S.type){case"group":var r=getDataPoints(f,o,x,P,w,v,m,b);var p=getStackDataPoints(f,o,x,P,w,v,m,i,y,b);A.push(p);r=fixColumeData(r,w,y.length,i,m,v);for(let t=0;t<r.length;t++){let o=r[t];if(o!==null&&t>C&&t<D){var n=o.x-o.width/2;var l=v.height-o.y-v.area[2];T.beginPath();var s=o.color||a.color;var g=o.color||a.color;if(S.linearType!=="none"){var e=T.createLinearGradient(n,o.y,n,v.height-v.area[2]);if(S.linearType=="opacity"){e.addColorStop(0,hexToRgb(s,S.linearOpacity));e.addColorStop(1,hexToRgb(s,1))}else{e.addColorStop(0,hexToRgb(S.customColor[a.linearIndex],S.linearOpacity));e.addColorStop(S.colorStop,hexToRgb(S.customColor[a.linearIndex],S.linearOpacity));e.addColorStop(1,hexToRgb(s,1))}s=e}if(S.barBorderRadius&&S.barBorderRadius.length===4||S.barBorderCircle===true){const h=n;const c=o.y;const d=o.width;const l=v.height-v.area[2]-o.y;if(S.barBorderCircle){S.barBorderRadius=[d/2,d/2,0,0]}let[t,e,a,i]=S.barBorderRadius;let r=Math.min(d/2,l/2);t=t>r?r:t;e=e>r?r:e;a=a>r?r:a;i=i>r?r:i;t=t<0?0:t;e=e<0?0:e;a=a<0?0:a;i=i<0?0:i;T.arc(h+t,c+t,t,-Math.PI,-Math.PI/2);T.arc(h+d-e,c+e,e,-Math.PI/2,0);T.arc(h+d-a,c+l-a,a,0,Math.PI/2);T.arc(h+i,c+l-i,i,Math.PI/2,Math.PI)}else{T.moveTo(n,o.y);T.lineTo(n+o.width,o.y);T.lineTo(n+o.width,v.height-v.area[2]);T.lineTo(n,v.height-v.area[2]);T.lineTo(n,o.y);T.setLineWidth(1);T.setStrokeStyle(g)}T.setFillStyle(s);T.closePath();T.fill()}};break;case"stack":var r=getStackDataPoints(f,o,x,P,w,v,m,i,y,b);A.push(r);r=fixColumeStackData(r,w,y.length,i,m,v,y);for(let e=0;e<r.length;e++){let t=r[e];if(t!==null&&e>C&&e<D){T.beginPath();var s=t.color||a.color;var n=t.x-t.width/2+1;var l=v.height-t.y-v.area[2];var u=v.height-t.y0-v.area[2];if(i>0){l-=u}T.setFillStyle(s);T.moveTo(n,t.y);T.fillRect(n,t.y,t.width,l);T.closePath();T.fill()}};break;case"meter":var r=getDataPoints(f,o,x,P,w,v,m,b);A.push(r);r=fixColumeMeterData(r,w,y.length,i,m,v,S.meterBorder);for(let t=0;t<r.length;t++){let o=r[t];if(o!==null&&t>C&&t<D){T.beginPath();if(i==0&&S.meterBorder>0){T.setStrokeStyle(a.color);T.setLineWidth(S.meterBorder*v.pix)}if(i==0){T.setFillStyle(S.meterFillColor)}else{T.setFillStyle(o.color||a.color)}var n=o.x-o.width/2;var l=v.height-o.y-v.area[2];if(S.barBorderRadius&&S.barBorderRadius.length===4||S.barBorderCircle===true){const h=n;const c=o.y;const d=o.width;const l=v.height-v.area[2]-o.y;if(S.barBorderCircle){S.barBorderRadius=[d/2,d/2,0,0]}let[t,e,a,i]=S.barBorderRadius;let r=Math.min(d/2,l/2);t=t>r?r:t;e=e>r?r:e;a=a>r?r:a;i=i>r?r:i;t=t<0?0:t;e=e<0?0:e;a=a<0?0:a;i=i<0?0:i;T.arc(h+t,c+t,t,-Math.PI,-Math.PI/2);T.arc(h+d-e,c+e,e,-Math.PI/2,0);T.arc(h+d-a,c+l-a,a,0,Math.PI/2);T.arc(h+i,c+l-i,i,Math.PI/2,Math.PI);T.fill()}else{T.moveTo(n,o.y);T.lineTo(n+o.width,o.y);T.lineTo(n+o.width,v.height-v.area[2]);T.lineTo(n,v.height-v.area[2]);T.lineTo(n,o.y);T.fill()}if(i==0&&S.meterBorder>0){T.closePath();T.stroke()}}}break}});if(v.dataLabel!==false&&b===1){y.forEach(function(t,e){let a,i,r;a=[].concat(v.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;switch(S.type){case"group":var n=getDataPoints(o,i,r,P,w,v,m,b);n=fixColumeData(n,w,y.length,e,m,v);drawPointText(n,t,m,T,v);break;case"stack":var n=getStackDataPoints(o,i,r,P,w,v,m,e,y,b);drawPointText(n,t,m,T,v);break;case"meter":var n=getDataPoints(o,i,r,P,w,v,m,b);drawPointText(n,t,m,T,v);break}})}T.restore();return{xAxisPoints:P,calPoints:A,eachSpacing:w}}function drawMountDataPoints(i,n,o,l){let f=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let t=n.chartData.xAxisData,p=t.xAxisPoints,r=t.eachSpacing;let s=assign({},{type:"mount",widthRatio:1,borderWidth:1,barBorderCircle:false,barBorderRadius:[],linearType:"none",linearOpacity:1,customColor:[],colorStop:0},n.extra.mount);s.widthRatio=s.widthRatio<=0?0:s.widthRatio;s.widthRatio=s.widthRatio>=2?2:s.widthRatio;let e=[];l.save();let a=-2;let g=p.length+2;if(n._scrollDistance_&&n._scrollDistance_!==0&&n.enableScroll===true){l.translate(n._scrollDistance_,0);a=Math.floor(-n._scrollDistance_/r)-2;g=a+n.xAxis.itemCount+4}s.customColor=fillCustomColor(s.linearType,s.customColor,i,o);let u,y,v;u=[].concat(n.chartData.yAxisData.ranges[0]);y=u.pop();v=u.shift();var h=getMountDataPoints(i,y,v,p,r,n,s,f);switch(s.type){case"bar":for(let t=0;t<h.length;t++){let o=h[t];if(o!==null&&t>a&&t<g){var c=o.x-r*s.widthRatio/2;var m=n.height-o.y-n.area[2];l.beginPath();var d=o.color||i[t].color;var T=o.color||i[t].color;if(s.linearType!=="none"){var x=l.createLinearGradient(c,o.y,c,n.height-n.area[2]);if(s.linearType=="opacity"){x.addColorStop(0,hexToRgb(d,s.linearOpacity));x.addColorStop(1,hexToRgb(d,1))}else{x.addColorStop(0,hexToRgb(s.customColor[i[t].linearIndex],s.linearOpacity));x.addColorStop(s.colorStop,hexToRgb(s.customColor[i[t].linearIndex],s.linearOpacity));x.addColorStop(1,hexToRgb(d,1))}d=x}if(s.barBorderRadius&&s.barBorderRadius.length===4||s.barBorderCircle===true){const b=c;const P=o.y;const w=o.width;const m=n.height-n.area[2]-o.y-s.borderWidth*n.pix/2;if(s.barBorderCircle){s.barBorderRadius=[w/2,w/2,0,0]}let[t,e,a,i]=s.barBorderRadius;let r=Math.min(w/2,m/2);t=t>r?r:t;e=e>r?r:e;a=a>r?r:a;i=i>r?r:i;t=t<0?0:t;e=e<0?0:e;a=a<0?0:a;i=i<0?0:i;l.arc(b+t,P+t,t,-Math.PI,-Math.PI/2);l.arc(b+w-e,P+e,e,-Math.PI/2,0);l.arc(b+w-a,P+m-a,a,0,Math.PI/2);l.arc(b+i,P+m-i,i,Math.PI/2,Math.PI)}else{l.moveTo(c,o.y);l.lineTo(c+o.width,o.y);l.lineTo(c+o.width,n.height-n.area[2]);l.lineTo(c,n.height-n.area[2]);l.lineTo(c,o.y)}l.setStrokeStyle(T);l.setFillStyle(d);if(s.borderWidth>0){l.setLineWidth(s.borderWidth*n.pix);l.closePath();l.stroke()}l.fill()}};break;case"triangle":for(let e=0;e<h.length;e++){let t=h[e];if(t!==null&&e>a&&e<g){var c=t.x-r*s.widthRatio/2;var m=n.height-t.y-n.area[2];l.beginPath();var d=t.color||i[e].color;var T=t.color||i[e].color;if(s.linearType!=="none"){var x=l.createLinearGradient(c,t.y,c,n.height-n.area[2]);if(s.linearType=="opacity"){x.addColorStop(0,hexToRgb(d,s.linearOpacity));x.addColorStop(1,hexToRgb(d,1))}else{x.addColorStop(0,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(s.colorStop,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(1,hexToRgb(d,1))}d=x}l.moveTo(c,n.height-n.area[2]);l.lineTo(t.x,t.y);l.lineTo(c+t.width,n.height-n.area[2]);l.setStrokeStyle(T);l.setFillStyle(d);if(s.borderWidth>0){l.setLineWidth(s.borderWidth*n.pix);l.stroke()}l.fill()}};break;case"mount":for(let e=0;e<h.length;e++){let t=h[e];if(t!==null&&e>a&&e<g){var c=t.x-r*s.widthRatio/2;var m=n.height-t.y-n.area[2];l.beginPath();var d=t.color||i[e].color;var T=t.color||i[e].color;if(s.linearType!=="none"){var x=l.createLinearGradient(c,t.y,c,n.height-n.area[2]);if(s.linearType=="opacity"){x.addColorStop(0,hexToRgb(d,s.linearOpacity));x.addColorStop(1,hexToRgb(d,1))}else{x.addColorStop(0,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(s.colorStop,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(1,hexToRgb(d,1))}d=x}l.moveTo(c,n.height-n.area[2]);l.bezierCurveTo(t.x-t.width/4,n.height-n.area[2],t.x-t.width/4,t.y,t.x,t.y);l.bezierCurveTo(t.x+t.width/4,t.y,t.x+t.width/4,n.height-n.area[2],c+t.width,n.height-n.area[2]);l.setStrokeStyle(T);l.setFillStyle(d);if(s.borderWidth>0){l.setLineWidth(s.borderWidth*n.pix);l.stroke()}l.fill()}};break;case"sharp":for(let e=0;e<h.length;e++){let t=h[e];if(t!==null&&e>a&&e<g){var c=t.x-r*s.widthRatio/2;var m=n.height-t.y-n.area[2];l.beginPath();var d=t.color||i[e].color;var T=t.color||i[e].color;if(s.linearType!=="none"){var x=l.createLinearGradient(c,t.y,c,n.height-n.area[2]);if(s.linearType=="opacity"){x.addColorStop(0,hexToRgb(d,s.linearOpacity));x.addColorStop(1,hexToRgb(d,1))}else{x.addColorStop(0,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(s.colorStop,hexToRgb(s.customColor[i[e].linearIndex],s.linearOpacity));x.addColorStop(1,hexToRgb(d,1))}d=x}l.moveTo(c,n.height-n.area[2]);l.quadraticCurveTo(t.x-0,n.height-n.area[2]-m/4,t.x,t.y);l.quadraticCurveTo(t.x+0,n.height-n.area[2]-m/4,c+t.width,n.height-n.area[2]);l.setStrokeStyle(T);l.setFillStyle(d);if(s.borderWidth>0){l.setLineWidth(s.borderWidth*n.pix);l.stroke()}l.fill()}};break}if(n.dataLabel!==false&&f===1){let t,e,a;t=[].concat(n.chartData.yAxisData.ranges[0]);e=t.pop();a=t.shift();var h=getMountDataPoints(i,e,a,p,r,n,s,f);drawMountPointText(h,i,o,l,n)}l.restore();return{xAxisPoints:p,calPoints:h,eachSpacing:r}}function drawBarDataPoints(y,v,m,T){let b=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let P=[];let w=(v.height-v.area[0]-v.area[2])/v.categories.length;for(let t=0;t<v.categories.length;t++){P.push(v.area[0]+w/2+w*t)}let S=assign({},{type:"group",width:w/2,meterBorder:4,meterFillColor:"#FFFFFF",barBorderCircle:false,barBorderRadius:[],seriesGap:2,linearType:"none",linearOpacity:1,customColor:[],colorStop:0},v.extra.bar);let A=[];T.save();let C=-2;let D=P.length+2;if(v.tooltip&&v.tooltip.textList&&v.tooltip.textList.length&&b===1){drawBarToolTipSplitArea(v.tooltip.offset.y,v,m,T,w)}S.customColor=fillCustomColor(S.linearType,S.customColor,y,m);y.forEach(function(a,t){let o,e,d;o=[].concat(v.chartData.xAxisData.ranges);d=o.pop();e=o.shift();var x=a.data;switch(S.type){case"group":var i=getBarDataPoints(x,e,d,P,w,v,m,b);var f=getBarStackDataPoints(x,e,d,P,w,v,m,t,y,b);A.push(f);i=fixBarData(i,w,y.length,t,m,v);for(let t=0;t<i.length;t++){let o=i[t];if(o!==null&&t>C&&t<D){var n=v.area[3];var r=o.y-o.width/2;var p=o.height;T.beginPath();var l=o.color||a.color;var g=o.color||a.color;if(S.linearType!=="none"){var s=T.createLinearGradient(n,o.y,o.x,o.y);if(S.linearType=="opacity"){s.addColorStop(0,hexToRgb(l,S.linearOpacity));s.addColorStop(1,hexToRgb(l,1))}else{s.addColorStop(0,hexToRgb(S.customColor[a.linearIndex],S.linearOpacity));s.addColorStop(S.colorStop,hexToRgb(S.customColor[a.linearIndex],S.linearOpacity));s.addColorStop(1,hexToRgb(l,1))}l=s}if(S.barBorderRadius&&S.barBorderRadius.length===4||S.barBorderCircle===true){const u=n;const h=o.width;const c=o.y-o.width/2;const p=o.height;if(S.barBorderCircle){S.barBorderRadius=[h/2,h/2,0,0]}let[t,e,a,i]=S.barBorderRadius;let r=Math.min(h/2,p/2);t=t>r?r:t;e=e>r?r:e;a=a>r?r:a;i=i>r?r:i;t=t<0?0:t;e=e<0?0:e;a=a<0?0:a;i=i<0?0:i;T.arc(u+i,c+i,i,-Math.PI,-Math.PI/2);T.arc(o.x-t,c+t,t,-Math.PI/2,0);T.arc(o.x-e,c+h-e,e,0,Math.PI/2);T.arc(u+a,c+h-a,a,Math.PI/2,Math.PI)}else{T.moveTo(n,r);T.lineTo(o.x,r);T.lineTo(o.x,r+o.width);T.lineTo(n,r+o.width);T.lineTo(n,r);T.setLineWidth(1);T.setStrokeStyle(g)}T.setFillStyle(l);T.closePath();T.fill()}};break;case"stack":var i=getBarStackDataPoints(x,e,d,P,w,v,m,t,y,b);A.push(i);i=fixBarStackData(i,w,y.length,t,m,v,y);for(let e=0;e<i.length;e++){let t=i[e];if(t!==null&&e>C&&e<D){T.beginPath();var l=t.color||a.color;var n=t.x0;T.setFillStyle(l);T.moveTo(n,t.y-t.width/2);T.fillRect(n,t.y-t.width/2,t.height,t.width);T.closePath();T.fill()}};break}});if(v.dataLabel!==false&&b===1){y.forEach(function(t,e){let a,i,r;a=[].concat(v.chartData.xAxisData.ranges);r=a.pop();i=a.shift();var o=t.data;switch(S.type){case"group":var n=getBarDataPoints(o,i,r,P,w,v,m,b);n=fixBarData(n,w,y.length,e,m,v);drawBarPointText(n,t,m,T,v);break;case"stack":var n=getBarStackDataPoints(o,i,r,P,w,v,m,e,y,b);drawBarPointText(n,t,m,T,v);break}})}return{yAxisPoints:P,calPoints:A,eachSpacing:w}}function drawCandleDataPoints(e,t,h,c,d){var u=arguments.length>5&&arguments[5]!==undefined?arguments[5]:1;var s=assign({},{color:{},average:{}},h.extra.candle);s.color=assign({},{upLine:"#f04864",upFill:"#f04864",downLine:"#2fc25b",downFill:"#2fc25b"},s.color);s.average=assign({},{show:false,name:[],day:[],color:c.color},s.average);h.extra.candle=s;let a=h.chartData.xAxisData,x=a.xAxisPoints,f=a.eachSpacing;let y=[];d.save();let p=-2;let v=x.length+2;let g=0;let m=h.width+f;if(h._scrollDistance_&&h._scrollDistance_!==0&&h.enableScroll===true){d.translate(h._scrollDistance_,0);p=Math.floor(-h._scrollDistance_/f)-2;v=p+h.xAxis.itemCount+4;g=-h._scrollDistance_-f*2+h.area[3];m=g+(h.xAxis.itemCount+4)*f}if(s.average.show||t){t.forEach(function(e,t){let a,i,r;a=[].concat(h.chartData.yAxisData.ranges[e.index]);i=a.pop();r=a.shift();var o=e.data;var n=getDataPoints(o,i,r,x,f,h,c,u);var l=splitPoints(n,e);for(let t=0;t<l.length;t++){let i=l[t];d.beginPath();d.setStrokeStyle(e.color);d.setLineWidth(1);if(i.length===1){d.moveTo(i[0].x,i[0].y);d.arc(i[0].x,i[0].y,1,0,2*Math.PI)}else{d.moveTo(i[0].x,i[0].y);let a=0;for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>g){d.moveTo(t.x,t.y);a=1}if(e>0&&t.x>g&&t.x<m){var s=createCurveControlPoints(i,e-1);d.bezierCurveTo(s.ctrA.x,s.ctrA.y,s.ctrB.x,s.ctrB.y,t.x,t.y)}}d.moveTo(i[0].x,i[0].y)}d.closePath();d.stroke()}})}e.forEach(function(t,e){let a,i,r;a=[].concat(h.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getCandleDataPoints(o,i,r,x,f,h,c,u);y.push(n);var l=splitPoints(n,t);for(let e=0;e<l[0].length;e++){if(e>p&&e<v){let t=l[0][e];d.beginPath();if(o[e][1]-o[e][0]>0){d.setStrokeStyle(s.color.upLine);d.setFillStyle(s.color.upFill);d.setLineWidth(1*h.pix);d.moveTo(t[3].x,t[3].y);d.lineTo(t[1].x,t[1].y);d.lineTo(t[1].x-f/4,t[1].y);d.lineTo(t[0].x-f/4,t[0].y);d.lineTo(t[0].x,t[0].y);d.lineTo(t[2].x,t[2].y);d.lineTo(t[0].x,t[0].y);d.lineTo(t[0].x+f/4,t[0].y);d.lineTo(t[1].x+f/4,t[1].y);d.lineTo(t[1].x,t[1].y);d.moveTo(t[3].x,t[3].y)}else{d.setStrokeStyle(s.color.downLine);d.setFillStyle(s.color.downFill);d.setLineWidth(1*h.pix);d.moveTo(t[3].x,t[3].y);d.lineTo(t[0].x,t[0].y);d.lineTo(t[0].x-f/4,t[0].y);d.lineTo(t[1].x-f/4,t[1].y);d.lineTo(t[1].x,t[1].y);d.lineTo(t[2].x,t[2].y);d.lineTo(t[1].x,t[1].y);d.lineTo(t[1].x+f/4,t[1].y);d.lineTo(t[0].x+f/4,t[0].y);d.lineTo(t[0].x,t[0].y);d.moveTo(t[3].x,t[3].y)}d.closePath();d.fill();d.stroke()}}});d.restore();return{xAxisPoints:x,calPoints:y,eachSpacing:f}}function drawAreaDataPoints(t,s,h,c){var d=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var x=assign({},{type:"straight",opacity:.2,addLine:false,width:2,gradient:false},s.extra.area);let e=s.chartData.xAxisData,y=e.xAxisPoints,f=e.eachSpacing;let p=s.height-s.area[2];let v=[];c.save();let g=0;let u=s.width+f;if(s._scrollDistance_&&s._scrollDistance_!==0&&s.enableScroll===true){c.translate(s._scrollDistance_,0);g=-s._scrollDistance_-f*2+s.area[3];u=g+(s.xAxis.itemCount+4)*f}t.forEach(function(e,t){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[e.index]);i=a.pop();r=a.shift();let o=e.data;let n=getDataPoints(o,i,r,y,f,s,h,d);v.push(n);let l=splitPoints(n,e);for(let t=0;t<l.length;t++){let r=l[t];c.beginPath();c.setStrokeStyle(hexToRgb(e.color,x.opacity));if(x.gradient){let t=c.createLinearGradient(0,s.area[0],0,s.height-s.area[2]);t.addColorStop("0",hexToRgb(e.color,x.opacity));t.addColorStop("1.0",hexToRgb("#FFFFFF",.1));c.setFillStyle(t)}else{c.setFillStyle(hexToRgb(e.color,x.opacity))}c.setLineWidth(x.width*s.pix);if(r.length>1){let t=r[0];let e=r[r.length-1];c.moveTo(t.x,t.y);let i=0;if(x.type==="curve"){for(let a=0;a<r.length;a++){let e=r[a];if(i==0&&e.x>g){c.moveTo(e.x,e.y);i=1}if(a>0&&e.x>g&&e.x<u){let t=createCurveControlPoints(r,a-1);c.bezierCurveTo(t.ctrA.x,t.ctrA.y,t.ctrB.x,t.ctrB.y,e.x,e.y)}}}if(x.type==="straight"){for(let e=0;e<r.length;e++){let t=r[e];if(i==0&&t.x>g){c.moveTo(t.x,t.y);i=1}if(e>0&&t.x>g&&t.x<u){c.lineTo(t.x,t.y)}}}if(x.type==="step"){for(let e=0;e<r.length;e++){let t=r[e];if(i==0&&t.x>g){c.moveTo(t.x,t.y);i=1}if(e>0&&t.x>g&&t.x<u){c.lineTo(t.x,r[e-1].y);c.lineTo(t.x,t.y)}}}c.lineTo(e.x,p);c.lineTo(t.x,p);c.lineTo(t.x,t.y)}else{let t=r[0];c.moveTo(t.x-f/2,t.y);c.lineTo(t.x+f/2,t.y);c.lineTo(t.x+f/2,p);c.lineTo(t.x-f/2,p);c.moveTo(t.x-f/2,t.y)}c.closePath();c.fill();if(x.addLine){if(e.lineType=="dash"){let t=e.dashLength?e.dashLength:8;t*=s.pix;c.setLineDash([t,t])}c.beginPath();c.setStrokeStyle(e.color);c.setLineWidth(x.width*s.pix);if(r.length===1){c.moveTo(r[0].x,r[0].y);c.arc(r[0].x,r[0].y,1,0,2*Math.PI)}else{c.moveTo(r[0].x,r[0].y);let i=0;if(x.type==="curve"){for(let a=0;a<r.length;a++){let e=r[a];if(i==0&&e.x>g){c.moveTo(e.x,e.y);i=1}if(a>0&&e.x>g&&e.x<u){let t=createCurveControlPoints(r,a-1);c.bezierCurveTo(t.ctrA.x,t.ctrA.y,t.ctrB.x,t.ctrB.y,e.x,e.y)}}}if(x.type==="straight"){for(let e=0;e<r.length;e++){let t=r[e];if(i==0&&t.x>g){c.moveTo(t.x,t.y);i=1}if(e>0&&t.x>g&&t.x<u){c.lineTo(t.x,t.y)}}}if(x.type==="step"){for(let e=0;e<r.length;e++){let t=r[e];if(i==0&&t.x>g){c.moveTo(t.x,t.y);i=1}if(e>0&&t.x>g&&t.x<u){c.lineTo(t.x,r[e-1].y);c.lineTo(t.x,t.y)}}}c.moveTo(r[0].x,r[0].y)}c.stroke();c.setLineDash([])}}if(s.dataPointShape!==false){drawPointShape(n,e.color,e.pointShape,c,s)}});if(s.dataLabel!==false&&d===1){t.forEach(function(t,e){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,y,f,s,h,d);drawPointText(n,t,h,c,s)})}c.restore();return{xAxisPoints:y,calPoints:v,eachSpacing:f}}function drawScatterDataPoints(t,s,h,c){var d=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var i=assign({},{type:"circle"},s.extra.scatter);let e=s.chartData.xAxisData,x=e.xAxisPoints,f=e.eachSpacing;var r=[];c.save();let a=0;let o=s.width+f;if(s._scrollDistance_&&s._scrollDistance_!==0&&s.enableScroll===true){c.translate(s._scrollDistance_,0);a=-s._scrollDistance_-f*2+s.area[3];o=a+(s.xAxis.itemCount+4)*f}t.forEach(function(t,e){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,x,f,s,h,d);c.beginPath();c.setStrokeStyle(t.color);c.setFillStyle(t.color);c.setLineWidth(1*s.pix);var l=t.pointShape;if(l==="diamond"){n.forEach(function(t,e){if(t!==null){c.moveTo(t.x,t.y-4.5);c.lineTo(t.x-4.5,t.y);c.lineTo(t.x,t.y+4.5);c.lineTo(t.x+4.5,t.y);c.lineTo(t.x,t.y-4.5)}})}else if(l==="circle"){n.forEach(function(t,e){if(t!==null){c.moveTo(t.x+2.5*s.pix,t.y);c.arc(t.x,t.y,3*s.pix,0,2*Math.PI,false)}})}else if(l==="square"){n.forEach(function(t,e){if(t!==null){c.moveTo(t.x-3.5,t.y-3.5);c.rect(t.x-3.5,t.y-3.5,7,7)}})}else if(l==="triangle"){n.forEach(function(t,e){if(t!==null){c.moveTo(t.x,t.y-4.5);c.lineTo(t.x-4.5,t.y+4.5);c.lineTo(t.x+4.5,t.y+4.5);c.lineTo(t.x,t.y-4.5)}})}else if(l==="triangle"){return}c.closePath();c.fill();c.stroke()});if(s.dataLabel!==false&&d===1){t.forEach(function(t,e){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,x,f,s,h,d);drawPointText(n,t,h,c,s)})}c.restore();return{xAxisPoints:x,calPoints:r,eachSpacing:f}}function drawBubbleDataPoints(l,s,h,c){var d=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var x=assign({},{opacity:1,border:2},s.extra.bubble);let t=s.chartData.xAxisData,f=t.xAxisPoints,p=t.eachSpacing;var e=[];c.save();let a=0;let i=s.width+p;if(s._scrollDistance_&&s._scrollDistance_!==0&&s.enableScroll===true){c.translate(s._scrollDistance_,0);a=-s._scrollDistance_-p*2+s.area[3];i=a+(s.xAxis.itemCount+4)*p}l.forEach(function(t,e){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,f,p,s,h,d);c.beginPath();c.setStrokeStyle(t.color);c.setLineWidth(x.border*s.pix);c.setFillStyle(hexToRgb(t.color,x.opacity));n.forEach(function(t,e){c.moveTo(t.x+t.r,t.y);c.arc(t.x,t.y,t.r*s.pix,0,2*Math.PI,false)});c.closePath();c.fill();c.stroke();if(s.dataLabel!==false&&d===1){n.forEach(function(t,e){c.beginPath();var a=l.textSize*s.pix||h.fontSize;c.setFontSize(a);c.setFillStyle(l.textColor||"#FFFFFF");c.setTextAlign("center");c.fillText(String(t.t),t.x,t.y+a/2);c.closePath();c.stroke();c.setTextAlign("left")})}});c.restore();return{xAxisPoints:f,calPoints:e,eachSpacing:p}}function drawLineDataPoints(t,s,h,c){var d=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var x=assign({},{type:"straight",width:2},s.extra.line);x.width*=s.pix;let e=s.chartData.xAxisData,f=e.xAxisPoints,p=e.eachSpacing;var y=[];c.save();let g=0;let u=s.width+p;if(s._scrollDistance_&&s._scrollDistance_!==0&&s.enableScroll===true){c.translate(s._scrollDistance_,0);g=-s._scrollDistance_-p*2+s.area[3];u=g+(s.xAxis.itemCount+4)*p}t.forEach(function(e,t){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[e.index]);i=a.pop();r=a.shift();var o=e.data;var n=getDataPoints(o,i,r,f,p,s,h,d);y.push(n);var l=splitPoints(n,e);if(e.lineType=="dash"){let t=e.dashLength?e.dashLength:8;t*=s.pix;c.setLineDash([t,t])}c.beginPath();c.setStrokeStyle(e.color);c.setLineWidth(x.width);l.forEach(function(i,t){if(i.length===1){c.moveTo(i[0].x,i[0].y);c.arc(i[0].x,i[0].y,1,0,2*Math.PI)}else{c.moveTo(i[0].x,i[0].y);let a=0;if(x.type==="curve"){for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>g){c.moveTo(t.x,t.y);a=1}if(e>0&&t.x>g&&t.x<u){var r=createCurveControlPoints(i,e-1);c.bezierCurveTo(r.ctrA.x,r.ctrA.y,r.ctrB.x,r.ctrB.y,t.x,t.y)}}}if(x.type==="straight"){for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>g){c.moveTo(t.x,t.y);a=1}if(e>0&&t.x>g&&t.x<u){c.lineTo(t.x,t.y)}}}if(x.type==="step"){for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>g){c.moveTo(t.x,t.y);a=1}if(e>0&&t.x>g&&t.x<u){c.lineTo(t.x,i[e-1].y);c.lineTo(t.x,t.y)}}}c.moveTo(i[0].x,i[0].y)}});c.stroke();c.setLineDash([]);if(s.dataPointShape!==false){drawPointShape(n,e.color,e.pointShape,c,s)}});if(s.dataLabel!==false&&d===1){t.forEach(function(t,e){let a,i,r;a=[].concat(s.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,f,p,s,h,d);drawPointText(n,t,h,c,s)})}c.restore();return{xAxisPoints:f,calPoints:y,eachSpacing:p}}function drawMixDataPoints(t,v,m,T){let D=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let e=v.chartData.xAxisData,b=e.xAxisPoints,P=e.eachSpacing;let w=assign({},{width:P/2,barBorderCircle:false,barBorderRadius:[],seriesGap:2,linearType:"none",linearOpacity:1,customColor:[],colorStop:0},v.extra.mix.column);let S=assign({},{opacity:.2,gradient:false},v.extra.mix.area);let M=v.height-v.area[2];let L=[];var _=0;var F=0;t.forEach(function(t,e){if(t.type=="column"){F+=1}});T.save();let k=-2;let R=b.length+2;let A=0;let C=v.width+P;if(v._scrollDistance_&&v._scrollDistance_!==0&&v.enableScroll===true){T.translate(v._scrollDistance_,0);k=Math.floor(-v._scrollDistance_/P)-2;R=k+v.xAxis.itemCount+4;A=-v._scrollDistance_-P*2+v.area[3];C=A+(v.xAxis.itemCount+4)*P}w.customColor=fillCustomColor(w.linearType,w.customColor,t,m);t.forEach(function(n,t){let o,x,f;o=[].concat(v.chartData.yAxisData.ranges[n.index]);x=o.pop();f=o.shift();var p=n.data;var a=getDataPoints(p,x,f,b,P,v,m,D);L.push(a);if(n.type=="column"){a=fixColumeData(a,P,F,_,m,v);for(let t=0;t<a.length;t++){let o=a[t];if(o!==null&&t>k&&t<R){var l=o.x-o.width/2;var s=v.height-o.y-v.area[2];T.beginPath();var e=o.color||n.color;var g=o.color||n.color;if(w.linearType!=="none"){var i=T.createLinearGradient(l,o.y,l,v.height-v.area[2]);if(w.linearType=="opacity"){i.addColorStop(0,hexToRgb(e,w.linearOpacity));i.addColorStop(1,hexToRgb(e,1))}else{i.addColorStop(0,hexToRgb(w.customColor[n.linearIndex],w.linearOpacity));i.addColorStop(w.colorStop,hexToRgb(w.customColor[n.linearIndex],w.linearOpacity));i.addColorStop(1,hexToRgb(e,1))}e=i}if(w.barBorderRadius&&w.barBorderRadius.length===4||w.barBorderCircle){const h=l;const c=o.y;const d=o.width;const s=v.height-v.area[2]-o.y;if(w.barBorderCircle){w.barBorderRadius=[d/2,d/2,0,0]}let[t,e,a,i]=w.barBorderRadius;let r=Math.min(d/2,s/2);t=t>r?r:t;e=e>r?r:e;a=a>r?r:a;i=i>r?r:i;t=t<0?0:t;e=e<0?0:e;a=a<0?0:a;i=i<0?0:i;T.arc(h+t,c+t,t,-Math.PI,-Math.PI/2);T.arc(h+d-e,c+e,e,-Math.PI/2,0);T.arc(h+d-a,c+s-a,a,0,Math.PI/2);T.arc(h+i,c+s-i,i,Math.PI/2,Math.PI)}else{T.moveTo(l,o.y);T.lineTo(l+o.width,o.y);T.lineTo(l+o.width,v.height-v.area[2]);T.lineTo(l,v.height-v.area[2]);T.lineTo(l,o.y);T.setLineWidth(1);T.setStrokeStyle(g)}T.setFillStyle(e);T.closePath();T.fill()}}_+=1}if(n.type=="area"){let e=splitPoints(a,n);for(let t=0;t<e.length;t++){let i=e[t];T.beginPath();T.setStrokeStyle(n.color);T.setStrokeStyle(hexToRgb(n.color,S.opacity));if(S.gradient){let t=T.createLinearGradient(0,v.area[0],0,v.height-v.area[2]);t.addColorStop("0",hexToRgb(n.color,S.opacity));t.addColorStop("1.0",hexToRgb("#FFFFFF",.1));T.setFillStyle(t)}else{T.setFillStyle(hexToRgb(n.color,S.opacity))}T.setLineWidth(2*v.pix);if(i.length>1){var r=i[0];let t=i[i.length-1];T.moveTo(r.x,r.y);let a=0;if(n.style==="curve"){for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>A){T.moveTo(t.x,t.y);a=1}if(e>0&&t.x>A&&t.x<C){var u=createCurveControlPoints(i,e-1);T.bezierCurveTo(u.ctrA.x,u.ctrA.y,u.ctrB.x,u.ctrB.y,t.x,t.y)}}}else{for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>A){T.moveTo(t.x,t.y);a=1}if(e>0&&t.x>A&&t.x<C){T.lineTo(t.x,t.y)}}}T.lineTo(t.x,M);T.lineTo(r.x,M);T.lineTo(r.x,r.y)}else{let t=i[0];T.moveTo(t.x-P/2,t.y);T.lineTo(t.x+P/2,t.y);T.lineTo(t.x+P/2,M);T.lineTo(t.x-P/2,M);T.moveTo(t.x-P/2,t.y)}T.closePath();T.fill()}}if(n.type=="line"){var y=splitPoints(a,n);y.forEach(function(i,t){if(n.lineType=="dash"){let t=n.dashLength?n.dashLength:8;t*=v.pix;T.setLineDash([t,t])}T.beginPath();T.setStrokeStyle(n.color);T.setLineWidth(2*v.pix);if(i.length===1){T.moveTo(i[0].x,i[0].y);T.arc(i[0].x,i[0].y,1,0,2*Math.PI)}else{T.moveTo(i[0].x,i[0].y);let a=0;if(n.style=="curve"){for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>A){T.moveTo(t.x,t.y);a=1}if(e>0&&t.x>A&&t.x<C){var r=createCurveControlPoints(i,e-1);T.bezierCurveTo(r.ctrA.x,r.ctrA.y,r.ctrB.x,r.ctrB.y,t.x,t.y)}}}else{for(let e=0;e<i.length;e++){let t=i[e];if(a==0&&t.x>A){T.moveTo(t.x,t.y);a=1}if(e>0&&t.x>A&&t.x<C){T.lineTo(t.x,t.y)}}}T.moveTo(i[0].x,i[0].y)}T.stroke();T.setLineDash([])})}if(n.type=="point"){n.addPoint=true}if(n.addPoint==true&&n.type!=="column"){drawPointShape(a,n.color,n.pointShape,T,v)}});if(v.dataLabel!==false&&D===1){var _=0;t.forEach(function(t,e){let a,i,r;a=[].concat(v.chartData.yAxisData.ranges[t.index]);i=a.pop();r=a.shift();var o=t.data;var n=getDataPoints(o,i,r,b,P,v,m,D);if(t.type!=="column"){drawPointText(n,t,m,T,v)}else{n=fixColumeData(n,P,F,_,m,v);drawPointText(n,t,m,T,v);_+=1}})}T.restore();return{xAxisPoints:b,calPoints:L,eachSpacing:P}}function drawToolTipBridge(t,e,a,i,r,o){var n=t.extra.tooltip||{};if(n.horizentalLine&&t.tooltip&&i===1&&(t.type=="line"||t.type=="area"||t.type=="column"||t.type=="mount"||t.type=="candle"||t.type=="mix")){drawToolTipHorizentalLine(t,e,a,r,o)}a.save();if(t._scrollDistance_&&t._scrollDistance_!==0&&t.enableScroll===true){a.translate(t._scrollDistance_,0)}if(t.tooltip&&t.tooltip.textList&&t.tooltip.textList.length&&i===1){drawToolTip(t.tooltip.textList,t.tooltip.offset,t,e,a,r,o)}a.restore()}function drawXAxis(r,l,s,h){let t=l.chartData.xAxisData,c=t.xAxisPoints,e=t.startX,a=t.endX,d=t.eachSpacing;var p="center";if(l.type=="bar"||l.type=="line"||l.type=="area"||l.type=="scatter"||l.type=="bubble"){p=l.xAxis.boundaryGap}var x=l.height-l.area[2];var i=l.area[0];if(l.enableScroll&&l.xAxis.scrollShow){var o=l.height-l.area[2]+s.xAxisHeight;var n=a-e;var g=d*(c.length-1);if(l.type=="mount"&&l.extra&&l.extra.mount&&l.extra.mount.widthRatio&&l.extra.mount.widthRatio>1){if(l.extra.mount.widthRatio>2)l.extra.mount.widthRatio=2;g+=(l.extra.mount.widthRatio-1)*d}var u=n*n/g;var y=0;if(l._scrollDistance_){y=-l._scrollDistance_*n/g}h.beginPath();h.setLineCap("round");h.setLineWidth(6*l.pix);h.setStrokeStyle(l.xAxis.scrollBackgroundColor||"#EFEBEF");h.moveTo(e,o);h.lineTo(a,o);h.stroke();h.closePath();h.beginPath();h.setLineCap("round");h.setLineWidth(6*l.pix);h.setStrokeStyle(l.xAxis.scrollColor||"#A6A6A6");h.moveTo(e+y,o);h.lineTo(e+y+u,o);h.stroke();h.closePath();h.setLineCap("butt")}h.save();if(l._scrollDistance_&&l._scrollDistance_!==0){h.translate(l._scrollDistance_,0)}if(l.xAxis.calibration===true){h.setStrokeStyle(l.xAxis.gridColor||"#cccccc");h.setLineCap("butt");h.setLineWidth(1*l.pix);c.forEach(function(t,e){if(e>0){h.beginPath();h.moveTo(t-d/2,x);h.lineTo(t-d/2,x+3*l.pix);h.closePath();h.stroke()}})}if(l.xAxis.disableGrid!==true){h.setStrokeStyle(l.xAxis.gridColor||"#cccccc");h.setLineCap("butt");h.setLineWidth(1*l.pix);if(l.xAxis.gridType=="dash"){h.setLineDash([l.xAxis.dashLength*l.pix,l.xAxis.dashLength*l.pix])}l.xAxis.gridEval=l.xAxis.gridEval||1;c.forEach(function(t,e){if(e%l.xAxis.gridEval==0){h.beginPath();h.moveTo(t,x);h.lineTo(t,i);h.stroke()}});h.setLineDash([])}if(l.xAxis.disabled!==true){let t=r.length;if(l.xAxis.labelCount){if(l.xAxis.itemCount){t=Math.ceil(r.length/l.xAxis.itemCount*l.xAxis.labelCount)}else{t=l.xAxis.labelCount}t-=1}let e=Math.ceil(r.length/t);let a=[];let i=r.length;for(let t=0;t<i;t++){if(t%e!==0){a.push("")}else{a.push(r[t])}}a[i-1]=r[i-1];var f=l.xAxis.fontSize*l.pix||s.fontSize;if(s._xAxisTextAngle_===0){a.forEach(function(t,e){var a=l.xAxis.formatter?l.xAxis.formatter(t,e,l):t;var i=-measureText(String(a),f,h)/2;if(p=="center"){i+=d/2}var r=0;if(l.xAxis.scrollShow){r=6*l.pix}h.beginPath();h.setFontSize(f);h.setFillStyle(l.xAxis.fontColor||l.fontColor);h.fillText(String(a),c[e]+i,x+f+(s.xAxisHeight-r-f)/2);h.closePath();h.stroke()})}else{a.forEach(function(t,e){var a=l.xAxis.formatter?l.xAxis.formatter(t):t;h.save();h.beginPath();h.setFontSize(f);h.setFillStyle(l.xAxis.fontColor||l.fontColor);var i=measureText(String(a),f,h);var r=c[e];if(p=="center"){r=c[e]+d/2}var o=0;if(l.xAxis.scrollShow){o=6*l.pix}var n=x+6*l.pix+f-f*Math.abs(Math.sin(s._xAxisTextAngle_));if(l.xAxis.rotateAngle<0){r-=f/2;i=0}else{r+=f/2;i=-i}h.translate(r,n);h.rotate(-1*s._xAxisTextAngle_);h.fillText(String(a),i,0);h.closePath();h.stroke();h.restore()})}}h.restore();if(l.xAxis.axisLine){h.beginPath();h.setStrokeStyle(l.xAxis.axisLineColor);h.setLineWidth(1*l.pix);h.moveTo(e,l.height-l.area[2]);h.lineTo(a,l.height-l.area[2]);h.stroke()}}function drawYAxisGrid(c,e,d,a){if(e.yAxis.disableGrid===true){return}let t=e.height-e.area[0]-e.area[2];let i=t/e.yAxis.splitNumber;let r=e.area[3];let o=e.chartData.xAxisData.xAxisPoints,n=e.chartData.xAxisData.eachSpacing;let l=n*(o.length-1);if(e.type=="mount"&&e.extra&&e.extra.mount&&e.extra.mount.widthRatio&&e.extra.mount.widthRatio>1){if(e.extra.mount.widthRatio>2)e.extra.mount.widthRatio=2;l+=(e.extra.mount.widthRatio-1)*n}let x=r+l;let s=[];let h=1;if(e.xAxis.axisLine===false){h=0}for(let t=h;t<e.yAxis.splitNumber+1;t++){s.push(e.height-e.area[2]-i*t)}a.save();if(e._scrollDistance_&&e._scrollDistance_!==0){a.translate(e._scrollDistance_,0)}if(e.yAxis.gridType=="dash"){a.setLineDash([e.yAxis.dashLength*e.pix,e.yAxis.dashLength*e.pix])}a.setStrokeStyle(e.yAxis.gridColor);a.setLineWidth(1*e.pix);s.forEach(function(t,e){a.beginPath();a.moveTo(r,t);a.lineTo(x,t);a.stroke()});a.setLineDash([]);a.restore()}function drawYAxis(e,h,a,c){if(h.yAxis.disabled===true){return}var i=h.height-h.area[0]-h.area[2];var r=i/h.yAxis.splitNumber;var o=h.area[3];var n=h.width-h.area[1];var l=h.height-h.area[2];var t=l+a.xAxisHeight;if(h.xAxis.scrollShow){t-=3*h.pix}if(h.xAxis.rotateLabel){t=h.height-h.area[2]+h.fontSize*h.pix/2}c.beginPath();c.setFillStyle(h.background);if(h.enableScroll==true&&h.xAxis.scrollPosition&&h.xAxis.scrollPosition!=="left"){c.fillRect(0,0,o,t)}if(h.enableScroll==true&&h.xAxis.scrollPosition&&h.xAxis.scrollPosition!=="right"){c.fillRect(n,0,h.width,t)}c.closePath();c.stroke();let d=h.area[3];let x=h.width-h.area[1];let f=h.area[3]+(h.width-h.area[1]-h.area[3])/2;if(h.yAxis.data){for(let e=0;e<h.yAxis.data.length;e++){let s=h.yAxis.data[e];var p=[];if(s.type==="categories"){for(let t=0;t<=s.categories.length;t++){p.push(h.area[0]+i/s.categories.length/2+i/s.categories.length*t)}}else{for(let t=0;t<=h.yAxis.splitNumber;t++){p.push(h.area[0]+r*t)}}if(s.disabled!==true){let t=h.chartData.yAxisData.rangesFormat[e];let o=s.fontSize?s.fontSize*h.pix:a.fontSize;let n=h.chartData.yAxisData.yAxisWidth[e];let l=s.textAlign||"right";t.forEach(function(t,e){var a=p[e];c.beginPath();c.setFontSize(o);c.setLineWidth(1*h.pix);c.setStrokeStyle(s.axisLineColor||"#cccccc");c.setFillStyle(s.fontColor||h.fontColor);let i=0;let r=4*h.pix;if(n.position=="left"){if(s.calibration==true){c.moveTo(d,a);c.lineTo(d-3*h.pix,a);r+=3*h.pix}switch(l){case"left":c.setTextAlign("left");i=d-n.width;break;case"right":c.setTextAlign("right");i=d-r;break;default:c.setTextAlign("center");i=d-n.width/2}c.fillText(String(t),i,a+o/2-3*h.pix)}else if(n.position=="right"){if(s.calibration==true){c.moveTo(x,a);c.lineTo(x+3*h.pix,a);r+=3*h.pix}switch(l){case"left":c.setTextAlign("left");i=x+r;break;case"right":c.setTextAlign("right");i=x+n.width;break;default:c.setTextAlign("center");i=x+n.width/2}c.fillText(String(t),i,a+o/2-3*h.pix)}else if(n.position=="center"){if(s.calibration==true){c.moveTo(f,a);c.lineTo(f-3*h.pix,a);r+=3*h.pix}switch(l){case"left":c.setTextAlign("left");i=f-n.width;break;case"right":c.setTextAlign("right");i=f-r;break;default:c.setTextAlign("center");i=f-n.width/2}c.fillText(String(t),i,a+o/2-3*h.pix)}c.closePath();c.stroke();c.setTextAlign("left")});if(s.axisLine!==false){c.beginPath();c.setStrokeStyle(s.axisLineColor||"#cccccc");c.setLineWidth(1*h.pix);if(n.position=="left"){c.moveTo(d,h.height-h.area[2]);c.lineTo(d,h.area[0])}else if(n.position=="right"){c.moveTo(x,h.height-h.area[2]);c.lineTo(x,h.area[0])}else if(n.position=="center"){c.moveTo(f,h.height-h.area[2]);c.lineTo(f,h.area[0])}c.stroke()}if(h.yAxis.showTitle){let t=s.titleFontSize*h.pix||a.fontSize;let e=s.title;c.beginPath();c.setFontSize(t);c.setFillStyle(s.titleFontColor||h.fontColor);if(n.position=="left"){c.fillText(e,d-measureText(e,t,c)/2+(s.titleOffsetX||0),h.area[0]-(10-(s.titleOffsetY||0))*h.pix)}else if(n.position=="right"){c.fillText(e,x-measureText(e,t,c)/2+(s.titleOffsetX||0),h.area[0]-(10-(s.titleOffsetY||0))*h.pix)}else if(n.position=="center"){c.fillText(e,f-measureText(e,t,c)/2+(s.titleOffsetX||0),h.area[0]-(10-(s.titleOffsetY||0))*h.pix)}c.closePath();c.stroke()}if(n.position=="left"){d-=n.width+h.yAxis.padding*h.pix}else{x+=n.width+h.yAxis.padding*h.pix}}}}}function drawLegend(t,l,y,s,e){if(l.legend.show===false){return}let h=e.legendData;let a=h.points;let c=h.area;let d=l.legend.padding*l.pix;let x=l.legend.fontSize*l.pix;let f=15*l.pix;let p=5*l.pix;let g=l.legend.itemGap*l.pix;let u=Math.max(l.legend.lineHeight*l.pix,x);s.beginPath();s.setLineWidth(l.legend.borderWidth*l.pix);s.setStrokeStyle(l.legend.borderColor);s.setFillStyle(l.legend.backgroundColor);s.moveTo(c.start.x,c.start.y);s.rect(c.start.x,c.start.y,c.width,c.height);s.closePath();s.fill();s.stroke();a.forEach(function(i,t){let e=0;let a=0;e=h.widthArr[t];a=h.heightArr[t];let r=0;let o=0;if(l.legend.position=="top"||l.legend.position=="bottom"){switch(l.legend.float){case"left":r=c.start.x+d;break;case"right":r=c.start.x+c.width-e;break;default:r=c.start.x+(c.width-e)/2}o=c.start.y+d+t*u}else{if(t==0){e=0}else{e=h.widthArr[t-1]}r=c.start.x+d+e;o=c.start.y+d+(c.height-a)/2}s.setFontSize(y.fontSize);for(let a=0;a<i.length;a++){let t=i[a];t.area=[0,0,0,0];t.area[0]=r;t.area[1]=o;t.area[3]=o+u;s.beginPath();s.setLineWidth(1*l.pix);s.setStrokeStyle(t.show?t.color:l.legend.hiddenColor);s.setFillStyle(t.show?t.color:l.legend.hiddenColor);switch(t.legendShape){case"line":s.moveTo(r,o+.5*u-2*l.pix);s.fillRect(r,o+.5*u-2*l.pix,15*l.pix,4*l.pix);break;case"triangle":s.moveTo(r+7.5*l.pix,o+.5*u-5*l.pix);s.lineTo(r+2.5*l.pix,o+.5*u+5*l.pix);s.lineTo(r+12.5*l.pix,o+.5*u+5*l.pix);s.lineTo(r+7.5*l.pix,o+.5*u-5*l.pix);break;case"diamond":s.moveTo(r+7.5*l.pix,o+.5*u-5*l.pix);s.lineTo(r+2.5*l.pix,o+.5*u);s.lineTo(r+7.5*l.pix,o+.5*u+5*l.pix);s.lineTo(r+12.5*l.pix,o+.5*u);s.lineTo(r+7.5*l.pix,o+.5*u-5*l.pix);break;case"circle":s.moveTo(r+7.5*l.pix,o+.5*u);s.arc(r+7.5*l.pix,o+.5*u,5*l.pix,0,2*Math.PI);break;case"rect":s.moveTo(r,o+.5*u-5*l.pix);s.fillRect(r,o+.5*u-5*l.pix,15*l.pix,10*l.pix);break;case"square":s.moveTo(r+5*l.pix,o+.5*u-5*l.pix);s.fillRect(r+5*l.pix,o+.5*u-5*l.pix,10*l.pix,10*l.pix);break;case"none":break;default:s.moveTo(r,o+.5*u-5*l.pix);s.fillRect(r,o+.5*u-5*l.pix,15*l.pix,10*l.pix)}s.closePath();s.fill();s.stroke();r+=f+p;let e=.5*u+.5*x-2;const n=t.legendText?t.legendText:t.name;s.beginPath();s.setFontSize(x);s.setFillStyle(t.show?l.legend.fontColor:l.legend.hiddenColor);s.fillText(n,r,o+e);s.closePath();s.stroke();if(l.legend.position=="top"||l.legend.position=="bottom"){r+=measureText(n,x,s)+g;t.area[2]=r}else{t.area[2]=r+measureText(n,x,s)+g;r-=f+p;o+=u}}})}function drawPieDataPoints(t,r,e,o){var a=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var n=assign({},{activeOpacity:.5,activeRadius:10,offsetAngle:0,labelWidth:15,ringWidth:30,customRadius:0,border:false,borderWidth:2,borderColor:"#FFFFFF",centerColor:"#FFFFFF",linearType:"none",customColor:[]},r.type=="pie"?r.extra.pie:r.extra.ring);var l={x:r.area[3]+(r.width-r.area[1]-r.area[3])/2,y:r.area[0]+(r.height-r.area[0]-r.area[2])/2};if(e.pieChartLinePadding==0){e.pieChartLinePadding=n.activeRadius*r.pix}var i=Math.min((r.width-r.area[1]-r.area[3])/2-e.pieChartLinePadding-e.pieChartTextPadding-e._pieTextMaxLength_,(r.height-r.area[0]-r.area[2])/2-e.pieChartLinePadding-e.pieChartTextPadding);i=i<10?10:i;if(n.customRadius>0){i=n.customRadius*r.pix}t=getPieDataPoints(t,i,a);var h=n.activeRadius*r.pix;n.customColor=fillCustomColor(n.linearType,n.customColor,t,e);t=t.map(function(t){t._start_+=n.offsetAngle*Math.PI/180;return t});t.forEach(function(t,e){if(r.tooltip){if(r.tooltip.index==e){o.beginPath();o.setFillStyle(hexToRgb(t.color,n.activeOpacity||.5));o.moveTo(l.x,l.y);o.arc(l.x,l.y,t._radius_+h,t._start_,t._start_+2*t._proportion_*Math.PI);o.closePath();o.fill()}}o.beginPath();o.setLineWidth(n.borderWidth*r.pix);o.lineJoin="round";o.setStrokeStyle(n.borderColor);var a=t.color;if(n.linearType=="custom"){var i;if(o.createCircularGradient){i=o.createCircularGradient(l.x,l.y,t._radius_)}else{i=o.createRadialGradient(l.x,l.y,0,l.x,l.y,t._radius_)}i.addColorStop(0,hexToRgb(n.customColor[t.linearIndex],1));i.addColorStop(1,hexToRgb(t.color,1));a=i}o.setFillStyle(a);o.moveTo(l.x,l.y);o.arc(l.x,l.y,t._radius_,t._start_,t._start_+2*t._proportion_*Math.PI);o.closePath();o.fill();if(n.border==true){o.stroke()}});if(r.type==="ring"){var s=i*.6;if(typeof n.ringWidth==="number"&&n.ringWidth>0){s=Math.max(0,i-n.ringWidth*r.pix)}o.beginPath();o.setFillStyle(n.centerColor);o.moveTo(l.x,l.y);o.arc(l.x,l.y,s,0,2*Math.PI);o.closePath();o.fill()}if(r.dataLabel!==false&&a===1){drawPieText(t,r,e,o,i,l)}if(a===1&&r.type==="ring"){drawRingTitle(r,e,o,l)}return{center:l,radius:i,series:t}}function drawRoseDataPoints(t,r,e,o){var a=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var n=assign({},{type:"area",activeOpacity:.5,activeRadius:10,offsetAngle:0,labelWidth:15,border:false,borderWidth:2,borderColor:"#FFFFFF",linearType:"none",customColor:[]},r.extra.rose);if(e.pieChartLinePadding==0){e.pieChartLinePadding=n.activeRadius*r.pix}var l={x:r.area[3]+(r.width-r.area[1]-r.area[3])/2,y:r.area[0]+(r.height-r.area[0]-r.area[2])/2};var i=Math.min((r.width-r.area[1]-r.area[3])/2-e.pieChartLinePadding-e.pieChartTextPadding-e._pieTextMaxLength_,(r.height-r.area[0]-r.area[2])/2-e.pieChartLinePadding-e.pieChartTextPadding);i=i<10?10:i;var s=n.minRadius||i*.5;t=getRoseDataPoints(t,n.type,s,i,a);var h=n.activeRadius*r.pix;n.customColor=fillCustomColor(n.linearType,n.customColor,t,e);t=t.map(function(t){t._start_+=(n.offsetAngle||0)*Math.PI/180;return t});t.forEach(function(t,e){if(r.tooltip){if(r.tooltip.index==e){o.beginPath();o.setFillStyle(hexToRgb(t.color,n.activeOpacity||.5));o.moveTo(l.x,l.y);o.arc(l.x,l.y,h+t._radius_,t._start_,t._start_+2*t._rose_proportion_*Math.PI);o.closePath();o.fill()}}o.beginPath();o.setLineWidth(n.borderWidth*r.pix);o.lineJoin="round";o.setStrokeStyle(n.borderColor);var a=t.color;if(n.linearType=="custom"){var i;if(o.createCircularGradient){i=o.createCircularGradient(l.x,l.y,t._radius_)}else{i=o.createRadialGradient(l.x,l.y,0,l.x,l.y,t._radius_)}i.addColorStop(0,hexToRgb(n.customColor[t.linearIndex],1));i.addColorStop(1,hexToRgb(t.color,1));a=i}o.setFillStyle(a);o.moveTo(l.x,l.y);o.arc(l.x,l.y,t._radius_,t._start_,t._start_+2*t._rose_proportion_*Math.PI);o.closePath();o.fill();if(n.border==true){o.stroke()}});if(r.dataLabel!==false&&a===1){drawPieText(t,r,e,o,i,l)}return{center:l,radius:i,series:t}}function drawArcbarDataPoints(a,i,t,r){var e=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var o=assign({},{startAngle:.75,endAngle:.25,type:"default",lineCap:"round",width:12,gap:2,linearType:"none",customColor:[]},i.extra.arcbar);a=getArcbarDataPoints(a,o,e);var n;if(o.centerX||o.centerY){n={x:o.centerX?o.centerX:i.width/2,y:o.centerY?o.centerY:i.height/2}}else{n={x:i.width/2,y:i.height/2}}var l;if(o.radius){l=o.radius}else{l=Math.min(n.x,n.y);l-=5*i.pix;l-=o.width/2}l=l<10?10:l;o.customColor=fillCustomColor(o.linearType,o.customColor,a,t);for(let e=0;e<a.length;e++){let t=a[e];r.setLineWidth(o.width*i.pix);r.setStrokeStyle(o.backgroundColor||"#E9E9E9");r.setLineCap(o.lineCap);r.beginPath();if(o.type=="default"){r.arc(n.x,n.y,l-(o.width*i.pix+o.gap*i.pix)*e,o.startAngle*Math.PI,o.endAngle*Math.PI,false)}else{r.arc(n.x,n.y,l-(o.width*i.pix+o.gap*i.pix)*e,0,2*Math.PI,false)}r.stroke();var s=t.color;if(o.linearType=="custom"){var h=r.createLinearGradient(n.x-l,n.y,n.x+l,n.y);h.addColorStop(1,hexToRgb(o.customColor[t.linearIndex],1));h.addColorStop(0,hexToRgb(t.color,1));s=h}r.setLineWidth(o.width*i.pix);r.setStrokeStyle(s);r.setLineCap(o.lineCap);r.beginPath();r.arc(n.x,n.y,l-(o.width*i.pix+o.gap*i.pix)*e,o.startAngle*Math.PI,t._proportion_*Math.PI,false);r.stroke()}drawRingTitle(i,t,r,n);return{center:n,radius:l,series:a}}function drawGaugeDataPoints(n,h,c,t,d){var x=arguments.length>5&&arguments[5]!==undefined?arguments[5]:1;var f=assign({},{type:"default",startAngle:.75,endAngle:.25,width:15,labelOffset:13,splitLine:{fixRadius:0,splitNumber:10,width:15,color:"#FFFFFF",childNumber:5,childWidth:5},pointer:{width:15,color:"auto"}},c.extra.gauge);if(f.oldAngle==undefined){f.oldAngle=f.startAngle}if(f.oldData==undefined){f.oldData=0}n=getGaugeAxisPoints(n,f.startAngle,f.endAngle);var p={x:c.width/2,y:c.height/2};var g=Math.min(p.x,p.y);g-=5*c.pix;g-=f.width/2;g=g<10?10:g;var u=g-f.width;var y=0;if(f.type=="progress"){var v=g-f.width*3;d.beginPath();let t=d.createLinearGradient(p.x,p.y-v,p.x,p.y+v);t.addColorStop("0",hexToRgb(h[0].color,.3));t.addColorStop("1.0",hexToRgb("#FFFFFF",.1));d.setFillStyle(t);d.arc(p.x,p.y,v,0,2*Math.PI,false);d.fill();d.setLineWidth(f.width);d.setStrokeStyle(hexToRgb(h[0].color,.3));d.setLineCap("round");d.beginPath();d.arc(p.x,p.y,u,f.startAngle*Math.PI,f.endAngle*Math.PI,false);d.stroke();y=f.startAngle-f.endAngle+1;let e=y/f.splitLine.splitNumber;let a=y/f.splitLine.splitNumber/f.splitLine.childNumber;let i=-g-f.width*.5-f.splitLine.fixRadius;let r=-g-f.width-f.splitLine.fixRadius+f.splitLine.width;d.save();d.translate(p.x,p.y);d.rotate((f.startAngle-1)*Math.PI);let o=f.splitLine.splitNumber*f.splitLine.childNumber+1;let n=h[0].data*x;for(let t=0;t<o;t++){d.beginPath();if(n>t/o){d.setStrokeStyle(hexToRgb(h[0].color,1))}else{d.setStrokeStyle(hexToRgb(h[0].color,.3))}d.setLineWidth(3*c.pix);d.moveTo(i,0);d.lineTo(r,0);d.stroke();d.rotate(a*Math.PI)}d.restore();h=getGaugeArcbarDataPoints(h,f,x);d.setLineWidth(f.width);d.setStrokeStyle(h[0].color);d.setLineCap("round");d.beginPath();d.arc(p.x,p.y,u,f.startAngle*Math.PI,h[0]._proportion_*Math.PI,false);d.stroke();let l=g-f.width*2.5;d.save();d.translate(p.x,p.y);d.rotate((h[0]._proportion_-1)*Math.PI);d.beginPath();d.setLineWidth(f.width/3);let s=d.createLinearGradient(0,-l*.6,0,l*.6);s.addColorStop("0",hexToRgb("#FFFFFF",0));s.addColorStop("0.5",hexToRgb(h[0].color,1));s.addColorStop("1.0",hexToRgb("#FFFFFF",0));d.setStrokeStyle(s);d.arc(0,0,l,.85*Math.PI,1.15*Math.PI,false);d.stroke();d.beginPath();d.setLineWidth(1);d.setStrokeStyle(h[0].color);d.setFillStyle(h[0].color);d.moveTo(-l-f.width/3/2,-4);d.lineTo(-l-f.width/3/2-4,0);d.lineTo(-l-f.width/3/2,4);d.lineTo(-l-f.width/3/2,-4);d.stroke();d.fill();d.restore()}else{d.setLineWidth(f.width);d.setLineCap("butt");for(let e=0;e<n.length;e++){let t=n[e];d.beginPath();d.setStrokeStyle(t.color);d.arc(p.x,p.y,g,t._startAngle_*Math.PI,t._endAngle_*Math.PI,false);d.stroke()}d.save();y=f.startAngle-f.endAngle+1;let e=y/f.splitLine.splitNumber;let a=y/f.splitLine.splitNumber/f.splitLine.childNumber;let i=-g-f.width*.5-f.splitLine.fixRadius;let r=-g-f.width*.5-f.splitLine.fixRadius+f.splitLine.width;let o=-g-f.width*.5-f.splitLine.fixRadius+f.splitLine.childWidth;d.translate(p.x,p.y);d.rotate((f.startAngle-1)*Math.PI);for(let t=0;t<f.splitLine.splitNumber+1;t++){d.beginPath();d.setStrokeStyle(f.splitLine.color);d.setLineWidth(2*c.pix);d.moveTo(i,0);d.lineTo(r,0);d.stroke();d.rotate(e*Math.PI)}d.restore();d.save();d.translate(p.x,p.y);d.rotate((f.startAngle-1)*Math.PI);for(let t=0;t<f.splitLine.splitNumber*f.splitLine.childNumber+1;t++){d.beginPath();d.setStrokeStyle(f.splitLine.color);d.setLineWidth(1*c.pix);d.moveTo(i,0);d.lineTo(o,0);d.stroke();d.rotate(a*Math.PI)}d.restore();h=getGaugeDataPoints(h,n,f,x);for(let e=0;e<h.length;e++){let t=h[e];d.save();d.translate(p.x,p.y);d.rotate((t._proportion_-1)*Math.PI);d.beginPath();d.setFillStyle(t.color);d.moveTo(f.pointer.width,0);d.lineTo(0,-f.pointer.width/2);d.lineTo(-u,0);d.lineTo(0,f.pointer.width/2);d.lineTo(f.pointer.width,0);d.closePath();d.fill();d.beginPath();d.setFillStyle("#FFFFFF");d.arc(0,0,f.pointer.width/6,0,2*Math.PI,false);d.fill();d.restore()}if(c.dataLabel!==false){drawGaugeLabel(f,g,p,c,t,d)}}drawRingTitle(c,t,d,p);if(x===1&&c.type==="gauge"){c.extra.gauge.oldAngle=h[0]._proportion_;c.extra.gauge.oldData=h[0].data}return{center:p,radius:g,innerRadius:u,categories:n,totalAngle:y}}function drawRadarDataPoints(o,n,i,l){var t=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;var s=assign({},{gridColor:"#cccccc",gridType:"radar",gridEval:1,axisLabel:false,axisLabelTofix:0,labelColor:"#666666",labelPointShow:false,labelPointRadius:3,labelPointColor:"#cccccc",opacity:.2,gridCount:3,border:false,borderWidth:2,linearType:"none",customColor:[]},n.extra.radar);var a=getRadarCoordinateSeries(n.categories.length);var h={x:n.area[3]+(n.width-n.area[1]-n.area[3])/2,y:n.area[0]+(n.height-n.area[0]-n.area[2])/2};var r=(n.width-n.area[1]-n.area[3])/2;var d=(n.height-n.area[0]-n.area[2])/2;var c=Math.min(r-(getMaxTextListLength(n.categories,i.fontSize,l)+i.radarLabelTextMargin),d-i.radarLabelTextMargin);c-=i.radarLabelTextMargin*n.pix;c=c<10?10:c;l.beginPath();l.setLineWidth(1*n.pix);l.setStrokeStyle(s.gridColor);a.forEach(function(t,e){var a=convertCoordinateOrigin(c*Math.cos(t),c*Math.sin(t),h);l.moveTo(h.x,h.y);if(e%s.gridEval==0){l.lineTo(a.x,a.y)}});l.stroke();l.closePath();var x=function t(i){var r={};l.beginPath();l.setLineWidth(1*n.pix);l.setStrokeStyle(s.gridColor);if(s.gridType=="radar"){a.forEach(function(t,e){var a=convertCoordinateOrigin(c/s.gridCount*i*Math.cos(t),c/s.gridCount*i*Math.sin(t),h);if(e===0){r=a;l.moveTo(a.x,a.y)}else{l.lineTo(a.x,a.y)}});l.lineTo(r.x,r.y)}else{var e=convertCoordinateOrigin(c/s.gridCount*i*Math.cos(1.5),c/s.gridCount*i*Math.sin(1.5),h);l.arc(h.x,h.y,h.y-e.y,0,2*Math.PI,false)}l.stroke();l.closePath()};for(var e=1;e<=s.gridCount;e++){x(e)}s.customColor=fillCustomColor(s.linearType,s.customColor,o,i);var f=getRadarDataPoints(a,h,c,o,n,t);f.forEach(function(t,e){l.beginPath();l.setLineWidth(s.borderWidth*n.pix);l.setStrokeStyle(t.color);var a=hexToRgb(t.color,s.opacity);if(s.linearType=="custom"){var i;if(l.createCircularGradient){i=l.createCircularGradient(h.x,h.y,c)}else{i=l.createRadialGradient(h.x,h.y,0,h.x,h.y,c)}i.addColorStop(0,hexToRgb(s.customColor[o[e].linearIndex],s.opacity));i.addColorStop(1,hexToRgb(t.color,s.opacity));a=i}l.setFillStyle(a);t.data.forEach(function(t,e){if(e===0){l.moveTo(t.position.x,t.position.y)}else{l.lineTo(t.position.x,t.position.y)}});l.closePath();l.fill();if(s.border===true){l.stroke()}l.closePath();if(n.dataPointShape!==false){var r=t.data.map(function(t){return t.position});drawPointShape(r,t.color,t.pointShape,l,n)}});if(s.axisLabel===true){const p=Math.max(s.max,Math.max.apply(null,dataCombine(o)));const g=c/s.gridCount;const u=n.fontSize*n.pix;l.setFontSize(u);l.setFillStyle(n.fontColor);l.setTextAlign("left");for(var e=0;e<s.gridCount+1;e++){let t=e*p/s.gridCount;t=t.toFixed(s.axisLabelTofix);l.fillText(String(t),h.x+3*n.pix,h.y-e*g+u/2)}}drawRadarLabel(a,c,h,n,i,l);if(n.dataLabel!==false&&t===1){f.forEach(function(t,e){l.beginPath();var a=t.textSize*n.pix||i.fontSize;l.setFontSize(a);l.setFillStyle(t.textColor||n.fontColor);t.data.forEach(function(t,e){if(Math.abs(t.position.x-h.x)<2){if(t.position.y<h.y){l.setTextAlign("center");l.fillText(t.value,t.position.x,t.position.y-4)}else{l.setTextAlign("center");l.fillText(t.value,t.position.x,t.position.y+a+2)}}else{if(t.position.x<h.x){l.setTextAlign("right");l.fillText(t.value,t.position.x-4,t.position.y+a/2-2)}else{l.setTextAlign("left");l.fillText(t.value,t.position.x+4,t.position.y+a/2-2)}}});l.closePath();l.stroke()});l.setTextAlign("left")}return{center:h,radius:c,angleList:a}}function lonlat2mercator(t,e){var a=Array(2);var i=t*20037508.34/180;var r=Math.log(Math.tan((90+e)*Math.PI/360))/(Math.PI/180);r=r*20037508.34/180;a[0]=i;a[1]=r;return a}function mercator2lonlat(t,e){var a=Array(2);var i=t/20037508.34*180;var r=e/20037508.34*180;r=180/Math.PI*(2*Math.atan(Math.exp(r*Math.PI/180))-Math.PI/2);a[0]=i;a[1]=r;return a}function getBoundingBox(t){var e={},a;e.xMin=180;e.xMax=0;e.yMin=90;e.yMax=0;for(var i=0;i<t.length;i++){var r=t[i].geometry.coordinates;for(var o=0;o<r.length;o++){a=r[o];if(a.length==1){a=a[0]}for(var n=0;n<a.length;n++){var l=a[n][0];var s=a[n][1];var h={x:l,y:s};e.xMin=e.xMin<h.x?e.xMin:h.x;e.xMax=e.xMax>h.x?e.xMax:h.x;e.yMin=e.yMin<h.y?e.yMin:h.y;e.yMax=e.yMax>h.y?e.yMax:h.y}}}return e}function coordinateToPoint(t,e,a,i,r,o){return{x:(e-a.xMin)*i+r,y:(a.yMax-t)*i+o}}function pointToCoordinate(t,e,a,i,r,o){return{x:(e-r)/i+a.xMin,y:a.yMax-(t-o)/i}}function isRayIntersectsSegment(t,e,a){if(e[1]==a[1]){return false}if(e[1]>t[1]&&a[1]>t[1]){return false}if(e[1]<t[1]&&a[1]<t[1]){return false}if(e[1]==t[1]&&a[1]>t[1]){return false}if(a[1]==t[1]&&e[1]>t[1]){return false}if(e[0]<t[0]&&a[1]<t[1]){return false}let i=a[0]-(a[0]-e[0])*(a[1]-t[1])/(a[1]-e[1]);if(i<t[0]){return false}else{return true}}function isPoiWithinPoly(r,e,o){let n=0;for(let t=0;t<e.length;t++){let i=e[t][0];if(e.length==1){i=e[t][0]}for(let a=0;a<i.length-1;a++){let t=i[a];let e=i[a+1];if(o){t=lonlat2mercator(i[a][0],i[a][1]);e=lonlat2mercator(i[a+1][0],i[a+1][1])}if(isRayIntersectsSegment(r,t,e)){n+=1}}}if(n%2==1){return true}else{return false}}function drawMapDataPoints(c,a,d,i){var r=assign({},{border:true,mercator:false,borderWidth:1,borderColor:"#666666",fillOpacity:.6,activeBorderColor:"#f04864",activeFillColor:"#facc14",activeFillOpacity:1},a.extra.map);var t,o;var n=c;var l=getBoundingBox(n);if(r.mercator){var x=lonlat2mercator(l.xMax,l.yMax);var f=lonlat2mercator(l.xMin,l.yMin);l.xMax=x[0];l.yMax=x[1];l.xMin=f[0];l.yMin=f[1]}var p=a.width/Math.abs(l.xMax-l.xMin);var g=a.height/Math.abs(l.yMax-l.yMin);var s=p<g?p:g;var u=a.width/2-Math.abs(l.xMax-l.xMin)/2*s;var y=a.height/2-Math.abs(l.yMax-l.yMin)/2*s;for(var h=0;h<n.length;h++){i.beginPath();i.setLineWidth(r.borderWidth*a.pix);i.setStrokeStyle(r.borderColor);i.setFillStyle(hexToRgb(c[h].color,r.fillOpacity));if(a.tooltip){if(a.tooltip.index==h){i.setStrokeStyle(r.activeBorderColor);i.setFillStyle(hexToRgb(r.activeFillColor,r.activeFillOpacity))}}var v=n[h].geometry.coordinates;for(var m=0;m<v.length;m++){t=v[m];if(t.length==1){t=t[0]}for(var e=0;e<t.length;e++){var T=Array(2);if(r.mercator){T=lonlat2mercator(t[e][0],t[e][1])}else{T=t[e]}o=coordinateToPoint(T[1],T[0],l,s,u,y);if(e===0){i.beginPath();i.moveTo(o.x,o.y)}else{i.lineTo(o.x,o.y)}}i.fill();if(r.border==true){i.stroke()}}}if(a.dataLabel==true){for(var h=0;h<n.length;h++){var b=n[h].properties.centroid;if(b){if(r.mercator){b=lonlat2mercator(n[h].properties.centroid[0],n[h].properties.centroid[1])}o=coordinateToPoint(b[1],b[0],l,s,u,y);let t=n[h].textSize*a.pix||d.fontSize;let e=n[h].properties.name;i.beginPath();i.setFontSize(t);i.setFillStyle(n[h].textColor||a.fontColor);i.fillText(e,o.x-measureText(e,t,i)/2,o.y+t/2);i.closePath();i.stroke()}}}a.chartData.mapData={bounds:l,scale:s,xoffset:u,yoffset:y,mercator:r.mercator};drawToolTipBridge(a,d,i,1);i.draw()}function normalInt(t,e,a){a=a==0?1:a;var i=[];for(var r=0;r<a;r++){i[r]=Math.random()}return Math.floor(i.reduce(function(t,e){return t+e})/a*(e-t))+t}function collisionNew(e,a,i,r){var o=false;for(let t=0;t<a.length;t++){if(a[t].area){if(e[3]<a[t].area[1]||e[0]>a[t].area[2]||e[1]>a[t].area[3]||e[2]<a[t].area[0]){if(e[0]<0||e[1]<0||e[2]>i||e[3]>r){o=true;break}else{o=false}}else{o=true;break}}}return o}function getWordCloudPoint(c,t,d){let x=c.series;switch(t){case"normal":for(let l=0;l<x.length;l++){let t=x[l].name;let e=x[l].textSize*c.pix;let a=measureText(t,e,d);let i,r;let o;let n=0;while(true){n++;i=normalInt(-c.width/2,c.width/2,5)-a/2;r=normalInt(-c.height/2,c.height/2,5)+e/2;o=[i-5+c.width/2,r-5-e+c.height/2,i+a+5+c.width/2,r+5+c.height/2];let t=collisionNew(o,x,c.width,c.height);if(!t)break;if(n==1e3){o=[-100,-100,-100,-100];break}}x[l].area=o}break;case"vertical":function f(){if(Math.random()>.7){return true}else{return false}};for(let h=0;h<x.length;h++){let t=x[h].name;let e=x[h].textSize*c.pix;let a=measureText(t,e,d);let i=f();let r,o,n,l;let s=0;while(true){s++;let t;if(i){r=normalInt(-c.width/2,c.width/2,5)-a/2;o=normalInt(-c.height/2,c.height/2,5)+e/2;n=[o-5-a+c.width/2,-r-5+c.height/2,o+5+c.width/2,-r+e+5+c.height/2];l=[c.width-(c.width/2-c.height/2)-(-r+e+5+c.height/2)-5,c.height/2-c.width/2+(o-5-a+c.width/2)-5,c.width-(c.width/2-c.height/2)-(-r+e+5+c.height/2)+e,c.height/2-c.width/2+(o-5-a+c.width/2)+a+5];t=collisionNew(l,x,c.height,c.width)}else{r=normalInt(-c.width/2,c.width/2,5)-a/2;o=normalInt(-c.height/2,c.height/2,5)+e/2;n=[r-5+c.width/2,o-5-e+c.height/2,r+a+5+c.width/2,o+5+c.height/2];t=collisionNew(n,x,c.width,c.height)}if(!t)break;if(s==1e3){n=[-1e3,-1e3,-1e3,-1e3];break}}if(i){x[h].area=l;x[h].areav=n}else{x[h].area=n}x[h].rotate=i};break}return x}function drawWordCloudDataPoints(t,r,e,o){let n=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let a=assign({},{type:"normal",autoColors:true},r.extra.word);if(!r.chartData.wordCloudData){r.chartData.wordCloudData=getWordCloudPoint(r,a.type,o)}o.beginPath();o.setFillStyle(r.background);o.rect(0,0,r.width,r.height);o.fill();o.save();let l=r.chartData.wordCloudData;o.translate(r.width/2,r.height/2);for(let i=0;i<l.length;i++){o.save();if(l[i].rotate){o.rotate(90*Math.PI/180)}let t=l[i].name;let e=l[i].textSize*r.pix;let a=measureText(t,e,o);o.beginPath();o.setStrokeStyle(l[i].color);o.setFillStyle(l[i].color);o.setFontSize(e);if(l[i].rotate){if(l[i].areav[0]>0){if(r.tooltip){if(r.tooltip.index==i){o.strokeText(t,(l[i].areav[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].areav[1]+5+e-r.height/2)*n)}else{o.fillText(t,(l[i].areav[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].areav[1]+5+e-r.height/2)*n)}}else{o.fillText(t,(l[i].areav[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].areav[1]+5+e-r.height/2)*n)}}}else{if(l[i].area[0]>0){if(r.tooltip){if(r.tooltip.index==i){o.strokeText(t,(l[i].area[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].area[1]+5+e-r.height/2)*n)}else{o.fillText(t,(l[i].area[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].area[1]+5+e-r.height/2)*n)}}else{o.fillText(t,(l[i].area[0]+5-r.width/2)*n-a*(1-n)/2,(l[i].area[1]+5+e-r.height/2)*n)}}}o.stroke();o.restore()}o.restore()}function drawFunnelDataPoints(e,a,t,i){let c=arguments.length>4&&arguments[4]!==undefined?arguments[4]:1;let r=assign({},{type:"funnel",activeWidth:10,activeOpacity:.3,border:false,borderWidth:2,borderColor:"#FFFFFF",fillOpacity:1,labelAlign:"right",linearType:"none",customColor:[]},a.extra.funnel);let o=(a.height-a.area[0]-a.area[2])/e.length;let n={x:a.area[3]+(a.width-a.area[1]-a.area[3])/2,y:a.height-a.area[2]};let l=r.activeWidth*a.pix;let d=Math.min((a.width-a.area[1]-a.area[3])/2-l,(a.height-a.area[0]-a.area[2])/2-l);e=getFunnelDataPoints(e,d,r.type,o,c);i.save();i.translate(n.x,n.y);r.customColor=fillCustomColor(r.linearType,r.customColor,e,t);if(r.type=="pyramid"){for(let t=0;t<e.length;t++){if(t==e.length-1){if(a.tooltip){if(a.tooltip.index==t){i.beginPath();i.setFillStyle(hexToRgb(e[t].color,r.activeOpacity));i.moveTo(-l,-o);i.lineTo(-e[t].radius-l,0);i.lineTo(e[t].radius+l,0);i.lineTo(l,-o);i.lineTo(-l,-o);i.closePath();i.fill()}}e[t].funnelArea=[n.x-e[t].radius,n.y-o*(t+1),n.x+e[t].radius,n.y-o*t];i.beginPath();i.setLineWidth(r.borderWidth*a.pix);i.setStrokeStyle(r.borderColor);var s=hexToRgb(e[t].color,r.fillOpacity);if(r.linearType=="custom"){var h=i.createLinearGradient(e[t].radius,-o,-e[t].radius,-o);h.addColorStop(0,hexToRgb(e[t].color,r.fillOpacity));h.addColorStop(.5,hexToRgb(r.customColor[e[t].linearIndex],r.fillOpacity));h.addColorStop(1,hexToRgb(e[t].color,r.fillOpacity));s=h}i.setFillStyle(s);i.moveTo(0,-o);i.lineTo(-e[t].radius,0);i.lineTo(e[t].radius,0);i.lineTo(0,-o);i.closePath();i.fill();if(r.border==true){i.stroke()}}else{if(a.tooltip){if(a.tooltip.index==t){i.beginPath();i.setFillStyle(hexToRgb(e[t].color,r.activeOpacity));i.moveTo(0,0);i.lineTo(-e[t].radius-l,0);i.lineTo(-e[t+1].radius-l,-o);i.lineTo(e[t+1].radius+l,-o);i.lineTo(e[t].radius+l,0);i.lineTo(0,0);i.closePath();i.fill()}}e[t].funnelArea=[n.x-e[t].radius,n.y-o*(t+1),n.x+e[t].radius,n.y-o*t];i.beginPath();i.setLineWidth(r.borderWidth*a.pix);i.setStrokeStyle(r.borderColor);var s=hexToRgb(e[t].color,r.fillOpacity);if(r.linearType=="custom"){var h=i.createLinearGradient(e[t].radius,-o,-e[t].radius,-o);h.addColorStop(0,hexToRgb(e[t].color,r.fillOpacity));h.addColorStop(.5,hexToRgb(r.customColor[e[t].linearIndex],r.fillOpacity));h.addColorStop(1,hexToRgb(e[t].color,r.fillOpacity));s=h}i.setFillStyle(s);i.moveTo(0,0);i.lineTo(-e[t].radius,0);i.lineTo(-e[t+1].radius,-o);i.lineTo(e[t+1].radius,-o);i.lineTo(e[t].radius,0);i.lineTo(0,0);i.closePath();i.fill();if(r.border==true){i.stroke()}}i.translate(0,-o)}}else{for(let t=0;t<e.length;t++){if(t==0){if(a.tooltip){if(a.tooltip.index==t){i.beginPath();i.setFillStyle(hexToRgb(e[t].color,r.activeOpacity));i.moveTo(-l,0);i.lineTo(-e[t].radius-l,-o);i.lineTo(e[t].radius+l,-o);i.lineTo(l,0);i.lineTo(-l,0);i.closePath();i.fill()}}e[t].funnelArea=[n.x-e[t].radius,n.y-o,n.x+e[t].radius,n.y];i.beginPath();i.setLineWidth(r.borderWidth*a.pix);i.setStrokeStyle(r.borderColor);var s=hexToRgb(e[t].color,r.fillOpacity);if(r.linearType=="custom"){var h=i.createLinearGradient(e[t].radius,-o,-e[t].radius,-o);h.addColorStop(0,hexToRgb(e[t].color,r.fillOpacity));h.addColorStop(.5,hexToRgb(r.customColor[e[t].linearIndex],r.fillOpacity));h.addColorStop(1,hexToRgb(e[t].color,r.fillOpacity));s=h}i.setFillStyle(s);i.moveTo(0,0);i.lineTo(-e[t].radius,-o);i.lineTo(e[t].radius,-o);i.lineTo(0,0);i.closePath();i.fill();if(r.border==true){i.stroke()}}else{if(a.tooltip){if(a.tooltip.index==t){i.beginPath();i.setFillStyle(hexToRgb(e[t].color,r.activeOpacity));i.moveTo(0,0);i.lineTo(-e[t-1].radius-l,0);i.lineTo(-e[t].radius-l,-o);i.lineTo(e[t].radius+l,-o);i.lineTo(e[t-1].radius+l,0);i.lineTo(0,0);i.closePath();i.fill()}}e[t].funnelArea=[n.x-e[t].radius,n.y-o*(t+1),n.x+e[t].radius,n.y-o*t];i.beginPath();i.setLineWidth(r.borderWidth*a.pix);i.setStrokeStyle(r.borderColor);var s=hexToRgb(e[t].color,r.fillOpacity);if(r.linearType=="custom"){var h=i.createLinearGradient(e[t].radius,-o,-e[t].radius,-o);h.addColorStop(0,hexToRgb(e[t].color,r.fillOpacity));h.addColorStop(.5,hexToRgb(r.customColor[e[t].linearIndex],r.fillOpacity));h.addColorStop(1,hexToRgb(e[t].color,r.fillOpacity));s=h}i.setFillStyle(s);i.moveTo(0,0);i.lineTo(-e[t-1].radius,0);i.lineTo(-e[t].radius,-o);i.lineTo(e[t].radius,-o);i.lineTo(e[t-1].radius,0);i.lineTo(0,0);i.closePath();i.fill();if(r.border==true){i.stroke()}}i.translate(0,-o)}}i.restore();if(a.dataLabel!==false&&c===1){drawFunnelText(e,a,i,o,r.labelAlign,l,n)}return{center:n,radius:d,series:e}}function drawFunnelText(l,s,h,c,d,x,f){for(let n=0;n<l.length;n++){let t=l[n];if(t.labelShow===false){continue}let e,a,i,r;let o=t.formatter?t.formatter(t,n,l,s):util.toFixed(t._proportion_*100)+"%";o=t.labelText?t.labelText:o;if(d=="right"){if(s.extra.funnel.type==="pyramid"){if(n==l.length-1){e=(t.funnelArea[2]+f.x)/2}else{e=(t.funnelArea[2]+l[n+1].funnelArea[2])/2}}else{if(n==0){e=(t.funnelArea[2]+f.x)/2}else{e=(t.funnelArea[2]+l[n-1].funnelArea[2])/2}}a=e+x*2;i=t.funnelArea[1]+c/2;r=t.textSize*s.pix||s.fontSize*s.pix;h.setLineWidth(1*s.pix);h.setStrokeStyle(t.color);h.setFillStyle(t.color);h.beginPath();h.moveTo(e,i);h.lineTo(a,i);h.stroke();h.closePath();h.beginPath();h.moveTo(a,i);h.arc(a,i,2*s.pix,0,2*Math.PI);h.closePath();h.fill();h.beginPath();h.setFontSize(r);h.setFillStyle(t.textColor||s.fontColor);h.fillText(o,a+5,i+r/2-2);h.closePath();h.stroke();h.closePath()}else{if(s.extra.funnel.type==="pyramid"){if(n==l.length-1){e=(t.funnelArea[0]+f.x)/2}else{e=(t.funnelArea[0]+l[n+1].funnelArea[0])/2}}else{if(n==0){e=(t.funnelArea[0]+f.x)/2}else{e=(t.funnelArea[0]+l[n-1].funnelArea[0])/2}}a=e-x*2;i=t.funnelArea[1]+c/2;r=t.textSize*s.pix||s.fontSize*s.pix;h.setLineWidth(1*s.pix);h.setStrokeStyle(t.color);h.setFillStyle(t.color);h.beginPath();h.moveTo(e,i);h.lineTo(a,i);h.stroke();h.closePath();h.beginPath();h.moveTo(a,i);h.arc(a,i,2,0,2*Math.PI);h.closePath();h.fill();h.beginPath();h.setFontSize(r);h.setFillStyle(t.textColor||s.fontColor);h.fillText(o,a-5-measureText(o,r,h),i+r/2-2);h.closePath();h.stroke();h.closePath()}}}function drawCanvas(t,e){e.draw()}var Timing={easeIn:function t(e){return Math.pow(e,3)},easeOut:function t(e){return Math.pow(e-1,3)+1},easeInOut:function t(e){if((e/=.5)<1){return.5*Math.pow(e,3)}else{return.5*(Math.pow(e-2,3)+2)}},linear:function t(e){return e}};function Animation(r){this.isStop=false;r.duration=typeof r.duration==="undefined"?1e3:r.duration;r.timing=r.timing||"easeInOut";var o=17;function t(){if(typeof setTimeout!=="undefined"){return function(e,t){setTimeout(function(){var t=+new Date;e(t)},t)}}else if(typeof requestAnimationFrame!=="undefined"){return requestAnimationFrame}else{return function(t){t(null)}}}var n=t();var l=null;var s=function t(e){if(e===null||this.isStop===true){r.onProcess&&r.onProcess(1);r.onAnimationFinish&&r.onAnimationFinish();return}if(l===null){l=e}if(e-l<r.duration){var a=(e-l)/r.duration;var i=Timing[r.timing];a=i(a);r.onProcess&&r.onProcess(a);n(s,o)}else{r.onProcess&&r.onProcess(1);r.onAnimationFinish&&r.onAnimationFinish()}};s=s.bind(this);n(s,o)}Animation.prototype.stop=function(){this.isStop=true};function drawCharts(t,l,n,s){var h=this;var c=l.series;if(t==="pie"||t==="ring"||t==="mount"||t==="rose"||t==="funnel"){c=fixPieSeries(c,l,n)}var d=l.categories;if(t==="mount"){d=[];for(let t=0;t<c.length;t++){if(c[t].show!==false)d.push(c[t].name)}l.categories=d}c=fillSeries(c,l,n);var e=l.animation?l.duration:0;h.animationInstance&&h.animationInstance.stop();var x=null;if(t=="candle"){let t=assign({},l.extra.candle.average);if(t.show){x=calCandleMA(t.day,t.name,t.color,c[0].data);x=fillSeries(x,l,n);l.seriesMA=x}else if(l.seriesMA){x=l.seriesMA=fillSeries(l.seriesMA,l,n)}else{x=c}}else{x=c}l._series_=c=filterSeries(c);l.area=new Array(4);for(let t=0;t<4;t++){l.area[t]=l.padding[t]*l.pix}var a=calLegendData(x,l,n,l.chartData,s),r=a.area.wholeHeight,o=a.area.wholeWidth;switch(l.legend.position){case"top":l.area[0]+=r;break;case"bottom":l.area[2]+=r;break;case"left":l.area[3]+=o;break;case"right":l.area[1]+=o;break}let f={},i=0;if(l.type==="line"||l.type==="column"||l.type==="mount"||l.type==="area"||l.type==="mix"||l.type==="candle"||l.type==="scatter"||l.type==="bubble"||l.type==="bar"){f=calYAxisData(c,l,n,s);i=f.yAxisWidth;if(l.yAxis.showTitle){let e=0;for(let t=0;t<l.yAxis.data.length;t++){e=Math.max(e,l.yAxis.data[t].titleFontSize?l.yAxis.data[t].titleFontSize*l.pix:n.fontSize)}l.area[0]+=e}let e=0,a=0;for(let t=0;t<i.length;t++){if(i[t].position=="left"){if(a>0){l.area[3]+=i[t].width+l.yAxis.padding*l.pix}else{l.area[3]+=i[t].width}a+=1}else if(i[t].position=="right"){if(e>0){l.area[1]+=i[t].width+l.yAxis.padding*l.pix}else{l.area[1]+=i[t].width}e+=1}}}else{n.yAxisWidth=i}l.chartData.yAxisData=f;if(l.categories&&l.categories.length&&l.type!=="radar"&&l.type!=="gauge"&&l.type!=="bar"){l.chartData.xAxisData=getXAxisPoints(l.categories,l,n);let t=calCategoriesData(l.categories,l,n,l.chartData.xAxisData.eachSpacing,s),e=t.xAxisHeight,a=t.angle;n.xAxisHeight=e;n._xAxisTextAngle_=a;l.area[2]+=e;l.chartData.categoriesData=t}else{if(l.type==="line"||l.type==="area"||l.type==="scatter"||l.type==="bubble"||l.type==="bar"){l.chartData.xAxisData=calXAxisData(c,l,n,s);d=l.chartData.xAxisData.rangesFormat;let t=calCategoriesData(d,l,n,l.chartData.xAxisData.eachSpacing,s),e=t.xAxisHeight,a=t.angle;n.xAxisHeight=e;n._xAxisTextAngle_=a;l.area[2]+=e;l.chartData.categoriesData=t}else{l.chartData.xAxisData={xAxisPoints:[]}}}if(l.enableScroll&&l.xAxis.scrollAlign=="right"&&l._scrollDistance_===undefined){let t=0,e=l.chartData.xAxisData.xAxisPoints,a=l.chartData.xAxisData.startX,i=l.chartData.xAxisData.endX,r=l.chartData.xAxisData.eachSpacing;let o=r*(e.length-1);let n=i-a;t=n-o;h.scrollOption.currentOffset=t;h.scrollOption.startTouchX=t;h.scrollOption.distance=0;h.scrollOption.lastMoveTime=0;l._scrollDistance_=t}if(t==="pie"||t==="ring"||t==="rose"){n._pieTextMaxLength_=l.dataLabel===false?0:getPieTextMaxLength(x,n,s,l)}switch(t){case"word":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function(t){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawWordCloudDataPoints(c,l,n,s,t);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"map":s.clearRect(0,0,l.width,l.height);drawMapDataPoints(c,l,n,s);break;case"funnel":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function(t){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.funnelData=drawFunnelDataPoints(c,l,n,s,t);drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,t);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"line":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawLineDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"scatter":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawScatterDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"bubble":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawBubbleDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"mix":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawMixDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"column":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawColumnDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"mount":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawMountDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"bar":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawXAxis(d,l,n,s);var a=drawBarDataPoints(c,l,n,s,e),i=a.yAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.yAxisPoints=i;l.chartData.xAxisPoints=l.chartData.xAxisData.xAxisPoints;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"area":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawAreaDataPoints(c,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"ring":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.pieData=drawPieDataPoints(c,l,n,s,e);drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"pie":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.pieData=drawPieDataPoints(c,l,n,s,e);drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"rose":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.pieData=drawRoseDataPoints(c,l,n,s,e);drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"radar":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.radarData=drawRadarDataPoints(c,l,n,s,e);drawLegend(l.series,l,n,s,l.chartData);drawToolTipBridge(l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"arcbar":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.arcbarData=drawArcbarDataPoints(c,l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"gauge":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}l.chartData.gaugeData=drawGaugeDataPoints(d,c,l,n,s,e);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break;case"candle":this.animationInstance=new Animation({timing:l.timing,duration:e,onProcess:function t(e){s.clearRect(0,0,l.width,l.height);if(l.rotate){contextRotate(s,l)}drawYAxisGrid(d,l,n,s);drawXAxis(d,l,n,s);var a=drawCandleDataPoints(c,x,l,n,s,e),i=a.xAxisPoints,r=a.calPoints,o=a.eachSpacing;l.chartData.xAxisPoints=i;l.chartData.calPoints=r;l.chartData.eachSpacing=o;drawYAxis(c,l,n,s);if(l.enableMarkLine!==false&&e===1){drawMarkLine(l,n,s)}if(x){drawLegend(x,l,n,s,l.chartData)}else{drawLegend(l.series,l,n,s,l.chartData)}drawToolTipBridge(l,n,s,e,o,i);drawCanvas(l,s)},onAnimationFinish:function t(){h.uevent.trigger("renderComplete")}});break}}function uChartsEvent(){this.events={}}uChartsEvent.prototype.addEventListener=function(t,e){this.events[t]=this.events[t]||[];this.events[t].push(e)};uChartsEvent.prototype.delEventListener=function(t){this.events[t]=[]};uChartsEvent.prototype.trigger=function(){for(var t=arguments.length,e=Array(t),a=0;a<t;a++){e[a]=arguments[a]}var i=e[0];var r=e.slice(1);if(!!this.events[i]){this.events[i].forEach(function(t){try{t.apply(null,r)}catch(t){}})}};var uCharts=function t(a){a.pix=a.pixelRatio?a.pixelRatio:1;a.fontSize=a.fontSize?a.fontSize:13;a.fontColor=a.fontColor?a.fontColor:config.fontColor;if(a.background==""||a.background=="none"){a.background="#FFFFFF"}a.title=assign({},a.title);a.subtitle=assign({},a.subtitle);a.duration=a.duration?a.duration:1e3;a.yAxis=assign({},{data:[],showTitle:false,disabled:false,disableGrid:false,splitNumber:5,gridType:"solid",dashLength:4*a.pix,gridColor:"#cccccc",padding:10,fontColor:"#666666"},a.yAxis);a.xAxis=assign({},{rotateLabel:false,rotateAngle:45,disabled:false,disableGrid:false,splitNumber:5,calibration:false,gridType:"solid",dashLength:4,scrollAlign:"left",boundaryGap:"center",axisLine:true,axisLineColor:"#cccccc"},a.xAxis);a.xAxis.scrollPosition=a.xAxis.scrollAlign;a.legend=assign({},{show:true,position:"bottom",float:"center",backgroundColor:"rgba(0,0,0,0)",borderColor:"rgba(0,0,0,0)",borderWidth:0,padding:5,margin:5,itemGap:10,fontSize:a.fontSize,lineHeight:a.fontSize,fontColor:a.fontColor,formatter:{},hiddenColor:"#CECECE"},a.legend);a.extra=assign({},a.extra);a.rotate=a.rotate?true:false;a.animation=a.animation?true:false;a.rotate=a.rotate?true:false;a.canvas2d=a.canvas2d?true:false;let e=assign({},config);e.color=a.color?a.color:e.color;if(a.type=="pie"){e.pieChartLinePadding=a.dataLabel===false?0:a.extra.pie.labelWidth*a.pix||e.pieChartLinePadding*a.pix}if(a.type=="ring"){e.pieChartLinePadding=a.dataLabel===false?0:a.extra.ring.labelWidth*a.pix||e.pieChartLinePadding*a.pix}if(a.type=="rose"){e.pieChartLinePadding=a.dataLabel===false?0:a.extra.rose.labelWidth*a.pix||e.pieChartLinePadding*a.pix}e.pieChartTextPadding=a.dataLabel===false?0:e.pieChartTextPadding*a.pix;e.rotate=a.rotate;if(a.rotate){let t=a.width;let e=a.height;a.width=e;a.height=t}a.padding=a.padding?a.padding:e.padding;e.yAxisWidth=config.yAxisWidth*a.pix;e.xAxisHeight=config.xAxisHeight*a.pix;if(a.enableScroll&&a.xAxis.scrollShow){e.xAxisHeight+=6*a.pix}e.fontSize=a.fontSize*a.pix;e.titleFontSize=config.titleFontSize*a.pix;e.subtitleFontSize=config.subtitleFontSize*a.pix;e.toolTipPadding=config.toolTipPadding*a.pix;e.toolTipLineHeight=config.toolTipLineHeight*a.pix;if(!a.context){throw new Error("[uCharts] 未获取到context！注意：v2.0版本后，需要自行获取canvas的绘图上下文并传入opts.context！")}this.context=a.context;if(!this.context.setTextAlign){this.context.setStrokeStyle=function(t){return this.strokeStyle=t};this.context.setLineWidth=function(t){return this.lineWidth=t};this.context.setLineCap=function(t){return this.lineCap=t};this.context.setFontSize=function(t){return this.font=t+"px sans-serif"};this.context.setFillStyle=function(t){return this.fillStyle=t};this.context.setTextAlign=function(t){return this.textAlign=t};this.context.draw=function(){}}if(!this.context.setLineDash){this.context.setLineDash=function(t){}}a.chartData={};this.uevent=new uChartsEvent;this.scrollOption={currentOffset:0,startTouchX:0,distance:0,lastMoveTime:0};this.opts=a;this.config=e;drawCharts.call(this,a.type,a,e,this.context)};uCharts.prototype.updateData=function(){let t=arguments.length>0&&arguments[0]!==undefined?arguments[0]:{};this.opts=assign({},this.opts,t);this.opts.updateData=true;let c=t.scrollPosition||"current";switch(c){case"current":this.opts._scrollDistance_=this.scrollOption.currentOffset;break;case"left":this.opts._scrollDistance_=0;this.scrollOption={currentOffset:0,startTouchX:0,distance:0,lastMoveTime:0};break;case"right":let t=calYAxisData(this.opts.series,this.opts,this.config,this.context),e=t.yAxisWidth;this.config.yAxisWidth=e;let a=0;let i=getXAxisPoints(this.opts.categories,this.opts,this.config),r=i.xAxisPoints,o=i.startX,n=i.endX,l=i.eachSpacing;let s=l*(r.length-1);let h=n-o;a=h-s;this.scrollOption={currentOffset:a,startTouchX:a,distance:0,lastMoveTime:0};this.opts._scrollDistance_=a;break}drawCharts.call(this,this.opts.type,this.opts,this.config,this.context)};uCharts.prototype.zoom=function(){var t=arguments.length>0&&arguments[0]!==undefined?arguments[0]:this.opts.xAxis.itemCount;if(this.opts.enableScroll!==true){console.log("[uCharts] 请启用滚动条后使用");return}let e=Math.round(Math.abs(this.scrollOption.currentOffset)/this.opts.chartData.eachSpacing)+Math.round(this.opts.xAxis.itemCount/2);this.opts.animation=false;this.opts.xAxis.itemCount=t.itemCount;let a=calYAxisData(this.opts.series,this.opts,this.config,this.context),i=a.yAxisWidth;this.config.yAxisWidth=i;let r=0;let o=getXAxisPoints(this.opts.categories,this.opts,this.config),h=o.xAxisPoints,c=o.startX,d=o.endX,n=o.eachSpacing;let x=n*e;let l=d-c;let s=l-n*(h.length-1);r=l/2-x;if(r>0){r=0}if(r<s){r=s}this.scrollOption={currentOffset:r,startTouchX:0,distance:0,lastMoveTime:0};calValidDistance(this,r,this.opts.chartData,this.config,this.opts);this.opts._scrollDistance_=r;drawCharts.call(this,this.opts.type,this.opts,this.config,this.context)};uCharts.prototype.dobuleZoom=function(t){if(this.opts.enableScroll!==true){console.log("[uCharts] 请启用滚动条后使用");return}const a=t.changedTouches;if(a.length<2){return}for(var e=0;e<a.length;e++){a[e].x=a[e].x?a[e].x:a[e].clientX;a[e].y=a[e].y?a[e].y:a[e].clientY}const i=[getTouches(a[0],this.opts,t),getTouches(a[1],this.opts,t)];const c=Math.abs(i[0].x-i[1].x);if(!this.scrollOption.moveCount){let t={changedTouches:[{x:a[0].x,y:this.opts.area[0]/this.opts.pix+2}]};let e={changedTouches:[{x:a[1].x,y:this.opts.area[0]/this.opts.pix+2}]};if(this.opts.rotate){t={changedTouches:[{x:this.opts.height/this.opts.pix-this.opts.area[0]/this.opts.pix-2,y:a[0].y}]};e={changedTouches:[{x:this.opts.height/this.opts.pix-this.opts.area[0]/this.opts.pix-2,y:a[1].y}]}}const s=this.getCurrentDataIndex(t).index;const h=this.getCurrentDataIndex(e).index;const v=Math.abs(s-h);this.scrollOption.moveCount=v;this.scrollOption.moveCurrent1=Math.min(s,h);this.scrollOption.moveCurrent2=Math.max(s,h);return}let d=c/this.scrollOption.moveCount;let r=(this.opts.width-this.opts.area[1]-this.opts.area[3])/d;r=r<=2?2:r;r=r>=this.opts.categories.length?this.opts.categories.length:r;this.opts.animation=false;this.opts.xAxis.itemCount=r;let o=0;let n=getXAxisPoints(this.opts.categories,this.opts,this.config),x=n.xAxisPoints,f=n.startX,p=n.endX,l=n.eachSpacing;let g=l*this.scrollOption.moveCurrent1;let u=p-f;let y=u-l*(x.length-1);o=-g+Math.min(i[0].x,i[1].x)-this.opts.area[3]-l;if(o>0){o=0}if(o<y){o=y}this.scrollOption.currentOffset=o;this.scrollOption.startTouchX=0;this.scrollOption.distance=0;calValidDistance(this,o,this.opts.chartData,this.config,this.opts);this.opts._scrollDistance_=o;drawCharts.call(this,this.opts.type,this.opts,this.config,this.context)};uCharts.prototype.stopAnimation=function(){this.animationInstance&&this.animationInstance.stop()};uCharts.prototype.addEventListener=function(t,e){this.uevent.addEventListener(t,e)};uCharts.prototype.delEventListener=function(t){this.uevent.delEventListener(t)};uCharts.prototype.getCurrentDataIndex=function(e){var a=null;if(e.changedTouches){a=e.changedTouches[0]}else{a=e.mp.changedTouches[0]}if(a){let t=getTouches(a,this.opts,e);if(this.opts.type==="pie"||this.opts.type==="ring"){return findPieChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.pieData,this.opts)}else if(this.opts.type==="rose"){return findRoseChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.pieData,this.opts)}else if(this.opts.type==="radar"){return findRadarChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.radarData,this.opts.categories.length)}else if(this.opts.type==="funnel"){return findFunnelChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.funnelData)}else if(this.opts.type==="map"){return findMapChartCurrentIndex({x:t.x,y:t.y},this.opts)}else if(this.opts.type==="word"){return findWordChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.wordCloudData)}else if(this.opts.type==="bar"){return findBarChartCurrentIndex({x:t.x,y:t.y},this.opts.chartData.calPoints,this.opts,this.config,Math.abs(this.scrollOption.currentOffset))}else{return findCurrentIndex({x:t.x,y:t.y},this.opts.chartData.calPoints,this.opts,this.config,Math.abs(this.scrollOption.currentOffset))}}return-1};uCharts.prototype.getLegendDataIndex=function(e){var a=null;if(e.changedTouches){a=e.changedTouches[0]}else{a=e.mp.changedTouches[0]}if(a){let t=getTouches(a,this.opts,e);return findLegendIndex({x:t.x,y:t.y},this.opts.chartData.legendData)}return-1};uCharts.prototype.touchLegend=function(t){var e=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};var a=null;if(t.changedTouches){a=t.changedTouches[0]}else{a=t.mp.changedTouches[0]}if(a){var i=getTouches(a,this.opts,t);var r=this.getLegendDataIndex(t);if(r>=0){if(this.opts.type=="candle"){this.opts.seriesMA[r].show=!this.opts.seriesMA[r].show}else{this.opts.series[r].show=!this.opts.series[r].show}this.opts.animation=e.animation?true:false;this.opts._scrollDistance_=this.scrollOption.currentOffset;drawCharts.call(this,this.opts.type,this.opts,this.config,this.context)}}};uCharts.prototype.showToolTip=function(t){var e=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};var c=null;if(t.changedTouches){c=t.changedTouches[0]}else{c=t.mp.changedTouches[0]}if(!c){console.log("[uCharts] 未获取到event坐标信息")}var a=getTouches(c,this.opts,t);var d=this.scrollOption.currentOffset;var i=assign({},this.opts,{_scrollDistance_:d,animation:false});if(this.opts.type==="line"||this.opts.type==="area"||this.opts.type==="column"||this.opts.type==="scatter"||this.opts.type==="bubble"){var r=this.getCurrentDataIndex(t);var o=e.index==undefined?r.index:e.index;if(o>-1||o.length>0){var n=getSeriesDataItem(this.opts.series,o,r.group);if(n.length!==0){var l=getToolTipData(n,this.opts,o,r.group,this.opts.categories,e),s=l.textList,h=l.offset;h.y=a.y;i.tooltip={textList:e.textList!==undefined?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="mount"){var o=e.index==undefined?this.getCurrentDataIndex(t).index:e.index;if(o>-1){var i=assign({},this.opts,{animation:false});var n=assign({},i._series_[o]);var s=[{text:e.formatter?e.formatter(n,undefined,o,i):n.name+": "+n.data,color:n.color}];var h={x:i.chartData.calPoints[o].x,y:a.y};i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="bar"){var r=this.getCurrentDataIndex(t);var o=e.index==undefined?r.index:e.index;if(o>-1||o.length>0){var n=getSeriesDataItem(this.opts.series,o,r.group);if(n.length!==0){var l=getToolTipData(n,this.opts,o,r.group,this.opts.categories,e),s=l.textList,h=l.offset;h.x=a.x;i.tooltip={textList:e.textList!==undefined?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="mix"){var r=this.getCurrentDataIndex(t);var o=e.index==undefined?r.index:e.index;if(o>-1){var d=this.scrollOption.currentOffset;var i=assign({},this.opts,{_scrollDistance_:d,animation:false});var n=getSeriesDataItem(this.opts.series,o);if(n.length!==0){var x=getMixToolTipData(n,this.opts,o,this.opts.categories,e),s=x.textList,h=x.offset;h.y=a.y;i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="candle"){var r=this.getCurrentDataIndex(t);var o=e.index==undefined?r.index:e.index;if(o>-1){var d=this.scrollOption.currentOffset;var i=assign({},this.opts,{_scrollDistance_:d,animation:false});var n=getSeriesDataItem(this.opts.series,o);if(n.length!==0){var l=getCandleToolTipData(this.opts.series[0].data,n,this.opts,o,this.opts.categories,this.opts.extra.candle,e),s=l.textList,h=l.offset;h.y=a.y;i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="pie"||this.opts.type==="ring"||this.opts.type==="rose"||this.opts.type==="funnel"){var o=e.index==undefined?this.getCurrentDataIndex(t):e.index;if(o>-1){var i=assign({},this.opts,{animation:false});var n=assign({},i._series_[o]);var s=[{text:e.formatter?e.formatter(n,undefined,o,i):n.name+": "+n.data,color:n.color}];var h={x:a.x,y:a.y};i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="map"){var o=e.index==undefined?this.getCurrentDataIndex(t):e.index;if(o>-1){var i=assign({},this.opts,{animation:false});var n=assign({},this.opts.series[o]);n.name=n.properties.name;var s=[{text:e.formatter?e.formatter(n,undefined,o,this.opts):n.name,color:n.color}];var h={x:a.x,y:a.y};i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}i.updateData=false;drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="word"){var o=e.index==undefined?this.getCurrentDataIndex(t):e.index;if(o>-1){var i=assign({},this.opts,{animation:false});var n=assign({},this.opts.series[o]);var s=[{text:e.formatter?e.formatter(n,undefined,o,this.opts):n.name,color:n.color}];var h={x:a.x,y:a.y};i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}i.updateData=false;drawCharts.call(this,i.type,i,this.config,this.context)}if(this.opts.type==="radar"){var o=e.index==undefined?this.getCurrentDataIndex(t):e.index;if(o>-1){var i=assign({},this.opts,{animation:false});var n=getSeriesDataItem(this.opts.series,o);if(n.length!==0){var s=n.map(t=>{return{text:e.formatter?e.formatter(t,this.opts.categories[o],o,this.opts):t.name+": "+t.data,color:t.color}});var h={x:a.x,y:a.y};i.tooltip={textList:e.textList?e.textList:s,offset:e.offset!==undefined?e.offset:h,option:e,index:o}}}drawCharts.call(this,i.type,i,this.config,this.context)}};uCharts.prototype.translate=function(t){this.scrollOption={currentOffset:t,startTouchX:t,distance:0,lastMoveTime:0};let e=assign({},this.opts,{_scrollDistance_:t,animation:false});drawCharts.call(this,this.opts.type,e,this.config,this.context)};uCharts.prototype.scrollStart=function(t){var e=null;if(t.changedTouches){e=t.changedTouches[0]}else{e=t.mp.changedTouches[0]}var a=getTouches(e,this.opts,t);if(e&&this.opts.enableScroll===true){this.scrollOption.startTouchX=a.x}};uCharts.prototype.scroll=function(t){if(this.scrollOption.lastMoveTime===0){this.scrollOption.lastMoveTime=Date.now()}let e=this.opts.touchMoveLimit||60;let a=Date.now();let i=a-this.scrollOption.lastMoveTime;if(i<Math.floor(1e3/e))return;if(this.scrollOption.startTouchX==0)return;this.scrollOption.lastMoveTime=a;var r=null;if(t.changedTouches){r=t.changedTouches[0]}else{r=t.mp.changedTouches[0]}if(r&&this.opts.enableScroll===true){var o=getTouches(r,this.opts,t);var n;n=o.x-this.scrollOption.startTouchX;var l=this.scrollOption.currentOffset;var s=calValidDistance(this,l+n,this.opts.chartData,this.config,this.opts);this.scrollOption.distance=n=s-l;var h=assign({},this.opts,{_scrollDistance_:l+n,animation:false});this.opts=h;drawCharts.call(this,h.type,h,this.config,this.context);return l+n}};uCharts.prototype.scrollEnd=function(t){if(this.opts.enableScroll===true){var e=this.scrollOption,a=e.currentOffset,i=e.distance;this.scrollOption.currentOffset=a+i;this.scrollOption.distance=0;this.scrollOption.moveCount=0}};export default uCharts;
\ No newline at end of file
diff --git a/uni_modules/qiun-data-charts/license.md b/uni_modules/qiun-data-charts/license.md
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/uni_modules/qiun-data-charts/license.md
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/uni_modules/qiun-data-charts/package.json b/uni_modules/qiun-data-charts/package.json
new file mode 100644
index 0000000..891ef3a
--- /dev/null
+++ b/uni_modules/qiun-data-charts/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "qiun-data-charts",
+  "displayName": "秋云 ucharts echarts 高性能跨全端图表组件",
+  "version": "2.4.3-20220505",
+  "description": "uCharts 新增双指缩放、新增山峰图！支持H5及APP用 ucharts echarts 渲染图表，uniapp可视化首选组件",
+  "keywords": [
+    "ucharts",
+    "echarts",
+    "f2",
+    "图表",
+    "可视化"
+],
+  "repository": "https://gitee.com/uCharts/uCharts",
+  "engines": {
+    "HBuilderX": "^3.3.8"
+  },
+  "dcloudext": {
+    "category": [
+        "前端组件",
+        "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "474119"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/~qiun"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/qiun-data-charts/readme.md b/uni_modules/qiun-data-charts/readme.md
new file mode 100644
index 0000000..1e99bca
--- /dev/null
+++ b/uni_modules/qiun-data-charts/readme.md
@@ -0,0 +1,102 @@
+
+
+## <font color='red'>写给uCharts使用者的一封信</font>
+<font color='red'>
+亲爱的用户：
+
+- 由于最近上线的官网中实行了部分收费体验，收到了许多用户的使用反馈，大致反馈的问题都指向同一矛头：为何新官网的在线工具也要收费？对于这件事，我们深表歉意。由于新官网本身未提供技术文档，使得用户误以为我们对文档实行了收费。经我们连夜整改，新官网目前已经将技术文档开放出来供大家阅读使用，并免费对外开放了【演示】中的查看全端全平台的代码的功能，为此再次向所受影响的用户们致以诚恳的歉意。
+
+- 其次，我们须澄清几点，如下：
+1. uCharts的插件本身遵循开源原则，并不收费，用户可自行到DCloud市场与Gitee码云上获取源码
+2. uCharts的技术文档永久对用户开放
+3. 收费内容仅针对原生工具、组件工具、定制功能以及模板市场的部分收费模板
+
+- uCharts为什么实行收费原则？
+1. 服务器的费用支撑
+2. 团队的运营支出；正如你所见，我们的群里有大量的用户在请教图表配置与反馈问题，群里的每一位管理员都在花费不少精力在积极解决用户的问题，然而遇到巨大的咨询量时，我们无法及时、精准解答回复，因此，我们推出了会员优先服务
+3. 与其说模板市场是收费，倒不如说给野生用户提供了创造价值的机会，用户既可以在上面发布模板赚取费用，遇到心动的模板也能免费/付费使用
+
+- 收费不是目的，正如你们所见，用户可以申请成为[【开发者】](https://www.ucharts.cn/v2/#/agreement/developer)，开发者不限制任何官网功能，并享有官方指导、开发、改造uCharts的权力，并且活动期间【返还超级会员费用】！我们想说的是，我们新版官网上线旨在希望更多的用户加入到开发者的队伍，我们共同去维护uCharts！
+       
+我们相信：星星之火可以燎原！
+
+uCharts技术团队
+
+2022.4.23
+
+</font>
+
+
+![logo](https://img-blog.csdnimg.cn/4a276226973841468c1be356f8d9438b.png)
+
+
+[![star](https://gitee.com/uCharts/uCharts/badge/star.svg?theme=gvp)](https://gitee.com/uCharts/uCharts/stargazers)
+[![fork](https://gitee.com/uCharts/uCharts/badge/fork.svg?theme=gvp)](https://gitee.com/uCharts/uCharts/members)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+[![npm package](https://img.shields.io/npm/v/@qiun/ucharts.svg?style=flat-square)](https://www.npmjs.com/~qiun)
+
+
+## uCharts简介
+
+`uCharts`是一款基于`canvas API`开发的适用于所有前端应用的图表库，开发者编写一套代码，可运行到 Web、iOS、Android（基于 uni-app / taro ）、以及各种小程序（微信/支付宝/百度/头条/飞书/QQ/快手/钉钉/淘宝）、快应用等更多支持 canvas API 的平台。
+
+## 官方网站
+
+## [https://www.ucharts.cn](https://www.ucharts.cn)
+
+## 快速体验
+
+一套代码编到多个平台，依次扫描二维码，亲自体验uCharts图表跨平台效果！其他平台请自行编译。
+
+![](https://www.ucharts.cn/images/web/guide/qrcode20220224.png)
+
+## 致开发者
+
+感谢各位开发者`四年`来对秋云及uCharts的支持，uCharts的进步离不开各位开发者的鼓励与贡献。为更好的帮助各位开发者使用图表工具，我们推出了新版官网，增加了在线定制、问答社区、在线配置等一些增值服务，为确保您能更好的应用图表组件，建议您先`仔细阅读本页指南`以及`常见问题`，而不是下载下来`直接使用`。如仍然不能解决，请到`官网社区`或开通会员后加入`专属VIP会员群`提问将会很快得到回答。
+
+## 社群支持
+
+uCharts官方拥有4个2000人的QQ群及专属VIP会员群支持，庞大的用户量证明我们一直在努力，请各位放心使用！uCharts的开源图表组件的开发，团队付出了大量的时间与精力，经过四来的考验，不会有比较明显的bug，请各位放心使用。如果您有更好的想法，可以在`码云提交Pull Requests`以帮助更多开发者完成需求，再次感谢各位对uCharts的鼓励与支持！
+
+#### 官方交流群
+- 交流群1：371774600（已满）
+- 交流群2：619841586（已满）
+- 交流群3：955340127（已满）
+- 交流群4：641669795
+- 口令`uniapp`
+
+#### 专属VIP会员群
+- 开通会员后详见【账号详情】页面中顶部的滚动通知
+- 口令`您的用户ID`
+
+## 版权信息
+
+uCharts始终坚持开源，遵循 [Apache Licence 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) 开源协议，意味着您无需支付任何费用，即可将uCharts应用到您的产品中。
+
+注意：这并不意味着您可以将uCharts应用到非法的领域，比如涉及赌博，暴力等方面。如因此产生纠纷或法律问题，uCharts相关方及秋云科技不承担任何责任。
+
+## 合作伙伴
+
+[![DIY官网](https://www.ucharts.cn/images/web/guide/links/diy-gw.png)](https://www.diygw.com/)
+[![HasChat](https://www.ucharts.cn/images/web/guide/links/haschat.png)](https://gitee.com/howcode/has-chat)
+[![uViewUI](https://www.ucharts.cn/images/web/guide/links/uView.png)](https://www.uviewui.com/)
+[![图鸟UI](https://www.ucharts.cn/images/web/guide/links/tuniao.png)](https://ext.dcloud.net.cn/plugin?id=7088)
+[![thorui](https://www.ucharts.cn/images/web/guide/links/thorui.png)](https://ext.dcloud.net.cn/publisher?id=202)
+[![FirstUI](https://www.ucharts.cn/images/web/guide/links/first.png)](https://www.firstui.cn/)
+[![nProUI](https://www.ucharts.cn/images/web/guide/links/nPro.png)](https://ext.dcloud.net.cn/plugin?id=5169)
+[![GraceUI](https://www.ucharts.cn/images/web/guide/links/grace.png)](https://www.graceui.com/)
+
+
+## 更新记录
+
+详见官网指南中说明，[点击此处查看](https://www.ucharts.cn/v2/#/guide/index?id=100)
+
+
+## 相关链接
+- [uCharts官网](https://www.ucharts.cn)
+- [DCloud插件市场地址](https://ext.dcloud.net.cn/plugin?id=271)
+- [uCharts码云开源托管地址](https://gitee.com/uCharts/uCharts) [![star](https://gitee.com/uCharts/uCharts/badge/star.svg?theme=gvp)](https://gitee.com/uCharts/uCharts/stargazers)
+- [uCharts npm开源地址](https://www.ucharts.cn)
+- [ECharts官网](https://echarts.apache.org/zh/index.html)
+- [ECharts配置手册](https://echarts.apache.org/zh/option.html)
+- [图表组件在项目中的应用 ReportPlus数据报表](https://www.ucharts.cn/v2/#/layout/info?id=1) 
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/changelog.md b/uni_modules/uni-easyinput/changelog.md
new file mode 100644
index 0000000..6c6b083
--- /dev/null
+++ b/uni_modules/uni-easyinput/changelog.md
@@ -0,0 +1,41 @@
+## 1.0.5（2022-06-07）
+- 优化 clearable 显示策略
+## 1.0.4（2022-06-07）
+- 优化 clearable 显示策略
+## 1.0.3（2022-05-20）
+- 修复 关闭图标某些情况下无法取消的bug
+## 1.0.2（2022-04-12）
+- 修复 默认值不生效的bug
+## 1.0.1（2022-04-02）
+- 修复 value不能为0的bug
+## 1.0.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-easyinput](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+## 0.1.4（2021-08-20）
+- 修复 在 uni-forms 的动态表单中默认值校验不通过的 bug
+## 0.1.3（2021-08-11）
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+## 0.1.2（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 0.1.1
+- 优化 errorMessage 属性支持 Boolean 类型
+## 0.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.16（2021-06-29）
+- 修复 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
+## 0.0.15（2021-06-21）
+- 修复 passwordIcon 属性拼写错误的 bug
+## 0.0.14（2021-06-18）
+- 新增 passwordIcon 属性，当type=password时是否显示小眼睛图标
+- 修复 confirmType 属性不生效的问题
+## 0.0.13（2021-06-04）
+- 修复 disabled 状态可清出内容的 bug
+## 0.0.12（2021-05-12）
+- 新增 组件示例地址
+## 0.0.11（2021-05-07）
+- 修复 input-border 属性不生效的问题
+## 0.0.10（2021-04-30）
+- 修复 ios 遮挡文字、显示一半的问题
+## 0.0.9（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/common.js b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
new file mode 100644
index 0000000..df9abe1
--- /dev/null
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
@@ -0,0 +1,56 @@
+/**
+ * @desc 函数防抖
+ * @param func 目标函数
+ * @param wait 延迟执行毫秒数
+ * @param immediate true - 立即执行， false - 延迟执行
+ */
+export const debounce = function(func, wait = 1000, immediate = true) {
+	let timer;
+	console.log(1);
+	return function() {
+		console.log(123);
+		let context = this,
+			args = arguments;
+		if (timer) clearTimeout(timer);
+		if (immediate) {
+			let callNow = !timer;
+			timer = setTimeout(() => {
+				timer = null;
+			}, wait);
+			if (callNow) func.apply(context, args);
+		} else {
+			timer = setTimeout(() => {
+				func.apply(context, args);
+			}, wait)
+		}
+	}
+}
+/**
+ * @desc 函数节流
+ * @param func 函数
+ * @param wait 延迟执行毫秒数
+ * @param type 1 使用表时间戳，在时间段开始的时候触发 2 使用表定时器，在时间段结束的时候触发
+ */
+export const throttle = (func, wait = 1000, type = 1) => {
+	let previous = 0;
+	let timeout;
+	return function() {
+		let context = this;
+		let args = arguments;
+		if (type === 1) {
+			let now = Date.now();
+
+			if (now - previous > wait) {
+				func.apply(context, args);
+				previous = now;
+			}
+		} else if (type === 2) {
+			if (!timeout) {
+				timeout = setTimeout(() => {
+					timeout = null;
+					func.apply(context, args)
+				}, wait)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
new file mode 100644
index 0000000..36e7702
--- /dev/null
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -0,0 +1,461 @@
+<template>
+	<view class="uni-easyinput" :class="{'uni-easyinput-error':msg}" :style="{color:inputBorder && msg?'#e43d33':styles.color}">
+		<view class="uni-easyinput__content" :class="{'is-input-border':inputBorder ,'is-input-error-border':inputBorder && msg,'is-textarea':type==='textarea','is-disabled':disabled}"
+		 :style="{'border-color':inputBorder && msg?'#dd524d':styles.borderColor,'background-color':disabled?styles.disableColor:''}">
+			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')"></uni-icons>
+			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{'input-padding':inputBorder}"
+			 :name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class"
+			 :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" @input="onInput" @blur="onBlur"  @focus="onFocus"
+			 @confirm="onConfirm"></textarea>
+			<input v-else :type="type === 'password'?'text':type" class="uni-easyinput__content-input" :style="{
+				 'padding-right':type === 'password' ||clearable || prefixIcon?'':'10px',
+				 'padding-left':prefixIcon?'':'10px'
+			 }"
+			 :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder"
+			 :placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" @focus="onFocus"
+			 @blur="onBlur" @input="onInput" @confirm="onConfirm" />
+			<template v-if="type === 'password' && passwordIcon" >
+				<uni-icons v-if="val" class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}" :type="showPassword?'eye-slash-filled':'eye-filled'"
+				 :size="18" color="#c0c4cc" @click="onEyes"></uni-icons>
+			</template>
+			<template v-else-if="suffixIcon">
+				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc" @click="onClickIcon('suffix')"></uni-icons>
+			</template>
+			<template v-else>
+				<uni-icons class="content-clear-icon" :class="{'is-textarea-icon':type==='textarea'}" type="clear" :size="clearSize"
+				 v-if="clearable && val && !disabled" color="#c0c4cc" @click="onClear"></uni-icons>
+			</template>
+			<slot name="right"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	// import {
+	// 	debounce,
+	// 	throttle
+	// } from './common.js'
+	/**
+	 * Easyinput 输入框
+	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3455
+	 * @property {String}	value	输入内容
+	 * @property {String }	type	输入框的类型（默认text） password/text/textarea/..
+	 * 	@value text			文本输入键盘
+	 * 	@value textarea	多行文本输入键盘
+	 * 	@value password	密码输入键盘
+	 * 	@value number		数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
+	 * 	@value idcard		身份证输入键盘，信、支付宝、百度、QQ小程序
+	 * 	@value digit		带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
+	 * @property {Boolean}	clearable	是否显示右侧清空内容的图标控件，点击可清空输入框内容（默认true）
+	 * @property {Boolean}	autoHeight	是否自动增高输入区域，type为textarea时有效（默认false）
+	 * @property {String }	placeholder	输入框的提示文字
+	 * @property {String }	placeholderStyle	placeholder的样式(内联样式，字符串)，如"color: #ddd"
+	 * @property {Boolean}	focus	是否自动获得焦点（默认false）
+	 * @property {Boolean}	disabled	是否禁用（默认false）
+	 * @property {Number }	maxlength	最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+	 * @property {String }	confirmType	设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+	 * @property {Number }	clearSize	清除图标的大小，单位px（默认15）
+	 * @property {String}	prefixIcon	输入框头部图标
+	 * @property {String}	suffixIcon	输入框尾部图标
+	 * @property {Boolean}	trim	是否自动去除两端的空格
+	 * @value both	去除两端空格
+	 * @value left	去除左侧空格
+	 * @value right	去除右侧空格
+	 * @value start	去除左侧空格
+	 * @value end		去除右侧空格
+	 * @value all		去除全部空格
+	 * @value none	不去除空格
+	 * @property {Boolean}	inputBorder	是否显示input输入框的边框（默认true）
+	 * @property {Boolean}	passwordIcon	type=password时是否显示小眼睛图标
+	 * @property {Object}	styles	自定义颜色
+	 * @event {Function}	input	输入框内容发生变化时触发
+	 * @event {Function}	focus	输入框获得焦点时触发
+	 * @event {Function}	blur	输入框失去焦点时触发
+	 * @event {Function}	confirm	点击完成按钮时触发
+	 * @event {Function}	iconClick	点击图标时触发
+	 * @example <uni-easyinput v-model="mobile"></uni-easyinput>
+	 */
+
+	 export default {
+		name: 'uni-easyinput',
+		emits:['click','iconClick','update:modelValue','input','focus','blur','confirm'],
+		model:{
+			prop:'modelValue',
+			event:'update:modelValue'
+		},
+		props: {
+			name: String,
+			value: [Number, String],
+			modelValue: [Number, String],
+			type: {
+				type: String,
+				default: 'text'
+			},
+			clearable: {
+				type: Boolean,
+				default: true
+			},
+			autoHeight: {
+				type: Boolean,
+				default: false
+			},
+			placeholder: String,
+			placeholderStyle: String,
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			maxlength: {
+				type: [Number, String],
+				default: 140
+			},
+			confirmType: {
+				type: String,
+				default: 'done'
+			},
+			clearSize: {
+				type: [Number, String],
+				default: 15
+			},
+			inputBorder: {
+				type: Boolean,
+				default: true
+			},
+			prefixIcon: {
+				type: String,
+				default: ''
+			},
+			suffixIcon: {
+				type: String,
+				default: ''
+			},
+			trim: {
+				type: [Boolean, String],
+				default: true
+			},
+			passwordIcon:{
+				type: Boolean,
+				default: true
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {
+						color: '#333',
+						disableColor: '#F7F6F6',
+						borderColor: '#e5e5e5'
+					}
+				}
+			},
+			errorMessage:{
+				type:[String,Boolean],
+				default:''
+			}
+		},
+		data() {
+			return {
+				focused: false,
+				errMsg: '',
+				val: '',
+				showMsg: '',
+				border: false,
+				isFirstBorder: false,
+				showClearIcon: false,
+				showPassword: false
+			};
+		},
+		computed: {
+			msg() {
+				return this.errorMessage || this.errMsg;
+			},
+			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
+			inputMaxlength() {
+				return Number(this.maxlength);
+			},
+		},
+		watch: {
+			value(newVal) {
+				if (this.errMsg) this.errMsg = ''
+				this.val = newVal
+				// fix by mehaotian is_reset 在 uni-forms 中定义
+				if (this.form && this.formItem &&!this.is_reset) {
+					this.is_reset = false
+					this.formItem.setValue(newVal)
+				}
+			},
+			modelValue(newVal) {
+				if (this.errMsg) this.errMsg = ''
+				this.val = newVal
+				if (this.form && this.formItem &&!this.is_reset) {
+					this.is_reset = false
+					this.formItem.setValue(newVal)
+				}
+			},
+			focus(newVal) {
+				this.$nextTick(() => {
+					this.focused = this.focus
+				})
+			}
+		},
+		created() {
+			if(!this.value && this.value !== 0){
+				this.val = this.modelValue
+			}
+			if(!this.modelValue && this.modelValue !== 0){
+				this.val = this.value
+			}
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			if (this.form && this.formItem) {
+				if (this.formItem.name) {
+					if(!this.is_reset){
+						this.is_reset = false
+						this.formItem.setValue(this.val)
+					}
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
+			}
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.focused = this.focus
+			})
+		},
+		methods: {
+			/**
+			 * 初始化变量值
+			 */
+			init() {
+
+			},
+			onClickIcon(type) {
+				this.$emit('iconClick', type)
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+
+			onEyes() {
+				this.showPassword = !this.showPassword
+			},
+			onInput(event) {
+				let value = event.detail.value;
+				// 判断是否去除空格
+				if (this.trim) {
+					if (typeof(this.trim) === 'boolean' && this.trim) {
+						value = this.trimStr(value)
+					}
+					if (typeof(this.trim) === 'string') {
+						value = this.trimStr(value, this.trim)
+					}
+				};
+				if (this.errMsg) this.errMsg = ''
+				this.val = value
+				// TODO 兼容 vue2
+				this.$emit('input', value);
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue',value)
+			},
+
+			onFocus(event) {
+				this.$emit('focus', event);
+			},
+			onBlur(event) {
+				let value = event.detail.value;
+				this.$emit('blur', event);
+			},
+			onConfirm(e) {
+				this.$emit('confirm', e.detail.value);
+			},
+			onClear(event) {
+				this.val = '';
+				// TODO 兼容 vue2
+				this.$emit('input', '');
+				// TODO 兼容 vue2
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue','')
+			},
+			fieldClick() {
+				this.$emit('click');
+			},
+			trimStr(str, pos = 'both') {
+				if (pos === 'both') {
+					return str.trim();
+				} else if (pos === 'left') {
+					return str.trimLeft();
+				} else if (pos === 'right') {
+					return str.trimRight();
+				} else if (pos === 'start') {
+					return str.trimStart()
+				} else if (pos === 'end') {
+					return str.trimEnd()
+				} else if (pos === 'all') {
+					return str.replace(/\s+/g, '');
+				} else if (pos === 'none') {
+					return str;
+				}
+				return str;
+			}
+		}
+	};
+</script>
+
+<style lang="scss" >
+	$uni-error: #e43d33;
+	$uni-border-1: #DCDFE6 !default;
+	.uni-easyinput {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		/* #endif */
+		flex: 1;
+		position: relative;
+		text-align: left;
+		color: #333;
+		font-size: 14px;
+	}
+
+	.uni-easyinput__content {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		box-sizing: border-box;
+		min-height: 36px;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-easyinput__content-input {
+		/* #ifndef APP-NVUE */
+		width: auto;
+		/* #endif */
+		position: relative;
+		overflow: hidden;
+		flex: 1;
+		line-height: 1;
+		font-size: 14px;
+	}
+	.uni-easyinput__placeholder-class {
+		color: #999;
+		font-size: 12px;
+		font-weight: 200;
+	}
+	.is-textarea {
+		align-items: flex-start;
+	}
+
+	.is-textarea-icon {
+		margin-top: 5px;
+	}
+
+	.uni-easyinput__content-textarea {
+		position: relative;
+		overflow: hidden;
+		flex: 1;
+		line-height: 1.5;
+		font-size: 14px;
+		padding-top: 6px;
+		padding-bottom: 10px;
+		height: 80px;
+		/* #ifndef APP-NVUE */
+		min-height: 80px;
+		width: auto;
+		/* #endif */
+	}
+
+	.input-padding {
+		padding-left: 10px;
+	}
+
+	.content-clear-icon {
+		padding: 0 5px;
+	}
+
+	.label-icon {
+		margin-right: 5px;
+		margin-top: -1px;
+	}
+
+	// 显示边框
+	.is-input-border {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border: 1px solid $uni-border-1;
+		border-radius: 4px;
+	}
+
+	.uni-error-message {
+		position: absolute;
+		bottom: -17px;
+		left: 0;
+		line-height: 12px;
+		color: $uni-error;
+		font-size: 12px;
+		text-align: left;
+	}
+
+	.uni-error-msg--boeder {
+		position: relative;
+		bottom: 0;
+		line-height: 22px;
+	}
+
+	.is-input-error-border {
+		border-color: $uni-error;
+		.uni-easyinput__placeholder-class {
+			color: mix(#fff, $uni-error, 50%);;
+		}
+	}
+
+
+	.uni-easyinput--border {
+		margin-bottom: 0;
+		padding: 10px 15px;
+		// padding-bottom: 0;
+		border-top: 1px #eee solid;
+	}
+
+	.uni-easyinput-error {
+		padding-bottom: 0;
+	}
+
+	.is-first-border {
+		/* #ifndef APP-NVUE */
+		border: none;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		border-width: 0;
+		/* #endif */
+	}
+
+	.is-disabled {
+		border-color: red;
+		background-color: #F7F6F6;
+		color: #D5D5D5;
+		.uni-easyinput__placeholder-class {
+			color: #D5D5D5;
+			font-size: 12px;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-easyinput/package.json b/uni_modules/uni-easyinput/package.json
new file mode 100644
index 0000000..15482b2
--- /dev/null
+++ b/uni_modules/uni-easyinput/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-easyinput",
+  "displayName": "uni-easyinput 增强输入框",
+  "version": "1.0.5",
+  "description": "Easyinput 组件是对原生input组件的增强",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "input",
+    "uni-easyinput",
+    "输入框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/readme.md b/uni_modules/uni-easyinput/readme.md
new file mode 100644
index 0000000..f1faf8f
--- /dev/null
+++ b/uni_modules/uni-easyinput/readme.md
@@ -0,0 +1,11 @@
+
+
+### Easyinput 增强输入框
+> **组件名：uni-easyinput**
+> 代码块： `uEasyinput`
+
+
+easyinput 组件是对原生input组件的增强 ，是专门为配合表单组件[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)而设计的，easyinput 内置了边框，图标等，同时包含 input 所有功能
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
new file mode 100644
index 0000000..6449885
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,22 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 1.3.0（2021-11-19）
+- 新增 更多图标
+- 优化 自定义图标使用方式
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-icons/components/uni-icons/icons.js b/uni_modules/uni-icons/components/uni-icons/icons.js
new file mode 100644
index 0000000..7889936
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -0,0 +1,1169 @@
+export default {
+  "id": "2852637",
+  "name": "uniui图标库",
+  "font_family": "uniicons",
+  "css_prefix_text": "uniui-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "25027049",
+      "name": "yanse",
+      "font_class": "color",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "25027048",
+      "name": "wallet",
+      "font_class": "wallet",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
+      "icon_id": "25015720",
+      "name": "settings-filled",
+      "font_class": "settings-filled",
+      "unicode": "e6ce",
+      "unicode_decimal": 59086
+    },
+    {
+      "icon_id": "25015434",
+      "name": "shimingrenzheng-filled",
+      "font_class": "auth-filled",
+      "unicode": "e6cc",
+      "unicode_decimal": 59084
+    },
+    {
+      "icon_id": "24934246",
+      "name": "shop-filled",
+      "font_class": "shop-filled",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "24934159",
+      "name": "staff-filled-01",
+      "font_class": "staff-filled",
+      "unicode": "e6cb",
+      "unicode_decimal": 59083
+    },
+    {
+      "icon_id": "24932461",
+      "name": "VIP-filled",
+      "font_class": "vip-filled",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
+    },
+    {
+      "icon_id": "24932462",
+      "name": "plus_circle_fill",
+      "font_class": "plus-filled",
+      "unicode": "e6c7",
+      "unicode_decimal": 59079
+    },
+    {
+      "icon_id": "24932463",
+      "name": "folder_add-filled",
+      "font_class": "folder-add-filled",
+      "unicode": "e6c8",
+      "unicode_decimal": 59080
+    },
+    {
+      "icon_id": "24932464",
+      "name": "yanse-filled",
+      "font_class": "color-filled",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "24932465",
+      "name": "tune-filled",
+      "font_class": "tune-filled",
+      "unicode": "e6ca",
+      "unicode_decimal": 59082
+    },
+    {
+      "icon_id": "24932455",
+      "name": "a-rilidaka-filled",
+      "font_class": "calendar-filled",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "24932456",
+      "name": "notification-filled",
+      "font_class": "notification-filled",
+      "unicode": "e6c1",
+      "unicode_decimal": 59073
+    },
+    {
+      "icon_id": "24932457",
+      "name": "wallet-filled",
+      "font_class": "wallet-filled",
+      "unicode": "e6c2",
+      "unicode_decimal": 59074
+    },
+    {
+      "icon_id": "24932458",
+      "name": "paihangbang-filled",
+      "font_class": "medal-filled",
+      "unicode": "e6c3",
+      "unicode_decimal": 59075
+    },
+    {
+      "icon_id": "24932459",
+      "name": "gift-filled",
+      "font_class": "gift-filled",
+      "unicode": "e6c4",
+      "unicode_decimal": 59076
+    },
+    {
+      "icon_id": "24932460",
+      "name": "fire-filled",
+      "font_class": "fire-filled",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    },
+    {
+      "icon_id": "24928001",
+      "name": "refreshempty",
+      "font_class": "refreshempty",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "24926853",
+      "name": "location-ellipse",
+      "font_class": "location-filled",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "24926735",
+      "name": "person-filled",
+      "font_class": "person-filled",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
+    },
+    {
+      "icon_id": "24926703",
+      "name": "personadd-filled",
+      "font_class": "personadd-filled",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
+    {
+      "icon_id": "24923351",
+      "name": "back",
+      "font_class": "back",
+      "unicode": "e6b9",
+      "unicode_decimal": 59065
+    },
+    {
+      "icon_id": "24923352",
+      "name": "forward",
+      "font_class": "forward",
+      "unicode": "e6ba",
+      "unicode_decimal": 59066
+    },
+    {
+      "icon_id": "24923353",
+      "name": "arrowthinright",
+      "font_class": "arrow-right",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
+    {
+      "icon_id": "24923354",
+      "name": "arrowthinleft",
+      "font_class": "arrow-left",
+      "unicode": "e6bc",
+      "unicode_decimal": 59068
+    },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
+    {
+      "icon_id": "24923355",
+      "name": "arrowthinup",
+      "font_class": "arrow-up",
+      "unicode": "e6bd",
+      "unicode_decimal": 59069
+    },
+		{
+		  "icon_id": "24923355",
+		  "name": "arrowthinup",
+		  "font_class": "arrowthinup",
+		  "unicode": "e6bd",
+		  "unicode_decimal": 59069
+		},
+    {
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrow-down",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },{
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrowthindown",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },
+    {
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "bottom",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },
+    {
+      "icon_id": "24923346",
+      "name": "arrowright",
+      "font_class": "right",
+      "unicode": "e6b5",
+      "unicode_decimal": 59061
+    },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
+    {
+      "icon_id": "24923347",
+      "name": "arrowup",
+      "font_class": "top",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
+    {
+      "icon_id": "24923348",
+      "name": "arrowleft",
+      "font_class": "left",
+      "unicode": "e6b7",
+      "unicode_decimal": 59063
+    },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
+    {
+      "icon_id": "24923334",
+      "name": "eye",
+      "font_class": "eye",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "24923335",
+      "name": "eye-filled",
+      "font_class": "eye-filled",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "24923336",
+      "name": "eye-slash",
+      "font_class": "eye-slash",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "24923337",
+      "name": "eye-slash-filled",
+      "font_class": "eye-slash-filled",
+      "unicode": "e6b4",
+      "unicode_decimal": 59060
+    },
+    {
+      "icon_id": "24923305",
+      "name": "info-filled",
+      "font_class": "info-filled",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "24923299",
+      "name": "reload-01",
+      "font_class": "reload",
+      "unicode": "e6b2",
+      "unicode_decimal": 59058
+    },
+    {
+      "icon_id": "24923195",
+      "name": "mic_slash_fill",
+      "font_class": "micoff-filled",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "24923165",
+      "name": "map-pin-ellipse",
+      "font_class": "map-pin-ellipse",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "24923166",
+      "name": "map-pin",
+      "font_class": "map-pin",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
+    },
+    {
+      "icon_id": "24923167",
+      "name": "location",
+      "font_class": "location",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "24923064",
+      "name": "starhalf",
+      "font_class": "starhalf",
+      "unicode": "e683",
+      "unicode_decimal": 59011
+    },
+    {
+      "icon_id": "24923065",
+      "name": "star",
+      "font_class": "star",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "24923066",
+      "name": "star-filled",
+      "font_class": "star-filled",
+      "unicode": "e68f",
+      "unicode_decimal": 59023
+    },
+    {
+      "icon_id": "24899646",
+      "name": "a-rilidaka",
+      "font_class": "calendar",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
+    },
+    {
+      "icon_id": "24899647",
+      "name": "fire",
+      "font_class": "fire",
+      "unicode": "e6a1",
+      "unicode_decimal": 59041
+    },
+    {
+      "icon_id": "24899648",
+      "name": "paihangbang",
+      "font_class": "medal",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
+    {
+      "icon_id": "24899649",
+      "name": "font",
+      "font_class": "font",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "24899650",
+      "name": "gift",
+      "font_class": "gift",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "24899651",
+      "name": "link",
+      "font_class": "link",
+      "unicode": "e6a5",
+      "unicode_decimal": 59045
+    },
+    {
+      "icon_id": "24899652",
+      "name": "notification",
+      "font_class": "notification",
+      "unicode": "e6a6",
+      "unicode_decimal": 59046
+    },
+    {
+      "icon_id": "24899653",
+      "name": "staff",
+      "font_class": "staff",
+      "unicode": "e6a7",
+      "unicode_decimal": 59047
+    },
+    {
+      "icon_id": "24899654",
+      "name": "VIP",
+      "font_class": "vip",
+      "unicode": "e6a8",
+      "unicode_decimal": 59048
+    },
+    {
+      "icon_id": "24899655",
+      "name": "folder_add",
+      "font_class": "folder-add",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "24899656",
+      "name": "tune",
+      "font_class": "tune",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "24899657",
+      "name": "shimingrenzheng",
+      "font_class": "auth",
+      "unicode": "e6ab",
+      "unicode_decimal": 59051
+    },
+    {
+      "icon_id": "24899565",
+      "name": "person",
+      "font_class": "person",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "24899566",
+      "name": "email-filled",
+      "font_class": "email-filled",
+      "unicode": "e69a",
+      "unicode_decimal": 59034
+    },
+    {
+      "icon_id": "24899567",
+      "name": "phone-filled",
+      "font_class": "phone-filled",
+      "unicode": "e69b",
+      "unicode_decimal": 59035
+    },
+    {
+      "icon_id": "24899568",
+      "name": "phone",
+      "font_class": "phone",
+      "unicode": "e69c",
+      "unicode_decimal": 59036
+    },
+    {
+      "icon_id": "24899570",
+      "name": "email",
+      "font_class": "email",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
+      "icon_id": "24899571",
+      "name": "personadd",
+      "font_class": "personadd",
+      "unicode": "e69f",
+      "unicode_decimal": 59039
+    },
+    {
+      "icon_id": "24899558",
+      "name": "chatboxes-filled",
+      "font_class": "chatboxes-filled",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
+    {
+      "icon_id": "24899559",
+      "name": "contact",
+      "font_class": "contact",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "24899560",
+      "name": "chatbubble-filled",
+      "font_class": "chatbubble-filled",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "24899561",
+      "name": "contact-filled",
+      "font_class": "contact-filled",
+      "unicode": "e695",
+      "unicode_decimal": 59029
+    },
+    {
+      "icon_id": "24899562",
+      "name": "chatboxes",
+      "font_class": "chatboxes",
+      "unicode": "e696",
+      "unicode_decimal": 59030
+    },
+    {
+      "icon_id": "24899563",
+      "name": "chatbubble",
+      "font_class": "chatbubble",
+      "unicode": "e697",
+      "unicode_decimal": 59031
+    },
+    {
+      "icon_id": "24881290",
+      "name": "upload-filled",
+      "font_class": "upload-filled",
+      "unicode": "e68e",
+      "unicode_decimal": 59022
+    },
+    {
+      "icon_id": "24881292",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "24881293",
+      "name": "weixin",
+      "font_class": "weixin",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "24881274",
+      "name": "compose",
+      "font_class": "compose",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "24881275",
+      "name": "qq",
+      "font_class": "qq",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "24881276",
+      "name": "download-filled",
+      "font_class": "download-filled",
+      "unicode": "e681",
+      "unicode_decimal": 59009
+    },
+    {
+      "icon_id": "24881277",
+      "name": "pengyouquan",
+      "font_class": "pyq",
+      "unicode": "e682",
+      "unicode_decimal": 59010
+    },
+    {
+      "icon_id": "24881279",
+      "name": "sound",
+      "font_class": "sound",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "24881280",
+      "name": "trash-filled",
+      "font_class": "trash-filled",
+      "unicode": "e685",
+      "unicode_decimal": 59013
+    },
+    {
+      "icon_id": "24881281",
+      "name": "sound-filled",
+      "font_class": "sound-filled",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "24881282",
+      "name": "trash",
+      "font_class": "trash",
+      "unicode": "e687",
+      "unicode_decimal": 59015
+    },
+    {
+      "icon_id": "24881284",
+      "name": "videocam-filled",
+      "font_class": "videocam-filled",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
+      "icon_id": "24881285",
+      "name": "spinner-cycle",
+      "font_class": "spinner-cycle",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "24881286",
+      "name": "weibo",
+      "font_class": "weibo",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "24881288",
+      "name": "videocam",
+      "font_class": "videocam",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "24881289",
+      "name": "download",
+      "font_class": "download",
+      "unicode": "e68d",
+      "unicode_decimal": 59021
+    },
+    {
+      "icon_id": "24879601",
+      "name": "help",
+      "font_class": "help",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "24879602",
+      "name": "navigate-filled",
+      "font_class": "navigate-filled",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "24879603",
+      "name": "plusempty",
+      "font_class": "plusempty",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "24879604",
+      "name": "smallcircle",
+      "font_class": "smallcircle",
+      "unicode": "e67c",
+      "unicode_decimal": 59004
+    },
+    {
+      "icon_id": "24879605",
+      "name": "minus-filled",
+      "font_class": "minus-filled",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "24879606",
+      "name": "micoff",
+      "font_class": "micoff",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "24879588",
+      "name": "closeempty",
+      "font_class": "closeempty",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "24879589",
+      "name": "clear",
+      "font_class": "clear",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "24879590",
+      "name": "navigate",
+      "font_class": "navigate",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "24879591",
+      "name": "minus",
+      "font_class": "minus",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "24879592",
+      "name": "image",
+      "font_class": "image",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "24879593",
+      "name": "mic",
+      "font_class": "mic",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "24879594",
+      "name": "paperplane",
+      "font_class": "paperplane",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "24879595",
+      "name": "close",
+      "font_class": "close",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "24879596",
+      "name": "help-filled",
+      "font_class": "help-filled",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "24879597",
+      "name": "plus-filled",
+      "font_class": "paperplane-filled",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "24879598",
+      "name": "plus",
+      "font_class": "plus",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "24879599",
+      "name": "mic-filled",
+      "font_class": "mic-filled",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "24879600",
+      "name": "image-filled",
+      "font_class": "image-filled",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "24855900",
+      "name": "locked-filled",
+      "font_class": "locked-filled",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "24855901",
+      "name": "info",
+      "font_class": "info",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "24855903",
+      "name": "locked",
+      "font_class": "locked",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "24855884",
+      "name": "camera-filled",
+      "font_class": "camera-filled",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "24855885",
+      "name": "chat-filled",
+      "font_class": "chat-filled",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "24855886",
+      "name": "camera",
+      "font_class": "camera",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "24855887",
+      "name": "circle",
+      "font_class": "circle",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "24855888",
+      "name": "checkmarkempty",
+      "font_class": "checkmarkempty",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "24855889",
+      "name": "chat",
+      "font_class": "chat",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "24855890",
+      "name": "circle-filled",
+      "font_class": "circle-filled",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "24855891",
+      "name": "flag",
+      "font_class": "flag",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "24855892",
+      "name": "flag-filled",
+      "font_class": "flag-filled",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "24855893",
+      "name": "gear-filled",
+      "font_class": "gear-filled",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "24855894",
+      "name": "home",
+      "font_class": "home",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "24855895",
+      "name": "home-filled",
+      "font_class": "home-filled",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "24855896",
+      "name": "gear",
+      "font_class": "gear",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "24855897",
+      "name": "smallcircle-filled",
+      "font_class": "smallcircle-filled",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "24855898",
+      "name": "map-filled",
+      "font_class": "map-filled",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "24855899",
+      "name": "map",
+      "font_class": "map",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "24855825",
+      "name": "refresh-filled",
+      "font_class": "refresh-filled",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "24855826",
+      "name": "refresh",
+      "font_class": "refresh",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "24855808",
+      "name": "cloud-upload",
+      "font_class": "cloud-upload",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "24855809",
+      "name": "cloud-download-filled",
+      "font_class": "cloud-download-filled",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "24855810",
+      "name": "cloud-download",
+      "font_class": "cloud-download",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "24855811",
+      "name": "cloud-upload-filled",
+      "font_class": "cloud-upload-filled",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "24855813",
+      "name": "redo",
+      "font_class": "redo",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "24855814",
+      "name": "images-filled",
+      "font_class": "images-filled",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "24855815",
+      "name": "undo-filled",
+      "font_class": "undo-filled",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "24855816",
+      "name": "more",
+      "font_class": "more",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "24855817",
+      "name": "more-filled",
+      "font_class": "more-filled",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "24855818",
+      "name": "undo",
+      "font_class": "undo",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "24855819",
+      "name": "images",
+      "font_class": "images",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "24855821",
+      "name": "paperclip",
+      "font_class": "paperclip",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "24855822",
+      "name": "settings",
+      "font_class": "settings",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "24855823",
+      "name": "search",
+      "font_class": "search",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "24855824",
+      "name": "redo-filled",
+      "font_class": "redo-filled",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "24841702",
+      "name": "list",
+      "font_class": "list",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "24841489",
+      "name": "mail-open-filled",
+      "font_class": "mail-open-filled",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "24841491",
+      "name": "hand-thumbsdown-filled",
+      "font_class": "hand-down-filled",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "24841492",
+      "name": "hand-thumbsdown",
+      "font_class": "hand-down",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "24841493",
+      "name": "hand-thumbsup-filled",
+      "font_class": "hand-up-filled",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "24841494",
+      "name": "hand-thumbsup",
+      "font_class": "hand-up",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "24841496",
+      "name": "heart-filled",
+      "font_class": "heart-filled",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "24841498",
+      "name": "mail-open",
+      "font_class": "mail-open",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "24841488",
+      "name": "heart",
+      "font_class": "heart",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "24839963",
+      "name": "loop",
+      "font_class": "loop",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "24839866",
+      "name": "pulldown",
+      "font_class": "pulldown",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "24813798",
+      "name": "scan",
+      "font_class": "scan",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "24813786",
+      "name": "bars",
+      "font_class": "bars",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "24813788",
+      "name": "cart-filled",
+      "font_class": "cart-filled",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "24813790",
+      "name": "checkbox",
+      "font_class": "checkbox",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "24813791",
+      "name": "checkbox-filled",
+      "font_class": "checkbox-filled",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "24813794",
+      "name": "shop",
+      "font_class": "shop",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "24813795",
+      "name": "headphones",
+      "font_class": "headphones",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "24813796",
+      "name": "cart",
+      "font_class": "cart",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    }
+  ]
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..86e7444
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,96 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import icons from './icons.js';
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
+	} 
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import iconUrl from './uniicons.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('"+iconUrl+"')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons.glyphs
+			}
+		},
+		computed:{
+			unicode(){
+				let code = this.icons.find(v=>v.font_class === this.type)
+				if(code){
+					return unescape(`%u${code.unicode}`)
+				}
+				return ''
+			},
+			iconSize(){
+				return getVal(this.size)
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf') format('truetype');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
new file mode 100644
index 0000000..2f56eab
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,663 @@
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6be";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowdown:before {
+  content: "\e6b8";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-arrowright:before {
+  content: "\e6b5";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowleft:before {
+  content: "\e6b7";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-cart-filled:before {
+  content: "\e629";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
new file mode 100644
index 0000000..835f33b
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..d1c4e77
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.3.5",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-icons/readme.md b/uni_modules/uni-icons/readme.md
new file mode 100644
index 0000000..86234ba
--- /dev/null
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-tag/changelog.md b/uni_modules/uni-tag/changelog.md
new file mode 100644
index 0000000..c0c5839
--- /dev/null
+++ b/uni_modules/uni-tag/changelog.md
@@ -0,0 +1,21 @@
+## 2.1.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-tag](https://uniapp.dcloud.io/component/uniui/uni-tag)
+## 2.0.0（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+- 移除 插槽
+- 移除 type 属性的 royal 选项
+## 1.1.1（2021-08-11）
+- type 不是 default 时，size 为 small 字体大小显示不正确
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-06-18）
+- 修复 uni-tag 在字节跳动小程序上 css 类名编译错误的 bug
+## 1.0.6（2021-06-04）
+- 修复 未定义 sass 变量 "$uni-color-royal" 的bug
+## 1.0.5（2021-05-10）
+- 修复 royal 类型无效的bug
+- 修复 uni-tag 宽度不自适应的bug
+- 新增 uni-tag 支持属性 custom-style 自定义样式
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-tag/components/uni-tag/uni-tag.vue b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
new file mode 100644
index 0000000..6378a0b
--- /dev/null
+++ b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
@@ -0,0 +1,252 @@
+<template>
+	<text class="uni-tag" v-if="text" :class="classes" :style="customStyle" @click="onClick">{{text}}</text>
+</template>
+
+<script>
+	/**
+	 * Tag 标签
+	 * @description 用于展示1个或多个文字标签，可点击切换选中、不选中的状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=35
+	 * @property {String} text 标签内容
+	 * @property {String} size = [default|small|mini] 大小尺寸
+	 * 	@value default 正常
+	 * 	@value small 小尺寸
+	 * 	@value mini 迷你尺寸
+	 * @property {String} type = [default|primary|success｜warning｜error]  颜色类型
+	 * 	@value default 灰色
+	 * 	@value primary 蓝色
+	 * 	@value success 绿色
+	 * 	@value warning 黄色
+	 * 	@value error 红色
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @property {Boolean} inverted = [true|false] 是否无需背景颜色（空心标签）
+	 * @property {Boolean} circle = [true|false] 是否为圆角
+	 * @event {Function} click 点击 Tag 触发事件
+	 */
+
+	export default {
+		name: "UniTag",
+		emits: ['click'],
+		props: {
+			type: {
+				// 标签类型default、primary、success、warning、error、royal
+				type: String,
+				default: "default"
+			},
+			size: {
+				// 标签大小 normal, small
+				type: String,
+				default: "normal"
+			},
+			// 标签内容
+			text: {
+				type: String,
+				default: ""
+			},
+			disabled: {
+				// 是否为禁用状态
+				type: [Boolean, String],
+				default: false
+			},
+			inverted: {
+				// 是否为空心
+				type: [Boolean, String],
+				default: false
+			},
+			circle: {
+				// 是否为圆角样式
+				type: [Boolean, String],
+				default: false
+			},
+			mark: {
+				// 是否为标记样式
+				type: [Boolean, String],
+				default: false
+			},
+			customStyle: {
+				type: String,
+				default: ''
+			}
+		},
+		computed: {
+			classes() {
+				const {
+					type,
+					disabled,
+					inverted,
+					circle,
+					mark,
+					size,
+					isTrue
+				} = this
+				const classArr = [
+					'uni-tag--' + type,
+					'uni-tag--' + size,
+					isTrue(disabled) ? 'uni-tag--disabled' : '',
+					isTrue(inverted) ? 'uni-tag--' + type + '--inverted' : '',
+					isTrue(circle) ? 'uni-tag--circle' : '',
+					isTrue(mark) ? 'uni-tag--mark' : '',
+					// type === 'default' ? 'uni-tag--default' : 'uni-tag-text',
+					isTrue(inverted) ? 'uni-tag--inverted uni-tag-text--' + type : '',
+					size === 'small' ? 'uni-tag-text--small' : ''
+				]
+				// 返回类的字符串，兼容字节小程序
+				return classArr.join(' ')
+			}
+		},
+		methods: {
+			isTrue(value) {
+				return value === true || value === 'true'
+			},
+			onClick() {
+				if (this.isTrue(this.disabled)) return
+				this.$emit("click");
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-primary: #2979ff !default;
+	$uni-success: #18bc37 !default;
+	$uni-warning: #f3a73f !default;
+	$uni-error: #e43d33 !default;
+	$uni-info: #8f939c !default;
+
+
+	$tag-default-pd: 4px 7px;
+	$tag-small-pd: 2px 5px;
+	$tag-mini-pd: 1px 3px;
+
+	.uni-tag {
+		line-height: 14px;
+		font-size: 12px;
+		font-weight: 200;
+		padding: $tag-default-pd;
+		color: #fff;
+		border-radius: 3px;
+		background-color: $uni-info;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-info;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+
+		// size attr
+		&--default {
+			font-size: 12px;
+		}
+
+		&--default--inverted {
+			color: $uni-info;
+			border-color: $uni-info;
+		}
+
+		&--small {
+			padding: $tag-small-pd;
+			font-size: 12px;
+			border-radius: 2px;
+		}
+
+		&--mini {
+			padding: $tag-mini-pd;
+			font-size: 12px;
+			border-radius: 2px;
+		}
+
+		// type attr
+		&--primary {
+			background-color: $uni-primary;
+			border-color: $uni-primary;
+			color: #fff;
+		}
+
+		&--success {
+			color: #fff;
+			background-color: $uni-success;
+			border-color: $uni-success;
+		}
+
+		&--warning {
+			color: #fff;
+			background-color: $uni-warning;
+			border-color: $uni-warning;
+		}
+
+		&--error {
+			color: #fff;
+			background-color: $uni-error;
+			border-color: $uni-error;
+		}
+
+		&--primary--inverted {
+			color: $uni-primary;
+			border-color: $uni-primary;
+		}
+
+		&--success--inverted {
+			color: $uni-success;
+			border-color: $uni-success;
+		}
+
+		&--warning--inverted {
+			color: $uni-warning;
+			border-color: $uni-warning;
+		}
+
+		&--error--inverted {
+			color: $uni-error;
+			border-color: $uni-error;
+		}
+
+		&--inverted {
+			background-color: #fff;
+		}
+
+		// other attr
+		&--circle {
+			border-radius: 15px !important;
+		}
+
+		&--mark {
+			border-top-left-radius: 0 !important;
+			border-bottom-left-radius: 0 !important;
+			border-top-right-radius: 15px !important;
+			border-bottom-right-radius: 15px !important;
+		}
+
+		&--disabled {
+			opacity: 0.5;
+			/* #ifdef H5 */
+			cursor: not-allowed;
+			/* #endif */
+		}
+	}
+
+
+	.uni-tag-text {
+		color: #fff;
+		font-size: 14px;
+
+		&--primary {
+			color: $uni-primary;
+		}
+
+		&--success {
+			color: $uni-success;
+		}
+
+		&--warning {
+			color: $uni-warning;
+		}
+
+		&--error {
+			color: $uni-error;
+		}
+
+		&--small {
+			font-size: 12px;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-tag/package.json b/uni_modules/uni-tag/package.json
new file mode 100644
index 0000000..1878088
--- /dev/null
+++ b/uni_modules/uni-tag/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-tag",
+  "displayName": "uni-tag 标签",
+  "version": "2.1.0",
+  "description": "Tag 组件，用于展示1个或多个文字标签，可点击切换选中、不选中的状态。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "",
+    "tag",
+    "标签"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-tag/readme.md b/uni_modules/uni-tag/readme.md
new file mode 100644
index 0000000..6e78ff5
--- /dev/null
+++ b/uni_modules/uni-tag/readme.md
@@ -0,0 +1,13 @@
+
+
+## Tag 标签
+> **组件名：uni-tag**
+> 代码块： `uTag`
+
+
+用于展示1个或多个文字标签，可点击切换选中、不选中的状态 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-tag)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/utils/city.js b/utils/city.js
new file mode 100644
index 0000000..2b28a2c
--- /dev/null
+++ b/utils/city.js
@@ -0,0 +1,1514 @@
+export default {
+    list:[
+		{
+			"letter":"A",
+			"data": []
+		},
+        {
+            "letter":"A",
+            "data":[
+                {
+                    "cityName":"阿坝",
+                    "keyword":"阿坝ABA"
+                },
+                {
+                    "cityName":"阿克苏",
+                    "keyword":"阿克苏AKESU"
+                },
+                {
+                    "cityName":"阿拉善",
+                    "keyword":"阿拉善ALASHAN"
+                },
+                {
+                    "cityName":"阿勒泰",
+                    "keyword":"阿勒泰ALETAI"
+                },
+                {
+                    "cityName":"阿里",
+                    "keyword":"阿里ALI"
+                },
+                {
+                    "cityName":"安康",
+                    "keyword":"安康ANKANG"
+                },
+                {
+                    "cityName":"安庆",
+                    "keyword":"安庆ANQING"
+                },
+                {
+                    "cityName":"鞍山",
+                    "keyword":"鞍山ANSHAN"
+                },
+                {
+                    "cityName":"马鞍山",
+                    "keyword":"马鞍山MAANSHAN"
+                },
+                {
+                    "cityName":"安顺",
+                    "keyword":"安顺ANSHUN"
+                },
+                {
+                    "cityName":"安阳",
+                    "keyword":"安阳ANYANG"
+                }
+            ]
+        },
+        {
+            "letter":"B",
+            "data":[
+                {
+                    "cityName":"白城",
+                    "keyword":"白城BAICHENG"
+                },
+                {
+                    "cityName":"白山",
+                    "keyword":"白山BAISHAN"
+                },
+                {
+                    "cityName":"白银",
+                    "keyword":"白银BAIYIN"
+                },
+                {
+                    "cityName":"保定",
+                    "keyword":"保定BAODING"
+                },
+                {
+                    "cityName":"宝鸡",
+                    "keyword":"宝鸡BAOJI"
+                },
+                {
+                    "cityName":"保山",
+                    "keyword":"保山BAOSHAN"
+                },
+                {
+                    "cityName":"包头",
+                    "keyword":"包头BAOTOU"
+                },
+                {
+                    "cityName":"巴彦淖尔",
+                    "keyword":"巴彦淖尔BAYANNAOER"
+                },
+                {
+                    "cityName":"巴音郭楞",
+                    "keyword":"巴音郭楞BAYINGUOLENG"
+                },
+                {
+                    "cityName":"巴中",
+                    "keyword":"巴中BAZHONG"
+                },
+                {
+                    "cityName":"北海",
+                    "keyword":"北海BEIHAI"
+                },
+                {
+                    "cityName":"北京",
+                    "keyword":"北京BEIJING"
+                },
+                {
+                    "cityName":"蚌埠",
+                    "keyword":"蚌埠BENGBU"
+                },
+                {
+                    "cityName":"本溪",
+                    "keyword":"本溪BENXI"
+                },
+                {
+                    "cityName":"毕节",
+                    "keyword":"毕节BIJIE"
+                },
+                {
+                    "cityName":"滨州",
+                    "keyword":"滨州BINZHOU"
+                },
+                {
+                    "cityName":"博尔塔拉",
+                    "keyword":"博尔塔拉BOERTALA"
+                },
+                {
+                    "cityName":"百色",
+                    "keyword":"百色BOSE"
+                },
+                {
+                    "cityName":"亳州",
+                    "keyword":"亳州BOZHOU"
+                }
+            ]
+        },
+        {
+            "letter":"C",
+            "data":[
+                {
+                    "cityName":"沧州",
+                    "keyword":"沧州CANGZHOU"
+                },
+                {
+                    "cityName":"长春",
+                    "keyword":"长春CHANGCHUN"
+                },
+                {
+                    "cityName":"常德",
+                    "keyword":"常德CHANGDE"
+                },
+                {
+                    "cityName":"昌都",
+                    "keyword":"昌都CHANGDU"
+                },
+                {
+                    "cityName":"昌吉",
+                    "keyword":"昌吉CHANGJI"
+                },
+                {
+                    "cityName":"长沙",
+                    "keyword":"长沙CHANGSHA"
+                },
+                {
+                    "cityName":"长治",
+                    "keyword":"长治CHANGZHI"
+                },
+                {
+                    "cityName":"常州",
+                    "keyword":"常州CHANGZHOU"
+                },
+                {
+                    "cityName":"潮州",
+                    "keyword":"潮州CHAOZHOU"
+                },
+                {
+                    "cityName":"承德",
+                    "keyword":"承德CHENGDE"
+                },
+                {
+                    "cityName":"成都",
+                    "keyword":"成都CHENGDU"
+                },
+                {
+                    "cityName":"郴州",
+                    "keyword":"郴州CHENZHOU"
+                },
+                {
+                    "cityName":"赤峰",
+                    "keyword":"赤峰CHIFENG"
+                },
+                {
+                    "cityName":"池州",
+                    "keyword":"池州CHIZHOU"
+                },
+                {
+                    "cityName":"重庆",
+                    "keyword":"重庆CHONGQING"
+                },
+                {
+                    "cityName":"崇左",
+                    "keyword":"崇左CHONGZUO"
+                },
+                {
+                    "cityName":"楚雄",
+                    "keyword":"楚雄CHUXIONG"
+                },
+                {
+                    "cityName":"滁州",
+                    "keyword":"滁州CHUZHOU"
+                }
+            ]
+        },
+        {
+            "letter":"D",
+            "data":[
+                {
+                    "cityName":"大理",
+                    "keyword":"大理DALI"
+                },
+                {
+                    "cityName":"大连",
+                    "keyword":"大连DALIAN"
+                },
+                {
+                    "cityName":"丹东",
+                    "keyword":"丹东DANDONG"
+                },
+                {
+                    "cityName":"儋州",
+                    "keyword":"儋州DANZHOU"
+                },
+                {
+                    "cityName":"大庆",
+                    "keyword":"大庆DAQING"
+                },
+                {
+                    "cityName":"大同",
+                    "keyword":"大同DATONG"
+                },
+                {
+                    "cityName":"大兴安岭",
+                    "keyword":"大兴安岭DAXINGANLING"
+                },
+                {
+                    "cityName":"达州",
+                    "keyword":"达州DAZHOU"
+                },
+                {
+                    "cityName":"德宏",
+                    "keyword":"德宏DEHONG"
+                },
+                {
+                    "cityName":"德阳",
+                    "keyword":"德阳DEYANG"
+                },
+                {
+                    "cityName":"德州",
+                    "keyword":"德州DEZHOU"
+                },
+                {
+                    "cityName":"定西",
+                    "keyword":"定西DINGXI"
+                },
+                {
+                    "cityName":"迪庆",
+                    "keyword":"迪庆DIQING"
+                },
+                {
+                    "cityName":"东莞",
+                    "keyword":"东莞DONGGUAN"
+                },
+                {
+                    "cityName":"东营",
+                    "keyword":"东营DONGYING"
+                }
+            ]
+        },
+        {
+            "letter":"E",
+            "data":[
+                {
+                    "cityName":"鄂尔多斯",
+                    "keyword":"鄂尔多斯EERDUOSI"
+                },
+                {
+                    "cityName":"恩施",
+                    "keyword":"恩施ENSHI"
+                },
+                {
+                    "cityName":"鄂州",
+                    "keyword":"鄂州EZHOU"
+                }
+            ]
+        },
+        {
+            "letter":"F",
+            "data":[
+                {
+                    "cityName":"防城港",
+                    "keyword":"防城港FANGCHENGGANG"
+                },
+                {
+                    "cityName":"佛山",
+                    "keyword":"佛山FOSHAN"
+                },
+                {
+                    "cityName":"抚顺",
+                    "keyword":"抚顺FUSHUN"
+                },
+                {
+                    "cityName":"阜新",
+                    "keyword":"阜新FUXIN"
+                },
+                {
+                    "cityName":"阜阳",
+                    "keyword":"阜阳FUYANG"
+                },
+                {
+                    "cityName":"抚州",
+                    "keyword":"抚州FUZHOU"
+                },
+                {
+                    "cityName":"福州",
+                    "keyword":"福州FUZHOU"
+                }
+            ]
+        },
+        {
+            "letter":"G",
+            "data":[
+                {
+                    "cityName":"甘南",
+                    "keyword":"甘南GANNAN"
+                },
+                {
+                    "cityName":"赣州",
+                    "keyword":"赣州GANZHOU"
+                },
+                {
+                    "cityName":"甘孜",
+                    "keyword":"甘孜GANZI"
+                },
+                {
+                    "cityName":"广安",
+                    "keyword":"广安GUANGAN"
+                },
+                {
+                    "cityName":"广元",
+                    "keyword":"广元GUANGYUAN"
+                },
+                {
+                    "cityName":"广州",
+                    "keyword":"广州GUANGZHOU"
+                },
+                {
+                    "cityName":"贵港",
+                    "keyword":"贵港GUIGANG"
+                },
+                {
+                    "cityName":"桂林",
+                    "keyword":"桂林GUILIN"
+                },
+                {
+                    "cityName":"贵阳",
+                    "keyword":"贵阳GUIYANG"
+                },
+                {
+                    "cityName":"果洛",
+                    "keyword":"果洛GUOLUO"
+                },
+                {
+                    "cityName":"固原",
+                    "keyword":"固原GUYUAN"
+                }
+            ]
+        },
+        {
+            "letter":"H",
+            "data":[
+                {
+                    "cityName":"哈尔滨",
+                    "keyword":"哈尔滨HAERBIN"
+                },
+                {
+                    "cityName":"海北",
+                    "keyword":"海北HAIBEI"
+                },
+                {
+                    "cityName":"海东",
+                    "keyword":"海东HAIDONG"
+                },
+                {
+                    "cityName":"海口",
+                    "keyword":"海口HAIKOU"
+                },
+                {
+                    "cityName":"海南藏族自治州",
+                    "keyword":"海南藏族自治州HAINAN"
+                },
+                {
+                    "cityName":"海南",
+                    "keyword":"海南藏族自治州HAINAN"
+                },
+                {
+                    "cityName":"海南",
+                    "keyword":"海南HAINAN"
+                },
+                {
+                    "cityName":"海西",
+                    "keyword":"海西HAIXI"
+                },
+                {
+                    "cityName":"哈密",
+                    "keyword":"哈密HAMI"
+                },
+                {
+                    "cityName":"邯郸",
+                    "keyword":"邯郸HANDAN"
+                },
+                {
+                    "cityName":"杭州",
+                    "keyword":"杭州HANGZHOU"
+                },
+                {
+                    "cityName":"汉中",
+                    "keyword":"汉中HANZHONG"
+                },
+                {
+                    "cityName":"河北",
+                    "keyword":"河北HEBEI"
+                },
+                {
+                    "cityName":"鹤壁",
+                    "keyword":"鹤壁HEBI"
+                },
+                {
+                    "cityName":"河池",
+                    "keyword":"河池HECHI"
+                },
+                {
+                    "cityName":"合肥",
+                    "keyword":"合肥HEFEI"
+                },
+                {
+                    "cityName":"鹤岗",
+                    "keyword":"鹤岗HEGANG"
+                },
+                {
+                    "cityName":"黑河",
+                    "keyword":"黑河HEIHE"
+                },
+                {
+                    "cityName":"河南",
+                    "keyword":"河南HENAN"
+                },
+                {
+                    "cityName":"衡水",
+                    "keyword":"衡水HENGSHUI"
+                },
+                {
+                    "cityName":"衡阳",
+                    "keyword":"衡阳HENGYANG"
+                },
+                {
+                    "cityName":"和田",
+                    "keyword":"和田HETIAN"
+                },
+                {
+                    "cityName":"河源",
+                    "keyword":"河源HEYUAN"
+                },
+                {
+                    "cityName":"菏泽",
+                    "keyword":"菏泽HEZE"
+                },
+                {
+                    "cityName":"贺州",
+                    "keyword":"贺州HEZHOU"
+                },
+                {
+                    "cityName":"红河",
+                    "keyword":"红河HONGHE"
+                },
+                {
+                    "cityName":"淮安",
+                    "keyword":"淮安HUAIAN"
+                },
+                {
+                    "cityName":"淮北",
+                    "keyword":"淮北HUAIBEI"
+                },
+                {
+                    "cityName":"怀化",
+                    "keyword":"怀化HUAIHUA"
+                },
+                {
+                    "cityName":"淮南",
+                    "keyword":"淮南HUAINAN"
+                },
+                {
+                    "cityName":"黄冈",
+                    "keyword":"黄冈HUANGGANG"
+                },
+                {
+                    "cityName":"黄南",
+                    "keyword":"黄南HUANGNAN"
+                },
+                {
+                    "cityName":"黄山",
+                    "keyword":"黄山HUANGSHAN"
+                },
+                {
+                    "cityName":"黄石",
+                    "keyword":"黄石HUANGSHI"
+                },
+                {
+                    "cityName":"湖北",
+                    "keyword":"湖北HUBEI"
+                },
+                {
+                    "cityName":"呼和浩特",
+                    "keyword":"呼和浩特HUHEHAOTE"
+                },
+                {
+                    "cityName":"惠州",
+                    "keyword":"惠州HUIZHOU"
+                },
+                {
+                    "cityName":"葫芦岛",
+                    "keyword":"葫芦岛HULUDAO"
+                },
+                {
+                    "cityName":"呼伦贝尔",
+                    "keyword":"呼伦贝尔HULUNBEIER"
+                },
+                {
+                    "cityName":"湖州",
+                    "keyword":"湖州HUZHOU"
+                }
+            ]
+        },
+        {
+            "letter":"I",
+            "data":[
+
+            ]
+        },
+        {
+            "letter":"J",
+            "data":[
+                {
+                    "cityName":"佳木斯",
+                    "keyword":"佳木斯JIAMUSI"
+                },
+                {
+                    "cityName":"吉安",
+                    "keyword":"吉安JIAN"
+                },
+                {
+                    "cityName":"江门",
+                    "keyword":"江门JIANGMEN"
+                },
+                {
+                    "cityName":"焦作",
+                    "keyword":"焦作JIAOZUO"
+                },
+                {
+                    "cityName":"嘉兴",
+                    "keyword":"嘉兴JIAXING"
+                },
+                {
+                    "cityName":"嘉峪关",
+                    "keyword":"嘉峪关JIAYUGUAN"
+                },
+                {
+                    "cityName":"揭阳",
+                    "keyword":"揭阳JIEYANG"
+                },
+                {
+                    "cityName":"吉林",
+                    "keyword":"吉林JILIN"
+                },
+                {
+                    "cityName":"济南",
+                    "keyword":"济南JINAN"
+                },
+                {
+                    "cityName":"金昌",
+                    "keyword":"金昌JINCHANG"
+                },
+                {
+                    "cityName":"晋城",
+                    "keyword":"晋城JINCHENG"
+                },
+                {
+                    "cityName":"景德镇",
+                    "keyword":"景德镇JINGDEZHEN"
+                },
+                {
+                    "cityName":"荆门",
+                    "keyword":"荆门JINGMEN"
+                },
+                {
+                    "cityName":"荆州",
+                    "keyword":"荆州JINGZHOU"
+                },
+                {
+                    "cityName":"金华",
+                    "keyword":"金华JINHUA"
+                },
+                {
+                    "cityName":"济宁",
+                    "keyword":"济宁JINING"
+                },
+                {
+                    "cityName":"晋中",
+                    "keyword":"晋中JINZHONG"
+                },
+                {
+                    "cityName":"锦州",
+                    "keyword":"锦州JINZHOU"
+                },
+                {
+                    "cityName":"九江",
+                    "keyword":"九江JIUJIANG"
+                },
+                {
+                    "cityName":"酒泉",
+                    "keyword":"酒泉JIUQUAN"
+                },
+                {
+                    "cityName":"鸡西",
+                    "keyword":"鸡西JIXI"
+                }
+            ]
+        },
+        {
+            "letter":"K",
+            "data":[
+                {
+                    "cityName":"开封",
+                    "keyword":"开封KAIFENG"
+                },
+                {
+                    "cityName":"喀什",
+                    "keyword":"喀什KASHI"
+                },
+                {
+                    "cityName":"克拉玛依",
+                    "keyword":"克拉玛依KELAMAYI"
+                },
+                {
+                    "cityName":"克孜勒苏",
+                    "keyword":"克孜勒苏KEZILESU"
+                },
+                {
+                    "cityName":"昆明",
+                    "keyword":"昆明KUNMING"
+                }
+            ]
+        },
+        {
+            "letter":"L",
+            "data":[
+                {
+                    "cityName":"来宾",
+                    "keyword":"来宾LAIBIN"
+                },
+                {
+                    "cityName":"莱芜",
+                    "keyword":"莱芜LAIWU"
+                },
+                {
+                    "cityName":"廊坊",
+                    "keyword":"廊坊LANGFANG"
+                },
+                {
+                    "cityName":"兰州",
+                    "keyword":"兰州LANZHOU"
+                },
+                {
+                    "cityName":"拉萨",
+                    "keyword":"拉萨LASA"
+                },
+                {
+                    "cityName":"乐山",
+                    "keyword":"乐山LESHAN"
+                },
+                {
+                    "cityName":"凉山",
+                    "keyword":"凉山LIANGSHAN"
+                },
+                {
+                    "cityName":"连云港",
+                    "keyword":"连云港LIANYUNGANG"
+                },
+                {
+                    "cityName":"聊城",
+                    "keyword":"聊城LIAOCHENG"
+                },
+                {
+                    "cityName":"辽阳",
+                    "keyword":"辽阳LIAOYANG"
+                },
+                {
+                    "cityName":"辽源",
+                    "keyword":"辽源LIAOYUAN"
+                },
+                {
+                    "cityName":"丽江",
+                    "keyword":"丽江LIJIANG"
+                },
+                {
+                    "cityName":"临沧",
+                    "keyword":"临沧LINCANG"
+                },
+                {
+                    "cityName":"临汾",
+                    "keyword":"临汾LINFEN"
+                },
+                {
+                    "cityName":"临夏",
+                    "keyword":"临夏LINXIA"
+                },
+                {
+                    "cityName":"临沂",
+                    "keyword":"临沂LINYI"
+                },
+                {
+                    "cityName":"林芝",
+                    "keyword":"林芝LINZHI"
+                },
+                {
+                    "cityName":"丽水",
+                    "keyword":"丽水LISHUI"
+                },
+                {
+                    "cityName":"六盘水",
+                    "keyword":"六盘水LIUPANSHUI"
+                },
+                {
+                    "cityName":"柳州",
+                    "keyword":"柳州LIUZHOU"
+                },
+                {
+                    "cityName":"陇南",
+                    "keyword":"陇南LONGNAN"
+                },
+                {
+                    "cityName":"龙岩",
+                    "keyword":"龙岩LONGYAN"
+                },
+                {
+                    "cityName":"娄底",
+                    "keyword":"娄底LOUDI"
+                },
+                {
+                    "cityName":"六安",
+                    "keyword":"六安LUAN"
+                },
+                {
+                    "cityName":"洛阳",
+                    "keyword":"洛阳LUOYANG"
+                },
+                {
+                    "cityName":"泸州",
+                    "keyword":"泸州LUZHOU"
+                },
+                {
+                    "cityName":"吕梁",
+                    "keyword":"吕梁LVLIANG"
+                }
+            ]
+        },
+        {
+            "letter":"M",
+            "data":[
+                {
+                    "cityName":"马鞍山",
+                    "keyword":"马鞍山MAANSHAN"
+                },
+                {
+                    "cityName":"茂名",
+                    "keyword":"茂名MAOMING"
+                },
+                {
+                    "cityName":"眉山",
+                    "keyword":"眉山MEISHAN"
+                },
+                {
+                    "cityName":"梅州",
+                    "keyword":"梅州MEIZHOU"
+                },
+                {
+                    "cityName":"绵阳",
+                    "keyword":"绵阳MIANYANG"
+                },
+                {
+                    "cityName":"牡丹江",
+                    "keyword":"牡丹江MUDANJIANG"
+                }
+            ]
+        },
+        {
+            "letter":"N",
+            "data":[
+                {
+                    "cityName":"南昌",
+                    "keyword":"南昌NANCHANG"
+                },
+                {
+                    "cityName":"南充",
+                    "keyword":"南充NANCHONG"
+                },
+                {
+                    "cityName":"南京",
+                    "keyword":"南京NANJING"
+                },
+                {
+                    "cityName":"南宁",
+                    "keyword":"南宁NANNING"
+                },
+                {
+                    "cityName":"南平",
+                    "keyword":"南平NANPING"
+                },
+                {
+                    "cityName":"南通",
+                    "keyword":"南通NANTONG"
+                },
+                {
+                    "cityName":"南阳",
+                    "keyword":"南阳NANYANG"
+                },
+                {
+                    "cityName":"那曲",
+                    "keyword":"那曲NAQU"
+                },
+                {
+                    "cityName":"内江",
+                    "keyword":"内江NEIJIANG"
+                },
+                {
+                    "cityName":"宁波",
+                    "keyword":"宁波NINGBO"
+                },
+                {
+                    "cityName":"宁德",
+                    "keyword":"宁德NINGDE"
+                },
+                {
+                    "cityName":"怒江",
+                    "keyword":"怒江NUJIANG"
+                }
+            ]
+        },
+        {
+            "letter":"O",
+            "data":[
+
+            ]
+        },
+        {
+            "letter":"P",
+            "data":[
+                {
+                    "cityName":"盘锦",
+                    "keyword":"盘锦PANJIN"
+                },
+                {
+                    "cityName":"攀枝花",
+                    "keyword":"攀枝花PANZHIHUA"
+                },
+                {
+                    "cityName":"平顶山",
+                    "keyword":"平顶山PINGDINGSHAN"
+                },
+                {
+                    "cityName":"平凉",
+                    "keyword":"平凉PINGLIANG"
+                },
+                {
+                    "cityName":"萍乡",
+                    "keyword":"萍乡PINGXIANG"
+                },
+                {
+                    "cityName":"普洱",
+                    "keyword":"普洱PUER"
+                },
+                {
+                    "cityName":"莆田",
+                    "keyword":"莆田PUTIAN"
+                },
+                {
+                    "cityName":"濮阳",
+                    "keyword":"濮阳PUYANG"
+                }
+            ]
+        },
+        {
+            "letter":"Q",
+            "data":[
+                {
+                    "cityName":"黔东南",
+                    "keyword":"黔东南QIANDONGNAN"
+                },
+                {
+                    "cityName":"黔南",
+                    "keyword":"黔南QIANNAN"
+                },
+                {
+                    "cityName":"黔西南",
+                    "keyword":"黔西南QIANXINAN"
+                },
+                {
+                    "cityName":"青岛",
+                    "keyword":"青岛QINGDAO"
+                },
+                {
+                    "cityName":"庆阳",
+                    "keyword":"庆阳QINGYANG"
+                },
+                {
+                    "cityName":"清远",
+                    "keyword":"清远QINGYUAN"
+                },
+                {
+                    "cityName":"秦皇岛",
+                    "keyword":"秦皇岛QINHUANGDAO"
+                },
+                {
+                    "cityName":"钦州",
+                    "keyword":"钦州QINZHOU"
+                },
+                {
+                    "cityName":"齐齐哈尔",
+                    "keyword":"齐齐哈尔QIQIHAER"
+                },
+                {
+                    "cityName":"七台河",
+                    "keyword":"七台河QITAIHE"
+                },
+                {
+                    "cityName":"泉州",
+                    "keyword":"泉州QUANZHOU"
+                },
+                {
+                    "cityName":"曲靖",
+                    "keyword":"曲靖QUJING"
+                },
+                {
+                    "cityName":"衢州",
+                    "keyword":"衢州QUZHOU"
+                }
+            ]
+        },
+        {
+            "letter":"R",
+            "data":[
+                {
+                    "cityName":"日喀则",
+                    "keyword":"日喀则RIKAZE"
+                },
+                {
+                    "cityName":"日照",
+                    "keyword":"日照RIZHAO"
+                }
+            ]
+        },
+        {
+            "letter":"S",
+            "data":[
+                {
+                    "cityName":"三门峡",
+                    "keyword":"三门峡SANMENXIA"
+                },
+                {
+                    "cityName":"三明",
+                    "keyword":"三明SANMING"
+                },
+                {
+                    "cityName":"三沙",
+                    "keyword":"三沙SANSHA"
+                },
+                {
+                    "cityName":"三亚",
+                    "keyword":"三亚SANYA"
+                },
+                {
+                    "cityName":"上海",
+                    "keyword":"上海SHANGHAI"
+                },
+                {
+                    "cityName":"商洛",
+                    "keyword":"商洛SHANGLUO"
+                },
+                {
+                    "cityName":"商丘",
+                    "keyword":"商丘SHANGQIU"
+                },
+                {
+                    "cityName":"上饶",
+                    "keyword":"上饶SHANGRAO"
+                },
+                {
+                    "cityName":"山南",
+                    "keyword":"山南SHANNAN"
+                },
+                {
+                    "cityName":"汕头",
+                    "keyword":"汕头SHANTOU"
+                },
+                {
+                    "cityName":"汕尾",
+                    "keyword":"汕尾SHANWEI"
+                },
+                {
+                    "cityName":"韶关",
+                    "keyword":"韶关SHAOGUAN"
+                },
+                {
+                    "cityName":"绍兴",
+                    "keyword":"绍兴SHAOXING"
+                },
+                {
+                    "cityName":"邵阳",
+                    "keyword":"邵阳SHAOYANG"
+                },
+                {
+                    "cityName":"沈阳",
+                    "keyword":"沈阳SHENYANG"
+                },
+                {
+                    "cityName":"深圳",
+                    "keyword":"深圳SHENZHEN"
+                },
+                {
+                    "cityName":"石家庄",
+                    "keyword":"石家庄SHIJIAZHUANG"
+                },
+                {
+                    "cityName":"十堰",
+                    "keyword":"十堰SHIYAN"
+                },
+                {
+                    "cityName":"石嘴山",
+                    "keyword":"石嘴山SHIZUISHAN"
+                },
+                {
+                    "cityName":"双鸭山",
+                    "keyword":"双鸭山SHUANGYASHAN"
+                },
+                {
+                    "cityName":"朔州",
+                    "keyword":"朔州SHUOZHOU"
+                },
+                {
+                    "cityName":"四平",
+                    "keyword":"四平SIPING"
+                },
+                {
+                    "cityName":"松原",
+                    "keyword":"松原SONGYUAN"
+                },
+                {
+                    "cityName":"绥化",
+                    "keyword":"绥化SUIHUA"
+                },
+                {
+                    "cityName":"遂宁",
+                    "keyword":"遂宁SUINING"
+                },
+                {
+                    "cityName":"随州",
+                    "keyword":"随州SUIZHOU"
+                },
+                {
+                    "cityName":"宿迁",
+                    "keyword":"宿迁SUQIAN"
+                },
+                {
+                    "cityName":"苏州",
+                    "keyword":"苏州SUZHOU"
+                },
+                {
+                    "cityName":"宿州",
+                    "keyword":"宿州SUZHOU"
+                }
+            ]
+        },
+        {
+            "letter":"T",
+            "data":[
+                {
+                    "cityName":"塔城",
+                    "keyword":"塔城TACHENG"
+                },
+                {
+                    "cityName":"漯河",
+                    "keyword":"漯河TAHE"
+                },
+                {
+                    "cityName":"泰安",
+                    "keyword":"泰安TAIAN"
+                },
+                {
+                    "cityName":"太原",
+                    "keyword":"太原TAIYUAN"
+                },
+                {
+                    "cityName":"泰州",
+                    "keyword":"泰州TAIZHOU"
+                },
+                {
+                    "cityName":"台州",
+                    "keyword":"台州TAIZHOU"
+                },
+                {
+                    "cityName":"唐山",
+                    "keyword":"唐山TANGSHAN"
+                },
+                {
+                    "cityName":"天津",
+                    "keyword":"天津TIANJIN"
+                },
+                {
+                    "cityName":"天水",
+                    "keyword":"天水TIANSHUI"
+                },
+                {
+                    "cityName":"铁岭",
+                    "keyword":"铁岭TIELING"
+                },
+                {
+                    "cityName":"铜川",
+                    "keyword":"铜川TONGCHUAN"
+                },
+                {
+                    "cityName":"通化",
+                    "keyword":"通化TONGHUA"
+                },
+                {
+                    "cityName":"通辽",
+                    "keyword":"通辽TONGLIAO"
+                },
+                {
+                    "cityName":"铜陵",
+                    "keyword":"铜陵TONGLING"
+                },
+                {
+                    "cityName":"铜仁",
+                    "keyword":"铜仁TONGREN"
+                },
+                {
+                    "cityName":"吐鲁番",
+                    "keyword":"吐鲁番TULUFAN"
+                }
+            ]
+        },
+        {
+            "letter":"W",
+            "data":[
+                {
+                    "cityName":"潍坊",
+                    "keyword":"潍坊WEIFANG"
+                },
+                {
+                    "cityName":"威海",
+                    "keyword":"威海WEIHAI"
+                },
+                {
+                    "cityName":"渭南",
+                    "keyword":"渭南WEINAN"
+                },
+                {
+                    "cityName":"文山",
+                    "keyword":"文山WENSHAN"
+                },
+                {
+                    "cityName":"温州",
+                    "keyword":"温州WENZHOU"
+                },
+                {
+                    "cityName":"乌海",
+                    "keyword":"乌海WUHAI"
+                },
+                {
+                    "cityName":"武汉",
+                    "keyword":"武汉WUHAN"
+                },
+                {
+                    "cityName":"芜湖",
+                    "keyword":"芜湖WUHU"
+                },
+                {
+                    "cityName":"乌兰察布",
+                    "keyword":"乌兰察布WULANCHABU"
+                },
+                {
+                    "cityName":"乌鲁木齐",
+                    "keyword":"乌鲁木齐WULUMUQI"
+                },
+                {
+                    "cityName":"武威",
+                    "keyword":"武威WUWEI"
+                },
+                {
+                    "cityName":"无锡",
+                    "keyword":"无锡WUXI"
+                },
+                {
+                    "cityName":"吴忠",
+                    "keyword":"吴忠WUZHONG"
+                },
+                {
+                    "cityName":"梧州",
+                    "keyword":"梧州WUZHOU"
+                }
+            ]
+        },
+        {
+            "letter":"X",
+            "data":[
+                {
+                    "cityName":"厦门",
+                    "keyword":"厦门XIAMEN"
+                },
+                {
+                    "cityName":"西安",
+                    "keyword":"西安XIAN"
+                },
+                {
+                    "cityName":"湘潭",
+                    "keyword":"湘潭XIANGTAN"
+                },
+                {
+                    "cityName":"湘西",
+                    "keyword":"湘西XIANGXI"
+                },
+                {
+                    "cityName":"襄阳",
+                    "keyword":"襄阳XIANGYANG"
+                },
+                {
+                    "cityName":"咸宁",
+                    "keyword":"咸宁XIANNING"
+                },
+                {
+                    "cityName":"咸阳",
+                    "keyword":"咸阳XIANYANG"
+                },
+                {
+                    "cityName":"孝感",
+                    "keyword":"孝感XIAOGAN"
+                },
+                {
+                    "cityName":"锡林郭勒",
+                    "keyword":"锡林郭勒XILINGUOLE"
+                },
+                {
+                    "cityName":"兴安",
+                    "keyword":"大兴安岭DAXINGANLING"
+                },
+                {
+                    "cityName":"兴安",
+                    "keyword":"兴安XINGAN"
+                },
+                {
+                    "cityName":"邢台",
+                    "keyword":"邢台XINGTAI"
+                },
+                {
+                    "cityName":"西宁",
+                    "keyword":"西宁XINING"
+                },
+                {
+                    "cityName":"新疆",
+                    "keyword":"新疆XINJIANG"
+                },
+                {
+                    "cityName":"新乡",
+                    "keyword":"新乡XINXIANG"
+                },
+                {
+                    "cityName":"信阳",
+                    "keyword":"信阳XINYANG"
+                },
+                {
+                    "cityName":"新余",
+                    "keyword":"新余XINYU"
+                },
+                {
+                    "cityName":"忻州",
+                    "keyword":"忻州XINZHOU"
+                },
+                {
+                    "cityName":"西双版纳",
+                    "keyword":"西双版纳XISHUANGBANNA"
+                },
+                {
+                    "cityName":"宣城",
+                    "keyword":"宣城XUANCHENG"
+                },
+                {
+                    "cityName":"许昌",
+                    "keyword":"许昌XUCHANG"
+                },
+                {
+                    "cityName":"徐州",
+                    "keyword":"徐州XUZHOU"
+                }
+            ]
+        },
+        {
+            "letter":"Y",
+            "data":[
+                {
+                    "cityName":"雅安",
+                    "keyword":"雅安YAAN"
+                },
+                {
+                    "cityName":"延安",
+                    "keyword":"延安YANAN"
+                },
+                {
+                    "cityName":"延边",
+                    "keyword":"延边YANBIAN"
+                },
+                {
+                    "cityName":"盐城",
+                    "keyword":"盐城YANCHENG"
+                },
+                {
+                    "cityName":"阳江",
+                    "keyword":"阳江YANGJIANG"
+                },
+                {
+                    "cityName":"阳泉",
+                    "keyword":"阳泉YANGQUAN"
+                },
+                {
+                    "cityName":"扬州",
+                    "keyword":"扬州YANGZHOU"
+                },
+                {
+                    "cityName":"烟台",
+                    "keyword":"烟台YANTAI"
+                },
+                {
+                    "cityName":"宜宾",
+                    "keyword":"宜宾YIBIN"
+                },
+                {
+                    "cityName":"宜昌",
+                    "keyword":"宜昌YICHANG"
+                },
+                {
+                    "cityName":"伊春",
+                    "keyword":"伊春YICHUN"
+                },
+                {
+                    "cityName":"宜春",
+                    "keyword":"宜春YICHUN"
+                },
+                {
+                    "cityName":"伊犁",
+                    "keyword":"伊犁YILI"
+                },
+                {
+                    "cityName":"银川",
+                    "keyword":"银川YINCHUAN"
+                },
+                {
+                    "cityName":"营口",
+                    "keyword":"营口YINGKOU"
+                },
+                {
+                    "cityName":"鹰潭",
+                    "keyword":"鹰潭YINGTAN"
+                },
+                {
+                    "cityName":"益阳",
+                    "keyword":"益阳YIYANG"
+                },
+                {
+                    "cityName":"永州",
+                    "keyword":"永州YONGZHOU"
+                },
+                {
+                    "cityName":"岳阳",
+                    "keyword":"岳阳YUEYANG"
+                },
+                {
+                    "cityName":"玉林",
+                    "keyword":"玉林YULIN"
+                },
+                {
+                    "cityName":"榆林",
+                    "keyword":"榆林YULIN"
+                },
+                {
+                    "cityName":"运城",
+                    "keyword":"运城YUNCHENG"
+                },
+                {
+                    "cityName":"云浮",
+                    "keyword":"云浮YUNFU"
+                },
+                {
+                    "cityName":"玉树",
+                    "keyword":"玉树YUSHU"
+                },
+                {
+                    "cityName":"玉溪",
+                    "keyword":"玉溪YUXI"
+                }
+            ]
+        },
+        {
+            "letter":"Z",
+            "data":[
+                {
+                    "cityName":"枣庄",
+                    "keyword":"枣庄ZAOZHUANG"
+                },
+                {
+                    "cityName":"张家界",
+                    "keyword":"张家界ZHANGJIAJIE"
+                },
+                {
+                    "cityName":"张家口",
+                    "keyword":"张家口ZHANGJIAKOU"
+                },
+                {
+                    "cityName":"张掖",
+                    "keyword":"张掖ZHANGYE"
+                },
+                {
+                    "cityName":"漳州",
+                    "keyword":"漳州ZHANGZHOU"
+                },
+                {
+                    "cityName":"湛江",
+                    "keyword":"湛江ZHANJIANG"
+                },
+                {
+                    "cityName":"肇庆",
+                    "keyword":"肇庆ZHAOQING"
+                },
+                {
+                    "cityName":"昭通",
+                    "keyword":"昭通ZHAOTONG"
+                },
+                {
+                    "cityName":"朝阳",
+                    "keyword":"朝阳ZHAOYANG"
+                },
+                {
+                    "cityName":"郑州",
+                    "keyword":"郑州ZHENGZHOU"
+                },
+                {
+                    "cityName":"镇江",
+                    "keyword":"镇江ZHENJIANG"
+                },
+                {
+                    "cityName":"中山",
+                    "keyword":"中山ZHONGSHAN"
+                },
+                {
+                    "cityName":"中卫",
+                    "keyword":"中卫ZHONGWEI"
+                },
+                {
+                    "cityName":"周口",
+                    "keyword":"周口ZHOUKOU"
+                },
+                {
+                    "cityName":"舟山",
+                    "keyword":"舟山ZHOUSHAN"
+                },
+                {
+                    "cityName":"珠海",
+                    "keyword":"珠海ZHUHAI"
+                },
+                {
+                    "cityName":"驻马店",
+                    "keyword":"驻马店ZHUMADIAN"
+                },
+                {
+                    "cityName":"株洲",
+                    "keyword":"株洲ZHUZHOU"
+                },
+                {
+                    "cityName":"淄博",
+                    "keyword":"淄博ZIBO"
+                },
+                {
+                    "cityName":"自贡",
+                    "keyword":"自贡ZIGONG"
+                },
+                {
+                    "cityName":"资阳",
+                    "keyword":"资阳ZIYANG"
+                },
+                {
+                    "cityName":"遵义",
+                    "keyword":"遵义ZUNYI"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/utils/emoji.js b/utils/emoji.js
new file mode 100644
index 0000000..6826959
--- /dev/null
+++ b/utils/emoji.js
@@ -0,0 +1,22 @@
+export default {
+	cn: ["[开心]", "[高兴]", "[哈哈]", "[灿烂]", "[大笑]", "[汗臭]", "[地板上笑]", "[笑哭]", "[微笑]", "[颠倒]", "[眨眼]", "[面带笑容]", "[晕笑]", "[爱心笑]", "[喜欢]", "[开眼界]", "[飞吻]",
+		"[亲亲]", "[面带微笑]", "[闭眼亲亲]", "[笑脸亲亲]", "[面对食物]", "[吐舌]", "[眨眼吐舌]", "[赞尼]", "[鬼脸]", "[钱嘴]",
+		"[拥抱]", "[偷笑]", "[嘘]", "[思考]", "[闭嘴]", "[翘眉毛]", "[中性]", "[无表情]", "[无嘴脸]", "[傻笑]", "[无趣]", "[白眼]", "[尴尬]", "[说谎]", "[舒缓]", "[沉思]", "[沉睡]", "[流口水]", "[睡觉]",
+		"[感冒]", "[发热]", "[受伤]", "[恶心]", "[呕吐]", "[打喷嚏]", "[炎热]", "[寒冷]", "[毛茸茸]", "[头晕]",
+		"[爆炸头]", "[牛仔帽]", "[聚会]", "[酷]", "[书呆子]", "[观察]", "[困惑]", "[担心]", "[皱眉]", "[不开心]", "[张嘴]", "[寂静]", "[惊讶]", "[害羞]", "[恳求]", "[丧气]", "[痛苦]", "[可怕]", "[焦虑]",
+		"[悲伤]", "[哭泣]", "[聚会]", "[恐惧]", "[极度困惑]", "[执着]", "[失望]", "[垂头丧气]", "[疲倦]", "[十分疲倦]",
+		"[打哈欠]", "[出气]", "[愤怒]", "[生气]", "[咒骂]"
+	],
+	en: ["emoji_01", "emoji_02", "emoji_03", "emoji_04", "emoji_05", "emoji_06", "emoji_07", "emoji_08", "emoji_09",
+		"emoji_10", "emoji_11", "emoji_12", "emoji_13", "emoji_14", "emoji_15", "emoji_16", "emoji_17", "emoji_18",
+		"emoji_19", "emoji_20", "emoji_21", "emoji_22", "emoji_23", "emoji_24", "emoji_25", "emoji_26", "emoji_27",
+		"emoji_28", "emoji_29", "emoji_30", "emoji_31", "emoji_32", "emoji_33", "emoji_34", "emoji_35", "emoji_36",
+		"emoji_37", "emoji_38", "emoji_39", "emoji_40", "emoji_41", "emoji_42", "emoji_43", "emoji_44", "emoji_45",
+		"emoji_46", "emoji_47", "emoji_48", "emoji_49", "emoji_50", "emoji_51", "emoji_52", "emoji_53", "emoji_54",
+		"emoji_55", "emoji_56", "emoji_57", "emoji_58", "emoji_59", "emoji_60", "emoji_61", "emoji_62", "emoji_63",
+		"emoji_64", "emoji_65", "emoji_66", "emoji_67", "emoji_68", "emoji_69", "emoji_70", "emoji_71", "emoji_72",
+		"emoji_73", "emoji_74", "emoji_75", "emoji_76", "emoji_77", "emoji_78", "emoji_79", "emoji_80", "emoji_81",
+		"emoji_82", "emoji_83", "emoji_84", "emoji_85", "emoji_86", "emoji_87", "emoji_88", "emoji_89", "emoji_90"
+	]
+
+};
\ No newline at end of file
diff --git a/utils/index.list.js b/utils/index.list.js
new file mode 100644
index 0000000..aaf4007
--- /dev/null
+++ b/utils/index.list.js
@@ -0,0 +1,585 @@
+export default {
+	list: [{
+			"letter": "A",
+			"data": [{
+					"name": "阿拉斯加",
+					"mobile": "13588889999",
+					"keyword": "阿拉斯加ABA13588889999"
+				},
+				{
+					"name": "阿克苏",
+					"mobile": "0551-4386721",
+					"keyword": "阿克苏AKESU0551-4386721"
+				},
+				{
+					"name": "阿拉善",
+					"mobile": "4008009100",
+					"keyword": "阿拉善ALASHAN4008009100"
+				},
+				{
+					"name": "阿勒泰",
+					"mobile": "13588889999",
+					"keyword": "阿勒泰ALETAI13588889999"
+				},
+				{
+					"name": "阿里",
+					"mobile": "13588889999",
+					"keyword": "阿里ALI13588889999"
+				},
+				{
+					"name": "安阳",
+					"mobile": "13588889999",
+					"keyword": "13588889999安阳ANYANG"
+				}
+			]
+		},
+		{
+			"letter": "B",
+			"data": [{
+					"name": "白城",
+					"mobile": "该主子没有留电话~",
+					"keyword": "白城BAICHENG"
+				},
+				{
+					"name": "白山",
+					"mobile": "13588889999",
+					"keyword": "白山BAISHAN13588889999"
+				},
+				{
+					"name": "白银",
+					"mobile": "13588889999",
+					"keyword": "白银BAIYIN13588889999"
+				},
+				{
+					"name": "保定",
+					"mobile": "13588889999",
+					"keyword": "保定BAODING13588889999"
+				}
+			]
+		},
+		{
+			"letter": "C",
+			"data": [{
+					"name": "沧州",
+					"mobile": "13588889999",
+					"keyword": "沧州CANGZHOU13588889999"
+				},
+				{
+					"name": "长春",
+					"mobile": "13588889999",
+					"keyword": "长春CHANGCHUN13588889999"
+				}
+			]
+		},
+		{
+			"letter": "D",
+			"data": [{
+					"name": "大理",
+					"mobile": "13588889999",
+					"keyword": "大理DALI13588889999"
+				},
+				{
+					"name": "大连",
+					"mobile": "13588889999",
+					"keyword": "大连DALIAN13588889999"
+				}
+			]
+		},
+		{
+			"letter": "E",
+			"data": [{
+					"name": "鄂尔多斯",
+					"mobile": "13588889999",
+					"keyword": "鄂尔多斯EERDUOSI13588889999"
+				},
+				{
+					"name": "恩施",
+					"mobile": "13588889999",
+					"keyword": "恩施ENSHI13588889999"
+				},
+				{
+					"name": "鄂州",
+					"mobile": "13588889999",
+					"keyword": "鄂州EZHOU13588889999"
+				}
+			]
+		},
+		{
+			"letter": "F",
+			"data": [{
+					"name": "防城港",
+					"mobile": "该主子没有留电话~",
+					"keyword": "防城港FANGCHENGGANG"
+				},
+				{
+					"name": "抚顺",
+					"mobile": "13588889999",
+					"keyword": "抚顺FUSHUN13588889999"
+				},
+				{
+					"name": "阜新",
+					"mobile": "13588889999",
+					"keyword": "阜新FUXIN13588889999"
+				},
+				{
+					"name": "阜阳",
+					"mobile": "13588889999",
+					"keyword": "阜阳FUYANG13588889999"
+				},
+				{
+					"name": "抚州",
+					"mobile": "13588889999",
+					"keyword": "抚州FUZHOU13588889999"
+				},
+				{
+					"name": "福州",
+					"mobile": "13588889999",
+					"keyword": "福州FUZHOU13588889999"
+				}
+			]
+		},
+		{
+			"letter": "G",
+			"data": [{
+					"name": "甘南",
+					"mobile": "13588889999",
+					"keyword": "甘南GANNAN13588889999"
+				},
+				{
+					"name": "赣州",
+					"mobile": "13588889999",
+					"keyword": "赣州GANZHOU13588889999"
+				},
+				{
+					"name": "甘孜",
+					"mobile": "13588889999",
+					"keyword": "甘孜GANZI13588889999"
+				}
+			]
+		},
+		{
+			"letter": "H",
+			"data": [{
+					"name": "哈尔滨",
+					"mobile": "13588889999",
+					"keyword": "哈尔滨HAERBIN13588889999"
+				},
+				{
+					"name": "海北",
+					"mobile": "13588889999",
+					"keyword": "海北HAIBEI13588889999"
+				},
+				{
+					"name": "海东",
+					"mobile": "13588889999",
+					"keyword": "海东HAIDONG13588889999"
+				},
+				{
+					"name": "海口",
+					"mobile": "13588889999",
+					"keyword": "海口HAIKOU13588889999"
+				}
+			]
+		},
+		{
+			"letter": "I",
+			"data": [{
+				"name": "ice",
+				"mobile": "13588889999",
+				"keyword": "佳木斯JIAMUSI13588889999"
+			}]
+		},
+		{
+			"letter": "J",
+			"data": [{
+					"name": "佳木斯",
+					"mobile": "13588889999",
+					"keyword": "佳木斯JIAMUSI13588889999"
+				},
+				{
+					"name": "吉安",
+					"mobile": "13588889999",
+					"keyword": "吉安JIAN13588889999"
+				},
+				{
+					"name": "江门",
+					"mobile": "13588889999",
+					"keyword": "江门JIANGMEN13588889999"
+				}
+			]
+		},
+		{
+			"letter": "K",
+			"data": [{
+					"name": "开封",
+					"mobile": "13588889999",
+					"keyword": "开封KAIFENG13588889999"
+				},
+				{
+					"name": "喀什",
+					"mobile": "13588889999",
+					"keyword": "喀什KASHI13588889999"
+				},
+				{
+					"name": "克拉玛依",
+					"mobile": "13588889999",
+					"keyword": "克拉玛依KELAMAYI13588889999"
+				}
+			]
+		},
+		{
+			"letter": "L",
+			"data": [{
+					"name": "来宾",
+					"mobile": "13588889999",
+					"keyword": "来宾LAIBIN13588889999"
+				},
+				{
+					"name": "兰州",
+					"mobile": "13588889999",
+					"keyword": "兰州LANZHOU13588889999"
+				},
+				{
+					"name": "拉萨",
+					"mobile": "13588889999",
+					"keyword": "拉萨LASA13588889999"
+				},
+				{
+					"name": "乐山",
+					"mobile": "13588889999",
+					"keyword": "乐山LESHAN13588889999"
+				},
+				{
+					"name": "凉山",
+					"mobile": "13588889999",
+					"keyword": "凉山LIANGSHAN13588889999"
+				},
+				{
+					"name": "连云港",
+					"mobile": "13588889999",
+					"keyword": "连云港LIANYUNGANG13588889999"
+				},
+				{
+					"name": "聊城",
+					"mobile": "18322223333",
+					"keyword": "聊城LIAOCHENG18322223333"
+				},
+				{
+					"name": "辽阳",
+					"mobile": "18322223333",
+					"keyword": "辽阳LIAOYANG18322223333"
+				},
+				{
+					"name": "辽源",
+					"mobile": "18322223333",
+					"keyword": "辽源LIAOYUAN18322223333"
+				},
+				{
+					"name": "丽江",
+					"mobile": "18322223333",
+					"keyword": "丽江LIJIANG18322223333"
+				},
+				{
+					"name": "临沧",
+					"mobile": "18322223333",
+					"keyword": "临沧LINCANG18322223333"
+				},
+				{
+					"name": "临汾",
+					"mobile": "18322223333",
+					"keyword": "临汾LINFEN18322223333"
+				},
+				{
+					"name": "临夏",
+					"mobile": "18322223333",
+					"keyword": "临夏LINXIA18322223333"
+				},
+				{
+					"name": "临沂",
+					"mobile": "18322223333",
+					"keyword": "临沂LINYI18322223333"
+				},
+				{
+					"name": "林芝",
+					"mobile": "18322223333",
+					"keyword": "林芝LINZHI18322223333"
+				},
+				{
+					"name": "丽水",
+					"mobile": "18322223333",
+					"keyword": "丽水LISHUI18322223333"
+				}
+			]
+		},
+		{
+			"letter": "M",
+			"data": [{
+					"name": "眉山",
+					"mobile": "15544448888",
+					"keyword": "眉山MEISHAN15544448888"
+				},
+				{
+					"name": "梅州",
+					"mobile": "15544448888",
+					"keyword": "梅州MEIZHOU15544448888"
+				},
+				{
+					"name": "绵阳",
+					"mobile": "15544448888",
+					"keyword": "绵阳MIANYANG15544448888"
+				},
+				{
+					"name": "牡丹江",
+					"mobile": "15544448888",
+					"keyword": "牡丹江MUDANJIANG15544448888"
+				}
+			]
+		},
+		{
+			"letter": "N",
+			"data": [{
+					"name": "南昌",
+					"mobile": "15544448888",
+					"keyword": "南昌NANCHANG15544448888"
+				},
+				{
+					"name": "南充",
+					"mobile": "15544448888",
+					"keyword": "南充NANCHONG15544448888"
+				},
+				{
+					"name": "南京",
+					"mobile": "15544448888",
+					"keyword": "南京NANJING15544448888"
+				},
+				{
+					"name": "南宁",
+					"mobile": "15544448888",
+					"keyword": "南宁NANNING15544448888"
+				},
+				{
+					"name": "南平",
+					"mobile": "15544448888",
+					"keyword": "南平NANPING15544448888"
+				}
+			]
+		},
+		{
+			"letter": "O",
+			"data": [{
+				"name": "欧阳",
+				"mobile": "15544448888",
+				"keyword": "欧阳ouyang15544448888"
+			}]
+		},
+		{
+			"letter": "P",
+			"data": [{
+					"name": "盘锦",
+					"mobile": "15544448888",
+					"keyword": "盘锦PANJIN15544448888"
+				},
+				{
+					"name": "攀枝花",
+					"mobile": "15544448888",
+					"keyword": "攀枝花PANZHIHUA15544448888"
+				},
+				{
+					"name": "平顶山",
+					"mobile": "15544448888",
+					"keyword": "平顶山PINGDINGSHAN15544448888"
+				},
+				{
+					"name": "平凉",
+					"mobile": "15544448888",
+					"keyword": "平凉PINGLIANG15544448888"
+				},
+				{
+					"name": "萍乡",
+					"mobile": "15544448888",
+					"keyword": "萍乡PINGXIANG15544448888"
+				},
+				{
+					"name": "普洱",
+					"mobile": "15544448888",
+					"keyword": "普洱PUER15544448888"
+				},
+				{
+					"name": "莆田",
+					"mobile": "15544448888",
+					"keyword": "莆田PUTIAN15544448888"
+				},
+				{
+					"name": "濮阳",
+					"mobile": "15544448888",
+					"keyword": "濮阳PUYANG15544448888"
+				}
+			]
+		},
+		{
+			"letter": "Q",
+			"data": [{
+					"name": "黔东南",
+					"mobile": "15544448888",
+					"keyword": "黔东南QIANDONGNAN15544448888"
+				},
+				{
+					"name": "黔南",
+					"mobile": "15544448888",
+					"keyword": "黔南QIANNAN15544448888"
+				},
+				{
+					"name": "黔西南",
+					"mobile": "15544448888",
+					"keyword": "黔西南QIANXINAN15544448888"
+				}
+			]
+		},
+		{
+			"letter": "R",
+			"data": [{
+					"name": "日喀则",
+					"mobile": "15544448888",
+					"keyword": "日喀则RIKAZE15544448888"
+				},
+				{
+					"name": "日照",
+					"mobile": "15544448888",
+					"keyword": "日照RIZHAO15544448888"
+				}
+			]
+		},
+		{
+			"letter": "S",
+			"data": [{
+					"name": "三门峡",
+					"mobile": "15544448888",
+					"keyword": "三门峡SANMENXIA15544448888"
+				},
+				{
+					"name": "三明",
+					"mobile": "15544448888",
+					"keyword": "三明SANMING15544448888"
+				},
+				{
+					"name": "三沙",
+					"mobile": "15544448888",
+					"keyword": "三沙SANSHA15544448888"
+				}
+			]
+		},
+		{
+			"letter": "T",
+			"data": [{
+					"name": "塔城",
+					"mobile": "15544448888",
+					"keyword": "塔城TACHENG15544448888"
+				},
+				{
+					"name": "漯河",
+					"mobile": "15544448888",
+					"keyword": "漯河TAHE15544448888"
+				},
+				{
+					"name": "泰安",
+					"mobile": "15544448888",
+					"keyword": "泰安TAIAN15544448888"
+				}
+			]
+		},
+		{
+			"letter": "W",
+			"data": [{
+					"name": "潍坊",
+					"mobile": "15544448888",
+					"keyword": "潍坊WEIFANG15544448888"
+				},
+				{
+					"name": "威海",
+					"mobile": "15544448888",
+					"keyword": "威海WEIHAI15544448888"
+				},
+				{
+					"name": "渭南",
+					"mobile": "15544448888",
+					"keyword": "渭南WEINAN15544448888"
+				},
+				{
+					"name": "文山",
+					"mobile": "15544448888",
+					"keyword": "文山WENSHAN15544448888"
+				}
+			]
+		},
+		{
+			"letter": "X",
+			"data": [{
+					"name": "厦门",
+					"mobile": "15544448888",
+					"keyword": "厦门XIAMEN15544448888"
+				},
+				{
+					"name": "西安",
+					"mobile": "15544448888",
+					"keyword": "西安XIAN15544448888"
+				},
+				{
+					"name": "湘潭",
+					"mobile": "15544448888",
+					"keyword": "湘潭XIANGTAN15544448888"
+				}
+			]
+		},
+		{
+			"letter": "Y",
+			"data": [{
+					"name": "雅安",
+					"mobile": "15544448888",
+					"keyword": "雅安YAAN15544448888"
+				},
+				{
+					"name": "延安",
+					"mobile": "15544448888",
+					"keyword": "延安YANAN15544448888"
+				},
+				{
+					"name": "延边",
+					"mobile": "15544448888",
+					"keyword": "延边YANBIAN15544448888"
+				},
+				{
+					"name": "盐城",
+					"mobile": "15544448888",
+					"keyword": "盐城YANCHENG15544448888"
+				}
+			]
+		},
+		{
+			"letter": "Z",
+			"data": [{
+					"name": "枣庄",
+					"mobile": "15544448888",
+					"keyword": "枣庄ZAOZHUANG15544448888"
+				},
+				{
+					"name": "张家界",
+					"mobile": "15544448888",
+					"keyword": "张家界ZHANGJIAJIE15544448888"
+				},
+				{
+					"name": "张家口",
+					"mobile": "15544448888",
+					"keyword": "张家口ZHANGJIAKOU15544448888"
+				}
+			]
+		},
+		{
+			"letter": "well",
+			"data": [{
+				"name": "☆echo.",
+				"mobile": "16666666666",
+				"keyword": "echo16666666666"
+			}]
+		}
+	]
+}
diff --git a/utils/picker.city.js b/utils/picker.city.js
new file mode 100644
index 0000000..a12f665
--- /dev/null
+++ b/utils/picker.city.js
@@ -0,0 +1,405 @@
+//测试数据，数据并非完整，只验证功能
+export default [{
+    "text": "北京市",
+    "value": "110000",
+    "children": [{
+      "text": "北京市市辖区",
+      "value": "110100",
+      "children": [{
+        "text": "东城区",
+        "value": "110101"
+      }, {
+        "text": "西城区",
+        "value": "110102"
+      }, {
+        "text": "朝阳区",
+        "value": "110105"
+      }]
+    }]
+  },
+  {
+    "text": "安徽省",
+    "value": "340000",
+    "children": [{
+      "text": "合肥市",
+      "value": "340100",
+      "children": [{
+        "text": "瑶海区",
+        "value": "340102"
+      }, {
+        "text": "庐阳区",
+        "value": "340103"
+      }, {
+        "text": "蜀山区",
+        "value": "340104"
+      }, {
+        "text": "包河区",
+        "value": "340111"
+      }, {
+        "text": "长丰县",
+        "value": "340121"
+      }, {
+        "text": "肥东县",
+        "value": "340122"
+      }, {
+        "text": "肥西县",
+        "value": "340123"
+      }, {
+        "text": "庐江县",
+        "value": "340124"
+      }, {
+        "text": "巢湖市",
+        "value": "340181"
+      }]
+    }, {
+      "text": "芜湖市",
+      "value": "340200",
+      "children": [{
+        "text": "镜湖区",
+        "value": "340202"
+      }, {
+        "text": "弋江区",
+        "value": "340203"
+      }, {
+        "text": "鸠江区",
+        "value": "340207"
+      }, {
+        "text": "三山区",
+        "value": "340208"
+      }, {
+        "text": "芜湖县",
+        "value": "340221"
+      }, {
+        "text": "繁昌县",
+        "value": "340222"
+      }, {
+        "text": "南陵县",
+        "value": "340223"
+      }, {
+        "text": "无为县",
+        "value": "340225"
+      }]
+    }, {
+      "text": "蚌埠市",
+      "value": "340300",
+      "children": [{
+        "text": "龙子湖区",
+        "value": "340302"
+      }, {
+        "text": "蚌山区",
+        "value": "340303"
+      }, {
+        "text": "禹会区",
+        "value": "340304"
+      }, {
+        "text": "淮上区",
+        "value": "340311"
+      }, {
+        "text": "怀远县",
+        "value": "340321"
+      }, {
+        "text": "五河县",
+        "value": "340322"
+      }, {
+        "text": "固镇县",
+        "value": "340323"
+      }]
+    }, {
+      "text": "淮南市",
+      "value": "340400",
+      "children": [{
+        "text": "大通区",
+        "value": "340402"
+      }, {
+        "text": "田家庵区",
+        "value": "340403"
+      }, {
+        "text": "谢家集区",
+        "value": "340404"
+      }, {
+        "text": "八公山区",
+        "value": "340405"
+      }, {
+        "text": "潘集区",
+        "value": "340406"
+      }, {
+        "text": "凤台县",
+        "value": "340421"
+      }, {
+        "text": "寿县",
+        "value": "340422"
+      }]
+    }, {
+      "text": "马鞍山市",
+      "value": "340500",
+      "children": [{
+        "text": "花山区",
+        "value": "340503"
+      }, {
+        "text": "雨山区",
+        "value": "340504"
+      }, {
+        "text": "博望区",
+        "value": "340506"
+      }, {
+        "text": "当涂县",
+        "value": "340521"
+      }, {
+        "text": "含山县",
+        "value": "340522"
+      }, {
+        "text": "和县",
+        "value": "340523"
+      }]
+    }, {
+      "text": "淮北市",
+      "value": "340600",
+      "children": [{
+        "text": "杜集区",
+        "value": "340602"
+      }, {
+        "text": "相山区",
+        "value": "340603"
+      }, {
+        "text": "烈山区",
+        "value": "340604"
+      }, {
+        "text": "濉溪县",
+        "value": "340621"
+      }]
+    }, {
+      "text": "铜陵市",
+      "value": "340700",
+      "children": [{
+        "text": "铜官区",
+        "value": "340705"
+      }, {
+        "text": "义安区",
+        "value": "340706"
+      }, {
+        "text": "郊区",
+        "value": "340711"
+      }, {
+        "text": "枞阳县",
+        "value": "340722"
+      }]
+    }, {
+      "text": "安庆市",
+      "value": "340800",
+      "children": [{
+        "text": "迎江区",
+        "value": "340802"
+      }, {
+        "text": "大观区",
+        "value": "340803"
+      }, {
+        "text": "宜秀区",
+        "value": "340811"
+      }, {
+        "text": "怀宁县",
+        "value": "340822"
+      }, {
+        "text": "潜山县",
+        "value": "340824"
+      }, {
+        "text": "太湖县",
+        "value": "340825"
+      }, {
+        "text": "宿松县",
+        "value": "340826"
+      }, {
+        "text": "望江县",
+        "value": "340827"
+      }, {
+        "text": "岳西县",
+        "value": "340828"
+      }, {
+        "text": "桐城市",
+        "value": "340881"
+      }]
+    }, {
+      "text": "黄山市",
+      "value": "341000",
+      "children": [{
+        "text": "屯溪区",
+        "value": "341002"
+      }, {
+        "text": "黄山区",
+        "value": "341003"
+      }, {
+        "text": "徽州区",
+        "value": "341004"
+      }, {
+        "text": "歙县",
+        "value": "341021"
+      }, {
+        "text": "休宁县",
+        "value": "341022"
+      }, {
+        "text": "黟县",
+        "value": "341023"
+      }, {
+        "text": "祁门县",
+        "value": "341024"
+      }]
+    }, {
+      "text": "滁州市",
+      "value": "341100",
+      "children": [{
+        "text": "琅琊区",
+        "value": "341102"
+      }, {
+        "text": "南谯区",
+        "value": "341103"
+      }, {
+        "text": "来安县",
+        "value": "341122"
+      }, {
+        "text": "全椒县",
+        "value": "341124"
+      }, {
+        "text": "定远县",
+        "value": "341125"
+      }, {
+        "text": "凤阳县",
+        "value": "341126"
+      }, {
+        "text": "天长市",
+        "value": "341181"
+      }, {
+        "text": "明光市",
+        "value": "341182"
+      }]
+    }, {
+      "text": "阜阳市",
+      "value": "341200",
+      "children": [{
+        "text": "颍州区",
+        "value": "341202"
+      }, {
+        "text": "颍东区",
+        "value": "341203"
+      }, {
+        "text": "颍泉区",
+        "value": "341204"
+      }, {
+        "text": "临泉县",
+        "value": "341221"
+      }, {
+        "text": "太和县",
+        "value": "341222"
+      }, {
+        "text": "阜南县",
+        "value": "341225"
+      }, {
+        "text": "颍上县",
+        "value": "341226"
+      }, {
+        "text": "界首市",
+        "value": "341282"
+      }]
+    }, {
+      "text": "宿州市",
+      "value": "341300",
+      "children": [{
+        "text": "埇桥区",
+        "value": "341302"
+      }, {
+        "text": "砀山县",
+        "value": "341321"
+      }, {
+        "text": "萧县",
+        "value": "341322"
+      }, {
+        "text": "灵璧县",
+        "value": "341323"
+      }, {
+        "text": "泗县",
+        "value": "341324"
+      }]
+    }, {
+      "text": "六安市",
+      "value": "341500",
+      "children": [{
+        "text": "金安区",
+        "value": "341502"
+      }, {
+        "text": "裕安区",
+        "value": "341503"
+      }, {
+        "text": "叶集区",
+        "value": "341504"
+      }, {
+        "text": "霍邱县",
+        "value": "341522"
+      }, {
+        "text": "舒城县",
+        "value": "341523"
+      }, {
+        "text": "金寨县",
+        "value": "341524"
+      }, {
+        "text": "霍山县",
+        "value": "341525"
+      }]
+    }, {
+      "text": "亳州市",
+      "value": "341600",
+      "children": [{
+        "text": "谯城区",
+        "value": "341602"
+      }, {
+        "text": "涡阳县",
+        "value": "341621"
+      }, {
+        "text": "蒙城县",
+        "value": "341622"
+      }, {
+        "text": "利辛县",
+        "value": "341623"
+      }]
+    }, {
+      "text": "池州市",
+      "value": "341700",
+      "children": [{
+        "text": "贵池区",
+        "value": "341702"
+      }, {
+        "text": "东至县",
+        "value": "341721"
+      }, {
+        "text": "石台县",
+        "value": "341722"
+      }, {
+        "text": "青阳县",
+        "value": "341723"
+      }]
+    }, {
+      "text": "宣城市",
+      "value": "341800",
+      "children": [{
+        "text": "宣州区",
+        "value": "341802"
+      }, {
+        "text": "郎溪县",
+        "value": "341821"
+      }, {
+        "text": "广德县",
+        "value": "341822"
+      }, {
+        "text": "泾县",
+        "value": "341823"
+      }, {
+        "text": "绩溪县",
+        "value": "341824"
+      }, {
+        "text": "旌德县",
+        "value": "341825"
+      }, {
+        "text": "宁国市",
+        "value": "341881"
+      }]
+    }]
+  }
+
+];
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
new file mode 100644
index 0000000..28dcd5d
--- /dev/null
+++ b/utils/util.js
@@ -0,0 +1,92 @@
+/**
+ * 数据处理
+ * @author echo.
+ * @version 1.5.0
+ **/
+const utils = {
+	//去空格
+	trim: function(value) {
+		return value.replace(/(^\s*)|(\s*$)/g, "");
+	},
+	//内容替换
+	replaceAll: function(text, repstr, newstr) {
+		return text.replace(new RegExp(repstr, "gm"), newstr);
+	},
+	//格式化手机号码
+	formatNumber: function(num) {
+		return num.length === 11 ? num.replace(/^(\d{3})\d{4}(\d{4})$/, '$1****$2') : num;
+	},
+	//金额格式化
+	rmoney: function(money) {
+		return parseFloat(money).toFixed(2).toString().split('').reverse().join('').replace(/(\d{3})/g, '$1,').replace(
+			/\,$/, '').split('').reverse().join('');
+	},
+	//日期格式化
+	formatDate: function(formatStr, fdate) {
+		if (fdate) {
+			if (~fdate.indexOf('.')) {
+				fdate = fdate.substring(0, fdate.indexOf('.'));
+			}
+			fdate = fdate.toString().replace('T', ' ').replace(/\-/g, '/');
+			var fTime, fStr = 'ymdhis';
+			if (!formatStr)
+				formatStr = "y-m-d h:i:s";
+			if (fdate)
+				fTime = new Date(fdate);
+			else
+				fTime = new Date();
+			var month = fTime.getMonth() + 1;
+			var day = fTime.getDate();
+			var hours = fTime.getHours();
+			var minu = fTime.getMinutes();
+			var second = fTime.getSeconds();
+			month = month < 10 ? '0' + month : month;
+			day = day < 10 ? '0' + day : day;
+			hours = hours < 10 ? ('0' + hours) : hours;
+			minu = minu < 10 ? '0' + minu : minu;
+			second = second < 10 ? '0' + second : second;
+			var formatArr = [
+				fTime.getFullYear().toString(),
+				month.toString(),
+				day.toString(),
+				hours.toString(),
+				minu.toString(),
+				second.toString()
+			]
+			for (var i = 0; i < formatArr.length; i++) {
+				formatStr = formatStr.replace(fStr.charAt(i), formatArr[i]);
+			}
+			return formatStr;
+		} else {
+			return "";
+		}
+	},
+	rgbToHex: function (r, g, b) {
+		return "#" + utils.toHex(r) + utils.toHex(g) + utils.toHex(b)
+	},
+	toHex: function (n) {
+		n = parseInt(n, 10);
+		if (isNaN(n)) return "00";
+		n = Math.max(0, Math.min(n, 255));
+		return "0123456789ABCDEF".charAt((n - n % 16) / 16) +
+			"0123456789ABCDEF".charAt(n % 16);
+	},
+	hexToRgb(hex) {
+		let result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+		return result ? {
+			r: parseInt(result[1], 16),
+			g: parseInt(result[2], 16),
+			b: parseInt(result[3], 16)
+		} : null;
+	}
+}
+
+export default {
+	trim: utils.trim,
+	replaceAll: utils.replaceAll,
+	formatNumber: utils.formatNumber,
+	rmoney: utils.rmoney,
+	formatDate: utils.formatDate,
+	rgbToHex: utils.rgbToHex,
+	hexToRgb: utils.hexToRgb
+}